Gemfile updates and changes to test-kitchen