diff --git a/tests/data/bbsim-kind-8x8.yaml b/tests/data/bbsim-kind-8x8.yaml
index fbb94b3..54f004a 100755
--- a/tests/data/bbsim-kind-8x8.yaml
+++ b/tests/data/bbsim-kind-8x8.yaml
@@ -30,267 +30,266 @@
 olts:
   -
     ip: bbsim0
-    serial: BBSIM_OLT_0
+    serial: BBSIM_OLT_10
 
 hosts:
   src:
-    - onu: 'BBSM00000001'
+    - onu: 'BBSM000a0001'
       c_tag: '900'
       s_tag: '900'
-      olt: BBSIM_OLT_0
-    - onu: 'BBSM00000002'
+      olt: BBSIM_OLT_10
+    - onu: 'BBSM000a0002'
       c_tag: '901'
       s_tag: '900'
-      olt: BBSIM_OLT_0
-    - onu: 'BBSM00000003'
+      olt: BBSIM_OLT_10
+    - onu: 'BBSM000a0003'
       c_tag: '902'
       s_tag: '900'
-      olt: BBSIM_OLT_0
-    - onu: 'BBSM00000004'
+      olt: BBSIM_OLT_10
+    - onu: 'BBSM000a0004'
       c_tag: '903'
       s_tag: '900'
-      olt: BBSIM_OLT_0
-    - onu: 'BBSM00000005'
+      olt: BBSIM_OLT_10
+    - onu: 'BBSM000a0005'
       c_tag: '904'
       s_tag: '900'
-      olt: BBSIM_OLT_0
-    - onu: 'BBSM00000006'
+      olt: BBSIM_OLT_10
+    - onu: 'BBSM000a0006'
       c_tag: '905'
       s_tag: '900'
-      olt: BBSIM_OLT_0
-    - onu: 'BBSM00000007'
+      olt: BBSIM_OLT_10
+    - onu: 'BBSM000a0007'
       c_tag: '906'
       s_tag: '900'
-      olt: BBSIM_OLT_0
-    - onu: 'BBSM00000008'
+      olt: BBSIM_OLT_10
+    - onu: 'BBSM000a0008'
       c_tag: '907'
       s_tag: '900'
-      olt: BBSIM_OLT_0
-    - onu: 'BBSM00000101'
+      olt: BBSIM_OLT_10
+    - onu: 'BBSM000a0101'
       c_tag: '908'
       s_tag: '900'
-      olt: BBSIM_OLT_0
-    - onu: 'BBSM00000102'
+      olt: BBSIM_OLT_10
+    - onu: 'BBSM000a0102'
       c_tag: '909'
       s_tag: '900'
-      olt: BBSIM_OLT_0
-    - onu: 'BBSM00000103'
+      olt: BBSIM_OLT_10
+    - onu: 'BBSM000a0103'
       c_tag: '910'
       s_tag: '900'
-      olt: BBSIM_OLT_0
-    - onu: 'BBSM00000104'
+      olt: BBSIM_OLT_10
+    - onu: 'BBSM000a0104'
       c_tag: '911'
       s_tag: '900'
-      olt: BBSIM_OLT_0
-    - onu: 'BBSM00000105'
+      olt: BBSIM_OLT_10
+    - onu: 'BBSM000a0105'
       c_tag: '912'
       s_tag: '900'
-      olt: BBSIM_OLT_0
-    - onu: 'BBSM00000106'
+      olt: BBSIM_OLT_10
+    - onu: 'BBSM000a0106'
       c_tag: '913'
       s_tag: '900'
-      olt: BBSIM_OLT_0
-    - onu: 'BBSM00000107'
+      olt: BBSIM_OLT_10
+    - onu: 'BBSM000a0107'
       c_tag: '914'
       s_tag: '900'
-      olt: BBSIM_OLT_0
-    - onu: 'BBSM00000108'
+      olt: BBSIM_OLT_10
+    - onu: 'BBSM000a0108'
       c_tag: '915'
       s_tag: '900'
-      olt: BBSIM_OLT_0
-    - onu: 'BBSM00000201'
+      olt: BBSIM_OLT_10
+    - onu: 'BBSM000a0201'
       c_tag: '916'
       s_tag: '900'
-      olt: BBSIM_OLT_0
-    - onu: 'BBSM00000202'
+      olt: BBSIM_OLT_10
+    - onu: 'BBSM000a0202'
       c_tag: '917'
       s_tag: '900'
-      olt: BBSIM_OLT_0
-    - onu: 'BBSM00000203'
+      olt: BBSIM_OLT_10
+    - onu: 'BBSM000a0203'
       c_tag: '918'
       s_tag: '900'
-      olt: BBSIM_OLT_0
-    - onu: 'BBSM00000204'
+      olt: BBSIM_OLT_10
+    - onu: 'BBSM000a0204'
       c_tag: '919'
       s_tag: '900'
