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

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