56651b31b1 PR: Tests Cleanup - Round 2 (#22537)
f0eff90448 PR: Tests cleanup - round 4 (#22541)