diff --git a/tests/data/dt-berlin-pod-1.13.9-sadis.json b/tests/data/dt-berlin-pod-1.13.9-sadis.json
deleted file mode 100644
index e5ffe1e..0000000
--- a/tests/data/dt-berlin-pod-1.13.9-sadis.json
+++ /dev/null
@@ -1,78 +0,0 @@
-{
-  "apps": {
-    "org.opencord.sadis": {
-      "sadis": {
-        "integration": {
-          "cache": {
-            "enabled": false,
-            "maxsize": 50,
-            "ttl": "PT0m"
-          }
-        },
-        "entries": [
-          {
-            "id": "ALPHe3d1cf5c-1",
-            "cTag": 11,
-            "sTag": 11,
-            "nasPortId": "ALPHe3d1cf5c-1",
-            "circuitId": "ALPHe3d1cf5c-1",
-            "remoteId": "EC1729003539",
-            "technologyProfileId": 64,
-            "upstreamBandwidthProfile": "User_Bandwidth3",
-            "downstreamBandwidthProfile": "User_Bandwidth2"
-          },
-          {
-            "id": "EC1729003539",
-            "hardwareIdentifier": "aa:bb:cc:dd:ee:ff",
-            "nasId": "EC1729003539",
-            "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/dt-berlin-pod-gpon-sadis-DT.json b/tests/data/dt-berlin-pod-gpon-sadis-DT.json
index 9776d91..91d3965 100644
--- a/tests/data/dt-berlin-pod-gpon-sadis-DT.json
+++ b/tests/data/dt-berlin-pod-gpon-sadis-DT.json
@@ -42,8 +42,8 @@
                 "ponCTag": 4096,
                 "ponSTag": 32,
                 "technologyProfileId": 64,
-                "upstreamBandwidthProfile": "Default",
-                "downstreamBandwidthProfile": "Default",
+                "upstreamBandwidthProfile": "User_Bandwidth1",
+                "downstreamBandwidthProfile": "User_Bandwidth2",
                 "isDhcpRequired": false
               }]
           },
@@ -58,8 +58,8 @@
                 "ponCTag": 4096,
                 "ponSTag": 33,
                 "technologyProfileId": 64,
-                "upstreamBandwidthProfile": "Default",
-                "downstreamBandwidthProfile": "Default",
+                "upstreamBandwidthProfile": "User_Bandwidth3",
+                "downstreamBandwidthProfile": "User_Bandwidth3",
                 "isDhcpRequired": false
               }]
           }]
@@ -101,9 +101,9 @@
                   "id": "User_Bandwidth3",
                   "air": 100000,
                   "cbs": 5000,
-                  "cir": 1000000,
+                  "cir": 500000,
                   "ebs": 5000,
-                  "eir": 1000000
+                  "eir": 500000
               }
 
           ]
diff --git a/tests/data/dt-berlin-pod-multi-olt-sadis.json b/tests/data/dt-berlin-pod-multi-olt-sadis.json
index 3ebcabf..c3aef90 100644
--- a/tests/data/dt-berlin-pod-multi-olt-sadis.json
+++ b/tests/data/dt-berlin-pod-multi-olt-sadis.json
@@ -78,8 +78,8 @@
               "ponCTag": 11,
               "ponSTag": 11,
               "technologyProfileId": 64,
-              "upstreamBandwidthProfile": "Default",
-              "downstreamBandwidthProfile": "Default",
+              "upstreamBandwidthProfile": "User_Bandwidth1",
+              "downstreamBandwidthProfile": "User_Bandwidth2",
               "isDhcpRequired": true
             }]
           },
@@ -93,8 +93,8 @@
                 "ponCTag": 7,
                 "ponSTag": 11,
                 "technologyProfileId": 64,
-                "upstreamBandwidthProfile": "Default",
-                "downstreamBandwidthProfile": "Default",
+                "upstreamBandwidthProfile": "User_Bandwidth3",
+                "downstreamBandwidthProfile": "User_Bandwidth3",
                 "isDhcpRequired": true
               }]
           }]
@@ -136,9 +136,9 @@
                   "id": "User_Bandwidth3",
                   "air": 100000,
                   "cbs": 5000,
