diff --git a/tests/data/bbsim-kind-2OLTx2ONUx2PON-tt.yaml b/tests/data/bbsim-kind-2OLTx2ONUx2PON-tt.yaml
index 56177a5..c665818 100755
--- a/tests/data/bbsim-kind-2OLTx2ONUx2PON-tt.yaml
+++ b/tests/data/bbsim-kind-2OLTx2ONUx2PON-tt.yaml
@@ -46,6 +46,7 @@
       s_tag: '900'
       service_type: 'hsia'
       uni_id: '1'
+      tp_id: '64'
     -
       onu: 'BBSM000a0001'
       olt: 'BBSIM_OLT_10'
@@ -53,6 +54,7 @@
       s_tag: '333'
       service_type: 'voip'
       uni_id: '1'
+      tp_id: '65'
     -
       onu: 'BBSM000a0001'
       olt: 'BBSIM_OLT_10'
@@ -60,6 +62,7 @@
       s_tag: '555'
       service_type: 'vod'
       uni_id: '1'
+      tp_id: '66'
     -
       onu: 'BBSM000a0001'
       olt: 'BBSIM_OLT_10'
@@ -67,6 +70,7 @@
       s_tag: '550'
       service_type: 'mcast'
       uni_id: '1'
+      tp_id: '66'
     -
       onu: 'BBSM000a0002'
       olt: 'BBSIM_OLT_10'
@@ -74,6 +78,7 @@
       s_tag: '900'
       service_type: 'hsia'
       uni_id: '1'
+      tp_id: '64'
     -
       onu: 'BBSM000a0002'
       olt: 'BBSIM_OLT_10'
@@ -81,6 +86,7 @@
       s_tag: '333'
       service_type: 'voip'
       uni_id: '1'
+      tp_id: '65'
     -
       onu: 'BBSM000a0002'
       olt: 'BBSIM_OLT_10'
@@ -88,6 +94,7 @@
       s_tag: '555'
       service_type: 'vod'
       uni_id: '1'
+      tp_id: '66'
     -
       onu: 'BBSM000a0002'
       olt: 'BBSIM_OLT_10'
@@ -95,6 +102,7 @@
       s_tag: '550'
       service_type: 'mcast'
       uni_id: '1'
+      tp_id: '66'
     -
       onu: 'BBSM000a0101'
       olt: 'BBSIM_OLT_10'
@@ -102,6 +110,7 @@
       s_tag: '900'
       service_type: 'hsia'
       uni_id: '1'
+      tp_id: '64'
     -
       onu: 'BBSM000a0101'
       olt: 'BBSIM_OLT_10'
@@ -109,6 +118,7 @@
       s_tag: '333'
       service_type: 'voip'
       uni_id: '1'
+      tp_id: '65'
     -
       onu: 'BBSM000a0101'
       olt: 'BBSIM_OLT_10'
@@ -116,6 +126,7 @@
       s_tag: '555'
       service_type: 'vod'
       uni_id: '1'
+      tp_id: '66'
     -
       onu: 'BBSM000a0101'
       olt: 'BBSIM_OLT_10'
@@ -123,6 +134,7 @@
       s_tag: '550'
       service_type: 'mcast'
       uni_id: '1'
+      tp_id: '66'
     -
       onu: 'BBSM000a0102'
       olt: 'BBSIM_OLT_10'
@@ -130,6 +142,7 @@
       s_tag: '900'
       service_type: 'hsia'
       uni_id: '1'
+      tp_id: '64'
     -
       onu: 'BBSM000a0102'
       olt: 'BBSIM_OLT_10'
@@ -137,6 +150,7 @@
       s_tag: '333'
       service_type: 'voip'
       uni_id: '1'
+      tp_id: '65'
     -
       onu: 'BBSM000a0102'
       olt: 'BBSIM_OLT_10'
@@ -144,6 +158,7 @@
       s_tag: '555'
       service_type: 'vod'
       uni_id: '1'
+      tp_id: '66'
     -
       onu: 'BBSM000a0102'
       olt: 'BBSIM_OLT_10'
@@ -151,6 +166,7 @@
       s_tag: '550'
       service_type: 'mcast'
       uni_id: '1'
+      tp_id: '66'
     -
       onu: 'BBSM000b0001'
       olt: 'BBSIM_OLT_11'
