migration from EasyMock to Mockito
Merge pull request #118 from willschipp/BATCH-1947

* willschipp-BATCH-1947:
  migration from EasyMock to Mockito