-                  "cir": 1000000,
+                  "cir": 500000,
                   "ebs": 5000,
-                  "eir": 1000000
+                  "eir": 500000
               }
 
           ]
diff --git a/tests/data/dt-berlin-pod-sadis.json b/tests/data/dt-berlin-pod-sadis.json
index 50733cc..1dab2db 100644
--- a/tests/data/dt-berlin-pod-sadis.json
+++ b/tests/data/dt-berlin-pod-sadis.json
@@ -40,8 +40,8 @@
                 "ponCTag": 7,
                 "ponSTag": 11,
                 "technologyProfileId": 64,
-                "upstreamBandwidthProfile": "Default",
-                "downstreamBandwidthProfile": "Default",
+                "upstreamBandwidthProfile": "User_Bandwidth3",
+                "downstreamBandwidthProfile": "User_Bandwidth3",
                 "isDhcpRequired": true
               }]
           }]
@@ -83,9 +83,9 @@
                   "id": "User_Bandwidth3",
                   "air": 100000,
                   "cbs": 5000,
-                  "cir": 1000000,
+                  "cir": 500000,
                   "ebs": 5000,
-                  "eir": 1000000
+                  "eir": 500000
               }
 
           ]
diff --git a/tests/data/flex-ocp-cord-1.13.9-sadis.json b/tests/data/flex-ocp-cord-1.13.9-sadis.json
deleted file mode 100644
index 3744deb..0000000
--- a/tests/data/flex-ocp-cord-1.13.9-sadis.json
+++ /dev/null
@@ -1,196 +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",
-            "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-sadis.json b/tests/data/flex-ocp-cord-sadis.json
index 307cb6b..254e367 100644
--- a/tests/data/flex-ocp-cord-sadis.json
+++ b/tests/data/flex-ocp-cord-sadis.json
@@ -27,7 +27,7 @@
               "ponSTag": 111,
               "technologyProfileId": 64,
               "upstreamBandwidthProfile": "User_Bandwidth3",
-              "downstreamBandwidthProfile": "User_Bandwidth2",
+              "downstreamBandwidthProfile": "User_Bandwidth3",
               "isDhcpRequired": true
             }]
           },
@@ -40,7 +40,7 @@
               "ponCTag": 801,
               "ponSTag": 111,
               "technologyProfileId": 64,
-              "upstreamBandwidthProfile": "User_Bandwidth2",
+              "upstreamBandwidthProfile": "User_Bandwidth1",
               "downstreamBandwidthProfile": "User_Bandwidth2",
               "isDhcpRequired": true
             }]
@@ -105,9 +105,9 @@
                   "id": "User_Bandwidth3",
                   "air": 100000,
                   "cbs": 5000,
-                  "cir": 1000000,
+                  "cir": 500000,
                   "ebs": 5000,
-                  "eir": 1000000
+                  "eir": 500000
               }
 
           ]
diff --git a/tests/data/infosys-pod-sadis.json b/tests/data/infosys-pod-sadis.json
index 45e7488..22f0010 100644
--- a/tests/data/infosys-pod-sadis.json
+++ b/tests/data/infosys-pod-sadis.json
@@ -26,8 +26,8 @@
               "ponCTag": 222,
               "ponSTag": 111,
               "technologyProfileId": 64,
-              "upstreamBandwidthProfile": "User_Bandwidth3",
-              "downstreamBandwidthProfile": "User_Bandwidth2",
+              "upstreamBandwidthProfile": "User_Bandwidth2",
+              "downstreamBandwidthProfile": "User_Bandwidth3",
               "isDhcpRequired": true
             }]
           },
@@ -77,9 +77,9 @@
                   "id": "User_Bandwidth3",
                   "air": 100000,
                   "cbs": 5000,
-                  "cir": 1000000,
+                  "cir": 500000,
                   "ebs": 5000,
-                  "eir": 1000000
+                  "eir": 500000
               }
 
           ]
