[PATCH 1/3] Update FactoryGirl use to current practice.