Adding more JUnit tests.