Updated gemfile and tests