Misc improvements to test runner.