Updates tests to use trait not a helper
CreateMock refactor
CreateMock refactors to test cases