Remove various unused stubbing detected by the newer Mockito version Update references to deprecated Matchers and MockitoJUnitRunner classes