Added factorymuff and updated models to use correct testing