diff --git a/README.rst b/README.rst
index 5ab48b3..9b0b946 100644
--- a/README.rst
+++ b/README.rst
@@ -25,28 +25,13 @@
 
 Salt master with API
 
-.. code-block:: yaml
-
-    salt:
-      api:
-        enabled: true
-        ssl:
-          engine: salt
-        bind:
-          address: 0.0.0.0
-          port: 8000
+.. literalinclude:: tests/pillar/master_api.sls
+   :language: yaml
 
 Salt master with defined user ACLs
 
-.. code-block:: yaml
-
-    salt:
-      master:
-        user:
-          peter:
-            permissions:
-            - 'fs.fs'
-            - 'fs.\*'
+.. literalinclude:: tests/pillar/master_acl.sls
+   :language: yaml
 
 Salt master with preset minions
 
@@ -55,7 +40,6 @@
     salt:
       master:
         enabled: true
-        ...
         minions:
         - name: 'node1.system.location.domain.com'
 
@@ -125,8 +109,7 @@
     salt:
       master:
         enabled: true
-        ...
-        syndic:
+        syndicate:
           mode: master
 
 Salt master syndicate (client) master
@@ -136,7 +119,6 @@
     salt:
       master:
         enabled: true
-        ...
         syndicate:
           mode: client
           host: master-master
@@ -222,6 +204,9 @@
 .. literalinclude:: tests/pillar/minion_graph.sls
    :language: yaml
 
+PKI CA
+~~~~~~
+
 Salt minion with PKI CA
 
 .. literalinclude:: tests/pillar/minion_pki_ca.sls
diff --git a/salt/master/pillar.sls b/salt/master/pillar.sls
index 65fc1a5..45dec09 100644
--- a/salt/master/pillar.sls
+++ b/salt/master/pillar.sls
@@ -4,9 +4,13 @@
 {%- if master.pillar.engine == 'salt' %}
 
 include:
+{%- if master.pillar.source.engine == "git" %}
 - git.client
+{%- endif %}
 - salt.master.service
 
+{%- if master.pillar.source.engine == "git" %}
+
 {{ master.pillar.source.address }}:
   git.latest:
   - target: /srv/salt/pillar
@@ -25,6 +29,8 @@
 
 {%- endif %}
 
+{%- endif %}
+
 {%- elif master.pillar.engine == 'reclass' %}
 
 include:
diff --git a/tests/pillar/master_acl.sls b/tests/pillar/master_acl.sls
new file mode 100644
index 0000000..d457f5c
--- /dev/null
+++ b/tests/pillar/master_acl.sls
@@ -0,0 +1,24 @@
+git:
+  client:
+    enabled: true
+linux:
+  system:
+    enabled: true
+salt:
+  master:
+    enabled: true
+    source:
+      engine: pkg
+    pillar:
+      engine: salt
+      source:
+        engine: local
+    environment:
+      prd:
+        formula: {}
+    user:
+      peter:
+        enabled: true
+        permissions:
+        - 'fs.fs'
+        - 'fs.\*'
diff --git a/tests/pillar/master_api.sls b/tests/pillar/master_api.sls
new file mode 100644
index 0000000..b5bd653
--- /dev/null
+++ b/tests/pillar/master_api.sls
@@ -0,0 +1,25 @@
+git:
+  client:
+    enabled: true
+linux:
+  system:
+    enabled: true
+salt:
+  master:
+    enabled: true
+    source:
+      engine: pkg
+    pillar:
+      engine: salt
+      source:
+        engine: local
+    environment:
+      prd:
+        formula: {}
+  api:
+    enabled: true
+    ssl:
+      engine: salt
+    bind:
+      address: 0.0.0.0
+      port: 8000
diff --git a/tests/pillar/master_cluster_failover.sls b/tests/pillar/master_cluster_failover.sls
index e69de29..88229a0 100644
--- a/tests/pillar/master_cluster_failover.sls
+++ b/tests/pillar/master_cluster_failover.sls
@@ -0,0 +1,18 @@
+git:
+  client:
+    enabled: true
+linux:
+  system:
+    enabled: true
+salt:
+  master:
+    enabled: true
+    source:
+      engine: pkg
+    pillar:
+      engine: salt
+      source:
+        engine: local
+    environment:
+      prd:
+        formula: {}
\ No newline at end of file
diff --git a/tests/pillar/master_custom_handler.sls b/tests/pillar/master_custom_handler.sls
new file mode 100644
index 0000000..80abf33
--- /dev/null
+++ b/tests/pillar/master_custom_handler.sls
@@ -0,0 +1,24 @@
+git:
+  client:
+    enabled: true
+linux:
+  system:
+    enabled: true
+salt:
+  master:
+    enabled: true
+    source:
+      engine: pkg
+    pillar:
+      engine: salt
+      source:
+        engine: local
+    environment:
+      prd:
+        formula: {}
+    handler:
+      handler01:
+        engine: udp
+        bind:
+          host: 127.0.0.1
+          port: 9999
diff --git a/tests/pillar/master_ssh_minion_key.sls b/tests/pillar/master_ssh_minion_key.sls
index 92ead37..09e007e 100644
--- a/tests/pillar/master_ssh_minion_key.sls
+++ b/tests/pillar/master_ssh_minion_key.sls
@@ -1,6 +1,21 @@
+git:
+  client:
+    enabled: true
+linux:
+  system:
+    enabled: true
 salt:
   master:
     enabled: true
