Completely removed EasyMock from tests