diff --git a/data/common.yaml b/data/common.yaml
index dec524ebf..67b67d073 100644
--- a/data/common.yaml
+++ b/data/common.yaml
@@ -1,50 +1,50 @@
 ---
-elasticsearch::ensure: present
-elasticsearch::api_basic_auth_password: ~
-elasticsearch::api_basic_auth_username: ~
-elasticsearch::api_ca_file: ~
-elasticsearch::api_ca_path: ~
+elasticsearch::api_basic_auth_password:
+elasticsearch::api_basic_auth_username:
+elasticsearch::api_ca_file:
+elasticsearch::api_ca_path:
 elasticsearch::api_host: localhost
 elasticsearch::api_port: 9200
 elasticsearch::api_protocol: http
 elasticsearch::api_timeout: 10
 elasticsearch::autoupgrade: false
 elasticsearch::config: {}
-elasticsearch::configdir: /etc/elasticsearch
+elasticsearch::configdir: "/etc/elasticsearch"
 elasticsearch::configdir_recurselimit: 2
+elasticsearch::default_logging_level: INFO
 elasticsearch::daily_rolling_date_pattern: |
   "'.'yyyy-MM-dd"
-elasticsearch::default_logging_level: 'INFO'
-elasticsearch::defaults_location: ~
+elasticsearch::defaults_location:
 elasticsearch::deprecation_logging: false
-elasticsearch::deprecation_logging_level: 'DEBUG'
-elasticsearch::download_tool: ~
-elasticsearch::download_tool_insecure: ~
+elasticsearch::deprecation_logging_level: DEBUG
+elasticsearch::download_tool:
+elasticsearch::download_tool_insecure:
 elasticsearch::download_tool_verify_certificates: true
+elasticsearch::ensure: present
 elasticsearch::file_rolling_type: dailyRollingFile
 elasticsearch::indices: {}
 elasticsearch::init_defaults: {}
-elasticsearch::init_defaults_file: ~
+elasticsearch::init_defaults_file:
 elasticsearch::init_template: "%{module_name}/etc/init.d/elasticsearch.systemd.erb"
 elasticsearch::instances: {}
 elasticsearch::jvm_options: []
-elasticsearch::license: ~
-elasticsearch::logdir: /var/log/elasticsearch
+elasticsearch::license:
+elasticsearch::logdir: "/var/log/elasticsearch"
 elasticsearch::logging_config: {}
-elasticsearch::logging_file: ~
-elasticsearch::logging_level: 'INFO'
-elasticsearch::logging_template: ~
+elasticsearch::logging_file:
+elasticsearch::logging_level: INFO
+elasticsearch::logging_template:
 elasticsearch::manage_repo: true
 elasticsearch::oss: false
 elasticsearch::package_dl_timeout: 600
 elasticsearch::package_name: elasticsearch
 elasticsearch::package_provider: package
-elasticsearch::package_url: ~
-elasticsearch::pid_dir: /var/run/elasticsearch
+elasticsearch::package_url:
+elasticsearch::pid_dir: "/var/run/elasticsearch"
 elasticsearch::pipelines: {}
-elasticsearch::plugindir: ~
+elasticsearch::plugindir:
 elasticsearch::plugins: {}
-elasticsearch::proxy_url: ~
+elasticsearch::proxy_url:
 elasticsearch::purge_configdir: false
 elasticsearch::purge_package_dir: false
 elasticsearch::purge_secrets: false
@@ -54,16 +54,16 @@ elasticsearch::roles: {}
 elasticsearch::rolling_file_max_backup_index: 1
 elasticsearch::rolling_file_max_file_size: 10MB
 elasticsearch::scripts: {}
-elasticsearch::secrets: ~
-elasticsearch::security_logging_content: ~
-elasticsearch::security_logging_source: ~
+elasticsearch::secrets:
+elasticsearch::security_logging_content:
+elasticsearch::security_logging_source:
 elasticsearch::service_name: elasticsearch
 elasticsearch::service_provider: systemd
 elasticsearch::snapshot_repositories: {}
 elasticsearch::ssl: false
 elasticsearch::status: enabled
