Add more detail to test failure info

This should help track down two failures I've seen on Travis.