Fixing up specs to reflect new FactoryGirl API.

Should have done this when the Gemfile got update.