Added JUnit Tests...