diff --git a/tests/data/bbsim-kind-2OLTx2ONUx2PON_VGC.yaml b/tests/data/bbsim-kind-2OLTx2ONUx2PON_VGC.yaml
new file mode 100755
index 0000000..cf9841c
--- /dev/null
+++ b/tests/data/bbsim-kind-2OLTx2ONUx2PON_VGC.yaml
@@ -0,0 +1,102 @@
+---
+
+# Copyright 2017-present Open Networking Foundation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Automated deployment configuration for systems running BBSim
+
+# Change default values in tests
+has_dataplane: false
+external_libs: false
+teardown_device: true
+VGC_REST_PORT: 8181
+VGC_SSH_PORT: 8101
+OLT_PORT: 50060
+
+
+# Actual Unused sadis.file but ready to future implementation
+sadis.file: ../data/dt-sadis-multiolt-config-vgc.json
+
+
+nodes:
+  -
+    ip: '127.0.0.1'
+
+olts:
+  -
+    ip: bbsim0.voltha.svc
+    serial: BBSIM_OLT_10
+  -
+    ip: bbsim1.voltha.svc
+    serial: BBSIM_OLT_11
+
+hosts:
+  src:
+    -
+      onu: 'BBSM000a0001'
+      c_tag: '4096'
+      s_tag: '900'
+      olt: 'BBSIM_OLT_10'
+      uni_id: '1'
+    -
+      onu: 'BBSM000a0002'
+      c_tag: '4096'
+      s_tag: '904'
+      olt: 'BBSIM_OLT_10'
+      uni_id: '1'
+    -
+      onu: 'BBSM000a0101'
+      olt: 'BBSIM_OLT_10'
+      c_tag: '4096'
+      s_tag: '908'
+      uni_id: '1'
+    -
+      onu: 'BBSM000a0102'
+      olt: 'BBSIM_OLT_10'
+      c_tag: '4096'
+      s_tag: '912'
+      uni_id: '1'
+    -
+      onu: 'BBSM000b0001'
+      c_tag: '4096'
+      s_tag: '900'
+      olt: 'BBSIM_OLT_11'
+      uni_id: '1'
+    -
+      onu: 'BBSM000b0002'
+      c_tag: '4096'
+      s_tag: '904'
+      olt: 'BBSIM_OLT_11'
+      uni_id: '1'
+    -
+      onu: 'BBSM000b0101'
+      olt: 'BBSIM_OLT_11'
+      c_tag: '4096'
+      s_tag: '908'
+      uni_id: '1'
+    -
+      onu: 'BBSM000b0102'
+      olt: 'BBSIM_OLT_11'
+      c_tag: '4096'
+      s_tag: '912'
+      uni_id: '1'
+  dst:
+    - ip: null
+    - ip: null
+    - ip: null
+    - ip: null
+    - ip: null
+    - ip: null
+    - ip: null
+    - ip: null
diff --git a/tests/data/bbsim-kind-dt-vgc.yaml b/tests/data/bbsim-kind-dt-vgc.yaml
new file mode 100755
index 0000000..73824ca
--- /dev/null
+++ b/tests/data/bbsim-kind-dt-vgc.yaml
@@ -0,0 +1,51 @@
+---
+
+# Copyright 2017-present Open Networking Foundation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Automated deployment configuration for systems running BBSim
+
+# Change default values in tests
+workflow: DT
+has_dataplane: false
+teardown_device: true
+VGC_REST_PORT: 8181
+VGC_SSH_PORT: 8101
+OLT_PORT: 50060
+
+
+# Actual Unused sadis.file but ready to future implementation
+sadis.file: ../data/dt-sadis-config.json
+
+
+nodes:
+  -
+    ip: '127.0.0.1'
+
+olts:
+  -
+    ip: bbsim0
+    serial: BBSIM_OLT_10
+
+hosts:
+  src:
+    -
+      onu: 'BBSM000a0001'
+      olt: 'BBSIM_OLT_10'
+      c_tag: '4096'
+      s_tag: '900'
+      uni_id: '1'
+
+  dst:
+    - ip: null
diff --git a/tests/data/dt-sadis-config.json b/tests/data/dt-sadis-config.json
new file mode 100644
index 0000000..6284e18
--- /dev/null
+++ b/tests/data/dt-sadis-config.json
@@ -0,0 +1,49 @@
+{
+  "apps": {
+    "org.opencord.sadis": {
+      "bandwidthprofile": {
+        "entries": [
+          {
+            "id": "High-Speed-Internet",
+            "gir": 50000,
+            "cbs": 10000,
+            "cir": 50000,
+            "pbs": 1000,
+            "pir": 300000
+          }
+        ]
+      },
+      "sadis": {
+        "entries": [
+          {
+            "id": "BBSIM_OLT_10",
+            "nasId": "BBSIM_OLT_10",
+            "hardwareIdentifier": "28:b9:d9:e2:93:d6",
+            "uplinkPort": "16777216"
+          },
+          {
+            "id": "BBSM000a0001",
+            "nasPortId": "BBSM000a0001-1",
+            "circuitId": "BBSM000a0001-1",
+            "remoteId": "BBSM000a0001",
+            "uniTagList": [
+              {
+                "uniTagMatch": 4096,
+                "ponCTag": 4096,
+                "ponSTag": 900,
+                "usPonCTagPriority": 0,
+                "usPonSTagPriority": 0,
+                "dsPonCTagPriority": 0,
+                "dsPonSTagPriority": 0,
+                "technologyProfileId": 64,
+                "downstreamBandwidthProfile": "High-Speed-Internet",
+                "upstreamBandwidthProfile": "High-Speed-Internet",
+                "serviceName": "HSIA"
+              }
+            ]
+          }
+        ]
+      }
+    }
+  }
+}
diff --git a/tests/data/dt-sadis-multiolt-config-vgc.json b/tests/data/dt-sadis-multiolt-config-vgc.json
new file mode 100644
index 0000000..e2460f1
--- /dev/null
+++ b/tests/data/dt-sadis-multiolt-config-vgc.json
@@ -0,0 +1,203 @@
+{
+  "apps": {
+    "org.opencord.sadis": {
+      "bandwidthprofile": {
+        "entries": [
+          {
+            "id": "High-Speed-Internet",
+            "gir": 50000,
+            "cbs": 10000,
+            "cir": 50000,
+            "pbs": 1000,
+            "pir": 300000
+          }
+        ]
+      },
+      "sadis": {
+        "entries": [
+          {
+            "id": "BBSIM_OLT_10",
+            "nasId": "BBSIM_OLT_10",
+            "hardwareIdentifier": "28:b9:d9:e2:93:d6",
+            "uplinkPort": "16777216"
+          },
+          {
+            "id": "BBSM000a0001",
+            "nasPortId": "BBSM000a0001-1",
+            "circuitId": "BBSM000a0001-1",
+            "remoteId": "BBSM000a0001",
+            "uniTagList": [
+              {
+                "uniTagMatch": 4096,
+                "ponCTag": 4096,
+                "ponSTag": 900,
+                "usPonCTagPriority": 0,
+                "usPonSTagPriority": 0,
+                "dsPonCTagPriority": 0,
+                "dsPonSTagPriority": 0,
+                "technologyProfileId": 64,
+                "downstreamBandwidthProfile": "High-Speed-Internet",
+                "upstreamBandwidthProfile": "High-Speed-Internet",
+                "serviceName": "HSIA"
+              }
+            ]
+          },
+          {
+            "id": "BBSM000a0002",
+            "nasPortId": "BBSM000a0002-1",
+            "circuitId": "BBSM000a0002-1",
+            "remoteId": "BBSM000a0002",
+            "uniTagList": [
+              {
+                "uniTagMatch": 4096,
+                "ponCTag": 4096,
+                "ponSTag": 904,
+                "usPonCTagPriority": 0,
+                "usPonSTagPriority": 0,
+                "dsPonCTagPriority": 0,
+                "dsPonSTagPriority": 0,
+                "technologyProfileId": 64,
+                "downstreamBandwidthProfile": "High-Speed-Internet",
+                "upstreamBandwidthProfile": "High-Speed-Internet",
+                "serviceName": "HSIA"
+              }
+            ]
+          },
+          {
+            "id": "BBSM000a0101",
+            "nasPortId": "BBSM000a0101-1",
+            "circuitId": "BBSM000a0101-1",
+            "remoteId": "BBSM000a0101",
+            "uniTagList": [
+              {
+                "uniTagMatch": 4096,
+                "ponCTag": 4096,
+                "ponSTag": 908,
+                "usPonCTagPriority": 0,
+                "usPonSTagPriority": 0,
+                "dsPonCTagPriority": 0,
+                "dsPonSTagPriority": 0,
+                "technologyProfileId": 64,
+                "downstreamBandwidthProfile": "High-Speed-Internet",
+                "upstreamBandwidthProfile": "High-Speed-Internet",
+                "serviceName": "HSIA"
+              }
+            ]
+          },
+          {
+            "id": "BBSM000a0102",
+            "nasPortId": "BBSM000a0102-1",
+            "circuitId": "BBSM000a0102-1",
+            "remoteId": "BBSM000a0102",
+            "uniTagList": [
+              {
+                "uniTagMatch": 4096,
+                "ponCTag": 4096,
+                "ponSTag": 912,
+                "usPonCTagPriority": 0,
+                "usPonSTagPriority": 0,
+                "dsPonCTagPriority": 0,
+                "dsPonSTagPriority": 0,
+                "technologyProfileId": 64,
+                "downstreamBandwidthProfile": "High-Speed-Internet",
+                "upstreamBandwidthProfile": "High-Speed-Internet",
+                "serviceName": "HSIA"
+              }
+            ]
+          },
+          {
+            "id": "BBSIM_OLT_11",
+            "nasId": "BBSIM_OLT_11",
+            "hardwareIdentifier": "28:b9:d9:e2:93:d6",
+            "uplinkPort": "16777216"
+          },
+          {
+            "id": "BBSM000b0001",
+            "nasPortId": "BBSM000b0001-1",
+            "circuitId": "BBSM000b0001-1",
+            "remoteId": "BBSM000b0001",
+            "uniTagList": [
+              {
+                "uniTagMatch": 4096,
+                "ponCTag": 4096,
+                "ponSTag": 900,
+                "usPonCTagPriority": 0,
+                "usPonSTagPriority": 0,
+                "dsPonCTagPriority": 0,
+                "dsPonSTagPriority": 0,
+                "technologyProfileId": 64,
+                "downstreamBandwidthProfile": "High-Speed-Internet",
+                "upstreamBandwidthProfile": "High-Speed-Internet",
+                "serviceName": "HSIA"
+              }
+            ]
+          },
+          {
+            "id": "BBSM000b0002",
+            "nasPortId": "BBSM000b0002-1",
+            "circuitId": "BBSM000b0002-1",
+            "remoteId": "BBSM000b0002",
+            "uniTagList": [
+              {
+                "uniTagMatch": 4096,
+                "ponCTag": 4096,
+                "ponSTag": 904,
+                "usPonCTagPriority": 0,
+                "usPonSTagPriority": 0,
+                "dsPonCTagPriority": 0,
+                "dsPonSTagPriority": 0,
+                "technologyProfileId": 64,
+                "downstreamBandwidthProfile": "High-Speed-Internet",
+                "upstreamBandwidthProfile": "High-Speed-Internet",
+                "serviceName": "HSIA"
+              }
+            ]
+          },
+          {
+            "id": "BBSM000b0101",
+            "nasPortId": "BBSM000b0101-1",
+            "circuitId": "BBSM000b0101-1",
+            "remoteId": "BBSM000b0101",
+            "uniTagList": [
+              {
+                "uniTagMatch": 4096,
+                "ponCTag": 4096,
+                "ponSTag": 908,
+                "usPonCTagPriority": 0,
+                "usPonSTagPriority": 0,
+                "dsPonCTagPriority": 0,
+                "dsPonSTagPriority": 0,
+                "technologyProfileId": 64,
+                "downstreamBandwidthProfile": "High-Speed-Internet",
+                "upstreamBandwidthProfile": "High-Speed-Internet",
+                "serviceName": "HSIA"
+              }
+            ]
+          },
+          {
+            "id": "BBSM000b0102",
+            "nasPortId": "BBSM000b0102-1",
+            "circuitId": "BBSM000b0102-1",
+            "remoteId": "BBSM000b0102",
+            "uniTagList": [
+              {
+                "uniTagMatch": 4096,
+                "ponCTag": 4096,
+                "ponSTag": 912,
+                "usPonCTagPriority": 0,
+                "usPonSTagPriority": 0,
+                "dsPonCTagPriority": 0,
+                "dsPonSTagPriority": 0,
+                "technologyProfileId": 64,
+                "downstreamBandwidthProfile": "High-Speed-Internet",
+                "upstreamBandwidthProfile": "High-Speed-Internet",
+                "serviceName": "HSIA"
+              }
+            ]
+          }
+        ]
+      }
+    }
+  }
+}
+