-      olt: BBSIM_OLT_0
-    - onu: 'BBSM00000205'
+      olt: BBSIM_OLT_10
+    - onu: 'BBSM000a0205'
       c_tag: '920'
       s_tag: '900'
-      olt: BBSIM_OLT_0
-    - onu: 'BBSM00000206'
+      olt: BBSIM_OLT_10
+    - onu: 'BBSM000a0206'
       c_tag: '921'
       s_tag: '900'
-      olt: BBSIM_OLT_0
-    - onu: 'BBSM00000207'
+      olt: BBSIM_OLT_10
+    - onu: 'BBSM000a0207'
       c_tag: '922'
       s_tag: '900'
-      olt: BBSIM_OLT_0
-    - onu: 'BBSM00000208'
+      olt: BBSIM_OLT_10
+    - onu: 'BBSM000a0208'
       c_tag: '923'
       s_tag: '900'
-      olt: BBSIM_OLT_0
-    - onu: 'BBSM00000301'
+      olt: BBSIM_OLT_10
+    - onu: 'BBSM000a0301'
       c_tag: '924'
       s_tag: '900'
-      olt: BBSIM_OLT_0
-    - onu: 'BBSM00000302'
+      olt: BBSIM_OLT_10
+    - onu: 'BBSM000a0302'
       c_tag: '925'
       s_tag: '900'
-      olt: BBSIM_OLT_0
-    - onu: 'BBSM00000303'
+      olt: BBSIM_OLT_10
+    - onu: 'BBSM000a0303'
       c_tag: '926'
       s_tag: '900'
-      olt: BBSIM_OLT_0
-    - onu: 'BBSM00000304'
+      olt: BBSIM_OLT_10
+    - onu: 'BBSM000a0304'
       c_tag: '927'
       s_tag: '900'
-      olt: BBSIM_OLT_0
-    - onu: 'BBSM00000305'
+      olt: BBSIM_OLT_10
+    - onu: 'BBSM000a0305'
       c_tag: '928'
       s_tag: '900'
-      olt: BBSIM_OLT_0
-    - onu: 'BBSM00000306'
+      olt: BBSIM_OLT_10
+    - onu: 'BBSM000a0306'
       c_tag: '929'
       s_tag: '900'
-      olt: BBSIM_OLT_0
-    - onu: 'BBSM00000307'
+      olt: BBSIM_OLT_10
+    - onu: 'BBSM000a0307'
       c_tag: '930'
       s_tag: '900'
-      olt: BBSIM_OLT_0
-    - onu: 'BBSM00000308'
+      olt: BBSIM_OLT_10
+    - onu: 'BBSM000a0308'
       c_tag: '931'
       s_tag: '900'
-      olt: BBSIM_OLT_0
-    - onu: 'BBSM00000401'
+      olt: BBSIM_OLT_10
+    - onu: 'BBSM000a0401'
       c_tag: '932'
       s_tag: '900'
-      olt: BBSIM_OLT_0
-    - onu: 'BBSM00000402'
+      olt: BBSIM_OLT_10
+    - onu: 'BBSM000a0402'
       c_tag: '933'
       s_tag: '900'
-      olt: BBSIM_OLT_0
-    - onu: 'BBSM00000403'
+      olt: BBSIM_OLT_10
+    - onu: 'BBSM000a0403'
       c_tag: '934'
       s_tag: '900'
-      olt: BBSIM_OLT_0
-    - onu: 'BBSM00000404'
+      olt: BBSIM_OLT_10
+    - onu: 'BBSM000a0404'
       c_tag: '935'
       s_tag: '900'
-      olt: BBSIM_OLT_0
-    - onu: 'BBSM00000405'
+      olt: BBSIM_OLT_10
+    - onu: 'BBSM000a0405'
       c_tag: '936'
       s_tag: '900'
-      olt: BBSIM_OLT_0
-    - onu: 'BBSM00000406'
+      olt: BBSIM_OLT_10
+    - onu: 'BBSM000a0406'
       c_tag: '937'
       s_tag: '900'
-      olt: BBSIM_OLT_0
-    - onu: 'BBSM00000407'
+      olt: BBSIM_OLT_10
+    - onu: 'BBSM000a0407'
       c_tag: '938'
       s_tag: '900'
-      olt: BBSIM_OLT_0
-    - onu: 'BBSM00000408'
+      olt: BBSIM_OLT_10
+    - onu: 'BBSM000a0408'
       c_tag: '939'
       s_tag: '900'
-      olt: BBSIM_OLT_0
-    - onu: 'BBSM00000501'
+      olt: BBSIM_OLT_10
+    - onu: 'BBSM000a0501'
       c_tag: '940'
       s_tag: '900'
-      olt: BBSIM_OLT_0
-    - onu: 'BBSM00000502'
+      olt: BBSIM_OLT_10
+    - onu: 'BBSM000a0502'
       c_tag: '941'
       s_tag: '900'
