Added automated JUnit Tests