Added some changes and JUnit