Minor test runner cleanup