Issue #21628: Changes to test_runner