I think this one is problematic, at least inside this commit because it (in my view) makes it problematic to *just* cherry-pick the test fixes into 2.3.X. Can't we split this into multiple commits so that we can cherry-pick the tests' changes into 2.3.X?