-elasticsearch::system_key: ~
-elasticsearch::systemd_service_path: /lib/systemd/system
+elasticsearch::system_key:
+elasticsearch::systemd_service_path: "/lib/systemd/system"
 elasticsearch::templates: {}
 elasticsearch::users: {}
 elasticsearch::validate_tls: true
diff --git a/data/distro/Debian/7.yaml b/data/distro/Debian/7.yaml
index e1a576cca..03a9b35c4 100644
--- a/data/distro/Debian/7.yaml
+++ b/data/distro/Debian/7.yaml
@@ -1,4 +1,4 @@
 ---
 elasticsearch::init_template: "%{module_name}/etc/init.d/elasticsearch.Debian.erb"
-elasticsearch::pid_dir: ~
+elasticsearch::pid_dir:
 elasticsearch::service_provider: init
diff --git a/data/distro/Ubuntu/12.04.yaml b/data/distro/Ubuntu/12.04.yaml
index e1a576cca..03a9b35c4 100644
--- a/data/distro/Ubuntu/12.04.yaml
+++ b/data/distro/Ubuntu/12.04.yaml
@@ -1,4 +1,4 @@
 ---
 elasticsearch::init_template: "%{module_name}/etc/init.d/elasticsearch.Debian.erb"
-elasticsearch::pid_dir: ~
+elasticsearch::pid_dir:
 elasticsearch::service_provider: init
diff --git a/data/distro/Ubuntu/14.04.yaml b/data/distro/Ubuntu/14.04.yaml
index e1a576cca..03a9b35c4 100644
--- a/data/distro/Ubuntu/14.04.yaml
+++ b/data/distro/Ubuntu/14.04.yaml
@@ -1,4 +1,4 @@
 ---
 elasticsearch::init_template: "%{module_name}/etc/init.d/elasticsearch.Debian.erb"
-elasticsearch::pid_dir: ~
+elasticsearch::pid_dir:
 elasticsearch::service_provider: init
diff --git a/data/kernel/Darwin.yaml b/data/kernel/Darwin.yaml
index 59d4a3b74..ed7484f33 100644
--- a/data/kernel/Darwin.yaml
+++ b/data/kernel/Darwin.yaml
@@ -1,5 +1,5 @@
 ---
 elasticsearch::download_tool: curl -o
 elasticsearch::download_tool_insecure: curl --insecure -o
-elasticsearch::elasticsearch_user: elasticsearch
 elasticsearch::elasticsearch_group: elasticsearch
+elasticsearch::elasticsearch_user: elasticsearch
diff --git a/data/kernel/Linux.yaml b/data/kernel/Linux.yaml
index eed184d5a..748d68c66 100644
--- a/data/kernel/Linux.yaml
+++ b/data/kernel/Linux.yaml
@@ -1,8 +1,8 @@
 ---
-elasticsearch::datadir: /var/lib/elasticsearch
+elasticsearch::datadir: "/var/lib/elasticsearch"
 elasticsearch::download_tool: wget -O
 elasticsearch::download_tool_insecure: wget --no-check-certificate -O
-elasticsearch::elasticsearch_user: elasticsearch
 elasticsearch::elasticsearch_group: elasticsearch
-elasticsearch::homedir: /usr/share/elasticsearch
-elasticsearch::package_dir: /opt/elasticsearch/swdl
+elasticsearch::elasticsearch_user: elasticsearch
+elasticsearch::homedir: "/usr/share/elasticsearch"
+elasticsearch::package_dir: "/opt/elasticsearch/swdl"
diff --git a/data/kernel/OpenBSD.yaml b/data/kernel/OpenBSD.yaml
index a0df29523..7afe6ea31 100644
--- a/data/kernel/OpenBSD.yaml
+++ b/data/kernel/OpenBSD.yaml
@@ -1,10 +1,10 @@
 ---
