Updated to latest Mockito