diff --git a/tests/data/bbsim-kind-2x2.yaml b/tests/data/bbsim-kind-2x2.yaml
new file mode 100644
index 0000000..47b30cb
--- /dev/null
+++ b/tests/data/bbsim-kind-2x2.yaml
@@ -0,0 +1,47 @@
+---
+
+# 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 kind-voltha running BBSim
+
+# Change default values in tests
+has_dataplane: False
+external_libs: False
+teardown_device: True
+ONOS_REST_PORT: 8181
+ONOS_SSH_PORT: 8101
+OLT_PORT: 50060
+
+nodes:
+  -
+    ip: '127.0.0.1'
+
+olts:
+  -
+    ip: bbsim.voltha.svc
+    serial: BBSIM_OLT_0
+
+hosts:
+  src:
+    - onu: 'BBSM00000001'
+    - onu: 'BBSM00000002'
+    - onu: 'BBSM00000101'
+    - onu: 'BBSM00000102'
+
+  dst:
+    - ip: null
+    - ip: null
+    - ip: null
+    - ip: null
diff --git a/tests/data/bbsim-kind.yaml b/tests/data/bbsim-kind.yaml
index f88bca9..12ab725 100644
--- a/tests/data/bbsim-kind.yaml
+++ b/tests/data/bbsim-kind.yaml
@@ -20,7 +20,6 @@
 has_dataplane: False
 external_libs: False
 teardown_device: True
-ports_per_onu: 4
 ONOS_REST_PORT: 8181
 ONOS_SSH_PORT: 8101
 OLT_PORT: 50060
@@ -28,51 +27,15 @@
 nodes:
   -
     ip: '127.0.0.1'
-    user: null
-    pass: null
-
-fabric_switches:
-  -
-    mac: null
-    ip: null
-    user: null
-    pass: null
-    bngPort: null
-    oltPort: null
-    device_id: null
 
 olts:
   -
     ip: bbsim.voltha.svc
-    user: null
-    pass: null
-    fortygig: null
     serial: BBSIM_OLT_0
 
-onus:
-  -
-    serial: 'BBSM00000001'
-
 hosts:
   src:
-    -
-      ip: null
-      pass: null
-      dp_iface_name: null
-      container_type: null
-      container_name: null
-      onu: null
-      c_tag: null
-      s_tag: null
+    - onu: 'BBSM00000001'
 
   dst:
-    -
-      ip: null
-      user: null
-      pass: null
-      dp_iface_name: null
-      dp_iface_ip_qinq: null
-      dp_iface_ip: null
-      dp_iface_gateway: null
-      container_type: null
-      container_name: null
\ No newline at end of file
+    - ip: null
diff --git a/tests/data/flex-ocp-cord-sadis.json b/tests/data/flex-ocp-cord-sadis.json
index 6d4db3b..e8b971b 100644
--- a/tests/data/flex-ocp-cord-sadis.json
+++ b/tests/data/flex-ocp-cord-sadis.json
@@ -21,9 +21,9 @@
             "id": "ALPHe3d1cfa7-1",
             "cTag": 901,
             "sTag": 111,
-            "nasPortId": "",
-            "circuitId": "",
-            "remoteId": "",
+            "nasPortId": "ALPHe3d1cfa7-1",
+            "circuitId": "ALPHe3d1cfa7-1",
+            "remoteId": "EC1838000853",
             "technologyProfileId": 64,
             "upstreamBandwidthProfile": "Default",
             "downstreamBandwidthProfile": "Default"
@@ -32,9 +32,9 @@
             "id": "ALPHe3d1cfa7-2",
             "cTag": 902,
             "sTag": 111,
-            "nasPortId": "",
-            "circuitId": "",
-            "remoteId": "",
+            "nasPortId": "ALPHe3d1cfa7-2",
+            "circuitId": "ALPHe3d1cfa7-2",
+            "remoteId": "EC1838000853",
             "technologyProfileId": 64,
             "upstreamBandwidthProfile": "Default",
             "downstreamBandwidthProfile": "Default"
@@ -43,9 +43,9 @@
             "id": "ALPHe3d1cfa7-3",
             "cTag": 903,
             "sTag": 111,
-            "nasPortId": "",
-            "circuitId": "",
-            "remoteId": "",
+            "nasPortId": "ALPHe3d1cfa7-3",
+            "circuitId": "ALPHe3d1cfa7-3",
+            "remoteId": "EC1838000853",
             "technologyProfileId": 64,
             "upstreamBandwidthProfile": "Default",
             "downstreamBandwidthProfile": "Default"
@@ -54,9 +54,9 @@
             "id": "ALPHe3d1cfa7-4",
             "cTag": 904,
             "sTag": 111,
-            "nasPortId": "",
-            "circuitId": "",
-            "remoteId": "",
+            "nasPortId": "ALPHe3d1cfa7-4",
+            "circuitId": "ALPHe3d1cfa7-4",
+            "remoteId": "EC1838000853",
             "technologyProfileId": 64,
             "upstreamBandwidthProfile": "Default",
             "downstreamBandwidthProfile": "Default"
@@ -65,9 +65,64 @@
             "id": "ALPHe3d1cfa7-5",
             "cTag": 905,
             "sTag": 111,
-            "nasPortId": "",
-            "circuitId": "",
-            "remoteId": "",
+            "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": "Default",
+            "downstreamBandwidthProfile": "Default"
+          },
+          {
+            "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"