Added JUnit testing