Upgrade Mockito

Talked offline, but appears to be a difference between mockito-all vs mockito-core so the strict conflict resolution isn't catching the problem.