diff --git a/tests/data/dt-berlin-pod-openonugo-sadis-DT.json b/tests/data/dt-berlin-pod-openonugo-sadis-DT.json
index deb053f..06a6277 100644
--- a/tests/data/dt-berlin-pod-openonugo-sadis-DT.json
+++ b/tests/data/dt-berlin-pod-openonugo-sadis-DT.json
@@ -1,11 +1,4 @@
 {
-  "devices": {
-    "of:000080a2354d28c0": {
-      "basic": {
-        "driver": "voltha"
-      }
-    }
-  },
   "apps": {
     "org.opencord.sadis": {
       "sadis": {
@@ -18,102 +11,118 @@
         },
         "entries": [
           {
-            "id": "SCOM00019ab7-1",
-            "nasPortId": "SCOM00019ab7-1",
-            "circuitId": "",
-            "remoteId": "",
+            "id": "EC1912001814",
+            "hardwareIdentifier": "80:a2:35:4d:24:c0",
+            "nasId": "EC1912001814",
+            "uplinkPort": 1048576
+          },
+          {
+            "id": "SCOM00001c82-1",
+            "nasPortId": "SCOM00001c82-1",
+            "circuitId": "SCOM00001c82-1",
+            "remoteId": "EC1912001814",
             "uniTagList": [{
               "uniTagMatch": 4096,
               "ponCTag": 4096,
               "ponSTag": 31,
               "technologyProfileId": 64,
-              "downstreamBandwidthProfile": "Default",
               "upstreamBandwidthProfile": "Default",
+              "downstreamBandwidthProfile": "Default",
               "isDhcpRequired": false
             }]
           },
           {
-            "id": "SCOM00001c8d-1",
-            "nasPortId": "SCOM00001c8d-1",
-            "circuitId": "",
-            "remoteId": "",
-            "uniTagList": [{
-              "uniTagMatch": 4096,
-              "ponCTag": 4096,
-              "ponSTag": 32,
-              "technologyProfileId": 64,
-              "downstreamBandwidthProfile": "User_Bandwidth2",
-              "upstreamBandwidthProfile": "User_Bandwidth1",
-              "isDhcpRequired": false
-            }]
+            "id": "SCOM00001c89-1",
+            "nasPortId": "SCOM00001c89-1",
+            "circuitId": "SCOM00001c89-1",
+            "remoteId": "EC1912001814",
+            "uniTagList": [
+              {
+                "uniTagMatch": 4096,
+                "ponCTag": 4096,
+                "ponSTag": 32,
+                "technologyProfileId": 64,
+                "upstreamBandwidthProfile": "User_Bandwidth1",
+                "downstreamBandwidthProfile": "User_Bandwidth2",
+                "isDhcpRequired": false
+              }]
           },
           {
-            "id": "SCOM00001c7f-1",
-            "nasPortId": "SCOM00001c7f-1",
-            "circuitId": "",
-            "remoteId": "",
-            "uniTagList": [{
-              "uniTagMatch": 4096,
-              "ponCTag": 4096,
-              "ponSTag": 33,
-              "technologyProfileId": 64,
-              "downstreamBandwidthProfile": "User_Bandwidth3",
-              "upstreamBandwidthProfile": "User_Bandwidth3",
-              "isDhcpRequired": false
-            }]
+            "id": "SCOM00001c96-1",
+            "nasPortId": "SCOM00001c96-1",
+            "circuitId": "SCOM00001c96-1",
+            "remoteId": "EC1912001814",
+            "uniTagList": [
+              {
+                "uniTagMatch": 4096,
+                "ponCTag": 4096,
+                "ponSTag": 33,
+                "technologyProfileId": 64,
+                "upstreamBandwidthProfile": "User_Bandwidth3",
+                "downstreamBandwidthProfile": "User_Bandwidth3",
+                "isDhcpRequired": false
+              }]
           },
           {
-            "id": "EC1912001818",
-            "hardwareIdentifier": "80:a2:35:4d:28:c0",
-            "ipAddress": "10.90.0.115",
-            "nasId": "EC1912001818",
-            "uplinkPort": 1048576
-          }
-        ]
+            "id": "SCOM00001c0b-1",
+            "nasPortId": "SCOM00001c0b-1",
+            "circuitId": "SCOM00001c0b-1",
+            "remoteId": "EC1912001814",
+            "uniTagList": [
+              {
+                "uniTagMatch": 4096,
+                "ponCTag": 4096,
+                "ponSTag": 34,
+                "technologyProfileId": 64,
+                "upstreamBandwidthProfile": "User_Bandwidth1",
+                "downstreamBandwidthProfile": "User_Bandwidth2",
+                "isDhcpRequired": false
+              }]
+          }]
       },
       "bandwidthprofile":{
-          "integration":{
-              "cache":{
-                  "enabled":true,
-                  "maxsize":40,
-                  "ttl":"PT1m"
-              }
+        "integration":{
+          "cache":{
+            "enabled":true,
+            "maxsize":40,
+            "ttl":"PT1m"
+          }
+        },
+        "entries":[
+          {
+            "id": "Default",
+            "air": 100000,
+            "cbs": 30,
+            "cir": 16000,
+            "ebs": 30,
+            "eir": 16000
           },
-          "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": 475000,
-                  "ebs": 5000,
-                  "eir": 475000
-              }
+          {
+            "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": 475000,
+            "ebs": 5000,
+            "eir": 475000
+          }
 
-          ]
+        ]
       }
     }
   }