diff --git a/tests/data/onf-demo-pod-1.13.9-sadis.json b/tests/data/onf-demo-pod-1.13.9-sadis.json
deleted file mode 100644
index fbf08dd..0000000
--- a/tests/data/onf-demo-pod-1.13.9-sadis.json
+++ /dev/null
@@ -1,108 +0,0 @@
-{
-  "devices": {
-    "of:000000000a80645a": {
-      "basic": {
-        "driver": "voltha"
-      }
-    }
-  },
-  "apps": {
-    "org.opencord.sadis": {
-      "sadis": {
-        "integration": {
-          "cache": {
-            "enabled": false,
-            "maxsize": 50,
-            "ttl": "PT0m"
-          }
-        },
-        "entries": [
-          {
-            "id": "BRCM22222222-1",
-            "cTag": 11,
-            "sTag": 99,
-            "nasPortId": "BRCM22222222-1",
-            "circuitId": "",
-            "remoteId": "",
-            "technologyProfileId": 64,
-            "upstreamBandwidthProfile": "Default",
-            "downstreamBandwidthProfile": "Default"
-          },
-          {
-            "id": "ALPHe3d1cf9d-1",
-            "cTag": 22,
-            "sTag": 99,
-            "nasPortId": "ALPHe3d1cf9d-1",
-            "circuitId": "",
-            "remoteId": "",
-            "technologyProfileId": 64,
-            "upstreamBandwidthProfile": "User_Bandwidth1",
-            "downstreamBandwidthProfile": "User_Bandwidth2"
-          },
-          {
-            "id": "ALPHe3d1ced5-1",
-            "cTag": 33,
-            "sTag": 99,
-            "nasPortId": "ALPHe3d1ced5-1",
-            "circuitId": "",
-            "remoteId": "",
-            "technologyProfileId": 64,
-            "upstreamBandwidthProfile": "User_Bandwidth3",
-            "downstreamBandwidthProfile": "User_Bandwidth3"
-          },
-          {
-            "id": "EC1904000654",
-            "hardwareIdentifier": "aa:bb:cc:dd:ee:ff",
-            "ipAddress": "10.192.20.206",
-            "nasId": "EC1904000654",
-            "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/onf-demo-pod-sadis-DT.json b/tests/data/onf-demo-pod-sadis-DT.json
index b2b9a4d..cbaa3b0 100644
--- a/tests/data/onf-demo-pod-sadis-DT.json
+++ b/tests/data/onf-demo-pod-sadis-DT.json
@@ -42,8 +42,8 @@
               "ponCTag": 4096,
               "ponSTag": 22,
               "technologyProfileId": 64,
-              "downstreamBandwidthProfile": "Default",
-              "upstreamBandwidthProfile": "Default",
+              "downstreamBandwidthProfile": "User_Bandwidth2",
+              "upstreamBandwidthProfile": "User_Bandwidth1",
               "isDhcpRequired": false
             }]
           },
@@ -57,8 +57,8 @@
               "ponCTag": 4096,
               "ponSTag": 33,
               "technologyProfileId": 64,
-              "downstreamBandwidthProfile": "Default",
-              "upstreamBandwidthProfile": "Default",
+              "downstreamBandwidthProfile": "User_Bandwidth3",
+              "upstreamBandwidthProfile": "User_Bandwidth3",
               "isDhcpRequired": false
             }]
           },
@@ -108,9 +108,9 @@
                   "id": "User_Bandwidth3",
                   "air": 100000,
                   "cbs": 5000,
-                  "cir": 1000000,
+                  "cir": 500000,
                   "ebs": 5000,
-                  "eir": 1000000
+                  "eir": 500000
               }
 
           ]
diff --git a/tests/data/onf-demo-pod-sadis.json b/tests/data/onf-demo-pod-sadis.json
index 6208870..4d73971 100644
--- a/tests/data/onf-demo-pod-sadis.json
+++ b/tests/data/onf-demo-pod-sadis.json
@@ -54,8 +54,8 @@
               "ponCTag": 33,
               "ponSTag": 99,
               "technologyProfileId": 64,
-              "downstreamBandwidthProfile": "Default",
-              "upstreamBandwidthProfile": "Default",
+              "downstreamBandwidthProfile": "User_Bandwidth2",
+              "upstreamBandwidthProfile": "User_Bandwidth1",
               "isDhcpRequired": true
             }]
           },
