diff --git a/tests/data/bbsim-kind-8x8.yaml b/tests/data/bbsim-kind-8x8.yaml
index a5ea424..16b059e 100755
--- a/tests/data/bbsim-kind-8x8.yaml
+++ b/tests/data/bbsim-kind-8x8.yaml
@@ -38,258 +38,322 @@
       c_tag: '900'
       s_tag: '900'
       olt: BBSIM_OLT_10
+      uni_id: '1'
     - onu: 'BBSM000a0002'
       c_tag: '904'
       s_tag: '900'
       olt: BBSIM_OLT_10
+      uni_id: '1'
     - onu: 'BBSM000a0003'
       c_tag: '908'
       s_tag: '900'
       olt: BBSIM_OLT_10
+      uni_id: '1'
     - onu: 'BBSM000a0004'
       c_tag: '912'
       s_tag: '900'
       olt: BBSIM_OLT_10
+      uni_id: '1'
     - onu: 'BBSM000a0005'
       c_tag: '916'
       s_tag: '900'
       olt: BBSIM_OLT_10
+      uni_id: '1'
     - onu: 'BBSM000a0006'
       c_tag: '920'
       s_tag: '900'
       olt: BBSIM_OLT_10
+      uni_id: '1'
     - onu: 'BBSM000a0007'
       c_tag: '924'
       s_tag: '900'
       olt: BBSIM_OLT_10
+      uni_id: '1'
     - onu: 'BBSM000a0008'
       c_tag: '928'
       s_tag: '900'
       olt: BBSIM_OLT_10
+      uni_id: '1'
     - onu: 'BBSM000a0101'
       c_tag: '932'
       s_tag: '900'
       olt: BBSIM_OLT_10
+      uni_id: '1'
     - onu: 'BBSM000a0102'
       c_tag: '936'
       s_tag: '900'
       olt: BBSIM_OLT_10
+      uni_id: '1'
     - onu: 'BBSM000a0103'
       c_tag: '940'
       s_tag: '900'
       olt: BBSIM_OLT_10
+      uni_id: '1'
     - onu: 'BBSM000a0104'
       c_tag: '944'
       s_tag: '900'
       olt: BBSIM_OLT_10
+      uni_id: '1'
     - onu: 'BBSM000a0105'
       c_tag: '948'
       s_tag: '900'
       olt: BBSIM_OLT_10
+      uni_id: '1'
     - onu: 'BBSM000a0106'
       c_tag: '952'
       s_tag: '900'
       olt: BBSIM_OLT_10
+      uni_id: '1'
     - onu: 'BBSM000a0107'
       c_tag: '956'
       s_tag: '900'
       olt: BBSIM_OLT_10
+      uni_id: '1'
     - onu: 'BBSM000a0108'
       c_tag: '960'
       s_tag: '900'
       olt: BBSIM_OLT_10
+      uni_id: '1'
     - onu: 'BBSM000a0201'
       c_tag: '964'
       s_tag: '900'
       olt: BBSIM_OLT_10
+      uni_id: '1'
     - onu: 'BBSM000a0202'
       c_tag: '968'
       s_tag: '900'
       olt: BBSIM_OLT_10
+      uni_id: '1'
     - onu: 'BBSM000a0203'
       c_tag: '972'
       s_tag: '900'
       olt: BBSIM_OLT_10
+      uni_id: '1'
     - onu: 'BBSM000a0204'
       c_tag: '976'
       s_tag: '900'
       olt: BBSIM_OLT_10
+      uni_id: '1'
     - onu: 'BBSM000a0205'
       c_tag: '980'
       s_tag: '900'
       olt: BBSIM_OLT_10
+      uni_id: '1'
     - onu: 'BBSM000a0206'
       c_tag: '984'
       s_tag: '900'
       olt: BBSIM_OLT_10
+      uni_id: '1'
     - onu: 'BBSM000a0207'
       c_tag: '988'
       s_tag: '900'
       olt: BBSIM_OLT_10
+      uni_id: '1'
     - onu: 'BBSM000a0208'
       c_tag: '992'
       s_tag: '900'
       olt: BBSIM_OLT_10
+      uni_id: '1'
     - onu: 'BBSM000a0301'
       c_tag: '996'
       s_tag: '900'
       olt: BBSIM_OLT_10
+      uni_id: '1'
     - onu: 'BBSM000a0302'
       c_tag: '1000'
       s_tag: '900'
       olt: BBSIM_OLT_10
+      uni_id: '1'
     - onu: 'BBSM000a0303'
       c_tag: '1004'
       s_tag: '900'
       olt: BBSIM_OLT_10
+      uni_id: '1'
     - onu: 'BBSM000a0304'
       c_tag: '1008'
       s_tag: '900'
       olt: BBSIM_OLT_10
+      uni_id: '1'
     - onu: 'BBSM000a0305'
       c_tag: '1012'
       s_tag: '900'
       olt: BBSIM_OLT_10
+      uni_id: '1'
     - onu: 'BBSM000a0306'
       c_tag: '1016'
       s_tag: '900'
       olt: BBSIM_OLT_10
+      uni_id: '1'
     - onu: 'BBSM000a0307'
       c_tag: '1020'
       s_tag: '900'
       olt: BBSIM_OLT_10
+      uni_id: '1'
     - onu: 'BBSM000a0308'
       c_tag: '1024'
       s_tag: '900'
       olt: BBSIM_OLT_10
