Improve test failure output

Change-Id: Icfb4af890548a2a11d638c59bb0fb54aaa01a2ed