Convert TestRunner into class