+      uni_id: '1'
     - onu: 'BBSM000a0401'
       c_tag: '1028'
       s_tag: '900'
       olt: BBSIM_OLT_10
+      uni_id: '1'
     - onu: 'BBSM000a0402'
       c_tag: '1032'
       s_tag: '900'
       olt: BBSIM_OLT_10
+      uni_id: '1'
     - onu: 'BBSM000a0403'
       c_tag: '1036'
       s_tag: '900'
       olt: BBSIM_OLT_10
+      uni_id: '1'
     - onu: 'BBSM000a0404'
       c_tag: '1040'
       s_tag: '900'
       olt: BBSIM_OLT_10
+      uni_id: '1'
     - onu: 'BBSM000a0405'
       c_tag: '1044'
       s_tag: '900'
       olt: BBSIM_OLT_10
+      uni_id: '1'
     - onu: 'BBSM000a0406'
       c_tag: '1048'
       s_tag: '900'
       olt: BBSIM_OLT_10
+      uni_id: '1'
     - onu: 'BBSM000a0407'
       c_tag: '1052'
       s_tag: '900'
       olt: BBSIM_OLT_10
+      uni_id: '1'
     - onu: 'BBSM000a0408'
       c_tag: '1056'
       s_tag: '900'
       olt: BBSIM_OLT_10
+      uni_id: '1'
     - onu: 'BBSM000a0501'
       c_tag: '1060'
       s_tag: '900'
       olt: BBSIM_OLT_10
+      uni_id: '1'
     - onu: 'BBSM000a0502'
       c_tag: '1064'
       s_tag: '900'
       olt: BBSIM_OLT_10
+      uni_id: '1'
     - onu: 'BBSM000a0503'
       c_tag: '1068'
       s_tag: '900'
       olt: BBSIM_OLT_10
+      uni_id: '1'
     - onu: 'BBSM000a0504'
       c_tag: '1072'
       s_tag: '900'
       olt: BBSIM_OLT_10
+      uni_id: '1'
     - onu: 'BBSM000a0505'
       c_tag: '1076'
       s_tag: '900'
       olt: BBSIM_OLT_10
+      uni_id: '1'
     - onu: 'BBSM000a0506'
       c_tag: '1080'
       s_tag: '900'
       olt: BBSIM_OLT_10
+      uni_id: '1'
     - onu: 'BBSM000a0507'
       c_tag: '1084'
       s_tag: '900'
       olt: BBSIM_OLT_10
+      uni_id: '1'
     - onu: 'BBSM000a0508'
       c_tag: '1088'
       s_tag: '900'
       olt: BBSIM_OLT_10
+      uni_id: '1'
     - onu: 'BBSM000a0601'
       c_tag: '1092'
       s_tag: '900'
       olt: BBSIM_OLT_10
+      uni_id: '1'
     - onu: 'BBSM000a0602'
       c_tag: '1096'
       s_tag: '900'
       olt: BBSIM_OLT_10
+      uni_id: '1'
     - onu: 'BBSM000a0603'
       c_tag: '1100'
       s_tag: '900'
       olt: BBSIM_OLT_10
+      uni_id: '1'
     - onu: 'BBSM000a0604'
       c_tag: '1104'
       s_tag: '900'
       olt: BBSIM_OLT_10
+      uni_id: '1'
     - onu: 'BBSM000a0605'
       c_tag: '1108'
       s_tag: '900'
       olt: BBSIM_OLT_10
+      uni_id: '1'
     - onu: 'BBSM000a0606'
       c_tag: '1112'
       s_tag: '900'
       olt: BBSIM_OLT_10
+      uni_id: '1'
     - onu: 'BBSM000a0607'
       c_tag: '1116'
       s_tag: '900'
       olt: BBSIM_OLT_10
+      uni_id: '1'
     - onu: 'BBSM000a0608'
       c_tag: '1120'
       s_tag: '900'
       olt: BBSIM_OLT_10
+      uni_id: '1'
     - onu: 'BBSM000a0701'
       c_tag: '1124'
       s_tag: '900'
       olt: BBSIM_OLT_10
+      uni_id: '1'
     - onu: 'BBSM000a0702'
       c_tag: '1128'
       s_tag: '900'
       olt: BBSIM_OLT_10
+      uni_id: '1'
     - onu: 'BBSM000a0703'
       c_tag: '1132'
       s_tag: '900'
       olt: BBSIM_OLT_10
+      uni_id: '1'
     - onu: 'BBSM000a0704'
       c_tag: '1136'
       s_tag: '900'
       olt: BBSIM_OLT_10
+      uni_id: '1'
     - onu: 'BBSM000a0705'
       c_tag: '1140'
       s_tag: '900'
       olt: BBSIM_OLT_10
+      uni_id: '1'
     - onu: 'BBSM000a0706'
       c_tag: '1144'
       s_tag: '900'
       olt: BBSIM_OLT_10
+      uni_id: '1'
     - onu: 'BBSM000a0707'
       c_tag: '1148'
       s_tag: '900'
       olt: BBSIM_OLT_10
+      uni_id: '1'
     - onu: 'BBSM000a0708'
       c_tag: '1152'
       s_tag: '900'
       olt: BBSIM_OLT_10
+      uni_id: '1'
   dst:
     - ip: null
     - ip: null