diff --git a/Gemfile b/Gemfile
index 4462f0e..cb355d5 100644
--- a/Gemfile
+++ b/Gemfile
@@ -7,7 +7,7 @@ end
 
 group :unit do
   gem 'berkshelf', '~> 3.1.2'
-  gem 'chefspec',  '~> 3.4.0'
+  gem 'chefspec', '~> 4.1.0'
   gem 'rspec-xml', '~> 0.0.6'
 end
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 38c5f4f..c7c1647 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,5 +1,5 @@
 GIT
-  remote: git://github.com/benesch/kitchen-ec2.git
+  remote: https://github.com/benesch/kitchen-ec2.git
   revision: 4e19267d1a75e66e6c92a489bf391e80d82a321f
   specs:
     kitchen-ec2 (0.8.1.dev)
@@ -9,6 +9,7 @@ GIT
 GEM
   remote: https://rubygems.org/
   specs:
+    CFPropertyList (2.3.6)
     addressable (2.3.6)
     ast (2.0.0)
     berkshelf (3.1.2)
@@ -36,18 +37,18 @@ GEM
     buff-ruby_engine (0.1.0)
     buff-shell_out (0.1.1)
       buff-ruby_engine (~> 0.1.0)
-    builder (3.2.2)
+    builder (3.2.4)
     celluloid (0.16.0.pre)
       timers (~> 2.0.0)
     celluloid-io (0.16.0.pre)
       celluloid (>= 0.16.0.pre)
       nio4r (>= 1.0.0)
-    chef (11.12.4)
-      chef-zero (~> 2.0, >= 2.0.2)
+    chef (11.18.12)
+      chef-zero (~> 2.2, >= 2.2.1)
       diff-lcs (~> 1.2, >= 1.2.4)
       erubis (~> 2.7)
+      ffi-yajl (~> 1.2)
       highline (~> 1.6, >= 1.6.9)
-      json (>= 1.4.4, <= 1.8.1)
       mime-types (~> 1.16)
       mixlib-authentication (~> 1.3)
       mixlib-cli (~> 1.4)
@@ -56,56 +57,186 @@ GEM
       mixlib-shellout (~> 1.4)
       net-ssh (~> 2.6)
       net-ssh-multi (~> 1.1)
-      ohai (~> 7.0.4)
+      ohai (~> 7.4)
+      plist (~> 3.1.0)
       pry (~> 0.9)
-      rest-client (>= 1.0.4, < 1.7.0)
-      yajl-ruby (~> 1.1)
-    chef-zero (2.0.2)
+      rest-client (>= 1.0.4, <= 1.6.7)
+    chef-zero (2.2.1)
+      ffi-yajl (~> 1.1)
       hashie (~> 2.0)
-      json
       mixlib-log (~> 1.3)
       rack
-    chefspec (3.4.0)
-      chef (~> 11.0)
+    chefspec (4.1.1)
+      chef (>= 11.14)
       fauxhai (~> 2.0)
-      rspec (~> 2.14)
-    coderay (1.1.0)
+      rspec (~> 3.0)
+    coderay (1.1.3)
     dep-selector-libgecode (1.0.0)
     dep_selector (1.0.3)
       dep-selector-libgecode (~> 1.0)
       ffi (~> 1.9)
-    diff-lcs (1.2.5)
+    diff-lcs (1.4.4)
+    dry-inflector (0.2.1)
     erubis (2.7.0)
-    excon (0.39.4)
+    excon (0.85.0)
     faraday (0.9.0)
       multipart-post (>= 1.2, < 3)
-    fauxhai (2.1.2)
+    fauxhai (2.3.0)
       net-ssh
       ohai
     ffi (1.9.3)
-    fog (1.23.0)
-      fog-brightbox
-      fog-core (~> 1.23)
+    ffi-yajl (1.4.0)
+      ffi (~> 1.5)
+      libyajl2 (~> 1.2)
+    fission (0.5.0)
+      CFPropertyList (~> 2.2)
+    fog (1.41.0)
+      fog-aliyun (>= 0.1.0)
+      fog-atmos
+      fog-aws (>= 0.6.0)
+      fog-brightbox (~> 0.4)
+      fog-cloudatcost (~> 0.1.0)
+      fog-core (~> 1.45)
+      fog-digitalocean (>= 0.3.0)
+      fog-dnsimple (~> 1.0)
+      fog-dynect (~> 0.0.2)
+      fog-ecloud (~> 0.1)
+      fog-google (<= 0.1.0)
+      fog-internet-archive
+      fog-joyent
       fog-json
+      fog-local
+      fog-openstack
+      fog-powerdns (>= 0.1.1)
+      fog-profitbricks
+      fog-rackspace
+      fog-radosgw (>= 0.0.2)
+      fog-riakcs
+      fog-sakuracloud (>= 0.0.4)
+      fog-serverlove
       fog-softlayer
+      fog-storm_on_demand
+      fog-terremark
+      fog-vmfusion
+      fog-voxel
+      fog-vsphere (>= 0.4.0)
+      fog-xenserver
+      fog-xml (~> 0.1.1)
       ipaddress (~> 0.5)
