More JUnit tests and code..