diff --git a/.gitignore b/.gitignore
index 3743dc1..7ae131f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@
 /spec/fixtures/Puppetfile.lock
 /spec/fixtures/modules/boxen/
 /spec/fixtures/vendor
+/bin
diff --git a/Gemfile.lock b/Gemfile.lock
index 0a85336..07416a0 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,58 +1,61 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.3.3)
+    addressable (2.3.5)
     ansi (1.4.3)
-    boxen (1.0.2)
+    boxen (1.4.2)
       ansi (~> 1.4)
-      hiera (~> 1.0.0)
+      hiera (~> 1.0)
       highline (~> 1.6)
       json_pure (>= 1.7.7, < 2.0)
-      librarian-puppet (~> 0.9)
+      librarian-puppet (~> 0.9.9)
       octokit (~> 1.15)
       puppet (~> 3.0)
-    cardboard (1.0.1)
+    cardboard (1.0.4)
       boxen (~> 1.0)
       puppet-lint (~> 0.3)
       puppetlabs_spec_helper (~> 0.4)
       rspec-puppet (~> 0.1)
-    diff-lcs (1.2.1)
-    facter (1.6.18)
-    faraday (0.8.6)
+    diff-lcs (1.2.4)
+    facter (1.7.1)
+    faraday (0.8.7)
       multipart-post (~> 1.1)
     faraday_middleware (0.9.0)
       faraday (>= 0.7.4, < 0.9)
-    hashie (1.2.0)
-    hiera (1.0.0)
-    highline (1.6.15)
-    json (1.7.7)
-    json_pure (1.7.7)
-    librarian-puppet (0.9.8)
+    hashie (2.0.5)
+    hiera (1.2.1)
+      json_pure
+    highline (1.6.19)
+    json (1.8.0)
+    json_pure (1.8.0)
+    librarian-puppet (0.9.9)
       json
       thor (~> 0.15)
     metaclass (0.0.1)
-    mocha (0.13.3)
+    mocha (0.14.0)
       metaclass (~> 0.0.1)
-    multi_json (1.6.1)
+    multi_json (1.7.7)
     multipart-post (1.2.0)
     netrc (0.7.7)
-    octokit (1.23.0)
+    octokit (1.24.0)
       addressable (~> 2.2)
       faraday (~> 0.8)
       faraday_middleware (~> 0.9)
-      hashie (~> 1.2)
+      hashie (~> 2.0)
       multi_json (~> 1.3)
       netrc (~> 0.7.7)
-    puppet (3.1.1)
+    puppet (3.2.2)
       facter (~> 1.6)
       hiera (~> 1.0)
+      rgen (~> 0.6)
     puppet-lint (0.3.2)
     puppetlabs_spec_helper (0.4.1)
       mocha (>= 0.10.5)
       rake
       rspec (>= 2.9.0)
       rspec-puppet (>= 0.1.1)
-    rake (10.0.3)
+    rake (10.1.0)
+    rgen (0.6.5)
     rspec (2.13.0)
       rspec-core (~> 2.13.0)
       rspec-expectations (~> 2.13.0)
@@ -60,10 +63,10 @@ GEM
     rspec-core (2.13.1)
     rspec-expectations (2.13.0)
       diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.13.0)
+    rspec-mocks (2.13.1)
     rspec-puppet (0.1.6)
       rspec
-    thor (0.17.0)
+    thor (0.18.1)
 
 PLATFORMS
   ruby
diff --git a/Rakefile b/Rakefile
new file mode 100644
index 0000000..e6443dc
--- /dev/null
+++ b/Rakefile
@@ -0,0 +1,7 @@
+require 'rake'
+
+require 'rspec/core/rake_task'
+
+RSpec::Core::RakeTask.new(:spec) do |t|
+  t.pattern = 'spec/*/*_spec.rb'
+end
diff --git a/spec/fixtures/manifests/site.pp b/spec/fixtures/manifests/site.pp
new file mode 100644
index 0000000..e69de29
diff --git a/spec/fixtures/modules/webstorm/manifests b/spec/fixtures/modules/webstorm/manifests
new file mode 120000
index 0000000..373b992
--- /dev/null
+++ b/spec/fixtures/modules/webstorm/manifests
@@ -0,0 +1 @@
+../../../../manifests
\ No newline at end of file