Added a couple more JUnit tests