Upgraded Mockito to the latest version