Merge "Increase run-test output on error."