diff --git a/jjb/docs.yaml b/jjb/docs.yaml
index e59fa44..aec942f 100644
--- a/jjb/docs.yaml
+++ b/jjb/docs.yaml
@@ -51,6 +51,9 @@
               file-paths:
                 - compare-type: REG_EXP
                   pattern: '{doc-files-regexp}'
+              file-paths:
+                - compare-type: REG_EXP
+                  pattern: '.*\.md'
 
     properties:
       - cord-infra-properties:
diff --git a/jjb/pipeline/all-xos-api-test-helm.groovy b/jjb/pipeline/all-xos-api-test-helm.groovy
index 4437414..9dcb6ce 100644
--- a/jjb/pipeline/all-xos-api-test-helm.groovy
+++ b/jjb/pipeline/all-xos-api-test-helm.groovy
@@ -190,8 +190,13 @@
     post {
         always {
             sh '''
-                kubectl get pods --all-namespaces
-                helm list
+              kubectl get pods --all-namespaces
+              helm list
+              helm delete --purge xos-core
+              if [[ "$GERRIT_PROJECT" =~ ^(rcord|vrouter|vsg|vtn|vtr|fabric|openstack|chameleon|exampleservice|simpleexampleservice|onos-service|olt-service|kubernetes-service)\$ ]]; then
+                helm delete --purge rcord-lite
+              fi
+              minikube delete
             '''
             step([$class: 'Mailer', notifyEveryUnstableBuild: true, recipients: "suchitra@opennetworking.org, you@opennetworking.org, kailash@opennetworking.org", sendToIndividuals: false])
         }
diff --git a/jjb/pipeline/helm-api-test.groovy b/jjb/pipeline/helm-api-test.groovy
index 4540502..7271d7a 100644
--- a/jjb/pipeline/helm-api-test.groovy
+++ b/jjb/pipeline/helm-api-test.groovy
@@ -130,6 +130,7 @@
          kubectl logs xos-core-api-test
          kubectl delete pod xos-core-api-test
          helm delete --purge xos-core
+         minikube delete
          '''
       deleteDir()
     }
diff --git a/jjb/verify/xos-tosca.yaml b/jjb/verify/xos-tosca.yaml
index 3fbf0df..df2d896 100644
--- a/jjb/verify/xos-tosca.yaml
+++ b/jjb/verify/xos-tosca.yaml
@@ -6,7 +6,7 @@
     project: '{name}'
 
     jobs:
-      - 'verify-xos-jobs':
+      - 'verify-xos-tosca-jobs':
           branch-regexp: '{supported-branches-regexp}'
 
 - job-group:
@@ -17,6 +17,6 @@
           dependency-jobs: 'verify_xos-tosca_licensed'
       - 'api-test':
           dependency-jobs: 'verify_xos-tosca_sonarqube'
-          pipeline_script: 'all-xos-tosca-api-test-helm.groovy'
+          pipeline_script: 'all-xos-api-test-helm.groovy'
       - 'xos-tosca-unit-test':
           dependency-jobs: 'verify_xos-tosca_sonarqube'
diff --git a/jjb/xos-unit.yaml b/jjb/xos-unit.yaml
index 3ac10ed..6d16939 100644
--- a/jjb/xos-unit.yaml
+++ b/jjb/xos-unit.yaml
@@ -62,12 +62,17 @@
           pip install networkx==1.11
           pip install netaddr==0.7.19
           pip install ipaddress==1.0.19
+          pip install grpcio==1.9.1
+          pip install grpcio-tools==1.9.1
           echo "Requirements Installed"
 
           cd $BASEDIR/cord/orchestration/xos/lib/xos-util; python setup.py install; echo "xos-util Installed"
           cd $BASEDIR/cord/orchestration/xos/lib/xos-config; python setup.py install; echo "xos-config Installed"
           cd $BASEDIR/cord/orchestration/xos/lib/xos-genx; python setup.py install; echo "xos-genx Installed"
 
+          cd $BASEDIR/cord/orchestration/xos/xos/xos_client/xosapi; ln -s ../../../../../component/chameleon chameleon
+          cd $BASEDIR/cord/orchestration/xos/xos/xos_client; make; echo "xos-client Installed"
+
           # Run the tests
           if [ $GERRIT_PROJECT = 'xos' ] ; then
             cd $BASEDIR