Added EasyMock for creating mocks in tests
organized imports