diff --git a/spec/fixtures/templates/post_6.0.json b/spec/fixtures/templates/6.x.json
similarity index 99%
rename from spec/fixtures/templates/post_6.0.json
rename to spec/fixtures/templates/6.x.json
index e118ec1..e1f9ba1 100644
--- a/spec/fixtures/templates/post_6.0.json
+++ b/spec/fixtures/templates/6.x.json
@@ -1,59 +1,59 @@
 {
   "index_patterns": [ "logstash-*" ],
   "version": 123,
   "settings": {
     "index": {
       "refresh_interval": "5s",
       "analysis": {
         "analyzer": {
           "default": {
             "type": "standard",
             "stopwords": "_none_"
           }
         }
       }
     }
   },
   "mappings": {
     "_doc": {
       "dynamic_templates": [
         {
           "string_fields": {
             "match": "*",
             "match_mapping_type": "string",
             "mapping": {
               "type": "multi_field",
               "fields": {
                 "{name}": {
                   "type": "text",
                   "index": "analyzed",
                   "omit_norms": true
                 },
                 "raw": {
                   "type ": "text",
                   "index": "not_analyzed",
                   "ignore_above": 256
                 }
               }
             }
           }
         }
       ],
       "properties": {
         "@version": {
           "type": "text",
           "index": false
         },
         "geoip": {
           "type": "object",
           "dynamic": true,
           "properties": {
             "location": {
               "type": "geo_point"
             }
           }
         }
       }
     }
   }
-}
+}
\ No newline at end of file
diff --git a/spec/fixtures/templates/post_8.0.json b/spec/fixtures/templates/7.x.json
similarity index 74%
copy from spec/fixtures/templates/post_8.0.json
copy to spec/fixtures/templates/7.x.json
index db8c484..54569e0 100644
--- a/spec/fixtures/templates/post_8.0.json
+++ b/spec/fixtures/templates/7.x.json
@@ -1,57 +1,42 @@
 {
   "index_patterns": [ "logstash-*" ],
   "version": 123,
   "settings": {
     "index": {
       "refresh_interval": "5s",
       "analysis": {
         "analyzer": {
           "default": {
             "type": "standard",
             "stopwords": "_none_"
           }
         }
       }
     }
   },
   "mappings": {
     "dynamic_templates": [
       {
         "string_fields": {
           "match": "*",
           "match_mapping_type": "string",
           "mapping": {
             "type": "multi_field",
             "fields": {
               "{name}": {
                 "type": "text",
                 "index": "analyzed",
                 "omit_norms": true
               },
               "raw": {
                 "type ": "text",
                 "index": "not_analyzed",
                 "ignore_above": 256
               }
             }
           }
         }
       }
-    ],
-    "properties": {
-      "@version": {
-        "type": "text",
-        "index": false
-      },
-      "geoip": {
-        "type": "object",
-        "dynamic": true,
-        "properties": {
-          "location": {
-            "type": "geo_point"
-          }
-        }
-      }
-    }
+    ]
   }
