diff --git a/src/app/tests/suites/certification/Test_TC_ACE_1_1.yaml b/src/app/tests/suites/certification/Test_TC_ACE_1_1.yaml
index 17ca29b..13eb032 100644
--- a/src/app/tests/suites/certification/Test_TC_ACE_1_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_ACE_1_1.yaml
@@ -29,12 +29,12 @@
     - label: "TH1 commissions DUT using admin node ID N1"
       verification: |
           DUT side:
-          sudo ./chip-all-clusters-app
+           sudo ./chip-all-clusters-app
 
           TH side:
-          ./chip-tool pairing ethernet 1 20202021 chiip5 matter123 3840 5540
+          ./chip-tool pairing ethernet 1 20202021 chiip5 matter123 3840  fe80::e65f:1ff:fe0f:2753  5540
 
-          [1650455358.501816][4366:4371] CHIP:TOO: Device commissioning completed with success
+          [1650455358.501816][4366:4371] CHIP:TOO: Device commissioning completed with success"
       disabled: true
 
     - label:
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 569358e..dac6858 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
@@ -67,6 +67,7 @@
           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
           [1657186324.710980][10820:10825] CHIP:CTL: Successfully opened pairing window On TH(Chiptool)e device
           [1657186324.711048][10820:10825] CHIP:CTL: Manual pairing code: [36253605617]
@@ -75,7 +76,7 @@
 
           Commission TH2(Chiptool) to DUT using manualcode generated in TH1 using open commission window
 
-          ./chip-tool pairing code 2 36253605617 --commissioner-name beta
+          ./chip-tool pairing code 2 36253605617 --commissioner-name beta --commissioner-nodeid 223344
           [1657186359.584672][3509:3514] CHIP:CTL: Successfully finished commissioning step "Cleanup"
           [1657186359.584743][3509:3514] CHIP:TOO: Device commissioning completed with success
       disabled: true
@@ -84,7 +85,7 @@
           "TH2 reads DUT Endpoint 0 OperationalCredentials cluster
           CurrentFabricIndex attribute"
       verification: |
-          ./chip-tool operationalcredentials read current-fabric-index 2 0 --commissioner-name beta
+          ./chip-tool operationalcredentials read current-fabric-index 2 0 --commissioner-name beta --commissioner-nodeid 223344
 
           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
@@ -97,7 +98,7 @@
           1.struct .Data field: D_OK_EMPTY 1718"
       PICS: ACL.S.A0001
       verification: |
-          ./chip-tool accesscontrol write extension "[{"data":"1718"}]" 1 0
+          ./chip-tool accesscontrol write extension '[{"data":"1718"}]' 1 0
 
           On TH1(Chiptool),Verify  Successfully to extension attribute list containg one element .
 
@@ -146,7 +147,7 @@
           17D00000F1FF01003D48656C6C6F20576F726C642E205468697320697320612073696E676C6520656C656D656E74206C6976696E6720617320612063686172737472696E670018"
       PICS: ACL.S.A0001
       verification: |
-          ./chip-tool   accesscontrol  write extension "[{"data":"17D00000F1FF01003D48656C6C6F20576F726C642E205468697320697320612073696E676C6520656C656D656E74206C6976696E6720617320612063686172737472696E670018"}]" 2 0 --commissioner-name beta
+          ./chip-tool   accesscontrol  write extension '[{"data":"17D00000F1FF01003D48656C6C6F20576F726C642E205468697320697320612073696E676C6520656C656D656E74206C6976696E6720617320612063686172737472696E670018"}]' 2 0 --commissioner-name beta --commissioner-nodeid 223344
 
           On TH2(Chiptool),Verify Successfully to extension attribute list containg one element .
           1657894672.479983][2433:2438] CHIP:DMG: WriteClient moving to [ResponseRe]
@@ -212,7 +213,7 @@
           "TH2 reads DUT Endpoint 0 AccessControl cluster Extension attribute"
       PICS: ACL.S.A0001
       verification: |
-          ./chip-tool accesscontrol read extension 2 0 --commissioner-name beta
+          ./chip-tool accesscontrol read extension 2 0 --commissioner-name beta --commissioner-nodeid 223344
 
           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
@@ -252,20 +253,18 @@
           AccessControlExtensionChanged event"
       PICS: ACL.S.E01
       verification: |
-          ./chip-tool accesscontrol read-event access-control-extension-changed  2 0 --commissioner-name beta
+          ./chip-tool accesscontrol read-event access-control-extension-changed  2 0 --commissioner-name beta  --commissioner-nodeid 223344
           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
-          [1658327551.622130][4295:4300] CHIP:TOO:          Timestamp: 4633724
-          [1658327551.622239][4295:4300] CHIP:TOO:   AccessControlExtensionChanged: {
-          [1658327551.622287][4295:4300] CHIP:TOO:     AdminNodeID: 112233
-          [1658327551.622313][4295:4300] CHIP:TOO:     AdminPasscodeID: null
-          [1658327551.622337][4295:4300] CHIP:TOO:     ChangeType: 1
-          [1658327551.622361][4295:4300] CHIP:TOO:     LatestValue: {
-          [1658327551.622389][4295:4300] CHIP:TOO:       Data: 17D00000F1FF01003D48656C6C6F20576F726C642E205468697320697320612073696E676C6520656C656D656E74206C6976696E6720617320612063686172737472696E670018
-          [1658327551.622414][4295:4300] CHIP:TOO:       FabricIndex: 2
-          [1658327551.622436][4295:4300] CHIP:TOO:      }
-          [1658327551.622459][4295:4300] CHIP:TOO:     AdminFabricIndex: 2
-          [1658327551.622480][4295:4300] CHIP:TOO:    }
+          [1663242753.957097][4264:4270] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_001F Event 0x0000_0001
+          [1663242753.957400][4264:4270] CHIP:TOO:   Event number: 8
+          [1663242753.957459][4264:4270] CHIP:TOO:   Priority: Info
+          [1663242753.957507][4264:4270] CHIP:TOO:   Timestamp: 20785045
+          [1663242753.957708][4264:4270] CHIP:TOO:   AccessControlExtensionChanged: {
+          [1663242753.957801][4264:4270] CHIP:TOO:     AdminNodeID: 223344
+          [1663242753.957867][4264:4270] CHIP:TOO:     AdminPasscodeID: null
+          [1663242753.957931][4264:4270] CHIP:TOO:     ChangeType: 1
+          [1663242753.957991][4264:4270] CHIP:TOO:     LatestValue: {
+          [1663242753.958055][4264:4270] CHIP:TOO:       Data: 17D00000F1FF01003D48656C6C6F20576F726C642E205468697320697320612073696E676C6520656C656D656E74206C6976696E6720617320612063686172737472696E670018
+          [1663242753.958118][4264:4270] CHIP:TOO:       FabricIndex: 2
+          [1663242753.958183][4264:4270] CHIP:TOO:      }
       disabled: true
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 5956df5..80d0e91 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
@@ -59,45 +59,17 @@
       verification: |
           Open a commissioning window On TH1(Chiptool)using below command
 
-          ./chip-tool administratorcommissioning open-basic-commissioning-window 180 1  0 --timedInteractionTimeoutMs 1000
+          ./chip-tool  pairing open-commissioning-window 1 1 400 2000 3841
 
-          [1657286379.420840][4724:4729] CHIP:DMG: InvokeResponseMessage =
-          [1657286379.420894][4724:4729] CHIP:DMG: {
-          [1657286379.420937][4724:4729] CHIP:DMG:         suppressResponse = false,
-          [1657286379.421000][4724:4729] CHIP:DMG:         InvokeResponseIBs =
-          [1657286379.421068][4724:4729] CHIP:DMG:         [
-          [1657286379.421120][4724:4729] CHIP:DMG:                 InvokeResponseIB =
-          [1657286379.421208][4724:4729] CHIP:DMG:                 {
-          [1657286379.421264][4724:4729] CHIP:DMG:                         CommandStatusIB =
-          [1657286379.421344][4724:4729] CHIP:DMG:                         {
-          [1657286379.421407][4724:4729] CHIP:DMG:                                 CommandPathIB =
-          [1657286379.421493][4724:4729] CHIP:DMG:                                 {
-          [1657286379.421581][4724:4729] CHIP:DMG:                                         EndpointId = 0x0,
-          [1657286379.421656][4724:4729] CHIP:DMG:                                         ClusterId = 0x3c,
-          [1657286379.421754][4724:4729] CHIP:DMG:                                         CommandId = 0x1,
-          [1657286379.421838][4724:4729] CHIP:DMG:                                 },
-          [1657286379.421916][4724:4729] CHIP:DMG:
-          [1657286379.421998][4724:4729] CHIP:DMG:                                 StatusIB =
-          [1657286379.422084][4724:4729] CHIP:DMG:                                 {
-          [1657286379.422159][4724:4729] CHIP:DMG:                                         status = 0x00 (SUCCESS),
-          [1657286379.422251][4724:4729] CHIP:DMG:                                 },
-          [1657286379.422336][4724:4729] CHIP:DMG:
-          [1657286379.422397][4724:4729] CHIP:DMG:                         },
-          [1657286379.422483][4724:4729] CHIP:DMG:
-          [1657286379.422537][4724:4729] CHIP:DMG:                 },
-          [1657286379.422616][4724:4729] CHIP:DMG:
-          [1657286379.422666][4724:4729] CHIP:DMG:         ],
-          [1657286379.422745][4724:4729] CHIP:DMG:
-          [1657286379.422796][4724:4729] CHIP:DMG:         InteractionModelRevision = 1
-          [1657286379.422861][4724:4729] CHIP:DMG: },
-          [1657286379.422975][4724:4729] CHIP:DMG: Received Command Response Status for Endpoint=0 Cluster=0x0000_003C Command=0x0000_0001 Status=0x0
-          [1657286379.423058][4724:4729] CHIP:DMG: ICR moving to [AwaitingDe]
+          [1657186324.710951][10820:10825] CHIP:DMG: Received Command Response Status for Endpoint=0 Cluster=0x0000_003C Command=0x0000_0000 Status=0x0
+          [1657186324.710980][10820:10825] CHIP:CTL: Successfully opened pairing window On TH(Chiptool)e device
+          [1657186324.711048][10820:10825] CHIP:CTL: Manual pairing code: [36253605617]
+          [1657186324.711108][10820:10825] CHIP:CTL: SetupQRCode: [MT:-24J0IRV01A7TB7E700]
 
 
+          Commission TH2(Chiptool) to DUT using manualcode generated in TH1 using open commission window
 
-          CommissiOn TH2(Chiptool) to DUT using below command
-
-          ./chip-tool pairing onnetwork 2 20202021 --commissioner-nodeid 223344  --commissioner-name beta
+          ./chip-tool pairing code 2 36253605617 --commissioner-name beta --commissioner-nodeid 223344
 
           [1657186359.584672][3509:3514] CHIP:CTL: Successfully finished commissioning step "Cleanup"
           [1657186359.584743][3509:3514] CHIP:TOO: Device commissioning completed with success
@@ -108,6 +80,7 @@
           CurrentFabricIndex attribute"
       verification: |
           ./chip-tool  operationalcredentials read current-fabric-index 2 0 --commissioner-nodeid 223344 --commissioner-name beta
+
           On TH2(Chiptool),verify  CurrentFabricIndex attribute of operationalCredential cluster  as 2
 
           1658747098.843523][3024:3029] CHIP:DMG:                 },
@@ -131,7 +104,8 @@
           field: [N1, 1111] Targets field: null"
       PICS: ACL.S.A0000
       verification: |
-          ./chip-tool accesscontrol write acl "[{ "privilege": 5, "authMode": 2, "subjects": [112233,1111], "targets":null}]" 1 0
+          ./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: {
@@ -185,7 +159,7 @@
           field: [N2, 2222] Targets field: null"
       PICS: ACL.S.A0000
       verification: |
-          ./chip-tool accesscontrol write acl "[{ "privilege": 5, "authMode": 2, "subjects": [223344,2222], "targets":null}]" 2 0  --commissioner-nodeid 223344 --commissioner-name beta
+          ./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
 
 
@@ -261,8 +235,8 @@
 
           On TH2(Chiptool), verify  AccessControlEntryStruct containing 1 element, and MUST NOT contain an element with FabricIndex F1
 
-          [1661407263.740571][2355:2360] CHIP:DMG: 	SuppressResponse = true,
-          [1661407263.740605][2355:2360] CHIP:DMG: 	InteractionModelRevision = 1
+          [1661407263.740571][2355:2360] CHIP:DMG:         SuppressResponse = true,
+          [1661407263.740605][2355:2360] CHIP:DMG:         InteractionModelRevision = 1
           [1661407263.740640][2355:2360] CHIP:DMG: }
           [1661407263.741000][2355:2360] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_001F Attribute 0x0000_0000 DataVersion: 2445703657
           [1661407263.741100][2355:2360] CHIP:TOO:   ACL: 1 entries
@@ -353,6 +327,7 @@
       PICS: ACL.S.E00
       verification: |
           ./chip-tool  accesscontrol  read-event  access-control-entry-changed  2 0 --commissioner-name beta --commissioner-nodeid 223344
+
           On TH2(Chiptool), verify AccessControl cluster AccessControlEntryChanged containing 3 elements, and MUST NOT contain any element with FabricIndex F1
 
 
diff --git a/src/app/tests/suites/certification/Test_TC_BINFO_2_2.yaml b/src/app/tests/suites/certification/Test_TC_BINFO_2_2.yaml
index dea7c83..5a50439 100644
--- a/src/app/tests/suites/certification/Test_TC_BINFO_2_2.yaml
+++ b/src/app/tests/suites/certification/Test_TC_BINFO_2_2.yaml
@@ -32,7 +32,7 @@
 
           3. BINFO.S.A0011(Reachable) - TH reads Reachable attribute from DUT and saves for future use(should be true)
 
-          4. BINFO.S.E00(StartUp) && BINFO.S.E01(ShutDown) && BINFO.S.E02(Leave) - TH subscribes to StartUp, ShutDown, Leave and ReachableChanged events on the Basic Information cluster of the DUT
+          4. BINFO.S.E00(StartUp) | BINFO.S.E01(ShutDown) && BINFO.S.E02(Leave) - TH subscribes to StartUp, ShutDown, Leave and ReachableChanged events on the Basic Information cluster of the DUT
 
           5. TH saves the FabricIndex during commissioning
       disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_BRBINFO_2_1.yaml b/src/app/tests/suites/certification/Test_TC_BRBINFO_2_1.yaml
index af03212..81ca104 100644
--- a/src/app/tests/suites/certification/Test_TC_BRBINFO_2_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_BRBINFO_2_1.yaml
@@ -140,14 +140,14 @@
           NOTE the quotes: single-quote/double-quote/string/double-quote/single-quote
 
 
-          [1660839701.840432][2444:2449] CHIP:DMG: 			}
+          [1660839701.840432][2444:2449] CHIP:DMG:                         }
           [1660839701.840505][2444:2449] CHIP:DMG:
-          [1660839701.840578][2444:2449] CHIP:DMG: 			StatusIB =
-          [1660839701.840661][2444:2449] CHIP:DMG: 			{
-          [1660839701.840742][2444:2449] CHIP:DMG: 				status = 0x88 (UNSUPPORTED_WRITE),
-          [1660839701.840827][2444:2449] CHIP:DMG: 			},
+          [1660839701.840578][2444:2449] CHIP:DMG:                         StatusIB =
+          [1660839701.840661][2444:2449] CHIP:DMG:                         {
+          [1660839701.840742][2444:2449] CHIP:DMG:                                 status = 0x88 (UNSUPPORTED_WRITE),
+          [1660839701.840827][2444:2449] CHIP:DMG:                         },
           [1660839701.840905][2444:2449] CHIP:DMG:
-          [1660839701.840973][2444:2449] CHIP:DMG: 		},
+          [1660839701.840973][2444:2449] CHIP:DMG:                 },
       disabled: true
 
     - label: "TH reads NodeLabel"
@@ -185,7 +185,7 @@
     - label: "TH reads HardwareVersion"
       PICS: BRBINFO.S.A0007
       verification: |
-          ./chip-tool bridgeddevicebasic read hardware-version  1 3
+          ./chip-tool bridgeddevicebasic write hardware-version-string 0x4531  1 3
 
           Optional Attribute - If it is supported, then in TH log it will results in displaying the value, else it will display UNSUPPORTED_ATTRIBUTE
 
@@ -472,7 +472,7 @@
           false."
       PICS: BRBINFO.S.A0011
       verification: |
-          ./chip-tool bridgeddevicebasic write-by-id 0x0005 false 1 0
+          ./chip-tool bridgeddevicebasic write-by-id 17   false 1 3
 
 
 
diff --git a/src/app/tests/suites/certification/Test_TC_BRBINFO_2_3.yaml b/src/app/tests/suites/certification/Test_TC_BRBINFO_2_3.yaml
index e057880..6ef05a6 100644
--- a/src/app/tests/suites/certification/Test_TC_BRBINFO_2_3.yaml
+++ b/src/app/tests/suites/certification/Test_TC_BRBINFO_2_3.yaml
@@ -39,28 +39,23 @@
           Optional Attribute - If it is supported, then in TH(bridge-app) log it will results in displaying the ReportDataMessage , else it will display UNSUPPORTED_ATTRIBUTE
 
           Example Log:
