Yet another attempt at improved test output.