-elasticsearch::datadir: /var/elasticsearch/data
-elasticsearch::download_tool: 'ftp -o'
-elasticsearch::elasticsearch_user: _elasticsearch
+elasticsearch::datadir: "/var/elasticsearch/data"
+elasticsearch::download_tool: ftp -o
 elasticsearch::elasticsearch_group: _elasticsearch
-elasticsearch::homedir: /usr/local/elasticsearch
+elasticsearch::elasticsearch_user: _elasticsearch
+elasticsearch::homedir: "/usr/local/elasticsearch"
 elasticsearch::init_template: "%{module_name}/etc/init.d/elasticsearch.OpenBSD.erb"
-elasticsearch::package_dir: /var/cache/elasticsearch
-elasticsearch::service_provider:  openbsd
 elasticsearch::manage_repo: false
+elasticsearch::package_dir: "/var/cache/elasticsearch"
+elasticsearch::service_provider: openbsd
diff --git a/data/os/Debian.yaml b/data/os/Debian.yaml
index 7c157d994..ec1906e3e 100644
--- a/data/os/Debian.yaml
+++ b/data/os/Debian.yaml
@@ -1,2 +1,2 @@
 ---
-elasticsearch::defaults_location: /etc/default
+elasticsearch::defaults_location: "/etc/default"
diff --git a/data/os/Gentoo.yaml b/data/os/Gentoo.yaml
index ac36c2a09..7b7808bf1 100644
--- a/data/os/Gentoo.yaml
+++ b/data/os/Gentoo.yaml
@@ -1,6 +1,6 @@
 ---
-elasticsearch::defaults_location: /etc/conf.d
+elasticsearch::defaults_location: "/etc/conf.d"
 elasticsearch::init_template: "%{module_name}/etc/init.d/elasticsearch.openrc.erb"
 elasticsearch::package_name: app-misc/elasticsearch
-elasticsearch::pid_dir: /run/elasticsearch
+elasticsearch::pid_dir: "/run/elasticsearch"
 elasticsearch::service_provider: openrc
diff --git a/data/os/RedHat.yaml b/data/os/RedHat.yaml
index d6595d798..7d3f15efc 100644
--- a/data/os/RedHat.yaml
+++ b/data/os/RedHat.yaml
@@ -1,2 +1,2 @@
 ---
-elasticsearch::defaults_location: /etc/sysconfig
+elasticsearch::defaults_location: "/etc/sysconfig"
diff --git a/data/os/Suse.yaml b/data/os/Suse.yaml
index 4d6c6fa31..ac393424b 100644
--- a/data/os/Suse.yaml
+++ b/data/os/Suse.yaml
@@ -1,3 +1,3 @@
 ---
-elasticsearch::defaults_location: /etc/sysconfig
-elasticsearch::systemd_service_path: /usr/lib/systemd/system
+elasticsearch::defaults_location: "/etc/sysconfig"
+elasticsearch::systemd_service_path: "/usr/lib/systemd/system"
diff --git a/data/os/Suse/11.yaml b/data/os/Suse/11.yaml
index a89e75324..b6e0121e1 100644
--- a/data/os/Suse/11.yaml
+++ b/data/os/Suse/11.yaml
@@ -1,4 +1,4 @@
 ---
 elasticsearch::init_template: "%{module_name}/etc/init.d/elasticsearch.SLES.erb"
-elasticsearch::pid_dir: ~
+elasticsearch::pid_dir:
 elasticsearch::service_provider: init
diff --git a/hiera.yaml b/hiera.yaml
index fcbd2be20..4886bb723 100644
--- a/hiera.yaml
+++ b/hiera.yaml
@@ -1,25 +1,18 @@
 ---
 version: 5
-
 defaults:
   datadir: data
-  data_hash: 'yaml_data'
-
+  data_hash: yaml_data
 hierarchy:
