Reärrangement of the way test output is printed, so as hopefully to support a 'multi_test' function easier