Fixing Gemfile and tests