-      olt: BBSIM_OLT_0
-    - onu: 'BBSM00000503'
+      olt: BBSIM_OLT_10
+    - onu: 'BBSM000a0503'
       c_tag: '942'
       s_tag: '900'
-      olt: BBSIM_OLT_0
-    - onu: 'BBSM00000504'
+      olt: BBSIM_OLT_10
+    - onu: 'BBSM000a0504'
       c_tag: '943'
       s_tag: '900'
-      olt: BBSIM_OLT_0
-    - onu: 'BBSM00000505'
+      olt: BBSIM_OLT_10
+    - onu: 'BBSM000a0505'
       c_tag: '944'
       s_tag: '900'
-      olt: BBSIM_OLT_0
-    - onu: 'BBSM00000506'
+      olt: BBSIM_OLT_10
+    - onu: 'BBSM000a0506'
       c_tag: '945'
       s_tag: '900'
-      olt: BBSIM_OLT_0
-    - onu: 'BBSM00000507'
+      olt: BBSIM_OLT_10
+    - onu: 'BBSM000a0507'
       c_tag: '946'
       s_tag: '900'
-      olt: BBSIM_OLT_0
-    - onu: 'BBSM00000508'
+      olt: BBSIM_OLT_10
+    - onu: 'BBSM000a0508'
       c_tag: '947'
       s_tag: '900'
-      olt: BBSIM_OLT_0
-    - onu: 'BBSM00000601'
+      olt: BBSIM_OLT_10
+    - onu: 'BBSM000a0601'
       c_tag: '948'
       s_tag: '900'
-      olt: BBSIM_OLT_0
-    - onu: 'BBSM00000602'
+      olt: BBSIM_OLT_10
+    - onu: 'BBSM000a0602'
       c_tag: '949'
       s_tag: '900'
-      olt: BBSIM_OLT_0
-    - onu: 'BBSM00000603'
+      olt: BBSIM_OLT_10
+    - onu: 'BBSM000a0603'
       c_tag: '950'
       s_tag: '900'
-      olt: BBSIM_OLT_0
-    - onu: 'BBSM00000604'
+      olt: BBSIM_OLT_10
+    - onu: 'BBSM000a0604'
       c_tag: '951'
       s_tag: '900'
-      olt: BBSIM_OLT_0
-    - onu: 'BBSM00000605'
+      olt: BBSIM_OLT_10
+    - onu: 'BBSM000a0605'
       c_tag: '952'
       s_tag: '900'
-      olt: BBSIM_OLT_0
-    - onu: 'BBSM00000606'
+      olt: BBSIM_OLT_10
+    - onu: 'BBSM000a0606'
       c_tag: '953'
       s_tag: '900'
-      olt: BBSIM_OLT_0
-    - onu: 'BBSM00000607'
+      olt: BBSIM_OLT_10
+    - onu: 'BBSM000a0607'
       c_tag: '954'
       s_tag: '900'
-      olt: BBSIM_OLT_0
-    - onu: 'BBSM00000608'
+      olt: BBSIM_OLT_10
+    - onu: 'BBSM000a0608'
       c_tag: '955'
       s_tag: '900'
-      olt: BBSIM_OLT_0
-    - onu: 'BBSM00000701'
+      olt: BBSIM_OLT_10
+    - onu: 'BBSM000a0701'
       c_tag: '956'
       s_tag: '900'
-      olt: BBSIM_OLT_0
-    - onu: 'BBSM00000702'
+      olt: BBSIM_OLT_10
+    - onu: 'BBSM000a0702'
       c_tag: '957'
       s_tag: '900'
-      olt: BBSIM_OLT_0
-    - onu: 'BBSM00000703'
+      olt: BBSIM_OLT_10
+    - onu: 'BBSM000a0703'
       c_tag: '958'
       s_tag: '900'
-      olt: BBSIM_OLT_0
-    - onu: 'BBSM00000704'
+      olt: BBSIM_OLT_10
+    - onu: 'BBSM000a0704'
       c_tag: '959'
       s_tag: '900'
-      olt: BBSIM_OLT_0
-    - onu: 'BBSM00000705'
+      olt: BBSIM_OLT_10
+    - onu: 'BBSM000a0705'
       c_tag: '960'
       s_tag: '900'
-      olt: BBSIM_OLT_0
-    - onu: 'BBSM00000706'
+      olt: BBSIM_OLT_10
+    - onu: 'BBSM000a0706'
       c_tag: '961'
       s_tag: '900'
-      olt: BBSIM_OLT_0
-    - onu: 'BBSM00000707'
+      olt: BBSIM_OLT_10
+    - onu: 'BBSM000a0707'
       c_tag: '962'
       s_tag: '900'
-      olt: BBSIM_OLT_0
-    - onu: 'BBSM00000708'
+      olt: BBSIM_OLT_10
+    - onu: 'BBSM000a0708'
       c_tag: '963'
       s_tag: '900'
-      olt: BBSIM_OLT_0
-
+      olt: BBSIM_OLT_10
   dst:
     - ip: null
     - ip: null