Upgrading factory_girl and guard-rspec