Fix for test runner