upgraded mockito to 1.10.18