Upgraded mockito to 1.9.5