Merge "Update the test for better output on error."