Working on JUnit tests