Improve diagnostics when test fail
===VersionHistory:None===