Fix FactoryGirl deprecation warnings