-          [1659966264.659547][3334:3334] CHIP:DMG: ReadRequestMessage =
-          [1659966264.659591][3334:3334] CHIP:DMG: {
-          [1659966264.659616][3334:3334] CHIP:DMG:         AttributePathIBs =
-          [1659966264.659647][3334:3334] CHIP:DMG:         [
-          [1659966264.659684][3334:3334] CHIP:DMG:                 AttributePathIB =
-          [1659966264.659716][3334:3334] CHIP:DMG:                 {
-          [1659966264.659759][3334:3334] CHIP:DMG:                         Endpoint = 0x0,
-          [1659966264.659809][3334:3334] CHIP:DMG:                         Cluster = 0x28,
-          [1659966264.659845][3334:3334] CHIP:DMG:                         Attribute = 0x0000_0001,
-          [1659966264.659892][3334:3334] CHIP:DMG:                 }
-          [1659966264.659925][3334:3334] CHIP:DMG:
-          [1659966264.659963][3334:3334] CHIP:DMG:         ],
-          [1659966264.659996][3334:3334] CHIP:DMG:
-          [1659966264.660036][3334:3334] CHIP:DMG:         isFabricFiltered = true,
-          [1659966264.660074][3334:3334] CHIP:DMG:         InteractionModelRevision = 1
-          [1659966264.660101][3334:3334] CHIP:DMG: },
-          [1659966264.660194][3334:3334] CHIP:DMG: IM RH moving to [GeneratingReports]
-          [1659966264.660306][3334:3334] CHIP:DMG: Building Reports for ReadHandler with LastReportGeneration = 0 DirtyGeneration = 0
-          [1659966264.660339][3334:3334] CHIP:DMG: <RE:Run> Cluster 28, Attribute 1 is dirty
-          [1659966264.660374][3334:3334] CHIP:DMG: Reading attribute: Cluster=0x0000_0028 Endpoint=0 AttributeId=0x0000_0001 (expanded=0)
-          [1659966264.660408][3334:3334] CHIP:DMG: AccessControl: checking f=1 a=c s=0x000000000001B669 t= c=0x0000_0028 e=0 p=v
-          [1659966264.660445][3334:3334] CHIP:DMG: AccessControl: allowed
+          [1662483091.813322][6721:6721] CHIP:DMG: ReadRequestMessage =
+          [1662483091.813361][6721:6721] CHIP:DMG: {
+          [1662483091.813393][6721:6721] CHIP:DMG:         AttributePathIBs =
+          [1662483091.813431][6721:6721] CHIP:DMG:         [
+          [1662483091.813467][6721:6721] CHIP:DMG:                 AttributePathIB =
+          [1662483091.813507][6721:6721] CHIP:DMG:                 {
+          [1662483091.813548][6721:6721] CHIP:DMG:                         Endpoint = 0x3,
+          [1662483091.813594][6721:6721] CHIP:DMG:                         Cluster = 0x39,
+          [1662483091.813641][6721:6721] CHIP:DMG:                         Attribute = 0x0000_0001,
+          [1662483091.813684][6721:6721] CHIP:DMG:                 }
+          [1662483091.813725][6721:6721] CHIP:DMG:
+          [1662483091.813762][6721:6721] CHIP:DMG:         ],
+          [1662483091.813803][6721:6721] CHIP:DMG:
+          [1662483091.813841][6721:6721] CHIP:DMG:         isFabricFiltered = true,
+          [1662483091.813878][6721:6721] CHIP:DMG:         InteractionModelRevision = 1
+          [1662483091.813912][6721:6721] CHIP:DMG: },
+          [1662483091.814011][6721:6721] CHIP:DMG: IM RH moving to [GeneratingReports]
       disabled: true
 
     - label: "DUT reads VendorID from the TH"
@@ -71,50 +66,24 @@
           Optional Attribute - If it is supported, then in TH(bridge-app) log it will results in displaying the ReportDataMessage , else it will display UNSUPPORTED_ATTRIBUTE
 
           Example Log:
-          [1659966317.983464][3334:3334] CHIP:DMG: ReadRequestMessage =
-          [1659966317.983491][3334:3334] CHIP:DMG: {
-          [1659966317.983513][3334:3334] CHIP:DMG:         AttributePathIBs =
-          [1659966317.983539][3334:3334] CHIP:DMG:         [
-          [1659966317.983563][3334:3334] CHIP:DMG:                 AttributePathIB =
-          [1659966317.983590][3334:3334] CHIP:DMG:                 {
-          [1659966317.983618][3334:3334] CHIP:DMG:                         Endpoint = 0x0,
-          [1659966317.983655][3334:3334] CHIP:DMG:                         Cluster = 0x28,
-          [1659966317.983687][3334:3334] CHIP:DMG:                         Attribute = 0x0000_0002,
-          [1659966317.983716][3334:3334] CHIP:DMG:                 }
-          [1659966317.983744][3334:3334] CHIP:DMG:
-          [1659966317.983770][3334:3334] CHIP:DMG:         ],
-          [1659966317.983798][3334:3334] CHIP:DMG:
-          [1659966317.983825][3334:3334] CHIP:DMG:         isFabricFiltered = true,
-          [1659966317.983851][3334:3334] CHIP:DMG:         InteractionModelRevision = 1
-          [1659966317.983874][3334:3334] CHIP:DMG: },
-          [1659966317.983949][3334:3334] CHIP:DMG: IM RH moving to [GeneratingReports]
-          [1659966317.984045][3334:3334] CHIP:DMG: Building Reports for ReadHandler with LastReportGeneration = 0 DirtyGeneration = 0
-          [1659966317.984077][3334:3334] CHIP:DMG: <RE:Run> Cluster 28, Attribute 2 is dirty
-          [1659966317.984099][3334:3334] CHIP:DMG: Reading attribute: Cluster=0x0000_0028 Endpoint=0 AttributeId=0x0000_0002 (expanded=0)
-          [1659966317.984128][3334:3334] CHIP:DMG: AccessControl: checking f=1 a=c s=0x000000000001B669 t= c=0x0000_0028 e=0 p=v
-          [1659966317.984161][3334:3334] CHIP:DMG: AccessControl: allowed
-          [1659966317.983464][3334:3334] CHIP:DMG: ReadRequestMessage =
-          [1659966317.983491][3334:3334] CHIP:DMG: {
-          [1659966317.983513][3334:3334] CHIP:DMG:         AttributePathIBs =
-          [1659966317.983539][3334:3334] CHIP:DMG:         [
-          [1659966317.983563][3334:3334] CHIP:DMG:                 AttributePathIB =
-          [1659966317.983590][3334:3334] CHIP:DMG:                 {
-          [1659966317.983618][3334:3334] CHIP:DMG:                         Endpoint = 0x0,
-          [1659966317.983655][3334:3334] CHIP:DMG:                         Cluster = 0x28,
-          [1659966317.983687][3334:3334] CHIP:DMG:                         Attribute = 0x0000_0002,
-          [1659966317.983716][3334:3334] CHIP:DMG:                 }
-          [1659966317.983744][3334:3334] CHIP:DMG:
-          [1659966317.983770][3334:3334] CHIP:DMG:         ],
-          [1659966317.983798][3334:3334] CHIP:DMG:
-          [1659966317.983825][3334:3334] CHIP:DMG:         isFabricFiltered = true,
-          [1659966317.983851][3334:3334] CHIP:DMG:         InteractionModelRevision = 1
-          [1659966317.983874][3334:3334] CHIP:DMG: },
-          [1659966317.983949][3334:3334] CHIP:DMG: IM RH moving to [GeneratingReports]
-          [1659966317.984045][3334:3334] CHIP:DMG: Building Reports for ReadHandler with LastReportGeneration = 0 DirtyGeneration = 0
-          [1659966317.984077][3334:3334] CHIP:DMG: <RE:Run> Cluster 28, Attribute 2 is dirty
-          [1659966317.984099][3334:3334] CHIP:DMG: Reading attribute: Cluster=0x0000_0028 Endpoint=0 AttributeId=0x0000_0002 (expanded=0)
-          [1659966317.984128][3334:3334] CHIP:DMG: AccessControl: checking f=1 a=c s=0x000000000001B669 t= c=0x0000_0028 e=0 p=v
-          [1659966317.984161][3334:3334] CHIP:DMG: AccessControl: allowed
+          [1662483142.830377][6721:6721] CHIP:IM: Received Read request
+          [1662483142.830459][6721:6721] CHIP:DMG: ReadRequestMessage =
+          [1662483142.830487][6721:6721] CHIP:DMG: {
+          [1662483142.830510][6721:6721] CHIP:DMG: 	AttributePathIBs =
+          [1662483142.830553][6721:6721] CHIP:DMG: 	[
+          [1662483142.830578][6721:6721] CHIP:DMG: 		AttributePathIB =
+          [1662483142.830616][6721:6721] CHIP:DMG: 		{
+          [1662483142.830650][6721:6721] CHIP:DMG: 			Endpoint = 0x3,
+          [1662483142.830690][6721:6721] CHIP:DMG: 			Cluster = 0x39,
+          [1662483142.830728][6721:6721] CHIP:DMG: 			Attribute = 0x0000_0002,
+          [1662483142.830756][6721:6721] CHIP:DMG: 		}
+          [1662483142.830792][6721:6721] CHIP:DMG:
+          [1662483142.830818][6721:6721] CHIP:DMG: 	],
+          [1662483142.830856][6721:6721] CHIP:DMG:
+          [1662483142.830883][6721:6721] CHIP:DMG: 	isFabricFiltered = true,
+          [1662483142.830916][6721:6721] CHIP:DMG: 	InteractionModelRevision = 1
+          [1662483142.830940][6721:6721] CHIP:DMG: },
+          [1662483142.831024][6721:6721] CHIP:DMG: IM RH moving to [GeneratingReports]
       disabled: true
 
     - label: "DUT reads ProductName from the TH"
@@ -125,26 +94,26 @@
           Optional Attribute - If it is supported, then in TH(bridge-app) log it will results in displaying the ReportDataMessage , else it will display UNSUPPORTED_ATTRIBUTE
 
           Example Log:
-          [1659966351.620979][3334:3334] CHIP:IM: Received Read request
-          [1659966351.621076][3334:3334] CHIP:DMG: ReadRequestMessage =
-          [1659966351.621104][3334:3334] CHIP:DMG: {
-          [1659966351.621128][3334:3334] CHIP:DMG:         AttributePathIBs =
-          [1659966351.621154][3334:3334] CHIP:DMG:         [
-          [1659966351.621178][3334:3334] CHIP:DMG:                 AttributePathIB =
-          [1659966351.621206][3334:3334] CHIP:DMG:                 {
-          [1659966351.621234][3334:3334] CHIP:DMG:                         Endpoint = 0x0,
-          [1659966351.621265][3334:3334] CHIP:DMG:                         Cluster = 0x28,
-          [1659966351.621297][3334:3334] CHIP:DMG:                         Attribute = 0x0000_0003,
-          [1659966351.621323][3334:3334] CHIP:DMG:                 }
-          [1659966351.621350][3334:3334] CHIP:DMG:
-          [1659966351.621375][3334:3334] CHIP:DMG:         ],
-          [1659966351.621403][3334:3334] CHIP:DMG:
-          [1659966351.621429][3334:3334] CHIP:DMG:         isFabricFiltered = true,
-          [1659966351.621454][3334:3334] CHIP:DMG:         InteractionModelRevision = 1
-          [1659966351.621476][3334:3334] CHIP:DMG: },
-          [1659966351.621549][3334:3334] CHIP:DMG: IM RH moving to [GeneratingReports]
-          [1659966351.621633][3334:3334] CHIP:DMG: Building Reports for ReadHandler with LastReportGeneration = 0 DirtyGeneration = 0
-          [1659966351.621662][3334:3334] CHIP:DMG: <RE:Run> Cluster 28, Attribute 3 is dirty
+          [1662483164.120156][6721:6721] CHIP:IM: Received Read request
+          [1662483164.120237][6721:6721] CHIP:DMG: ReadRequestMessage =
+          [1662483164.120264][6721:6721] CHIP:DMG: {
+          [1662483164.120286][6721:6721] CHIP:DMG:         AttributePathIBs =
+          [1662483164.120312][6721:6721] CHIP:DMG:         [
+          [1662483164.120336][6721:6721] CHIP:DMG:                 AttributePathIB =
+          [1662483164.120364][6721:6721] CHIP:DMG:                 {
+          [1662483164.120391][6721:6721] CHIP:DMG:                         Endpoint = 0x3,
+          [1662483164.120426][6721:6721] CHIP:DMG:                         Cluster = 0x39,
+          [1662483164.120458][6721:6721] CHIP:DMG:                         Attribute = 0x0000_0003,
+          [1662483164.120487][6721:6721] CHIP:DMG:                 }
+          [1662483164.120515][6721:6721] CHIP:DMG:
+          [1662483164.120540][6721:6721] CHIP:DMG:         ],
+          [1662483164.120568][6721:6721] CHIP:DMG:
+          [1662483164.120594][6721:6721] CHIP:DMG:         isFabricFiltered = true,
+          [1662483164.120619][6721:6721] CHIP:DMG:         InteractionModelRevision = 1
+          [1662483164.120642][6721:6721] CHIP:DMG: },
+          [1662483164.120713][6721:6721] CHIP:DMG: IM RH moving to [GeneratingReports]
+          [1662483164.120803][6721:6721] CHIP:DMG: Building Reports for ReadHandler with LastReportGeneration = 0 DirtyGeneration = 0
+          [1662483164.120834][6721:6721] CHIP:DMG: <RE:Run> Cluster 39, Attribute 3 is dirty
       disabled: true
 
     - label: "DUT reads NodeLabel from the TH"
@@ -155,29 +124,26 @@
           Optional Attribute - If it is supported, then in TH(bridge-app) log it will results in displaying the ReportDataMessage , else it will display UNSUPPORTED_ATTRIBUTE
 
           Example Log:
-          [1659966481.748125][3334:3334] CHIP:IM: Received Read request
-          [1659966481.748209][3334:3334] CHIP:DMG: ReadRequestMessage =
-          [1659966481.748236][3334:3334] CHIP:DMG: {
-          [1659966481.748258][3334:3334] CHIP:DMG:         AttributePathIBs =
-          [1659966481.748283][3334:3334] CHIP:DMG:         [
-          [1659966481.748307][3334:3334] CHIP:DMG:                 AttributePathIB =
-          [1659966481.748334][3334:3334] CHIP:DMG:                 {
-          [1659966481.748362][3334:3334] CHIP:DMG:                         Endpoint = 0x0,
-          [1659966481.748397][3334:3334] CHIP:DMG:                         Cluster = 0x28,
-          [1659966481.748429][3334:3334] CHIP:DMG:                         Attribute = 0x0000_0005,
-          [1659966481.748458][3334:3334] CHIP:DMG:                 }
-          [1659966481.748486][3334:3334] CHIP:DMG:
-          [1659966481.748511][3334:3334] CHIP:DMG:         ],
-          [1659966481.748539][3334:3334] CHIP:DMG:
-          [1659966481.748566][3334:3334] CHIP:DMG:         isFabricFiltered = true,
-          [1659966481.748590][3334:3334] CHIP:DMG:         InteractionModelRevision = 1
-          [1659966481.748614][3334:3334] CHIP:DMG: },
-          [1659966481.748689][3334:3334] CHIP:DMG: IM RH moving to [GeneratingReports]
-          [1659966481.748787][3334:3334] CHIP:DMG: Building Reports for ReadHandler with LastReportGeneration = 0 DirtyGeneration = 0
-          [1659966481.748818][3334:3334] CHIP:DMG: <RE:Run> Cluster 28, Attribute 5 is dirty
-          [1659966481.748839][3334:3334] CHIP:DMG: Reading attribute: Cluster=0x0000_0028 Endpoint=0 AttributeId=0x0000_0005 (expanded=0)
-          [1659966481.748868][3334:3334] CHIP:DMG: AccessControl: checking f=1 a=c s=0x000000000001B669 t= c=0x0000_0028 e=0 p=v
-          [1659966481.748901][3334:3334] CHIP:DMG: AccessControl: allowed
+          [1662483190.104331][6721:6721] CHIP:IM: Received Read request
+          [1662483190.104408][6721:6721] CHIP:DMG: ReadRequestMessage =
+          [1662483190.104434][6721:6721] CHIP:DMG: {
+          [1662483190.104455][6721:6721] CHIP:DMG:         AttributePathIBs =
+          [1662483190.104481][6721:6721] CHIP:DMG:         [
+          [1662483190.104505][6721:6721] CHIP:DMG:                 AttributePathIB =
+          [1662483190.104534][6721:6721] CHIP:DMG:                 {
+          [1662483190.104562][6721:6721] CHIP:DMG:                         Endpoint = 0x3,
+          [1662483190.104592][6721:6721] CHIP:DMG:                         Cluster = 0x39,
+          [1662483190.104623][6721:6721] CHIP:DMG:                         Attribute = 0x0000_0005,
+          [1662483190.104650][6721:6721] CHIP:DMG:                 }
+          [1662483190.104678][6721:6721] CHIP:DMG:
+          [1662483190.104702][6721:6721] CHIP:DMG:         ],
+          [1662483190.104730][6721:6721] CHIP:DMG:
+          [1662483190.104755][6721:6721] CHIP:DMG:         isFabricFiltered = true,
+          [1662483190.104780][6721:6721] CHIP:DMG:         InteractionModelRevision = 1
+          [1662483190.104803][6721:6721] CHIP:DMG: },
+          [1662483190.104875][6721:6721] CHIP:DMG: IM RH moving to [GeneratingReports]
+          [1662483190.104951][6721:6721] CHIP:DMG: Building Reports for ReadHandler with LastReportGeneration = 0 DirtyGeneration = 0
+          [1662483190.104979][6721:6721] CHIP:DMG: <RE:Run> Cluster 39, Attribute 5 is dirty
       disabled: true
 
     - label: "DUT reads Location from the TH"
