diff --git a/tests/pillar/control_cloud_digitalocean.sls b/tests/pillar/control_cloud_digitalocean.sls
new file mode 100644
index 0000000..57db1e6
--- /dev/null
+++ b/tests/pillar/control_cloud_digitalocean.sls
@@ -0,0 +1,25 @@
+salt:
+  control:
+    enabled: true
+    provider:
+      digitalocean_account:
+        engine: digital_ocean
+        region: New York 1
+        client_key: xxxxxxx
+        api_key: xxxxxxx
+    cluster:
+      dc01_prd:
+        domain: dc01.prd.domain.com
+        engine: cloud
+        config:
+          engine: salt
+          host: master.dc01.domain.com
+        node:
+          ubuntu1:
+            provider: digitalocean_account
+            image: Ubuntu14.04 x86_64
+            size: m1.medium
+          ubuntu2:
+            provider: digitalocean_account
+            image: Ubuntu14.04 x86_64
+            size: m1.medium
\ No newline at end of file
diff --git a/tests/pillar/control_cloud_openstack.sls b/tests/pillar/control_cloud_openstack.sls
new file mode 100644
index 0000000..08c3b8c
--- /dev/null
+++ b/tests/pillar/control_cloud_openstack.sls
@@ -0,0 +1,33 @@
+salt:
+  control:
+    enabled: true
+    provider:
+      openstack_account:
+        engine: openstack
+        insecure: true
+        region: RegionOne
+        identity_url: 'https://10.0.0.2:35357'
+        tenant: project 
+        user: user
+        password: 'password'
+        fixed_networks:
+        - 123d3332-18be-4d1d-8d4d-5f5a54456554e
+        floating_networks:
+        - public
+        ignore_cidr: 192.168.0.0/16
+    cluster:
+      dc01_prd:
+        domain: dc01.prd.domain.com
+        engine: cloud
+        config:
+          engine: salt
+          host: master.dc01.domain.com
+        node:
+          ubuntu1:
+            provider: openstack_account
+            image: Ubuntu14.04 x86_64
+            size: m1.medium
+          ubuntu2:
+            provider: openstack_account
+            image: Ubuntu14.04 x86_64
+            size: m1.medium
\ No newline at end of file
diff --git a/tests/pillar/control_virt.sls b/tests/pillar/control_virt.sls
new file mode 100644
index 0000000..7ca7e11
--- /dev/null
+++ b/tests/pillar/control_virt.sls
@@ -0,0 +1,32 @@
+salt:
+  control:
+    enabled: true
+    size:
+      small:
+        cpu: 1
+        ram: 1
+        hdd: 10
+      medium:
+        cpu: 2
+        ram: 4
+        hdd: 20
+      large:
+        cpu: 4
+        ram: 8
+        hdd: 70
+    cluster:
+      vpc20_infra:
+        domain: neco.virt.domain.com
+        engine: virt
+        config:
+          engine: salt
+          host: master.domain.com
+        node:
+          ubuntu1:
+            provider: node01.domain.com
+            image: ubuntu.qcow
+            size: medium
+          ubuntu2:
+            provider: node02.domain.com
+            image: bubuntu.qcomw
+            size: small
\ No newline at end of file
diff --git a/tests/pillar/master_base.sls b/tests/pillar/master_base.sls
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/tests/pillar/master_base.sls
diff --git a/tests/pillar/master_cluster_failover.sls b/tests/pillar/master_cluster_failover.sls
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/tests/pillar/master_cluster_failover.sls
diff --git a/tests/pillar/master_single.sls b/tests/pillar/master_single_pillar.sls
similarity index 70%
rename from tests/pillar/master_single.sls
rename to tests/pillar/master_single_pillar.sls
index 62f9fd3..b20e2b6 100644
--- a/tests/pillar/master_single.sls
+++ b/tests/pillar/master_single_pillar.sls
@@ -10,16 +10,19 @@
     command_timeout: 5
     worker_threads: 2
     base_environment: prd
