Added some more tests, and got junit working correctly