Merge pull request #21907 from eileenmcnaughton/tests