added changes required for fixing version issues and mockito

Merged Mahsa Hanifi requested to merge mahsa/bug-fix into azure/m16-master

added changes required for fixing version issues and mockito

Merge request reports