Some cleanup.
Including EasyMock for JUnit tests.