Merge pull request #144 from twogee/lost-tests

Some tests were lost in migration to JUnit 4