Started building general mock factory to replace all the redundant mocks