-  - name: 'Distribution major version'
-    path: 'distro/%{facts.os.name}/%{facts.os.release.major}.yaml'
-
-  - name: 'Operating system family major version'
-    path: 'os/%{facts.os.family}/%{facts.os.release.major}.yaml'
-
-  - name: 'Distribution name'
-    path: 'distro/%{facts.os.name}.yaml'
-
-  - name: 'Operating system family'
-    path: 'os/%{facts.os.family}.yaml'
-
-  - name: 'System kernel'
-    path: 'kernel/%{facts.kernel}.yaml'
-
-  - name: 'Default values'
-    path: 'common.yaml'
+- name: Distribution major version
+  path: distro/%{facts.os.name}/%{facts.os.release.major}.yaml
+- name: Operating system family major version
+  path: os/%{facts.os.family}/%{facts.os.release.major}.yaml
+- name: Distribution name
+  path: distro/%{facts.os.name}.yaml
+- name: Operating system family
+  path: os/%{facts.os.family}.yaml
+- name: System kernel
+  path: kernel/%{facts.kernel}.yaml
+- name: Default values
+  path: common.yaml
diff --git a/spec/fixtures/data/common.yaml b/spec/fixtures/data/common.yaml
new file mode 100644
index 000000000..2fbf0ffd7
--- /dev/null
+++ b/spec/fixtures/data/common.yaml
@@ -0,0 +1 @@
+--- {}
diff --git a/spec/fixtures/hiera/hieradata/envs/defaultinstance-merged.yaml b/spec/fixtures/data/envs/defaultinstance-merged.yaml
similarity index 65%
rename from spec/fixtures/hiera/hieradata/envs/defaultinstance-merged.yaml
rename to spec/fixtures/data/envs/defaultinstance-merged.yaml
index 7527e98a6..b056ca113 100644
--- a/spec/fixtures/hiera/hieradata/envs/defaultinstance-merged.yaml
+++ b/spec/fixtures/data/envs/defaultinstance-merged.yaml
@@ -2,9 +2,8 @@
 lookup_options:
   elasticsearch::instances:
     merge: deep
-
 elasticsearch::instances:
   default:
     config:
-      node.name: 'default'
-      http.bind_host: '0.0.0.0'
+      node.name: default
+      http.bind_host: 0.0.0.0
diff --git a/spec/fixtures/data/envs/defaultinstance.yaml b/spec/fixtures/data/envs/defaultinstance.yaml
new file mode 100644
index 000000000..a7929ca2b
--- /dev/null
+++ b/spec/fixtures/data/envs/defaultinstance.yaml
@@ -0,0 +1,6 @@
+---
+elasticsearch::instances:
+  default:
+    config:
+      node.name: default
+      http.bind_host: 0.0.0.0
diff --git a/spec/fixtures/data/multipleinstances.yaml b/spec/fixtures/data/multipleinstances.yaml
new file mode 100644
index 000000000..26e3f09a7
--- /dev/null
+++ b/spec/fixtures/data/multipleinstances.yaml
@@ -0,0 +1,10 @@
+---
+elasticsearch::instances:
+  es-hiera-multiple-1:
+    config:
+      node.name: es-hiera-multiple-1
+      http.bind_host: 0.0.0.0
+  es-hiera-multiple-2:
+    config:
+      node.name: es-hiera-multiple-2
+      http.bind_host: 0.0.0.0
diff --git a/spec/fixtures/hiera/hieradata/singleindex.yaml b/spec/fixtures/data/singleindex.yaml
similarity index 80%
rename from spec/fixtures/hiera/hieradata/singleindex.yaml
rename to spec/fixtures/data/singleindex.yaml
index e8311380c..f46107981 100644
--- a/spec/fixtures/hiera/hieradata/singleindex.yaml
+++ b/spec/fixtures/data/singleindex.yaml
@@ -1,7 +1,7 @@
 ---
 elasticsearch::indices:
   baz:
-    ensure: 'present'
+    ensure: present
     settings:
       index:
         number_of_shards: 1