@@ -158,6 +174,7 @@
       s_tag: '901'
       service_type: 'hsia'
       uni_id: '1'
+      tp_id: '64'
     -
       onu: 'BBSM000b0001'
       olt: 'BBSIM_OLT_11'
@@ -165,6 +182,7 @@
       s_tag: '333'
       service_type: 'voip'
       uni_id: '1'
+      tp_id: '65'
     -
       onu: 'BBSM000b0001'
       olt: 'BBSIM_OLT_11'
@@ -172,6 +190,7 @@
       s_tag: '555'
       service_type: 'vod'
       uni_id: '1'
+      tp_id: '66'
     -
       onu: 'BBSM000b0001'
       olt: 'BBSIM_OLT_11'
@@ -179,6 +198,7 @@
       s_tag: '550'
       service_type: 'mcast'
       uni_id: '1'
+      tp_id: '66'
     -
       onu: 'BBSM000b0002'
       olt: 'BBSIM_OLT_11'
@@ -186,6 +206,7 @@
       s_tag: '901'
       service_type: 'hsia'
       uni_id: '1'
+      tp_id: '64'
     -
       onu: 'BBSM000b0002'
       olt: 'BBSIM_OLT_11'
@@ -193,6 +214,7 @@
       s_tag: '333'
       service_type: 'voip'
       uni_id: '1'
+      tp_id: '65'
     -
       onu: 'BBSM000b0002'
       olt: 'BBSIM_OLT_11'
@@ -200,6 +222,7 @@
       s_tag: '555'
       service_type: 'vod'
       uni_id: '1'
+      tp_id: '66'
     -
       onu: 'BBSM000b0002'
       olt: 'BBSIM_OLT_11'
@@ -207,6 +230,7 @@
       s_tag: '550'
       service_type: 'mcast'
       uni_id: '1'
+      tp_id: '66'
     -
       onu: 'BBSM000b0101'
       olt: 'BBSIM_OLT_11'
@@ -214,6 +238,7 @@
       s_tag: '901'
       service_type: 'hsia'
       uni_id: '1'
+      tp_id: '64'
     -
       onu: 'BBSM000b0101'
       olt: 'BBSIM_OLT_11'
@@ -221,6 +246,7 @@
       s_tag: '333'
       service_type: 'voip'
       uni_id: '1'
+      tp_id: '65'
     -
       onu: 'BBSM000b0101'
       olt: 'BBSIM_OLT_11'
@@ -228,6 +254,7 @@
       s_tag: '555'
       service_type: 'vod'
       uni_id: '1'
+      tp_id: '66'
     -
       onu: 'BBSM000b0101'
       olt: 'BBSIM_OLT_11'
@@ -235,6 +262,7 @@
       s_tag: '550'
       service_type: 'mcast'
       uni_id: '1'
+      tp_id: '66'
     -
       onu: 'BBSM000b0102'
       olt: 'BBSIM_OLT_11'
@@ -242,6 +270,7 @@
       s_tag: '901'
       service_type: 'hsia'
       uni_id: '1'
+      tp_id: '64'
     -
       onu: 'BBSM000b0102'
       olt: 'BBSIM_OLT_11'
@@ -249,6 +278,7 @@
       s_tag: '333'
       service_type: 'voip'
       uni_id: '1'
+      tp_id: '65'
     -
       onu: 'BBSM000b0102'
       olt: 'BBSIM_OLT_11'
@@ -256,6 +286,7 @@
       s_tag: '555'
       service_type: 'vod'
       uni_id: '1'
+      tp_id: '66'
     -
       onu: 'BBSM000b0102'
       olt: 'BBSIM_OLT_11'
@@ -263,6 +294,7 @@
       s_tag: '550'
       service_type: 'mcast'
       uni_id: '1'
+      tp_id: '66'
   dst:
     - ip: null
     - ip: null
diff --git a/tests/data/bbsim-kind-multi-uni-tt.yaml b/tests/data/bbsim-kind-multi-uni-tt.yaml
index 58fac66..bc19afe 100755
--- a/tests/data/bbsim-kind-multi-uni-tt.yaml
+++ b/tests/data/bbsim-kind-multi-uni-tt.yaml
@@ -44,96 +44,112 @@
       s_tag: '900'
       service_type: 'hsia'
       uni_id: 1
+      tp_id: '64'
     - onu: 'BBSM000a0001'
       olt: 'BBSIM_OLT_10'
       c_tag: '444'
       s_tag: '333'
       uni_id: 1
       service_type: 'voip'