@@ -105,9 +105,9 @@
                   "id": "User_Bandwidth3",
                   "air": 100000,
                   "cbs": 5000,
-                  "cir": 1000000,
+                  "cir": 500000,
                   "ebs": 5000,
-                  "eir": 1000000
+                  "eir": 500000
               }
 
           ]
diff --git a/tests/data/sadis-with-tp-16.json b/tests/data/sadis-with-tp-16.json
deleted file mode 100755
index c40db86..0000000
--- a/tests/data/sadis-with-tp-16.json
+++ /dev/null
@@ -1,241 +0,0 @@
-{
-   "org.opencord.sadis": {
-      "sadis": {
-         "integration": {
-            "cache": {
-               "enabled": false,
-               "maxsize": 50,
-               "ttl": "PT0m"
-            }
-         },
-         "entries": [
-            {
-               "id": "BBSIM_OLT_0",
-               "hardwareIdentifier": "00:00:0a:62:ce:e2",
-               "ipAddress": "192.168.1.252",
-               "nasId": "BBSIM_OLT_0",
-               "uplinkPort": 1048576
-            },
-            {
-               "id": "BBSM00000001-1",
-               "cTag": 55,
-               "sTag": 66,
-               "nasPortId": "BBSM00000001-1",
-               "circuitId": "BBSM00000001-1",
-               "remoteId" : "BBSIM_OLT_0",
-               "technologyProfileId": 64,
-               "upstreamBandwidthProfile": "Default",
-               "downstreamBandwidthProfile": "Default"
-            },
-            {
-               "id": "BBSM00000002-1",
-               "cTag": 56,
-               "sTag": 66,
-               "nasPortId": "BBSM00000002-1",
-               "circuitId": "BBSM00000002-1",
-               "remoteId" : "BBSIM_OLT_0",
-               "technologyProfileId": 64,
-               "upstreamBandwidthProfile": "Default",
-               "downstreamBandwidthProfile": "Default"
-            },
-            {
-               "id": "BBSM00000003-1",
-               "cTag": 57,
-               "sTag": 66,
-               "nasPortId": "BBSM00000003-1",
-               "circuitId": "BBSM00000003-1",
-               "remoteId" : "BBSIM_OLT_0",
-               "technologyProfileId": 64,
-               "upstreamBandwidthProfile": "Default",
-               "downstreamBandwidthProfile": "Default"
-            },
-            {
-               "id": "BBSM00000004-1",
-               "cTag": 58,
-               "sTag": 66,
-               "nasPortId": "BBSM00000004-1",
-               "circuitId": "BBSM00000004-1",
-               "remoteId" : "BBSIM_OLT_0",
-               "technologyProfileId": 64,
-               "upstreamBandwidthProfile": "User_Bandwidth1",
-               "downstreamBandwidthProfile": "User_Bandwidth1"
-            },
-            {
-               "id": "BBSM00000005-1",
-               "cTag": 60,
-               "sTag": 77,
-               "nasPortId": "BBSM00000005-1",
-               "circuitId": "BBSM00000005-1",
-               "remoteId" : "BBSIM_OLT_0",
-               "technologyProfileId": 64,
-               "upstreamBandwidthProfile": "Default",
-               "downstreamBandwidthProfile": "Default"
-            },
-            {
-               "id": "BBSM00000006-1",
-               "cTag": 61,
-               "sTag": 77,
-               "nasPortId": "BBSM00000006-1",
-               "circuitId": "BBSM00000006-1",
-               "remoteId" : "BBSIM_OLT_0",
-               "technologyProfileId": 64,
-               "upstreamBandwidthProfile": "Default",
-               "downstreamBandwidthProfile": "Default"
-            },
-            {
-               "id": "BBSM00000007-1",
-               "cTag": 62,
-               "sTag": 77,
-               "nasPortId": "BBSM00000007-1",
-               "circuitId": "BBSM00000007-1",
-               "remoteId" : "BBSIM_OLT_0",
-               "technologyProfileId": 64,
-               "upstreamBandwidthProfile": "Default",
-               "downstreamBandwidthProfile": "Default"
-            },
-            {
-               "id": "BBSM00000008-1",
-               "cTag": 63,
-               "sTag": 77,
-               "nasPortId": "BBSM00000008-1",
-               "circuitId": "BBSM00000008-1",
-               "remoteId" : "BBSIM_OLT_0",
-               "technologyProfileId": 64,
-               "upstreamBandwidthProfile": "Default",
-               "downstreamBandwidthProfile": "Default"
-            },
-            {
-               "id": "BBSM00000009-1",
-               "cTag": 70,
-               "sTag": 88,
-               "nasPortId": "BBSM00000009-1",
-               "circuitId": "BBSM00000009-1",
-               "remoteId" : "BBSIM_OLT_0",
-               "technologyProfileId": 64,
-               "upstreamBandwidthProfile": "Default",
-               "downstreamBandwidthProfile": "Default"
-            },
-            {
-               "id": "BBSM0000000a-1",
-               "cTag": 71,
-               "sTag": 88,
-               "nasPortId": "BBSM0000000a-1",
-               "circuitId": "BBSM0000000a-1",
-               "remoteId" : "BBSIM_OLT_0",
-               "technologyProfileId": 64,
-               "upstreamBandwidthProfile": "User_Bandwidth2",
-               "downstreamBandwidthProfile": "User_Bandwidth2"
-            },
-            {
-               "id": "BBSM0000000b-1",
-               "cTag": 72,
-               "sTag": 88,
-               "nasPortId": "BBSM0000000b-1",
-               "circuitId": "BBSM0000000b-1",
-               "remoteId" : "BBSIM_OLT_0",
-               "technologyProfileId": 64,
-               "upstreamBandwidthProfile": "Default",
-               "downstreamBandwidthProfile": "Default"
-            },
-            {
-               "id": "BBSM0000000c-1",
-               "cTag": 73,
-               "sTag": 88,
-               "nasPortId": "BBSM0000000c-1",
-               "circuitId": "BBSM0000000c-1",
-               "remoteId" : "BBSIM_OLT_0",
-               "technologyProfileId": 64,
-               "upstreamBandwidthProfile": "Default",
-               "downstreamBandwidthProfile": "Default"
-            },
-            {
-               "id": "BBSM0000000d-1",
-               "cTag": 80,
-               "sTag": 99,
-               "nasPortId": "BBSM0000000d-1",
-               "circuitId": "BBSM0000000d-1",
-               "remoteId" : "BBSIM_OLT_0",
-               "technologyProfileId": 64,
-               "upstreamBandwidthProfile": "Default",
-               "downstreamBandwidthProfile": "Default"
-            },
-            {
-               "id": "BBSM0000000e-1",
-               "cTag": 81,
-               "sTag": 99,
-               "nasPortId": "BBSM0000000e-1",
-               "circuitId": "BBSM0000000e-1",
-               "remoteId" : "BBSIM_OLT_0",
-               "technologyProfileId": 64,
-               "upstreamBandwidthProfile": "Default",
-               "downstreamBandwidthProfile": "Default"
-            },
-            {
-               "id": "BBSM0000000f-1",
-               "cTag": 82,
-               "sTag": 99,
-               "nasPortId": "BBSM0000000f-1",
-               "circuitId": "BBSM0000000f-1",
-               "remoteId" : "BBSIM_OLT_0",
-               "technologyProfileId": 64,
-               "upstreamBandwidthProfile": "Default",
-               "downstreamBandwidthProfile": "Default"
-            },
-            {
-               "id": "BBSM00000010-1",
-               "cTag": 83,
-               "sTag": 99,
-               "nasPortId": "BBSM00000010-1",
-               "circuitId": "BBSM00000010-1",
-               "remoteId" : "BBSIM_OLT_0",
-               "technologyProfileId": 64,
-               "upstreamBandwidthProfile": "Default",
-               "downstreamBandwidthProfile": "Default"
-            }
-         ]
-      },
-      "bandwidthprofile": {
-         "integration": {
-            "cache": {
-               "enabled": true,
-               "maxsize": 40,
-               "ttl": "PT1m"
-            }
-         },
-         "entries": [
-            {
-               "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
-            },
-            {
-               "id": "Default",
-               "air": 100000,
-               "cbs": 30,
-               "cir": 600,
-               "ebs": 30,
-               "eir": 400
-            }
-         ]
-      }
-   }
-}
diff --git a/tests/data/sadis-with-tp-8x2.json b/tests/data/sadis-with-tp-8x2.json
deleted file mode 100755
index 1bc90eb..0000000
--- a/tests/data/sadis-with-tp-8x2.json
+++ /dev/null
@@ -1,241 +0,0 @@
-{
-   "org.opencord.sadis": {
-      "sadis": {
-         "integration": {
-            "cache": {
-               "enabled": false,
-               "maxsize": 50,
-               "ttl": "PT0m"
-            }
-         },
-         "entries": [
-            {
-               "id": "BBSIM_OLT_0",
-               "hardwareIdentifier": "00:00:0a:62:ce:e2",
-               "ipAddress": "192.168.1.252",
-               "nasId": "BBSIM_OLT_0",
-               "uplinkPort": 1048576
-            },
-            {
-               "id": "BBSM00000001-1",
-               "cTag": 55,
-               "sTag": 66,
-               "nasPortId": "BBSM00000001-1",
-               "circuitId": "BBSM00000001-1",
-               "remoteId" : "BBSIM_OLT_0",
-               "technologyProfileId": 64,
-               "upstreamBandwidthProfile": "Default",
-               "downstreamBandwidthProfile": "Default"
-            },
-            {
-               "id": "BBSM00000002-1",
-               "cTag": 56,
-               "sTag": 66,
-               "nasPortId": "BBSM00000002-1",
-               "circuitId": "BBSM00000002-1",
-               "remoteId" : "BBSIM_OLT_0",
-               "technologyProfileId": 64,
-               "upstreamBandwidthProfile": "Default",
-               "downstreamBandwidthProfile": "Default"
-            },
-            {
-               "id": "BBSM00000101-1",
-               "cTag": 57,
-               "sTag": 66,
-               "nasPortId": "BBSM00000101-1",
-               "circuitId": "BBSM00000101-1",
-               "remoteId" : "BBSIM_OLT_0",
-               "technologyProfileId": 64,
-               "upstreamBandwidthProfile": "Default",
-               "downstreamBandwidthProfile": "Default"
-            },
-            {
-               "id": "BBSM00000102-1",
-               "cTag": 58,
-               "sTag": 66,
-               "nasPortId": "BBSM00000102-1",
-               "circuitId": "BBSM00000102-1",
-               "remoteId" : "BBSIM_OLT_0",
-               "technologyProfileId": 64,
-               "upstreamBandwidthProfile": "Default",
-               "downstreamBandwidthProfile": "Default"
-            },
-            {
-               "id": "BBSM00000201-1",
-               "cTag": 60,
-               "sTag": 77,
-               "nasPortId": "BBSM00000201-1",
-               "circuitId": "BBSM00000201-1",
-               "remoteId" : "BBSIM_OLT_0",
-               "technologyProfileId": 64,
-               "upstreamBandwidthProfile": "Default",
-               "downstreamBandwidthProfile": "Default"
-            },
-            {
-               "id": "BBSM00000202-1",
-               "cTag": 61,
-               "sTag": 77,
-               "nasPortId": "BBSM00000202-1",
-               "circuitId": "BBSM00000202-1",
-               "remoteId" : "BBSIM_OLT_0",
-               "technologyProfileId": 64,
-               "upstreamBandwidthProfile": "Default",
-               "downstreamBandwidthProfile": "Default"
-            },
-            {
-               "id": "BBSM00000301-1",
-               "cTag": 62,
-               "sTag": 77,
-               "nasPortId": "BBSM00000301-1",
-               "circuitId": "BBSM00000301-1",
-               "remoteId" : "BBSIM_OLT_0",
-               "technologyProfileId": 64,
-               "upstreamBandwidthProfile": "User_Bandwidth1",
-               "downstreamBandwidthProfile": "User_Bandwidth1"
-            },
-            {
-               "id": "BBSM00000302-1",
-               "cTag": 63,
-               "sTag": 77,
-               "nasPortId": "BBSM00000302-1",
-               "circuitId": "BBSM00000302-1",
-               "remoteId" : "BBSIM_OLT_0",
-               "technologyProfileId": 64,
-               "upstreamBandwidthProfile": "Default",
-               "downstreamBandwidthProfile": "Default"
-            },
-            {
-               "id": "BBSM00000401-1",
-               "cTag": 70,
-               "sTag": 88,
-               "nasPortId": "BBSM00000401-1",
-               "circuitId": "BBSM00000401-1",
-               "remoteId" : "BBSIM_OLT_0",
-               "technologyProfileId": 64,
-               "upstreamBandwidthProfile": "Default",
-               "downstreamBandwidthProfile": "Default"
-            },
-            {
-               "id": "BBSM00000402-1",
-               "cTag": 71,
-               "sTag": 88,
-               "nasPortId": "BBSM00000402-1",
-               "circuitId": "BBSM00000402-1",
-               "remoteId" : "BBSIM_OLT_0",
-               "technologyProfileId": 64,
-               "upstreamBandwidthProfile": "Default",
-               "downstreamBandwidthProfile": "Default"
-            },
-            {
-               "id": "BBSM00000501-1",
-               "cTag": 72,
-               "sTag": 88,
-               "nasPortId": "BBSM00000501-1",
-               "circuitId": "BBSM00000501-1",
-               "remoteId" : "BBSIM_OLT_0",
-               "technologyProfileId": 64,
-               "upstreamBandwidthProfile": "Default",
-               "downstreamBandwidthProfile": "Default"
-            },
-            {
-               "id": "BBSM00000502-1",
-               "cTag": 73,
-               "sTag": 88,
-               "nasPortId": "BBSM00000502-1",
-               "circuitId": "BBSM00000502-1",
-               "remoteId" : "BBSIM_OLT_0",
-               "technologyProfileId": 64,
-               "upstreamBandwidthProfile": "Default",
-               "downstreamBandwidthProfile": "Default"
-            },
-            {
-               "id": "BBSM00000601-1",
-               "cTag": 80,
-               "sTag": 99,
-               "nasPortId": "BBSM00000601-1",
-               "circuitId": "BBSM00000601-1",
-               "remoteId" : "BBSIM_OLT_0",
-               "technologyProfileId": 64,
-               "upstreamBandwidthProfile": "User_Bandwidth2",
-               "downstreamBandwidthProfile": "User_Bandwidth2"
-            },
-            {
-               "id": "BBSM00000602-1",
-               "cTag": 81,
-               "sTag": 99,
-               "nasPortId": "BBSM00000602-1",
-               "circuitId": "BBSM00000602-1",
-               "remoteId" : "BBSIM_OLT_0",
-               "technologyProfileId": 64,
-               "upstreamBandwidthProfile": "Default",
-               "downstreamBandwidthProfile": "Default"
-            },
-            {
-               "id": "BBSM00000701-1",
-               "cTag": 82,
-               "sTag": 99,
-               "nasPortId": "BBSM00000701-1",
-               "circuitId": "BBSM00000701-1",
-               "remoteId" : "BBSIM_OLT_0",
-               "technologyProfileId": 64,
-               "upstreamBandwidthProfile": "Default",
-               "downstreamBandwidthProfile": "Default"
-            },
-            {
-               "id": "BBSM00000702-1",
-               "cTag": 83,
-               "sTag": 99,
-               "nasPortId": "BBSM00000702-1",
-               "circuitId": "BBSM00000702-1",
-               "remoteId" : "BBSIM_OLT_0",
-               "technologyProfileId": 64,
-               "upstreamBandwidthProfile": "Default",
-               "downstreamBandwidthProfile": "Default"
-            }
-         ]
-      },
-      "bandwidthprofile": {
-         "integration": {
-            "cache": {
-               "enabled": true,
-               "maxsize": 40,
-               "ttl": "PT1m"
-            }
-         },
-         "entries": [
-            {
-               "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
-            },
-            {
-               "id": "Default",
-               "air": 100000,
-               "cbs": 30,
-               "cir": 600,
-               "ebs": 30,
-               "eir": 400
-            }
-         ]
-      }
-   }
-}