Update Gemfile.lock and fix related tests