Remove MockFactoryTrait and break into several