Added more JUnit Tests