Upgrade rspec and fix specs