Improve test failure output

Change-Id: I4417318988ef70639cbcec9d776c783ad69c3990