More JUnit tests done