added changes required for fixing version issues and mockito

added changes required for fixing version issues and mockito

Merge request reports

Loading