diff --git a/Jenkinsfile-voltha-bal31-build b/Jenkinsfile-voltha-bal31-build
index cc5dd61..49892b1 100644
--- a/Jenkinsfile-voltha-bal31-build
+++ b/Jenkinsfile-voltha-bal31-build
@@ -120,7 +120,7 @@
             stage('Push Sadis-config') {
                 timeout(1) {
                     sadis_out = sh returnStatus: true, script: """
-                    if [[ "${onosVersion}" == "1.13.10" || "${onosVersion}" == "2.2" ]]; then
+                    if [[ "${onosVersion}" == "1.13.9" ]]; then
                         curl -sSL --user karaf:karaf -X POST -H Content-Type:application/json http://${deployment_config.nodes[0].ip}:30120/onos/v1/network/configuration --data @$WORKSPACE/voltha-system-tests/tests/data/${configFileName}-${onosVersion}-sadis.json
                     else
                         curl -sSL --user karaf:karaf -X POST -H Content-Type:application/json http://${deployment_config.nodes[0].ip}:30120/onos/v1/network/configuration --data @$WORKSPACE/voltha-system-tests/tests/data/${configFileName}-sadis.json
@@ -192,11 +192,6 @@
                             sshpass -p karaf ssh -p 30115 karaf@${deployment_config.nodes[0].ip} "log:set TRACE org.opencord.dhcpl2relay"
                             sshpass -p karaf ssh -p 30115 karaf@${deployment_config.nodes[0].ip} "log:set TRACE org.opencord.aaa"
                             sshpass -p karaf ssh -p 30115 karaf@${deployment_config.nodes[0].ip} "log:set TRACE org.opencord.olt"
-                            if [[ "${onosVersion}" == "1.13.10" || "${onosVersion}" == "2.2" ]]; then
-                                sshpass -p karaf ssh -p 30115 karaf@${deployment_config.nodes[0].ip} "cfg set org.opencord.olt.impl.OltFlowService enableDhcpOnProvisioning true"
-                                sshpass -p karaf ssh -p 30115 karaf@${deployment_config.nodes[0].ip} "cfg set org.opencord.olt.impl.OltFlowService enableDhcpV4 true"
-                                sshpass -p karaf ssh -p 30115 karaf@${deployment_config.nodes[0].ip} "cfg set org.opencord.olt.impl.OltFlowService enableEapol true"
-                            fi
                             curl -sSL --user karaf:karaf -X GET http://${deployment_config.nodes[0].ip}:30120/onos/v1/applications/org.onosproject.segmentrouting | jq '.state' | grep ACTIVE
                             """
                             return sr_active_out == 0
@@ -207,6 +202,7 @@
                         for(int i=0; i < deployment_config.hosts.src.size(); i++) {
                             xconnect_out = sh returnStatus: true, script: """
                             version=\$(sshpass -p karaf ssh -p 30115 karaf@${deployment_config.nodes[0].ip} "summary" | grep version)
+                            sleep 10
                             if [[ \$version == *"version=2.2"* ]]; then
                                 curl -X POST --user karaf:karaf --header 'Content-Type: application/json' --header 'Accept: application/json' -d '{"deviceId": "${deployment_config.fabric_switches[0].device_id}", "vlanId": "${deployment_config.hosts.src[i].s_tag}", "endpoints": [${deployment_config.fabric_switches[0].bngPort},${deployment_config.fabric_switches[0].oltPort}]}' 'http://${deployment_config.nodes[0].ip}:30120/onos/segmentrouting/xconnect'
                             else
diff --git a/tests/data/flex-ocp-cord-1.13.9-sadis.json b/tests/data/flex-ocp-cord-1.13.9-sadis.json
new file mode 100644
index 0000000..3744deb
--- /dev/null
+++ b/tests/data/flex-ocp-cord-1.13.9-sadis.json
@@ -0,0 +1,196 @@
+{
+  "devices": {
+    "of:000000000ac014ce": {
+      "basic": {
+        "driver": "voltha"
+      }
+    }
+  },
+  "apps": {
+    "org.opencord.sadis": {
+      "sadis": {
+        "integration": {
+          "cache": {
+            "enabled": false,
+            "maxsize": 50,
+            "ttl": "PT0m"
+          }
+        },
+        "entries": [
+          {
+            "id": "ALPHe3d1cfa7-1",
+            "cTag": 901,
+            "sTag": 111,
+            "nasPortId": "ALPHe3d1cfa7-1",
+            "circuitId": "ALPHe3d1cfa7-1",
+            "remoteId": "EC1838000853",
+            "technologyProfileId": 64,
+            "upstreamBandwidthProfile": "User_Bandwidth3",
+            "downstreamBandwidthProfile": "User_Bandwidth2"
+          },
+          {
+            "id": "ALPHe3d1cfa7-2",
+            "cTag": 902,
+            "sTag": 111,
+            "nasPortId": "ALPHe3d1cfa7-2",
+            "circuitId": "ALPHe3d1cfa7-2",
+            "remoteId": "EC1838000853",
+            "technologyProfileId": 64,
+            "upstreamBandwidthProfile": "Default",
+            "downstreamBandwidthProfile": "Default"
+          },
+          {
+            "id": "ALPHe3d1cfa7-3",
+            "cTag": 903,
+            "sTag": 111,
+            "nasPortId": "ALPHe3d1cfa7-3",
+            "circuitId": "ALPHe3d1cfa7-3",
+            "remoteId": "EC1838000853",
+            "technologyProfileId": 64,
+            "upstreamBandwidthProfile": "Default",
+            "downstreamBandwidthProfile": "Default"
+          },
+          {
+            "id": "ALPHe3d1cfa7-4",
+            "cTag": 904,
+            "sTag": 111,
+            "nasPortId": "ALPHe3d1cfa7-4",
+            "circuitId": "ALPHe3d1cfa7-4",
+            "remoteId": "EC1838000853",
+            "technologyProfileId": 64,
+            "upstreamBandwidthProfile": "Default",
+            "downstreamBandwidthProfile": "Default"
+          },
+          {
+            "id": "ALPHe3d1cfa7-5",
+            "cTag": 905,
+            "sTag": 111,
+            "nasPortId": "ALPHe3d1cfa7-5",
+            "circuitId": "ALPHe3d1cfa7-5",
+            "remoteId": "EC1838000853",
+            "technologyProfileId": 64,
+            "upstreamBandwidthProfile": "Default",
+            "downstreamBandwidthProfile": "Default"
+          },
+          {
+            "id": "ALPHe3d1cea3-1",
+            "cTag": 801,
+            "sTag": 111,
+            "nasPortId": "ALPHe3d1cea3-1",
+            "circuitId": "ALPHe3d1cea3-1",
+            "remoteId": "EC1838000853",
+            "technologyProfileId": 64,
+            "upstreamBandwidthProfile": "User_Bandwidth2",
+            "downstreamBandwidthProfile": "User_Bandwidth2"
+          },
+          {
+            "id": "ALPHe3d1cea3-2",
+            "cTag": 802,
+            "sTag": 111,
+            "nasPortId": "ALPHe3d1cea3-2",
+            "circuitId": "ALPHe3d1cea3-2",
+            "remoteId": "EC1838000853",
+            "technologyProfileId": 64,
+            "upstreamBandwidthProfile": "Default",
+            "downstreamBandwidthProfile": "Default"
+          },
+          {
+            "id": "ALPHe3d1cea3-3",
+            "cTag": 803,
+            "sTag": 111,
+            "nasPortId": "ALPHe3d1cea3-3",
+            "circuitId": "ALPHe3d1cea3-3",
+            "remoteId": "EC1838000853",
+            "technologyProfileId": 64,
+            "upstreamBandwidthProfile": "Default",
+            "downstreamBandwidthProfile": "Default"
+          },
+          {
+            "id": "ALPHe3d1cea3-4",
+            "cTag": 804,
+            "sTag": 111,
+            "nasPortId": "ALPHe3d1cea3-4",
+            "circuitId": "ALPHe3d1cea3-4",
+            "remoteId": "EC1838000853",
+            "technologyProfileId": 64,
+            "upstreamBandwidthProfile": "Default",
+            "downstreamBandwidthProfile": "Default"
+          },
+          {
+            "id": "ALPHe3d1cea3-5",
+            "cTag": 805,
+            "sTag": 111,
+            "nasPortId": "ALPHe3d1cea3-5",
+            "circuitId": "ALPHe3d1cea3-5",
+            "remoteId": "EC1838000853",
+            "technologyProfileId": 64,
+            "upstreamBandwidthProfile": "Default",
+            "downstreamBandwidthProfile": "Default"
+          },
+          {
+            "id": "ALPHe3d1ceb7-1",
+            "cTag": 101,
+            "sTag": 222,
+            "nasPortId": "ALPHe3d1ceb7-1",
+            "circuitId": "ALPHe3d1ceb7-1",
+            "remoteId": "EC1838000853",
+            "technologyProfileId": 64,
+            "upstreamBandwidthProfile": "Default",
+            "downstreamBandwidthProfile": "Default"
+          },
+          {
+            "id": "EC1838000853",
+            "hardwareIdentifier": "aa:bb:cc:dd:ee:ff",
+            "ipAddress": "10.192.20.206",
+            "nasId": "EC1838000853",
+            "uplinkPort": 1048576
+          }
+        ]
+      },
+      "bandwidthprofile":{
+          "integration":{
+              "cache":{
+                  "enabled":true,
+                  "maxsize":40,
+                  "ttl":"PT1m"
+              }
+          },
+          "entries":[
+              {
+                  "id": "Default",
+                  "air": 100000,
+                  "cbs": 30,
+                  "cir": 16000,
+                  "ebs": 30,
+                  "eir": 16000
+              },
+              {
+                  "id": "User_Bandwidth1",
+                  "air": 100000,
+                  "cbs": 10000,
+                  "cir": 30000,
+                  "ebs": 1000,
+                  "eir": 20000
+              },
+              {
+                  "id": "User_Bandwidth2",
+                  "air": 100000,
+                  "cbs": 5000,
+                  "cir": 100000,
+                  "ebs": 5000,
+                  "eir": 100000
+              },
+              {
+                  "id": "User_Bandwidth3",
+                  "air": 100000,
+                  "cbs": 5000,
+                  "cir": 1000000,
+                  "ebs": 5000,
+                  "eir": 1000000
+              }
+
+          ]
+      }
+    }
+  }
+}
diff --git a/tests/data/flex-ocp-cord-2.2-sadis.json b/tests/data/flex-ocp-cord-2.2-sadis.json
deleted file mode 100644
index 307cb6b..0000000
--- a/tests/data/flex-ocp-cord-2.2-sadis.json
+++ /dev/null
@@ -1,117 +0,0 @@
-{
-  "devices": {
-    "of:000000000ac014ce": {
-      "basic": {
-        "driver": "voltha"
-      }
-    }
-  },
-  "apps": {
-    "org.opencord.sadis": {
-      "sadis": {
-        "integration": {
-          "cache": {
-            "enabled": false,
-            "maxsize": 50,
-            "ttl": "PT0m"
-          }
-        },
-        "entries": [
-          {
-            "id": "ALPHe3d1cfa7-1",
-            "nasPortId": "ALPHe3d1cfa7-1",
-            "circuitId": "ALPHe3d1cfa7-1",
-            "remoteId": "EC1838000853",
-            "uniTagList": [{
-              "ponCTag": 901,
-              "ponSTag": 111,
-              "technologyProfileId": 64,
-              "upstreamBandwidthProfile": "User_Bandwidth3",
-              "downstreamBandwidthProfile": "User_Bandwidth2",
-              "isDhcpRequired": true
-            }]
-          },
-          {
-            "id": "ALPHe3d1cea3-1",
-            "nasPortId": "ALPHe3d1cea3-1",
-            "circuitId": "ALPHe3d1cea3-1",
-            "remoteId": "EC1838000853",
-            "uniTagList": [{
-              "ponCTag": 801,
-              "ponSTag": 111,
-              "technologyProfileId": 64,
-              "upstreamBandwidthProfile": "User_Bandwidth2",
-              "downstreamBandwidthProfile": "User_Bandwidth2",
-              "isDhcpRequired": true
-            }]
-          },
-          {
-            "id": "ALPHe3d1ceb7-1",
-            "nasPortId": "ALPHe3d1ceb7-1",
-            "circuitId": "ALPHe3d1ceb7-1",
-            "remoteId": "EC1838000853",
-            "uniTagList": [{
-              "ponCTag": 101,
-              "ponSTag": 222,
-              "technologyProfileId": 64,
-              "upstreamBandwidthProfile": "Default",
-              "downstreamBandwidthProfile": "Default",
-              "isDhcpRequired": true
-            }]
-          },
-          {
-            "id": "EC1838000853",
-            "hardwareIdentifier": "aa:bb:cc:dd:ee:ff",
-            "ipAddress": "10.192.20.206",
-            "nasId": "EC1838000853",
-            "uplinkPort": 1048576
-          }
-        ]
-      },
-      "bandwidthprofile":{
-          "integration":{
-              "cache":{
-                  "enabled":true,
-                  "maxsize":40,
-                  "ttl":"PT1m"
-              }
-          },
-          "entries":[
-              {
-                  "id": "Default",
-                  "air": 100000,
-                  "cbs": 30,
-                  "cir": 16000,
-                  "ebs": 30,
-                  "eir": 16000
-              },
-              {
-                  "id": "User_Bandwidth1",
-                  "air": 100000,
-                  "cbs": 10000,
-                  "cir": 30000,
-                  "ebs": 1000,
-                  "eir": 20000
-              },
-              {
-                  "id": "User_Bandwidth2",
-                  "air": 100000,
-                  "cbs": 5000,
-                  "cir": 100000,
-                  "ebs": 5000,
-                  "eir": 100000
-              },
-              {
-                  "id": "User_Bandwidth3",
-                  "air": 100000,
-                  "cbs": 5000,
-                  "cir": 1000000,
-                  "ebs": 5000,
-                  "eir": 1000000
-              }
-
-          ]
-      }
-    }
-  }
-}
diff --git a/tests/data/flex-ocp-cord-sadis.json b/tests/data/flex-ocp-cord-sadis.json
index 3744deb..307cb6b 100644
--- a/tests/data/flex-ocp-cord-sadis.json
+++ b/tests/data/flex-ocp-cord-sadis.json
@@ -19,124 +19,45 @@
         "entries": [
           {
             "id": "ALPHe3d1cfa7-1",
-            "cTag": 901,
-            "sTag": 111,
             "nasPortId": "ALPHe3d1cfa7-1",
             "circuitId": "ALPHe3d1cfa7-1",
             "remoteId": "EC1838000853",
-            "technologyProfileId": 64,
-            "upstreamBandwidthProfile": "User_Bandwidth3",
-            "downstreamBandwidthProfile": "User_Bandwidth2"
-          },
-          {
-            "id": "ALPHe3d1cfa7-2",
-            "cTag": 902,
-            "sTag": 111,
-            "nasPortId": "ALPHe3d1cfa7-2",
-            "circuitId": "ALPHe3d1cfa7-2",
-            "remoteId": "EC1838000853",
-            "technologyProfileId": 64,
-            "upstreamBandwidthProfile": "Default",
-            "downstreamBandwidthProfile": "Default"
-          },
-          {
-            "id": "ALPHe3d1cfa7-3",
-            "cTag": 903,
-            "sTag": 111,
-            "nasPortId": "ALPHe3d1cfa7-3",
-            "circuitId": "ALPHe3d1cfa7-3",
-            "remoteId": "EC1838000853",
-            "technologyProfileId": 64,
-            "upstreamBandwidthProfile": "Default",
-            "downstreamBandwidthProfile": "Default"
-          },
-          {
-            "id": "ALPHe3d1cfa7-4",
-            "cTag": 904,
-            "sTag": 111,
-            "nasPortId": "ALPHe3d1cfa7-4",
-            "circuitId": "ALPHe3d1cfa7-4",
-            "remoteId": "EC1838000853",
-            "technologyProfileId": 64,
-            "upstreamBandwidthProfile": "Default",
-            "downstreamBandwidthProfile": "Default"
-          },
-          {
-            "id": "ALPHe3d1cfa7-5",
-            "cTag": 905,
-            "sTag": 111,
-            "nasPortId": "ALPHe3d1cfa7-5",
-            "circuitId": "ALPHe3d1cfa7-5",
-            "remoteId": "EC1838000853",
-            "technologyProfileId": 64,
-            "upstreamBandwidthProfile": "Default",
-            "downstreamBandwidthProfile": "Default"
+            "uniTagList": [{
+              "ponCTag": 901,
+              "ponSTag": 111,
+              "technologyProfileId": 64,
+              "upstreamBandwidthProfile": "User_Bandwidth3",
+              "downstreamBandwidthProfile": "User_Bandwidth2",
+              "isDhcpRequired": true
+            }]
           },
           {
             "id": "ALPHe3d1cea3-1",
-            "cTag": 801,
-            "sTag": 111,
             "nasPortId": "ALPHe3d1cea3-1",
             "circuitId": "ALPHe3d1cea3-1",
             "remoteId": "EC1838000853",
-            "technologyProfileId": 64,
-            "upstreamBandwidthProfile": "User_Bandwidth2",
-            "downstreamBandwidthProfile": "User_Bandwidth2"
-          },
-          {
-            "id": "ALPHe3d1cea3-2",
-            "cTag": 802,
-            "sTag": 111,
-            "nasPortId": "ALPHe3d1cea3-2",
-            "circuitId": "ALPHe3d1cea3-2",
-            "remoteId": "EC1838000853",
-            "technologyProfileId": 64,
-            "upstreamBandwidthProfile": "Default",
-            "downstreamBandwidthProfile": "Default"
-          },
-          {
-            "id": "ALPHe3d1cea3-3",
-            "cTag": 803,
-            "sTag": 111,
-            "nasPortId": "ALPHe3d1cea3-3",
-            "circuitId": "ALPHe3d1cea3-3",
-            "remoteId": "EC1838000853",
-            "technologyProfileId": 64,
-            "upstreamBandwidthProfile": "Default",
-            "downstreamBandwidthProfile": "Default"
-          },
-          {
-            "id": "ALPHe3d1cea3-4",
-            "cTag": 804,
-            "sTag": 111,
-            "nasPortId": "ALPHe3d1cea3-4",
-            "circuitId": "ALPHe3d1cea3-4",
-            "remoteId": "EC1838000853",
-            "technologyProfileId": 64,
-            "upstreamBandwidthProfile": "Default",
-            "downstreamBandwidthProfile": "Default"
-          },
-          {
-            "id": "ALPHe3d1cea3-5",
-            "cTag": 805,
-            "sTag": 111,
-            "nasPortId": "ALPHe3d1cea3-5",
-            "circuitId": "ALPHe3d1cea3-5",
-            "remoteId": "EC1838000853",
-            "technologyProfileId": 64,
-            "upstreamBandwidthProfile": "Default",
-            "downstreamBandwidthProfile": "Default"
+            "uniTagList": [{
+              "ponCTag": 801,
+              "ponSTag": 111,
+              "technologyProfileId": 64,
+              "upstreamBandwidthProfile": "User_Bandwidth2",
+              "downstreamBandwidthProfile": "User_Bandwidth2",
+              "isDhcpRequired": true
+            }]
           },
           {
             "id": "ALPHe3d1ceb7-1",
-            "cTag": 101,
-            "sTag": 222,
             "nasPortId": "ALPHe3d1ceb7-1",
             "circuitId": "ALPHe3d1ceb7-1",
             "remoteId": "EC1838000853",
-            "technologyProfileId": 64,
-            "upstreamBandwidthProfile": "Default",
-            "downstreamBandwidthProfile": "Default"
+            "uniTagList": [{
+              "ponCTag": 101,
+              "ponSTag": 222,
+              "technologyProfileId": 64,
+              "upstreamBandwidthProfile": "Default",
+              "downstreamBandwidthProfile": "Default",
+              "isDhcpRequired": true
+            }]
           },
           {
             "id": "EC1838000853",
diff --git a/tests/data/onf-demo-pod-1.13.10-sadis.json b/tests/data/onf-demo-pod-1.13.9-sadis.json
similarity index 72%
rename from tests/data/onf-demo-pod-1.13.10-sadis.json
rename to tests/data/onf-demo-pod-1.13.9-sadis.json
index 6208870..fbf08dd 100644
--- a/tests/data/onf-demo-pod-1.13.10-sadis.json
+++ b/tests/data/onf-demo-pod-1.13.9-sadis.json
@@ -19,45 +19,36 @@
         "entries": [
           {
             "id": "BRCM22222222-1",
+            "cTag": 11,
+            "sTag": 99,
             "nasPortId": "BRCM22222222-1",
             "circuitId": "",
             "remoteId": "",
-            "uniTagList": [{
-              "ponCTag": 11,
-              "ponSTag": 99,
-              "technologyProfileId": 64,
-              "downstreamBandwidthProfile": "Default",
-              "upstreamBandwidthProfile": "Default",
-              "isDhcpRequired": true
-            }]
+            "technologyProfileId": 64,
+            "upstreamBandwidthProfile": "Default",
+            "downstreamBandwidthProfile": "Default"
           },
           {
             "id": "ALPHe3d1cf9d-1",
+            "cTag": 22,
+            "sTag": 99,
             "nasPortId": "ALPHe3d1cf9d-1",
             "circuitId": "",
             "remoteId": "",
-            "uniTagList": [{
-              "ponCTag": 22,
-              "ponSTag": 99,
-              "technologyProfileId": 64,
-              "downstreamBandwidthProfile": "Default",
-              "upstreamBandwidthProfile": "Default",
-              "isDhcpRequired": true
-            }]
+            "technologyProfileId": 64,
+            "upstreamBandwidthProfile": "User_Bandwidth1",
+            "downstreamBandwidthProfile": "User_Bandwidth2"
           },
           {
             "id": "ALPHe3d1ced5-1",
+            "cTag": 33,
+            "sTag": 99,
             "nasPortId": "ALPHe3d1ced5-1",
             "circuitId": "",
             "remoteId": "",
-            "uniTagList": [{
-              "ponCTag": 33,
-              "ponSTag": 99,
-              "technologyProfileId": 64,
-              "downstreamBandwidthProfile": "Default",
-              "upstreamBandwidthProfile": "Default",
-              "isDhcpRequired": true
-            }]
+            "technologyProfileId": 64,
+            "upstreamBandwidthProfile": "User_Bandwidth3",
+            "downstreamBandwidthProfile": "User_Bandwidth3"
           },
           {
             "id": "EC1904000654",
diff --git a/tests/data/onf-demo-pod-sadis.json b/tests/data/onf-demo-pod-sadis.json
index fbf08dd..6208870 100644
--- a/tests/data/onf-demo-pod-sadis.json
+++ b/tests/data/onf-demo-pod-sadis.json
@@ -19,36 +19,45 @@
         "entries": [
           {
             "id": "BRCM22222222-1",
-            "cTag": 11,
-            "sTag": 99,
             "nasPortId": "BRCM22222222-1",
             "circuitId": "",
             "remoteId": "",
-            "technologyProfileId": 64,
-            "upstreamBandwidthProfile": "Default",
-            "downstreamBandwidthProfile": "Default"
+            "uniTagList": [{
+              "ponCTag": 11,
+              "ponSTag": 99,
+              "technologyProfileId": 64,
+              "downstreamBandwidthProfile": "Default",
+              "upstreamBandwidthProfile": "Default",
+              "isDhcpRequired": true
+            }]
           },
           {
             "id": "ALPHe3d1cf9d-1",
-            "cTag": 22,
-            "sTag": 99,
             "nasPortId": "ALPHe3d1cf9d-1",
             "circuitId": "",
             "remoteId": "",
-            "technologyProfileId": 64,
-            "upstreamBandwidthProfile": "User_Bandwidth1",
-            "downstreamBandwidthProfile": "User_Bandwidth2"
+            "uniTagList": [{
+              "ponCTag": 22,
+              "ponSTag": 99,
+              "technologyProfileId": 64,
+              "downstreamBandwidthProfile": "Default",
+              "upstreamBandwidthProfile": "Default",
+              "isDhcpRequired": true
+            }]
           },
           {
             "id": "ALPHe3d1ced5-1",
-            "cTag": 33,
-            "sTag": 99,
             "nasPortId": "ALPHe3d1ced5-1",
             "circuitId": "",
             "remoteId": "",
-            "technologyProfileId": 64,
-            "upstreamBandwidthProfile": "User_Bandwidth3",
-            "downstreamBandwidthProfile": "User_Bandwidth3"
+            "uniTagList": [{
+              "ponCTag": 33,
+              "ponSTag": 99,
+              "technologyProfileId": 64,
+              "downstreamBandwidthProfile": "Default",
+              "upstreamBandwidthProfile": "Default",
+              "isDhcpRequired": true
+            }]
           },
           {
             "id": "EC1904000654",