Adding JUnit Tests