am cadf4284: am 4d9281da: Merge "Update the test for better output on error."

* commit 'cadf428403314769f22d3b54b81d082294992ddc':
  Update the test for better output on error.