Fix unit test errors due to Mockito upgrade