Update gemfile and tests