JUnit added and DONE