-      nokogiri (~> 1.5, >= 1.5.11)
-    fog-brightbox (0.2.0)
-      fog-core (~> 1.22)
+      json (>= 1.8, < 2.0)
+    fog-aliyun (0.3.13)
+      fog-core
       fog-json
-      inflecto
-    fog-core (1.23.0)
+      ipaddress (~> 0.8)
+      xml-simple (~> 1.1)
+    fog-atmos (0.1.0)
+      fog-core
+      fog-xml
+    fog-aws (2.0.1)
+      fog-core (~> 1.38)
+      fog-json (~> 1.0)
+      fog-xml (~> 0.1)
+      ipaddress (~> 0.8)
+    fog-brightbox (0.16.1)
+      dry-inflector
+      fog-core
+      fog-json
+      mime-types
+    fog-cloudatcost (0.1.2)
+      fog-core (~> 1.36)
+      fog-json (~> 1.0)
+      fog-xml (~> 0.1)
+      ipaddress (~> 0.8)
+    fog-core (1.45.0)
       builder
-      excon (~> 0.38)
+      excon (~> 0.58)
       formatador (~> 0.2)
-      mime-types
-      net-scp (~> 1.1)
-      net-ssh (>= 2.1.3)
-    fog-json (1.0.0)
-      multi_json (~> 1.0)
-    fog-softlayer (0.3.13)
+    fog-digitalocean (0.4.0)
       fog-core
       fog-json
+      fog-xml
+      ipaddress (>= 0.5)
+    fog-dnsimple (1.0.0)
+      fog-core (~> 1.38)
+      fog-json (~> 1.0)
+    fog-dynect (0.0.3)
+      fog-core
+      fog-json
+      fog-xml
+    fog-ecloud (0.3.0)
+      fog-core
+      fog-xml
+    fog-google (0.1.0)
+      fog-core
+      fog-json
+      fog-xml
+    fog-internet-archive (0.0.2)
+      fog-core
+      fog-json
+      fog-xml
+    fog-joyent (0.0.1)
+      fog-core (~> 1.42)
+      fog-json (>= 1.0)
+    fog-json (1.2.0)
+      fog-core
+      multi_json (~> 1.10)
+    fog-local (0.7.0)
+      fog-core (>= 1.27, < 3.0)
+    fog-openstack (0.3.10)
+      fog-core (>= 1.45, <= 2.1.0)
+      fog-json (>= 1.0)
+      ipaddress (>= 0.8)
+    fog-powerdns (0.2.0)
+      fog-core
+      fog-json
+      fog-xml
+    fog-profitbricks (4.1.1)
+      fog-core (~> 1.42)
+      fog-json (~> 1.0)
+    fog-rackspace (0.1.6)
+      fog-core (>= 1.35)
+      fog-json (>= 1.0)
+      fog-xml (>= 0.1)
+      ipaddress (>= 0.8)
+    fog-radosgw (0.0.5)
+      fog-core (>= 1.21.0)
+      fog-json
+      fog-xml (>= 0.0.1)
+    fog-riakcs (0.1.0)
+      fog-core
+      fog-json
+      fog-xml
+    fog-sakuracloud (1.7.5)
+      fog-core
+      fog-json
+    fog-serverlove (0.1.2)
+      fog-core
+      fog-json
+    fog-softlayer (1.1.4)
+      fog-core
+      fog-json
+    fog-storm_on_demand (0.1.1)
+      fog-core
+      fog-json
+    fog-terremark (0.1.0)
+      fog-core
+      fog-xml
+    fog-vmfusion (0.1.0)
+      fission
+      fog-core
+    fog-voxel (0.1.0)
+      fog-core
+      fog-xml
+    fog-vsphere (3.5.0)
+      fog-core
+      rbvmomi (>= 1.9, < 3)
+    fog-xenserver (1.0.0)
+      fog-core
+      fog-xml
+      xmlrpc
+    fog-xml (0.1.3)
+      fog-core
+      nokogiri (>= 1.5.11, < 2.0.0)
     foodcritic (3.0.3)
       erubis
       gherkin (~> 2.11.7)
@@ -135,68 +266,76 @@ GEM
     guard-rubocop (1.1.0)
       guard (~> 2.0)
       rubocop (~> 0.20)
-    hashie (2.1.1)
-    highline (1.6.21)
+    hashie (2.1.2)
+    highline (1.7.10)
     hitimes (1.2.1)
-    inflecto (0.0.2)
-    ipaddress (0.8.0)
+    ipaddress (0.8.3)
     java-properties (0.0.2)
-    json (1.8.1)
+    json (1.8.6)
     kitchen-vagrant (0.15.0)
       test-kitchen (~> 1.0)
+    libyajl2 (1.2.0)
     listen (2.7.5)
       celluloid (>= 0.15.2)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
     lumberjack (1.0.5)
-    method_source (0.8.2)
+    method_source (1.0.0)
     mime-types (1.25.1)
     minitar (0.5.4)
