Switch to EasyMock