diff --git a/tests/data/bbsim-kind-tim-2OLTx2PONx2ONU.yaml b/tests/data/bbsim-kind-tim-2OLTx2PONx2ONU.yaml
index ec02b87..af2eecd 100644
--- a/tests/data/bbsim-kind-tim-2OLTx2PONx2ONU.yaml
+++ b/tests/data/bbsim-kind-tim-2OLTx2PONx2ONU.yaml
@@ -32,9 +32,9 @@
     ip: '127.0.0.1'
 
 olts:
-  - ip: bbsim0.voltha.svc
+  - ip: bbsim0
     serial: BBSIM_OLT_10
-  - ip: bbsim1.voltha.svc
+  - ip: bbsim1
     serial: BBSIM_OLT_11
 
 hosts:
@@ -47,6 +47,16 @@
       service_type: 'hsia'
       uni_id: 1
       tp_id: '64'
+    - onu: 'BBSM000a0001'
+      olt: 'BBSIM_OLT_10'
+      uni_tag: '836'
+      c_tag: '101'
+      s_tag: '4096'
+      service_type: 'vod'
+      subMcast:
+        - 224.0.0.22
+      uni_id: 1
+      tp_id: '64'
     - onu: 'BBSM000a0002'
       olt: 'BBSIM_OLT_10'
       uni_tag: '835'
@@ -55,6 +65,16 @@
       service_type: 'hsia'
       uni_id: 1
       tp_id: '64'
+    - onu: 'BBSM000a0002'
+      olt: 'BBSIM_OLT_10'
+      uni_tag: '836'
+      c_tag: '101'
+      s_tag: '4096'
+      service_type: 'vod'
+      subMcast:
+        - 224.0.0.24
+      uni_id: 1
+      tp_id: '64'
     - onu: 'BBSM000a0101'
       olt: 'BBSIM_OLT_10'
       uni_tag: '835'
@@ -63,6 +83,17 @@
       service_type: 'hsia'
       uni_id: 1
       tp_id: '64'
+    - onu: 'BBSM000a0101'
+      olt: 'BBSIM_OLT_10'
+      uni_tag: '836'
+      c_tag: '101'
+      s_tag: '4096'
+      service_type: 'vod'
+      subMcast:
+        - 224.0.0.25
+        - 224.0.0.22
+      uni_id: 1
+      tp_id: '64'
     - onu: 'BBSM000a0102'
       olt: 'BBSIM_OLT_10'
       uni_tag: '835'
@@ -71,6 +102,16 @@
       service_type: 'hsia'
       uni_id: 1
       tp_id: '64'
+    - onu: 'BBSM000a0102'
+      olt: 'BBSIM_OLT_10'
+      uni_tag: '836'
+      c_tag: '101'
+      s_tag: '4096'
+      service_type: 'vod'
+      subMcast:
+        - 224.0.0.24
+      uni_id: 1
+      tp_id: '64'
     - onu: 'BBSM000b0001'
       olt: 'BBSIM_OLT_11'
       uni_tag: '835'
@@ -79,6 +120,16 @@
       service_type: 'hsia'
       uni_id: 1
       tp_id: '64'
+    - onu: 'BBSM000b0001'
+      olt: 'BBSIM_OLT_11'
+      uni_tag: '836'
+      c_tag: '101'
+      s_tag: '4096'
+      service_type: 'vod'
+      subMcast:
+        - 224.0.0.22
+      uni_id: 1
+      tp_id: '64'
     - onu: 'BBSM000b0002'
       olt: 'BBSIM_OLT_11'
       uni_tag: '835'
@@ -87,6 +138,16 @@
       service_type: 'hsia'
       uni_id: 1
       tp_id: '64'
+    - onu: 'BBSM000b0002'
+      olt: 'BBSIM_OLT_11'
+      uni_tag: '836'
+      c_tag: '101'
+      s_tag: '4096'
+      service_type: 'vod'
+      subMcast:
+        - 224.0.0.24
+      uni_id: 1
+      tp_id: '64'
     - onu: 'BBSM000b0101'
       olt: 'BBSIM_OLT_11'
       uni_tag: '835'
@@ -95,6 +156,17 @@
       service_type: 'hsia'
       uni_id: 1
       tp_id: '64'
+    - onu: 'BBSM000b0101'
+      olt: 'BBSIM_OLT_11'
+      uni_tag: '836'
+      c_tag: '101'
+      s_tag: '4096'
+      service_type: 'vod'
+      subMcast:
+        - 224.0.0.25
+        - 224.0.0.22
+      uni_id: 1
+      tp_id: '64'
     - onu: 'BBSM000b0102'
       olt: 'BBSIM_OLT_11'
       uni_tag: '835'
@@ -103,6 +175,16 @@
       service_type: 'hsia'
       uni_id: 1
       tp_id: '64'
+    - onu: 'BBSM000b0102'
+      olt: 'BBSIM_OLT_11'
+      uni_tag: '836'
+      c_tag: '101'
+      s_tag: '4096'
+      service_type: 'vod'
+      subMcast:
+        - 224.0.0.24
+      uni_id: 1
+      tp_id: '64'
 
   dst:
     - ip: null
@@ -113,3 +195,11 @@
     - ip: null
     - ip: null
     - ip: null
+    - ip: null
+    - ip: null
+    - ip: null
+    - ip: null
+    - ip: null
+    - ip: null
+    - ip: null
+    - ip: null