diff --git a/tests/data/bbsim-kind-16.yaml b/tests/data/bbsim-kind-16.yaml
index fabbf42..fef8835 100644
--- a/tests/data/bbsim-kind-16.yaml
+++ b/tests/data/bbsim-kind-16.yaml
@@ -31,42 +31,42 @@
 olts:
   -
     ip: bbsim0
-    serial: BBSIM_OLT_0
+    serial: BBSIM_OLT_10
 
 hosts:
   src:
-    - onu: 'BBSM00000001'
-      olt: 'BBSIM_OLT_0'
-    - onu: 'BBSM00000002'
-      olt: 'BBSIM_OLT_0'
-    - onu: 'BBSM00000003'
-      olt: 'BBSIM_OLT_0'
-    - onu: 'BBSM00000004'
-      olt: 'BBSIM_OLT_0'
-    - onu: 'BBSM00000005'
-      olt: 'BBSIM_OLT_0'
-    - onu: 'BBSM00000006'
-      olt: 'BBSIM_OLT_0'
-    - onu: 'BBSM00000007'
-      olt: 'BBSIM_OLT_0'
-    - onu: 'BBSM00000008'
-      olt: 'BBSIM_OLT_0'
-    - onu: 'BBSM00000009'
-      olt: 'BBSIM_OLT_0'
-    - onu: 'BBSM0000000a'
-      olt: 'BBSIM_OLT_0'
-    - onu: 'BBSM0000000b'
-      olt: 'BBSIM_OLT_0'
-    - onu: 'BBSM0000000c'
-      olt: 'BBSIM_OLT_0'
-    - onu: 'BBSM0000000d'
-      olt: 'BBSIM_OLT_0'
-    - onu: 'BBSM0000000e'
-      olt: 'BBSIM_OLT_0'
-    - onu: 'BBSM0000000f'
-      olt: 'BBSIM_OLT_0'
-    - onu: 'BBSM00000010'
-      olt: 'BBSIM_OLT_0'
+    - onu: 'BBSM000a0001'
+      olt: 'BBSIM_OLT_10'
+    - onu: 'BBSM000a0002'
+      olt: 'BBSIM_OLT_10'
+    - onu: 'BBSM000a0003'
+      olt: 'BBSIM_OLT_10'
+    - onu: 'BBSM000a0004'
+      olt: 'BBSIM_OLT_10'
+    - onu: 'BBSM000a0005'
+      olt: 'BBSIM_OLT_10'
+    - onu: 'BBSM000a0006'
+      olt: 'BBSIM_OLT_10'
+    - onu: 'BBSM000a0007'
+      olt: 'BBSIM_OLT_10'
+    - onu: 'BBSM000a0008'
+      olt: 'BBSIM_OLT_10'
+    - onu: 'BBSM000a0009'
+      olt: 'BBSIM_OLT_10'
+    - onu: 'BBSM000a000a'
+      olt: 'BBSIM_OLT_10'
+    - onu: 'BBSM000a000b'
+      olt: 'BBSIM_OLT_10'
+    - onu: 'BBSM000a000c'
+      olt: 'BBSIM_OLT_10'
+    - onu: 'BBSM000a000d'
+      olt: 'BBSIM_OLT_10'
+    - onu: 'BBSM000a000e'
+      olt: 'BBSIM_OLT_10'
+    - onu: 'BBSM000a000f'
+      olt: 'BBSIM_OLT_10'
+    - onu: 'BBSM000a0010'
+      olt: 'BBSIM_OLT_10'
 
   dst:
     - ip: null
diff --git a/tests/data/bbsim-kind-2OLTx2ONUx2PON.yaml b/tests/data/bbsim-kind-2OLTx2ONUx2PON.yaml
index b2476d9..60c9779 100755
--- a/tests/data/bbsim-kind-2OLTx2ONUx2PON.yaml
+++ b/tests/data/bbsim-kind-2OLTx2ONUx2PON.yaml
@@ -31,33 +31,33 @@
 olts:
   -
     ip: bbsim0.voltha.svc
-    serial: BBSIM_OLT_0
+    serial: BBSIM_OLT_10
   -
     ip: bbsim1.voltha.svc
-    serial: BBSIM_OLT_1
+    serial: BBSIM_OLT_11
 
 hosts:
   src:
     -
-      onu: 'BBSM00000001'
+      onu: 'BBSM000a0001'
       c_tag: '900'
       s_tag: '900'
