Update rspec gem and fix minor syntax changes in specs