Added more JUnit tests.