Updated factories, to match new FactoryGirl version