1b1a5eddc0 PR: Tests cleanup - round 1 (#22530)