diff --git a/_test/lib.sh b/_test/lib.sh
index 50361dbff1..d157d11890 100644
--- a/_test/lib.sh
+++ b/_test/lib.sh
@@ -1,9 +1,8 @@
-function jigger-files-for-travis {
+function move-files {
   helm doctor # need proper ~/.helm directory structure and config.yml
 
-  if [ "${TRAVIS}" == true ]; then
-    cp -r . ${TRAVIS_HOME}/.helm/cache/charts
-  fi
+  log-info "Staging chart directory"
+  rsync -av . ${HOME}/.helm/cache/charts/
 }
 
 function install-helm {
@@ -18,7 +17,7 @@ function install-helm {
   )
   export PATH="$(pwd)/.bin:${PATH}"
 
-  jigger-files-for-travis
+  move-files
 }
 
 function get-changed-charts {
@@ -60,9 +59,10 @@ function get-all-charts {
 
 function helm-test {
   log-warn "Start: ${1}"
-  .bin/helm install ${1}
-  healthcheck ${1}
-  .bin/helm uninstall -y ${1}
+  .bin/helm fetch "${1}"
+  .bin/helm install "${1}"
+  healthcheck "${1}"
+  .bin/helm uninstall -y "${1}"
   log-warn "Done: ${1}"
 }
 
@@ -108,13 +108,17 @@ function is-pod-running {
     kubectl get pods ${name} -o json | jq -r "${jq_name_query}" | grep -q "Running" && return 0
   fi
 
-  log-info "Couldn't find pod named ${name}, looking for label: app=${name}"
+  log-info "Looking for label: app=${name}"
   local jq_app_label_query=".items[] | select(.metadata.labels.app == \"${name}\") | .status.phase"
   kubectl get pods -o json | jq -r "${jq_app_label_query}" | grep -q "Running" && return 0
 
-  log-info "Couldn't find label: app=${name}, looking for label: provider=${name}"
+  log-info "Looking for label: provider=${name}"
   local jq_provider_label_query=".items[] | select(.metadata.labels.provider == \"${name}\") | .status.phase"
   kubectl get pods -o json | jq -r "${jq_provider_label_query}" | grep -q "Running" && return 0
+
+  log-info "Looking for label: name=${name}"
+  local jq_provider_label_query=".items[] | select(.metadata.labels.name == \"${name}\") | .status.phase"
+  kubectl get pods -o json | jq -r "${jq_provider_label_query}" | grep -q "Running" && return 0
 }
 
 function healthcheck {
diff --git a/proxy-2-service/manifests/proxy-2-service-pod.yaml b/proxy-2-service/manifests/proxy-2-service-pod.yaml
index d7120da0e6..cba97e6598 100644
--- a/proxy-2-service/manifests/proxy-2-service-pod.yaml
+++ b/proxy-2-service/manifests/proxy-2-service-pod.yaml
@@ -1,8 +1,9 @@
 apiVersion: v1
 kind: Pod
 metadata:
-  name: http-proxy
-  heritage: helm
+  name: proxy-2-service
+  labels:
+    heritage: helm
 spec:
   containers:
   - name: http-tcp
diff --git a/redis-cluster/manifests/redis-rc.yaml b/redis-cluster/manifests/redis-rc.yaml
index 40b61c122d..8816f58cc1 100644
--- a/redis-cluster/manifests/redis-rc.yaml
+++ b/redis-cluster/manifests/redis-rc.yaml
@@ -11,6 +11,7 @@ spec:
   template:
     metadata:
       labels:
+        app: redis-cluster
         name: redis
     spec:
       containers:
diff --git a/redis-standalone/manifests/redis-rc.yaml b/redis-standalone/manifests/redis-rc.yaml
index 269353c53e..50bf5fb23c 100644
--- a/redis-standalone/manifests/redis-rc.yaml
+++ b/redis-standalone/manifests/redis-rc.yaml
@@ -14,6 +14,7 @@ spec:
         name: redis-standalone
         mode: standalone
         provider: redis
+        app: redis-standalone
     spec:
       containers:
       - name: redis-standalone
diff --git a/riak/manifests/riak-rc.yaml b/riak/manifests/riak-rc.yaml
index 8907380b21..e20959d4b8 100644
--- a/riak/manifests/riak-rc.yaml
+++ b/riak/manifests/riak-rc.yaml
@@ -8,6 +8,9 @@ metadata:
 spec:
   replicas: 1
   template:
+    metadata:
+      labels:
+        provider: riak
     spec:
       containers:
       - name: riak
diff --git a/selenium/Chart.yaml b/selenium-hub/Chart.yaml
similarity index 100%
rename from selenium/Chart.yaml
rename to selenium-hub/Chart.yaml
diff --git a/selenium/README.md b/selenium-hub/README.md
similarity index 100%
rename from selenium/README.md
rename to selenium-hub/README.md
diff --git a/selenium/manifests/selenium-hub-rc.yaml b/selenium-hub/manifests/selenium-hub-rc.yaml
similarity index 100%
rename from selenium/manifests/selenium-hub-rc.yaml
rename to selenium-hub/manifests/selenium-hub-rc.yaml
diff --git a/selenium/manifests/selenium-hub-svc.yaml b/selenium-hub/manifests/selenium-hub-svc.yaml
similarity index 100%
rename from selenium/manifests/selenium-hub-svc.yaml
rename to selenium-hub/manifests/selenium-hub-svc.yaml
diff --git a/selenium/manifests/selenium-node-chrome-rc.yaml b/selenium-hub/manifests/selenium-node-chrome-rc.yaml
similarity index 100%
rename from selenium/manifests/selenium-node-chrome-rc.yaml
rename to selenium-hub/manifests/selenium-node-chrome-rc.yaml
diff --git a/selenium/manifests/selenium-node-firefox-rc.yaml b/selenium-hub/manifests/selenium-node-firefox-rc.yaml
similarity index 100%
rename from selenium/manifests/selenium-node-firefox-rc.yaml
rename to selenium-hub/manifests/selenium-node-firefox-rc.yaml