fixed tests (weren't in JSON, now they are)
Merge branch 'master' of https://github.com/cs373-spring-2014/idb-tests