@@ -187,30 +153,9 @@
 
           Optional Attribute - If it is supported, then in TH(bridge-app) log it will results in displaying the ReportDataMessage , else it will display UNSUPPORTED_ATTRIBUTE
 
-          Example Log:
-          [1659966523.437542][3334:3334] CHIP:IM: Received Read request
-          [1659966523.437648][3334:3334] CHIP:DMG: ReadRequestMessage =
-          [1659966523.437686][3334:3334] CHIP:DMG: {
-          [1659966523.437719][3334:3334] CHIP:DMG:         AttributePathIBs =
-          [1659966523.437757][3334:3334] CHIP:DMG:         [
-          [1659966523.437792][3334:3334] CHIP:DMG:                 AttributePathIB =
-          [1659966523.437838][3334:3334] CHIP:DMG:                 {
-          [1659966523.437879][3334:3334] CHIP:DMG:                         Endpoint = 0x0,
-          [1659966523.437924][3334:3334] CHIP:DMG:                         Cluster = 0x28,
-          [1659966523.437972][3334:3334] CHIP:DMG:                         Attribute = 0x0000_0006,
-          [1659966523.438013][3334:3334] CHIP:DMG:                 }
-          [1659966523.438054][3334:3334] CHIP:DMG:
-          [1659966523.438092][3334:3334] CHIP:DMG:         ],
-          [1659966523.438133][3334:3334] CHIP:DMG:
-          [1659966523.438171][3334:3334] CHIP:DMG:         isFabricFiltered = true,
-          [1659966523.438208][3334:3334] CHIP:DMG:         InteractionModelRevision = 1
-          [1659966523.438243][3334:3334] CHIP:DMG: },
-          [1659966523.438346][3334:3334] CHIP:DMG: IM RH moving to [GeneratingReports]
-          [1659966523.438456][3334:3334] CHIP:DMG: Building Reports for ReadHandler with LastReportGeneration = 0 DirtyGeneration = 0
-          [1659966523.438499][3334:3334] CHIP:DMG: <RE:Run> Cluster 28, Attribute 6 is dirty
-          [1659966523.438529][3334:3334] CHIP:DMG: Reading attribute: Cluster=0x0000_0028 Endpoint=0 AttributeId=0x0000_0006 (expanded=0)
-          [1659966523.438563][3334:3334] CHIP:DMG: AccessControl: checking f=1 a=c s=0x000000000001B669 t= c=0x0000_0028 e=0 p=v
-          [1659966523.438603][3334:3334] CHIP:DMG: AccessControl: allowed
+
+
+          chip-tool needs to be implemented
       disabled: true
 
     - label: "DUT reads HardwareVersion from the TH"
@@ -221,29 +166,25 @@
           Optional Attribute - If it is supported, then in TH(bridge-app) log it will results in displaying the ReportDataMessage , else it will display UNSUPPORTED_ATTRIBUTE
 
           Example Log:
-          [1659966609.655514][3334:3334] CHIP:IM: Received Read request
-          [1659966609.655592][3334:3334] CHIP:DMG: ReadRequestMessage =
-          [1659966609.655618][3334:3334] CHIP:DMG: {
-          [1659966609.655640][3334:3334] CHIP:DMG:         AttributePathIBs =
-          [1659966609.655666][3334:3334] CHIP:DMG:         [
-          [1659966609.655689][3334:3334] CHIP:DMG:                 AttributePathIB =
-          [1659966609.655719][3334:3334] CHIP:DMG:                 {
-          [1659966609.655748][3334:3334] CHIP:DMG:                         Endpoint = 0x0,
-          [1659966609.655778][3334:3334] CHIP:DMG:                         Cluster = 0x28,
-          [1659966609.655810][3334:3334] CHIP:DMG:                         Attribute = 0x0000_0008,
-          [1659966609.655841][3334:3334] CHIP:DMG:                 }
-          [1659966609.655871][3334:3334] CHIP:DMG:
-          [1659966609.655898][3334:3334] CHIP:DMG:         ],
-          [1659966609.655925][3334:3334] CHIP:DMG:
-          [1659966609.655951][3334:3334] CHIP:DMG:         isFabricFiltered = true,
-          [1659966609.655979][3334:3334] CHIP:DMG:         InteractionModelRevision = 1
-          [1659966609.656001][3334:3334] CHIP:DMG: },
-          [1659966609.656073][3334:3334] CHIP:DMG: IM RH moving to [GeneratingReports]
-          [1659966609.656154][3334:3334] CHIP:DMG: Building Reports for ReadHandler with LastReportGeneration = 0 DirtyGeneration = 0
-          [1659966609.656183][3334:3334] CHIP:DMG: <RE:Run> Cluster 28, Attribute 8 is dirty
-          [1659966609.656204][3334:3334] CHIP:DMG: Reading attribute: Cluster=0x0000_0028 Endpoint=0 AttributeId=0x0000_0008 (expanded=0)
-          [1659966609.656233][3334:3334] CHIP:DMG: AccessControl: checking f=1 a=c s=0x000000000001B669 t= c=0x0000_0028 e=0 p=v
-          [1659966609.656266][3334:3334] CHIP:DMG: AccessControl: allowed
+          [1662483240.584273][6721:6721] CHIP:IM: Received Read request
+          [1662483240.584351][6721:6721] CHIP:DMG: ReadRequestMessage =
+          [1662483240.584389][6721:6721] CHIP:DMG: {
+          [1662483240.584411][6721:6721] CHIP:DMG:         AttributePathIBs =
+          [1662483240.584437][6721:6721] CHIP:DMG:         [
+          [1662483240.584470][6721:6721] CHIP:DMG:                 AttributePathIB =
+          [1662483240.584500][6721:6721] CHIP:DMG:                 {
+          [1662483240.584539][6721:6721] CHIP:DMG:                         Endpoint = 0x3,
+          [1662483240.584570][6721:6721] CHIP:DMG:                         Cluster = 0x39,
+          [1662483240.584611][6721:6721] CHIP:DMG:                         Attribute = 0x0000_0007,
+          [1662483240.584648][6721:6721] CHIP:DMG:                 }
+          [1662483240.584679][6721:6721] CHIP:DMG:
+          [1662483240.584713][6721:6721] CHIP:DMG:         ],
+          [1662483240.584743][6721:6721] CHIP:DMG:
+          [1662483240.584780][6721:6721] CHIP:DMG:         isFabricFiltered = true,
+          [1662483240.584805][6721:6721] CHIP:DMG:         InteractionModelRevision = 1
+          [1662483240.584837][6721:6721] CHIP:DMG: },
+          [1662483240.584919][6721:6721] CHIP:DMG: IM RH moving to [GeneratingReports]
+          [1662483240.585010][6721:6721] CHIP:DMG: Building Reports for ReadHandler with LastReportGeneration = 0 DirtyGeneration = 0
       disabled: true
 
     - label: "DUT reads HardwareVersionString from the TH"
@@ -255,29 +196,26 @@
 
           Example Log:
 
-          [1659966639.857534][3334:3334] CHIP:IM: Received Read request
-          [1659966639.857613][3334:3334] CHIP:DMG: ReadRequestMessage =
-          [1659966639.857640][3334:3334] CHIP:DMG: {
-          [1659966639.857661][3334:3334] CHIP:DMG:         AttributePathIBs =
-          [1659966639.857687][3334:3334] CHIP:DMG:         [
-          [1659966639.857711][3334:3334] CHIP:DMG:                 AttributePathIB =
-          [1659966639.857739][3334:3334] CHIP:DMG:                 {
-          [1659966639.857766][3334:3334] CHIP:DMG:                         Endpoint = 0x0,
-          [1659966639.857798][3334:3334] CHIP:DMG:                         Cluster = 0x28,
-          [1659966639.857828][3334:3334] CHIP:DMG:                         Attribute = 0x0000_0008,
-          [1659966639.857856][3334:3334] CHIP:DMG:                 }
-          [1659966639.857884][3334:3334] CHIP:DMG:
-          [1659966639.857909][3334:3334] CHIP:DMG:         ],
-          [1659966639.857936][3334:3334] CHIP:DMG:
-          [1659966639.857962][3334:3334] CHIP:DMG:         isFabricFiltered = true,
-          [1659966639.857987][3334:3334] CHIP:DMG:         InteractionModelRevision = 1
-          [1659966639.858010][3334:3334] CHIP:DMG: },
-          [1659966639.858080][3334:3334] CHIP:DMG: IM RH moving to [GeneratingReports]
-          [1659966639.858163][3334:3334] CHIP:DMG: Building Reports for ReadHandler with LastReportGeneration = 0 DirtyGeneration = 0
-          [1659966639.858192][3334:3334] CHIP:DMG: <RE:Run> Cluster 28, Attribute 8 is dirty
-          [1659966639.858213][3334:3334] CHIP:DMG: Reading attribute: Cluster=0x0000_0028 Endpoint=0 AttributeId=0x0000_0008 (expanded=0)
-          [1659966639.858243][3334:3334] CHIP:DMG: AccessControl: checking f=1 a=c s=0x000000000001B669 t= c=0x0000_0028 e=0 p=v
-          [1659966639.858275][3334:3334] CHIP:DMG: AccessControl: allowed
+          [1662483260.814729][6721:6721] CHIP:IM: Received Read request
+          [1662483260.814805][6721:6721] CHIP:DMG: ReadRequestMessage =
+          [1662483260.814843][6721:6721] CHIP:DMG: {
+          [1662483260.814872][6721:6721] CHIP:DMG:         AttributePathIBs =
+          [1662483260.814903][6721:6721] CHIP:DMG:         [
+          [1662483260.814928][6721:6721] CHIP:DMG:                 AttributePathIB =
+          [1662483260.814955][6721:6721] CHIP:DMG:                 {
+          [1662483260.814983][6721:6721] CHIP:DMG:                         Endpoint = 0x3,
+          [1662483260.815022][6721:6721] CHIP:DMG:                         Cluster = 0x39,
+          [1662483260.815063][6721:6721] CHIP:DMG:                         Attribute = 0x0000_0008,
+          [1662483260.815091][6721:6721] CHIP:DMG:                 }
+          [1662483260.815129][6721:6721] CHIP:DMG:
+          [1662483260.815156][6721:6721] CHIP:DMG:         ],
+          [1662483260.815192][6721:6721] CHIP:DMG:
+          [1662483260.815218][6721:6721] CHIP:DMG:         isFabricFiltered = true,
+          [1662483260.815252][6721:6721] CHIP:DMG:         InteractionModelRevision = 1
+          [1662483260.815275][6721:6721] CHIP:DMG: },
+          [1662483260.815364][6721:6721] CHIP:DMG: IM RH moving to [GeneratingReports]
+          [1662483260.815454][6721:6721] CHIP:DMG: Building Reports for ReadHandler with LastReportGeneration = 0 DirtyGeneration = 0
+          [1662483260.815483][6721:6721] CHIP:DMG: <RE:Run> Cluster 39, Attribute 8 is dirty
       disabled: true
 
     - label: "DUT reads SoftwareVersion from the TH"
@@ -289,29 +227,26 @@
 
           Example Log:
 
-          [1659966672.320763][3334:3334] CHIP:IM: Received Read request
-          [1659966672.320848][3334:3334] CHIP:DMG: ReadRequestMessage =
-          [1659966672.320876][3334:3334] CHIP:DMG: {
-          [1659966672.320898][3334:3334] CHIP:DMG:         AttributePathIBs =
-          [1659966672.320987][3334:3334] CHIP:DMG:         [
-          [1659966672.321033][3334:3334] CHIP:DMG:                 AttributePathIB =
-          [1659966672.321066][3334:3334] CHIP:DMG:                 {
-          [1659966672.321095][3334:3334] CHIP:DMG:                         Endpoint = 0x0,
-          [1659966672.321128][3334:3334] CHIP:DMG:                         Cluster = 0x28,
-          [1659966672.321161][3334:3334] CHIP:DMG:                         Attribute = 0x0000_0009,
-          [1659966672.321191][3334:3334] CHIP:DMG:                 }
-          [1659966672.321220][3334:3334] CHIP:DMG:
-          [1659966672.321244][3334:3334] CHIP:DMG:         ],
-          [1659966672.321273][3334:3334] CHIP:DMG:
-          [1659966672.321299][3334:3334] CHIP:DMG:         isFabricFiltered = true,
-          [1659966672.321324][3334:3334] CHIP:DMG:         InteractionModelRevision = 1
-          [1659966672.321347][3334:3334] CHIP:DMG: },
-          [1659966672.321427][3334:3334] CHIP:DMG: IM RH moving to [GeneratingReports]
-          [1659966672.321529][3334:3334] CHIP:DMG: Building Reports for ReadHandler with LastReportGeneration = 0 DirtyGeneration = 0
-          [1659966672.321561][3334:3334] CHIP:DMG: <RE:Run> Cluster 28, Attribute 9 is dirty
-          [1659966672.321583][3334:3334] CHIP:DMG: Reading attribute: Cluster=0x0000_0028 Endpoint=0 AttributeId=0x0000_0009 (expanded=0)
-          [1659966672.321612][3334:3334] CHIP:DMG: AccessControl: checking f=1 a=c s=0x000000000001B669 t= c=0x0000_0028 e=0 p=v
-          [1659966672.321646][3334:3334] CHIP:DMG: AccessControl: allowed
+          [1662483282.272696][6721:6721] CHIP:IM: Received Read request
+          [1662483282.272777][6721:6721] CHIP:DMG: ReadRequestMessage =
+          [1662483282.272805][6721:6721] CHIP:DMG: {
+          [1662483282.272830][6721:6721] CHIP:DMG:         AttributePathIBs =
+          [1662483282.272866][6721:6721] CHIP:DMG:         [
+          [1662483282.272891][6721:6721] CHIP:DMG:                 AttributePathIB =
+          [1662483282.272920][6721:6721] CHIP:DMG:                 {
+          [1662483282.272949][6721:6721] CHIP:DMG:                         Endpoint = 0x3,
+          [1662483282.272978][6721:6721] CHIP:DMG:                         Cluster = 0x39,
+          [1662483282.273007][6721:6721] CHIP:DMG:                         Attribute = 0x0000_0009,
+          [1662483282.273036][6721:6721] CHIP:DMG:                 }
+          [1662483282.273064][6721:6721] CHIP:DMG:
+          [1662483282.273089][6721:6721] CHIP:DMG:         ],
+          [1662483282.273118][6721:6721] CHIP:DMG:
+          [1662483282.273144][6721:6721] CHIP:DMG:         isFabricFiltered = true,
+          [1662483282.273169][6721:6721] CHIP:DMG:         InteractionModelRevision = 1
+          [1662483282.273192][6721:6721] CHIP:DMG: },
+          [1662483282.273267][6721:6721] CHIP:DMG: IM RH moving to [GeneratingReports]
+          [1662483282.273361][6721:6721] CHIP:DMG: Building Reports for ReadHandler with LastReportGeneration = 0 DirtyGeneration = 0
+          [1662483282.273392][6721:6721] CHIP:DMG: <RE:Run> Cluster 39, Attribute 9 is dirty
       disabled: true
 
     - label: "DUT reads SoftwareVersionString from the TH"
@@ -323,29 +258,26 @@
 
           Example Log:
 
-          [1659966701.890819][3334:3334] CHIP:IM: Received Read request
-          [1659966701.890896][3334:3334] CHIP:DMG: ReadRequestMessage =
-          [1659966701.890922][3334:3334] CHIP:DMG: {
-          [1659966701.890944][3334:3334] CHIP:DMG:         AttributePathIBs =
-          [1659966701.890973][3334:3334] CHIP:DMG:         [
-          [1659966701.890997][3334:3334] CHIP:DMG:                 AttributePathIB =
-          [1659966701.891024][3334:3334] CHIP:DMG:                 {
-          [1659966701.891052][3334:3334] CHIP:DMG:                         Endpoint = 0x0,
-          [1659966701.891083][3334:3334] CHIP:DMG:                         Cluster = 0x28,
-          [1659966701.891116][3334:3334] CHIP:DMG:                         Attribute = 0x0000_000A,
-          [1659966701.891148][3334:3334] CHIP:DMG:                 }
-          [1659966701.891178][3334:3334] CHIP:DMG:
-          [1659966701.891203][3334:3334] CHIP:DMG:         ],
-          [1659966701.891230][3334:3334] CHIP:DMG:
-          [1659966701.891256][3334:3334] CHIP:DMG:         isFabricFiltered = true,
-          [1659966701.891281][3334:3334] CHIP:DMG:         InteractionModelRevision = 1
-          [1659966701.891304][3334:3334] CHIP:DMG: },
-          [1659966701.891376][3334:3334] CHIP:DMG: IM RH moving to [GeneratingReports]
-          [1659966701.891456][3334:3334] CHIP:DMG: Building Reports for ReadHandler with LastReportGeneration = 0 DirtyGeneration = 0
-          [1659966701.891485][3334:3334] CHIP:DMG: <RE:Run> Cluster 28, Attribute a is dirty
-          [1659966701.891507][3334:3334] CHIP:DMG: Reading attribute: Cluster=0x0000_0028 Endpoint=0 AttributeId=0x0000_000A (expanded=0)
-          [1659966701.891536][3334:3334] CHIP:DMG: AccessControl: checking f=1 a=c s=0x000000000001B669 t= c=0x0000_0028 e=0 p=v
-          [1659966701.891568][3334:3334] CHIP:DMG: AccessControl: allowed
+          [1662483301.552473][6721:6721] CHIP:IM: Received Read request
+          [1662483301.552587][6721:6721] CHIP:DMG: ReadRequestMessage =
+          [1662483301.552630][6721:6721] CHIP:DMG: {
+          [1662483301.552666][6721:6721] CHIP:DMG:         AttributePathIBs =
+          [1662483301.552709][6721:6721] CHIP:DMG:         [
+          [1662483301.552748][6721:6721] CHIP:DMG:                 AttributePathIB =
+          [1662483301.552796][6721:6721] CHIP:DMG:                 {
+          [1662483301.552842][6721:6721] CHIP:DMG:                         Endpoint = 0x3,
+          [1662483301.552893][6721:6721] CHIP:DMG:                         Cluster = 0x39,
+          [1662483301.552946][6721:6721] CHIP:DMG:                         Attribute = 0x0000_000A,
+          [1662483301.552992][6721:6721] CHIP:DMG:                 }
+          [1662483301.553038][6721:6721] CHIP:DMG:
+          [1662483301.553079][6721:6721] CHIP:DMG:         ],
+          [1662483301.553125][6721:6721] CHIP:DMG:
+          [1662483301.553168][6721:6721] CHIP:DMG:         isFabricFiltered = true,
+          [1662483301.553208][6721:6721] CHIP:DMG:         InteractionModelRevision = 1
+          [1662483301.553246][6721:6721] CHIP:DMG: },
+          [1662483301.553352][6721:6721] CHIP:DMG: IM RH moving to [GeneratingReports]
+          [1662483301.553468][6721:6721] CHIP:DMG: Building Reports for ReadHandler with LastReportGeneration = 0 DirtyGeneration = 0
+          [1662483301.553513][6721:6721] CHIP:DMG: <RE:Run> Cluster 39, Attribute a is dirty
       disabled: true
 
     - label: "DUT reads ManufacturingDate from the TH"
