diff --git a/.gitignore b/.gitignore
index 80bf705b..7ad67ce3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ pkg
 spec/fixtures
 .rspec_system
 Gemfile.lock
+log/
diff --git a/.travis.yml b/.travis.yml
index 3caf0876..b84c4b6b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,16 +4,16 @@ bundler_args: --without development
 before_install: rm Gemfile.lock || true
 sudo: false
 rvm:
-  - 1.8.7
+#  - 1.8.7
   - 1.9.3
   - 2.0.0
   - 2.1.0
 script: bundle exec rake test
 env:
-  - PUPPET_VERSION="~> 2.7.0" STRICT_VARIABLES=yes
-  - PUPPET_VERSION="~> 3.1.0" STRICT_VARIABLES=yes
-  - PUPPET_VERSION="~> 3.3.0" STRICT_VARIABLES=yes
-  - PUPPET_VERSION="~> 3.7.4" FUTURE_PARSER=yes
+#  - PUPPET_VERSION="~> 2.7.0"
+  - PUPPET_VERSION="~> 3.1.0"
+  - PUPPET_VERSION="~> 3.3.0"
+  - PUPPET_VERSION="~> 3.7.4" FUTURE_PARSER=yes STRICT_VARIABLES=yes
   - PUPPET_VERSION="~> 4.0.0"
   - PUPPET_VERSION="~> 4.1.0"
 matrix:
diff --git a/Gemfile b/Gemfile
index 0ba23998..a38557c4 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,23 +1,27 @@
-source "http://rubygems.org"
+source "https://rubygems.org"
+
+group :development do
+  gem "beaker", "> 2.0.0"
+  gem "beaker-rspec", ">= 5.1.0"
+  gem "pry"
+  gem "puppet-blacksmith"
+  gem "serverspec"
+  gem "vagrant-wrapper"
+end
 
 group :test do
+  gem "json"
   gem "rake"
-  gem 'beaker', '~> 1.11.0'
-  gem "retriable", '~> 1.4.1'
-  gem "rest-client", '<= 1.7.0'
-  gem "puppet-blacksmith", '~> 2.3.1'
-  gem "puppet", '~> 3.7.0'
+  gem "puppet", ENV['PUPPET_VERSION'] || '~> 3.7.0'
   gem "puppet-lint"
-  gem "rspec-puppet", :git => 'https://github.com/rodjek/rspec-puppet.git'
-  gem "rspec", '~> 3.1.0'
-  gem "rspec-core", '~> 3.1.7'
+
+  # Pin for 1.8.7 compatibility for now
+  gem "rspec", '< 3.2.0'
+  gem "rspec-core", "3.1.7"
+  gem "rspec-puppet", "~> 2.1"
+
   gem "puppet-syntax"
   gem "puppetlabs_spec_helper"
+  gem "hiera"
   gem "hiera-puppet-helper"
-  gem "nokogiri", '~> 1.5.10'
-end
-
-group :development do
-  gem 'json'
-  gem 'beaker-rspec'
 end
diff --git a/Gemfile.lock b/Gemfile.lock
index 5ef97950..aac5ea21 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,175 +1,293 @@
-GIT
-  remote: https://github.com/rodjek/rspec-puppet.git
-  revision: 6ac97993fa972a15851a73d55fe3d1c0a85172b5
-  specs:
-    rspec-puppet (1.0.1)
-      rspec
-
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
     CFPropertyList (2.2.8)
-    addressable (2.3.6)
-    archive-tar-minitar (0.5.2)
+    activesupport (4.2.1)
+      i18n (~> 0.7)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.3, >= 0.3.4)
+      tzinfo (~> 1.1)
+    addressable (2.3.8)
     autoparse (0.3.3)
       addressable (>= 2.3.1)
       extlib (>= 0.9.15)
       multi_json (>= 1.0.0)
-    aws-sdk (1.57.0)
-      aws-sdk-v1 (= 1.57.0)
-    aws-sdk-v1 (1.57.0)
+    aws-sdk (1.64.0)
+      aws-sdk-v1 (= 1.64.0)
+    aws-sdk-v1 (1.64.0)
       json (~> 1.4)
       nokogiri (>= 1.4.4)
-    beaker (1.11.2)
-      aws-sdk (~> 1.38)
-      blimpy (~> 0.6)
+    beaker (2.14.1)
+      aws-sdk (~> 1.57)
       docker-api
       fission (~> 0.4)
-      google-api-client (~> 0.7.1)
+      fog (~> 1.25)
+      google-api-client (~> 0.8)
+      hocon (~> 0.1)
       inifile (~> 2.0)
       json (~> 1.8)
-      mime-types (~> 1.25)
-      net-scp (~> 1.1)
-      net-ssh (~> 2.6)
-      nokogiri (= 1.5.10)
-      rbvmomi (= 1.8.1)
+      minitest (~> 5.4)
+      net-scp (~> 1.2)
+      net-ssh (~> 2.9)
+      rbvmomi (~> 1.8)
+      rsync (~> 1.0.9)
       unf (~> 0.1)
