Moving to use the mock module found in Python3

Change-Id: I6a2af0405b8628d4589ce7edb56f10935d5112ea
Merge "Moving to use the mock module found in Python3"