Tweak to test runner