Getting ready to rework test runner