Cleanup + extend tests/pillars
diff --git a/tests/pillar/cluster.sls b/tests/pillar/cluster.sls
index a1984fd..29e22c9 100644
--- a/tests/pillar/cluster.sls
+++ b/tests/pillar/cluster.sls
@@ -1,6 +1,6 @@
 opencontrail:
   common:
-    version: 2.2
+    version: 3.0
     source:
       engine: pkg
       address: http://mirror.robotice.cz/contrail-havana/
@@ -15,7 +15,7 @@
       host: 127.0.0.1
       port: 9696
   config:
-    version: 2.2
+    version: 3.0
     enabled: true
     multi_tenancy: false
     network:
@@ -66,7 +66,7 @@
     - host: 127.0.0.1
       id: 3
   control:
-    version: 2.2
+    version: 3.0
     enabled: true
     bind:
       address: 127.0.0.1
@@ -82,7 +82,7 @@
     - host: 127.0.0.1
       id: 3
   collector:
-    version: 2.2
+    version: 3.0
     enabled: true
     bind:
       address: 127.0.0.1
@@ -100,7 +100,7 @@
       - host: 127.0.0.1
         port: 9160
   database:
-    version: 2.2
+    version: 3.0
     cassandra:
       version: 2
     enabled: true
@@ -124,7 +124,7 @@
     - host: 127.0.0.1
       id: 3
   web:
-    version: 2.2
+    version: 3.0
     enabled: True
     bind:
       address: 127.0.0.1