Fixes for the testrunner