Added more JUnit tests