BATCH 1947 - EasyMock to Mockito

2nd attempt at removal of EasyMock and migration to Mockito