Minor test error reporting cleanup.

Change-Id: Ie11c16b4e60de7c179c6d2a86e063f4432e2000f