diff --git a/tests/data/bbsim-kind-8x8.yaml b/tests/data/bbsim-kind-8x8.yaml
index d9d3017..fbb94b3 100755
--- a/tests/data/bbsim-kind-8x8.yaml
+++ b/tests/data/bbsim-kind-8x8.yaml
@@ -67,228 +67,228 @@
       s_tag: '900'
       olt: BBSIM_OLT_0
     - onu: 'BBSM00000101'
-      c_tag: '902'
-      s_tag: '910'
+      c_tag: '908'
+      s_tag: '900'
       olt: BBSIM_OLT_0
     - onu: 'BBSM00000102'
-      c_tag: '903'
-      s_tag: '910'
+      c_tag: '909'
+      s_tag: '900'
       olt: BBSIM_OLT_0
     - onu: 'BBSM00000103'
-      c_tag: '904'
-      s_tag: '910'
+      c_tag: '910'
+      s_tag: '900'
       olt: BBSIM_OLT_0
     - onu: 'BBSM00000104'
-      c_tag: '905'
-      s_tag: '910'
+      c_tag: '911'
+      s_tag: '900'
       olt: BBSIM_OLT_0
     - onu: 'BBSM00000105'
-      c_tag: '906'
-      s_tag: '910'
+      c_tag: '912'
+      s_tag: '900'
       olt: BBSIM_OLT_0
     - onu: 'BBSM00000106'
-      c_tag: '907'
-      s_tag: '910'
+      c_tag: '913'
+      s_tag: '900'
       olt: BBSIM_OLT_0
     - onu: 'BBSM00000107'
-      c_tag: '908'
-      s_tag: '910'
+      c_tag: '914'
+      s_tag: '900'
       olt: BBSIM_OLT_0
     - onu: 'BBSM00000108'
-      c_tag: '909'
-      s_tag: '910'
+      c_tag: '915'
+      s_tag: '900'
       olt: BBSIM_OLT_0
     - onu: 'BBSM00000201'
-      c_tag: '905'
-      s_tag: '920'
+      c_tag: '916'
+      s_tag: '900'
       olt: BBSIM_OLT_0
     - onu: 'BBSM00000202'
-      c_tag: '905'
-      s_tag: '920'
+      c_tag: '917'
+      s_tag: '900'
       olt: BBSIM_OLT_0
     - onu: 'BBSM00000203'
-      c_tag: '906'
-      s_tag: '920'
+      c_tag: '918'
+      s_tag: '900'
       olt: BBSIM_OLT_0
     - onu: 'BBSM00000204'
-      c_tag: '907'
-      s_tag: '920'
+      c_tag: '919'
+      s_tag: '900'
       olt: BBSIM_OLT_0
     - onu: 'BBSM00000205'
-      c_tag: '908'
-      s_tag: '920'
+      c_tag: '920'
+      s_tag: '900'
       olt: BBSIM_OLT_0
     - onu: 'BBSM00000206'
-      c_tag: '909'
-      s_tag: '920'
+      c_tag: '921'
+      s_tag: '900'
       olt: BBSIM_OLT_0
     - onu: 'BBSM00000207'
-      c_tag: '910'
-      s_tag: '920'
+      c_tag: '922'
+      s_tag: '900'
       olt: BBSIM_OLT_0
     - onu: 'BBSM00000208'
-      c_tag: '911'
-      s_tag: '920'
+      c_tag: '923'
+      s_tag: '900'
       olt: BBSIM_OLT_0
     - onu: 'BBSM00000301'
-      c_tag: '906'
-      s_tag: '930'
+      c_tag: '924'
+      s_tag: '900'
       olt: BBSIM_OLT_0
     - onu: 'BBSM00000302'
-      c_tag: '907'
-      s_tag: '930'
+      c_tag: '925'
+      s_tag: '900'
       olt: BBSIM_OLT_0
     - onu: 'BBSM00000303'
-      c_tag: '908'
-      s_tag: '930'
+      c_tag: '926'
+      s_tag: '900'
       olt: BBSIM_OLT_0
     - onu: 'BBSM00000304'
-      c_tag: '909'
-      s_tag: '930'
+      c_tag: '927'
+      s_tag: '900'
       olt: BBSIM_OLT_0
     - onu: 'BBSM00000305'
-      c_tag: '910'
-      s_tag: '930'
+      c_tag: '928'
+      s_tag: '900'
       olt: BBSIM_OLT_0
     - onu: 'BBSM00000306'
-      c_tag: '911'
-      s_tag: '930'
+      c_tag: '929'
+      s_tag: '900'
       olt: BBSIM_OLT_0
     - onu: 'BBSM00000307'
-      c_tag: '912'
-      s_tag: '930'
+      c_tag: '930'
+      s_tag: '900'
       olt: BBSIM_OLT_0
     - onu: 'BBSM00000308'
-      c_tag: '913'
-      s_tag: '930'
+      c_tag: '931'
+      s_tag: '900'
       olt: BBSIM_OLT_0
     - onu: 'BBSM00000401'
-      c_tag: '908'
-      s_tag: '940'
+      c_tag: '932'
+      s_tag: '900'
       olt: BBSIM_OLT_0
     - onu: 'BBSM00000402'
-      c_tag: '909'
-      s_tag: '940'
+      c_tag: '933'
+      s_tag: '900'
       olt: BBSIM_OLT_0
     - onu: 'BBSM00000403'
-      c_tag: '910'
-      s_tag: '940'
+      c_tag: '934'
+      s_tag: '900'
       olt: BBSIM_OLT_0
     - onu: 'BBSM00000404'