-    mixlib-authentication (1.3.0)
-      mixlib-log
-    mixlib-cli (1.5.0)
-    mixlib-config (2.1.0)
-    mixlib-log (1.6.0)
-    mixlib-shellout (1.4.0)
+    mixlib-authentication (1.4.2)
+    mixlib-cli (1.7.0)
+    mixlib-config (2.2.18)
+      tomlrb
+    mixlib-log (1.7.1)
+    mixlib-shellout (1.6.1)
     multi_json (1.10.1)
     multipart-post (2.0.0)
     net-http-persistent (2.9.4)
     net-scp (1.2.1)
       net-ssh (>= 2.6.5)
-    net-ssh (2.9.1)
-    net-ssh-gateway (1.2.0)
+    net-ssh (2.9.4)
+    net-ssh-gateway (1.3.0)
       net-ssh (>= 2.6.5)
-    net-ssh-multi (1.2.0)
+    net-ssh-multi (1.2.1)
       net-ssh (>= 2.6.5)
       net-ssh-gateway (>= 1.2.0)
     nio4r (1.0.0)
     nokogiri (1.5.11)
     octokit (3.1.0)
       sawyer (~> 0.5.3)
-    ohai (7.0.4)
+    ohai (7.4.1)
+      ffi (~> 1.9)
+      ffi-yajl (~> 1.1)
       ipaddress
       mime-types (~> 1.16)
       mixlib-cli
       mixlib-config (~> 2.0)
       mixlib-log
       mixlib-shellout (~> 1.2)
-      systemu (~> 2.5.2)
-      yajl-ruby
+      systemu (~> 2.6.4)
+      wmi-lite (~> 1.0)
+    optimist (3.0.1)
     parser (2.1.9)
       ast (>= 1.1, < 3.0)
       slop (~> 3.4, >= 3.4.5)
+    plist (3.1.0)
     polyglot (0.3.4)
     powerpack (0.0.9)
-    pry (0.9.12.6)
-      coderay (~> 1.0)
-      method_source (~> 0.8)
-      slop (~> 3.4)
-    rack (1.5.2)
+    pry (0.14.1)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    rack (2.2.3)
     rainbow (2.0.0)
     rake (10.3.2)
     rb-fsevent (0.9.4)
     rb-inotify (0.9.4)
       ffi (>= 0.5.0)
+    rbvmomi (2.4.1)
+      builder (~> 3.0)
+      json (>= 1.8)
+      nokogiri (~> 1.5)
+      optimist (~> 3.0)
     rest-client (1.6.7)
       mime-types (>= 1.16)
     retryable (1.3.5)
@@ -217,14 +356,19 @@ GEM
       retryable
       semverse (~> 1.1)
       varia_model (~> 0.3)
-    rspec (2.14.1)
-      rspec-core (~> 2.14.0)
-      rspec-expectations (~> 2.14.0)
-      rspec-mocks (~> 2.14.0)
-    rspec-core (2.14.8)
-    rspec-expectations (2.14.5)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.6)
+    rspec (3.10.0)
+      rspec-core (~> 3.10.0)
+      rspec-expectations (~> 3.10.0)
+      rspec-mocks (~> 3.10.0)
+    rspec-core (3.10.1)
+      rspec-support (~> 3.10.0)
+    rspec-expectations (3.10.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.10.0)
+    rspec-mocks (3.10.2)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.10.0)
+    rspec-support (3.10.2)
     rspec-xml (0.0.6)
       nokogiri
       rspec
@@ -241,11 +385,11 @@ GEM
       addressable (~> 2.3.5)
       faraday (~> 0.8, < 0.10)
     semverse (1.1.0)
-    slop (3.5.0)
+    slop (3.6.0)
     solve (1.2.0)
       dep_selector (~> 1.0)
       semverse (~> 1.1)
-    systemu (2.5.2)
+    systemu (2.6.5)
     test-kitchen (1.2.1)
       mixlib-shellout (~> 1.2)
       net-scp (~> 1.1)
@@ -255,12 +399,18 @@ GEM
     thor (0.19.1)
     timers (2.0.0)
       hitimes
+    tomlrb (2.0.1)
     treetop (1.4.15)
       polyglot
       polyglot (>= 0.3.1)
     varia_model (0.3.2)
       buff-extensions (~> 0.2)
       hashie (>= 2.0.2)
+    webrick (1.7.0)
+    wmi-lite (1.0.5)
+    xml-simple (1.1.8)
+    xmlrpc (0.3.2)
+      webrick
     yajl-ruby (1.1.0)
 
 PLATFORMS
@@ -268,7 +418,7 @@ PLATFORMS
 
 DEPENDENCIES
   berkshelf (~> 3.1.2)
-  chefspec (~> 3.4.0)
+  chefspec (~> 4.1.0)
   foodcritic (~> 3.0.3)
   growl
   guard (~> 2.4)
@@ -285,3 +435,6 @@ DEPENDENCIES
   rubocop (~> 0.22.0)
   ruby_gntp
   test-kitchen (~> 1.2.1)
+
+BUNDLED WITH
+   2.1.4