some changes on mockito implementation