Replaced references to Factory(deprecated) to FactoryGirl