Added missing @Mock
Removed extra verification lines added as a result of the merge