diff --git a/tests/pillar/class_mapping.sls b/tests/pillar/class_mapping.sls
new file mode 100644
index 0000000..05d74d5
--- /dev/null
+++ b/tests/pillar/class_mapping.sls
@@ -0,0 +1,6 @@
+reclass:
+  storage:
+    enabled: true
+    class_mappings:
+    - target: '\*'
+      class: default
diff --git a/tests/pillar/generate_multi.sls b/tests/pillar/generate_multi.sls
new file mode 100644
index 0000000..d25e2f6
--- /dev/null
+++ b/tests/pillar/generate_multi.sls
@@ -0,0 +1,25 @@
+reclass:
+  storage:
+    enabled: true
+    repeat_replace_symbol: <<count>>
+    node:
+      service_node01:
+        name: node<<count>>
+        domain: deployment.local
+        classes:
+        - cluster.deployment.service.role
+        repeat:
+          count: 2
+          start: 5
+          digits: 2
+          params:
+            single_address:
+              value: 10.0.0.<<count>>
+              start: 100
+            deploy_address:
+              value: part-<<count>>-whole
+              start: 5
+              digits: 3
+        params:
+          salt_master_host: <<salt-master-ip>>
+          linux_system_codename: trusty
diff --git a/tests/pillar/generate_single.sls b/tests/pillar/generate_single.sls
new file mode 100644
index 0000000..a8f5b4e
--- /dev/null
+++ b/tests/pillar/generate_single.sls
@@ -0,0 +1,14 @@
+reclass:
+  storage:
+    enabled: true
+    node:
+      service_node01:
+        name: svc01
+        domain: deployment.local
+        classes:
+        - cluster.deployment_name.service.role
+        params:
+          salt_master_host: <<salt-master-ip>>
+          linux_system_codename: trusty
+          single_address: <<node-ip>>
+
diff --git a/tests/pillar/storage_git.sls b/tests/pillar/storage_git.sls
new file mode 100644
index 0000000..33b989d
--- /dev/null
+++ b/tests/pillar/storage_git.sls
@@ -0,0 +1,8 @@
+reclass:
+  storage:
+    enabled: true
+    base_dir: /srv/reclass
+    data_source:
+      engine: git
+      address: git@repo.domain.com:reclass/reclass-project.git
+      revision: master
diff --git a/tests/pillar/storage_local.sls b/tests/pillar/storage_local.sls
new file mode 100644
index 0000000..8e342a9
--- /dev/null
+++ b/tests/pillar/storage_local.sls
@@ -0,0 +1,6 @@
+reclass:
+  storage:
+    enabled: true
+    base_dir: /srv/reclass
+    data_source:
+      engine: local
diff --git a/tests/pillar/storage_salt.sls b/tests/pillar/storage_salt.sls
deleted file mode 100644
index 51e40df..0000000
--- a/tests/pillar/storage_salt.sls
+++ /dev/null
@@ -1,9 +0,0 @@
-reclass:
-  storage:
-    enabled: true
-    base_dir: /srv/salt/reclass
-    output: yaml
-    data_source:
-      engine: git
-      address: git....
-      branch: master