Add some JUnit tests