Add some JUnit tests and other