Working on JUnit tests.