Update gemfile, fix tests