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

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