Merge pull request #23432 from colemanw/api4TestCleanup