Added more methods and JUnit