fixes for test runner