convert remaining Factory to FactoryGirl