fix test failures

On my system, some of the tests were failing.  I tweaked the failure output to be more readable, and this made it obvious that the failures were due to subtle differences in the diff hunk header.