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.
Merge pull request #66 from iParadigms/FormatBreakBugFix

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