Moved MockMaker to separate file