Removed unneeded non-generic CreatMock
Refactoring and cleaning up