upgrade gems and fix rspec for new changes