TestRunner fixes