diff --git a/spec/fixtures/data/singleinstance.yaml b/spec/fixtures/data/singleinstance.yaml
new file mode 100644
index 000000000..640988e32
--- /dev/null
+++ b/spec/fixtures/data/singleinstance.yaml
@@ -0,0 +1,6 @@
+---
+elasticsearch::instances:
+  es-hiera-single:
+    config:
+      node.name: es-hiera-single
+      http.bind_host: 0.0.0.0
diff --git a/spec/fixtures/hiera/hieradata/singlepipeline.yaml b/spec/fixtures/data/singlepipeline.yaml
similarity index 68%
rename from spec/fixtures/hiera/hieradata/singlepipeline.yaml
rename to spec/fixtures/data/singlepipeline.yaml
index 21f7f1ccb..6177c565c 100644
--- a/spec/fixtures/hiera/hieradata/singlepipeline.yaml
+++ b/spec/fixtures/data/singlepipeline.yaml
@@ -5,6 +5,6 @@ elasticsearch::pipelines:
     content:
       description: Add the foo field
       processors:
-        - set:
-            field: foo
-            value: bar
+      - set:
+          field: foo
+          value: bar
diff --git a/spec/fixtures/data/singleplugin.yaml b/spec/fixtures/data/singleplugin.yaml
new file mode 100644
index 000000000..6159f5183
--- /dev/null
+++ b/spec/fixtures/data/singleplugin.yaml
@@ -0,0 +1,5 @@
+---
+elasticsearch::plugins:
+  mobz/elasticsearch-head:
+    ensure: present
+    module_dir: head
diff --git a/spec/fixtures/hiera/hieradata/singlerole.yaml b/spec/fixtures/data/singlerole.yaml
similarity index 70%
rename from spec/fixtures/hiera/hieradata/singlerole.yaml
rename to spec/fixtures/data/singlerole.yaml
index c3e7883c2..894903cab 100644
--- a/spec/fixtures/hiera/hieradata/singlerole.yaml
+++ b/spec/fixtures/data/singlerole.yaml
@@ -5,6 +5,6 @@ elasticsearch::roles:
     privileges:
       cluster: monitor
       indices:
-        '*': all
+        "*": all
     mappings:
-      - cn=users,dc=example,dc=com
+    - cn=users,dc=example,dc=com
diff --git a/spec/fixtures/hiera/hieradata/singlescript.yaml b/spec/fixtures/data/singlescript.yaml
similarity index 100%
rename from spec/fixtures/hiera/hieradata/singlescript.yaml
rename to spec/fixtures/data/singlescript.yaml
diff --git a/spec/fixtures/hiera/hieradata/singletemplate.yaml b/spec/fixtures/data/singletemplate.yaml
similarity index 71%
rename from spec/fixtures/hiera/hieradata/singletemplate.yaml
rename to spec/fixtures/data/singletemplate.yaml
index 0863e335e..961b214e1 100644
--- a/spec/fixtures/hiera/hieradata/singletemplate.yaml
+++ b/spec/fixtures/data/singletemplate.yaml
@@ -1,9 +1,9 @@
 ---
 elasticsearch::templates:
   foo:
-    ensure: 'present'
+    ensure: present
     content:
-      template: 'foo-*'
+      template: foo-*
       settings:
         index:
           number_of_replicas: 0
diff --git a/spec/fixtures/hiera/hieradata/singleuser.yaml b/spec/fixtures/data/singleuser.yaml
similarity index 86%
rename from spec/fixtures/hiera/hieradata/singleuser.yaml
rename to spec/fixtures/data/singleuser.yaml
index 8f23a85ec..4166484d8 100644
--- a/spec/fixtures/hiera/hieradata/singleuser.yaml
+++ b/spec/fixtures/data/singleuser.yaml
@@ -4,4 +4,4 @@ elasticsearch::users:
     ensure: present
     password: password
     roles:
