some more work on making the output nicer for test runner