diff --git a/.gitignore b/.gitignore
index 00de2b6..2e1014a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@ spec/fixtures/
 .vagrant/
 .bundle/
 coverage/
+log/
diff --git a/.travis.yml b/.travis.yml
index 71bb3aa..4231fd9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,54 +7,20 @@ sudo: false
 matrix:
   fast_finish: true
   include:
-  - rvm: 1.8.7
-    env: PUPPET_GEM_VERSION="~> 2.7.0"
-  - rvm: 1.8.7
-    env: PUPPET_GEM_VERSION="~> 3.1.0"
-  - rvm: 1.8.7
-    env: PUPPET_GEM_VERSION="~> 3.2.0"
   - rvm: 1.8.7
     env: PUPPET_GEM_VERSION="~> 3.3.0"
   - rvm: 1.8.7
-    env: PUPPET_GEM_VERSION="~> 3.4.0"
-  - rvm: 1.8.7
-    env: PUPPET_GEM_VERSION="~> 3.5.0" STRICT_VARIABLES="yes"
-  - rvm: 1.8.7
-    env: PUPPET_GEM_VERSION="~> 3.6.0" STRICT_VARIABLES="yes"
-  - rvm: 1.8.7
-    env: PUPPET_GEM_VERSION="~> 3.7.0" STRICT_VARIABLES="yes"
-  - rvm: 1.9.3
-    env: PUPPET_GEM_VERSION="~> 3.1.0"
-  - rvm: 1.9.3
-    env: PUPPET_GEM_VERSION="~> 3.2.0"
+    env: PUPPET_GEM_VERSION="~> 3.0" FUTURE_PARSER="yes"
   - rvm: 1.9.3
     env: PUPPET_GEM_VERSION="~> 3.3.0"
   - rvm: 1.9.3
-    env: PUPPET_GEM_VERSION="~> 3.4.0"
-  - rvm: 1.9.3
-    env: PUPPET_GEM_VERSION="~> 3.5.0" STRICT_VARIABLES="yes"
-  - rvm: 1.9.3
-    env: PUPPET_GEM_VERSION="~> 3.6.0" STRICT_VARIABLES="yes"
-  - rvm: 1.9.3
-    env: PUPPET_GEM_VERSION="~> 3.7.0" STRICT_VARIABLES="yes"
-  - rvm: 2.0.0
-    env: PUPPET_GEM_VERSION="~> 3.2.0"
+    env: PUPPET_GEM_VERSION="~> 3.0" FUTURE_PARSER="yes"
   - rvm: 2.0.0
     env: PUPPET_GEM_VERSION="~> 3.3.0"
   - rvm: 2.0.0
-    env: PUPPET_GEM_VERSION="~> 3.4.0"
-  - rvm: 2.0.0
-    env: PUPPET_GEM_VERSION="~> 3.5.0" STRICT_VARIABLES="yes"
-  - rvm: 2.0.0
-    env: PUPPET_GEM_VERSION="~> 3.6.0" STRICT_VARIABLES="yes"
-  - rvm: 2.0.0
-    env: PUPPET_GEM_VERSION="~> 3.7.0" STRICT_VARIABLES="yes"
-  - rvm: 2.1.0
-    env: PUPPET_GEM_VERSION="~> 3.5.0" STRICT_VARIABLES="yes"
-  - rvm: 2.1.0
-    env: PUPPET_GEM_VERSION="~> 3.6.0" STRICT_VARIABLES="yes"
+    env: PUPPET_GEM_VERSION="~> 3.0" FUTURE_PARSER="yes"
   - rvm: 2.1.0
-    env: PUPPET_GEM_VERSION="~> 3.7.0" STRICT_VARIABLES="yes"
+    env: PUPPET_GEM_VERSION="~> 3.0" FUTURE_PARSER="yes"
 notifications:
   email: false
   hipchat:
diff --git a/Gemfile b/Gemfile
index 8f93270..007789b 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,24 +1,25 @@
 source ENV['GEM_SOURCE'] || "https://rubygems.org"
 
 group :unit_tests do
-  gem 'rake',                                              :require => false
-  gem 'rspec', '~> 3.1.0',                                 :require => false
-  gem 'rspec-puppet',                                      :require => false
-  gem 'puppetlabs_spec_helper',                            :require => false
-  gem 'puppet-lint', '1.0.1',                              :require => false
-  gem 'puppet-syntax',                                     :require => false
-  gem 'metadata-json-lint',                                :require => false
-  gem 'json',                                              :require => false
-  gem 'puppet-lint-absolute_classname-check',              :require => false
-  gem 'puppet-lint-appends-check',                         :require => false
-  gem 'puppet-lint-empty_string-check',                    :require => false
-  gem 'puppet-lint-file_ensure-check',                     :require => false
-  gem 'puppet-lint-leading_zero-check',                    :require => false
-  gem 'puppet-lint-spaceship_operator_without_tag-check',  :require => false
-  gem 'puppet-lint-trailing_comma-check',                  :require => false
-  gem 'puppet-lint-undef_in_function-check',               :require => false
-  gem 'puppet-lint-unquoted_string-check',                 :require => false
-  gem 'puppet-lint-version_comparison-check',              :require => false
+  gem 'rake',                                                       :require => false
+  gem 'rspec', '~> 3.1.0',                                          :require => false
+  gem 'rspec-puppet',                                               :require => false
+  gem 'puppetlabs_spec_helper',                                     :require => false
+  gem 'puppet-lint', '1.0.1',                                       :require => false
+  gem 'puppet-syntax',                                              :require => false
+  gem 'metadata-json-lint',                                         :require => false
+  gem 'json',                                                       :require => false
+  gem 'puppet-lint-absolute_classname-check',                       :require => false
+  gem 'puppet-lint-appends-check',                                  :require => false
+  gem 'puppet-lint-empty_string-check',                             :require => false
+  gem 'puppet-lint-file_ensure-check',                              :require => false
+  gem 'puppet-lint-leading_zero-check',                             :require => false
+  gem 'puppet-lint-spaceship_operator_without_tag-check',           :require => false
+  gem 'puppet-lint-trailing_comma-check',                           :require => false
+  gem 'puppet-lint-undef_in_function-check',                        :require => false
+  gem 'puppet-lint-unquoted_string-check',                          :require => false
+  gem 'puppet-lint-version_comparison-check',                       :require => false
+  gem 'puppet-lint-classes_and_types_beginning_with_digits-check',  :require => false
 end
 group :development do
   gem 'simplecov',   :require => false
diff --git a/Rakefile b/Rakefile
index cec22ff..58e0ff7 100644
--- a/Rakefile
+++ b/Rakefile
@@ -2,6 +2,7 @@ require 'rubygems' if RUBY_VERSION < '1.9.0'
 require 'puppetlabs_spec_helper/rake_tasks'
 require 'puppet-lint/tasks/puppet-lint'
 require 'puppet-syntax/tasks/puppet-syntax'
+require 'metadata-json-lint/rake_task'
 
 begin
   require 'puppet_blacksmith/rake_tasks'
@@ -28,14 +29,10 @@ RSpec::Core::RakeTask.new(:acceptance) do |t|
   t.pattern = 'spec/acceptance'
 end
 
-task :metadata do
-  sh "metadata-json-lint metadata.json"
-end
-
 desc "Run syntax, lint, and spec tests."
 task :test => [
   :syntax,
   :lint,
-  :metadata,
+  :metadata_lint,
   :spec,
 ]