Added JUnit Tests