diff --git a/tests/data/onos-sadis-bbsim.json b/tests/data/onos-sadis-bbsim.json
index a8068b5..565ed62 100644
--- a/tests/data/onos-sadis-bbsim.json
+++ b/tests/data/onos-sadis-bbsim.json
@@ -1,24 +1,94 @@
 {
-  "org.opencord.sadis": {
-    "sadis": {
-      "integration": {
-        "url":"http://bbsim.voltha.svc:50074/subscribers/%s",
-        "cache": {
-          "enabled":true,
-          "maxsize":50,
-          "ttl":"PT1m"
-        }
+  "sadis": {
+    "integration": {
+      "cache": {
+        "enabled": false,
+        "maxsize": 50,
+        "ttl": "PT0m"
       }
     },
-    "bandwidthprofile": {
-      "integration": {
-        "url":"http://bbsim.voltha.svc:50074/bandwidthprofiles/%s",
-        "cache": {
-          "enabled":true,
-          "maxsize":40,
-          "ttl":"PT1m"
-        }
+    "entries": [
+      {
+        "id": "BBSIM_OLT_0",
+        "hardwareIdentifier": "0f:f1:ce:c0:ff:ee",
+        "nasId": "BBSIMOLT000",
+        "uplinkPort": 1048576
+      },
+      {
+        "id": "BBSM00000001-1",
+        "nasPortId": "BBSM00000001-1",
+        "circuitId": "BBSM00000001-1",
+        "remoteId": "BBSM00000001-1",
+        "uniTagList": [{
+          "ponCTag": 900,
+          "ponSTag": 900,
+          "technologyProfileId": 64,
+          "downstreamBandwidthProfile": "Default",
+          "upstreamBandwidthProfile": "Default",
+          "isDhcpRequired": true
+        }]
+      },
+      {
+        "id": "BBSM00000002-1",
+        "nasPortId": "BBSM00000002-1",
+        "circuitId": "BBSM00000002-1",
+        "remoteId": "BBSM00000002-1",
+        "uniTagList": [{
+          "ponCTag": 901,
+          "ponSTag": 900,
+          "technologyProfileId": 64,
+          "downstreamBandwidthProfile": "Default",
+          "upstreamBandwidthProfile": "Default",
+          "isDhcpRequired": true
+        }]
+      },
+      {
+        "id": "BBSM00000101-1",
+        "nasPortId": "BBSM00000101-1",
+        "circuitId": "BBSM00000101-1",
+        "remoteId": "BBSM00000101-1",
+        "uniTagList": [{
+          "ponCTag": 902,
+          "ponSTag": 900,
+          "technologyProfileId": 64,
+          "downstreamBandwidthProfile": "Default",
+          "upstreamBandwidthProfile": "Default",
+          "isDhcpRequired": true
+        }]
+      },
+      {
+        "id": "BBSM00000201-1",
+        "nasPortId": "BBSM00000201-1",
+        "circuitId": "BBSM00000201-1",
+        "remoteId": "BBSM00000201-1",
+        "uniTagList": [{
+          "ponCTag": 903,
+          "ponSTag": 900,
+          "technologyProfileId": 64,
+          "downstreamBandwidthProfile": "Default",
+          "upstreamBandwidthProfile": "Default",
+          "isDhcpRequired": true
+        }]
       }
-    }
+    ]
+  },
+  "bandwidthprofile": {
+    "integration": {
+      "cache": {
+        "enabled": true,
+        "maxsize": 40,
+        "ttl": "PT1m"
+      }
+    },
+    "entries": [
+      {
+        "id": "Default",
+        "cir": 1000000,
+        "cbs": 1001,
+        "eir": 1002,
+        "ebs": 1003,
+        "air": 1004
+      }
+    ]
   }
 }