CONN-1076: Mockito Junit PR modifications