Use better constants
Cleanup
Review request for issue 8252001 for branch testRunner, commit 687.