Added the mockito dependency and made further changes