@@ -357,29 +289,25 @@
 
           Example Log:
 
-          [1659966734.117679][3334:3334] CHIP:IM: Received Read request
-          [1659966734.117757][3334:3334] CHIP:DMG: ReadRequestMessage =
-          [1659966734.117784][3334:3334] CHIP:DMG: {
-          [1659966734.117806][3334:3334] CHIP:DMG:         AttributePathIBs =
-          [1659966734.117832][3334:3334] CHIP:DMG:         [
-          [1659966734.117856][3334:3334] CHIP:DMG:                 AttributePathIB =
-          [1659966734.117892][3334:3334] CHIP:DMG:                 {
-          [1659966734.117920][3334:3334] CHIP:DMG:                         Endpoint = 0x0,
-          [1659966734.117952][3334:3334] CHIP:DMG:                         Cluster = 0x28,
-          [1659966734.117987][3334:3334] CHIP:DMG:                         Attribute = 0x0000_000B,
-          [1659966734.118016][3334:3334] CHIP:DMG:                 }
-          [1659966734.118046][3334:3334] CHIP:DMG:
-          [1659966734.118073][3334:3334] CHIP:DMG:         ],
-          [1659966734.118100][3334:3334] CHIP:DMG:
-          [1659966734.118126][3334:3334] CHIP:DMG:         isFabricFiltered = true,
-          [1659966734.118151][3334:3334] CHIP:DMG:         InteractionModelRevision = 1
-          [1659966734.118175][3334:3334] CHIP:DMG: },
-          [1659966734.118248][3334:3334] CHIP:DMG: IM RH moving to [GeneratingReports]
-          [1659966734.118331][3334:3334] CHIP:DMG: Building Reports for ReadHandler with LastReportGeneration = 0 DirtyGeneration = 0
-          [1659966734.118360][3334:3334] CHIP:DMG: <RE:Run> Cluster 28, Attribute b is dirty
-          [1659966734.118382][3334:3334] CHIP:DMG: Reading attribute: Cluster=0x0000_0028 Endpoint=0 AttributeId=0x0000_000B (expanded=0)
-          [1659966734.118411][3334:3334] CHIP:DMG: AccessControl: checking f=1 a=c s=0x000000000001B669 t= c=0x0000_0028 e=0 p=v
-          [1659966734.118444][3334:3334] CHIP:DMG: AccessControl: allowed
+          [1662483324.189011][6721:6721] CHIP:IM: Received Read request
+          [1662483324.189095][6721:6721] CHIP:DMG: ReadRequestMessage =
+          [1662483324.189123][6721:6721] CHIP:DMG: {
+          [1662483324.189145][6721:6721] CHIP:DMG:         AttributePathIBs =
+          [1662483324.189170][6721:6721] CHIP:DMG:         [
+          [1662483324.189194][6721:6721] CHIP:DMG:                 AttributePathIB =
+          [1662483324.189222][6721:6721] CHIP:DMG:                 {
+          [1662483324.189250][6721:6721] CHIP:DMG:                         Endpoint = 0x3,
+          [1662483324.189284][6721:6721] CHIP:DMG:                         Cluster = 0x39,
+          [1662483324.189317][6721:6721] CHIP:DMG:                         Attribute = 0x0000_000B,
+          [1662483324.189347][6721:6721] CHIP:DMG:                 }
+          [1662483324.189376][6721:6721] CHIP:DMG:
+          [1662483324.189401][6721:6721] CHIP:DMG:         ],
+          [1662483324.189429][6721:6721] CHIP:DMG:
+          [1662483324.189455][6721:6721] CHIP:DMG:         isFabricFiltered = true,
+          [1662483324.189479][6721:6721] CHIP:DMG:         InteractionModelRevision = 1
+          [1662483324.189502][6721:6721] CHIP:DMG: },
+          [1662483324.189575][6721:6721] CHIP:DMG: IM RH moving to [GeneratingReports]
+          [1662483324.189665][6721:6721] CHIP:DMG: Building Reports for ReadHandler with LastReportGeneration =
       disabled: true
 
     - label: "DUT reads PartNumber from the TH"
@@ -391,29 +319,26 @@
 
           Example Log:
 
-          [1659966759.882885][3334:3334] CHIP:IM: Received Read request
-          [1659966759.882962][3334:3334] CHIP:DMG: ReadRequestMessage =
-          [1659966759.882989][3334:3334] CHIP:DMG: {
-          [1659966759.883011][3334:3334] CHIP:DMG:         AttributePathIBs =
-          [1659966759.883037][3334:3334] CHIP:DMG:         [
-          [1659966759.883061][3334:3334] CHIP:DMG:                 AttributePathIB =
-          [1659966759.883089][3334:3334] CHIP:DMG:                 {
-          [1659966759.883117][3334:3334] CHIP:DMG:                         Endpoint = 0x0,
-          [1659966759.883153][3334:3334] CHIP:DMG:                         Cluster = 0x28,
-          [1659966759.883182][3334:3334] CHIP:DMG:                         Attribute = 0x0000_000C,
-          [1659966759.883215][3334:3334] CHIP:DMG:                 }
-          [1659966759.883243][3334:3334] CHIP:DMG:
-          [1659966759.883268][3334:3334] CHIP:DMG:         ],
-          [1659966759.883296][3334:3334] CHIP:DMG:
-          [1659966759.883322][3334:3334] CHIP:DMG:         isFabricFiltered = true,
-          [1659966759.883347][3334:3334] CHIP:DMG:         InteractionModelRevision = 1
-          [1659966759.883370][3334:3334] CHIP:DMG: },
-          [1659966759.883444][3334:3334] CHIP:DMG: IM RH moving to [GeneratingReports]
-          [1659966759.883528][3334:3334] CHIP:DMG: Building Reports for ReadHandler with LastReportGeneration = 0 DirtyGeneration = 0
-          [1659966759.883557][3334:3334] CHIP:DMG: <RE:Run> Cluster 28, Attribute c is dirty
-          [1659966759.883579][3334:3334] CHIP:DMG: Reading attribute: Cluster=0x0000_0028 Endpoint=0 AttributeId=0x0000_000C (expanded=0)
-          [1659966759.883608][3334:3334] CHIP:DMG: AccessControl: checking f=1 a=c s=0x000000000001B669 t= c=0x0000_0028 e=0 p=v
-          [1659966759.883642][3334:3334] CHIP:DMG: AccessControl: allowed
+          [1662483344.709130][6721:6721] CHIP:IM: Received Read request
+          [1662483344.709209][6721:6721] CHIP:DMG: ReadRequestMessage =
+          [1662483344.709236][6721:6721] CHIP:DMG: {
+          [1662483344.709257][6721:6721] CHIP:DMG:         AttributePathIBs =
+          [1662483344.709283][6721:6721] CHIP:DMG:         [
+          [1662483344.709307][6721:6721] CHIP:DMG:                 AttributePathIB =
+          [1662483344.709341][6721:6721] CHIP:DMG:                 {
+          [1662483344.709371][6721:6721] CHIP:DMG:                         Endpoint = 0x3,
+          [1662483344.709407][6721:6721] CHIP:DMG:                         Cluster = 0x39,
+          [1662483344.709439][6721:6721] CHIP:DMG:                         Attribute = 0x0000_000C,
+          [1662483344.709468][6721:6721] CHIP:DMG:                 }
+          [1662483344.709496][6721:6721] CHIP:DMG:
+          [1662483344.709523][6721:6721] CHIP:DMG:         ],
+          [1662483344.709551][6721:6721] CHIP:DMG:
+          [1662483344.709576][6721:6721] CHIP:DMG:         isFabricFiltered = true,
+          [1662483344.709603][6721:6721] CHIP:DMG:         InteractionModelRevision = 1
+          [1662483344.709626][6721:6721] CHIP:DMG: },
+          [1662483344.709697][6721:6721] CHIP:DMG: IM RH moving to [GeneratingReports]
+          [1662483344.709776][6721:6721] CHIP:DMG: Building Reports for ReadHandler with LastReportGeneration = 0 DirtyGeneration = 0
+          [1662483344.709805][6721:6721] CHIP:DMG: <RE:Run> Cluster 39, Attribute c is dirty
       disabled: true
 
     - label: "DUT reads ProductURL from the TH"
@@ -425,29 +350,25 @@
 
           Example Log:
 
-          [1659966801.953254][3334:3334] CHIP:IM: Received Read request
-          [1659966801.953352][3334:3334] CHIP:DMG: ReadRequestMessage =
-          [1659966801.953388][3334:3334] CHIP:DMG: {
-          [1659966801.953417][3334:3334] CHIP:DMG:         AttributePathIBs =
-          [1659966801.953452][3334:3334] CHIP:DMG:         [
-          [1659966801.953484][3334:3334] CHIP:DMG:                 AttributePathIB =
-          [1659966801.953531][3334:3334] CHIP:DMG:                 {
-          [1659966801.953569][3334:3334] CHIP:DMG:                         Endpoint = 0x0,
-          [1659966801.953611][3334:3334] CHIP:DMG:                         Cluster = 0x28,
-          [1659966801.953653][3334:3334] CHIP:DMG:                         Attribute = 0x0000_000D,
-          [1659966801.953693][3334:3334] CHIP:DMG:                 }
-          [1659966801.953731][3334:3334] CHIP:DMG:
-          [1659966801.953765][3334:3334] CHIP:DMG:         ],
-          [1659966801.953802][3334:3334] CHIP:DMG:
-          [1659966801.953837][3334:3334] CHIP:DMG:         isFabricFiltered = true,
-          [1659966801.953871][3334:3334] CHIP:DMG:         InteractionModelRevision = 1
-          [1659966801.953903][3334:3334] CHIP:DMG: },
-          [1659966801.953996][3334:3334] CHIP:DMG: IM RH moving to [GeneratingReports]
-          [1659966801.954102][3334:3334] CHIP:DMG: Building Reports for ReadHandler with LastReportGeneration = 0 DirtyGeneration = 0
-          [1659966801.954177][3334:3334] CHIP:DMG: <RE:Run> Cluster 28, Attribute d is dirty
-          [1659966801.954208][3334:3334] CHIP:DMG: Reading attribute: Cluster=0x0000_0028 Endpoint=0 AttributeId=0x0000_000D (expanded=0)
-          [1659966801.954246][3334:3334] CHIP:DMG: AccessControl: checking f=1 a=c s=0x000000000001B669 t= c=0x0000_0028 e=0 p=v
-          [1659966801.954288][3334:3334] CHIP:DMG: AccessControl: allowed
+          [1662483368.089998][6721:6721] CHIP:DMG: ReadRequestMessage =
+          [1662483368.090026][6721:6721] CHIP:DMG: {
+          [1662483368.090047][6721:6721] CHIP:DMG:         AttributePathIBs =
+          [1662483368.090100][6721:6721] CHIP:DMG:         [
+          [1662483368.090126][6721:6721] CHIP:DMG:                 AttributePathIB =
+          [1662483368.090154][6721:6721] CHIP:DMG:                 {
+          [1662483368.090182][6721:6721] CHIP:DMG:                         Endpoint = 0x3,
+          [1662483368.090214][6721:6721] CHIP:DMG:                         Cluster = 0x39,
+          [1662483368.090244][6721:6721] CHIP:DMG:                         Attribute = 0x0000_000D,
+          [1662483368.090272][6721:6721] CHIP:DMG:                 }
+          [1662483368.090299][6721:6721] CHIP:DMG:
+          [1662483368.090324][6721:6721] CHIP:DMG:         ],
+          [1662483368.090352][6721:6721] CHIP:DMG:
+          [1662483368.090378][6721:6721] CHIP:DMG:         isFabricFiltered = true,
+          [1662483368.090403][6721:6721] CHIP:DMG:         InteractionModelRevision = 1
+          [1662483368.090426][6721:6721] CHIP:DMG: },
+          [1662483368.090499][6721:6721] CHIP:DMG: IM RH moving to [GeneratingReports]
+          [1662483368.090578][6721:6721] CHIP:DMG: Building Reports for ReadHandler with LastReportGeneration = 0 DirtyGeneration = 0
+          [1662483368.090607][6721:6721] CHIP:DMG: <RE:Run> Cluster 39, Attribute d is dirty
       disabled: true
 
     - label: "DUT reads ProductLabel from the TH"
@@ -459,29 +380,24 @@
 
           Example Log:
 
-          [1659966838.501579][3334:3334] CHIP:IM: Received Read request
-          [1659966838.501708][3334:3334] CHIP:DMG: ReadRequestMessage =
-          [1659966838.501758][3334:3334] CHIP:DMG: {
-          [1659966838.501799][3334:3334] CHIP:DMG:         AttributePathIBs =
-          [1659966838.501846][3334:3334] CHIP:DMG:         [
-          [1659966838.501892][3334:3334] CHIP:DMG:                 AttributePathIB =
-          [1659966838.501942][3334:3334] CHIP:DMG:                 {
-          [1659966838.501994][3334:3334] CHIP:DMG:                         Endpoint = 0x0,
-          [1659966838.502081][3334:3334] CHIP:DMG:                         Cluster = 0x28,
-          [1659966838.502146][3334:3334] CHIP:DMG:                         Attribute = 0x0000_000E,
-          [1659966838.502202][3334:3334] CHIP:DMG:                 }
-          [1659966838.502254][3334:3334] CHIP:DMG:
-          [1659966838.502301][3334:3334] CHIP:DMG:         ],
-          [1659966838.502352][3334:3334] CHIP:DMG:
-          [1659966838.502401][3334:3334] CHIP:DMG:         isFabricFiltered = true,
-          [1659966838.502448][3334:3334] CHIP:DMG:         InteractionModelRevision = 1
-          [1659966838.502492][3334:3334] CHIP:DMG: },
-          [1659966838.502613][3334:3334] CHIP:DMG: IM RH moving to [GeneratingReports]
-          [1659966838.502731][3334:3334] CHIP:DMG: Building Reports for ReadHandler with LastReportGeneration = 0 DirtyGeneration = 0
-          [1659966838.502768][3334:3334] CHIP:DMG: <RE:Run> Cluster 28, Attribute e is dirty
-          [1659966838.502793][3334:3334] CHIP:DMG: Reading attribute: Cluster=0x0000_0028 Endpoint=0 AttributeId=0x0000_000E (expanded=0)
-          [1659966838.502827][3334:3334] CHIP:DMG: AccessControl: checking f=1 a=c s=0x000000000001B669 t= c=0x0000_0028 e=0 p=v
-          [1659966838.502864][3334:3334] CHIP:DMG: AccessControl: allowed
+          [1662483390.848183][6721:6721] CHIP:IM: Received Read request
+          [1662483390.848263][6721:6721] CHIP:DMG: ReadRequestMessage =
+          [1662483390.848289][6721:6721] CHIP:DMG: {
+          [1662483390.848311][6721:6721] CHIP:DMG:         AttributePathIBs =
+          [1662483390.848344][6721:6721] CHIP:DMG:         [
+          [1662483390.848368][6721:6721] CHIP:DMG:                 AttributePathIB =
+          [1662483390.848395][6721:6721] CHIP:DMG:                 {
+          [1662483390.848423][6721:6721] CHIP:DMG:                         Endpoint = 0x3,
+          [1662483390.848454][6721:6721] CHIP:DMG:                         Cluster = 0x39,
+          [1662483390.848488][6721:6721] CHIP:DMG:                         Attribute = 0x0000_000E,
+          [1662483390.848517][6721:6721] CHIP:DMG:                 }
+          [1662483390.848546][6721:6721] CHIP:DMG:
+          [1662483390.848573][6721:6721] CHIP:DMG:         ],
+          [1662483390.848601][6721:6721] CHIP:DMG:
+          [1662483390.848627][6721:6721] CHIP:DMG:         isFabricFiltered = true,
+          [1662483390.848652][6721:6721] CHIP:DMG:         InteractionModelRevision = 1
+          [1662483390.848675][6721:6721] CHIP:DMG: },
+          [1662483390.848745][6721:6721] CHIP:DMG: IM RH moving to [GeneratingReports]
       disabled: true
 
     - label: "DUT reads SerialNumber from the TH"
