diff --git a/tests/data/onos-sadis-bbsim-new-apps.json b/tests/data/onos-sadis-bbsim-new-apps.json
deleted file mode 100644
index b63f4f8..0000000
--- a/tests/data/onos-sadis-bbsim-new-apps.json
+++ /dev/null
@@ -1,56 +0,0 @@
-{
-  "org.opencord.sadis": {
-    "sadis": {
-      "integration": {
-        "cache": {
-          "enabled": false,
-          "maxsize": 50,
-          "ttl": "PT0m"
-        }
-      },
-      "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
-            }
-          ]
-        }
-      ]
-    },
-    "bandwidthprofile": {
-      "integration": {
-        "cache": {
-          "enabled": true,
-          "maxsize": 40,
-          "ttl": "PT1m"
-        }
-      },
-      "entries": [
-        {
-          "id": "Default",
-          "cir": 1000000,
-          "cbs": 1001,
-          "eir": 1002,
-          "ebs": 1003,
-          "air": 1004
-        }
-      ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/tests/data/onos-sadis-bbsim.json b/tests/data/onos-sadis-bbsim.json
index 565ed62..b63f4f8 100644
--- a/tests/data/onos-sadis-bbsim.json
+++ b/tests/data/onos-sadis-bbsim.json
@@ -1,94 +1,56 @@
 {
-  "sadis": {
-    "integration": {
-      "cache": {
-        "enabled": false,
-        "maxsize": 50,
-        "ttl": "PT0m"
-      }
+  "org.opencord.sadis": {
+    "sadis": {
+      "integration": {
+        "cache": {
+          "enabled": false,
+          "maxsize": 50,
+          "ttl": "PT0m"
+        }
+      },
+      "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
+            }
+          ]
+        }
+      ]
     },
-    "entries": [
-      {
-        "id": "BBSIM_OLT_0",
-        "hardwareIdentifier": "0f:f1:ce:c0:ff:ee",
-        "nasId": "BBSIMOLT000",
-        "uplinkPort": 1048576
+    "bandwidthprofile": {
+      "integration": {
+        "cache": {
+          "enabled": true,
+          "maxsize": 40,
+          "ttl": "PT1m"
+        }
       },
-      {
-        "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
-      }
-    ]
+      "entries": [
+        {
+          "id": "Default",
+          "cir": 1000000,
+          "cbs": 1001,
+          "eir": 1002,
+          "ebs": 1003,
+          "air": 1004
+        }
+      ]
+    }
   }
-}
+}
\ No newline at end of file