Checkpoint some updates to test runner.