a few gemfile fixes
fixed deprecated rspec stuff
Fixed tests