Some badly needed TLC…fix our tests to accommodate a change in failure messages in moving from Java 6->7, as well as a missed fix for a failure message from a previously merged PR