re-fixing logic of test runner