Improve diagnostics when test fail
===VersionHistory:None===
Merge branch 'V8_2-branch'