-    beaker-rspec (3.0.0)
-      beaker (~> 1.10)
+    beaker-rspec (5.1.0)
+      beaker (~> 2.0)
       rspec
-      serverspec (~> 1.0)
-      specinfra (~> 1.0)
-    blimpy (0.6.7)
-      fog
-      minitar
-      thor
+      serverspec (~> 2)
+      specinfra (~> 2)
     builder (3.2.2)
+    coderay (1.1.0)
     diff-lcs (1.2.5)
-    docker-api (1.13.6)
-      archive-tar-minitar
+    docker-api (1.21.4)
       excon (>= 0.38.0)
       json
-    excon (0.40.0)
+    domain_name (0.5.24)
+      unf (>= 0.0.5, < 1.0.0)
+    excon (0.45.3)
     extlib (0.9.16)
-    facter (2.3.0)
+    facter (2.4.4)
       CFPropertyList (~> 2.2.6)
-    faraday (0.9.0)
+    faraday (0.9.1)
       multipart-post (>= 1.2, < 3)
     fission (0.5.0)
       CFPropertyList (~> 2.2)
-    fog (1.11.1)
+    fog (1.31.0)
+      fog-atmos
+      fog-aws (~> 0.0)
+      fog-brightbox (~> 0.4)
+      fog-core (~> 1.30)
+      fog-ecloud
+      fog-google (>= 0.0.2)
+      fog-json
+      fog-local
+      fog-powerdns (>= 0.1.1)
+      fog-profitbricks
+      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-xml (~> 0.1.1)
+      ipaddress (~> 0.5)
+      nokogiri (~> 1.5, >= 1.5.11)
+    fog-atmos (0.1.0)
+      fog-core
+      fog-xml
+    fog-aws (0.4.0)
+      fog-core (~> 1.27)
+      fog-json (~> 1.0)
+      fog-xml (~> 0.1)
+      ipaddress (~> 0.8)
+    fog-brightbox (0.7.1)
+      fog-core (~> 1.22)
+      fog-json
+      inflecto (~> 0.0.2)
+    fog-core (1.30.0)
       builder
-      excon (~> 0.20)
-      formatador (~> 0.2.0)
-      json (~> 1.7)
+      excon (~> 0.45)
+      formatador (~> 0.2)
       mime-types
       net-scp (~> 1.1)
       net-ssh (>= 2.1.3)
-      nokogiri (~> 1.5.0)
-      ruby-hmac
+    fog-ecloud (0.1.2)
+      fog-core
+      fog-xml
+    fog-google (0.0.5)
+      fog-core
+      fog-json
+      fog-xml
+    fog-json (1.0.2)
+      fog-core (~> 1.0)
+      multi_json (~> 1.10)
+    fog-local (0.2.1)
+      fog-core (~> 1.27)
+    fog-powerdns (0.1.1)
+      fog-core (~> 1.27)
+      fog-json (~> 1.0)
+      fog-xml (~> 0.1)
+    fog-profitbricks (0.0.3)
+      fog-core
+      fog-xml
+      nokogiri
+    fog-radosgw (0.0.4)
+      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.0.1)
+      fog-core
+      fog-json
+    fog-serverlove (0.1.2)
+      fog-core
+      fog-json
+    fog-softlayer (0.4.6)
+      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-xml (0.1.2)
+      fog-core
+      nokogiri (~> 1.5, >= 1.5.11)
     formatador (0.2.5)
-    google-api-client (0.7.1)
-      addressable (>= 2.3.2)
-      autoparse (>= 0.3.3)
-      extlib (>= 0.9.15)
-      faraday (>= 0.9.0)
-      jwt (>= 0.1.5)
-      launchy (>= 2.1.1)
-      multi_json (>= 1.0.0)
-      retriable (>= 1.4)
-      signet (>= 0.5.0)
-      uuidtools (>= 2.1.0)
+    google-api-client (0.8.6)
+      activesupport (>= 3.2)
+      addressable (~> 2.3)
+      autoparse (~> 0.3)
+      extlib (~> 0.9)
+      faraday (~> 0.9)
+      googleauth (~> 0.3)
+      launchy (~> 2.4)
+      multi_json (~> 1.10)
+      retriable (~> 1.4)
+      signet (~> 0.6)
+    googleauth (0.4.1)
+      faraday (~> 0.9)
+      jwt (~> 1.4)
+      logging (~> 2.0)
+      memoist (~> 0.12)
+      multi_json (= 1.11)
+      signet (~> 0.6)
     hiera (1.3.4)
       json_pure
-    hiera-puppet-helper (1.0.1)
-    highline (1.6.21)
+    hocon (0.9.0)
+    http-cookie (1.0.2)
+      domain_name (~> 0.5)
+    i18n (0.7.0)
+    inflecto (0.0.2)
     inifile (2.0.2)
-    json (1.8.1)
-    json_pure (1.8.1)
-    jwt (1.0.0)
-    launchy (2.4.2)
+    ipaddress (0.8.0)
+    json (1.8.3)
+    json_pure (1.8.2)
+    jwt (1.5.0)
+    launchy (2.4.3)
       addressable (~> 2.3)