-}
+}
\ No newline at end of file
diff --git a/spec/fixtures/templates/post_8.0.json b/spec/fixtures/templates/post_8.0.json
index db8c484..91cade1 100644
--- a/spec/fixtures/templates/post_8.0.json
+++ b/spec/fixtures/templates/post_8.0.json
@@ -1,57 +1,30 @@
 {
-  "index_patterns": [ "logstash-*" ],
-  "version": 123,
-  "settings": {
-    "index": {
-      "refresh_interval": "5s",
-      "analysis": {
-        "analyzer": {
-          "default": {
-            "type": "standard",
-            "stopwords": "_none_"
-          }
-        }
-      }
-    }
-  },
-  "mappings": {
-    "dynamic_templates": [
-      {
-        "string_fields": {
-          "match": "*",
-          "match_mapping_type": "string",
-          "mapping": {
-            "type": "multi_field",
-            "fields": {
-              "{name}": {
-                "type": "text",
-                "index": "analyzed",
-                "omit_norms": true
-              },
-              "raw": {
-                "type ": "text",
-                "index": "not_analyzed",
-                "ignore_above": 256
-              }
-            }
-          }
-        }
-      }
-    ],
-    "properties": {
-      "@version": {
-        "type": "text",
-        "index": false
+  "index_patterns": ["te*", "bar*"],
+  "template": {
+    "settings": {
+      "number_of_shards": 1
+    },
+    "mappings": {
+      "_source": {
+        "enabled": false
       },
-      "geoip": {
-        "type": "object",
-        "dynamic": true,
-        "properties": {
-          "location": {
-            "type": "geo_point"
-          }
+      "properties": {
+        "host_name": {
+          "type": "keyword"
+        },
+        "created_at": {
+          "type": "date",
+          "format": "EEE MMM dd HH:mm:ss Z yyyy"
         }
       }
+    },
+    "aliases": {
+      "mydata": { }
     }
+  },
+  "priority": 10,
+  "version": 3,
+  "_meta": {
+    "description": "my custom"
   }
-}
+}
\ No newline at end of file
diff --git a/spec/fixtures/templates/pre_6.0.json b/spec/fixtures/templates/pre_6.0.json
deleted file mode 100644
index 38a2379..0000000
--- a/spec/fixtures/templates/pre_6.0.json
+++ /dev/null
@@ -1,61 +0,0 @@
-{
-  "template": "logstash-*",
-  "settings": {
-    "index": {
-      "refresh_interval": "5s",
-      "analysis": {
-        "analyzer": {
-          "default": {
-            "type": "standard",
-            "stopwords": "_none_"
-          }
-        }
-      }
-    }
-  },
-  "mappings": {
-    "_default_": {
-      "_all": {
-        "enabled": true
-      },
-      "dynamic_templates": [
-        {
-          "string_fields": {
-            "match": "*",
-            "match_mapping_type": "string",
-            "mapping": {
-              "type": "multi_field",
-              "fields": {
-                "{name}": {
-                  "type": "string",
-                  "index": "analyzed",
-                  "omit_norms": true
-                },
-                "raw": {
-                  "type ": "string",
-                  "index": "not_analyzed",
-                  "ignore_above": 256
-                }
-              }
-            }
-          }
-        }
-      ],
-      "properties": {
-        "@version": {
-          "type": "string",
-          "index": "not_analyzed"
-        },
-        "geoip": {
-          "type": "object",
-          "dynamic": true,
-          "properties": {
-            "location": {
-              "type": "geo_point"
-            }
-          }
-        }
-      }
-    }
-  }
-}
diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb
index e22289a..7a11b60 100644
--- a/spec/spec_helper_acceptance.rb
+++ b/spec/spec_helper_acceptance.rb
@@ -1,255 +1,255 @@
 require 'beaker-rspec'
 require 'beaker/puppet_install_helper'
 require 'securerandom'
 require 'thread'
 require 'infrataster/rspec'
 require 'rspec/retry'
 require 'vault'
 
 require 'simp/beaker_helpers'
 include Simp::BeakerHelpers
 
 require_relative 'spec_helper_tls'
 require_relative 'spec_utilities'
 require_relative '../lib/puppet_x/elastic/deep_to_i'
 require_relative '../lib/puppet_x/elastic/deep_to_s'
 
 # def f
 #   RSpec.configuration.fact
 # end
 
 run_puppet_install_helper('agent') unless ENV['BEAKER_provision'] == 'no'
 
 RSpec.configure do |c|
   # General-purpose spec-global variables
   c.add_setting :v, :default => {}
 
   # Puppet debug logging
   v[:puppet_debug] = ENV['BEAKER_debug'] ? true : false
 
   unless ENV['snapshot_version'].nil?
     v[:snapshot_version] = ENV['snapshot_version']
     v[:is_snapshot] = ENV['SNAPSHOT_TEST'] == 'true'
   end
 
   unless ENV['ELASTICSEARCH_VERSION'].nil? and v[:snapshot_version].nil?
     v[:elasticsearch_full_version] = ENV['ELASTICSEARCH_VERSION'] || v[:snapshot_version]
     v[:elasticsearch_major_version] = v[:elasticsearch_full_version].split('.').first.to_i
     v[:elasticsearch_package] = {}
-    v[:template] = if v[:elasticsearch_major_version] < 6
-                     JSON.load(File.new('spec/fixtures/templates/pre_6.0.json'))
+    v[:template] = if v[:elasticsearch_major_version] == 6
+                     JSON.load(File.new('spec/fixtures/templates/6.x.json'))
                    elsif v[:elasticsearch_major_version] >= 8
                      JSON.load(File.new('spec/fixtures/templates/post_8.0.json'))
                    else
-                     JSON.load(File.new('spec/fixtures/templates/post_6.0.json'))
+                     JSON.load(File.new('spec/fixtures/templates/7.x.json'))
                    end
     v[:template] = Puppet_X::Elastic.deep_to_i(Puppet_X::Elastic.deep_to_s(v[:template]))
     v[:pipeline] = JSON.load(File.new('spec/fixtures/pipelines/example.json'))
 
     v[:elasticsearch_plugins] = Dir[
       artifact("*#{v[:elasticsearch_full_version]}.zip", ['plugins'])
     ].map do |plugin|
       plugin_filename = File.basename(plugin)
       plugin_name = plugin_filename.match(/^(?<name>.+)-#{v[:elasticsearch_full_version]}.zip/)[:name]
       [
         plugin_name,
         {
           :path => plugin,
           :url => derive_plugin_urls_for(v[:elasticsearch_full_version], [plugin_name]).keys.first
         }
       ]
     end.to_h
   end
 
   v[:oss] = (not ENV['OSS_PACKAGE'].nil?) and ENV['OSS_PACKAGE'] == 'true'
   v[:cluster_name] = SecureRandom.hex(10)
 
   # rspec-retry
   c.display_try_failure_messages = true
   c.default_sleep_interval = 10
   # General-case retry keyword for unstable tests
   c.around :each, :with_retries do |example|
     example.run_with_retry retry: 10
   end
 
   # Helper hook for module cleanup
   c.after :context, :with_cleanup do
     apply_manifest <<-EOS
       class { 'elasticsearch':
         ensure      => 'absent',
         manage_repo => true,
         oss         => #{v[:oss]},
       }
 
       file { '/usr/share/elasticsearch/plugin':
         ensure  => 'absent',
         force   => true,
         recurse => true,
         require => Class['elasticsearch'],
       }
     EOS
   end
 
   c.before :context, :with_certificates do
     @keystore_password = SecureRandom.hex
     @role = [*('a'..'z')].sample(8).join
 
     # Setup TLS cert placement
     @tls = gen_certs(2, '/tmp')
 
     create_remote_file hosts, @tls[:ca][:cert][:path], @tls[:ca][:cert][:pem]
     @tls[:clients].each do |node|
       node.each do |_type, params|
         create_remote_file hosts, params[:path], params[:pem]
       end
     end
   end
 
   c.before :context, :with_license do
     Vault.address = ENV['VAULT_ADDR']
     Vault.auth.approle ENV['VAULT_APPROLE_ROLE_ID'], ENV['VAULT_APPROLE_SECRET_ID']
     licenses = Vault.with_retries(Vault::HTTPConnectionError) do
       Vault.logical.read(ENV['VAULT_PATH'])
     end.data
 
     raise 'No license found!' unless licenses
 
     license = case v[:elasticsearch_major_version]
               when 2
                 licenses[:v2]
               else
                 licenses[:v5]
               end
     create_remote_file hosts, '/tmp/license.json', license
     v[:elasticsearch_license_path] = '/tmp/license.json'
   end
 
   c.after :context, :then_purge do
     shell 'rm -rf {/usr/share,/etc,/var/lib}/elasticsearch*'
   end
 
   c.before :context, :first_purge do
     shell 'rm -rf {/usr/share,/etc,/var/lib}/elasticsearch*'
   end
 
   # Provide a hook filter to spit out some ES logs if the example fails.
   c.after(:example, :logs_on_failure) do |example|
     if example.exception
       hosts.each do |host|
         on host, "find / -name '#{v[:cluster_name]}.log' | xargs cat || true" do |result|
           puts result.formatted_output
         end
       end
     end
   end
 end
 
 files_dir = ENV['files_dir'] || './spec/fixtures/artifacts'
 
 # General bootstrapping steps for each host
 hosts.each do |host|
   # # Set the host to 'aio' in order to adopt the puppet-agent style of
   # # installation, and configure paths/etc.
   # host[:type] = 'aio'
   # configure_defaults_on host, 'aio'
 
   if fact('os.family') == 'Suse'
     install_package host,
                     '--force-resolution augeas-devel libxml2-devel ruby-devel'
     on host, 'gem install ruby-augeas --no-ri --no-rdoc'
   end
 
   v[:ext] = case fact('os.family')
             when 'Debian'
               'deb'
             else
               'rpm'
             end
 
   if v[:elasticsearch_package]
     v[:elasticsearch_package].merge!(
       derive_full_package_url(
         v[:elasticsearch_full_version], [v[:ext]]
       ).flat_map do |url, filename|
         [[:url, url], [:filename, filename], [:path, artifact(filename)]]
       end.to_h
     )
   end
 
   Infrataster::Server.define(:docker) do |server|
     server.address = host[:ip]
     server.ssh = host[:ssh].tap { |s| s.delete :forward_agent }
   end
   Infrataster::Server.define(:container) do |server|
     server.address = host[:vm_ip] # this gets ignored anyway
     server.from = :docker
   end
 end
 
 RSpec.configure do |c|
   if v[:is_snapshot]
     c.before :suite do
       scp_to default,
              "#{files_dir}/elasticsearch-snapshot.#{v[:ext]}",
              "/tmp/elasticsearch-snapshot.#{v[:ext]}"
       v[:snapshot_package] = "file:/tmp/elasticsearch-snapshot.#{v[:ext]}"
     end
   end
 
   c.before :suite do
     # Install module and dependencies
     install_dev_puppet_module :ignore_list => [
       'junit'
     ] + Beaker::DSL::InstallUtils::ModuleUtils::PUPPET_MODULE_INSTALL_IGNORE
 
     hosts.each do |host|
       modules = %w[archive augeas_core datacat java java_ks stdlib elastic_stack]
 
       dist_module = {
         'Debian' => ['apt'],
         'Suse'   => ['zypprepo'],
         'RedHat' => %w[concat yumrepo_core]
       }[fact('os.family')]
 
       modules += dist_module unless dist_module.nil?
 
       modules.each do |mod|
         copy_module_to(
           host,
           :module_name => mod,
           :source      => "spec/fixtures/modules/#{mod}"
         )
       end
 
       on(host, 'mkdir -p etc/puppet/modules/another/files/')
 
       # Apt doesn't update package caches sometimes, ensure we're caught up.
       shell 'apt-get update' if fact('os.family') == 'Debian'
     end
 
     # Use the Java class once before the suite of tests
     unless shell('command -v java', :accept_all_exit_codes => true).exit_code.zero?
       java = case fact('os.name')
              when 'OpenSuSE'
                'package => "java-1_8_0-openjdk-headless",'
              else
                ''
              end
 
       apply_manifest <<-MANIFEST
         class { "java" :
           distribution => "jre",
           #{java}
         }
       MANIFEST
     end
   end
 end
 
 # # Java 8 is only easy to manage on recent distros
 # def v5x_capable?
 #   (fact('os.family') == 'RedHat' and \
 #     not (fact('os.name') == 'OracleLinux' and \
 #     f['os']['release']['major'] == '6')) or \
 #     f.dig 'os', 'distro', 'codename' == 'xenial'
 # end
diff --git a/spec/unit/type/elasticsearch_template_spec.rb b/spec/unit/type/elasticsearch_template_spec.rb
index 0d50347..abeabf0 100644
--- a/spec/unit/type/elasticsearch_template_spec.rb
+++ b/spec/unit/type/elasticsearch_template_spec.rb
@@ -1,134 +1,134 @@
 require_relative '../../helpers/unit/type/elasticsearch_rest_shared_examples'
 
 describe Puppet::Type.type(:elasticsearch_template) do
   let(:resource_name) { 'test_template' }
 
   include_examples 'REST API types', 'template', :content
 
   describe 'template attribute validation' do
     it 'should have a source parameter' do
       expect(described_class.attrtype(:source)).to eq(:param)
     end
 
     describe 'content and source validation' do
       it 'should require either "content" or "source"' do
         expect do
           described_class.new(
             :name => resource_name,
             :ensure => :present
           )
         end.to raise_error(Puppet::Error, /content.*or.*source.*required/)
       end
 
       it 'should fail with both defined' do
         expect do
           described_class.new(
             :name => resource_name,
             :content => {},
             :source => 'puppet:///example.json'
           )
         end.to raise_error(Puppet::Error, /simultaneous/)
       end
 
       it 'should parse source paths into the content property' do
         file_stub = 'foo'
         [
           Puppet::FileServing::Metadata,
           Puppet::FileServing::Content
         ].each do |klass|
           allow(klass).to receive(:indirection)
             .and_return(Object)
         end
         allow(Object).to receive(:find)
           .and_return(file_stub)
         allow(file_stub).to receive(:content)
           .and_return('{"template":"foobar-*", "order": 1}')
         expect(described_class.new(
           :name => resource_name,
           :source => '/example.json'
         )[:content]).to include(
           'template' => 'foobar-*',
           'order' => 1
         )
       end
 
       it 'should qualify settings' do
         expect(described_class.new(
           :name => resource_name,
           :content => { 'settings' => {
             'number_of_replicas' => '2',
             'index' => { 'number_of_shards' => '3' }
           } }
         )[:content]).to eq(
           'order' => 0,
           'aliases' => {},
           'mappings' => {},
           'settings' => {
             'index' => {
               'number_of_replicas' => 2,
               'number_of_shards' => 3
             }
           }
         )
       end
 
       it 'detects flat qualified index settings' do
         expect(described_class.new(
           :name => resource_name,
           :content => {
             'settings' => {
               'number_of_replicas' => '2',
               'index.number_of_shards' => '3'
             }
           }
         )[:content]).to eq(
           'order' => 0,
           'aliases' => {},
           'mappings' => {},
           'settings' => {
             'index' => {
               'number_of_replicas' => 2,
               'number_of_shards' => 3
             }
           }
         )
       end
     end
   end # of describing when validing values
 
   describe 'insync?' do
     # Although users can pass the type a hash structure with any sort of values
     # - string, integer, or other native datatype - the Elasticsearch API
     # normalizes all values to strings. In order to verify that the type does
     # not incorrectly detect changes when values may be in string form, we take
     # an example template and force all values to strings to mimic what
     # Elasticsearch does.
     it 'is idempotent' do
       def deep_stringify(obj)
         if obj.is_a? Array
           obj.map { |element| deep_stringify(element) }
         elsif obj.is_a? Hash
           obj.merge(obj) { |_key, val| deep_stringify(val) }
         elsif [true, false].include? obj
           obj
         else
           obj.to_s
         end
       end
-      json = JSON.parse(File.read('spec/fixtures/templates/post_6.0.json'))
+      json = JSON.parse(File.read('spec/fixtures/templates/6.x.json'))
 
       is_template = described_class.new(
         :name => resource_name,
         :ensure => 'present',
         :content => json
       ).property(:content)
       should_template = described_class.new(
         :name => resource_name,
         :ensure => 'present',
         :content => deep_stringify(json)
       ).property(:content).should
 
       expect(is_template.insync?(should_template)).to be_truthy
     end
   end
 end # of describe Puppet::Type