562677552f PR: Tests cleanup - round 3 (#22538)