diff --git a/tests/data/bbsim-kind-2OLTx2ONUx2PON-tt.yaml b/tests/data/bbsim-kind-2OLTx2ONUx2PON-tt.yaml
index 928da63..3469558 100755
--- a/tests/data/bbsim-kind-2OLTx2ONUx2PON-tt.yaml
+++ b/tests/data/bbsim-kind-2OLTx2ONUx2PON-tt.yaml
@@ -45,192 +45,224 @@
       c_tag: '900'
       s_tag: '900'
       service_type: 'hsia'
+      uni_id: '1'
     -
       onu: 'BBSM000a0001'
       olt: 'BBSIM_OLT_10'
       c_tag: '444'
       s_tag: '333'
       service_type: 'voip'
+      uni_id: '1'
     -
       onu: 'BBSM000a0001'
       olt: 'BBSIM_OLT_10'
       c_tag: '55'
       s_tag: '555'
       service_type: 'vod'
+      uni_id: '1'
     -
       onu: 'BBSM000a0001'
       olt: 'BBSIM_OLT_10'
       c_tag: '55'
       s_tag: '550'
       service_type: 'mcast'
+      uni_id: '1'
     -
       onu: 'BBSM000a0002'
       olt: 'BBSIM_OLT_10'
       c_tag: '904'
       s_tag: '900'
       service_type: 'hsia'
+      uni_id: '1'
     -
       onu: 'BBSM000a0002'
       olt: 'BBSIM_OLT_10'
       c_tag: '444'
       s_tag: '333'
       service_type: 'voip'
+      uni_id: '1'
     -
       onu: 'BBSM000a0002'
       olt: 'BBSIM_OLT_10'
       c_tag: '55'
       s_tag: '555'
       service_type: 'vod'
+      uni_id: '1'
     -
       onu: 'BBSM000a0002'
       olt: 'BBSIM_OLT_10'
       c_tag: '55'
       s_tag: '550'
       service_type: 'mcast'
+      uni_id: '1'
     -
       onu: 'BBSM000a0101'
       olt: 'BBSIM_OLT_10'
       c_tag: '908'
       s_tag: '900'
       service_type: 'hsia'
+      uni_id: '1'
     -
       onu: 'BBSM000a0101'
       olt: 'BBSIM_OLT_10'
       c_tag: '444'
       s_tag: '333'
       service_type: 'voip'
+      uni_id: '1'
     -
       onu: 'BBSM000a0101'
       olt: 'BBSIM_OLT_10'
       c_tag: '55'
       s_tag: '555'
       service_type: 'vod'
+      uni_id: '1'
     -
       onu: 'BBSM000a0101'
       olt: 'BBSIM_OLT_10'
       c_tag: '55'
       s_tag: '550'
       service_type: 'mcast'
+      uni_id: '1'
     -
       onu: 'BBSM000a0102'
       olt: 'BBSIM_OLT_10'
       c_tag: '912'
       s_tag: '900'
       service_type: 'hsia'
+      uni_id: '1'
     -
       onu: 'BBSM000a0102'
       olt: 'BBSIM_OLT_10'
       c_tag: '444'
       s_tag: '333'
       service_type: 'voip'
+      uni_id: '1'
     -
       onu: 'BBSM000a0102'
       olt: 'BBSIM_OLT_10'
       c_tag: '55'
       s_tag: '555'
       service_type: 'vod'
+      uni_id: '1'
     -
       onu: 'BBSM000a0102'
       olt: 'BBSIM_OLT_10'
       c_tag: '55'
       s_tag: '550'
       service_type: 'mcast'
+      uni_id: '1'
     -
       onu: 'BBSM000b0001'
       olt: 'BBSIM_OLT_11'
       c_tag: '900'
       s_tag: '901'
       service_type: 'hsia'
+      uni_id: '1'
     -
       onu: 'BBSM000b0001'
       olt: 'BBSIM_OLT_11'
       c_tag: '444'
       s_tag: '333'
       service_type: 'voip'
+      uni_id: '1'
     -
       onu: 'BBSM000b0001'
       olt: 'BBSIM_OLT_11'
       c_tag: '55'
       s_tag: '555'
       service_type: 'vod'
+      uni_id: '1'
     -
       onu: 'BBSM000b0001'
       olt: 'BBSIM_OLT_11'
       c_tag: '55'
       s_tag: '550'
       service_type: 'mcast'
+      uni_id: '1'
     -
       onu: 'BBSM000b0002'
       olt: 'BBSIM_OLT_11'
       c_tag: '904'
       s_tag: '901'
       service_type: 'hsia'
+      uni_id: '1'
     -
       onu: 'BBSM000b0002'
       olt: 'BBSIM_OLT_11'
       c_tag: '444'
       s_tag: '333'
       service_type: 'voip'
+      uni_id: '1'
     -
       onu: 'BBSM000b0002'
       olt: 'BBSIM_OLT_11'
       c_tag: '55'
       s_tag: '555'
       service_type: 'vod'
+      uni_id: '1'
     -
       onu: 'BBSM000b0002'
       olt: 'BBSIM_OLT_11'
       c_tag: '55'
       s_tag: '550'
       service_type: 'mcast'
+      uni_id: '1'
     -
       onu: 'BBSM000b0101'
       olt: 'BBSIM_OLT_11'
       c_tag: '908'
       s_tag: '901'
       service_type: 'hsia'
+      uni_id: '1'
     -
       onu: 'BBSM000b0101'
       olt: 'BBSIM_OLT_11'
       c_tag: '444'
       s_tag: '333'
       service_type: 'voip'
+      uni_id: '1'
     -
       onu: 'BBSM000b0101'
       olt: 'BBSIM_OLT_11'
       c_tag: '55'
       s_tag: '555'
       service_type: 'vod'
+      uni_id: '1'
     -
       onu: 'BBSM000b0101'
       olt: 'BBSIM_OLT_11'
       c_tag: '55'
       s_tag: '550'
       service_type: 'mcast'
+      uni_id: '1'
     -
       onu: 'BBSM000b0102'
       olt: 'BBSIM_OLT_11'
       c_tag: '912'
       s_tag: '901'
       service_type: 'hsia'
+      uni_id: '1'
     -
       onu: 'BBSM000b0102'
       olt: 'BBSIM_OLT_11'
       c_tag: '444'
       s_tag: '333'
       service_type: 'voip'
+      uni_id: '1'
     -
       onu: 'BBSM000b0102'
       olt: 'BBSIM_OLT_11'
       c_tag: '55'
       s_tag: '555'
       service_type: 'vod'
+      uni_id: '1'
     -
       onu: 'BBSM000b0102'
       olt: 'BBSIM_OLT_11'
       c_tag: '55'
       s_tag: '550'
       service_type: 'mcast'
+      uni_id: '1'
   dst:
     - ip: null
     - ip: null