Added JUnit and some tests