Modified test runner