Started cleaning up tests
Continue cleaning tests
Completed Tyepmock remove phase