Bug 1047292 - Clean up the test code
Merge pull request #22398 from evanxd/bug-1047292

Bug 1047292 - Clean up the test code