Remove EasyMock dependency