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