Fixed JUnit tests.