Improve test fail output a bit; but will need to also resolve 2 Java 7 test failures