added mockito as dependency
(cherry-picked from a2d6c47)
replaced mock implementation by mockito usage
(cherry-picked from 6f3dcf1)