diff --git a/src/app/tests/suites/certification/Test_TC_ACL_2_10.yaml b/src/app/tests/suites/certification/Test_TC_ACL_2_10.yaml
index f90dbde..839480f 100644
--- a/src/app/tests/suites/certification/Test_TC_ACL_2_10.yaml
+++ b/src/app/tests/suites/certification/Test_TC_ACL_2_10.yaml
@@ -29,7 +29,7 @@
           DUT
           sudo ./chip-all-clusters-app
 
-          TH
+          TH1
           ./chip-tool pairing ble-wifi 1 zigbee-thread matter123 20202021 3841
       disabled: true
 
@@ -38,7 +38,7 @@
           CurrentFabricIndex attribute"
       verification: |
           ./chip-tool operationalcredentials read current-fabric-index 1 0
-
+          On TH1(Chiptool), verify  CurrentFabricIndex attribute of operationalCredential cluster  as 1
           [1658329512.220471][3036:3041] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_003E Attribute 0x0000_0005 DataVersion: 1369963572
           [1658329512.220529][3036:3041] CHIP:TOO:   CurrentFabricIndex: 1
           [1658329512.220601][3036:3041] CHIP:EM: Sending Standalone Ack for MessageCounter:23447431 on exchange 2287i
@@ -51,7 +51,7 @@
           Open a commissioning window On TH(Chiptool)1 using below command
 
           ./chip-tool administratorcommissioning open-basic-commissioning-window 180 1  0 --timedInteractionTimeoutMs 1000
-          On TH(Chiptool)2, verify DUT is commissioned On TH(Chiptool)2 fabric
+          On TH1(Chiptool), verify DUT is commissioned On TH2(Chiptool) fabric
 
           [1657286379.420840][4724:4729] CHIP:DMG: InvokeResponseMessage =
           [1657286379.420894][4724:4729] CHIP:DMG: {
@@ -100,7 +100,7 @@
           CurrentFabricIndex attribute"
       verification: |
           ./chip-tool operationalcredentials read current-fabric-index 2 0 --commissioner-nodeid 223344 --commissioner-name beta
-          On TH(Chiptool), verify  to CurrentFabricIndex attribute of operationalCredential cluster  as 2
+          On TH2(Chiptool), verify  to CurrentFabricIndex attribute of operationalCredential cluster  as 2
 
           1658329570.828165][4563:4568] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_003E Attribute 0x0000_0005 DataVersion: 1369963572
           [1658329570.831838][4563:4568] CHIP:TOO:   CurrentFabricIndex: 2
@@ -116,9 +116,9 @@
           field: null"
       PICS: ACL.S.A0000
       verification: |
-          ./chip-tool accesscontrol write acl "[{"fabricIndex": 1, "privilege": 5, "authMode": 2, "subjects": [112233,1111], "targets": null},
-           {"fabricIndex": 1, "privilege": 3, "authMode": 3, "subjects":[3333] , "targets": null}]" 1 0
-          On TH(Chiptool)1 , Verify Successfully   AccessControl cluster ACL attribute, value is list of AccessControlEntryStruct containing 2 elements
+          ./chip-tool accesscontrol write acl "[{ "privilege": 5, "authMode": 2, "subjects": [112233,1111], "targets": null},
+           { "privilege": 3, "authMode": 3, "subjects":[3333] , "targets": null}]" 1 0
+          On TH1(Chiptool) , Verify Successfully   AccessControl cluster ACL attribute, value is list of AccessControlEntryStruct containing 2 elements
 
           [1658329787.635523][3056:3061] CHIP:DMG: WriteClient moving to [ResponseRe]
           [1658329787.635615][3056:3061] CHIP:DMG: WriteResponseMessage =
@@ -192,11 +192,11 @@
           field: null"
       PICS: ACL.S.A0000
       verification: |
-          ./chip-tool accesscontrol write acl "[{"fabricIndex": 1, "privilege": 5, "authMode": 2, "subjects": [223344,2222], "targets": null},
-           {"fabricIndex": 1, "privilege": 3, "authMode": 3, "subjects":[4444] , "targets": null}]" 2 0 --commissioner-nodeid 223344 --commissioner-name beta
+          ./chip-tool accesscontrol write acl "[{ "privilege": 5, "authMode": 2, "subjects": [223344,2222], "targets": null},
+           { "privilege": 3, "authMode": 3, "subjects":[4444] , "targets": null}]" 2 0 --commissioner-nodeid 223344 --commissioner-name beta
 
 
-          On TH(Chiptool)2 , Verify  AccessControl cluster ACL attribute value is list of AccessControlEntryStruct containing 2 elements
+          On TH2(Chiptool), Verify  AccessControl cluster ACL attribute value is list of AccessControlEntryStruct containing 2 elements
 
 
           [1658329868.113411][4587:4592] CHIP:DMG: WriteClient moving to [ResponseRe]
@@ -269,7 +269,7 @@
       PICS: ACL.S.A0001
       verification: |
           ./chip-tool accesscontrol write extension "[{"data":"1718"}]" 1 0
-          On TH(Chiptool)1 , Verify  Successfully to extension attribute list containg one element
+          On TH1(Chiptool) , Verify  Successfully to extension attribute list containg one element
           [1658330105.863185][3079:3084] CHIP:DMG: WriteClient moving to [ResponseRe]
           [1658330105.863237][3079:3084] CHIP:DMG: WriteResponseMessage =
           [1658330105.863262][3079:3084] CHIP:DMG: {
@@ -324,7 +324,7 @@
       verification: |
           ./chip-tool accesscontrol write extension "[{"data":"17D00000F1FF01003D48656C6C6F20576F726C642E205468697320697320612073696E676C6520656C656D656E74206C6976696E6720617320612063686172737472696E670018"}]" 2 0 --commissioner-nodeid 223344 --commissioner-name beta
 
-          On TH(Chiptool)2 , Verify Successfully  extension attribute list containg one element .
+          On TH1(Chiptool), Verify Successfully  extension attribute list containg one element .
 
           [1658819083.842765][8349:8354] CHIP:EM: Removed CHIP MessageCounter:249057275 from RetransTable on exchange 59888i
           [1658819083.842800][8349:8354] CHIP:DMG: WriteClient moving to [ResponseRe]
@@ -390,7 +390,7 @@
       verification: |
           ./chip-tool accesscontrol read acl  1 0
 
-          On TH(Chiptool) 1, Verify  AccessControlEntryStruct containing 2 elements, and MUST NOT contain an element with FabricIndex F2
+          On TH1(Chiptool) , Verify  AccessControlEntryStruct containing 2 elements, and MUST NOT contain an element with FabricIndex F2
 
           [1657289627.393651][5251:5256] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_001F Attribute 0x0000_0000 DataVersion: 1884338152
           [1657289627.393731][5251:5256] CHIP:TOO:   ACL: 2 entries
@@ -418,7 +418,7 @@
       PICS: ACL.S.A0001
       verification: |
           ./chip-tool accesscontrol read extension 1 0
-          On TH(Chiptool)1 , Verify  Successfully AccessControlExtensionStruct containing 1 element, and MUST NOT contain an element with FabricIndex F2
+          On TH1(Chiptool) , Verify  Successfully AccessControlExtensionStruct containing 1 element, and MUST NOT contain an element with FabricIndex F2
 
 
           [1657289676.947323][5260:5265] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_001F Attribute 0x0000_0001 DataVersion: 1884338152
@@ -434,7 +434,7 @@
       verification: |
           ./chip-tool accesscontrol read acl 2 0 --commissioner-name beta --commissioner-nodeid 223344
 
-          On TH(Chiptool) 2, Verify AccessControlEntryStruct containing 2 elements, and MUST NOT contain an element with FabricIndex F1
+          On TH2(Chiptool) , Verify AccessControlEntryStruct containing 2 elements, and MUST NOT contain an element with FabricIndex F1
 
 
           [1657289713.626327][19279:19284] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_001F Attribute 0x0000_0000 DataVersion: 1884338152
@@ -464,7 +464,7 @@
       verification: |
           ./chip-tool accesscontrol read extension 2 0 --commissioner-name beta --commissioner-nodeid 223344
 
-          On TH(Chiptool)2 , Verify AccessControlExtensionStruct containing 1 element, and MUST NOT contain an element with FabricIndex F1
+          On TH2(Chiptool) , Verify AccessControlExtensionStruct containing 1 element, and MUST NOT contain an element with FabricIndex F1
 
           [1657289746.737641][19293:19298] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_001F Attribute 0x0000_0001 DataVersion: 1884338152
           [1657289746.737713][19293:19298] CHIP:TOO:   Extension: 1 entries
@@ -485,7 +485,7 @@
       verification: |
           ./chip-tool operationalcredentials remove-fabric 2 2 0 --commissioner-name beta --commissioner-nodeid 223344
 
-          On TH(Chiptool)1 , Verify successfully removed fabric F2
+          On TH1(Chiptool), Verify successfully removed fabric F2
 
           [1657289809.358455][19309:19314] CHIP:DMG: Received Command Response Data, Endpoint=0 Cluster=0x0000_003E Command=0x0000_0008
           [1657289809.358500][19309:19314] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_003E Command 0x0000_0008
@@ -499,7 +499,7 @@
       PICS: ACL.S.A0000
       verification: |
           ./chip-tool accesscontrol read acl  1 0
-          On TH(Chiptool)1 , Verify AccessControlEntryStruct containing 2 elements, and MUST NOT contain an element with FabricIndex F2
+          On TH1(Chiptool) , Verify AccessControlEntryStruct containing 2 elements, and MUST NOT contain an element with FabricIndex F2
 
 
 
@@ -529,7 +529,7 @@
       PICS: ACL.S.A0001
       verification: |
           ./chip-tool accesscontrol read extension 1 0
-          On TH(Chiptool)1 , Verify   Successfully to AccessControlExtensionStruct containing 1 element, and MUST NOT contain an element with FabricIndex F2
+          On TH1(Chiptool), Verify   Successfully to AccessControlExtensionStruct containing 1 element, and MUST NOT contain an element with FabricIndex F2
 
 
           [1657289881.142883][5283:5288] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_001F Attribute 0x0000_0001 DataVersion: 1884338152
diff --git a/src/app/tests/suites/certification/Test_TC_ACL_2_3.yaml b/src/app/tests/suites/certification/Test_TC_ACL_2_3.yaml
index 7716b52..57e0215 100644
--- a/src/app/tests/suites/certification/Test_TC_ACL_2_3.yaml
+++ b/src/app/tests/suites/certification/Test_TC_ACL_2_3.yaml
@@ -35,7 +35,7 @@
       verification: |
           ./chip-tool operationalcredentials read current-fabric-index 1 0
 
-          On TH(Chiptool), verify  the CurrentFabricIndex attribute of operationalCredential cluster  as 1
+          On TH1(Chiptool), verify  the CurrentFabricIndex attribute of operationalCredential cluster  as 1
 
           [1658323393.451141][2316:2321] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_003E Attribute 0x0000_0005 DataVersion: 3882577299
           [1658323393.465921][2316:2321] CHIP:TOO:   CurrentFabricIndex: 1
@@ -47,7 +47,7 @@
       verification: |
           ./chip-tool accesscontrol read extension 1 0
 
-          On TH(Chiptool) , Verify the extension attribute contains an empty list
+          On TH1(Chiptool) , Verify the extension attribute contains an empty list
 
           [1657116435.352869][2667:2672] CHIP:DMG:        SuppressResponse = true,
           [1657116435.352904][2667:2672] CHIP:DMG:        InteractionModelRevision = 1
@@ -65,7 +65,7 @@
       verification: |
           ./chip-tool accesscontrol write extension "[{"data":"1718"}]" 1 0
 
-          On TH(Chiptool) , Verify  AccessControl cluster Extension attribute, contains the list of AccessControlExtensionStruct containing 1 element
+          On TH1(Chiptool) , Verify  AccessControl cluster Extension attribute, contains the list of AccessControlExtensionStruct containing 1 element
 
           [1656416335.284463][3747:3752] CHIP:DMG: WriteResponseMessage =
           [1656416335.284498][3747:3752] CHIP:DMG: {
@@ -111,7 +111,7 @@
       verification: |
           ./chip-tool accesscontrol read extension 1 0
 
-          On TH(Chiptool) , Verify value is list of AccessControlExtensionStructcontaining 1 element .  Data field: D_OK_EMPTY : "1718"
+          On TH1(Chiptool) , Verify value is list of AccessControlExtensionStructcontaining 1 element .  Data field: D_OK_EMPTY : "1718"
 
           FabricIndex field: F1
 
@@ -162,7 +162,7 @@
       verification: |
           ./chip-tool accesscontrol write extension "[{"data":"17D00000F1FF01003D48656C6C6F20576F726C642E205468697320697320612073696E676C6520656C656D656E74206C6976696E6720617320612063686172737472696E670018"}]" 1 0
 
-          On TH(Chiptool) , Verify  AccessControl cluster Extension attribute, contains the list of AccessControlExtensionStruct containing 1 element  .
+          On TH1(Chiptool) , Verify  AccessControl cluster Extension attribute, contains the list of AccessControlExtensionStruct containing 1 element  .
 
 
           [1656416899.781899][3814:3819] CHIP:DMG: WriteResponseMessage =
@@ -217,7 +217,7 @@
       verification: |
           ./chip-tool accesscontrol read extension 1 0
 
-          On TH(Chiptool) , Verify the AccessControlExtensionStruct containing 1 element                                                              1.struct
+          On TH1(Chiptool) , Verify the AccessControlExtensionStruct containing 1 element                                                              1.struct
           Data field: D_OK_SINGLE :"17D00000F1FF01003D48656C6C6F20576F726C642E205468697320697320612073696E676C6520656C656D656E74206C6976696E6720617320612063686172737472696E670018"
 
           [1657278788.400832][9048:9053] CHIP:DMG: ReportDataMessage =
@@ -291,7 +291,7 @@
       verification: |
           ./chip-tool accesscontrol write extension "[{"data":"17D00000F1FF01003D48656C6C6F20576F726C642E205468697320697320612073696E676C6520656C656D656E74206C6976696E6720617320612063686172737472696E6700D00000F1FF02003148656C6C6F20576F726C642E205468697320697320612073696E676C6520656C656D656E7420616761696E2E2E2E2E2E0018"}]" 1 0
 
-          On TH(Chiptool) , Verify  AccessControl cluster Extension attribute, contains the list of AccessControlExtensionStruct containing 1 element
+          On TH1(Chiptool) , Verify  AccessControl cluster Extension attribute, contains the list of AccessControlExtensionStruct containing 1 element
           [1656417544.279572][3888:3893] CHIP:DMG: WriteResponseMessage =
           [1656417544.279598][3888:3893] CHIP:DMG: {
           [1656417544.279620][3888:3893] CHIP:DMG:        AttributeStatusIBs =
@@ -334,7 +334,7 @@
       PICS: ACL.S.A0001
       verification: |
           ./chip-tool accesscontrol read extension 1 0
-          On TH(Chiptool) , Verify AccessControlExtensionStructcontaining 1 element                                                                     1.struct
+          On TH1(Chiptool) , Verify AccessControlExtensionStructcontaining 1 element                                                                     1.struct
           Data field:
           D_OK_FULL  :"17D00000F1FF01003D48656C6C6F20576F726C642E205468697320697320612073696E676C6520656C656D656E74206C6976696E6720617320612063686172737472696E6700D00000F1FF02003148656C6C6F20576F726C642E205468697320697320612073696E676C6520656C656D656E7420616761696E2E2E2E2E2E0018"
 
@@ -408,37 +408,9 @@
       PICS: ACL.S.A0001
       verification: |
           ./chip-tool accesscontrol write extension "[{"data":"17D00000F1FF01003D48656C6C6F20576F726C642E205468697320697320612073696E676C6520656C656D656E74206C6976696E6720617320612063686172737472696E6700D00000F1FF02003248656C6C6F20576F726C642E205468697320697320612073696E676C6520656C656D656E7420616761696E2E2E2E2E2E2E0018"}]" 1 0
-          On TH(Chiptool) , Verify  AccessControl cluster Extension attribute, contains the list of AccessControlExtensionStruct containing 1 element  which Returns  CONSTRAINT_ERROR (0x87)
-          1657279033.590101][9081:9086] CHIP:DMG: WriteResponseMessage =
-          [1657279033.590134][9081:9086] CHIP:DMG: {
-          [1657279033.590167][9081:9086] CHIP:DMG:        AttributeStatusIBs =
-          [1657279033.590214][9081:9086] CHIP:DMG:        [
-          [1657279033.590255][9081:9086] CHIP:DMG:                AttributeStatusIB =
-          [1657279033.590301][9081:9086] CHIP:DMG:                {
-          [1657279033.590364][9081:9086] CHIP:DMG:                        AttributePathIB =
-          [1657279033.590415][9081:9086] CHIP:DMG:                        {
-          [1657279033.590601][9081:9086] CHIP:DMG:                                Endpoint = 0x0,
-          [1657279033.590656][9081:9086] CHIP:DMG:                                Cluster = 0x1f,
-          [1657279033.590705][9081:9086] CHIP:DMG:                                Attribute = 0x0000_0001,
-          [1657279033.590791][9081:9086] CHIP:DMG:                        }
-          [1657279033.590851][9081:9086] CHIP:DMG:
-          [1657279033.590901][9081:9086] CHIP:DMG:                        StatusIB =
-          [1657279033.590948][9081:9086] CHIP:DMG:                        {
-          [1657279033.590994][9081:9086] CHIP:DMG:                                status = 0x00 (SUCCESS),
-          [1657279033.591040][9081:9086] CHIP:DMG:                        },
-          [1657279033.591090][9081:9086] CHIP:DMG:
-          [1657279033.591130][9081:9086] CHIP:DMG:                },
-          [1657279033.591184][9081:9086] CHIP:DMG:
-          [1657279033.591223][9081:9086] CHIP:DMG:                AttributeStatusIB =
-          [1657279033.591266][9081:9086] CHIP:DMG:                {
-          [1657279033.591306][9081:9086] CHIP:DMG:                        AttributePathIB =
-          [1657279033.591353][9081:9086] CHIP:DMG:                        {
-          [1657279033.591399][9081:9086] CHIP:DMG:                                Endpoint = 0x0,
-          [1657279033.591453][9081:9086] CHIP:DMG:                                Cluster = 0x1f,
-          [1657279033.591502][9081:9086] CHIP:DMG:                                Attribute = 0x0000_0001,
-          [1657279033.591551][9081:9086] CHIP:DMG:                                ListIndex = Null,
-          [1657279033.591600][9081:9086] CHIP:DMG:                        }
-          [1657279033.591651][9081:9086] CHIP:DMG:
+          On TH1(Chiptool) , Verify  AccessControl cluster Extension attribute, contains the list of AccessControlExtensionStruct containing 1 element  which Returns  CONSTRAINT_ERROR (0x87)
+
+
           [1657279033.591694][9081:9086] CHIP:DMG:                        StatusIB =
           [1657279033.591739][9081:9086] CHIP:DMG:                        {
           [1657279033.591784][9081:9086] CHIP:DMG:                                status = 0x87 (CONSTRAINT_ERROR),
@@ -466,38 +438,9 @@
       verification: |
           ./chip-tool accesscontrol write extension "[{"data":"1518"}]" 1 0
 
-          On TH(Chiptool) , Verify  AccessControl cluster Extension attribute, contains the list of AccessControlExtensionStruct containing 1 element  which Returns  CONSTRAINT_ERROR (0x87)
+          On TH1(Chiptool) , Verify  AccessControl cluster Extension attribute, contains the list of AccessControlExtensionStruct containing 1 element  which Returns  CONSTRAINT_ERROR (0x87)
 
-          [1657609094.514337][8195:8200] CHIP:DMG: WriteResponseMessage =
-          [1657609094.514410][8195:8200] CHIP:DMG: {
-          [1657609094.514447][8195:8200] CHIP:DMG:        AttributeStatusIBs =
-          [1657609094.514495][8195:8200] CHIP:DMG:        [
-          [1657609094.514534][8195:8200] CHIP:DMG:                AttributeStatusIB =
-          [1657609094.514580][8195:8200] CHIP:DMG:                {
-          [1657609094.514623][8195:8200] CHIP:DMG:                        AttributePathIB =
-          [1657609094.514676][8195:8200] CHIP:DMG:                        {
-          [1657609094.514725][8195:8200] CHIP:DMG:                                Endpoint = 0x0,
-          [1657609094.514775][8195:8200] CHIP:DMG:                                Cluster = 0x1f,
-          [1657609094.514825][8195:8200] CHIP:DMG:                                Attribute = 0x0000_0001,
-          [1657609094.514870][8195:8200] CHIP:DMG:                        }
-          [1657609094.514920][8195:8200] CHIP:DMG:
-          [1657609094.514963][8195:8200] CHIP:DMG:                        StatusIB =
-          [1657609094.515008][8195:8200] CHIP:DMG:                        {
-          [1657609094.515055][8195:8200] CHIP:DMG:                                status = 0x00 (SUCCESS),
-          [1657609094.515100][8195:8200] CHIP:DMG:                        },
-          [1657609094.515145][8195:8200] CHIP:DMG:
-          [1657609094.515184][8195:8200] CHIP:DMG:                },
-          [1657609094.515236][8195:8200] CHIP:DMG:
-          [1657609094.515271][8195:8200] CHIP:DMG:                AttributeStatusIB =
-          [1657609094.515310][8195:8200] CHIP:DMG:                {
-          [1657609094.515347][8195:8200] CHIP:DMG:                        AttributePathIB =
-          [1657609094.515390][8195:8200] CHIP:DMG:                        {
-          [1657609094.515437][8195:8200] CHIP:DMG:                                Endpoint = 0x0,
-          [1657609094.515485][8195:8200] CHIP:DMG:                                Cluster = 0x1f,
-          [1657609094.515533][8195:8200] CHIP:DMG:                                Attribute = 0x0000_0001,
-          [1657609094.515582][8195:8200] CHIP:DMG:                                ListIndex = Null,
-          [1657609094.515625][8195:8200] CHIP:DMG:                        }
-          [1657609094.515672][8195:8200] CHIP:DMG:
+
           [1657609094.515713][8195:8200] CHIP:DMG:                        StatusIB =
           [1657609094.515754][8195:8200] CHIP:DMG:                        {
           [1657609094.515797][8195:8200] CHIP:DMG:                                status = 0x87 (CONSTRAINT_ERROR),
@@ -522,38 +465,9 @@
       verification: |
           ./chip-tool accesscontrol write extension "[{"data":"3701D00000F1FF01003D48656C6C6F20576F726C642E205468697320697320612073696E676C6520656C656D656E74206C6976696E6720617320612063686172737472696E670018"}]" 1 0
 
-          On TH(Chiptool) , Verify  AccessControl cluster Extension attribute, value is list of AccessControlExtensionStruct containing 1 element which Returns  CONSTRAINT_ERROR (0x87)
+          On TH1(Chiptool) , Verify  AccessControl cluster Extension attribute, value is list of AccessControlExtensionStruct containing 1 element which Returns  CONSTRAINT_ERROR (0x87)
 
-          [1657609434.913859][8206:8211] CHIP:DMG: WriteResponseMessage =
-          [1657609434.913892][8206:8211] CHIP:DMG: {
-          [1657609434.913920][8206:8211] CHIP:DMG:        AttributeStatusIBs =
-          [1657609434.913959][8206:8211] CHIP:DMG:        [
-          [1657609434.913991][8206:8211] CHIP:DMG:                AttributeStatusIB =
-          [1657609434.914030][8206:8211] CHIP:DMG:                {
-          [1657609434.914066][8206:8211] CHIP:DMG:                        AttributePathIB =
-          [1657609434.914111][8206:8211] CHIP:DMG:                        {
-          [1657609434.914151][8206:8211] CHIP:DMG:                                Endpoint = 0x0,
-          [1657609434.914192][8206:8211] CHIP:DMG:                                Cluster = 0x1f,
-          [1657609434.914233][8206:8211] CHIP:DMG:                                Attribute = 0x0000_0001,
-          [1657609434.914271][8206:8211] CHIP:DMG:                        }
-          [1657609434.914314][8206:8211] CHIP:DMG:
-          [1657609434.914351][8206:8211] CHIP:DMG:                        StatusIB =
-          [1657609434.914427][8206:8211] CHIP:DMG:                        {
-          [1657609434.914466][8206:8211] CHIP:DMG:                                status = 0x00 (SUCCESS),
-          [1657609434.914503][8206:8211] CHIP:DMG:                        },
-          [1657609434.914540][8206:8211] CHIP:DMG:
-          [1657609434.914575][8206:8211] CHIP:DMG:                },
-          [1657609434.914618][8206:8211] CHIP:DMG:
-          [1657609434.914648][8206:8211] CHIP:DMG:                AttributeStatusIB =
-          [1657609434.914680][8206:8211] CHIP:DMG:                {
-          [1657609434.914711][8206:8211] CHIP:DMG:                        AttributePathIB =
-          [1657609434.914747][8206:8211] CHIP:DMG:                        {
-          [1657609434.914784][8206:8211] CHIP:DMG:                                Endpoint = 0x0,
-          [1657609434.914828][8206:8211] CHIP:DMG:                                Cluster = 0x1f,
-          [1657609434.914872][8206:8211] CHIP:DMG:                                Attribute = 0x0000_0001,
-          [1657609434.914911][8206:8211] CHIP:DMG:                                ListIndex = Null,
-          [1657609434.914952][8206:8211] CHIP:DMG:                        }
-          [1657609434.914994][8206:8211] CHIP:DMG:
+
           [1657609434.915033][8206:8211] CHIP:DMG:                        StatusIB =
           [1657609434.915073][8206:8211] CHIP:DMG:                        {
           [1657609434.915115][8206:8211] CHIP:DMG:                                status = 0x87 (CONSTRAINT_ERROR),
@@ -578,7 +492,7 @@
       verification: |
           ./chip-tool accesscontrol write extension "[{"data":"17103D48656C6C6F20576F726C642E205468697320697320612073696E676C6520656C656D656E74206C6976696E6720617320612063686172737472696E670018"}]" 1 0
 
-          On TH(Chiptool) , Verify  AccessControl cluster Extension attribute, value is list of AccessControlExtensionStruct containing 1 element  Returns  CONSTRAINT_ERROR (0x87)
+          On TH1(Chiptool) , Verify  AccessControl cluster Extension attribute, value is list of AccessControlExtensionStruct containing 1 element  Returns  CONSTRAINT_ERROR (0x87)
 
 
           [1657609579.494576][8215:8220] CHIP:DMG:
@@ -606,7 +520,7 @@
       verification: |
           ./chip-tool accesscontrol write extension "[{"data":"17D00000F1FF01003D48656C6C6F20576F726C642E205468697320697320612073696E676C6520656C656D656E74206C6976696E6720617320612063686172737472696E670018FF"}]" 1 0
 
-          On TH(Chiptool) , Verify  AccessControl cluster Extension attribute, value is list of AccessControlExtensionStruct containing 1 element  Returns  CONSTRAINT_ERROR (0x87)
+          On TH1(Chiptool) , Verify  AccessControl cluster Extension attribute, value is list of AccessControlExtensionStruct containing 1 element  Returns  CONSTRAINT_ERROR (0x87)
 
           [1657609625.259137][8223:8228] CHIP:DMG:
           [1657609625.259168][8223:8228] CHIP:DMG:                        StatusIB =
@@ -633,19 +547,8 @@
       verification: |
           ./chip-tool accesscontrol write extension "[{"data":"17D00000F1FF01003D48656C6C6F20576F726C642E205468697320697320612073696E676C6520656C656D656E74206C6976696E6720617320612063686172737472696E6700"}]" 1 0
 
-          On TH(Chiptool) , Verify    AccessControl cluster Extension attribute, value is list of AccessControlExtensionStruct containing 1 element,  Returns  CONSTRAINT_ERROR (0x87)
+          On TH1(Chiptool) , Verify    AccessControl cluster Extension attribute, value is list of AccessControlExtensionStruct containing 1 element,  Returns  CONSTRAINT_ERROR (0x87)
 
-          [1657609654.299183][8229:8234] CHIP:DMG:
-          [1657609654.299220][8229:8234] CHIP:DMG:                AttributeStatusIB =
-          [1657609654.299259][8229:8234] CHIP:DMG:                {
-          [1657609654.299296][8229:8234] CHIP:DMG:                        AttributePathIB =
-          [1657609654.299340][8229:8234] CHIP:DMG:                        {
-          [1657609654.299385][8229:8234] CHIP:DMG:                                Endpoint = 0x0,
-          [1657609654.299434][8229:8234] CHIP:DMG:                                Cluster = 0x1f,
-          [1657609654.299483][8229:8234] CHIP:DMG:                                Attribute = 0x0000_0001,
-          [1657609654.299531][8229:8234] CHIP:DMG:                                ListIndex = Null,
-          [1657609654.299576][8229:8234] CHIP:DMG:                        }
-          [1657609654.299625][8229:8234] CHIP:DMG:
           [1657609654.299668][8229:8234] CHIP:DMG:                        StatusIB =
           [1657609654.299712][8229:8234] CHIP:DMG:                        {
           [1657609654.299758][8229:8234] CHIP:DMG:                                status = 0x87 (CONSTRAINT_ERROR),
@@ -669,7 +572,7 @@
       verification: |
           ./chip-tool accesscontrol write extension "[{"data":""}]" 1 0
 
-          On TH(Chiptool) , Verify    AccessControl cluster Extension attribute, value is list of AccessControlExtensionStruct containing 1 element,  Returns  CONSTRAINT_ERROR (0x87)
+          On TH1(Chiptool) , Verify    AccessControl cluster Extension attribute, value is list of AccessControlExtensionStruct containing 1 element,  Returns  CONSTRAINT_ERROR (0x87)
 
 
           [1657609694.046042][8236:8241] CHIP:DMG:
@@ -699,7 +602,7 @@
       verification: |
           ./chip-tool accesscontrol write extension "[{"data":"1718"},{"data":"17D00000F1FF01003D48656C6C6F20576F726C642E205468697320697320612073696E676C6520656C656D656E74206C6976696E6720617320612063686172737472696E670018"}]" 1 0
 
-          On TH(Chiptool) , Verify  Successfully AccessControl cluster Extension attribute, value is list of AccessControlExtensionStruct containing 2 elements and  CONSTRAINT_ERROR (0x87) for second element path
+          On TH1(Chiptool) , Verify  Successfully AccessControl cluster Extension attribute, value is list of AccessControlExtensionStruct containing 2 elements and  CONSTRAINT_ERROR (0x87) for second element path
 
           [1657279798.809590][9208:9213] CHIP:DMG:
           [1657279798.809629][9208:9213] CHIP:DMG:                        StatusIB =
@@ -724,7 +627,7 @@
       verification: |
           ./chip-tool accesscontrol read extension 1 0
 
-          On TH(Chiptool) , Verify Successfully the list of AccessControlExtensionStruct containing 1 element.
+          On TH1(Chiptool) , Verify Successfully the list of AccessControlExtensionStruct containing 1 element.
 
 
           1657279968.695899][9221:9226] CHIP:DMG: ReportDataMessage =
@@ -795,7 +698,7 @@
       verification: |
           ./chip-tool accesscontrol write extension "[]" 1 0
 
-          On TH(Chiptool) , Verify  Successfully,AccessControl cluster Extension attribute, value is an empty list
+          On TH1(Chiptool) , Verify  Successfully,AccessControl cluster Extension attribute, value is an empty list
 
           7625][1521:1526] CHIP:DMG:                AttributeStatusIB =
           [1657692723.227673][1521:1526] CHIP:DMG:                {
@@ -829,7 +732,7 @@
       verification: |
           ./chip-tool accesscontrol read extension 1 0
 
-          On TH(Chiptool) , Verify AccessControl cluster Extension attribute, value is an empty list
+          On TH1(Chiptool) , Verify AccessControl cluster Extension attribute, value is an empty list
 
           [1660223145.427219][80697:80702] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_001F Attribute 0x0000_0001 DataVersion: 2385810240
           [1660223145.427227][80697:80702] CHIP:TOO:   Extension: 0 entries
diff --git a/src/app/tests/suites/certification/Test_TC_ACL_2_4.yaml b/src/app/tests/suites/certification/Test_TC_ACL_2_4.yaml
index 62b04fb..9e74143 100644
--- a/src/app/tests/suites/certification/Test_TC_ACL_2_4.yaml
+++ b/src/app/tests/suites/certification/Test_TC_ACL_2_4.yaml
@@ -36,7 +36,7 @@
           ./chip-tool operationalcredentials read current-fabric-index 1 0
 
 
-          On TH(Chiptool), verify  to CurrentFabricIndex attribute of operationalCredential cluster  as 1
+          On TH1(Chiptool), verify  to CurrentFabricIndex attribute of operationalCredential cluster  as 1
 
           [1656652012.060584][2763:2768] CHIP:DMG:
           [1656652012.060609][2763:2768] CHIP:DMG:        SuppressResponse = true,
@@ -54,7 +54,7 @@
       verification: |
           ./chip-tool accesscontrol read acl 1 0
 
-          On TH(Chiptool) , Verify Successfully AccessControl cluster ACL attribute value is list of AccessControlEntryStruct containing 1 element
+          On TH1(Chiptool) , Verify Successfully AccessControl cluster ACL attribute value is list of AccessControlEntryStruct containing 1 element
 
           [1656652338.381499][2784:2789] CHIP:DMG:                },
           [1656652338.381552][2784:2789] CHIP:DMG:
@@ -91,7 +91,7 @@
           ./chip-tool accesscontrol write acl "[{ "privilege": 5, "authMode": 2, "subjects": [112233], "targets": null},
            { "privilege": 1, "authMode": 3, "subjects": [111,222,333,444], "targets": [{"cluster":11 , "endpoint":22, "deviceType": null}]},
            { "privilege": 3, "authMode": 3, "subjects": [555,666,777,888], "targets": [{"cluster": 55, "endpoint": 66, "deviceType":null }]}]" 1 0
-          On TH(Chiptool)1, Verify Successfully AccessControl cluster ACL attribute value is list of AccessControlEntryStruct containing 3 elements
+          On TH1(Chiptool), Verify Successfully AccessControl cluster ACL attribute value is list of AccessControlEntryStruct containing 3 elements
           [1658323877.660699][2502:2507] CHIP:DMG: WriteClient moving to [ResponseRe]
           [1658323877.660829][2502:2507] CHIP:DMG: WriteResponseMessage =
           [1658323877.660890][2502:2507] CHIP:DMG: {
@@ -176,7 +176,7 @@
       PICS: ACL.S.A0000
       verification: |
           ./chip-tool accesscontrol read acl 1 0
-           On TH(Chiptool) 1, Verify Successfully AccessControl cluster ACL attribute value is list of AccessControlEntryStruct containing 3 elements
+           On TH1(Chiptool) , Verify Successfully AccessControl cluster ACL attribute value is list of AccessControlEntryStruct containing 3 elements
                  InteractionModelRevision = 1
           [1658229676.712083][4872:4878] CHIP:DMG: }
           [1658229676.712624][4872:4878] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_001F Attribute 0x0000_0000 DataVersion: 1307037423
@@ -237,7 +237,7 @@
       verification: |
           ./chip-tool accesscontrol write acl "[{ "privilege": 5, "authMode": 2, "subjects": [112233], "targets": null}, { "privilege": 4, "authMode": 2, "subjects": [444,333,222,111], "targets": [{"cluster":44 , "endpoint":33, "deviceType":null}]},{ "privilege":4 , "authMode":3, "subjects": [888,777,666,555], "targets": [{"cluster": 88, "endpoint": 77, "deviceType":null}]}]" 1 0
 
-          On TH(Chiptool) 1, Verify Successfully AccessControl cluster ACL attribute value is list of AccessControlEntryStruct containing 3 elements
+          On TH1(Chiptool) , Verify Successfully AccessControl cluster ACL attribute value is list of AccessControlEntryStruct containing 3 elements
           1658226959.554674][4736:4741] CHIP:DMG:        AttributeStatusIBs =
           [1658226959.554706][4736:4741] CHIP:DMG:        [
           [1658226959.554732][4736:4741] CHIP:DMG:                AttributeStatusIB =
@@ -313,7 +313,7 @@
       PICS: ACL.S.A0000
       verification: |
           ./chip-tool accesscontrol read acl 1 0
-          On TH(Chiptool)1, Verify Successfully AccessControl cluster ACL attribute value is list of AccessControlEntryStruct containing 3 elements
+          On TH1(Chiptool), Verify Successfully AccessControl cluster ACL attribute value is list of AccessControlEntryStruct containing 3 elements
           9800.959293][4892:4897] CHIP:DMG:
           [1658229800.959325][4892:4897] CHIP:DMG:        ],
           [1658229800.959399][4892:4897] CHIP:DMG:
@@ -378,7 +378,7 @@
       PICS: ACL.S.A0000
       verification: |
           ./chip-tool accesscontrol write acl "[{ "privilege": 5, "authMode": 2, "subjects": [112233], "targets": null}, { "privilege": 1, "authMode": 2, "subjects": [111,222,333,444], "targets":[{ "cluster": 11, "endpoint": 22, "deviceType": null },{ "cluster": 33, "endpoint": null, "deviceType": 44 }]}, { "privilege": 3, "authMode": 3, "subjects": [555,666,777,888], "targets":[{ "cluster": 55, "endpoint": 66, "deviceType": null },{ "cluster": 77, "endpoint": null, "deviceType": 88 }]}]" 1 0
-            On TH(Chiptool)1, Verify the  Successfully to acl attribute with a  value is list of AccessControlEntryStruct containing 3 elements
+            On TH1(Chiptool), Verify the  Successfully to acl attribute with a  value is list of AccessControlEntryStruct containing 3 elements
           1657276276.708941][2297:2302] CHIP:DMG: WriteClient moving to [ResponseRe]
           [1657276276.709021][2297:2302] CHIP:DMG: WriteResponseMessage =
           [1657276276.709058][2297:2302] CHIP:DMG: {
@@ -461,7 +461,7 @@
       PICS: ACL.S.A0000
       verification: |
           ./chip-tool accesscontrol read acl 1 0
-          On TH(Chiptool) 1, Verify Successfully AccessControl cluster ACL attribute value is list of AccessControlEntryStruct containing 3 elements
+          On TH1(Chiptool), Verify Successfully AccessControl cluster ACL attribute value is list of AccessControlEntryStruct containing 3 elements
 
           [1657278053.764924][2231:2236] CHIP:DMG:        SuppressResponse = true,
           [1657278053.764958][2231:2236] CHIP:DMG:        InteractionModelRevision = 1
@@ -536,7 +536,7 @@
       PICS: ACL.S.A0000
       verification: |
           ./chip-tool accesscontrol write acl "[{ "privilege": 5, "authMode": 2, "subjects": [112233], "targets": null}, { "privilege": 1, "authMode": 2, "subjects": [], "targets":[{ "cluster": 11, "endpoint": 22, "deviceType": null },{ "cluster": 33, "endpoint": null, "deviceType": 44 }]}, { "privilege": 3, "authMode": 3, "subjects": [], "targets":[{ "cluster": 55, "endpoint": 66, "deviceType": null },{ "cluster": 77, "endpoint": null, "deviceType": 88 }]}]" 1 0
-          On TH(Chiptool) 1, Verify Successfully AccessControl cluster ACL attribute value is list of AccessControlEntryStruct containing 3 elements
+          On TH1(Chiptool) , Verify Successfully AccessControl cluster ACL attribute value is list of AccessControlEntryStruct containing 3 elements
 
           [1657541707.114348][3004:3009] CHIP:DMG: {
           [1657541707.114393][3004:3009] CHIP:DMG:        AttributeStatusIBs =
@@ -618,7 +618,7 @@
       PICS: ACL.S.A0000
       verification: |
           ./chip-tool accesscontrol read acl 1 0
-          On TH(Chiptool) 1, Verify Successfully AccessControl cluster ACL attribute value is list of AccessControlEntryStruct containing 3 elements
+          On TH1(Chiptool) , Verify Successfully AccessControl cluster ACL attribute value is list of AccessControlEntryStruct containing 3 elements
 
           [1657278352.938811][2258:2263] CHIP:DMG:
           [1657278352.938840][2258:2263] CHIP:DMG:                },
@@ -689,7 +689,7 @@
           ./chip-tool accesscontrol write acl "[{ "privilege": 5, "authMode": 2, "subjects": [112233], "targets": null},
           { "privilege": 1, "authMode": 2, "subjects":  [111, 222, 333, 444], "targets": null},
           { "privilege": 3, "authMode": 3, "subjects":  [555, 666, 777, 888], "targets": null}]" 1 0
-          On TH(Chiptool) 1, Verify   Successfully to acl attribute  value is list of AccessControlEntryStruct containing 3 elements as Target Null.
+          On TH1(Chiptool) , Verify   Successfully to acl attribute  value is list of AccessControlEntryStruct containing 3 elements as Target Null.
 
           [1657542060.230268][3398:3403] CHIP:DMG: {
           [1657542060.230322][3398:3403] CHIP:DMG:        AttributeStatusIBs =
@@ -771,7 +771,7 @@
       PICS: ACL.S.A0000
       verification: |
           ./chip-tool accesscontrol read acl 1 0
-          On TH(Chiptool) 1, Verify Successfully AccessControl cluster ACL attribute value is list of AccessControlEntryStruct containing 3 elements as Target Null
+          On TH1(Chiptool) , Verify Successfully AccessControl cluster ACL attribute value is list of AccessControlEntryStruct containing 3 elements as Target Null
           [1656656511.643560][2994:2999] CHIP:DMG:
           [1656656511.643593][2994:2999] CHIP:DMG:        SuppressResponse = true,
           [1656656511.643626][2994:2999] CHIP:DMG:        InteractionModelRevision = 1
@@ -822,7 +822,7 @@
           ./chip-tool accesscontrol write acl "[{ "privilege": 5, "authMode": 2, "subjects": [112233], "targets": null},
            { "privilege": 3, "authMode": 3, "subjects": null, "targets": null}]" 1 0
 
-          On TH(Chiptool) 1, Verify   Successfully to acl attribute with a  value is list of AccessControlEntryStruct containing 2 elements as Target Null
+          On TH1(Chiptool) , Verify   Successfully to acl attribute with a  value is list of AccessControlEntryStruct containing 2 elements as Target Null
 
           [1656507141.628453][3224:3229] CHIP:DMG: WriteResponseMessage =
           [1656507141.628515][3224:3229] CHIP:DMG: {
@@ -890,7 +890,7 @@
       PICS: ACL.S.A0000
       verification: |
           ./chip-tool accesscontrol read acl 1 0
-          On TH(Chiptool) 1, Verify  Successfully that  acl attribute with a  value is list of AccessControlEntryStruct containing 2 elements as Target Null
+          On TH1(Chiptool) , Verify  Successfully that  acl attribute with a  value is list of AccessControlEntryStruct containing 2 elements as Target Null
 
           [1656507318.740283][3241:3246] CHIP:DMG:        ],
           [1656507318.740346][3241:3246] CHIP:DMG:
@@ -927,7 +927,7 @@
       verification: |
           ./chip-tool accesscontrol write acl "[{ "privilege": 5, "authMode": 2, "subjects": [112233], "targets": null},
           { "privilege": 2, "authMode": 2, "subjects": null, "targets": null}]" 1 0
-          On TH(Chiptool)1 , Verify  Successfully that  acl attribute with a  value is list of AccessControlEntryStruct containing 2 elements as Subject and Target as null
+          On TH1(Chiptool), Verify  Successfully that  acl attribute with a  value is list of AccessControlEntryStruct containing 2 elements as Subject and Target as null
           [1656507439.868495][3249:3254] CHIP:DMG: WriteClient moving to [ResponseRe]
           [1656507439.868612][3249:3254] CHIP:DMG: WriteResponseMessage =
           [1656507439.868671][3249:3254] CHIP:DMG: {
@@ -994,7 +994,7 @@
       PICS: ACL.S.A0000
       verification: |
           ./chip-tool accesscontrol read acl 1 0
-          On TH(Chiptool) 1, Verify  Successfully  acl attribute   value is list of AccessControlEntryStruct containing 2 elements as Subject and Target as null
+          On TH1(Chiptool) , Verify  Successfully  acl attribute   value is list of AccessControlEntryStruct containing 2 elements as Subject and Target as null
 
           [1656507517.730614][3261:3266] CHIP:DMG:
           [1656507517.730654][3261:3266] CHIP:DMG:        SuppressResponse = true,
@@ -1027,7 +1027,7 @@
       verification: |
           ./chip-tool accesscontrol read subjects-per-access-control-entry 1 0
 
-          On TH(Chiptool)1, verify with value 4 or greater as  subjects-per-access-control-entry , value is stored as MAXSUBJECTS
+          On TH1(Chiptool), verify with value 4 or greater as  subjects-per-access-control-entry , value is stored as MAXSUBJECTS
 
           [1656657490.002372][3078:3083] CHIP:DMG:
           [1656657490.002408][3078:3083] CHIP:DMG:        ],
@@ -1051,7 +1051,7 @@
       PICS: ACL.S.A0000
       verification: |
           ./chip-tool accesscontrol write acl "[{ "privilege": 5, "authMode": 2, "subjects": [112233], "targets": null}, { "privilege": 3, "authMode": 2, "subjects":[33,44,55,66] , "targets": null}]" 1 0
-          On TH(Chiptool)1, Verify  Successfully  acl attribute with a  value is list of AccessControlEntryStruct containing 2 elements as Subject as SUBJECTS and Target as null
+          On TH1(Chiptool), Verify  Successfully  acl attribute with a  value is list of AccessControlEntryStruct containing 2 elements as Subject as SUBJECTS and Target as null
 
 
 
@@ -1120,7 +1120,7 @@
       verification: |
           ./chip-tool accesscontrol read acl 1 0
 
-          On TH(Chiptool) 1, Verify  Successfully   acl attribute with a  value is list of AccessControlEntryStruct containing 2 elements as SUBJECTS and Target as null
+          On TH1(Chiptool) , Verify  Successfully   acl attribute with a  value is list of AccessControlEntryStruct containing 2 elements as SUBJECTS and Target as null
           [1656928460.992030][4255:4260] CHIP:DMG:        ],
           [1656928460.992075][4255:4260] CHIP:DMG:
           [1656928460.992101][4255:4260] CHIP:DMG:        SuppressResponse = true,
@@ -1163,7 +1163,7 @@
           ./chip-tool accesscontrol write acl "[{ "privilege": 5, "authMode": 2, "subjects": [112233], "targets": null},
            { "privilege": 3, "authMode": 2, "subjects":[65520,65521,65522,65523] , "targets": null}]" 1 0
 
-          On TH(Chiptool) 1, Verify  Successfully   acl attribute  value is list of AccessControlEntryStruct containing 2 elements , Subjects as CAT Values and Target as null
+          On TH1(Chiptool) , Verify  Successfully   acl attribute  value is list of AccessControlEntryStruct containing 2 elements , Subjects as CAT Values and Target as null
           [1656509348.174135][3403:3408] CHIP:DMG: WriteClient moving to [ResponseRe]
           [1656509348.174227][3403:3408] CHIP:DMG: WriteResponseMessage =
           [1656509348.174272][3403:3408] CHIP:DMG: {
@@ -1232,7 +1232,7 @@
       verification: |
           ./chip-tool accesscontrol read acl 1 0
 
-          On TH(Chiptool) 1, Verify  Successfully that  acl attribute with a  value is list of AccessControlEntryStruct containing 2 elements , Subjects as CAT Values and Target as null
+          On TH1(Chiptool) , Verify  Successfully that  acl attribute with a  value is list of AccessControlEntryStruct containing 2 elements , Subjects as CAT Values and Target as null
           [1656509471.738046][3416:3421] CHIP:DMG:
           [1656509471.738082][3416:3421] CHIP:DMG:        SuppressResponse = true,
           [1656509471.738120][3416:3421] CHIP:DMG:        InteractionModelRevision = 1
@@ -1267,7 +1267,7 @@
       PICS: ACL.S.A0000
       verification: |
           ./chip-tool accesscontrol read  targets-per-access-control-entry 1 0
-          On TH(Chiptool)1, verify with value 3  or greater as  Targets-per-access-control-entry ,value is stored as MAXTARGETS
+          On TH1(Chiptool), verify with value 3  or greater as  Targets-per-access-control-entry ,value is stored as MAXTARGETS
           [1656509737.166763][3434:3439] CHIP:DMG:
           [1656509737.166786][3434:3439] CHIP:DMG:        ],
           [1656509737.166816][3434:3439] CHIP:DMG:
diff --git a/src/app/tests/suites/certification/Test_TC_ACL_2_5.yaml b/src/app/tests/suites/certification/Test_TC_ACL_2_5.yaml
index 91a4000..a2815f3 100644
--- a/src/app/tests/suites/certification/Test_TC_ACL_2_5.yaml
+++ b/src/app/tests/suites/certification/Test_TC_ACL_2_5.yaml
@@ -26,7 +26,11 @@
 tests:
     - label: "TH1 commissions DUT using admin node ID N1"
       verification: |
-          verification step to be updated.
+          DUT
+          sudo ./chip-all-clusters-app
+
+          TH1
+          ./chip-tool pairing ble-wifi 1 zigbee-thread matter123 20202021 3841
       disabled: true
 
     - label:
@@ -35,29 +39,15 @@
       verification: |
           ./chip-tool  operationalcredentials read current-fabric-index 1 0
 
-          On TH(Chiptool), verify  CurrentFabricIndex attribute of operationalCredential cluster  as 1
+          On TH1(Chiptool), verify  CurrentFabricIndex attribute of operationalCredential cluster  as 1
 
-          [1657283596.149202][2284:2289] CHIP:DMG:                                {
-          [1657283596.149247][2284:2289] CHIP:DMG:                                        Endpoint = 0x0,
-          [1657283596.149293][2284:2289] CHIP:DMG:                                        Cluster = 0x3e,
-          [1657283596.149340][2284:2289] CHIP:DMG:                                        Attribute = 0x0000_0005,
-          [1657283596.149384][2284:2289] CHIP:DMG:                                }
-          [1657283596.149430][2284:2289] CHIP:DMG:
-          [1657283596.149479][2284:2289] CHIP:DMG:                                Data = 1,
-          [1657283596.149520][2284:2289] CHIP:DMG:                        },
-          [1657283596.149565][2284:2289] CHIP:DMG:
-          [1657283596.149602][2284:2289] CHIP:DMG:                },
-          [1657283596.149643][2284:2289] CHIP:DMG:
-          [1657283596.149674][2284:2289] CHIP:DMG:        ],
-          [1657283596.149714][2284:2289] CHIP:DMG:
+
           [1657283596.149747][2284:2289] CHIP:DMG:        SuppressResponse = true,
           [1657283596.149781][2284:2289] CHIP:DMG:        InteractionModelRevision = 1
           [1657283596.149813][2284:2289] CHIP:DMG: }
           [1657283596.150010][2284:2289] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_003E Attribute 0x0000_0005 DataVersion: 485742003
           [1657283596.152307][2284:2289] CHIP:TOO:   CurrentFabricIndex: 1
           [1657283596.152411][2284:2289] CHIP:EM: Sending Standalone Ack for MessageCounter:50620552 on exchange 25474i
-          [1657283596.152498][2284:2289] CHIP:IN: Prepared secure message 0xffffab7ed958 to 0x0000000000000001 (1)  of type 0x10 and protocolId (0, 0) on exchange 25474i with MessageCounter:219007987.
-          [1657283596.152548][2284
       disabled: true
 
     - label:
@@ -67,7 +57,7 @@
       verification: |
           ./chip-tool   accesscontrol  read-event  access-control-extension-changed 1 0
 
-          On TH(Chiptool), Verify  AccessControl cluster AccessControlExtensionChanged event value is an empty list
+          On TH1(Chiptool), Verify  AccessControl cluster AccessControlExtensionChanged event value is an empty list
 
           848.856174][2311:2316] CHIP:EM: Removed CHIP MessageCounter:265690133 from RetransTable on exchange 23190i
           [1657283848.856239][2311:2316] CHIP:DMG: ReportDataMessage =
@@ -87,7 +77,7 @@
       PICS: ACL.S.E01
       verification: |
           ./chip-tool   accesscontrol  write extension "[{"data":"1718"}]" 1 0
-          On TH(Chiptool), Verify  AccessControl cluster Extension attribute, value is list of AccessControlExtensionStruct containing 1 element
+          On TH1(Chiptool), Verify  AccessControl cluster Extension attribute, value is list of AccessControlExtensionStruct containing 1 element
 
           217.510779][2371:2376] CHIP:DMG:                        AttributePathIB =
           [1657284217.510818][2371:2376] CHIP:DMG:                        {
@@ -135,7 +125,7 @@
       PICS: ACL.S.E01
       verification: |
           ./chip-tool   accesscontrol  read-event  access-control-extension-changed 1 0
-          On TH(Chiptool), Verify  AccessControlExtensionChanged containing 1 element
+          On TH1(Chiptool), Verify  AccessControlExtensionChanged containing 1 element
 
           [1657618132.685459][8992:8998] CHIP:DMG:
           [1657618132.685495][8992:8998] CHIP:DMG:        SuppressResponse = true,
@@ -165,7 +155,7 @@
       PICS: ACL.S.E01
       verification: |
           ./chip-tool   accesscontrol  write extension "[{"data":"17D00000F1FF01003D48656C6C6F20576F726C642E205468697320697320612073696E676C6520656C656D656E74206C6976696E6720617320612063686172737472696E670018"}]" 1 0
-          On TH(Chiptool) , Verify   Successfully extension attribute list containg one element
+          On TH1(Chiptool) , Verify   Successfully extension attribute list containg one element
           7284747.131523][2411:2416] CHIP:DMG:                        StatusIB =
           [1657284747.131568][2411:2416] CHIP:DMG:                        {
           [1657284747.131618][2411:2416] CHIP:DMG:                                status = 0x00 (SUCCESS),
@@ -205,7 +195,7 @@
       PICS: ACL.S.E01
       verification: |
           ./chip-tool   accesscontrol  read-event  access-control-extension-changed 1 0
-          On TH(Chiptool) , Verify  AccessControlExtensionChanged containing at least 2 new elements.
+          On TH1(Chiptool) , Verify  AccessControlExtensionChanged containing at least 2 new elements.
 
 
           [1657618237.140162][9007:9012] CHIP:DMG: }
@@ -262,37 +252,10 @@
       verification: |
           ./chip-tool   accesscontrol  write extension "[{"data":"17D00000F1FF01003D48656C6C6F20576F726C642E205468697320697320612073696E676C6520656C656D656E74206C6976696E6720617320612063686172737472696E6700D00000F1FF02003248656C6C6F20576F726C642E205468697320697320612073696E676C6520656C656D656E7420616761696E2E2E2E2E2E2E0018"}]" 1 0
 
-          On TH(Chiptool) , Verify AccessControl cluster Extension attribute value is list of AccessControlExtensionStruct containing 1 element Data, exceeds maximum length.
+          On TH1(Chiptool) , Verify AccessControl cluster Extension attribute value is list of AccessControlExtensionStruct containing 1 element Data, exceeds maximum length.
 
-          1657287642.551842][9699:9704] CHIP:DMG: WriteResponseMessage =
-          [1657287642.551872][9699:9704] CHIP:DMG: {
-          [1657287642.551901][9699:9704] CHIP:DMG:        AttributeStatusIBs =
-          [1657287642.551940][9699:9704] CHIP:DMG:        [
-          [1657287642.551973][9699:9704] CHIP:DMG:                AttributeStatusIB =
-          [1657287642.552012][9699:9704] CHIP:DMG:                {
-          [1657287642.552061][9699:9704] CHIP:DMG:                        AttributePathIB =
-          [1657287642.552116][9699:9704] CHIP:DMG:                        {
-          [1657287642.552156][9699:9704] CHIP:DMG:                                Endpoint = 0x0,
-          [1657287642.552197][9699:9704] CHIP:DMG:                                Cluster = 0x1f,
-          [1657287642.552290][9699:9704] CHIP:DMG:                                Attribute = 0x0000_0001,
-          [1657287642.552331][9699:9704] CHIP:DMG:                        }
-          [1657287642.552375][9699:9704] CHIP:DMG:
-          [1657287642.552409][9699:9704] CHIP:DMG:                        StatusIB =
-          [1657287642.552447][9699:9704] CHIP:DMG:                        {
-          [1657287642.552488][9699:9704] CHIP:DMG:                                status = 0x00 (SUCCESS),
-          [1657287642.552526][9699:9704] CHIP:DMG:                        },
-          [1657287642.552564][9699:9704] CHIP:DMG:
-          [1657287642.552598][9699:9704] CHIP:DMG:                },
-          [1657287642.552641][9699:9704] CHIP:DMG:
-          [1657287642.552671][9699:9704] CHIP:DMG:                AttributeStatusIB =
-          [1657287642.552704][9699:9704] CHIP:DMG:                {
-          [1657287642.552741][9699:9704] CHIP:DMG:                        AttributePathIB =
-          [1657287642.552797][9699:9704] CHIP:DMG:                        {
-          [1657287642.552836][9699:9704] CHIP:DMG:                                Endpoint = 0x0,
-          [1657287642.552882][9699:9704] CHIP:DMG:                                Cluster = 0x1f,
-          [1657287642.552922][9699:9704] CHIP:DMG:                                Attribute = 0x0000_0001,
-          [1657287642.552962][9699:9704] CHIP:DMG:                                ListIndex = Null,
-          [1657287642.552999][9699:9704] CHIP:DMG:                        }
+
+
           [1657287642.553045][9699:9704] CHIP:DMG:
           [1657287642.553083][9699:9704] CHIP:DMG:                        StatusIB =
           [1657287642.553121][9699:9704] CHIP:DMG:                        {
@@ -317,7 +280,7 @@
       verification: |
           ./chip-tool   accesscontrol  read-event  access-control-extension-changed 1 0
 
-          On TH(Chiptool) , Verify AccessControl cluster AccessControlExtensionChanged containing at least 1 new element, and MUST NOT contain an added event for the extension with data that is too large
+          On TH1(Chiptool) , Verify AccessControl cluster AccessControlExtensionChanged containing at least 1 new element, and MUST NOT contain an added event for the extension with data that is too large
 
           [1657618374.299423][9024:9029] CHIP:DMG: }
           [1657618374.299739][9024:9029] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_001F Event 0x0000_0001
@@ -388,55 +351,10 @@
       verification: |
           ./chip-tool   accesscontrol  write extension "[{"data":"1718"},{"data":"17D00000F1FF01003D48656C6C6F20576F726C642E205468697320697320612073696E676C6520656C656D656E74206C6976696E6720617320612063686172737472696E670018"}]" 1 0
 
-          On TH(Chiptool) , Verify AccessControl cluster Extension attribute, value is list of AccessControlExtensionStruct containing 2 elements Returns 0x87 (CONSTRAINT_ERROR)-as there are more than 1 entry
+          On TH1(Chiptool) , Verify AccessControl cluster Extension attribute, value is list of AccessControlExtensionStruct containing 2 elements Returns 0x87 (CONSTRAINT_ERROR)-as there are more than 1 entry
 
 
-          1657289068.797364][9823:9828] CHIP:DMG: WriteResponseMessage =
-          [1657289068.797394][9823:9828] CHIP:DMG: {
-          [1657289068.797419][9823:9828] CHIP:DMG:        AttributeStatusIBs =
-          [1657289068.797455][9823:9828] CHIP:DMG:        [
-          [1657289068.797482][9823:9828] CHIP:DMG:                AttributeStatusIB =
-          [1657289068.797515][9823:9828] CHIP:DMG:                {
-          [1657289068.797550][9823:9828] CHIP:DMG:                        AttributePathIB =
-          [1657289068.797590][9823:9828] CHIP:DMG:                        {
-          [1657289068.797632][9823:9828] CHIP:DMG:                                Endpoint = 0x0,
-          [1657289068.797673][9823:9828] CHIP:DMG:                                Cluster = 0x1f,
-          [1657289068.797716][9823:9828] CHIP:DMG:                                Attribute = 0x0000_0001,
-          [1657289068.797754][9823:9828] CHIP:DMG:                        }
-          [1657289068.797798][9823:9828] CHIP:DMG:
-          [1657289068.797835][9823:9828] CHIP:DMG:                        StatusIB =
-          [1657289068.797875][9823:9828] CHIP:DMG:                        {
-          [1657289068.797914][9823:9828] CHIP:DMG:                                status = 0x00 (SUCCESS),
-          [1657289068.797952][9823:9828] CHIP:DMG:                        },
-          [1657289068.797991][9823:9828] CHIP:DMG:
-          [1657289068.798025][9823:9828] CHIP:DMG:                },
-          [1657289068.798071][9823:9828] CHIP:DMG:
-          [1657289068.798104][9823:9828] CHIP:DMG:                AttributeStatusIB =
-          [1657289068.798139][9823:9828] CHIP:DMG:                {
-          [1657289068.798173][9823:9828] CHIP:DMG:                        AttributePathIB =
-          [1657289068.798211][9823:9828] CHIP:DMG:                        {
-          [1657289068.798250][9823:9828] CHIP:DMG:                                Endpoint = 0x0,
-          [1657289068.798291][9823:9828] CHIP:DMG:                                Cluster = 0x1f,
-          [1657289068.798332][9823:9828] CHIP:DMG:                                Attribute = 0x0000_0001,
-          [1657289068.798372][9823:9828] CHIP:DMG:                                ListIndex = Null,
-          [1657289068.798410][9823:9828] CHIP:DMG:                        }
-          [1657289068.798453][9823:9828] CHIP:DMG:
-          [1657289068.798489][9823:9828] CHIP:DMG:                        StatusIB =
-          [1657289068.798527][9823:9828] CHIP:DMG:                        {
-          [1657289068.798565][9823:9828] CHIP:DMG:                                status = 0x00 (SUCCESS),
-          [1657289068.798603][9823:9828] CHIP:DMG:                        },
-          [1657289068.798640][9823:9828] CHIP:DMG:
-          [1657289068.798671][9823:9828] CHIP:DMG:                },
-          [1657289068.798709][9823:9828] CHIP:DMG:
-          [1657289068.798734][9823:9828] CHIP:DMG:                AttributeStatusIB =
-          [1657289068.798762][9823:9828] CHIP:DMG:                {
-          [1657289068.798791][9823:9828] CHIP:DMG:                        AttributePathIB =
-          [1657289068.798819][9823:9828] CHIP:DMG:                        {
-          [1657289068.798857][9823:9828] CHIP:DMG:                                Endpoint = 0x0,
-          [1657289068.798895][9823:9828] CHIP:DMG:                                Cluster = 0x1f,
-          [1657289068.798930][9823:9828] CHIP:DMG:                                Attribute = 0x0000_0001,
-          [1657289068.798964][9823:9828] CHIP:DMG:                                ListIndex = Null,
-          [1657289068.798997][9823:9828] CHIP:DMG:                        }
+
           [1657289068.799030][9823:9828] CHIP:DMG:
           [1657289068.799061][9823:9828] CHIP:DMG:                        StatusIB =
           [1657289068.799093][9823:9828] CHIP:DMG:                        {
@@ -460,7 +378,7 @@
       PICS: ACL.S.E01
       verification: |
           ./chip-tool   accesscontrol  read-event  access-control-extension-changed 1 0
-          On TH(Chiptool) , Verify AccessControl cluster AccessControlExtensionChanged event
+          On TH1(Chiptool) , Verify AccessControl cluster AccessControlExtensionChanged event
           containing at least 1 new element, and MUST NOT contain an added event for the second extension
           [1657618501.560311][9050:9055] CHIP:DMG: }
           [1657618501.560653][9050:9055] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_001F Event 0x0000_0001
@@ -570,7 +488,7 @@
       PICS: ACL.S.E01
       verification: |
           ./chip-tool accesscontrol write extension "[]" 1 0
-          On TH(Chiptool) , Verify  AccessControl cluster Extension attribute, value is an empty list
+          On TH1(Chiptool) , Verify  AccessControl cluster Extension attribute, value is an empty list
 
           7625][1521:1526] CHIP:DMG:                AttributeStatusIB =
           [1657692723.227673][1521:1526] CHIP:DMG:                {
@@ -604,7 +522,7 @@
       PICS: ACL.S.E01
       verification: |
           ./chip-tool   accesscontrol  read-event  access-control-extension-changed 1 0
-          On TH(Chiptool) , Verify  AccessControl cluster AccessControlExtensionChanged event containing at least 1 new element
+          On TH1(Chiptool) , Verify  AccessControl cluster AccessControlExtensionChanged event containing at least 1 new element
 
           [1657618604.091599][9063:9068] CHIP:DMG: }
           [1657618604.091929][9063:9068] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_001F Event 0x0000_0001
diff --git a/src/app/tests/suites/certification/Test_TC_ACL_2_6.yaml b/src/app/tests/suites/certification/Test_TC_ACL_2_6.yaml
index 9401565..7f8e420 100644
--- a/src/app/tests/suites/certification/Test_TC_ACL_2_6.yaml
+++ b/src/app/tests/suites/certification/Test_TC_ACL_2_6.yaml
@@ -26,7 +26,11 @@
 tests:
     - label: "TH1 commissions DUT using admin node ID N1"
       verification: |
-          verification step to be updated.
+          DUT
+          sudo ./chip-all-clusters-app
+
+          TH1
+          ./chip-tool pairing ble-wifi 1 zigbee-thread matter123 20202021 3841
       disabled: true
 
     - label:
@@ -35,7 +39,7 @@
       verification: |
           ./chip-tool operationalcredentials  read  current-fabric-index 1 0
 
-          On TH(Chiptool), verify CurrentFabricIndex attribute of operationalCredential cluster  as 1
+          On TH1(Chiptool), verify CurrentFabricIndex attribute of operationalCredential cluster  as 1
 
 
           [1656581567.459433][2846:2851] CHIP:EM: Removed CHIP MessageCounter:147498618 from RetransTable on exchange 16019i
@@ -77,7 +81,7 @@
       verification: |
           ./chip-tool accesscontrol  read-event access-control-entry-changed 1 0
 
-          On TH(Chiptool) , Verify AccessControl cluster AccessControlEntryChanged event  containing 1 element
+          On TH1(Chiptool) , Verify AccessControl cluster AccessControlEntryChanged event  containing 1 element
 
 
           [[1657618697.392815][9079:9084] CHIP:DMG:
@@ -148,9 +152,9 @@
           AuthMode field: Group (3) Subjects field: null Targets field: null"
       PICS: ACL.S.E00
       verification: |
-          ./chip-tool accesscontrol write acl "[{"fabricIndex": 1, "privilege": 5, "authMode": 2, "subjects": [112233], "targets": null},
-          {"fabricIndex": 1, "privilege": 3, "authMode": 3, "subjects": [], "targets":null}]" 1 0
-          On TH(Chiptool) , Verify AccessControl cluster AccessControlEntryChanged event  containing 2 elements
+          ./chip-tool accesscontrol write acl "[{ "privilege": 5, "authMode": 2, "subjects": [112233], "targets": null},
+          { "privilege": 3, "authMode": 3, "subjects": [], "targets":null}]" 1 0
+          On TH1(Chiptool) , Verify AccessControl cluster AccessControlEntryChanged event  containing 2 elements
 
           [[1657545728.526415][3928:3933] CHIP:DMG: WriteResponseMessage =
           [1657545728.526460][3928:3933] CHIP:DMG: {
@@ -219,7 +223,7 @@
       verification: |
           ./chip-tool  accesscontrol  read-event  access-control-entry-changed  1 0
 
-          On TH(Chiptool) , Verify AccessControl cluster AccessControlEntryChanged event   containing at least 3 new elements
+          On TH1(Chiptool) , Verify AccessControl cluster AccessControlEntryChanged event   containing at least 3 new elements
 
           [1657618772.535125][9091:9096] CHIP:DMG:
           [1657618772.535162][9091:9096] CHIP:DMG:        SuppressResponse = true,
@@ -305,8 +309,8 @@
           (3) AuthMode field: Group (3) Subjects field: null Targets field: null"
       PICS: ACL.S.E00
       verification: |
-          ./chip-tool accesscontrol write acl "[{"fabricIndex": 1, "privilege": 5, "authMode": 2, "subjects": [112233], "targets": null}, {"fabricIndex": 1, "privilege": 3, "authMode": 3, "subjects": null, "targets":null}]" 1 0
-          On TH(Chiptool)  ,verify AccessControl cluster ACL attribute, value is list of AccessControlEntryStruct containing 2 elements
+          ./chip-tool accesscontrol write acl "[{ "privilege": 5, "authMode": 2, "subjects": [112233], "targets": null}, { "privilege": 3, "authMode": 3, "subjects": null, "targets":null}]" 1 0
+          On TH1(Chiptool)  ,verify AccessControl cluster ACL attribute, value is list of AccessControlEntryStruct containing 2 elements
 
           58813102.344539][2489:2494] CHIP:EM: Removed CHIP MessageCounter:131488146 from RetransTable on exchange 37188i
           [1658813102.344581][2489:2494] CHIP:DMG: WriteClient moving to [ResponseRe]
@@ -379,7 +383,7 @@
       verification: |
           ./chip-tool accesscontrol read-event access-control-entry-changed 1 0
 
-          On TH(Chiptool) , Verify AccessControl cluster AccessControlEntryChanged event containing
+          On TH1(Chiptool) , Verify AccessControl cluster AccessControlEntryChanged event containing
            at least 3 new elements and MUST NOT contain an added event for the third entry
 
           1658813186.871698][2504:2509] CHIP:DMG:        ],
diff --git a/src/app/tests/suites/certification/Test_TC_ACL_2_7.yaml b/src/app/tests/suites/certification/Test_TC_ACL_2_7.yaml
index 71d1b62..4cd0bea 100644
--- a/src/app/tests/suites/certification/Test_TC_ACL_2_7.yaml
+++ b/src/app/tests/suites/certification/Test_TC_ACL_2_7.yaml
@@ -29,7 +29,7 @@
           DUT
           sudo ./chip-all-clusters-app
 
-          TH
+          TH1
           ./chip-tool pairing ble-wifi 1 zigbee-thread matter123 20202021 3841
       disabled: true
 
@@ -39,7 +39,7 @@
       verification: |
           ./chip-tool operationalcredentials read current-fabric-index 1 0
 
-          On TH(Chiptool), verify  CurrentFabricIndex attribute of operationalCredential cluster  as 1
+          On TH1(Chiptool), verify  CurrentFabricIndex attribute of operationalCredential cluster  as 1
 
           [1657186774.908634][10846:10851] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_003E Attribute 0x0000_0005 DataVersion: 3161849734
           [1657186774.911149][10846:10851] CHIP:TOO:   CurrentFabricIndex: 1
@@ -49,7 +49,7 @@
           "TH1 puts DUT into commissioning mode, TH2 commissions DUT using admin
           node ID N2"
       verification: |
-          Open a commissioning window On TH(Chiptool)1 using below command
+          Open a commissioning window On TH1(Chiptool)using below command
 
           ./chip-tool  pairing open-commissioning-window 1 1 400 2000 3841
           [1657186324.710951][10820:10825] CHIP:DMG: Received Command Response Status for Endpoint=0 Cluster=0x0000_003C Command=0x0000_0000 Status=0x0
@@ -71,7 +71,7 @@
       verification: |
           ./chip-tool operationalcredentials read current-fabric-index 2 0
 
-          On TH(Chiptool), verify  CurrentFabricIndex attribute of operationalCredential cluster  as 2
+          On TH2(Chiptool), verify  CurrentFabricIndex attribute of operationalCredential cluster  as 2
           [1657186956.724761][3910:3915] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_003E Attribute 0x0000_0005 DataVersion: 3161849734
           [1657186956.731658][3910:3915] CHIP:TOO:   CurrentFabricIndex: 2
       disabled: true
@@ -84,7 +84,7 @@
       verification: |
           ./chip-tool accesscontrol write extension "[{"data":"1718"}]" 1 0
 
-          On TH(Chiptool)1,Verify  Successfully to extension attribute list containg one element .
+          On TH1(Chiptool),Verify  Successfully to extension attribute list containg one element .
 
 
           657893593.975649][4116:4121] CHIP:DMG:                {
@@ -133,7 +133,7 @@
       verification: |
           ./chip-tool   accesscontrol  write extension "[{"data":"17D00000F1FF01003D48656C6C6F20576F726C642E205468697320697320612073696E676C6520656C656D656E74206C6976696E6720617320612063686172737472696E670018"}]" 2 0
 
-          On TH(Chiptool)2,Verify Successfully to extension attribute list containg one element .
+          On TH2(Chiptool),Verify Successfully to extension attribute list containg one element .
           1657894672.479983][2433:2438] CHIP:DMG: WriteClient moving to [ResponseRe]
           [1657894672.480057][2433:2438] CHIP:DMG: WriteResponseMessage =
           [1657894672.480092][2433:2438] CHIP:DMG: {
@@ -183,7 +183,7 @@
       PICS: ACL.S.A0001
       verification: |
           ./chip-tool accesscontrol read extension 1 0
-          On TH(Chiptool)1 ,verify AccessControlExtensionStruct containing 1 element, and MUST NOT contain an element with FabricIndex F2
+          On TH1(Chiptool) ,verify AccessControlExtensionStruct containing 1 element, and MUST NOT contain an element with FabricIndex F2
 
           [1657187433.621369][10890:10895] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_001F Attribute 0x0000_0001 DataVersion: 3415499944
           [1657187433.621422][10890:10895] CHIP:TOO:   Extension: 1 entries
@@ -199,7 +199,7 @@
       verification: |
           ./chip-tool accesscontrol read extension 2 0
 
-          On TH(Chiptool)2 , Verify AccessControlExtensionStruct containing 1 element, and MUST NOT contain an element with FabricIndex F1
+          On TH2(Chiptool), Verify AccessControlExtensionStruct containing 1 element, and MUST NOT contain an element with FabricIndex F1
           [1658327214.683199][2749:2754] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_001F Attribute 0x0000_0001 DataVersion: 2953114587
           [1658327214.683283][2749:2754] CHIP:TOO:   Extension: 1 entries
           [1658327214.683348][2749:2754] CHIP:TOO:     [1]: {
@@ -214,7 +214,7 @@
       PICS: ACL.S.E01
       verification: |
           ./chip-tool   accesscontrol  read-event  access-control-extension-changed 1 0
-          On TH(Chiptool)1 , Verify AccessControlExtensionChanged containing 1 element, and MUST NOT contain an element with FabricIndex F2
+          On TH1(Chiptool) , Verify AccessControlExtensionChanged containing 1 element, and MUST NOT contain an element with FabricIndex F2
 
           [1658327494.282263][2810:2815] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_001F Event 0x0000_0001
           [1658327494.282295][2810:2815] CHIP:TOO:          Event number: 5
@@ -238,7 +238,7 @@
       PICS: ACL.S.E01
       verification: |
           ./chip-tool accesscontrol read-event access-control-extension-changed  2
-          On TH(Chiptool)2 , Verify AccessControlExtensionChanged containing 1 element, and MUST NOT contain an element with FabricIndex F1
+          On TH2(Chiptool) , Verify AccessControlExtensionChanged containing 1 element, and MUST NOT contain an element with FabricIndex F1
           [1658327551.622018][4295:4300] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_001F Event 0x0000_0001
           [1658327551.622043][4295:4300] CHIP:TOO:          Event number: 6
           [1658327551.622065][4295:4300] CHIP:TOO:          Priority: Info
diff --git a/src/app/tests/suites/certification/Test_TC_ACL_2_8.yaml b/src/app/tests/suites/certification/Test_TC_ACL_2_8.yaml
index 192a959..37805cd 100644
--- a/src/app/tests/suites/certification/Test_TC_ACL_2_8.yaml
+++ b/src/app/tests/suites/certification/Test_TC_ACL_2_8.yaml
@@ -29,7 +29,7 @@
           DUT
           sudo ./chip-all-clusters-app
 
-          TH
+          TH1
           ./chip-tool pairing ble-wifi 1 zigbee-thread matter123 20202021 3841
       disabled: true
 
@@ -39,7 +39,7 @@
       verification: |
           ./chip-tool operationalcredentials read current-fabric-index 1 0
 
-          On TH(Chiptool)1, verify  CurrentFabricIndex attribute of operationalCredential cluster  as 1
+          On TH1(Chiptool), verify  CurrentFabricIndex attribute of operationalCredential cluster  as 1
 
           [1656588171.078880][3260:3265] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_003E Attribute 0x0000_0005 DataVersion: 1776815488
           [1656588171.078952][3260:3265] CHIP:TOO:   CurrentFabricIndex: 1
@@ -50,7 +50,7 @@
           "TH1 puts DUT into commissioning mode, TH2 commissions DUT using admin
           node ID N2"
       verification: |
-          Open a commissioning window On TH(Chiptool)1 using below command
+          Open a commissioning window On TH1(Chiptool)1using below command
 
           ./chip-tool administratorcommissioning open-basic-commissioning-window 180 1  0 --timedInteractionTimeoutMs 1000
 
@@ -101,7 +101,7 @@
           CurrentFabricIndex attribute"
       verification: |
           ./chip-tool  operationalcredentials read current-fabric-index 2 0 --commissioner-nodeid 223344 --commissioner-name beta
-          On TH(Chiptool)2, verify  CurrentFabricIndex attribute of operationalCredential cluster  as 2
+          On TH2(Chiptool),verify  CurrentFabricIndex attribute of operationalCredential cluster  as 2
 
           1658747098.843523][3024:3029] CHIP:DMG:                 },
           [1658747098.843552][3024:3029] CHIP:DMG:
@@ -124,8 +124,8 @@
           field: [N1, 1111] Targets field: null"
       PICS: ACL.S.A0000
       verification: |
-          ./chip-tool accesscontrol write acl "[{"fabricIndex": 1, "privilege": 5, "authMode": 2, "subjects": [112233,1111], "targets":null}]" 1 0
-          On TH(Chiptool)1, verify AccessControl cluster ACL attribute, value is list of AccessControlEntryStruct containing 1 element
+          ./chip-tool accesscontrol write acl "[{ "privilege": 5, "authMode": 2, "subjects": [112233,1111], "targets":null}]" 1 0
+          On TH1(Chiptool), verify AccessControl cluster ACL attribute, value is list of AccessControlEntryStruct containing 1 element
 
           [1657286416.461279][4737:4742] CHIP:DMG: {
           [1657286416.461307][4737:4742] CHIP:DMG:         AttributeStatusIBs =
@@ -178,8 +178,8 @@
           field: [N2, 2222] Targets field: null"
       PICS: ACL.S.A0000
       verification: |
-          ./chip-tool accesscontrol write acl "[{"fabricIndex": 1, "privilege": 5, "authMode": 2, "subjects": [223344,2222], "targets":null}]" 2 0  --commissioner-nodeid 223344 --commissioner-name beta
-          On TH(Chiptool)2, verify AccessControl cluster ACL attribute value is list of AccessControlEntryStruct containing 1 element
+          ./chip-tool accesscontrol write acl "[{ "privilege": 5, "authMode": 2, "subjects": [223344,2222], "targets":null}]" 2 0  --commissioner-nodeid 223344 --commissioner-name beta
+          On TH2(Chiptool), verify AccessControl cluster ACL attribute value is list of AccessControlEntryStruct containing 1 element
 
 
           [1658747124.117113][3031:3036] CHIP:DMG: {
@@ -233,7 +233,7 @@
       verification: |
           ./chip-tool  accesscontrol  read  acl 1 0
 
-          On TH(Chiptool)1, verify AccessControlEntryStruct containing 1 element, and MUST NOT contain an element with FabricIndex F2
+          On TH1(Chiptool), verify AccessControlEntryStruct containing 1 element, and MUST NOT contain an element with FabricIndex F2
           [1657286432.997319][4745:4751] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_001F Attribute 0x0000_0000 DataVersion: 3308562949
           [1657286432.997655][4745:4751] CHIP:TOO:   ACL: 1 entries
           [1657286432.997727][4745:4751] CHIP:TOO:     [1]: {
@@ -252,7 +252,7 @@
       verification: |
           ./chip-tool accesscontrol read acl 2 0 --commissioner-name beta --commissioner-nodeid 223344
 
-          On TH(Chiptool)2, verify  AccessControlEntryStruct containing 1 element, and MUST NOT contain an element with FabricIndex F1
+          On TH2(Chiptool), verify  AccessControlEntryStruct containing 1 element, and MUST NOT contain an element with FabricIndex F1
           [1657286742.977222][18111:18116] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_001F Attribute 0x0000_0000 DataVersion: 3308562953
           [1657286742.977287][18111:18116] CHIP:TOO:   ACL: 1 entries
           [1657286742.977344][18111:18116] CHIP:TOO:     [1]: {
@@ -272,7 +272,7 @@
       PICS: ACL.S.E00
       verification: |
           ./chip-tool  accesscontrol  read-event  access-control-entry-changed  1 0
-          On TH(Chiptool)1, verify AccessControl cluster AccessControlEntryChanged containing 3 elements, and MUST NOT contain any element with FabricIndex F2
+          On TH1(Chiptool), verify AccessControl cluster AccessControlEntryChanged containing 3 elements, and MUST NOT contain any element with FabricIndex F2
 
 
           [1657286873.948408][4767:4772] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_001F Event 0x0000_0000
@@ -338,29 +338,10 @@
       PICS: ACL.S.E00
       verification: |
           ./chip-tool  accesscontrol  read-event  access-control-entry-changed  2 0 --commissioner-name beta --commissioner-nodeid 223344
-          On TH(Chiptool)2, verify AccessControl cluster AccessControlEntryChanged containing 3 elements, and MUST NOT contain any element with FabricIndex F1
+          On TH2(Chiptool), verify AccessControl cluster AccessControlEntryChanged containing 3 elements, and MUST NOT contain any element with FabricIndex F1
 
 
 
-          [1657287207.040351][18332:18337] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_001F Event 0x0000_0000
-          [1657287207.040361][18332:18337] CHIP:TOO:          Event number: 4
-          [1657287207.040369][18332:18337] CHIP:TOO:          Priority: Info
-          [1657287207.040376][18332:18337] CHIP:TOO:          Timestamp: 31805127
-          [1657287207.040425][18332:18337] CHIP:TOO:   AccessControlEntryChanged: {
-          [1657287207.040440][18332:18337] CHIP:TOO:     AdminNodeID: null
-          [1657287207.040451][18332:18337] CHIP:TOO:     AdminPasscodeID: 0
-          [1657287207.040460][18332:18337] CHIP:TOO:     ChangeType: 1
-          [1657287207.040467][18332:18337] CHIP:TOO:     LatestValue: {
-          [1657287207.040474][18332:18337] CHIP:TOO:       Privilege: 5
-          [1657287207.040482][18332:18337] CHIP:TOO:       AuthMode: 2
-          [1657287207.040492][18332:18337] CHIP:TOO:       Subjects: 1 entries
-          [1657287207.040502][18332:18337] CHIP:TOO:         [1]: 223344
-          [1657287207.040510][18332:18337] CHIP:TOO:       Targets: null
-          [1657287207.040518][18332:18337] CHIP:TOO:       FabricIndex: 2
-          [1657287207.040526][18332:18337] CHIP:TOO:      }
-          [1657287207.040533][18332:18337] CHIP:TOO:     AdminFabricIndex: 2
-          [1657287207.040540][18332:18337] CHIP:TOO:    }
-          [1657287207.040612][18332:18337] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_001F Event 0x0000_0000
           [1657287207.040619][18332:18337] CHIP:TOO:          Event number: 7
           [1657287207.040624][18332:18337] CHIP:TOO:          Priority: Info
           [1657287207.040630][18332:18337] CHIP:TOO:          Timestamp: 31903266
diff --git a/src/app/tests/suites/certification/Test_TC_ACL_2_9.yaml b/src/app/tests/suites/certification/Test_TC_ACL_2_9.yaml
index fa68ec0..e605cc3 100644
--- a/src/app/tests/suites/certification/Test_TC_ACL_2_9.yaml
+++ b/src/app/tests/suites/certification/Test_TC_ACL_2_9.yaml
@@ -26,7 +26,11 @@
 tests:
     - label: "TH1 commissions DUT using admin node ID N1"
       verification: |
-          verification step to be updated.
+          DUT
+          sudo ./chip-all-clusters-app
+
+          TH1
+          ./chip-tool pairing ble-wifi 1 zigbee-thread matter123 20202021 3841
       disabled: true
 
     - label:
@@ -36,8 +40,8 @@
           [N1] Targets field: null"
       PICS: ACL.S.A0000
       verification: |
-          ./chip-tool accesscontrol write acl "[{"fabricIndex": 1, "privilege": 4, "authMode": 2, "subjects": [112233], "targets": null}]" 1 0
-          On TH(Chiptool), verify AccessControl cluster ACL attribute, value is list of AccessControlEntryStruct containing 1 element
+          ./chip-tool accesscontrol write acl "[{ "privilege": 4, "authMode": 2, "subjects": [112233], "targets": null}]" 1 0
+          On TH1(Chiptool), verify AccessControl cluster ACL attribute, value is list of AccessControlEntryStruct containing 1 element
 
           [1656589077.991761][3452:3457] CHIP:DMG: WriteClient moving to [ResponseRe]
           [1656589077.991838][3452:3457] CHIP:DMG: WriteResponseMessage =
@@ -90,7 +94,7 @@
       verification: |
           ./chip-tool accesscontrol read acl 1 0
 
-          On TH(Chiptool), verify AccessControl cluster ACL attribute Returns UNSUPPORTED_ACCESS (0x7e)
+          On TH1(Chiptool), verify AccessControl cluster ACL attribute Returns UNSUPPORTED_ACCESS (0x7e)
           [1656589294.730359][3469:3474] CHIP:DMG: ReportDataMessage =
           [1656589294.730409][3469:3474] CHIP:DMG: {
           [1656589294.730449][3469:3474] CHIP:DMG:        AttributeReportIBs =
@@ -132,8 +136,8 @@
           field: [N1] Targets field: null"
       PICS: ACL.S.A0000
       verification: |
-          ./chip-tool accesscontrol write acl "[{"fabricIndex": 1, "privilege": 5, "authMode": 2, "subjects": [112233], "targets": null}]" 1 0
-          On TH(Chiptool), verify  AccessControl cluster ACL attribute, value is list of AccessControlEntryStruct containing 1 element Returns Unsupported Access
+          ./chip-tool accesscontrol write acl "[{"privilege": 5, "authMode": 2, "subjects": [112233], "targets": null}]" 1 0
+          On TH1(Chiptool), verify  AccessControl cluster ACL attribute, value is list of AccessControlEntryStruct containing 1 element Returns Unsupported Access
 
           [1656589843.696435][3518:3523] CHIP:DMG: WriteResponseMessage =
           [1656589843.696471][3518:3523] CHIP:DMG: {
@@ -186,7 +190,7 @@
       PICS: ACL.S.A0001
       verification: |
           ./chip-tool accesscontrol read  extension 1 0
-          On TH(Chiptool), verify  AccessControl cluster Extension attribute Returns UNSUPPORTED_ACCESS (0x7e)
+          On TH1(Chiptool), verify  AccessControl cluster Extension attribute Returns UNSUPPORTED_ACCESS (0x7e)
           [1656590048.181895][3536:3541] CHIP:DMG: ReportDataMessage =
           [1656590048.181938][3536:3541] CHIP:DMG: {
           [1656590048.181973][3536:3541] CHIP:DMG:        AttributeReportIBs =
@@ -226,7 +230,7 @@
       PICS: ACL.S.A0001
       verification: |
           ./chip-tool accesscontrol write extension [] 1 0
-          On TH(Chiptool) , Verify the  Successfully with  extension attribute value is an empty list Returns
+          On TH1(Chiptool) , Verify the  Successfully with  extension attribute value is an empty list which Returns
           UNSUPPORTED_ACCESS (0x7e)
           [1656592607.144276][3897:3903] CHIP:DMG: WriteClient moving to [ResponseRe]
           [1656592607.144341][3897:3903] CHIP:DMG: WriteResponseMessage =
@@ -254,7 +258,7 @@
       PICS: ACL.S.A0002
       verification: |
           ./chip-tool accesscontrol read subjects-per-access-control-entry 1 0
-          On TH(Chiptool), verify with value 4 or greater as  subjects-per-access-control-entry.
+          On TH1(Chiptool), verify with value 4 or greater as  subjects-per-access-control-entry.
 
           [1656592739.107798][3916:3921] CHIP:DMG: ReportDataMessage =
           [1656592739.107828][3916:3921] CHIP:DMG: {
@@ -293,7 +297,7 @@
       PICS: ACL.S.A0003
       verification: |
           ./chip-tool accesscontrol read targets-per-access-control-entry 1 0
-          On TH(Chiptool), verify with value 3 or greater as   TargetsPerAccessControlEntry
+          On TH1(Chiptool), verify with value 3 or greater as   TargetsPerAccessControlEntry
           [1656593266.074720][3943:3948] CHIP:DMG: ReportDataMessage =
           [1656593266.074748][3943:3948] CHIP:DMG: {
           [1656593266.074769][3943:3948] CHIP:DMG:        AttributeReportIBs =
@@ -332,7 +336,7 @@
       verification: |
           ./chip-tool accesscontrol read access-control-entries-per-fabric 1 0
 
-          On TH(Chiptool), verify with value 3  or greater as AccessControlEntriesPerFabric.
+          On TH1(Chiptool), verify with value 3  or greater as AccessControlEntriesPerFabric.
           [1656593406.902865][3956:3961] CHIP:DMG: ReportDataMessage =
           [1656593406.902902][3956:3961] CHIP:DMG: {
           [1656593406.902931][3956:3961] CHIP:DMG:        AttributeReportIBs =
@@ -371,7 +375,7 @@
       PICS: ACL.S.E00
       verification: |
           ./chip-tool accesscontrol read-event access-control-entry-changed 1
-          On TH(Chiptool), Verify  AccessControl cluster AccessControlEntryChanged event Returns UNSUPPORTED_ACCESS (0x7e)
+          On TH1(Chiptool), Verify  AccessControl cluster AccessControlEntryChanged event Returns UNSUPPORTED_ACCESS (0x7e)
           [1656593588.305232][3979:3984] CHIP:DMG:                                },
           [1656593588.305269][3979:3984] CHIP:DMG:
           [1656593588.305299][3979:3984] CHIP:DMG:                                StatusIB =
@@ -400,7 +404,7 @@
       PICS: ACL.S.E01
       verification: |
           ./chip-tool accesscontrol read-event  access-control-extension-changed 1 0
-          On TH(Chiptool), verify AccessControl cluster AccessControlExtensionChanged event Returns UNSUPPORTED_ACCESS (0x7e)
+          On TH1(Chiptool), verify AccessControl cluster AccessControlExtensionChanged event Returns UNSUPPORTED_ACCESS (0x7e)
           [1656593726.387025][3990:3995] CHIP:DMG:
           [1656593726.387048][3990:3995] CHIP:DMG:                EventReportIB =
           [1656593726.387078][3990:3995] CHIP:DMG:                {
diff --git a/src/app/tests/suites/certification/Test_TC_APPLAUNCHER_1_3.yaml b/src/app/tests/suites/certification/Test_TC_APPLAUNCHER_1_3.yaml
index 620afff..f0d4f63 100644
--- a/src/app/tests/suites/certification/Test_TC_APPLAUNCHER_1_3.yaml
+++ b/src/app/tests/suites/certification/Test_TC_APPLAUNCHER_1_3.yaml
@@ -16,6 +16,9 @@
     19.1.3. [TC-APPLAUNCHER-1.3] Global attributes - Application Launcher
     Cluster (DUT as Server)
 
+PICS:
+    - APPLAUNCHER.S
+
 config:
     nodeId: 0x12344321
     cluster: "Application Launcher"
diff --git a/src/app/tests/suites/certification/Test_TC_CADMIN_1_1.yaml b/src/app/tests/suites/certification/Test_TC_CADMIN_1_1.yaml
index 04cfb07..b2b7678 100644
--- a/src/app/tests/suites/certification/Test_TC_CADMIN_1_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CADMIN_1_1.yaml
@@ -101,8 +101,10 @@
       PICS: CADMIN.C
       verification: |
           On 2nd controller, using chip-tool connect using manual code.
+
+          On Raspi platform use commissioner-name parameter to commission different TH as server with DUT as commissioner,  Pls use equivalent command on the respective TH as server
           Below is the example when using chip tool as controller (considering 35998938564 as the manual code generated by 1st controller)
-          ./chip-tool pairing code 2 35998938564
+          ./chip-tool pairing code 2 35998938564 --commissioner-name beta
 
            Verify whether you got below message in the log of TH
 
@@ -135,8 +137,9 @@
       verification: |
           On 2nd controller using chip tool write and read node-label
 
+          On Raspi platform use commissioner-name parameter to commission different TH as server with DUT as commissioner,  Pls use equivalent command on the respective TH as server
           Below is the example when using chip tool as controller
-          ./chip-tool basic write node-label te5new 2 0
+          ./chip-tool basic write node-label te5new 2 0 --commissioner-name beta
 
           CHIP:DMG: WriteClient moving to [ResponseRe]
           [1649671460.431199][20958:20963] CHIP:DMG: WriteResponseMessage =
@@ -170,7 +173,8 @@
 
           Verify read attribute returns the updated value written
 
-          ./chip-tool basic read node-label 2 0
+          On Raspi platform use commissioner-name parameter to commission different TH as server with DUT as commissioner,  Pls use equivalent command on the respective TH as server
+          ./chip-tool basic read node-label 2 0 --commissioner-name beta
 
           CHIP:DMG: ReportDataMessage =
           [1649671466.310233][20969:20974] CHIP:DMG: {
@@ -211,7 +215,8 @@
 
           Below is the example using chip tool as controller
 
-          ./chip-tool operationalcredentials read fabrics 2 0  --fabric-filtered 0
+          ./chip-tool operationalcredentials read fabrics 2 0  --fabric-filtered 0 --commissioner-name beta
+
 
 
           CHIP:TOO: Endpoint: 0 Cluster: 0x0000_003E Attribute 0x0000_0001 DataVersion: 3621507063
@@ -288,7 +293,7 @@
 
           Below is an example of using chip tool as controller
 
-          ./chip-tool basic write node-label te5new 2 0
+          ./chip-tool basic write node-label te5new 2 0 --commissioner-name beta
 
           CHIP:DMG: WriteResponseMessage =
           [1649245940.788522][10110:10115] CHIP:DMG: {
@@ -318,7 +323,7 @@
 
           Verify read attribute returns the updated value written
 
-          ./chip-tool basic read node-label 2 0
+          ./chip-tool basic read node-label 2 0 --commissioner-name beta
 
           CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0028 Attribute 0x0000_0005 DataVersion: 3061847068
           [1649245950.006849][10116:10121] CHIP:TOO:   NodeLabel: te5new
@@ -339,7 +344,7 @@
           On 2nd controller open commissioning window using ECM
 
           Below is an example when using chip tool as controller
-          ./chip-tool pairing open-commissionig-window 2 1 300 1000 3841
+          ./chip-tool pairing open-commissionig-window 2 1 300 1000 3841 --commissioner-name beta
 
           CHIP: [IN] Prepared encrypted message 0x124012e80 to 0x0000000000000001 of type 0x8 and protocolId (0, 1) on exchange 50829i with MessageCounter:0.
           [1635693418549] [30519:4583024] CHIP: [IN] Sending encrypted msg 0x124012e80 with MessageCounter:0 to 0x0000000000000001 at monotonic time: 5995099243 msec
@@ -360,7 +365,7 @@
 
           Below is an example when using chip tool as controller
 
-          ./chip-tool administratorcommissioning revoke-commissioning 2 0 --timedInteractionTimeoutMs 1000
+          ./chip-tool administratorcommissioning revoke-commissioning 2 0 --timedInteractionTimeoutMs 1000 --commissioner-name beta
 
 
           CHIP: [DMG] InvokeResponseMessage =
@@ -402,7 +407,7 @@
       verification: |
           On 3rd controller using chip-tool connect using manual code generated from 1st controller. This attempt should fail, i.e
 
-          ./chip-tool pairing code 1  34995354639
+          ./chip-tool pairing code 3  34995354639  --commissioner-name gamma
 
           verify you got the following message in the TH log
 
@@ -420,7 +425,7 @@
 
           Below is the example using chip tool as controller
 
-          ./chip-tool basic write node-label te5new 2 0
+          ./chip-tool basic write node-label te5new 2 0 --commissioner-name beta
 
           CHIP:DMG: WriteResponseMessage =
           [1649245940.788522][10110:10115] CHIP:DMG: {
@@ -450,7 +455,8 @@
 
           Verify read attribute returns the updated value written
 
-          ./chip-tool basic read node-label 2 0
+          ./chip-tool basic read node-label 2 0 --commissioner-name beta
+
 
           CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0028 Attribute 0x0000_0005 DataVersion: 3061847068
           [1649245950.006849][10116:10121] CHIP:TOO:   NodeLabel: te5new
@@ -465,7 +471,7 @@
           On 2nd controller open commissioning window using ECM
 
           Below is an example when using chip tool as controller
-          ./chip-tool pairing open-commissioning-window 2 1 180 1000 3840
+          ./chip-tool pairing open-commissioning-window 2 1 180 1000 3840 --commissioner-name beta
 
           CHIP: [IN] Prepared encrypted message 0x124012e80 to 0x0000000000000001 of type 0x8 and protocolId (0, 1) on exchange 50829i with MessageCounter:0.
           [1635693418549] [30519:4583024] CHIP: [IN] Sending encrypted msg 0x124012e80 with MessageCounter:0 to 0x0000000000000001 at monotonic time: 5995099243 msec
@@ -491,7 +497,7 @@
           On 2nd controller open commissioning window using ECM
 
           Below is an example when using chip tool as controller
-          ./chip-tool pairing open-commissionig-window 2 1 300 1000 3840
+          ./chip-tool pairing open-commissionig-window 2 1 300 1000 3840 --commissioner-name beta
 
           CHIP: [IN] Prepared encrypted message 0x124012e80 to 0x0000000000000001 of type 0x8 and protocolId (0, 1) on exchange 50829i with MessageCounter:0.
           [1635693418549] [30519:4583024] CHIP: [IN] Sending encrypted msg 0x124012e80 with MessageCounter:0 to 0x0000000000000001 at monotonic time: 5995099243 msec
diff --git a/src/app/tests/suites/certification/Test_TC_CADMIN_1_2.yaml b/src/app/tests/suites/certification/Test_TC_CADMIN_1_2.yaml
index cfa0869..844c50f 100644
--- a/src/app/tests/suites/certification/Test_TC_CADMIN_1_2.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CADMIN_1_2.yaml
@@ -114,7 +114,7 @@
           On second Controller connect to the accessory.
 
           Below is the example when using chip tool as controller
-          ./chip-tool pairing onnetwork 2 20202021
+          ./chip-tool pairing onnetwork 2 20202021 --commissioner-name beta
 
           Verify you got below message
           Device commissioning completed with success
@@ -147,7 +147,7 @@
           On the 2nd controller write attribute and read attribute to and from TH_CE
 
           Below is the example while using chip tool on second controller,
-          ./chip-tool basic write  node-label te5new 2 0
+          ./chip-tool basic write  node-label te5new 2 0 --commissioner-name beta
 
           CHIP:DMG: WriteResponseMessage =
           [1649245940.788522][10110:10115] CHIP:DMG: {
@@ -177,7 +177,7 @@
 
 
           Verify read attribute returns the updated value written
-          ./chip-tool basic read node-label 1 0
+          ./chip-tool basic read node-label 1 0 --commissioner-name beta
           CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0028 Attribute 0x0000_0005 DataVersion: 3061847068
           [1649245950.006849][10116:10121] CHIP:TOO:   NodeLabel: te5new
           [1649245950.007024][10116:10121] CHIP:EM: Sending Standalone Ack for MessageCounter:12495101 on exchange 24816i
@@ -190,7 +190,7 @@
           On second controller controller read fabricList
 
           Below is the example while using chip tool on second controller,
-          ./chip-tool operationalcredentials read fabrics 2 0 --fabric-filtered 0
+          ./chip-tool operationalcredentials read fabrics 2 0 --fabric-filtered 0 --commissioner-name beta
 
           CHIP:TOO: Endpoint: 0 Cluster: 0x0000_003E Attribute 0x0000_0001 DataVersion: 3229397217
           [1650277071.834099][40790:40795] CHIP:TOO:   Fabrics: 2 entries
@@ -265,7 +265,7 @@
 
 
           Below is the example while using chip tool on second controller,
-          ./chip-tool basic write node-label te5new 2 0
+          ./chip-tool basic write node-label te5new 2 0 --commissioner-name beta
 
           CHIP:DMG: WriteResponseMessage =
           [1649245940.788522][10110:10115] CHIP:DMG: {
@@ -295,7 +295,7 @@
 
           Verify read attribute returns the updated value written
 
-          ./chip-tool basic read node-label 2 0
+          ./chip-tool basic read node-label 2 0 --commissioner-name beta
           CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0028 Attribute 0x0000_0005 DataVersion: 3061847068
           [1649245950.006849][10116:10121] CHIP:TOO:   NodeLabel: te5new
           [1649245950.007024][10116:10121] CHIP:EM: Sending Standalone Ack for MessageCounter:12495101 on exchange 24816i
@@ -315,7 +315,7 @@
           On second controller using chip-tool open commissioning widow using BCM.
 
           Below is the example while using chip tool on second controller,
-          ./chip-tool administratorcommissioning open-basic-commissioning-window 500 2 0 --timedInteractionTimeoutMs 1000
+          ./chip-tool administratorcommissioning open-basic-commissioning-window 500 2 0 --timedInteractionTimeoutMs 1000  --commissioner-name beta
 
 
           CHIP:DMG: InvokeResponseMessage =
@@ -359,7 +359,7 @@
           On second controller using chip-tool run revoke command
 
           Below is the example while using chip tool on second controller,
-          ./chip-tool administratorcommissioning revoke-commissioning 2 0 --timedInteractionTimeoutMs 1000
+          ./chip-tool administratorcommissioning revoke-commissioning 2 0 --timedInteractionTimeoutMs 1000 --commissioner-name beta
 
 
           CHIP:DMG: InvokeResponseMessage =
@@ -401,7 +401,7 @@
       PICS: CADMIN.C
       verification: |
           1. On third controller, using chip-tool connect to the accessory. Connect attempt should fail, i.e
-          ./chip-tool pairing onnetwork 3 20202021
+          ./chip-tool pairing onnetwork 3 20202021 --commissioner-name gamma
 
           verify you got the following message in the TH log
 
@@ -418,7 +418,7 @@
           On second controller, write attribute and read attribute to and from TH_CE
 
           Below is the example while using chip tool on second controller,
-          ./chip-tool basic write node-label te5new 2 0
+          ./chip-tool basic write node-label te5new 2 0 --commissioner-name beta
 
           CHIP:DMG: WriteResponseMessage =
           [1649245940.788522][10110:10115] CHIP:DMG: {
@@ -447,7 +447,7 @@
           [1649245940.790167][10110:10115] CHIP:DMG: WriteClient moving to [AwaitingDe]
 
           Verify read attribute returns the updated value written
-          ./chip-tool basic read node-label 2 0
+          ./chip-tool basic read node-label 2 0 --commissioner-name beta
           CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0028 Attribute 0x0000_0005 DataVersion: 3061847068
           [1649245950.006849][10116:10121] CHIP:TOO:   NodeLabel: te5new
           [1649245950.007024][10116:10121] CHIP:EM: Sending Standalone Ack for MessageCounter:12495101 on exchange 24816i
@@ -461,7 +461,7 @@
           On second controller using chip-tool open commissioning widow using BCM.
 
           Below is the example while using chip tool on second controller,
-          ./chip-tool administratorcommissioning open-basic-commissioning-window 180 2 0 --timedInteractionTimeoutMs 1000
+          ./chip-tool administratorcommissioning open-basic-commissioning-window 180 2 0 --timedInteractionTimeoutMs 1000 --commissioner-name beta
 
 
           CHIP:DMG: InvokeResponseMessage =
@@ -511,7 +511,7 @@
           On second controller using chip-tool open commissioning widow using BCM.
 
           Below is the example while using chip tool on second controller,
-          ./chip-tool administratorcommissioning open-basic-commissioning-window 500 2 0 --timedInteractionTimeoutMs 1000
+          ./chip-tool administratorcommissioning open-basic-commissioning-window 500 2 0 --timedInteractionTimeoutMs 1000 --commissioner-name beta
 
 
           CHIP:DMG: InvokeResponseMessage =
diff --git a/src/app/tests/suites/certification/Test_TC_CADMIN_1_7.yaml b/src/app/tests/suites/certification/Test_TC_CADMIN_1_7.yaml
index d110113..c8371b5 100644
--- a/src/app/tests/suites/certification/Test_TC_CADMIN_1_7.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CADMIN_1_7.yaml
@@ -98,7 +98,7 @@
 
 
           Below is the example when using chip tool as controller (considering 36366524220 as the manual code generated by DUT controller)
-          ./chip-tool pairing code 2 36366524220
+          ./chip-tool pairing code 2 36366524220 --commissioner-name beta
 
           verify you got the following message in the TH log
           CHIP:SC: PASESession timed out while waiting for a response from the peer. Expected message type was 33
@@ -116,7 +116,7 @@
 
           Below is the example while using chip tool as controller,
 
-          ./chip-tool pairing open-commissioning-window 2 1 300 1000 3840
+          ./chip-tool pairing open-commissioning-window 2 1 300 1000 3840 --commissioner-name beta
 
           [1635871058.908790][4273:4278] CHIP:SC: Success status report received. Session was established
           [1635871058.908827][4273:4278] CHIP:IN: New secure session created for device 0x0000000000000001, key 47!!
@@ -180,7 +180,7 @@
 
 
           Below is the example when using chip tool as controller (considering 34921141778 as the manual code generated by DUT controller)
-          ./chip-tool pairing code 2 34921141778
+          ./chip-tool pairing code 2 34921141778 --commissioner-name beta
 
           verify you got the following message in the TH log
           CHIP:SC: PASESession timed out while waiting for a response from the peer. Expected message type was 33
@@ -306,7 +306,7 @@
 
 
           Below is the example when using chip tool as controller (considering 35256543344 as the manual code generated by DUT controller)
-          ./chip-tool pairing code 2 35256543344
+          ./chip-tool pairing code 2 35256543344 --commissioner-name beta
 
           Verify you got below message
           Device commissioning completed with success
@@ -319,7 +319,7 @@
 
 
           Below is the example when using chip tool as controller (considering 35256543344 as the manual code generated by DUT controller)
-          ./chip-tool pairing code 3 35256543344
+          ./chip-tool pairing code 3 35256543344 --commissioner-name gamma
 
           verify you got the following message in the TH log
           CHIP:SC: PASESession timed out while waiting for a response from the peer. Expected message type was 33
diff --git a/src/app/tests/suites/certification/Test_TC_CADMIN_1_8.yaml b/src/app/tests/suites/certification/Test_TC_CADMIN_1_8.yaml
index f82ed5c..eea76fb 100644
--- a/src/app/tests/suites/certification/Test_TC_CADMIN_1_8.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CADMIN_1_8.yaml
@@ -116,7 +116,7 @@
       verification: |
           On the 2nd controller using chip-tool , connect to the accessory
 
-          ./chip-tool pairing onnetwork 2 20202021
+          ./chip-tool pairing onnetwork 2 20202021 --commissioner-name beta
 
           verify you got the following message in the TH log
           CHIP:SC: PASESession timed out while waiting for a response from the peer. Expected message type was 33
@@ -216,7 +216,7 @@
       verification: |
           On the 2nd controller using chip-tool , connect to the accessory
 
-          ./chip-tool pairing onnetwork 2 20202021
+          ./chip-tool pairing onnetwork 2 20202021 --commissioner-name beta
 
           verify you got the following message in the TH log
           CHIP:SC: PASESession timed out while waiting for a response from the peer. Expected message type was 33
@@ -362,7 +362,7 @@
       verification: |
           On the 2nd controller using chip-tool , connect to the accessory
 
-          ./chip-tool pairing onnetwork 2 20202021
+          ./chip-tool pairing onnetwork 2 20202021 --commissioner-name beta
 
           Verify you got below message
           Device commissioning completed with success
@@ -373,7 +373,7 @@
       verification: |
           On the 3rd controller using chip-tool , connect to the accessory
 
-          ./chip-tool pairing onnetwork 3 20202021
+          ./chip-tool pairing onnetwork 3 20202021 --commissioner-name gamma
 
           verify you got the following message in the TH log
           CHIP:SC: PASESession timed out while waiting for a response from the peer. Expected message type was 33
diff --git a/src/app/tests/suites/certification/Test_TC_CC_2_2.yaml b/src/app/tests/suites/certification/Test_TC_CC_2_2.yaml
index 8ed35a0..1633c8b 100644
--- a/src/app/tests/suites/certification/Test_TC_CC_2_2.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CC_2_2.yaml
@@ -39,7 +39,7 @@
       verification: |
           ./chip-tool colorcontrol read current-hue 1 1
 
-          Verify on TH(all-clusters-app) log:
+          Verify response contains an uint8 in  TH(all-clusters-app)  Logs:
 
           [1657908705.581609][2861:2861] CHIP:IM: Received Read request
           [1657908705.581752][2861:2861] CHIP:DMG: ReadRequestMessage =
@@ -72,7 +72,7 @@
       verification: |
           ./chip-tool colorcontrol read current-saturation 1 1
 
-          Verify on TH(all-clusters-app) log:
+          Verify response contains an uint8 in  TH(all-clusters-app)  Logs:
 
           [1657908593.710273][2861:2861] CHIP:IM: Received Read request
           [1657908593.710359][2861:2861] CHIP:DMG: ReadRequestMessage =
@@ -103,7 +103,7 @@
       verification: |
           ./chip-tool colorcontrol read remaining-time 1 1
 
-          Verify on TH(all-clusters-app) log:
+          Verify response contains an uint16 in  TH(all-clusters-app)  Logs:
 
           [1657908803.102070][2933:2933] CHIP:IM: Received Read request
           [1657908803.102154][2933:2933] CHIP:DMG: ReadRequestMessage =
@@ -136,7 +136,7 @@
       verification: |
           ./chip-tool colorcontrol read current-x 1 1
 
-          Verify on TH(all-clusters-app)  log:
+          Verify response contains an uint16 in  TH(all-clusters-app)  Logs:
 
           [1657908856.780574][2933:2933] CHIP:IM: Received Read request
           [1657908856.780702][2933:2933] CHIP:DMG: ReadRequestMessage =
@@ -169,7 +169,8 @@
       verification: |
           ./chip-tool colorcontrol read current-y 1 1
 
-          Verify on TH(all-clusters-app) log:
+          Verify response contains an uint16 in  TH(all-clusters-app)  Logs:
+
 
           [1657909305.413625][2933:2933] CHIP:IM: Received Read request
           [1657909305.413743][2933:2933] CHIP:DMG: ReadRequestMessage =
@@ -204,7 +205,8 @@
       verification: |
           ./chip-tool colorcontrol read drift-compensation 1 1
 
-          Verify on TH(all-clusters-app) log:
+          Verify response contains an enum8 in  TH(all-clusters-app)  Logs:
+
 
           [1657909433.948649][2933:2933] CHIP:IM: Received Read request
           [1657909433.948766][2933:2933] CHIP:DMG: ReadRequestMessage =
@@ -239,7 +241,9 @@
       verification: |
           ./chip-tool colorcontrol read compensation-text 1 1
 
-          Verify on TH(all-clusters-app) log:
+
+          Verify response contains a string in  TH(all-clusters-app)  Logs:
+
 
           [1657909470.827379][2933:2933] CHIP:IM: Received Read request
           [1657909470.827505][2933:2933] CHIP:DMG: ReadRequestMessage =
@@ -273,7 +277,8 @@
       verification: |
           ./chip-tool colorcontrol read color-temperature 1 1
 
-          Verify on TH(all-clusters-app) log:
+          Verify response contains an uint16 in  TH(all-clusters-app)  Logs:
+
 
           [1657909522.420348][2977:2977] CHIP:IM: Received Read request
           [1657909522.420471][2977:2977] CHIP:DMG: ReadRequestMessage =
@@ -306,7 +311,9 @@
       verification: |
           ./chip-tool colorcontrol read color-mode 1 1
 
-          Verify on TH(all-clusters-app) log:
+
+          Verify response contains an enum8 in  TH(all-clusters-app)  Logs:
+
 
           [1657909555.028998][2977:2977] CHIP:IM: Received Read request
           [1657909555.029124][2977:2977] CHIP:DMG: ReadRequestMessage =
@@ -339,7 +346,9 @@
       verification: |
           ./chip-tool colorcontrol read options 1 1
 
-          Verify on TH(all-clusters-app) log:
+
+          Verify response contains an bitmap8 in  TH(all-clusters-app)  Logs:
+
 
           [1657909576.774655][2977:2977] CHIP:IM: Received Read request
           [1657909576.774796][2977:2977] CHIP:DMG: ReadRequestMessage =
@@ -372,7 +381,8 @@
       verification: |
           ./chip-tool colorcontrol read enhanced-current-hue 1 1
 
-          Verify on TH(all-clusters-app) log:
+          Verify response contains an uint16 in  TH(all-clusters-app)  Logs:
+
 
           [1657909627.086489][2977:2977] CHIP:IM: Received Read request
           [1657909627.086602][2977:2977] CHIP:DMG: ReadRequestMessage =
@@ -405,7 +415,9 @@
       verification: |
           ./chip-tool colorcontrol read enhanced-color-mode 1 1
 
-          Verify on TH(all-clusters-app) log:
+
+          Verify response contains an enum8 in  TH(all-clusters-app)  Logs:
+
 
           [1657909652.217887][2977:2977] CHIP:IM: Received Read request
           [1657909652.218015][2977:2977] CHIP:DMG: ReadRequestMessage =
@@ -438,7 +450,9 @@
       verification: |
           ./chip-tool colorcontrol read color-loop-active 1 1
 
-          Verify on TH(all-clusters-app) log:
+
+          Verify response contains an uint8 in  TH(all-clusters-app)  Logs:
+
 
           [1657909711.352753][2977:2977] CHIP:IM: Received Read request
           [1657909711.352915][2977:2977] CHIP:DMG: ReadRequestMessage =
@@ -471,7 +485,7 @@
       verification: |
           ./chip-tool colorcontrol read color-loop-direction 1 1
 
-          Verify on TH(all-clusters-app) log:
+          Verify response contains an uint8 in  TH(all-clusters-app)  Logs:
 
           [1657909741.232136][2977:2977] CHIP:IM: Received Read request
           [1657909741.232261][2977:2977] CHIP:DMG: ReadRequestMessage =
@@ -504,7 +518,8 @@
       verification: |
           ./chip-tool colorcontrol read color-loop-time 1 1
 
-          Verify on TH(all-clusters-app) log:
+
+          Verify response contains an uint16 in  TH(all-clusters-app)  Logs:
 
           [1657909771.649273][2977:2977] CHIP:IM: Received Read request
           [1657909771.649413][2977:2977] CHIP:DMG: ReadRequestMessage =
@@ -539,7 +554,9 @@
       verification: |
           ./chip-tool colorcontrol read color-loop-start-enhanced-hue 1 1
 
-          Verify on TH(all-clusters-app) log:
+
+          Verify response contains an uint16 in  TH(all-clusters-app)  Logs:
+
 
           [1657909997.529812][2977:2977] CHIP:IM: Received Read request
           [1657909997.530002][2977:2977] CHIP:DMG: ReadRequestMessage =
@@ -574,7 +591,9 @@
       verification: |
           ./chip-tool colorcontrol read color-loop-stored-enhanced-hue 1 1
 
-          Verify on TH(all-clusters-app) log:
+
+          Verify response contains an uint16 in  TH(all-clusters-app)  Logs:
+
 
           [1657910020.977065][2977:2977] CHIP:IM: Received Read request
           [1657910020.977155][2977:2977] CHIP:DMG: ReadRequestMessage =
@@ -607,7 +626,9 @@
       verification: |
           ./chip-tool colorcontrol read color-capabilities 1 1
 
-          Verify on TH(all-clusters-app) log:
+
+          Verify response contains an map16 in  TH(all-clusters-app)  Logs:
+
 
           [1657910072.897195][2977:2977] CHIP:IM: Received Read request
           [1657910072.897323][2977:2977] CHIP:DMG: ReadRequestMessage =
@@ -642,7 +663,9 @@
       verification: |
           ./chip-tool colorcontrol read color-temp-physical-min-mireds  1 1
 
-          Verify on TH(all-clusters-app) log:
+
+          Verify response contains an uint16 in  TH(all-clusters-app)  Logs:
+
 
           [1657910109.902989][2977:2977] CHIP:IM: Received Read request
           [1657910109.903095][2977:2977] CHIP:DMG: ReadRequestMessage =
@@ -677,7 +700,9 @@
       verification: |
           ./chip-tool colorcontrol read color-temp-physical-max-mireds 1 1
 
-          Verify on TH(all-clusters-app) log:
+
+          Verify response contains an uint16 in  TH(all-clusters-app)  Logs:
+
 
           [1657910176.514563][2977:2977] CHIP:IM: Received Read request
           [1657910176.514690][2977:2977] CHIP:DMG: ReadRequestMessage =
@@ -712,7 +737,9 @@
       verification: |
           ./chip-tool colorcontrol read couple-color-temp-to-level-min-mireds 1 1
 
-          Verify on TH(all-clusters-app) log:
+
+          Verify response contains an uint16 in  TH(all-clusters-app)  Logs:
+
 
           [1657910205.278279][2977:2977] CHIP:IM: Received Read request
           [1657910205.278421][2977:2977] CHIP:DMG: ReadRequestMessage =
@@ -747,7 +774,8 @@
       verification: |
           ./chip-tool colorcontrol read start-up-color-temperature-mireds 1 1
 
-          Verify on TH(all-clusters-app) log:
+          Verify response contains an uint16 in  TH(all-clusters-app)  Logs:
+
 
           [1657910246.097315][2977:2977] CHIP:IM: Received Read request
           [1657910246.097460][2977:2977] CHIP:DMG: ReadRequestMessage =
@@ -780,7 +808,8 @@
       verification: |
           ./chip-tool colorcontrol read number-of-primaries 1 1
 
-          Verify on TH(all-clusters-app) log:
+          Verify response contains an uint8 in  TH(all-clusters-app)  Logs:
+
 
           [1657910445.890552][2977:2977] CHIP:IM: Received Read request
           [1657910445.890635][2977:2977] CHIP:DMG: ReadRequestMessage =
@@ -813,7 +842,9 @@
       verification: |
           ./chip-tool colorcontrol read  primary1x 1 1
 
-          Verify on TH(all-clusters-app) log:
+
+          Verify response contains an uint16 in  TH(all-clusters-app)  Logs:
+
 
           [1657910568.808716][2977:2977] CHIP:IM: Received Read request
           [1657910568.808876][2977:2977] CHIP:DMG: ReadRequestMessage =
@@ -846,7 +877,9 @@
       verification: |
           ./chip-tool colorcontrol read  primary1y 1 1
 
-          Verify on TH(all-clusters-app) log:
+
+          Verify response contains an uint16 in  TH(all-clusters-app)  Logs:
+
 
           [1657910588.961223][2977:2977] CHIP:IM: Received Read request
           [1657910588.961366][2977:2977] CHIP:DMG: ReadRequestMessage =
@@ -879,7 +912,9 @@
       verification: |
           ./chip-tool colorcontrol read primary1intensity 1 1
 
-          Verify on TH(all-clusters-app) log:
+
+          Verify response contains an uint8 in  TH(all-clusters-app)  Logs:
+
 
           [1657910622.925613][2977:2977] CHIP:IM: Received Read request
           [1657910622.925739][2977:2977] CHIP:DMG: ReadRequestMessage =
@@ -912,7 +947,9 @@
       verification: |
           ./chip-tool colorcontrol read primary2x 1 1
 
-          Verify on TH(all-clusters-app) log:
+
+          Verify response contains an uint16 in  TH(all-clusters-app)  Logs:
+
 
           [1657910659.885682][2977:2977] CHIP:IM: Received Read request
           [1657910659.885821][2977:2977] CHIP:DMG: ReadRequestMessage =
@@ -945,7 +982,9 @@
       verification: |
           ./chip-tool colorcontrol read primary2y 1 1
 
-          Verify on TH(all-clusters-app) log:
+
+          Verify response contains an uint16 in  TH(all-clusters-app)  Logs:
+
 
           [1657910687.168648][2977:2977] CHIP:IM: Received Read request
           [1657910687.168754][2977:2977] CHIP:DMG: ReadRequestMessage =
@@ -978,7 +1017,8 @@
       verification: |
           ./chip-tool colorcontrol read primary2intensity 1 1
 
-          Verify on TH(all-clusters-app) log:
+          Verify response contains an uint8 in  TH(all-clusters-app)  Logs:
+
 
           [1657910837.125032][2977:2977] CHIP:IM: Received Read request
           [1657910837.125157][2977:2977] CHIP:DMG: ReadRequestMessage =
@@ -1011,7 +1051,8 @@
       verification: |
           ./chip-tool colorcontrol read primary3x 1 1
 
-          Verify on TH(all-clusters-app) log:
+          Verify response contains an uint16 in  TH(all-clusters-app)  Logs:
+
           CHIP:IM: Received Read request
           CHIP:DMG: ReadRequestMessage =
           CHIP:DMG: {
@@ -1036,7 +1077,8 @@
       verification: |
           ./chip-tool colorcontrol read primary3y 1 1
 
-          Verify on TH(all-clusters-app) log:
+          Verify response contains an uint16 in  TH(all-clusters-app)  Logs:
+
 
           CHIP:IM: Received Read request
           CHIP:DMG: ReadRequestMessage =
@@ -1062,7 +1104,7 @@
       verification: |
           ./chip-tool colorcontrol read primary3intensity 1 1
 
-          Verify on TH(all-clusters-app) log:
+          Verify response contains an uint8 in  TH(all-clusters-app)  Logs:
 
           CHIP:IM: Received Read request
           CHIP:DMG: ReadRequestMessage =
@@ -1088,7 +1130,9 @@
       verification: |
           ./chip-tool colorcontrol read primary4x 1 1
 
-          Verify on TH(all-clusters-app) log:
+
+          Verify response contains an uint16 in  TH(all-clusters-app)  Logs:
+
 
           CHIP:IM: Received Read request
           CHIP:DMG: ReadRequestMessage =
@@ -1114,7 +1158,9 @@
       verification: |
           ./chip-tool colorcontrol read primary4y 1 1
 
-          Verify on TH(all-clusters-app) log:
+
+          Verify response contains an uint16 in  TH(all-clusters-app)  Logs:
+
 
           CHIP:IM: Received Read request
           CHIP:DMG: ReadRequestMessage =
@@ -1140,7 +1186,8 @@
       verification: |
           ./chip-tool colorcontrol read primary4intensity 1 1
 
-          Verify on TH(all-clusters-app) log:
+          Verify response contains an uint8 in  TH(all-clusters-app)  Logs:
+
 
           CHIP:IM: Received Read request
           CHIP:DMG: ReadRequestMessage =
@@ -1166,7 +1213,7 @@
       verification: |
           ./chip-tool colorcontrol read primary5x 1 1
 
-          Verify on TH(all-clusters-app) log:
+          Verify response contains an uint16 in  TH(all-clusters-app)  Logs:
 
           CHIP:IM: Received Read request
           CHIP:DMG: ReadRequestMessage =
@@ -1192,7 +1239,8 @@
       verification: |
           ./chip-tool colorcontrol read primary5y 1 1
 
-          Verify on TH(all-clusters-app) log:
+          Verify response contains an uint16 in  TH(all-clusters-app)  Logs:
+
 
           CHIP:IM: Received Read request
           CHIP:DMG: ReadRequestMessage =
@@ -1218,7 +1266,9 @@
       verification: |
           ./chip-tool colorcontrol read primary5intensity 1 1
 
-          Verify on TH(all-clusters-app) log:
+
+          Verify response contains an uint8 in  TH(all-clusters-app)  Logs:
+
 
           CHIP:IM: Received Read request
           CHIP:DMG: ReadRequestMessage =
@@ -1244,7 +1294,8 @@
       verification: |
           ./chip-tool colorcontrol read primary6x 1 1
 
-          Verify on TH(all-clusters-app) log:
+          Verify response contains an uint16 in  TH(all-clusters-app)  Logs:
+
 
           CHIP:IM: Received Read request
           CHIP:DMG: ReadRequestMessage =
@@ -1270,7 +1321,8 @@
       verification: |
           ./chip-tool colorcontrol read primary6y 1 1
 
-          Verify on TH(all-clusters-app) log:
+          Verify response contains an uint16 in  TH(all-clusters-app)  Logs:
+
 
           CHIP:IM: Received Read request
           CHIP:DMG: ReadRequestMessage =
@@ -1296,7 +1348,9 @@
       verification: |
           ./chip-tool colorcontrol read primary6intensity 1 1
 
-          Verify on TH(all-clusters-app) log:
+
+          Verify response contains an uint8 in  TH(all-clusters-app)  Logs:
+
 
           CHIP:IM: Received Read request
           CHIP:DMG: ReadRequestMessage =
@@ -1322,7 +1376,9 @@
       verification: |
           ./chip-tool colorcontrol read white-point-x   1 1
 
-          Verify on TH(all-clusters-app) log:
+
+          Verify response contains an uint16 in  TH(all-clusters-app)  Logs:
+
 
           CHIP:IM: Received Read request
           CHIP:DMG: ReadRequestMessage =
@@ -1348,7 +1404,8 @@
       verification: |
           ./chip-tool colorcontrol read white-point-y 1 1
 
-          Verify on TH(all-clusters-app) log:
+          Verify response contains an uint16 in  TH(all-clusters-app)  Logs:
+
 
           CHIP:IM: Received Read request
           CHIP:DMG: ReadRequestMessage =
@@ -1375,7 +1432,9 @@
       verification: |
           ./chip-tool colorcontrol read color-point-rx   1 1
 
-          Verify on TH(all-clusters-app) log:
+
+          Verify response contains an uint16 in  TH(all-clusters-app)  Logs:
+
 
           CHIP:IM: Received Read request
           CHIP:DMG: ReadRequestMessage =
@@ -1402,7 +1461,9 @@
       verification: |
           ./chip-tool colorcontrol read color-point-ry   1 1
 
-          Verify on TH(all-clusters-app) log:
+
+          Verify response contains an uint16 in  TH(all-clusters-app)  Logs:
+
 
           CHIP:IM: Received Read request
           CHIP:DMG: ReadRequestMessage =
@@ -1430,7 +1491,9 @@
       verification: |
           ./chip-tool colorcontrol read color-point-rintensity   1 1
 
-          Verify on TH(all-clusters-app) log:
+
+          Verify response contains an uint8 in  TH(all-clusters-app)  Logs:
+
 
           CHIP:IM: Received Read request
           CHIP:DMG: ReadRequestMessage =
@@ -1457,7 +1520,9 @@
       verification: |
           ./chip-tool colorcontrol read color-point-gx   1 1
 
-          Verify on TH(all-clusters-app) log:
+
+          Verify response contains an uint16 in  TH(all-clusters-app)  Logs:
+
 
           CHIP:IM: Received Read request
           CHIP:DMG: ReadRequestMessage =
@@ -1484,7 +1549,9 @@
       verification: |
           ./chip-tool colorcontrol read color-point-gy   1 1
 
-          Verify on TH(all-clusters-app) log:
+
+          Verify response contains an uint16 in  TH(all-clusters-app)  Logs:
+
 
           CHIP:IM: Received Read request
           CHIP:DMG: ReadRequestMessage =
@@ -1512,7 +1579,9 @@
       verification: |
           ./chip-tool colorcontrol read color-point-gintensity   1 1
 
-          Verify on TH(all-clusters-app) log:
+
+          Verify response contains an uint8 in  TH(all-clusters-app)  Logs:
+
 
           CHIP:IM: Received Read request
           CHIP:DMG: ReadRequestMessage =
@@ -1539,7 +1608,9 @@
       verification: |
           ./chip-tool colorcontrol read color-point-bx   1 1
 
-          Verify on TH(all-clusters-app) log:
+
+          Verify response contains an uint16 in  TH(all-clusters-app)  Logs:
+
 
           CHIP:IM: Received Read request
           CHIP:DMG: ReadRequestMessage =
@@ -1566,7 +1637,9 @@
       verification: |
           ./chip-tool colorcontrol read color-point-by   1 1
 
-          Verify on TH(all-clusters-app) log:
+
+          Verify response contains an uint16 in  TH(all-clusters-app)  Logs:
+
 
           CHIP:IM: Received Read request
           CHIP:DMG: ReadRequestMessage =
@@ -1594,7 +1667,9 @@
       verification: |
           ./chip-tool colorcontrol read color-point-bintensity   1 1
 
-          Verify on TH(all-clusters-app) log:
+
+          Verify response contains an uint8 in  TH(all-clusters-app)  Logs:
+
 
           CHIP:IM: Received Read request
           CHIP:DMG: ReadRequestMessage =
diff --git a/src/app/tests/suites/certification/Test_TC_CC_3_4.yaml b/src/app/tests/suites/certification/Test_TC_CC_3_4.yaml
index 3882463..eddc654 100644
--- a/src/app/tests/suites/certification/Test_TC_CC_3_4.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CC_3_4.yaml
@@ -34,7 +34,7 @@
       verification: |
           ./chip-tool colorcontrol move-to-hue 1 0 300 0 0 1 1
 
-          Verify on TH(all-clusters-app) Log
+          Verify success response in TH(all-clusters-app) Log:
 
           [1657911287.814194][2977:2977] CHIP:DMG: InvokeRequestMessage =
           [1657911287.814246][2977:2977] CHIP:DMG: {
@@ -76,8 +76,7 @@
       verification: |
           ./chip-tool colorcontrol read current-hue 1  1
 
-          Verify on TH(all-clusters-app) Log
-
+          Verify response contains a CurrentHue value in  TH(all-clusters-app)  Logs:
           [1657911327.184763][2977:2977] CHIP:IM: Received Read request
           [1657911327.184901][2977:2977] CHIP:DMG: ReadRequestMessage =
           [1657911327.184952][2977:2977] CHIP:DMG: {
@@ -109,7 +108,7 @@
       verification: |
           ./chip-tool colorcontrol move-hue 1 10 0 0 1 1
 
-          Verify on TH(all-clusters-app) log
+          Verify success response in TH(all-clusters-app) Log:
 
           [1657911357.567908][2977:2977] CHIP:DMG: InvokeRequestMessage =
           [1657911357.567957][2977:2977] CHIP:DMG: {
@@ -149,7 +148,8 @@
       verification: |
           ./chip-tool colorcontrol read current-hue 1  1
 
-          Verify on TH(all-clusters-app) log
+
+          Verify response contains a CurrentHue value in  TH(all-clusters-app)  Logs:
 
           [1657911381.312873][2977:2977] CHIP:IM: Received Read request
           [1657911381.312995][2977:2977] CHIP:DMG: ReadRequestMessage =
@@ -182,7 +182,8 @@
       verification: |
           ./chip-tool colorcontrol step-hue 1 10 200 0 0 1 1
 
-          Verify on TH(all-clusters-app) log
+
+          Verify success response in TH(all-clusters-app) Log:
 
           [1657911412.480684][2977:2977] CHIP:DMG: InvokeRequestMessage =
           [1657911412.480741][2977:2977] CHIP:DMG: {
@@ -223,7 +224,8 @@
       PICS: CC.C.C02.Rsp && CC.C.A0000
       verification: |
           ./chip-tool colorcontrol read current-hue 1  1
-          Verify on TH(all-clusters-app) Log
+
+          Verify response contains a CurrentHue value in  TH(all-clusters-app)  Logs:
 
           [1657911437.116353][2977:2977] CHIP:IM: Received Read request
           [1657911437.116480][2977:2977] CHIP:DMG: ReadRequestMessage =
@@ -255,7 +257,8 @@
       PICS: CC.C.C47.Rsp
       verification: |
           ./chip-tool colorcontrol stop-move-step 0 0 1 1
-          Verify on TH(all-clusters-app) log
+
+          Verify success response in TH(all-clusters-app) Log:
 
           [1657911457.334435][2977:2977] CHIP:DMG: InvokeRequestMessage =
           [1657911457.334464][2977:2977] CHIP:DMG: {
@@ -292,8 +295,8 @@
       PICS: CC.C.C47.Rsp && CC.C.A0000
       verification: |
           ./chip-tool colorcontrol read current-hue 1  1
-          Verify on TH(all-clusters-app) Log
 
+          Verify response contains a CurrentHue value in  TH(all-clusters-app)  Logs:
           [1657911437.116353][2977:2977] CHIP:IM: Received Read request
           [1657911437.116480][2977:2977] CHIP:DMG: ReadRequestMessage =
           [1657911437.116528][2977:2977] CHIP:DMG: {
diff --git a/src/app/tests/suites/certification/Test_TC_CC_5_4.yaml b/src/app/tests/suites/certification/Test_TC_CC_5_4.yaml
index 0dc2c4a..f9b24fd 100644
--- a/src/app/tests/suites/certification/Test_TC_CC_5_4.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CC_5_4.yaml
@@ -34,7 +34,8 @@
       verification: |
           ./chip-tool colorcontrol move-to-color 400 500 300 0 0 1 1
 
-          Verify in TH(all-clusters-app) log:
+          Verify success response in TH(all-clusters-app) Log:
+
           [1657911753.687856][2977:2977] CHIP:DMG: InvokeRequestMessage =
           [1657911753.687913][2977:2977] CHIP:DMG: {
           [1657911753.687961][2977:2977] CHIP:DMG:        suppressResponse = false,
@@ -76,7 +77,7 @@
       verification: |
           ./chip-tool colorcontrol read current-x 1 1
 
-          Verify in TH(all-clusters-app) log:
+          Verify response contains a CurrentX value in  TH(all-clusters-app)  Logs:
           [1657911771.965429][2977:2977] CHIP:IM: Received Read request
           [1657911771.965509][2977:2977] CHIP:DMG: ReadRequestMessage =
           [1657911771.965536][2977:2977] CHIP:DMG: {
@@ -104,8 +105,7 @@
 
 
           "./chip-tool colorcontrol read current-y 1 1
-
-          Verify in TH(all-clusters-app) log:
+          Verify response contains a CurrentY value in  TH(all-clusters-app)  Logs:
           [1657911790.232595][2977:2977] CHIP:IM: Received Read request
           [1657911790.232674][2977:2977] CHIP:DMG: ReadRequestMessage =
           [1657911790.232700][2977:2977] CHIP:DMG: {
@@ -138,8 +138,7 @@
       PICS: CC.C.C08.Rsp
       verification: |
           ./chip-tool colorcontrol move-color 10 20 0 0 1 1
-
-          Verify in TH(all-clusters-app) log:
+          Verify success response in TH(all-clusters-app) Log:
 
           [1657911814.839535][2977:2977] CHIP:DMG: InvokeRequestMessage =
           [1657911814.839586][2977:2977] CHIP:DMG: {
@@ -181,7 +180,7 @@
       verification: |
           ./chip-tool colorcontrol read current-x 1 1
 
-          Verify in TH(all-clusters-app) log:
+          Verify response contains a CurrentX value in  TH(all-clusters-app)  Logs:
           [1657911771.965429][2977:2977] CHIP:IM: Received Read request
           [1657911771.965509][2977:2977] CHIP:DMG: ReadRequestMessage =
           [1657911771.965536][2977:2977] CHIP:DMG: {
@@ -209,8 +208,7 @@
 
 
           "./chip-tool colorcontrol read current-y 1 1
-
-          Verify in TH(all-clusters-app) log:
+          Verify response contains a CurrentY value in  TH(all-clusters-app)  Logs:
           [1657911790.232595][2977:2977] CHIP:IM: Received Read request
           [1657911790.232674][2977:2977] CHIP:DMG: ReadRequestMessage =
           [1657911790.232700][2977:2977] CHIP:DMG: {
@@ -244,7 +242,7 @@
       verification: |
           ./chip-tool colorcontrol step-color 100 100 200 0 0 1 1
 
-          Verify in TH(all-clusters-app) log:
+          Verify success response in TH(all-clusters-app) Log:
           [1657911853.249758][2977:2977] CHIP:DMG: InvokeRequestMessage =
           [1657911853.249810][2977:2977] CHIP:DMG: {
           [1657911853.249851][2977:2977] CHIP:DMG:        suppressResponse = false,
@@ -286,7 +284,8 @@
       verification: |
           ./chip-tool colorcontrol read current-x 1 1
 
-          Verify in TH(all-clusters-app) log:
+
+          Verify response contains a CurrentX value in  TH(all-clusters-app)  Logs:
           [1657911771.965429][2977:2977] CHIP:IM: Received Read request
           [1657911771.965509][2977:2977] CHIP:DMG: ReadRequestMessage =
           [1657911771.965536][2977:2977] CHIP:DMG: {
@@ -315,7 +314,7 @@
 
           "./chip-tool colorcontrol read current-y 1 1
 
-          Verify in TH(all-clusters-app) log:
+          Verify response contains a CurrentY value in  TH(all-clusters-app)  Logs:
           [1657911790.232595][2977:2977] CHIP:IM: Received Read request
           [1657911790.232674][2977:2977] CHIP:DMG: ReadRequestMessage =
           [1657911790.232700][2977:2977] CHIP:DMG: {
@@ -349,7 +348,7 @@
       verification: |
           ./chip-tool colorcontrol stop-move-step 0 0 1 1
 
-          Verify in TH(all-clusters-app) log:
+          Verify success response in TH(all-clusters-app) Log:
 
           [1657911876.005800][2977:2977] CHIP:DMG: InvokeRequestMessage =
           [1657911876.005828][2977:2977] CHIP:DMG: {
@@ -389,7 +388,7 @@
       verification: |
           ./chip-tool colorcontrol read current-x 1 1
 
-          Verify in TH(all-clusters-app) log:
+          Verify response contains a CurrentX value in  TH(all-clusters-app)  Logs:
           [1657911771.965429][2977:2977] CHIP:IM: Received Read request
           [1657911771.965509][2977:2977] CHIP:DMG: ReadRequestMessage =
           [1657911771.965536][2977:2977] CHIP:DMG: {
@@ -418,7 +417,7 @@
 
           "./chip-tool colorcontrol read current-y 1 1
 
-          Verify in TH(all-clusters-app) log:
+          Verify response contains a CurrentY value in  TH(all-clusters-app)  Logs:
           [1657911790.232595][2977:2977] CHIP:IM: Received Read request
           [1657911790.232674][2977:2977] CHIP:DMG: ReadRequestMessage =
           [1657911790.232700][2977:2977] CHIP:DMG: {
diff --git a/src/app/tests/suites/certification/Test_TC_CC_6_4.yaml b/src/app/tests/suites/certification/Test_TC_CC_6_4.yaml
index 2075de9..19ec169 100644
--- a/src/app/tests/suites/certification/Test_TC_CC_6_4.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CC_6_4.yaml
@@ -39,7 +39,8 @@
       verification: |
           ./chip-tool colorcontrol read color-temp-physical-min-mireds 1 1
 
-          Verify in TH(all-clusters-app) log:
+
+          Verify response contains an ColorTempPhysicalMinMireds in  TH(all-clusters-app)  Logs:
           [1658215472.478274][3413:3413] CHIP:IM: Received Read request
           [1658215472.478456][3413:3413] CHIP:DMG: ReadRequestMessage =
           [1658215472.478527][3413:3413] CHIP:DMG: {
@@ -67,7 +68,8 @@
 
           ./chip-tool colorcontrol read color-temp-physical-max-mireds 1 1
 
-          Verify in TH(all-clusters-app) log:
+
+          Verify response contains an ColorTempPhysicalMaxMireds in  TH(all-clusters-app)  Logs:
           [1658215497.166720][3413:3413] CHIP:IM: Received Read request
           [1658215497.166886][3413:3413] CHIP:DMG: ReadRequestMessage =
           [1658215497.166949][3413:3413] CHIP:DMG: {
@@ -98,7 +100,8 @@
       verification: |
           ./chip-tool colorcontrol move-to-color-temperature 150 300 0 0 1 1
 
-          Verify in TH(all-clusters-app) log:
+
+          Verify response contains an ColorTemperatureMireds in  TH(all-clusters-app)  Logs:
           [1657911906.102478][2977:2977] CHIP:DMG: InvokeRequestMessage =
           [1657911906.102603][2977:2977] CHIP:DMG: {
           [1657911906.102633][2977:2977] CHIP:DMG:        suppressResponse = false,
@@ -139,22 +142,23 @@
       verification: |
           ./chip-tool colorcontrol read color-temperature 1 1
 
-          Verify in TH(all-clusters-app) log:
+
+          Verify response contains an ColorTemperatureMireds in  TH(all-clusters-app)  Logs:
           [1659955633.975562][2718:2718] CHIP:DMG: ReadRequestMessage =
           [1659955633.975617][2718:2718] CHIP:DMG: {
-          [1659955633.975650][2718:2718] CHIP:DMG: 	AttributePathIBs =
-          [1659955633.975689][2718:2718] CHIP:DMG: 	[
-          [1659955633.975738][2718:2718] CHIP:DMG: 		AttributePathIB =
-          [1659955633.975779][2718:2718] CHIP:DMG: 		{
-          [1659955633.975834][2718:2718] CHIP:DMG: 			Endpoint = 0x1,
-          [1659955633.975894][2718:2718] CHIP:DMG: 			Cluster = 0x300,
-          [1659955633.975941][2718:2718] CHIP:DMG: 			Attribute = 0x0000_0007,
-          [1659955633.975998][2718:2718] CHIP:DMG: 		}
+          [1659955633.975650][2718:2718] CHIP:DMG:         AttributePathIBs =
+          [1659955633.975689][2718:2718] CHIP:DMG:         [
+          [1659955633.975738][2718:2718] CHIP:DMG:                 AttributePathIB =
+          [1659955633.975779][2718:2718] CHIP:DMG:                 {
+          [1659955633.975834][2718:2718] CHIP:DMG:                         Endpoint = 0x1,
+          [1659955633.975894][2718:2718] CHIP:DMG:                         Cluster = 0x300,
+          [1659955633.975941][2718:2718] CHIP:DMG:                         Attribute = 0x0000_0007,
+          [1659955633.975998][2718:2718] CHIP:DMG:                 }
           [1659955633.976040][2718:2718] CHIP:DMG:
-          [1659955633.976090][2718:2718] CHIP:DMG: 	],
+          [1659955633.976090][2718:2718] CHIP:DMG:         ],
           [1659955633.976132][2718:2718] CHIP:DMG:
-          [1659955633.976183][2718:2718] CHIP:DMG: 	isFabricFiltered = true,
-          [1659955633.976221][2718:2718] CHIP:DMG: 	InteractionModelRevision = 1
+          [1659955633.976183][2718:2718] CHIP:DMG:         isFabricFiltered = true,
+          [1659955633.976221][2718:2718] CHIP:DMG:         InteractionModelRevision = 1
           [1659955633.976268][2718:2718] CHIP:DMG: },
           [1659955633.976388][2718:2718] CHIP:DMG: IM RH moving to [GeneratingReports]
           [1659955633.976525][2718:2718] CHIP:DMG: Building Reports for ReadHandler with LastReportGeneration = 0 DirtyGeneration = 0
@@ -170,37 +174,39 @@
           ./chip-tool colorcontrol move-color-temperature 1 16319 0 65279 0 0 1 1
 
 
-          Verify in TH(all-clusters-app) log:
+
+
+          Verify response contains an ColorTemperatureMireds in  TH(all-clusters-app)  Logs:
 
           [1659955779.460043][2718:2718] CHIP:DMG: InvokeRequestMessage =
           [1659955779.460071][2718:2718] CHIP:DMG: {
-          [1659955779.460095][2718:2718] CHIP:DMG: 	suppressResponse = false,
-          [1659955779.460122][2718:2718] CHIP:DMG: 	timedRequest = false,
-          [1659955779.460147][2718:2718] CHIP:DMG: 	InvokeRequests =
-          [1659955779.460178][2718:2718] CHIP:DMG: 	[
-          [1659955779.460202][2718:2718] CHIP:DMG: 		CommandDataIB =
-          [1659955779.460230][2718:2718] CHIP:DMG: 		{
-          [1659955779.460263][2718:2718] CHIP:DMG: 			CommandPathIB =
-          [1659955779.460300][2718:2718] CHIP:DMG: 			{
-          [1659955779.460334][2718:2718] CHIP:DMG: 				EndpointId = 0x1,
-          [1659955779.460372][2718:2718] CHIP:DMG: 				ClusterId = 0x300,
-          [1659955779.460409][2718:2718] CHIP:DMG: 				CommandId = 0x4b,
-          [1659955779.460444][2718:2718] CHIP:DMG: 			},
+          [1659955779.460095][2718:2718] CHIP:DMG:         suppressResponse = false,
+          [1659955779.460122][2718:2718] CHIP:DMG:         timedRequest = false,
+          [1659955779.460147][2718:2718] CHIP:DMG:         InvokeRequests =
+          [1659955779.460178][2718:2718] CHIP:DMG:         [
+          [1659955779.460202][2718:2718] CHIP:DMG:                 CommandDataIB =
+          [1659955779.460230][2718:2718] CHIP:DMG:                 {
+          [1659955779.460263][2718:2718] CHIP:DMG:                         CommandPathIB =
+          [1659955779.460300][2718:2718] CHIP:DMG:                         {
+          [1659955779.460334][2718:2718] CHIP:DMG:                                 EndpointId = 0x1,
+          [1659955779.460372][2718:2718] CHIP:DMG:                                 ClusterId = 0x300,
+          [1659955779.460409][2718:2718] CHIP:DMG:                                 CommandId = 0x4b,
+          [1659955779.460444][2718:2718] CHIP:DMG:                         },
           [1659955779.460477][2718:2718] CHIP:DMG:
-          [1659955779.460504][2718:2718] CHIP:DMG: 			CommandFields =
-          [1659955779.460539][2718:2718] CHIP:DMG: 			{
-          [1659955779.460572][2718:2718] CHIP:DMG: 				0x0 = 1,
-          [1659955779.460608][2718:2718] CHIP:DMG: 				0x1 = 16319,
-          [1659955779.460646][2718:2718] CHIP:DMG: 				0x2 = 0,
-          [1659955779.460683][2718:2718] CHIP:DMG: 				0x3 = 65279,
-          [1659955779.460717][2718:2718] CHIP:DMG: 				0x4 = 0,
-          [1659955779.460755][2718:2718] CHIP:DMG: 				0x5 = 0,
-          [1659955779.460791][2718:2718] CHIP:DMG: 			},
-          [1659955779.460820][2718:2718] CHIP:DMG: 		},
+          [1659955779.460504][2718:2718] CHIP:DMG:                         CommandFields =
+          [1659955779.460539][2718:2718] CHIP:DMG:                         {
+          [1659955779.460572][2718:2718] CHIP:DMG:                                 0x0 = 1,
+          [1659955779.460608][2718:2718] CHIP:DMG:                                 0x1 = 16319,
+          [1659955779.460646][2718:2718] CHIP:DMG:                                 0x2 = 0,
+          [1659955779.460683][2718:2718] CHIP:DMG:                                 0x3 = 65279,
+          [1659955779.460717][2718:2718] CHIP:DMG:                                 0x4 = 0,
+          [1659955779.460755][2718:2718] CHIP:DMG:                                 0x5 = 0,
+          [1659955779.460791][2718:2718] CHIP:DMG:                         },
+          [1659955779.460820][2718:2718] CHIP:DMG:                 },
           [1659955779.460851][2718:2718] CHIP:DMG:
-          [1659955779.460875][2718:2718] CHIP:DMG: 	],
+          [1659955779.460875][2718:2718] CHIP:DMG:         ],
           [1659955779.460907][2718:2718] CHIP:DMG:
-          [1659955779.460931][2718:2718] CHIP:DMG: 	InteractionModelRevision = 1
+          [1659955779.460931][2718:2718] CHIP:DMG:         InteractionModelRevision = 1
           [1659955779.460954][2718:2718] CHIP:DMG: },
           [1659955779.461068][2718:2718] CHIP:DMG: AccessControl: checking f=1 a=c s=0x000000000001B669 t= c=0x0000_0300 e=1 p=o
           [1659955779.461110][2718:2718] CHIP:DMG: AccessControl: allowed
@@ -218,22 +224,24 @@
       verification: |
           ./chip-tool colorcontrol read color-temperature 1 1
 
-          Verify in TH(all-clusters-app) log:
+
+
+          Verify response contains an ColorTemperatureMireds in  TH(all-clusters-app)  Logs:
           [1659955633.975562][2718:2718] CHIP:DMG: ReadRequestMessage =
           [1659955633.975617][2718:2718] CHIP:DMG: {
-          [1659955633.975650][2718:2718] CHIP:DMG: 	AttributePathIBs =
-          [1659955633.975689][2718:2718] CHIP:DMG: 	[
-          [1659955633.975738][2718:2718] CHIP:DMG: 		AttributePathIB =
-          [1659955633.975779][2718:2718] CHIP:DMG: 		{
-          [1659955633.975834][2718:2718] CHIP:DMG: 			Endpoint = 0x1,
-          [1659955633.975894][2718:2718] CHIP:DMG: 			Cluster = 0x300,
-          [1659955633.975941][2718:2718] CHIP:DMG: 			Attribute = 0x0000_0007,
-          [1659955633.975998][2718:2718] CHIP:DMG: 		}
+          [1659955633.975650][2718:2718] CHIP:DMG:         AttributePathIBs =
+          [1659955633.975689][2718:2718] CHIP:DMG:         [
+          [1659955633.975738][2718:2718] CHIP:DMG:                 AttributePathIB =
+          [1659955633.975779][2718:2718] CHIP:DMG:                 {
+          [1659955633.975834][2718:2718] CHIP:DMG:                         Endpoint = 0x1,
+          [1659955633.975894][2718:2718] CHIP:DMG:                         Cluster = 0x300,
+          [1659955633.975941][2718:2718] CHIP:DMG:                         Attribute = 0x0000_0007,
+          [1659955633.975998][2718:2718] CHIP:DMG:                 }
           [1659955633.976040][2718:2718] CHIP:DMG:
-          [1659955633.976090][2718:2718] CHIP:DMG: 	],
+          [1659955633.976090][2718:2718] CHIP:DMG:         ],
           [1659955633.976132][2718:2718] CHIP:DMG:
-          [1659955633.976183][2718:2718] CHIP:DMG: 	isFabricFiltered = true,
-          [1659955633.976221][2718:2718] CHIP:DMG: 	InteractionModelRevision = 1
+          [1659955633.976183][2718:2718] CHIP:DMG:         isFabricFiltered = true,
+          [1659955633.976221][2718:2718] CHIP:DMG:         InteractionModelRevision = 1
           [1659955633.976268][2718:2718] CHIP:DMG: },
           [1659955633.976388][2718:2718] CHIP:DMG: IM RH moving to [GeneratingReports]
           [1659955633.976525][2718:2718] CHIP:DMG: Building Reports for ReadHandler with LastReportGeneration = 0 DirtyGeneration = 0
@@ -248,7 +256,9 @@
       verification: |
           ./chip-tool colorcontrol step-color-temperature 1 32639 200 0 65279 0 0 1 1
 
-          Verify in TH(all-clusters-app) log:
+
+
+          Verify the all fields are within their allowed bounds in CommandFields on  TH(all-clusters-app)  Logs:
 
           [1659955888.144223][2718:2718] CHIP:DMG: InvokeRequestMessage =
           [1659955888.144251][2718:2718] CHIP:DMG: {
@@ -294,11 +304,10 @@
     - label:
           "DUT reads ColorTemperatureMired attribute from TH (potentially
           multiple times)"
-      PICS: CC.C.C4c.Rsp && CC.C.A0007
+      PICS: CC.C.C4c.Rsp & CC.C.A0007
       verification: |
           ./chip-tool colorcontrol read color-temperature 1 1
-
-          Verify in TH(all-clusters-app) log:
+          Verify response contains an ColorTemperatureMireds in  TH(all-clusters-app)  Logs:
           [1659955633.975562][2718:2718] CHIP:DMG: ReadRequestMessage =
           [1659955633.975617][2718:2718] CHIP:DMG: {
           [1659955633.975650][2718:2718] CHIP:DMG:         AttributePathIBs =
@@ -327,7 +336,8 @@
       PICS: CC.C.C47.Rsp
       verification: |
           ./chip-tool colorcontrol stop-move-step 0 0 1 1
-          Verify in TH(all-clusters-app) log:
+
+          Verify the all fields are within their allowed bounds in CommandFields on  TH(all-clusters-app)  Logs:
 
 
           [1659955999.857777][2718:2718] CHIP:DMG: InvokeRequestMessage =
@@ -373,7 +383,7 @@
       verification: |
           ./chip-tool colorcontrol read color-temperature 1 1
 
-          Verify in TH(all-clusters-app) log:
+          Verify response contains an ColorTemperatureMireds in  TH(all-clusters-app)  Logs:
           [1659955633.975562][2718:2718] CHIP:DMG: ReadRequestMessage =
           [1659955633.975617][2718:2718] CHIP:DMG: {
           [1659955633.975650][2718:2718] CHIP:DMG:         AttributePathIBs =
@@ -397,3 +407,13 @@
           [1659955633.976650][2718:2718] CHIP:DMG: AccessControl: checking f=1 a=c s=0x000000000001B669 t= c=0x0000_0300 e=1 p=v
           [1659955633.976696][2718:2718] CHIP:DMG: AccessControl: allowed
       disabled: true
+
+    - label: ""
+      verification: |
+          verification step to be updated.
+      disabled: true
+
+    - label: ""
+      verification: |
+          verification step to be updated.
+      disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_CC_7_5.yaml b/src/app/tests/suites/certification/Test_TC_CC_7_5.yaml
index 9e45d0b..8cccb5a 100644
--- a/src/app/tests/suites/certification/Test_TC_CC_7_5.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CC_7_5.yaml
@@ -34,7 +34,7 @@
       verification: |
           ./chip-tool colorcontrol enhanced-move-to-hue 1000 3 200 0 0 1 1
 
-          Verify in TH(all-clusters-app) log:
+          Verify success response in TH(all-clusters-app) Log:
           [1657912045.703432][2977:2977] CHIP:DMG: InvokeRequestMessage =
           [1657912045.703462][2977:2977] CHIP:DMG: {
           [1657912045.703485][2977:2977] CHIP:DMG:        suppressResponse = false,
@@ -76,7 +76,8 @@
       verification: |
           ./chip-tool colorcontrol read enhanced-current-hue 1 1
 
-          Verify in TH(all-clusters-app) log:
+
+          Verify response contains a EnhancedCurrentHue value in  TH(all-clusters-app)  Logs:
           [1657912064.296156][2977:2977] CHIP:IM: Received Read request
           [1657912064.296261][2977:2977] CHIP:DMG: ReadRequestMessage =
           [1657912064.296295][2977:2977] CHIP:DMG: {
@@ -108,7 +109,8 @@
       verification: |
           ./chip-tool colorcontrol enhanced-move-hue 0 100 0 0 1 1
 
-          Verify in TH(all-clusters-app) log:
+
+          Verify success response in TH(all-clusters-app) Log:
 
           [1657912085.345044][2977:2977] CHIP:DMG: InvokeRequestMessage =
           [1657912085.345072][2977:2977] CHIP:DMG: {
@@ -149,7 +151,7 @@
       verification: |
           ./chip-tool colorcontrol read enhanced-current-hue 1 1
 
-          Verify in TH(all-clusters-app) log:
+          Verify response contains a EnhancedCurrentHue value in  TH(all-clusters-app)  Logs:
           [1657912064.296156][2977:2977] CHIP:IM: Received Read request
           [1657912064.296261][2977:2977] CHIP:DMG: ReadRequestMessage =
           [1657912064.296295][2977:2977] CHIP:DMG: {
@@ -181,7 +183,7 @@
       verification: |
           ./chip-tool colorcontrol enhanced-step-hue 1 1000 200 0 0 1 1
 
-          Verify in TH(all-clusters-app) log:
+          Verify success response in TH(all-clusters-app) Log:
           [1657912123.677693][2977:2977] CHIP:DMG: InvokeRequestMessage =
           [1657912123.677720][2977:2977] CHIP:DMG: {
           [1657912123.677742][2977:2977] CHIP:DMG:        suppressResponse = false,
@@ -223,7 +225,7 @@
       verification: |
           ./chip-tool colorcontrol read enhanced-current-hue 1 1
 
-          Verify in TH(all-clusters-app) log:
+          Verify response contains a EnhancedCurrentHue value in  TH(all-clusters-app)  Logs:
           [1657912064.296156][2977:2977] CHIP:IM: Received Read request
           [1657912064.296261][2977:2977] CHIP:DMG: ReadRequestMessage =
           [1657912064.296295][2977:2977] CHIP:DMG: {
@@ -255,7 +257,8 @@
       verification: |
           ./chip-tool colorcontrol enhanced-move-to-hue-and-saturation 2500 100 200 0 0 1 1
 
-          Verify in TH(all-clusters-app) log:
+
+          Verify success response in TH(all-clusters-app) Log:
           [1657912153.500024][2977:2977] CHIP:DMG: InvokeRequestMessage =
           [1657912153.500080][2977:2977] CHIP:DMG: {
           [1657912153.500108][2977:2977] CHIP:DMG:        suppressResponse = false,
@@ -297,7 +300,8 @@
       verification: |
           ./chip-tool colorcontrol read enhanced-current-hue 1 1
 
-          Verify in TH(all-clusters-app) log:
+
+          Verify response contains a EnhancedCurrentHue value in  TH(all-clusters-app)  Logs:
           [1657912064.296156][2977:2977] CHIP:IM: Received Read request
           [1657912064.296261][2977:2977] CHIP:DMG: ReadRequestMessage =
           [1657912064.296295][2977:2977] CHIP:DMG: {
@@ -329,7 +333,8 @@
       verification: |
           ./chip-tool colorcontrol stop-move-step 0 0 1 1
 
-          Verify in TH(all-clusters-app) log:
+
+          Verify success response in TH(all-clusters-app) Log:
           [1657912172.988756][2977:2977] CHIP:DMG: InvokeRequestMessage =
           [1657912172.988782][2977:2977] CHIP:DMG: {
           [1657912172.988805][2977:2977] CHIP:DMG:        suppressResponse = false,
@@ -367,7 +372,8 @@
       verification: |
           ./chip-tool colorcontrol read enhanced-current-hue 1 1
 
-          Verify in TH(all-clusters-app) log:
+
+          Verify response contains a EnhancedCurrentHue value in  TH(all-clusters-app)  Logs:
           [1657912064.296156][2977:2977] CHIP:IM: Received Read request
           [1657912064.296261][2977:2977] CHIP:DMG: ReadRequestMessage =
           [1657912064.296295][2977:2977] CHIP:DMG: {
diff --git a/src/app/tests/suites/certification/Test_TC_CC_9_4.yaml b/src/app/tests/suites/certification/Test_TC_CC_9_4.yaml
index e91449e..4a83af9 100644
--- a/src/app/tests/suites/certification/Test_TC_CC_9_4.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CC_9_4.yaml
@@ -34,7 +34,7 @@
       verification: |
           ./chip-tool colorcontrol color-loop-set 15 0 0 30 160 0 0 1 1
 
-          Verify in TH(all-clusters-app) log:
+          Verify success response in TH(all-clusters-app) Log:
           [1657912387.432732][3126:3126] CHIP:DMG: InvokeRequestMessage =
           [1657912387.432781][3126:3126] CHIP:DMG: {
           [1657912387.432823][3126:3126] CHIP:DMG:        suppressResponse = false,
@@ -76,7 +76,7 @@
       verification: |
           ./chip-tool colorcontrol read color-loop-active 1 1
 
-          Verify in TH(all-clusters-app) log:
+          Verify response contains a value consistent  in  TH(all-clusters-app)  Logs:
           [1657912416.547714][3126:3126] CHIP:IM: Received Read request
           [1657912416.547842][3126:3126] CHIP:DMG: ReadRequestMessage =
           [1657912416.547890][3126:3126] CHIP:DMG: {
@@ -108,7 +108,7 @@
       verification: |
           ./chip-tool colorcontrol read color-loop-direction 1 1
 
-          Verify in TH(all-clusters-app) log:
+          Verify response contains a value consistent  in  TH(all-clusters-app)  Logs:
           [1657912446.661818][3126:3126] CHIP:IM: Received Read request
           [1657912446.661940][3126:3126] CHIP:DMG: ReadRequestMessage =
           [1657912446.661989][3126:3126] CHIP:DMG: {
@@ -139,8 +139,7 @@
       PICS: CC.C.A4004
       verification: |
           ./chip-tool colorcontrol read color-loop-time 1 1
-
-          Verify in TH(all-clusters-app) log:
+          Verify response contains a value consistent  in  TH(all-clusters-app)  Logs:
           [1657912469.590293][3126:3126] CHIP:IM: Received Read request
           [1657912469.590419][3126:3126] CHIP:DMG: ReadRequestMessage =
           [1657912469.590466][3126:3126] CHIP:DMG: {
@@ -171,8 +170,7 @@
       PICS: CC.C.A4005
       verification: |
           ./chip-tool colorcontrol read color-loop-start-enhanced-hue 1 1
-
-          Verify in TH(all-clusters-app) log:
+          Verify response contains a value consistent  in  TH(all-clusters-app)  Logs:
           [1657912490.104534][3126:3126] CHIP:IM: Received Read request
           [1657912490.104664][3126:3126] CHIP:DMG: ReadRequestMessage =
           [1657912490.104713][3126:3126] CHIP:DMG: {
@@ -205,23 +203,22 @@
       PICS: CC.C.A4000
       verification: |
           ./chip-tool colorcontrol read enhanced-current-hue 1 1
-
-          Verify in TH(all-clusters-app) log:
+          Verify response contains a value consistent  in  TH(all-clusters-app)  Logs:
           [1659960576.917953][2718:2718] CHIP:DMG: ReadRequestMessage =
           [1659960576.917989][2718:2718] CHIP:DMG: {
-          [1659960576.918016][2718:2718] CHIP:DMG: 	AttributePathIBs =
-          [1659960576.918051][2718:2718] CHIP:DMG: 	[
-          [1659960576.918084][2718:2718] CHIP:DMG: 		AttributePathIB =
-          [1659960576.918121][2718:2718] CHIP:DMG: 		{
-          [1659960576.918159][2718:2718] CHIP:DMG: 			Endpoint = 0x1,
-          [1659960576.918206][2718:2718] CHIP:DMG: 			Cluster = 0x300,
-          [1659960576.918249][2718:2718] CHIP:DMG: 			Attribute = 0x0000_4000,
-          [1659960576.918287][2718:2718] CHIP:DMG: 		}
+          [1659960576.918016][2718:2718] CHIP:DMG:         AttributePathIBs =
+          [1659960576.918051][2718:2718] CHIP:DMG:         [
+          [1659960576.918084][2718:2718] CHIP:DMG:                 AttributePathIB =
+          [1659960576.918121][2718:2718] CHIP:DMG:                 {
+          [1659960576.918159][2718:2718] CHIP:DMG:                         Endpoint = 0x1,
+          [1659960576.918206][2718:2718] CHIP:DMG:                         Cluster = 0x300,
+          [1659960576.918249][2718:2718] CHIP:DMG:                         Attribute = 0x0000_4000,
+          [1659960576.918287][2718:2718] CHIP:DMG:                 }
           [1659960576.918325][2718:2718] CHIP:DMG:
-          [1659960576.918359][2718:2718] CHIP:DMG: 	],
+          [1659960576.918359][2718:2718] CHIP:DMG:         ],
           [1659960576.918397][2718:2718] CHIP:DMG:
-          [1659960576.918432][2718:2718] CHIP:DMG: 	isFabricFiltered = true,
-          [1659960576.918466][2718:2718] CHIP:DMG: 	InteractionModelRevision = 1
+          [1659960576.918432][2718:2718] CHIP:DMG:         isFabricFiltered = true,
+          [1659960576.918466][2718:2718] CHIP:DMG:         InteractionModelRevision = 1
           [1659960576.918498][2718:2718] CHIP:DMG: },
           [1659960576.918604][2718:2718] CHIP:DMG: IM RH moving to [GeneratingReports]
           [1659960576.918724][2718:2718] CHIP:DMG: Building Reports for ReadHandler with LastReportGeneration = 0 DirtyGeneration = 0
@@ -233,7 +230,7 @@
       verification: |
           ./chip-tool colorcontrol read color-loop-active 1 1
 
-          Verify in TH(all-clusters-app) log:
+          Verify response contains a Color Loop activated  in  TH(all-clusters-app)  Logs:
 
           [1657912750.645121][3126:3126] CHIP:IM: Received Read request
           [1657912750.645210][3126:3126] CHIP:DMG: ReadRequestMessage =
@@ -262,7 +259,7 @@
       verification: |
           ./chip-tool colorcontrol read color-loop-stored-enhanced-hue 1 1
 
-          Verify in TH(all-clusters-app) log:
+          Verify response contains a value same as EnhencedCurrentHue in  TH(all-clusters-app)  Logs:
           [1657912783.463733][3126:3126] CHIP:IM: Received Read request
           [1657912783.463816][3126:3126] CHIP:DMG: ReadRequestMessage =
           [1657912783.463844][3126:3126] CHIP:DMG: {
@@ -290,8 +287,7 @@
       PICS: CC.C.A4000
       verification: |
           ./chip-tool colorcontrol read enhanced-current-hue 1 1
-
-          Verify in TH(all-clusters-app) log:
+          Verify response contains EnhencedCurrentHue value in  TH(all-clusters-app)  Logs:
           [1657912801.027600][3126:3126] CHIP:IM: Received Read request
           [1657912801.027717][3126:3126] CHIP:DMG: ReadRequestMessage =
           [1657912801.027761][3126:3126] CHIP:DMG: {
@@ -321,7 +317,7 @@
       verification: |
           ./chip-tool colorcontrol read enhanced-current-hue 1 1
 
-          Verify in TH(all-clusters-app) log:
+          Verify response contains EnhencedCurrentHue value in  TH(all-clusters-app)  Logs:
           [1657912801.027600][3126:3126] CHIP:IM: Received Read request
           [1657912801.027717][3126:3126] CHIP:DMG: ReadRequestMessage =
           [1657912801.027761][3126:3126] CHIP:DMG: {
@@ -351,7 +347,7 @@
       verification: |
           ./chip-tool colorcontrol color-loop-set 1 0 0 0 0 0 0 1 1
 
-          Verify in TH(all-clusters-app) log:
+          Verify success response in TH(all-clusters-app) Log:
 
           [1657912615.862118][3126:3126] CHIP:DMG: InvokeRequestMessage =
           [1657912615.862168][3126:3126] CHIP:DMG: {
@@ -394,7 +390,7 @@
       verification: |
           ./chip-tool colorcontrol read color-loop-active 1 1
 
-          Verify in TH(all-clusters-app) log:
+          Verify response contains a ColorLoop value in  TH(all-clusters-app)  Logs:
           [1657912416.547714][3126:3126] CHIP:IM: Received Read request
           [1657912416.547842][3126:3126] CHIP:DMG: ReadRequestMessage =
           [1657912416.547890][3126:3126] CHIP:DMG: {
@@ -426,7 +422,8 @@
       verification: |
           ./chip-tool colorcontrol read enhanced-current-hue 1 1
 
-          Verify in TH(all-clusters-app) log:
+
+          Verify response contains a ColorLoop value in  TH(all-clusters-app)  Logs:
           [1657912801.027600][3126:3126] CHIP:IM: Received Read request
           [1657912801.027717][3126:3126] CHIP:DMG: ReadRequestMessage =
           [1657912801.027761][3126:3126] CHIP:DMG: {
diff --git a/src/app/tests/suites/certification/Test_TC_CNET_1_3.yaml b/src/app/tests/suites/certification/Test_TC_CNET_1_3.yaml
index e53ddab..ec94f45 100644
--- a/src/app/tests/suites/certification/Test_TC_CNET_1_3.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CNET_1_3.yaml
@@ -44,23 +44,34 @@
 
     - label: "TH reads the FeatureMap from DUT"
       verification: |
+          (WiFi)
           ./chip-tool networkcommissioning read feature-map 1 0
 
           Verify "FeatureMap" on the TH(Chip-tool)  Log:
 
           [1651215443.195852][3285:3290] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Attribute 0x0000_FFFC DataVersion: 2584224280
-          [1651215443.195939][3285:3290] CHIP:TOO:   FeatureMap: 4
+          [1651215443.195939][3285:3290] CHIP:TOO:   FeatureMap: 1
 
+          (Ethernet)
           ./chip-tool networkcommissioning read feature-map 1 0
 
           Verify "FeatureMap" on the TH(Chip-tool)  Log:
 
           [1660315515.081759][32315:32320] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Attribute 0x0000_FFFC DataVersion: 4034679103
           [1660315515.081895][32315:32320] CHIP:TOO:   FeatureMap: 4
+
+          (Thread)
+          ./chip-tool networkcommissioning read feature-map 1 0
+
+          Verify "FeatureMap" on the TH(Chip-tool)  Log:
+
+          [1660315948.250922][3101:3106] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Attribute 0x0000_FFFC DataVersion: 1122474754
+          [1660315948.261520][3101:3106] CHIP:TOO:   FeatureMap: 2
       disabled: true
 
     - label: "TH reads AttributeList from DUT"
       verification: |
+          (WiFi)
           ./chip-tool networkcommissioning read attribute-list 1 0
 
           Verify "AttributeList" on the TH(Chip-tool)  Log:
@@ -82,10 +93,12 @@
           [1651215479.539564][3293:3298] CHIP:TOO:     [13]: 65533
 
 
-          Ethernet:
+          (Ethernet)
 
           ./chip-tool networkcommissioning read attribute-list 1 0
 
+          Verify "AttributeList" on the TH(Chip-tool)  Log:
+
           [1660315522.163640][32321:32326] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Attribute 0x0000_FFFB DataVersion: 4034679103
           [1660315522.163797][32321:32326] CHIP:TOO:   AttributeList: 13 entries
           [1660315522.163880][32321:32326] CHIP:TOO:     [1]: 0
@@ -101,6 +114,28 @@
           [1660315522.164636][32321:32326] CHIP:TOO:     [11]: 65531
           [1660315522.164708][32321:32326] CHIP:TOO:     [12]: 65532
           [1660315522.164778][32321:32326] CHIP:TOO:     [13]: 65533
+
+          (Thread)
+
+          ./chip-tool networkcommissioning read attribute-list 1 0
+
+          Verify "AttributeList" on the TH(Chip-tool)  Log:
+
+          [1660316011.016650][3112:3117] CHIP:TOO:   AttributeList: 13 entries
+          [1660316011.016678][3112:3117] CHIP:TOO:     [1]: 0
+          [1660316011.016700][3112:3117] CHIP:TOO:     [2]: 1
+          [1660316011.016721][3112:3117] CHIP:TOO:     [3]: 2
+          [1660316011.016741][3112:3117] CHIP:TOO:     [4]: 3
+          [1660316011.016762][3112:3117] CHIP:TOO:     [5]: 4
+          [1660316011.016782][3112:3117] CHIP:TOO:     [6]: 5
+          [1660316011.016803][3112:3117] CHIP:TOO:     [7]: 6
+          [1660316011.016823][3112:3117] CHIP:TOO:     [8]: 7
+          [1660316011.016844][3112:3117] CHIP:TOO:     [9]: 65528
+          [1660316011.016865][3112:3117] CHIP:TOO:     [10]: 65529
+          [1660316011.016887][3112:3117] CHIP:TOO:     [11]: 65531
+          [1660316011.016908][3112:3117] CHIP:TOO:     [12]: 65532
+          [1660316011.016929][3112:3117] CHIP:TOO:     [13]: 65533
+          [1660316011.017068][3112:3117] CHIP:EM: Sending Standalone Ack for MessageCounter:239150268 on exchange 45209i
       disabled: true
 
     - label: "TH reads EventList from the DUT"
@@ -132,6 +167,20 @@
 
           [1660315536.068512][32327:32332] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Attribute 0x0000_FFF9 DataVersion: 4034679103
           [1660315536.068654][32327:32332] CHIP:TOO:   AcceptedCommandList: 0 entries
+
+          (Thread)
+          ./chip-tool networkcommissioning read accepted-command-list 1 0
+
+          Verify "AcceptedCommandList" on the TH(Chip-tool)  Log:
+
+          [1660316038.564553][3121:3126] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Attribute 0x0000_FFF9 DataVersion: 1122474754
+          [1660316038.564671][3121:3126] CHIP:TOO:   AcceptedCommandList: 5 entries
+          [1660316038.564702][3121:3126] CHIP:TOO:     [1]: 0
+          [1660316038.564725][3121:3126] CHIP:TOO:     [2]: 3
+          [1660316038.564747][3121:3126] CHIP:TOO:     [3]: 4
+          [1660316038.564769][3121:3126] CHIP:TOO:     [4]: 6
+          [1660316038.564853][3121:3126] CHIP:TOO:     [5]: 8
+          [1660316038.564991][3121:3126] CHIP:EM: Sending Standalone Ack for MessageCounter:232731891 on exchange 30329i
       disabled: true
 
     - label: "TH reads GeneratedCommandList from DUT"
@@ -149,6 +198,17 @@
           [1650370123.418013][42418:42423] CHIP:TOO:     [3]: 7
           [1650370123.418143][42418:42423] CHIP:EM: Sending Standalone Ack for MessageCounter:759910 on exchange 25409i
 
+
+
+          (Ethernet)
+          ./chip-tool networkcommissioning read generated-command-list 1 0
+
+          Verify "GeneratedCommandList" on the TH(Chip-tool)  Log:
+
+          [1660315548.937195][32333:32338] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Attribute 0x0000_FFF8 DataVersion: 4034679103
+          [1660315548.937327][32333:32338] CHIP:TOO:   GeneratedCommandList: 0 entries
+
+
            ( Thread )
           ./chip-tool networkcommissioning read generated-command-list 51 0
 
@@ -161,15 +221,6 @@
           [1650370123.417977][42418:42423] CHIP:TOO:     [2]: 5
           [1650370123.418013][42418:42423] CHIP:TOO:     [3]: 7
           [1650370342.693995][7450:7455] CHIP:EM: Sending Standalone Ack for MessageCounter:2345375 on exchange 25146i
-
-
-          (Ethernet)
-          ./chip-tool networkcommissioning read generated-command-list 1 0
-
-          Verify "GeneratedCommandList" on the TH(Chip-tool)  Log:
-
-          [1660315548.937195][32333:32338] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Attribute 0x0000_FFF8 DataVersion: 4034679103
-          [1660315548.937327][32333:32338] CHIP:TOO:   GeneratedCommandList: 0 entries
       disabled: true
 
     - label:
diff --git a/src/app/tests/suites/certification/Test_TC_CNET_4_12.yaml b/src/app/tests/suites/certification/Test_TC_CNET_4_12.yaml
index 417f62c..0d282af 100644
--- a/src/app/tests/suites/certification/Test_TC_CNET_4_12.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CNET_4_12.yaml
@@ -176,6 +176,8 @@
           fail-safe and is  expected to cause  the changes of  configuration
           to  NetworkCommissi  oning cluster done  so far to be  reverted."
       verification: |
+          Mark as not applicable and proceed to next step
+
           ./chip-tool generalcommissioning arm-fail-safe 0 1 22 0
 
           Verify "ArmFailSafeResponse" on the TH(Chip-tool) Log:
@@ -193,13 +195,15 @@
           "TH ensures it can communicate on PIXIT.CNET.THRE AD_1ST_OPERATI
           ONALDATASET"
       verification: |
-          verification step to be updated.
+          Mark as not applicable and proceed to next step
       disabled: true
 
     - label:
           "TH discovers and connects to DUT on the PIXIT.CNET.THRE
           AD_1ST_OPERATI ONALDATASET operational network"
       verification: |
+          Mark as not applicable and proceed to next step
+
           ./chip-tool networkcommissioning read networks 22 0
 
           Verify "Networks entiries and its status" on the TH(Chip-tool) Log:
@@ -209,7 +213,7 @@
           "TH sends ArmFailSafe command to the DUT with ExpiryLengthSeco nds set
           to 900"
       verification: |
-          verification step to be updated.
+          Mark as not applicable and proceed to next step
       disabled: true
 
     - label:
@@ -217,7 +221,7 @@
           th_xpan and Breadcrumb field set to 1"
       PICS: CNET.S.C04.Rsp && CNET.S.C05.Tx
       verification: |
-          verification step to be updated.
+          Mark as not applicable and proceed to next step
       disabled: true
 
     - label:
@@ -226,7 +230,7 @@
           ONALDATASET and Breadcrumb field set to 1"
       PICS: CNET.S.C02.Rsp && CNET.S.C05.Tx
       verification: |
-          verification step to be updated.
+          Mark as not applicable and proceed to next step
       disabled: true
 
     - label:
@@ -235,14 +239,14 @@
           and Breadcrumb field set to 3"
       PICS: CNET.S.C06.Rsp && CNET.S.C07.Tx
       verification: |
-          verification step to be updated.
+          Mark as not applicable and proceed to next step
       disabled: true
 
     - label:
           "TH discovers and  connects to DUT  on
           the  PIXIT.CNET.THRE  AD_2ND_OPERATI  ONALDATASET  operational  network"
       verification: |
-          verification step to be updated.
+          Mark as not applicable and proceed to next step
       disabled: true
 
     - label:
@@ -250,16 +254,16 @@
           the  General  Commissioning  cluster of the DUT"
       PICS: CNET.S.C06.Rsp
       verification: |
-          verification step to be updated.
+          Mark as not applicable and proceed to next step
       disabled: true
 
     - label: "TH sends the  CommissioningCo  mplete command  to the DUT"
       verification: |
-          verification step to be updated.
+          Mark as not applicable and proceed to next step
       disabled: true
 
     - label: "TH reads  Networks  attribute from the  DUT"
       PICS: CNET.S.A0001
       verification: |
-          verification step to be updated.
+          Mark as not applicable and proceed to next step
       disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_DD_1_11.yaml b/src/app/tests/suites/certification/Test_TC_DD_1_11.yaml
index 6d20dad..fbc3594 100644
--- a/src/app/tests/suites/certification/Test_TC_DD_1_11.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DD_1_11.yaml
@@ -19,6 +19,7 @@
 
 PICS:
     - MCORE.ROLE.COMMISSIONER
+    - MCORE.DD.QR_COMMISSIONING
 
 config:
     nodeId: 0x12344321
diff --git a/src/app/tests/suites/certification/Test_TC_IDM_7_1.yaml b/src/app/tests/suites/certification/Test_TC_IDM_7_1.yaml
index 0f47f5b..b38f5ee 100644
--- a/src/app/tests/suites/certification/Test_TC_IDM_7_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_IDM_7_1.yaml
@@ -40,609 +40,693 @@
       verification: |
           Please  run this test in chip tool interactive mode ./chip-tool interactive start
 
+          Example commands given below are using 5 reference devices (User can use 5 reference devices and send the below command in from each reference device)
 
-          Send 3 Subscriptionrequest message from each Reference Device(Eg. RD1...) to DUT
-          and verify all the subscription requests are succes, and change the value of
-          all the attributes by sending write command, after sending write commanfd
-           verify on each of these Reference Devices that the appropriate attribute
+          Send 3 Subscriptionrequest messages from each Reference Device(Eg. RD1...) to DUT  and verify all the subscription requests are success and change the value of
+          all the attributes by sending a write command, after sending a write command verify on each of these Reference Devices that the appropriate attribute
            value has been received.
 
-          Example commands given below are using 3 reference device (User can use 5 reference device and send the below command in from each reference device)
 
 
-          on the first reference deice enter:
-
-           onoff  subscribe on-time  10 100  1 1
-          [1657715218.149357][5956:5961] CHIP:DMG: ReportDataMessage =
-          [1657715218.149399][5956:5961] CHIP:DMG: {
-          [1657715218.149432][5956:5961] CHIP:DMG:         SubscriptionId = 0xea8e5b3b,
-          [1657715218.149465][5956:5961] CHIP:DMG:         AttributeReportIBs =
-          [1657715218.149504][5956:5961] CHIP:DMG:         [
-          [1657715218.149535][5956:5961] CHIP:DMG:                 AttributeReportIB =
-          [1657715218.149581][5956:5961] CHIP:DMG:                 {
-          [1657715218.149619][5956:5961] CHIP:DMG:                         AttributeDataIB =
-          [1657715218.149663][5956:5961] CHIP:DMG:                         {
-          [1657715218.149711][5956:5961] CHIP:DMG:                                 DataVersion = 0x734a2d83,
-          [1657715218.149755][5956:5961] CHIP:DMG:                                 AttributePathIB =
-          [1657715218.149802][5956:5961] CHIP:DMG:                                 {
-          [1657715218.149849][5956:5961] CHIP:DMG:                                         Endpoint = 0x1,
-          [1657715218.149895][5956:5961] CHIP:DMG:                                         Cluster = 0x6,
-          [1657715218.149942][5956:5961] CHIP:DMG:                                         Attribute = 0x0000_4001,
-          [1657715218.149983][5956:5961] CHIP:DMG:                                 }
-          [1657715218.150027][5956:5961] CHIP:DMG:
-          [1657715218.150075][5956:5961] CHIP:DMG:                                 Data = 0,
-          [1657715218.150118][5956:5961] CHIP:DMG:                         },
-          [1657715218.150165][5956:5961] CHIP:DMG:
-          [1657715218.150201][5956:5961] CHIP:DMG:                 },
-          [1657715218.150245][5956:5961] CHIP:DMG:
-          [1657715218.150275][5956:5961] CHIP:DMG:         ],
-          [1657715218.150313][5956:5961] CHIP:DMG:
-          [1657715218.150343][5956:5961] CHIP:DMG:         InteractionModelRevision = 1
-          [1657715218.150372][5956:5961] CHIP:DMG: }
-          [1657715218.150529][5956:5961] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0006 Attribute 0x0000_4001 DataVersion: 1934241155
-          [1657715218.150599][5956:5961] CHIP:TOO:   OnTime: 0
-          [1657715218.150646][5956:5961] CHIP:DMG: MoveToState ReadClient[0xffff94008e40]: Moving to [AwaitingSu]
+          on the first reference device  send 3 Subscribe Request Messages to DUT
+           basic subscribe node-label 100 1000 1  0  --keepSubscriptions 1
+          [1660652952.537644][58131:58136] CHIP:EM: Removed CHIP MessageCounter:11153878 from RetransTable on exchange 57366i
+          [1660652952.537721][58131:58136] CHIP:DMG: ReportDataMessage =
+          [1660652952.537759][58131:58136] CHIP:DMG: {
+          [1660652952.537794][58131:58136] CHIP:DMG:         SubscriptionId = 0x50d4243c,
+          [1660652952.537829][58131:58136] CHIP:DMG:         AttributeReportIBs =
+          [1660652952.537873][58131:58136] CHIP:DMG:         [
+          [1660652952.537907][58131:58136] CHIP:DMG:                 AttributeReportIB =
+          [1660652952.537964][58131:58136] CHIP:DMG:                 {
+          [1660652952.538008][58131:58136] CHIP:DMG:                         AttributeDataIB =
+          [1660652952.538055][58131:58136] CHIP:DMG:                         {
+          [1660652952.538106][58131:58136] CHIP:DMG:                                 DataVersion = 0xe16fa6f6,
+          [1660652952.538152][58131:58136] CHIP:DMG:                                 AttributePathIB =
+          [1660652952.538205][58131:58136] CHIP:DMG:                                 {
+          [1660652952.538254][58131:58136] CHIP:DMG:                                         Endpoint = 0x0,
+          [1660652952.538308][58131:58136] CHIP:DMG:                                         Cluster = 0x28,
+          [1660652952.538358][58131:58136] CHIP:DMG:                                         Attribute = 0x0000_0005,
+          [1660652952.538409][58131:58136] CHIP:DMG:                                 }
+          [1660652952.538465][58131:58136] CHIP:DMG:
+          [1660652952.538517][58131:58136] CHIP:DMG:                                 Data = "" (0 chars),
+          [1660652952.538562][58131:58136] CHIP:DMG:                         },
+          [1660652952.538615][58131:58136] CHIP:DMG:
+          [1660652952.538654][58131:58136] CHIP:DMG:                 },
+          [1660652952.538700][58131:58136] CHIP:DMG:
+          [1660652952.538734][58131:58136] CHIP:DMG:         ],
+          [1660652952.538777][58131:58136] CHIP:DMG:
+          [1660652952.538811][58131:58136] CHIP:DMG:         InteractionModelRevision = 1
+          [1660652952.538844][58131:58136] CHIP:DMG: }
+          [1660652952.539010][58131:58136] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0028 Attribute 0x0000_0005 DataVersion: 3782190838
+          [1660652952.539073][58131:58136] CHIP:TOO:   NodeLabel:
+          [1660652952.539140][58131:58136] CHIP:DMG: MoveToState ReadClient[0xffffa0004bc0]: Moving to [AwaitingSu]
 
 
-           levelcontrol  subscribe  on-level 100 1000  1 1
-          [1657715273.668717][5956:5961] CHIP:DMG: ReportDataMessage =
-          [1657715273.668784][5956:5961] CHIP:DMG: {
-          [1657715273.668846][5956:5961] CHIP:DMG:         SubscriptionId = 0xb6497be6,
-          [1657715273.668908][5956:5961] CHIP:DMG:         AttributeReportIBs =
-          [1657715273.668984][5956:5961] CHIP:DMG:         [
-          [1657715273.669046][5956:5961] CHIP:DMG:                 AttributeReportIB =
-          [1657715273.669126][5956:5961] CHIP:DMG:                 {
-          [1657715273.669190][5956:5961] CHIP:DMG:                         AttributeDataIB =
-          [1657715273.669261][5956:5961] CHIP:DMG:                         {
-          [1657715273.669378][5956:5961] CHIP:DMG:                                 DataVersion = 0x319eeda7,
-          [1657715273.669460][5956:5961] CHIP:DMG:                                 AttributePathIB =
-          [1657715273.669540][5956:5961] CHIP:DMG:                                 {
-          [1657715273.669620][5956:5961] CHIP:DMG:                                         Endpoint = 0x1,
-          [1657715273.669706][5956:5961] CHIP:DMG:                                         Cluster = 0x8,
-          [1657715273.669792][5956:5961] CHIP:DMG:                                         Attribute = 0x0000_0011,
-          [1657715273.669875][5956:5961] CHIP:DMG:                                 }
-          [1657715273.669961][5956:5961] CHIP:DMG:
-          [1657715273.670043][5956:5961] CHIP:DMG:                                 Data = NULL
-          [1657715273.670119][5956:5961] CHIP:DMG:                         },
-          [1657715273.670199][5956:5961] CHIP:DMG:
-          [1657715273.670267][5956:5961] CHIP:DMG:                 },
-          [1657715273.670341][5956:5961] CHIP:DMG:
-          [1657715273.670400][5956:5961] CHIP:DMG:         ],
-          [1657715273.670474][5956:5961] CHIP:DMG:
-          [1657715273.670533][5956:5961] CHIP:DMG:         InteractionModelRevision = 1
-          [1657715273.670591][5956:5961] CHIP:DMG: }
-          [1657715273.670803][5956:5961] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0008 Attribute 0x0000_0011 DataVersion: 832499111
-          [1657715273.670879][5956:5961] CHIP:TOO:   on level: null
-          [1657715273.670967][5956:5961] CHIP:DMG: MoveToState ReadClient[0xffff94008f30]: Moving to [AwaitingSu]
-
-
-          onoff subscribe start-up-on-off   100 1000 1 1
-          [1657715343.924200][5956:5961] CHIP:DMG: ReportDataMessage =
-          [1657715343.924269][5956:5961] CHIP:DMG: {
-          [1657715343.924330][5956:5961] CHIP:DMG:         SubscriptionId = 0x9fce63ae,
-          [1657715343.924392][5956:5961] CHIP:DMG:         AttributeReportIBs =
-          [1657715343.924470][5956:5961] CHIP:DMG:         [
-          [1657715343.924532][5956:5961] CHIP:DMG:                 AttributeReportIB =
-          [1657715343.924612][5956:5961] CHIP:DMG:                 {
-          [1657715343.924678][5956:5961] CHIP:DMG:                         AttributeDataIB =
-          [1657715343.924750][5956:5961] CHIP:DMG:                         {
-          [1657715343.924833][5956:5961] CHIP:DMG:                                 DataVersion = 0x734a2d84,
-          [1657715343.924909][5956:5961] CHIP:DMG:                                 AttributePathIB =
-          [1657715343.924992][5956:5961] CHIP:DMG:                                 {
-          [1657715343.925074][5956:5961] CHIP:DMG:                                         Endpoint = 0x1,
-          [1657715343.925159][5956:5961] CHIP:DMG:                                         Cluster = 0x6,
-          [1657715343.925245][5956:5961] CHIP:DMG:                                         Attribute = 0x0000_4003,
-          [1657715343.925382][5956:5961] CHIP:DMG:                                 }
-          [1657715343.925470][5956:5961] CHIP:DMG:
-          [1657715343.925561][5956:5961] CHIP:DMG:                                 Data = NULL
-          [1657715343.925631][5956:5961] CHIP:DMG:                         },
-          [1657715343.925713][5956:5961] CHIP:DMG:
-          [1657715343.925776][5956:5961] CHIP:DMG:                 },
-          [1657715343.925851][5956:5961] CHIP:DMG:
-          [1657715343.925910][5956:5961] CHIP:DMG:         ],
-          [1657715343.925985][5956:5961] CHIP:DMG:
-          [1657715343.926046][5956:5961] CHIP:DMG:         InteractionModelRevision = 1
-          [1657715343.926104][5956:5961] CHIP:DMG: }
-          [1657715343.926315][5956:5961] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0006 Attribute 0x0000_4003 DataVersion: 1934241156
-          [1657715343.926395][5956:5961] CHIP:TOO:   StartUpOnOff: null
-          [1657715343.926485][5956:5961] CHIP:DMG: MoveToState ReadClient[0xffff94008c80]: Moving to [AwaitingSu]
+           basic subscribe location 100 1000 1  0   --keepSubscriptions 1
+          [1660653005.341371][58131:58136] CHIP:DMG: ReportDataMessage =
+          [1660653005.341441][58131:58136] CHIP:DMG: {
+          [1660653005.341503][58131:58136] CHIP:DMG:         SubscriptionId = 0xea4facb0,
+          [1660653005.341568][58131:58136] CHIP:DMG:         AttributeReportIBs =
+          [1660653005.341648][58131:58136] CHIP:DMG:         [
+          [1660653005.341711][58131:58136] CHIP:DMG:                 AttributeReportIB =
+          [1660653005.341808][58131:58136] CHIP:DMG:                 {
+          [1660653005.341881][58131:58136] CHIP:DMG:                         AttributeDataIB =
+          [1660653005.341972][58131:58136] CHIP:DMG:                         {
+          [1660653005.342065][58131:58136] CHIP:DMG:                                 DataVersion = 0xe16fa6f6,
+          [1660653005.342148][58131:58136] CHIP:DMG:                                 AttributePathIB =
+          [1660653005.342244][58131:58136] CHIP:DMG:                                 {
+          [1660653005.342340][58131:58136] CHIP:DMG:                                         Endpoint = 0x0,
+          [1660653005.342436][58131:58136] CHIP:DMG:                                         Cluster = 0x28,
+          [1660653005.342528][58131:58136] CHIP:DMG:                                         Attribute = 0x0000_0006,
+          [1660653005.342616][58131:58136] CHIP:DMG:                                 }
+          [1660653005.342708][58131:58136] CHIP:DMG:
+          [1660653005.342801][58131:58136] CHIP:DMG:                                 Data = "XX" (2 chars),
+          [1660653005.342883][58131:58136] CHIP:DMG:                         },
+          [1660653005.342972][58131:58136] CHIP:DMG:
+          [1660653005.343045][58131:58136] CHIP:DMG:                 },
+          [1660653005.343129][58131:58136] CHIP:DMG:
+          [1660653005.343191][58131:58136] CHIP:DMG:         ],
+          [1660653005.343270][58131:58136] CHIP:DMG:
+          [1660653005.343331][58131:58136] CHIP:DMG:         InteractionModelRevision = 1
+          [1660653005.343392][58131:58136] CHIP:DMG: }
+          [1660653005.343616][58131:58136] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0028 Attribute 0x0000_0006 DataVersion: 3782190838
+          [1660653005.343884][58131:58136] CHIP:TOO:   Location: XX
+          [1660653005.343983][58131:58136] CHIP:DMG: MoveToState ReadClient[0xffffa00129b0]: Moving to [AwaitingSu]
 
 
 
-          on the 2nd reference deice enter:
-
-          any subscribe-by-id 0x0008 0x0010 10 100  1 1
-          [1657715407.685574][5956:5961] CHIP:DMG: ReportDataMessage =
-          [1657715407.685644][5956:5961] CHIP:DMG: {
-          [1657715407.685705][5956:5961] CHIP:DMG:         SubscriptionId = 0x9c90104c,
-          [1657715407.685767][5956:5961] CHIP:DMG:         AttributeReportIBs =
-          [1657715407.685844][5956:5961] CHIP:DMG:         [
-          [1657715407.685906][5956:5961] CHIP:DMG:                 AttributeReportIB =
-          [1657715407.685985][5956:5961] CHIP:DMG:                 {
-          [1657715407.686049][5956:5961] CHIP:DMG:                         AttributeDataIB =
-          [1657715407.686122][5956:5961] CHIP:DMG:                         {
-          [1657715407.686197][5956:5961] CHIP:DMG:                                 DataVersion = 0x319eeda8,
-          [1657715407.686271][5956:5961] CHIP:DMG:                                 AttributePathIB =
-          [1657715407.686347][5956:5961] CHIP:DMG:                                 {
-          [1657715407.686424][5956:5961] CHIP:DMG:                                         Endpoint = 0x1,
-          [1657715407.686505][5956:5961] CHIP:DMG:                                         Cluster = 0x8,
-          [1657715407.686586][5956:5961] CHIP:DMG:                                         Attribute = 0x0000_0010,
-          [1657715407.686661][5956:5961] CHIP:DMG:                                 }
-          [1657715407.686739][5956:5961] CHIP:DMG:
-          [1657715407.686817][5956:5961] CHIP:DMG:                                 Data = 0,
-          [1657715407.686888][5956:5961] CHIP:DMG:                         },
-          [1657715407.686965][5956:5961] CHIP:DMG:
-          [1657715407.687029][5956:5961] CHIP:DMG:                 },
-          [1657715407.687105][5956:5961] CHIP:DMG:
-          [1657715407.687164][5956:5961] CHIP:DMG:         ],
-          [1657715407.687238][5956:5961] CHIP:DMG:
-          [1657715407.687299][5956:5961] CHIP:DMG:         InteractionModelRevision = 1
-          [1657715407.687358][5956:5961] CHIP:DMG: }
-          [1657715407.687564][5956:5961] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0008 Attribute 0x0000_0010 DataVersion: 832499112
-          [1657715407.687645][5956:5961] CHIP:TOO:   on off transition time: 0
-          [1657715407.687735][5956:5961] CHIP:DMG: MoveToState ReadClient[0xffff94008e40]: Moving to [AwaitingSu]
+           basic subscribe  local-config-disabled 100 1000 1  0   --keepSubscriptions 1
+          [1660653043.575397][58131:58136] CHIP:DMG: ReportDataMessage =
+          [1660653043.575423][58131:58136] CHIP:DMG: {
+          [1660653043.575445][58131:58136] CHIP:DMG:         SubscriptionId = 0x1ff9dbc5,
+          [1660653043.575467][58131:58136] CHIP:DMG:         AttributeReportIBs =
+          [1660653043.575504][58131:58136] CHIP:DMG:         [
+          [1660653043.575526][58131:58136] CHIP:DMG:                 AttributeReportIB =
+          [1660653043.575556][58131:58136] CHIP:DMG:                 {
+          [1660653043.575579][58131:58136] CHIP:DMG:                         AttributeDataIB =
+          [1660653043.575605][58131:58136] CHIP:DMG:                         {
+          [1660653043.575633][58131:58136] CHIP:DMG:                                 DataVersion = 0xe16fa6f6,
+          [1660653043.575658][58131:58136] CHIP:DMG:                                 AttributePathIB =
+          [1660653043.575686][58131:58136] CHIP:DMG:                                 {
+          [1660653043.575713][58131:58136] CHIP:DMG:                                         Endpoint = 0x0,
+          [1660653043.575743][58131:58136] CHIP:DMG:                                         Cluster = 0x28,
+          [1660653043.575806][58131:58136] CHIP:DMG:                                         Attribute = 0x0000_0010,
+          [1660653043.575833][58131:58136] CHIP:DMG:                                 }
+          [1660653043.575863][58131:58136] CHIP:DMG:
+          [1660653043.575892][58131:58136] CHIP:DMG:                                 Data = false,
+          [1660653043.575917][58131:58136] CHIP:DMG:                         },
+          [1660653043.575944][58131:58136] CHIP:DMG:
+          [1660653043.575966][58131:58136] CHIP:DMG:                 },
+          [1660653043.575993][58131:58136] CHIP:DMG:
+          [1660653043.576013][58131:58136] CHIP:DMG:         ],
+          [1660653043.576041][58131:58136] CHIP:DMG:
+          [1660653043.576063][58131:58136] CHIP:DMG:         InteractionModelRevision = 1
+          [1660653043.576084][58131:58136] CHIP:DMG: }
+          [1660653043.576169][58131:58136] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0028 Attribute 0x0000_0010 DataVersion: 3782190838
+          [1660653043.576207][58131:58136] CHIP:TOO:   LocalConfigDisabled: FALSE
+          [1660653043.576240][58131:58136] CHIP:DMG: MoveToState ReadClient[0xffffa0012b40]: Moving to [AwaitingSu]
 
 
 
-            basic subscribe node-label 10 100  1 0
-          [1657715505.138806][5956:5961] CHIP:DMG: ReportDataMessage =
-          [1657715505.138881][5956:5961] CHIP:DMG: {
-          [1657715505.138943][5956:5961] CHIP:DMG:         SubscriptionId = 0xd002abb6,
-          [1657715505.139045][5956:5961] CHIP:DMG:         AttributeReportIBs =
-          [1657715505.139128][5956:5961] CHIP:DMG:         [
-          [1657715505.139190][5956:5961] CHIP:DMG:                 AttributeReportIB =
-          [1657715505.139498][5956:5961] CHIP:DMG:                 {
-          [1657715505.139600][5956:5961] CHIP:DMG:                         AttributeDataIB =
-          [1657715505.139713][5956:5961] CHIP:DMG:                         {
-          [1657715505.139824][5956:5961] CHIP:DMG:                                 DataVersion = 0x1b93dc30,
-          [1657715505.139932][5956:5961] CHIP:DMG:                                 AttributePathIB =
-          [1657715505.140020][5956:5961] CHIP:DMG:                                 {
-          [1657715505.140112][5956:5961] CHIP:DMG:                                         Endpoint = 0x0,
-          [1657715505.140202][5956:5961] CHIP:DMG:                                         Cluster = 0x28,
-          [1657715505.140289][5956:5961] CHIP:DMG:                                         Attribute = 0x0000_0005,
-          [1657715505.140370][5956:5961] CHIP:DMG:                                 }
-          [1657715505.140560][5956:5961] CHIP:DMG:
-          [1657715505.140657][5956:5961] CHIP:DMG:                                 Data = "",
-          [1657715505.140741][5956:5961] CHIP:DMG:                         },
-          [1657715505.140825][5956:5961] CHIP:DMG:
-          [1657715505.140893][5956:5961] CHIP:DMG:                 },
-          [1657715505.140972][5956:5961] CHIP:DMG:
-          [1657715505.141031][5956:5961] CHIP:DMG:         ],
-          [1657715505.141105][5956:5961] CHIP:DMG:
-          [1657715505.141165][5956:5961] CHIP:DMG:         InteractionModelRevision = 1
-          [1657715505.141223][5956:5961] CHIP:DMG: }
-          [1657715505.141471][5956:5961] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0028 Attribute 0x0000_0005 DataVersion: 462674992
-          [1657715505.141554][5956:5961] CHIP:TOO:   NodeLabel:
-          [1657715505.141643][5956:5961] CHIP:DMG: MoveToState ReadClient[0xffff94008c80]: Moving to [AwaitingSu]
-
-
-           levelcontrol subscribe options  100 1000  1 1
-          [1657715610.399441][5956:5961] CHIP:DMG: ReportDataMessage =
-          [1657715610.399538][5956:5961] CHIP:DMG: {
-          [1657715610.399602][5956:5961] CHIP:DMG:         SubscriptionId = 0x96289376,
-          [1657715610.399685][5956:5961] CHIP:DMG:         AttributeReportIBs =
-          [1657715610.399763][5956:5961] CHIP:DMG:         [
-          [1657715610.399845][5956:5961] CHIP:DMG:                 AttributeReportIB =
-          [1657715610.399928][5956:5961] CHIP:DMG:                 {
-          [1657715610.399992][5956:5961] CHIP:DMG:                         AttributeDataIB =
-          [1657715610.400094][5956:5961] CHIP:DMG:                         {
-          [1657715610.400195][5956:5961] CHIP:DMG:                                 DataVersion = 0x319eedaa,
-          [1657715610.400285][5956:5961] CHIP:DMG:                                 AttributePathIB =
-          [1657715610.400385][5956:5961] CHIP:DMG:                                 {
-          [1657715610.400467][5956:5961] CHIP:DMG:                                         Endpoint = 0x1,
-          [1657715610.400583][5956:5961] CHIP:DMG:                                         Cluster = 0x8,
-          [1657715610.400688][5956:5961] CHIP:DMG:                                         Attribute = 0x0000_000F,
-          [1657715610.400770][5956:5961] CHIP:DMG:                                 }
-          [1657715610.400873][5956:5961] CHIP:DMG:
-          [1657715610.400985][5956:5961] CHIP:DMG:                                 Data = 0,
-          [1657715610.401063][5956:5961] CHIP:DMG:                         },
-          [1657715610.401162][5956:5961] CHIP:DMG:
-          [1657715610.401226][5956:5961] CHIP:DMG:                 },
-          [1657715610.401356][5956:5961] CHIP:DMG:
-          [1657715610.401410][5956:5961] CHIP:DMG:         ],
-          [1657715610.401506][5956:5961] CHIP:DMG:
-          [1657715610.401571][5956:5961] CHIP:DMG:         InteractionModelRevision = 1
-          [1657715610.401629][5956:5961] CHIP:DMG: }
-          [1657715610.401887][5956:5961] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0008 Attribute 0x0000_000F DataVersion: 832499114
-          [1657715610.401968][5956:5961] CHIP:TOO:   options: 0
-          [1657715610.402081][5956:5961] CHIP:DMG: MoveToState ReadClient[0xffff94003070]: Moving to [AwaitingSu]
+          on the 2nd reference device send 3 Subscribe Request Messages to DUT
+          basic subscribe node-label 100 1000 2  0  --commissioner-name beta  --keepSubscriptions 1
+          [1660653125.592268][58143:58148] CHIP:DMG: ReportDataMessage =
+          [1660653125.592310][58143:58148] CHIP:DMG: {
+          [1660653125.592348][58143:58148] CHIP:DMG:         SubscriptionId = 0xc15110c4,
+          [1660653125.592387][58143:58148] CHIP:DMG:         AttributeReportIBs =
+          [1660653125.592435][58143:58148] CHIP:DMG:         [
+          [1660653125.592472][58143:58148] CHIP:DMG:                 AttributeReportIB =
+          [1660653125.592527][58143:58148] CHIP:DMG:                 {
+          [1660653125.592568][58143:58148] CHIP:DMG:                         AttributeDataIB =
+          [1660653125.592618][58143:58148] CHIP:DMG:                         {
+          [1660653125.592675][58143:58148] CHIP:DMG:                                 DataVersion = 0xe16fa6f6,
+          [1660653125.592726][58143:58148] CHIP:DMG:                                 AttributePathIB =
+          [1660653125.592785][58143:58148] CHIP:DMG:                                 {
+          [1660653125.592839][58143:58148] CHIP:DMG:                                         Endpoint = 0x0,
+          [1660653125.592896][58143:58148] CHIP:DMG:                                         Cluster = 0x28,
+          [1660653125.592946][58143:58148] CHIP:DMG:                                         Attribute = 0x0000_0005,
+          [1660653125.592997][58143:58148] CHIP:DMG:                                 }
+          [1660653125.593051][58143:58148] CHIP:DMG:
+          [1660653125.593109][58143:58148] CHIP:DMG:                                 Data = "" (0 chars),
+          [1660653125.593158][58143:58148] CHIP:DMG:                         },
+          [1660653125.593212][58143:58148] CHIP:DMG:
+          [1660653125.593255][58143:58148] CHIP:DMG:                 },
+          [1660653125.593305][58143:58148] CHIP:DMG:
+          [1660653125.593342][58143:58148] CHIP:DMG:         ],
+          [1660653125.593390][58143:58148] CHIP:DMG:
+          [1660653125.593428][58143:58148] CHIP:DMG:         InteractionModelRevision = 1
+          [1660653125.593464][58143:58148] CHIP:DMG: }
+          [1660653125.593640][58143:58148] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0028 Attribute 0x0000_0005 DataVersion: 3782190838
+          [1660653125.593706][58143:58148] CHIP:TOO:   NodeLabel:
+          [1660653125.593776][58143:58148] CHIP:DMG: MoveToState ReadClient[0xffff6800df30]: Moving to [AwaitingSu]
 
 
 
 
-          on the 3rd reference deice enter:
+           basic subscribe location 100 1000 2  0  --commissioner-name beta  --keepSubscriptions 1
+          [1660653198.460290][58143:58148] CHIP:DMG: ReportDataMessage =
+          [1660653198.460359][58143:58148] CHIP:DMG: {
+          [1660653198.460423][58143:58148] CHIP:DMG:         SubscriptionId = 0xfed77bda,
+          [1660653198.460487][58143:58148] CHIP:DMG:         AttributeReportIBs =
+          [1660653198.460567][58143:58148] CHIP:DMG:         [
+          [1660653198.460630][58143:58148] CHIP:DMG:                 AttributeReportIB =
+          [1660653198.460718][58143:58148] CHIP:DMG:                 {
+          [1660653198.460786][58143:58148] CHIP:DMG:                         AttributeDataIB =
+          [1660653198.460871][58143:58148] CHIP:DMG:                         {
+          [1660653198.460966][58143:58148] CHIP:DMG:                                 DataVersion = 0xe16fa6f6,
+          [1660653198.461058][58143:58148] CHIP:DMG:                                 AttributePathIB =
+          [1660653198.461147][58143:58148] CHIP:DMG:                                 {
+          [1660653198.461244][58143:58148] CHIP:DMG:                                         Endpoint = 0x0,
+          [1660653198.461335][58143:58148] CHIP:DMG:                                         Cluster = 0x28,
+          [1660653198.461427][58143:58148] CHIP:DMG:                                         Attribute = 0x0000_0006,
+          [1660653198.461513][58143:58148] CHIP:DMG:                                 }
+          [1660653198.461604][58143:58148] CHIP:DMG:
+          [1660653198.461699][58143:58148] CHIP:DMG:                                 Data = "XX" (2 chars),
+          [1660653198.461782][58143:58148] CHIP:DMG:                         },
+          [1660653198.461880][58143:58148] CHIP:DMG:
+          [1660653198.461952][58143:58148] CHIP:DMG:                 },
+          [1660653198.462037][58143:58148] CHIP:DMG:
+          [1660653198.462099][58143:58148] CHIP:DMG:         ],
+          [1660653198.462176][58143:58148] CHIP:DMG:
+          [1660653198.462241][58143:58148] CHIP:DMG:         InteractionModelRevision = 1
+          [1660653198.462303][58143:58148] CHIP:DMG: }
+          [1660653198.462524][58143:58148] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0028 Attribute 0x0000_0006 DataVersion: 3782190838
+          [1660653198.462606][58143:58148] CHIP:TOO:   Location: XX
+          [1660653198.462695][58143:58148] CHIP:DMG: MoveToState ReadClient[0xffff68010fa0]: Moving to [AwaitingSu]
 
-           basic subscribe  local-config-disabled 10 100 1 0
-          [1657715779.644677][5956:5961] CHIP:DMG: ReportDataMessage =
-          [1657715779.644720][5956:5961] CHIP:DMG: {
-          [1657715779.644758][5956:5961] CHIP:DMG:         SubscriptionId = 0xe65b5e5,
-          [1657715779.644795][5956:5961] CHIP:DMG:         AttributeReportIBs =
-          [1657715779.644842][5956:5961] CHIP:DMG:         [
-          [1657715779.644879][5956:5961] CHIP:DMG:                 AttributeReportIB =
-          [1657715779.644927][5956:5961] CHIP:DMG:                 {
-          [1657715779.644966][5956:5961] CHIP:DMG:                         AttributeDataIB =
-          [1657715779.645013][5956:5961] CHIP:DMG:                         {
-          [1657715779.645062][5956:5961] CHIP:DMG:                                 DataVersion = 0x1b93dc35,
-          [1657715779.645114][5956:5961] CHIP:DMG:                                 AttributePathIB =
-          [1657715779.645165][5956:5961] CHIP:DMG:                                 {
-          [1657715779.645216][5956:5961] CHIP:DMG:                                         Endpoint = 0x0,
-          [1657715779.645268][5956:5961] CHIP:DMG:                                         Cluster = 0x28,
-          [1657715779.645362][5956:5961] CHIP:DMG:                                         Attribute = 0x0000_0010,
-          [1657715779.645411][5956:5961] CHIP:DMG:                                 }
-          [1657715779.645464][5956:5961] CHIP:DMG:
-          [1657715779.645516][5956:5961] CHIP:DMG:                                 Data = false,
-          [1657715779.645562][5956:5961] CHIP:DMG:                         },
-          [1657715779.645612][5956:5961] CHIP:DMG:
-          [1657715779.645653][5956:5961] CHIP:DMG:                 },
-          [1657715779.645701][5956:5961] CHIP:DMG:
-          [1657715779.645740][5956:5961] CHIP:DMG:         ],
-          [1657715779.645785][5956:5961] CHIP:DMG:
-          [1657715779.645821][5956:5961] CHIP:DMG:         InteractionModelRevision = 1
-          [1657715779.645856][5956:5961] CHIP:DMG: }
-          [1657715779.645989][5956:5961] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0028 Attribute 0x0000_0010 DataVersion: 462674997
-          [1657715779.646067][5956:5961] CHIP:TOO:   LocalConfigDisabled: FALSE
-          [1657715779.646124][5956:5961] CHIP:DMG: MoveToState ReadClient[0xffff94003070]: Moving to [AwaitingSu]
+
+
+           basic subscribe  local-config-disabled 100 1000 2  0  --commissioner-name beta  --keepSubscriptions 1
+          [1660653260.633215][58143:58148] CHIP:EM: Removed CHIP MessageCounter:178377836 from RetransTable on exchange 25360i
+          [1660653260.633327][58143:58148] CHIP:DMG: ReportDataMessage =
+          [1660653260.633387][58143:58148] CHIP:DMG: {
+          [1660653260.633442][58143:58148] CHIP:DMG:         SubscriptionId = 0x60feee4d,
+          [1660653260.633493][58143:58148] CHIP:DMG:         AttributeReportIBs =
+          [1660653260.633560][58143:58148] CHIP:DMG:         [
+          [1660653260.633615][58143:58148] CHIP:DMG:                 AttributeReportIB =
+          [1660653260.633691][58143:58148] CHIP:DMG:                 {
+          [1660653260.633755][58143:58148] CHIP:DMG:                         AttributeDataIB =
+          [1660653260.633820][58143:58148] CHIP:DMG:                         {
+          [1660653260.633891][58143:58148] CHIP:DMG:                                 DataVersion = 0xe16fa6f6,
+          [1660653260.633964][58143:58148] CHIP:DMG:                                 AttributePathIB =
+          [1660653260.634046][58143:58148] CHIP:DMG:                                 {
+          [1660653260.634130][58143:58148] CHIP:DMG:                                         Endpoint = 0x0,
+          [1660653260.634212][58143:58148] CHIP:DMG:                                         Cluster = 0x28,
+          [1660653260.634292][58143:58148] CHIP:DMG:                                         Attribute = 0x0000_0010,
+          [1660653260.634366][58143:58148] CHIP:DMG:                                 }
+          [1660653260.634445][58143:58148] CHIP:DMG:
+          [1660653260.634523][58143:58148] CHIP:DMG:                                 Data = false,
+          [1660653260.634600][58143:58148] CHIP:DMG:                         },
+          [1660653260.634674][58143:58148] CHIP:DMG:
+          [1660653260.634736][58143:58148] CHIP:DMG:                 },
+          [1660653260.634802][58143:58148] CHIP:DMG:
+          [1660653260.634855][58143:58148] CHIP:DMG:         ],
+          [1660653260.635066][58143:58148] CHIP:DMG:
+          [1660653260.635128][58143:58148] CHIP:DMG:         InteractionModelRevision = 1
+          [1660653260.635181][58143:58148] CHIP:DMG: }
+          [1660653260.635371][58143:58148] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0028 Attribute 0x0000_0010 DataVersion: 3782190838
+          [1660653260.635446][58143:58148] CHIP:TOO:   LocalConfigDisabled: FALSE
+          [1660653260.635523][58143:58148] CHIP:DMG: MoveToState ReadClient[0xffff68011170]: Moving to [AwaitingSu]
 
 
 
 
-          colorcontrol subscribe start-up-color-temperature-mireds 10 100 1 1
-          [1657715983.658378][5956:5961] CHIP:DMG: ReportDataMessage =
-          [1657715983.658409][5956:5961] CHIP:DMG: {
-          [1657715983.658434][5956:5961] CHIP:DMG:         SubscriptionId = 0x71492e8f,
-          [1657715983.658460][5956:5961] CHIP:DMG:         AttributeReportIBs =
-          [1657715983.658492][5956:5961] CHIP:DMG:         [
-          [1657715983.658517][5956:5961] CHIP:DMG:                 AttributeReportIB =
-          [1657715983.658551][5956:5961] CHIP:DMG:                 {
-          [1657715983.658577][5956:5961] CHIP:DMG:                         AttributeDataIB =
-          [1657715983.658612][5956:5961] CHIP:DMG:                         {
-          [1657715983.658647][5956:5961] CHIP:DMG:                                 DataVersion = 0x30f1c30e,
-          [1657715983.658683][5956:5961] CHIP:DMG:                                 AttributePathIB =
-          [1657715983.658718][5956:5961] CHIP:DMG:                                 {
-          [1657715983.658752][5956:5961] CHIP:DMG:                                         Endpoint = 0x1,
-          [1657715983.658794][5956:5961] CHIP:DMG:                                         Cluster = 0x300,
-          [1657715983.658834][5956:5961] CHIP:DMG:                                         Attribute = 0x0000_4010,
-          [1657715983.658871][5956:5961] CHIP:DMG:                                 }
-          [1657715983.658910][5956:5961] CHIP:DMG:
-          [1657715983.658945][5956:5961] CHIP:DMG:                                 Data = 0,
-          [1657715983.658976][5956:5961] CHIP:DMG:                         },
-          [1657715983.659011][5956:5961] CHIP:DMG:
-          [1657715983.659037][5956:5961] CHIP:DMG:                 },
-          [1657715983.659068][5956:5961] CHIP:DMG:
-          [1657715983.659092][5956:5961] CHIP:DMG:         ],
-          [1657715983.659122][5956:5961] CHIP:DMG:
-          [1657715983.659147][5956:5961] CHIP:DMG:         InteractionModelRevision = 1
-          [1657715983.659171][5956:5961] CHIP:DMG: }
-          [1657715983.659266][5956:5961] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0300 Attribute 0x0000_4010 DataVersion: 821150478
-          [1657715983.661975][5956:5961] CHIP:TOO:   StartUpColorTemperatureMireds: 0
-          [1657715983.662048][5956:5961] CHIP:DMG: MoveToState ReadClient[0xffff94002740]: Moving to [AwaitingSu]
+          on the 3rd reference device send 3 Subscribe Request Messages to DUT
+          basic subscribe node-label 100 1000 3  0  --commissioner-name 4  --keepSubscriptions 1
+          [1660653438.741061][58149:58154] CHIP:EM: Removed CHIP MessageCounter:141916359 from RetransTable on exchange 34400i
+          [1660653438.741116][58149:58154] CHIP:DMG: ReportDataMessage =
+          [1660653438.741143][58149:58154] CHIP:DMG: {
+          [1660653438.741236][58149:58154] CHIP:DMG:         SubscriptionId = 0xff93c648,
+          [1660653438.741262][58149:58154] CHIP:DMG:         AttributeReportIBs =
+          [1660653438.741294][58149:58154] CHIP:DMG:         [
+          [1660653438.741318][58149:58154] CHIP:DMG:                 AttributeReportIB =
+          [1660653438.741352][58149:58154] CHIP:DMG:                 {
+          [1660653438.741380][58149:58154] CHIP:DMG:                         AttributeDataIB =
+          [1660653438.741415][58149:58154] CHIP:DMG:                         {
+          [1660653438.741448][58149:58154] CHIP:DMG:                                 DataVersion = 0xe16fa6f6,
+          [1660653438.741479][58149:58154] CHIP:DMG:                                 AttributePathIB =
+          [1660653438.741517][58149:58154] CHIP:DMG:                                 {
+          [1660653438.741553][58149:58154] CHIP:DMG:                                         Endpoint = 0x0,
+          [1660653438.741592][58149:58154] CHIP:DMG:                                         Cluster = 0x28,
+          [1660653438.741627][58149:58154] CHIP:DMG:                                         Attribute = 0x0000_0005,
+          [1660653438.741660][58149:58154] CHIP:DMG:                                 }
+          [1660653438.741695][58149:58154] CHIP:DMG:
+          [1660653438.741732][58149:58154] CHIP:DMG:                                 Data = "" (0 chars),
+          [1660653438.741764][58149:58154] CHIP:DMG:                         },
+          [1660653438.741800][58149:58154] CHIP:DMG:
+          [1660653438.741828][58149:58154] CHIP:DMG:                 },
+          [1660653438.741859][58149:58154] CHIP:DMG:
+          [1660653438.741883][58149:58154] CHIP:DMG:         ],
+          [1660653438.741913][58149:58154] CHIP:DMG:
+          [1660653438.741938][58149:58154] CHIP:DMG:         InteractionModelRevision = 1
+          [1660653438.741961][58149:58154] CHIP:DMG: }
+          [1660653438.742081][58149:58154] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0028 Attribute 0x0000_0005 DataVersion: 3782190838
+          [1660653438.742125][58149:58154] CHIP:TOO:   NodeLabel:
+          [1660653438.742171][58149:58154] CHIP:DMG: MoveToState ReadClient[0xffff740129e0]: Moving to [AwaitingSu]
+
+
+           basic subscribe location 100 1000 3  0  --commissioner-name 4  --keepSubscriptions 1
+          [1660653500.501007][58149:58154] CHIP:DMG: {
+          [1660653500.501077][58149:58154] CHIP:DMG:         SubscriptionId = 0xb129bd8c,
+          [1660653500.501126][58149:58154] CHIP:DMG:         AttributeReportIBs =
+          [1660653500.501204][58149:58154] CHIP:DMG:         [
+          [1660653500.501253][58149:58154] CHIP:DMG:                 AttributeReportIB =
+          [1660653500.501323][58149:58154] CHIP:DMG:                 {
+          [1660653500.501397][58149:58154] CHIP:DMG:                         AttributeDataIB =
+          [1660653500.501466][58149:58154] CHIP:DMG:                         {
+          [1660653500.501550][58149:58154] CHIP:DMG:                                 DataVersion = 0xe16fa6f6,
+          [1660653500.501615][58149:58154] CHIP:DMG:                                 AttributePathIB =
+          [1660653500.501698][58149:58154] CHIP:DMG:                                 {
+          [1660653500.501765][58149:58154] CHIP:DMG:                                         Endpoint = 0x0,
+          [1660653500.501835][58149:58154] CHIP:DMG:                                         Cluster = 0x28,
+          [1660653500.501905][58149:58154] CHIP:DMG:                                         Attribute = 0x0000_0006,
+          [1660653500.501971][58149:58154] CHIP:DMG:                                 }
+          [1660653500.502041][58149:58154] CHIP:DMG:
+          [1660653500.502111][58149:58154] CHIP:DMG:                                 Data = "XX" (2 chars),
+          [1660653500.502176][58149:58154] CHIP:DMG:                         },
+          [1660653500.502249][58149:58154] CHIP:DMG:
+          [1660653500.502303][58149:58154] CHIP:DMG:                 },
+          [1660653500.502367][58149:58154] CHIP:DMG:
+          [1660653500.502414][58149:58154] CHIP:DMG:         ],
+          [1660653500.502473][58149:58154] CHIP:DMG:
+          [1660653500.502520][58149:58154] CHIP:DMG:         InteractionModelRevision = 1
+          [1660653500.502567][58149:58154] CHIP:DMG: }
+          [1660653500.502738][58149:58154] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0028 Attribute 0x0000_0006 DataVersion: 3782190838
+          [1660653500.502801][58149:58154] CHIP:TOO:   Location: XX
+          [1660653500.502870][58149:58154] CHIP:DMG: MoveToState ReadClient[0xffff7400adb0]: Moving to [AwaitingSu]
 
 
 
-           identify subscribe identify-time 10 100 1 1
-          [1657716084.847650][5956:5961] CHIP:DMG: ReportDataMessage =
-          [1657716084.847702][5956:5961] CHIP:DMG: {
-          [1657716084.847748][5956:5961] CHIP:DMG:         SubscriptionId = 0xd5e59a1a,
-          [1657716084.847795][5956:5961] CHIP:DMG:         AttributeReportIBs =
-          [1657716084.847853][5956:5961] CHIP:DMG:         [
-          [1657716084.847900][5956:5961] CHIP:DMG:                 AttributeReportIB =
-          [1657716084.847965][5956:5961] CHIP:DMG:                 {
-          [1657716084.848013][5956:5961] CHIP:DMG:                         AttributeDataIB =
-          [1657716084.848071][5956:5961] CHIP:DMG:                         {
-          [1657716084.848130][5956:5961] CHIP:DMG:                                 DataVersion = 0xdefea11c,
-          [1657716084.848194][5956:5961] CHIP:DMG:                                 AttributePathIB =
-          [1657716084.848257][5956:5961] CHIP:DMG:                                 {
-          [1657716084.848319][5956:5961] CHIP:DMG:                                         Endpoint = 0x1,
-          [1657716084.848387][5956:5961] CHIP:DMG:                                         Cluster = 0x3,
-          [1657716084.848459][5956:5961] CHIP:DMG:                                         Attribute = 0x0000_0000,
-          [1657716084.848525][5956:5961] CHIP:DMG:                                 }
-          [1657716084.848591][5956:5961] CHIP:DMG:
-          [1657716084.848655][5956:5961] CHIP:DMG:                                 Data = 0,
-          [1657716084.848713][5956:5961] CHIP:DMG:                         },
-          [1657716084.848772][5956:5961] CHIP:DMG:
-          [1657716084.848821][5956:5961] CHIP:DMG:                 },
-          [1657716084.848884][5956:5961] CHIP:DMG:
-          [1657716084.848930][5956:5961] CHIP:DMG:         ],
-          [1657716084.848986][5956:5961] CHIP:DMG:
-          [1657716084.849032][5956:5961] CHIP:DMG:         InteractionModelRevision = 1
-          [1657716084.849075][5956:5961] CHIP:DMG: }
-          [1657716084.849237][5956:5961] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0003 Attribute 0x0000_0000 DataVersion: 3741229340
-          [1657716084.849338][5956:5961] CHIP:TOO:   identify time: 0
-          [1657716084.849410][5956:5961] CHIP:DMG: MoveToState ReadClient[0xffff94003070]: Moving to [AwaitingSu]
+           basic subscribe  local-config-disabled 100 1000 3  0  --commissioner-name 4  --keepSubscriptions 1
+          [1660653545.650817][58149:58154] CHIP:DMG: ReportDataMessage =
+          [1660653545.650842][58149:58154] CHIP:DMG: {
+          [1660653545.650864][58149:58154] CHIP:DMG:         SubscriptionId = 0x5310d542,
+          [1660653545.650901][58149:58154] CHIP:DMG:         AttributeReportIBs =
+          [1660653545.650929][58149:58154] CHIP:DMG:         [
+          [1660653545.650950][58149:58154] CHIP:DMG:                 AttributeReportIB =
+          [1660653545.650999][58149:58154] CHIP:DMG:                 {
+          [1660653545.651032][58149:58154] CHIP:DMG:                         AttributeDataIB =
+          [1660653545.651060][58149:58154] CHIP:DMG:                         {
+          [1660653545.651088][58149:58154] CHIP:DMG:                                 DataVersion = 0xe16fa6f6,
+          [1660653545.651123][58149:58154] CHIP:DMG:                                 AttributePathIB =
+          [1660653545.651151][58149:58154] CHIP:DMG:                                 {
+          [1660653545.651179][58149:58154] CHIP:DMG:                                         Endpoint = 0x0,
+          [1660653545.651209][58149:58154] CHIP:DMG:                                         Cluster = 0x28,
+          [1660653545.651238][58149:58154] CHIP:DMG:                                         Attribute = 0x0000_0010,
+          [1660653545.651265][58149:58154] CHIP:DMG:                                 }
+          [1660653545.651294][58149:58154] CHIP:DMG:
+          [1660653545.651323][58149:58154] CHIP:DMG:                                 Data = false,
+          [1660653545.651349][58149:58154] CHIP:DMG:                         },
+          [1660653545.651377][58149:58154] CHIP:DMG:
+          [1660653545.651399][58149:58154] CHIP:DMG:                 },
+          [1660653545.651425][58149:58154] CHIP:DMG:
+          [1660653545.651446][58149:58154] CHIP:DMG:         ],
+          [1660653545.651473][58149:58154] CHIP:DMG:
+          [1660653545.651494][58149:58154] CHIP:DMG:         InteractionModelRevision = 1
+          [1660653545.651514][58149:58154] CHIP:DMG: }
+          [1660653545.651601][58149:58154] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0028 Attribute 0x0000_0010 DataVersion: 3782190838
+          [1660653545.651636][58149:58154] CHIP:TOO:   LocalConfigDisabled: FALSE
+          [1660653545.651669][58149:58154] CHIP:DMG: MoveToState ReadClient[0xffff74009a20]: Moving to [AwaitingSu]
+
+
+
+          on the 4th reference device send 3 Subscribe Request Messages to DUT
+          basic subscribe node-label 100 1000 4  0  --commissioner-name 5   --keepSubscriptions 1
+
+          [1660652952.539010][58131:58136] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0028 Attribute 0x0000_0005 DataVersion: 3782190838
+          [1660652952.539073][58131:58136] CHIP:TOO:   NodeLabel:
+          [1660652952.539140][58131:58136] CHIP:DMG: MoveToState ReadClient[0xffffa0004bc0]: Moving to [AwaitingSu]
+
+
+           basic subscribe location 100 1000 4  0  --commissioner-name 5   --keepSubscriptions 1
+
+          [1660653500.502738][58149:58154] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0028 Attribute 0x0000_0006 DataVersion: 3782190838
+          [1660653500.502801][58149:58154] CHIP:TOO:   Location: XX
+          [1660653500.502870][58149:58154] CHIP:DMG: MoveToState ReadClient[0xffff7400adb0]: Moving to [AwaitingSu]
+
+
+
+           basic subscribe  local-config-disabled 100 1000 4  0  --commissioner-name 5   --keepSubscriptions 1
+          : }
+          [1660653545.651601][58149:58154] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0028 Attribute 0x0000_0010 DataVersion: 3782190838
+          [1660653545.651636][58149:58154] CHIP:TOO:   LocalConfigDisabled: FALSE
+          [1660653545.651669][58149:58154] CHIP:DMG: MoveToState ReadClient[0xffff74009a20]: Moving to [AwaitingSu]
+
+
+
+          on the 5th reference device send 3 Subscribe Request Messages to DUT
+          basic subscribe node-label 100 1000 5  0  --commissioner-name 6  --keepSubscriptions 1
+
+          [1660652952.539010][58131:58136] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0028 Attribute 0x0000_0005 DataVersion: 3782190838
+          [1660652952.539073][58131:58136] CHIP:TOO:   NodeLabel:
+          [1660652952.539140][58131:58136] CHIP:DMG: MoveToState ReadClient[0xffffa0004bc0]: Moving to [AwaitingSu]
+
+
+
+           basic subscribe location 100 1000 5  0  --commissioner-name 6   --keepSubscriptions 1
+
+          [1660653500.502738][58149:58154] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0028 Attribute 0x0000_0006 DataVersion: 3782190838
+          [1660653500.502801][58149:58154] CHIP:TOO:   Location: XX
+          [1660653500.502870][58149:58154] CHIP:DMG: MoveToState ReadClient[0xffff7400adb0]: Moving to [AwaitingSu]
+
+
+
+           basic subscribe  local-config-disabled 100 1000 5  0  --commissioner-name beta  --keepSubscriptions 1
+          : }
+          [1660653545.651601][58149:58154] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0028 Attribute 0x0000_0010 DataVersion: 3782190838
+          [1660653545.651636][58149:58154] CHIP:TOO:   LocalConfigDisabled: FALSE
+          [1660653545.651669][58149:58154] CHIP:DMG: MoveToState ReadClient[0xffff74009a20]: Moving to [AwaitingSu]
+
+
+
+          once all the subscription is active, on the first reference device enter below mentioned commands to change the attribute values in RD1
+
+          basic write node-label ""newnode"" 1 0
+          ReportDataMessage =
+          [1660653595.180285][58131:58136] CHIP:DMG: {
+          [1660653595.180335][58131:58136] CHIP:DMG:         SubscriptionId = 0x50d4243c,
+          [1660653595.180388][58131:58136] CHIP:DMG:         AttributeReportIBs =
+          [1660653595.180456][58131:58136] CHIP:DMG:         [
+          [1660653595.180508][58131:58136] CHIP:DMG:                 AttributeReportIB =
+          [1660653595.180579][58131:58136] CHIP:DMG:                 {
+          [1660653595.180640][58131:58136] CHIP:DMG:                         AttributeDataIB =
+          [1660653595.180707][58131:58136] CHIP:DMG:                         {
+          [1660653595.180794][58131:58136] CHIP:DMG:                                 DataVersion = 0xe16fa6f7,
+          [1660653595.180874][58131:58136] CHIP:DMG:                                 AttributePathIB =
+          [1660653595.180958][58131:58136] CHIP:DMG:                                 {
+          [1660653595.181042][58131:58136] CHIP:DMG:                                         Endpoint = 0x0,
+          [1660653595.181131][58131:58136] CHIP:DMG:                                         Cluster = 0x28,
+          [1660653595.181214][58131:58136] CHIP:DMG:                                         Attribute = 0x0000_0005,
+          [1660653595.181281][58131:58136] CHIP:DMG:                                 }
+          [1660653595.181353][58131:58136] CHIP:DMG:
+          [1660653595.181426][58131:58136] CHIP:DMG:                                 Data = ""newnode"" (9 chars),
+          [1660653595.181491][58131:58136] CHIP:DMG:                         },
+          [1660653595.181564][58131:58136] CHIP:DMG:
+          [1660653595.181638][58131:58136] CHIP:DMG:                 },
+          [1660653595.181706][58131:58136] CHIP:DMG:
+          [1660653595.181772][58131:58136] CHIP:DMG:         ],
+          [1660653595.181858][58131:58136] CHIP:DMG:
+          [1660653595.181924][58131:58136] CHIP:DMG:         InteractionModelRevision = 1
+          [1660653595.181987][58131:58136] CHIP:DMG: }
+          [1660653595.182209][58131:58136] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0028 Attribute 0x0000_0005 DataVersion: 3782190839
+          [1660653595.182295][58131:58136] CHIP:TOO:   NodeLabel: "newnode"
+          [1660653595.182400][58131:58136] CHIP:DMG: Refresh LivenessCheckTime for 1025000 milliseconds with SubscriptionId = 0x50d4243c Peer = 01:0000000000000001
+
+          basic write location in 1 0
+          ReportDataMessage =
+          [1660653646.567396][58131:58136] CHIP:DMG: {
+          [1660653646.567414][58131:58136] CHIP:DMG:         SubscriptionId = 0xea4facb0,
+          [1660653646.567432][58131:58136] CHIP:DMG:         AttributeReportIBs =
+          [1660653646.567455][58131:58136] CHIP:DMG:         [
+          [1660653646.567472][58131:58136] CHIP:DMG:                 AttributeReportIB =
+          [1660653646.567497][58131:58136] CHIP:DMG:                 {
+          [1660653646.567515][58131:58136] CHIP:DMG:                         AttributeDataIB =
+          [1660653646.567537][58131:58136] CHIP:DMG:                         {
+          [1660653646.567560][58131:58136] CHIP:DMG:                                 DataVersion = 0xe16fa6f8,
+          [1660653646.567581][58131:58136] CHIP:DMG:                                 AttributePathIB =
+          [1660653646.567604][58131:58136] CHIP:DMG:                                 {
+          [1660653646.567627][58131:58136] CHIP:DMG:                                         Endpoint = 0x0,
+          [1660653646.567651][58131:58136] CHIP:DMG:                                         Cluster = 0x28,
+          [1660653646.567676][58131:58136] CHIP:DMG:                                         Attribute = 0x0000_0006,
+          [1660653646.567699][58131:58136] CHIP:DMG:                                 }
+          [1660653646.567723][58131:58136] CHIP:DMG:
+          [1660653646.567749][58131:58136] CHIP:DMG:                                 Data = "in" (2 chars),
+          [1660653646.567852][58131:58136] CHIP:DMG:                         },
+          [1660653646.567880][58131:58136] CHIP:DMG:
+          [1660653646.567904][58131:58136] CHIP:DMG:                 },
+          [1660653646.567931][58131:58136] CHIP:DMG:
+          [1660653646.567952][58131:58136] CHIP:DMG:         ],
+          [1660653646.567980][58131:58136] CHIP:DMG:
+          [1660653646.568002][58131:58136] CHIP:DMG:         InteractionModelRevision = 1
+          [1660653646.568023][58131:58136] CHIP:DMG: }
+          [1660653646.568112][58131:58136] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0028 Attribute 0x0000_0006 DataVersion: 3782190840
+          [1660653646.568151][58131:58136] CHIP:TOO:   Location: in
+          [1660653646.568191][58131:58136] CHIP:DMG: Refresh LivenessCheckTime for 1025000 milliseconds with SubscriptionId = 0xea4facb0 Peer = 01:0000000000000001
+
+
+          basic write local-config-disabled 1 1 0
+          ReportDataMessage =
+          [1660653666.029792][58131:58136] CHIP:DMG: {
+          [1660653666.029813][58131:58136] CHIP:DMG:         SubscriptionId = 0x1ff9dbc5,
+          [1660653666.029835][58131:58136] CHIP:DMG:         AttributeReportIBs =
+          [1660653666.029862][58131:58136] CHIP:DMG:         [
+          [1660653666.029883][58131:58136] CHIP:DMG:                 AttributeReportIB =
+          [1660653666.029921][58131:58136] CHIP:DMG:                 {
+          [1660653666.029947][58131:58136] CHIP:DMG:                         AttributeDataIB =
+          [1660653666.029980][58131:58136] CHIP:DMG:                         {
+          [1660653666.030013][58131:58136] CHIP:DMG:                                 DataVersion = 0xe16fa6f9,
+          [1660653666.030045][58131:58136] CHIP:DMG:                                 AttributePathIB =
+          [1660653666.030071][58131:58136] CHIP:DMG:                                 {
+          [1660653666.030107][58131:58136] CHIP:DMG:                                         Endpoint = 0x0,
+          [1660653666.030137][58131:58136] CHIP:DMG:                                         Cluster = 0x28,
+          [1660653666.030161][58131:58136] CHIP:DMG:                                         Attribute = 0x0000_0010,
+          [1660653666.030184][58131:58136] CHIP:DMG:                                 }
+          [1660653666.030209][58131:58136] CHIP:DMG:
+          [1660653666.030234][58131:58136] CHIP:DMG:                                 Data = true,
+          [1660653666.030255][58131:58136] CHIP:DMG:                         },
+          [1660653666.030278][58131:58136] CHIP:DMG:
+          [1660653666.030297][58131:58136] CHIP:DMG:                 },
+          [1660653666.030320][58131:58136] CHIP:DMG:
+          [1660653666.030337][58131:58136] CHIP:DMG:         ],
+          [1660653666.030361][58131:58136] CHIP:DMG:
+          [1660653666.030378][58131:58136] CHIP:DMG:         InteractionModelRevision = 1
+          [1660653666.030395][58131:58136] CHIP:DMG: }
+          [1660653666.030472][58131:58136] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0028 Attribute 0x0000_0010 DataVersion: 3782190841
+          [1660653666.030502][58131:58136] CHIP:TOO:   LocalConfigDisabled: TRUE
+          [1660653666.030535][58131:58136] CHIP:DMG: Refresh LivenessCheckTime for 1025000 milliseconds with SubscriptionId = 0x1ff9dbc5 Peer = 01:00000
+
+          Once RD1 change the attibute values by sending above command, verify that  all the RD*(RD2/3/4/5) should be notified with a subscription report
+
+          on the 2nd reference device verify the ReportDataMessage with the attribute value change
+          [1660653595.177882][58143:58148] CHIP:EM: Handling via exchange: 9001r, Delegate: 0xaaaaea1cd718
+          [1660653595.178151][58143:58148] CHIP:DMG: ReportDataMessage =
+          [1660653595.178219][58143:58148] CHIP:DMG: {
+          [1660653595.178272][58143:58148] CHIP:DMG:         SubscriptionId = 0xc15110c4,
+          [1660653595.178325][58143:58148] CHIP:DMG:         AttributeReportIBs =
+          [1660653595.178396][58143:58148] CHIP:DMG:         [
+          [1660653595.178449][58143:58148] CHIP:DMG:                 AttributeReportIB =
+          [1660653595.178522][58143:58148] CHIP:DMG:                 {
+          [1660653595.178580][58143:58148] CHIP:DMG:                         AttributeDataIB =
+          [1660653595.178647][58143:58148] CHIP:DMG:                         {
+          [1660653595.178717][58143:58148] CHIP:DMG:                                 DataVersion = 0xe16fa6f7,
+          [1660653595.178804][58143:58148] CHIP:DMG:                                 AttributePathIB =
+          [1660653595.178874][58143:58148] CHIP:DMG:                                 {
+          [1660653595.178942][58143:58148] CHIP:DMG:                                         Endpoint = 0x0,
+          [1660653595.179014][58143:58148] CHIP:DMG:                                         Cluster = 0x28,
+          [1660653595.179086][58143:58148] CHIP:DMG:                                         Attribute = 0x0000_0005,
+          [1660653595.179153][58143:58148] CHIP:DMG:                                 }
+          [1660653595.179225][58143:58148] CHIP:DMG:
+          [1660653595.179300][58143:58148] CHIP:DMG:                                 Data = ""newnode"" (9 chars),
+          [1660653595.179363][58143:58148] CHIP:DMG:                         },
+          [1660653595.179438][58143:58148] CHIP:DMG:
+          [1660653595.179499][58143:58148] CHIP:DMG:                 },
+          [1660653595.179587][58143:58148] CHIP:DMG:
+          [1660653595.179639][58143:58148] CHIP:DMG:         ],
+          [1660653595.179705][58143:58148] CHIP:DMG:
+          [1660653595.179894][58143:58148] CHIP:DMG:         InteractionModelRevision = 1
+          [1660653595.179952][58143:58148] CHIP:DMG: }
+          [1660653595.180163][58143:58148] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0028 Attribute 0x0000_0005 DataVersion: 3782190839
+          [1660653595.180235][58143:58148] CHIP:TOO:   NodeLabel: "newnode"
+          [1660653595.180511][58143:58148] CHIP:DMG: Refresh LivenessCheckTime for 1025000 milliseconds with SubscriptionId = 0xc15110c4 Peer = 02:0000000000000002
+
+
+          [1660653646.567549][58143:58148] CHIP:DMG: ReportDataMessage =
+          [1660653646.567570][58143:58148] CHIP:DMG: {
+          [1660653646.567587][58143:58148] CHIP:DMG:         SubscriptionId = 0xfed77bda,
+          [1660653646.567605][58143:58148] CHIP:DMG:         AttributeReportIBs =
+          [1660653646.567628][58143:58148] CHIP:DMG:         [
+          [1660653646.567646][58143:58148] CHIP:DMG:                 AttributeReportIB =
+          [1660653646.567670][58143:58148] CHIP:DMG:                 {
+          [1660653646.567689][58143:58148] CHIP:DMG:                         AttributeDataIB =
+          [1660653646.567709][58143:58148] CHIP:DMG:                         {
+          [1660653646.567731][58143:58148] CHIP:DMG:                                 DataVersion = 0xe16fa6f8,
+          [1660653646.567780][58143:58148] CHIP:DMG:                                 AttributePathIB =
+          [1660653646.567806][58143:58148] CHIP:DMG:                                 {
+          [1660653646.567829][58143:58148] CHIP:DMG:                                         Endpoint = 0x0,
+          [1660653646.567854][58143:58148] CHIP:DMG:                                         Cluster = 0x28,
+          [1660653646.568334][58143:58148] CHIP:DMG:                                         Attribute = 0x0000_0006,
+          [1660653646.568364][58143:58148] CHIP:DMG:                                 }
+          [1660653646.568726][58143:58148] CHIP:DMG:
+          [1660653646.568769][58143:58148] CHIP:DMG:                                 Data = "in" (2 chars),
+          [1660653646.569119][58143:58148] CHIP:DMG:                         },
+          [1660653646.569313][58143:58148] CHIP:DMG:
+          [1660653646.569337][58143:58148] CHIP:DMG:                 },
+          [1660653646.569518][58143:58148] CHIP:DMG:
+          [1660653646.569538][58143:58148] CHIP:DMG:         ],
+          [1660653646.569566][58143:58148] CHIP:DMG:
+          [1660653646.569588][58143:58148] CHIP:DMG:         InteractionModelRevision = 1
+          [1660653646.569610][58143:58148] CHIP:DMG: }
+          [1660653646.569682][58143:58148] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0028 Attribute 0x0000_0006 DataVersion: 3782190840
+          [1660653646.569713][58143:58148] CHIP:TOO:   Location: in
+          [1660653646.569762][58143:58148] CHIP:DMG: Refresh LivenessCheckTime for 1025000 milliseconds with SubscriptionId = 0xfed77bda Peer = 02:0000000000000002
+
+
+          [1660653666.030382][58143:58148] CHIP:DMG: ReportDataMessage =
+          [1660653666.030401][58143:58148] CHIP:DMG: {
+          [1660653666.030419][58143:58148] CHIP:DMG:         SubscriptionId = 0x60feee4d,
+          [1660653666.030438][58143:58148] CHIP:DMG:         AttributeReportIBs =
+          [1660653666.030461][58143:58148] CHIP:DMG:         [
+          [1660653666.030478][58143:58148] CHIP:DMG:                 AttributeReportIB =
+          [1660653666.030502][58143:58148] CHIP:DMG:                 {
+          [1660653666.030521][58143:58148] CHIP:DMG:                         AttributeDataIB =
+          [1660653666.030542][58143:58148] CHIP:DMG:                         {
+          [1660653666.030564][58143:58148] CHIP:DMG:                                 DataVersion = 0xe16fa6f9,
+          [1660653666.030586][58143:58148] CHIP:DMG:                                 AttributePathIB =
+          [1660653666.030609][58143:58148] CHIP:DMG:                                 {
+          [1660653666.030647][58143:58148] CHIP:DMG:                                         Endpoint = 0x0,
+          [1660653666.030672][58143:58148] CHIP:DMG:                                         Cluster = 0x28,
+          [1660653666.030696][58143:58148] CHIP:DMG:                                         Attribute = 0x0000_0010,
+          [1660653666.030718][58143:58148] CHIP:DMG:                                 }
+          [1660653666.030742][58143:58148] CHIP:DMG:
+          [1660653666.030778][58143:58148] CHIP:DMG:                                 Data = true,
+          [1660653666.030803][58143:58148] CHIP:DMG:                         },
+          [1660653666.030827][58143:58148] CHIP:DMG:
+          [1660653666.030846][58143:58148] CHIP:DMG:                 },
+          [1660653666.030868][58143:58148] CHIP:DMG:
+          [1660653666.030885][58143:58148] CHIP:DMG:         ],
+          [1660653666.030908][58143:58148] CHIP:DMG:
+          [1660653666.030926][58143:58148] CHIP:DMG:         InteractionModelRevision = 1
+          [1660653666.030944][58143:58148] CHIP:DMG: }
+          [1660653666.031027][58143:58148] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0028 Attribute 0x0000_0010 DataVersion: 3782190841
+          [1660653666.031058][58143:58148] CHIP:TOO:   LocalConfigDisabled: TRUE
+          [1660653666.031092][58143:58148] CHIP:DMG: Refresh LivenessCheckTime for 1025000 milliseconds with SubscriptionId = 0x60feee4d Peer = 02:0000000000000002
+
+
+          on the 3rd reference device verify the ReportDataMessage with the attribute value change
+          onic time: 000000000199A0AE msec
+          [1660653545.654422][58149:58154] CHIP:EM: Flushed pending ack for MessageCounter:144882910 on exchange 34402i
+          [1660653595.178474][58149:58154] CHIP:EM: Received message of type 0x5 with protocolId (0, 1) and MessageCounter:144882911 on exchange 9002r
+          [1660653595.178564][58149:58154] CHIP:EM: Handling via exchange: 9002r, Delegate: 0xaaaade55d718
+          [1660653595.178743][58149:58154] CHIP:DMG: ReportDataMessage =
+          [1660653595.178805][58149:58154] CHIP:DMG: {
+          [1660653595.178858][58149:58154] CHIP:DMG:         SubscriptionId = 0xff93c648,
+          [1660653595.178912][58149:58154] CHIP:DMG:         AttributeReportIBs =
+          [1660653595.178980][58149:58154] CHIP:DMG:         [
+          [1660653595.179033][58149:58154] CHIP:DMG:                 AttributeReportIB =
+          [1660653595.179106][58149:58154] CHIP:DMG:                 {
+          [1660653595.179163][58149:58154] CHIP:DMG:                         AttributeDataIB =
+          [1660653595.179225][58149:58154] CHIP:DMG:                         {
+          [1660653595.179291][58149:58154] CHIP:DMG:                                 DataVersion = 0xe16fa6f7,
+          [1660653595.179355][58149:58154] CHIP:DMG:                                 AttributePathIB =
+          [1660653595.179422][58149:58154] CHIP:DMG:                                 {
+          [1660653595.179498][58149:58154] CHIP:DMG:                                         Endpoint = 0x0,
+          [1660653595.179640][58149:58154] CHIP:DMG:                                         Cluster = 0x28,
+          [1660653595.179718][58149:58154] CHIP:DMG:                                         Attribute = 0x0000_0005,
+          [1660653595.179864][58149:58154] CHIP:DMG:                                 }
+          [1660653595.179939][58149:58154] CHIP:DMG:
+          [1660653595.180012][58149:58154] CHIP:DMG:                                 Data = ""newnode"" (9 chars),
+          [1660653595.180077][58149:58154] CHIP:DMG:                         },
+          [1660653595.180148][58149:58154] CHIP:DMG:
+          [1660653595.180204][58149:58154] CHIP:DMG:                 },
+          [1660653595.180276][58149:58154] CHIP:DMG:
+          [1660653595.180328][58149:58154] CHIP:DMG:         ],
+          [1660653595.180395][58149:58154] CHIP:DMG:
+          [1660653595.180462][58149:58154] CHIP:DMG:         InteractionModelRevision = 1
+          [1660653595.180513][58149:58154] CHIP:DMG: }
+          [1660653595.180721][58149:58154] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0028 Attribute 0x0000_0005 DataVersion: 3782190839
+          [1660653595.180792][58149:58154] CHIP:TOO:   NodeLabel: "newnode"
+          [1660653595.180894][58149:58154] CHIP:DMG: Refresh LivenessCheckTime for 1025000 milliseconds with SubscriptionId =
+
+
+          [1660653646.568849][58149:58154] CHIP:DMG: ReportDataMessage =
+          [1660653646.568878][58149:58154] CHIP:DMG: {
+          [1660653646.568903][58149:58154] CHIP:DMG:         SubscriptionId = 0xb129bd8c,
+          [1660653646.568926][58149:58154] CHIP:DMG:         AttributeReportIBs =
+          [1660653646.568955][58149:58154] CHIP:DMG:         [
+          [1660653646.568974][58149:58154] CHIP:DMG:                 AttributeReportIB =
+          [1660653646.569004][58149:58154] CHIP:DMG:                 {
+          [1660653646.569027][58149:58154] CHIP:DMG:                         AttributeDataIB =
+          [1660653646.569054][58149:58154] CHIP:DMG:                         {
+          [1660653646.569082][58149:58154] CHIP:DMG:                                 DataVersion = 0xe16fa6f8,
+          [1660653646.569109][58149:58154] CHIP:DMG:                                 AttributePathIB =
+          [1660653646.569138][58149:58154] CHIP:DMG:                                 {
+          [1660653646.569165][58149:58154] CHIP:DMG:                                         Endpoint = 0x0,
+          [1660653646.569194][58149:58154] CHIP:DMG:                                         Cluster = 0x28,
+          [1660653646.569225][58149:58154] CHIP:DMG:                                         Attribute = 0x0000_0006,
+          [1660653646.569253][58149:58154] CHIP:DMG:                                 }
+          [1660653646.569282][58149:58154] CHIP:DMG:
+          [1660653646.569313][58149:58154] CHIP:DMG:                                 Data = "in" (2 chars),
+          [1660653646.569339][58149:58154] CHIP:DMG:                         },
+          [1660653646.569368][58149:58154] CHIP:DMG:
+          [1660653646.569392][58149:58154] CHIP:DMG:                 },
+          [1660653646.569419][58149:58154] CHIP:DMG:
+          [1660653646.569441][58149:58154] CHIP:DMG:         ],
+          [1660653646.569469][58149:58154] CHIP:DMG:
+          [1660653646.569492][58149:58154] CHIP:DMG:         InteractionModelRevision = 1
+          [1660653646.569510][58149:58154] CHIP:DMG: }
+          [1660653646.569596][58149:58154] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0028 Attribute 0x0000_0006 DataVersion: 3782190840
+          [1660653646.569638][58149:58154] CHIP:TOO:   Location: in
+          [1660653646.569738][58149:58154] CHIP:DMG: Refresh LivenessCheckTime for 1025000 milliseconds with SubscriptionId = 0xb129bd8c Peer = 03:0000000000000003
+
+          MessageCounter:144882915 on exchange 9008r
+          [1660653666.030877][58149:58154] CHIP:EM: Handling via exchange: 9008r, Delegate: 0xaaaade55d718
+          [1660653666.030942][58149:58154] CHIP:DMG: ReportDataMessage =
+          [1660653666.030968][58149:58154] CHIP:DMG: {
+          [1660653666.030986][58149:58154] CHIP:DMG:         SubscriptionId = 0x5310d542,
+          [1660653666.031004][58149:58154] CHIP:DMG:         AttributeReportIBs =
+          [1660653666.031028][58149:58154] CHIP:DMG:         [
+          [1660653666.031045][58149:58154] CHIP:DMG:                 AttributeReportIB =
+          [1660653666.031069][58149:58154] CHIP:DMG:                 {
+          [1660653666.031089][58149:58154] CHIP:DMG:                         AttributeDataIB =
+          [1660653666.031111][58149:58154] CHIP:DMG:                         {
+          [1660653666.031133][58149:58154] CHIP:DMG:                                 DataVersion = 0xe16fa6f9,
+          [1660653666.031155][58149:58154] CHIP:DMG:                                 AttributePathIB =
+          [1660653666.031178][58149:58154] CHIP:DMG:                                 {
+          [1660653666.031202][58149:58154] CHIP:DMG:                                         Endpoint = 0x0,
+          [1660653666.031226][58149:58154] CHIP:DMG:                                         Cluster = 0x28,
+          [1660653666.031251][58149:58154] CHIP:DMG:                                         Attribute = 0x0000_0010,
+          [1660653666.031274][58149:58154] CHIP:DMG:                                 }
+          [1660653666.031308][58149:58154] CHIP:DMG:
+          [1660653666.031334][58149:58154] CHIP:DMG:                                 Data = true,
+          [1660653666.031355][58149:58154] CHIP:DMG:                         },
+          [1660653666.031379][58149:58154] CHIP:DMG:
+          [1660653666.031398][58149:58154] CHIP:DMG:                 },
+          [1660653666.031421][58149:58154] CHIP:DMG:
+          [1660653666.031438][58149:58154] CHIP:DMG:         ],
+          [1660653666.031462][58149:58154] CHIP:DMG:
+          [1660653666.031480][58149:58154] CHIP:DMG:         InteractionModelRevision = 1
+          [1660653666.031503][58149:58154] CHIP:DMG: }
+          [1660653666.031584][58149:58154] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0028 Attribute 0x0000_0010 DataVersion: 3782190841
+          [1660653666.031617][58149:58154] CHIP:TOO:   LocalConfigDisabled: TRUE
+          [1660653666.031655][58149:58154] CHIP:DMG: Refresh LivenessCheckTime for 1025000 milliseconds with SubscriptionId = 0x5310d542 Peer = 03:0000000000
+
+
+
+          on the 4th reference device verify the ReportDataMessage with the attribute value change
+
+          [1660653595.182209][58131:58136] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0028 Attribute 0x0000_0005 DataVersion: 378219084
+          [1660653595.182295][58131:58136] CHIP:TOO:   NodeLabel: "newnode"
+          [1660653595.182400][58131:58136] CHIP:DMG: Refresh LivenessCheckTime for 1025000 milliseconds with SubscriptionId = 0x50d4249f Peer = 01:0000000000000001
+
+          [1660653646.569682][58143:58148] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0028 Attribute 0x0000_0006 DataVersion: 3782190840
+          [1660653646.569713][58143:58148] CHIP:TOO:   Location: in
+          [1660653646.569762][58143:58148] CHIP:DMG: Refresh LivenessCheckTime for 1025000 milliseconds with SubscriptionId = 0xfed77bda Peer = 02:0000000000000002
+
+
+          [1660653666.031584][58149:58154] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0028 Attribute 0x0000_0010 DataVersion: 37821909841
+          [1660653666.031617][58149:58154] CHIP:TOO:   LocalConfigDisabled: TRUE
+          [1660653666.031655][58149:58154] CHIP:DMG: Refresh LivenessCheckTime for 1025000 milliseconds with SubscriptionId = 0x5310d57o2 Peer = 03:0000000000
 
 
 
 
-          on the first reference deice enter below mentioned commands to change the attribute values
-
-          onoff  write on-time 1 1 1
-          [1657715232.758666][5956:5961] CHIP:DMG: ReportDataMessage =
-          [1657715232.758698][5956:5961] CHIP:DMG: {
-          [1657715232.758724][5956:5961] CHIP:DMG:         SubscriptionId = 0xea8e5b3b,
-          [1657715232.758753][5956:5961] CHIP:DMG:         AttributeReportIBs =
-          [1657715232.758782][5956:5961] CHIP:DMG:         [
-          [1657715232.758803][5956:5961] CHIP:DMG:                 AttributeReportIB =
-          [1657715232.758832][5956:5961] CHIP:DMG:                 {
-          [1657715232.758854][5956:5961] CHIP:DMG:                         AttributeDataIB =
-          [1657715232.758880][5956:5961] CHIP:DMG:                         {
-          [1657715232.758911][5956:5961] CHIP:DMG:                                 DataVersion = 0x734a2d84,
-          [1657715232.758936][5956:5961] CHIP:DMG:                                 AttributePathIB =
-          [1657715232.758962][5956:5961] CHIP:DMG:                                 {
-          [1657715232.758989][5956:5961] CHIP:DMG:                                         Endpoint = 0x1,
-          [1657715232.759030][5956:5961] CHIP:DMG:                                         Cluster = 0x6,
-          [1657715232.759071][5956:5961] CHIP:DMG:                                         Attribute = 0x0000_4001,
-          [1657715232.759104][5956:5961] CHIP:DMG:                                 }
-          [1657715232.759140][5956:5961] CHIP:DMG:
-          [1657715232.759174][5956:5961] CHIP:DMG:                                 Data = 1,
-          [1657715232.759203][5956:5961] CHIP:DMG:                         },
-          [1657715232.759235][5956:5961] CHIP:DMG:
-          [1657715232.759261][5956:5961] CHIP:DMG:                 },
-          [1657715232.759292][5956:5961] CHIP:DMG:
-          [1657715232.759317][5956:5961] CHIP:DMG:         ],
-          [1657715232.759348][5956:5961] CHIP:DMG:
-          [1657715232.759373][5956:5961] CHIP:DMG:         InteractionModelRevision = 1
-          [1657715232.759398][5956:5961] CHIP:DMG: }
-          [1657715232.759493][5956:5961] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0006 Attribute 0x0000_4001 DataVersion: 1934241156
-          [1657715232.759530][5956:5961] CHIP:TOO:   OnTime: 1
-          [1657715232.759576][5956:5961] CHIP:DMG: Refresh LivenessCheckTime for 125000 milliseconds with SubscriptionId = 0xea8e5b3b
 
 
+          on the 5th reference device verify the ReportDataMessage with the attribute value change
 
-           levelcontrol  write  on-level  1  1 1
-          [1657715287.200431][5956:5961] CHIP:DMG: ReportDataMessage =
-          [1657715287.200491][5956:5961] CHIP:DMG: {
-          [1657715287.200557][5956:5961] CHIP:DMG:         SubscriptionId = 0xb6497be6,
-          [1657715287.200622][5956:5961] CHIP:DMG:         AttributeReportIBs =
-          [1657715287.200701][5956:5961] CHIP:DMG:         [
-          [1657715287.200765][5956:5961] CHIP:DMG:                 AttributeReportIB =
-          [1657715287.200848][5956:5961] CHIP:DMG:                 {
-          [1657715287.200921][5956:5961] CHIP:DMG:                         AttributeDataIB =
-          [1657715287.201012][5956:5961] CHIP:DMG:                         {
-          [1657715287.201094][5956:5961] CHIP:DMG:                                 DataVersion = 0x319eeda8,
-          [1657715287.201180][5956:5961] CHIP:DMG:                                 AttributePathIB =
-          [1657715287.201263][5956:5961] CHIP:DMG:                                 {
-          [1657715287.201403][5956:5961] CHIP:DMG:                                         Endpoint = 0x1,
-          [1657715287.201501][5956:5961] CHIP:DMG:                                         Cluster = 0x8,
-          [1657715287.201596][5956:5961] CHIP:DMG:                                         Attribute = 0x0000_0011,
-          [1657715287.201686][5956:5961] CHIP:DMG:                                 }
-          [1657715287.201889][5956:5961] CHIP:DMG:
-          [1657715287.201987][5956:5961] CHIP:DMG:                                 Data = 1,
-          [1657715287.202074][5956:5961] CHIP:DMG:                         },
-          [1657715287.202157][5956:5961] CHIP:DMG:
-          [1657715287.202221][5956:5961] CHIP:DMG:                 },
-          [1657715287.202296][5956:5961] CHIP:DMG:
-          [1657715287.202354][5956:5961] CHIP:DMG:         ],
-          [1657715287.202429][5956:5961] CHIP:DMG:
-          [1657715287.202488][5956:5961] CHIP:DMG:         InteractionModelRevision = 1
-          [1657715287.202546][5956:5961] CHIP:DMG: }
-          [1657715287.202754][5956:5961] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0008 Attribute 0x0000_0011 DataVersion: 832499112
-          [1657715287.202838][5956:5961] CHIP:TOO:   on level: 1
-          [1657715287.202937][5956:5961] CHIP:DMG: Refresh LivenessCheckTime for 125000 milliseconds with SubscriptionId = 0xb6497be6 Peer = 01:0000000000000001
-
-           onoff write start-up-on-off  1 1 1
-          [1657715357.628508][5956:5961] CHIP:DMG: ReportDataMessage =
-          [1657715357.628536][5956:5961] CHIP:DMG: {
-          [1657715357.628561][5956:5961] CHIP:DMG:         SubscriptionId = 0x9fce63ae,
-          [1657715357.628586][5956:5961] CHIP:DMG:         AttributeReportIBs =
-          [1657715357.628618][5956:5961] CHIP:DMG:         [
-          [1657715357.628643][5956:5961] CHIP:DMG:                 AttributeReportIB =
-          [1657715357.628676][5956:5961] CHIP:DMG:                 {
-          [1657715357.628702][5956:5961] CHIP:DMG:                         AttributeDataIB =
-          [1657715357.628735][5956:5961] CHIP:DMG:                         {
-          [1657715357.628763][5956:5961] CHIP:DMG:                                 DataVersion = 0x734a2d85,
-          [1657715357.628791][5956:5961] CHIP:DMG:                                 AttributePathIB =
-          [1657715357.628822][5956:5961] CHIP:DMG:                                 {
-          [1657715357.628853][5956:5961] CHIP:DMG:                                         Endpoint = 0x1,
-          [1657715357.628882][5956:5961] CHIP:DMG:                                         Cluster = 0x6,
-          [1657715357.628914][5956:5961] CHIP:DMG:                                         Attribute = 0x0000_4003,
-          [1657715357.628944][5956:5961] CHIP:DMG:                                 }
-          [1657715357.628977][5956:5961] CHIP:DMG:
-          [1657715357.629009][5956:5961] CHIP:DMG:                                 Data = 1,
-          [1657715357.629037][5956:5961] CHIP:DMG:                         },
-          [1657715357.629068][5956:5961] CHIP:DMG:
-          [1657715357.629093][5956:5961] CHIP:DMG:                 },
-          [1657715357.629123][5956:5961] CHIP:DMG:
-          [1657715357.629147][5956:5961] CHIP:DMG:         ],
-          [1657715357.629177][5956:5961] CHIP:DMG:
-          [1657715357.629201][5956:5961] CHIP:DMG:         InteractionModelRevision = 1
-          [1657715357.629225][5956:5961] CHIP:DMG: }
-          [1657715357.629340][5956:5961] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0006 Attribute 0x0000_4003 DataVersion: 1934241157
-          [1657715357.629432][5956:5961] CHIP:TOO:   StartUpOnOff: 1
-          [1657715357.629480][5956:5961] CHIP:DMG: Refresh LivenessCheckTime for 125000 milliseconds with SubscriptionId = 0x9fce63ae Peer = 01:0000000000000001
+          [1660653595.182209][58131:58136] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0028 Attribute 0x0000_0005 DataVersion: 378218970
+          [1660653595.182295][58131:58136] CHIP:TOO:   NodeLabel: "newnode"
+          [1660653595.182400][58131:58136] CHIP:DMG: Refresh LivenessCheckTime for 1025000 milliseconds with SubscriptionId = 0x50d42ftc Peer = 01:0000000000000001
 
 
-          on the 2nd reference deice enter below mentioned commands to change the attribute values
-           any write-by-id 0x0008 0x0010 1 1 1
-          [1657715446.002084][5956:5961] CHIP:DMG: ReportDataMessage =
-          [1657715446.002120][5956:5961] CHIP:DMG: {
-          [1657715446.002151][5956:5961] CHIP:DMG:         SubscriptionId = 0x9c90104c,
-          [1657715446.002200][5956:5961] CHIP:DMG:         AttributeReportIBs =
-          [1657715446.002242][5956:5961] CHIP:DMG:         [
-          [1657715446.002273][5956:5961] CHIP:DMG:                 AttributeReportIB =
-          [1657715446.002332][5956:5961] CHIP:DMG:                 {
-          [1657715446.002379][5956:5961] CHIP:DMG:                         AttributeDataIB =
-          [1657715446.002434][5956:5961] CHIP:DMG:                         {
-          [1657715446.002489][5956:5961] CHIP:DMG:                                 DataVersion = 0x319eeda9,
-          [1657715446.002542][5956:5961] CHIP:DMG:                                 AttributePathIB =
-          [1657715446.002598][5956:5961] CHIP:DMG:                                 {
-          [1657715446.002654][5956:5961] CHIP:DMG:                                         Endpoint = 0x1,
-          [1657715446.002703][5956:5961] CHIP:DMG:                                         Cluster = 0x8,
-          [1657715446.002752][5956:5961] CHIP:DMG:                                         Attribute = 0x0000_0010,
-          [1657715446.002795][5956:5961] CHIP:DMG:                                 }
-          [1657715446.002838][5956:5961] CHIP:DMG:
-          [1657715446.002881][5956:5961] CHIP:DMG:                                 Data = 1,
-          [1657715446.002921][5956:5961] CHIP:DMG:                         },
-          [1657715446.002963][5956:5961] CHIP:DMG:
-          [1657715446.002996][5956:5961] CHIP:DMG:                 },
-          [1657715446.003039][5956:5961] CHIP:DMG:
-          [1657715446.003069][5956:5961] CHIP:DMG:         ],
-          [1657715446.003107][5956:5961] CHIP:DMG:
-          [1657715446.003138][5956:5961] CHIP:DMG:         InteractionModelRevision = 1
-          [1657715446.003169][5956:5961] CHIP:DMG: }
-          [1657715446.003278][5956:5961] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0008 Attribute 0x0000_0010 DataVersion: 832499113
-          [1657715446.003322][5956:5961] CHIP:TOO:   on off transition time: 1
-          [1657715446.003375][5956:5961] CHIP:DMG: Refresh LivenessCheckTime for 125000 milliseconds with SubscriptionId = 0x9c90104c Peer = 01:0000000000000001
-
-           basic write node-label  1  1 0
-          [1657715530.832949][5956:5961] CHIP:DMG: ReportDataMessage =
-          [1657715530.832977][5956:5961] CHIP:DMG: {
-          [1657715530.833000][5956:5961] CHIP:DMG:         SubscriptionId = 0xfd355fe5,
-          [1657715530.833024][5956:5961] CHIP:DMG:         AttributeReportIBs =
-          [1657715530.833063][5956:5961] CHIP:DMG:         [
-          [1657715530.833091][5956:5961] CHIP:DMG:                 AttributeReportIB =
-          [1657715530.833133][5956:5961] CHIP:DMG:                 {
-          [1657715530.833165][5956:5961] CHIP:DMG:                         AttributeDataIB =
-          [1657715530.833205][5956:5961] CHIP:DMG:                         {
-          [1657715530.833243][5956:5961] CHIP:DMG:                                 DataVersion = 0x1b93dc31,
-          [1657715530.833279][5956:5961] CHIP:DMG:                                 AttributePathIB =
-          [1657715530.833342][5956:5961] CHIP:DMG:                                 {
-          [1657715530.833382][5956:5961] CHIP:DMG:                                         Endpoint = 0x0,
-          [1657715530.833422][5956:5961] CHIP:DMG:                                         Cluster = 0x28,
-          [1657715530.833466][5956:5961] CHIP:DMG:                                         Attribute = 0x0000_0005,
-          [1657715530.833505][5956:5961] CHIP:DMG:                                 }
-          [1657715530.833546][5956:5961] CHIP:DMG:
-          [1657715530.833587][5956:5961] CHIP:DMG:                                 Data = "1",
-          [1657715530.833623][5956:5961] CHIP:DMG:                         },
-          [1657715530.833662][5956:5961] CHIP:DMG:
-          [1657715530.833693][5956:5961] CHIP:DMG:                 },
-          [1657715530.833730][5956:5961] CHIP:DMG:
-          [1657715530.833760][5956:5961] CHIP:DMG:         ],
-          [1657715530.833794][5956:5961] CHIP:DMG:
-          [1657715530.833822][5956:5961] CHIP:DMG:         InteractionModelRevision = 1
-          [1657715530.833851][5956:5961] CHIP:DMG: }
-          [1657715530.833959][5956:5961] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0028 Attribute 0x0000_0005 DataVersion: 462674993
-          [1657715530.833999][5956:5961] CHIP:TOO:   NodeLabel: 1
-          [1657715530.834171][5956:5961] CHIP:DMG: Refresh LivenessCheckTime for 125000 milliseconds with SubscriptionId = 0xfd355fe5 Peer = 01:0000000000000001
+          [1660653646.569682][58143:58148] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0028 Attribute 0x0000_0006 DataVersion: 3782190840
+          [1660653646.569713][58143:58148] CHIP:TOO:   Location: in
+          [1660653646.569762][58143:58148] CHIP:DMG: Refresh LivenessCheckTime for 1025000 milliseconds with SubscriptionId = 0xfed77bda Peer = 02:0000000000000002
 
 
-
-           levelcontrol write options  1 1 1
-          [1657715624.029906][5956:5961] CHIP:DMG: ReportDataMessage =
-          [1657715624.029977][5956:5961] CHIP:DMG: {
-          [1657715624.030039][5956:5961] CHIP:DMG:         SubscriptionId = 0x96289376,
-          [1657715624.030101][5956:5961] CHIP:DMG:         AttributeReportIBs =
-          [1657715624.030179][5956:5961] CHIP:DMG:         [
-          [1657715624.030241][5956:5961] CHIP:DMG:                 AttributeReportIB =
-          [1657715624.030321][5956:5961] CHIP:DMG:                 {
-          [1657715624.030377][5956:5961] CHIP:DMG:                         AttributeDataIB =
-          [1657715624.030438][5956:5961] CHIP:DMG:                         {
-          [1657715624.030501][5956:5961] CHIP:DMG:                                 DataVersion = 0x319eedab,
-          [1657715624.030580][5956:5961] CHIP:DMG:                                 AttributePathIB =
-          [1657715624.030673][5956:5961] CHIP:DMG:                                 {
-          [1657715624.030757][5956:5961] CHIP:DMG:                                         Endpoint = 0x1,
-          [1657715624.030843][5956:5961] CHIP:DMG:                                         Cluster = 0x8,
-          [1657715624.030937][5956:5961] CHIP:DMG:                                         Attribute = 0x0000_000F,
-          [1657715624.031017][5956:5961] CHIP:DMG:                                 }
-          [1657715624.031103][5956:5961] CHIP:DMG:
-          [1657715624.031177][5956:5961] CHIP:DMG:                                 Data = 1,
-          [1657715624.031214][5956:5961] CHIP:DMG:                         },
-          [1657715624.031252][5956:5961] CHIP:DMG:
-          [1657715624.031339][5956:5961] CHIP:DMG:                 },
-          [1657715624.031378][5956:5961] CHIP:DMG:
-          [1657715624.031406][5956:5961] CHIP:DMG:         ],
-          [1657715624.031438][5956:5961] CHIP:DMG:
-          [1657715624.031461][5956:5961] CHIP:DMG:         InteractionModelRevision = 1
-          [1657715624.031484][5956:5961] CHIP:DMG: }
-          [1657715624.031584][5956:5961] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0008 Attribute 0x0000_000F DataVersion: 832499115
-          [1657715624.031621][5956:5961] CHIP:TOO:   options: 1
-          [1657715624.031667][5956:5961] CHIP:DMG: Refresh LivenessCheckTime for 125000 milliseconds with SubscriptionId = 0x96289376 Peer = 01:0000000000000001
-
-
-          on the 3rd reference deice enter below mentioned commands to change the attribute values
-            basic write  local-config-disabled 1 1 0
-          [1657715793.400009][5956:5961] CHIP:DMG: ReportDataMessage =
-          [1657715793.400035][5956:5961] CHIP:DMG: {
-          [1657715793.400059][5956:5961] CHIP:DMG:         SubscriptionId = 0xe65b5e5,
-          [1657715793.400083][5956:5961] CHIP:DMG:         AttributeReportIBs =
-          [1657715793.400114][5956:5961] CHIP:DMG:         [
-          [1657715793.400138][5956:5961] CHIP:DMG:                 AttributeReportIB =
-          [1657715793.400170][5956:5961] CHIP:DMG:                 {
-          [1657715793.400195][5956:5961] CHIP:DMG:                         AttributeDataIB =
-          [1657715793.400223][5956:5961] CHIP:DMG:                         {
-          [1657715793.400252][5956:5961] CHIP:DMG:                                 DataVersion = 0x1b93dc36,
-          [1657715793.400280][5956:5961] CHIP:DMG:                                 AttributePathIB =
-          [1657715793.400310][5956:5961] CHIP:DMG:                                 {
-          [1657715793.400340][5956:5961] CHIP:DMG:                                         Endpoint = 0x0,
-          [1657715793.400372][5956:5961] CHIP:DMG:                                         Cluster = 0x28,
-          [1657715793.400403][5956:5961] CHIP:DMG:                                         Attribute = 0x0000_0010,
-          [1657715793.400432][5956:5961] CHIP:DMG:                                 }
-          [1657715793.400464][5956:5961] CHIP:DMG:
-          [1657715793.400495][5956:5961] CHIP:DMG:                                 Data = true,
-          [1657715793.400522][5956:5961] CHIP:DMG:                         },
-          [1657715793.400553][5956:5961] CHIP:DMG:
-          [1657715793.400578][5956:5961] CHIP:DMG:                 },
-          [1657715793.400607][5956:5961] CHIP:DMG:
-          [1657715793.400630][5956:5961] CHIP:DMG:         ],
-          [1657715793.400659][5956:5961] CHIP:DMG:
-          [1657715793.400681][5956:5961] CHIP:DMG:         InteractionModelRevision = 1
-          [1657715793.400703][5956:5961] CHIP:DMG: }
-          [1657715793.400800][5956:5961] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0028 Attribute 0x0000_0010 DataVersion: 462674998
-          [1657715793.400834][5956:5961] CHIP:TOO:   LocalConfigDisabled: TRUE
-          [1657715793.400875][5956:5961] CHIP:DMG: Refresh LivenessCheckTime for 125000 milliseconds with SubscriptionId = 0x0e65b5e5 Peer = 01:0000000000000001
-
-
-          colorcontrol write start-up-color-temperature-mireds 1 1 1
-          [1657715994.727404][5956:5961] CHIP:DMG: ReportDataMessage =
-          [1657715994.727477][5956:5961] CHIP:DMG: {
-          [1657715994.727539][5956:5961] CHIP:DMG:         SubscriptionId = 0x71492e8f,
-          [1657715994.727600][5956:5961] CHIP:DMG:         AttributeReportIBs =
-          [1657715994.727676][5956:5961] CHIP:DMG:         [
-          [1657715994.727737][5956:5961] CHIP:DMG:                 AttributeReportIB =
-          [1657715994.727815][5956:5961] CHIP:DMG:                 {
-          [1657715994.727878][5956:5961] CHIP:DMG:                         AttributeDataIB =
-          [1657715994.727977][5956:5961] CHIP:DMG:                         {
-          [1657715994.728062][5956:5961] CHIP:DMG:                                 DataVersion = 0x30f1c30f,
-          [1657715994.728141][5956:5961] CHIP:DMG:                                 AttributePathIB =
-          [1657715994.728224][5956:5961] CHIP:DMG:                                 {
-          [1657715994.728309][5956:5961] CHIP:DMG:                                         Endpoint = 0x1,
-          [1657715994.728398][5956:5961] CHIP:DMG:                                         Cluster = 0x300,
-          [1657715994.728486][5956:5961] CHIP:DMG:                                         Attribute = 0x0000_4010,
-          [1657715994.728574][5956:5961] CHIP:DMG:                                 }
-          [1657715994.728777][5956:5961] CHIP:DMG:
-          [1657715994.728874][5956:5961] CHIP:DMG:                                 Data = 1,
-          [1657715994.728952][5956:5961] CHIP:DMG:                         },
-          [1657715994.729042][5956:5961] CHIP:DMG:
-          [1657715994.729110][5956:5961] CHIP:DMG:                 },
-          [1657715994.729185][5956:5961] CHIP:DMG:
-          [1657715994.729246][5956:5961] CHIP:DMG:         ],
-          [1657715994.729383][5956:5961] CHIP:DMG:
-          [1657715994.729445][5956:5961] CHIP:DMG:         InteractionModelRevision = 1
-          [1657715994.729504][5956:5961] CHIP:DMG: }
-          [1657715994.729713][5956:5961] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0300 Attribute 0x0000_4010 DataVersion: 821150479
-          [1657715994.729796][5956:5961] CHIP:TOO:   StartUpColorTemperatureMireds: 1
-          [1657715994.729895][5956:5961] CHIP:DMG: Refresh LivenessCheckTime for 125000 milliseconds with SubscriptionId = 0x71492e8f Peer = 01:0000000000000001
-
-
-          identify write identify-time 1 1 1
-          [1657716094.853203][5956:5961] CHIP:DMG: ReportDataMessage =
-          [1657716094.853245][5956:5961] CHIP:DMG: {
-          [1657716094.853364][5956:5961] CHIP:DMG:         SubscriptionId = 0xd5e59a1a,
-          [1657716094.853415][5956:5961] CHIP:DMG:         AttributeReportIBs =
-          [1657716094.853517][5956:5961] CHIP:DMG:         [
-          [1657716094.853578][5956:5961] CHIP:DMG:                 AttributeReportIB =
-          [1657716094.853658][5956:5961] CHIP:DMG:                 {
-          [1657716094.853743][5956:5961] CHIP:DMG:                         AttributeDataIB =
-          [1657716094.853825][5956:5961] CHIP:DMG:                         {
-          [1657716094.853905][5956:5961] CHIP:DMG:                                 DataVersion = 0xdefea11d,
-          [1657716094.854010][5956:5961] CHIP:DMG:                                 AttributePathIB =
-          [1657716094.854093][5956:5961] CHIP:DMG:                                 {
-          [1657716094.854197][5956:5961] CHIP:DMG:                                         Endpoint = 0x1,
-          [1657716094.854307][5956:5961] CHIP:DMG:                                         Cluster = 0x3,
-          [1657716094.854394][5956:5961] CHIP:DMG:                                         Attribute = 0x0000_0000,
-          [1657716094.854495][5956:5961] CHIP:DMG:                                 }
-          [1657716094.854599][5956:5961] CHIP:DMG:
-          [1657716094.854685][5956:5961] CHIP:DMG:                                 Data = 1,
-          [1657716094.854789][5956:5961] CHIP:DMG:                         },
-          [1657716094.854891][5956:5961] CHIP:DMG:
-          [1657716094.854960][5956:5961] CHIP:DMG:                 },
-          [1657716094.855035][5956:5961] CHIP:DMG:
-          [1657716094.855094][5956:5961] CHIP:DMG:         ],
-          [1657716094.855168][5956:5961] CHIP:DMG:
-          [1657716094.855227][5956:5961] CHIP:DMG:         InteractionModelRevision = 1
-          [1657716094.855284][5956:5961] CHIP:DMG: }
-          [1657716094.855493][5956:5961] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0003 Attribute 0x0000_0000 DataVersion: 3741229341
-          [1657716094.855573][5956:5961] CHIP:TOO:   identify time: 1
-          [1657716094.855675][5956:5961] CHIP:DMG: Refresh LivenessCheckTime for 125000 milliseconds with SubscriptionId = 0xd5e59a1a Peer = 01:0000000000000001
+          [1660653666.031584][58149:58154] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0028 Attribute 0x0000_0010 DataVersion: 3782190981
+          [1660653666.031617][58149:58154] CHIP:TOO:   LocalConfigDisabled: TRUE
+          [1660653666.031655][58149:58154] CHIP:DMG: Refresh LivenessCheckTime for 1025000 milliseconds with SubscriptionId = 0x5310d5l0 Peer = 03:0000000000
       disabled: true
 
     - label:
@@ -653,339 +737,316 @@
       verification: |
           Please  run this test in chip tool interactive mode ./chip-tool interactive start
 
+          Example commands given below are using 5 reference devices (User can use 5 reference devices and send the below command in from each reference device)
+
           Send 3 Subscriptionrequest message from each Reference Device(Eg. RD1...) to DUT
           and verify all the subscription requests are succes. and in The subscription request from RD1 should contain 4 paths, Verify that the subscriptions from RD2, RD3, RD4 and RD5 are not affected.
 
-          Example commands given below are using 3 reference device (User can use 5 reference device and send the below command in from each reference device)
+          on the first reference device(RD1)  send 3 Subscribe Request Messages to DUT.
+           basic subscribe node-label 100 1000 1  0  --keepSubscriptions 1
+          [1660652952.537644][58131:58136] CHIP:EM: Removed CHIP MessageCounter:11153878 from RetransTable on exchange 57366i
+          [1660652952.537721][58131:58136] CHIP:DMG: ReportDataMessage =
+          [1660652952.537759][58131:58136] CHIP:DMG: {
+          [1660652952.537794][58131:58136] CHIP:DMG:         SubscriptionId = 0x50d4243c,
+          [1660652952.537829][58131:58136] CHIP:DMG:         AttributeReportIBs =
+          [1660652952.537873][58131:58136] CHIP:DMG:         [
+          [1660652952.537907][58131:58136] CHIP:DMG:                 AttributeReportIB =
+          [1660652952.537964][58131:58136] CHIP:DMG:                 {
+          [1660652952.538008][58131:58136] CHIP:DMG:                         AttributeDataIB =
+          [1660652952.538055][58131:58136] CHIP:DMG:                         {
+          [1660652952.538106][58131:58136] CHIP:DMG:                                 DataVersion = 0xe16fa6f6,
+          [1660652952.538152][58131:58136] CHIP:DMG:                                 AttributePathIB =
+          [1660652952.538205][58131:58136] CHIP:DMG:                                 {
+          [1660652952.538254][58131:58136] CHIP:DMG:                                         Endpoint = 0x0,
+          [1660652952.538308][58131:58136] CHIP:DMG:                                         Cluster = 0x28,
+          [1660652952.538358][58131:58136] CHIP:DMG:                                         Attribute = 0x0000_0005,
+          [1660652952.538409][58131:58136] CHIP:DMG:                                 }
+          [1660652952.538465][58131:58136] CHIP:DMG:
+          [1660652952.538517][58131:58136] CHIP:DMG:                                 Data = "" (0 chars),
+          [1660652952.538562][58131:58136] CHIP:DMG:                         },
+          [1660652952.538615][58131:58136] CHIP:DMG:
+          [1660652952.538654][58131:58136] CHIP:DMG:                 },
+          [1660652952.538700][58131:58136] CHIP:DMG:
+          [1660652952.538734][58131:58136] CHIP:DMG:         ],
+          [1660652952.538777][58131:58136] CHIP:DMG:
+          [1660652952.538811][58131:58136] CHIP:DMG:         InteractionModelRevision = 1
+          [1660652952.538844][58131:58136] CHIP:DMG: }
+          [1660652952.539010][58131:58136] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0028 Attribute 0x0000_0005 DataVersion: 3782190838
+          [1660652952.539073][58131:58136] CHIP:TOO:   NodeLabel:
+          [1660652952.539140][58131:58136] CHIP:DMG: MoveToState ReadClient[0xffffa0004bc0]: Moving to [AwaitingSu]
 
 
-          on the first reference deice enter:
-
-           any subscribe-by-id 0x0008 0x0010 10 100   1 1
-
-          [1657716563.242433][6034:6039] CHIP:DMG: ReportDataMessage =
-          [1657716563.242475][6034:6039] CHIP:DMG: {
-          [1657716563.242507][6034:6039] CHIP:DMG:         SubscriptionId = 0xebc26cc4,
-          [1657716563.242538][6034:6039] CHIP:DMG:         AttributeReportIBs =
-          [1657716563.242577][6034:6039] CHIP:DMG:         [
-          [1657716563.242607][6034:6039] CHIP:DMG:                 AttributeReportIB =
-          [1657716563.242648][6034:6039] CHIP:DMG:                 {
-          [1657716563.242680][6034:6039] CHIP:DMG:                         AttributeDataIB =
-          [1657716563.242721][6034:6039] CHIP:DMG:                         {
-          [1657716563.242762][6034:6039] CHIP:DMG:                                 DataVersion = 0x319eedab,
-          [1657716563.242801][6034:6039] CHIP:DMG:                                 AttributePathIB =
-          [1657716563.242842][6034:6039] CHIP:DMG:                                 {
-          [1657716563.242883][6034:6039] CHIP:DMG:                                         Endpoint = 0x1,
-          [1657716563.242928][6034:6039] CHIP:DMG:                                         Cluster = 0x8,
-          [1657716563.242971][6034:6039] CHIP:DMG:                                         Attribute = 0x0000_0010,
-          [1657716563.243012][6034:6039] CHIP:DMG:                                 }
-          [1657716563.243056][6034:6039] CHIP:DMG:
-          [1657716563.243100][6034:6039] CHIP:DMG:                                 Data = 1,
-          [1657716563.243138][6034:6039] CHIP:DMG:                         },
-          [1657716563.243179][6034:6039] CHIP:DMG:
-          [1657716563.243213][6034:6039] CHIP:DMG:                 },
-          [1657716563.243251][6034:6039] CHIP:DMG:
-          [1657716563.243280][6034:6039] CHIP:DMG:         ],
-          [1657716563.243318][6034:6039] CHIP:DMG:
-          [1657716563.243348][6034:6039] CHIP:DMG:         InteractionModelRevision = 1
-          [1657716563.243377][6034:6039] CHIP:DMG: }
-          [1657716563.243531][6034:6039] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0008 Attribute 0x0000_0010 DataVersion: 832499115
-          [1657716563.243601][6034:6039] CHIP:TOO:   on off transition time: 1
-          [1657716563.243648][6034:6039] CHIP:DMG: MoveToState ReadClient[0xffff8c008e30]: Moving to [AwaitingSu]
+           basic subscribe location 100 1000 1  0   --keepSubscriptions 1
+          [1660653005.341371][58131:58136] CHIP:DMG: ReportDataMessage =
+          [1660653005.341441][58131:58136] CHIP:DMG: {
+          [1660653005.341503][58131:58136] CHIP:DMG:         SubscriptionId = 0xea4facb0,
+          [1660653005.341568][58131:58136] CHIP:DMG:         AttributeReportIBs =
+          [1660653005.341648][58131:58136] CHIP:DMG:         [
+          [1660653005.341711][58131:58136] CHIP:DMG:                 AttributeReportIB =
+          [1660653005.341808][58131:58136] CHIP:DMG:                 {
+          [1660653005.341881][58131:58136] CHIP:DMG:                         AttributeDataIB =
+          [1660653005.341972][58131:58136] CHIP:DMG:                         {
+          [1660653005.342065][58131:58136] CHIP:DMG:                                 DataVersion = 0xe16fa6f6,
+          [1660653005.342148][58131:58136] CHIP:DMG:                                 AttributePathIB =
+          [1660653005.342244][58131:58136] CHIP:DMG:                                 {
+          [1660653005.342340][58131:58136] CHIP:DMG:                                         Endpoint = 0x0,
+          [1660653005.342436][58131:58136] CHIP:DMG:                                         Cluster = 0x28,
+          [1660653005.342528][58131:58136] CHIP:DMG:                                         Attribute = 0x0000_0006,
+          [1660653005.342616][58131:58136] CHIP:DMG:                                 }
+          [1660653005.342708][58131:58136] CHIP:DMG:
+          [1660653005.342801][58131:58136] CHIP:DMG:                                 Data = "XX" (2 chars),
+          [1660653005.342883][58131:58136] CHIP:DMG:                         },
+          [1660653005.342972][58131:58136] CHIP:DMG:
+          [1660653005.343045][58131:58136] CHIP:DMG:                 },
+          [1660653005.343129][58131:58136] CHIP:DMG:
+          [1660653005.343191][58131:58136] CHIP:DMG:         ],
+          [1660653005.343270][58131:58136] CHIP:DMG:
+          [1660653005.343331][58131:58136] CHIP:DMG:         InteractionModelRevision = 1
+          [1660653005.343392][58131:58136] CHIP:DMG: }
+          [1660653005.343616][58131:58136] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0028 Attribute 0x0000_0006 DataVersion: 3782190838
+          [1660653005.343884][58131:58136] CHIP:TOO:   Location: XX
+          [1660653005.343983][58131:58136] CHIP:DMG: MoveToState ReadClient[0xffffa00129b0]: Moving to [AwaitingSu]
 
 
 
-            basic subscribe node-label 10 100  1 0
-          [1657716599.928585][6034:6039] CHIP:DMG: ReportDataMessage =
-          [1657716599.928652][6034:6039] CHIP:DMG: {
-          [1657716599.928825][6034:6039] CHIP:DMG:         SubscriptionId = 0x3d9f1c1,
-          [1657716599.928890][6034:6039] CHIP:DMG:         AttributeReportIBs =
-          [1657716599.928968][6034:6039] CHIP:DMG:         [
-          [1657716599.929029][6034:6039] CHIP:DMG:                 AttributeReportIB =
-          [1657716599.929122][6034:6039] CHIP:DMG:                 {
-          [1657716599.929192][6034:6039] CHIP:DMG:                         AttributeDataIB =
-          [1657716599.929278][6034:6039] CHIP:DMG:                         {
-          [1657716599.929399][6034:6039] CHIP:DMG:                                 DataVersion = 0x1b93dc36,
-          [1657716599.929476][6034:6039] CHIP:DMG:                                 AttributePathIB =
-          [1657716599.929687][6034:6039] CHIP:DMG:                                 {
-          [1657716599.929774][6034:6039] CHIP:DMG:                                         Endpoint = 0x0,
-          [1657716599.929861][6034:6039] CHIP:DMG:                                         Cluster = 0x28,
-          [1657716599.929949][6034:6039] CHIP:DMG:                                         Attribute = 0x0000_0005,
-          [1657716599.930031][6034:6039] CHIP:DMG:                                 }
-          [1657716599.930115][6034:6039] CHIP:DMG:
-          [1657716599.930285][6034:6039] CHIP:DMG:                                 Data = "1",
-          [1657716599.930370][6034:6039] CHIP:DMG:                         },
-          [1657716599.930454][6034:6039] CHIP:DMG:
-          [1657716599.930578][6034:6039] CHIP:DMG:                 },
-          [1657716599.930660][6034:6039] CHIP:DMG:
-          [1657716599.930720][6034:6039] CHIP:DMG:         ],
-          [1657716599.930796][6034:6039] CHIP:DMG:
-          [1657716599.930856][6034:6039] CHIP:DMG:         InteractionModelRevision = 1
-          [1657716599.930914][6034:6039] CHIP:DMG: }
-          [1657716599.931131][6034:6039] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0028 Attribute 0x0000_0005 DataVersion: 462674998
-          [1657716599.931326][6034:6039] CHIP:TOO:   NodeLabel: 1
-          [1657716599.931420][6034:6039] CHIP:DMG: MoveToState ReadClient[0xffff8c008f20]: Moving to [AwaitingSu]
-
-          onoff  subscribe on-time  10 100  1 1
-          [1657716634.400468][6034:6039] CHIP:DMG: ReportDataMessage =
-          [1657716634.400499][6034:6039] CHIP:DMG: {
-          [1657716634.400525][6034:6039] CHIP:DMG:         SubscriptionId = 0xf9b815a2,
-          [1657716634.400551][6034:6039] CHIP:DMG:         AttributeReportIBs =
-          [1657716634.400585][6034:6039] CHIP:DMG:         [
-          [1657716634.400610][6034:6039] CHIP:DMG:                 AttributeReportIB =
-          [1657716634.400647][6034:6039] CHIP:DMG:                 {
-          [1657716634.400674][6034:6039] CHIP:DMG:                         AttributeDataIB =
-          [1657716634.400705][6034:6039] CHIP:DMG:                         {
-          [1657716634.400739][6034:6039] CHIP:DMG:                                 DataVersion = 0x734a2d85,
-          [1657716634.400775][6034:6039] CHIP:DMG:                                 AttributePathIB =
-          [1657716634.400809][6034:6039] CHIP:DMG:                                 {
-          [1657716634.400847][6034:6039] CHIP:DMG:                                         Endpoint = 0x1,
-          [1657716634.400883][6034:6039] CHIP:DMG:                                         Cluster = 0x6,
-          [1657716634.400920][6034:6039] CHIP:DMG:                                         Attribute = 0x0000_4001,
-          [1657716634.400950][6034:6039] CHIP:DMG:                                 }
-          [1657716634.400987][6034:6039] CHIP:DMG:
-          [1657716634.401024][6034:6039] CHIP:DMG:                                 Data = 1,
-          [1657716634.401058][6034:6039] CHIP:DMG:                         },
-          [1657716634.401092][6034:6039] CHIP:DMG:
-          [1657716634.401117][6034:6039] CHIP:DMG:                 },
-          [1657716634.401148][6034:6039] CHIP:DMG:
-          [1657716634.401172][6034:6039] CHIP:DMG:         ],
-          [1657716634.401202][6034:6039] CHIP:DMG:
-          [1657716634.401227][6034:6039] CHIP:DMG:         InteractionModelRevision = 1
-          [1657716634.401250][6034:6039] CHIP:DMG: }
-          [1657716634.401383][6034:6039] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0006 Attribute 0x0000_4001 DataVersion: 1934241157
-          [1657716634.401428][6034:6039] CHIP:TOO:   OnTime: 1
-          [1657716634.401466][6034:6039] CHIP:DMG: MoveToState ReadClient[0xffff8c008c70]: Moving to [AwaitingSu]
-
-
-          levelcontrol  subscribe  on-level 10 100  1 1
-          [1657716667.237484][6034:6039] CHIP:DMG: ReportDataMessage =
-          [1657716667.237515][6034:6039] CHIP:DMG: {
-          [1657716667.237541][6034:6039] CHIP:DMG:         SubscriptionId = 0xe457240d,
-          [1657716667.237571][6034:6039] CHIP:DMG:         AttributeReportIBs =
-          [1657716667.237738][6034:6039] CHIP:DMG:         [
-          [1657716667.237768][6034:6039] CHIP:DMG:                 AttributeReportIB =
-          [1657716667.237819][6034:6039] CHIP:DMG:                 {
-          [1657716667.237850][6034:6039] CHIP:DMG:                         AttributeDataIB =
-          [1657716667.237897][6034:6039] CHIP:DMG:                         {
-          [1657716667.237944][6034:6039] CHIP:DMG:                                 DataVersion = 0x319eedab,
-          [1657716667.237993][6034:6039] CHIP:DMG:                                 AttributePathIB =
-          [1657716667.238044][6034:6039] CHIP:DMG:                                 {
-          [1657716667.238094][6034:6039] CHIP:DMG:                                         Endpoint = 0x1,
-          [1657716667.238145][6034:6039] CHIP:DMG:                                         Cluster = 0x8,
-          [1657716667.238196][6034:6039] CHIP:DMG:                                         Attribute = 0x0000_0011,
-          [1657716667.238244][6034:6039] CHIP:DMG:                                 }
-          [1657716667.238294][6034:6039] CHIP:DMG:
-          [1657716667.238345][6034:6039] CHIP:DMG:                                 Data = 1,
-          [1657716667.238391][6034:6039] CHIP:DMG:                         },
-          [1657716667.238437][6034:6039] CHIP:DMG:
-          [1657716667.238467][6034:6039] CHIP:DMG:                 },
-          [1657716667.238509][6034:6039] CHIP:DMG:
-          [1657716667.238535][6034:6039] CHIP:DMG:         ],
-          [1657716667.238567][6034:6039] CHIP:DMG:
-          [1657716667.238591][6034:6039] CHIP:DMG:         InteractionModelRevision = 1
-          [1657716667.238614][6034:6039] CHIP:DMG: }
-          [1657716667.238709][6034:6039] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0008 Attribute 0x0000_0011 DataVersion: 832499115
-          [1657716667.238752][6034:6039] CHIP:TOO:   on level: 1
-          [1657716667.238790][6034:6039] CHIP:DMG: MoveToState ReadClient[0xffff8c0092b0]: Moving to [AwaitingSu]
+           basic subscribe  local-config-disabled 100 1000 1  0   --keepSubscriptions 1
+          [1660653043.575397][58131:58136] CHIP:DMG: ReportDataMessage =
+          [1660653043.575423][58131:58136] CHIP:DMG: {
+          [1660653043.575445][58131:58136] CHIP:DMG:         SubscriptionId = 0x1ff9dbc5,
+          [1660653043.575467][58131:58136] CHIP:DMG:         AttributeReportIBs =
+          [1660653043.575504][58131:58136] CHIP:DMG:         [
+          [1660653043.575526][58131:58136] CHIP:DMG:                 AttributeReportIB =
+          [1660653043.575556][58131:58136] CHIP:DMG:                 {
+          [1660653043.575579][58131:58136] CHIP:DMG:                         AttributeDataIB =
+          [1660653043.575605][58131:58136] CHIP:DMG:                         {
+          [1660653043.575633][58131:58136] CHIP:DMG:                                 DataVersion = 0xe16fa6f6,
+          [1660653043.575658][58131:58136] CHIP:DMG:                                 AttributePathIB =
+          [1660653043.575686][58131:58136] CHIP:DMG:                                 {
+          [1660653043.575713][58131:58136] CHIP:DMG:                                         Endpoint = 0x0,
+          [1660653043.575743][58131:58136] CHIP:DMG:                                         Cluster = 0x28,
+          [1660653043.575806][58131:58136] CHIP:DMG:                                         Attribute = 0x0000_0010,
+          [1660653043.575833][58131:58136] CHIP:DMG:                                 }
+          [1660653043.575863][58131:58136] CHIP:DMG:
+          [1660653043.575892][58131:58136] CHIP:DMG:                                 Data = false,
+          [1660653043.575917][58131:58136] CHIP:DMG:                         },
+          [1660653043.575944][58131:58136] CHIP:DMG:
+          [1660653043.575966][58131:58136] CHIP:DMG:                 },
+          [1660653043.575993][58131:58136] CHIP:DMG:
+          [1660653043.576013][58131:58136] CHIP:DMG:         ],
+          [1660653043.576041][58131:58136] CHIP:DMG:
+          [1660653043.576063][58131:58136] CHIP:DMG:         InteractionModelRevision = 1
+          [1660653043.576084][58131:58136] CHIP:DMG: }
+          [1660653043.576169][58131:58136] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0028 Attribute 0x0000_0010 DataVersion: 3782190838
+          [1660653043.576207][58131:58136] CHIP:TOO:   LocalConfigDisabled: FALSE
+          [1660653043.576240][58131:58136] CHIP:DMG: MoveToState ReadClient[0xffffa0012b40]: Moving to [AwaitingSu]
 
 
 
-          on the 2nd reference deice enter:
-           onoff subscribe start-up-on-off   10 100 1 1
-          [1657716703.322836][6034:6039] CHIP:DMG: ReportDataMessage =
-          [1657716703.322895][6034:6039] CHIP:DMG: {
-          [1657716703.322947][6034:6039] CHIP:DMG:         SubscriptionId = 0x8962f8b4,
-          [1657716703.323010][6034:6039] CHIP:DMG:         AttributeReportIBs =
-          [1657716703.323080][6034:6039] CHIP:DMG:         [
-          [1657716703.323133][6034:6039] CHIP:DMG:                 AttributeReportIB =
-          [1657716703.323217][6034:6039] CHIP:DMG:                 {
-          [1657716703.323280][6034:6039] CHIP:DMG:                         AttributeDataIB =
-          [1657716703.323341][6034:6039] CHIP:DMG:                         {
-          [1657716703.323396][6034:6039] CHIP:DMG:                                 DataVersion = 0x734a2d85,
-          [1657716703.323449][6034:6039] CHIP:DMG:                                 AttributePathIB =
-          [1657716703.323519][6034:6039] CHIP:DMG:                                 {
-          [1657716703.323591][6034:6039] CHIP:DMG:                                         Endpoint = 0x1,
-          [1657716703.323671][6034:6039] CHIP:DMG:                                         Cluster = 0x6,
-          [1657716703.323759][6034:6039] CHIP:DMG:                                         Attribute = 0x0000_4003,
-          [1657716703.323835][6034:6039] CHIP:DMG:                                 }
-          [1657716703.323909][6034:6039] CHIP:DMG:
-          [1657716703.323981][6034:6039] CHIP:DMG:                                 Data = 1,
-          [1657716703.324047][6034:6039] CHIP:DMG:                         },
-          [1657716703.324113][6034:6039] CHIP:DMG:
-          [1657716703.324170][6034:6039] CHIP:DMG:                 },
-          [1657716703.324238][6034:6039] CHIP:DMG:
-          [1657716703.324289][6034:6039] CHIP:DMG:         ],
-          [1657716703.324352][6034:6039] CHIP:DMG:
-          [1657716703.324403][6034:6039] CHIP:DMG:         InteractionModelRevision = 1
-          [1657716703.324457][6034:6039] CHIP:DMG: }
-          [1657716703.324785][6034:6039] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0006 Attribute 0x0000_4003 DataVersion: 1934241157
-          [1657716703.324904][6034:6039] CHIP:TOO:   StartUpOnOff: 1
-          [1657716703.324985][6034:6039] CHIP:DMG: MoveToState ReadClient[0xffff8c008e30]: Moving to [AwaitingSu]
+          on the 2nd reference device(RD2)  send 3 Subscribe Request Messages to DUT.
+          basic subscribe node-label 100 1000 2  0  --commissioner-name beta  --keepSubscriptions 1
+          [1660653125.592268][58143:58148] CHIP:DMG: ReportDataMessage =
+          [1660653125.592310][58143:58148] CHIP:DMG: {
+          [1660653125.592348][58143:58148] CHIP:DMG:         SubscriptionId = 0xc15110c4,
+          [1660653125.592387][58143:58148] CHIP:DMG:         AttributeReportIBs =
+          [1660653125.592435][58143:58148] CHIP:DMG:         [
+          [1660653125.592472][58143:58148] CHIP:DMG:                 AttributeReportIB =
+          [1660653125.592527][58143:58148] CHIP:DMG:                 {
+          [1660653125.592568][58143:58148] CHIP:DMG:                         AttributeDataIB =
+          [1660653125.592618][58143:58148] CHIP:DMG:                         {
+          [1660653125.592675][58143:58148] CHIP:DMG:                                 DataVersion = 0xe16fa6f6,
+          [1660653125.592726][58143:58148] CHIP:DMG:                                 AttributePathIB =
+          [1660653125.592785][58143:58148] CHIP:DMG:                                 {
+          [1660653125.592839][58143:58148] CHIP:DMG:                                         Endpoint = 0x0,
+          [1660653125.592896][58143:58148] CHIP:DMG:                                         Cluster = 0x28,
+          [1660653125.592946][58143:58148] CHIP:DMG:                                         Attribute = 0x0000_0005,
+          [1660653125.592997][58143:58148] CHIP:DMG:                                 }
+          [1660653125.593051][58143:58148] CHIP:DMG:
+          [1660653125.593109][58143:58148] CHIP:DMG:                                 Data = "" (0 chars),
+          [1660653125.593158][58143:58148] CHIP:DMG:                         },
+          [1660653125.593212][58143:58148] CHIP:DMG:
+          [1660653125.593255][58143:58148] CHIP:DMG:                 },
+          [1660653125.593305][58143:58148] CHIP:DMG:
+          [1660653125.593342][58143:58148] CHIP:DMG:         ],
+          [1660653125.593390][58143:58148] CHIP:DMG:
+          [1660653125.593428][58143:58148] CHIP:DMG:         InteractionModelRevision = 1
+          [1660653125.593464][58143:58148] CHIP:DMG: }
+          [1660653125.593640][58143:58148] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0028 Attribute 0x0000_0005 DataVersion: 3782190838
+          [1660653125.593706][58143:58148] CHIP:TOO:   NodeLabel:
+          [1660653125.593776][58143:58148] CHIP:DMG: MoveToState ReadClient[0xffff6800df30]: Moving to [AwaitingSu]
 
 
 
-           basic subscribe node-label 10 100  1 0
-          [1657716743.523056][6034:6039] CHIP:DMG: ReportDataMessage =
-          [1657716743.523131][6034:6039] CHIP:DMG: {
-          [1657716743.523178][6034:6039] CHIP:DMG:         SubscriptionId = 0xc3b3c364,
-          [1657716743.523240][6034:6039] CHIP:DMG:         AttributeReportIBs =
-          [1657716743.523302][6034:6039] CHIP:DMG:         [
-          [1657716743.523362][6034:6039] CHIP:DMG:                 AttributeReportIB =
-          [1657716743.523433][6034:6039] CHIP:DMG:                 {
-          [1657716743.523499][6034:6039] CHIP:DMG:                         AttributeDataIB =
-          [1657716743.523555][6034:6039] CHIP:DMG:                         {
-          [1657716743.523627][6034:6039] CHIP:DMG:                                 DataVersion = 0x1b93dc36,
-          [1657716743.523682][6034:6039] CHIP:DMG:                                 AttributePathIB =
-          [1657716743.523738][6034:6039] CHIP:DMG:                                 {
-          [1657716743.523812][6034:6039] CHIP:DMG:                                         Endpoint = 0x0,
-          [1657716743.523873][6034:6039] CHIP:DMG:                                         Cluster = 0x28,
-          [1657716743.523934][6034:6039] CHIP:DMG:                                         Attribute = 0x0000_0005,
-          [1657716743.523990][6034:6039] CHIP:DMG:                                 }
-          [1657716743.524050][6034:6039] CHIP:DMG:
-          [1657716743.524111][6034:6039] CHIP:DMG:                                 Data = "1",
-          [1657716743.524164][6034:6039] CHIP:DMG:                         },
-          [1657716743.524223][6034:6039] CHIP:DMG:
-          [1657716743.524271][6034:6039] CHIP:DMG:                 },
-          [1657716743.524328][6034:6039] CHIP:DMG:
-          [1657716743.524372][6034:6039] CHIP:DMG:         ],
-          [1657716743.524430][6034:6039] CHIP:DMG:
-          [1657716743.524475][6034:6039] CHIP:DMG:         InteractionModelRevision = 1
-          [1657716743.524518][6034:6039] CHIP:DMG: }
-          [1657716743.524683][6034:6039] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0028 Attribute 0x0000_0005 DataVersion: 462674998
-          [1657716743.524745][6034:6039] CHIP:TOO:   NodeLabel: 1
-          [1657716743.524813][6034:6039] CHIP:DMG: MoveToState ReadClient[0xffff8c004100]: Moving to [AwaitingSu]
+
+           basic subscribe location 100 1000 2  0  --commissioner-name beta  --keepSubscriptions 1
+          [1660653198.460290][58143:58148] CHIP:DMG: ReportDataMessage =
+          [1660653198.460359][58143:58148] CHIP:DMG: {
+          [1660653198.460423][58143:58148] CHIP:DMG:         SubscriptionId = 0xfed77bda,
+          [1660653198.460487][58143:58148] CHIP:DMG:         AttributeReportIBs =
+          [1660653198.460567][58143:58148] CHIP:DMG:         [
+          [1660653198.460630][58143:58148] CHIP:DMG:                 AttributeReportIB =
+          [1660653198.460718][58143:58148] CHIP:DMG:                 {
+          [1660653198.460786][58143:58148] CHIP:DMG:                         AttributeDataIB =
+          [1660653198.460871][58143:58148] CHIP:DMG:                         {
+          [1660653198.460966][58143:58148] CHIP:DMG:                                 DataVersion = 0xe16fa6f6,
+          [1660653198.461058][58143:58148] CHIP:DMG:                                 AttributePathIB =
+          [1660653198.461147][58143:58148] CHIP:DMG:                                 {
+          [1660653198.461244][58143:58148] CHIP:DMG:                                         Endpoint = 0x0,
+          [1660653198.461335][58143:58148] CHIP:DMG:                                         Cluster = 0x28,
+          [1660653198.461427][58143:58148] CHIP:DMG:                                         Attribute = 0x0000_0006,
+          [1660653198.461513][58143:58148] CHIP:DMG:                                 }
+          [1660653198.461604][58143:58148] CHIP:DMG:
+          [1660653198.461699][58143:58148] CHIP:DMG:                                 Data = "XX" (2 chars),
+          [1660653198.461782][58143:58148] CHIP:DMG:                         },
+          [1660653198.461880][58143:58148] CHIP:DMG:
+          [1660653198.461952][58143:58148] CHIP:DMG:                 },
+          [1660653198.462037][58143:58148] CHIP:DMG:
+          [1660653198.462099][58143:58148] CHIP:DMG:         ],
+          [1660653198.462176][58143:58148] CHIP:DMG:
+          [1660653198.462241][58143:58148] CHIP:DMG:         InteractionModelRevision = 1
+          [1660653198.462303][58143:58148] CHIP:DMG: }
+          [1660653198.462524][58143:58148] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0028 Attribute 0x0000_0006 DataVersion: 3782190838
+          [1660653198.462606][58143:58148] CHIP:TOO:   Location: XX
+          [1660653198.462695][58143:58148] CHIP:DMG: MoveToState ReadClient[0xffff68010fa0]: Moving to [AwaitingSu]
 
 
-           levelcontrol subscribe  on-transition-time  10 100 1 1
-          [1657716911.280884][6034:6039] CHIP:DMG: ReportDataMessage =
-          [1657716911.280957][6034:6039] CHIP:DMG: {
-          [1657716911.281018][6034:6039] CHIP:DMG:         SubscriptionId = 0x1a544eea,
-          [1657716911.281080][6034:6039] CHIP:DMG:         AttributeReportIBs =
-          [1657716911.281157][6034:6039] CHIP:DMG:         [
-          [1657716911.281217][6034:6039] CHIP:DMG:                 AttributeReportIB =
-          [1657716911.281338][6034:6039] CHIP:DMG:                 {
-          [1657716911.281408][6034:6039] CHIP:DMG:                         AttributeDataIB =
-          [1657716911.281487][6034:6039] CHIP:DMG:                         {
-          [1657716911.281570][6034:6039] CHIP:DMG:                                 DataVersion = 0x319eedab,
-          [1657716911.281649][6034:6039] CHIP:DMG:                                 AttributePathIB =
-          [1657716911.281723][6034:6039] CHIP:DMG:                                 {
-          [1657716911.281813][6034:6039] CHIP:DMG:                                         Endpoint = 0x1,
-          [1657716911.281892][6034:6039] CHIP:DMG:                                         Cluster = 0x8,
-          [1657716911.281978][6034:6039] CHIP:DMG:                                         Attribute = 0x0000_0012,
-          [1657716911.282059][6034:6039] CHIP:DMG:                                 }
-          [1657716911.282145][6034:6039] CHIP:DMG:
-          [1657716911.282236][6034:6039] CHIP:DMG:                                 Data = 0,
-          [1657716911.282311][6034:6039] CHIP:DMG:                         },
-          [1657716911.282392][6034:6039] CHIP:DMG:
-          [1657716911.282459][6034:6039] CHIP:DMG:                 },
-          [1657716911.282534][6034:6039] CHIP:DMG:
-          [1657716911.282593][6034:6039] CHIP:DMG:         ],
-          [1657716911.282667][6034:6039] CHIP:DMG:
-          [1657716911.282727][6034:6039] CHIP:DMG:         InteractionModelRevision = 1
-          [1657716911.282786][6034:6039] CHIP:DMG: }
-          [1657716911.282995][6034:6039] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0008 Attribute 0x0000_0012 DataVersion: 832499115
-          [1657716911.283082][6034:6039] CHIP:TOO:   on transition time: 0
-          [1657716911.283172][6034:6039] CHIP:DMG: MoveToState ReadClient[0xffff8c008f20]: Moving to [AwaitingSu]
+
+           basic subscribe  local-config-disabled 100 1000 2  0  --commissioner-name beta  --keepSubscriptions 1
+          [1660653260.633215][58143:58148] CHIP:EM: Removed CHIP MessageCounter:178377836 from RetransTable on exchange 25360i
+          [1660653260.633327][58143:58148] CHIP:DMG: ReportDataMessage =
+          [1660653260.633387][58143:58148] CHIP:DMG: {
+          [1660653260.633442][58143:58148] CHIP:DMG:         SubscriptionId = 0x60feee4d,
+          [1660653260.633493][58143:58148] CHIP:DMG:         AttributeReportIBs =
+          [1660653260.633560][58143:58148] CHIP:DMG:         [
+          [1660653260.633615][58143:58148] CHIP:DMG:                 AttributeReportIB =
+          [1660653260.633691][58143:58148] CHIP:DMG:                 {
+          [1660653260.633755][58143:58148] CHIP:DMG:                         AttributeDataIB =
+          [1660653260.633820][58143:58148] CHIP:DMG:                         {
+          [1660653260.633891][58143:58148] CHIP:DMG:                                 DataVersion = 0xe16fa6f6,
+          [1660653260.633964][58143:58148] CHIP:DMG:                                 AttributePathIB =
+          [1660653260.634046][58143:58148] CHIP:DMG:                                 {
+          [1660653260.634130][58143:58148] CHIP:DMG:                                         Endpoint = 0x0,
+          [1660653260.634212][58143:58148] CHIP:DMG:                                         Cluster = 0x28,
+          [1660653260.634292][58143:58148] CHIP:DMG:                                         Attribute = 0x0000_0010,
+          [1660653260.634366][58143:58148] CHIP:DMG:                                 }
+          [1660653260.634445][58143:58148] CHIP:DMG:
+          [1660653260.634523][58143:58148] CHIP:DMG:                                 Data = false,
+          [1660653260.634600][58143:58148] CHIP:DMG:                         },
+          [1660653260.634674][58143:58148] CHIP:DMG:
+          [1660653260.634736][58143:58148] CHIP:DMG:                 },
+          [1660653260.634802][58143:58148] CHIP:DMG:
+          [1660653260.634855][58143:58148] CHIP:DMG:         ],
+          [1660653260.635066][58143:58148] CHIP:DMG:
+          [1660653260.635128][58143:58148] CHIP:DMG:         InteractionModelRevision = 1
+          [1660653260.635181][58143:58148] CHIP:DMG: }
+          [1660653260.635371][58143:58148] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0028 Attribute 0x0000_0010 DataVersion: 3782190838
+          [1660653260.635446][58143:58148] CHIP:TOO:   LocalConfigDisabled: FALSE
+          [1660653260.635523][58143:58148] CHIP:DMG: MoveToState ReadClient[0xffff68011170]: Moving to [AwaitingSu]
 
 
-          on the 3rd reference deice enter:
-          onoff subscribe start-up-on-off  10 100 1 1
-          [1657716965.736576][6034:6039] CHIP:EM: Removed CHIP MessageCounter:12313969 from RetransTable on exchange 50225i
-          [1657716965.736639][6034:6039] CHIP:DMG: ReportDataMessage =
-          [1657716965.736669][6034:6039] CHIP:DMG: {
-          [1657716965.736695][6034:6039] CHIP:DMG:         SubscriptionId = 0x5a6ddc07,
-          [1657716965.736741][6034:6039] CHIP:DMG:         AttributeReportIBs =
-          [1657716965.736777][6034:6039] CHIP:DMG:         [
-          [1657716965.736802][6034:6039] CHIP:DMG:                 AttributeReportIB =
-          [1657716965.736848][6034:6039] CHIP:DMG:                 {
-          [1657716965.736887][6034:6039] CHIP:DMG:                         AttributeDataIB =
-          [1657716965.736932][6034:6039] CHIP:DMG:                         {
-          [1657716965.736978][6034:6039] CHIP:DMG:                                 DataVersion = 0x734a2d85,
-          [1657716965.737021][6034:6039] CHIP:DMG:                                 AttributePathIB =
-          [1657716965.737067][6034:6039] CHIP:DMG:                                 {
-          [1657716965.737113][6034:6039] CHIP:DMG:                                         Endpoint = 0x1,
-          [1657716965.737159][6034:6039] CHIP:DMG:                                         Cluster = 0x6,
-          [1657716965.737207][6034:6039] CHIP:DMG:                                         Attribute = 0x0000_4003,
-          [1657716965.737251][6034:6039] CHIP:DMG:                                 }
-          [1657716965.737346][6034:6039] CHIP:DMG:
-          [1657716965.737396][6034:6039] CHIP:DMG:                                 Data = 1,
-          [1657716965.737438][6034:6039] CHIP:DMG:                         },
-          [1657716965.737484][6034:6039] CHIP:DMG:
-          [1657716965.737521][6034:6039] CHIP:DMG:                 },
-          [1657716965.737563][6034:6039] CHIP:DMG:
-          [1657716965.737589][6034:6039] CHIP:DMG:         ],
-          [1657716965.737620][6034:6039] CHIP:DMG:
-          [1657716965.737645][6034:6039] CHIP:DMG:         InteractionModelRevision = 1
-          [1657716965.737679][6034:6039] CHIP:DMG: }
-          [1657716965.737779][6034:6039] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0006 Attribute 0x0000_4003 DataVersion: 1934241157
-          [1657716965.737827][6034:6039] CHIP:TOO:   StartUpOnOff: 1
-          [1657716965.737867][6034:6039] CHIP:DMG: MoveToState ReadClient[0xffff8c008e30]: Moving to [AwaitingSu]
 
 
-          basic subscribe reachable  10 100 1 0
-          [1657717032.547326][6034:6039] CHIP:EM: Removed CHIP MessageCounter:12313975 from RetransTable on exchange 50227i
-          [1657717032.547406][6034:6039] CHIP:DMG: ReportDataMessage =
-          [1657717032.547470][6034:6039] CHIP:DMG: {
-          [1657717032.547507][6034:6039] CHIP:DMG:         SubscriptionId = 0x242f7180,
-          [1657717032.547560][6034:6039] CHIP:DMG:         AttributeReportIBs =
-          [1657717032.547607][6034:6039] CHIP:DMG:         [
-          [1657717032.547644][6034:6039] CHIP:DMG:                 AttributeReportIB =
-          [1657717032.547696][6034:6039] CHIP:DMG:                 {
-          [1657717032.547734][6034:6039] CHIP:DMG:                         AttributeDataIB =
-          [1657717032.547779][6034:6039] CHIP:DMG:                         {
-          [1657717032.547829][6034:6039] CHIP:DMG:                                 DataVersion = 0x1b93dc36,
-          [1657717032.547876][6034:6039] CHIP:DMG:                                 AttributePathIB =
-          [1657717032.547925][6034:6039] CHIP:DMG:                                 {
-          [1657717032.547974][6034:6039] CHIP:DMG:                                         Endpoint = 0x0,
-          [1657717032.548027][6034:6039] CHIP:DMG:                                         Cluster = 0x28,
-          [1657717032.548077][6034:6039] CHIP:DMG:                                         Attribute = 0x0000_0011,
-          [1657717032.548124][6034:6039] CHIP:DMG:                                 }
-          [1657717032.548175][6034:6039] CHIP:DMG:
-          [1657717032.548225][6034:6039] CHIP:DMG:                                 Data = true,
-          [1657717032.548272][6034:6039] CHIP:DMG:                         },
-          [1657717032.548321][6034:6039] CHIP:DMG:
-          [1657717032.548358][6034:6039] CHIP:DMG:                 },
-          [1657717032.548403][6034:6039] CHIP:DMG:
-          [1657717032.548438][6034:6039] CHIP:DMG:         ],
-          [1657717032.548482][6034:6039] CHIP:DMG:
-          [1657717032.548518][6034:6039] CHIP:DMG:         InteractionModelRevision = 1
-          [1657717032.548553][6034:6039] CHIP:DMG: }
-          [1657717032.548686][6034:6039] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0028 Attribute 0x0000_0011 DataVersion: 462674998
-          [1657717032.548795][6034:6039] CHIP:TOO:   Reachable: TRUE
-          [1657717032.548850][6034:6039] CHIP:DMG: MoveToState ReadClient[0xffff8c0092b0]: Moving to [AwaitingSu]
+          on the 3rd reference device(RD3)  send 3 Subscribe Request Messages to DUT.
+          basic subscribe node-label 100 1000 3  0  --commissioner-name 4  --keepSubscriptions 1
+          [1660653438.741061][58149:58154] CHIP:EM: Removed CHIP MessageCounter:141916359 from RetransTable on exchange 34400i
+          [1660653438.741116][58149:58154] CHIP:DMG: ReportDataMessage =
+          [1660653438.741143][58149:58154] CHIP:DMG: {
+          [1660653438.741236][58149:58154] CHIP:DMG:         SubscriptionId = 0xff93c648,
+          [1660653438.741262][58149:58154] CHIP:DMG:         AttributeReportIBs =
+          [1660653438.741294][58149:58154] CHIP:DMG:         [
+          [1660653438.741318][58149:58154] CHIP:DMG:                 AttributeReportIB =
+          [1660653438.741352][58149:58154] CHIP:DMG:                 {
+          [1660653438.741380][58149:58154] CHIP:DMG:                         AttributeDataIB =
+          [1660653438.741415][58149:58154] CHIP:DMG:                         {
+          [1660653438.741448][58149:58154] CHIP:DMG:                                 DataVersion = 0xe16fa6f6,
+          [1660653438.741479][58149:58154] CHIP:DMG:                                 AttributePathIB =
+          [1660653438.741517][58149:58154] CHIP:DMG:                                 {
+          [1660653438.741553][58149:58154] CHIP:DMG:                                         Endpoint = 0x0,
+          [1660653438.741592][58149:58154] CHIP:DMG:                                         Cluster = 0x28,
+          [1660653438.741627][58149:58154] CHIP:DMG:                                         Attribute = 0x0000_0005,
+          [1660653438.741660][58149:58154] CHIP:DMG:                                 }
+          [1660653438.741695][58149:58154] CHIP:DMG:
+          [1660653438.741732][58149:58154] CHIP:DMG:                                 Data = "" (0 chars),
+          [1660653438.741764][58149:58154] CHIP:DMG:                         },
+          [1660653438.741800][58149:58154] CHIP:DMG:
+          [1660653438.741828][58149:58154] CHIP:DMG:                 },
+          [1660653438.741859][58149:58154] CHIP:DMG:
+          [1660653438.741883][58149:58154] CHIP:DMG:         ],
+          [1660653438.741913][58149:58154] CHIP:DMG:
+          [1660653438.741938][58149:58154] CHIP:DMG:         InteractionModelRevision = 1
+          [1660653438.741961][58149:58154] CHIP:DMG: }
+          [1660653438.742081][58149:58154] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0028 Attribute 0x0000_0005 DataVersion: 3782190838
+          [1660653438.742125][58149:58154] CHIP:TOO:   NodeLabel:
+          [1660653438.742171][58149:58154] CHIP:DMG: MoveToState ReadClient[0xffff740129e0]: Moving to [AwaitingSu]
 
 
-           onoff subscribe off-wait-time   10 100 1 1
-          [1657717085.996867][6034:6039] CHIP:DMG: ReportDataMessage =
-          [1657717085.996895][6034:6039] CHIP:DMG: {
-          [1657717085.996920][6034:6039] CHIP:DMG:         SubscriptionId = 0xbe7eee69,
-          [1657717085.996945][6034:6039] CHIP:DMG:         AttributeReportIBs =
-          [1657717085.996977][6034:6039] CHIP:DMG:         [
-          [1657717085.997002][6034:6039] CHIP:DMG:                 AttributeReportIB =
-          [1657717085.997035][6034:6039] CHIP:DMG:                 {
-          [1657717085.997060][6034:6039] CHIP:DMG:                         AttributeDataIB =
-          [1657717085.997089][6034:6039] CHIP:DMG:                         {
-          [1657717085.997122][6034:6039] CHIP:DMG:                                 DataVersion = 0x734a2d85,
-          [1657717085.997153][6034:6039] CHIP:DMG:                                 AttributePathIB =
-          [1657717085.997187][6034:6039] CHIP:DMG:                                 {
-          [1657717085.997220][6034:6039] CHIP:DMG:                                         Endpoint = 0x1,
-          [1657717085.997258][6034:6039] CHIP:DMG:                                         Cluster = 0x6,
-          [1657717085.997317][6034:6039] CHIP:DMG:                                         Attribute = 0x0000_4002,
-          [1657717085.997367][6034:6039] CHIP:DMG:                                 }
-          [1657717085.997404][6034:6039] CHIP:DMG:
-          [1657717085.997440][6034:6039] CHIP:DMG:                                 Data = 0,
-          [1657717085.997471][6034:6039] CHIP:DMG:                         },
-          [1657717085.997504][6034:6039] CHIP:DMG:
-          [1657717085.997531][6034:6039] CHIP:DMG:                 },
-          [1657717085.997561][6034:6039] CHIP:DMG:
-          [1657717085.997585][6034:6039] CHIP:DMG:         ],
-          [1657717085.997615][6034:6039] CHIP:DMG:
-          [1657717085.997640][6034:6039] CHIP:DMG:         InteractionModelRevision = 1
-          [1657717085.997663][6034:6039] CHIP:DMG: }
-          [1657717085.997757][6034:6039] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0006 Attribute 0x0000_4002 DataVersion: 1934241157
-          [1657717085.997793][6034:6039] CHIP:TOO:   OffWaitTime: 0
-          [1657717085.997830][6034:6039] CHIP:DMG: MoveToState ReadClient[0xffff8c008f20]: Moving to [AwaitingSu]
+           basic subscribe location 100 1000 3  0  --commissioner-name 4  --keepSubscriptions 1
+          [1660653500.502738][58149:58154] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0028 Attribute 0x0000_0006 DataVersion: 3782190838
+          [1660653500.502801][58149:58154] CHIP:TOO:   Location: XX
+          [1660653500.502870][58149:58154] CHIP:DMG: MoveToState ReadClient[0xffff7400adb0]: Moving to [AwaitingSu]
+
+
+
+           basic subscribe  local-config-disabled 100 1000 3  0  --commissioner-name 4  --keepSubscriptions 1
+
+          [1660653545.651601][58149:58154] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0028 Attribute 0x0000_0010 DataVersion: 3782190838
+          [1660653545.651636][58149:58154] CHIP:TOO:   LocalConfigDisabled: FALSE
+          [1660653545.651669][58149:58154] CHIP:DMG: MoveToState ReadClient[0xffff74009a20]: Moving to [AwaitingSu]
+
+
+
+          on the 4th reference device(RD4)  send 3 Subscribe Request Messages to DUT.
+          basic subscribe node-label 100 1000 4  0  --commissioner-name 5   --keepSubscriptions 1
+
+          [1660652952.539010][58131:58136] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0028 Attribute 0x0000_0005 DataVersion: 3782190838
+          [1660652952.539073][58131:58136] CHIP:TOO:   NodeLabel:
+          [1660652952.539140][58131:58136] CHIP:DMG: MoveToState ReadClient[0xffffa0004bc0]: Moving to [AwaitingSu]
+
+
+           basic subscribe location 100 1000 4  0  --commissioner-name 5   --keepSubscriptions 1
+
+          [1660653500.502738][58149:58154] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0028 Attribute 0x0000_0006 DataVersion: 3782190838
+          [1660653500.502801][58149:58154] CHIP:TOO:   Location: XX
+          [1660653500.502870][58149:58154] CHIP:DMG: MoveToState ReadClient[0xffff7400adb0]: Moving to [AwaitingSu]
+
+
+
+           basic subscribe  local-config-disabled 100 1000 4  0  --commissioner-name 5   --keepSubscriptions 1
+          [1660653545.651601][58149:58154] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0028 Attribute 0x0000_0010 DataVersion: 3782190838
+          [1660653545.651636][58149:58154] CHIP:TOO:   LocalConfigDisabled: FALSE
+          [1660653545.651669][58149:58154] CHIP:DMG: MoveToState ReadClient[0xffff74009a20]: Moving to [AwaitingSu]
+
+
+
+          on the 5th reference device(RD5)  send 3 Subscribe Request Messages to DUT.
+          basic subscribe node-label 100 1000 5  0  --commissioner-name 6  --keepSubscriptions 1
+
+          [1660652952.539010][58131:58136] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0028 Attribute 0x0000_0005 DataVersion: 3782190838
+          [1660652952.539073][58131:58136] CHIP:TOO:   NodeLabel:
+          [1660652952.539140][58131:58136] CHIP:DMG: MoveToState ReadClient[0xffffa0004bc0]: Moving to [AwaitingSu]
+
+
+
+           basic subscribe location 100 1000 5  0  --commissioner-name 6   --keepSubscriptions 1
+
+          [1660653500.502738][58149:58154] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0028 Attribute 0x0000_0006 DataVersion: 3782190838
+          [1660653500.502801][58149:58154] CHIP:TOO:   Location: XX
+          [1660653500.502870][58149:58154] CHIP:DMG: MoveToState ReadClient[0xffff7400adb0]: Moving to [AwaitingSu]
+
+
+
+           basic subscribe  local-config-disabled 100 1000 5  0  --commissioner-name beta  --keepSubscriptions 1
+          : }
+          [1660653545.651601][58149:58154] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0028 Attribute 0x0000_0010 DataVersion: 3782190838
+          [1660653545.651636][58149:58154] CHIP:TOO:   LocalConfigDisabled: FALSE
+          [1660653545.651669][58149:58154] CHIP:DMG: MoveToState ReadClient[0xffff74009a20]: Moving to [AwaitingSu]
+
+
+
+          Once all 15 subscriptions are active send one more subscriptiopn command in RD1 and Verify that the subscriptions from RD2, RD3, RD4 and RD5 are not affected.
+          basic subscribe product-id 100 1000 1  0  --keepSubscriptions 1
+          [1660654945.477837][58149:58154] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0028 Attribute 0x0000_0004 DataVersion: 3782190841
+          [1660654945.477932][58149:58154] CHIP:TOO:   ProductID: 32769
+          [1660654945.478023][58149:58154] CHIP:DMG: MoveToState ReadClient[0xffff740127c0]: Moving to [AwaitingSu]
       disabled: true
 
     - label:
@@ -997,440 +1058,285 @@
       verification: |
           Please  run this test in chip tool interactive mode ./chip-tool interactive start
 
+          Example commands given below are using 5 reference devices (User can use 5 reference devices and send the below command in from each reference device)
+
           Send 3 Subscriptionrequest message from each Reference Device(Eg. RD1...) to DUT
           and verify all the subscription requests are succes. and in The subscription request
           from RD1 should contain 6 paths, Verify that the subscriptions from RD2, RD3, RD4 and
            RD5 are not affected.
 
-          Example commands given below are using 3 reference device (User can use 5 reference device and send the below command in from each reference device)
+          on the 2nd reference device(RD2)  send 3 Subscribe Request Messages to DUT.
+          basic subscribe node-label 100 1000 2  0  --commissioner-name beta  --keepSubscriptions 1
+          [1660653125.592268][58143:58148] CHIP:DMG: ReportDataMessage =
+          [1660653125.592310][58143:58148] CHIP:DMG: {
+          [1660653125.592348][58143:58148] CHIP:DMG:         SubscriptionId = 0xc15110c4,
+          [1660653125.592387][58143:58148] CHIP:DMG:         AttributeReportIBs =
+          [1660653125.592435][58143:58148] CHIP:DMG:         [
+          [1660653125.592472][58143:58148] CHIP:DMG:                 AttributeReportIB =
+          [1660653125.592527][58143:58148] CHIP:DMG:                 {
+          [1660653125.592568][58143:58148] CHIP:DMG:                         AttributeDataIB =
+          [1660653125.592618][58143:58148] CHIP:DMG:                         {
+          [1660653125.592675][58143:58148] CHIP:DMG:                                 DataVersion = 0xe16fa6f6,
+          [1660653125.592726][58143:58148] CHIP:DMG:                                 AttributePathIB =
+          [1660653125.592785][58143:58148] CHIP:DMG:                                 {
+          [1660653125.592839][58143:58148] CHIP:DMG:                                         Endpoint = 0x0,
+          [1660653125.592896][58143:58148] CHIP:DMG:                                         Cluster = 0x28,
+          [1660653125.592946][58143:58148] CHIP:DMG:                                         Attribute = 0x0000_0005,
+          [1660653125.592997][58143:58148] CHIP:DMG:                                 }
+          [1660653125.593051][58143:58148] CHIP:DMG:
+          [1660653125.593109][58143:58148] CHIP:DMG:                                 Data = "" (0 chars),
+          [1660653125.593158][58143:58148] CHIP:DMG:                         },
+          [1660653125.593212][58143:58148] CHIP:DMG:
+          [1660653125.593255][58143:58148] CHIP:DMG:                 },
+          [1660653125.593305][58143:58148] CHIP:DMG:
+          [1660653125.593342][58143:58148] CHIP:DMG:         ],
+          [1660653125.593390][58143:58148] CHIP:DMG:
+          [1660653125.593428][58143:58148] CHIP:DMG:         InteractionModelRevision = 1
+          [1660653125.593464][58143:58148] CHIP:DMG: }
+          [1660653125.593640][58143:58148] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0028 Attribute 0x0000_0005 DataVersion: 3782190838
+          [1660653125.593706][58143:58148] CHIP:TOO:   NodeLabel:
+          [1660653125.593776][58143:58148] CHIP:DMG: MoveToState ReadClient[0xffff6800df30]: Moving to [AwaitingSu]
 
-          on the first reference deice enter:
 
-           levelcontrol subscribe min-level   10 100 1 1
-          [1657717758.176398][6034:6039] CHIP:DMG: ReportDataMessage =
-          [1657717758.176466][6034:6039] CHIP:DMG: {
-          [1657717758.176545][6034:6039] CHIP:DMG:         SubscriptionId = 0xbf960b6c,
-          [1657717758.176619][6034:6039] CHIP:DMG:         AttributeReportIBs =
-          [1657717758.176698][6034:6039] CHIP:DMG:         [
-          [1657717758.176750][6034:6039] CHIP:DMG:                 AttributeReportIB =
-          [1657717758.176818][6034:6039] CHIP:DMG:                 {
-          [1657717758.176872][6034:6039] CHIP:DMG:                         AttributeDataIB =
-          [1657717758.176959][6034:6039] CHIP:DMG:                         {
-          [1657717758.177034][6034:6039] CHIP:DMG:                                 DataVersion = 0x319eedab,
-          [1657717758.177136][6034:6039] CHIP:DMG:                                 AttributePathIB =
-          [1657717758.177206][6034:6039] CHIP:DMG:                                 {
-          [1657717758.177269][6034:6039] CHIP:DMG:                                         Endpoint = 0x1,
-          [1657717758.177377][6034:6039] CHIP:DMG:                                         Cluster = 0x8,
-          [1657717758.177429][6034:6039] CHIP:DMG:                                         Attribute = 0x0000_0002,
-          [1657717758.177488][6034:6039] CHIP:DMG:                                 }
-          [1657717758.177551][6034:6039] CHIP:DMG:
-          [1657717758.177600][6034:6039] CHIP:DMG:                                 Data = 1,
-          [1657717758.177655][6034:6039] CHIP:DMG:                         },
-          [1657717758.177716][6034:6039] CHIP:DMG:
-          [1657717758.177755][6034:6039] CHIP:DMG:                 },
-          [1657717758.177813][6034:6039] CHIP:DMG:
-          [1657717758.177850][6034:6039] CHIP:DMG:         ],
-          [1657717758.177896][6034:6039] CHIP:DMG:
-          [1657717758.177933][6034:6039] CHIP:DMG:         InteractionModelRevision = 1
-          [1657717758.177969][6034:6039] CHIP:DMG: }
-          [1657717758.178105][6034:6039] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0008 Attribute 0x0000_0002 DataVersion: 832499115
-          [1657717758.178156][6034:6039] CHIP:TOO:   min level: 1
-          [1657717758.178215][6034:6039] CHIP:DMG: MoveToState ReadClient[0xffff8c004100]: Moving to [AwaitingSu]
+           basic subscribe location 100 1000 2  0  --commissioner-name beta  --keepSubscriptions 1
+          [1660653198.460290][58143:58148] CHIP:DMG: ReportDataMessage =
+          [1660653198.460359][58143:58148] CHIP:DMG: {
+          [1660653198.460423][58143:58148] CHIP:DMG:         SubscriptionId = 0xfed77bda,
+          [1660653198.460487][58143:58148] CHIP:DMG:         AttributeReportIBs =
+          [1660653198.460567][58143:58148] CHIP:DMG:         [
+          [1660653198.460630][58143:58148] CHIP:DMG:                 AttributeReportIB =
+          [1660653198.460718][58143:58148] CHIP:DMG:                 {
+          [1660653198.460786][58143:58148] CHIP:DMG:                         AttributeDataIB =
+          [1660653198.460871][58143:58148] CHIP:DMG:                         {
+          [1660653198.460966][58143:58148] CHIP:DMG:                                 DataVersion = 0xe16fa6f6,
+          [1660653198.461058][58143:58148] CHIP:DMG:                                 AttributePathIB =
+          [1660653198.461147][58143:58148] CHIP:DMG:                                 {
+          [1660653198.461244][58143:58148] CHIP:DMG:                                         Endpoint = 0x0,
+          [1660653198.461335][58143:58148] CHIP:DMG:                                         Cluster = 0x28,
+          [1660653198.461427][58143:58148] CHIP:DMG:                                         Attribute = 0x0000_0006,
+          [1660653198.461513][58143:58148] CHIP:DMG:                                 }
+          [1660653198.461604][58143:58148] CHIP:DMG:
+          [1660653198.461699][58143:58148] CHIP:DMG:                                 Data = "XX" (2 chars),
+          [1660653198.461782][58143:58148] CHIP:DMG:                         },
+          [1660653198.461880][58143:58148] CHIP:DMG:
+          [1660653198.461952][58143:58148] CHIP:DMG:                 },
+          [1660653198.462037][58143:58148] CHIP:DMG:
+          [1660653198.462099][58143:58148] CHIP:DMG:         ],
+          [1660653198.462176][58143:58148] CHIP:DMG:
+          [1660653198.462241][58143:58148] CHIP:DMG:         InteractionModelRevision = 1
+          [1660653198.462303][58143:58148] CHIP:DMG: }
+          [1660653198.462524][58143:58148] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0028 Attribute 0x0000_0006 DataVersion: 3782190838
+          [1660653198.462606][58143:58148] CHIP:TOO:   Location: XX
+          [1660653198.462695][58143:58148] CHIP:DMG: MoveToState ReadClient[0xffff68010fa0]: Moving to [AwaitingSu]
 
 
 
-           onoff subscribe global-scene-control   10 100 1 1
-          [1657717721.303602][6034:6039] CHIP:DMG: ReportDataMessage =
-          [1657717721.303670][6034:6039] CHIP:DMG: {
-          [1657717721.303730][6034:6039] CHIP:DMG:         SubscriptionId = 0x2b768ffd,
-          [1657717721.303791][6034:6039] CHIP:DMG:         AttributeReportIBs =
-          [1657717721.303867][6034:6039] CHIP:DMG:         [
-          [1657717721.303928][6034:6039] CHIP:DMG:                 AttributeReportIB =
-          [1657717721.304007][6034:6039] CHIP:DMG:                 {
-          [1657717721.304071][6034:6039] CHIP:DMG:                         AttributeDataIB =
-          [1657717721.304149][6034:6039] CHIP:DMG:                         {
-          [1657717721.304225][6034:6039] CHIP:DMG:                                 DataVersion = 0x734a2d85,
-          [1657717721.304297][6034:6039] CHIP:DMG:                                 AttributePathIB =
-          [1657717721.304372][6034:6039] CHIP:DMG:                                 {
-          [1657717721.304454][6034:6039] CHIP:DMG:                                         Endpoint = 0x1,
-          [1657717721.304542][6034:6039] CHIP:DMG:                                         Cluster = 0x6,
-          [1657717721.304628][6034:6039] CHIP:DMG:                                         Attribute = 0x0000_4000,
-          [1657717721.304711][6034:6039] CHIP:DMG:                                 }
-          [1657717721.304797][6034:6039] CHIP:DMG:
-          [1657717721.304881][6034:6039] CHIP:DMG:                                 Data = true,
-          [1657717721.304958][6034:6039] CHIP:DMG:                         },
-          [1657717721.305039][6034:6039] CHIP:DMG:
-          [1657717721.305102][6034:6039] CHIP:DMG:                 },
-          [1657717721.305178][6034:6039] CHIP:DMG:
-          [1657717721.305238][6034:6039] CHIP:DMG:         ],
-          [1657717721.305348][6034:6039] CHIP:DMG:
-          [1657717721.305412][6034:6039] CHIP:DMG:         InteractionModelRevision = 1
-          [1657717721.305470][6034:6039] CHIP:DMG: }
-          [1657717721.305679][6034:6039] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0006 Attribute 0x0000_4000 DataVersion: 1934241157
-          [1657717721.305761][6034:6039] CHIP:TOO:   GlobalSceneControl: TRUE
-          [1657717721.305849][6034:6039] CHIP:DMG: MoveToState ReadClient[0xffff8c0092b0]: Moving to [AwaitingSu]
-
-
-          temperaturemeasurement subscribe  tolerance     10 100 1 1
-          [1657717893.368431][6034:6039] CHIP:DMG: ReportDataMessage =
-          [1657717893.368514][6034:6039] CHIP:DMG: {
-          [1657717893.368562][6034:6039] CHIP:DMG:         SubscriptionId = 0x87e778d7,
-          [1657717893.368649][6034:6039] CHIP:DMG:         AttributeReportIBs =
-          [1657717893.368744][6034:6039] CHIP:DMG:         [
-          [1657717893.368837][6034:6039] CHIP:DMG:                 AttributeReportIB =
-          [1657717893.368943][6034:6039] CHIP:DMG:                 {
-          [1657717893.369046][6034:6039] CHIP:DMG:                         AttributeDataIB =
-          [1657717893.369138][6034:6039] CHIP:DMG:                         {
-          [1657717893.369231][6034:6039] CHIP:DMG:                                 DataVersion = 0x8ca282b3,
-          [1657717893.369359][6034:6039] CHIP:DMG:                                 AttributePathIB =
-          [1657717893.369461][6034:6039] CHIP:DMG:                                 {
-          [1657717893.369563][6034:6039] CHIP:DMG:                                         Endpoint = 0x1,
-          [1657717893.369674][6034:6039] CHIP:DMG:                                         Cluster = 0x402,
-          [1657717893.369786][6034:6039] CHIP:DMG:                                         Attribute = 0x0000_0003,
-          [1657717893.369896][6034:6039] CHIP:DMG:                                 }
-          [1657717893.370000][6034:6039] CHIP:DMG:
-          [1657717893.370094][6034:6039] CHIP:DMG:                                 Data = 0,
-          [1657717893.370192][6034:6039] CHIP:DMG:                         },
-          [1657717893.370284][6034:6039] CHIP:DMG:
-          [1657717893.370359][6034:6039] CHIP:DMG:                 },
-          [1657717893.370439][6034:6039] CHIP:DMG:
-          [1657717893.370504][6034:6039] CHIP:DMG:         ],
-          [1657717893.370575][6034:6039] CHIP:DMG:
-          [1657717893.370630][6034:6039] CHIP:DMG:         InteractionModelRevision = 1
-          [1657717893.370699][6034:6039] CHIP:DMG: }
-          [1657717893.370819][6034:6039] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0402 Attribute 0x0000_0003 DataVersion: 2359460531
-          [1657717893.370888][6034:6039] CHIP:TOO:   Tolerance: 0
-          [1657717893.370929][6034:6039] CHIP:DMG: MoveToState ReadClient[0xffff8c0092b0]: Moving to [AwaitingSu]
+           basic subscribe  local-config-disabled 100 1000 2  0  --commissioner-name beta  --keepSubscriptions 1
+          [1660653260.633215][58143:58148] CHIP:EM: Removed CHIP MessageCounter:178377836 from RetransTable on exchange 25360i
+          [1660653260.633327][58143:58148] CHIP:DMG: ReportDataMessage =
+          [1660653260.633387][58143:58148] CHIP:DMG: {
+          [1660653260.633442][58143:58148] CHIP:DMG:         SubscriptionId = 0x60feee4d,
+          [1660653260.633493][58143:58148] CHIP:DMG:         AttributeReportIBs =
+          [1660653260.633560][58143:58148] CHIP:DMG:         [
+          [1660653260.633615][58143:58148] CHIP:DMG:                 AttributeReportIB =
+          [1660653260.633691][58143:58148] CHIP:DMG:                 {
+          [1660653260.633755][58143:58148] CHIP:DMG:                         AttributeDataIB =
+          [1660653260.633820][58143:58148] CHIP:DMG:                         {
+          [1660653260.633891][58143:58148] CHIP:DMG:                                 DataVersion = 0xe16fa6f6,
+          [1660653260.633964][58143:58148] CHIP:DMG:                                 AttributePathIB =
+          [1660653260.634046][58143:58148] CHIP:DMG:                                 {
+          [1660653260.634130][58143:58148] CHIP:DMG:                                         Endpoint = 0x0,
+          [1660653260.634212][58143:58148] CHIP:DMG:                                         Cluster = 0x28,
+          [1660653260.634292][58143:58148] CHIP:DMG:                                         Attribute = 0x0000_0010,
+          [1660653260.634366][58143:58148] CHIP:DMG:                                 }
+          [1660653260.634445][58143:58148] CHIP:DMG:
+          [1660653260.634523][58143:58148] CHIP:DMG:                                 Data = false,
+          [1660653260.634600][58143:58148] CHIP:DMG:                         },
+          [1660653260.634674][58143:58148] CHIP:DMG:
+          [1660653260.634736][58143:58148] CHIP:DMG:                 },
+          [1660653260.634802][58143:58148] CHIP:DMG:
+          [1660653260.634855][58143:58148] CHIP:DMG:         ],
+          [1660653260.635066][58143:58148] CHIP:DMG:
+          [1660653260.635128][58143:58148] CHIP:DMG:         InteractionModelRevision = 1
+          [1660653260.635181][58143:58148] CHIP:DMG: }
+          [1660653260.635371][58143:58148] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0028 Attribute 0x0000_0010 DataVersion: 3782190838
+          [1660653260.635446][58143:58148] CHIP:TOO:   LocalConfigDisabled: FALSE
+          [1660653260.635523][58143:58148] CHIP:DMG: MoveToState ReadClient[0xffff68011170]: Moving to [AwaitingSu]
 
 
 
 
+          on the 3nd reference device(RD3)  send 3 Subscribe Request Messages to DUT.
+          basic subscribe node-label 100 1000 3  0  --commissioner-name 4  --keepSubscriptions 1
+          [1660653438.741061][58149:58154] CHIP:EM: Removed CHIP MessageCounter:141916359 from RetransTable on exchange 34400i
+          [1660653438.741116][58149:58154] CHIP:DMG: ReportDataMessage =
+          [1660653438.741143][58149:58154] CHIP:DMG: {
+          [1660653438.741236][58149:58154] CHIP:DMG:         SubscriptionId = 0xff93c648,
+          [1660653438.741262][58149:58154] CHIP:DMG:         AttributeReportIBs =
+          [1660653438.741294][58149:58154] CHIP:DMG:         [
+          [1660653438.741318][58149:58154] CHIP:DMG:                 AttributeReportIB =
+          [1660653438.741352][58149:58154] CHIP:DMG:                 {
+          [1660653438.741380][58149:58154] CHIP:DMG:                         AttributeDataIB =
+          [1660653438.741415][58149:58154] CHIP:DMG:                         {
+          [1660653438.741448][58149:58154] CHIP:DMG:                                 DataVersion = 0xe16fa6f6,
+          [1660653438.741479][58149:58154] CHIP:DMG:                                 AttributePathIB =
+          [1660653438.741517][58149:58154] CHIP:DMG:                                 {
+          [1660653438.741553][58149:58154] CHIP:DMG:                                         Endpoint = 0x0,
+          [1660653438.741592][58149:58154] CHIP:DMG:                                         Cluster = 0x28,
+          [1660653438.741627][58149:58154] CHIP:DMG:                                         Attribute = 0x0000_0005,
+          [1660653438.741660][58149:58154] CHIP:DMG:                                 }
+          [1660653438.741695][58149:58154] CHIP:DMG:
+          [1660653438.741732][58149:58154] CHIP:DMG:                                 Data = "" (0 chars),
+          [1660653438.741764][58149:58154] CHIP:DMG:                         },
+          [1660653438.741800][58149:58154] CHIP:DMG:
+          [1660653438.741828][58149:58154] CHIP:DMG:                 },
+          [1660653438.741859][58149:58154] CHIP:DMG:
+          [1660653438.741883][58149:58154] CHIP:DMG:         ],
+          [1660653438.741913][58149:58154] CHIP:DMG:
+          [1660653438.741938][58149:58154] CHIP:DMG:         InteractionModelRevision = 1
+          [1660653438.741961][58149:58154] CHIP:DMG: }
+          [1660653438.742081][58149:58154] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0028 Attribute 0x0000_0005 DataVersion: 3782190838
+          [1660653438.742125][58149:58154] CHIP:TOO:   NodeLabel:
+          [1660653438.742171][58149:58154] CHIP:DMG: MoveToState ReadClient[0xffff740129e0]: Moving to [AwaitingSu]
 
-           any subscribe-by-id 0x0008 0x0010 10 100   1 1
 
-          [1657716563.242433][6034:6039] CHIP:DMG: ReportDataMessage =
-          [1657716563.242475][6034:6039] CHIP:DMG: {
-          [1657716563.242507][6034:6039] CHIP:DMG:         SubscriptionId = 0xebc26cc4,
-          [1657716563.242538][6034:6039] CHIP:DMG:         AttributeReportIBs =
-          [1657716563.242577][6034:6039] CHIP:DMG:         [
-          [1657716563.242607][6034:6039] CHIP:DMG:                 AttributeReportIB =
-          [1657716563.242648][6034:6039] CHIP:DMG:                 {
-          [1657716563.242680][6034:6039] CHIP:DMG:                         AttributeDataIB =
-          [1657716563.242721][6034:6039] CHIP:DMG:                         {
-          [1657716563.242762][6034:6039] CHIP:DMG:                                 DataVersion = 0x319eedab,
-          [1657716563.242801][6034:6039] CHIP:DMG:                                 AttributePathIB =
-          [1657716563.242842][6034:6039] CHIP:DMG:                                 {
-          [1657716563.242883][6034:6039] CHIP:DMG:                                         Endpoint = 0x1,
-          [1657716563.242928][6034:6039] CHIP:DMG:                                         Cluster = 0x8,
-          [1657716563.242971][6034:6039] CHIP:DMG:                                         Attribute = 0x0000_0010,
-          [1657716563.243012][6034:6039] CHIP:DMG:                                 }
-          [1657716563.243056][6034:6039] CHIP:DMG:
-          [1657716563.243100][6034:6039] CHIP:DMG:                                 Data = 1,
-          [1657716563.243138][6034:6039] CHIP:DMG:                         },
-          [1657716563.243179][6034:6039] CHIP:DMG:
-          [1657716563.243213][6034:6039] CHIP:DMG:                 },
-          [1657716563.243251][6034:6039] CHIP:DMG:
-          [1657716563.243280][6034:6039] CHIP:DMG:         ],
-          [1657716563.243318][6034:6039] CHIP:DMG:
-          [1657716563.243348][6034:6039] CHIP:DMG:         InteractionModelRevision = 1
-          [1657716563.243377][6034:6039] CHIP:DMG: }
-          [1657716563.243531][6034:6039] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0008 Attribute 0x0000_0010 DataVersion: 832499115
-          [1657716563.243601][6034:6039] CHIP:TOO:   on off transition time: 1
-          [1657716563.243648][6034:6039] CHIP:DMG: MoveToState ReadClient[0xffff8c008e30]: Moving to [AwaitingSu]
+           basic subscribe location 100 1000 3  0  --commissioner-name 4  --keepSubscriptions 1
+          [1660653500.501007][58149:58154] CHIP:DMG: {
+          [1660653500.501077][58149:58154] CHIP:DMG:         SubscriptionId = 0xb129bd8c,
+          [1660653500.501126][58149:58154] CHIP:DMG:         AttributeReportIBs =
+          [1660653500.501204][58149:58154] CHIP:DMG:         [
+          [1660653500.501253][58149:58154] CHIP:DMG:                 AttributeReportIB =
+          [1660653500.501323][58149:58154] CHIP:DMG:                 {
+          [1660653500.501397][58149:58154] CHIP:DMG:                         AttributeDataIB =
+          [1660653500.501466][58149:58154] CHIP:DMG:                         {
+          [1660653500.501550][58149:58154] CHIP:DMG:                                 DataVersion = 0xe16fa6f6,
+          [1660653500.501615][58149:58154] CHIP:DMG:                                 AttributePathIB =
+          [1660653500.501698][58149:58154] CHIP:DMG:                                 {
+          [1660653500.501765][58149:58154] CHIP:DMG:                                         Endpoint = 0x0,
+          [1660653500.501835][58149:58154] CHIP:DMG:                                         Cluster = 0x28,
+          [1660653500.501905][58149:58154] CHIP:DMG:                                         Attribute = 0x0000_0006,
+          [1660653500.501971][58149:58154] CHIP:DMG:                                 }
+          [1660653500.502041][58149:58154] CHIP:DMG:
+          [1660653500.502111][58149:58154] CHIP:DMG:                                 Data = "XX" (2 chars),
+          [1660653500.502176][58149:58154] CHIP:DMG:                         },
+          [1660653500.502249][58149:58154] CHIP:DMG:
+          [1660653500.502303][58149:58154] CHIP:DMG:                 },
+          [1660653500.502367][58149:58154] CHIP:DMG:
+          [1660653500.502414][58149:58154] CHIP:DMG:         ],
+          [1660653500.502473][58149:58154] CHIP:DMG:
+          [1660653500.502520][58149:58154] CHIP:DMG:         InteractionModelRevision = 1
+          [1660653500.502567][58149:58154] CHIP:DMG: }
+          [1660653500.502738][58149:58154] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0028 Attribute 0x0000_0006 DataVersion: 3782190838
+          [1660653500.502801][58149:58154] CHIP:TOO:   Location: XX
+          [1660653500.502870][58149:58154] CHIP:DMG: MoveToState ReadClient[0xffff7400adb0]: Moving to [AwaitingSu]
 
 
 
-            basic subscribe node-label 10 100  1 0
-          [1657716599.928585][6034:6039] CHIP:DMG: ReportDataMessage =
-          [1657716599.928652][6034:6039] CHIP:DMG: {
-          [1657716599.928825][6034:6039] CHIP:DMG:         SubscriptionId = 0x3d9f1c1,
-          [1657716599.928890][6034:6039] CHIP:DMG:         AttributeReportIBs =
-          [1657716599.928968][6034:6039] CHIP:DMG:         [
-          [1657716599.929029][6034:6039] CHIP:DMG:                 AttributeReportIB =
-          [1657716599.929122][6034:6039] CHIP:DMG:                 {
-          [1657716599.929192][6034:6039] CHIP:DMG:                         AttributeDataIB =
-          [1657716599.929278][6034:6039] CHIP:DMG:                         {
-          [1657716599.929399][6034:6039] CHIP:DMG:                                 DataVersion = 0x1b93dc36,
-          [1657716599.929476][6034:6039] CHIP:DMG:                                 AttributePathIB =
-          [1657716599.929687][6034:6039] CHIP:DMG:                                 {
-          [1657716599.929774][6034:6039] CHIP:DMG:                                         Endpoint = 0x0,
-          [1657716599.929861][6034:6039] CHIP:DMG:                                         Cluster = 0x28,
-          [1657716599.929949][6034:6039] CHIP:DMG:                                         Attribute = 0x0000_0005,
-          [1657716599.930031][6034:6039] CHIP:DMG:                                 }
-          [1657716599.930115][6034:6039] CHIP:DMG:
-          [1657716599.930285][6034:6039] CHIP:DMG:                                 Data = "1",
-          [1657716599.930370][6034:6039] CHIP:DMG:                         },
-          [1657716599.930454][6034:6039] CHIP:DMG:
-          [1657716599.930578][6034:6039] CHIP:DMG:                 },
-          [1657716599.930660][6034:6039] CHIP:DMG:
-          [1657716599.930720][6034:6039] CHIP:DMG:         ],
-          [1657716599.930796][6034:6039] CHIP:DMG:
-          [1657716599.930856][6034:6039] CHIP:DMG:         InteractionModelRevision = 1
-          [1657716599.930914][6034:6039] CHIP:DMG: }
-          [1657716599.931131][6034:6039] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0028 Attribute 0x0000_0005 DataVersion: 462674998
-          [1657716599.931326][6034:6039] CHIP:TOO:   NodeLabel: 1
-          [1657716599.931420][6034:6039] CHIP:DMG: MoveToState ReadClient[0xffff8c008f20]: Moving to [AwaitingSu]
-
-          onoff  subscribe on-time  10 100  1 1
-          [1657716634.400468][6034:6039] CHIP:DMG: ReportDataMessage =
-          [1657716634.400499][6034:6039] CHIP:DMG: {
-          [1657716634.400525][6034:6039] CHIP:DMG:         SubscriptionId = 0xf9b815a2,
-          [1657716634.400551][6034:6039] CHIP:DMG:         AttributeReportIBs =
-          [1657716634.400585][6034:6039] CHIP:DMG:         [
-          [1657716634.400610][6034:6039] CHIP:DMG:                 AttributeReportIB =
-          [1657716634.400647][6034:6039] CHIP:DMG:                 {
-          [1657716634.400674][6034:6039] CHIP:DMG:                         AttributeDataIB =
-          [1657716634.400705][6034:6039] CHIP:DMG:                         {
-          [1657716634.400739][6034:6039] CHIP:DMG:                                 DataVersion = 0x734a2d85,
-          [1657716634.400775][6034:6039] CHIP:DMG:                                 AttributePathIB =
-          [1657716634.400809][6034:6039] CHIP:DMG:                                 {
-          [1657716634.400847][6034:6039] CHIP:DMG:                                         Endpoint = 0x1,
-          [1657716634.400883][6034:6039] CHIP:DMG:                                         Cluster = 0x6,
-          [1657716634.400920][6034:6039] CHIP:DMG:                                         Attribute = 0x0000_4001,
-          [1657716634.400950][6034:6039] CHIP:DMG:                                 }
-          [1657716634.400987][6034:6039] CHIP:DMG:
-          [1657716634.401024][6034:6039] CHIP:DMG:                                 Data = 1,
-          [1657716634.401058][6034:6039] CHIP:DMG:                         },
-          [1657716634.401092][6034:6039] CHIP:DMG:
-          [1657716634.401117][6034:6039] CHIP:DMG:                 },
-          [1657716634.401148][6034:6039] CHIP:DMG:
-          [1657716634.401172][6034:6039] CHIP:DMG:         ],
-          [1657716634.401202][6034:6039] CHIP:DMG:
-          [1657716634.401227][6034:6039] CHIP:DMG:         InteractionModelRevision = 1
-          [1657716634.401250][6034:6039] CHIP:DMG: }
-          [1657716634.401383][6034:6039] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0006 Attribute 0x0000_4001 DataVersion: 1934241157
-          [1657716634.401428][6034:6039] CHIP:TOO:   OnTime: 1
-          [1657716634.401466][6034:6039] CHIP:DMG: MoveToState ReadClient[0xffff8c008c70]: Moving to [AwaitingSu]
-
-
-          levelcontrol  subscribe  on-level 10 100  1 1
-          [1657716667.237484][6034:6039] CHIP:DMG: ReportDataMessage =
-          [1657716667.237515][6034:6039] CHIP:DMG: {
-          [1657716667.237541][6034:6039] CHIP:DMG:         SubscriptionId = 0xe457240d,
-          [1657716667.237571][6034:6039] CHIP:DMG:         AttributeReportIBs =
-          [1657716667.237738][6034:6039] CHIP:DMG:         [
-          [1657716667.237768][6034:6039] CHIP:DMG:                 AttributeReportIB =
-          [1657716667.237819][6034:6039] CHIP:DMG:                 {
-          [1657716667.237850][6034:6039] CHIP:DMG:                         AttributeDataIB =
-          [1657716667.237897][6034:6039] CHIP:DMG:                         {
-          [1657716667.237944][6034:6039] CHIP:DMG:                                 DataVersion = 0x319eedab,
-          [1657716667.237993][6034:6039] CHIP:DMG:                                 AttributePathIB =
-          [1657716667.238044][6034:6039] CHIP:DMG:                                 {
-          [1657716667.238094][6034:6039] CHIP:DMG:                                         Endpoint = 0x1,
-          [1657716667.238145][6034:6039] CHIP:DMG:                                         Cluster = 0x8,
-          [1657716667.238196][6034:6039] CHIP:DMG:                                         Attribute = 0x0000_0011,
-          [1657716667.238244][6034:6039] CHIP:DMG:                                 }
-          [1657716667.238294][6034:6039] CHIP:DMG:
-          [1657716667.238345][6034:6039] CHIP:DMG:                                 Data = 1,
-          [1657716667.238391][6034:6039] CHIP:DMG:                         },
-          [1657716667.238437][6034:6039] CHIP:DMG:
-          [1657716667.238467][6034:6039] CHIP:DMG:                 },
-          [1657716667.238509][6034:6039] CHIP:DMG:
-          [1657716667.238535][6034:6039] CHIP:DMG:         ],
-          [1657716667.238567][6034:6039] CHIP:DMG:
-          [1657716667.238591][6034:6039] CHIP:DMG:         InteractionModelRevision = 1
-          [1657716667.238614][6034:6039] CHIP:DMG: }
-          [1657716667.238709][6034:6039] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0008 Attribute 0x0000_0011 DataVersion: 832499115
-          [1657716667.238752][6034:6039] CHIP:TOO:   on level: 1
-          [1657716667.238790][6034:6039] CHIP:DMG: MoveToState ReadClient[0xffff8c0092b0]: Moving to [AwaitingSu]
+           basic subscribe  local-config-disabled 100 1000 3  0  --commissioner-name 4  --keepSubscriptions 1
+          [1660653545.650817][58149:58154] CHIP:DMG: ReportDataMessage =
+          [1660653545.650842][58149:58154] CHIP:DMG: {
+          [1660653545.650864][58149:58154] CHIP:DMG:         SubscriptionId = 0x5310d542,
+          .
+          .
+          .
+          [1660653545.651494][58149:58154] CHIP:DMG:         InteractionModelRevision = 1
+          [1660653545.651514][58149:58154] CHIP:DMG: }
+          [1660653545.651601][58149:58154] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0028 Attribute 0x0000_0010 DataVersion: 3782190838
+          [1660653545.651636][58149:58154] CHIP:TOO:   LocalConfigDisabled: FALSE
+          [1660653545.651669][58149:58154] CHIP:DMG: MoveToState ReadClient[0xffff74009a20]: Moving to [AwaitingSu]
 
 
 
-          on the 2nd reference deice enter:
-           onoff subscribe start-up-on-off   10 100 1 1
-          [1657716703.322836][6034:6039] CHIP:DMG: ReportDataMessage =
-          [1657716703.322895][6034:6039] CHIP:DMG: {
-          [1657716703.322947][6034:6039] CHIP:DMG:         SubscriptionId = 0x8962f8b4,
-          [1657716703.323010][6034:6039] CHIP:DMG:         AttributeReportIBs =
-          [1657716703.323080][6034:6039] CHIP:DMG:         [
-          [1657716703.323133][6034:6039] CHIP:DMG:                 AttributeReportIB =
-          [1657716703.323217][6034:6039] CHIP:DMG:                 {
-          [1657716703.323280][6034:6039] CHIP:DMG:                         AttributeDataIB =
-          [1657716703.323341][6034:6039] CHIP:DMG:                         {
-          [1657716703.323396][6034:6039] CHIP:DMG:                                 DataVersion = 0x734a2d85,
-          [1657716703.323449][6034:6039] CHIP:DMG:                                 AttributePathIB =
-          [1657716703.323519][6034:6039] CHIP:DMG:                                 {
-          [1657716703.323591][6034:6039] CHIP:DMG:                                         Endpoint = 0x1,
-          [1657716703.323671][6034:6039] CHIP:DMG:                                         Cluster = 0x6,
-          [1657716703.323759][6034:6039] CHIP:DMG:                                         Attribute = 0x0000_4003,
-          [1657716703.323835][6034:6039] CHIP:DMG:                                 }
-          [1657716703.323909][6034:6039] CHIP:DMG:
-          [1657716703.323981][6034:6039] CHIP:DMG:                                 Data = 1,
-          [1657716703.324047][6034:6039] CHIP:DMG:                         },
-          [1657716703.324113][6034:6039] CHIP:DMG:
-          [1657716703.324170][6034:6039] CHIP:DMG:                 },
-          [1657716703.324238][6034:6039] CHIP:DMG:
-          [1657716703.324289][6034:6039] CHIP:DMG:         ],
-          [1657716703.324352][6034:6039] CHIP:DMG:
-          [1657716703.324403][6034:6039] CHIP:DMG:         InteractionModelRevision = 1
-          [1657716703.324457][6034:6039] CHIP:DMG: }
-          [1657716703.324785][6034:6039] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0006 Attribute 0x0000_4003 DataVersion: 1934241157
-          [1657716703.324904][6034:6039] CHIP:TOO:   StartUpOnOff: 1
-          [1657716703.324985][6034:6039] CHIP:DMG: MoveToState ReadClient[0xffff8c008e30]: Moving to [AwaitingSu]
+          on the 4nd reference device(RD4)  send 3 Subscribe Request Messages to DUT.
+          basic subscribe node-label 100 1000 4  0  --commissioner-name 5   --keepSubscriptions 1
+
+          [1660652952.539010][58131:58136] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0028 Attribute 0x0000_0005 DataVersion: 3782190838
+          [1660652952.539073][58131:58136] CHIP:TOO:   NodeLabel:
+          [1660652952.539140][58131:58136] CHIP:DMG: MoveToState ReadClient[0xffffa0004bc0]: Moving to [AwaitingSu]
+
+
+           basic subscribe location 100 1000 4  0  --commissioner-name 5   --keepSubscriptions 1
+
+          [1660653500.502738][58149:58154] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0028 Attribute 0x0000_0006 DataVersion: 3782190838
+          [1660653500.502801][58149:58154] CHIP:TOO:   Location: XX
+          [1660653500.502870][58149:58154] CHIP:DMG: MoveToState ReadClient[0xffff7400adb0]: Moving to [AwaitingSu]
 
 
 
-           basic subscribe node-label 10 100  1 0
-          [1657716743.523056][6034:6039] CHIP:DMG: ReportDataMessage =
-          [1657716743.523131][6034:6039] CHIP:DMG: {
-          [1657716743.523178][6034:6039] CHIP:DMG:         SubscriptionId = 0xc3b3c364,
-          [1657716743.523240][6034:6039] CHIP:DMG:         AttributeReportIBs =
-          [1657716743.523302][6034:6039] CHIP:DMG:         [
-          [1657716743.523362][6034:6039] CHIP:DMG:                 AttributeReportIB =
-          [1657716743.523433][6034:6039] CHIP:DMG:                 {
-          [1657716743.523499][6034:6039] CHIP:DMG:                         AttributeDataIB =
-          [1657716743.523555][6034:6039] CHIP:DMG:                         {
-          [1657716743.523627][6034:6039] CHIP:DMG:                                 DataVersion = 0x1b93dc36,
-          [1657716743.523682][6034:6039] CHIP:DMG:                                 AttributePathIB =
-          [1657716743.523738][6034:6039] CHIP:DMG:                                 {
-          [1657716743.523812][6034:6039] CHIP:DMG:                                         Endpoint = 0x0,
-          [1657716743.523873][6034:6039] CHIP:DMG:                                         Cluster = 0x28,
-          [1657716743.523934][6034:6039] CHIP:DMG:                                         Attribute = 0x0000_0005,
-          [1657716743.523990][6034:6039] CHIP:DMG:                                 }
-          [1657716743.524050][6034:6039] CHIP:DMG:
-          [1657716743.524111][6034:6039] CHIP:DMG:                                 Data = "1",
-          [1657716743.524164][6034:6039] CHIP:DMG:                         },
-          [1657716743.524223][6034:6039] CHIP:DMG:
-          [1657716743.524271][6034:6039] CHIP:DMG:                 },
-          [1657716743.524328][6034:6039] CHIP:DMG:
-          [1657716743.524372][6034:6039] CHIP:DMG:         ],
-          [1657716743.524430][6034:6039] CHIP:DMG:
-          [1657716743.524475][6034:6039] CHIP:DMG:         InteractionModelRevision = 1
-          [1657716743.524518][6034:6039] CHIP:DMG: }
-          [1657716743.524683][6034:6039] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0028 Attribute 0x0000_0005 DataVersion: 462674998
-          [1657716743.524745][6034:6039] CHIP:TOO:   NodeLabel: 1
-          [1657716743.524813][6034:6039] CHIP:DMG: MoveToState ReadClient[0xffff8c004100]: Moving to [AwaitingSu]
+           basic subscribe  local-config-disabled 100 1000 4  0  --commissioner-name 5   --keepSubscriptions 1
+          : }
+          [1660653545.651601][58149:58154] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0028 Attribute 0x0000_0010 DataVersion: 3782190838
+          [1660653545.651636][58149:58154] CHIP:TOO:   LocalConfigDisabled: FALSE
+          [1660653545.651669][58149:58154] CHIP:DMG: MoveToState ReadClient[0xffff74009a20]: Moving to [AwaitingSu]
 
 
-           levelcontrol subscribe  on-transition-time  10 100 1 1
-          [1657716911.280884][6034:6039] CHIP:DMG: ReportDataMessage =
-          [1657716911.280957][6034:6039] CHIP:DMG: {
-          [1657716911.281018][6034:6039] CHIP:DMG:         SubscriptionId = 0x1a544eea,
-          [1657716911.281080][6034:6039] CHIP:DMG:         AttributeReportIBs =
-          [1657716911.281157][6034:6039] CHIP:DMG:         [
-          [1657716911.281217][6034:6039] CHIP:DMG:                 AttributeReportIB =
-          [1657716911.281338][6034:6039] CHIP:DMG:                 {
-          [1657716911.281408][6034:6039] CHIP:DMG:                         AttributeDataIB =
-          [1657716911.281487][6034:6039] CHIP:DMG:                         {
-          [1657716911.281570][6034:6039] CHIP:DMG:                                 DataVersion = 0x319eedab,
-          [1657716911.281649][6034:6039] CHIP:DMG:                                 AttributePathIB =
-          [1657716911.281723][6034:6039] CHIP:DMG:                                 {
-          [1657716911.281813][6034:6039] CHIP:DMG:                                         Endpoint = 0x1,
-          [1657716911.281892][6034:6039] CHIP:DMG:                                         Cluster = 0x8,
-          [1657716911.281978][6034:6039] CHIP:DMG:                                         Attribute = 0x0000_0012,
-          [1657716911.282059][6034:6039] CHIP:DMG:                                 }
-          [1657716911.282145][6034:6039] CHIP:DMG:
-          [1657716911.282236][6034:6039] CHIP:DMG:                                 Data = 0,
-          [1657716911.282311][6034:6039] CHIP:DMG:                         },
-          [1657716911.282392][6034:6039] CHIP:DMG:
-          [1657716911.282459][6034:6039] CHIP:DMG:                 },
-          [1657716911.282534][6034:6039] CHIP:DMG:
-          [1657716911.282593][6034:6039] CHIP:DMG:         ],
-          [1657716911.282667][6034:6039] CHIP:DMG:
-          [1657716911.282727][6034:6039] CHIP:DMG:         InteractionModelRevision = 1
-          [1657716911.282786][6034:6039] CHIP:DMG: }
-          [1657716911.282995][6034:6039] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0008 Attribute 0x0000_0012 DataVersion: 832499115
-          [1657716911.283082][6034:6039] CHIP:TOO:   on transition time: 0
-          [1657716911.283172][6034:6039] CHIP:DMG: MoveToState ReadClient[0xffff8c008f20]: Moving to [AwaitingSu]
+
+          on the 5th reference device(RD5)  send 3 Subscribe Request Messages to DUT.
+          basic subscribe node-label 100 1000 5  0  --commissioner-name 6  --keepSubscriptions 1
+
+          [1660652952.539010][58131:58136] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0028 Attribute 0x0000_0005 DataVersion: 3782190838
+          [1660652952.539073][58131:58136] CHIP:TOO:   NodeLabel:
+          [1660652952.539140][58131:58136] CHIP:DMG: MoveToState ReadClient[0xffffa0004bc0]: Moving to [AwaitingSu]
 
 
-          on the 3rd reference deice enter:
-          onoff subscribe start-up-on-off  10 100 1 1
-          [1657716965.736576][6034:6039] CHIP:EM: Removed CHIP MessageCounter:12313969 from RetransTable on exchange 50225i
-          [1657716965.736639][6034:6039] CHIP:DMG: ReportDataMessage =
-          [1657716965.736669][6034:6039] CHIP:DMG: {
-          [1657716965.736695][6034:6039] CHIP:DMG:         SubscriptionId = 0x5a6ddc07,
-          [1657716965.736741][6034:6039] CHIP:DMG:         AttributeReportIBs =
-          [1657716965.736777][6034:6039] CHIP:DMG:         [
-          [1657716965.736802][6034:6039] CHIP:DMG:                 AttributeReportIB =
-          [1657716965.736848][6034:6039] CHIP:DMG:                 {
-          [1657716965.736887][6034:6039] CHIP:DMG:                         AttributeDataIB =
-          [1657716965.736932][6034:6039] CHIP:DMG:                         {
-          [1657716965.736978][6034:6039] CHIP:DMG:                                 DataVersion = 0x734a2d85,
-          [1657716965.737021][6034:6039] CHIP:DMG:                                 AttributePathIB =
-          [1657716965.737067][6034:6039] CHIP:DMG:                                 {
-          [1657716965.737113][6034:6039] CHIP:DMG:                                         Endpoint = 0x1,
-          [1657716965.737159][6034:6039] CHIP:DMG:                                         Cluster = 0x6,
-          [1657716965.737207][6034:6039] CHIP:DMG:                                         Attribute = 0x0000_4003,
-          [1657716965.737251][6034:6039] CHIP:DMG:                                 }
-          [1657716965.737346][6034:6039] CHIP:DMG:
-          [1657716965.737396][6034:6039] CHIP:DMG:                                 Data = 1,
-          [1657716965.737438][6034:6039] CHIP:DMG:                         },
-          [1657716965.737484][6034:6039] CHIP:DMG:
-          [1657716965.737521][6034:6039] CHIP:DMG:                 },
-          [1657716965.737563][6034:6039] CHIP:DMG:
-          [1657716965.737589][6034:6039] CHIP:DMG:         ],
-          [1657716965.737620][6034:6039] CHIP:DMG:
-          [1657716965.737645][6034:6039] CHIP:DMG:         InteractionModelRevision = 1
-          [1657716965.737679][6034:6039] CHIP:DMG: }
-          [1657716965.737779][6034:6039] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0006 Attribute 0x0000_4003 DataVersion: 1934241157
-          [1657716965.737827][6034:6039] CHIP:TOO:   StartUpOnOff: 1
-          [1657716965.737867][6034:6039] CHIP:DMG: MoveToState ReadClient[0xffff8c008e30]: Moving to [AwaitingSu]
+
+           basic subscribe location 100 1000 5  0  --commissioner-name 6   --keepSubscriptions 1
+
+          [1660653500.502738][58149:58154] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0028 Attribute 0x0000_0006 DataVersion: 3782190838
+          [1660653500.502801][58149:58154] CHIP:TOO:   Location: XX
+          [1660653500.502870][58149:58154] CHIP:DMG: MoveToState ReadClient[0xffff7400adb0]: Moving to [AwaitingSu]
 
 
-          basic subscribe reachable  10 100 1 0
-          [1657717032.547326][6034:6039] CHIP:EM: Removed CHIP MessageCounter:12313975 from RetransTable on exchange 50227i
-          [1657717032.547406][6034:6039] CHIP:DMG: ReportDataMessage =
-          [1657717032.547470][6034:6039] CHIP:DMG: {
-          [1657717032.547507][6034:6039] CHIP:DMG:         SubscriptionId = 0x242f7180,
-          [1657717032.547560][6034:6039] CHIP:DMG:         AttributeReportIBs =
-          [1657717032.547607][6034:6039] CHIP:DMG:         [
-          [1657717032.547644][6034:6039] CHIP:DMG:                 AttributeReportIB =
-          [1657717032.547696][6034:6039] CHIP:DMG:                 {
-          [1657717032.547734][6034:6039] CHIP:DMG:                         AttributeDataIB =
-          [1657717032.547779][6034:6039] CHIP:DMG:                         {
-          [1657717032.547829][6034:6039] CHIP:DMG:                                 DataVersion = 0x1b93dc36,
-          [1657717032.547876][6034:6039] CHIP:DMG:                                 AttributePathIB =
-          [1657717032.547925][6034:6039] CHIP:DMG:                                 {
-          [1657717032.547974][6034:6039] CHIP:DMG:                                         Endpoint = 0x0,
-          [1657717032.548027][6034:6039] CHIP:DMG:                                         Cluster = 0x28,
-          [1657717032.548077][6034:6039] CHIP:DMG:                                         Attribute = 0x0000_0011,
-          [1657717032.548124][6034:6039] CHIP:DMG:                                 }
-          [1657717032.548175][6034:6039] CHIP:DMG:
-          [1657717032.548225][6034:6039] CHIP:DMG:                                 Data = true,
-          [1657717032.548272][6034:6039] CHIP:DMG:                         },
-          [1657717032.548321][6034:6039] CHIP:DMG:
-          [1657717032.548358][6034:6039] CHIP:DMG:                 },
-          [1657717032.548403][6034:6039] CHIP:DMG:
-          [1657717032.548438][6034:6039] CHIP:DMG:         ],
-          [1657717032.548482][6034:6039] CHIP:DMG:
-          [1657717032.548518][6034:6039] CHIP:DMG:         InteractionModelRevision = 1
-          [1657717032.548553][6034:6039] CHIP:DMG: }
-          [1657717032.548686][6034:6039] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0028 Attribute 0x0000_0011 DataVersion: 462674998
-          [1657717032.548795][6034:6039] CHIP:TOO:   Reachable: TRUE
-          [1657717032.548850][6034:6039] CHIP:DMG: MoveToState ReadClient[0xffff8c0092b0]: Moving to [AwaitingSu]
+
+           basic subscribe  local-config-disabled 100 1000 5  0  --commissioner-name beta  --keepSubscriptions 1
+          : }
+          [1660653545.651601][58149:58154] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0028 Attribute 0x0000_0010 DataVersion: 3782190838
+          [1660653545.651636][58149:58154] CHIP:TOO:   LocalConfigDisabled: FALSE
+          [1660653545.651669][58149:58154] CHIP:DMG: MoveToState ReadClient[0xffff74009a20]: Moving to [AwaitingSu]
 
 
-           onoff subscribe off-wait-time   10 100 1 1
-          [1657717085.996867][6034:6039] CHIP:DMG: ReportDataMessage =
-          [1657717085.996895][6034:6039] CHIP:DMG: {
-          [1657717085.996920][6034:6039] CHIP:DMG:         SubscriptionId = 0xbe7eee69,
-          [1657717085.996945][6034:6039] CHIP:DMG:         AttributeReportIBs =
-          [1657717085.996977][6034:6039] CHIP:DMG:         [
-          [1657717085.997002][6034:6039] CHIP:DMG:                 AttributeReportIB =
-          [1657717085.997035][6034:6039] CHIP:DMG:                 {
-          [1657717085.997060][6034:6039] CHIP:DMG:                         AttributeDataIB =
-          [1657717085.997089][6034:6039] CHIP:DMG:                         {
-          [1657717085.997122][6034:6039] CHIP:DMG:                                 DataVersion = 0x734a2d85,
-          [1657717085.997153][6034:6039] CHIP:DMG:                                 AttributePathIB =
-          [1657717085.997187][6034:6039] CHIP:DMG:                                 {
-          [1657717085.997220][6034:6039] CHIP:DMG:                                         Endpoint = 0x1,
-          [1657717085.997258][6034:6039] CHIP:DMG:                                         Cluster = 0x6,
-          [1657717085.997317][6034:6039] CHIP:DMG:                                         Attribute = 0x0000_4002,
-          [1657717085.997367][6034:6039] CHIP:DMG:                                 }
-          [1657717085.997404][6034:6039] CHIP:DMG:
-          [1657717085.997440][6034:6039] CHIP:DMG:                                 Data = 0,
-          [1657717085.997471][6034:6039] CHIP:DMG:                         },
-          [1657717085.997504][6034:6039] CHIP:DMG:
-          [1657717085.997531][6034:6039] CHIP:DMG:                 },
-          [1657717085.997561][6034:6039] CHIP:DMG:
-          [1657717085.997585][6034:6039] CHIP:DMG:         ],
-          [1657717085.997615][6034:6039] CHIP:DMG:
-          [1657717085.997640][6034:6039] CHIP:DMG:         InteractionModelRevision = 1
-          [1657717085.997663][6034:6039] CHIP:DMG: }
-          [1657717085.997757][6034:6039] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0006 Attribute 0x0000_4002 DataVersion: 1934241157
-          [1657717085.997793][6034:6039] CHIP:TOO:   OffWaitTime: 0
-          [1657717085.997830][6034:6039] CHIP:DMG: MoveToState ReadClient[0xffff8c008f20]: Moving to [AwaitingSu]
+          on the 1st reference device(RD1)  send 6 Subscribe Request Messages to DUT, and Verify that the Subscriptions from RD2, RD3, RD4, RD5 are not affected.
+           basic subscribe node-label 100 1000 1  0  --keepSubscriptions 1
+          [1660652952.539010][58131:58136] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0028 Attribute 0x0000_0005 DataVersion: 3782190838
+          [1660652952.539073][58131:58136] CHIP:TOO:   NodeLabel:
+          [1660652952.539140][58131:58136] CHIP:DMG: MoveToState ReadClient[0xffffa0004bc0]: Moving to [AwaitingSu]
+
+
+           basic subscribe location 100 1000 1  0   --keepSubscriptions 1
+          [1660653005.343616][58131:58136] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0028 Attribute 0x0000_0006 DataVersion: 3782190838
+          [1660653005.343884][58131:58136] CHIP:TOO:   Location: XX
+          [1660653005.343983][58131:58136] CHIP:DMG: MoveToState ReadClient[0xffffa00129b0]: Moving to [AwaitingSu]
+
+
+
+           basic subscribe  local-config-disabled 100 1000 1  0   --keepSubscriptions 1
+          [1660653043.576169][58131:58136] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0028 Attribute 0x0000_0010 DataVersion: 3782190838
+          [1660653043.576207][58131:58136] CHIP:TOO:   LocalConfigDisabled: FALSE
+          [1660653043.576240][58131:58136] CHIP:DMG: MoveToState ReadClient[0xffffa0012b40]: Moving to [AwaitingSu]
+
+
+
+
+          basic subscribe product-id 100 1000 1  0  --keepSubscriptions 1
+
+          [1660654945.477837][58149:58154] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0028 Attribute 0x0000_0004 DataVersion: 3782190841
+          [1660654945.477932][58149:58154] CHIP:TOO:   ProductID: 32769
+          [1660654945.478023][58149:58154] CHIP:DMG: MoveToState ReadClient[0xffff740127c0]: Moving to [AwaitingSu]
+
+
+          basic subscribe software-version 100 1000 1  0  --keepSubscriptions 1
+
+          [1660654945.477837][58149:58154] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0028 Attribute 0x0000_0004 DataVersion: 3782190841
+          [1660654945.477932][58149:58154] CHIP:TOO:   software-version:
+          [1660654945.478023][58149:58154] CHIP:DMG: MoveToState ReadClient[0xffff740127c0]: Moving to [AwaitingSu]
+
+
+
+
+          basic subscribe  hardware-version  100 1000 1  0  --keepSubscriptions 1
+          [1660654945.477837][58149:58154] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0028 Attribute 0x0000_0004 DataVersion: 3782190841
+          [1660654945.477932][58149:58154] CHIP:TOO: hardware-version:
+          [1660654945.478023][58149:58154] CHIP:DMG: MoveToState ReadClient[0xffff740127c0]: Moving to [AwaitingSu]
       disabled: true
 
     - label:
@@ -1440,408 +1346,6 @@
           Subscription Requests are activated, send a Subscribe request messages
           having 3 different paths from RD1A to the DUT."
       verification: |
-          Please  run this test in chip tool interactive mode ./chip-tool interactive start
-
-          Send 3 Subscriptionrequest message from each Reference Device(Eg. RD1...) to DUT
-          and verify all the subscription requests are succes, then send a Subscribe request messages having 3 different paths from RD1A to the DUT.
-
-
-          Example commands given below are using 3 reference device (User can use 5 reference device and send the below command in from each reference device)
-
-
-          on the 1st reference deice enter:
-          onoff subscribe start-up-on-off  10 100 1 1
-          [1657716965.736576][6034:6039] CHIP:EM: Removed CHIP MessageCounter:12313969 from RetransTable on exchange 50225i
-          [1657716965.736639][6034:6039] CHIP:DMG: ReportDataMessage =
-          [1657716965.736669][6034:6039] CHIP:DMG: {
-          [1657716965.736695][6034:6039] CHIP:DMG:         SubscriptionId = 0x5a6ddc07,
-          [1657716965.736741][6034:6039] CHIP:DMG:         AttributeReportIBs =
-          [1657716965.736777][6034:6039] CHIP:DMG:         [
-          [1657716965.736802][6034:6039] CHIP:DMG:                 AttributeReportIB =
-          [1657716965.736848][6034:6039] CHIP:DMG:                 {
-          [1657716965.736887][6034:6039] CHIP:DMG:                         AttributeDataIB =
-          [1657716965.736932][6034:6039] CHIP:DMG:                         {
-          [1657716965.736978][6034:6039] CHIP:DMG:                                 DataVersion = 0x734a2d85,
-          [1657716965.737021][6034:6039] CHIP:DMG:                                 AttributePathIB =
-          [1657716965.737067][6034:6039] CHIP:DMG:                                 {
-          [1657716965.737113][6034:6039] CHIP:DMG:                                         Endpoint = 0x1,
-          [1657716965.737159][6034:6039] CHIP:DMG:                                         Cluster = 0x6,
-          [1657716965.737207][6034:6039] CHIP:DMG:                                         Attribute = 0x0000_4003,
-          [1657716965.737251][6034:6039] CHIP:DMG:                                 }
-          [1657716965.737346][6034:6039] CHIP:DMG:
-          [1657716965.737396][6034:6039] CHIP:DMG:                                 Data = 1,
-          [1657716965.737438][6034:6039] CHIP:DMG:                         },
-          [1657716965.737484][6034:6039] CHIP:DMG:
-          [1657716965.737521][6034:6039] CHIP:DMG:                 },
-          [1657716965.737563][6034:6039] CHIP:DMG:
-          [1657716965.737589][6034:6039] CHIP:DMG:         ],
-          [1657716965.737620][6034:6039] CHIP:DMG:
-          [1657716965.737645][6034:6039] CHIP:DMG:         InteractionModelRevision = 1
-          [1657716965.737679][6034:6039] CHIP:DMG: }
-          [1657716965.737779][6034:6039] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0006 Attribute 0x0000_4003 DataVersion: 1934241157
-          [1657716965.737827][6034:6039] CHIP:TOO:   StartUpOnOff: 1
-          [1657716965.737867][6034:6039] CHIP:DMG: MoveToState ReadClient[0xffff8c008e30]: Moving to [AwaitingSu]
-
-
-          basic subscribe reachable  10 100 1 0
-          [1657717032.547326][6034:6039] CHIP:EM: Removed CHIP MessageCounter:12313975 from RetransTable on exchange 50227i
-          [1657717032.547406][6034:6039] CHIP:DMG: ReportDataMessage =
-          [1657717032.547470][6034:6039] CHIP:DMG: {
-          [1657717032.547507][6034:6039] CHIP:DMG:         SubscriptionId = 0x242f7180,
-          [1657717032.547560][6034:6039] CHIP:DMG:         AttributeReportIBs =
-          [1657717032.547607][6034:6039] CHIP:DMG:         [
-          [1657717032.547644][6034:6039] CHIP:DMG:                 AttributeReportIB =
-          [1657717032.547696][6034:6039] CHIP:DMG:                 {
-          [1657717032.547734][6034:6039] CHIP:DMG:                         AttributeDataIB =
-          [1657717032.547779][6034:6039] CHIP:DMG:                         {
-          [1657717032.547829][6034:6039] CHIP:DMG:                                 DataVersion = 0x1b93dc36,
-          [1657717032.547876][6034:6039] CHIP:DMG:                                 AttributePathIB =
-          [1657717032.547925][6034:6039] CHIP:DMG:                                 {
-          [1657717032.547974][6034:6039] CHIP:DMG:                                         Endpoint = 0x0,
-          [1657717032.548027][6034:6039] CHIP:DMG:                                         Cluster = 0x28,
-          [1657717032.548077][6034:6039] CHIP:DMG:                                         Attribute = 0x0000_0011,
-          [1657717032.548124][6034:6039] CHIP:DMG:                                 }
-          [1657717032.548175][6034:6039] CHIP:DMG:
-          [1657717032.548225][6034:6039] CHIP:DMG:                                 Data = true,
-          [1657717032.548272][6034:6039] CHIP:DMG:                         },
-          [1657717032.548321][6034:6039] CHIP:DMG:
-          [1657717032.548358][6034:6039] CHIP:DMG:                 },
-          [1657717032.548403][6034:6039] CHIP:DMG:
-          [1657717032.548438][6034:6039] CHIP:DMG:         ],
-          [1657717032.548482][6034:6039] CHIP:DMG:
-          [1657717032.548518][6034:6039] CHIP:DMG:         InteractionModelRevision = 1
-          [1657717032.548553][6034:6039] CHIP:DMG: }
-          [1657717032.548686][6034:6039] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0028 Attribute 0x0000_0011 DataVersion: 462674998
-          [1657717032.548795][6034:6039] CHIP:TOO:   Reachable: TRUE
-          [1657717032.548850][6034:6039] CHIP:DMG: MoveToState ReadClient[0xffff8c0092b0]: Moving to [AwaitingSu]
-
-
-           onoff subscribe off-wait-time   10 100 1 1
-          [1657717085.996867][6034:6039] CHIP:DMG: ReportDataMessage =
-          [1657717085.996895][6034:6039] CHIP:DMG: {
-          [1657717085.996920][6034:6039] CHIP:DMG:         SubscriptionId = 0xbe7eee69,
-          [1657717085.996945][6034:6039] CHIP:DMG:         AttributeReportIBs =
-          [1657717085.996977][6034:6039] CHIP:DMG:         [
-          [1657717085.997002][6034:6039] CHIP:DMG:                 AttributeReportIB =
-          [1657717085.997035][6034:6039] CHIP:DMG:                 {
-          [1657717085.997060][6034:6039] CHIP:DMG:                         AttributeDataIB =
-          [1657717085.997089][6034:6039] CHIP:DMG:                         {
-          [1657717085.997122][6034:6039] CHIP:DMG:                                 DataVersion = 0x734a2d85,
-          [1657717085.997153][6034:6039] CHIP:DMG:                                 AttributePathIB =
-          [1657717085.997187][6034:6039] CHIP:DMG:                                 {
-          [1657717085.997220][6034:6039] CHIP:DMG:                                         Endpoint = 0x1,
-          [1657717085.997258][6034:6039] CHIP:DMG:                                         Cluster = 0x6,
-          [1657717085.997317][6034:6039] CHIP:DMG:                                         Attribute = 0x0000_4002,
-          [1657717085.997367][6034:6039] CHIP:DMG:                                 }
-          [1657717085.997404][6034:6039] CHIP:DMG:
-          [1657717085.997440][6034:6039] CHIP:DMG:                                 Data = 0,
-          [1657717085.997471][6034:6039] CHIP:DMG:                         },
-          [1657717085.997504][6034:6039] CHIP:DMG:
-          [1657717085.997531][6034:6039] CHIP:DMG:                 },
-          [1657717085.997561][6034:6039] CHIP:DMG:
-          [1657717085.997585][6034:6039] CHIP:DMG:         ],
-          [1657717085.997615][6034:6039] CHIP:DMG:
-          [1657717085.997640][6034:6039] CHIP:DMG:         InteractionModelRevision = 1
-          [1657717085.997663][6034:6039] CHIP:DMG: }
-          [1657717085.997757][6034:6039] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0006 Attribute 0x0000_4002 DataVersion: 1934241157
-          [1657717085.997793][6034:6039] CHIP:TOO:   OffWaitTime: 0
-          [1657717085.997830][6034:6039] CHIP:DMG: MoveToState ReadClient[0xffff8c008f20]: Moving to [AwaitingSu]
-
-
-          on the 2nd reference deice enter:
-           onoff subscribe start-up-on-off   10 100 1 1
-          [1657716703.322836][6034:6039] CHIP:DMG: ReportDataMessage =
-          [1657716703.322895][6034:6039] CHIP:DMG: {
-          [1657716703.322947][6034:6039] CHIP:DMG:         SubscriptionId = 0x8962f8b4,
-          [1657716703.323010][6034:6039] CHIP:DMG:         AttributeReportIBs =
-          [1657716703.323080][6034:6039] CHIP:DMG:         [
-          [1657716703.323133][6034:6039] CHIP:DMG:                 AttributeReportIB =
-          [1657716703.323217][6034:6039] CHIP:DMG:                 {
-          [1657716703.323280][6034:6039] CHIP:DMG:                         AttributeDataIB =
-          [1657716703.323341][6034:6039] CHIP:DMG:                         {
-          [1657716703.323396][6034:6039] CHIP:DMG:                                 DataVersion = 0x734a2d85,
-          [1657716703.323449][6034:6039] CHIP:DMG:                                 AttributePathIB =
-          [1657716703.323519][6034:6039] CHIP:DMG:                                 {
-          [1657716703.323591][6034:6039] CHIP:DMG:                                         Endpoint = 0x1,
-          [1657716703.323671][6034:6039] CHIP:DMG:                                         Cluster = 0x6,
-          [1657716703.323759][6034:6039] CHIP:DMG:                                         Attribute = 0x0000_4003,
-          [1657716703.323835][6034:6039] CHIP:DMG:                                 }
-          [1657716703.323909][6034:6039] CHIP:DMG:
-          [1657716703.323981][6034:6039] CHIP:DMG:                                 Data = 1,
-          [1657716703.324047][6034:6039] CHIP:DMG:                         },
-          [1657716703.324113][6034:6039] CHIP:DMG:
-          [1657716703.324170][6034:6039] CHIP:DMG:                 },
-          [1657716703.324238][6034:6039] CHIP:DMG:
-          [1657716703.324289][6034:6039] CHIP:DMG:         ],
-          [1657716703.324352][6034:6039] CHIP:DMG:
-          [1657716703.324403][6034:6039] CHIP:DMG:         InteractionModelRevision = 1
-          [1657716703.324457][6034:6039] CHIP:DMG: }
-          [1657716703.324785][6034:6039] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0006 Attribute 0x0000_4003 DataVersion: 1934241157
-          [1657716703.324904][6034:6039] CHIP:TOO:   StartUpOnOff: 1
-          [1657716703.324985][6034:6039] CHIP:DMG: MoveToState ReadClient[0xffff8c008e30]: Moving to [AwaitingSu]
-
-
-
-           basic subscribe node-label 10 100  1 0
-          [1657716743.523056][6034:6039] CHIP:DMG: ReportDataMessage =
-          [1657716743.523131][6034:6039] CHIP:DMG: {
-          [1657716743.523178][6034:6039] CHIP:DMG:         SubscriptionId = 0xc3b3c364,
-          [1657716743.523240][6034:6039] CHIP:DMG:         AttributeReportIBs =
-          [1657716743.523302][6034:6039] CHIP:DMG:         [
-          [1657716743.523362][6034:6039] CHIP:DMG:                 AttributeReportIB =
-          [1657716743.523433][6034:6039] CHIP:DMG:                 {
-          [1657716743.523499][6034:6039] CHIP:DMG:                         AttributeDataIB =
-          [1657716743.523555][6034:6039] CHIP:DMG:                         {
-          [1657716743.523627][6034:6039] CHIP:DMG:                                 DataVersion = 0x1b93dc36,
-          [1657716743.523682][6034:6039] CHIP:DMG:                                 AttributePathIB =
-          [1657716743.523738][6034:6039] CHIP:DMG:                                 {
-          [1657716743.523812][6034:6039] CHIP:DMG:                                         Endpoint = 0x0,
-          [1657716743.523873][6034:6039] CHIP:DMG:                                         Cluster = 0x28,
-          [1657716743.523934][6034:6039] CHIP:DMG:                                         Attribute = 0x0000_0005,
-          [1657716743.523990][6034:6039] CHIP:DMG:                                 }
-          [1657716743.524050][6034:6039] CHIP:DMG:
-          [1657716743.524111][6034:6039] CHIP:DMG:                                 Data = "1",
-          [1657716743.524164][6034:6039] CHIP:DMG:                         },
-          [1657716743.524223][6034:6039] CHIP:DMG:
-          [1657716743.524271][6034:6039] CHIP:DMG:                 },
-          [1657716743.524328][6034:6039] CHIP:DMG:
-          [1657716743.524372][6034:6039] CHIP:DMG:         ],
-          [1657716743.524430][6034:6039] CHIP:DMG:
-          [1657716743.524475][6034:6039] CHIP:DMG:         InteractionModelRevision = 1
-          [1657716743.524518][6034:6039] CHIP:DMG: }
-          [1657716743.524683][6034:6039] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0028 Attribute 0x0000_0005 DataVersion: 462674998
-          [1657716743.524745][6034:6039] CHIP:TOO:   NodeLabel: 1
-          [1657716743.524813][6034:6039] CHIP:DMG: MoveToState ReadClient[0xffff8c004100]: Moving to [AwaitingSu]
-
-
-           levelcontrol subscribe  on-transition-time  10 100 1 1
-          [1657716911.280884][6034:6039] CHIP:DMG: ReportDataMessage =
-          [1657716911.280957][6034:6039] CHIP:DMG: {
-          [1657716911.281018][6034:6039] CHIP:DMG:         SubscriptionId = 0x1a544eea,
-          [1657716911.281080][6034:6039] CHIP:DMG:         AttributeReportIBs =
-          [1657716911.281157][6034:6039] CHIP:DMG:         [
-          [1657716911.281217][6034:6039] CHIP:DMG:                 AttributeReportIB =
-          [1657716911.281338][6034:6039] CHIP:DMG:                 {
-          [1657716911.281408][6034:6039] CHIP:DMG:                         AttributeDataIB =
-          [1657716911.281487][6034:6039] CHIP:DMG:                         {
-          [1657716911.281570][6034:6039] CHIP:DMG:                                 DataVersion = 0x319eedab,
-          [1657716911.281649][6034:6039] CHIP:DMG:                                 AttributePathIB =
-          [1657716911.281723][6034:6039] CHIP:DMG:                                 {
-          [1657716911.281813][6034:6039] CHIP:DMG:                                         Endpoint = 0x1,
-          [1657716911.281892][6034:6039] CHIP:DMG:                                         Cluster = 0x8,
-          [1657716911.281978][6034:6039] CHIP:DMG:                                         Attribute = 0x0000_0012,
-          [1657716911.282059][6034:6039] CHIP:DMG:                                 }
-          [1657716911.282145][6034:6039] CHIP:DMG:
-          [1657716911.282236][6034:6039] CHIP:DMG:                                 Data = 0,
-          [1657716911.282311][6034:6039] CHIP:DMG:                         },
-          [1657716911.282392][6034:6039] CHIP:DMG:
-          [1657716911.282459][6034:6039] CHIP:DMG:                 },
-          [1657716911.282534][6034:6039] CHIP:DMG:
-          [1657716911.282593][6034:6039] CHIP:DMG:         ],
-          [1657716911.282667][6034:6039] CHIP:DMG:
-          [1657716911.282727][6034:6039] CHIP:DMG:         InteractionModelRevision = 1
-          [1657716911.282786][6034:6039] CHIP:DMG: }
-          [1657716911.282995][6034:6039] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0008 Attribute 0x0000_0012 DataVersion: 832499115
-          [1657716911.283082][6034:6039] CHIP:TOO:   on transition time: 0
-          [1657716911.283172][6034:6039] CHIP:DMG: MoveToState ReadClient[0xffff8c008f20]: Moving to [AwaitingSu]
-
-
-          on the 3rd reference deice enter:
-
-           levelcontrol subscribe min-level   10 100 1 1
-          [1657717758.176398][6034:6039] CHIP:DMG: ReportDataMessage =
-          [1657717758.176466][6034:6039] CHIP:DMG: {
-          [1657717758.176545][6034:6039] CHIP:DMG:         SubscriptionId = 0xbf960b6c,
-          [1657717758.176619][6034:6039] CHIP:DMG:         AttributeReportIBs =
-          [1657717758.176698][6034:6039] CHIP:DMG:         [
-          [1657717758.176750][6034:6039] CHIP:DMG:                 AttributeReportIB =
-          [1657717758.176818][6034:6039] CHIP:DMG:                 {
-          [1657717758.176872][6034:6039] CHIP:DMG:                         AttributeDataIB =
-          [1657717758.176959][6034:6039] CHIP:DMG:                         {
-          [1657717758.177034][6034:6039] CHIP:DMG:                                 DataVersion = 0x319eedab,
-          [1657717758.177136][6034:6039] CHIP:DMG:                                 AttributePathIB =
-          [1657717758.177206][6034:6039] CHIP:DMG:                                 {
-          [1657717758.177269][6034:6039] CHIP:DMG:                                         Endpoint = 0x1,
-          [1657717758.177377][6034:6039] CHIP:DMG:                                         Cluster = 0x8,
-          [1657717758.177429][6034:6039] CHIP:DMG:                                         Attribute = 0x0000_0002,
-          [1657717758.177488][6034:6039] CHIP:DMG:                                 }
-          [1657717758.177551][6034:6039] CHIP:DMG:
-          [1657717758.177600][6034:6039] CHIP:DMG:                                 Data = 1,
-          [1657717758.177655][6034:6039] CHIP:DMG:                         },
-          [1657717758.177716][6034:6039] CHIP:DMG:
-          [1657717758.177755][6034:6039] CHIP:DMG:                 },
-          [1657717758.177813][6034:6039] CHIP:DMG:
-          [1657717758.177850][6034:6039] CHIP:DMG:         ],
-          [1657717758.177896][6034:6039] CHIP:DMG:
-          [1657717758.177933][6034:6039] CHIP:DMG:         InteractionModelRevision = 1
-          [1657717758.177969][6034:6039] CHIP:DMG: }
-          [1657717758.178105][6034:6039] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0008 Attribute 0x0000_0002 DataVersion: 832499115
-          [1657717758.178156][6034:6039] CHIP:TOO:   min level: 1
-          [1657717758.178215][6034:6039] CHIP:DMG: MoveToState ReadClient[0xffff8c004100]: Moving to [AwaitingSu]
-
-
-
-           onoff subscribe global-scene-control   10 100 1 1
-          [1657717721.303602][6034:6039] CHIP:DMG: ReportDataMessage =
-          [1657717721.303670][6034:6039] CHIP:DMG: {
-          [1657717721.303730][6034:6039] CHIP:DMG:         SubscriptionId = 0x2b768ffd,
-          [1657717721.303791][6034:6039] CHIP:DMG:         AttributeReportIBs =
-          [1657717721.303867][6034:6039] CHIP:DMG:         [
-          [1657717721.303928][6034:6039] CHIP:DMG:                 AttributeReportIB =
-          [1657717721.304007][6034:6039] CHIP:DMG:                 {
-          [1657717721.304071][6034:6039] CHIP:DMG:                         AttributeDataIB =
-          [1657717721.304149][6034:6039] CHIP:DMG:                         {
-          [1657717721.304225][6034:6039] CHIP:DMG:                                 DataVersion = 0x734a2d85,
-          [1657717721.304297][6034:6039] CHIP:DMG:                                 AttributePathIB =
-          [1657717721.304372][6034:6039] CHIP:DMG:                                 {
-          [1657717721.304454][6034:6039] CHIP:DMG:                                         Endpoint = 0x1,
-          [1657717721.304542][6034:6039] CHIP:DMG:                                         Cluster = 0x6,
-          [1657717721.304628][6034:6039] CHIP:DMG:                                         Attribute = 0x0000_4000,
-          [1657717721.304711][6034:6039] CHIP:DMG:                                 }
-          [1657717721.304797][6034:6039] CHIP:DMG:
-          [1657717721.304881][6034:6039] CHIP:DMG:                                 Data = true,
-          [1657717721.304958][6034:6039] CHIP:DMG:                         },
-          [1657717721.305039][6034:6039] CHIP:DMG:
-          [1657717721.305102][6034:6039] CHIP:DMG:                 },
-          [1657717721.305178][6034:6039] CHIP:DMG:
-          [1657717721.305238][6034:6039] CHIP:DMG:         ],
-          [1657717721.305348][6034:6039] CHIP:DMG:
-          [1657717721.305412][6034:6039] CHIP:DMG:         InteractionModelRevision = 1
-          [1657717721.305470][6034:6039] CHIP:DMG: }
-          [1657717721.305679][6034:6039] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0006 Attribute 0x0000_4000 DataVersion: 1934241157
-          [1657717721.305761][6034:6039] CHIP:TOO:   GlobalSceneControl: TRUE
-          [1657717721.305849][6034:6039] CHIP:DMG: MoveToState ReadClient[0xffff8c0092b0]: Moving to [AwaitingSu]
-
-
-          temperaturemeasurement subscribe  tolerance     10 100 1 1
-          [1657717893.368431][6034:6039] CHIP:DMG: ReportDataMessage =
-          [1657717893.368514][6034:6039] CHIP:DMG: {
-          [1657717893.368562][6034:6039] CHIP:DMG:         SubscriptionId = 0x87e778d7,
-          [1657717893.368649][6034:6039] CHIP:DMG:         AttributeReportIBs =
-          [1657717893.368744][6034:6039] CHIP:DMG:         [
-          [1657717893.368837][6034:6039] CHIP:DMG:                 AttributeReportIB =
-          [1657717893.368943][6034:6039] CHIP:DMG:                 {
-          [1657717893.369046][6034:6039] CHIP:DMG:                         AttributeDataIB =
-          [1657717893.369138][6034:6039] CHIP:DMG:                         {
-          [1657717893.369231][6034:6039] CHIP:DMG:                                 DataVersion = 0x8ca282b3,
-          [1657717893.369359][6034:6039] CHIP:DMG:                                 AttributePathIB =
-          [1657717893.369461][6034:6039] CHIP:DMG:                                 {
-          [1657717893.369563][6034:6039] CHIP:DMG:                                         Endpoint = 0x1,
-          [1657717893.369674][6034:6039] CHIP:DMG:                                         Cluster = 0x402,
-          [1657717893.369786][6034:6039] CHIP:DMG:                                         Attribute = 0x0000_0003,
-          [1657717893.369896][6034:6039] CHIP:DMG:                                 }
-          [1657717893.370000][6034:6039] CHIP:DMG:
-          [1657717893.370094][6034:6039] CHIP:DMG:                                 Data = 0,
-          [1657717893.370192][6034:6039] CHIP:DMG:                         },
-          [1657717893.370284][6034:6039] CHIP:DMG:
-          [1657717893.370359][6034:6039] CHIP:DMG:                 },
-          [1657717893.370439][6034:6039] CHIP:DMG:
-          [1657717893.370504][6034:6039] CHIP:DMG:         ],
-          [1657717893.370575][6034:6039] CHIP:DMG:
-          [1657717893.370630][6034:6039] CHIP:DMG:         InteractionModelRevision = 1
-          [1657717893.370699][6034:6039] CHIP:DMG: }
-          [1657717893.370819][6034:6039] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0402 Attribute 0x0000_0003 DataVersion: 2359460531
-          [1657717893.370888][6034:6039] CHIP:TOO:   Tolerance: 0
-          [1657717893.370929][6034:6039] CHIP:DMG: MoveToState ReadClient[0xffff8c0092b0]: Moving to [AwaitingSu]
-
-
-
-
-          After all above mentioned subscription are activated send below mentioned command in 4th reference device  which is having same  same fabric as 1st reference device
-
-           any subscribe-by-id 0x0008 0x0010 10 100   1 1
-
-          [1657716563.242433][6034:6039] CHIP:DMG: ReportDataMessage =
-          [1657716563.242475][6034:6039] CHIP:DMG: {
-          [1657716563.242507][6034:6039] CHIP:DMG:         SubscriptionId = 0xebc26cc4,
-          [1657716563.242538][6034:6039] CHIP:DMG:         AttributeReportIBs =
-          [1657716563.242577][6034:6039] CHIP:DMG:         [
-          [1657716563.242607][6034:6039] CHIP:DMG:                 AttributeReportIB =
-          [1657716563.242648][6034:6039] CHIP:DMG:                 {
-          [1657716563.242680][6034:6039] CHIP:DMG:                         AttributeDataIB =
-          [1657716563.242721][6034:6039] CHIP:DMG:                         {
-          [1657716563.242762][6034:6039] CHIP:DMG:                                 DataVersion = 0x319eedab,
-          [1657716563.242801][6034:6039] CHIP:DMG:                                 AttributePathIB =
-          [1657716563.242842][6034:6039] CHIP:DMG:                                 {
-          [1657716563.242883][6034:6039] CHIP:DMG:                                         Endpoint = 0x1,
-          [1657716563.242928][6034:6039] CHIP:DMG:                                         Cluster = 0x8,
-          [1657716563.242971][6034:6039] CHIP:DMG:                                         Attribute = 0x0000_0010,
-          [1657716563.243012][6034:6039] CHIP:DMG:                                 }
-          [1657716563.243056][6034:6039] CHIP:DMG:
-          [1657716563.243100][6034:6039] CHIP:DMG:                                 Data = 1,
-          [1657716563.243138][6034:6039] CHIP:DMG:                         },
-          [1657716563.243179][6034:6039] CHIP:DMG:
-          [1657716563.243213][6034:6039] CHIP:DMG:                 },
-          [1657716563.243251][6034:6039] CHIP:DMG:
-          [1657716563.243280][6034:6039] CHIP:DMG:         ],
-          [1657716563.243318][6034:6039] CHIP:DMG:
-          [1657716563.243348][6034:6039] CHIP:DMG:         InteractionModelRevision = 1
-          [1657716563.243377][6034:6039] CHIP:DMG: }
-          [1657716563.243531][6034:6039] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0008 Attribute 0x0000_0010 DataVersion: 832499115
-          [1657716563.243601][6034:6039] CHIP:TOO:   on off transition time: 1
-          [1657716563.243648][6034:6039] CHIP:DMG: MoveToState ReadClient[0xffff8c008e30]: Moving to [AwaitingSu]
-
-
-
-            basic subscribe node-label 10 100  1 0
-          [1657716599.928585][6034:6039] CHIP:DMG: ReportDataMessage =
-          [1657716599.928652][6034:6039] CHIP:DMG: {
-          [1657716599.928825][6034:6039] CHIP:DMG:         SubscriptionId = 0x3d9f1c1,
-          [1657716599.928890][6034:6039] CHIP:DMG:         AttributeReportIBs =
-          [1657716599.928968][6034:6039] CHIP:DMG:         [
-          [1657716599.929029][6034:6039] CHIP:DMG:                 AttributeReportIB =
-          [1657716599.929122][6034:6039] CHIP:DMG:                 {
-          [1657716599.929192][6034:6039] CHIP:DMG:                         AttributeDataIB =
-          [1657716599.929278][6034:6039] CHIP:DMG:                         {
-          [1657716599.929399][6034:6039] CHIP:DMG:                                 DataVersion = 0x1b93dc36,
-          [1657716599.929476][6034:6039] CHIP:DMG:                                 AttributePathIB =
-          [1657716599.929687][6034:6039] CHIP:DMG:                                 {
-          [1657716599.929774][6034:6039] CHIP:DMG:                                         Endpoint = 0x0,
-          [1657716599.929861][6034:6039] CHIP:DMG:                                         Cluster = 0x28,
-          [1657716599.929949][6034:6039] CHIP:DMG:                                         Attribute = 0x0000_0005,
-          [1657716599.930031][6034:6039] CHIP:DMG:                                 }
-          [1657716599.930115][6034:6039] CHIP:DMG:
-          [1657716599.930285][6034:6039] CHIP:DMG:                                 Data = "1",
-          [1657716599.930370][6034:6039] CHIP:DMG:                         },
-          [1657716599.930454][6034:6039] CHIP:DMG:
-          [1657716599.930578][6034:6039] CHIP:DMG:                 },
-          [1657716599.930660][6034:6039] CHIP:DMG:
-          [1657716599.930720][6034:6039] CHIP:DMG:         ],
-          [1657716599.930796][6034:6039] CHIP:DMG:
-          [1657716599.930856][6034:6039] CHIP:DMG:         InteractionModelRevision = 1
-          [1657716599.930914][6034:6039] CHIP:DMG: }
-          [1657716599.931131][6034:6039] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0028 Attribute 0x0000_0005 DataVersion: 462674998
-          [1657716599.931326][6034:6039] CHIP:TOO:   NodeLabel: 1
-          [1657716599.931420][6034:6039] CHIP:DMG: MoveToState ReadClient[0xffff8c008f20]: Moving to [AwaitingSu]
-
-          onoff  subscribe on-time  10 100  1 1
-          [1657716634.400468][6034:6039] CHIP:DMG: ReportDataMessage =
-          [1657716634.400499][6034:6039] CHIP:DMG: {
-          [1657716634.400525][6034:6039] CHIP:DMG:         SubscriptionId = 0xf9b815a2,
-          [1657716634.400551][6034:6039] CHIP:DMG:         AttributeReportIBs =
-          [1657716634.400585][6034:6039] CHIP:DMG:         [
-          [1657716634.400610][6034:6039] CHIP:DMG:                 AttributeReportIB =
-          [1657716634.400647][6034:6039] CHIP:DMG:                 {
-          [1657716634.400674][6034:6039] CHIP:DMG:                         AttributeDataIB =
-          [1657716634.400705][6034:6039] CHIP:DMG:                         {
-          [1657716634.400739][6034:6039] CHIP:DMG:                                 DataVersion = 0x734a2d85,
-          [1657716634.400775][6034:6039] CHIP:DMG:                                 AttributePathIB =
-          [1657716634.400809][6034:6039] CHIP:DMG:                                 {
-          [1657716634.400847][6034:6039] CHIP:DMG:                                         Endpoint = 0x1,
-          [1657716634.400883][6034:6039] CHIP:DMG:                                         Cluster = 0x6,
-          [1657716634.400920][6034:6039] CHIP:DMG:                                         Attribute = 0x0000_4001,
-          [1657716634.400950][6034:6039] CHIP:DMG:                                 }
-          [1657716634.400987][6034:6039] CHIP:DMG:
-          [1657716634.401024][6034:6039] CHIP:DMG:                                 Data = 1,
-          [1657716634.401058][6034:6039] CHIP:DMG:                         },
-          [1657716634.401092][6034:6039] CHIP:DMG:
-          [1657716634.401117][6034:6039] CHIP:DMG:                 },
-          [1657716634.401148][6034:6039] CHIP:DMG:
-          [1657716634.401172][6034:6039] CHIP:DMG:         ],
-          [1657716634.401202][6034:6039] CHIP:DMG:
-          [1657716634.401227][6034:6039] CHIP:DMG:         InteractionModelRevision = 1
-          [1657716634.401250][6034:6039] CHIP:DMG: }
-          [1657716634.401383][6034:6039] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0006 Attribute 0x0000_4001 DataVersion: 1934241157
-          [1657716634.401428][6034:6039] CHIP:TOO:   OnTime: 1
-          [1657716634.401466][6034:6039] CHIP:DMG: MoveToState ReadClient[0xffff8c008c70]: Moving to [AwaitingSu]
+          Verification step identification is in progress
+          https://github.com/project-chip/connectedhomeip/issues/21009
       disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_KEYPADINPUT_3_1.yaml b/src/app/tests/suites/certification/Test_TC_KEYPADINPUT_3_1.yaml
index 8e091da..edfa5fb 100644
--- a/src/app/tests/suites/certification/Test_TC_KEYPADINPUT_3_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_KEYPADINPUT_3_1.yaml
@@ -15,6 +15,9 @@
 
 name: 3.3.1. [TC-KEYPADINPUT-3.1] Send Key Command Verification (DUT as Client)
 
+PICS:
+    - KEYPADINPUT.C
+
 config:
     nodeId: 0x12344321
     cluster: "Basic"
diff --git a/src/app/tests/suites/certification/Test_TC_OPCREDS_3_1.yaml b/src/app/tests/suites/certification/Test_TC_OPCREDS_3_1.yaml
index 92052a3..7e59af1 100644
--- a/src/app/tests/suites/certification/Test_TC_OPCREDS_3_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_OPCREDS_3_1.yaml
@@ -38,7 +38,7 @@
     - label: "Start the commissioning process of DUT by TH1 on a first Fabric"
       verification: |
           DUT side:
-          sudo ./chip-all-clusters-app --wifi
+          sudo ./chip-all-clusters-app --wifi  --trace_decode 1
 
           TH side:
           ./chip-tool pairing ble-wifi 1 zigbeehome matter123 20202021 3841 --trace_decode 1
@@ -83,7 +83,7 @@
     - label: "TH1 sends AttestationRequest command to DUT"
       PICS: OPCREDS.S.C00.Rsp && OPCREDS.S.C01.Tx
       verification: |
-          To get attestation nonce give below command
+          To get attestation nonce give below command Raspi platform on TH
            echo hex:$(hexdump -vn32 -e"4/4 "%08X" " /dev/urandom)
 
 
@@ -105,21 +105,105 @@
           saves the certififate as PAICert"
       PICS: OPCREDS.S.C02.Rsp && OPCREDS.S.C03.Tx
       verification: |
-          ./chip-tool operationalcredentials certificate-chain-request 2 1 0
+          ./chip-tool operationalcredentials certificate-chain-request 2 1 0 --trace_decode 1
+
 
           Verify the CertificateChainResponse and verify that the size of certificate is less than or equal to 600 bytes and of type octstr in TH Log
 
-          [1658223566.816155][5951:5956] CHIP:DMG: Received Command Response Data, Endpoint=0 Cluster=0x0000_003E Command=0x0000_0003
-          [1658223566.816246][5951:5956] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_003E Command 0x0000_0003
-          [1658223566.816346][5951:5956] CHIP:TOO:   CertificateChainResponse: {
-          [1658223566.816403][5951:5956] CHIP:TOO:     certificate: 308201CB30820171A003020102020856AD8222AD945B64300A06082A8648CE3D04030230303118301606035504030C0F4D617474657220546573742050414131143012060A2B0601040182A27C02010C04464646313020170D3232303230353030303030305A180F39393939313233313233353935395A303D3125302306035504030C1C4D6174746572204465762050414920307846464631206E6F2050494431143012060A2B0601040182A27C02010C04464646313059301306072A8648CE3D020106082A8648CE3D03010703420004419A9315C2173E0C8C876D03CCFC944852647F7FEC5E5082F4059928ECA894C594151309AC631E4CB03392AF684B0BAFB7E65B3B8162C2F52BF931B8E77AAA82A366306430120603551D130101FF040830060101FF020100300E0603551D0F0101FF040403020106301D0603551D0E0416041463540E47F64B1C38D13884A462D16C195D8FFB3C301F0603551D230418301680146AFD22771F511FECBF1641976710DCDC31A1717E300A06082A8648CE3D0403020348003045022100B2EF27F49AE9B50FB91EEAC94C4D0BDBB8D7929C6C
-          [1658223566.816475][5951:5956] CHIP:TOO:     ...........: B88FACE529368D12054C0C0220655DC92B86BD909882A6C62177B825D7D05EDBE7C22F9FEA71220E7EA703F891
-          [1658223566.816510][5951:5956] CHIP:TOO:    }
-
-          Verify the size of certificate is less than or equal to 600 bytes and of type octstr from the above log
-
-          Example :
-          308201CB30820171A003020102020856AD8222AD945B64300A06082A8648CE3D04030230303118301606035504030C0F4D617474657220546573742050414131143012060A2B0601040182A27C02010C04464646313020170D3232303230353030303030305A180F39393939313233313233353935395A303D3125302306035504030C1C4D6174746572204465762050414920307846464631206E6F2050494431143012060A2B0601040182A27C02010C04464646313059301306072A8648CE3D020106082A8648CE3D03010703420004419A9315C2173E0C8C876D03CCFC944852647F7FEC5E5082F4059928ECA894C594151309AC631E4CB03392AF684B0BAFB7E65B3B8162C2F52BF931B8E77AAA82A366306430120603551D130101FF040830060101FF020100300E0603551D0F0101FF040403020106301D0603551D0E0416041463540E47F64B1C38D13884A462D16C195D8FFB3C301F0603551D230418301680146AFD22771F511FECBF1641976710DCDC31A1717E300A06082A8648CE3D0403020348003045022100B2EF27F49AE9B50FB91EEAC94C4D0BDBB8D7929C6C
+          [1660214092.609231][14671:14676] CHIP:DMG: InvokeRequestMessage =
+          [1660214092.609243][14671:14676] CHIP:DMG: {
+          [1660214092.609255][14671:14676] CHIP:DMG:         suppressResponse = false,
+          [1660214092.609269][14671:14676] CHIP:DMG:         timedRequest = false,
+          [1660214092.609281][14671:14676] CHIP:DMG:         InvokeRequests =
+          [1660214092.609301][14671:14676] CHIP:DMG:         [
+          [1660214092.609311][14671:14676] CHIP:DMG:                 CommandDataIB =
+          [1660214092.609326][14671:14676] CHIP:DMG:                 {
+          [1660214092.609338][14671:14676] CHIP:DMG:                         CommandPathIB =
+          [1660214092.609352][14671:14676] CHIP:DMG:                         {
+          [1660214092.609367][14671:14676] CHIP:DMG:                                 EndpointId = 0x0,
+          [1660214092.609383][14671:14676] CHIP:DMG:                                 ClusterId = 0x3e,
+          [1660214092.609396][14671:14676] CHIP:DMG:                                 CommandId = 0x2,
+          [1660214092.609410][14671:14676] CHIP:DMG:                         },
+          [1660214092.609426][14671:14676] CHIP:DMG:
+          [1660214092.609437][14671:14676] CHIP:DMG:                         CommandFields =
+          [1660214092.609452][14671:14676] CHIP:DMG:                         {
+          [1660214092.609467][14671:14676] CHIP:DMG:                                 0x0 = 2,
+          [1660214092.609481][14671:14676] CHIP:DMG:                         },
+          [1660214092.609493][14671:14676] CHIP:DMG:                 },
+          [1660214092.609511][14671:14676] CHIP:DMG:
+          [1660214092.609522][14671:14676] CHIP:DMG:         ],
+          [1660214092.609541][14671:14676] CHIP:DMG:
+          [1660214092.609551][14671:14676] CHIP:DMG:         InteractionModelRevision = 1
+          [1660214092.609563][14671:14676] CHIP:DMG: },
+          [1660214092.609576][14671:14676] CHIP:DMG:
+          [1660214092.609674][14671:14676] CHIP:DMG: ICR moving to [CommandSen]
+          [1660214092.609707][14671:14676] CHIP:EM: Sending Standalone Ack for MessageCounter:33263154 on exchange 56685i
+          [1660214092.609876][14671:14676] CHIP:IN: Prepared unauthenticated message 0x7f5ae77fd000 to 0x0000000000000000 (0)  of type 0x10 and protocolId (0, 0) on exchange 56685i with MessageCounter:66323624.
+          [1660214092.609904][14671:14676] CHIP:IN: Sending unauthenticated msg 0x7f5ae77fd000 with MessageCounter:66323624 to 0x0000000000000000 at monotonic time: 00000000012052C1 msec
+          [1660214092.610138][14671:14676] CHIP:DMG: >> to UDP:[fe80::e65f:1ff:fe0f:2753%enp0s31f6]:5540 | 66323624 | [Secure Channel  (0) / Standalone Ack (0x10) / Session = 0 / Exchange = 56685]
+          [1660214092.610167][14671:14676] CHIP:DMG: Header Flags =
+          [1660214092.610177][14671:14676] CHIP:DMG: {
+          [1660214092.610198][14671:14676] CHIP:DMG:     Message (0x04) =
+          [1660214092.610208][14671:14676] CHIP:DMG:     {
+          [1660214092.610222][14671:14676] CHIP:DMG:         SourceNodeId = 86B22B3066A1B459
+          [1660214092.610234][14671:14676] CHIP:DMG:     }
+          [1660214092.610255][14671:14676] CHIP:DMG:     Exchange (0x03) =
+          [1660214092.610265][14671:14676] CHIP:DMG:     {
+          [1660214092.610276][14671:14676] CHIP:DMG:         Initiator = true
+          [1660214092.610290][14671:14676] CHIP:DMG:         AckMsg = 33263154
+          [1660214092.610301][14671:14676] CHIP:DMG:     }
+          [1660214092.610333][14671:14676] CHIP:DMG: }
+          [1660214092.610355][14671:14676] CHIP:DMG:
+          [1660214092.610379][14671:14676] CHIP:DMG: Encrypted Payload (26 bytes) =
+          [1660214092.610394][14671:14676] CHIP:DMG: {
+          [1660214092.610407][14671:14676] CHIP:DMG:     data = 04000000a804f40359b4a166302bb28603106ddd0000328efb01
+          [1660214092.610423][14671:14676] CHIP:DMG:     buffer_ptr = 140028080604320
+          [1660214092.610436][14671:14676] CHIP:DMG: }
+          [1660214092.610450][14671:14676] CHIP:DMG:
+          [1660214092.610521][14671:14676] CHIP:EM: Flushed pending ack for MessageCounter:33263154 on exchange 56685i
+          [1660214092.617596][14671:14676] CHIP:DMG: << from UDP:[fe80::e65f:1ff:fe0f:2753%enp0s31f6]:5540 | 219026739 | [Interaction Model  (1) / InvokeCommandResponse (0x09) / Session = 20731 / Exchange = 56686]
+          [1660214092.617620][14671:14676] CHIP:DMG: Header Flags =
+          [1660214092.617626][14671:14676] CHIP:DMG: {
+          [1660214092.617637][14671:14676] CHIP:DMG:     Exchange (0x06) =
+          [1660214092.617645][14671:14676] CHIP:DMG:     {
+          [1660214092.617652][14671:14676] CHIP:DMG:         AckMsg = 21510045
+          [1660214092.617657][14671:14676] CHIP:DMG:         NeedsAck = true
+          [1660214092.617663][14671:14676] CHIP:DMG:     }
+          [1660214092.617672][14671:14676] CHIP:DMG: }
+          [1660214092.617678][14671:14676] CHIP:DMG:
+          [1660214092.617686][14671:14676] CHIP:DMG: Encrypted Payload (531 bytes) =
+          [1660214092.617692][14671:14676] CHIP:DMG: {
+          [1660214092.617698][14671:14676] CHIP:DMG:     data = 00fb500033150e0d1ee5b6538768098d8ef37ec0e09fbeb30c158a93ffdd1ca81041b2baa637a7e200110cd7cf06f5ffa40a8e4529a8a38cdd47e50715aaa344941b0c760264022f21b37432352c00f457fade1bdee072261fcb5cde3fcd70e2e71d5a8ec9fa038e670a404d8641162b8fb34919e9d6e431a1c895a6e01cbd3125c9322ff741caf28b79f69f103ec0e9c5b1b74c43fde4d4ac21f15e48b2090916feca5662682ae9eb1f8d18011d618492d57139ad99e94f99e3a755d2a8e46ba7133a0f1d2fe20b7e5cf2906542c4685866c7ccbd8e2e15e84e3dc653057623dac7d65d7bb785466bab3e816e06f378d0165aadf7ef38d23afdb42731191683a995fa1223bcccf27c0314aced823b2a00ff0da758b1f910631fab7098f013a7fed82136cf072c1150e4f351541f194f0aa2987bc0d1d7688d7955d94560b34bbce0b407d340b0ebaef6f5e9343af6cb8d030fb8040a9a6b7cd9465974a692072d05597b98ec66c42cf4edd86d841048cf5f045f90fb74d4066f2f23e038530e18dd4a0f3c1d86800077661bbd5ff28ff873bb87c6a2545871c6eeca5426466cecff984822b8dd3b7822fb109ec80c9ca3c9bb70b20056f2f4f8b25d1ec3bd8c17a86403bdd42d8cf2c2f66ca8983812361f34770992a7724fc33c5297169a2dcc99b92f290d2894bad6c612684f29c71eb0190b5d8d31dee66650da1942a798de69389d9c5bcfbf0e56a08c820092a53d4f34
+          [1660214092.617712][14671:14676] CHIP:DMG:     buffer_ptr = 140028080581472
+          [1660214092.617717][14671:14676] CHIP:DMG: }
+          [1660214092.617722][14671:14676] CHIP:DMG:
+          [1660214092.617768][14671:14676] CHIP:DMG: DAC/PAI (463) =
+          [1660214092.617789][14671:14676] CHIP:DMG: {
+          -----BEGIN CERTIFICATE-----
+          MIIByzCCAXGgAwIBAgIIVq2CIq2UW2QwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+          TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjAyMDUw
+          MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowPTElMCMGA1UEAwwcTWF0dGVyIERldiBQ
+          QUkgMHhGRkYxIG5vIFBJRDEUMBIGCisGAQQBgqJ8AgEMBEZGRjEwWTATBgcqhkjO
+          PQIBBggqhkjOPQMBBwNCAARBmpMVwhc+DIyHbQPM/JRIUmR/f+xeUIL0BZko7KiU
+          xZQVEwmsYx5MsDOSr2hLC6+35ls7gWLC9Sv5MbjneqqCo2YwZDASBgNVHRMBAf8E
+          CDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUY1QOR/ZLHDjROISk
+          YtFsGV2P+zwwHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGhcX4wCgYIKoZI
+          zj0EAwIDSAAwRQIhALLvJ/Sa6bUPuR7qyUxNC9u415KcbLiPrOUpNo0SBUwMAiBl
+          Xckrhr2QmIKmxiF3uCXX0F7b58Ivn+pxIg5+pwP4kQ==
+          -----END CERTIFICATE-----
+          [1660214092.617801][14671:14676] CHIP:DMG: }
+          [1660214092.617807][14671:14676] CHIP:DMG:
+          [1660214092.617815][14671:14676] CHIP:DMG:
+          [1660214092.617827][14671:14676] CHIP:DMG: Additional Fields =
+          [1660214092.617832][14671:14676] CHIP:DMG: {
+          [1660214092.617839][14671:14676] CHIP:DMG:     peer_address = UDP:[fe80::e65f:1ff:fe0f:2753%enp0s31f6]:5540
+          [1660214092.617845][14671:14676] CHIP:DMG: }
+          [1660214092.617851][14671:14676] CHIP:DMG:
+          [1660214092.617861][14671:14676] CHIP:EM: Received message of type 0x9 with protocolId (0, 1) and MessageCounter:219026739 on exchange 56686i
+          [1660214092.617870][14671:14676] CHIP:EM: Found matching exchange: 56686i, Delegate: 0x7f5ad4003a48
+          [1660214092.617885][14671:14676] CHIP:EM: Rxd Ack; Removing MessageCounter:21510045 from Retrans Table on exchange 56686i
+          [1660214092.617891][14671:14676] CHIP:EM: Removed CHIP MessageCounter:21510045 from RetransTable on exchange 56686i
+          [1660214092.617904][14671:14676] CHIP:DMG: ICR moving to [ResponseRe]
       disabled: true
 
     - label:
@@ -131,17 +215,101 @@
 
           Verify the CertificateChainResponse in TH Log
 
-          [1658223537.868606][5857:5862] CHIP:DMG: Received Command Response Data, Endpoint=0 Cluster=0x0000_003E Command=0x0000_0003
-          [1658223537.868656][5857:5862] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_003E Command 0x0000_0003
-          [1658223537.868716][5857:5862] CHIP:TOO:   CertificateChainResponse: {
-          [1658223537.868762][5857:5862] CHIP:TOO:     certificate: 308201E73082018EA003020102020869CDF10DE9E54ED1300A06082A8648CE3D040302303D3125302306035504030C1C4D6174746572204465762050414920307846464631206E6F2050494431143012060A2B0601040182A27C02010C04464646313020170D3232303230353030303030305A180F39393939313233313233353935395A30533125302306035504030C1C4D61747465722044657620444143203078464646312F30783830303131143012060A2B0601040182A27C02010C044646463131143012060A2B0601040182A27C02020C04383030313059301306072A8648CE3D020106082A8648CE3D03010703420004463AC69342910A0E5588FC6FF56BB63E62ECCECB148F7D4EB03EE552601415767D16A5C663F793E49123260B8297A7CD7E7CFC7B316B39D98E90D29377738E82A360305E300C0603551D130101FF04023000300E0603551D0F0101FF040403020780301D0603551D0E0416041488DDE7B300382932CFF734C04624810F44168A6F301F0603551D2304183016801463540E47F64B1C38D13884A462D16C195D8FFB3C300A06082A8648CE3D040302
-          [1658223537.868809][5857:5862] CHIP:TOO:     ...........: 034700304402200127A27B4B44610EE2FCDC4D2B7885563660BC0F76F17219ED6A08DFB2B3C1CD02206B59E0AF45F3EB2A85B919D35731528C6028C415239545E108E4E54E70971353
-          [1658223537.868834][5857:5862] CHIP:TOO:    }
-
-          Verify the size of certificate is less than or equal to 600 bytes and of type octstr from the above log
-
-          Example :
-          308201E73082018EA003020102020869CDF10DE9E54ED1300A06082A8648CE3D040302303D3125302306035504030C1C4D6174746572204465762050414920307846464631206E6F2050494431143012060A2B0601040182A27C02010C04464646313020170D3232303230353030303030305A180F39393939313233313233353935395A30533125302306035504030C1C4D61747465722044657620444143203078464646312F30783830303131143012060A2B0601040182A27C02010C044646463131143012060A2B0601040182A27C02020C04383030313059301306072A8648CE3D020106082A8648CE3D03010703420004463AC69342910A0E5588FC6FF56BB63E62ECCECB148F7D4EB03EE552601415767D16A5C663F793E49123260B8297A7CD7E7CFC7B316B39D98E90D29377738E82A360305E300C0603551D130101FF04023000300E0603551D0F0101FF040403020780301D0603551D0E0416041488DDE7B300382932CFF734C04624810F44168A6F301F0603551D2304183016801463540E47F64B1C38D13884A462D16C195D8FFB3C300A06082A8648CE3D040302
+          [1660218221.819087][17048:17053] CHIP:DMG: InvokeRequestMessage =
+          [1660218221.819106][17048:17053] CHIP:DMG: {
+          [1660218221.819126][17048:17053] CHIP:DMG:         suppressResponse = false,
+          [1660218221.819147][17048:17053] CHIP:DMG:         timedRequest = false,
+          [1660218221.819164][17048:17053] CHIP:DMG:         InvokeRequests =
+          [1660218221.819194][17048:17053] CHIP:DMG:         [
+          [1660218221.819210][17048:17053] CHIP:DMG:                 CommandDataIB =
+          [1660218221.819233][17048:17053] CHIP:DMG:                 {
+          [1660218221.819251][17048:17053] CHIP:DMG:                         CommandPathIB =
+          [1660218221.819274][17048:17053] CHIP:DMG:                         {
+          [1660218221.819296][17048:17053] CHIP:DMG:                                 EndpointId = 0x0,
+          [1660218221.819319][17048:17053] CHIP:DMG:                                 ClusterId = 0x3e,
+          [1660218221.819341][17048:17053] CHIP:DMG:                                 CommandId = 0x2,
+          [1660218221.819361][17048:17053] CHIP:DMG:                         },
+          [1660218221.819386][17048:17053] CHIP:DMG:
+          [1660218221.819403][17048:17053] CHIP:DMG:                         CommandFields =
+          [1660218221.819425][17048:17053] CHIP:DMG:                         {
+          [1660218221.819448][17048:17053] CHIP:DMG:                                 0x0 = 1,
+          [1660218221.819470][17048:17053] CHIP:DMG:                         },
+          [1660218221.819488][17048:17053] CHIP:DMG:                 },
+          [1660218221.819515][17048:17053] CHIP:DMG:
+          [1660218221.819530][17048:17053] CHIP:DMG:         ],
+          [1660218221.819559][17048:17053] CHIP:DMG:
+          [1660218221.819575][17048:17053] CHIP:DMG:         InteractionModelRevision = 1
+          [1660218221.819592][17048:17053] CHIP:DMG: },
+          [1660218221.819611][17048:17053] CHIP:DMG:
+          [1660218221.819755][17048:17053] CHIP:DMG: ICR moving to [CommandSen]
+          [1660218221.819807][17048:17053] CHIP:EM: Sending Standalone Ack for MessageCounter:33263156 on exchange 41890i
+          [1660218221.820060][17048:17053] CHIP:IN: Prepared unauthenticated message 0x7f950d02b000 to 0x0000000000000000 (0)  of type 0x10 and protocolId (0, 0) on exchange 41890i with MessageCounter:146063148.
+          [1660218221.820102][17048:17053] CHIP:IN: Sending unauthenticated msg 0x7f950d02b000 with MessageCounter:146063148 to 0x0000000000000000 at monotonic time: 00000000015F547B msec
+          [1660218221.820457][17048:17053] CHIP:DMG: >> to UDP:[fe80::e65f:1ff:fe0f:2753%enp0s31f6]:5540 | 146063148 | [Secure Channel  (0) / Standalone Ack (0x10) / Session = 0 / Exchange = 41890]
+          [1660218221.820501][17048:17053] CHIP:DMG: Header Flags =
+          [1660218221.820519][17048:17053] CHIP:DMG: {
+          [1660218221.820578][17048:17053] CHIP:DMG:     Message (0x04) =
+          [1660218221.820596][17048:17053] CHIP:DMG:     {
+          [1660218221.820622][17048:17053] CHIP:DMG:         SourceNodeId = EB2A0D2FCD128BCD
+          [1660218221.820642][17048:17053] CHIP:DMG:     }
+          [1660218221.820677][17048:17053] CHIP:DMG:     Exchange (0x03) =
+          [1660218221.820692][17048:17053] CHIP:DMG:     {
+          [1660218221.820709][17048:17053] CHIP:DMG:         Initiator = true
+          [1660218221.820730][17048:17053] CHIP:DMG:         AckMsg = 33263156
+          [1660218221.820747][17048:17053] CHIP:DMG:     }
+          [1660218221.820778][17048:17053] CHIP:DMG: }
+          [1660218221.820792][17048:17053] CHIP:DMG:
+          [1660218221.820819][17048:17053] CHIP:DMG: Encrypted Payload (26 bytes) =
+          [1660218221.820834][17048:17053] CHIP:DMG: {
+          [1660218221.820853][17048:17053] CHIP:DMG:     data = 040000002cbfb408cd8b12cd2f0d2aeb0310a2a30000348efb01
+          [1660218221.820871][17048:17053] CHIP:DMG:     buffer_ptr = 140277792687280
+          [1660218221.820888][17048:17053] CHIP:DMG: }
+          [1660218221.820906][17048:17053] CHIP:DMG:
+          [1660218221.820997][17048:17053] CHIP:EM: Flushed pending ack for MessageCounter:33263156 on exchange 41890i
+          [1660218221.826505][17048:17053] CHIP:DMG: << from UDP:[fe80::e65f:1ff:fe0f:2753%enp0s31f6]:5540 | 217571241 | [Interaction Model  (1) / InvokeCommandResponse (0x09) / Session = 16041 / Exchange = 41891]
+          [1660218221.826559][17048:17053] CHIP:DMG: Header Flags =
+          [1660218221.826581][17048:17053] CHIP:DMG: {
+          [1660218221.826620][17048:17053] CHIP:DMG:     Exchange (0x06) =
+          [1660218221.826636][17048:17053] CHIP:DMG:     {
+          [1660218221.826658][17048:17053] CHIP:DMG:         AckMsg = 228316047
+          [1660218221.826677][17048:17053] CHIP:DMG:         NeedsAck = true
+          [1660218221.826695][17048:17053] CHIP:DMG:     }
+          [1660218221.826723][17048:17053] CHIP:DMG: }
+          [1660218221.826736][17048:17053] CHIP:DMG:
+          [1660218221.826764][17048:17053] CHIP:DMG: Encrypted Payload (559 bytes) =
+          [1660218221.826778][17048:17053] CHIP:DMG: {
+          [1660218221.826796][17048:17053] CHIP:DMG:     data = 00a93e00a9dff70c44f908196a2718a5b4cd8fb67b67d2223ade09fa1f23a5e9d6081ef9003a293b4f7ddf1e64767c15165a5544c4bc162a2eea22b085a5392580dec393bc15a705abc25360a7f05f99baf448b6c29e93defc8d01b00c11b268b2a197f88fc5984fe4c541fc523e2ecd2316b5dc1109c54408186296772f48d484047770f70a6af3e639833481b4663c7b65b902a850a8d55d3a86c73523a6853f47727582113480efece0e72f552a42ce49a26746e8d6b405ae87fadc7711a313f1865b90ac934486e05d2ed6868a5b5c4e13010eec98f917308c6fe5e9c6816c045f4640aea37804278a600cede11aee2bb591224edd0524bda56ee2d4d64c8a29c664edb006f4f42855f3868f272e94d8648d2431c0e95f6a55802c18d5938497b6b5c5aa37e37597a6782ca55a2948ceededd45e63537f4f1985f45653dbb118a0e1108eca228973b5c8fb48a1afeb649c46aec6259a649f0795c677ca492452c9fcb07969b6f851421252d30d6e160a350feb8baee6ccea79f54e0ebfae94c99eafa466964671b1fe3aa8585c83c28d9484444ba7d5a8a8e3178aedea00d292a53e3f0939b15bb7bee982e346410d5b064ec496409ba26e6a3b2182cff7b1955ba8f980d99590dfa0f2b690d1f1e5d8d178b1a64893dfcd242949ade66269336bc6c0440e9e4a120af59bfbbaabee32871ec1208915f63f91bdb1305045afeface4c7fc39e8eae7db8923b95aa01d4fee30d525664297305e569a3bfca01a767d47f6fdc0eb1b7706bc4547b1
+          [1660218221.826837][17048:17053] CHIP:DMG:     buffer_ptr = 140277792657648
+          [1660218221.826854][17048:17053] CHIP:DMG: }
+          [1660218221.826870][17048:17053] CHIP:DMG:
+          [1660218221.826979][17048:17053] CHIP:DMG: DAC/PAI (491) =
+          [1660218221.827025][17048:17053] CHIP:DMG: {
+          -----BEGIN CERTIFICATE-----
+          MIIB5zCCAY6gAwIBAgIIac3xDenlTtEwCgYIKoZIzj0EAwIwPTElMCMGA1UEAwwc
+          TWF0dGVyIERldiBQQUkgMHhGRkYxIG5vIFBJRDEUMBIGCisGAQQBgqJ8AgEMBEZG
+          RjEwIBcNMjIwMjA1MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMFMxJTAjBgNVBAMM
+          HE1hdHRlciBEZXYgREFDIDB4RkZGMS8weDgwMDExFDASBgorBgEEAYKifAIBDARG
+          RkYxMRQwEgYKKwYBBAGConwCAgwEODAwMTBZMBMGByqGSM49AgEGCCqGSM49AwEH
+          A0IABEY6xpNCkQoOVYj8b/Vrtj5i7M7LFI99TrA+5VJgFBV2fRalxmP3k+SRIyYL
+          gpenzX58/HsxaznZjpDSk3dzjoKjYDBeMAwGA1UdEwEB/wQCMAAwDgYDVR0PAQH/
+          BAQDAgeAMB0GA1UdDgQWBBSI3eezADgpMs/3NMBGJIEPRBaKbzAfBgNVHSMEGDAW
+          gBRjVA5H9kscONE4hKRi0WwZXY/7PDAKBggqhkjOPQQDAgNHADBEAiABJ6J7S0Rh
+          DuL83E0reIVWNmC8D3bxchntagjfsrPBzQIga1ngr0Xz6yqFuRnTVzFSjGAoxBUj
+          lUXhCOTlTnCXE1M=
+          -----END CERTIFICATE-----
+          [1660218221.827089][17048:17053] CHIP:DMG: }
+          [1660218221.827105][17048:17053] CHIP:DMG:
+          [1660218221.827125][17048:17053] CHIP:DMG:
+          [1660218221.827158][17048:17053] CHIP:DMG: Additional Fields =
+          [1660218221.827173][17048:17053] CHIP:DMG: {
+          [1660218221.827194][17048:17053] CHIP:DMG:     peer_address = UDP:[fe80::e65f:1ff:fe0f:2753%enp0s31f6]:5540
+          [1660218221.827211][17048:17053] CHIP:DMG: }
+          [1660218221.827226][17048:17053] CHIP:DMG:
+          [1660218221.827257][17048:17053] CHIP:EM: Received message of type 0x9 with protocolId (0, 1) and MessageCounter:217571241 on exchange 41891i
+          [1660218221.827276][17048:17053] CHIP:EM: Found matching exchange: 41891i, Delegate: 0x7f94f8003a48
+          [1660218221.827310][17048:17053] CHIP:EM: Rxd Ack; Removing MessageCounter:228316047 from Retrans Table on exchange 41891i
+          [1660218221.827326][17048:17053] CHIP:EM: Removed CHIP MessageCounter:228316047 from RetransTable on exchange 41891i
+          [1660218221.827357][17048:17053] CHIP:DMG: ICR moving to [ResponseRe]
       disabled: true
 
     - label: "TH1 Sends CSRRequest command with a random 32-byte nonce"
diff --git a/src/app/tests/suites/certification/Test_TC_OPCREDS_3_4.yaml b/src/app/tests/suites/certification/Test_TC_OPCREDS_3_4.yaml
index 391d9df..54f13b1 100644
--- a/src/app/tests/suites/certification/Test_TC_OPCREDS_3_4.yaml
+++ b/src/app/tests/suites/certification/Test_TC_OPCREDS_3_4.yaml
@@ -41,7 +41,7 @@
       verification: |
           ./chip-tool operationalcredentials read nocs 1 0 --fabric-filtered 1
 
-          Verify in TH Log
+          Verify  NOC lists and verify the returned lists has single entry in TH(chip-tool) Log
 
           [1658736497.592132][3787:3792] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_003E Attribute 0x0000_0000 DataVersion: 999376603
           [1658736497.595396][3787:3792] CHIP:TOO:   NOCs: 1 entries
@@ -150,11 +150,12 @@
       verification: |
           Verify that the DUT returns a CSRResponse and save as csr_not_update
 
-          To get csr nonce give below command 2 times
+          To get csr nonce give below command 2 times in TH(chip-tool) Log
            echo hex:$(hexdump -vn32 -e"4/4 "%08X" " /dev/urandom)
 
           ./chip-tool operationalcredentials csrrequest hex:C11D6EAA00A54066220DA7F3FC5DC0F684C13D8B8FD3758B51163C2AEDD6F10F 1 0 --IsForUpdateNOC 0
 
+          Verify DUT returns a CSRResponse in TH(chip-tool) Log
           [1658743641.233113][9670:9675] CHIP:DMG: Received Command Response Data, Endpoint=0 Cluster=0x0000_003E Command=0x0000_0005
           [1658743641.233162][9670:9675] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_003E Command 0x0000_0005
           [1658743641.233226][9670:9675] CHIP:TOO:   CSRResponse: {
diff --git a/src/app/tests/suites/certification/Test_TC_OPCREDS_3_5.yaml b/src/app/tests/suites/certification/Test_TC_OPCREDS_3_5.yaml
index b769dc2..15598fe 100644
--- a/src/app/tests/suites/certification/Test_TC_OPCREDS_3_5.yaml
+++ b/src/app/tests/suites/certification/Test_TC_OPCREDS_3_5.yaml
@@ -41,7 +41,8 @@
       verification: |
           ./chip-tool operationalcredentials read nocs 1 0 --fabric-filtered 1
 
-          Verify in TH Log
+          Verify  NOC lists and verify the returned lists has single entry in TH(chip-tool) Log
+
           [1658736497.592132][3787:3792] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_003E Attribute 0x0000_0000 DataVersion: 999376603
           [1658736497.595396][3787:3792] CHIP:TOO:   NOCs: 1 entries
           [1658736497.595477][3787:3792] CHIP:TOO:     [1]: {
@@ -85,11 +86,12 @@
           true"
       PICS: OPCREDS.S.C04.Rsp
       verification: |
-          To get csr nonce give below command 2 times
+          To get csr nonce give below command 2 times in TH(chip-tool)
            echo hex:$(hexdump -vn32 -e"4/4 "%08X" " /dev/urandom)
 
           ./chip-tool operationalcredentials csrrequest hex:C11D6EAA00A54066220DA7F3FC5DC0F684C13D8B8FD3758B51163C2AEDD6F10F 1 0 --IsForUpdateNOC 0
 
+          Verify that the DUT returns a CSRResponse in TH(chip-tool) log
           [1658743641.233113][9670:9675] CHIP:DMG: Received Command Response Data, Endpoint=0 Cluster=0x0000_003E Command=0x0000_0005
           [1658743641.233162][9670:9675] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_003E Command 0x0000_0005
           [1658743641.233226][9670:9675] CHIP:TOO:   CSRResponse: {