Integration of JUnit and addition of some code