-      olt: 'BBSIM_OLT_0'
+      olt: 'BBSIM_OLT_10'
     -
-      onu: 'BBSM00000002'
+      onu: 'BBSM000a0002'
       c_tag: '901'
       s_tag: '900'
-      olt: 'BBSIM_OLT_0'
+      olt: 'BBSIM_OLT_10'
     -
-      onu: 'BBSM00010001'
+      onu: 'BBSM000b0001'
       c_tag: '900'
       s_tag: '901'
-      olt: 'BBSIM_OLT_1'
+      olt: 'BBSIM_OLT_11'
     -
-      onu: 'BBSM00010002'
+      onu: 'BBSM000b0002'
       c_tag: '901'
       s_tag: '901'
-      olt: 'BBSIM_OLT_1'
+      olt: 'BBSIM_OLT_11'
   dst:
     - ip: null
     - ip: null
diff --git a/tests/data/bbsim-kind-2x2.yaml b/tests/data/bbsim-kind-2x2.yaml
index 4618002..18d1c85 100644
--- a/tests/data/bbsim-kind-2x2.yaml
+++ b/tests/data/bbsim-kind-2x2.yaml
@@ -30,24 +30,24 @@
 olts:
   -
     ip: bbsim0
-    serial: BBSIM_OLT_0
+    serial: BBSIM_OLT_10
 
 hosts:
   src:
-    - onu: 'BBSM00000001'
-      olt: 'BBSIM_OLT_0'
+    - onu: 'BBSM000a0001'
+      olt: 'BBSIM_OLT_10'
       c_tag: '900'
       s_tag: '900'
-    - onu: 'BBSM00000002'
-      olt: 'BBSIM_OLT_0'
+    - onu: 'BBSM000a0002'
+      olt: 'BBSIM_OLT_10'
       c_tag: '901'
       s_tag: '900'
-    - onu: 'BBSM00000101'
-      olt: 'BBSIM_OLT_0'
+    - onu: 'BBSM000a0101'
+      olt: 'BBSIM_OLT_10'
       c_tag: '902'
       s_tag: '900'
-    - onu: 'BBSM00000102'
-      olt: 'BBSIM_OLT_0'
+    - onu: 'BBSM000a0102'
+      olt: 'BBSIM_OLT_10'
       c_tag: '903'
       s_tag: '900'
 
diff --git a/tests/data/bbsim-kind-8x2.yaml b/tests/data/bbsim-kind-8x2.yaml
index cdd217c..e592d48 100644
--- a/tests/data/bbsim-kind-8x2.yaml
+++ b/tests/data/bbsim-kind-8x2.yaml
@@ -31,42 +31,42 @@
 olts:
   -
     ip: bbsim0
-    serial: BBSIM_OLT_0
+    serial: BBSIM_OLT_10
 
 hosts:
   src:
-    - onu: 'BBSM00000001'
-      olt: 'BBSIM_OLT_0'
-    - onu: 'BBSM00000002'
-      olt: 'BBSIM_OLT_0'
-    - onu: 'BBSM00000101'
-      olt: 'BBSIM_OLT_0'
-    - onu: 'BBSM00000102'
-      olt: 'BBSIM_OLT_0'
-    - onu: 'BBSM00000201'
-      olt: 'BBSIM_OLT_0'
-    - onu: 'BBSM00000202'
-      olt: 'BBSIM_OLT_0'
-    - onu: 'BBSM00000301'
-      olt: 'BBSIM_OLT_0'
-    - onu: 'BBSM00000302'
-      olt: 'BBSIM_OLT_0'
-    - onu: 'BBSM00000401'
-      olt: 'BBSIM_OLT_0'
-    - onu: 'BBSM00000402'
-      olt: 'BBSIM_OLT_0'
-    - onu: 'BBSM00000501'
-      olt: 'BBSIM_OLT_0'
-    - onu: 'BBSM00000502'
-      olt: 'BBSIM_OLT_0'
-    - onu: 'BBSM00000601'
-      olt: 'BBSIM_OLT_0'
-    - onu: 'BBSM00000602'
-      olt: 'BBSIM_OLT_0'
-    - onu: 'BBSM00000701'
-      olt: 'BBSIM_OLT_0'
-    - onu: 'BBSM00000702'
-      olt: 'BBSIM_OLT_0'
+    - onu: 'BBSM000a0001'
+      olt: 'BBSIM_OLT_10'
+    - onu: 'BBSM000a0002'
+      olt: 'BBSIM_OLT_10'
+    - onu: 'BBSM000a0101'
+      olt: 'BBSIM_OLT_10'
+    - onu: 'BBSM000a0102'
+      olt: 'BBSIM_OLT_10'
+    - onu: 'BBSM000a0201'
+      olt: 'BBSIM_OLT_10'
+    - onu: 'BBSM000a0202'
+      olt: 'BBSIM_OLT_10'
+    - onu: 'BBSM000a0301'
+      olt: 'BBSIM_OLT_10'
+    - onu: 'BBSM000a0302'
+      olt: 'BBSIM_OLT_10'
+    - onu: 'BBSM000a0401'
+      olt: 'BBSIM_OLT_10'
+    - onu: 'BBSM000a0402'
+      olt: 'BBSIM_OLT_10'
+    - onu: 'BBSM000a0501'
+      olt: 'BBSIM_OLT_10'
+    - onu: 'BBSM000a0502'
+      olt: 'BBSIM_OLT_10'
+    - onu: 'BBSM000a0601'
+      olt: 'BBSIM_OLT_10'
+    - onu: 'BBSM000a0602'
+      olt: 'BBSIM_OLT_10'
+    - onu: 'BBSM000a0701'
+      olt: 'BBSIM_OLT_10'
+    - onu: 'BBSM000a0702'
+      olt: 'BBSIM_OLT_10'
 
   dst:
     - ip: null
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
diff --git a/tests/data/bbsim-kind-dt.yaml b/tests/data/bbsim-kind-dt.yaml
index 3747263..1b77ad6 100644
--- a/tests/data/bbsim-kind-dt.yaml
+++ b/tests/data/bbsim-kind-dt.yaml
@@ -31,13 +31,13 @@
 olts:
   -
     ip: bbsim0
-    serial: BBSIM_OLT_0
+    serial: BBSIM_OLT_10
 
 hosts:
   src:
     -
-      onu: 'BBSM00000001'
-      olt: 'BBSIM_OLT_0'
+      onu: 'BBSM000a0001'
+      olt: 'BBSIM_OLT_10'
       c_tag: '4096'
       s_tag: '900'
 
diff --git a/tests/data/bbsim-kind-tt.yaml b/tests/data/bbsim-kind-tt.yaml
index 7434bca..1066768 100644
--- a/tests/data/bbsim-kind-tt.yaml
+++ b/tests/data/bbsim-kind-tt.yaml
@@ -31,13 +31,13 @@
 olts:
   -
     ip: bbsim0
-    serial: BBSIM_OLT_0
+    serial: BBSIM_OLT_10
 
 hosts:
   src:
     -
-      onu: 'BBSM00000001'
-      olt: 'BBSIM_OLT_0'
+      onu: 'BBSM000a0001'
+      olt: 'BBSIM_OLT_10'
       c_tag: '900'
       s_tag: '900'
 
diff --git a/tests/data/bbsim-kind.yaml b/tests/data/bbsim-kind.yaml
index dae5f1f..5326f68 100644
--- a/tests/data/bbsim-kind.yaml
+++ b/tests/data/bbsim-kind.yaml
@@ -30,13 +30,13 @@
 olts:
   -
     ip: bbsim0
-    serial: BBSIM_OLT_0
+    serial: BBSIM_OLT_10
 
 hosts:
   src:
     -
-      onu: 'BBSM00000001'
-      olt: 'BBSIM_OLT_0'
+      onu: 'BBSM000a0001'
+      olt: 'BBSIM_OLT_10'
       c_tag: '900'
       s_tag: '900'
 
diff --git a/tests/data/multiple-bbsim-kind.yaml b/tests/data/multiple-bbsim-kind.yaml
index 37214a4..1202e48 100755
--- a/tests/data/multiple-bbsim-kind.yaml
+++ b/tests/data/multiple-bbsim-kind.yaml
@@ -31,87 +31,87 @@
 olts:
   -
     ip: bbsim0.voltha.svc
-    serial: BBSIM_OLT_0
+    serial: BBSIM_OLT_10
   -
     ip: bbsim1.voltha.svc
-    serial: BBSIM_OLT_1
+    serial: BBSIM_OLT_11
   -
     ip: bbsim2.voltha.svc
