Tidy up some of the test output