Added mockito support