-    serial: BBSIM_OLT_2
+    serial: BBSIM_OLT_12
   -
     ip: bbsim3.voltha.svc
-    serial: BBSIM_OLT_3
+    serial: BBSIM_OLT_13
   -
     ip: bbsim4.voltha.svc
-    serial: BBSIM_OLT_4
+    serial: BBSIM_OLT_14
   -
     ip: bbsim5.voltha.svc
-    serial: BBSIM_OLT_5
+    serial: BBSIM_OLT_15
   -
     ip: bbsim6.voltha.svc
-    serial: BBSIM_OLT_6
+    serial: BBSIM_OLT_16
   -
     ip: bbsim7.voltha.svc
-    serial: BBSIM_OLT_7
+    serial: BBSIM_OLT_17
   -
     ip: bbsim8.voltha.svc
-    serial: BBSIM_OLT_8
+    serial: BBSIM_OLT_18
   -
     ip: bbsim9.voltha.svc
-    serial: BBSIM_OLT_9
+    serial: BBSIM_OLT_19
 
 hosts:
   src:
     -
-      onu: 'BBSM00000001'
+      onu: 'BBSM000a0001'
       c_tag: '900'
       s_tag: '900'
-      olt: 'BBSIM_OLT_0'
+      olt: 'BBSIM_OLT_10'
     -
-      onu: 'BBSM00010001'
+      onu: 'BBSM000b0001'
       c_tag: '900'
-      s_tag: '900'
-      olt: 'BBSIM_OLT_1'
+      s_tag: '901'
+      olt: 'BBSIM_OLT_11'
     -
-      onu: 'BBSM00020001'
+      onu: 'BBSM000c0001'
       c_tag: '900'
-      s_tag: '900'
-      olt: 'BBSIM_OLT_2'
+      s_tag: '902'
+      olt: 'BBSIM_OLT_12'
     -
-      onu: 'BBSM00030001'
+      onu: 'BBSM000d0001'
       c_tag: '900'
-      s_tag: '900'
-      olt: 'BBSIM_OLT_3'
+      s_tag: '903'
+      olt: 'BBSIM_OLT_13'
     -
-      onu: 'BBSM00040001'
+      onu: 'BBSM000e0001'
       c_tag: '900'
-      s_tag: '900'
-      olt: 'BBSIM_OLT_4'
+      s_tag: '904'
+      olt: 'BBSIM_OLT_14'
     -
-      onu: 'BBSM00050001'
+      onu: 'BBSM000f0001'
       c_tag: '900'
-      s_tag: '900'
-      olt: 'BBSIM_OLT_5'
+      s_tag: '905'
+      olt: 'BBSIM_OLT_15'
     -
-      onu: 'BBSM00060001'
+      onu: 'BBSM00100001'
       c_tag: '900'
-      s_tag: '900'
-      olt: 'BBSIM_OLT_6'
+      s_tag: '906'
+      olt: 'BBSIM_OLT_16'
     -
-      onu: 'BBSM00070001'
+      onu: 'BBSM00110001'
       c_tag: '900'
-      s_tag: '900'
-      olt: 'BBSIM_OLT_7'
+      s_tag: '907'
+      olt: 'BBSIM_OLT_17'
     -
-      onu: 'BBSM00080001'
+      onu: 'BBSM00120001'
       c_tag: '900'
-      s_tag: '900'
-      olt: 'BBSIM_OLT_8'
+      s_tag: '908'
+      olt: 'BBSIM_OLT_18'
     -
-      onu: 'BBSM00090001'
+      onu: 'BBSM00130001'
       c_tag: '900'
-      s_tag: '900'
-      olt: 'BBSIM_OLT_9'
+      s_tag: '909'
+      olt: 'BBSIM_OLT_19'
   dst:
     - ip: null
     - ip: null
diff --git a/variables/variables.robot b/variables/variables.robot
index 1fb3327..331e6fd 100644
--- a/variables/variables.robot
+++ b/variables/variables.robot
@@ -13,8 +13,8 @@
 # limitations under the License.
 
 *** Variables ***
-${BBSIM_OLT_SN}    BBSIM_OLT_0
-${BBSIM_ONU_SN}    BBSM00000001
+${BBSIM_OLT_SN}    BBSIM_OLT_10
+${BBSIM_ONU_SN}    BBSM000a0001
 ${ONOS_REST_PORT}    30120
 ${ONOS_SSH_PORT}    30115
 ${OLT_PORT}       9191