@@ -493,29 +409,26 @@
 
           Example Log:
 
-          [1659966910.846054][3334:3334] CHIP:IM: Received Read request
-          [1659966910.846136][3334:3334] CHIP:DMG: ReadRequestMessage =
-          [1659966910.846163][3334:3334] CHIP:DMG: {
-          [1659966910.846185][3334:3334] CHIP:DMG:         AttributePathIBs =
-          [1659966910.846218][3334:3334] CHIP:DMG:         [
-          [1659966910.846243][3334:3334] CHIP:DMG:                 AttributePathIB =
-          [1659966910.846275][3334:3334] CHIP:DMG:                 {
-          [1659966910.846307][3334:3334] CHIP:DMG:                         Endpoint = 0x0,
-          [1659966910.846344][3334:3334] CHIP:DMG:                         Cluster = 0x28,
-          [1659966910.846381][3334:3334] CHIP:DMG:                         Attribute = 0x0000_000F,
-          [1659966910.846414][3334:3334] CHIP:DMG:                 }
-          [1659966910.846445][3334:3334] CHIP:DMG:
-          [1659966910.846473][3334:3334] CHIP:DMG:         ],
-          [1659966910.846501][3334:3334] CHIP:DMG:
-          [1659966910.846527][3334:3334] CHIP:DMG:         isFabricFiltered = true,
-          [1659966910.846552][3334:3334] CHIP:DMG:         InteractionModelRevision = 1
-          [1659966910.846578][3334:3334] CHIP:DMG: },
-          [1659966910.846653][3334:3334] CHIP:DMG: IM RH moving to [GeneratingReports]
-          [1659966910.846749][3334:3334] CHIP:DMG: Building Reports for ReadHandler with LastReportGeneration = 0 DirtyGeneration = 0
-          [1659966910.846780][3334:3334] CHIP:DMG: <RE:Run> Cluster 28, Attribute f is dirty
-          [1659966910.846801][3334:3334] CHIP:DMG: Reading attribute: Cluster=0x0000_0028 Endpoint=0 AttributeId=0x0000_000F (expanded=0)
-          [1659966910.846831][3334:3334] CHIP:DMG: AccessControl: checking f=1 a=c s=0x000000000001B669 t= c=0x0000_0028 e=0 p=v
-          [1659966910.846865][3334:3334] CHIP:DMG: AccessControl: allowed
+          [1662483412.129986][6721:6721] CHIP:IM: Received Read request
+          [1662483412.130062][6721:6721] CHIP:DMG: ReadRequestMessage =
+          [1662483412.130088][6721:6721] CHIP:DMG: {
+          [1662483412.130134][6721:6721] CHIP:DMG:         AttributePathIBs =
+          [1662483412.130162][6721:6721] CHIP:DMG:         [
+          [1662483412.130186][6721:6721] CHIP:DMG:                 AttributePathIB =
+          [1662483412.130214][6721:6721] CHIP:DMG:                 {
+          [1662483412.130242][6721:6721] CHIP:DMG:                         Endpoint = 0x3,
+          [1662483412.130273][6721:6721] CHIP:DMG:                         Cluster = 0x39,
+          [1662483412.130304][6721:6721] CHIP:DMG:                         Attribute = 0x0000_000F,
+          [1662483412.130333][6721:6721] CHIP:DMG:                 }
+          [1662483412.130361][6721:6721] CHIP:DMG:
+          [1662483412.130386][6721:6721] CHIP:DMG:         ],
+          [1662483412.130413][6721:6721] CHIP:DMG:
+          [1662483412.130439][6721:6721] CHIP:DMG:         isFabricFiltered = true,
+          [1662483412.130464][6721:6721] CHIP:DMG:         InteractionModelRevision = 1
+          [1662483412.130487][6721:6721] CHIP:DMG: },
+          [1662483412.130558][6721:6721] CHIP:DMG: IM RH moving to [GeneratingReports]
+          [1662483412.130636][6721:6721] CHIP:DMG: Building Reports for ReadHandler with LastReportGeneration = 0 DirtyGeneration = 0
+          [1662483412.130665][6721:6721] CHIP:DMG: <RE:Run> Cluster 39, Attribute f is dirty
       disabled: true
 
     - label: "DUT reads Reachable from the TH"
@@ -524,29 +437,26 @@
           ./chip-tool bridgeddevicebasic read reachable 1 3
 
           Verify ReadRequestMessage is displayed on TH(bridge-app) Log
-          [1659966974.431316][3334:3334] CHIP:IM: Received Read request
-          [1659966974.431423][3334:3334] CHIP:DMG: ReadRequestMessage =
-          [1659966974.431461][3334:3334] CHIP:DMG: {
-          [1659966974.431493][3334:3334] CHIP:DMG:         AttributePathIBs =
-          [1659966974.431531][3334:3334] CHIP:DMG:         [
-          [1659966974.431567][3334:3334] CHIP:DMG:                 AttributePathIB =
-          [1659966974.431607][3334:3334] CHIP:DMG:                 {
-          [1659966974.431649][3334:3334] CHIP:DMG:                         Endpoint = 0x0,
-          [1659966974.431696][3334:3334] CHIP:DMG:                         Cluster = 0x28,
-          [1659966974.431740][3334:3334] CHIP:DMG:                         Attribute = 0x0000_0011,
-          [1659966974.431784][3334:3334] CHIP:DMG:                 }
-          [1659966974.431825][3334:3334] CHIP:DMG:
-          [1659966974.431862][3334:3334] CHIP:DMG:         ],
-          [1659966974.431903][3334:3334] CHIP:DMG:
-          [1659966974.431941][3334:3334] CHIP:DMG:         isFabricFiltered = true,
-          [1659966974.431979][3334:3334] CHIP:DMG:         InteractionModelRevision = 1
-          [1659966974.432014][3334:3334] CHIP:DMG: },
-          [1659966974.432116][3334:3334] CHIP:DMG: IM RH moving to [GeneratingReports]
-          [1659966974.432230][3334:3334] CHIP:DMG: Building Reports for ReadHandler with LastReportGeneration = 0 DirtyGeneration = 0
-          [1659966974.432272][3334:3334] CHIP:DMG: <RE:Run> Cluster 28, Attribute 11 is dirty
-          [1659966974.432304][3334:3334] CHIP:DMG: Reading attribute: Cluster=0x0000_0028 Endpoint=0 AttributeId=0x0000_0011 (expanded=0)
-          [1659966974.432345][3334:3334] CHIP:DMG: AccessControl: checking f=1 a=c s=0x000000000001B669 t= c=0x0000_0028 e=0 p=v
-          [1659966974.432391][3334:3334] CHIP:DMG: AccessControl: allowed
+          [1662483432.994416][6721:6721] CHIP:IM: Received Read request
+          [1662483432.994498][6721:6721] CHIP:DMG: ReadRequestMessage =
+          [1662483432.994524][6721:6721] CHIP:DMG: {
+          [1662483432.994546][6721:6721] CHIP:DMG:         AttributePathIBs =
+          [1662483432.994572][6721:6721] CHIP:DMG:         [
+          [1662483432.994596][6721:6721] CHIP:DMG:                 AttributePathIB =
+          [1662483432.994623][6721:6721] CHIP:DMG:                 {
+          [1662483432.994651][6721:6721] CHIP:DMG:                         Endpoint = 0x3,
+          [1662483432.994684][6721:6721] CHIP:DMG:                         Cluster = 0x39,
+          [1662483432.994714][6721:6721] CHIP:DMG:                         Attribute = 0x0000_0011,
+          [1662483432.994742][6721:6721] CHIP:DMG:                 }
+          [1662483432.994770][6721:6721] CHIP:DMG:
+          [1662483432.994795][6721:6721] CHIP:DMG:         ],
+          [1662483432.994823][6721:6721] CHIP:DMG:
+          [1662483432.994849][6721:6721] CHIP:DMG:         isFabricFiltered = true,
+          [1662483432.994873][6721:6721] CHIP:DMG:         InteractionModelRevision = 1
+          [1662483432.994896][6721:6721] CHIP:DMG: },
+          [1662483432.994968][6721:6721] CHIP:DMG: IM RH moving to [GeneratingReports]
+          [1662483432.995051][6721:6721] CHIP:DMG: Building Reports for ReadHandler with LastReportGeneration = 0 DirtyGeneration = 0
+          [1662483432.995079][6721:6721] CHIP:DMG: <RE:Run> Cluster 39, Attribute 11 is dirty
       disabled: true
 
     - label: "DUT reads UniqueID from the TH"
@@ -557,27 +467,23 @@
           Optional Attribute - If it is supported, then in TH(bridge-app) log it will results in displaying the ReportDataMessage , else it will display UNSUPPORTED_ATTRIBUTE
 
           Example Log:
-          [1659967013.796500][3334:3334] CHIP:IM: Received Read request
-          [1659967013.796577][3334:3334] CHIP:DMG: ReadRequestMessage =
-          [1659967013.796604][3334:3334] CHIP:DMG: {
-          [1659967013.796625][3334:3334] CHIP:DMG:         AttributePathIBs =
-          [1659967013.796651][3334:3334] CHIP:DMG:         [
-          [1659967013.796675][3334:3334] CHIP:DMG:                 AttributePathIB =
-          [1659967013.796702][3334:3334] CHIP:DMG:                 {
-          [1659967013.796730][3334:3334] CHIP:DMG:                         Endpoint = 0x0,
-          [1659967013.796821][3334:3334] CHIP:DMG:                         Cluster = 0x28,
-          [1659967013.796854][3334:3334] CHIP:DMG:                         Attribute = 0x0000_0012,
-          [1659967013.796883][3334:3334] CHIP:DMG:                 }
-          [1659967013.796911][3334:3334] CHIP:DMG:
-          [1659967013.796935][3334:3334] CHIP:DMG:         ],
-          [1659967013.796963][3334:3334] CHIP:DMG:
-          [1659967013.796989][3334:3334] CHIP:DMG:         isFabricFiltered = true,
-          [1659967013.797014][3334:3334] CHIP:DMG:         InteractionModelRevision = 1
-          [1659967013.797074][3334:3334] CHIP:DMG: },
-          [1659967013.797147][3334:3334] CHIP:DMG: IM RH moving to [GeneratingReports]
-          [1659967013.797234][3334:3334] CHIP:DMG: Building Reports for ReadHandler with LastReportGeneration = 0 DirtyGeneration = 0
-          [1659967013.797263][3334:3334] CHIP:DMG: <RE:Run> Cluster 28, Attribute 12 is dirty
-          [1659967013.797285][3334:3334] CHIP:DMG: Reading attribute: Cluster=0x0000_0028 Endpoint=0 AttributeId=0x0000_0012 (expanded=0)
-          [1659967013.797315][3334:3334] CHIP:DMG: AccessControl: checking f=1 a=c s=0x000000000001B669 t= c=0x0000_0028 e=0 p=v
-          [1659967013.797348][3334:3334] CHIP:DMG: AccessControl: allowed
+          [1662483460.016076][6721:6721] CHIP:IM: Received Read request
+          [1662483460.016164][6721:6721] CHIP:DMG: ReadRequestMessage =
+          [1662483460.016192][6721:6721] CHIP:DMG: {
+          [1662483460.016214][6721:6721] CHIP:DMG:         AttributePathIBs =
+          [1662483460.016240][6721:6721] CHIP:DMG:         [
+          [1662483460.016264][6721:6721] CHIP:DMG:                 AttributePathIB =
+          [1662483460.016298][6721:6721] CHIP:DMG:                 {
+          [1662483460.016335][6721:6721] CHIP:DMG:                         Endpoint = 0x3,
+          [1662483460.016368][6721:6721] CHIP:DMG:                         Cluster = 0x39,
+          [1662483460.016399][6721:6721] CHIP:DMG:                         Attribute = 0x0000_0012,
+          [1662483460.016429][6721:6721] CHIP:DMG:                 }
+          [1662483460.016457][6721:6721] CHIP:DMG:
+          [1662483460.016482][6721:6721] CHIP:DMG:         ],
+          [1662483460.016510][6721:6721] CHIP:DMG:
+          [1662483460.016536][6721:6721] CHIP:DMG:         isFabricFiltered = true,
+          [1662483460.016561][6721:6721] CHIP:DMG:         InteractionModelRevision = 1
+          [1662483460.016584][6721:6721] CHIP:DMG: },
+          [1662483460.016656][6721:6721] CHIP:DMG: IM RH moving to [GeneratingReports]
+          [1662483460.016752][6721:6721] CHIP:DMG: Building Reports for ReadHandler with LastReportGenera
       disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_BR_1.yaml b/src/app/tests/suites/certification/Test_TC_BR_1.yaml
index 01cb2ed..a48b1f6 100644
--- a/src/app/tests/suites/certification/Test_TC_BR_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_BR_1.yaml
@@ -24,6 +24,14 @@
     endpoint: 0
 
 tests:
+    - label: "Precondition"
+      verification: |
+          1. DUT (bridge) has been commissioned to TH
+
+          2. Two or more bridged devices of a supported type connected via non-Matter network/protocol to DUT (bridge).
+          If the bridge supports both actuator and sensor/switch devices, use at least one of each type
+      disabled: true
+
     - label:
           "Read attribute DeviceTypeList of the Descriptor cluster on endpoint 0"
       PICS: MCORE.BRIDGE
@@ -257,6 +265,16 @@
       disabled: true
 
     - label:
+          "IF 0 endpoints found in step 1c, FAIL the test (no Aggregator device
+          type found) ELSE Execute test steps 2a..7d for each of the endpoints
+          found in step 1c (i.e. for each of the Aggregator device types)"
+      verification: |
+          From Step1c,  list all the endpoints having the aggregator i.e., 0x000e=14
+
+          Then in this case Endpoint is 1
+      disabled: true
+
+    - label:
           "Read attribute PartsList of the Descriptor cluster on endpoint found
           in step 1c"
       PICS: MCORE.BRIDGE
@@ -480,7 +498,7 @@
 
           ./chip-tool bridgeddevicebasic read node-label 1 4
 
-          Verify Verify Node-label is read sucessfully in TH(chip-tool) Log
+          Verify Node-label is read sucessfully in TH(chip-tool) Log
 
           [1657003598.573764][4552:4557] CHIP:TOO: Endpoint: 4 Cluster: 0x0000_0039 Attribute 0x0000_0005 DataVersion: 3722118563
           [1657003598.573811][4552:4557] CHIP:TOO:   NodeLabel: Switch 1
@@ -646,7 +664,7 @@
           which is an actuator (e.g. light, window covering)"
       PICS: MCORE.BRIDGE
       verification: |
-          From Step 5 output , choose one of the device type and identfy the device from the device librray.
+          From Step 5 output , choose one of the device type and identify the device from the device library.
           For Ex: on-off cluster has been taken as example to run tfurther steps
       disabled: true
 
@@ -716,10 +734,10 @@
     - label:
           "From the list acquired in step 5, choose one of the bridged devices
           which is a sensor (e.g. occupancy sensor, contact sensor, temperature
-          sensor)"
+          sensor)or switch"
       PICS: MCORE.BRIDGE
       verification: |
-          From Step 5 output , choose one of the sensor device type and identfy the device from the device librray.
+          From Step 5 output , choose one of the sensor device type and identify the device from the device library
           For Ex:  temperature sensor, being added to bridge-app as example to run further steps
       disabled: true
 
diff --git a/src/app/tests/suites/certification/Test_TC_CADMIN_1_17.yaml b/src/app/tests/suites/certification/Test_TC_CADMIN_1_17.yaml
index c62bac9..7e3f09d 100644
--- a/src/app/tests/suites/certification/Test_TC_CADMIN_1_17.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CADMIN_1_17.yaml
@@ -112,7 +112,7 @@
       verification: |
           On DUT_CR1  using chip tool, read fabrics list
 
-            Below are the example command for using single RPI as multiple controller. Vendor should have the provision to use the equivalent command in their DUT or use multiple commissioners/controllers
+            Below are the example command for using single RPI as multiplecontrollers. Vendor should have the provision to use the equivalent command in their DUT or use multiple commissioners/controllers
 
           Verify TH_CE receives and processes the command successfully on TH_CE (all-clusters-app) log
 
@@ -219,15 +219,16 @@
 
           ./chip-tool operationalcredentials remove-fabric 2 1 0  --commissioner-name beta
 
-          Verify TH_CE responses with NOCResponse with a StatusCode OK on TH_CE (all-clusters-app) log
+          Verify TH_CE responses with "RemoveFabric successful" and "Expiring all sessions for fabric 0x2" on TH_CE (all-clusters-app) log
 
-          CHIP:DMG: Received Command Response Data, Endpoint=0 Cluster=0x0000_003E Command=0x0000_0008
-          CHIP:TOO: Endpoint: 0 Cluster: 0x0000_003E Command 0x0000_0008
-          CHIP:TOO:   NOCResponse: {
-          CHIP:TOO:     statusCode: 0
-          CHIP:TOO:     fabricIndex: 2
-          CHIP:TOO:    }
-          CHIP:DMG: ICR moving to [AwaitingDe]
+
+          [1663307444.729967][1746:1746] CHIP:DIS: mDNS service published: _matter._tcp
+          [1663307444.730031][1746:1746] CHIP:ZCL: OpCreds: RemoveFabric successful
+          [1663307444.730110][1746:1746] CHIP:DMG: Command handler moving to [ Preparing]
+          [1663307444.730183][1746:1746] CHIP:DMG: Command handler moving to [AddingComm]
+          [1663307444.730277][1746:1746] CHIP:DMG: Command handler moving to [AddedComma]
+          [1663307444.730346][1746:1746] CHIP:IN: Expiring all sessions for fabric 0x2!!
+          [1663307444.730426][1746:1746] CHIP:IN: SecureSession[0xaaaae0b82e10]: MarkForEviction Type:2 LSID:23764
       disabled: true
 
     - label:
