testrunner cleanup fix