-      - admin
+    - admin
diff --git a/spec/fixtures/hiera.yaml b/spec/fixtures/hiera.yaml
new file mode 100644
index 000000000..661052d0c
--- /dev/null
+++ b/spec/fixtures/hiera.yaml
@@ -0,0 +1,9 @@
+---
+version: 5
+hierarchy:
+- name: Spec-Fixtures
+  paths:
+  # Default for datadir is data/ (relative to hiera.yaml's Directory)
+  - ! "%{::facts.scenario}.yaml"
+  - envs/%{::facts.common}.yaml
+  - common.yaml
diff --git a/spec/fixtures/hiera/hiera.yaml b/spec/fixtures/hiera/hiera.yaml
deleted file mode 100644
index 954cef4bc..000000000
--- a/spec/fixtures/hiera/hiera.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-:backends: yaml
-:yaml:
-  :datadir: spec/fixtures/hiera/hieradata
-:hierarchy:
-- ! '%{scenario}'
-- envs/%{common}
-:logger: console
diff --git a/spec/fixtures/hiera/hieradata/envs/defaultinstance.yaml b/spec/fixtures/hiera/hieradata/envs/defaultinstance.yaml
deleted file mode 100644
index ad966a675..000000000
--- a/spec/fixtures/hiera/hieradata/envs/defaultinstance.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-elasticsearch::instances:
-  default:
-    config:
-      node.name: 'default'
-      http.bind_host: '0.0.0.0'
diff --git a/spec/fixtures/hiera/hieradata/multipleinstances.yaml b/spec/fixtures/hiera/hieradata/multipleinstances.yaml
deleted file mode 100644
index 13116efd5..000000000
--- a/spec/fixtures/hiera/hieradata/multipleinstances.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
----
-elasticsearch::instances:
-  es-hiera-multiple-1:
-    config:
-      node.name: 'es-hiera-multiple-1'
-      http.bind_host: '0.0.0.0'
-  es-hiera-multiple-2:
-    config:
-      node.name: 'es-hiera-multiple-2'
-      http.bind_host: '0.0.0.0'
diff --git a/spec/fixtures/hiera/hieradata/singleinstance.yaml b/spec/fixtures/hiera/hieradata/singleinstance.yaml
deleted file mode 100644
index 8139c654e..000000000
--- a/spec/fixtures/hiera/hieradata/singleinstance.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-elasticsearch::instances:
-  es-hiera-single:
-    config:
-      node.name: 'es-hiera-single'
-      http.bind_host: '0.0.0.0'
diff --git a/spec/fixtures/hiera/hieradata/singleplugin.yaml b/spec/fixtures/hiera/hieradata/singleplugin.yaml
deleted file mode 100644
index 10d1d6afa..000000000
--- a/spec/fixtures/hiera/hieradata/singleplugin.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-elasticsearch::plugins:
-  'mobz/elasticsearch-head':
-    ensure: 'present'
-    module_dir: 'head'
diff --git a/spec/matrix.yml b/spec/matrix.yml
index 929d7fcec..1e76af136 100644
--- a/spec/matrix.yml
+++ b/spec/matrix.yml
@@ -1,20 +1,20 @@
 ---
 OS:
-  - amazonlinux-1-x64
-  - centos-6-x64
-  - centos-7-x64
-  - debian-8-x64
-  - debian-9-x64
-  - oracle-6-x64
-  - oracle-7-x64
-  - ubuntu-server-1404-x64
-  - ubuntu-server-1604-x64
+- amazonlinux-1-x64
+- centos-6-x64
+- centos-7-x64
+- debian-8-x64
+- debian-9-x64
+- oracle-6-x64
+- oracle-7-x64
+- ubuntu-server-1404-x64
+- ubuntu-server-1604-x64
 PUPPET_VERSION:
-  - ""
-  - "~> 6.0"
-  - "~> 5.0"
-  - "~> 4.10.0"
+- ''
+- "~> 6.0"
+- "~> 5.0"
+- "~> 4.10.0"
 TEST_TYPE:
-  - latest
-  - 5.6.9
-#  - snapshot
+- latest
+- 5.6.9
+#- snapshot
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index fe09954db..cf64ebcc9 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -10,7 +10,7 @@
 require 'voxpupuli/test/spec_helper'
 
 RSpec.configure do |c|
-  c.hiera_config = 'spec/fixtures/hiera/hiera.yaml'
+  c.hiera_config = 'spec/fixtures/hiera.yaml'
 end
 
 add_mocked_facts!