diff --git a/src/app/tests/suites/certification/Test_TC_CADMIN_1_18.yaml b/src/app/tests/suites/certification/Test_TC_CADMIN_1_18.yaml
index d6ed7f4..5189b69 100644
--- a/src/app/tests/suites/certification/Test_TC_CADMIN_1_18.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CADMIN_1_18.yaml
@@ -224,17 +224,17 @@
 
             Below are the example command for using single RPI as multiple controller. Vendor should have the provision to use the equivalent command in their DUT or use multiple commissioners/controllers
 
-          Verify TH_CE responses with NOCResponse with a StatusCode OK on TH_CE (all-clusters-app) log
+          Verify TH_CE responses with "RemoveFabric successful" and "Expiring all sessions for fabric 0x2" on TH_CE (all-clusters-app) log
 
           ./chip-tool operationalcredentials remove-fabric 2 1 0
 
-          CHIP:DMG: Received Command Response Data, Endpoint=0 Cluster=0x0000_003E Command=0x0000_0008
-          CHIP:TOO: Endpoint: 0 Cluster: 0x0000_003E Command 0x0000_0008
-          CHIP:TOO:   NOCResponse: {
-          CHIP:TOO:     statusCode: 0
-          CHIP:TOO:     fabricIndex: 2
-          CHIP:TOO:    }
-          CHIP:DMG: ICR moving to [AwaitingDe]
+          [1663307444.729967][1746:1746] CHIP:DIS: mDNS service published: _matter._tcp
+          [1663307444.730031][1746:1746] CHIP:ZCL: OpCreds: RemoveFabric successful
+          [1663307444.730110][1746:1746] CHIP:DMG: Command handler moving to [ Preparing]
+          [1663307444.730183][1746:1746] CHIP:DMG: Command handler moving to [AddingComm]
+          [1663307444.730277][1746:1746] CHIP:DMG: Command handler moving to [AddedComma]
+          [1663307444.730346][1746:1746] CHIP:IN: Expiring all sessions for fabric 0x2!!
+          [1663307444.730426][1746:1746] CHIP:IN: SecureSession[0xaaaae0b82e10]: MarkForEviction Type:2 LSID:23764
       disabled: true
 
     - label:
@@ -250,15 +250,19 @@
 
           ./chip-tool basic write node-label te5new 2 0 --commissioner-name beta
 
-           Received error (protocol code 2) during pairing process. ../../third_party/connectedhomeip/src/protocols/secure_channel/CASESession.cpp:1551: CHIP Error 0x00000054: Invalid CASE parameter
-          [1651819620.929567][4359:4364] CHIP:CTL: OperationalDeviceProxy[B8070CD13C99D367:0000000000000002]: State change 3 --> 2
-          [1651819620.929700][4359:4364] CHIP:-: ../../third_party/connectedhomeip/src/protocols/secure_channel/CASESession.cpp:1551: CHIP Error 0x00000054: Invalid CASE parameter at ../../commands/clusters/ModelCommand.cpp:53
+          [1663571657.500021][3463:3463] CHIP:DL: NVS set: chip-counters/total-operational-hours = 0 (0x0)
+          [1663571657.500077][3463:3463] CHIP:DL: Inet Layer shutdown
+          [1663571657.500123][3463:3463] CHIP:DL: BLE shutdown
+          [1663571657.500168][3463:3463] CHIP:DL: System Layer shutdown
+          [1663571657.500383][3463:3463] CHIP:TOO: Run command failure: ../../examples/chip-tool/commands/common/CHIPCommand.cpp:454: CHIP Error 0x00000032: Timeout
 
           ./chip-tool basic read node-label 2 0 --commissioner-name beta
 
-           Received error (protocol code 2) during pairing process. ../../third_party/connectedhomeip/src/protocols/secure_channel/CASESession.cpp:1551: CHIP Error 0x00000054: Invalid CASE parameter
-          [1651819620.929567][4359:4364] CHIP:CTL: OperationalDeviceProxy[B8070CD13C99D367:0000000000000002]: State change 3 --> 2
-          [1651819620.929700][4359:4364] CHIP:-: ../../third_party/connectedhomeip/src/protocols/secure_channel/CASESession.cpp:1551: CHIP Error 0x00000054: Invalid CASE parameter at ../../commands/clusters/ModelCommand.cpp:53
+          [1663571960.877702][3488:3488] CHIP:DL: NVS set: chip-counters/total-operational-hours = 0 (0x0)
+          [1663571960.877766][3488:3488] CHIP:DL: Inet Layer shutdown
+          [1663571960.877820][3488:3488] CHIP:DL: BLE shutdown
+          [1663571960.877873][3488:3488] CHIP:DL: System Layer shutdown
+          [1663571960.878116][3488:3488] CHIP:TOO: Run command failure: ../../src/lib/address_resolve/AddressResolve_DefaultImpl.cpp:174: CHIP Error 0x00000032: Timeout
       disabled: true
 
     - label: "DUT_CR1 sends command to TH_CE to read the list of Fabrics"
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 f057ea5..78d0cdc 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,9 +98,11 @@
 
           Verify the below message in the TH_CR2(chip-tool) Log:
 
-          CHIP:SC: PASESession timed out while waiting for a response from the peer. Expected message type was 33
-          CHIP:TOO: Secure Pairing Failed
-          CHIP:TOO: Pairing Failure: ../../third_party/connectedhomeip/src/protocols/secure_channel/PASESession.cpp:324: CHIP Error 0x00000032: Timeout
+          [1663841939.843550][13897:13897] CHIP:DL: NVS set: chip-counters/total-operational-hours = 0 (0x0)
+          [1663841939.843617][13897:13897] CHIP:DL: Inet Layer shutdown
+          [1663841939.843673][13897:13897] CHIP:DL: BLE shutdown
+          [1663841939.843727][13897:13897] CHIP:DL: System Layer shutdown
+          [1663841939.844009][13897:13897] CHIP:TOO: Run command failure: ../../examples/chip-tool/commands/pairing/PairingCommand.cpp:151: CHIP Error 0x00000003: Incorrect state
       disabled: true
 
     - label:
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 f6e9305..88151ea 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
@@ -97,9 +97,11 @@
 
           Verify the below message in the TH_CR2(chip-tool) Log:
 
-          CHIP:SC: PASESession timed out while waiting for a response from the peer. Expected message type was 33
-          CHIP:TOO: Secure Pairing Failed
-          CHIP:TOO: Pairing Failure: ../../third_party/connectedhomeip/src/protocols/secure_channel/PASESession.cpp:324: CHIP Error 0x00000032: Timeout
+          [1663842366.887733][13938:13938] CHIP:DL: NVS set: chip-counters/total-operational-hours = 0 (0x0)
+          [1663842366.887797][13938:13938] CHIP:DL: Inet Layer shutdown
+          [1663842366.887851][13938:13938] CHIP:DL: BLE shutdown
+          [1663842366.887905][13938:13938] CHIP:DL: System Layer shutdown
+          [1663842366.888154][13938:13938] CHIP:TOO: Run command failure: ../../examples/chip-tool/commands/common/CHIPCommand.cpp:454: CHIP Error 0x00000032: Timeout
       disabled: true
 
     - label:
diff --git a/src/app/tests/suites/certification/Test_TC_DRLK_2_10.yaml b/src/app/tests/suites/certification/Test_TC_DRLK_2_10.yaml
index 28bdf63..ce52697 100644
--- a/src/app/tests/suites/certification/Test_TC_DRLK_2_10.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DRLK_2_10.yaml
@@ -30,7 +30,7 @@
           NOTE: https://github.com/project-chip/connectedhomeip/tree/master/examples/lock-app/linux#readme
           Events to be executed as following
           1. Compile app using below command in connectedhomeip folder
-          a. ./scripts/run_in_build_env.sh ./scripts/build/build_examples.py --target linux-arm64-all-clusters-no-ble-asan-clang build
+          a. ./scripts/run_in_build_env.sh "./scripts/build/build_examples.py --target linux-arm64-all-clusters-no-ble-asan-clang build"
           2. Build respective app (lock-app)
           3. Commission DUT to TH
           4. Open 2nd terminal of DUT and provide the below command to obtain PID of DUT
diff --git a/src/app/tests/suites/certification/Test_TC_IDM_2_1.yaml b/src/app/tests/suites/certification/Test_TC_IDM_2_1.yaml
index 1fe257a..56abae9 100644
--- a/src/app/tests/suites/certification/Test_TC_IDM_2_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_IDM_2_1.yaml
@@ -870,15 +870,9 @@
 
           ./chip-tool any read-by-id 0xFFFFFFFF 0xFFFFFFFF 1 0xFFFF
 
-          The message flow  can expect as mentioned below
-             TH(all-clusters-app) -> DUT(chip-tool) ReadRequest
-              DUT(chip-tool) -> TH(all-clusters-app) ReportData, not last chunk
-              TH (all-clusters-app)-> DUT(chip-tool) StatusResponse
-              Possibly DUT and TH repeat  itself steps 2 & 3 a few times
-              DUT(chip-tool) -> TH(all-clusters-app) ReportData, last chunk, SuppressResponse set to true
-              TH(all-clusters-app) -> DUT(chip-tool) standalone ack
 
-          From TH(all-clusters-app) will send read request to DUT(chip-tool), Then DUT(chip-tool) will send the report data message for the request which sent from TH(All-clusters-app), this report message keep on generating  the report data until it reaches the last chuck message and for last chunk message DUT(chip-tool) will not get status response message
+          From TH(all-clusters-app) will send read request to DUT(chip-tool), Then DUT(chip-tool) will send the report data message for the request which sent from TH(All-clusters-app), this report message keep on generating  the report data until it reaches the last chuck message and for last chunk message TH(all-clusters-app) will not receive any status response.
+
           [1663148506.794519][39604:39604] CHIP:EM: Removed CHIP MessageCounter:119127068 from RetransTable on exchange 23857r
           [1663148506.794525][39604:39604] CHIP:DMG: StatusResponseMessage =
           [1663148506.794527][39604:39604] CHIP:DMG: {
diff --git a/src/app/tests/suites/certification/Test_TC_IDM_2_2.yaml b/src/app/tests/suites/certification/Test_TC_IDM_2_2.yaml
index c968217..f5aeaee 100644
--- a/src/app/tests/suites/certification/Test_TC_IDM_2_2.yaml
+++ b/src/app/tests/suites/certification/Test_TC_IDM_2_2.yaml
@@ -419,7 +419,7 @@
       verification: |
           DUT implementation required to verify read an attribute of data type Float
 
-          If the Vendor DUT doesn"t implement/supported this attribute, Please mark the test step as "Not Applicable"
+          If the Vendor DUT doesn"t implement/supported this attribute, Please mark the test step as "\Not Applicable\"
       disabled: true
 
     - label:
@@ -581,7 +581,7 @@
           which is not readable. DUT responds with the report data action."
       verification: |
           DUT implementation required to verify read an attribute which is not having a read access
-          If the Vendor DUT doesn"t implement/supported this attribute, Please mark the test step as "Not Applicable"
+          If the Vendor DUT doesn"t implement/supported this attribute, Please mark the test step as "\Not Applicable\"
       disabled: true
 
     - label:
@@ -654,7 +654,7 @@
 
           With the above command, we are overwriting the default privilege that chip-tool has as an admin. After this test step you need to  send below mentioned command to Grant access to all clusters again.
 
-          ./chip-tool accesscontrol write acl '[{"fabricIndex": 1, "privilege": 5, "authMode":2, "subjects":[112233], "targets":null}]' 1 0
+          ./chip-tool accesscontrol write acl "[{"fabricIndex": 1, "privilege": 5, "authMode":2, "subjects":[112233], "targets":null}]" 1 0
       disabled: true
 
     - label:
@@ -721,9 +721,11 @@
           [1653633746.448576][9791:9796] CHIP:TOO:   identify time: 0
           [1653633746.448656][9791:9796] CHIP:EM: Sending Standalone Ack for MessageCounter:16255130 on exchange 13134i
 
-          Verify on TH(chip-tool) that DUT should not send a report data action with the attribute value to the TH
+           TH sends a  below mentioned second read request to the same cluster with the DataVersionFilter Field set with the dataversion value received before.
 
           sudo ./chip-tool identify read identify-time 1 1 --data-version 0xd7cb76c6
+          Verify on TH(chip-tool) that DUT should not send a report data action with the attribute value to the TH
+
           [1653633771.729259][9806:9811] CHIP:DMG: ReportDataMessage =
           [1653633771.729282][9806:9811] CHIP:DMG: {
           [1653633771.729305][9806:9811] CHIP:DMG:         SuppressResponse = true,
@@ -787,7 +789,7 @@
           [1653633154.992480][9645:9650] CHIP:DMG:                         },
           [1653633154.992499][9645:9650] CHIP:DMG:
 
-
+           TH sends a below mentioned  second read request to read an attribute from the same cluster with the DataVersionFilter Field set with the dataversion value received before, and verify that DUT should send a report data action with the attribute value to the TH.
            sudo ./chip-tool identify read identify-time 1 1 --data-version 0xd7cb76c3
 
           [1653633215.246620][9664:9669] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0003 Attribute 0x0000_0000 DataVersion: 3620435654
@@ -863,6 +865,8 @@
           [1653634024.367404][9851:9856] CHIP:DMG: }
           [1653634024.367443][9851:9856] CHIP:DMG: WriteClient moving to [AwaitingDe]
 
+           TH sends a second read request to read all the attributes from the same cluster with the DataVersionFilter Field set with the dataversion value received before and verify that
+          DUT should send a report data action with all the attribute values to the TH.
 
           sudo ./chip-tool any read-by-id 0x03 0xFFFFFFFF  1 1 --data-version 0xd7cb76c6
 
@@ -911,6 +915,9 @@
           [1653634213.984086][9909:9914] CHIP:TOO:   identify time: 0
           [1653634213.984156][9909:9914] CHIP:EM: Sending Standalone Ack for MessageCounter:1385351 on exchange 48030i
 
+
+           TH sends a below mentioned  read request to the same cluster to read any attribute with the right DataVersion(received in the previous step) and also an older DataVersion.
+           The Read Request Message should have 2 DataVersionIB filters and verify that DUT should send a report data action with the attribute value to the TH.
           sudo ./chip-tool identify read identify-type 1 1 --data-version  0xd7cb76cc,0xd7cb76c9
 
           [1653634371.474553][9936:9941] CHIP:DMG: ReportDataMessage =
@@ -1037,7 +1044,7 @@
       PICS: MCORE.IDM.S.LargeData
       verification: |
           DUT implementation required to verify read an attribute which is is larger than 1 MTU(1280 bytes)
-          If the Vendor DUT doesn"t implement/supported this attribute, Please mark the test step as "Not Applicable"
+          If the Vendor DUT doesn"t implement/supported this attribute, Please mark the test step as "\Not Applicable\"
       disabled: true
 
     - label:
@@ -1094,7 +1101,7 @@
           To Setup the TH(chip-tool) such that it should not have the privilege for the cluster in the path. , 1st we need to send below mentioned ACL command
           Here by sending below mentioned ACL command giving only access for ACL cluster(31), So except ACL cluster command if try to send any other command will get status as unsupported access
 
-          ./chip-tool accesscontrol write acl '[{"fabricIndex": 1, "privilege": 5, "authMode": 2, "subjects":[1,112233], "targets": [{ "cluster":31, "endpoint":0, "deviceType":null }]}]' 1 0
+          ./chip-tool accesscontrol write acl "[{"fabricIndex": 1, "privilege": 5, "authMode": 2, "subjects":[1,112233], "targets": [{ "cluster":31, "endpoint":0, "deviceType":null }]}]" 1 0
           [1659419722.669629][1915:1920] CHIP:DMG: WriteResponseMessage =
           [1659419722.669657][1915:1920] CHIP:DMG: {
           [1659419722.669687][1915:1920] CHIP:DMG:         AttributeStatusIBs =
@@ -1193,7 +1200,7 @@
 
           With the above command, we are overwriting the default privilege that chip-tool has as an admin. After this test step you need to  send below mentioned command to Grant access to all clusters again.
 
-          ./chip-tool accesscontrol write acl '[{"fabricIndex": 1, "privilege": 5, "authMode":2, "subjects":[112233], "targets":null}]' 1 0
+          ./chip-tool accesscontrol write acl "[{"fabricIndex": 1, "privilege": 5, "authMode":2, "subjects":[112233], "targets":null}]" 1 0
       disabled: true
 
     - label:
diff --git a/src/app/tests/suites/certification/Test_TC_IDM_3_2.yaml b/src/app/tests/suites/certification/Test_TC_IDM_3_2.yaml
index 2e999ee..b3e9be2 100644
--- a/src/app/tests/suites/certification/Test_TC_IDM_3_2.yaml
+++ b/src/app/tests/suites/certification/Test_TC_IDM_3_2.yaml
@@ -219,7 +219,7 @@
       verification: |
           DUT implementation required to verify write an attribute of data type signed integer.
 
-          If the Vendor DUT doesn"t implement/supported this attribute, Please mark the test step as "Not Applicable"
+          If the Vendor DUT doesn"t implement/supported this attribute, Please mark the test step as "\Not Applicable\"
       disabled: true
 
     - label:
@@ -229,7 +229,7 @@
       verification: |
           DUT implementation required to verify write an attribute of data type float
 
-          If the Vendor DUT doesn"t implement/supported this attribute, Please mark the test step as "Not Applicable"
+          If the Vendor DUT doesn"t implement/supported this attribute, Please mark the test step as "\Not Applicable\"
       disabled: true
 
     - label:
@@ -239,7 +239,7 @@
       verification: |
           DUT implementation required to verify write an attribute of data type Octet String
 
-          If the Vendor DUT doesn"t implement/supported this attribute, Please mark the test step as "Not Applicable"
+          If the Vendor DUT doesn"t implement/supported this attribute, Please mark the test step as "\Not Applicable\"
       disabled: true
 
     - label:
@@ -249,7 +249,7 @@
       verification: |
           DUT implementation required to verify write an attribute ofdata type Struct
 
-          If the Vendor DUT doesn"t implement/supported this attribute, Please mark the test step as "Not Applicable"
+          If the Vendor DUT doesn"t implement/supported this attribute, Please mark the test step as "\Not Applicable\"
       disabled: true
 
     - label:
@@ -259,7 +259,7 @@
       verification: |
           DUT implementation required to verify write an attribute of  data type List
 
-          If the Vendor DUT doesn"t implement/supported this attribute, Please mark the test step as "Not Applicable"
+          If the Vendor DUT doesn"t implement/supported this attribute, Please mark the test step as "\Not Applicable\"
       disabled: true
 
     - label:
@@ -732,7 +732,7 @@
           [1653028897.526687][6605:6611] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0008 Attribute 0x0000_0011 DataVersion: 3301562286
           [1653028897.526763][6605:6611] CHIP:TOO: on level: 2
 
-
+           TH sends below mentioned WriteRequestMessage to the DUT to modify the value of one attribute with the DataVersion field set to the one received in the prior step.
           ./chip-tool levelcontrol write on-level 3 1 1 --data-version 0xc4c9d7ae
 
            On TH, verify that DUT sends a Write Response message with a success
@@ -803,7 +803,7 @@
           [1653029055.885209][6643:6648] CHIP:DMG: },
           [1653029055.885219][6643:6648] CHIP:DMG:
 