+      tp_id: '65'
     - onu: 'BBSM000a0001'
       olt: 'BBSIM_OLT_10'
       c_tag: '55'
       s_tag: '555'
       service_type: 'vod'
       uni_id: 1
+      tp_id: '66'
     - onu: 'BBSM000a0001'
       olt: 'BBSIM_OLT_10'
       c_tag: '55'
       s_tag: '550'
       service_type: 'mcast'
       uni_id: 1
+      tp_id: '66'
     - onu: 'BBSM000a0001'
       olt: 'BBSIM_OLT_10'
       c_tag: '901'
       s_tag: '900'
       service_type: 'hsia'
       uni_id: 2
+      tp_id: '64'
     - onu: 'BBSM000a0001'
       olt: 'BBSIM_OLT_10'
       c_tag: '444'
       s_tag: '333'
       uni_id: 2
       service_type: 'voip'
+      tp_id: '65'
     - onu: 'BBSM000a0001'
       olt: 'BBSIM_OLT_10'
       c_tag: '55'
       s_tag: '555'
       service_type: 'vod'
       uni_id: 2
+      tp_id: '66'
     - onu: 'BBSM000a0001'
       olt: 'BBSIM_OLT_10'
       c_tag: '55'
       s_tag: '550'
       service_type: 'mcast'
       uni_id: 2
+      tp_id: '66'
     - onu: 'BBSM000a0001'
       olt: 'BBSIM_OLT_10'
       c_tag: '902'
       s_tag: '900'
       service_type: 'hsia'
       uni_id: 3
+      tp_id: '64'
     - onu: 'BBSM000a0001'
       olt: 'BBSIM_OLT_10'
       c_tag: '444'
       s_tag: '333'
       uni_id: 3
       service_type: 'voip'
+      tp_id: '65'
     - onu: 'BBSM000a0001'
       olt: 'BBSIM_OLT_10'
       c_tag: '55'
       s_tag: '555'
       service_type: 'vod'
       uni_id: 3
+      tp_id: '66'
     - onu: 'BBSM000a0001'
       olt: 'BBSIM_OLT_10'
       c_tag: '55'
       s_tag: '550'
       service_type: 'mcast'
       uni_id: 3
+      tp_id: '66'
     - onu: 'BBSM000a0001'
       olt: 'BBSIM_OLT_10'
       c_tag: '903'
       s_tag: '900'
       service_type: 'hsia'
       uni_id: 4
+      tp_id: '64'
     - onu: 'BBSM000a0001'
       olt: 'BBSIM_OLT_10'
       c_tag: '444'
       s_tag: '333'
       uni_id: 4
       service_type: 'voip'
+      tp_id: '65'
     - onu: 'BBSM000a0001'
       olt: 'BBSIM_OLT_10'
       c_tag: '55'
       s_tag: '555'
       service_type: 'vod'
       uni_id: 4
+      tp_id: '66'
     - onu: 'BBSM000a0001'
       olt: 'BBSIM_OLT_10'
       c_tag: '55'
       s_tag: '550'
       service_type: 'mcast'
       uni_id: 4
+      tp_id: '66'
 
   dst:
     - ip: null
diff --git a/tests/data/bbsim-kind-tt.yaml b/tests/data/bbsim-kind-tt.yaml
index cb9201c..584ac1b 100755
--- a/tests/data/bbsim-kind-tt.yaml
+++ b/tests/data/bbsim-kind-tt.yaml
@@ -44,24 +44,28 @@
       s_tag: '900'
       service_type: 'hsia'
       uni_id: 1
+      tp_id: '64'
     - onu: 'BBSM000a0001'
       olt: 'BBSIM_OLT_10'
       c_tag: '444'
       s_tag: '333'
       uni_id: 1
       service_type: 'voip'
+      tp_id: '65'
     - onu: 'BBSM000a0001'
       olt: 'BBSIM_OLT_10'
       c_tag: '55'
       s_tag: '555'
       service_type: 'vod'
       uni_id: 1
+      tp_id: '66'
     - onu: 'BBSM000a0001'
       olt: 'BBSIM_OLT_10'
       c_tag: '55'
       s_tag: '550'
       service_type: 'mcast'
       uni_id: 1
+      tp_id: '66'
 
   dst:
     - ip: null