Clean up TestHarness to be more instructive