Fixing up unit test and test runner.