Updates for FactoryGirl v4.2