-
+          TH sends below mentioned  second WriteRequestMessage to the DUT to modify the value of an attribute with the dataversion field set to the value received earlier.
            ./chip-tool levelcontrol write on-level 4 1 1 --data-version 0xc4c9d7af
            on TH, verify that  DUT responds as DATA_VERSION_MISMATCH for the second Write request.
 
@@ -842,5 +842,5 @@
       verification: |
           DUT implementation required to verify write an attribute which need NEEDS_TIMED_INTERACTION.
 
-          If the Vendor DUT doesn"t implement/supported this attribute, Please mark the test step as "Not Applicable"
+          If the Vendor DUT doesn"t implement/supported this attribute, Please mark the test step as "\Not Applicable\"
       disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_IDM_4_3.yaml b/src/app/tests/suites/certification/Test_TC_IDM_4_3.yaml
index 4a10b80..a12cdf8 100644
--- a/src/app/tests/suites/certification/Test_TC_IDM_4_3.yaml
+++ b/src/app/tests/suites/certification/Test_TC_IDM_4_3.yaml
@@ -461,7 +461,7 @@
           Subscribe to an attribute of type signed integer to the Harness
 
 
-          If the Vendor DUT doesn"t implement/supported this attribute, Please mark the test step as "Not Applicable"
+          If the Vendor DUT doesn"t implement/supported this attribute, Please mark the test step as "\Not Applicable\"
       disabled: true
 
     - label:
@@ -475,7 +475,7 @@
           Subscribe to an attribute of type floating point to the Harness
 
 
-          If the Vendor DUT doesn"t implement/supported this attribute, Please mark the test step as "Not Applicable"
+          If the Vendor DUT doesn"t implement/supported this attribute, Please mark the test step as "\Not Applicable\"
       disabled: true
 
     - label:
@@ -502,7 +502,6 @@
           here is an example command the TH can write an attribute in the userlabel cluster in the DUT to change the value that the TH subscribed in the above command.
            userlabel write label-list '[{"label":"room", "value":"bedroom 1"}, {"label":"orientation", "value":"east"}]' 1 0
 
-          ./chip-tool userlabel subscribe label-list 100 500 1 0
           [1655896422.936972][1899:1904] CHIP:DMG: }
           [1655896422.937347][1899:1904] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0041 Attribute 0x0000_0000 DataVersion: 3773922728
           [1655896422.937478][1899:1904] CHIP:TOO:   label list: 2 entries
@@ -727,40 +726,49 @@
 
 
           onoff subscribe on-time 100 1000 1 1
-          On TH(chip-tool) Verify that the DUT sends a Report Data action and  There are no attribute value changes before MaxInterval elapses.
-          [1657453718.436970][11635:11640] CHIP:DMG: ReportDataMessage =
-          [1657453718.437043][11635:11640] CHIP:DMG: {
-          [1657453718.437108][11635:11640] CHIP:DMG:      SubscriptionId = 0xce00f651,
-          [1657453718.437174][11635:11640] CHIP:DMG:      AttributeReportIBs =
-          [1657453718.437253][11635:11640] CHIP:DMG:      [
-          [1657453718.437315][11635:11640] CHIP:DMG:              AttributeReportIB =
-          [1657453718.437403][11635:11640] CHIP:DMG:              {
-          [1657453718.437473][11635:11640] CHIP:DMG:                      AttributeDataIB =
-          [1657453718.437550][11635:11640] CHIP:DMG:                      {
-          [1657453718.437632][11635:11640] CHIP:DMG:                              DataVersion = 0x1979c38,
-          [1657453718.437711][11635:11640] CHIP:DMG:                              AttributePathIB =
-          [1657453718.437790][11635:11640] CHIP:DMG:                              {
-          [1657453718.437883][11635:11640] CHIP:DMG:                                      Endpoint = 0x1,
-          [1657453718.437974][11635:11640] CHIP:DMG:                                      Cluster = 0x6,
-          [1657453718.438063][11635:11640] CHIP:DMG:                                      Attribute = 0x0000_4001,
-          [1657453718.438145][11635:11640] CHIP:DMG:                              }
-          [1657453718.438224][11635:11640] CHIP:DMG:
-          [1657453718.438318][11635:11640] CHIP:DMG:                              Data = 0,
-          [1657453718.438393][11635:11640] CHIP:DMG:                      },
-          [1657453718.438483][11635:11640] CHIP:DMG:
-          [1657453718.438551][11635:11640] CHIP:DMG:              },
-          [1657453718.438626][11635:11640] CHIP:DMG:
-          [1657453718.438686][11635:11640] CHIP:DMG:      ],
-          [1657453718.438760][11635:11640] CHIP:DMG:
-          [1657453718.438821][11635:11640] CHIP:DMG:      InteractionModelRevision = 1
-          [1657453718.438884][11635:11640] CHIP:DMG: }
-          [1657453718.439091][11635:11640] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0006 Attribute 0x0000_4001 DataVersion: 26713144
-          [1657453718.439173][11635:11640] CHIP:TOO:   OnTime: 0
-          [1657453718.439260][11635:11640] CHIP:DMG: MoveToState ReadClient[0xffff94005970]: Moving to [AwaitingSu]
-
-          here is an example command the TH can write an attribute in the onoff cluster in the DUT to change the value that the TH subscribed in the above command.
-            onoff write on-time 1  1 1
-          There are no attribute value changes before MaxInterval elapses
+          On TH(chip-tool) Verify that the DUT sends a Report Data action with no data and  There are no attribute value changes before MaxInterval elapses.
+          [1663737332.441587][143123:143128] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0006 Attribute 0x0000_4001 DataVersion: 807738967
+          [1663737332.441608][143123:143128] CHIP:TOO:   OnTime: 0
+          [1663737332.441624][143123:143128] CHIP:DMG: MoveToState ReadClient[0x7f7afc026d10]: Moving to [AwaitingSu]
+          [1663737332.441656][143123:143128] CHIP:EM: <<< [E:57594i M:195529658 (Ack:189815301)] (S) Msg TX to 1:0000000000000001 [730F] --- Type 0001:01 (IM:StatusResponse)
+          [1663737332.441668][143123:143128] CHIP:IN: (S) Sending msg 195529658 on secure session with LSID: 48157
+          [1663737332.442019][143123:143128] CHIP:EM: >>> [E:57594i M:189815302 (Ack:195529658)] (S) Msg RX from 1:0000000000000001 [730F] --- Type 0001:04 (IM:SubscribeResponse)
+          [1663737332.442045][143123:143128] CHIP:EM: Found matching exchange: 57594i, Delegate: 0x7f7afc026d20
+          [1663737332.442062][143123:143128] CHIP:EM: Rxd Ack; Removing MessageCounter:195529658 from Retrans Table on exchange 57594i
+          [1663737332.442076][143123:143128] CHIP:DMG: SubscribeResponse is received
+          [1663737332.442093][143123:143128] CHIP:DMG: SubscribeResponseMessage =
+          [1663737332.442101][143123:143128] CHIP:DMG: {
+          [1663737332.442109][143123:143128] CHIP:DMG:         SubscriptionId = 0xb98ba037,
+          [1663737332.442117][143123:143128] CHIP:DMG:         MaxInterval = 0x64,
+          [1663737332.442124][143123:143128] CHIP:DMG:         InteractionModelRevision = 1
+          [1663737332.442131][143123:143128] CHIP:DMG: }
+          [1663737332.442140][143123:143128] CHIP:DMG: Subscription established with SubscriptionID = 0xb98ba037 MinInterval = 10s MaxInterval = 100s Peer = 01:0000000000000001
+          [1663737332.442152][143123:143128] CHIP:DMG: MoveToState ReadClient[0x7f7afc026d10]: Moving to [Subscripti]
+          [1663737332.442180][143123:143128] CHIP:DMG: Refresh LivenessCheckTime for 125000 milliseconds with SubscriptionId = 0xb98ba037 Peer = 01:0000000000000001
+          [1663737332.442218][143123:143128] CHIP:EM: <<< [E:57594i M:195529659 (Ack:189815302)] (S) Msg TX to 1:0000000000000001 [730F] --- Type 0000:10 (SecureChannel:StandaloneAck)
+          [1663737332.442236][143123:143128] CHIP:IN: (S) Sending msg 195529659 on secure session with LSID: 48157
+          [1663737332.442293][143123:143128] CHIP:EM: Flushed pending ack for MessageCounter:189815302 on exchange 57594i
+          [1663737432.513952][143123:143128] CHIP:EM: >>> [E:46530r M:189815303] (S) Msg RX from 1:0000000000000001 [730F] --- Type 0001:05 (IM:ReportData)
+          [1663737432.513994][143123:143128] CHIP:EM: Handling via exchange: 46530r, Delegate: 0x558ebddc7068
+          [1663737432.514039][143123:143128] CHIP:DMG: ReportDataMessage =
+          [1663737432.514047][143123:143128] CHIP:DMG: {
+          [1663737432.514056][143123:143128] CHIP:DMG:         SubscriptionId = 0xb98ba037,
+          [1663737432.514070][143123:143128] CHIP:DMG:         InteractionModelRevision = 1
+          [1663737432.514077][143123:143128] CHIP:DMG: }
+          [1663737432.514096][143123:143128] CHIP:DMG: Refresh LivenessCheckTime for 125000 milliseconds with SubscriptionId = 0xb98ba037 Peer = 01:0000000000000001
+          [1663737432.514136][143123:143128] CHIP:EM: <<< [E:46530r M:195529660 (Ack:189815303)] (S) Msg TX to 1:0000000000000001 [730F] --- Type 0001:01 (IM:StatusResponse)
+          [1663737432.514151][143123:143128] CHIP:IN: (S) Sending msg 195529660 on secure session with LSID: 48157
+          [1663737432.514638][143123:143128] CHIP:EM: >>> [E:46530r M:189815304 (Ack:195529660)] (S) Msg RX from 1:0000000000000001 [730F] --- Type 0000:10 (SecureChannel:StandaloneAck)
+          [1663737432.514664][143123:143128] CHIP:EM: Found matching exchange: 46530r, Delegate: (nil)
+          [1663737432.514684][143123:143128] CHIP:EM: Rxd Ack; Removing MessageCounter:195529660 from Retrans Table on exchange 46530r
+          [1663737532.580214][143123:143128] CHIP:EM: >>> [E:46531r M:189815305] (S) Msg RX from 1:0000000000000001 [730F] --- Type 0001:05 (IM:ReportData)
+          [1663737532.580260][143123:143128] CHIP:EM: Handling via exchange: 46531r, Delegate: 0x558ebddc7068
+          [1663737532.580304][143123:143128] CHIP:DMG: ReportDataMessage =
+          [1663737532.580317][143123:143128] CHIP:DMG: {
+          [1663737532.580329][143123:143128] CHIP:DMG:         SubscriptionId = 0xb98ba037,
+          [1663737532.580341][143123:143128] CHIP:DMG:         InteractionModelRevision = 1
+          [1663737532.580351][143123:143128] CHIP:DMG: }
+          [1663737532.580380][143123:143128] CHIP:DMG: Refresh LivenessCheckTime for 125000 milliseconds with SubscriptionId = 0xb98ba037 Peer = 01:0000000000000001
       disabled: true
 
     - label:
diff --git a/src/app/tests/suites/certification/Test_TC_IDM_6_2.yaml b/src/app/tests/suites/certification/Test_TC_IDM_6_2.yaml
index e5651a7..53dbe35 100644
--- a/src/app/tests/suites/certification/Test_TC_IDM_6_2.yaml
+++ b/src/app/tests/suites/certification/Test_TC_IDM_6_2.yaml
@@ -858,14 +858,6 @@
       disabled: true
 
     - label:
-          "TH sends Subscribe Request Message to DUT. DUT sends Report Data
-          message to DUT + TH sends Status Response Message with an error
-          Status."
-      verification: |
-          Mark this as not testable /NA. Out of Scope for V1.0
-      disabled: true
-
-    - label:
           "TH sends Subscribe Request Message to DUT with EventRequests set to
           path which indicates a cluster event that is not supported."
       verification: |
@@ -928,7 +920,7 @@
 
 
           With the ACL command in step-2, we are overwriting the default privilege that chip-tool has an admin. After this step-3 you need to send below mentioned command to Grant access to all clusters again.
-          accesscontrol write acl "[{"fabricIndex": 1, "privilege": 5, "authMode":2, "subjects":[112233], "targets":null}]" 1 0
+          accesscontrol write acl '[{"fabricIndex": 1, "privilege": 5, "authMode":2, "subjects":[112233], "targets":null}]' 1 0
       disabled: true
 
     - label:
@@ -942,7 +934,7 @@
 
           To  Setup the TH such that there is no accessing fabric, 1st we need to send below mentioned ACL command
 
-          accesscontrol write acl '[{"fabricIndex": 1, "privilege": 5, "authMode": 2, "subjects": [1234], "targets": null}]' 1 0
+          accesscontrol write acl "[{"fabricIndex": 1, "privilege": 5, "authMode": 2, "subjects": [1234], "targets": null}]" 1 0
 
           any subscribe-event-by-id 0xFFFFFFFF 0xFFFFFFFF 100 1000 1 0xFFFF
 
@@ -1103,70 +1095,6 @@
           [1655979915.866116][4607:4612] CHIP:TOO:     AdminFabricIndex: 1
           [1655979915.866148][4607:4612] CHIP:TOO:    }
           [1655979915.866233][4607:4612] CHIP:DMG: MoveToState ReadClient[0xffffa0005710]: Moving to [AwaitingSu]
