Added JUnit Testing