+    environment:
+      prd:
+        formula:
+          service01:
+            source: git
+            address: 'git@git.domain.com/service01-formula.git'
+            revision: master
+          service02:
+            source: pkg
+            name: salt-formula-service02 
     pillar:
       engine: salt
       source:
         engine: git
         address: 'git@repo.domain.com:salt/pillar-demo.git'
         branch: 'master'
-    environment:
-      prd:
-        formula:
-          memcached:
-            source: git
-            address: 'git@git.domain.com/memcached-formula.git'
-            revision: master
diff --git a/tests/pillar/master_single_reclass.sls b/tests/pillar/master_single_reclass.sls
index 637c018..d6db522 100644
--- a/tests/pillar/master_single_reclass.sls
+++ b/tests/pillar/master_single_reclass.sls
@@ -17,13 +17,16 @@
     command_timeout: 5
     worker_threads: 2
     base_environment: prd
-    pillar:
-      engine: reclass
-      data_dir: /srv/salt/reclass
     environment:
       prd:
         formula:
-          memcached:
+          service01:
             source: git
-            address: 'git@git.domain.com/memcached-formula.git'
+            address: 'git@git.domain.com/service01-formula.git'
             revision: master
+          service02:
+            source: pkg
+            name: salt-formula-service02
+    pillar:
+      engine: reclass
+      data_dir: /srv/salt/reclass
diff --git a/tests/pillar/minion_graph.sls b/tests/pillar/minion_graph.sls
new file mode 100644
index 0000000..1a357d4
--- /dev/null
+++ b/tests/pillar/minion_graph.sls
@@ -0,0 +1,4 @@
+salt:
+  minion:
+    enabled: true
+    graph_states: true
diff --git a/tests/pillar/minion_local.sls b/tests/pillar/minion_local_pillar.sls
similarity index 99%
rename from tests/pillar/minion_local.sls
rename to tests/pillar/minion_local_pillar.sls
index 9e3168f..cd8f611 100644
--- a/tests/pillar/minion_local.sls
+++ b/tests/pillar/minion_local_pillar.sls
@@ -7,4 +7,4 @@
       source:
         engine: git
         address: 'git@repo.domain.com:salt/pillar-demo.git'
-        branch: 'master'
\ No newline at end of file
+        branch: 'master'
diff --git a/tests/pillar/minion_master.sls b/tests/pillar/minion_master.sls
index 3adb7e6..cd722f2 100644
--- a/tests/pillar/minion_master.sls
+++ b/tests/pillar/minion_master.sls
@@ -2,9 +2,4 @@
   minion:
     enabled: true
     master:
-      host: 127.0.0.1
-    mine:
-      interval: 60
-      module:
-        grains.items: []
-        network.interfaces: []
+      host: config01.dc01.domain.com
diff --git a/tests/pillar/minion_mine.sls b/tests/pillar/minion_mine.sls
new file mode 100644
index 0000000..3ee5d0a
--- /dev/null
+++ b/tests/pillar/minion_mine.sls
@@ -0,0 +1,8 @@
+salt:
+  minion:
+    enabled: true
+    mine:
+      interval: 60
+      module:
+        grains.items: []
+        network.interfaces: []
diff --git a/tests/pillar/minion_multi_master.sls b/tests/pillar/minion_multi_master.sls
new file mode 100644
index 0000000..381e50c
--- /dev/null
+++ b/tests/pillar/minion_multi_master.sls
@@ -0,0 +1,6 @@
+salt:
+  minion:
+    enabled: true
+    masters:
+    - host: config01.dc01.domain.com
+    - host: config02.dc01.domain.com
diff --git a/tests/pillar/minion_multi_master_failover.sls b/tests/pillar/minion_multi_master_failover.sls
new file mode 100644
index 0000000..cffefec
--- /dev/null
+++ b/tests/pillar/minion_multi_master_failover.sls
@@ -0,0 +1,7 @@
+salt:
+  minion:
+    enabled: true
+    masters:
+    - host: config01.dc01.domain.com
+    - host: config02.dc01.domain.com
+    master_type: failover