infrastructure : cosmetic changes to test runner