Adding cleanup for all test runner calls