Merge "Fix tests when flag is on" into main