+    source:
+      engine: pkg
+    pillar:
+      engine: salt
+      source:
+        engine: local
+    environment:
+      prd:
+        formula: {}
     ssh_minion:
       node01:
         host: 10.0.0.1
diff --git a/tests/pillar/master_ssh_minion_password.sls b/tests/pillar/master_ssh_minion_password.sls
index e3c9c82..2883f4d 100644
--- a/tests/pillar/master_ssh_minion_password.sls
+++ b/tests/pillar/master_ssh_minion_password.sls
@@ -1,6 +1,21 @@
+git:
+  client:
+    enabled: true
+linux:
+  system:
+    enabled: true
 salt:
   master:
     enabled: true
+    source:
+      engine: pkg
+    pillar:
+      engine: salt
+      source:
+        engine: local
+    environment:
+      prd:
+        formula: {}
     ssh_minion:
       node01:
         host: 10.0.0.1
diff --git a/tests/pillar/master_ssh_minion_root.sls b/tests/pillar/master_ssh_minion_root.sls
index 2e72678..b076fbc 100644
--- a/tests/pillar/master_ssh_minion_root.sls
+++ b/tests/pillar/master_ssh_minion_root.sls
@@ -1,6 +1,21 @@
+git:
+  client:
+    enabled: true
+linux:
+  system:
+    enabled: true
 salt:
   master:
     enabled: true
+    source:
+      engine: pkg
+    pillar:
+      engine: salt
+      source:
+        engine: local
+    environment:
+      prd:
+        formula: {}
     ssh_minion:
       node01:
         host: 10.0.0.1
diff --git a/tests/pillar/minion_custom_handler.sls b/tests/pillar/minion_custom_handler.sls
new file mode 100644
index 0000000..6c30c48
--- /dev/null
+++ b/tests/pillar/minion_custom_handler.sls
@@ -0,0 +1,14 @@
+salt:
+  minion:
+    enabled: true
+    handler:
+      handler01:
+        engine: udp
+        bind:
+          host: 127.0.0.1
+          port: 9999
+      handler02:
+        engine: zmq
+        bind:
+          host: 127.0.0.1
+          port: 9999
\ No newline at end of file
diff --git a/tests/pillar/master_base.sls b/tests/pillar/salt_master_peer.sls
similarity index 100%
rename from tests/pillar/master_base.sls
rename to tests/pillar/salt_master_peer.sls