Fix tests

Hi, I noticed that `lein test` was failing on the develop branch. The changes are all very minor, but at least the tests pass now!