test runner and unit test fixes