-      c_tag: '911'
-      s_tag: '940'
+      c_tag: '935'
+      s_tag: '900'
       olt: BBSIM_OLT_0
     - onu: 'BBSM00000405'
-      c_tag: '912'
-      s_tag: '940'
+      c_tag: '936'
+      s_tag: '900'
       olt: BBSIM_OLT_0
     - onu: 'BBSM00000406'
-      c_tag: '913'
-      s_tag: '940'
+      c_tag: '937'
+      s_tag: '900'
       olt: BBSIM_OLT_0
     - onu: 'BBSM00000407'
-      c_tag: '914'
-      s_tag: '940'
+      c_tag: '938'
+      s_tag: '900'
       olt: BBSIM_OLT_0
     - onu: 'BBSM00000408'
-      c_tag: '915'
-      s_tag: '940'
+      c_tag: '939'
+      s_tag: '900'
       olt: BBSIM_OLT_0
     - onu: 'BBSM00000501'
-      c_tag: '910'
-      s_tag: '950'
+      c_tag: '940'
+      s_tag: '900'
       olt: BBSIM_OLT_0
     - onu: 'BBSM00000502'
-      c_tag: '911'
-      s_tag: '950'
+      c_tag: '941'
+      s_tag: '900'
       olt: BBSIM_OLT_0
     - onu: 'BBSM00000503'
-      c_tag: '912'
-      s_tag: '950'
+      c_tag: '942'
+      s_tag: '900'
       olt: BBSIM_OLT_0
     - onu: 'BBSM00000504'
-      c_tag: '913'
-      s_tag: '950'
+      c_tag: '943'
+      s_tag: '900'
       olt: BBSIM_OLT_0
     - onu: 'BBSM00000505'
-      c_tag: '914'
-      s_tag: '950'
+      c_tag: '944'
+      s_tag: '900'
       olt: BBSIM_OLT_0
     - onu: 'BBSM00000506'
-      c_tag: '915'
-      s_tag: '950'
+      c_tag: '945'
+      s_tag: '900'
       olt: BBSIM_OLT_0
     - onu: 'BBSM00000507'
-      c_tag: '916'
-      s_tag: '950'
+      c_tag: '946'
+      s_tag: '900'
       olt: BBSIM_OLT_0
     - onu: 'BBSM00000508'
-      c_tag: '917'
-      s_tag: '950'
+      c_tag: '947'
+      s_tag: '900'
       olt: BBSIM_OLT_0
     - onu: 'BBSM00000601'
-      c_tag: '912'
-      s_tag: '960'
+      c_tag: '948'
+      s_tag: '900'
       olt: BBSIM_OLT_0
     - onu: 'BBSM00000602'
-      c_tag: '913'
-      s_tag: '960'
+      c_tag: '949'
+      s_tag: '900'
       olt: BBSIM_OLT_0
     - onu: 'BBSM00000603'
-      c_tag: '914'
-      s_tag: '960'
+      c_tag: '950'
+      s_tag: '900'
       olt: BBSIM_OLT_0
     - onu: 'BBSM00000604'
-      c_tag: '915'
-      s_tag: '960'
+      c_tag: '951'
+      s_tag: '900'
       olt: BBSIM_OLT_0
     - onu: 'BBSM00000605'
-      c_tag: '916'
-      s_tag: '960'
+      c_tag: '952'
+      s_tag: '900'
       olt: BBSIM_OLT_0
     - onu: 'BBSM00000606'
-      c_tag: '917'
-      s_tag: '960'
+      c_tag: '953'
+      s_tag: '900'
       olt: BBSIM_OLT_0
     - onu: 'BBSM00000607'
-      c_tag: '918'
-      s_tag: '960'
+      c_tag: '954'
+      s_tag: '900'
       olt: BBSIM_OLT_0
     - onu: 'BBSM00000608'
-      c_tag: '919'
-      s_tag: '960'
+      c_tag: '955'
+      s_tag: '900'
       olt: BBSIM_OLT_0
     - onu: 'BBSM00000701'
-      c_tag: '914'
-      s_tag: '970'
+      c_tag: '956'
+      s_tag: '900'
       olt: BBSIM_OLT_0
     - onu: 'BBSM00000702'
-      c_tag: '915'
-      s_tag: '970'
+      c_tag: '957'
+      s_tag: '900'
       olt: BBSIM_OLT_0
     - onu: 'BBSM00000703'
-      c_tag: '916'
-      s_tag: '970'
+      c_tag: '958'
+      s_tag: '900'
       olt: BBSIM_OLT_0
     - onu: 'BBSM00000704'
-      c_tag: '917'
-      s_tag: '970'
+      c_tag: '959'
+      s_tag: '900'
       olt: BBSIM_OLT_0
     - onu: 'BBSM00000705'
-      c_tag: '918'
-      s_tag: '970'
+      c_tag: '960'
+      s_tag: '900'
       olt: BBSIM_OLT_0
     - onu: 'BBSM00000706'
-      c_tag: '919'
-      s_tag: '970'
+      c_tag: '961'
+      s_tag: '900'
       olt: BBSIM_OLT_0
     - onu: 'BBSM00000707'
-      c_tag: '920'
-      s_tag: '970'
+      c_tag: '962'
+      s_tag: '900'
       olt: BBSIM_OLT_0
     - onu: 'BBSM00000708'
-      c_tag: '921'
-      s_tag: '970'
+      c_tag: '963'
+      s_tag: '900'
       olt: BBSIM_OLT_0
 
   dst: