Upgrade Rspec, fix specs