Merge "Improve unit test runner."