Merge pull request #22442 from demeritcowboy/tests-22429