Fixed two JUnit tests.