965a342485 PR: Tests cleanup - round 5 (#22548)