Fixed some bugs introduced in format change, and fixed test script.

script/test.sh was swallowing errors, which allowed travis to miss these errors on previous checkins.

Previously, Dan didn't love my use of && in the test.sh. I would consider this fix temporary, until we've settled on how we're going to be running tests moving forward. But since test.sh is not reporting errors properly, I would argue this patch (or similar) is critical.