Cleanup + extend tests/pillars
diff --git a/tests/pillar/analytics.sls b/tests/pillar/analytics.sls
index 7ef9977..0fe58c0 100644
--- a/tests/pillar/analytics.sls
+++ b/tests/pillar/analytics.sls
@@ -1,6 +1,6 @@
 opencontrail:
   common:
-    version: 2.2
+    version: 3.0
     identity:
       engine: keystone
       host: 127.0.0.1
@@ -12,7 +12,7 @@
       host: 127.0.0.1
       port: 9696
   collector:
-    version: 2.2
+    version: 3.0
     enabled: true
     bind:
       address: 127.0.0.1
@@ -30,7 +30,7 @@
       - host: 127.0.0.1
         port: 9160
   database:
-    version: 2.2
+    version: 3.0
     cassandra:
       version: 2
     enabled: true
@@ -52,4 +52,4 @@
     - host: 127.0.0.1
       id: 2
     - host: 127.0.0.1
-      id: 3
\ No newline at end of file
+      id: 3