-
-          [1655979915.863156][4607:4612] CHIP:DMG: ReportDataMessage =
-          [1655979915.863196][4607:4612] CHIP:DMG: {
-          [1655979915.863232][4607:4612] CHIP:DMG:         SubscriptionId = 0xeb39dedd,
-          [1655979915.863268][4607:4612] CHIP:DMG:         EventReportIBs =
-          [1655979915.863321][4607:4612] CHIP:DMG:         [
-          [1655979915.863357][4607:4612] CHIP:DMG:                 EventReportIB =
-          [1655979915.863412][4607:4612] CHIP:DMG:                 {
-          [1655979915.863450][4607:4612] CHIP:DMG:                         EventDataIB =
-          [1655979915.863496][4607:4612] CHIP:DMG:                         {
-          [1655979915.863538][4607:4612] CHIP:DMG:                                 EventPath =
-          [1655979915.863586][4607:4612] CHIP:DMG:                                 {
-          [1655979915.863636][4607:4612] CHIP:DMG:                                         Endpoint = 0x0,
-          [1655979915.863692][4607:4612] CHIP:DMG:                                         Cluster = 0x1f,
-          [1655979915.863743][4607:4612] CHIP:DMG:                                         Event = 0x0,
-          [1655979915.863790][4607:4612] CHIP:DMG:                                 },
-          [1655979915.863845][4607:4612] CHIP:DMG:
-          [1655979915.863892][4607:4612] CHIP:DMG:                                 EventNumber = 0x1,
-          [1655979915.863942][4607:4612] CHIP:DMG:                                 PriorityLevel = 0x1,
-          [1655979915.863990][4607:4612] CHIP:DMG:                                 SystemTimestamp = 0x4bdb01,
-          [1655979915.864036][4607:4612] CHIP:DMG:                                 EventData =
-          [1655979915.864083][4607:4612] CHIP:DMG:                                 {
-          [1655979915.864149][4607:4612] CHIP:DMG:                                         0x1 = NULL
-          [1655979915.864201][4607:4612] CHIP:DMG:                                         0x2 = 0,
-          [1655979915.864252][4607:4612] CHIP:DMG:                                         0x3 = 1,
-          [1655979915.864300][4607:4612] CHIP:DMG:                                         0x4 =
-          [1655979915.864348][4607:4612] CHIP:DMG:                                         {
-          [1655979915.864399][4607:4612] CHIP:DMG:                                                 0x1 = 5,
-          [1655979915.864454][4607:4612] CHIP:DMG:                                                 0x2 = 2,
-          [1655979915.864505][4607:4612] CHIP:DMG:                                                 0x3 = [
-          [1655979915.864571][4607:4612] CHIP:DMG:                                                                 112233,
-          [1655979915.864631][4607:4612] CHIP:DMG:                                                 ],
-          [1655979915.864685][4607:4612] CHIP:DMG:                                                 0x4 = NULL
-          [1655979915.864738][4607:4612] CHIP:DMG:                                                 0xfe = 1,
-          [1655979915.864791][4607:4612] CHIP:DMG:                                         },
-          [1655979915.864841][4607:4612] CHIP:DMG:                                         0xfe = 1,
-          [1655979915.864889][4607:4612] CHIP:DMG:                                 },
-          [1655979915.864934][4607:4612] CHIP:DMG:                         },
-          [1655979915.864989][4607:4612] CHIP:DMG:
-          [1655979915.865025][4607:4612] CHIP:DMG:                 },
-          [1655979915.865076][4607:4612] CHIP:DMG:
-          [1655979915.865111][4607:4612] CHIP:DMG:         ],
-          [1655979915.865163][4607:4612] CHIP:DMG:
-          [1655979915.865198][4607:4612] CHIP:DMG:         InteractionModelRevision = 1
-          [1655979915.865232][4607:4612] CHIP:DMG: }
-          [1655979915.865462][4607:4612] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_001F Event 0x0000_0000
-          [1655979915.865497][4607:4612] CHIP:TOO:          Event number: 1
-          [1655979915.865530][4607:4612] CHIP:TOO:          Priority: Info
-          [1655979915.865562][4607:4612] CHIP:TOO:          Timestamp: 4971265
-          [1655979915.865683][4607:4612] CHIP:TOO:   AccessControlEntryChanged: {
-          [1655979915.865720][4607:4612] CHIP:TOO:     AdminNodeID: null
-          [1655979915.865767][4607:4612] CHIP:TOO:     AdminPasscodeID: 0
-          [1655979915.865802][4607:4612] CHIP:TOO:     ChangeType: 1
-          [1655979915.865835][4607:4612] CHIP:TOO:     LatestValue: {
-          [1655979915.865867][4607:4612] CHIP:TOO:       Privilege: 5
-          [1655979915.865899][4607:4612] CHIP:TOO:       AuthMode: 2
-          [1655979915.865939][4607:4612] CHIP:TOO:       Subjects: 1 entries
-          [1655979915.865981][4607:4612] CHIP:TOO:         [1]: 112233
-          [1655979915.866018][4607:4612] CHIP:TOO:       Targets: null
-          [1655979915.866052][4607:4612] CHIP:TOO:       FabricIndex: 1
-          [1655979915.866084][4607:4612] CHIP:TOO:      }
-          [1655979915.866116][4607:4612] CHIP:TOO:     AdminFabricIndex: 1
-          [1655979915.866148][4607:4612] CHIP:TOO:    }
-          [1655979915.866233][4607:4612] CHIP:DMG: MoveToState ReadClient[0xffffa0005710]: Moving to [AwaitingSu]
       disabled: true
 
     - label:
@@ -1205,7 +1133,7 @@
 
           Please  run this test in chip tool interactive mode ./chip-tool interactive start
 
-          accesscontrol subscribe-event access-control-entry-changed  20 500 1 0
+          accesscontrol subscribe-event access-control-entry-changed  20 500 1 0    --keepSubscriptions 1
           On TH(chip-tool) verify that each event number
           [1658405014.975407][4236:4241] CHIP:DMG: }
           [1658405014.975582][4236:4241] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_001F Event 0x0000_0000
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 187cbc0..b48bfba 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
@@ -35,39 +35,30 @@
           Use the below commands to provision the DUT with 5 reference devices (Reference device is unique instance of a Chip-tool)
           RD1, RD2, RD3, RD4, RD5 should be on separate, distinct fabrics. in RPI platform
 
-          * For ethernet provisioning in DUT
+          execute the below mentioned command to put DUT into a commissionable state, Pls use equivalent command on the respective DUT
           ./chip-all-clusters-app
 
+          Once DUT reach the  commissionable state pls send below mentioned command on RD"s respectively. Pls use equivalent command on the respective DUT
+
+
           *Provision the device using chip tool on first controller(RD1)
-          *./chip-tool pairing ethernet node-id  setup-pin-code  discriminator  device-remote-ip  device-remote-port(5540)
-          on first controller open a commissioning window using below command (In RD1)
-          ./chip-tool pairing open-commissioning-window 1 1 400 2000 3840 (Save the manualcode for 2nd  Provision)
+           ./chip-tool pairing onnetwork 1 20202021
+          ./chip-tool pairing open-commissioning-window 1 1 400 2000 3840
 
           *Provision the device using chip tool on 2nd  controller(RD2)
-          * ./chip-tool pairing code 2 mannualcode –commissioner name beta
-          on 2nd controller open a commissioning window using below command (In RD2)
-          ./chip-tool pairing open-commissioning-window 2 1 400 2000 3840 ( Save the manualcode for 3rd Provision)
-
+            ./chip-tool pairing code 2 36453420312(mannualcode) --commissioner-name beta
+          ./chip-tool pairing open-commissioning-window 2 1 400 2000 3840 --commissioner-name beta
 
           *Provision the device using chip tool on 3rd  controller(RD3)
-          * ./chip-tool pairing code 3 mannualcode –commissioner name gamma
-          on 3rd controller open a commissioning window using below command (In RD3)
-          ./chip-tool pairing open-commissioning-window 2 1 400 2000 3840 ( Save the manualcode for 4th Provision)
+          ./chip-tool pairing code 3 35603352859(mannualcode) --commissioner-name 4
+          ./chip-tool pairing open-commissioning-window 3 1 400 2000 3840 --commissioner-name 4
 
           *Provision the device using chip tool on 4th  controller(RD4)
-          * ./chip-tool pairing code 4 mannualcode –commissioner name 234
-          on 3rd controller open a commissioning window using below command (In RD4)
-          ./chip-tool pairing open-commissioning-window 2 1 400 2000 3840 ( Save the manualcode for 5th Provision)
+           ./chip-tool pairing code 4 36375333175(mannualcode) --commissioner-name 5
+           ./chip-tool pairing open-commissioning-window 4 1 400 2000 3840 --commissioner-name 5
 
           *Provision the device using chip tool on 5th  controller(RD5)
-          * ./chip-tool pairing code 5 mannualcode –commissioner name 2345
-          on 3rd controller open a commissioning window using below command (In RD5)
-          ./chip-tool pairing open-commissioning-window 2 1 400 2000 3840
-
-
-          Please open 5 terminal windows  to observe the subscription report messages coming from different subscriptions(to different fabrics)
-
-          Please use Interactive mode to Verify subscription test cases. Here the command to enter interactive mode:-- ./chip-tool interactive start
+            ./chip-tool pairing code 5 35358158796(mannualcode) --commissioner-name 6
       disabled: true
 
     - label:
@@ -431,7 +422,7 @@
 
 
 
-           basic subscribe  local-config-disabled 100 1000 5  0  --commissioner-name beta  --keepSubscriptions 1
+           basic subscribe  local-config-disabled 100 1000 5  0  --commissioner-name 6  --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
@@ -775,6 +766,8 @@
           contain 3 different paths. The subscription request from RD1 should
           contain 4 paths."
       verification: |
+          After provisioning again the values are been set to default values such as node label= " ". so in VS mentioned as node-label="", location=XX and local-config-disabled=FALSE but if your going to verify 3 steps contentiously you will get the attribute value as node-label="newlabel", location=in and local-config-disabled=TRUE.
+
           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)
@@ -1074,7 +1067,7 @@
 
 
 
-           basic subscribe  local-config-disabled 100 1000 5  0  --commissioner-name beta  --keepSubscriptions 1
+           basic subscribe  local-config-disabled 100 1000 5  0  --commissioner-name 6  --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
@@ -1096,6 +1089,8 @@
           Requests are activated, RD1 sends 6 subscription request messages with
           each of them having 3 different paths."
       verification: |
+          After provisioning again the values are been set to default values such as node label= " ". so in VS mentioned as node-label="", location=XX and local-config-disabled=FALSE but if your going to verify 3 steps contentiously you will get the attribute value as node-label="newlabel", location=in and local-config-disabled=TRUE.
+
           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)
@@ -1328,7 +1323,7 @@
 
 
 
-           basic subscribe  local-config-disabled 100 1000 5  0  --commissioner-name beta  --keepSubscriptions 1
+           basic subscribe  local-config-disabled 100 1000 5  0  --commissioner-name 6  --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
diff --git a/src/app/tests/suites/certification/Test_TC_SC_5_1.yaml b/src/app/tests/suites/certification/Test_TC_SC_5_1.yaml
index f5822dc..0160403 100644
--- a/src/app/tests/suites/certification/Test_TC_SC_5_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_SC_5_1.yaml
@@ -26,8 +26,6 @@
     - label: "Precondition"
       verification: |
           Group Member is commissioned with Admin
-
-          DUT will set TestGroupEndpoint
       disabled: true
 
     - label: "TH writes ACL entry by setting AuthMode as Group to DUT"
@@ -55,11 +53,7 @@
           "Admin sends KeySetWrite command to GroupKeyManagement cluster to DUT
           on PIXIT.G.ENDPOINT"
       verification: |
-          ./chip-tool groupkeymanagement key-set-write "{"groupKeySetID": 42,
-          "groupKeySecurityPolicy": 0, "epochKey0":
-          "d0d1d2d3d4d5d6d7d8d9dadbdcdddedf", "epochStartTime0": 2220000,"epochKey1":
-          "d1d1d2d3d4d5d6d7d8d9dadbdcdddedf", "epochStartTime1": 2220001,"epochKey2":
-          "d2d1d2d3d4d5d6d7d8d9dadbdcdddedf", "epochStartTime2": 2220002 }" 1 0
+          ./chip-tool groupkeymanagement key-set-write "{"groupKeySetID": 42,"groupKeySecurityPolicy": 0, "epochKey0":"d0d1d2d3d4d5d6d7d8d9dadbdcdddedf", "epochStartTime0": 2220000,"epochKey1":"d1d1d2d3d4d5d6d7d8d9dadbdcdddedf", "epochStartTime1": 2220001,"epochKey2":"d2d1d2d3d4d5d6d7d8d9dadbdcdddedf", "epochStartTime2": 2220002 }" 1 0
 
           Verify success response on the TH Log:
 
@@ -123,8 +117,8 @@
       disabled: true
 
     - label:
-          "Admin sends AddGroup Command to DUT with the GroupID set by Admin on
-          PIXIT.SC.ENDPOINT"
+          "Admin sends AddGroup Command to DUT with the GroupID and GroupName
+          set by Admin on PIXIT.G.ENDPOINT"
       verification: |
           ./chip-tool groups add-group 0x0001 grp1 1 1
 
@@ -139,7 +133,24 @@
 
     - label:
           "Admin sends ViewGroup command with the GroupID to the Group cluster
-          on the DUT on PIXIT.SC.ENDPOINT"
+          on the DUT on PIXIT.G.ENDPOINT"
+      verification: |
+          ./chip-tool groups view-group 0x0001 1 1
+
+          Verify  ViewGroupResponse on the TH Log:
+
+          [1651218576.149152][2635:2640] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0004 Command 0x0000_0001
+          [1651218576.149231][2635:2640] CHIP:TOO:   ViewGroupResponse: {
+          [1651218576.149265][2635:2640] CHIP:TOO:     status: 0
+          [1651218576.149289][2635:2640] CHIP:TOO:     groupId: 1
+          [1651218576.149311][2635:2640] CHIP:TOO:     groupName: grp1
+          [1651218576.149335][2635:2640] CHIP:TOO:    }
+      disabled: true
+
+    - label:
+          "Verify DUT sends a ViewGroupResponse command with the same GroupName
+          created by Admin in step 1b."
+      PICS: G.S.F00
       verification: |
           ./chip-tool groups view-group 0x0001 1 1
 
@@ -203,9 +214,28 @@
           [1655965817.917408][3012:3017] CHIP:TOO:   GroupTable: 1 entries
           [1655965817.917506][3012:3017] CHIP:TOO:     [1]: {
           [1655965817.917559][3012:3017] CHIP:TOO:       GroupId: 1
-          [1655965817.917600][3012:3017] CHIP:TOO:       Endpoints: 2 entries
-          [1655965817.917642][3012:3017] CHIP:TOO:         [1]: 0
-          [1655965817.917680][3012:3017] CHIP:TOO:         [2]: 1
+          [1655965817.917600][3012:3017] CHIP:TOO:       Endpoints: 1 entries
+          [1655965817.917680][3012:3017] CHIP:TOO:         [1]: 1
+          [1655965817.917718][3012:3017] CHIP:TOO:       GroupName: grp1
+          [1655965817.917752][3012:3017] CHIP:TOO:       FabricIndex: 1
+          [1655965817.917784][3012:3017] CHIP:TOO:      }
+      disabled: true
+
+    - label:
+          "Verify each returned GroupInfoMapStruct contains an expected
+          GroupName as generated in step 1b."
+      PICS: G.S.F00
+      verification: |
+          ./chip-tool groupkeymanagement read group-table 1 0
+
+          Verify  GroupTable on the TH Log:
+
+          [1655965817.917300][3012:3017] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_003F Attribute 0x0000_0001 DataVersion: 1208492408
+          [1655965817.917408][3012:3017] CHIP:TOO:   GroupTable: 1 entries
+          [1655965817.917506][3012:3017] CHIP:TOO:     [1]: {
+          [1655965817.917559][3012:3017] CHIP:TOO:       GroupId: 1
+          [1655965817.917600][3012:3017] CHIP:TOO:       Endpoints: 1 entries
+          [1655965817.917680][3012:3017] CHIP:TOO:         [1]: 1
           [1655965817.917718][3012:3017] CHIP:TOO:       GroupName: grp1
           [1655965817.917752][3012:3017] CHIP:TOO:       FabricIndex: 1
           [1655965817.917784][3012:3017] CHIP:TOO:      }
diff --git a/src/app/tests/suites/certification/Test_TC_SC_5_2.yaml b/src/app/tests/suites/certification/Test_TC_SC_5_2.yaml
index a8297b8..b18c883 100644
--- a/src/app/tests/suites/certification/Test_TC_SC_5_2.yaml
+++ b/src/app/tests/suites/certification/Test_TC_SC_5_2.yaml
@@ -37,7 +37,7 @@
 
     - label:
           "TH sends a multicast Identify command with the IdentifyTime set to
-          0x0078 (120s) to DUT with GroupID and PIXIT.SC.ENDPOINT"
+          0x0078 (120s) to DUT with GroupID and PIXIT.G.ENDPOINT"
       PICS: I.S.C00.Rsp
       verification: |
           ./chip-tool identify identify 0x0078 0xffffffffffff0001 1
@@ -50,7 +50,7 @@
 
     - label:
           "TH reads immediately IdentifyTime attribute from DUT on the
-          PIXIT.SC.ENDPOINT set by DUT"
+          PIXIT.G.ENDPOINT set by DUT"
       PICS: I.S.A0000
       verification: |
           ./chip-tool identify read identify-time 1 1
diff --git a/src/app/tests/suites/certification/Test_TC_SC_6_1.yaml b/src/app/tests/suites/certification/Test_TC_SC_6_1.yaml
index 58537af..ef8f913 100644
--- a/src/app/tests/suites/certification/Test_TC_SC_6_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_SC_6_1.yaml
@@ -31,8 +31,20 @@
     - label: "Precondition"
       verification: |
           Group Member is commissioned with Admin
+      disabled: true
 
-          TH will set TestGroupEndpoint
+    - label: "Precondition"
+      verification: |
+          Execute this step before executing the test steps.
+
+          ./chip-tool accesscontrol write acl "[{"fabricIndex": 1, "privilege": 5, "authMode": 2, "subjects": [112233], "targets": null },{"fabricIndex": 1, "privilege": 4, "authMode": 3, "subjects": [1], "targets": null }]" 1 0
+
+          Verify success response on the TH Log:
+
+          [1652330385.328196][3240:3245] CHIP:DMG:                        StatusIB =
+          [1652330385.328229][3240:3245] CHIP:DMG:                        {
+          [1652330385.328264][3240:3245] CHIP:DMG:                                status = 0x00 (SUCCESS),
+          [1652330385.328298][3240:3245] CHIP:DMG:                        },
       disabled: true
 
     - label: "TH should have the ACL entry with the AuthMode as Group by DUT"
@@ -130,7 +142,7 @@
 
     - label:
           "DUT sends KeySetWrite command to GroupKeyManagement cluster to TH on
-          PIXIT.SC.ENDPOINT"
+          PIXIT.G.ENDPOINT"
       PICS: GRPKEY.C.C00.Tx
       verification: |
 
@@ -195,7 +207,7 @@
           [1659350562.022661][5824:5824] CHIP:DMG: AccessControl: allowed
       disabled: true
 
-    - label: "DUT sends AddGroup Command to TH on PIXIT.SC.ENDPOINT"
+    - label: "DUT sends AddGroup Command to TH on PIXIT.G.ENDPOINT"
       PICS: G.C.C00.Tx
       verification: |
           ./chip-tool groups add-group 0x0001 grp1 1 0