+    little-plugger (1.1.3)
+    logging (2.0.0)
+      little-plugger (~> 1.1)
+      multi_json (~> 1.10)
+    memoist (0.12.0)
     metaclass (0.0.4)
-    mime-types (1.25.1)
-    minitar (0.5.4)
+    method_source (0.8.2)
+    mime-types (2.6.1)
+    mini_portile (0.6.2)
+    minitest (5.7.0)
     mocha (1.1.0)
       metaclass (~> 0.0.1)
-    multi_json (1.10.1)
+    multi_json (1.11.0)
     multipart-post (2.0.0)
     net-scp (1.2.1)
       net-ssh (>= 2.6.5)
-    net-ssh (2.9.1)
-    netrc (0.8.0)
-    nokogiri (1.5.10)
-    puppet (3.7.3)
+    net-ssh (2.9.2)
+    netrc (0.10.3)
+    nokogiri (1.6.6.2)
+      mini_portile (~> 0.6.0)
+    pry (0.10.1)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
+      slop (~> 3.4)
+    puppet (3.7.5)
       facter (> 1.6, < 3)
       hiera (~> 1.0)
       json_pure
-    puppet-blacksmith (3.0.2)
+    puppet-blacksmith (3.3.1)
       puppet (>= 2.7.16)
       rest-client
     puppet-lint (1.1.0)
-    puppet-syntax (1.3.0)
+    puppet-syntax (2.0.0)
       rake
-    puppetlabs_spec_helper (0.8.2)
+    puppetlabs_spec_helper (0.10.3)
       mocha
       puppet-lint
       puppet-syntax
       rake
-      rspec
       rspec-puppet
-    rake (10.3.2)
-    rbvmomi (1.8.1)
+    rake (10.4.2)
+    rbvmomi (1.8.2)
       builder
       nokogiri (>= 1.4.1)
       trollop
-    rest-client (1.7.2)
+    rest-client (1.8.0)
+      http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 3.0)
       netrc (~> 0.7)
     retriable (1.4.1)
-    rspec (2.99.0)
-      rspec-core (~> 2.99.0)
-      rspec-expectations (~> 2.99.0)
-      rspec-mocks (~> 2.99.0)
-    rspec-core (2.99.2)
-    rspec-expectations (2.99.2)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-its (1.0.1)
-      rspec-core (>= 2.99.0.beta1)
-      rspec-expectations (>= 2.99.0.beta1)
-    rspec-mocks (2.99.2)
-    ruby-hmac (0.4.0)
-    serverspec (1.9.1)
-      highline
-      net-ssh
-      rspec (~> 2.13)
+    rspec (3.1.0)
+      rspec-core (~> 3.1.0)
+      rspec-expectations (~> 3.1.0)
+      rspec-mocks (~> 3.1.0)
+    rspec-core (3.1.7)
+      rspec-support (~> 3.1.0)
+    rspec-expectations (3.1.2)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.1.0)
+    rspec-its (1.2.0)
+      rspec-core (>= 3.0.0)
+      rspec-expectations (>= 3.0.0)
+    rspec-mocks (3.1.3)
+      rspec-support (~> 3.1.0)
+    rspec-puppet (2.2.0)
+      rspec
+    rspec-support (3.1.2)
+    rsync (1.0.9)
+    serverspec (2.17.1)
+      multi_json
+      rspec (~> 3.0)
       rspec-its
-      specinfra (~> 1.18)
-    signet (0.5.1)
-      addressable (>= 2.2.3)
-      faraday (>= 0.9.0.rc5)
-      jwt (>= 0.1.5)
-      multi_json (>= 1.0.0)
-    specinfra (1.27.5)
-    thor (0.19.1)
-    trollop (2.0)
+      specinfra (~> 2.32)
+    signet (0.6.1)
+      addressable (~> 2.3)
+      extlib (~> 0.9)
+      faraday (~> 0.9)
+      jwt (~> 1.5)
+      multi_json (~> 1.10)
+    slop (3.6.0)
+    specinfra (2.34.9)
+      net-scp
+      net-ssh
+    thread_safe (0.3.5)
+    trollop (2.1.2)
+    tzinfo (1.2.2)
+      thread_safe (~> 0.1)
     unf (0.1.4)
       unf_ext
-    unf_ext (0.0.6)
-    uuidtools (2.1.5)
+    unf_ext (0.0.7.1)
+    vagrant-wrapper (2.0.2)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  beaker (~> 1.11.0)
-  beaker-rspec
-  hiera-puppet-helper
-  json
+  beaker (> 2.0.0)
+  beaker-rspec (>= 5.1.0)
+  pry
   puppet (~> 3.7.0)
   puppet-blacksmith
   puppet-lint
   puppet-syntax
   puppetlabs_spec_helper
   rake
-  rspec-puppet!
+  rspec (< 3.2.0)
+  rspec-core (= 3.1.7)
+  rspec-puppet (~> 2.1)
+  serverspec
+  vagrant-wrapper