Merge "Improve error output when test fails"