Issue #20266 Cleanup test code.