Fixed FactoryGirl deprecation warnings