Merge "Deflake functor tests" into main