diff --git a/src/app/tests/suites/certification/PICS.yaml b/src/app/tests/suites/certification/PICS.yaml
index 5437e5f..861d01f 100644
--- a/src/app/tests/suites/certification/PICS.yaml
+++ b/src/app/tests/suites/certification/PICS.yaml
@@ -506,15 +506,15 @@
     - label:
           "Does the device implement receiving the MoveToColorTemperature
           command?"
-      id: CC.C.C0A.Rsp
+      id: CC.C.C0a.Rsp
 
     - label:
           "Does the device implement receiving the MoveColorTemperature command?"
-      id: CC.C.C4B.Rsp
+      id: CC.C.C4b.Rsp
 
     - label:
           "Does the device implement receiving the StepColorTemperature command?"
-      id: CC.C.C4C.Rsp
+      id: CC.C.C4c.Rsp
 
     - label:
           "Does the device implement receiving the EnhancedMoveToHue command?"
@@ -534,6 +534,10 @@
     - label: "Does the device implement receiving the ColorLoopSet command?"
       id: CC.C.C44.Rsp
 
+    - label:
+          "Does the device implement sending the MoveToColorTemperature command?"
+      id: CC.C.C0a.Rsp
+
       # Relative Humidity cluster
     - label: "Does the device implement the MeasuredValue attribute?"
       id: RH.S.A0000
@@ -1940,6 +1944,11 @@
       id: KEYPADINPUT.S.C00.Rsp
 
     - label:
+          "Does the DUT support the Keypad Input client cluster, SendKey
+          command?"
+      id: KEYPADINPUT.C.C00.Tx
+
+    - label:
           "Does the DUT support the Application Launcher server cluster
           Application Platform feature?"
       id: APPLAUNCHER.S.AP
diff --git a/src/app/tests/suites/certification/Test_TC_BOOL_2_2.yaml b/src/app/tests/suites/certification/Test_TC_BOOL_2_2.yaml
index 3e40847..0497fca 100644
--- a/src/app/tests/suites/certification/Test_TC_BOOL_2_2.yaml
+++ b/src/app/tests/suites/certification/Test_TC_BOOL_2_2.yaml
@@ -40,7 +40,7 @@
       verification: |
           ./chip-tool booleanstate read state-value 1 1
 
-          On TH, verify the StateValue value as FALSE
+          On TH(chip-tool), verify the StateValue value as FALSE
 
           [1646118838.087500][3279:3284] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0045 Attribute 0x0000_0000DataVersion: 2127727071
           [1646118838.087536][3279:3284] CHIP:TOO:   StateValue: FALSE
@@ -57,7 +57,7 @@
       verification: |
           ./chip-tool booleanstate read state-value 1 1
 
-          On TH, verify the StateValue value as TRUE
+          On TH(chip-tool), verify the StateValue value as TRUE
 
           [1646118838.087500][3279:3284] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0045 Attribute 0x0000_0000DataVersion: 2127727071
           [1646118838.087536][3279:3284] CHIP:TOO:   StateValue: TRUE
@@ -69,7 +69,7 @@
           Run the below command to start interactive mode
           ./chip-tool interactive start
 
-          Subscribe the event using below command in Interactive mode. Once the event occurs, TH get the subscription message.
+          Subscribe the event using below command in Interactive mode. Once the event occurs, TH(chip-tool) get the subscription message.
 
            booleanstate subscribe-event-by-id 0x0 1 100 2 1
       disabled: true
@@ -77,7 +77,7 @@
     - label: "Bring the DUT into a state so StateValue is FALSE"
       PICS: BOOL.M.ManuallyControlled && BOOL.S.E00 && BOOL.S.A0000
       verification: |
-          On TH, verify the StateValue value as FALSE
+          On TH(chip-tool), verify the StateValue value as FALSE
 
           [1646119162.628169][3311:3316] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0045 Attribute 0x0000_0000DataVersion: 2127727071
           [1646119162.628207][3311:3316] CHIP:TOO:   StateValue: FALSE
@@ -88,7 +88,7 @@
       verification: |
           ./chip-tool booleanstate read state-value 1 1
 
-          On TH, verify the StateValue value as FALSE
+          On TH(chip-tool), verify the StateValue value as FALSE
 
           [1646118838.087500][3279:3284] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0045 Attribute 0x0000_0000DataVersion: 2127727071
           [1646118838.087536][3279:3284] CHIP:TOO:   StateValue: FALSE
@@ -97,7 +97,7 @@
     - label: "Bring the DUT into a state so StateValue is TRUE"
       PICS: BOOL.M.ManuallyControlled && BOOL.S.E00 && BOOL.S.A0000
       verification: |
-          On TH, verify the StateValue value as TRUE
+          On TH(chip-tool), verify the StateValue value as TRUE
 
           [1646119162.628169][3311:3316] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0045 Attribute 0x0000_0000DataVersion: 2127727071
           [1646119162.628207][3311:3316] CHIP:TOO:   StateValue: TRUE
@@ -108,7 +108,7 @@
       verification: |
           ./chip-tool booleanstate read state-value 1 1
 
-          On TH, verify the StateValue value as TRUE
+          On TH(chip-tool), verify the StateValue value as TRUE
 
           [1646118838.087500][3279:3284] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0045 Attribute 0x0000_0000DataVersion: 2127727071
           [1646118838.087536][3279:3284] CHIP:TOO:   StateValue: TRUE
diff --git a/src/app/tests/suites/certification/Test_TC_BOOL_3_1.yaml b/src/app/tests/suites/certification/Test_TC_BOOL_3_1.yaml
index 3cf7b94..4e736f9 100644
--- a/src/app/tests/suites/certification/Test_TC_BOOL_3_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_BOOL_3_1.yaml
@@ -28,13 +28,18 @@
     endpoint: 0
 
 tests:
+    - label: "Note"
+      verification: |
+          For DUT as client test cases, Chip-tool command used below are an example to verify the functionality. For certification test, we expect DUT should have a capability or way to run the equivalent command.
+      disabled: true
+
     - label:
           "DUT reads all supported mandatory attributes from TH one at a time in
           a manufacturer specific order"
       verification: |
           ./chip-tool booleanstate read state-value 1 1
 
-          Verify read command is received in DUT as client side log
+          Verify read command is received on TH(all-clusters-app) Log successfully
 
           [1658847009.838448][28392:28392] CHIP:IM: Received Read request
           [1658847009.838537][28392:28392] CHIP:DMG: ReadRequestMessage =
@@ -90,7 +95,7 @@
       verification: |
           ./chip-tool booleanstate read attribute-list 1 1
 
-          Verify none of the optional attributes of the server-side of the cluster is listed  in DUT as client side log
+          Verify none of the optional attributes of the server-side of the cluster is listed  on TH(all-clusters-app) Log
           [1654244313219] [91456:3997555] CHIP: [TOO] Endpoint: 1 Cluster: 0x0000_0045 Attribute 0x0000_FFFB DataVersion: 2739318439
           [1654244313220] [91456:3997555] CHIP: [TOO]   AttributeList: 6 entries
           [1654244313220] [91456:3997555] CHIP: [TOO]     [1]: 0
@@ -102,7 +107,7 @@
 
            ./chip-tool booleanstate read state-value 1 1
 
-          Verify read command is received in DUT as client side log
+          Verify read command is received on TH (all-clusters-minimal-app) Log
 
           [1658847009.838448][28392:28392] CHIP:IM: Received Read request
           [1658847009.838537][28392:28392] CHIP:DMG: ReadRequestMessage =
diff --git a/src/app/tests/suites/certification/Test_TC_BRBINFO_1_1.yaml b/src/app/tests/suites/certification/Test_TC_BRBINFO_1_1.yaml
index 2751607..3e19e78 100644
--- a/src/app/tests/suites/certification/Test_TC_BRBINFO_1_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_BRBINFO_1_1.yaml
@@ -32,7 +32,7 @@
       verification: |
           ./chip-tool bridgeddevicebasic read cluster-revision 1 3
 
-          On TH, verify  DUT responsds ClusterRevision attribute as the value 1
+          On TH(chip-tool), verify  DUT responsds ClusterRevision attribute has  value 1
 
           [1657695910.794487][15411:15416] CHIP:TOO: Endpoint: 3 Cluster: 0x0000_0039 Attribute 0x0000_FFFD DataVersion: 2577979325
           [1657695910.794568][15411:15416] CHIP:TOO:   ClusterRevision: 1
@@ -42,7 +42,7 @@
       verification: |
           ./chip-tool bridgeddevicebasic read  feature-map 1 3
 
-          On TH, verify that DUT responds the  Featuremap  value as 0
+          On TH(chip-tool), verify at DUT responds   Featuremap  value as 0
 
           [1658749277.166884][10254:10259] CHIP:TOO: Endpoint: 3 Cluster: 0x0000_0039 Attribute 0x0000_FFFC DataVersion: 3297319126
           [1658749277.166945][10254:10259] CHIP:TOO:   FeatureMap: 0
@@ -53,7 +53,7 @@
       verification: |
           ./chip-tool bridgeddevicebasic read attribute-list 1 3
 
-          On TH, verify that DUT responds as list of supported attributes as 7 entries
+          On TH(chip-tool), verify TH(chip-tool)at DUT responds as list of supported attributes as entries matching TH(chip-tool)e PICS items (see column F)
 
           [1658833518.065647][9014:9019] CHIP:TOO: Endpoint: 3 Cluster: 0x0000_0039 Attribute 0x0000_FFFB DataVersion: 270848876
           [1658833518.065723][9014:9019] CHIP:TOO:   AttributeList: 7 entries
@@ -77,7 +77,7 @@
       verification: |
           ./chip-tool bridgeddevicebasic read accepted-command-list 1 3
 
-          On TH, verify that DUT responds as list of Accepted Commands as 0 entries
+          On TH(chip-tool), verify  DUT responds as list of Accepted Commands as 0 entries
 
           [1657696300.165081][15447:15452] CHIP:TOO: Endpoint: 3 Cluster: 0x0000_0039 Attribute 0x0000_FFF9 DataVersion: 2577979325
           [1657696300.165174][15447:15452] CHIP:TOO:   AcceptedCommandList: 0 entries
@@ -87,7 +87,7 @@
       verification: |
           ./chip-tool bridgeddevicebasic read generated-command-list 1 3
 
-          On TH, verify that DUT responds as list of GeneratedCommands as 0 entries
+          On TH(chip-tool), verify that DUT responds as list of GeneratedCommands as 0 entries
 
           [1657696328.889936][15454:15459] CHIP:TOO: Endpoint: 3 Cluster: 0x0000_0039 Attribute 0x0000_FFF8 DataVersion: 2577979325
           [1657696328.890017][15454:15459] CHIP:TOO:   GeneratedCommandList: 0 entries
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 a897cc0..8ec4289 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
@@ -26,7 +26,9 @@
       verification: |
           ./chip-tool bridgeddevicebasic read vendor-name  1 3
 
-          Note: The attribute is optional so no example log can be provided.
+          Verify VendorName is of type string and is less than or equal to 32 bytes on TH(chip-tool) Log:
+
+          [1656495199.434300][2158:2163] CHIP:TOO:   VendorName: TEST_VENDOR
       disabled: true
 
     - label: "TH writes VendorName as sample"
@@ -34,8 +36,9 @@
       verification: |
           ./chip-tool bridgeddevicebasic write vendor-name sample 1 3
 
+          Verify response has unsupported write on TH(chip-tool) Log:
 
-          Note: The attribute is optional so no example log can be provided.
+          [1656495259.991989][2164:2169] CHIP:TOO: Response Failure: IM Error 0x00000588: General error: 0x88 (UNSUPPORTED_WRITE)
       disabled: true
 
     - label: "TH reads VendorName"
@@ -43,8 +46,9 @@
       verification: |
           ./chip-tool bridgeddevicebasic read vendor-name  1 3
 
+          Verify VendorName is not chnged when compared to step 1 on TH(chip-tool) Log
 
-          Note: The attribute is optional so no example log can be provided.
+          [1656495199.434300][2158:2163] CHIP:TOO:   VendorName: TEST_VENDOR
       disabled: true
 
     - label: "TH reads VendorID from the DUT."
@@ -52,8 +56,9 @@
       verification: |
           ./chip-tool bridgeddevicebasic read vendor-id  1 3
 
+          Veify VendorID value is in range of 0x0001 to 0xFFF0 on TH(chip-tool) Log
 
-          Note: The attribute is optional so no example log can be provided.
+          [1656495322.252171][2177:2182] CHIP:TOO:   VendorID: 65521
       disabled: true
 
     - label: "TH writes VendorID as 0x0011"
@@ -61,17 +66,19 @@
       verification: |
           ./chip-tool bridgeddevicebasic write vendor-name 0x0011 1 3
 
+          Verify response has unsupported write on TH(chip-tool) Log:
 
-          Note: The attribute is optional so no example log can be provided.
+          [1656495259.991989][2164:2169] CHIP:TOO: Response Failure: IM Error 0x00000588: General error: 0x88 (UNSUPPORTED_WRITE)
       disabled: true
 
     - label: "TH reads VendorID"
       PICS: BRBINFO.S.A0002
       verification: |
-          ./chip-tool bridgeddevicebasic read vendor-name  1 3
+          ./chip-tool bridgeddevicebasic read vendor-id  1 3
 
+          Verify VendorID is not chnged when compared to step 8 on TH(chip-tool) Log
 
-          Note: The attribute is optional so no example log can be provided.
+          [1656495322.252171][2177:2182] CHIP:TOO:   VendorID: 65521
       disabled: true
 
     - label: "TH reads ProductName from the DUT."
@@ -79,15 +86,20 @@
       verification: |
           ./chip-tool bridgeddevicebasic read product-name  1 3
 
-          Note: The attribute is optional so no example log can be provided.
+          Verify ProductName has  human readable string and is less or equal to 32 bytes on TH(chip-tool) Log
+
+          [1656495708.412745][2200:2205] CHIP:TOO:   ProductName: TEST_PRODUCT
       disabled: true
 
     - label: "TH writes ProductName as newproduct"
       PICS: BRBINFO.S.A0003
       verification: |
-          ./chip-tool bridgeddevicebasic write vendor-name newproduct 1 3
+          ./chip-tool bridgeddevicebasic write vendor-name ""newproduct"" 1 3
 
-          Note: The attribute is optional so no example log can be provided.
+          Verify response has unsupported write on TH(chip-tool) Log:
+
+          NOTE the quotes: single-quote/double-quote/string/double-quote/single-quote
+          [1656495259.991989][2164:2169] CHIP:TOO: Response Failure: IM Error 0x00000588: General error: 0x88 (UNSUPPORTED_WRITE)
       disabled: true
 
     - label: "TH reads ProductName"
@@ -95,8 +107,9 @@
       verification: |
           ./chip-tool bridgeddevicebasic read product-name  1 3
 
+          Verify ProductName is not chnged when compared to step 11 on TH(chip-tool) Log
 
-          Note: The attribute is optional so no example log can be provided.
+          [1656495708.412745][2200:2205] CHIP:TOO:   ProductName: TEST_PRODUCT
       disabled: true
 
     - label: "TH reads NodeLabel from the DUT"
@@ -104,7 +117,7 @@
       verification: |
           ./chip-tool bridgeddevicebasic read node-label 1 3
 
-          Verify the value of node-label is type of string and contains length between 0 and 32 in TH Log:
+          Verify the value of node-label is type of string and contains length between 0 and 32 in TH(chip-tool) Log:
 
           [1657696463.081741][15476:15481] CHIP:TOO: Endpoint: 3 Cluster: 0x0000_0039 Attribute 0x0000_0005 DataVersion: 2577979325
           [1657696463.081791][15476:15481] CHIP:TOO:   NodeLabel: Light 1
@@ -113,9 +126,21 @@
     - label: "TH writes newnode to NodeLabel"
       PICS: BRBINFO.S.A0005
       verification: |
-          ./chip-tool bridgeddevicebasic write node-label newnode 1 3
+          ./chip-tool bridgeddevicebasic write node-label ""newnode"" 1 3
 
-          Note: The attribute is optional so no example log can be provided.
+          Verify response has unsupported write on TH(chip-tool) Log:
+
+          NOTE the quotes: single-quote/double-quote/string/double-quote/single-quote
+
+          On TH(chip-tool) verify that DUT sends a success response
+          [1656495932.122094][2236:2241] CHIP:DMG:                         }
+          [1656495932.122264][2236:2241] CHIP:DMG:
+          [1656495932.122332][2236:2241] CHIP:DMG:                         StatusIB =
+          [1656495932.122398][2236:2241] CHIP:DMG:                         {
+          [1656495932.122466][2236:2241] CHIP:DMG:                                 status = 0x00 (SUCCESS),
+          [1656495932.122538][2236:2241] CHIP:DMG:                         },
+          [1656495932.122602][2236:2241] CHIP:DMG:
+          [1656495932.122660][2236:2241] CHIP:DMG:                 },
       disabled: true
 
     - label: "TH reads NodeLabel"
@@ -123,7 +148,10 @@
       verification: |
           ./chip-tool bridgeddevicebasic read node-label 1 3
 
-          Note: The attribute is optional so no example log can be provided.
+          Verify the value of node-label is type of string and contains length between 0 and 32 in TH(chip-tool) Log:
+
+          [1657696463.081741][15476:15481] CHIP:TOO: Endpoint: 3 Cluster: 0x0000_0039 Attribute 0x0000_0005 DataVersion: 2577979325
+          [1657696463.081791][15476:15481] CHIP:TOO:   NodeLabel: newnode
       disabled: true
 
     - label: "TH reads HardwareVersion from the DUT."
@@ -131,7 +159,9 @@
       verification: |
           ./chip-tool bridgeddevicebasic read hardware-version  1 3
 
-          Note: The attribute is optional so no example log can be provided.
+          Verify HardwareVersion is in range of 0 to 65534 on TH(chip-tool) Log
+
+          [1656496175.564718][2302:2307] CHIP:TOO:   HardwareVersion: 0
       disabled: true
 
     - label: "TH writes HardwareVersion as 0x4531"
@@ -139,7 +169,9 @@
       verification: |
           ./chip-tool bridgeddevicebasic write hardware-version-string 0x4531  1 3
 
-          Note: The attribute is optional so no example log can be provided.
+          Verify response has unsupported write on TH(chip-tool) Log:
+
+          [1656495259.991989][2164:2169] CHIP:TOO: Response Failure: IM Error 0x00000588: General error: 0x88 (UNSUPPORTED_WRITE)
       disabled: true
 
     - label: "TH reads HardwareVersion"
@@ -147,7 +179,9 @@
       verification: |
           ./chip-tool bridgeddevicebasic read hardware-version  1 3
 
-          Note: The attribute is optional so no example log can be provided.
+          Verify HardwareVersion is not chnged when compared to step 21 on TH(chip-tool) Log
+
+          [1656496175.564718][2302:2307] CHIP:TOO:   HardwareVersion: 0
       disabled: true
 
     - label: "TH reads HardwareVersionString from the DUT."
@@ -155,8 +189,9 @@
       verification: |
           ./chip-tool bridgeddevicebasic read hardware-version-string  1 3
 
+          Verify HardwareVersionString value is type of string and in range of 1 to 64 bytes
 
-          Note: The attribute is optional so no example log can be provided.
+          [1656496257.298675][2315:2320] CHIP:TOO:   HardwareVersionString: TEST_VERSION
       disabled: true
 
     - label: "TH writes HardwareVersionString as newhardwareversion"
@@ -164,7 +199,9 @@
       verification: |
           ./chip-tool bridgeddevicebasic write hardware-version-string newhardwareversion  1 3
 
-          Note: The attribute is optional so no example log can be provided.
+          Verify response has unsupported write on TH(chip-tool) Log:
+
+          [1656495259.991989][2164:2169] CHIP:TOO: Response Failure: IM Error 0x00000588: General error: 0x88 (UNSUPPORTED_WRITE)
       disabled: true
 
     - label: "TH reads HardwareVersionString"
@@ -172,7 +209,9 @@
       verification: |
           ./chip-tool bridgeddevicebasic read hardware-version-string  1 3
 
-          Note: The attribute is optional so no example log can be provided.
+          Verify HardwareVersionString is not chnged when compared to step 24 on TH(chip-tool) Log
+
+          [1656496257.298675][2315:2320] CHIP:TOO:   HardwareVersionString: TEST_VERSION
       disabled: true
 
     - label: "TH reads SoftwareVersion from the DUT."
@@ -180,7 +219,9 @@
       verification: |
           ./chip-tool bridgeddevicebasic read software-version 1 3
 
-          Note: The attribute is optional so no example log can be provided.
+          Verify SoftwareVersion value is in range of 0 to 4294967294 on TH(chip-tol) Log
+
+          [1656496411.609866][2348:2353] CHIP:TOO:   SoftwareVersion: 1
       disabled: true
 
     - label: "TH writes SoftwareVersion as 0x8213"
@@ -188,7 +229,9 @@
       verification: |
           ./chip-tool bridgeddevicebasic write software-version 0x8213  1 3
 
-          Note: The attribute is optional so no example log can be provided.
+          Verify response has unsupported write on TH(chip-tool) Log:
+
+          [1656495259.991989][2164:2169] CHIP:TOO: Response Failure: IM Error 0x00000588: General error: 0x88 (UNSUPPORTED_WRITE)
       disabled: true
 
     - label: "TH reads SoftwareVersion"
@@ -196,8 +239,9 @@
       verification: |
           ./chip-tool bridgeddevicebasic read software-version 1 3
 
+          Verify SoftwareVersion is not chnged when compared to step 27 on TH(chip-tool) Log
 
-          Note: The attribute is optional so no example log can be provided.
+          [1656496411.609866][2348:2353] CHIP:TOO:   SoftwareVersion: 1
       disabled: true
 
     - label: "TH reads SoftwareVersionString from the DUT."
@@ -205,7 +249,9 @@
       verification: |
           ./chip-tool bridgeddevicebasic read software-version-string  1 3
 
-          Note: The attribute is optional so no example log can be provided.
+          Verify the SoftwareVersionString is of type string and has length of 1 to 64 bytes
+
+          [1656496498.568951][2362:2367] CHIP:TOO:   SoftwareVersionString: 1.0
       disabled: true
 
     - label: "TH writes SoftwareVersionString as 1.0"
@@ -213,8 +259,10 @@
       verification: |
           ./chip-tool bridgeddevicebasic write software-version 1.0  1 3
 
+          Verify response has unsupported write on TH(chip-tool) Log:
 
-          Note: The attribute is optional so no example log can be provided.
+
+          [1656495259.991989][2164:2169] CHIP:TOO: Response Failure: IM Error 0x00000588: General error: 0x88 (UNSUPPORTED_WRITE)
       disabled: true
 
     - label: "TH reads SoftwareVersionString"
@@ -222,7 +270,9 @@
       verification: |
           ./chip-tool bridgeddevicebasic read software-version-string  1 3
 
-          Note: The attribute is optional so no example log can be provided.
+          Verify SoftwareVersionString is not chnged when compared to step 1 on TH(chip-tool) Log
+
+          [1656496498.568951][2362:2367] CHIP:TOO:   SoftwareVersionString: 1.0
       disabled: true
 
     - label: "TH reads ManufacturingDate from the DUT."
@@ -230,8 +280,9 @@
       verification: |
           ./chip-tool bridgeddevicebasic read manufacturing-date  1 3
 
+          Verify manufacturing date is of type string and has length of range 8 to 16 bytes on TH()
 
-          Note: The attribute is optional so no example log can be provided.
+          [1656496661.777852][2388:2393] CHIP:TOO:   ManufacturingDate: 20200101
       disabled: true
 
     - label: "TH writes ManufacturingDate as 20210814789452IN"
@@ -239,7 +290,9 @@
       verification: |
           ./chip-tool bridgeddevicebasic write manufacturing-date  20210814789452IN 1 3
 
-          Note: The attribute is optional so no example log can be provided.
+          Verify response has unsupported write on TH(chip-tool) Log:
+
+          [1656495259.991989][2164:2169] CHIP:TOO: Response Failure: IM Error 0x00000588: General error: 0x88 (UNSUPPORTED_WRITE)
       disabled: true
 
     - label: "TH reads ManufacturingDate"
@@ -247,8 +300,9 @@
       verification: |
           ./chip-tool bridgeddevicebasic read manufacturing-date  1 3
 
+          Verify VendorName is not chnged when compared to step 1 on TH(chip-tool) Log
 
-          Note: The attribute is optional so no example log can be provided.
+          [1656496661.777852][2388:2393] CHIP:TOO:   ManufacturingDate: 20200101
       disabled: true
 
     - label: "TH reads PartNumber from the DUT."
@@ -256,7 +310,7 @@
       verification: |
           ./chip-tool bridgeddevicebasic read part-number  1 3
 
-          Note: The attribute is optional so no example log can be provided.
+          [1656496800.941788][2405:2410] CHIP:TOO:   PartNumber: 1234
       disabled: true
 
     - label: "TH writes PartNumber as newpart"
@@ -264,7 +318,9 @@
       verification: |
           ./chip-tool bridgeddevicebasic write part-number newpart  1 3
 
-          Note: The attribute is optional so no example log can be provided.
+          Verify response has unsupported write on TH(chip-tool) Log:
+
+          [1656495259.991989][2164:2169] CHIP:TOO: Response Failure: IM Error 0x00000588: General error: 0x88 (UNSUPPORTED_WRITE)
       disabled: true
 
     - label: "TH reads PartNumber"
@@ -272,8 +328,9 @@
       verification: |
           ./chip-tool bridgeddevicebasic read part-number  1 3
 
+          Verify VendorName is not chnged when compared to step 1 on TH(chip-tool) Log
 
-          Note: The attribute is optional so no example log can be provided.
+          [1656496800.941788][2405:2410] CHIP:TOO:   PartNumber: 1234
       disabled: true
 
     - label: "TH reads ProductURL from the DUT."
@@ -281,8 +338,7 @@
       verification: |
           ./chip-tool bridgeddevicebasic read product-url  1 3
 
-
-          Note: The attribute is optional so no example log can be provided.
+          [1656497181.118653][2436:2441] CHIP:TOO:   ProductURL: https://example.com/myproduct
       disabled: true
 
     - label: "TH writes ProductURL as https://www.example.com"
@@ -290,8 +346,9 @@
       verification: |
           ./chip-tool bridgeddevicebasic write product-url  https://www.example.com 1 3
 
+          Verify response has unsupported write on TH(chip-tool) Log:
 
-          Note: The attribute is optional so no example log can be provided.
+          [1656495259.991989][2164:2169] CHIP:TOO: Response Failure: IM Error 0x00000588: General error: 0x88 (UNSUPPORTED_WRITE)
       disabled: true
 
     - label: "TH reads ProductURL"
@@ -299,9 +356,9 @@
       verification: |
           ./chip-tool bridgeddevicebasic read product-url  1 3
 
+          Verify VendorName is not chnged when compared to step 1 on TH(chip-tool) Log
 
-
-          Note: The attribute is optional so no example log can be provided.
+          [1656497181.118653][2436:2441] CHIP:TOO:   ProductURL: https://example.com/myproduct
       disabled: true
 
     - label: "TH reads ProductLabel from the DUT."
@@ -309,8 +366,7 @@
       verification: |
           ./chip-tool bridgeddevicebasic read product-label  1 3
 
-
-          Note: The attribute is optional so no example log can be provided.
+          [1656501313.811305][2602:2607] CHIP:TOO:   ProductLabel: ABCD
       disabled: true
 
     - label: "TH writes ProductLabel as newproductlabel"
@@ -318,8 +374,9 @@
       verification: |
           ./chip-tool bridgeddevicebasic write product-label newproductlabel  1 3
 
+          Verify response has unsupported write on TH(chip-tool) Log:
 
-          Note: The attribute is optional so no example log can be provided.
+          [1656495259.991989][2164:2169] CHIP:TOO: Response Failure: IM Error 0x00000588: General error: 0x88 (UNSUPPORTED_WRITE)
       disabled: true
 
     - label: "TH reads ProductLabel"
@@ -327,7 +384,9 @@
       verification: |
           ./chip-tool bridgeddevicebasic read product-label  1 3
 
-          Note: The attribute is optional so no example log can be provided.
+          Verify VendorName is not chnged when compared to step 1 on TH(chip-tool) Log
+
+          [1656501313.811305][2602:2607] CHIP:TOO:   ProductLabel: ABCD
       disabled: true
 
     - label: "TH reads SerialNumber from the DUT."
@@ -335,8 +394,7 @@
       verification: |
           ./chip-tool bridgeddevicebasic read serial-number  1 3
 
-
-          Note: The attribute is optional so no example log can be provided.
+          [1656501452.183890][2624:2630] CHIP:TOO:   SerialNumber: 5678
       disabled: true
 
     - label: "TH writes SerialNumber_test as newserialnumber"
@@ -344,10 +402,9 @@
       verification: |
           ./chip-tool bridgeddevicebasic write serial-number newserialnumber  1 3
 
+          Verify response has unsupported write on TH(chip-tool) Log:
 
-
-
-          Note: The attribute is optional so no example log can be provided.
+          [1656495259.991989][2164:2169] CHIP:TOO: Response Failure: IM Error 0x00000588: General error: 0x88 (UNSUPPORTED_WRITE)
       disabled: true
 
     - label: "TH reads SerialNumber"
@@ -355,8 +412,9 @@
       verification: |
           ./chip-tool bridgeddevicebasic read serial-number  1 3
 
+          Verify VendorName is not chnged when compared to step 1 on TH(chip-tool) Log
 
-          Note: The attribute is optional so no example log can be provided.
+          [1656501452.183890][2624:2630] CHIP:TOO:   SerialNumber: 5678
       disabled: true
 
     - label: "TH reads Reachable from the DUT."
@@ -378,6 +436,8 @@
       verification: |
           ./chip-tool bridgeddevicebasic write-by-id 0x0005 ‘“false”’ 1 0
 
+          Verify response has unsupported write on TH(chip-tool) Log:
+
           On TH verify that, TH receives  UNSUPPORTED_WRITE response as status
           [1656496372.884955][2340:2345] CHIP:DMG: }
           [1656496372.885085][2340:2345] CHIP:DMG: WriteClient moving to [AwaitingDe]
@@ -401,7 +461,7 @@
       verification: |
           ./chip-tool bridgeddevicebasic read unique-id 1 3
 
-          Note: The attribute is optional so no example log can be provided.
+          [1656501734.253827][2673:2679] CHIP:TOO:   UniqueID: 30789FE4FCF832C9
       disabled: true
 
     - label: "TH writes UniqueID as newid"
@@ -409,7 +469,9 @@
       verification: |
           ./chip-tool bridgeddevicebasic write unique-id newid  1 3
 
-          Note: The attribute is optional so no example log can be provided.
+          Verify response has unsupported write on TH(chip-tool) Log:
+
+          [1656495259.991989][2164:2169] CHIP:TOO: Response Failure: IM Error 0x00000588: General error: 0x88 (UNSUPPORTED_WRITE)
       disabled: true
 
     - label: "TH reads UniqueID"
@@ -417,6 +479,7 @@
       verification: |
           ./chip-tool bridgeddevicebasic read unique-id 1 3
 
+          Verify VendorName is not chnged when compared to step 1 on TH(chip-tool) Log
 
-          Note: The attribute is optional so no example log can be provided.
+          [1656501734.253827][2673:2679] CHIP:TOO:   UniqueID: 30789FE4FCF832C9
       disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_BRBINFO_2_2.yaml b/src/app/tests/suites/certification/Test_TC_BRBINFO_2_2.yaml
index 8989032..ed625f1 100644
--- a/src/app/tests/suites/certification/Test_TC_BRBINFO_2_2.yaml
+++ b/src/app/tests/suites/certification/Test_TC_BRBINFO_2_2.yaml
@@ -26,17 +26,11 @@
           new) TH receives the StartUp event from DUT"
       PICS: BRBINFO.S.E00
       verification: |
-          Optional Event -
+          StartUp is an optional Event -
+          As its an optional event we cannot generate the event as of now , hence no example logs provided.
+
 
           ./chip-tool bridgeddevicebasic read-event start-up 1 3
-
-          Verify in TH Log:
-
-          [1657698138.901928][15596:15601] CHIP:DMG: ReportDataMessage =
-          [1657698138.901978][15596:15601] CHIP:DMG: {
-          [1657698138.902023][15596:15601] CHIP:DMG:         SuppressResponse = true,
-          [1657698138.902081][15596:15601] CHIP:DMG:         InteractionModelRevision = 1
-          [1657698138.902126][15596:15601] CHIP:DMG: }
       disabled: true
 
     - label:
@@ -46,22 +40,28 @@
           the bridged device or the connectivity to it."
       PICS: BRBINFO.S.E03
       verification: |
-          Verify in TH Log:
+          To verify thi ReachableChanged follow the below procedure
 
-           ./chip-tool bridgeddevicebasic read-event reachable-changed  1 3
+          1. ./chip-tool interactive start
+          2. bridgeddevicebasic subscribe reachable 1 60 1 4
+          3. press "u" on bridge-app to change reachable to false for endpoint 4 and see the reachable value has been changed compared with precondition
+
+          [1659441181.388547][2392:2397] CHIP:TOO: Endpoint: 4 Cluster: 0x0000_0039 Attribute 0x0000_0011 DataVersion: 2189020906
+          [1659441181.388600][2392:2397] CHIP:TOO:   Reachable: FALSE
+          [1659441181.388651][2392:2397] CHIP:DMG: MoveToState ReadClient[0xffff7c005ac0]: Moving to [AwaitingSu]
+
+          4. press "v"  on bridge-app to change reachable to true for endpoint 4
+
+          [1659441193.443232][2392:2397] CHIP:TOO: Endpoint: 4 Cluster: 0x0000_0039 Attribute 0x0000_0011 DataVersion: 2189020907
+          [1659441193.443267][2392:2397] CHIP:TOO:   Reachable: TRUE
+          [1659441193.443331][2392:2397] CHIP:EM: Piggybacking Ack for MessageCounter:194624180 on exchange: 18196r
       disabled: true
 
     - label: "TH subscribes to the shutdown event on the DUT. Shutdown DUT."
       PICS: BRBINFO.S.E01
       verification: |
-          Optional Event -
+          ShutDown is an optional Event -
+          As its an optional event we cannot generate the event as of now , hence no example logs provided.
 
           ./chip-tool bridgeddevicebasic read-event shut-down  1 3
-
-          Verify in TH Log:
-          [1657698198.023273][15606:15611] CHIP:DMG: ReportDataMessage =
-          [1657698198.023302][15606:15611] CHIP:DMG: {
-          [1657698198.023326][15606:15611] CHIP:DMG:         SuppressResponse = true,
-          [1657698198.023352][15606:15611] CHIP:DMG:         InteractionModelRevision = 1
-          [1657698198.023376][15606:15611] CHIP:DMG: }
       disabled: true
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 eeba8ba..502e566 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
@@ -21,13 +21,19 @@
     endpoint: 0
 
 tests:
+    - label: "Note"
+      verification: |
+          For DUT as client test cases, Chip-tool command used below are an example to verify the functionality. For certification test, we expect DUT should have a capability or way to run the equivalent command.
+      disabled: true
+
     - label: "DUT reads VendorName from the TH"
       PICS: BRBINFO.C.A0001
       verification: |
           ./chip-tool bridgeddevicebasic read vendor-name  1 3
 
+          Verify that DUT reads VendorName from the TH successfully on TH(all-clusters-app) Log
 
-          Note: The attribute is optional so no example log can be provided.
+          [1656495199.434300][2158:2163] CHIP:TOO:   VendorName: TEST_VENDOR
       disabled: true
 
     - label: "DUT reads VendorID from the TH"
@@ -35,8 +41,9 @@
       verification: |
           ./chip-tool bridgeddevicebasic read vendor-id  1 3
 
+          Verify that DUT reads VendorID from the TH successfully on TH(all-clusters-app) Log
 
-          Note: The attribute is optional so no example log can be provided.
+          [1656495322.252171][2177:2182] CHIP:TOO:   VendorID: 65521
       disabled: true
 
     - label: "DUT reads ProductName from the TH"
@@ -44,18 +51,19 @@
       verification: |
           ./chip-tool bridgeddevicebasic read product-name  1 3
 
+          Verify that DUT reads ProductName from the TH successfully on TH(clusters-app)
 
-          Note: The attribute is optional so no example log can be provided.
+          [1656495708.412745][2200:2205] CHIP:TOO:   ProductName: TEST_PRODUCT
       disabled: true
 
     - label: "DUT reads NodeLabel from the TH"
       PICS: BRBINFO.C.A0005
       verification: |
-          Optional Attribute -
+          Nodelabel is an optional Attribute -
 
           ./chip-tool bridgeddevicebasic read node-label 1 3
 
-          Verify Node-label is read sucessfully in DUT as client side log
+          Verify Node-label is read sucessfully on TH(all-clusters-app)
 
           [1657696463.081741][15476:15481] CHIP:TOO: Endpoint: 3 Cluster: 0x0000_0039 Attribute 0x0000_0005 DataVersion: 2577979325
           [1657696463.081791][15476:15481] CHIP:TOO:   NodeLabel: Light 1
@@ -66,8 +74,9 @@
       verification: |
           ./chip-tool bridgeddevicebasic read location 1 3
 
+          Verify that DUT reads Location from the TH successfully on TH(all-clusters-app) Log
 
-          Note: The attribute is optional so no example log can be provided.
+          Note: The Location attribute is optional so no example log can be provided.
       disabled: true
 
     - label: "DUT reads HardwareVersion from the TH"
@@ -75,9 +84,9 @@
       verification: |
           ./chip-tool bridgeddevicebasic read hardware-version  1 3
 
+          Verify that DUT reads HardwareVersion from the TH successfully on TH(all-clusters-app) Log
 
-
-          Note: The attribute is optional so no example log can be provided.
+          [1656496175.564718][2302:2307] CHIP:TOO:   HardwareVersion: 0
       disabled: true
 
     - label: "DUT reads HardwareVersionString from the TH"
@@ -85,9 +94,9 @@
       verification: |
           ./chip-tool bridgeddevicebasic read hardware-version-string  1 3
 
+          Verify that DUT reads HardwareVersionString from the TH successfully on TH(all-clusters-app) Log
 
-
-          Note: The attribute is optional so no example log can be provided.
+          [1656496257.298675][2315:2320] CHIP:TOO:   HardwareVersionString: TEST_VERSION
       disabled: true
 
     - label: "DUT reads SoftwareVersion from the TH"
@@ -95,9 +104,9 @@
       verification: |
           ./chip-tool bridgeddevicebasic read software-version 1 3
 
+          Verify that DUT reads SoftwareVersion from the TH successfully
 
-
-          Note: The attribute is optional so no example log can be provided.
+          [1656496411.609866][2348:2353] CHIP:TOO:   SoftwareVersion: 1
       disabled: true
 
     - label: "DUT reads SoftwareVersionString from the TH"
@@ -105,9 +114,9 @@
       verification: |
           ./chip-tool bridgeddevicebasic read software-version-string  1 3
 
+          Verify that DUT reads SoftwareVersionString from the TH successfully on TH(all-clusters-app) Log
 
-
-          Note: The attribute is optional so no example log can be provided.
+          [1656496498.568951][2362:2367] CHIP:TOO:   SoftwareVersionString: 1.0
       disabled: true
 
     - label: "DUT reads ManufacturingDate from the TH"
@@ -115,9 +124,9 @@
       verification: |
           ./chip-tool bridgeddevicebasic read manufacturing-date  1 3
 
+          Verify that DUT reads ManufacturingDate from the TH successfully on TH(all-clusters-app) Log
 
-
-          Note: The attribute is optional so no example log can be provided.
+          [1656496661.777852][2388:2393] CHIP:TOO:   ManufacturingDate: 20200101
       disabled: true
 
     - label: "DUT reads PartNumber from the TH"
@@ -125,9 +134,9 @@
       verification: |
           ./chip-tool bridgeddevicebasic read part-number  1 3
 
+          Verify that DUT reads PartNumber from the TH successfully on TH(all-clusters-app) Log
 
-
-          Note: The attribute is optional so no example log can be provided.
+          [1656496800.941788][2405:2410] CHIP:TOO:   PartNumber: 1234
       disabled: true
 
     - label: "DUT reads ProductURL from the TH"
@@ -135,9 +144,9 @@
       verification: |
           ./chip-tool bridgeddevicebasic read product-url  1 3
 
+          Verify that DUT reads ProductURL from the TH successfully on TH(all-clusters-app) Log
 
-
-          Note: The attribute is optional so no example log can be provided.
+          [1656497181.118653][2436:2441] CHIP:TOO:   ProductURL: https://example.com/myproduct
       disabled: true
 
     - label: "DUT reads ProductLabel from the TH"
@@ -145,9 +154,9 @@
       verification: |
           ./chip-tool bridgeddevicebasic read product-label  1 3
 
+          Verify that DUT reads ProductLabel from the TH successfully on TH(all-clusters-app) Log
 
-
-          Note: The attribute is optional so no example log can be provided.
+          [1656501313.811305][2602:2607] CHIP:TOO:   ProductLabel: ABCD
       disabled: true
 
     - label: "DUT reads SerialNumber from the TH"
@@ -155,9 +164,9 @@
       verification: |
           ./chip-tool bridgeddevicebasic read serial-number  1 3
 
+          Verify that DUT reads SerialNumber from the TH successfully on TH(all-clusters-app) Log
 
-
-          Note: The attribute is optional so no example log can be provided.
+          [1656501452.183890][2624:2630] CHIP:TOO:   SerialNumber: 5678
       disabled: true
 
     - label: "DUT reads Reachable from the TH"
@@ -176,7 +185,7 @@
       verification: |
           ./chip-tool bridgeddevicebasic read unique-id 1 3
 
+          Verify that DUT reads UniqueID from the TH successfully on TH(all-clusters-app) Log
 
-
-          Note: The attribute is optional so no example log can be provided.
+          [1656501734.253827][2673:2679] CHIP:TOO:   UniqueID: 30789FE4FCF832C9
       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 f2f97f1..01cb2ed 100644
--- a/src/app/tests/suites/certification/Test_TC_BR_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_BR_1.yaml
@@ -30,7 +30,7 @@
       verification: |
           ./chip-tool  descriptor read device-list 1 0
 
-          Verify device type Root Node(Type-22) contains in TH Log
+          Verify the attribute contains device type Root Node (Type-22) in TH(chip-tool) Log
 
           [1657002174.323780][3885:3890] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_001D Attribute 0x0000_0000 DataVersion: 3573910940
           [1657002174.323838][3885:3890] CHIP:TOO:   device list: 1 entries
@@ -44,7 +44,7 @@
       verification: |
           ./chip-tool  descriptor read parts-list 1 0
 
-          Verify the endpoints listed in TH Log
+          Verify the endpoints listed in TH(chip-tool) Log
 
           [1657002201.045720][3893:3899] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_001D Attribute 0x0000_0003 DataVersion: 3573910940
           [1657002201.045841][3893:3899] CHIP:TOO:   parts list: 12 entries
@@ -66,11 +66,11 @@
           "For each of the endpoints read in step 1b, read attribute
           DeviceTypeList of the Descriptor cluster on that endpoint"
       verification: |
-          Verify in which of the following read device-list attribute contains device type Aggregator (Type- 14)
+          Verify  which of Those endpoints in The previous step results have a DeviceTypeList containing device type Aggregator (Type- 14) for all The following steps. in TH(chip-tool)
 
           ./chip-tool  descriptor read device-list 1 1
 
-          Verify in TH Log
+          Verify in TH(chip-tool) Log
 
           [1657002313.871608][3977:3982] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_001D Attribute 0x0000_0000 DataVersion: 3021853414
           [1657002313.871680][3977:3982] CHIP:TOO:   device list: 1 entries
@@ -82,7 +82,7 @@
 
           ./chip-tool  descriptor read device-list 1 3
 
-          Verify in TH Log
+          Verify in TH(chip-tool) Log
 
           [1657002329.438065][3983:3988] CHIP:TOO: Endpoint: 3 Cluster: 0x0000_001D Attribute 0x0000_0000 DataVersion: 2452512872
           [1657002329.438135][3983:3988] CHIP:TOO:   device list: 2 entries
@@ -98,7 +98,7 @@
 
           ./chip-tool  descriptor read device-list 1 4
 
-          Verify in TH Log
+          Verify in TH(chip-tool) Log
 
           [1659351082.975711][12107:12112] CHIP:TOO: Endpoint: 4 Cluster: 0x0000_001D Attribute 0x0000_0000 DataVersion: 3999956962
           [1659351082.975821][12107:12112] CHIP:TOO:   device list: 2 entries
@@ -116,7 +116,7 @@
 
           ./chip-tool  descriptor read device-list 1 5
 
-          Verify in TH Log
+          Verify in TH(chip-tool) Log
 
           [1659351100.369601][12113:12118] CHIP:TOO: Endpoint: 5 Cluster: 0x0000_001D Attribute 0x0000_0000 DataVersion: 3187411685
           [1659351100.369695][12113:12118] CHIP:TOO:   device list: 2 entries
@@ -133,7 +133,7 @@
 
           ./chip-tool  descriptor read device-list 1 6
 
-          Verify in TH Log
+          Verify in TH(chip-tool) Log
 
 
           [1659351102.837218][12119:12124] CHIP:TOO: Endpoint: 6 Cluster: 0x0000_001D Attribute 0x0000_0000 DataVersion: 1173571869
@@ -149,7 +149,7 @@
 
           ./chip-tool  descriptor read device-list 1 7
 
-          Verify in TH Log
+          Verify in TH(chip-tool) Log
 
           [1659351105.133982][12125:12130] CHIP:TOO: Endpoint: 7 Cluster: 0x0000_001D Attribute 0x0000_0000 DataVersion: 1309892739
           [1659351105.134087][12125:12130] CHIP:TOO:   device list: 1 entries
@@ -164,7 +164,7 @@
 
           ./chip-tool  descriptor read device-list 1 8
 
-          Verify in TH Log
+          Verify in TH(chip-tool) Log
 
           [1659351107.202771][12131:12136] CHIP:TOO: Endpoint: 8 Cluster: 0x0000_001D Attribute 0x0000_0000 DataVersion: 929721508
           [1659351107.202850][12131:12136] CHIP:TOO:   device list: 1 entries
@@ -179,7 +179,7 @@
 
           ./chip-tool  descriptor read device-list 1 9
 
-          Verify in TH Log
+          Verify in TH(chip-tool) Log
 
           [1657002455.445818][4040:4045] CHIP:TOO: Endpoint: 9 Cluster: 0x0000_001D Attribute 0x0000_0000 DataVersion: 913116116
           [1657002455.445883][4040:4045] CHIP:TOO:   device list: 1 entries
@@ -192,7 +192,7 @@
 
           ./chip-tool  descriptor read device-list 1 10
 
-          Verify in TH Log
+          Verify in TH(chip-tool) Log
 
           [1657002473.100910][4047:4052] CHIP:TOO: Endpoint: 10 Cluster: 0x0000_001D Attribute 0x0000_0000 DataVersion: 259205426
           [1657002473.100967][4047:4052] CHIP:TOO:   device list: 2 entries
@@ -208,7 +208,7 @@
 
           ./chip-tool  descriptor read device-list 1 11
 
-          Verify in TH Log
+          Verify in TH(chip-tool) Log
 
           [1657002495.856770][4061:4066] CHIP:TOO: Endpoint: 11 Cluster: 0x0000_001D Attribute 0x0000_0000 DataVersion: 4248421677
           [1657002495.856836][4061:4066] CHIP:TOO:   device list: 2 entries
@@ -225,7 +225,7 @@
 
           ./chip-tool  descriptor read device-list 1 12
 
-          Verify in TH Log
+          Verify in TH(chip-tool) Log
 
           [1657002515.862187][4073:4078] CHIP:TOO: Endpoint: 12 Cluster: 0x0000_001D Attribute 0x0000_0000 DataVersion: 2731599835
           [1657002515.862249][4073:4078] CHIP:TOO:   device list: 2 entries
@@ -242,7 +242,7 @@
 
           ./chip-tool  descriptor read device-list 1 13
 
-          Verify in TH Log
+          Verify in TH(chip-tool) Log
 
           [1657002538.134605][4097:4102] CHIP:TOO: Endpoint: 13 Cluster: 0x0000_001D Attribute 0x0000_0000 DataVersion: 3449178249
           [1657002538.134700][4097:4102] CHIP:TOO:   device list: 2 entries
@@ -261,11 +261,11 @@
           in step 1c"
       PICS: MCORE.BRIDGE
       verification: |
-          Read parts-list with endpoint listed in 1c
+          Read attribute PartsList of the Descriptor cluster on endpoint found in step 1c step
 
           ./chip-tool  descriptor read parts-list 1 1
 
-          Verify the list contains 11 entries in TH Log
+          Verify the list contains 11 entries in TH(chip-tool) Log
 
           [1657002810.697118][4121:4126] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_001D Attribute 0x0000_0003 DataVersion: 3021853414
           [1657002810.697276][4121:4126] CHIP:TOO:   parts list: 11 entries
@@ -290,7 +290,7 @@
       verification: |
           Verify device type has either Bridged node (0x0013), i.e.,  Type=19
 
-          Verify in TH Log
+          Verify in TH(chip-tool) Log
 
           ./chip-tool  descriptor read device-list 1 3
           [1657002843.395988][4135:4140] CHIP:TOO: Endpoint: 3 Cluster: 0x0000_001D Attribute 0x0000_0000 DataVersion: 2452512872
@@ -306,7 +306,7 @@
 
            ./chip-tool  descriptor read device-list 1 4
 
-          Verify in TH Log
+          Verify in TH(chip-tool) Log
 
           [1659351082.975711][12107:12112] CHIP:TOO: Endpoint: 4 Cluster: 0x0000_001D Attribute 0x0000_0000 DataVersion: 3999956962
           [1659351082.975821][12107:12112] CHIP:TOO:   device list: 2 entries
@@ -324,7 +324,7 @@
 
           ./chip-tool  descriptor read device-list 1 5
 
-          Verify in TH Log
+          Verify in TH(chip-tool) Log
 
           [1659351100.369601][12113:12118] CHIP:TOO: Endpoint: 5 Cluster: 0x0000_001D Attribute 0x0000_0000 DataVersion: 3187411685
           [1659351100.369695][12113:12118] CHIP:TOO:   device list: 2 entries
@@ -341,7 +341,7 @@
 
           ./chip-tool  descriptor read device-list 1 6
 
-          Verify in TH Log
+          Verify in TH(chip-tool) Log
 
 
           [1659351102.837218][12119:12124] CHIP:TOO: Endpoint: 6 Cluster: 0x0000_001D Attribute 0x0000_0000 DataVersion: 1173571869
@@ -357,7 +357,7 @@
 
           ./chip-tool  descriptor read device-list 1 7
 
-          Verify in TH Log
+          Verify in TH(chip-tool) Log
 
           [1659351105.133982][12125:12130] CHIP:TOO: Endpoint: 7 Cluster: 0x0000_001D Attribute 0x0000_0000 DataVersion: 1309892739
           [1659351105.134087][12125:12130] CHIP:TOO:   device list: 1 entries
@@ -372,7 +372,7 @@
 
           ./chip-tool  descriptor read device-list 1 8
 
-          Verify in TH Log
+          Verify in TH(chip-tool) Log
 
           [1659351107.202771][12131:12136] CHIP:TOO: Endpoint: 8 Cluster: 0x0000_001D Attribute 0x0000_0000 DataVersion: 929721508
           [1659351107.202850][12131:12136] CHIP:TOO:   device list: 1 entries
@@ -387,7 +387,7 @@
 
           ./chip-tool  descriptor read device-list 1 9
 
-          Verify in TH Log
+          Verify in TH(chip-tool) Log
 
           [1657002455.445818][4040:4045] CHIP:TOO: Endpoint: 9 Cluster: 0x0000_001D Attribute 0x0000_0000 DataVersion: 913116116
           [1657002455.445883][4040:4045] CHIP:TOO:   device list: 1 entries
@@ -400,7 +400,7 @@
 
           ./chip-tool  descriptor read device-list 1 10
 
-          Verify in TH Log
+          Verify in TH(chip-tool) Log
 
           [1657002473.100910][4047:4052] CHIP:TOO: Endpoint: 10 Cluster: 0x0000_001D Attribute 0x0000_0000 DataVersion: 259205426
           [1657002473.100967][4047:4052] CHIP:TOO:   device list: 2 entries
@@ -416,7 +416,7 @@
 
           ./chip-tool  descriptor read device-list 1 11
 
-          Verify in TH Log
+          Verify in TH(chip-tool) Log
 
           [1657002495.856770][4061:4066] CHIP:TOO: Endpoint: 11 Cluster: 0x0000_001D Attribute 0x0000_0000 DataVersion: 4248421677
           [1657002495.856836][4061:4066] CHIP:TOO:   device list: 2 entries
@@ -433,7 +433,7 @@
 
           ./chip-tool  descriptor read device-list 1 12
 
-          Verify in TH Log
+          Verify in TH(chip-tool) Log
 
           [1657002515.862187][4073:4078] CHIP:TOO: Endpoint: 12 Cluster: 0x0000_001D Attribute 0x0000_0000 DataVersion: 2731599835
           [1657002515.862249][4073:4078] CHIP:TOO:   device list: 2 entries
@@ -450,7 +450,7 @@
 
           ./chip-tool  descriptor read device-list 1 13
 
-          Verify in TH Log
+          Verify in TH(chip-tool) Log
 
           [1657002538.134605][4097:4102] CHIP:TOO: Endpoint: 13 Cluster: 0x0000_001D Attribute 0x0000_0000 DataVersion: 3449178249
           [1657002538.134700][4097:4102] CHIP:TOO:   device list: 2 entries
@@ -469,18 +469,18 @@
           perform the tests for Bridged Device Basic Information cluster"
       PICS: MCORE.BRIDGE
       verification: |
-          ref to test plan for Bridged Device Basic Information cluster(https://github.com/CHIP-Specifications/chip-test-plans/blob/master/src/cluster/bridged_device_basic_information.adoc)
+          For Bridged Device Basic Information cluster, ref the test plan (https://github.com/CHIP-Specifications/chip-test-plans/blob/master/src/cluster/bridged_device_basic_information.adoc)
 
            ./chip-tool bridgeddevicebasic read reachable 1 3
 
-          Verify reachable attribute is read successfully in TH Log
+          Verify reachable attribute is read successfully in TH(chip-tool) Log
 
           [1657003614.269096][4564:4569] CHIP:TOO: Endpoint: 3 Cluster: 0x0000_0039 Attribute 0x0000_0011 DataVersion: 1897994097
           [1657003614.269155][4564:4569] CHIP:TOO:   Reachable: TRUE
 
           ./chip-tool bridgeddevicebasic read node-label 1 4
 
-          Verify Verify Node-label is read sucessfully in TH Log
+          Verify 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
@@ -494,9 +494,13 @@
           Configuration cluster refers to"
       PICS: MCORE.BRIDGE && MCORE.BRIDGE.BatInfo
       verification: |
-          ref to test plan for Power Source Configuration and Power Source clusters
+          For Power Source Configuration and Power Source clusters, ref the  test plan - Link  Link2
 
-          None of the endpoints listed in step 2b supports Power Source Configuration cluster and Power Source cluster
+          None of the endpoints listed in step 2b supports Power Source Configuration cluster and Power Source cluster.
+
+          If any device lists the PS configuration, then below sample command needs to be executed for all the attributes for the endpoint listed in 2b
+          ./chip-tool powersourceconfiguration read sources 1 0
+          ./chip-tool powersource read status 1 1
       disabled: true
 
     - label:
@@ -505,12 +509,12 @@
           type(s) of the bridged device"
       PICS: MCORE.BRIDGE
       verification: |
-          Verify thedevice-list attribute has devicetype application 1.e, 0x0100 = 256(actuator),0x0302=770( temperature sensor)
+          Verify the device-list attribute has devicetype application e.g., 0x0100 = 256(on/off light),0x0302=770( temperature sensor)
 
 
           ./chip-tool descriptor read device-list 1 3
 
-          Verify in TH Log
+          Verify in TH(chip-tool) Log
 
           [1657003925.553294][4664:4669] CHIP:TOO: Endpoint: 3 Cluster: 0x0000_001D Attribute 0x0000_0000 DataVersion: 2452512872
           [1657003925.553368][4664:4669] CHIP:TOO:   device list: 2 entries
@@ -527,7 +531,7 @@
 
           ./chip-tool descriptor read device-list 1 4
 
-          Verify in TH Log
+          Verify in TH(chip-tool) Log
 
           [1659350396.878528][11929:11934] CHIP:TOO: Endpoint: 4 Cluster: 0x0000_001D Attribute 0x0000_0000 DataVersion: 3398096270
           [1659350396.878598][11929:11934] CHIP:TOO:   device list: 2 entries
@@ -544,7 +548,7 @@
 
           ./chip-tool descriptor read device-list 1 5
 
-          Verify in TH Log
+          Verify in TH(chip-tool) Log
 
           [1659350678.671359][11991:11996] CHIP:TOO: Endpoint: 5 Cluster: 0x0000_001D Attribute 0x0000_0000 DataVersion: 3750503881
           [1659350678.671437][11991:11996] CHIP:TOO:   device list: 2 entries
@@ -561,7 +565,7 @@
 
           ./chip-tool descriptor read device-list 1 6
 
-          Verify in TH Log
+          Verify in TH(chip-tool) Log
 
           [1659350682.392346][11997:12002] CHIP:TOO: Endpoint: 6 Cluster: 0x0000_001D Attribute 0x0000_0000 DataVersion: 2160703024
           [1659350682.392416][11997:12002] CHIP:TOO:   device list: 1 entries
@@ -575,7 +579,7 @@
 
           ./chip-tool descriptor read device-list 1 10
 
-          Verify in TH Log
+          Verify in TH(chip-tool) Log
 
           [1657004074.939061][4704:4709] CHIP:TOO: Endpoint: 10 Cluster: 0x0000_001D Attribute 0x0000_0000 DataVersion: 259205426
           [1657004074.939126][4704:4709] CHIP:TOO:   device list: 2 entries
@@ -591,7 +595,7 @@
 
           ./chip-tool descriptor read device-list 1 11
 
-          Verify in TH Log
+          Verify in TH(chip-tool) Log
 
           [1657004114.075998][4725:4730] CHIP:TOO: Endpoint: 11 Cluster: 0x0000_001D Attribute 0x0000_0000 DataVersion: 4248421677
           [1657004114.076073][4725:4730] CHIP:TOO:   device list: 2 entries
@@ -607,7 +611,7 @@
 
           ./chip-tool descriptor read device-list 1 12
 
-          Verify in TH Log
+          Verify in TH(chip-tool) Log
 
           [1657004134.659723][4737:4742] CHIP:TOO: Endpoint: 12 Cluster: 0x0000_001D Attribute 0x0000_0000 DataVersion: 2731599835
           [1657004134.659785][4737:4742] CHIP:TOO:   device list: 2 entries
@@ -623,7 +627,7 @@
 
           ./chip-tool descriptor read device-list 1 13
 
-          Verify in TH Log
+          Verify in TH(chip-tool) Log
 
           [1657004152.758221][4749:4754] CHIP:TOO: Endpoint: 13 Cluster: 0x0000_001D Attribute 0x0000_0000 DataVersion: 3449178249
           [1657004152.758277][4749:4754] CHIP:TOO:   device list: 2 entries
@@ -642,7 +646,8 @@
           which is an actuator (e.g. light, window covering)"
       PICS: MCORE.BRIDGE
       verification: |
-          Choose on-off cluster as the bridged devices which is an actuator
+          From Step 5 output , choose one of the device type and identfy the device from the device librray.
+          For Ex: on-off cluster has been taken as example to run tfurther steps
       disabled: true
 
     - label:
@@ -651,7 +656,7 @@
       verification: |
           ./chip-tool onoff read on-off 1 3
 
-          Verify the actual state of the bridged device in TH Log
+          Verify the actual state of the bridged device in TH(chip-tool) Log
 
           [1657004454.213279][4792:4798] CHIP:TOO: Endpoint: 3 Cluster: 0x0000_0006 Attribute 0x0000_0000 DataVersion: 3808303315
           [1657004454.213319][4792:4798] CHIP:TOO:   OnOff: FALSE
@@ -663,17 +668,8 @@
       verification: |
           ./chip-tool onoff toggle 1 3
 
-          Verify On bridge-app
 
-          [1657522278.538831][18140:18140] CHIP:DMG: Received command for Endpoint=3 Cluster=0x0000_0006 Command=0x0000_0002
-          [1657522278.538861][18140:18140] CHIP:ZCL: On/Off set value: 3 2
-          [1657522278.538887][18140:18140] CHIP:DL: HandleReadOnOffAttribute: attrId=0, maxReadLength=1
-          [1657522278.538910][18140:18140] CHIP:ZCL: Toggle on/off from 0 to 1
-          [1657522278.538936][18140:18140] CHIP:DL: HandleWriteOnOffAttribute: attrId=0
-          [1657522278.538957][18140:18140] CHIP:DL: Device[Light 1]: ON
-
-
-          Verify actual state of the bridged device changes accordingly in TH Log
+          Verify state change response of the bridged device in TH(chip-tool) Log
 
           [1657522278.539407][16698:16703] CHIP:DMG: {
           [1657522278.539447][16698:16703] CHIP:DMG:         suppressResponse = false,
@@ -711,7 +707,7 @@
       verification: |
           ./chip-tool onoff read on-off 1 3
 
-          Verify the value of onoff matches the value of onoff in step 6c in TH Log
+          Verify the value of onoff matches the value of onoff in step 6c in TH(chip-tool) Log
 
           [1657004565.254591][4804:4809] CHIP:TOO: Endpoint: 3 Cluster: 0x0000_0006 Attribute 0x0000_0000 DataVersion: 3808303316
           [1657004565.254635][4804:4809] CHIP:TOO:   OnOff: TRUE
@@ -723,7 +719,8 @@
           sensor)"
       PICS: MCORE.BRIDGE
       verification: |
-          Choose a sensor device (e.g. temperature sensor, being added to bridge-app)
+          From Step 5 output , choose one of the sensor device type and identfy the device from the device librray.
+          For Ex:  temperature sensor, being added to bridge-app as example to run further steps
       disabled: true
 
     - label:
@@ -741,7 +738,7 @@
           "Change the state of this sensor (e.g. cover the occupancy sensor,
           open the contact sensor, heat the temperature sensor)"
       verification: |
-          Press a key "tbd" on bridge-app to change the simulated temperature
+          Press a key "t" on bridge-app to change the simulated temperature
 
           [1659351537.115828][14237:14242] CHIP:DL: TempSensorDevice[TempSensor 1]: New measurement="200"
           [1659351537.115987][14237:14242] CHIP:DL: TempSensorDevice[TempSensor 2]: New measurement="200"
diff --git a/src/app/tests/suites/certification/Test_TC_BR_2.yaml b/src/app/tests/suites/certification/Test_TC_BR_2.yaml
index c4ac703..45039e7 100644
--- a/src/app/tests/suites/certification/Test_TC_BR_2.yaml
+++ b/src/app/tests/suites/certification/Test_TC_BR_2.yaml
@@ -36,7 +36,7 @@
 
           ./chip-tool descriptor read parts-list 1 0
 
-          Verify in TH Log
+          Verify in TH(chip-tool) Log
 
           [1657004688.484502][4828:4833] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_001D Attribute 0x0000_0003 DataVersion: 3573910940
           [1657004688.484597][4828:4833] CHIP:TOO:   parts list: 12 entries
@@ -55,7 +55,7 @@
 
           ./chip-tool descriptor read parts-list 1 1
 
-          Verify in TH Log
+          Verify in TH(chip-tool) Log
 
           [1657013897.304642][5792:5797] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_001D Attribute 0x0000_0003 DataVersion: 1583672815
           [1657013897.304741][5792:5797] CHIP:TOO:   parts list: 11 entries
@@ -74,7 +74,7 @@
 
           ./chip-tool descriptor read parts-list 1 3
 
-          Verify in TH Log
+          Verify in TH(chip-tool) Log
 
           [1657013905.333904][5805:5810] CHIP:TOO: Endpoint: 3 Cluster: 0x0000_001D Attribute 0x0000_0003 DataVersion: 4168180
           [1657013905.333984][5805:5810] CHIP:TOO:   parts list: 0 entries
@@ -82,7 +82,7 @@
 
           ./chip-tool descriptor read parts-list 1 4
 
-          Verify in TH Log
+          Verify in TH(chip-tool) Log
 
           [1657014011.276060][5822:5827] CHIP:TOO: Endpoint: 4 Cluster: 0x0000_001D Attribute 0x0000_0003 DataVersion: 2935336058
           [1657014011.276141][5822:5827] CHIP:TOO:   parts list: 0 entries
@@ -90,14 +90,14 @@
 
           ./chip-tool descriptor read parts-list 1 5
 
-          Verify in TH Log
+          Verify in TH(chip-tool) Log
 
           [1657014034.298958][5829:5834] CHIP:TOO: Endpoint: 5 Cluster: 0x0000_001D Attribute 0x0000_0003 DataVersion: 3372622835
           [1657014034.299041][5829:5834] CHIP:TOO:   parts list: 0 entries
 
           ./chip-tool descriptor read parts-list 1 6
 
-          Verify in TH Log
+          Verify in TH(chip-tool) Log
 
           [1657014056.893995][5847:5852] CHIP:TOO: Endpoint: 6 Cluster: 0x0000_001D Attribute 0x0000_0003 DataVersion: 1565587733
           [1657014056.894072][5847:5852] CHIP:TOO:   parts list: 3 entries
@@ -107,56 +107,71 @@
 
           ./chip-tool descriptor read parts-list 1 7
 
-          Verify in TH Log
+          Verify in TH(chip-tool) Log
 
           [1657014071.347535][5854:5859] CHIP:TOO: Endpoint: 7 Cluster: 0x0000_001D Attribute 0x0000_0003 DataVersion: 1352552269
           [1657014071.347611][5854:5859] CHIP:TOO:   parts list: 0 entries
 
           ./chip-tool descriptor read parts-list 1 8
 
-          Verify in TH Log
+          Verify in TH(chip-tool) Log
 
           [1657014071.347535][5854:5859] CHIP:TOO: Endpoint: 7 Cluster: 0x0000_001D Attribute 0x0000_0003 DataVersion: 1352552269
           [1657014071.347611][5854:5859] CHIP:TOO:   parts list: 0 entries
 
           ./chip-tool descriptor read parts-list 1 9
 
-          Verify in TH Log
+          Verify in TH(chip-tool) Log
 
           [1657014071.347535][5854:5859] CHIP:TOO: Endpoint: 7 Cluster: 0x0000_001D Attribute 0x0000_0003 DataVersion: 1352552269
           [1657014071.347611][5854:5859] CHIP:TOO:   parts list: 0 entries
 
           ./chip-tool descriptor read parts-list 1 10
 
-          Verify in TH Log
+          Verify in TH(chip-tool) Log
 
           [1657014071.347535][5854:5859] CHIP:TOO: Endpoint: 7 Cluster: 0x0000_001D Attribute 0x0000_0003 DataVersion: 1352552269
           [1657014071.347611][5854:5859] CHIP:TOO:   parts list: 0 entries
 
           ./chip-tool descriptor read parts-list 1 11
 
-          Verify in TH Log
+          Verify in TH(chip-tool) Log
 
           [1657014071.347535][5854:5859] CHIP:TOO: Endpoint: 7 Cluster: 0x0000_001D Attribute 0x0000_0003 DataVersion: 1352552269
           [1657014071.347611][5854:5859] CHIP:TOO:   parts list: 0 entries
 
           ./chip-tool descriptor read parts-list 1 12
 
-          Verify in TH Log
+          Verify in TH(chip-tool) Log
 
           [1657014071.347535][5854:5859] CHIP:TOO: Endpoint: 7 Cluster: 0x0000_001D Attribute 0x0000_0003 DataVersion: 1352552269
           [1657014071.347611][5854:5859] CHIP:TOO:   parts list: 0 entries
 
           ./chip-tool descriptor read parts-list 1 13
 
-          Verify in TH Log
+          Verify in TH(chip-tool) Log
 
           [1657014071.347535][5854:5859] CHIP:TOO: Endpoint: 7 Cluster: 0x0000_001D Attribute 0x0000_0003 DataVersion: 1352552269
           [1657014071.347611][5854:5859] CHIP:TOO:   parts list: 0 entries
 
+
+
+          ./chip-tool  descriptor read device-list 1 0
+
+          Verify in TH(chip-tool) Log
+
+          [1659500855.723987][2484:2490] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_001D Attribute 0x0000_0000 DataVersion: 3659645514
+          [1659500855.724078][2484:2490] CHIP:TOO:   device list: 1 entries
+          [1659500855.724161][2484:2490] CHIP:TOO:     [1]: {
+          [1659500855.724190][2484:2490] CHIP:TOO:       Type: 22
+          [1659500855.724219][2484:2490] CHIP:TOO:       Revision: 1
+          [1659500855.724245][2484:2490] CHIP:TOO:      }
+          [1659500855.724382][2484:2490] CHIP:EM: Sending Standalone Ack for MessageCounter:115141829 on exchange 59132i
+
+
           ./chip-tool  descriptor read device-list 1 1
 
-          Verify in TH Log
+          Verify in TH(chip-tool) Log
 
           [1657014181.180101][5978:5983] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_001D Attribute 0x0000_0000 DataVersion: 1583672815
           [1657014181.180163][5978:5983] CHIP:TOO:   device list: 1 entries
@@ -168,7 +183,7 @@
 
           ./chip-tool descriptor read device-list 1 3
 
-          Verify in TH Log
+          Verify in TH(chip-tool) Log
 
 
           [1657003925.553294][4664:4669] CHIP:TOO: Endpoint: 3 Cluster: 0x0000_001D Attribute 0x0000_0000 DataVersion: 2452512872
@@ -186,7 +201,7 @@
 
           ./chip-tool descriptor read device-list 1 4
 
-          Verify in TH Log
+          Verify in TH(chip-tool) Log
 
           [1657004014.927308][4678:4683] CHIP:TOO: Endpoint: 4 Cluster: 0x0000_001D Attribute 0x0000_0000 DataVersion: 1398882309
           [1657004014.927387][4678:4683] CHIP:TOO:   device list: 2 entries
@@ -201,6 +216,9 @@
 
 
           ./chip-tool descriptor read device-list 1 5
+
+          Verify in TH(chip-tool) Log
+
           [1657004035.789404][4690:4695] CHIP:TOO: Endpoint: 5 Cluster: 0x0000_001D Attribute 0x0000_0000 DataVersion: 130458766
           [1657004035.789470][4690:4695] CHIP:TOO:   device list: 2 entries
           [1657004035.789526][4690:4695] CHIP:TOO:     [1]: {
@@ -215,7 +233,8 @@
 
           ./chip-tool descriptor read device-list 1 6
 
-          Verify in TH Log
+          Verify in TH(chip-tool) Log
+
           [1657004053.597061][4698:4703] CHIP:TOO: Endpoint: 6 Cluster: 0x0000_001D Attribute 0x0000_0000 DataVersion: 295450100
           [1657004053.597116][4698:4703] CHIP:TOO:   device list: 1 entries
           [1657004053.597164][4698:4703] CHIP:TOO:     [1]: {
@@ -226,7 +245,7 @@
 
           ./chip-tool descriptor read device-list 1 10
 
-          Verify in TH Log
+          Verify in TH(chip-tool) Log
 
           [1657004074.939061][4704:4709] CHIP:TOO: Endpoint: 10 Cluster: 0x0000_001D Attribute 0x0000_0000 DataVersion: 259205426
           [1657004074.939126][4704:4709] CHIP:TOO:   device list: 2 entries
@@ -242,7 +261,7 @@
 
           ./chip-tool descriptor read device-list 1 11
 
-          Verify in TH Log
+          Verify in TH(chip-tool) Log
 
           [1657004114.075998][4725:4730] CHIP:TOO: Endpoint: 11 Cluster: 0x0000_001D Attribute 0x0000_0000 DataVersion: 4248421677
           [1657004114.076073][4725:4730] CHIP:TOO:   device list: 2 entries
@@ -258,7 +277,7 @@
 
           ./chip-tool descriptor read device-list 1 12
 
-          Verify in TH Log
+          Verify in TH(chip-tool) Log
 
           [1657004134.659723][4737:4742] CHIP:TOO: Endpoint: 12 Cluster: 0x0000_001D Attribute 0x0000_0000 DataVersion: 2731599835
           [1657004134.659785][4737:4742] CHIP:TOO:   device list: 2 entries
@@ -274,7 +293,7 @@
 
           ./chip-tool descriptor read device-list 1 13
 
-          Verify in TH Log
+          Verify in TH(chip-tool) Log
 
           [1657004152.758221][4749:4754] CHIP:TOO: Endpoint: 13 Cluster: 0x0000_001D Attribute 0x0000_0000 DataVersion: 3449178249
           [1657004152.758277][4749:4754] CHIP:TOO:   device list: 2 entries
@@ -298,7 +317,7 @@
 
           ./chip-tool  descriptor read device-list 1 1
 
-          Verify in TH Log
+          Verify in TH(chip-tool) Log
 
           [1657002313.871608][3977:3982] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_001D Attribute 0x0000_0000 DataVersion: 3021853414
           [1657002313.871680][3977:3982] CHIP:TOO:   device list: 1 entries
@@ -311,7 +330,7 @@
 
           ./chip-tool  descriptor read device-list 1 3
 
-          Verify in TH Log
+          Verify in TH(chip-tool) Log
 
           [1657002329.438065][3983:3988] CHIP:TOO: Endpoint: 3 Cluster: 0x0000_001D Attribute 0x0000_0000 DataVersion: 2452512872
           [1657002329.438135][3983:3988] CHIP:TOO:   device list: 2 entries
@@ -327,7 +346,7 @@
 
           ./chip-tool  descriptor read device-list 1 4
 
-          Verify in TH Log
+          Verify in TH(chip-tool) Log
 
           [1657002348.693948][3989:3994] CHIP:TOO: Endpoint: 4 Cluster: 0x0000_001D Attribute 0x0000_0000 DataVersion: 1398882309
           [1657002348.694013][3989:3994] CHIP:TOO:   device list: 2 entries
@@ -344,7 +363,7 @@
 
           ./chip-tool  descriptor read device-list 1 5
 
-          Verify in TH Log
+          Verify in TH(chip-tool) Log
 
           [1657002369.589492][3996:4001] CHIP:TOO: Endpoint: 5 Cluster: 0x0000_001D Attribute 0x0000_0000 DataVersion: 130458766
           [1657002369.589556][3996:4001] CHIP:TOO:   device list: 2 entries
@@ -361,7 +380,7 @@
 
           ./chip-tool  descriptor read device-list 1 6
 
-          Verify in TH Log
+          Verify in TH(chip-tool) Log
 
           [1657002386.484093][4002:4007] CHIP:TOO: Endpoint: 6 Cluster: 0x0000_001D Attribute 0x0000_0000 DataVersion: 295450100
           [1657002386.484155][4002:4007] CHIP:TOO:   device list: 1 entries
@@ -374,7 +393,7 @@
 
           ./chip-tool  descriptor read device-list 1 7
 
-          Verify in TH Log
+          Verify in TH(chip-tool) Log
 
           [1657002413.721927][4015:4020] CHIP:TOO: Endpoint: 7 Cluster: 0x0000_001D Attribute 0x0000_0000 DataVersion: 2117104859
           [1657002413.721981][4015:4020] CHIP:TOO:   device list: 1 entries
@@ -387,7 +406,7 @@
 
           ./chip-tool  descriptor read device-list 1 8
 
-          Verify in TH Log
+          Verify in TH(chip-tool) Log
 
           [1657002436.415904][4034:4039] CHIP:TOO: Endpoint: 8 Cluster: 0x0000_001D Attribute 0x0000_0000 DataVersion: 2026786918
           [1657002436.415972][4034:4039] CHIP:TOO:   device list: 1 entries
@@ -400,7 +419,7 @@
 
           ./chip-tool  descriptor read device-list 1 9
 
-          Verify in TH Log
+          Verify in TH(chip-tool) Log
 
           [1657002455.445818][4040:4045] CHIP:TOO: Endpoint: 9 Cluster: 0x0000_001D Attribute 0x0000_0000 DataVersion: 913116116
           [1657002455.445883][4040:4045] CHIP:TOO:   device list: 1 entries
@@ -413,7 +432,7 @@
 
           ./chip-tool  descriptor read device-list 1 10
 
-          Verify in TH Log
+          Verify in TH(chip-tool) Log
 
           [1657002473.100910][4047:4052] CHIP:TOO: Endpoint: 10 Cluster: 0x0000_001D Attribute 0x0000_0000 DataVersion: 259205426
           [1657002473.100967][4047:4052] CHIP:TOO:   device list: 2 entries
@@ -430,7 +449,7 @@
 
           ./chip-tool  descriptor read device-list 1 11
 
-          Verify in TH Log
+          Verify in TH(chip-tool) Log
 
           [1657002495.856770][4061:4066] CHIP:TOO: Endpoint: 11 Cluster: 0x0000_001D Attribute 0x0000_0000 DataVersion: 4248421677
           [1657002495.856836][4061:4066] CHIP:TOO:   device list: 2 entries
@@ -447,7 +466,7 @@
 
           ./chip-tool  descriptor read device-list 1 12
 
-          Verify in TH Log
+          Verify in TH(chip-tool) Log
 
           [1657002515.862187][4073:4078] CHIP:TOO: Endpoint: 12 Cluster: 0x0000_001D Attribute 0x0000_0000 DataVersion: 2731599835
           [1657002515.862249][4073:4078] CHIP:TOO:   device list: 2 entries
@@ -464,7 +483,7 @@
 
           ./chip-tool  descriptor read device-list 1 13
 
-          Verify in TH Log
+          Verify in TH(chip-tool) Log
 
           [1657002538.134605][4097:4102] CHIP:TOO: Endpoint: 13 Cluster: 0x0000_001D Attribute 0x0000_0000 DataVersion: 3449178249
           [1657002538.134700][4097:4102] CHIP:TOO:   device list: 2 entries
@@ -494,7 +513,7 @@
 
           ./chip-tool descriptor read parts-list 1 0
 
-          Verify in TH Log
+          Verify in TH(chip-tool) Log
 
           [1657004820.589511][4847:4853] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_001D Attribute 0x0000_0003 DataVersion: 3573910941
           [1657004820.589607][4847:4853] CHIP:TOO:   parts list: 13 entries
@@ -516,7 +535,7 @@
 
           ./chip-tool descriptor read device-list 1 0
 
-          Verify in TH Log
+          Verify in TH(chip-tool) Log
 
           [1657514215.227230][15951:15956] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_001D Attribute 0x0000_0000 DataVersion: 508500617
           [1657514215.227289][15951:15956] CHIP:TOO:   device list: 1 entries
@@ -532,7 +551,7 @@
 
           ./chip-tool descriptor read parts-list 1 1
 
-          Verify in TH Log
+          Verify in TH(chip-tool) Log
 
           [1657004854.903425][4855:4860] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_001D Attribute 0x0000_0003 DataVersion: 3021853415
           [1657004854.903514][4855:4860] CHIP:TOO:   parts list: 12 entries
@@ -552,7 +571,7 @@
 
           ./chip-tool descriptor read device-list 1 1
 
-          Verify in TH Log
+          Verify in TH(chip-tool) Log
 
           [1657514252.212456][15958:15963] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_001D Attribute 0x0000_0000 DataVersion: 2755694332
           [1657514252.212521][15958:15963] CHIP:TOO:   device list: 1 entries
@@ -571,7 +590,7 @@
 
           ./chip-tool descriptor read parts-list 1 0
 
-          Verify in TH Log
+          Verify in TH(chip-tool) Log
 
           [1657014360.649059][5991:5997] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_001D Attribute 0x0000_0003 DataVersion: 2526005575
           [1657014360.649148][5991:5997] CHIP:TOO:   parts list: 13 entries
@@ -592,7 +611,7 @@
 
           ./chip-tool descriptor read parts-list 1 1
 
-          Verify in TH Log
+          Verify in TH(chip-tool) Log
 
           [1657014489.152608][6029:6034] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_001D Attribute 0x0000_0003 DataVersion: 1583672816
           [1657014489.152708][6029:6034] CHIP:TOO:   parts list: 12 entries
@@ -612,28 +631,28 @@
 
           ./chip-tool descriptor read parts-list 1 3
 
-          Verify in TH Log
+          Verify in TH(chip-tool) Log
 
           [1657013905.333904][5805:5810] CHIP:TOO: Endpoint: 3 Cluster: 0x0000_001D Attribute 0x0000_0003 DataVersion: 4168180
           [1657013905.333984][5805:5810] CHIP:TOO:   parts list: 0 entries
 
 
           ./chip-tool descriptor read parts-list 1 4
-          Verify in TH Log
+          Verify in TH(chip-tool) Log
 
           [1657014011.276060][5822:5827] CHIP:TOO: Endpoint: 4 Cluster: 0x0000_001D Attribute 0x0000_0003 DataVersion: 2935336058
           [1657014011.276141][5822:5827] CHIP:TOO:   parts list: 0 entries
 
 
           ./chip-tool descriptor read parts-list 1 5
-          Verify in TH Log
+          Verify in TH(chip-tool) Log
 
           [1657014034.298958][5829:5834] CHIP:TOO: Endpoint: 5 Cluster: 0x0000_001D Attribute 0x0000_0003 DataVersion: 3372622835
           [1657014034.299041][5829:5834] CHIP:TOO:   parts list: 0 entries
 
           ./chip-tool descriptor read parts-list 1 6
 
-          Verify in TH Log
+          Verify in TH(chip-tool) Log
 
           [1657014056.893995][5847:5852] CHIP:TOO: Endpoint: 6 Cluster: 0x0000_001D Attribute 0x0000_0003 DataVersion: 1565587733
           [1657014056.894072][5847:5852] CHIP:TOO:   parts list: 3 entries
@@ -642,55 +661,55 @@
           [1657014056.894154][5847:5852] CHIP:TOO:     [3]: 9
 
           ./chip-tool descriptor read parts-list 1 7
-          Verify in TH Log
+          Verify in TH(chip-tool) Log
 
           [1657014071.347535][5854:5859] CHIP:TOO: Endpoint: 7 Cluster: 0x0000_001D Attribute 0x0000_0003 DataVersion: 1352552269
           [1657014071.347611][5854:5859] CHIP:TOO:   parts list: 0 entries
 
           ./chip-tool descriptor read parts-list 1 8
-          Verify in TH Log
+          Verify in TH(chip-tool) Log
 
           [1657014071.347535][5854:5859] CHIP:TOO: Endpoint: 7 Cluster: 0x0000_001D Attribute 0x0000_0003 DataVersion: 1352552269
           [1657014071.347611][5854:5859] CHIP:TOO:   parts list: 0 entries
 
           ./chip-tool descriptor read parts-list 1 9
-          Verify in TH Log
+          Verify in TH(chip-tool) Log
 
           [1657014071.347535][5854:5859] CHIP:TOO: Endpoint: 7 Cluster: 0x0000_001D Attribute 0x0000_0003 DataVersion: 1352552269
           [1657014071.347611][5854:5859] CHIP:TOO:   parts list: 0 entries
 
           ./chip-tool descriptor read parts-list 1 10
-          Verify in TH Log
+          Verify in TH(chip-tool) Log
 
           [1657014071.347535][5854:5859] CHIP:TOO: Endpoint: 7 Cluster: 0x0000_001D Attribute 0x0000_0003 DataVersion: 1352552269
           [1657014071.347611][5854:5859] CHIP:TOO:   parts list: 0 entries
 
           ./chip-tool descriptor read parts-list 1 11
-          Verify in TH Log
+          Verify in TH(chip-tool) Log
 
           [1657014071.347535][5854:5859] CHIP:TOO: Endpoint: 7 Cluster: 0x0000_001D Attribute 0x0000_0003 DataVersion: 1352552269
           [1657014071.347611][5854:5859] CHIP:TOO:   parts list: 0 entries
 
           ./chip-tool descriptor read parts-list 1 12
-          Verify in TH Log
+          Verify in TH(chip-tool) Log
 
           [1657014071.347535][5854:5859] CHIP:TOO: Endpoint: 7 Cluster: 0x0000_001D Attribute 0x0000_0003 DataVersion: 1352552269
           [1657014071.347611][5854:5859] CHIP:TOO:   parts list: 0 entries
 
           ./chip-tool descriptor read parts-list 1 13
-          Verify in TH Log
+          Verify in TH(chip-tool) Log
 
           [1657014071.347535][5854:5859] CHIP:TOO: Endpoint: 7 Cluster: 0x0000_001D Attribute 0x0000_0003 DataVersion: 1352552269
           [1657014071.347611][5854:5859] CHIP:TOO:   parts list: 0 entries
 
           ./chip-tool  descriptor read parts-list 1 14
-          Verify in TH Log
+          Verify in TH(chip-tool) Log
 
           1657014512.922645][6043:6048] CHIP:TOO: Endpoint: 14 Cluster: 0x0000_001D Attribute 0x0000_0003 DataVersion: 503350386
           [1657014512.922742][6043:6048] CHIP:TOO:   parts list: 0 entries
 
           ./chip-tool  descriptor read device-list 1 1
-          Verify in TH Log
+          Verify in TH(chip-tool) Log
 
           [1657014181.180101][5978:5983] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_001D Attribute 0x0000_0000 DataVersion: 1583672815
           [1657014181.180163][5978:5983] CHIP:TOO:   device list: 1 entries
@@ -701,7 +720,7 @@
 
 
           ./chip-tool descriptor read device-list 1 3
-          Verify in TH Log
+          Verify in TH(chip-tool) Log
 
           [1657003925.553294][4664:4669] CHIP:TOO: Endpoint: 3 Cluster: 0x0000_001D Attribute 0x0000_0000 DataVersion: 2452512872
           [1657003925.553368][4664:4669] CHIP:TOO:   device list: 2 entries
@@ -717,7 +736,7 @@
 
 
           ./chip-tool descriptor read device-list 1 4
-          Verify in TH Log
+          Verify in TH(chip-tool) Log
 
           [1657004014.927308][4678:4683] CHIP:TOO: Endpoint: 4 Cluster: 0x0000_001D Attribute 0x0000_0000 DataVersion: 1398882309
           [1657004014.927387][4678:4683] CHIP:TOO:   device list: 2 entries
@@ -732,7 +751,7 @@
 
 
           ./chip-tool descriptor read device-list 1 5
-          Verify in TH Log
+          Verify in TH(chip-tool) Log
 
           [1657004035.789404][4690:4695] CHIP:TOO: Endpoint: 5 Cluster: 0x0000_001D Attribute 0x0000_0000 DataVersion: 130458766
           [1657004035.789470][4690:4695] CHIP:TOO:   device list: 2 entries
@@ -747,7 +766,7 @@
 
 
           ./chip-tool descriptor read device-list 1 6
-          Verify in TH Log
+          Verify in TH(chip-tool) Log
 
           [1657004053.597061][4698:4703] CHIP:TOO: Endpoint: 6 Cluster: 0x0000_001D Attribute 0x0000_0000 DataVersion: 295450100
           [1657004053.597116][4698:4703] CHIP:TOO:   device list: 1 entries
@@ -758,7 +777,7 @@
 
 
           ./chip-tool descriptor read device-list 1 10
-          Verify in TH Log
+          Verify in TH(chip-tool) Log
 
           [1657004074.939061][4704:4709] CHIP:TOO: Endpoint: 10 Cluster: 0x0000_001D Attribute 0x0000_0000 DataVersion: 259205426
           [1657004074.939126][4704:4709] CHIP:TOO:   device list: 2 entries
@@ -773,7 +792,7 @@
 
 
           ./chip-tool descriptor read device-list 1 11
-          Verify in TH Log
+          Verify in TH(chip-tool) Log
 
           [1657004114.075998][4725:4730] CHIP:TOO: Endpoint: 11 Cluster: 0x0000_001D Attribute 0x0000_0000 DataVersion: 4248421677
           [1657004114.076073][4725:4730] CHIP:TOO:   device list: 2 entries
@@ -788,7 +807,7 @@
 
 
           ./chip-tool descriptor read device-list 1 12
-          Verify in TH Log
+          Verify in TH(chip-tool) Log
 
           [1657004134.659723][4737:4742] CHIP:TOO: Endpoint: 12 Cluster: 0x0000_001D Attribute 0x0000_0000 DataVersion: 2731599835
           [1657004134.659785][4737:4742] CHIP:TOO:   device list: 2 entries
@@ -803,7 +822,7 @@
 
 
           ./chip-tool descriptor read device-list 1 13
-          Verify in TH Log
+          Verify in TH(chip-tool) Log
 
           [1657004152.758221][4749:4754] CHIP:TOO: Endpoint: 13 Cluster: 0x0000_001D Attribute 0x0000_0000 DataVersion: 3449178249
           [1657004152.758277][4749:4754] CHIP:TOO:   device list: 2 entries
@@ -819,7 +838,7 @@
 
 
           ./chip-tool  descriptor read device-list 1 14
-          Verify in TH Log
+          Verify in TH(chip-tool) Log
 
           [1657014545.912534][6051:6056] CHIP:TOO: Endpoint: 14 Cluster: 0x0000_001D Attribute 0x0000_0000 DataVersion: 503350386
           [1657014545.912595][6051:6056] CHIP:TOO:   device list: 2 entries
@@ -840,10 +859,13 @@
       verification: |
           Verify step 6 and 7 of TC-BR-1 for bridged device added in step 2 of TC-BR-2
 
-          For actuator follow below steps:
+          For actuator,
+          "From Step 5 output of TC-BR-1 , choose one of the device type and identfy the device from the device librray.
+          For Ex: on-off cluster has been taken as example to run tfurther steps" follow below steps
+
           1) Choose on-off cluster as the bridged devices which is an actuator
           2) ./chip-tool onoff read on-off 1 3
-          Verify the actual state of the bridged device in TH Log
+          Verify the actual state of the bridged device in TH(chip-tool) Log
           [1657004454.213279][4792:4798] CHIP:TOO: Endpoint: 3 Cluster: 0x0000_0006 Attribute 0x0000_0000 DataVersion: 3808303315
           [1657004454.213319][4792:4798] CHIP:TOO:   OnOff: FALSE
 
@@ -856,7 +878,7 @@
           [1657522278.538936][18140:18140] CHIP:DL: HandleWriteOnOffAttribute: attrId=0
           [1657522278.538957][18140:18140] CHIP:DL: Device[Light 1]: ON
 
-          Verify actual state of the bridged device changes accordingly in TH Log
+          Verify actual state of the bridged device changes accordingly in TH(chip-tool) Log
           [1657522278.539407][16698:16703] CHIP:DMG: {
           [1657522278.539447][16698:16703] CHIP:DMG:         suppressResponse = false,
           [1657522278.539495][16698:16703] CHIP:DMG:         InvokeResponseIBs =
@@ -889,23 +911,25 @@
           [1657522278.540981][16698:16703] CHIP:DMG: ICR moving to [AwaitingDe]
 
           4)./chip-tool onoff read on-off 1 3
-          Verify the value of onoff matches the value of onoff in step 6c in TH Log
+          Verify the value of onoff matches the value of onoff in step 6c in TH(chip-tool) Log
           [1657004565.254591][4804:4809] CHIP:TOO: Endpoint: 3 Cluster: 0x0000_0006 Attribute 0x0000_0000 DataVersion: 3808303316
           [1657004565.254635][4804:4809] CHIP:TOO:   OnOff: TRUE
 
 
+          For sensor
+          "From Step 5 output , choose one of the sensor device type and identfy the device from the device librray.
+          For Ex:  temperature sensor, being added to bridge-app as example to run further steps "follow below steps:
 
-
-
-
-          For sensor follow below steps:
           1) Choose a sensor device (e.g. temperature sensor, being added to bridge-app)
           2) ./chip-tool temperaturemeasurement read measured-value 1 4
+
+          Verify on TH(chip-tool) Log
           [1659351487.005743][12201:12207] CHIP:TOO: Endpoint: 4 Cluster: 0x0000_0402 Attribute 0x0000_0000 DataVersion: 2406690152
           [1659351487.005831][12201:12207] CHIP:TOO:   MeasuredValue: 100
           [1659351487.005924][12201:12207] CHIP:EM: Sending Standalone Ack for MessageCounter:236763897 on exchange 8128i
 
           3) Press a key "tbd" on bridge-app to change the simulated temperature
+          Verify on bridge-app
           [1659351537.115828][14237:14242] CHIP:DL: TempSensorDevice[TempSensor 1]: New measurement=""200""
           [1659351537.115987][14237:14242] CHIP:DL: TempSensorDevice[TempSensor 2]: New measurement=""200""
           [1659351537.116097][14237:14242] CHIP:DL: TempSensorDevice[Composed TempSensor 1]: New measurement=""200""
@@ -915,6 +939,8 @@
           [1659351537.116179][14237:14242] CHIP:DL: TempSensorDevice[Composed TempSensor 2]: New measurement=""200""
 
           4)./chip-tool temperaturemeasurement read measured-value 1 4
+
+          Verify on TH(chip-tool) Log
           [1659351542.393349][12212:12217] CHIP:TOO: Endpoint: 4 Cluster: 0x0000_0402 Attribute 0x0000_0000 DataVersion: 2406690153
           [1659351542.393429][12212:12217] CHIP:TOO:   MeasuredValue: 200
           [1659351542.393552][12212:12217] CHIP:EM: Sending Standalone Ack for MessageCounter:120981971 on exchange 25924i
@@ -936,7 +962,7 @@
 
           ./chip-tool descriptor read parts-list 1 0
 
-          Verify in TH Log
+          Verify in TH(chip-tool) Log
 
           [1657005165.790283][4885:4890] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_001D Attribute 0x0000_0003 DataVersion: 3573910942
           [1657005165.790379][4885:4890] CHIP:TOO:   parts list: 12 entries
@@ -956,7 +982,7 @@
           Verify that DeviceTypeList has not changed compared to step 1a
           ./chip-tool descriptor read device-list 1 0
 
-          Verify in TH Log
+          Verify in TH(chip-tool) Log
 
           [1657514215.227230][15951:15956] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_001D Attribute 0x0000_0000 DataVersion: 508500617
           [1657514215.227289][15951:15956] CHIP:TOO:   device list: 1 entries
@@ -972,7 +998,7 @@
 
           ./chip-tool descriptor read parts-list 1 1
 
-          Verify in TH Log
+          Verify in TH(chip-tool) Log
 
           [1657005188.474784][4893:4898] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_001D Attribute 0x0000_0003 DataVersion: 3021853416
           [1657005188.474879][4893:4898] CHIP:TOO:   parts list: 11 entries
@@ -991,7 +1017,7 @@
 
           ./chip-tool descriptor read device-list 1 1
 
-          Verify in TH Log
+          Verify in TH(chip-tool) Log
 
           [1657514252.212456][15958:15963] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_001D Attribute 0x0000_0000 DataVersion: 2755694332
           [1657514252.212521][15958:15963] CHIP:TOO:   device list: 1 entries
@@ -1006,11 +1032,11 @@
           cluster of all other endpoints listed in the PartsList attribute in
           the Descriptor cluster of endpoint 0"
       verification: |
-          Eead device-list and parts-list with EP 0 and verify the contents is not changed when compared to step 1a
+          Each device-list and parts-list with EP 0 and verify the contents is not changed when compared to step 1a
 
           ./chip-tool descriptor read parts-list 1 0
 
-          Verify in TH Log
+          Verify in TH(chip-tool) Log
 
           [1657014638.415060][6061:6066] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_001D Attribute 0x0000_0003 DataVersion: 2526005576
           [1657014638.415201][6061:6066] CHIP:TOO:   parts list: 12 entries
@@ -1031,7 +1057,7 @@
 
           ./chip-tool descriptor read parts-list 1 1
 
-          Verify in TH Log
+          Verify in TH(chip-tool) Log
 
           [1657014672.768932][6068:6073] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_001D Attribute 0x0000_0003 DataVersion: 1583672817
           [1657014672.769082][6068:6073] CHIP:TOO:   parts list: 11 entries
@@ -1051,7 +1077,7 @@
 
           ./chip-tool descriptor read parts-list 1 4
 
-          Verify in TH Log
+          Verify in TH(chip-tool) Log
 
           [1657014011.276060][5822:5827] CHIP:TOO: Endpoint: 4 Cluster: 0x0000_001D Attribute 0x0000_0003 DataVersion: 2935336058
           [1657014011.276141][5822:5827] CHIP:TOO:   parts list: 0 entries
@@ -1059,14 +1085,14 @@
 
           ./chip-tool descriptor read parts-list 1 5
 
-          Verify in TH Log
+          Verify in TH(chip-tool) Log
 
           [1657014034.298958][5829:5834] CHIP:TOO: Endpoint: 5 Cluster: 0x0000_001D Attribute 0x0000_0003 DataVersion: 3372622835
           [1657014034.299041][5829:5834] CHIP:TOO:   parts list: 0 entries
 
           ./chip-tool descriptor read parts-list 1 6
 
-          Verify in TH Log
+          Verify in TH(chip-tool) Log
 
           [1657014056.893995][5847:5852] CHIP:TOO: Endpoint: 6 Cluster: 0x0000_001D Attribute 0x0000_0003 DataVersion: 1565587733
           [1657014056.894072][5847:5852] CHIP:TOO:   parts list: 3 entries
@@ -1076,63 +1102,63 @@
 
           ./chip-tool descriptor read parts-list 1 7
 
-          Verify in TH Log
+          Verify in TH(chip-tool) Log
 
           [1657014071.347535][5854:5859] CHIP:TOO: Endpoint: 7 Cluster: 0x0000_001D Attribute 0x0000_0003 DataVersion: 1352552269
           [1657014071.347611][5854:5859] CHIP:TOO:   parts list: 0 entries
 
           ./chip-tool descriptor read parts-list 1 8
 
-          Verify in TH Log
+          Verify in TH(chip-tool) Log
 
           [1657014071.347535][5854:5859] CHIP:TOO: Endpoint: 7 Cluster: 0x0000_001D Attribute 0x0000_0003 DataVersion: 1352552269
           [1657014071.347611][5854:5859] CHIP:TOO:   parts list: 0 entries
 
           ./chip-tool descriptor read parts-list 1 9
 
-          Verify in TH Log
+          Verify in TH(chip-tool) Log
 
           [1657014071.347535][5854:5859] CHIP:TOO: Endpoint: 7 Cluster: 0x0000_001D Attribute 0x0000_0003 DataVersion: 1352552269
           [1657014071.347611][5854:5859] CHIP:TOO:   parts list: 0 entries
 
           ./chip-tool descriptor read parts-list 1 10
 
-          Verify in TH Log
+          Verify in TH(chip-tool) Log
 
           [1657014071.347535][5854:5859] CHIP:TOO: Endpoint: 7 Cluster: 0x0000_001D Attribute 0x0000_0003 DataVersion: 1352552269
           [1657014071.347611][5854:5859] CHIP:TOO:   parts list: 0 entries
 
           ./chip-tool descriptor read parts-list 1 11
 
-          Verify in TH Log
+          Verify in TH(chip-tool) Log
 
           [1657014071.347535][5854:5859] CHIP:TOO: Endpoint: 7 Cluster: 0x0000_001D Attribute 0x0000_0003 DataVersion: 1352552269
           [1657014071.347611][5854:5859] CHIP:TOO:   parts list: 0 entries
 
           ./chip-tool descriptor read parts-list 1 12
 
-          Verify in TH Log
+          Verify in TH(chip-tool) Log
 
           [1657014071.347535][5854:5859] CHIP:TOO: Endpoint: 7 Cluster: 0x0000_001D Attribute 0x0000_0003 DataVersion: 1352552269
           [1657014071.347611][5854:5859] CHIP:TOO:   parts list: 0 entries
 
           ./chip-tool descriptor read parts-list 1 13
 
-          Verify in TH Log
+          Verify in TH(chip-tool) Log
 
           [1657014071.347535][5854:5859] CHIP:TOO: Endpoint: 7 Cluster: 0x0000_001D Attribute 0x0000_0003 DataVersion: 1352552269
           [1657014071.347611][5854:5859] CHIP:TOO:   parts list: 0 entries
 
           ./chip-tool  descriptor read parts-list 1 14
 
-          Verify in TH Log
+          Verify in TH(chip-tool) Log
 
           1657014512.922645][6043:6048] CHIP:TOO: Endpoint: 14 Cluster: 0x0000_001D Attribute 0x0000_0003 DataVersion: 503350386
           [1657014512.922742][6043:6048] CHIP:TOO:   parts list: 0 entries
 
           ./chip-tool  descriptor read device-list 1 1
 
-          Verify in TH Log
+          Verify in TH(chip-tool) Log
 
           [1657014181.180101][5978:5983] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_001D Attribute 0x0000_0000 DataVersion: 1583672815
           [1657014181.180163][5978:5983] CHIP:TOO:   device list: 1 entries
@@ -1144,7 +1170,7 @@
 
           ./chip-tool descriptor read device-list 1 4
 
-          Verify in TH Log
+          Verify in TH(chip-tool) Log
 
           [1657004014.927308][4678:4683] CHIP:TOO: Endpoint: 4 Cluster: 0x0000_001D Attribute 0x0000_0000 DataVersion: 1398882309
           [1657004014.927387][4678:4683] CHIP:TOO:   device list: 2 entries
@@ -1160,7 +1186,7 @@
 
           ./chip-tool descriptor read device-list 1 5
 
-          Verify in TH Log
+          Verify in TH(chip-tool) Log
 
           [1657004035.789404][4690:4695] CHIP:TOO: Endpoint: 5 Cluster: 0x0000_001D Attribute 0x0000_0000 DataVersion: 130458766
           [1657004035.789470][4690:4695] CHIP:TOO:   device list: 2 entries
@@ -1176,7 +1202,7 @@
 
           ./chip-tool descriptor read device-list 1 6
 
-          Verify in TH Log
+          Verify in TH(chip-tool) Log
 
           [1657004053.597061][4698:4703] CHIP:TOO: Endpoint: 6 Cluster: 0x0000_001D Attribute 0x0000_0000 DataVersion: 295450100
           [1657004053.597116][4698:4703] CHIP:TOO:   device list: 1 entries
@@ -1188,7 +1214,8 @@
 
           ./chip-tool descriptor read device-list 1 10
 
-          Verify in TH Log
+          Verify in TH(chip-tool) Log
+
           [1657004074.939061][4704:4709] CHIP:TOO: Endpoint: 10 Cluster: 0x0000_001D Attribute 0x0000_0000 DataVersion: 259205426
           [1657004074.939126][4704:4709] CHIP:TOO:   device list: 2 entries
           [1657004074.939178][4704:4709] CHIP:TOO:     [1]: {
@@ -1203,7 +1230,7 @@
 
           ./chip-tool descriptor read device-list 1 11
 
-          Verify in TH Log
+          Verify in TH(chip-tool) Log
 
           [1657004114.075998][4725:4730] CHIP:TOO: Endpoint: 11 Cluster: 0x0000_001D Attribute 0x0000_0000 DataVersion: 4248421677
           [1657004114.076073][4725:4730] CHIP:TOO:   device list: 2 entries
@@ -1219,7 +1246,7 @@
 
           ./chip-tool descriptor read device-list 1 12
 
-          Verify in TH Log
+          Verify in TH(chip-tool) Log
 
           [1657004134.659723][4737:4742] CHIP:TOO: Endpoint: 12 Cluster: 0x0000_001D Attribute 0x0000_0000 DataVersion: 2731599835
           [1657004134.659785][4737:4742] CHIP:TOO:   device list: 2 entries
@@ -1235,7 +1262,7 @@
 
           ./chip-tool descriptor read device-list 1 13
 
-          Verify in TH Log
+          Verify in TH(chip-tool) Log
 
           [1657004152.758221][4749:4754] CHIP:TOO: Endpoint: 13 Cluster: 0x0000_001D Attribute 0x0000_0000 DataVersion: 3449178249
           [1657004152.758277][4749:4754] CHIP:TOO:   device list: 2 entries
@@ -1252,7 +1279,7 @@
 
           ./chip-tool  descriptor read device-list 1 14
 
-          Verify in TH Log
+          Verify in TH(chip-tool) Log
 
           [1657014545.912534][6051:6056] CHIP:TOO: Endpoint: 14 Cluster: 0x0000_001D Attribute 0x0000_0000 DataVersion: 503350386
           [1657014545.912595][6051:6056] CHIP:TOO:   device list: 2 entries
@@ -1289,7 +1316,7 @@
 
           ./chip-tool descriptor read parts-list 1 0
 
-          Verify in TH Log
+          Verify in TH(chip-tool) Log
 
           [1657005275.756668][4900:4905] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_001D Attribute 0x0000_0003 DataVersion: 3573910943
           [1657005275.756770][4900:4905] CHIP:TOO:   parts list: 13 entries
@@ -1311,7 +1338,7 @@
 
           ./chip-tool descriptor read device-list 1 1
 
-          Verify in TH Log
+          Verify in TH(chip-tool) Log
 
           [1657514252.212456][15958:15963] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_001D Attribute 0x0000_0000 DataVersion: 2755694332
           [1657514252.212521][15958:15963] CHIP:TOO:   device list: 1 entries
@@ -1329,7 +1356,7 @@
           ./chip-tool descriptor read parts-list 1 1
 
 
-          Verify in TH Log
+          Verify in TH(chip-tool) Log
 
           [1657005310.589940][4938:4943] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_001D Attribute 0x0000_0003 DataVersion: 3021853417
           [1657005310.590033][4938:4943] CHIP:TOO:   parts list: 12 entries
@@ -1349,7 +1376,7 @@
 
           ./chip-tool descriptor read device-list 1 1
 
-          Verify in TH Log
+          Verify in TH(chip-tool) Log
 
           [1657514252.212456][15958:15963] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_001D Attribute 0x0000_0000 DataVersion: 2755694332
           [1657514252.212521][15958:15963] CHIP:TOO:   device list: 1 entries
@@ -1366,7 +1393,7 @@
       verification: |
           ./chip-tool descriptor read parts-list 1 0
 
-          Verify in TH Log
+          Verify in TH(chip-tool) Log
 
           [1657005275.756668][4900:4905] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_001D Attribute 0x0000_0003 DataVersion: 3573910943
           [1657005275.756770][4900:4905] CHIP:TOO:   parts list: 13 entries
@@ -1387,7 +1414,7 @@
 
           ./chip-tool descriptor read parts-list 1 1
 
-          Verify in TH Log
+          Verify in TH(chip-tool) Log
 
           [1657005310.589940][4938:4943] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_001D Attribute 0x0000_0003 DataVersion: 3021853417
           [1657005310.590033][4938:4943] CHIP:TOO:   parts list: 12 entries
@@ -1407,19 +1434,31 @@
 
 
           ./chip-tool  descriptor read parts-list 1 15
+
+          Verify in TH(chip-tool) Log
+
           [1657014783.484273][6118:6123] CHIP:TOO: Endpoint: 15 Cluster: 0x0000_001D Attribute 0x0000_0003 DataVersion: 2738912500
           [1657014783.484345][6118:6123] CHIP:TOO:   parts list: 0 entries
 
           ./chip-tool descriptor read parts-list 1 4
+
+          Verify in TH(chip-tool) Log
+
           [1657014011.276060][5822:5827] CHIP:TOO: Endpoint: 4 Cluster: 0x0000_001D Attribute 0x0000_0003 DataVersion: 2935336058
           [1657014011.276141][5822:5827] CHIP:TOO:   parts list: 0 entries
 
 
           ./chip-tool descriptor read parts-list 1 5
+
+          Verify in TH(chip-tool) Log
+
           [1657014034.298958][5829:5834] CHIP:TOO: Endpoint: 5 Cluster: 0x0000_001D Attribute 0x0000_0003 DataVersion: 3372622835
           [1657014034.299041][5829:5834] CHIP:TOO:   parts list: 0 entries
 
           ./chip-tool descriptor read parts-list 1 6
+
+          Verify in TH(chip-tool) Log
+
           [1657014056.893995][5847:5852] CHIP:TOO: Endpoint: 6 Cluster: 0x0000_001D Attribute 0x0000_0003 DataVersion: 1565587733
           [1657014056.894072][5847:5852] CHIP:TOO:   parts list: 3 entries
           [1657014056.894104][5847:5852] CHIP:TOO:     [1]: 7
@@ -1427,34 +1466,58 @@
           [1657014056.894154][5847:5852] CHIP:TOO:     [3]: 9
 
           ./chip-tool descriptor read parts-list 1 7
+
+          Verify in TH(chip-tool) Log
+
           [1657014071.347535][5854:5859] CHIP:TOO: Endpoint: 7 Cluster: 0x0000_001D Attribute 0x0000_0003 DataVersion: 1352552269
           [1657014071.347611][5854:5859] CHIP:TOO:   parts list: 0 entries
 
           ./chip-tool descriptor read parts-list 1 8
+
+          Verify in TH(chip-tool) Log
+
           [1657014071.347535][5854:5859] CHIP:TOO: Endpoint: 7 Cluster: 0x0000_001D Attribute 0x0000_0003 DataVersion: 1352552269
           [1657014071.347611][5854:5859] CHIP:TOO:   parts list: 0 entries
 
           ./chip-tool descriptor read parts-list 1 9
+
+          Verify in TH(chip-tool) Log
+
           [1657014071.347535][5854:5859] CHIP:TOO: Endpoint: 7 Cluster: 0x0000_001D Attribute 0x0000_0003 DataVersion: 1352552269
           [1657014071.347611][5854:5859] CHIP:TOO:   parts list: 0 entries
 
           ./chip-tool descriptor read parts-list 1 10
+
+          Verify in TH(chip-tool) Log
+
           [1657014071.347535][5854:5859] CHIP:TOO: Endpoint: 7 Cluster: 0x0000_001D Attribute 0x0000_0003 DataVersion: 1352552269
           [1657014071.347611][5854:5859] CHIP:TOO:   parts list: 0 entries
 
           ./chip-tool descriptor read parts-list 1 11
+
+          Verify in TH(chip-tool) Log
+
           [1657014071.347535][5854:5859] CHIP:TOO: Endpoint: 7 Cluster: 0x0000_001D Attribute 0x0000_0003 DataVersion: 1352552269
           [1657014071.347611][5854:5859] CHIP:TOO:   parts list: 0 entries
 
           ./chip-tool descriptor read parts-list 1 12
+
+          Verify in TH(chip-tool) Log
+
           [1657014071.347535][5854:5859] CHIP:TOO: Endpoint: 7 Cluster: 0x0000_001D Attribute 0x0000_0003 DataVersion: 1352552269
           [1657014071.347611][5854:5859] CHIP:TOO:   parts list: 0 entries
 
           ./chip-tool descriptor read parts-list 1 13
+
+          Verify in TH(chip-tool) Log
+
           [1657014071.347535][5854:5859] CHIP:TOO: Endpoint: 7 Cluster: 0x0000_001D Attribute 0x0000_0003 DataVersion: 1352552269
           [1657014071.347611][5854:5859] CHIP:TOO:   parts list: 0 entries
 
           ./chip-tool  descriptor read parts-list 1 14
+
+          Verify in TH(chip-tool) Log
+
           1657014512.922645][6043:6048] CHIP:TOO: Endpoint: 14 Cluster: 0x0000_001D Attribute 0x0000_0003 DataVersion: 503350386
           [1657014512.922742][6043:6048] CHIP:TOO:   parts list: 0 entries
 
@@ -1462,6 +1525,9 @@
 
 
           ./chip-tool  descriptor read device-list 1 15
+
+          Verify in TH(chip-tool) Log
+
           [1657014818.210651][6132:6137] CHIP:TOO: Endpoint: 15 Cluster: 0x0000_001D Attribute 0x0000_0000 DataVersion: 2738912500
           [1657014818.210711][6132:6137] CHIP:TOO:   device list: 2 entries
           [1657014818.210759][6132:6137] CHIP:TOO:     [1]: {
@@ -1474,6 +1540,9 @@
           [1657014818.210939][6132:6137] CHIP:TOO:      }
 
           ./chip-tool  descriptor read device-list 1 1
+
+          Verify in TH(chip-tool) Log
+
           [1657014181.180101][5978:5983] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_001D Attribute 0x0000_0000 DataVersion: 1583672815
           [1657014181.180163][5978:5983] CHIP:TOO:   device list: 1 entries
           [1657014181.180244][5978:5983] CHIP:TOO:     [1]: {
@@ -1483,6 +1552,9 @@
 
 
           ./chip-tool descriptor read device-list 1 4
+
+          Verify in TH(chip-tool) Log
+
           [1657004014.927308][4678:4683] CHIP:TOO: Endpoint: 4 Cluster: 0x0000_001D Attribute 0x0000_0000 DataVersion: 1398882309
           [1657004014.927387][4678:4683] CHIP:TOO:   device list: 2 entries
           [1657004014.927460][4678:4683] CHIP:TOO:     [1]: {
@@ -1496,6 +1568,9 @@
 
 
           ./chip-tool descriptor read device-list 1 5
+
+          Verify in TH(chip-tool) Log
+
           [1657004035.789404][4690:4695] CHIP:TOO: Endpoint: 5 Cluster: 0x0000_001D Attribute 0x0000_0000 DataVersion: 130458766
           [1657004035.789470][4690:4695] CHIP:TOO:   device list: 2 entries
           [1657004035.789526][4690:4695] CHIP:TOO:     [1]: {
@@ -1509,6 +1584,9 @@
 
 
           ./chip-tool descriptor read device-list 1 6
+
+          Verify in TH(chip-tool) Log
+
           [1657004053.597061][4698:4703] CHIP:TOO: Endpoint: 6 Cluster: 0x0000_001D Attribute 0x0000_0000 DataVersion: 295450100
           [1657004053.597116][4698:4703] CHIP:TOO:   device list: 1 entries
           [1657004053.597164][4698:4703] CHIP:TOO:     [1]: {
@@ -1518,6 +1596,9 @@
 
 
           ./chip-tool descriptor read device-list 1 10
+
+          Verify in TH(chip-tool) Log
+
           [1657004074.939061][4704:4709] CHIP:TOO: Endpoint: 10 Cluster: 0x0000_001D Attribute 0x0000_0000 DataVersion: 259205426
           [1657004074.939126][4704:4709] CHIP:TOO:   device list: 2 entries
           [1657004074.939178][4704:4709] CHIP:TOO:     [1]: {
@@ -1531,6 +1612,9 @@
 
 
           ./chip-tool descriptor read device-list 1 11
+
+          Verify in TH(chip-tool) Log
+
           [1657004114.075998][4725:4730] CHIP:TOO: Endpoint: 11 Cluster: 0x0000_001D Attribute 0x0000_0000 DataVersion: 4248421677
           [1657004114.076073][4725:4730] CHIP:TOO:   device list: 2 entries
           [1657004114.076130][4725:4730] CHIP:TOO:     [1]: {
@@ -1544,6 +1628,9 @@
 
 
           ./chip-tool descriptor read device-list 1 12
+
+          Verify in TH(chip-tool) Log
+
           [1657004134.659723][4737:4742] CHIP:TOO: Endpoint: 12 Cluster: 0x0000_001D Attribute 0x0000_0000 DataVersion: 2731599835
           [1657004134.659785][4737:4742] CHIP:TOO:   device list: 2 entries
           [1657004134.659835][4737:4742] CHIP:TOO:     [1]: {
@@ -1557,6 +1644,9 @@
 
 
           ./chip-tool descriptor read device-list 1 13
+
+          Verify in TH(chip-tool) Log
+
           [1657004152.758221][4749:4754] CHIP:TOO: Endpoint: 13 Cluster: 0x0000_001D Attribute 0x0000_0000 DataVersion: 3449178249
           [1657004152.758277][4749:4754] CHIP:TOO:   device list: 2 entries
           [1657004152.758323][4749:4754] CHIP:TOO:     [1]: {
@@ -1571,6 +1661,9 @@
 
 
           ./chip-tool  descriptor read device-list 1 14
+
+          Verify in TH(chip-tool) Log
+
           [1657014545.912534][6051:6056] CHIP:TOO: Endpoint: 14 Cluster: 0x0000_001D Attribute 0x0000_0000 DataVersion: 503350386
           [1657014545.912595][6051:6056] CHIP:TOO:   device list: 2 entries
           [1657014545.912645][6051:6056] CHIP:TOO:     [1]: {
diff --git a/src/app/tests/suites/certification/Test_TC_BR_3.yaml b/src/app/tests/suites/certification/Test_TC_BR_3.yaml
index 53cc770..52dcf84 100644
--- a/src/app/tests/suites/certification/Test_TC_BR_3.yaml
+++ b/src/app/tests/suites/certification/Test_TC_BR_3.yaml
@@ -33,7 +33,7 @@
 
           ./chip-tool bridgeddevicebasic read node-label 1 3
 
-          Verify in TH Log
+          Verify in TH(chip-tool) Log
           [1657013337.140125][5753:5758] CHIP:TOO: Endpoint: 3 Cluster: 0x0000_0039 Attribute 0x0000_0005 DataVersion: 3293551312
           [1657013337.140235][5753:5758] CHIP:TOO:   NodeLabel: Light 1
       disabled: true
@@ -56,7 +56,7 @@
 
           ./chip-tool bridgeddevicebasic read node-label 1 3
 
-          Verify in TH Log
+          Verify in TH(chip-tool) Log
           [1657013347.277584][5759:5764] CHIP:TOO: Endpoint: 3 Cluster: 0x0000_0039 Attribute 0x0000_0005 DataVersion: 3293551313
           [1657013347.277631][5759:5764] CHIP:TOO:   NodeLabel: Light 1b
       disabled: true
@@ -68,7 +68,7 @@
           lights brightness)"
       PICS: MCORE.BRIDGE && MCORE.BRIDGE.OtherControl
       verification: |
-          Choose on-off cluster
+          Choose on-off cluster on EP 3
       disabled: true
 
     - label: "Read the state (e.g. on/off, brightness) of that bridged device"
@@ -77,7 +77,7 @@
 
           ./chip-tool onoff read on-off 1 3
 
-          Verify in TH Log
+          Verify in TH(chip-tool) Log
           [1657004565.254591][4804:4809] CHIP:TOO: Endpoint: 3 Cluster: 0x0000_0006 Attribute 0x0000_0000 DataVersion: 3808303316
           [1657004565.254635][4804:4809] CHIP:TOO:   OnOff: TRUE
       disabled: true
@@ -91,11 +91,11 @@
 
     - label: "Read the state of that bridged device again (as in 2b)"
       verification: |
-          Read OnOff attribute of On/Off cluster and verify the value is different comapred to step 2b
+          Read OnOff attribute of On/Off cluster and verify the value is different compared to step 2b
 
           ./chip-tool onoff read on-off 1 3
 
-          Verify in TH Log
+          Verify in TH(chip-tool) Log
           [1657004454.213279][4792:4798] CHIP:TOO: Endpoint: 3 Cluster: 0x0000_0006 Attribute 0x0000_0000 DataVersion: 3808303315
           [1657004454.213319][4792:4798] CHIP:TOO:   OnOff: FALSE
       disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_BR_4.yaml b/src/app/tests/suites/certification/Test_TC_BR_4.yaml
index 6fdf3aa..e836b98 100644
--- a/src/app/tests/suites/certification/Test_TC_BR_4.yaml
+++ b/src/app/tests/suites/certification/Test_TC_BR_4.yaml
@@ -24,21 +24,24 @@
     endpoint: 0
 
 tests:
+    - label: "Note"
+      verification: |
+          For DUT as client test cases, Chip-tool command used below are an example to verify the functionality. For certification test, we expect DUT should have a capability or way to run the equivalent command.
+      disabled: true
+
     - label:
           "Start bridge-app on TH. Commission TH to DUT. Monitor traffic between
           DUT and TH."
       verification: |
-          On TH server side:
           sudo ./chip-bridge-app
 
-          On DUT as client side:
           ./chip-tool pairing ethernet 1 20202021 3840 fe80::e65f:1ff:fe0f:2753  5540
 
           Verify DeviceTypeList for available EP
 
           ./chip-tool  descriptor read device-list 1 1
 
-          On DUT as client side:
+          Verify in TH(all-clusters-app) Log:
           [1657002313.871608][3977:3982] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_001D Attribute 0x0000_0000 DataVersion: 3021853414
           [1657002313.871680][3977:3982] CHIP:TOO:   device list: 1 entries
           [1657002313.871740][3977:3982] CHIP:TOO:     [1]: {
@@ -48,7 +51,7 @@
 
           ./chip-tool  descriptor read device-list 1 3
 
-          On DUT as client side:
+          Verify in TH(all-clusters-app) Log:
           [1657002329.438065][3983:3988] CHIP:TOO: Endpoint: 3 Cluster: 0x0000_001D Attribute 0x0000_0000 DataVersion: 2452512872
           [1657002329.438135][3983:3988] CHIP:TOO:   device list: 2 entries
           [1657002329.438193][3983:3988] CHIP:TOO:     [1]: {
@@ -63,7 +66,7 @@
 
           ./chip-tool  descriptor read device-list 1 4
 
-          On DUT as client side:
+          Verify in TH(all-clusters-app) Log:
           [1657002348.693948][3989:3994] CHIP:TOO: Endpoint: 4 Cluster: 0x0000_001D Attribute 0x0000_0000 DataVersion: 1398882309
           [1657002348.694013][3989:3994] CHIP:TOO:   device list: 2 entries
           [1657002348.694063][3989:3994] CHIP:TOO:     [1]: {
@@ -79,7 +82,7 @@
 
           ./chip-tool  descriptor read device-list 1 5
 
-          On DUT as client side:
+          Verify in TH(all-clusters-app) Log:
           [1657002369.589492][3996:4001] CHIP:TOO: Endpoint: 5 Cluster: 0x0000_001D Attribute 0x0000_0000 DataVersion: 130458766
           [1657002369.589556][3996:4001] CHIP:TOO:   device list: 2 entries
           [1657002369.589610][3996:4001] CHIP:TOO:     [1]: {
@@ -95,7 +98,7 @@
 
           ./chip-tool  descriptor read device-list 1 6
 
-          On DUT as client side:
+          Verify in TH(all-clusters-app) Log:
           [1657002386.484093][4002:4007] CHIP:TOO: Endpoint: 6 Cluster: 0x0000_001D Attribute 0x0000_0000 DataVersion: 295450100
           [1657002386.484155][4002:4007] CHIP:TOO:   device list: 1 entries
           [1657002386.484255][4002:4007] CHIP:TOO:     [1]: {
@@ -107,7 +110,7 @@
 
           ./chip-tool  descriptor read device-list 1 7
 
-          On DUT as client side:
+          Verify in TH(all-clusters-app) Log:
           [1657002413.721927][4015:4020] CHIP:TOO: Endpoint: 7 Cluster: 0x0000_001D Attribute 0x0000_0000 DataVersion: 2117104859
           [1657002413.721981][4015:4020] CHIP:TOO:   device list: 1 entries
           [1657002413.722028][4015:4020] CHIP:TOO:     [1]: {
@@ -119,7 +122,7 @@
 
           ./chip-tool  descriptor read device-list 1 8
 
-          On DUT as client side:
+          Verify in TH(all-clusters-app) Log:
           [1657002436.415904][4034:4039] CHIP:TOO: Endpoint: 8 Cluster: 0x0000_001D Attribute 0x0000_0000 DataVersion: 2026786918
           [1657002436.415972][4034:4039] CHIP:TOO:   device list: 1 entries
           [1657002436.416033][4034:4039] CHIP:TOO:     [1]: {
@@ -131,7 +134,7 @@
 
           ./chip-tool  descriptor read device-list 1 9
 
-          On DUT as client side:
+          Verify in TH(all-clusters-app) Log:
           [1657002455.445818][4040:4045] CHIP:TOO: Endpoint: 9 Cluster: 0x0000_001D Attribute 0x0000_0000 DataVersion: 913116116
           [1657002455.445883][4040:4045] CHIP:TOO:   device list: 1 entries
           [1657002455.445944][4040:4045] CHIP:TOO:     [1]: {
@@ -143,7 +146,7 @@
 
           ./chip-tool  descriptor read device-list 1 10
 
-          On DUT as client side:
+          Verify in TH(all-clusters-app) Log:
           [1657002473.100910][4047:4052] CHIP:TOO: Endpoint: 10 Cluster: 0x0000_001D Attribute 0x0000_0000 DataVersion: 259205426
           [1657002473.100967][4047:4052] CHIP:TOO:   device list: 2 entries
           [1657002473.101013][4047:4052] CHIP:TOO:     [1]: {
@@ -158,7 +161,7 @@
 
           ./chip-tool  descriptor read device-list 1 11
 
-          On DUT as client side:
+          Verify in TH(all-clusters-app) Log:
           [1657002495.856770][4061:4066] CHIP:TOO: Endpoint: 11 Cluster: 0x0000_001D Attribute 0x0000_0000 DataVersion: 4248421677
           [1657002495.856836][4061:4066] CHIP:TOO:   device list: 2 entries
           [1657002495.856893][4061:4066] CHIP:TOO:     [1]: {
@@ -174,7 +177,7 @@
 
           ./chip-tool  descriptor read device-list 1 12
 
-          On DUT as client side:
+          Verify in TH(all-clusters-app) Log:
           [1657002515.862187][4073:4078] CHIP:TOO: Endpoint: 12 Cluster: 0x0000_001D Attribute 0x0000_0000 DataVersion: 2731599835
           [1657002515.862249][4073:4078] CHIP:TOO:   device list: 2 entries
           [1657002515.862302][4073:4078] CHIP:TOO:     [1]: {
@@ -190,7 +193,7 @@
 
           ./chip-tool  descriptor read device-list 1 13
 
-          On DUT as client side:
+          Verify in TH(all-clusters-app) Log:
           [1657002538.134605][4097:4102] CHIP:TOO: Endpoint: 13 Cluster: 0x0000_001D Attribute 0x0000_0000 DataVersion: 3449178249
           [1657002538.134700][4097:4102] CHIP:TOO:   device list: 2 entries
           [1657002538.134784][4097:4102] CHIP:TOO:     [1]: {
@@ -208,6 +211,8 @@
 
           ./chip-tool  descriptor read parts-list 1 0
 
+          Verify in TH(all-clusters-app) Log:
+
           [1657002201.045720][3893:3899] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_001D Attribute 0x0000_0003 DataVersion: 3573910940
           [1657002201.045841][3893:3899] CHIP:TOO:   parts list: 12 entries
           [1657002201.045887][3893:3899] CHIP:TOO:     [1]: 1
@@ -226,7 +231,7 @@
 
           ./chip-tool  descriptor read device-list 1 3
 
-          On DUT as client side:
+          Verify in TH(all-clusters-app) Log:
           [1657002843.395988][4135:4140] CHIP:TOO: Endpoint: 3 Cluster: 0x0000_001D Attribute 0x0000_0000 DataVersion: 2452512872
           [1657002843.396058][4135:4140] CHIP:TOO:   device list: 2 entries
           [1657002843.396112][4135:4140] CHIP:TOO:     [1]: {
@@ -240,7 +245,7 @@
 
           ./chip-tool  descriptor read device-list 1 4
 
-          On DUT as client side:
+          Verify in TH(all-clusters-app) Log:
           [1657002927.992247][4143:4148] CHIP:TOO: Endpoint: 4 Cluster: 0x0000_001D Attribute 0x0000_0000 DataVersion: 1398882309
           [1657002927.992309][4143:4148] CHIP:TOO:   device list: 2 entries
           [1657002927.992362][4143:4148] CHIP:TOO:     [1]: {
@@ -254,7 +259,7 @@
 
            ./chip-tool  descriptor read device-list 1 5
 
-          On DUT as client side:
+          Verify in TH(all-clusters-app) Log:
           [1657002949.332151][4156:4161] CHIP:TOO: Endpoint: 5 Cluster: 0x0000_001D Attribute 0x0000_0000 DataVersion: 130458766
           [1657002949.332245][4156:4161] CHIP:TOO:   device list: 2 entries
           [1657002949.332294][4156:4161] CHIP:TOO:     [1]: {
@@ -268,7 +273,7 @@
 
            ./chip-tool  descriptor read device-list 1 6
 
-          On DUT as client side:
+          Verify in TH(all-clusters-app) Log:
           [1657002965.947096][4163:4168] CHIP:TOO: Endpoint: 6 Cluster: 0x0000_001D Attribute 0x0000_0000 DataVersion: 295450100
           [1657002965.947150][4163:4168] CHIP:TOO:   device list: 1 entries
           [1657002965.947196][4163:4168] CHIP:TOO:     [1]: {
@@ -278,7 +283,7 @@
 
            ./chip-tool  descriptor read device-list 1 7
 
-          On DUT as client side:
+          Verify in TH(all-clusters-app) Log:
           [1657002981.963307][4176:4181] CHIP:TOO: Endpoint: 7 Cluster: 0x0000_001D Attribute 0x0000_0000 DataVersion: 2117104859
           [1657002981.963371][4176:4181] CHIP:TOO:   device list: 1 entries
           [1657002981.963429][4176:4181] CHIP:TOO:     [1]: {
@@ -288,7 +293,7 @@
 
            ./chip-tool  descriptor read device-list 1 8
 
-          On DUT as client side:
+          Verify in TH(all-clusters-app) Log:
           [1657003007.476575][4183:4188] CHIP:TOO: Endpoint: 8 Cluster: 0x0000_001D Attribute 0x0000_0000 DataVersion: 2026786918
           [1657003007.476635][4183:4188] CHIP:TOO:   device list: 1 entries
           [1657003007.476689][4183:4188] CHIP:TOO:     [1]: {
@@ -298,7 +303,7 @@
 
            ./chip-tool  descriptor read device-list 1 9
 
-          On DUT as client side:
+          Verify in TH(all-clusters-app) Log:
           [1657003023.263333][4191:4196] CHIP:TOO: Endpoint: 9 Cluster: 0x0000_001D Attribute 0x0000_0000 DataVersion: 913116116
           [1657003023.263391][4191:4196] CHIP:TOO:   device list: 1 entries
           [1657003023.263443][4191:4196] CHIP:TOO:     [1]: {
@@ -308,7 +313,7 @@
 
            ./chip-tool  descriptor read device-list 1 10
 
-          On DUT as client side:
+          Verify in TH(all-clusters-app) Log:
           [1657003044.071972][4204:4209] CHIP:TOO: Endpoint: 10 Cluster: 0x0000_001D Attribute 0x0000_0000 DataVersion: 259205426
           [1657003044.072037][4204:4209] CHIP:TOO:   device list: 2 entries
           [1657003044.072085][4204:4209] CHIP:TOO:     [1]: {
@@ -322,7 +327,7 @@
 
            ./chip-tool  descriptor read device-list 1 11
 
-          On DUT as client side:
+          Verify in TH(all-clusters-app) Log:
           [1657003082.358311][4217:4222] CHIP:TOO: Endpoint: 11 Cluster: 0x0000_001D Attribute 0x0000_0000 DataVersion: 4248421677
           [1657003082.358379][4217:4222] CHIP:TOO:   device list: 2 entries
           [1657003082.358432][4217:4222] CHIP:TOO:     [1]: {
@@ -336,7 +341,7 @@
 
            ./chip-tool  descriptor read device-list 1 12
 
-          On DUT as client side:
+          Verify in TH(all-clusters-app) Log:
           [1657003103.954911][4248:4253] CHIP:TOO: Endpoint: 12 Cluster: 0x0000_001D Attribute 0x0000_0000 DataVersion: 2731599835
           [1657003103.954986][4248:4253] CHIP:TOO:   device list: 2 entries
           [1657003103.955050][4248:4253] CHIP:TOO:     [1]: {
@@ -350,7 +355,7 @@
 
           ./chip-tool  descriptor read device-list 1 13
 
-          On DUT as client side:
+          Verify in TH(all-clusters-app) Log:
           [1657003125.905572][4261:4266] CHIP:TOO: Endpoint: 13 Cluster: 0x0000_001D Attribute 0x0000_0000 DataVersion: 3449178249
           [1657003125.905638][4261:4266] CHIP:TOO:   device list: 2 entries
           [1657003125.905687][4261:4266] CHIP:TOO:     [1]: {
@@ -368,13 +373,13 @@
           bridged On/Off lights (use key c in the console to bridge-app)"
       PICS: MCORE.DEVLIST.UseDeviceState
       verification: |
-          Verify in TH as server side
+          Verify on DUT(chip-tool) Log
           c
           [1659089560.774328][12236:12241] CHIP:DL: Device[Light 1b]: ON
           [1659089560.774681][12236:12236] CHIP:DMG: Endpoint 3, Cluster 0x0000_0006 update version to 83dcb371
 
 
-          Verify in DUT as client side
+          Verify on TH(all-clusters-app) Log:
           ./chip-tool onoff read on-off 1 3
 
           [1659089585.162599][8769:8774] CHIP:TOO: Endpoint: 3 Cluster: 0x0000_0006 Attribute 0x0000_0000 DataVersion: 2212279153
@@ -389,6 +394,8 @@
       verification: |
           Press a key "tbd" on bridge-app to change the simulated temperature
 
+          Verify on DUT(chip-tool) Log
+
           [1659351537.115828][14237:14242] CHIP:DL: TempSensorDevice[TempSensor 1]: New measurement=""200""
           [1659351537.115987][14237:14242] CHIP:DL: TempSensorDevice[TempSensor 2]: New measurement=""200""
           [1659351537.116097][14237:14242] CHIP:DL: TempSensorDevice[Composed TempSensor 1]: New measurement=""200""
@@ -399,6 +406,8 @@
           "
           "./chip-tool temperaturemeasurement read measured-value 1 4
 
+          Verify on TH(all-clusters-app) Log:
+
           expect to get a different value than step 7b
           [1659351542.393349][12212:12217] CHIP:TOO: Endpoint: 4 Cluster: 0x0000_0402 Attribute 0x0000_0000 DataVersion: 2406690153
           [1659351542.393429][12212:12217] CHIP:TOO:   MeasuredValue: 200
@@ -411,6 +420,8 @@
       verification: |
           ./chip-tool onoff on 1 3
 
+          Verify on DUT(chip-tool) Log
+
           [1658501274.507714][14425:14425] CHIP:DMG: AccessControl: checking f=1 a=c s=0x000000000001B669 t= c=0x0000_0006 e=3 p=o
           [1658501274.507760][14425:14425] CHIP:DMG: AccessControl: allowed
           [1658501274.507789][14425:14425] CHIP:DMG: Received command for Endpoint=3 Cluster=0x0000_0006 Command=0x0000_0001
@@ -421,6 +432,8 @@
 
           ./chip-tool onoff read on-off 1 3
 
+          Verify on TH(all-clusters-app) Log:
+
           [1658501339.773125][35583:35588] CHIP:TOO: Endpoint: 3 Cluster: 0x0000_0006 Attribute 0x0000_0000 DataVersion: 3868039507
           [1658501339.773139][35583:35588] CHIP:TOO:   OnOff: TRUE
       disabled: true
@@ -432,14 +445,20 @@
       verification: |
           ./chip-tool bridgeddevicebasic  read node-label 1 3
 
+          Verify on TH(all-clusters-app) Log:
+
           [1659089932.160005][8810:8815] CHIP:TOO: Endpoint: 3 Cluster: 0x0000_0039 Attribute 0x0000_0005 DataVersion: 3178625724
           [1659089932.160111][8810:8815] CHIP:TOO:   NodeLabel: Light 1
 
+          Verify on DUT(chip-tool) Log
+
           "b
           [1659089470.077297][12236:12241] CHIP:DL: Device[Light 1]: New Name=""Light 1b""
 
           ./chip-tool bridgeddevicebasic  read node-label 1 3
 
+          Verify on TH(all-clusters-app) Log:
+
           [1659352004.560327][12241:12246] CHIP:TOO: Endpoint: 3 Cluster: 0x0000_0039 Attribute 0x0000_0005 DataVersion: 2321959095
           [1659352004.560365][12241:12246] CHIP:TOO:   NodeLabel: Light 1b
       disabled: true
@@ -448,6 +467,8 @@
           "Use TH/bridge-app to add a bridged light (use key 2 in the console to
           bridge-app to add Light 2)"
       verification: |
+          Verify on DUT(chip-tool) Log
+
           2
           [1659352274.915018][14237:14242] CHIP:DMG: Endpoint 1, Cluster 0x0000_001D update version to 7e918bae
           [1659352274.915107][14237:14242] CHIP:DMG: Endpoint 0, Cluster 0x0000_001D update version to 7561f371
@@ -456,7 +477,7 @@
 
           ./chip-tool  descriptor read parts-list 1 0
 
-          Verify the endpoints listed in TH Log
+          Verify the endpoints listed in TH(all-clusters-app) Log
 
           [1659352284.821350][12264:12269] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_001D Attribute 0x0000_0003 DataVersion: 1969353585
           [1659352284.821433][12264:12269] CHIP:TOO:   parts list: 13 entries
@@ -475,8 +496,8 @@
           [1659352284.821812][12264:12269] CHIP:TOO:     [13]: 14
 
           "
-
-          Verify the list contains 11 entries in TH Log
+          ./chip-tool  descriptor read parts-list 1 1
+          Verify the list contains 11 entries in TH(all-clusters-app) Log
 
           [1659352298.310126][12270:12275] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_001D Attribute 0x0000_0003 DataVersion: 2123467694
           [1659352298.310213][12270:12275] CHIP:TOO:   parts list: 12 entries
@@ -496,12 +517,17 @@
 
           ./chip-tool  descriptor read parts-list 1 14
 
+          Verify on TH(all-clusters-app) Log
+
+
           [1659352316.442844][12276:12281] CHIP:TOO: Endpoint: 14 Cluster: 0x0000_001D Attribute 0x0000_0003 DataVersion: 3417142897
           [1659352316.442927][12276:12281] CHIP:TOO:   parts list: 0 entries
           [1659352316.443042][12276:12281] CHIP:EM: Sending Standalone Ack for MessageCounter:85433161 on exchange 30040i
 
           ./chip-tool  descriptor read device-list 1 14
 
+          Verify the list contains 11 entries in TH(all-clusters-app) Log
+
           [1659352346.719522][12283:12288] CHIP:TOO: Endpoint: 14 Cluster: 0x0000_001D Attribute 0x0000_0000 DataVersion: 3417142897
           [1659352346.719601][12283:12288] CHIP:TOO:   device list: 2 entries
           [1659352346.719645][12283:12288] CHIP:TOO:     [1]: {
@@ -521,6 +547,8 @@
       verification: |
           ./chip-tool  descriptor read parts-list 1 0
 
+          Verify on TH(all-clusters-app) Log:
+
           [1659352461.553715][12295:12300] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_001D Attribute 0x0000_0003 DataVersion: 1969353586
           [1659352461.553848][12295:12300] CHIP:TOO:   parts list: 12 entries
           [1659352461.553882][12295:12300] CHIP:TOO:     [1]: 1
@@ -538,6 +566,8 @@
 
           ./chip-tool  descriptor read parts-list 1 1
 
+          Verify on TH(all-clusters-app) Log:
+
           [1659352492.227696][12302:12307] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_001D Attribute 0x0000_0003 DataVersion: 2123467695
           [1659352492.227770][12302:12307] CHIP:TOO:   parts list: 11 entries
           [1659352492.227804][12302:12307] CHIP:TOO:     [1]: 4
diff --git a/src/app/tests/suites/certification/Test_TC_CC_2_2.yaml b/src/app/tests/suites/certification/Test_TC_CC_2_2.yaml
index 20c02ca..8ed35a0 100644
--- a/src/app/tests/suites/certification/Test_TC_CC_2_2.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CC_2_2.yaml
@@ -24,6 +24,11 @@
     endpoint: 0
 
 tests:
+    - label: "Note"
+      verification: |
+          For DUT as client test cases, Chip-tool command used below are an example to verify the functionality. For certification test, we expect DUT should have a capability or way to run the equivalent command.
+      disabled: true
+
     - label: "Commission TH to DUT"
       verification: |
           verification step to be updated.
@@ -34,7 +39,7 @@
       verification: |
           ./chip-tool colorcontrol read current-hue 1 1
 
-          Verify in DUT as client side log:
+          Verify on TH(all-clusters-app) log:
 
           [1657908705.581609][2861:2861] CHIP:IM: Received Read request
           [1657908705.581752][2861:2861] CHIP:DMG: ReadRequestMessage =
@@ -67,7 +72,8 @@
       verification: |
           ./chip-tool colorcontrol read current-saturation 1 1
 
-          Verify in DUT as client side log:
+          Verify on TH(all-clusters-app) log:
+
           [1657908593.710273][2861:2861] CHIP:IM: Received Read request
           [1657908593.710359][2861:2861] CHIP:DMG: ReadRequestMessage =
           [1657908593.710389][2861:2861] CHIP:DMG: {
@@ -97,7 +103,8 @@
       verification: |
           ./chip-tool colorcontrol read remaining-time 1 1
 
-          Verify in DUT as client side log:
+          Verify on TH(all-clusters-app) log:
+
           [1657908803.102070][2933:2933] CHIP:IM: Received Read request
           [1657908803.102154][2933:2933] CHIP:DMG: ReadRequestMessage =
           [1657908803.102182][2933:2933] CHIP:DMG: {
@@ -129,7 +136,8 @@
       verification: |
           ./chip-tool colorcontrol read current-x 1 1
 
-          Verify in DUT as client side log:
+          Verify on TH(all-clusters-app)  log:
+
           [1657908856.780574][2933:2933] CHIP:IM: Received Read request
           [1657908856.780702][2933:2933] CHIP:DMG: ReadRequestMessage =
           [1657908856.780750][2933:2933] CHIP:DMG: {
@@ -161,7 +169,8 @@
       verification: |
           ./chip-tool colorcontrol read current-y 1 1
 
-          Verify in DUT as client side log:
+          Verify on TH(all-clusters-app) log:
+
           [1657909305.413625][2933:2933] CHIP:IM: Received Read request
           [1657909305.413743][2933:2933] CHIP:DMG: ReadRequestMessage =
           [1657909305.413786][2933:2933] CHIP:DMG: {
@@ -195,7 +204,8 @@
       verification: |
           ./chip-tool colorcontrol read drift-compensation 1 1
 
-          Verify in DUT as client side log:
+          Verify on TH(all-clusters-app) log:
+
           [1657909433.948649][2933:2933] CHIP:IM: Received Read request
           [1657909433.948766][2933:2933] CHIP:DMG: ReadRequestMessage =
           [1657909433.948809][2933:2933] CHIP:DMG: {
@@ -229,7 +239,8 @@
       verification: |
           ./chip-tool colorcontrol read compensation-text 1 1
 
-          Verify in DUT as client side log:
+          Verify on TH(all-clusters-app) log:
+
           [1657909470.827379][2933:2933] CHIP:IM: Received Read request
           [1657909470.827505][2933:2933] CHIP:DMG: ReadRequestMessage =
           [1657909470.827553][2933:2933] CHIP:DMG: {
@@ -262,7 +273,7 @@
       verification: |
           ./chip-tool colorcontrol read color-temperature 1 1
 
-          Verify in DUT as client side log:
+          Verify on TH(all-clusters-app) log:
 
           [1657909522.420348][2977:2977] CHIP:IM: Received Read request
           [1657909522.420471][2977:2977] CHIP:DMG: ReadRequestMessage =
@@ -295,7 +306,8 @@
       verification: |
           ./chip-tool colorcontrol read color-mode 1 1
 
-          Verify in DUT as client side log:
+          Verify on TH(all-clusters-app) log:
+
           [1657909555.028998][2977:2977] CHIP:IM: Received Read request
           [1657909555.029124][2977:2977] CHIP:DMG: ReadRequestMessage =
           [1657909555.029171][2977:2977] CHIP:DMG: {
@@ -327,7 +339,8 @@
       verification: |
           ./chip-tool colorcontrol read options 1 1
 
-          Verify in DUT as client side log:
+          Verify on TH(all-clusters-app) log:
+
           [1657909576.774655][2977:2977] CHIP:IM: Received Read request
           [1657909576.774796][2977:2977] CHIP:DMG: ReadRequestMessage =
           [1657909576.774850][2977:2977] CHIP:DMG: {
@@ -359,7 +372,8 @@
       verification: |
           ./chip-tool colorcontrol read enhanced-current-hue 1 1
 
-          Verify in DUT as client side log:
+          Verify on TH(all-clusters-app) log:
+
           [1657909627.086489][2977:2977] CHIP:IM: Received Read request
           [1657909627.086602][2977:2977] CHIP:DMG: ReadRequestMessage =
           [1657909627.086641][2977:2977] CHIP:DMG: {
@@ -391,7 +405,8 @@
       verification: |
           ./chip-tool colorcontrol read enhanced-color-mode 1 1
 
-          Verify in DUT as client side log:
+          Verify on TH(all-clusters-app) log:
+
           [1657909652.217887][2977:2977] CHIP:IM: Received Read request
           [1657909652.218015][2977:2977] CHIP:DMG: ReadRequestMessage =
           [1657909652.218064][2977:2977] CHIP:DMG: {
@@ -423,7 +438,8 @@
       verification: |
           ./chip-tool colorcontrol read color-loop-active 1 1
 
-          Verify in DUT as client side log:
+          Verify on TH(all-clusters-app) log:
+
           [1657909711.352753][2977:2977] CHIP:IM: Received Read request
           [1657909711.352915][2977:2977] CHIP:DMG: ReadRequestMessage =
           [1657909711.352973][2977:2977] CHIP:DMG: {
@@ -455,7 +471,8 @@
       verification: |
           ./chip-tool colorcontrol read color-loop-direction 1 1
 
-          Verify in DUT as client side log:
+          Verify on TH(all-clusters-app) log:
+
           [1657909741.232136][2977:2977] CHIP:IM: Received Read request
           [1657909741.232261][2977:2977] CHIP:DMG: ReadRequestMessage =
           [1657909741.232310][2977:2977] CHIP:DMG: {
@@ -487,7 +504,8 @@
       verification: |
           ./chip-tool colorcontrol read color-loop-time 1 1
 
-          Verify in DUT as client side log:
+          Verify on TH(all-clusters-app) log:
+
           [1657909771.649273][2977:2977] CHIP:IM: Received Read request
           [1657909771.649413][2977:2977] CHIP:DMG: ReadRequestMessage =
           [1657909771.649468][2977:2977] CHIP:DMG: {
@@ -521,7 +539,8 @@
       verification: |
           ./chip-tool colorcontrol read color-loop-start-enhanced-hue 1 1
 
-          Verify in DUT as client side log:
+          Verify on TH(all-clusters-app) log:
+
           [1657909997.529812][2977:2977] CHIP:IM: Received Read request
           [1657909997.530002][2977:2977] CHIP:DMG: ReadRequestMessage =
           [1657909997.530053][2977:2977] CHIP:DMG: {
@@ -555,7 +574,8 @@
       verification: |
           ./chip-tool colorcontrol read color-loop-stored-enhanced-hue 1 1
 
-          Verify in DUT as client side log:
+          Verify on TH(all-clusters-app) log:
+
           [1657910020.977065][2977:2977] CHIP:IM: Received Read request
           [1657910020.977155][2977:2977] CHIP:DMG: ReadRequestMessage =
           [1657910020.977187][2977:2977] CHIP:DMG: {
@@ -587,7 +607,8 @@
       verification: |
           ./chip-tool colorcontrol read color-capabilities 1 1
 
-          Verify in DUT as client side log:
+          Verify on TH(all-clusters-app) log:
+
           [1657910072.897195][2977:2977] CHIP:IM: Received Read request
           [1657910072.897323][2977:2977] CHIP:DMG: ReadRequestMessage =
           [1657910072.897371][2977:2977] CHIP:DMG: {
@@ -621,7 +642,8 @@
       verification: |
           ./chip-tool colorcontrol read color-temp-physical-min-mireds  1 1
 
-          Verify in DUT as client side log:
+          Verify on TH(all-clusters-app) log:
+
           [1657910109.902989][2977:2977] CHIP:IM: Received Read request
           [1657910109.903095][2977:2977] CHIP:DMG: ReadRequestMessage =
           [1657910109.903134][2977:2977] CHIP:DMG: {
@@ -655,7 +677,8 @@
       verification: |
           ./chip-tool colorcontrol read color-temp-physical-max-mireds 1 1
 
-          Verify in DUT as client side log:
+          Verify on TH(all-clusters-app) log:
+
           [1657910176.514563][2977:2977] CHIP:IM: Received Read request
           [1657910176.514690][2977:2977] CHIP:DMG: ReadRequestMessage =
           [1657910176.514738][2977:2977] CHIP:DMG: {
@@ -689,7 +712,8 @@
       verification: |
           ./chip-tool colorcontrol read couple-color-temp-to-level-min-mireds 1 1
 
-          Verify in DUT as client side log:
+          Verify on TH(all-clusters-app) log:
+
           [1657910205.278279][2977:2977] CHIP:IM: Received Read request
           [1657910205.278421][2977:2977] CHIP:DMG: ReadRequestMessage =
           [1657910205.278474][2977:2977] CHIP:DMG: {
@@ -723,7 +747,8 @@
       verification: |
           ./chip-tool colorcontrol read start-up-color-temperature-mireds 1 1
 
-          Verify in DUT as client side log:
+          Verify on TH(all-clusters-app) log:
+
           [1657910246.097315][2977:2977] CHIP:IM: Received Read request
           [1657910246.097460][2977:2977] CHIP:DMG: ReadRequestMessage =
           [1657910246.097516][2977:2977] CHIP:DMG: {
@@ -755,7 +780,8 @@
       verification: |
           ./chip-tool colorcontrol read number-of-primaries 1 1
 
-          Verify in DUT as client side log:
+          Verify on TH(all-clusters-app) log:
+
           [1657910445.890552][2977:2977] CHIP:IM: Received Read request
           [1657910445.890635][2977:2977] CHIP:DMG: ReadRequestMessage =
           [1657910445.890664][2977:2977] CHIP:DMG: {
@@ -787,7 +813,8 @@
       verification: |
           ./chip-tool colorcontrol read  primary1x 1 1
 
-          Verify in DUT as client side log:
+          Verify on TH(all-clusters-app) log:
+
           [1657910568.808716][2977:2977] CHIP:IM: Received Read request
           [1657910568.808876][2977:2977] CHIP:DMG: ReadRequestMessage =
           [1657910568.809073][2977:2977] CHIP:DMG: {
@@ -819,7 +846,8 @@
       verification: |
           ./chip-tool colorcontrol read  primary1y 1 1
 
-          Verify in DUT as client side log:
+          Verify on TH(all-clusters-app) log:
+
           [1657910588.961223][2977:2977] CHIP:IM: Received Read request
           [1657910588.961366][2977:2977] CHIP:DMG: ReadRequestMessage =
           [1657910588.961422][2977:2977] CHIP:DMG: {
@@ -851,7 +879,8 @@
       verification: |
           ./chip-tool colorcontrol read primary1intensity 1 1
 
-          Verify in DUT as client side log:
+          Verify on TH(all-clusters-app) log:
+
           [1657910622.925613][2977:2977] CHIP:IM: Received Read request
           [1657910622.925739][2977:2977] CHIP:DMG: ReadRequestMessage =
           [1657910622.925788][2977:2977] CHIP:DMG: {
@@ -883,7 +912,8 @@
       verification: |
           ./chip-tool colorcontrol read primary2x 1 1
 
-          Verify in DUT as client side log:
+          Verify on TH(all-clusters-app) log:
+
           [1657910659.885682][2977:2977] CHIP:IM: Received Read request
           [1657910659.885821][2977:2977] CHIP:DMG: ReadRequestMessage =
           [1657910659.885876][2977:2977] CHIP:DMG: {
@@ -915,7 +945,8 @@
       verification: |
           ./chip-tool colorcontrol read primary2y 1 1
 
-          Verify in DUT as client side log:
+          Verify on TH(all-clusters-app) log:
+
           [1657910687.168648][2977:2977] CHIP:IM: Received Read request
           [1657910687.168754][2977:2977] CHIP:DMG: ReadRequestMessage =
           [1657910687.168793][2977:2977] CHIP:DMG: {
@@ -947,7 +978,8 @@
       verification: |
           ./chip-tool colorcontrol read primary2intensity 1 1
 
-          Verify in DUT as client side log:
+          Verify on TH(all-clusters-app) log:
+
           [1657910837.125032][2977:2977] CHIP:IM: Received Read request
           [1657910837.125157][2977:2977] CHIP:DMG: ReadRequestMessage =
           [1657910837.125206][2977:2977] CHIP:DMG: {
@@ -979,7 +1011,7 @@
       verification: |
           ./chip-tool colorcontrol read primary3x 1 1
 
-          Verify in DUT as client side log:
+          Verify on TH(all-clusters-app) log:
           CHIP:IM: Received Read request
           CHIP:DMG: ReadRequestMessage =
           CHIP:DMG: {
@@ -1004,7 +1036,8 @@
       verification: |
           ./chip-tool colorcontrol read primary3y 1 1
 
-          Verify in DUT as client side log:
+          Verify on TH(all-clusters-app) log:
+
           CHIP:IM: Received Read request
           CHIP:DMG: ReadRequestMessage =
           CHIP:DMG: {
@@ -1029,7 +1062,8 @@
       verification: |
           ./chip-tool colorcontrol read primary3intensity 1 1
 
-          Verify in DUT as client side log:
+          Verify on TH(all-clusters-app) log:
+
           CHIP:IM: Received Read request
           CHIP:DMG: ReadRequestMessage =
           CHIP:DMG: {
@@ -1054,7 +1088,8 @@
       verification: |
           ./chip-tool colorcontrol read primary4x 1 1
 
-          Verify in DUT as client side log:
+          Verify on TH(all-clusters-app) log:
+
           CHIP:IM: Received Read request
           CHIP:DMG: ReadRequestMessage =
           CHIP:DMG: {
@@ -1079,7 +1114,8 @@
       verification: |
           ./chip-tool colorcontrol read primary4y 1 1
 
-          Verify in DUT as client side log:
+          Verify on TH(all-clusters-app) log:
+
           CHIP:IM: Received Read request
           CHIP:DMG: ReadRequestMessage =
           CHIP:DMG: {
@@ -1104,7 +1140,8 @@
       verification: |
           ./chip-tool colorcontrol read primary4intensity 1 1
 
-          Verify in DUT as client side log:
+          Verify on TH(all-clusters-app) log:
+
           CHIP:IM: Received Read request
           CHIP:DMG: ReadRequestMessage =
           CHIP:DMG: {
@@ -1129,7 +1166,8 @@
       verification: |
           ./chip-tool colorcontrol read primary5x 1 1
 
-          Verify in DUT as client side log:
+          Verify on TH(all-clusters-app) log:
+
           CHIP:IM: Received Read request
           CHIP:DMG: ReadRequestMessage =
           CHIP:DMG: {
@@ -1154,7 +1192,8 @@
       verification: |
           ./chip-tool colorcontrol read primary5y 1 1
 
-          Verify in DUT as client side log:
+          Verify on TH(all-clusters-app) log:
+
           CHIP:IM: Received Read request
           CHIP:DMG: ReadRequestMessage =
           CHIP:DMG: {
@@ -1179,7 +1218,8 @@
       verification: |
           ./chip-tool colorcontrol read primary5intensity 1 1
 
-          Verify in DUT as client side log:
+          Verify on TH(all-clusters-app) log:
+
           CHIP:IM: Received Read request
           CHIP:DMG: ReadRequestMessage =
           CHIP:DMG: {
@@ -1204,7 +1244,8 @@
       verification: |
           ./chip-tool colorcontrol read primary6x 1 1
 
-          Verify in DUT as client side log:
+          Verify on TH(all-clusters-app) log:
+
           CHIP:IM: Received Read request
           CHIP:DMG: ReadRequestMessage =
           CHIP:DMG: {
@@ -1229,7 +1270,8 @@
       verification: |
           ./chip-tool colorcontrol read primary6y 1 1
 
-          Verify in DUT as client side log:
+          Verify on TH(all-clusters-app) log:
+
           CHIP:IM: Received Read request
           CHIP:DMG: ReadRequestMessage =
           CHIP:DMG: {
@@ -1254,7 +1296,8 @@
       verification: |
           ./chip-tool colorcontrol read primary6intensity 1 1
 
-          Verify in DUT as client side log:
+          Verify on TH(all-clusters-app) log:
+
           CHIP:IM: Received Read request
           CHIP:DMG: ReadRequestMessage =
           CHIP:DMG: {
@@ -1279,7 +1322,8 @@
       verification: |
           ./chip-tool colorcontrol read white-point-x   1 1
 
-          Verify in DUT as client side log:
+          Verify on TH(all-clusters-app) log:
+
           CHIP:IM: Received Read request
           CHIP:DMG: ReadRequestMessage =
           CHIP:DMG: {
@@ -1304,7 +1348,8 @@
       verification: |
           ./chip-tool colorcontrol read white-point-y 1 1
 
-          Verify in DUT as client side log:
+          Verify on TH(all-clusters-app) log:
+
           CHIP:IM: Received Read request
           CHIP:DMG: ReadRequestMessage =
           CHIP:DMG: {
@@ -1330,7 +1375,8 @@
       verification: |
           ./chip-tool colorcontrol read color-point-rx   1 1
 
-          Verify in DUT as client side log:
+          Verify on TH(all-clusters-app) log:
+
           CHIP:IM: Received Read request
           CHIP:DMG: ReadRequestMessage =
           CHIP:DMG: {
@@ -1356,7 +1402,8 @@
       verification: |
           ./chip-tool colorcontrol read color-point-ry   1 1
 
-          Verify in DUT as client side log:
+          Verify on TH(all-clusters-app) log:
+
           CHIP:IM: Received Read request
           CHIP:DMG: ReadRequestMessage =
           CHIP:DMG: {
@@ -1383,7 +1430,8 @@
       verification: |
           ./chip-tool colorcontrol read color-point-rintensity   1 1
 
-          Verify in DUT as client side log:
+          Verify on TH(all-clusters-app) log:
+
           CHIP:IM: Received Read request
           CHIP:DMG: ReadRequestMessage =
           CHIP:DMG: {
@@ -1409,7 +1457,8 @@
       verification: |
           ./chip-tool colorcontrol read color-point-gx   1 1
 
-          Verify in DUT as client side log:
+          Verify on TH(all-clusters-app) log:
+
           CHIP:IM: Received Read request
           CHIP:DMG: ReadRequestMessage =
           CHIP:DMG: {
@@ -1435,7 +1484,8 @@
       verification: |
           ./chip-tool colorcontrol read color-point-gy   1 1
 
-          Verify in DUT as client side log:
+          Verify on TH(all-clusters-app) log:
+
           CHIP:IM: Received Read request
           CHIP:DMG: ReadRequestMessage =
           CHIP:DMG: {
@@ -1462,7 +1512,8 @@
       verification: |
           ./chip-tool colorcontrol read color-point-gintensity   1 1
 
-          Verify in DUT as client side log:
+          Verify on TH(all-clusters-app) log:
+
           CHIP:IM: Received Read request
           CHIP:DMG: ReadRequestMessage =
           CHIP:DMG: {
@@ -1488,7 +1539,8 @@
       verification: |
           ./chip-tool colorcontrol read color-point-bx   1 1
 
-          Verify in DUT as client side log:
+          Verify on TH(all-clusters-app) log:
+
           CHIP:IM: Received Read request
           CHIP:DMG: ReadRequestMessage =
           CHIP:DMG: {
@@ -1514,7 +1566,8 @@
       verification: |
           ./chip-tool colorcontrol read color-point-by   1 1
 
-          Verify in DUT as client side log:
+          Verify on TH(all-clusters-app) log:
+
           CHIP:IM: Received Read request
           CHIP:DMG: ReadRequestMessage =
           CHIP:DMG: {
@@ -1541,7 +1594,8 @@
       verification: |
           ./chip-tool colorcontrol read color-point-bintensity   1 1
 
-          Verify in DUT as client side log:
+          Verify on TH(all-clusters-app) log:
+
           CHIP:IM: Received Read request
           CHIP:DMG: ReadRequestMessage =
           CHIP:DMG: {
diff --git a/src/app/tests/suites/certification/Test_TC_CC_3_4.yaml b/src/app/tests/suites/certification/Test_TC_CC_3_4.yaml
index f3f8a89..3882463 100644
--- a/src/app/tests/suites/certification/Test_TC_CC_3_4.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CC_3_4.yaml
@@ -24,12 +24,17 @@
     endpoint: 0
 
 tests:
-    - label: "DUT sends MoveToHue command to TH an Hue with TransitionTime 300."
+    - label: "Note"
+      verification: |
+          For DUT as client test cases, Chip-tool command used below are an example to verify the functionality. For certification test, we expect DUT should have a capability or way to run the equivalent command.
+      disabled: true
+
+    - label: "DUT sends MoveToHue command to TH"
       PICS: CC.C.C00.Rsp
       verification: |
           ./chip-tool colorcontrol move-to-hue 1 0 300 0 0 1 1
 
-          Verify in DUT as client side log:
+          Verify on TH(all-clusters-app) Log
 
           [1657911287.814194][2977:2977] CHIP:DMG: InvokeRequestMessage =
           [1657911287.814246][2977:2977] CHIP:DMG: {
@@ -65,12 +70,13 @@
           [1657911287.815590][2977:2977] CHIP:DMG: Received command for Endpoint=1 Cluster=0x0000_0300 Command=0x0000_0000
       disabled: true
 
-    - label: "Over TransitionTime, DUT reads CurrentHue attribute from TH."
-      PICS: CC.C.A0000
+    - label:
+          "DUT reads CurrentHue attribute from TH (potentially multiple times)"
+      PICS: CC.C.C00.Rsp && CC.C.A0000
       verification: |
           ./chip-tool colorcontrol read current-hue 1  1
 
-          Verify in DUT as client side log:
+          Verify on TH(all-clusters-app) Log
 
           [1657911327.184763][2977:2977] CHIP:IM: Received Read request
           [1657911327.184901][2977:2977] CHIP:DMG: ReadRequestMessage =
@@ -102,7 +108,8 @@
       PICS: CC.C.C01.Rsp
       verification: |
           ./chip-tool colorcontrol move-hue 1 10 0 0 1 1
-          Verify in DUT as client side log:
+
+          Verify on TH(all-clusters-app) log
 
           [1657911357.567908][2977:2977] CHIP:DMG: InvokeRequestMessage =
           [1657911357.567957][2977:2977] CHIP:DMG: {
@@ -137,12 +144,13 @@
           [1657911357.569659][2977:2977] CHIP:DMG: Received command for Endpoint=1 Cluster=0x0000_0300 Command=0x0000_0001
       disabled: true
 
-    - label: "DUT reads CurrentHue attribute from TH several times."
-      PICS: CC.C.A0000
+    - label: "DUT reads CurrentHue attribute (potentially multiple times)"
+      PICS: CC.C.C01.Rsp && CC.C.A0000
       verification: |
           ./chip-tool colorcontrol read current-hue 1  1
 
-          Verify in DUT as client side log:
+          Verify on TH(all-clusters-app) log
+
           [1657911381.312873][2977:2977] CHIP:IM: Received Read request
           [1657911381.312995][2977:2977] CHIP:DMG: ReadRequestMessage =
           [1657911381.313043][2977:2977] CHIP:DMG: {
@@ -174,7 +182,7 @@
       verification: |
           ./chip-tool colorcontrol step-hue 1 10 200 0 0 1 1
 
-          Verify in DUT as client side log:
+          Verify on TH(all-clusters-app) log
 
           [1657911412.480684][2977:2977] CHIP:DMG: InvokeRequestMessage =
           [1657911412.480741][2977:2977] CHIP:DMG: {
@@ -210,11 +218,12 @@
           [1657911412.482974][2977:2977] CHIP:DMG: Received command for Endpoint=1 Cluster=0x0000_0300 Command=0x0000_0002
       disabled: true
 
-    - label: "Over TransitionTime, DUT reads CurrentHue attribute from TH."
-      PICS: CC.C.A0000
+    - label:
+          "DUT reads CurrentHue attribute from TH (potentially multiple times)"
+      PICS: CC.C.C02.Rsp && CC.C.A0000
       verification: |
           ./chip-tool colorcontrol read current-hue 1  1
-          Verify in DUT as client side log:
+          Verify on TH(all-clusters-app) Log
 
           [1657911437.116353][2977:2977] CHIP:IM: Received Read request
           [1657911437.116480][2977:2977] CHIP:DMG: ReadRequestMessage =
@@ -246,7 +255,7 @@
       PICS: CC.C.C47.Rsp
       verification: |
           ./chip-tool colorcontrol stop-move-step 0 0 1 1
-          Verify in DUT as client side log:
+          Verify on TH(all-clusters-app) log
 
           [1657911457.334435][2977:2977] CHIP:DMG: InvokeRequestMessage =
           [1657911457.334464][2977:2977] CHIP:DMG: {
@@ -278,3 +287,35 @@
           [1657911457.335258][2977:2977] CHIP:DMG: AccessControl: allowed
           [1657911457.335287][2977:2977] CHIP:DMG: Received command for Endpoint=1 Cluster=0x0000_0300 Command=0x0000_0047
       disabled: true
+
+    - label: "Over TransitionTime, DUT reads CurrentHue attribute from TH."
+      PICS: CC.C.C47.Rsp && CC.C.A0000
+      verification: |
+          ./chip-tool colorcontrol read current-hue 1  1
+          Verify on TH(all-clusters-app) Log
+
+          [1657911437.116353][2977:2977] CHIP:IM: Received Read request
+          [1657911437.116480][2977:2977] CHIP:DMG: ReadRequestMessage =
+          [1657911437.116528][2977:2977] CHIP:DMG: {
+          [1657911437.116568][2977:2977] CHIP:DMG:        AttributePathIBs =
+          [1657911437.116615][2977:2977] CHIP:DMG:        [
+          [1657911437.116658][2977:2977] CHIP:DMG:                AttributePathIB =
+          [1657911437.116707][2977:2977] CHIP:DMG:                {
+          [1657911437.116758][2977:2977] CHIP:DMG:                        Endpoint = 0x1,
+          [1657911437.116823][2977:2977] CHIP:DMG:                        Cluster = 0x300,
+          [1657911437.116882][2977:2977] CHIP:DMG:                        Attribute = 0x0000_0000,
+          [1657911437.116933][2977:2977] CHIP:DMG:                }
+          [1657911437.116988][2977:2977] CHIP:DMG:
+          [1657911437.117038][2977:2977] CHIP:DMG:        ],
+          [1657911437.117090][2977:2977] CHIP:DMG:
+          [1657911437.117130][2977:2977] CHIP:DMG:        isFabricFiltered = true,
+          [1657911437.117175][2977:2977] CHIP:DMG:        InteractionModelRevision = 1
+          [1657911437.117218][2977:2977] CHIP:DMG: },
+          [1657911437.117344][2977:2977] CHIP:DMG: IM RH moving to [GeneratingReports]
+          [1657911437.117488][2977:2977] CHIP:DMG: Building Reports for ReadHandler with LastReportGeneration = 0 DirtyGeneration = 0
+          [1657911437.117541][2977:2977] CHIP:DMG: <RE:Run> Cluster 300, Attribute 0 is dirty
+          [1657911437.117580][2977:2977] CHIP:DMG: Reading attribute: Cluster=0x0000_0300 Endpoint=1 AttributeId=0x0000_0000 (expanded=0)
+          [1657911437.117629][2977:2977] CHIP:DMG: AccessControl: checking f=1 a=c s=0x000000000001B669 t= c=0x0000_0300 e=1 p=v
+          [1657911437.117684][2977:2977] CHIP:DMG: AccessControl: allowed
+          [1657911437.117773][2977:2977] CHIP:DMG: <RE> Sending report (payload has 37 bytes)...
+      disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_CC_4_5.yaml b/src/app/tests/suites/certification/Test_TC_CC_4_5.yaml
index f49fa4b..872bda6 100644
--- a/src/app/tests/suites/certification/Test_TC_CC_4_5.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CC_4_5.yaml
@@ -24,14 +24,17 @@
     endpoint: 0
 
 tests:
-    - label:
-          "DUT sends MoveToSaturation command to TH a Saturation with
-          TransitionTime 300."
+    - label: "Note"
+      verification: |
+          For DUT as client test cases, Chip-tool command used below are an example to verify the functionality. For certification test, we expect DUT should have a capability or way to run the equivalent command.
+      disabled: true
+
+    - label: "DUT sends MoveToSaturation command to TH"
       PICS: CC.C.C03.Rsp
       verification: |
           ./chip-tool colorcontrol move-to-saturation 200 300 0 0 1 1
 
-          Verify in DUT as client side log:
+          Verify in TH(all-clusters-app) Log:
 
           [1657911500.672151][2977:2977] CHIP:DMG: InvokeRequestMessage =
           [1657911500.672204][2977:2977] CHIP:DMG: {
@@ -67,12 +70,13 @@
       disabled: true
 
     - label:
-          "Over TransitionTime, DUT reads CurrentSaturation attribute from TH."
-      PICS: CC.C.A0001
+          "DUT reads CurrentSaturation attribute from TH (potentially multiple
+          times)"
+      PICS: CC.C.C03.Rsp && CC.C.A0001
       verification: |
           ./chip-tool colorcontrol read current-saturation 1 1
 
-          Verify in DUT as client side log:
+          Verify in TH(all-clusters-app) Log:
 
           [1657911521.672771][2977:2977] CHIP:IM: Received Read request
           [1657911521.672849][2977:2977] CHIP:DMG: ReadRequestMessage =
@@ -104,7 +108,8 @@
       PICS: CC.C.C04.Rsp
       verification: |
           ./chip-tool colorcontrol move-saturation 1 10 0 0 1 1
-          Verify in DUT as client side log:
+
+          Verify in TH(all-clusters-app) Log:
 
 
           [1657911543.960120][2977:2977] CHIP:DMG: InvokeRequestMessage =
@@ -140,12 +145,13 @@
           [1657911543.961152][2977:2977] CHIP:DMG: Received command for Endpoint=1 Cluster=0x0000_0300 Command=0x0000_0004
       disabled: true
 
-    - label: "DUT reads CurrentSaturation attribute from TH several times."
-      PICS: CC.C.A0001
+    - label:
+          "DUT reads CurrentSaturation attribute (potentially multiple times)"
+      PICS: CC.C.C04.Rsp && CC.C.A0001
       verification: |
           ./chip-tool colorcontrol read current-saturation 1 1
 
-          Verify in DUT as client side log:
+          Verify in TH(all-clusters-app) Log:
 
           [1657911563.694872][2977:2977] CHIP:IM: Received Read request
           [1657911563.694955][2977:2977] CHIP:DMG: ReadRequestMessage =
@@ -178,7 +184,7 @@
       verification: |
           ./chip-tool colorcontrol step-saturation 1 10 200 0 0 1 1
 
-          Verify in DUT as client side log:
+          Verify in TH(all-clusters-app) Log:
 
           [1657911581.077515][2977:2977] CHIP:DMG: InvokeRequestMessage =
           [1657911581.077553][2977:2977] CHIP:DMG: {
@@ -215,12 +221,13 @@
       disabled: true
 
     - label:
-          "Over TransitionTime, DUT reads CurrentSaturation attribute from TH."
-      PICS: CC.C.A0001
+          "DUT reads CurrentSaturation attribute from TH (potentially multiple
+          times)"
+      PICS: CC.C.C05.Rsp && CC.C.A0001
       verification: |
           ./chip-tool colorcontrol read current-saturation 1 1
 
-          Verify in DUT as client side log:
+          Verify in TH(all-clusters-app) Log:
           [1657911602.223413][2977:2977] CHIP:IM: Received Read request
           [1657911602.223554][2977:2977] CHIP:DMG: ReadRequestMessage =
           [1657911602.223609][2977:2977] CHIP:DMG: {
@@ -247,12 +254,12 @@
           [1657911602.224608][2977:2977] CHIP:DMG: <RE> Sending report (payload has 37 bytes)...
       disabled: true
 
-    - label: "DUT sends MoveToHueAndSaturation command to TH."
+    - label: "DUT sends MoveToHueAndSaturation command to TH"
       PICS: CC.C.C06.Rsp
       verification: |
           ./chip-tool colorcontrol move-to-hue-and-saturation 100 200 200 0 0 1 1
 
-          Verify in DUT as client side log:
+          Verify in TH(all-clusters-app) Log:
 
           [1657911631.586168][2977:2977] CHIP:DMG: InvokeRequestMessage =
           [1657911631.586198][2977:2977] CHIP:DMG: {
@@ -289,12 +296,12 @@
       disabled: true
 
     - label:
-          "Over TransitionTime, DUT reads CurrentHue and CurrentSaturation
-          attributes from TH."
-      PICS: CC.C.A0000 && CC.C.A0001
+          "DUT reads CurrentHue and CurrentSaturation attributes from TH
+          (potentially multiple times)"
+      PICS: CC.C.C06.Rsp && CC.C.A0000 && CC.C.A0001
       verification: |
           ./chip-tool colorcontrol read current-hue 1 1
-          Verify in DUT as client side log:
+          Verify in TH(all-clusters-app) Log:
 
           [1657911655.180421][2977:2977] CHIP:IM: Received Read request
           [1657911655.180507][2977:2977] CHIP:DMG: ReadRequestMessage =
@@ -324,7 +331,7 @@
 
           "./chip-tool colorcontrol read current-saturation 1 1
 
-          Verify in DUT as client side log:
+          Verify in TH(all-clusters-app) Log:
 
           [1657911674.594218][2977:2977] CHIP:IM: Received Read request
           [1657911674.594301][2977:2977] CHIP:DMG: ReadRequestMessage =
@@ -359,7 +366,7 @@
       verification: |
           ./chip-tool colorcontrol stop-move-step 0 0 1 1
 
-          Verify in DUT as client side log:
+          Verify in TH(all-clusters-app) Log:
           [1657911698.270231][2977:2977] CHIP:DMG: InvokeRequestMessage =
           [1657911698.270280][2977:2977] CHIP:DMG: {
           [1657911698.270321][2977:2977] CHIP:DMG:        suppressResponse = false,
@@ -390,3 +397,36 @@
           [1657911698.271337][2977:2977] CHIP:DMG: AccessControl: allowed
           [1657911698.271365][2977:2977] CHIP:DMG: Received command for Endpoint=1 Cluster=0x0000_0300 Command=0x0000_0047
       disabled: true
+
+    - label:
+          "Over TransitionTime, DUT reads CurrentSaturation attribute from TH."
+      PICS: CC.C.C47.Rsp && CC.C.A0001
+      verification: |
+          ./chip-tool colorcontrol read current-saturation 1 1
+
+          Verify in TH(all-clusters-app) Log:
+          [1657911602.223413][2977:2977] CHIP:IM: Received Read request
+          [1657911602.223554][2977:2977] CHIP:DMG: ReadRequestMessage =
+          [1657911602.223609][2977:2977] CHIP:DMG: {
+          [1657911602.223655][2977:2977] CHIP:DMG:        AttributePathIBs =
+          [1657911602.223708][2977:2977] CHIP:DMG:        [
+          [1657911602.223758][2977:2977] CHIP:DMG:                AttributePathIB =
+          [1657911602.223828][2977:2977] CHIP:DMG:                {
+          [1657911602.223884][2977:2977] CHIP:DMG:                        Endpoint = 0x1,
+          [1657911602.223949][2977:2977] CHIP:DMG:                        Cluster = 0x300,
+          [1657911602.224000][2977:2977] CHIP:DMG:                        Attribute = 0x0000_0001,
+          [1657911602.224027][2977:2977] CHIP:DMG:                }
+          [1657911602.224078][2977:2977] CHIP:DMG:
+          [1657911602.224162][2977:2977] CHIP:DMG:        ],
+          [1657911602.224193][2977:2977] CHIP:DMG:
+          [1657911602.224219][2977:2977] CHIP:DMG:        isFabricFiltered = true,
+          [1657911602.224244][2977:2977] CHIP:DMG:        InteractionModelRevision = 1
+          [1657911602.224267][2977:2977] CHIP:DMG: },
+          [1657911602.224346][2977:2977] CHIP:DMG: IM RH moving to [GeneratingReports]
+          [1657911602.224442][2977:2977] CHIP:DMG: Building Reports for ReadHandler with LastReportGeneration = 0 DirtyGeneration = 0
+          [1657911602.224471][2977:2977] CHIP:DMG: <RE:Run> Cluster 300, Attribute 1 is dirty
+          [1657911602.224492][2977:2977] CHIP:DMG: Reading attribute: Cluster=0x0000_0300 Endpoint=1 AttributeId=0x0000_0001 (expanded=0)
+          [1657911602.224520][2977:2977] CHIP:DMG: AccessControl: checking f=1 a=c s=0x000000000001B669 t= c=0x0000_0300 e=1 p=v
+          [1657911602.224553][2977:2977] CHIP:DMG: AccessControl: allowed
+          [1657911602.224608][2977:2977] CHIP:DMG: <RE> Sending report (payload has 37 bytes)...
+      disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_CC_5_4.yaml b/src/app/tests/suites/certification/Test_TC_CC_5_4.yaml
index c898362..0dc2c4a 100644
--- a/src/app/tests/suites/certification/Test_TC_CC_5_4.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CC_5_4.yaml
@@ -24,13 +24,17 @@
     endpoint: 0
 
 tests:
-    - label:
-          "DUT sends MoveToColor command to TH a Color with TransitionTime 300."
+    - label: "Note"
+      verification: |
+          For DUT as client test cases, Chip-tool command used below are an example to verify the functionality. For certification test, we expect DUT should have a capability or way to run the equivalent command.
+      disabled: true
+
+    - label: "DUT sends MoveToColor command to TH"
       PICS: CC.C.C07.Rsp
       verification: |
           ./chip-tool colorcontrol move-to-color 400 500 300 0 0 1 1
 
-          Verify in DUT as client side log:
+          Verify in TH(all-clusters-app) log:
           [1657911753.687856][2977:2977] CHIP:DMG: InvokeRequestMessage =
           [1657911753.687913][2977:2977] CHIP:DMG: {
           [1657911753.687961][2977:2977] CHIP:DMG:        suppressResponse = false,
@@ -66,13 +70,13 @@
       disabled: true
 
     - label:
-          "Over TransitionTime, DUT reads CurrentX and CurrentY attributes from
-          TH."
+          "DUT reads CurrentX and CurrentY attributes from TH (potentially
+          multiple times)"
       PICS: CC.C.C07.Rsp && CC.C.A0003 && CC.C.A0004
       verification: |
           ./chip-tool colorcontrol read current-x 1 1
 
-          Verify in DUT as client side log:
+          Verify in TH(all-clusters-app) log:
           [1657911771.965429][2977:2977] CHIP:IM: Received Read request
           [1657911771.965509][2977:2977] CHIP:DMG: ReadRequestMessage =
           [1657911771.965536][2977:2977] CHIP:DMG: {
@@ -101,7 +105,7 @@
 
           "./chip-tool colorcontrol read current-y 1 1
 
-          Verify in DUT as client side log:
+          Verify in TH(all-clusters-app) log:
           [1657911790.232595][2977:2977] CHIP:IM: Received Read request
           [1657911790.232674][2977:2977] CHIP:DMG: ReadRequestMessage =
           [1657911790.232700][2977:2977] CHIP:DMG: {
@@ -135,7 +139,7 @@
       verification: |
           ./chip-tool colorcontrol move-color 10 20 0 0 1 1
 
-          Verify in DUT as client side log:
+          Verify in TH(all-clusters-app) log:
 
           [1657911814.839535][2977:2977] CHIP:DMG: InvokeRequestMessage =
           [1657911814.839586][2977:2977] CHIP:DMG: {
@@ -170,12 +174,14 @@
           [1657911814.840624][2977:2977] CHIP:DMG: Received command for Endpoint=1 Cluster=0x0000_0300 Command=0x0000_0008
       disabled: true
 
-    - label: "DUT reads CurrentX and CurrentY attributes from TH."
+    - label:
+          "DUT reads CurrentX and CurrentY attributes from TH (potentially
+          multiple times)"
       PICS: CC.C.C08.Rsp && CC.C.A0003 && CC.C.A0004
       verification: |
           ./chip-tool colorcontrol read current-x 1 1
 
-          Verify in DUT as client side log:
+          Verify in TH(all-clusters-app) log:
           [1657911771.965429][2977:2977] CHIP:IM: Received Read request
           [1657911771.965509][2977:2977] CHIP:DMG: ReadRequestMessage =
           [1657911771.965536][2977:2977] CHIP:DMG: {
@@ -204,7 +210,7 @@
 
           "./chip-tool colorcontrol read current-y 1 1
 
-          Verify in DUT as client side log:
+          Verify in TH(all-clusters-app) log:
           [1657911790.232595][2977:2977] CHIP:IM: Received Read request
           [1657911790.232674][2977:2977] CHIP:DMG: ReadRequestMessage =
           [1657911790.232700][2977:2977] CHIP:DMG: {
@@ -238,7 +244,7 @@
       verification: |
           ./chip-tool colorcontrol step-color 100 100 200 0 0 1 1
 
-          Verify in DUT as client side log:
+          Verify in TH(all-clusters-app) log:
           [1657911853.249758][2977:2977] CHIP:DMG: InvokeRequestMessage =
           [1657911853.249810][2977:2977] CHIP:DMG: {
           [1657911853.249851][2977:2977] CHIP:DMG:        suppressResponse = false,
@@ -274,13 +280,13 @@
       disabled: true
 
     - label:
-          "Over TransitionTime, DUT reads CurrentX and CurrentY attributes from
-          TH."
+          "DUT reads CurrentX and CurrentY attributes from TH (potentially
+          multiple times)"
       PICS: CC.C.C09.Rsp && CC.C.A0003 && CC.C.A0004
       verification: |
           ./chip-tool colorcontrol read current-x 1 1
 
-          Verify in DUT as client side log:
+          Verify in TH(all-clusters-app) log:
           [1657911771.965429][2977:2977] CHIP:IM: Received Read request
           [1657911771.965509][2977:2977] CHIP:DMG: ReadRequestMessage =
           [1657911771.965536][2977:2977] CHIP:DMG: {
@@ -309,7 +315,7 @@
 
           "./chip-tool colorcontrol read current-y 1 1
 
-          Verify in DUT as client side log:
+          Verify in TH(all-clusters-app) log:
           [1657911790.232595][2977:2977] CHIP:IM: Received Read request
           [1657911790.232674][2977:2977] CHIP:DMG: ReadRequestMessage =
           [1657911790.232700][2977:2977] CHIP:DMG: {
@@ -343,7 +349,7 @@
       verification: |
           ./chip-tool colorcontrol stop-move-step 0 0 1 1
 
-          Verify in DUT as client side log:
+          Verify in TH(all-clusters-app) log:
 
           [1657911876.005800][2977:2977] CHIP:DMG: InvokeRequestMessage =
           [1657911876.005828][2977:2977] CHIP:DMG: {
@@ -375,3 +381,68 @@
           [1657911876.006676][2977:2977] CHIP:DMG: AccessControl: allowed
           [1657911876.006706][2977:2977] CHIP:DMG: Received command for Endpoint=1 Cluster=0x0000_0300 Command=0x0000_0047
       disabled: true
+
+    - label:
+          "DUT reads CurrentX and CurrentY attributes from TH (potentially
+          multiple times)"
+      PICS: CC.C.C47.Rsp && CC.C.A0003 && CC.C.A0004
+      verification: |
+          ./chip-tool colorcontrol read current-x 1 1
+
+          Verify in TH(all-clusters-app) log:
+          [1657911771.965429][2977:2977] CHIP:IM: Received Read request
+          [1657911771.965509][2977:2977] CHIP:DMG: ReadRequestMessage =
+          [1657911771.965536][2977:2977] CHIP:DMG: {
+          [1657911771.965557][2977:2977] CHIP:DMG:        AttributePathIBs =
+          [1657911771.965583][2977:2977] CHIP:DMG:        [
+          [1657911771.965606][2977:2977] CHIP:DMG:                AttributePathIB =
+          [1657911771.965631][2977:2977] CHIP:DMG:                {
+          [1657911771.965657][2977:2977] CHIP:DMG:                        Endpoint = 0x1,
+          [1657911771.965695][2977:2977] CHIP:DMG:                        Cluster = 0x300,
+          [1657911771.965726][2977:2977] CHIP:DMG:                        Attribute = 0x0000_0003,
+          [1657911771.965758][2977:2977] CHIP:DMG:                }
+          [1657911771.965786][2977:2977] CHIP:DMG:
+          [1657911771.965811][2977:2977] CHIP:DMG:        ],
+          [1657911771.965838][2977:2977] CHIP:DMG:
+          [1657911771.965864][2977:2977] CHIP:DMG:        isFabricFiltered = true,
+          [1657911771.965889][2977:2977] CHIP:DMG:        InteractionModelRevision = 1
+          [1657911771.965912][2977:2977] CHIP:DMG: },
+          [1657911771.965989][2977:2977] CHIP:DMG: IM RH moving to [GeneratingReports]
+          [1657911771.966084][2977:2977] CHIP:DMG: Building Reports for ReadHandler with LastReportGeneration = 0 DirtyGeneration = 0
+          [1657911771.966114][2977:2977] CHIP:DMG: <RE:Run> Cluster 300, Attribute 3 is dirty
+          [1657911771.966136][2977:2977] CHIP:DMG: Reading attribute: Cluster=0x0000_0300 Endpoint=1 AttributeId=0x0000_0003 (expanded=0)
+          [1657911771.966164][2977:2977] CHIP:DMG: AccessControl: checking f=1 a=c s=0x000000000001B669 t= c=0x0000_0300 e=1 p=v
+          [1657911771.966196][2977:2977] CHIP:DMG: AccessControl: allowed
+          [1657911771.966254][2977:2977] CHIP:DMG: <RE> Sending report (payload has 38 bytes)...
+
+
+          "./chip-tool colorcontrol read current-y 1 1
+
+          Verify in TH(all-clusters-app) log:
+          [1657911790.232595][2977:2977] CHIP:IM: Received Read request
+          [1657911790.232674][2977:2977] CHIP:DMG: ReadRequestMessage =
+          [1657911790.232700][2977:2977] CHIP:DMG: {
+          [1657911790.232723][2977:2977] CHIP:DMG:        AttributePathIBs =
+          [1657911790.232756][2977:2977] CHIP:DMG:        [
+          [1657911790.232780][2977:2977] CHIP:DMG:                AttributePathIB =
+          [1657911790.232807][2977:2977] CHIP:DMG:                {
+          [1657911790.232834][2977:2977] CHIP:DMG:                        Endpoint = 0x1,
+          [1657911790.232865][2977:2977] CHIP:DMG:                        Cluster = 0x300,
+          [1657911790.232898][2977:2977] CHIP:DMG:                        Attribute = 0x0000_0004,
+          [1657911790.232931][2977:2977] CHIP:DMG:                }
+          [1657911790.232960][2977:2977] CHIP:DMG:
+          [1657911790.232985][2977:2977] CHIP:DMG:        ],
+          [1657911790.233012][2977:2977] CHIP:DMG:
+          [1657911790.233038][2977:2977] CHIP:DMG:        isFabricFiltered = true,
+          [1657911790.233063][2977:2977] CHIP:DMG:        InteractionModelRevision = 1
+          [1657911790.233086][2977:2977] CHIP:DMG: },
+          [1657911790.233162][2977:2977] CHIP:DMG: IM RH moving to [GeneratingReports]
+          [1657911790.233249][2977:2977] CHIP:DMG: Building Reports for ReadHandler with LastReportGeneration = 0 DirtyGeneration = 0
+          [1657911790.233279][2977:2977] CHIP:DMG: <RE:Run> Cluster 300, Attribute 4 is dirty
+          [1657911790.233300][2977:2977] CHIP:DMG: Reading attribute: Cluster=0x0000_0300 Endpoint=1 AttributeId=0x0000_0004 (expanded=0)
+          [1657911790.233328][2977:2977] CHIP:DMG: AccessControl: checking f=1 a=c s=0x000000000001B669 t= c=0x0000_0300 e=1 p=v
+          [1657911790.233360][2977:2977] CHIP:DMG: AccessControl: allowed
+          [1657911790.233415][2977:2977] CHIP:DMG: <RE> Sending report (payload has 38 bytes)...
+
+          "
+      disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_CC_6_4.yaml b/src/app/tests/suites/certification/Test_TC_CC_6_4.yaml
index 6863dae..2075de9 100644
--- a/src/app/tests/suites/certification/Test_TC_CC_6_4.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CC_6_4.yaml
@@ -24,16 +24,22 @@
     endpoint: 0
 
 tests:
+    - label: "Note"
+      verification: |
+          For DUT as client test cases, Chip-tool command used below are an example to verify the functionality. For certification test, we expect DUT should have a capability or way to run the equivalent command.
+      disabled: true
+
     - label:
           "* TH provides a server implementation of Color Control with
-          F04(CT)=true and reasonable values of ColorTempPhysicalMinMireds,
-          ColorTempPhysicalMaxMireds * DUT might read attributes like
-          ColorTempPhysicalMinMireds, ColorTempPhysicalMaxMireds from TH (now or
-          in later steps) to use those."
+          F04(CT)=true and reasonable values of ColorTempPhysicalMinMireds (e.g.
+          153 (6500K), ColorTempPhysicalMaxMireds (e.g. 454 (2200K)) * DUT might
+          read attributes like ColorTempPhysicalMinMireds,
+          ColorTempPhysicalMaxMireds from TH (now or in later steps) to use
+          those."
       verification: |
           ./chip-tool colorcontrol read color-temp-physical-min-mireds 1 1
 
-          Verify in DUT as client side log:
+          Verify in TH(all-clusters-app) log:
           [1658215472.478274][3413:3413] CHIP:IM: Received Read request
           [1658215472.478456][3413:3413] CHIP:DMG: ReadRequestMessage =
           [1658215472.478527][3413:3413] CHIP:DMG: {
@@ -61,7 +67,7 @@
 
           ./chip-tool colorcontrol read color-temp-physical-max-mireds 1 1
 
-          Verify in DUT as client side log:
+          Verify in TH(all-clusters-app) log:
           [1658215497.166720][3413:3413] CHIP:IM: Received Read request
           [1658215497.166886][3413:3413] CHIP:DMG: ReadRequestMessage =
           [1658215497.166949][3413:3413] CHIP:DMG: {
@@ -88,11 +94,11 @@
       disabled: true
 
     - label: "DUT sends MoveToColorTemperature command to TH"
-      PICS: CC.C.C0A.Rsp
+      PICS: CC.C.C0a.Rsp
       verification: |
           ./chip-tool colorcontrol move-to-color-temperature 150 300 0 0 1 1
 
-          Verify in DUT as client side log:
+          Verify in TH(all-clusters-app) log:
           [1657911906.102478][2977:2977] CHIP:DMG: InvokeRequestMessage =
           [1657911906.102603][2977:2977] CHIP:DMG: {
           [1657911906.102633][2977:2977] CHIP:DMG:        suppressResponse = false,
@@ -126,124 +132,268 @@
           [1657911906.103757][2977:2977] CHIP:DMG: Received command for Endpoint=1 Cluster=0x0000_0300 Command=0x0000_000A
       disabled: true
 
-    - label: "DUT sends MoveColorTemperature command to TH"
-      PICS: CC.C.C4B.Rsp
+    - label:
+          "DUT reads ColorTemperatureMired attribute from TH (potentially
+          multiple times)"
+      PICS: CC.C.C0a.Rsp && CC.C.A0007
       verification: |
-          ./chip-tool colorcontrol move-color-temperature 1 10 5 250 0 0 1 1
+          ./chip-tool colorcontrol read color-temperature 1 1
 
-          Verify in DUT as client side log:
-          [1657911964.250866][2977:2977] CHIP:DMG: InvokeRequestMessage =
-          [1657911964.250894][2977:2977] CHIP:DMG: {
-          [1657911964.250917][2977:2977] CHIP:DMG:        suppressResponse = false,
-          [1657911964.250952][2977:2977] CHIP:DMG:        timedRequest = false,
-          [1657911964.250991][2977:2977] CHIP:DMG:        InvokeRequests =
-          [1657911964.251026][2977:2977] CHIP:DMG:        [
-          [1657911964.251050][2977:2977] CHIP:DMG:                CommandDataIB =
-          [1657911964.251090][2977:2977] CHIP:DMG:                {
-          [1657911964.251120][2977:2977] CHIP:DMG:                        CommandPathIB =
-          [1657911964.251156][2977:2977] CHIP:DMG:                        {
-          [1657911964.251192][2977:2977] CHIP:DMG:                                EndpointId = 0x1,
-          [1657911964.251230][2977:2977] CHIP:DMG:                                ClusterId = 0x300,
-          [1657911964.251260][2977:2977] CHIP:DMG:                                CommandId = 0x4b,
-          [1657911964.251283][2977:2977] CHIP:DMG:                        },
-          [1657911964.251328][2977:2977] CHIP:DMG:
-          [1657911964.251359][2977:2977] CHIP:DMG:                        CommandFields =
-          [1657911964.251394][2977:2977] CHIP:DMG:                        {
-          [1657911964.251430][2977:2977] CHIP:DMG:                                0x0 = 1,
-          [1657911964.251477][2977:2977] CHIP:DMG:                                0x1 = 10,
-          [1657911964.251516][2977:2977] CHIP:DMG:                                0x2 = 5,
-          [1657911964.251553][2977:2977] CHIP:DMG:                                0x3 = 250,
-          [1657911964.251600][2977:2977] CHIP:DMG:                                0x4 = 0,
-          [1657911964.251639][2977:2977] CHIP:DMG:                                0x5 = 0,
-          [1657911964.251675][2977:2977] CHIP:DMG:                        },
-          [1657911964.251713][2977:2977] CHIP:DMG:                },
-          [1657911964.251748][2977:2977] CHIP:DMG:
-          [1657911964.251772][2977:2977] CHIP:DMG:        ],
-          [1657911964.251812][2977:2977] CHIP:DMG:
-          [1657911964.251838][2977:2977] CHIP:DMG:        InteractionModelRevision = 1
-          [1657911964.251861][2977:2977] CHIP:DMG: },
-          [1657911964.251947][2977:2977] CHIP:DMG: AccessControl: checking f=1 a=c s=0x000000000001B669 t= c=0x0000_0300 e=1 p=o
-          [1657911964.252028][2977:2977] CHIP:DMG: AccessControl: allowed
-          [1657911964.252083][2977:2977] CHIP:DMG: Received command for Endpoint=1 Cluster=0x0000_0300 Command=0x0000_004B
+          Verify in TH(all-clusters-app) log:
+          [1659955633.975562][2718:2718] CHIP:DMG: ReadRequestMessage =
+          [1659955633.975617][2718:2718] CHIP:DMG: {
+          [1659955633.975650][2718:2718] CHIP:DMG: 	AttributePathIBs =
+          [1659955633.975689][2718:2718] CHIP:DMG: 	[
+          [1659955633.975738][2718:2718] CHIP:DMG: 		AttributePathIB =
+          [1659955633.975779][2718:2718] CHIP:DMG: 		{
+          [1659955633.975834][2718:2718] CHIP:DMG: 			Endpoint = 0x1,
+          [1659955633.975894][2718:2718] CHIP:DMG: 			Cluster = 0x300,
+          [1659955633.975941][2718:2718] CHIP:DMG: 			Attribute = 0x0000_0007,
+          [1659955633.975998][2718:2718] CHIP:DMG: 		}
+          [1659955633.976040][2718:2718] CHIP:DMG:
+          [1659955633.976090][2718:2718] CHIP:DMG: 	],
+          [1659955633.976132][2718:2718] CHIP:DMG:
+          [1659955633.976183][2718:2718] CHIP:DMG: 	isFabricFiltered = true,
+          [1659955633.976221][2718:2718] CHIP:DMG: 	InteractionModelRevision = 1
+          [1659955633.976268][2718:2718] CHIP:DMG: },
+          [1659955633.976388][2718:2718] CHIP:DMG: IM RH moving to [GeneratingReports]
+          [1659955633.976525][2718:2718] CHIP:DMG: Building Reports for ReadHandler with LastReportGeneration = 0 DirtyGeneration = 0
+          [1659955633.976567][2718:2718] CHIP:DMG: <RE:Run> Cluster 300, Attribute 7 is dirty
+          [1659955633.976610][2718:2718] CHIP:DMG: Reading attribute: Cluster=0x0000_0300 Endpoint=1 AttributeId=0x0000_0007 (expanded=0)
+          [1659955633.976650][2718:2718] CHIP:DMG: AccessControl: checking f=1 a=c s=0x000000000001B669 t= c=0x0000_0300 e=1 p=v
+          [1659955633.976696][2718:2718] CHIP:DMG: AccessControl: allowed
+      disabled: true
+
+    - label: "DUT sends MoveColorTemperature command to TH"
+      PICS: CC.C.C4b.Rsp
+      verification: |
+          ./chip-tool colorcontrol move-color-temperature 1 16319 0 65279 0 0 1 1
+
+
+          Verify in TH(all-clusters-app) log:
+
+          [1659955779.460043][2718:2718] CHIP:DMG: InvokeRequestMessage =
+          [1659955779.460071][2718:2718] CHIP:DMG: {
+          [1659955779.460095][2718:2718] CHIP:DMG: 	suppressResponse = false,
+          [1659955779.460122][2718:2718] CHIP:DMG: 	timedRequest = false,
+          [1659955779.460147][2718:2718] CHIP:DMG: 	InvokeRequests =
+          [1659955779.460178][2718:2718] CHIP:DMG: 	[
+          [1659955779.460202][2718:2718] CHIP:DMG: 		CommandDataIB =
+          [1659955779.460230][2718:2718] CHIP:DMG: 		{
+          [1659955779.460263][2718:2718] CHIP:DMG: 			CommandPathIB =
+          [1659955779.460300][2718:2718] CHIP:DMG: 			{
+          [1659955779.460334][2718:2718] CHIP:DMG: 				EndpointId = 0x1,
+          [1659955779.460372][2718:2718] CHIP:DMG: 				ClusterId = 0x300,
+          [1659955779.460409][2718:2718] CHIP:DMG: 				CommandId = 0x4b,
+          [1659955779.460444][2718:2718] CHIP:DMG: 			},
+          [1659955779.460477][2718:2718] CHIP:DMG:
+          [1659955779.460504][2718:2718] CHIP:DMG: 			CommandFields =
+          [1659955779.460539][2718:2718] CHIP:DMG: 			{
+          [1659955779.460572][2718:2718] CHIP:DMG: 				0x0 = 1,
+          [1659955779.460608][2718:2718] CHIP:DMG: 				0x1 = 16319,
+          [1659955779.460646][2718:2718] CHIP:DMG: 				0x2 = 0,
+          [1659955779.460683][2718:2718] CHIP:DMG: 				0x3 = 65279,
+          [1659955779.460717][2718:2718] CHIP:DMG: 				0x4 = 0,
+          [1659955779.460755][2718:2718] CHIP:DMG: 				0x5 = 0,
+          [1659955779.460791][2718:2718] CHIP:DMG: 			},
+          [1659955779.460820][2718:2718] CHIP:DMG: 		},
+          [1659955779.460851][2718:2718] CHIP:DMG:
+          [1659955779.460875][2718:2718] CHIP:DMG: 	],
+          [1659955779.460907][2718:2718] CHIP:DMG:
+          [1659955779.460931][2718:2718] CHIP:DMG: 	InteractionModelRevision = 1
+          [1659955779.460954][2718:2718] CHIP:DMG: },
+          [1659955779.461068][2718:2718] CHIP:DMG: AccessControl: checking f=1 a=c s=0x000000000001B669 t= c=0x0000_0300 e=1 p=o
+          [1659955779.461110][2718:2718] CHIP:DMG: AccessControl: allowed
+          [1659955779.461139][2718:2718] CHIP:DMG: Received command for Endpoint=1 Cluster=0x0000_0300 Command=0x0000_004B
+          [1659955779.463159][2718:2718] CHIP:DMG: ICR moving to [ Preparing]
+          [1659955779.463212][2718:2718] CHIP:DMG: ICR moving to [AddingComm]
+          [1659955779.463239][2718:2718] CHIP:DMG: ICR moving to [AddedComma]
+          [1659955779.463289][2718:2718] CHIP:DMG: Decreasing reference count for CommandHandler, remaining 0
+      disabled: true
+
+    - label:
+          "DUT reads ColorTemperatureMired attribute from TH (potentially
+          multiple times)"
+      PICS: CC.C.C4b.Rsp && CC.C.A0007
+      verification: |
+          ./chip-tool colorcontrol read color-temperature 1 1
+
+          Verify in TH(all-clusters-app) log:
+          [1659955633.975562][2718:2718] CHIP:DMG: ReadRequestMessage =
+          [1659955633.975617][2718:2718] CHIP:DMG: {
+          [1659955633.975650][2718:2718] CHIP:DMG: 	AttributePathIBs =
+          [1659955633.975689][2718:2718] CHIP:DMG: 	[
+          [1659955633.975738][2718:2718] CHIP:DMG: 		AttributePathIB =
+          [1659955633.975779][2718:2718] CHIP:DMG: 		{
+          [1659955633.975834][2718:2718] CHIP:DMG: 			Endpoint = 0x1,
+          [1659955633.975894][2718:2718] CHIP:DMG: 			Cluster = 0x300,
+          [1659955633.975941][2718:2718] CHIP:DMG: 			Attribute = 0x0000_0007,
+          [1659955633.975998][2718:2718] CHIP:DMG: 		}
+          [1659955633.976040][2718:2718] CHIP:DMG:
+          [1659955633.976090][2718:2718] CHIP:DMG: 	],
+          [1659955633.976132][2718:2718] CHIP:DMG:
+          [1659955633.976183][2718:2718] CHIP:DMG: 	isFabricFiltered = true,
+          [1659955633.976221][2718:2718] CHIP:DMG: 	InteractionModelRevision = 1
+          [1659955633.976268][2718:2718] CHIP:DMG: },
+          [1659955633.976388][2718:2718] CHIP:DMG: IM RH moving to [GeneratingReports]
+          [1659955633.976525][2718:2718] CHIP:DMG: Building Reports for ReadHandler with LastReportGeneration = 0 DirtyGeneration = 0
+          [1659955633.976567][2718:2718] CHIP:DMG: <RE:Run> Cluster 300, Attribute 7 is dirty
+          [1659955633.976610][2718:2718] CHIP:DMG: Reading attribute: Cluster=0x0000_0300 Endpoint=1 AttributeId=0x0000_0007 (expanded=0)
+          [1659955633.976650][2718:2718] CHIP:DMG: AccessControl: checking f=1 a=c s=0x000000000001B669 t= c=0x0000_0300 e=1 p=v
+          [1659955633.976696][2718:2718] CHIP:DMG: AccessControl: allowed
       disabled: true
 
     - label: "DUT sends StepColorTemperature command to TH"
-      PICS: CC.C.C4C.Rsp
+      PICS: CC.C.C4c.Rsp
       verification: |
-          ./chip-tool colorcontrol step-color-temperature 1 10 200 5 250 0 0 1 1
+          ./chip-tool colorcontrol step-color-temperature 1 32639 200 0 65279 0 0 1 1
 
+          Verify in TH(all-clusters-app) log:
 
-          Verify in DUT as client side log:
+          [1659955888.144223][2718:2718] CHIP:DMG: InvokeRequestMessage =
+          [1659955888.144251][2718:2718] CHIP:DMG: {
+          [1659955888.144275][2718:2718] CHIP:DMG:         suppressResponse = false,
+          [1659955888.144306][2718:2718] CHIP:DMG:         timedRequest = false,
+          [1659955888.144330][2718:2718] CHIP:DMG:         InvokeRequests =
+          [1659955888.144362][2718:2718] CHIP:DMG:         [
+          [1659955888.144386][2718:2718] CHIP:DMG:                 CommandDataIB =
+          [1659955888.144414][2718:2718] CHIP:DMG:                 {
+          [1659955888.144439][2718:2718] CHIP:DMG:                         CommandPathIB =
+          [1659955888.144470][2718:2718] CHIP:DMG:                         {
+          [1659955888.144503][2718:2718] CHIP:DMG:                                 EndpointId = 0x1,
+          [1659955888.144536][2718:2718] CHIP:DMG:                                 ClusterId = 0x300,
+          [1659955888.144569][2718:2718] CHIP:DMG:                                 CommandId = 0x4c,
+          [1659955888.144603][2718:2718] CHIP:DMG:                         },
+          [1659955888.144636][2718:2718] CHIP:DMG:
+          [1659955888.144662][2718:2718] CHIP:DMG:                         CommandFields =
+          [1659955888.144693][2718:2718] CHIP:DMG:                         {
+          [1659955888.144725][2718:2718] CHIP:DMG:                                 0x0 = 1,
+          [1659955888.144759][2718:2718] CHIP:DMG:                                 0x1 = 32639,
+          [1659955888.144791][2718:2718] CHIP:DMG:                                 0x2 = 200,
+          [1659955888.144825][2718:2718] CHIP:DMG:                                 0x3 = 0,
+          [1659955888.144855][2718:2718] CHIP:DMG:                                 0x4 = 65279,
+          [1659955888.144888][2718:2718] CHIP:DMG:                                 0x5 = 0,
+          [1659955888.144917][2718:2718] CHIP:DMG:                                 0x6 = 0,
+          [1659955888.144950][2718:2718] CHIP:DMG:                         },
+          [1659955888.144979][2718:2718] CHIP:DMG:                 },
+          [1659955888.145012][2718:2718] CHIP:DMG:
+          [1659955888.145055][2718:2718] CHIP:DMG:         ],
+          [1659955888.145088][2718:2718] CHIP:DMG:
+          [1659955888.145112][2718:2718] CHIP:DMG:         InteractionModelRevision = 1
+          [1659955888.145135][2718:2718] CHIP:DMG: },
+          [1659955888.145204][2718:2718] CHIP:DMG: AccessControl: checking f=1 a=c s=0x000000000001B669 t= c=0x0000_0300 e=1 p=o
+          [1659955888.145240][2718:2718] CHIP:DMG: AccessControl: allowed
+          [1659955888.145269][2718:2718] CHIP:DMG: Received command for Endpoint=1 Cluster=0x0000_0300 Command=0x0000_004C
+          [1659955888.145332][2718:2718] CHIP:DMG: ICR moving to [ Preparing]
+          [1659955888.145364][2718:2718] CHIP:DMG: ICR moving to [AddingComm]
+          [1659955888.145390][2718:2718] CHIP:DMG: ICR moving to [AddedComma]
+          [1659955888.145432][2718:2718] CHIP:DMG: Decreasing reference count for CommandHandler, remaining 0
+          [1659955888.145463][2718:2718] CHIP:EM: Piggybacking Ack for MessageCounter:152242371 on exchange: 5785r
+      disabled: true
 
-          [1657911996.200187][2977:2977] CHIP:DMG: InvokeRequestMessage =
-          [1657911996.200216][2977:2977] CHIP:DMG: {
-          [1657911996.200238][2977:2977] CHIP:DMG:        suppressResponse = false,
-          [1657911996.200265][2977:2977] CHIP:DMG:        timedRequest = false,
-          [1657911996.200304][2977:2977] CHIP:DMG:        InvokeRequests =
-          [1657911996.200337][2977:2977] CHIP:DMG:        [
-          [1657911996.200361][2977:2977] CHIP:DMG:                CommandDataIB =
-          [1657911996.200389][2977:2977] CHIP:DMG:                {
-          [1657911996.200424][2977:2977] CHIP:DMG:                        CommandPathIB =
-          [1657911996.200465][2977:2977] CHIP:DMG:                        {
-          [1657911996.200507][2977:2977] CHIP:DMG:                                EndpointId = 0x1,
-          [1657911996.200543][2977:2977] CHIP:DMG:                                ClusterId = 0x300,
-          [1657911996.200592][2977:2977] CHIP:DMG:                                CommandId = 0x4c,
-          [1657911996.200626][2977:2977] CHIP:DMG:                        },
-          [1657911996.200659][2977:2977] CHIP:DMG:
-          [1657911996.200701][2977:2977] CHIP:DMG:                        CommandFields =
-          [1657911996.200735][2977:2977] CHIP:DMG:                        {
-          [1657911996.200768][2977:2977] CHIP:DMG:                                0x0 = 1,
-          [1657911996.200816][2977:2977] CHIP:DMG:                                0x1 = 10,
-          [1657911996.200850][2977:2977] CHIP:DMG:                                0x2 = 200,
-          [1657911996.200893][2977:2977] CHIP:DMG:                                0x3 = 5,
-          [1657911996.200931][2977:2977] CHIP:DMG:                                0x4 = 250,
-          [1657911996.200967][2977:2977] CHIP:DMG:                                0x5 = 0,
-          [1657911996.201010][2977:2977] CHIP:DMG:                                0x6 = 0,
-          [1657911996.201046][2977:2977] CHIP:DMG:                        },
-          [1657911996.201075][2977:2977] CHIP:DMG:                },
-          [1657911996.201119][2977:2977] CHIP:DMG:
-          [1657911996.201144][2977:2977] CHIP:DMG:        ],
-          [1657911996.201176][2977:2977] CHIP:DMG:
-          [1657911996.201200][2977:2977] CHIP:DMG:        InteractionModelRevision = 1
-          [1657911996.201237][2977:2977] CHIP:DMG: },
-          [1657911996.201314][2977:2977] CHIP:DMG: AccessControl: checking f=1 a=c s=0x000000000001B669 t= c=0x0000_0300 e=1 p=o
-          [1657911996.201367][2977:2977] CHIP:DMG: AccessControl: allowed
-          [1657911996.201395][2977:2977] CHIP:DMG: Received command for Endpoint=1 Cluster=0x0000_0300 Command=0x0000_004C
+    - label:
+          "DUT reads ColorTemperatureMired attribute from TH (potentially
+          multiple times)"
+      PICS: CC.C.C4c.Rsp && CC.C.A0007
+      verification: |
+          ./chip-tool colorcontrol read color-temperature 1 1
+
+          Verify in TH(all-clusters-app) log:
+          [1659955633.975562][2718:2718] CHIP:DMG: ReadRequestMessage =
+          [1659955633.975617][2718:2718] CHIP:DMG: {
+          [1659955633.975650][2718:2718] CHIP:DMG:         AttributePathIBs =
+          [1659955633.975689][2718:2718] CHIP:DMG:         [
+          [1659955633.975738][2718:2718] CHIP:DMG:                 AttributePathIB =
+          [1659955633.975779][2718:2718] CHIP:DMG:                 {
+          [1659955633.975834][2718:2718] CHIP:DMG:                         Endpoint = 0x1,
+          [1659955633.975894][2718:2718] CHIP:DMG:                         Cluster = 0x300,
+          [1659955633.975941][2718:2718] CHIP:DMG:                         Attribute = 0x0000_0007,
+          [1659955633.975998][2718:2718] CHIP:DMG:                 }
+          [1659955633.976040][2718:2718] CHIP:DMG:
+          [1659955633.976090][2718:2718] CHIP:DMG:         ],
+          [1659955633.976132][2718:2718] CHIP:DMG:
+          [1659955633.976183][2718:2718] CHIP:DMG:         isFabricFiltered = true,
+          [1659955633.976221][2718:2718] CHIP:DMG:         InteractionModelRevision = 1
+          [1659955633.976268][2718:2718] CHIP:DMG: },
+          [1659955633.976388][2718:2718] CHIP:DMG: IM RH moving to [GeneratingReports]
+          [1659955633.976525][2718:2718] CHIP:DMG: Building Reports for ReadHandler with LastReportGeneration = 0 DirtyGeneration = 0
+          [1659955633.976567][2718:2718] CHIP:DMG: <RE:Run> Cluster 300, Attribute 7 is dirty
+          [1659955633.976610][2718:2718] CHIP:DMG: Reading attribute: Cluster=0x0000_0300 Endpoint=1 AttributeId=0x0000_0007 (expanded=0)
+          [1659955633.976650][2718:2718] CHIP:DMG: AccessControl: checking f=1 a=c s=0x000000000001B669 t= c=0x0000_0300 e=1 p=v
+          [1659955633.976696][2718:2718] CHIP:DMG: AccessControl: allowed
       disabled: true
 
     - label: "DUT sends StopMoveStep command to TH."
       PICS: CC.C.C47.Rsp
       verification: |
           ./chip-tool colorcontrol stop-move-step 0 0 1 1
+          Verify in TH(all-clusters-app) log:
 
-          Verify in DUT as client side log:
-          [1657912016.927414][2977:2977] CHIP:DMG: InvokeRequestMessage =
-          [1657912016.927442][2977:2977] CHIP:DMG: {
-          [1657912016.927464][2977:2977] CHIP:DMG:        suppressResponse = false,
-          [1657912016.927490][2977:2977] CHIP:DMG:        timedRequest = false,
-          [1657912016.927514][2977:2977] CHIP:DMG:        InvokeRequests =
-          [1657912016.927557][2977:2977] CHIP:DMG:        [
-          [1657912016.927581][2977:2977] CHIP:DMG:                CommandDataIB =
-          [1657912016.927608][2977:2977] CHIP:DMG:                {
-          [1657912016.927642][2977:2977] CHIP:DMG:                        CommandPathIB =
-          [1657912016.927675][2977:2977] CHIP:DMG:                        {
-          [1657912016.927705][2977:2977] CHIP:DMG:                                EndpointId = 0x1,
-          [1657912016.927739][2977:2977] CHIP:DMG:                                ClusterId = 0x300,
-          [1657912016.927770][2977:2977] CHIP:DMG:                                CommandId = 0x47,
-          [1657912016.927809][2977:2977] CHIP:DMG:                        },
-          [1657912016.927841][2977:2977] CHIP:DMG:
-          [1657912016.927866][2977:2977] CHIP:DMG:                        CommandFields =
-          [1657912016.927905][2977:2977] CHIP:DMG:                        {
-          [1657912016.927935][2977:2977] CHIP:DMG:                                0x0 = 0,
-          [1657912016.927976][2977:2977] CHIP:DMG:                                0x1 = 0,
-          [1657912016.928008][2977:2977] CHIP:DMG:                        },
-          [1657912016.928035][2977:2977] CHIP:DMG:                },
-          [1657912016.928090][2977:2977] CHIP:DMG:
-          [1657912016.928124][2977:2977] CHIP:DMG:        ],
-          [1657912016.928154][2977:2977] CHIP:DMG:
-          [1657912016.928178][2977:2977] CHIP:DMG:        InteractionModelRevision = 1
-          [1657912016.928201][2977:2977] CHIP:DMG: },
-          [1657912016.928282][2977:2977] CHIP:DMG: AccessControl: checking f=1 a=c s=0x000000000001B669 t= c=0x0000_0300 e=1 p=o
-          [1657912016.928328][2977:2977] CHIP:DMG: AccessControl: allowed
-          [1657912016.928356][2977:2977] CHIP:DMG: Received command for Endpoint=1 Cluster=0x0000_0300 Command=0x0000_0047
+
+          [1659955999.857777][2718:2718] CHIP:DMG: InvokeRequestMessage =
+          [1659955999.857804][2718:2718] CHIP:DMG: {
+          [1659955999.857827][2718:2718] CHIP:DMG:         suppressResponse = false,
+          [1659955999.857852][2718:2718] CHIP:DMG:         timedRequest = false,
+          [1659955999.857876][2718:2718] CHIP:DMG:         InvokeRequests =
+          [1659955999.857906][2718:2718] CHIP:DMG:         [
+          [1659955999.857931][2718:2718] CHIP:DMG:                 CommandDataIB =
+          [1659955999.857964][2718:2718] CHIP:DMG:                 {
+          [1659955999.857990][2718:2718] CHIP:DMG:                         CommandPathIB =
+          [1659955999.858022][2718:2718] CHIP:DMG:                         {
+          [1659955999.858054][2718:2718] CHIP:DMG:                                 EndpointId = 0x1,
+          [1659955999.858088][2718:2718] CHIP:DMG:                                 ClusterId = 0x300,
+          [1659955999.858118][2718:2718] CHIP:DMG:                                 CommandId = 0x47,
+          [1659955999.858150][2718:2718] CHIP:DMG:                         },
+          [1659955999.858182][2718:2718] CHIP:DMG:
+          [1659955999.858208][2718:2718] CHIP:DMG:                         CommandFields =
+          [1659955999.858238][2718:2718] CHIP:DMG:                         {
+          [1659955999.858270][2718:2718] CHIP:DMG:                                 0x0 = 0,
+          [1659955999.858305][2718:2718] CHIP:DMG:                                 0x1 = 0,
+          [1659955999.858338][2718:2718] CHIP:DMG:                         },
+          [1659955999.858364][2718:2718] CHIP:DMG:                 },
+          [1659955999.858393][2718:2718] CHIP:DMG:
+          [1659955999.858417][2718:2718] CHIP:DMG:         ],
+          [1659955999.858447][2718:2718] CHIP:DMG:
+          [1659955999.858471][2718:2718] CHIP:DMG:         InteractionModelRevision = 1
+          [1659955999.858494][2718:2718] CHIP:DMG: },
+          [1659955999.858560][2718:2718] CHIP:DMG: AccessControl: checking f=1 a=c s=0x000000000001B669 t= c=0x0000_0300 e=1 p=o
+          [1659955999.858598][2718:2718] CHIP:DMG: AccessControl: allowed
+          [1659955999.858626][2718:2718] CHIP:DMG: Received command for Endpoint=1 Cluster=0x0000_0300 Command=0x0000_0047
+          [1659955999.858681][2718:2718] CHIP:DMG: ICR moving to [ Preparing]
+          [1659955999.858713][2718:2718] CHIP:DMG: ICR moving to [AddingComm]
+          [1659955999.858739][2718:2718] CHIP:DMG: ICR moving to [AddedComma]
+          [1659955999.858776][2718:2718] CHIP:DMG: Decreasing reference count for CommandHandler, remaining 0
+          [1659955999.858808][2718:2718] CHIP:EM: Piggybacking Ack for MessageCounter:92622659 on exchange: 1429r
+      disabled: true
+
+    - label:
+          "DUT reads ColorTemperatureMired attribute from TH (potentially
+          multiple times)"
+      PICS: CC.C.C47.Rsp && CC.C.A0007
+      verification: |
+          ./chip-tool colorcontrol read color-temperature 1 1
+
+          Verify in TH(all-clusters-app) log:
+          [1659955633.975562][2718:2718] CHIP:DMG: ReadRequestMessage =
+          [1659955633.975617][2718:2718] CHIP:DMG: {
+          [1659955633.975650][2718:2718] CHIP:DMG:         AttributePathIBs =
+          [1659955633.975689][2718:2718] CHIP:DMG:         [
+          [1659955633.975738][2718:2718] CHIP:DMG:                 AttributePathIB =
+          [1659955633.975779][2718:2718] CHIP:DMG:                 {
+          [1659955633.975834][2718:2718] CHIP:DMG:                         Endpoint = 0x1,
+          [1659955633.975894][2718:2718] CHIP:DMG:                         Cluster = 0x300,
+          [1659955633.975941][2718:2718] CHIP:DMG:                         Attribute = 0x0000_0007,
+          [1659955633.975998][2718:2718] CHIP:DMG:                 }
+          [1659955633.976040][2718:2718] CHIP:DMG:
+          [1659955633.976090][2718:2718] CHIP:DMG:         ],
+          [1659955633.976132][2718:2718] CHIP:DMG:
+          [1659955633.976183][2718:2718] CHIP:DMG:         isFabricFiltered = true,
+          [1659955633.976221][2718:2718] CHIP:DMG:         InteractionModelRevision = 1
+          [1659955633.976268][2718:2718] CHIP:DMG: },
+          [1659955633.976388][2718:2718] CHIP:DMG: IM RH moving to [GeneratingReports]
+          [1659955633.976525][2718:2718] CHIP:DMG: Building Reports for ReadHandler with LastReportGeneration = 0 DirtyGeneration = 0
+          [1659955633.976567][2718:2718] CHIP:DMG: <RE:Run> Cluster 300, Attribute 7 is dirty
+          [1659955633.976610][2718:2718] CHIP:DMG: Reading attribute: Cluster=0x0000_0300 Endpoint=1 AttributeId=0x0000_0007 (expanded=0)
+          [1659955633.976650][2718:2718] CHIP:DMG: AccessControl: checking f=1 a=c s=0x000000000001B669 t= c=0x0000_0300 e=1 p=v
+          [1659955633.976696][2718:2718] CHIP:DMG: AccessControl: allowed
       disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_CC_7_5.yaml b/src/app/tests/suites/certification/Test_TC_CC_7_5.yaml
index 340c638..9e45d0b 100644
--- a/src/app/tests/suites/certification/Test_TC_CC_7_5.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CC_7_5.yaml
@@ -24,13 +24,17 @@
     endpoint: 0
 
 tests:
-    - label:
-          "DUT sends MoveToEnhancedHue command to TH an EnhancedHue with
-          TransitionTime 300."
+    - label: "Note"
+      verification: |
+          For DUT as client test cases, Chip-tool command used below are an example to verify the functionality. For certification test, we expect DUT should have a capability or way to run the equivalent command.
+      disabled: true
+
+    - label: "DUT sends EnhancedMoveToHue command to TH"
       PICS: CC.C.C40.Rsp
       verification: |
           ./chip-tool colorcontrol enhanced-move-to-hue 1000 3 200 0 0 1 1
-          Verify in DUT as client side log:
+
+          Verify in TH(all-clusters-app) log:
           [1657912045.703432][2977:2977] CHIP:DMG: InvokeRequestMessage =
           [1657912045.703462][2977:2977] CHIP:DMG: {
           [1657912045.703485][2977:2977] CHIP:DMG:        suppressResponse = false,
@@ -66,12 +70,13 @@
       disabled: true
 
     - label:
-          "Over TransitionTime, DUT reads CurrentEnhanced Hue attribute from TH."
-      PICS: CC.C.A4000
+          "DUT reads EnhancedCurrentHue attribute from TH (potentially multiple
+          times)"
+      PICS: CC.C.C40.Rsp && CC.C.A4000
       verification: |
           ./chip-tool colorcontrol read enhanced-current-hue 1 1
 
-          Verify in DUT as client side log:
+          Verify in TH(all-clusters-app) log:
           [1657912064.296156][2977:2977] CHIP:IM: Received Read request
           [1657912064.296261][2977:2977] CHIP:DMG: ReadRequestMessage =
           [1657912064.296295][2977:2977] CHIP:DMG: {
@@ -98,12 +103,12 @@
           [1657912064.297288][2977:2977] CHIP:DMG: <RE> Sending report (payload has 38 bytes)...
       disabled: true
 
-    - label: "DUT sends MoveEnhanced Hue command to TH"
+    - label: "DUT sends EnhancedMoveHue command to TH"
       PICS: CC.C.C41.Rsp
       verification: |
           ./chip-tool colorcontrol enhanced-move-hue 0 100 0 0 1 1
 
-          Verify in DUT as client side log:
+          Verify in TH(all-clusters-app) log:
 
           [1657912085.345044][2977:2977] CHIP:DMG: InvokeRequestMessage =
           [1657912085.345072][2977:2977] CHIP:DMG: {
@@ -138,12 +143,13 @@
           [1657912085.345962][2977:2977] CHIP:DMG: Received command for Endpoint=1 Cluster=0x0000_0300 Command=0x0000_0041
       disabled: true
 
-    - label: "DUT reads CurrentEnhanced Hue attribute from TH several times."
-      PICS: CC.C.A4000
+    - label:
+          "DUT reads EnhancedCurrentHue attribute (potentially multiple times)"
+      PICS: CC.C.C41.Rsp && CC.C.A4000
       verification: |
           ./chip-tool colorcontrol read enhanced-current-hue 1 1
 
-          Verify in DUT as client side log:
+          Verify in TH(all-clusters-app) log:
           [1657912064.296156][2977:2977] CHIP:IM: Received Read request
           [1657912064.296261][2977:2977] CHIP:DMG: ReadRequestMessage =
           [1657912064.296295][2977:2977] CHIP:DMG: {
@@ -170,12 +176,12 @@
           [1657912064.297288][2977:2977] CHIP:DMG: <RE> Sending report (payload has 38 bytes)...
       disabled: true
 
-    - label: "DUT sends StepEnhanced Hue command to TH"
+    - label: "DUT sends EnhancedStepHue command to TH"
       PICS: CC.C.C42.Rsp
       verification: |
           ./chip-tool colorcontrol enhanced-step-hue 1 1000 200 0 0 1 1
 
-          Verify in DUT as client side log:
+          Verify in TH(all-clusters-app) log:
           [1657912123.677693][2977:2977] CHIP:DMG: InvokeRequestMessage =
           [1657912123.677720][2977:2977] CHIP:DMG: {
           [1657912123.677742][2977:2977] CHIP:DMG:        suppressResponse = false,
@@ -211,12 +217,13 @@
       disabled: true
 
     - label:
-          "Over TransitionTime, DUT reads CurrentEnhanced Hue attribute from TH."
-      PICS: CC.C.A4000
+          "DUT reads EnhancedCurrentHue attribute from TH (potentially multiple
+          times)"
+      PICS: CC.C.C42.Rsp && CC.C.A4000
       verification: |
           ./chip-tool colorcontrol read enhanced-current-hue 1 1
 
-          Verify in DUT as client side log:
+          Verify in TH(all-clusters-app) log:
           [1657912064.296156][2977:2977] CHIP:IM: Received Read request
           [1657912064.296261][2977:2977] CHIP:DMG: ReadRequestMessage =
           [1657912064.296295][2977:2977] CHIP:DMG: {
@@ -243,11 +250,12 @@
           [1657912064.297288][2977:2977] CHIP:DMG: <RE> Sending report (payload has 38 bytes)...
       disabled: true
 
-    - label: "DUT sends EnhancedMoveToHueAndSaturation command to TH."
+    - label: "DUT sends EnhancedMoveToHueAndSaturation command to TH"
       PICS: CC.C.C43.Rsp
       verification: |
           ./chip-tool colorcontrol enhanced-move-to-hue-and-saturation 2500 100 200 0 0 1 1
-          Verify in DUT as client side log:
+
+          Verify in TH(all-clusters-app) log:
           [1657912153.500024][2977:2977] CHIP:DMG: InvokeRequestMessage =
           [1657912153.500080][2977:2977] CHIP:DMG: {
           [1657912153.500108][2977:2977] CHIP:DMG:        suppressResponse = false,
@@ -283,12 +291,13 @@
       disabled: true
 
     - label:
-          "Over TransitionTime, DUT reads EnhancedCurrentHue attribute from TH."
-      PICS: CC.C.A4000
+          "DUT reads EnhancedCurrentHue and CurrentSaturation attributes from TH
+          (potentially multiple times)"
+      PICS: CC.C.C43.Rsp && CC.C.A4000 && CC.C.A0001
       verification: |
           ./chip-tool colorcontrol read enhanced-current-hue 1 1
 
-          Verify in DUT as client side log:
+          Verify in TH(all-clusters-app) log:
           [1657912064.296156][2977:2977] CHIP:IM: Received Read request
           [1657912064.296261][2977:2977] CHIP:DMG: ReadRequestMessage =
           [1657912064.296295][2977:2977] CHIP:DMG: {
@@ -320,7 +329,7 @@
       verification: |
           ./chip-tool colorcontrol stop-move-step 0 0 1 1
 
-          Verify in DUT as client side log:
+          Verify in TH(all-clusters-app) log:
           [1657912172.988756][2977:2977] CHIP:DMG: InvokeRequestMessage =
           [1657912172.988782][2977:2977] CHIP:DMG: {
           [1657912172.988805][2977:2977] CHIP:DMG:        suppressResponse = false,
@@ -351,3 +360,36 @@
           [1657912172.989646][2977:2977] CHIP:DMG: AccessControl: allowed
           [1657912172.989682][2977:2977] CHIP:DMG: Received command for Endpoint=1 Cluster=0x0000_0300 Command=0x0000_0047
       disabled: true
+
+    - label:
+          "Over TransitionTime, DUT reads EnhancedCurrentHue attribute from TH."
+      PICS: CC.C.C47.Rsp && CC.C.A4000
+      verification: |
+          ./chip-tool colorcontrol read enhanced-current-hue 1 1
+
+          Verify in TH(all-clusters-app) log:
+          [1657912064.296156][2977:2977] CHIP:IM: Received Read request
+          [1657912064.296261][2977:2977] CHIP:DMG: ReadRequestMessage =
+          [1657912064.296295][2977:2977] CHIP:DMG: {
+          [1657912064.296322][2977:2977] CHIP:DMG:        AttributePathIBs =
+          [1657912064.296378][2977:2977] CHIP:DMG:        [
+          [1657912064.296409][2977:2977] CHIP:DMG:                AttributePathIB =
+          [1657912064.296448][2977:2977] CHIP:DMG:                {
+          [1657912064.296497][2977:2977] CHIP:DMG:                        Endpoint = 0x1,
+          [1657912064.296538][2977:2977] CHIP:DMG:                        Cluster = 0x300,
+          [1657912064.296578][2977:2977] CHIP:DMG:                        Attribute = 0x0000_4000,
+          [1657912064.296621][2977:2977] CHIP:DMG:                }
+          [1657912064.296660][2977:2977] CHIP:DMG:
+          [1657912064.296694][2977:2977] CHIP:DMG:        ],
+          [1657912064.296729][2977:2977] CHIP:DMG:
+          [1657912064.296774][2977:2977] CHIP:DMG:        isFabricFiltered = true,
+          [1657912064.296808][2977:2977] CHIP:DMG:        InteractionModelRevision = 1
+          [1657912064.296837][2977:2977] CHIP:DMG: },
+          [1657912064.296942][2977:2977] CHIP:DMG: IM RH moving to [GeneratingReports]
+          [1657912064.297059][2977:2977] CHIP:DMG: Building Reports for ReadHandler with LastReportGeneration = 0 DirtyGeneration = 0
+          [1657912064.297109][2977:2977] CHIP:DMG: <RE:Run> Cluster 300, Attribute 4000 is dirty
+          [1657912064.297136][2977:2977] CHIP:DMG: Reading attribute: Cluster=0x0000_0300 Endpoint=1 AttributeId=0x0000_4000 (expanded=0)
+          [1657912064.297171][2977:2977] CHIP:DMG: AccessControl: checking f=1 a=c s=0x000000000001B669 t= c=0x0000_0300 e=1 p=v
+          [1657912064.297210][2977:2977] CHIP:DMG: AccessControl: allowed
+          [1657912064.297288][2977:2977] CHIP:DMG: <RE> Sending report (payload has 38 bytes)...
+      disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_CC_9_4.yaml b/src/app/tests/suites/certification/Test_TC_CC_9_4.yaml
index cd47ce2..e91449e 100644
--- a/src/app/tests/suites/certification/Test_TC_CC_9_4.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CC_9_4.yaml
@@ -24,93 +24,17 @@
     endpoint: 0
 
 tests:
-    - label: "Set OnOff to On Pre-set EnhancedCurrentHue to 0x4000"
+    - label: "Note"
       verification: |
-          ./chip-tool onoff on 1 1
-
-          Verify in DUT as client side log:
-          [1657912254.685769][2977:2977] CHIP:DMG: InvokeRequestMessage =
-          [1657912254.685812][2977:2977] CHIP:DMG: {
-          [1657912254.685849][2977:2977] CHIP:DMG:        suppressResponse = false,
-          [1657912254.685891][2977:2977] CHIP:DMG:        timedRequest = false,
-          [1657912254.685945][2977:2977] CHIP:DMG:        InvokeRequests =
-          [1657912254.685994][2977:2977] CHIP:DMG:        [
-          [1657912254.686033][2977:2977] CHIP:DMG:                CommandDataIB =
-          [1657912254.686097][2977:2977] CHIP:DMG:                {
-          [1657912254.686138][2977:2977] CHIP:DMG:                        CommandPathIB =
-          [1657912254.686190][2977:2977] CHIP:DMG:                        {
-          [1657912254.686255][2977:2977] CHIP:DMG:                                EndpointId = 0x1,
-          [1657912254.686310][2977:2977] CHIP:DMG:                                ClusterId = 0x6,
-          [1657912254.686361][2977:2977] CHIP:DMG:                                CommandId = 0x1,
-          [1657912254.686424][2977:2977] CHIP:DMG:                        },
-          [1657912254.686480][2977:2977] CHIP:DMG:
-          [1657912254.686523][2977:2977] CHIP:DMG:                        CommandFields =
-          [1657912254.686572][2977:2977] CHIP:DMG:                        {
-          [1657912254.686621][2977:2977] CHIP:DMG:                        },
-          [1657912254.686679][2977:2977] CHIP:DMG:                },
-          [1657912254.686727][2977:2977] CHIP:DMG:
-          [1657912254.686765][2977:2977] CHIP:DMG:        ],
-          [1657912254.686812][2977:2977] CHIP:DMG:
-          [1657912254.686866][2977:2977] CHIP:DMG:        InteractionModelRevision = 1
-          [1657912254.686904][2977:2977] CHIP:DMG: },
-          [1657912254.687011][2977:2977] CHIP:DMG: AccessControl: checking f=1 a=c s=0x000000000001B669 t= c=0x0000_0006 e=1 p=o
-          [1657912254.687066][2977:2977] CHIP:DMG: AccessControl: allowed
-          [1657912254.687110][2977:2977] CHIP:DMG: Received command for Endpoint=1 Cluster=0x0000_0006 Command=0x0000_0001
-          [1657912254.687171][2977:2977] CHIP:ZCL: On/Off set value: 1 1
-          [1657912254.687213][2977:2977] CHIP:ZCL: Toggle on/off from 0 to 1
-          [1657912254.687251][2977:2977] CHIP:ZCL: On Command - OffWaitTime :  0
-          [1657912254.687307][2977:2977] CHIP:DMG: Endpoint 1, Cluster 0x0000_0006 update version to a51673a9
-          [1657912254.687353][2977:2977] CHIP:ZCL: On/Toggle Command - Stop Timer
-          [1657912254.687388][2977:2977] CHIP:DMG: Endpoint 1, Cluster 0x0000_0006 update version to a51673aa
-
-
-
-          ./chip-tool colorcontrol enhanced-move-to-hue 16384 0 0 0 0 1 1
-
-          Verify in DUT as client side log:
-          [1657912325.922452][2977:2977] CHIP:DMG: InvokeRequestMessage =
-          [1657912325.922480][2977:2977] CHIP:DMG: {
-          [1657912325.922503][2977:2977] CHIP:DMG:        suppressResponse = false,
-          [1657912325.922529][2977:2977] CHIP:DMG:        timedRequest = false,
-          [1657912325.922553][2977:2977] CHIP:DMG:        InvokeRequests =
-          [1657912325.922596][2977:2977] CHIP:DMG:        [
-          [1657912325.922622][2977:2977] CHIP:DMG:                CommandDataIB =
-          [1657912325.922649][2977:2977] CHIP:DMG:                {
-          [1657912325.922673][2977:2977] CHIP:DMG:                        CommandPathIB =
-          [1657912325.922720][2977:2977] CHIP:DMG:                        {
-          [1657912325.922753][2977:2977] CHIP:DMG:                                EndpointId = 0x1,
-          [1657912325.922787][2977:2977] CHIP:DMG:                                ClusterId = 0x300,
-          [1657912325.922820][2977:2977] CHIP:DMG:                                CommandId = 0x40,
-          [1657912325.922862][2977:2977] CHIP:DMG:                        },
-          [1657912325.922896][2977:2977] CHIP:DMG:
-          [1657912325.922922][2977:2977] CHIP:DMG:                        CommandFields =
-          [1657912325.922953][2977:2977] CHIP:DMG:                        {
-          [1657912325.922986][2977:2977] CHIP:DMG:                                0x0 = 16384,
-          [1657912325.923030][2977:2977] CHIP:DMG:                                0x1 = 0,
-          [1657912325.923064][2977:2977] CHIP:DMG:                                0x2 = 0,
-          [1657912325.923097][2977:2977] CHIP:DMG:                                0x3 = 0,
-          [1657912325.923138][2977:2977] CHIP:DMG:                                0x4 = 0,
-          [1657912325.923171][2977:2977] CHIP:DMG:                        },
-          [1657912325.923200][2977:2977] CHIP:DMG:                },
-          [1657912325.923240][2977:2977] CHIP:DMG:
-          [1657912325.923265][2977:2977] CHIP:DMG:        ],
-          [1657912325.923296][2977:2977] CHIP:DMG:
-          [1657912325.923319][2977:2977] CHIP:DMG:        InteractionModelRevision = 1
-          [1657912325.923351][2977:2977] CHIP:DMG: },
-          [1657912325.923425][2977:2977] CHIP:DMG: AccessControl: checking f=1 a=c s=0x000000000001B669 t= c=0x0000_0300 e=1 p=o
-          [1657912325.923477][2977:2977] CHIP:DMG: AccessControl: allowed
-          [1657912325.923507][2977:2977] CHIP:DMG: Received command for Endpoint=1 Cluster=0x0000_0300 Command=0x0000_0040
+          For DUT as client test cases, Chip-tool command used below are an example to verify the functionality. For certification test, we expect DUT should have a capability or way to run the equivalent command.
       disabled: true
 
-    - label:
-          "DUT sends ColorLoopSet command to with UpdateFlag attribute to 0xF,
-          action attribute to 0x0, Direction attribute to 0x0, Time attribute to
-          30, and StartHue attribute to 0xA0 to TH."
+    - label: "DUT sends ColorLoopSet command to TH."
       PICS: CC.C.C44.Rsp
       verification: |
           ./chip-tool colorcontrol color-loop-set 15 0 0 30 160 0 0 1 1
 
-          Verify in DUT as client side log:
+          Verify in TH(all-clusters-app) log:
           [1657912387.432732][3126:3126] CHIP:DMG: InvokeRequestMessage =
           [1657912387.432781][3126:3126] CHIP:DMG: {
           [1657912387.432823][3126:3126] CHIP:DMG:        suppressResponse = false,
@@ -152,7 +76,7 @@
       verification: |
           ./chip-tool colorcontrol read color-loop-active 1 1
 
-          Verify in DUT as client side log:
+          Verify in TH(all-clusters-app) log:
           [1657912416.547714][3126:3126] CHIP:IM: Received Read request
           [1657912416.547842][3126:3126] CHIP:DMG: ReadRequestMessage =
           [1657912416.547890][3126:3126] CHIP:DMG: {
@@ -184,7 +108,7 @@
       verification: |
           ./chip-tool colorcontrol read color-loop-direction 1 1
 
-          Verify in DUT as client side log:
+          Verify in TH(all-clusters-app) log:
           [1657912446.661818][3126:3126] CHIP:IM: Received Read request
           [1657912446.661940][3126:3126] CHIP:DMG: ReadRequestMessage =
           [1657912446.661989][3126:3126] CHIP:DMG: {
@@ -215,7 +139,8 @@
       PICS: CC.C.A4004
       verification: |
           ./chip-tool colorcontrol read color-loop-time 1 1
-          Verify in DUT as client side log:
+
+          Verify in TH(all-clusters-app) log:
           [1657912469.590293][3126:3126] CHIP:IM: Received Read request
           [1657912469.590419][3126:3126] CHIP:DMG: ReadRequestMessage =
           [1657912469.590466][3126:3126] CHIP:DMG: {
@@ -247,7 +172,7 @@
       verification: |
           ./chip-tool colorcontrol read color-loop-start-enhanced-hue 1 1
 
-          Verify in DUT as client side log:
+          Verify in TH(all-clusters-app) log:
           [1657912490.104534][3126:3126] CHIP:IM: Received Read request
           [1657912490.104664][3126:3126] CHIP:DMG: ReadRequestMessage =
           [1657912490.104713][3126:3126] CHIP:DMG: {
@@ -275,47 +200,32 @@
       disabled: true
 
     - label:
-          "DUT sends ColorLoopSet command to with UpdateFlag attribute to 0x1
-          and Action attribute to 0x1 to TH."
-      PICS: CC.C.C44.Rsp
+          "Over next 30 seconds, at 5 seconds interval, DUT read
+          EnhancedCurrentHue attribute from TH."
+      PICS: CC.C.A4000
       verification: |
-          ./chip-tool colorcontrol color-loop-set 1 1 0 0 0 0 0 1 1
+          ./chip-tool colorcontrol read enhanced-current-hue 1 1
 
-          Verify in DUT as client side log:
-          [1657912520.093793][3126:3126] CHIP:DMG: InvokeRequestMessage =
-          [1657912520.093822][3126:3126] CHIP:DMG: {
-          [1657912520.093845][3126:3126] CHIP:DMG:        suppressResponse = false,
-          [1657912520.093872][3126:3126] CHIP:DMG:        timedRequest = false,
-          [1657912520.093896][3126:3126] CHIP:DMG:        InvokeRequests =
-          [1657912520.093928][3126:3126] CHIP:DMG:        [
-          [1657912520.093952][3126:3126] CHIP:DMG:                CommandDataIB =
-          [1657912520.093989][3126:3126] CHIP:DMG:                {
-          [1657912520.094015][3126:3126] CHIP:DMG:                        CommandPathIB =
-          [1657912520.094046][3126:3126] CHIP:DMG:                        {
-          [1657912520.094079][3126:3126] CHIP:DMG:                                EndpointId = 0x1,
-          [1657912520.094112][3126:3126] CHIP:DMG:                                ClusterId = 0x300,
-          [1657912520.094144][3126:3126] CHIP:DMG:                                CommandId = 0x44,
-          [1657912520.094173][3126:3126] CHIP:DMG:                        },
-          [1657912520.094199][3126:3126] CHIP:DMG:
-          [1657912520.094225][3126:3126] CHIP:DMG:                        CommandFields =
-          [1657912520.094255][3126:3126] CHIP:DMG:                        {
-          [1657912520.094286][3126:3126] CHIP:DMG:                                0x0 = 1,
-          [1657912520.094316][3126:3126] CHIP:DMG:                                0x1 = 1,
-          [1657912520.094342][3126:3126] CHIP:DMG:                                0x2 = 0,
-          [1657912520.094367][3126:3126] CHIP:DMG:                                0x3 = 0,
-          [1657912520.094492][3126:3126] CHIP:DMG:                                0x4 = 0,
-          [1657912520.094533][3126:3126] CHIP:DMG:                                0x5 = 0,
-          [1657912520.094565][3126:3126] CHIP:DMG:                                0x6 = 0,
-          [1657912520.094597][3126:3126] CHIP:DMG:                        },
-          [1657912520.094626][3126:3126] CHIP:DMG:                },
-          [1657912520.094660][3126:3126] CHIP:DMG:
-          [1657912520.094683][3126:3126] CHIP:DMG:        ],
-          [1657912520.094715][3126:3126] CHIP:DMG:
-          [1657912520.094739][3126:3126] CHIP:DMG:        InteractionModelRevision = 1
-          [1657912520.094762][3126:3126] CHIP:DMG: },
-          [1657912520.094835][3126:3126] CHIP:DMG: AccessControl: checking f=1 a=c s=0x000000000001B669 t= c=0x0000_0300 e=1 p=o
-          [1657912520.094872][3126:3126] CHIP:DMG: AccessControl: allowed
-          [1657912520.094900][3126:3126] CHIP:DMG: Received command for Endpoint=1 Cluster=0x0000_0300 Command=0x0000_0044
+          Verify in TH(all-clusters-app) log:
+          [1659960576.917953][2718:2718] CHIP:DMG: ReadRequestMessage =
+          [1659960576.917989][2718:2718] CHIP:DMG: {
+          [1659960576.918016][2718:2718] CHIP:DMG: 	AttributePathIBs =
+          [1659960576.918051][2718:2718] CHIP:DMG: 	[
+          [1659960576.918084][2718:2718] CHIP:DMG: 		AttributePathIB =
+          [1659960576.918121][2718:2718] CHIP:DMG: 		{
+          [1659960576.918159][2718:2718] CHIP:DMG: 			Endpoint = 0x1,
+          [1659960576.918206][2718:2718] CHIP:DMG: 			Cluster = 0x300,
+          [1659960576.918249][2718:2718] CHIP:DMG: 			Attribute = 0x0000_4000,
+          [1659960576.918287][2718:2718] CHIP:DMG: 		}
+          [1659960576.918325][2718:2718] CHIP:DMG:
+          [1659960576.918359][2718:2718] CHIP:DMG: 	],
+          [1659960576.918397][2718:2718] CHIP:DMG:
+          [1659960576.918432][2718:2718] CHIP:DMG: 	isFabricFiltered = true,
+          [1659960576.918466][2718:2718] CHIP:DMG: 	InteractionModelRevision = 1
+          [1659960576.918498][2718:2718] CHIP:DMG: },
+          [1659960576.918604][2718:2718] CHIP:DMG: IM RH moving to [GeneratingReports]
+          [1659960576.918724][2718:2718] CHIP:DMG: Building Reports for ReadHandler with LastReportGeneration = 0 DirtyGeneration = 0
+          [1659960576.918767][2718:2718] CHIP:DMG: <RE:Run> Cluster 300, Attribute 4000 is dirty
       disabled: true
 
     - label: "DUT read ColorLoopActive attribute from TH."
@@ -323,7 +233,7 @@
       verification: |
           ./chip-tool colorcontrol read color-loop-active 1 1
 
-          Verify in DUT as client side log:
+          Verify in TH(all-clusters-app) log:
 
           [1657912750.645121][3126:3126] CHIP:IM: Received Read request
           [1657912750.645210][3126:3126] CHIP:DMG: ReadRequestMessage =
@@ -351,7 +261,8 @@
       PICS: CC.C.A4006
       verification: |
           ./chip-tool colorcontrol read color-loop-stored-enhanced-hue 1 1
-          Verify in DUT as client side log:
+
+          Verify in TH(all-clusters-app) log:
           [1657912783.463733][3126:3126] CHIP:IM: Received Read request
           [1657912783.463816][3126:3126] CHIP:DMG: ReadRequestMessage =
           [1657912783.463844][3126:3126] CHIP:DMG: {
@@ -379,7 +290,8 @@
       PICS: CC.C.A4000
       verification: |
           ./chip-tool colorcontrol read enhanced-current-hue 1 1
-          Verify in DUT as client side log:
+
+          Verify in TH(all-clusters-app) log:
           [1657912801.027600][3126:3126] CHIP:IM: Received Read request
           [1657912801.027717][3126:3126] CHIP:DMG: ReadRequestMessage =
           [1657912801.027761][3126:3126] CHIP:DMG: {
@@ -408,7 +320,8 @@
       PICS: CC.C.A4000
       verification: |
           ./chip-tool colorcontrol read enhanced-current-hue 1 1
-          Verify in DUT as client side log:
+
+          Verify in TH(all-clusters-app) log:
           [1657912801.027600][3126:3126] CHIP:IM: Received Read request
           [1657912801.027717][3126:3126] CHIP:DMG: ReadRequestMessage =
           [1657912801.027761][3126:3126] CHIP:DMG: {
@@ -437,7 +350,8 @@
       PICS: CC.C.C44.Rsp
       verification: |
           ./chip-tool colorcontrol color-loop-set 1 0 0 0 0 0 0 1 1
-          Verify in DUT as client side log:
+
+          Verify in TH(all-clusters-app) log:
 
           [1657912615.862118][3126:3126] CHIP:DMG: InvokeRequestMessage =
           [1657912615.862168][3126:3126] CHIP:DMG: {
@@ -480,7 +394,7 @@
       verification: |
           ./chip-tool colorcontrol read color-loop-active 1 1
 
-          Verify in DUT as client side log:
+          Verify in TH(all-clusters-app) log:
           [1657912416.547714][3126:3126] CHIP:IM: Received Read request
           [1657912416.547842][3126:3126] CHIP:DMG: ReadRequestMessage =
           [1657912416.547890][3126:3126] CHIP:DMG: {
@@ -511,7 +425,8 @@
       PICS: CC.C.A4000
       verification: |
           ./chip-tool colorcontrol read enhanced-current-hue 1 1
-          Verify in DUT as client side log:
+
+          Verify in TH(all-clusters-app) log:
           [1657912801.027600][3126:3126] CHIP:IM: Received Read request
           [1657912801.027717][3126:3126] CHIP:DMG: ReadRequestMessage =
           [1657912801.027761][3126:3126] CHIP:DMG: {
diff --git a/src/app/tests/suites/certification/Test_TC_CGEN_2_2.yaml b/src/app/tests/suites/certification/Test_TC_CGEN_2_2.yaml
index c90332e..2a051a0 100644
--- a/src/app/tests/suites/certification/Test_TC_CGEN_2_2.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CGEN_2_2.yaml
@@ -30,7 +30,7 @@
           numTrustedRootsOriginal"
       verification: |
           ./chip-tool  operationalcredentials read  trusted-root-certificates 1 0
-          On TH verify that  TH reads TrustedRootCertificates entries from DUT
+          On TH1 verify that  TH reads TrustedRootCertificates entries from DUT
 
           [1658482014.176273][26852:26857] CHIP:DMG: }
           [1658482014.176359][26852:26857] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_003E Attribute 0x0000_0004 DataVersion: 527687668
@@ -45,7 +45,7 @@
       PICS: CGEN.S.A0001
       verification: |
           ./chip-tool generalcommissioning read  basic-commissioning-info 1 0
-          On TH verify that TH reads BasicCommissioningInfo attribute from DUT
+          On TH1 verify that TH reads BasicCommissioningInfo attribute from DUT
 
           [1658482413.950617][27013:27018] CHIP:DMG: }
           [1658482413.950753][27013:27018] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0030 Attribute 0x0000_0001 DataVersion: 2195123768
@@ -63,7 +63,7 @@
       PICS: CGEN.S.C00.Rsp && CGEN.S.C01.Tx
       verification: |
           ./chip-tool generalcommissioning  arm-fail-safe   900 1 1 0
-          On TH verify that  TH reads ArmFailSafe command from DUT
+          On TH1 verify that  TH reads ArmFailSafe command from DUT
 
           [1658482454.092676][27036:27041] CHIP:DMG: },
           [1658482454.092739][27036:27041] CHIP:DMG: Received Command Response Data, Endpoint=0 Cluster=0x0000_0030 Command=0x0000_0001
@@ -81,7 +81,7 @@
       verification: |
           ./chip-tool generalcommissioning read breadcrumb 1 0
 
-          On TH Verify that the breadcrumb attribute value
+          On TH1 Verify that the breadcrumb attribute value
           [1658482504.991161][27058:27064] CHIP:DMG: }
           [1658482504.991205][27058:27064] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0030 Attribute 0x0000_0000 DataVersion: 2195123769
           [1658482504.991215][27058:27064] CHIP:TOO:   Breadcrumb: 1
@@ -106,7 +106,7 @@
           ./chip-tool  operationalcredentials add-trusted-root-certificate  hex:1530010828c376ebc17f21512402013703271401000000cacacaca182604ef171b2726056eb5b94c3706271401000000cacacaca182407012408013009410452c19fd9d329a738fd65722a8309fa68bcaa9ffe87d8114b802c922e5066d0b2f0573b89b38bf98fc9c424ab8ffdabcb18d42e623d82a02d0ca0c062ccadb4bc370a350129011824026030041457934de5405e9a40eacb86ee647e583141ae78f430051457934de5405e9a40eacb86ee647e583141ae78f418300b40a0b0d57bddbc7bcf44480a8b7bd0231d54ccacd68d90efb67b7aa3206adbd268725092992a0388c8e934504178613c5b932d422eed7463f38fd82aaa429b574a18 1 0
 
 
-          Verify in TH log:
+          on TH1, Verify that the DUT responds with SUCCESS
 
 
           [1658482609.069728][27095:27100] CHIP:DMG:         InteractionModelRevision = 1
@@ -120,7 +120,7 @@
           Operational Credentials cluster"
       verification: |
           ./chip-tool  operationalcredentials read  trusted-root-certificates 1 0
-          On TH verify that  TH reads TrustedRootCertificates entries from DUT
+          On TH1 verify that TrustedRootCertificates entries from DUT
           [1658482718.809139][27144:27149] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_003E Attribute 0x0000_0004 DataVersion: 527687668
           [1658482718.809271][27144:27149] CHIP:TOO:   TrustedRootCertificates: 2 entries
           [1658482718.809327][27144:27149] CHIP:TOO:     [1]: 1530010100240201370324140018260480228127260580254D3A370624140018240701240801300941045B7F0549925832A9A1294607ADC4695EA3477D3DC9E584431F53A60FC57629C6A616814389C479D3E059D931600F62CA328087462582A350AD015B32756DDC69370A3501290118240260300414A1BBCB2500D57101023ACB4AFD7EBD4FC0487AF3300514A1BBCB2500D57101023ACB4AFD7EBD4FC0487AF318300B40E878725378AEA74A5F6CB6267CB9F7ACD0DACF26741FB24356379D850DD5F23A746281C845FD76D89E97AB188E9BF8A98047B43E3E868A5A8B8E50BAE62F116F18
@@ -141,7 +141,7 @@
           Operational Credentials cluster"
       verification: |
           ./chip-tool  operationalcredentials read  trusted-root-certificates 1 0
-          On TH verify that  TH reads TrustedRootCertificates entries from DUT
+          On TH1 verify that TrustedRootCertificates entries from DUT
           [1658483361.121153][27343:27348] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_003E Attribute 0x0000_0004 DataVersion: 527687668
           [1658483361.121212][27343:27348] CHIP:TOO:   TrustedRootCertificates: 1 entries
           [1658483361.121257][27343:27348] CHIP:TOO:     [1]: 1530010100240201370324140018260480228127260580254D3A370624140018240701240801300941045B7F0549925832A9A1294607ADC4695EA3477D3DC9E584431F53A60FC57629C6A616814389C479D3E059D931600F62CA328087462582A350AD015B32756DDC69370A3501290118240260300414A1BBCB2500D57101023ACB4AFD7EBD4FC0487AF3300514A1BBCB2500D57101023ACB4AFD7EBD4FC0487AF318300B40E878725378AEA74A5F6CB6267CB9F7ACD0DACF26741FB24356379D850DD5F23A746281C845FD76D89E97AB188E9BF8A98047B43E3E868A5A8B8E50BAE62F116F18
@@ -153,7 +153,7 @@
       verification: |
           ./chip-tool generalcommissioning read breadcrumb 1 0
 
-          On TH Verify that the breadcrumb attribute value
+          On TH1 Verify that the breadcrumb attribute value
           [1658483428.627422][27375:27380] CHIP:DMG: }
           [1658483428.627566][27375:27380] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0030 Attribute 0x0000_0000 DataVersion: 2195123770
           [1658483428.627610][27375:27380] CHIP:TOO:   Breadcrumb: 0
@@ -162,7 +162,7 @@
 
     - label: "TH1 repeats steps 3 through 5"
       verification: |
-          verification step to be updated.
+          TH1 repeats steps 3 through 5
       disabled: true
 
     - label:
@@ -171,7 +171,7 @@
       PICS: CGEN.S.C00.Rsp && CGEN.S.C01.Tx
       verification: |
           ./chip-tool generalcommissioning  arm-fail-safe  0 1 1 0
-          On TH verify that  TH reads ArmFailSafe command from DUT
+          On TH1 verify that   ArmFailSafe command from DUT
           [1658483503.637026][27397:27402] CHIP:DMG: },
           [1658483503.637054][27397:27402] CHIP:DMG: Received Command Response Data, Endpoint=0 Cluster=0x0000_0030 Command=0x0000_0001
           [1658483503.637074][27397:27402] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0030 Command 0x0000_0001
@@ -193,6 +193,7 @@
           Commissioning cluster"
       verification: |
           ./chip-tool  pairing open-commissioning-window 1 1 400 2000 3840
+          On TH1 Verify that the DUT returns a status code of SUCCESS
           [1658483545.889080][27420:27425] CHIP:DMG: },
           [1658483545.889093][27420:27425] CHIP:DMG: Received Command Response Status for Endpoint=0 Cluster=0x0000_003C Command=0x0000_0000 Status=0x0
           [1658483545.889098][27420:27425] CHIP:CTL: Successfully opened pairing window on the device
@@ -207,7 +208,7 @@
       PICS: CGEN.S.C00.Rsp && CGEN.S.C01.Tx
       verification: |
           ./chip-tool generalcommissioning  arm-fail-safe   900 1 1 0
-          On TH verify that  TH reads ArmFailSafe command from DUT
+          On TH1 verify that   ArmFailSafe command from DUT
           [1658483622.896405][27446:27451] CHIP:DMG: },
           [1658483622.896466][27446:27451] CHIP:DMG: Received Command Response Data, Endpoint=0 Cluster=0x0000_0030 Command=0x0000_0001
           [1658483622.896509][27446:27451] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0030 Command 0x0000_0001
@@ -261,7 +262,7 @@
           as nocs"
       verification: |
           ./chip-tool  operationalcredentials read  nocs  1 0 --fabric-filtered 0
-          On TH verify that  TH reads nocs entries from DUT
+          On TH1 verify that  TH reads nocs entries from DUT
           [1658484050.459056][27576:27582] CHIP:DMG: }
           [1658484050.459316][27576:27582] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_003E Attribute 0x0000_0000 DataVersion: 527687672
           [1658484050.459362][27576:27582] CHIP:TOO:   NOCs: 2 entries
@@ -284,7 +285,7 @@
           as fabrics"
       verification: |
           ./chip-tool operationalcredentials read fabrics    1  0 --fabric-filtered 0
-
+          On TH1 verify the fabrics list from DUT
           [1658484135.730921][27619:27624] CHIP:DMG: }
           [1658484135.731211][27619:27624] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_003E Attribute 0x0000_0001 DataVersion: 527687672
           [1658484135.731264][27619:27624] CHIP:TOO:   Fabrics: 2 entries
@@ -313,7 +314,7 @@
           trustedroots"
       verification: |
           ./chip-tool operationalcredentials read  trusted-root-certificates   1  0
-          On TH verify that  TH reads TrustedRootCertificates entries from DUT
+          On TH1 verify that TrustedRootCertificates entries from DUT
           [1658489869.278413][31188:31193] CHIP:DMG: }
           [1658489869.278997][31188:31193] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_003E Attribute 0x0000_0004 DataVersion: 527687672
           [1658489869.279090][31188:31193] CHIP:TOO:   TrustedRootCertificates: 2 entries
@@ -356,7 +357,7 @@
           cluster using a non-fabric-filtered read"
       verification: |
           ./chip-tool  operationalcredentials read  nocs  1 0
-          On TH verify that  TH reads nocs entries from DUT
+          On TH1 verify that  TH reads nocs entries from DUT
           [1658484226.587652][27658:27663] CHIP:DMG: }
           [1658484226.587884][27658:27663] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_003E Attribute 0x0000_0004 DataVersion: 527687672
           [1658484226.587936][27658:27663] CHIP:TOO:   TrustedRootCertificates: 2 entries
@@ -370,7 +371,7 @@
           cluster using a non-fabric-filtered read"
       verification: |
           ./chip-tool operationalcredentials read fabrics    1  0 --fabric-filtered 0
-          On TH verify that  TH reads fabrics list from DUT
+          On TH1 verify that  TH reads fabrics list from DUT
           [1658484405.562192][27710:27716] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_003E Attribute 0x0000_0001 DataVersion: 527687672
           [1658484405.562321][27710:27716] CHIP:TOO:   Fabrics: 2 entries
           [1658484405.562395][27710:27716] CHIP:TOO:     [1]: {
@@ -397,7 +398,7 @@
           Operational Credentials cluster"
       verification: |
           ./chip-tool operationalcredentials read  trusted-root-certificates   1  0
-          On TH verify that  TH reads TrustedRootCertificates entries from DUT
+          On TH1 verify that  TH reads TrustedRootCertificates entries from DUT
           [1658484601.144043][28501:28506] CHIP:DMG:         InteractionModelRevision = 1
           [1658484601.144050][28501:28506] CHIP:DMG: }
           [1658484601.144213][28501:28506] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_003E Attribute 0x0000_0004 DataVersion: 527687672
@@ -431,7 +432,7 @@
 
 
           ./chip-tool  operationalcredentials add-trusted-root-certificate    04614D01D2897082D7F85832CE00AC787A5A221A6F7B19C4202C069E3D70DDC615E5B9436919266360AC847F2FAB3EAEE3902B43812A13D18C061CC5028EADB775583DCB1008E4CEBFF810EEB2BC60FF7A3CF954C57101798443DA39E75F5FFDEA 2 0
-          On TH verify that DUT responds with FAILSAFE_REQUIRED
+          On TH2 verify that DUT responds with FAILSAFE_REQUIRED
           [1658484766.785916][8132:8137] CHIP:DMG:
           [1658484766.785961][8132:8137] CHIP:DMG:         InteractionModelRevision = 1
           [1658484766.786005][8132:8137] CHIP:DMG: },
@@ -445,7 +446,7 @@
           cluster using a non-fabric-filtered read"
       verification: |
           ./chip-tool operationalcredentials read fabrics    1  0 --fabric-filtered 0
-          On TH verify that  TH reads fabrics list from DUT
+          On TH1 verify that  TH reads fabrics list from DUT
           [1658484969.071455][28631:28636] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_003E Attribute 0x0000_0000 DataVersion: 527687672
           [1658484969.071527][28631:28636] CHIP:TOO:   NOCs: 2 entries
           [1658484969.071587][28631:28636] CHIP:TOO:     [1]: {
@@ -468,7 +469,7 @@
       PICS: CGEN.S.C00.Rsp && CGEN.S.C01.Tx
       verification: |
           ./chip-tool generalcommissioning  arm-fail-safe   60 1 1 0
-          On TH verify that  TH reads ArmFailSafe command from DUT
+          On TH1 verify that  TH reads ArmFailSafe command from DUT
           [1658485224.066397][28732:28737] CHIP:DMG:         InteractionModelRevision = 1
           [1658485224.066407][28732:28737] CHIP:DMG: },
           [1658485224.066441][28732:28737] CHIP:DMG: Received Command Response Data, Endpoint=0 Cluster=0x0000_0030 Command=0x0000_0001
@@ -488,7 +489,7 @@
       verification: |
           ./chip-tool  operationalcredentials add-trusted-root-certificate  hex:1530010828c376ebc17f21512402013703271401000000cacacaca182604ef171b2726056eb5b94c3706271401000000cacacaca182407012408013009410452c19fd9d329a738fd65722a8309fa68bcaa9ffe87d8114b802c922e5066d0b2f0573b89b38bf98fc9c424ab8ffdabcb18d42e623d82a02d0ca0c062ccadb4bc370a350129011824026030041457934de5405e9a40eacb86ee647e583141ae78f430051457934de5405e9a40eacb86ee647e583141ae78f418300b40a0b0d57bddbc7bcf44480a8b7bd0231d54ccacd68d90efb67b7aa3206adbd268725092992a0388c8e934504178613c5b932d422eed7463f38fd82aaa429b574a18 1 0
 
-          On TH verify that DUT responds as success
+          On TH1 verify that DUT responds as success
           [1658485618.508499][28884:28890] CHIP:DMG:
           [1658485618.508513][28884:28890] CHIP:DMG:         InteractionModelRevision = 1
           [1658485618.508525][28884:28890] CHIP:DMG: },
@@ -503,7 +504,7 @@
       verification: |
           ./chip-tool operationalcredentials read  trusted-root-certificates   1  0
 
-          On TH verify that  TH reads TrustedRootCertificates entries from DUT
+          On TH1 verify that  TH reads TrustedRootCertificates entries from DUT
           [1658485696.739931][28920:28925] CHIP:DMG:         InteractionModelRevision = 1
           [1658485696.739936][28920:28925] CHIP:DMG: }
           [1658485696.740122][28920:28925] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_003E Attribute 0x0000_0004 DataVersion: 527687672
@@ -520,7 +521,7 @@
       PICS: CGEN.S.C00.Rsp && CGEN.S.C01.Tx
       verification: |
           ./chip-tool generalcommissioning  arm-fail-safe   900 1 1 0
-          On TH verify that  TH reads ArmFailSafe command from DUT
+          On TH1 verify that  TH reads ArmFailSafe command from DUT
           [1658486181.080260][29218:29223] CHIP:DMG: },
           [1658486181.080289][29218:29223] CHIP:DMG: Received Command Response Data, Endpoint=0 Cluster=0x0000_0030 Command=0x0000_0001
           [1658486181.080319][29218:29223] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0030 Command 0x0000_0001
@@ -542,7 +543,7 @@
           Operational Credentials cluster"
       verification: |
           ./chip-tool operationalcredentials read  trusted-root-certificates   1  0
-          On TH verify that  TH reads TrustedRootCertificates entries from DUT
+          On TH1 verify that  TH reads TrustedRootCertificates entries from DUT
           [1658486366.493185][29315:29320] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_003E Attribute 0x0000_0004 DataVersion: 527687672
           [1658486366.493236][29315:29320] CHIP:TOO:   TrustedRootCertificates: 2 entries
           [1658486366.493266][29315:29320] CHIP:TOO:     [1]: 1530010100240201370324140018260480228127260580254D3A370624140018240701240801300941045B7F0549925832A9A1294607ADC4695EA3477D3DC9E584431F53A60FC57629C6A616814389C479D3E059D931600F62CA328087462582A350AD015B32756DDC69370A3501290118240260300414A1BBCB2500D57101023ACB4AFD7EBD4FC0487AF3300514A1BBCB2500D57101023ACB4AFD7EBD4FC0487AF318300B40E878725378AEA74A5F6CB6267CB9F7ACD0DACF26741FB24356379D850DD5F23A746281C845FD76D89E97AB188E9BF8A98047B43E3E868A5A8B8E50BAE62F116F18
@@ -557,7 +558,7 @@
       PICS: CGEN.S.C00.Rsp && CGEN.S.C01.Tx
       verification: |
           ./chip-tool generalcommissioning  arm-fail-safe   900 1 2 0
-          On TH verify that  TH reads ArmFailSafe command from DUT
+          On TH2 verify that  TH reads ArmFailSafe command from DUT
           [1658486289.473526][8200:8205] CHIP:DMG:         InteractionModelRevision = 1
           [1658486289.473563][8200:8205] CHIP:DMG: },
           [1658486289.473639][8200:8205] CHIP:DMG: Received Command Response Data, Endpoint=0 Cluster=0x0000_0030 Command=0x0000_0001
@@ -576,7 +577,7 @@
       PICS: CGEN.S.C00.Rsp
       verification: |
           ./chip-tool generalcommissioning  arm-fail-safe 0 1 1 0
-          On TH verify that  TH reads ArmFailSafe command from DUT
+          On TH1 verify that  TH reads ArmFailSafe command from DUT
           [1658486510.232274][29388:29393] CHIP:DMG: Received Command Response Data, Endpoint=0 Cluster=0x0000_0030 Command=0x0000_0001
           [1658486510.232302][29388:29393] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0030 Command 0x0000_0001
           [1658486510.232334][29388:29393] CHIP:TOO:   ArmFailSafeResponse: {
@@ -593,7 +594,7 @@
       PICS: CGEN.S.C00.Rsp
       verification: |
           ./chip-tool generalcommissioning  arm-fail-safe 900 1 1 0
-          On TH verify that  TH reads ArmFailSafe command from DUT
+          On TH1 verify that  TH reads ArmFailSafe command from DUT
           [1658486418.024554][29343:29348] CHIP:DMG:         InteractionModelRevision = 1
           [1658486418.024559][29343:29348] CHIP:DMG: },
           [1658486418.024588][29343:29348] CHIP:DMG: Received Command Response Data, Endpoint=0 Cluster=0x0000_0030 Command=0x0000_0001
@@ -629,7 +630,7 @@
 
           ./chip-tool  operationalcredentials add-trusted-root-certificate
           hex:1530010828c376ebc17f21512402013703271401000000cacacaca182604ef171b2726056eb5b94c3706271401000000cacacaca182407012408013009410452c19fd9d329a738fd65722a8309fa68bcaa9ffe87d8114b802c922e5066d0b2f0573b89b38bf98fc9c424ab8ffdabcb18d42e623d82a02d0ca0c062ccadb4bc370a350129011824026030041457934de5405e9a40eacb86ee647e583141ae78f430051457934de5405e9a40eacb86ee647e583141ae78f418300b40a0b0d57bddbc7bcf44480a8b7bd0231d54ccacd68d90efb67b7aa3206adbd268725092992a0388c8e934504178613c5b932d422eed7463f38fd82aaa429b574a18 1 0
-          On TH verify that DUT responds as success
+          On TH1 verify that DUT responds as success
           [1658487558.547191][30203:30208] CHIP:DMG: },
           [1658487558.547257][30203:30208] CHIP:DMG: Received Command Response Status for Endpoint=0 Cluster=0x0000_003E Command=0x0000_000B Status=0x0
           [1658487558.547300][30203:30208] CHIP:DMG: ICR moving to [AwaitingDe]
@@ -641,7 +642,7 @@
           Operational Credentials cluster"
       verification: |
           ./chip-tool operationalcredentials read  trusted-root-certificates   1  0
-          On TH verify that  TH reads TrustedRootCertificates entries from DUT
+          On TH1 verify that  TH reads TrustedRootCertificates entries from DUT
 
           [1658487613.357548][30232:30237] CHIP:DMG: }
           [1658487613.358000][30232:30237] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_003E Attribute 0x0000_0004 DataVersion: 527687672
@@ -667,7 +668,7 @@
       PICS: CGEN.S.C00.Rsp
       verification: |
           ./chip-tool generalcommissioning  arm-fail-safe   900 0 1  0
-          On TH verify that  TH reads ArmFailSafe command from DUT
+          On TH1 verify that  TH reads ArmFailSafe command from DUT
 
           [1658487663.593485][30268:30273] CHIP:DMG:         InteractionModelRevision = 1
           [1658487663.593506][30268:30273] CHIP:DMG: },
@@ -695,7 +696,7 @@
           Operational Credentials cluster"
       verification: |
           ./chip-tool operationalcredentials read  trusted-root-certificates   1  0
-          On TH verify that  TH reads TrustedRootCertificates entries from DUT
+          On TH1 verify that  TH reads TrustedRootCertificates entries from DUT
           [1658489869.278413][31188:31193] CHIP:DMG: }
           [1658489869.278997][31188:31193] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_003E Attribute 0x0000_0004 DataVersion: 527687672
           [1658489869.279090][31188:31193] CHIP:TOO:   TrustedRootCertificates: 2 entries
diff --git a/src/app/tests/suites/certification/Test_TC_CGEN_2_4.yaml b/src/app/tests/suites/certification/Test_TC_CGEN_2_4.yaml
index e931db6..7c9a3cf 100644
--- a/src/app/tests/suites/certification/Test_TC_CGEN_2_4.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CGEN_2_4.yaml
@@ -14,7 +14,7 @@
 # Auto-generated scripts for harness use only, please review before automation. The endpoints and cluster names are currently set to default
 
 name:
-    92.2.3. [TC-CGEN-2.4] Verification For CommissioningError on response
+    93.2.3. [TC-CGEN-2.4] Verification For CommissioningError on response
     message [DUT - Server]
 
 PICS:
diff --git a/src/app/tests/suites/certification/Test_TC_CNET_1_3.yaml b/src/app/tests/suites/certification/Test_TC_CNET_1_3.yaml
index f97bc71..0362a31 100644
--- a/src/app/tests/suites/certification/Test_TC_CNET_1_3.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CNET_1_3.yaml
@@ -35,7 +35,7 @@
       verification: |
           ./chip-tool networkcommissioning read cluster-revision  1 0
 
-          Verify  ClusterRevision: 1 on the TH Log:
+          Verify  "ClusterRevision: 1" on the TH(Chip-tool)  Log:
 
           [1649244866.275684][30440:30446] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Attribute 0x0000_FFFD DataVersion: 2702518944
           [1649244866.277721][30440:30446] CHIP:TOO:   ClusterRevision: 1
@@ -46,7 +46,7 @@
       verification: |
           ./chip-tool networkcommissioning read feature-map 1 0
 
-          Verify FeatureMap on the TH Log:
+          Verify "FeatureMap" on the TH(Chip-tool)  Log:
 
           [1651215443.195852][3285:3290] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Attribute 0x0000_FFFC DataVersion: 2584224280
           [1651215443.195939][3285:3290] CHIP:TOO:   FeatureMap: 4
@@ -56,7 +56,7 @@
       verification: |
           ./chip-tool networkcommissioning read attribute-list 1 0
 
-          Verify AttributeList on the TH Log:
+          Verify "AttributeList" on the TH(Chip-tool)  Log:
 
           [1651215479.539148][3293:3298] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Attribute 0x0000_FFFB DataVersion: 2584224280
           [1651215479.539230][3293:3298] CHIP:TOO:   AttributeList: 13 entries
@@ -84,7 +84,7 @@
       verification: |
           ./chip-tool networkcommissioning read accepted-command-list 1 0
 
-          Verify AcceptedCommandList on the TH Log:
+          Verify "AcceptedCommandList" on the TH(Chip-tool)  Log:
 
           [1653909914.972854][3424:3429] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Attribute 0x0000_FFF9 DataVersion: 880539056
           [1653909914.973027][3424:3429] CHIP:TOO:   AcceptedCommandList: 5 entries
@@ -101,7 +101,7 @@
           ( WiFi) ./chip-tool networkcommissioning read generated-command-list 1 0
 
 
-          Verify GeneratedCommandList on the TH Log:
+          Verify "GeneratedCommandList" on the TH(Chip-tool)  Log:
 
           [1650370123.417759][42418:42423] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Attribute 0x0000_FFF8 DataVersion: 3182776035
           [1650370123.417866][42418:42423] CHIP:TOO:   GeneratedCommandList: 3 entries
@@ -113,7 +113,7 @@
            ( Thread ) ./chip-tool networkcommissioning read generated-command-list 51 0
 
 
-          Verify GeneratedCommandList on the TH Log:
+          Verify "GeneratedCommandList" on the TH(Chip-tool)  Log:
 
           [1650370342.693373][7450:7455] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Attribute 0x0000_FFF8 DataVersion: 1032683896
           [1650370342.693536][7450:7455] CHIP:TOO:   GeneratedCommandList: 2 entries
diff --git a/src/app/tests/suites/certification/Test_TC_CNET_4_1.yaml b/src/app/tests/suites/certification/Test_TC_CNET_4_1.yaml
index 7aaff63..2ffcf9b 100644
--- a/src/app/tests/suites/certification/Test_TC_CNET_4_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CNET_4_1.yaml
@@ -41,7 +41,7 @@
       verification: |
           ./chip-tool descriptor read server-list 1 0
 
-          Verify "server list" on the TH(chip-tool) Log:
+          Verify "server list" on the TH(Chip-tool) Log:
 
           [1654250292.680821][5262:5267] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_001D Attribute 0x0000_0001 DataVersion: 812190876
           [1654250292.681079][5262:5267] CHIP:TOO:   server list: 26 entries
@@ -77,7 +77,7 @@
       verification: |
           ./chip-tool networkcommissioning read feature-map 1 0
 
-          Verify "FeatureMap: 1" on the TH(chip-tool) Log:
+          Verify "FeatureMap: 1" on the TH(Chip-tool) Log:
 
           [1653473169.784344][29771:29776] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Attribute 0x0000_FFFC DataVersion: 1600858167
           [1653473169.784413][29771:29776] CHIP:TOO:   FeatureMap: 1
@@ -89,7 +89,7 @@
       verification: |
           ./chip-tool networkcommissioning read max-networks 1 0
 
-          Verify "MaxNetworks" on the TH(chip-tool) Log:
+          Verify "MaxNetworks" on the TH(Chip-tool) Log:
 
           [1653473181.407542][29777:29782] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Attribute 0x0000_0000 DataVersion: 1600858167
           [1653473181.407621][29777:29782] CHIP:TOO:   MaxNetworks: 1
@@ -109,7 +109,7 @@
           ./chip-tool networkcommissioning read networks 1 0
 
 
-          Verify "Networks entiries and its status" on the TH(chip-tool) Log:
+          Verify "Networks entiries and its status" on the TH(Chip-tool) Log:
 
           [1654250379.881780][5309:5314] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Attribute 0x0000_0001 DataVersion: 3741733376
           [1654250379.881974][5309:5314] CHIP:TOO:   Networks: 1 entries
@@ -124,7 +124,7 @@
       verification: |
           ./chip-tool networkcommissioning read scan-max-time-seconds 1 0
 
-          Verify  "ScanMaxTimeSeconds" on the TH(chip-tool) Log:
+          Verify  "ScanMaxTimeSeconds" on the TH(Chip-tool) Log:
 
 
           [1653473784.850830][29813:29818] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Attribute 0x0000_0002 DataVersion: 1600858167
@@ -138,7 +138,7 @@
           ./chip-tool networkcommissioning read connect-max-time-seconds 1 0
 
 
-          Verify "ConnectMaxTimeSeconds" on the TH(chip-tool) Log:
+          Verify "ConnectMaxTimeSeconds" on the TH(Chip-tool) Log:
 
           [1653473821.367214][29821:29826] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Attribute 0x0000_0003 DataVersion: 1600858167
           [1653473821.367283][29821:29826] CHIP:TOO:   ConnectMaxTimeSeconds: 20
@@ -151,7 +151,7 @@
           ./chip-tool networkcommissioning read interface-enabled 1 0
 
 
-          Verify "InterfaceEnabled" on the TH(chip-tool) Log:
+          Verify "InterfaceEnabled" on the TH(Chip-tool) Log:
 
           [1653473893.275901][29834:29839] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Attribute 0x0000_0004 DataVersion: 1600858167
           [1653473893.275964][29834:29839] CHIP:TOO:   InterfaceEnabled: TRUE
@@ -164,7 +164,7 @@
           ./chip-tool networkcommissioning read last-networking-status 1 0
 
 
-          Verify "LastNetworkingStatus" on the TH(chip-tool) Log:
+          Verify "LastNetworkingStatus" on the TH(Chip-tool) Log:
 
           [1653473918.484769][29840:29845] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Attribute 0x0000_0005 DataVersion: 1600858167
           [1653473918.484843][29840:29845] CHIP:TOO:   LastNetworkingStatus: 0
@@ -178,7 +178,7 @@
       verification: |
           ./chip-tool networkcommissioning read last-network-id 1  0
 
-          Verify "LastNetworkID" on the TH(chip-tool) Log:
+          Verify "LastNetworkID" on the TH(Chip-tool) Log:
 
 
           "[1653474059.383553][27286:27291] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Attribute 0x0000_0006 DataVersion: 1912591449
@@ -192,7 +192,7 @@
           ./chip-tool networkcommissioning read last-connect-error-value 1 0
 
 
-          Verify "LastConnectErrorValue" on the TH(chip-tool) Log:
+          Verify "LastConnectErrorValue" on the TH(Chip-tool) Log:
 
 
           [1653474102.061746][29860:29865] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Attribute 0x0000_0007 DataVersion: 1600858167
diff --git a/src/app/tests/suites/certification/Test_TC_CNET_4_10.yaml b/src/app/tests/suites/certification/Test_TC_CNET_4_10.yaml
index db14b8b..14d14e9 100644
--- a/src/app/tests/suites/certification/Test_TC_CNET_4_10.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CNET_4_10.yaml
@@ -32,7 +32,7 @@
       verification: |
           ./chip-tool generalcommissioning arm-fail-safe 900 1 62 0
 
-          Verify ArmFailSafeResponse on the TH Log:
+          Verify "ArmFailSafeResponse" on the TH(Chip-tool) Log:
 
           [1650391404.723087][10042:10047] CHIP:DMG: Received Command Response Data, Endpoint=0 Cluster=0x0000_0030 Command=0x0000_0001
           [1650391404.723164][10042:10047] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0030 Command 0x0000_0001
@@ -50,7 +50,7 @@
       verification: |
           ./chip-tool networkcommissioning read networks 1 0
 
-          Verify Networks entiries and its status on the TH Log:
+          Verify "Networks entiries and its status" on the TH(Chip-tool) Log:
 
           [1657790578.359665][5247:5252] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Attribute 0x0000_0001 DataVersion: 2276799582
           [1657790578.359820][5247:5252] CHIP:TOO:   Networks: 1 entries
@@ -81,7 +81,7 @@
 
            ./chip-tool networkcommissioning  remove-network hex:1850171990782922 62 0
 
-          Verify NetworkConfigResponse and its arguments on the TH Log:
+          Verify "NetworkConfigResponse and its arguments" on the TH(Chip-tool) Log:
 
           [1657790635.532308][5254:5259] CHIP:DMG: Received Command Response Data, Endpoint=0 Cluster=0x0000_0031 Command=0x0000_0005
           [1657790635.532395][5254:5259] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Command 0x0000_0005
@@ -98,7 +98,7 @@
       verification: |
           ./chip-tool networkcommissioning read networks 1 0
 
-          Verify Networks entiries and its status on the TH Log:
+          Verify "Networks entiries and its status" on the TH(Chip-tool) Log:
 
           [1657625584.426746][2703:2708] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Attribute 0x0000_0001 DataVersion: 1201757611
           [1657625584.427014][2703:2708] CHIP:TOO:   Networks: 0 entries
@@ -110,7 +110,7 @@
       verification: |
           ./chip-tool networkcommissioning read last-networking-status 1 0
 
-          Verify LastNetworkingStatus on the TH Log:
+          Verify "LastNetworkingStatus" on the TH(Chip-tool) Log:
 
           [1657625631.550171][2710:2715] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Attribute 0x0000_0005 DataVersion: 1201757611
           [1657625631.550337][2710:2715] CHIP:TOO:   LastNetworkingStatus: 0
@@ -122,7 +122,7 @@
       verification: |
           ./chip-tool networkcommissioning read last-network-id 1 0
 
-          Verify LastNetworkID on the TH Log:
+          Verify "LastNetworkID" on the TH(Chip-tool) Log:
 
           [1657625691.050998][2718:2724] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Attribute 0x0000_0006 DataVersion: 1201757611
           [1657625691.051142][2718:2724] CHIP:TOO:   LastNetworkID: 1850171990782922
@@ -136,7 +136,7 @@
       verification: |
           ./chip-tool generalcommissioning read breadcrumb 1 0
 
-          Verify Breadcrumb: 1 on the TH Log:
+          Verify "Breadcrumb: 1" on the TH(Chip-tool) Log:
 
           [1657625860.742472][2739:2744] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0030 Attribute 0x0000_0000 DataVersion: 2669958173
           [1657625860.742607][2739:2744] CHIP:TOO:   Breadcrumb: 1
@@ -155,7 +155,7 @@
 
           ./chip-tool networkcommissioning connect-network hex:1850171990782922 1 0 --Breadcrumb 2
 
-          Verify ConnectNetworkResponse and its arguments on the TH Log:
+          Verify "ConnectNetworkResponse and its arguments" on the TH(Chip-tool) Log:
 
 
           [1657625912.836563][2747:2752] CHIP:DMG: Received Command Response Data, Endpoint=0 Cluster=0x0000_0031 Command=0x0000_0007
@@ -175,7 +175,7 @@
       verification: |
           ./chip-tool generalcommissioning read breadcrumb 1 0
 
-          Verify Breadcrumb: 1 on the TH Log:
+          Verify "Breadcrumb: 1" on the TH(Chip-tool) Log:
 
           [1657781070.617341][4823:4828] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0030 Attribute 0x0000_0000 DataVersion: 2383846386
           [1657781070.617458][4823:4828] CHIP:TOO:   Breadcrumb: 1
@@ -188,7 +188,7 @@
       verification: |
           ./chip-tool generalcommissioning arm-fail-safe 0 0 1 0
 
-          Verify ArmFailSafeResponse on the TH Log:
+          Verify "ArmFailSafeResponse" on the TH(Chip-tool) Log:
 
           [1657626058.290176][2767:2772] CHIP:DMG: Received Command Response Data, Endpoint=0 Cluster=0x0000_0030 Command=0x0000_0001
           [1657626058.290276][2767:2772] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0030 Command 0x0000_0001
@@ -204,7 +204,7 @@
       verification: |
           ./chip-tool networkcommissioning read networks 1 0
 
-          Verify Networks entiries and its status on the TH Log:
+          Verify "Networks entiries and its status" on the TH(Chip-tool) Log:
 
           [1657790810.454838][5308:5313] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Attribute 0x0000_0001 DataVersion: 2276799582
           [1657790810.454996][5308:5313] CHIP:TOO:   Networks: 1 entries
@@ -221,7 +221,7 @@
       verification: |
           ./chip-tool generalcommissioning arm-fail-safe 90 0 1 0
 
-          Verify ArmFailSafeResponse on the TH Log:
+          Verify "ArmFailSafeResponse" on the TH (chip-tool)Log:
 
           [1657626161.611078][2780:2785] CHIP:DMG: Received Command Response Data, Endpoint=0 Cluster=0x0000_0030 Command=0x0000_0001
           [1657626161.611183][2780:2785] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0030 Command 0x0000_0001
@@ -245,7 +245,7 @@
 
           ./chip-tool networkcommissioning  remove-network hex:1850171990782922 32 0 --Breadcrumb 1
 
-          Verify NetworkConfigResponse and its arguments on the TH Log:
+          Verify "NetworkConfigResponse and its arguments" on the TH(Chip-tool) Log:
 
           [1657791030.761976][5336:5341] CHIP:DMG: Received Command Response Data, Endpoint=0 Cluster=0x0000_0031 Command=0x0000_0005
           [1657791030.762070][5336:5341] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Command 0x0000_0005
@@ -262,7 +262,7 @@
       verification: |
           ./chip-tool generalcommissioning commissioning-complete 1 0
 
-          Verify CommissioningCompleteResponse and its arguments on the TH Log:
+          Verify "CommissioningCompleteResponse and its arguments" on the TH(Chip-tool) Log:
 
           [1657626243.485752][2795:2801] CHIP:DMG: Received Command Response Data, Endpoint=0 Cluster=0x0000_0030 Command=0x0000_0005
           [1657626243.485947][2795:2801] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0030 Command 0x0000_0005
@@ -282,7 +282,7 @@
       verification: |
           ./chip-tool generalcommissioning arm-fail-safe 0 0 62 0
 
-          Verify ArmFailSafeResponse on the TH Log:
+          Verify "ArmFailSafeResponse" on the TH(Chip-tool) Log:
 
 
           [1657626274.218994][2802:2807] CHIP:DMG: Received Command Response Data, Endpoint=0 Cluster=0x0000_0030 Command=0x0000_0001
@@ -300,7 +300,7 @@
       verification: |
           ./chip-tool networkcommissioning read networks 1 0
 
-          Verify Networks entiries and its status on the TH Log:
+          Verify "Networks entiries and its status on the TH Log:
 
           [1657626300.861344][2808:2813] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Attribute 0x0000_0001 DataVersion: 1201757611
           [1657626300.861492][2808:2813] CHIP:TOO:   Networks: 0 entries
diff --git a/src/app/tests/suites/certification/Test_TC_CNET_4_11.yaml b/src/app/tests/suites/certification/Test_TC_CNET_4_11.yaml
index 30c2f77..968242f 100644
--- a/src/app/tests/suites/certification/Test_TC_CNET_4_11.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CNET_4_11.yaml
@@ -30,7 +30,7 @@
       verification: |
           ./chip-tool generalcommissioning arm-fail-safe 900 1 1 0
 
-          Verify ArmFailSafeResponse on the TH Log:
+          Verify "ArmFailSafeResponse" on the TH(Chip-tool) Log:
 
 
           [1653479952.284160][30473:30478] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0030 Command 0x0000_0001
@@ -49,7 +49,7 @@
       verification: |
           ./chip-tool networkcommissioning read networks 1 0
 
-          Verify Networks entiries and its status on the TH Log:
+          Verify "Networks entiries and its status" on the TH(Chip-tool) Log:
 
           [1657733068.835240][7475:7480] CHIP:TOO:   Networks: 1 entries
           [1657733068.835354][7475:7480] CHIP:TOO:     [1]: {
@@ -76,7 +76,7 @@
 
           ./chip-tool networkcommissioning remove-network hex:47524C50726976617465 1  0 --Breadcrumb 1
 
-          Verify NetworkConfigResponse and its arguments on the TH Log:
+          Verify "NetworkConfigResponse and its arguments" on the TH(Chip-tool) Log:
 
           [1657290079.168208][2668:2673] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Command 0x0000_0005
           [1657290079.168273][2668:2673] CHIP:TOO:   NetworkConfigResponse: {
@@ -98,7 +98,7 @@
 
           ./chip-tool networkcommissioning add-or-update-wi-fi-network Sbee_Moto Sunsuraj 1 0 --Breadcrumb 1 ( second network)
 
-          Verify NetworkConfigResponse and its arguments on the TH Log:
+          Verify "NetworkConfigResponse and its arguments" on the TH(Chip-tool) Log:
 
           [1657288838.207746][2455:2460] CHIP:DMG: Received Command Response Data, Endpoint=0 Cluster=0x0000_0031 Command=0x0000_0005
           [1657288838.207816][2455:2460] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Command 0x0000_0005
@@ -113,7 +113,7 @@
       verification: |
           ./chip-tool networkcommissioning read networks 1 0
 
-          Verify Networks entiries and its status on the TH Log:
+          Verify "Networks entiries and its status" on the TH(Chip-tool) Log:
 
           [1657733345.351745][7595:7600] CHIP:TOO:   Networks: 1 entries
           [1657733345.351888][7595:7600] CHIP:TOO:     [1]: {
@@ -134,7 +134,7 @@
 
           ./chip-tool networkcommissioning connect-network hex:536265655F4D6F746F 1 0 --Breadcrumb 2 (second network)
 
-          Verify NetworkConfigResponse and its arguments on the TH Log:
+          Verify "NetworkConfigResponse and its arguments" on the TH(Chip-tool) Log:
 
 
           [1653479953.633815][30491:30496] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Command 0x0000_0007
@@ -159,7 +159,7 @@
       verification: |
           ./chip-tool networkcommissioning read networks 1 0
 
-          Verify Networks entiries and its status on the TH Log:
+          Verify "Networks entiries and its status" on the TH(Chip-tool) Log:
 
 
           [1657733596.457792][7640:7645] CHIP:TOO:   Networks: 1 entries
@@ -176,7 +176,7 @@
       verification: |
           ./chip-tool generalcommissioning read breadcrumb 1 0
 
-          Verify Breadcrumb: 2 on the TH Log:
+          Verify "Breadcrumb: 2" on the TH(Chip-tool) Log:
 
           [1657733618.370511][7653:7658] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0030 Attribute 0x0000_0000 DataVersion: 2956231097
           [1657733618.370581][7653:7658] CHIP:TOO:   Breadcrumb: 2
@@ -190,7 +190,7 @@
       verification: |
           ./chip-tool generalcommissioning arm-fail-safe 0 0 1 0
 
-          Verify ArmFailSafeResponse on the TH Log:
+          Verify "ArmFailSafeResponse" on the TH(Chip-tool) Log:
 
           [1657289119.775902][2519:2524] CHIP:DMG: Received Command Response Data, Endpoint=0 Cluster=0x0000_0030 Command=0x0000_0001
           [1657289119.775973][2519:2524] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0030 Command 0x0000_0001
@@ -213,7 +213,7 @@
       verification: |
           ./chip-tool networkcommissioning read networks 1 0
 
-          Verify Networks entiries and its status on the TH Log:
+          Verify "Networks entiries and its status" on the TH(Chip-tool) Log:
 
           [1657881740.139492][3022:3027] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Attribute 0x0000_0001 DataVersion: 4005581086
           [1657881740.139598][3022:3027] CHIP:TOO:   Networks: 0 entries
@@ -226,7 +226,7 @@
       verification: |
           ./chip-tool generalcommissioning arm-fail-safe 900 0 1 0
 
-          Verify ArmFailSafeResponse on the TH Log:
+          Verify "ArmFailSafeResponse" on the TH(Chip-tool) Log:
 
           [1657289228.311622][2529:2534] CHIP:DMG: Received Command Response Data, Endpoint=0 Cluster=0x0000_0030 Command=0x0000_0001
           [1657289228.311668][2529:2534] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0030 Command 0x0000_0001
@@ -246,7 +246,7 @@
           Below is an example:
           ./chip-tool networkcommissioning remove-network hex:47524C50726976617465 1  0 --Breadcrumb 1
 
-          Verify NetworkConfigResponse and its arguments on the TH Log:
+          Verify "NetworkConfigResponse and its arguments" on the TH(Chip-tool) Log:
 
           [1653479953.633815][30491:30496] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Command 0x0000_0007
           [1653479953.633986][30491:30496] CHIP:TOO:   ConnectNetworkResponse: {
@@ -269,7 +269,7 @@
           Below is an example:
           ./chip-tool networkcommissioning add-or-update-wi-fi-network Sbee_Moto Sunsuraj 1 0 --Breadcrumb 1 ( second network)
 
-          Verify NetworkConfigResponse and its arguments on the TH Log:
+          Verify "NetworkConfigResponse and its arguments" on the TH(Chip-tool) Log:
 
           [1657734444.832145][7736:7741] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Command 0x0000_0005
           [1657734444.832215][7736:7741] CHIP:TOO:   NetworkConfigResponse: {
@@ -289,7 +289,7 @@
           Below is an example:
           ./chip-tool networkcommissioning connect-network hex:536265655F4D6F746F 1 0 --Breadcrumb 3 (second network)
 
-          Verify ConnectNetworkResponse and its arguments on the TH Log:
+          Verify "ConnectNetworkResponse and its arguments" on the TH(Chip-tool) Log:
 
           [1657734624.698518][7768:7773] CHIP:TOO:   ConnectNetworkResponse: {
           [1657734624.698601][7768:7773] CHIP:TOO:     networkingStatus: 0
@@ -310,7 +310,7 @@
       verification: |
           ./chip-tool networkcommissioning read networks 1 0
 
-          Verify Networks entiries and its status on the TH Log:
+          Verify "Networks entiries and its status" on the TH(Chip-tool) Log:
 
           [1657733596.457792][7640:7645] CHIP:TOO:   Networks: 1 entries
           [1657733596.457867][7640:7645] CHIP:TOO:     [1]: {
@@ -327,7 +327,7 @@
           ./chip-tool generalcommissioning read breadcrumb 1 0
 
 
-          Verify Breadcrumb: 3 on the TH Log:
+          Verify "Breadcrumb: 3" on the TH(Chip-tool) Log:
 
           [1657734757.740003][7793:7798] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0030 Attribute 0x0000_0000 DataVersion: 2956231102
           [1657734757.740140][7793:7798] CHIP:TOO:   Breadcrumb: 3
@@ -337,7 +337,7 @@
       verification: |
           ./chip-tool generalcommissioning commissioning-complete 1 0
 
-          Verify CommissioningCompleteResponse and its arguments on the TH Log:
+          Verify "CommissioningCompleteResponse and its arguments" on the TH(Chip-tool) Log:
 
           [1657734803.411199][7802:7808] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0030 Command 0x0000_0005
           [1657734803.411256][7802:7808] CHIP:TOO:   CommissioningCompleteResponse: {
@@ -351,7 +351,7 @@
       verification: |
           ./chip-tool networkcommissioning read networks 1 0
 
-          Verify Networks entiries and its status on the TH Log:
+          Verify "Networks entiries and its status" on the TH(Chip-tool) Log:
 
 
           [1657734855.925075][7819:7824] CHIP:TOO:   Networks: 1 entries
diff --git a/src/app/tests/suites/certification/Test_TC_CNET_4_12.yaml b/src/app/tests/suites/certification/Test_TC_CNET_4_12.yaml
index 4fab79c..417f62c 100644
--- a/src/app/tests/suites/certification/Test_TC_CNET_4_12.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CNET_4_12.yaml
@@ -32,7 +32,7 @@
       verification: |
           ./chip-tool generalcommissioning arm-fail-safe 900 1 22 0
 
-          Verify ArmFailSafeResponse on the TH Log:
+          Verify "ArmFailSafeResponse" on the TH(Chip-tool) Log:
 
           [1657808518.577084][5979:5984] CHIP:DMG: Received Command Response Data, Endpoint=0 Cluster=0x0000_0030 Command=0x0000_0001
           [1657808518.577181][5979:5984] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0030 Command 0x0000_0001
@@ -51,17 +51,14 @@
       verification: |
           ./chip-tool networkcommissioning read networks 22 0
 
-          Verify Networks entiries and its status on the TH Log:
+          Verify "Networks entiries and its status" on the TH(Chip-tool) Log:
 
-          [1658294685.945276][7397:7402] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Attribute 0x0000_0001 DataVersion: 4291713161
-          [1658294685.948705][7397:7402] CHIP:TOO:   Networks: 1 entries
-          [1658294685.949116][7397:7402] CHIP:TOO:     [1]: {
-          [1658294685.949204][7397:7402] CHIP:TOO:       NetworkID: 1111071122222222
-          [1658294685.949265][7397:7402] CHIP:TOO:       Connected: TRUE
-          [1658294685.949321][7397:7402] CHIP:TOO:      }
-          [1658294685.949533][7397:7402] CHIP:EM: Sending Standalone Ack for MessageCounter:233126607 on exchange 26309i
-
-          [1657808547.049138][5988:5993] CHIP:EM: Sending Standalone Ack for MessageCounter:115176450 on exchange 56560i
+          [1659623217.387917][9816:9821] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Attribute 0x0000_0001 DataVersion: 4196844346
+          [1659623217.388007][9816:9821] CHIP:TOO:   Networks: 1 entries
+          [1659623217.388058][9816:9821] CHIP:TOO:     [1]: {
+          [1659623217.388089][9816:9821] CHIP:TOO:       NetworkID: 2111111122222222
+          [1659623217.388110][9816:9821] CHIP:TOO:       Connected: TRUE
+          [1659623217.388129][9816:9821] CHIP:TOO:      }
       disabled: true
 
     - label:
@@ -80,18 +77,17 @@
 
           Below is an example:
 
-          ./chip-tool networkcommissioning  remove-network hex:1111071122222222 22 0
+          ./chip-tool networkcommissioning  remove-network hex:2111111122222222 22 0
 
-          Verify NetworkConfigResponse and its arguments on the TH Log:
+          Verify "NetworkConfigResponse and its arguments" on the TH(Chip-tool) Log:
 
-          [1657808740.364069][5996:6001] CHIP:DMG: Received Command Response Data, Endpoint=0 Cluster=0x0000_0031 Command=0x0000_0005
-          [1657808740.364170][5996:6001] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Command 0x0000_0005
-          [1657808740.364321][5996:6001] CHIP:TOO:   NetworkConfigResponse: {
-          [1657808740.364422][5996:6001] CHIP:TOO:     networkingStatus: 0
-          [1657808740.364484][5996:6001] CHIP:TOO:     networkIndex: 0
-          [1657808740.364540][5996:6001] CHIP:TOO:    }
-          [1657808740.364627][5996:6001] CHIP:DMG: ICR moving to [AwaitingDe]
-          [1657808740.364725][5996:6001] CHIP:EM: Sending Standalone Ack for MessageCounter:3675459 on exchange 43075i
+          [1659623277.664477][9824:9831] CHIP:DMG: Received Command Response Data, Endpoint=0 Cluster=0x0000_0031 Command=0x0000_0005
+          [1659623277.664556][9824:9831] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Command 0x0000_0005
+          [1659623277.664667][9824:9831] CHIP:TOO:   NetworkConfigResponse: {
+          [1659623277.664758][9824:9831] CHIP:TOO:     networkingStatus: 0
+          [1659623277.664810][9824:9831] CHIP:TOO:     networkIndex: 0
+          [1659623277.664843][9824:9831] CHIP:TOO:    }
+          [1659623277.664907][9824:9831] CHIP:DMG: ICR moving to [AwaitingDe]
       disabled: true
 
     - label:
@@ -104,17 +100,16 @@
 
           Below is an example:
 
-          ./chip-tool networkcommissioning add-or-update-thread-network hex:0e080000000000010000000300000f35060004001fffe0020811111111072222220708fd9957a92dadc7aa051000112233445966778899aabbccddeeff030f4f70656e54687265616444656d6f6a0102123404106ad73489ca556d19f8c47fd2150e58e30c0402a0fff8 48 0(second network dataset value)
+          ./chip-tool networkcommissioning add-or-update-thread-network hex:0e080000000000010000000300000c35060004001fffe0020831111111222222220708fd6958bdf99a83e6051000112233445566778899aabbccddeeff030e4f70656e54687265616444656d6b0102123404101fdf27d94ddb7edc69dc3e72a0ca0ae10c0402a0f7f8 22 0 (second network dataset value)
 
-          Verify NetworkConfigResponse and its arguments on the TH Log:
+          Verify "NetworkConfigResponse and its arguments" on the TH(Chip-tool) Log:
 
-          [1657809088.095574][6022:6027] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Command 0x0000_0005
-          [1657809088.095728][6022:6027] CHIP:TOO:   NetworkConfigResponse: {
-          [1657809088.095828][6022:6027] CHIP:TOO:     networkingStatus: 0
-          [1657809088.095889][6022:6027] CHIP:TOO:     networkIndex: 0
-          [1657809088.095943][6022:6027] CHIP:TOO:    }
-          [1657809088.096030][6022:6027] CHIP:DMG: ICR moving to [AwaitingDe]
-          [1657809088.096131][6022:6027] CHIP:EM: Sending Standalone Ack for MessageCounter:17614664 on exchange 10016i
+          [1659623353.963125][9870:9875] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Command 0x0000_0005
+          [1659623353.963312][9870:9875] CHIP:TOO:   NetworkConfigResponse: {
+          [1659623353.963406][9870:9875] CHIP:TOO:     networkingStatus: 0
+          [1659623353.963473][9870:9875] CHIP:TOO:     networkIndex: 0
+          [1659623353.963530][9870:9875] CHIP:TOO:    }
+          [1659623353.963623][9870:9875] CHIP:DMG: ICR moving to [AwaitingDe]
       disabled: true
 
     - label: "TH reads  Networks  attribute from the  DUT"
@@ -122,15 +117,13 @@
       verification: |
           ./chip-tool networkcommissioning read networks 22 0
 
-          Verify Networks entiries and its status on the TH Log:
+          Verify "Networks entiries and its status" on the TH(Chip-tool) Log:
 
-          [1657809209.998296][6029:6034] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Attribute 0x0000_0001 DataVersion: 1213114000
-          [1657887708.272234][3468:3473] CHIP:TOO:   Networks: 1 entries
-          [1657887708.272346][3468:3473] CHIP:TOO:     [1]: {
-          [1657887708.272415][3468:3473] CHIP:TOO:       NetworkID: 1111111107222222
-          [1657887708.272472][3468:3473] CHIP:TOO:       Connected: FALSE
-          [1657887708.272527][3468:3473] CHIP:TOO:      }
-          [1657809209.999036][6029:6034] CHIP:EM: Sending Standalone Ack for MessageCounter:117964728 on exchange 14021i
+          [1659623451.276073][9891:9896] CHIP:TOO:   Networks: 1 entries
+          [1659623451.276194][9891:9896] CHIP:TOO:     [1]: {
+          [1659623451.276268][9891:9896] CHIP:TOO:       NetworkID: 3111111122222222
+          [1659623451.276326][9891:9896] CHIP:TOO:       Connected: FALSE
+          [1659623451.276381][9891:9896] CHIP:TOO:      }
       disabled: true
 
     - label:
@@ -143,18 +136,17 @@
 
           Below is an example:
 
-          ./chip-tool networkcommissioning connect-network hex:1111111107222222 1 0 --Breadcrumb 2
+          ./chip-tool networkcommissioning connect-network hex:3111111122222222 22 0 --Breadcrumb 2
 
-          Verify ConnectNetworkResponse and its arguments on the TH Log:
+          Verify "ConnectNetworkResponse and its arguments" on the TH(Chip-tool) Log:
 
-          [1657887765.287786][3477:3482] CHIP:DMG: Received Command Response Data, Endpoint=0 Cluster=0x0000_0031 Command=0x0000_0007
-          [1657887765.287890][3477:3482] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Command 0x0000_0007
-          [1657887765.288052][3477:3482] CHIP:TOO:   ConnectNetworkResponse: {
-          [1657887765.288157][3477:3482] CHIP:TOO:     networkingStatus: 0
-          [1657887765.288218][3477:3482] CHIP:TOO:     errorValue: null
-          [1657887765.288272][3477:3482] CHIP:TOO:    }
-          [1657887765.288359][3477:3482] CHIP:DMG: ICR moving to [AwaitingDe]
-          [1657887765.288468][3477:3482] CHIP:EM: Sending Standalone Ack for MessageCounter:268153454 on exchange 57665i
+          1 Command=0x0000_0007
+          [1659623520.296630][9903:9908] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Command 0x0000_0007
+          [1659623520.296853][9903:9908] CHIP:TOO:   ConnectNetworkResponse: {
+          [1659623520.296935][9903:9908] CHIP:TOO:     networkingStatus: 0
+          [1659623520.296987][9903:9908] CHIP:TOO:     errorValue: null
+          [1659623520.297037][9903:9908] CHIP:TOO:    }
+          [1659623520.297124][9903:9908] CHIP:DMG: ICR moving to [AwaitingDe]
       disabled: true
 
     - label:
@@ -169,7 +161,13 @@
           the  General  Commissioning  cluster of the DUT"
       PICS: CNET.S.C06.Rsp
       verification: |
-          ./chip-tool generalcommissioning read breadcrumb 1 0
+          ./chip-tool generalcommissioning read breadcrumb 22 0
+
+          Verify "breadcrumb value is set to 2" on the TH(Chip-tool) Log:
+
+          [1659623558.934419][9911:9917] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0030 Attribute 0x0000_0000 DataVersion: 808037534
+          [1659623558.934529][9911:9917] CHIP:TOO:   Breadcrumb: 2
+          [1659623558.934681][9911:9917] CHIP:EM: Sending Standalone Ack for MessageCounter:244248455 on exchange 8477i
       disabled: true
 
     - label:
@@ -179,52 +177,62 @@
           to  NetworkCommissi  oning cluster done  so far to be  reverted."
       verification: |
           ./chip-tool generalcommissioning arm-fail-safe 0 1 22 0
+
+          Verify "ArmFailSafeResponse" on the TH(Chip-tool) Log:
+
+          [1659623653.222898][9932:9937] CHIP:DMG: Received Command Response Data, Endpoint=0 Cluster=0x0000_0030 Command=0x0000_0001
+          [1659623653.223029][9932:9937] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0030 Command 0x0000_0001
+          [1659623653.223198][9932:9937] CHIP:TOO:   ArmFailSafeResponse: {
+          [1659623653.223283][9932:9937] CHIP:TOO:     errorCode: 0
+          [1659623653.223347][9932:9937] CHIP:TOO:     debugText:
+          [1659623653.223403][9932:9937] CHIP:TOO:    }
+          [1659623653.223492][9932:9937] CHIP:DMG: ICR moving to [AwaitingDe]
       disabled: true
 
     - label:
-          "TH changes its  WiFi connection
-          to  PIXIT.CNET.WIFI_  1ST_ACCESSPOINT  _SSID"
+          "TH ensures it can communicate on PIXIT.CNET.THRE AD_1ST_OPERATI
+          ONALDATASET"
       verification: |
           verification step to be updated.
       disabled: true
 
     - label:
-          "TH discovers and  connects to DUT  on
-          the  PIXIT.CNET.WIFI_  1ST_ACCESSPOINT  _SSID operational  network"
+          "TH discovers and connects to DUT on the PIXIT.CNET.THRE
+          AD_1ST_OPERATI ONALDATASET operational network"
       verification: |
-          verification step to be updated.
+          ./chip-tool networkcommissioning read networks 22 0
+
+          Verify "Networks entiries and its status" on the TH(Chip-tool) Log:
       disabled: true
 
     - label:
-          "TH sends  ArmFailSafe  command to the  DUT
-          with  ExpiryLengthSeco  nds set to 900"
+          "TH sends ArmFailSafe command to the DUT with ExpiryLengthSeco nds set
+          to 900"
       verification: |
           verification step to be updated.
       disabled: true
 
     - label:
           "TH sends RemoveNetwork Command to the DUT with NetworkID field set to
-          PIXIT.CNET.WIFI_ 1ST_ACCESSPOINT _SSID and Breadcrumb field set to 1"
+          th_xpan and Breadcrumb field set to 1"
       PICS: CNET.S.C04.Rsp && CNET.S.C05.Tx
       verification: |
           verification step to be updated.
       disabled: true
 
     - label:
-          "TH sends  AddOrUpdateWiFi  Network  command to the  DUT with
-          SSID  field set
-          to  PIXIT.CNET.WIFI_  2ND_ACCESSPOIN  T_SSID,  Credentials field  set
-          to  PIXIT.CNET.WIFI_  2ND_ACCESSPOIN  T_CREDENTIALS  and
-          Breadcrumb  field set to 1"
+          "TH sends AddOrUpdateThre adNetwork command to the DUT with the
+          OperationalDatase t field set to PIXIT.CNET.THRE AD_2ND_OPERATI
+          ONALDATASET and Breadcrumb field set to 1"
       PICS: CNET.S.C02.Rsp && CNET.S.C05.Tx
       verification: |
           verification step to be updated.
       disabled: true
 
     - label:
-          "TH sends  ConnectNetwork  command to the  DUT with  NetworkID
-          field  set to  PIXIT.CNET.WIFI_  2ND_ACCESSPOIN  T_SSID
-          and  Breadcrumb field  set to 3"
+          "TH sends ConnectNetwork command to the DUT with NetworkID field set
+          to the extended PAN ID of PIXIT.CNET.THRE AD_2ND_OPERATI ONALDATASET
+          and Breadcrumb field set to 3"
       PICS: CNET.S.C06.Rsp && CNET.S.C07.Tx
       verification: |
           verification step to be updated.
diff --git a/src/app/tests/suites/certification/Test_TC_CNET_4_14.yaml b/src/app/tests/suites/certification/Test_TC_CNET_4_14.yaml
index c184271..637f128 100644
--- a/src/app/tests/suites/certification/Test_TC_CNET_4_14.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CNET_4_14.yaml
@@ -53,15 +53,6 @@
       disabled: true
 
     - label:
-          "TH1 sends AddOrUpdateWiFiNetwork command to the DUT with SSID
-          argument value as Userwifi_ssid2, Credentials argument value as
-          Userwifi_Credentials and Breadcrumb argument value as 1"
-      verification: |
-          The test case is not verifiable in RPI platform. As MaxNetworks value is 1 but expected is 4
-          ( Pre-Condition)
-      disabled: true
-
-    - label:
           "TH calculates the  midpoint of the  network list
           as  floor((MaxNetwor  ksValue + 1)/2)  and saves as  Midpoint"
       verification: |
@@ -78,11 +69,10 @@
       disabled: true
 
     - label:
-          "TH sends  AddOrUpdateWiFi  Network  command to the  DUT. This
-          step  should be  repeated  RemainingNetwor  kSlots times
-          using  DIFFERENT SSID  and credential  values and the  Breadcrumb
-          field  set to 1. Note that  these credentials  are NOT required  to be
-          connectable."
+          "TH sends AddOrUpdateThre adNetwork command to the DUT. This step
+          should be repeated RemainingNetwor kSlots times using DIFFERENT
+          OperationalDatase t values and Breadcrumb set to 1. Note that these
+          credentials are NOT required to be connectable."
       PICS: CNET.S.C02.Rsp && CNET.S.C05.Tx
       verification: |
           The test case is not verifiable in RPI platform. As MaxNetworks value is 1 but expected is 4
diff --git a/src/app/tests/suites/certification/Test_TC_CNET_4_15.yaml b/src/app/tests/suites/certification/Test_TC_CNET_4_15.yaml
index 5561ab5..3519c47 100644
--- a/src/app/tests/suites/certification/Test_TC_CNET_4_15.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CNET_4_15.yaml
@@ -32,7 +32,7 @@
       verification: |
           ./chip-tool generalcommissioning arm-fail-safe 60 0 1 0
 
-          Verify ArmFailSafeResponse on the TH Log:
+          Verify "ArmFailSafeResponse" on the TH(Chip-tool) Log:
 
           [1650383264.543046][44233:44238] CHIP:DMG: Received Command Response Data, Endpoint=0 Cluster=0x0000_0030 Command=0x0000_0001
           [1650383264.543109][44233:44238] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0030 Command 0x0000_0001
@@ -56,7 +56,7 @@
 
            ./chip-tool networkcommissioning remove-network hex:47524C50726976617465 1 0
 
-          Verify NetworkConfigResponse and its arguments on the TH Log:
+          Verify "NetworkConfigResponse and its arguments" on the TH(Chip-tool) Log:
 
           [1650383270.888700][44239:44244] CHIP:DMG: Received Command Response Data, Endpoint=0 Cluster=0x0000_0031 Command=0x0000_0005
           [1650383270.888774][44239:44244] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Command 0x0000_0005
@@ -79,7 +79,7 @@
 
           ./chip-tool networkcommissioning connect-network hex:47524C50726976617465 1 0
 
-          Verify ConnectNetworkResponse and its arguments on the TH Log:
+          Verify "ConnectNetworkResponse and its arguments" on the TH(Chip-tool) Log:
 
           [1650383278.349428][44245:44250] CHIP:DMG: Received Command Response Data, Endpoint=0 Cluster=0x0000_0031 Command=0x0000_0007
           [1650383278.349490][44245:44250] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Command 0x0000_0007
diff --git a/src/app/tests/suites/certification/Test_TC_CNET_4_16.yaml b/src/app/tests/suites/certification/Test_TC_CNET_4_16.yaml
index 5402eb0..7963d5e 100644
--- a/src/app/tests/suites/certification/Test_TC_CNET_4_16.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CNET_4_16.yaml
@@ -30,7 +30,7 @@
       verification: |
           ./chip-tool generalcommissioning arm-fail-safe 900 0 54 0
 
-          Verify ArmFailSafeResponse on the TH Log:
+          Verify "ArmFailSafeResponse" on the TH(Chip-tool) Log:
 
           [1650392597.976230][10152:10157] CHIP:DMG: Received Command Response Data, Endpoint=0 Cluster=0x0000_0030 Command=0x0000_0001
           [1650392597.976363][10152:10157] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0030 Command 0x0000_0001
@@ -55,7 +55,7 @@
 
           ./chip-tool networkcommissioning remove-network 47524C50726976617465 54 0
 
-          Verify NetworkConfigResponse and its arguments on the TH Log:
+          Verify "NetworkConfigResponse and its arguments" on the TH(Chip-tool) Log:
 
           [1650392982.606392][10188:10193] CHIP:DMG: Received Command Response Data, Endpoint=0 Cluster=0x0000_0031 Command=0x0000_0007
           [1650392982.606501][10188:10193] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Command 0x0000_0007
@@ -79,7 +79,7 @@
 
           ./chip-tool networkcommissioning connect-network 47524C50726976617465 54 0
 
-          Verify ConnectNetworkResponse and its arguments on the TH Log:
+          Verify "ConnectNetworkResponse and its arguments" on the TH(Chip-tool) Log:
 
           [1650392982.606392][10188:10193] CHIP:DMG: Received Command Response Data, Endpoint=0 Cluster=0x0000_0031 Command=0x0000_0007
           [1650392982.606501][10188:10193] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Command 0x0000_0007
diff --git a/src/app/tests/suites/certification/Test_TC_CNET_4_17.yaml b/src/app/tests/suites/certification/Test_TC_CNET_4_17.yaml
index 671e0af..5e70a7d 100644
--- a/src/app/tests/suites/certification/Test_TC_CNET_4_17.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CNET_4_17.yaml
@@ -26,19 +26,40 @@
     endpoint: 0
 
 tests:
+    - label: "Note"
+      verification: |
+          Chip-tool command used below are an example to verify the  DUT as client test cases. For certification test, we expect DUT should have a capability or way to run the equivalent command.
+      disabled: true
+
     - label: "DUT reads the MaxNetworks attribute from the TH"
       PICS: CNET.S.A0000
       verification: |
           ./chip-tool networkcommissioning read max-networks 1 0
 
-          Verify MaxNetworks attribute on the TH/All-cluster-app Log:
+          Verify "MaxNetworks attribute response" on the TH(All-cluster-app) Log:
 
-          [1646216356.472036][7021:7026] CHIP:DMG:        SuppressResponse = true,
-          [1646216356.472088][7021:7026] CHIP:DMG:        InteractionModelRevision = 1
-          [1646216356.472136][7021:7026] CHIP:DMG: }
-          [1646216356.472388][7021:7026] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Attribute 0x0000_0000DataVersion: 1979781767
-          [1646216356.472511][7021:7026] CHIP:TOO:  MaxNetworks: 1
-          [1646216356.472624][7021:7026] CHIP:EM: Sending Standalone Ack for MessageCounter:4914191 on exchange 38527i
+          [1659616395.286439][8402:8402] CHIP:EM: Received message of type 0x2 with protocolId (0, 1) and MessageCounter:91174595 on exchange 50838r
+          [1659616395.286508][8402:8402] CHIP:EM: Handling via exchange: 50838r, Delegate: 0xaaaab5424f68
+          [1659616395.286555][8402:8402] CHIP:IM: Received Read request
+          [1659616395.286651][8402:8402] CHIP:DMG: ReadRequestMessage =
+          [1659616395.286686][8402:8402] CHIP:DMG: {
+          [1659616395.286713][8402:8402] CHIP:DMG:         AttributePathIBs =
+          [1659616395.286745][8402:8402] CHIP:DMG:         [
+          [1659616395.286775][8402:8402] CHIP:DMG:                 AttributePathIB =
+          [1659616395.286809][8402:8402] CHIP:DMG:                 {
+          [1659616395.286843][8402:8402] CHIP:DMG:                         Endpoint = 0x0,
+          [1659616395.286888][8402:8402] CHIP:DMG:                         Cluster = 0x31,
+          [1659616395.286926][8402:8402] CHIP:DMG:                         Attribute = 0x0000_0000,
+          [1659616395.286963][8402:8402] CHIP:DMG:                 }
+          [1659616395.286997][8402:8402] CHIP:DMG:
+          [1659616395.287028][8402:8402] CHIP:DMG:         ],
+          [1659616395.287062][8402:8402] CHIP:DMG:
+          [1659616395.287095][8402:8402] CHIP:DMG:         isFabricFiltered = true,
+          [1659616395.287127][8402:8402] CHIP:DMG:         InteractionModelRevision = 1
+          [1659616395.287155][8402:8402] CHIP:DMG: },
+          [1659616395.287248][8402:8402] CHIP:DMG: IM RH moving to [GeneratingReports]
+          [1659616395.287360][8402:8402] CHIP:DMG: Building Reports for ReadHandler with LastReportGeneration = 0 DirtyGeneration = 0
+          [1659616395.287396][8402:8402] CHIP:DMG: <RE:Run> Cluster 31, Attribute 0 is dirty
       disabled: true
 
     - label: "DUT reads the Networks attribute from the TH"
@@ -47,14 +68,29 @@
           ./chip-tool networkcommissioning read networks 1 0
 
 
-          Verify Networks entiries and its status on the TH/All-cluster-app Log:
+          Verify "Networks response" on the TH(All-cluster-app) Log:
 
-          [1654250379.881780][5309:5314] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Attribute 0x0000_0001 DataVersion: 3741733376
-          [1654250379.881974][5309:5314] CHIP:TOO:   Networks: 1 entries
-          [1654250379.882123][5309:5314] CHIP:TOO:     [1]: {
-          [1654250379.882196][5309:5314] CHIP:TOO:       NetworkID: 47524C50726976617465
-          [1654250379.882257][5309:5314] CHIP:TOO:       Connected: TRUE
-          [1654250379.882312][5309:5314] CHIP:TOO:      }
+          [1659616436.026593][8402:8402] CHIP:EM: Received message of type 0x2 with protocolId (0, 1) and MessageCounter:247558361 on exchange 12757r
+          [1659616436.026665][8402:8402] CHIP:EM: Handling via exchange: 12757r, Delegate: 0xaaaab5424f68
+          [1659616436.026717][8402:8402] CHIP:IM: Received Read request
+          [1659616436.026802][8402:8402] CHIP:DMG: ReadRequestMessage =
+          [1659616436.026831][8402:8402] CHIP:DMG: {
+          [1659616436.026851][8402:8402] CHIP:DMG:         AttributePathIBs =
+          [1659616436.026878][8402:8402] CHIP:DMG:         [
+          [1659616436.026901][8402:8402] CHIP:DMG:                 AttributePathIB =
+          [1659616436.026938][8402:8402] CHIP:DMG:                 {
+          [1659616436.026967][8402:8402] CHIP:DMG:                         Endpoint = 0x0,
+          [1659616436.027002][8402:8402] CHIP:DMG:                         Cluster = 0x31,
+          [1659616436.027034][8402:8402] CHIP:DMG:                         Attribute = 0x0000_0001,
+          [1659616436.027064][8402:8402] CHIP:DMG:                 }
+          [1659616436.027093][8402:8402] CHIP:DMG:
+          [1659616436.027118][8402:8402] CHIP:DMG:         ],
+          [1659616436.027148][8402:8402] CHIP:DMG:
+          [1659616436.027175][8402:8402] CHIP:DMG:         isFabricFiltered = true,
+          [1659616436.027200][8402:8402] CHIP:DMG:         InteractionModelRevision = 1
+          [1659616436.027224][8402:8402] CHIP:DMG: },
+          [1659616436.027302][8402:8402] CHIP:DMG: IM RH moving to [GeneratingReports]
+          [1659616436.027411][8402:8402] CHIP:DMG: Building Reports for ReadHandler with LastReportGeneration = 0 DirtyGeneration = 0
       disabled: true
 
     - label: "DUT reads ScanMaxTimeSeconds attribute from the TH"
@@ -62,12 +98,30 @@
       verification: |
           ./chip-tool networkcommissioning read scan-max-time-seconds 1 0
 
-          Verify  ScanMaxTimeSeconds on the TH/All-cluster-app Log:
+          Verify  "ScanMaxTimeSeconds response" on the TH(All-cluster-app) Log:
 
 
-          [1653473784.850830][29813:29818] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Attribute 0x0000_0002 DataVersion: 1600858167
-          [1653473784.850916][29813:29818] CHIP:TOO:   ScanMaxTimeSeconds: 10
-          [1653473784.851029][29813:29818] CHIP:EM: Sending Standalone Ack for MessageCounter:16671548 on exchange 37205i
+          [1659616466.503155][8402:8402] CHIP:EM: Handling via exchange: 8026r, Delegate: 0xaaaab5424f68
+          [1659616466.503237][8402:8402] CHIP:IM: Received Read request
+          [1659616466.503369][8402:8402] CHIP:DMG: ReadRequestMessage =
+          [1659616466.503418][8402:8402] CHIP:DMG: {
+          [1659616466.503457][8402:8402] CHIP:DMG:         AttributePathIBs =
+          [1659616466.503505][8402:8402] CHIP:DMG:         [
+          [1659616466.503549][8402:8402] CHIP:DMG:                 AttributePathIB =
+          [1659616466.503597][8402:8402] CHIP:DMG:                 {
+          [1659616466.503648][8402:8402] CHIP:DMG:                         Endpoint = 0x0,
+          [1659616466.503710][8402:8402] CHIP:DMG:                         Cluster = 0x31,
+          [1659616466.503774][8402:8402] CHIP:DMG:                         Attribute = 0x0000_0002,
+          [1659616466.503831][8402:8402] CHIP:DMG:                 }
+          [1659616466.503885][8402:8402] CHIP:DMG:
+          [1659616466.503932][8402:8402] CHIP:DMG:         ],
+          [1659616466.503983][8402:8402] CHIP:DMG:
+          [1659616466.504031][8402:8402] CHIP:DMG:         isFabricFiltered = true,
+          [1659616466.504078][8402:8402] CHIP:DMG:         InteractionModelRevision = 1
+          [1659616466.504121][8402:8402] CHIP:DMG: },
+          [1659616466.504248][8402:8402] CHIP:DMG: IM RH moving to [GeneratingReports]
+          [1659616466.504400][8402:8402] CHIP:DMG: Building Reports for ReadHandler with LastReportGeneration = 0 DirtyGeneration = 0
+          [1659616466.504455][8402:8402] CHIP:DMG: <RE:Run> Cluster 31, Attribute 2 is dirty
       disabled: true
 
     - label: "DUT reads ConnectMaxTimeSeconds attribute from the TH"
@@ -76,11 +130,29 @@
           ./chip-tool networkcommissioning read connect-max-time-seconds 1 0
 
 
-          Verify ConnectMaxTimeSeconds on the TH/All-cluster-app Log:
+          Verify "ConnectMaxTimeSeconds response" on the TH(All-cluster-app) Log:
 
-          [1653473821.367214][29821:29826] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Attribute 0x0000_0003 DataVersion: 1600858167
-          [1653473821.367283][29821:29826] CHIP:TOO:   ConnectMaxTimeSeconds: 20
-          [1653473821.367379][29821:29826] CHIP:EM: Sending Standalone Ack for MessageCounter:187119 on exchange 50022i
+          [1659616499.766656][8402:8402] CHIP:EM: Handling via exchange: 21680r, Delegate: 0xaaaab5424f68
+          [1659616499.766704][8402:8402] CHIP:IM: Received Read request
+          [1659616499.766789][8402:8402] CHIP:DMG: ReadRequestMessage =
+          [1659616499.766817][8402:8402] CHIP:DMG: {
+          [1659616499.766839][8402:8402] CHIP:DMG:         AttributePathIBs =
+          [1659616499.766865][8402:8402] CHIP:DMG:         [
+          [1659616499.766889][8402:8402] CHIP:DMG:                 AttributePathIB =
+          [1659616499.766918][8402:8402] CHIP:DMG:                 {
+          [1659616499.766946][8402:8402] CHIP:DMG:                         Endpoint = 0x0,
+          [1659616499.766982][8402:8402] CHIP:DMG:                         Cluster = 0x31,
+          [1659616499.767014][8402:8402] CHIP:DMG:                         Attribute = 0x0000_0003,
+          [1659616499.767043][8402:8402] CHIP:DMG:                 }
+          [1659616499.767072][8402:8402] CHIP:DMG:
+          [1659616499.767097][8402:8402] CHIP:DMG:         ],
+          [1659616499.767124][8402:8402] CHIP:DMG:
+          [1659616499.767151][8402:8402] CHIP:DMG:         isFabricFiltered = true,
+          [1659616499.767176][8402:8402] CHIP:DMG:         InteractionModelRevision = 1
+          [1659616499.767199][8402:8402] CHIP:DMG: },
+          [1659616499.767276][8402:8402] CHIP:DMG: IM RH moving to [GeneratingReports]
+          [1659616499.767379][8402:8402] CHIP:DMG: Building Reports for ReadHandler with LastReportGeneration = 0 DirtyGeneration = 0
+          [1659616499.767411][8402:8402] CHIP:DMG: <RE:Run> Cluster 31, Attribute 3 is dirty
       disabled: true
 
     - label: "DUT reads InterfaceEnabled attribute from the TH"
@@ -89,11 +161,29 @@
           ./chip-tool networkcommissioning read interface-enabled 1 0
 
 
-          Verify InterfaceEnabled on the TH/All-cluster-app Log:
+          Verify "InterfaceEnabled response" on the TH(All-cluster-app) Log:
 
-          [1653473893.275901][29834:29839] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Attribute 0x0000_0004 DataVersion: 1600858167
-          [1653473893.275964][29834:29839] CHIP:TOO:   InterfaceEnabled: TRUE
-          [1653473893.276084][29834:29839] CHIP:EM: Sending Standalone Ack for MessageCounter:13157245 on exchange 55578i
+          [1659616529.997762][8402:8402] CHIP:EM: Handling via exchange: 30450r, Delegate: 0xaaaab5424f68
+          [1659616529.997805][8402:8402] CHIP:IM: Received Read request
+          [1659616529.997915][8402:8402] CHIP:DMG: ReadRequestMessage =
+          [1659616529.997945][8402:8402] CHIP:DMG: {
+          [1659616529.997968][8402:8402] CHIP:DMG:         AttributePathIBs =
+          [1659616529.997995][8402:8402] CHIP:DMG:         [
+          [1659616529.998020][8402:8402] CHIP:DMG:                 AttributePathIB =
+          [1659616529.998049][8402:8402] CHIP:DMG:                 {
+          [1659616529.998078][8402:8402] CHIP:DMG:                         Endpoint = 0x0,
+          [1659616529.998116][8402:8402] CHIP:DMG:                         Cluster = 0x31,
+          [1659616529.998149][8402:8402] CHIP:DMG:                         Attribute = 0x0000_0004,
+          [1659616529.998180][8402:8402] CHIP:DMG:                 }
+          [1659616529.998210][8402:8402] CHIP:DMG:
+          [1659616529.998236][8402:8402] CHIP:DMG:         ],
+          [1659616529.998266][8402:8402] CHIP:DMG:
+          [1659616529.998293][8402:8402] CHIP:DMG:         isFabricFiltered = true,
+          [1659616529.998320][8402:8402] CHIP:DMG:         InteractionModelRevision = 1
+          [1659616529.998345][8402:8402] CHIP:DMG: },
+          [1659616529.998425][8402:8402] CHIP:DMG: IM RH moving to [GeneratingReports]
+          [1659616529.998519][8402:8402] CHIP:DMG: Building Reports for ReadHandler with LastReportGeneration = 0 DirtyGeneration = 0
+          [1659616529.998551][8402:8402] CHIP:DMG: <RE:Run> Cluster 31, Attribute 4 is dirty
       disabled: true
 
     - label: "DUT reads LastNetworkingStatus attribute from the TH"
@@ -102,23 +192,60 @@
           ./chip-tool networkcommissioning read last-networking-status 1 0
 
 
-          Verify LastNetworkingStatus on the TH/All-cluster-app Log:
+          Verify "LastNetworkingStatus response" on the TH(All-cluster-app) Log:
 
-          [1653473918.484769][29840:29845] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Attribute 0x0000_0005 DataVersion: 1600858167
-          [1653473918.484843][29840:29845] CHIP:TOO:   LastNetworkingStatus: 0
-          [1653473918.484940][29840:29845] CHIP:EM: Sending Standalone Ack for MessageCounter:10161085 on exchange 18769i
+          [1659616569.888457][8402:8402] CHIP:EM: Handling via exchange: 58386r, Delegate: 0xaaaab5424f68
+          [1659616569.888496][8402:8402] CHIP:IM: Received Read request
+          [1659616569.888573][8402:8402] CHIP:DMG: ReadRequestMessage =
+          [1659616569.888599][8402:8402] CHIP:DMG: {
+          [1659616569.888620][8402:8402] CHIP:DMG:         AttributePathIBs =
+          [1659616569.888649][8402:8402] CHIP:DMG:         [
+          [1659616569.888673][8402:8402] CHIP:DMG:                 AttributePathIB =
+          [1659616569.888700][8402:8402] CHIP:DMG:                 {
+          [1659616569.888727][8402:8402] CHIP:DMG:                         Endpoint = 0x0,
+          [1659616569.888762][8402:8402] CHIP:DMG:                         Cluster = 0x31,
+          [1659616569.888793][8402:8402] CHIP:DMG:                         Attribute = 0x0000_0005,
+          [1659616569.888821][8402:8402] CHIP:DMG:                 }
+          [1659616569.888850][8402:8402] CHIP:DMG:
+          [1659616569.888877][8402:8402] CHIP:DMG:         ],
+          [1659616569.888905][8402:8402] CHIP:DMG:
+          [1659616569.888931][8402:8402] CHIP:DMG:         isFabricFiltered = true,
+          [1659616569.888958][8402:8402] CHIP:DMG:         InteractionModelRevision = 1
+          [1659616569.888981][8402:8402] CHIP:DMG: },
+          [1659616569.889056][8402:8402] CHIP:DMG: IM RH moving to [GeneratingReports]
+          [1659616569.889181][8402:8402] CHIP:DMG: Building Reports for ReadHandler with LastReportGeneration = 0 DirtyGeneration = 0
+          [1659616569.889213][8402:8402] CHIP:DMG: <RE:Run> Cluster 31, Attribute 5 is dirty
       disabled: true
 
     - label: "DUT reads LastNetworkID attribute from the TH"
       PICS: CNET.S.A0006
       verification: |
-          ./chip-tool networkcommissioning read last-network-id 1
+          ./chip-tool networkcommissioning read last-network-id 1 0
 
-          Verify LastNetworkID on the TH/All-cluster-app Log:
+          Verify "LastNetworkID response" on the TH(All-cluster-app) Log:
 
-          "[1653474059.383553][27286:27291] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Attribute 0x0000_0006 DataVersion: 1912591449
-          [1653474059.383618][27286:27291] CHIP:TOO:   LastNetworkID: 47524C50726976617465
-          [1653474059.383723][27286:27291] CHIP:EM: Sending Standalone Ack for MessageCounter:6975079 on exchange 34674i"
+          [1659616615.600044][8402:8402] CHIP:EM: Handling via exchange: 57776r, Delegate: 0xaaaab5424f68
+          [1659616615.600082][8402:8402] CHIP:IM: Received Read request
+          [1659616615.600157][8402:8402] CHIP:DMG: ReadRequestMessage =
+          [1659616615.600184][8402:8402] CHIP:DMG: {
+          [1659616615.600205][8402:8402] CHIP:DMG:         AttributePathIBs =
+          [1659616615.600230][8402:8402] CHIP:DMG:         [
+          [1659616615.600254][8402:8402] CHIP:DMG:                 AttributePathIB =
+          [1659616615.600281][8402:8402] CHIP:DMG:                 {
+          [1659616615.600314][8402:8402] CHIP:DMG:                         Endpoint = 0x0,
+          [1659616615.600348][8402:8402] CHIP:DMG:                         Cluster = 0x31,
+          [1659616615.600379][8402:8402] CHIP:DMG:                         Attribute = 0x0000_0006,
+          [1659616615.600408][8402:8402] CHIP:DMG:                 }
+          [1659616615.600436][8402:8402] CHIP:DMG:
+          [1659616615.600460][8402:8402] CHIP:DMG:         ],
+          [1659616615.600487][8402:8402] CHIP:DMG:
+          [1659616615.600513][8402:8402] CHIP:DMG:         isFabricFiltered = true,
+          [1659616615.600538][8402:8402] CHIP:DMG:         InteractionModelRevision = 1
+          [1659616615.600561][8402:8402] CHIP:DMG: },
+          [1659616615.600634][8402:8402] CHIP:DMG: IM RH moving to [GeneratingReports]
+          [1659616615.600718][8402:8402] CHIP:DMG: Building Reports for ReadHandler with LastReportGeneration = 0 DirtyGeneration = 0
+          [1659616615.600747][8402:8402] CHIP:DMG: <RE:Run> Cluster 31, Attribute 6 is dirty
+          [1659616615.600768][8402:8402] CHIP:DMG: Reading attribute: Cluster=0x0000_0031 Endpoint=0 AttributeId=0x0000_0006 (expanded=0)
       disabled: true
 
     - label: "DUT reads LastConnectErrorValue attribute from the TH"
@@ -126,9 +253,27 @@
       verification: |
           ./chip-tool networkcommissioning read last-connect-error-value 1 0
 
-          Verify LastConnectErrorValue on the TH/All-cluster-app Log:
+          Verify "LastConnectErrorValue response" on the TH(All-cluster-app) Log:
 
-          [1653474102.061746][29860:29865] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Attribute 0x0000_0007 DataVersion: 1600858167
-          [1653474102.061812][29860:29865] CHIP:TOO:   LastConnectErrorValue: null
-          [1653474102.061934][29860:29865] CHIP:EM: Sending Standalone Ack for MessageCounter:5193529 on exchange 29546i
+          [1659616664.345623][8402:8402] CHIP:EM: Handling via exchange: 54621r, Delegate: 0xaaaab5424f68
+          [1659616664.345672][8402:8402] CHIP:IM: Received Read request
+          [1659616664.345755][8402:8402] CHIP:DMG: ReadRequestMessage =
+          [1659616664.345784][8402:8402] CHIP:DMG: {
+          [1659616664.345822][8402:8402] CHIP:DMG:         AttributePathIBs =
+          [1659616664.345849][8402:8402] CHIP:DMG:         [
+          [1659616664.345883][8402:8402] CHIP:DMG:                 AttributePathIB =
+          [1659616664.345911][8402:8402] CHIP:DMG:                 {
+          [1659616664.345948][8402:8402] CHIP:DMG:                         Endpoint = 0x0,
+          [1659616664.345983][8402:8402] CHIP:DMG:                         Cluster = 0x31,
+          [1659616664.346025][8402:8402] CHIP:DMG:                         Attribute = 0x0000_0007,
+          [1659616664.346063][8402:8402] CHIP:DMG:                 }
+          [1659616664.346092][8402:8402] CHIP:DMG:
+          [1659616664.346127][8402:8402] CHIP:DMG:         ],
+          [1659616664.346156][8402:8402] CHIP:DMG:
+          [1659616664.346193][8402:8402] CHIP:DMG:         isFabricFiltered = true,
+          [1659616664.346220][8402:8402] CHIP:DMG:         InteractionModelRevision = 1
+          [1659616664.346242][8402:8402] CHIP:DMG: },
+          [1659616664.346320][8402:8402] CHIP:DMG: IM RH moving to [GeneratingReports]
+          [1659616664.346426][8402:8402] CHIP:DMG: Building Reports for ReadHandler with LastReportGeneration = 0 DirtyGeneration = 0
+          [1659616664.346458][8402:8402] CHIP:DMG: <RE:Run> Cluster 31, Attribute 7 is dirty
       disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_CNET_4_18.yaml b/src/app/tests/suites/certification/Test_TC_CNET_4_18.yaml
index b395e8d..b21221f 100644
--- a/src/app/tests/suites/certification/Test_TC_CNET_4_18.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CNET_4_18.yaml
@@ -26,12 +26,17 @@
     endpoint: 0
 
 tests:
+    - label: "Note"
+      verification: |
+          Chip-tool command used below are an example to verify the  DUT as client test cases. For certification test, we expect DUT should have a capability or way to run the equivalent command.
+      disabled: true
+
     - label: "DUT reads the MaxNetworks attribute from the TH"
       PICS: CNET.S.A0000
       verification: |
           ./chip-tool networkcommissioning read max-networks 54 0
 
-          Verify MaxNetworks on the TH(All-cluster-app) Log:
+          Verify "MaxNetworks response" on the TH(All-cluster-app) Log:
 
           D: 7993601 [SC]Allocated SecureSession (0x20003680) - waiting for Sigma1 msg
           D: 7993608 [EM]Retransmitting MessageCounter:53368032 on exchange 5643r Send Cnt 1
@@ -52,7 +57,7 @@
       verification: |
           ./chip-tool networkcommissioning read networks 54 0
 
-          Verify Networks entries and its status on the TH(All-cluster-app) Log:
+          Verify "Networks response" on the TH(All-cluster-app) Log:
 
           D: 8065181 [SC]Allocated SecureSession (0x20003738) - waiting for Sigma1 msg
           D: 8065188 [EM]Retransmitting MessageCounter:53368036 on exchange 57159r Send Cnt 1
@@ -72,7 +77,7 @@
       verification: |
           ./chip-tool networkcommissioning read scan-max-time-seconds 54 0
 
-          Verify  ScanMaxTimeSeconds on the TH(All-cluster-app) Log:
+          Verify  "ScanMaxTimeSeconds response" on the TH(All-cluster-app) Log:
 
           D: 8108702 [SC]Allocated SecureSession (0x200037f0) - waiting for Sigma1 msg
           I: 8108710 [EM]Received message of type 0x2 with protocolId (0, 1) and MessageCounter:194637583 on exchar
@@ -90,7 +95,7 @@
       verification: |
           ./chip-tool networkcommissioning read connect-max-time-seconds 54 0
 
-          Verify ConnectMaxTimeSeconds on the TH(All-cluster-app) Log:
+          Verify "ConnectMaxTimeSeconds response" on the TH(All-cluster-app) Log:
 
           D: 8145477 [SC]Allocated SecureSession (0x20002c70) - waiting for Sigma1 msg
           I: 8145484 [EM]Received message of type 0x2 with protocolId (0, 1) and MessageCounter:134704639 on exchar
@@ -108,7 +113,7 @@
       verification: |
           ./chip-tool networkcommissioning read interface-enabled 54 0
 
-          Verify InterfaceEnabled on the TH(All-cluster-app) Log:
+          Verify "InterfaceEnabled response" on the TH(All-cluster-app) Log:
 
           D: 8179717 [SC]Allocated SecureSession (0x20002de0) - waiting for Sigma1 msg
           I: 8179725 [EM]Received message of type 0x2 with protocolId (0, 1) and MessageCounter:158532673 on exchar
@@ -127,7 +132,7 @@
           ubuntu@ubuntu:~/connectedhomeip/examples/chip-tool/out/debug$ ./chip-tool networkcommissioning read last-networking-status 54 0
 
 
-          Verify LastNetworkingStatus on the TH(All-cluster-app) Log:
+          Verify "LastNetworkingStatus response" on the TH(All-cluster-app) Log:
 
           D: 8428403 [SC]Allocated SecureSession (0x20002d28) - waiting for Sigma1 msg
           I: 8428410 [EM]Received message of type 0x2 with protocolId (0, 1) and MessageCounter:135181543 on exchar
@@ -148,7 +153,7 @@
           ./chip-tool networkcommissioning read last-network-id 54 0
 
 
-          Verify LastNetworkID on the TH(All-cluster-app) Log:
+          Verify "LastNetworkID response" on the TH(All-cluster-app) Log:
 
           D: 8469179 [SC]Allocated SecureSession (0x20002e98) - waiting for Sigma1 msg
           I: 8469187 [EM]Received message of type 0x2 with protocolId (0, 1) and MessageCounter:91003604 on exchanr
@@ -169,7 +174,7 @@
           ./chip-tool networkcommissioning read last-connect-error-value 54 0
 
 
-          Verify LastConnectErrorValue on the TH(All-cluster-app) Log:
+          Verify "LastConnectErrorValue response" on the TH(All-cluster-app) Log:
 
           D: 8729020 [SC]Allocated SecureSession (0x20002f50) - waiting for Sigma1 msg
           I: 8729028 [EM]Received message of type 0x2 with protocolId (0, 1) and MessageCounter:249692114 on exchar
diff --git a/src/app/tests/suites/certification/Test_TC_CNET_4_19.yaml b/src/app/tests/suites/certification/Test_TC_CNET_4_19.yaml
index 5b349f5..6ccf90f 100644
--- a/src/app/tests/suites/certification/Test_TC_CNET_4_19.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CNET_4_19.yaml
@@ -26,19 +26,39 @@
     endpoint: 0
 
 tests:
+    - label: "Note"
+      verification: |
+          Chip-tool command used below are an example to verify the  DUT as client test cases. For certification test, we expect DUT should have a capability or way to run the equivalent command.
+      disabled: true
+
     - label: "DUT reads the MaxNetworks attribute from the TH"
       PICS: CNET.S.A0000
       verification: |
           ./chip-tool networkcommissioning read max-networks 1 0
 
-          Verify MaxNetworks on the TH/All-cluster-app Log:
+          Verify "MaxNetworks response" on the TH(All-cluster-app) Log:
 
-          [1646226441.815782][2475:2480] CHIP:DMG:        SuppressResponse = true,
-          [1646226441.815849][2475:2480] CHIP:DMG:        InteractionModelRevision = 1
-          [1646226441.815889][2475:2480] CHIP:DMG: }
-          [1646226441.816092][2475:2480] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Attribute 0x0000_0000DataVersion: 3622667250
-          [1646226441.816191][2475:2480] CHIP:TOO:   MaxNetworks: 1
-          [1646226441.816288][2475:2480] CHIP:EM: Sending Standalone Ack for MessageCounter:14864333 on exchange 39473i
+          [1659609763.322869][3355:3355] CHIP:EM: Received message of type 0x2 with protocolId (0, 1) and MessageCounter:183685847 on exchange 32698r
+          [1659609763.322969][3355:3355] CHIP:EM: Handling via exchange: 32698r, Delegate: 0xaaaac00e4f08
+          [1659609763.323017][3355:3355] CHIP:IM: Received Read request
+          [1659609763.323116][3355:3355] CHIP:DMG: ReadRequestMessage =
+          [1659609763.323147][3355:3355] CHIP:DMG: {
+          [1659609763.323179][3355:3355] CHIP:DMG:         AttributePathIBs =
+          [1659609763.323206][3355:3355] CHIP:DMG:         [
+          [1659609763.323230][3355:3355] CHIP:DMG:                 AttributePathIB =
+          [1659609763.323267][3355:3355] CHIP:DMG:                 {
+          [1659609763.323296][3355:3355] CHIP:DMG:                         Endpoint = 0x0,
+          [1659609763.323355][3355:3355] CHIP:DMG:                         Cluster = 0x31,
+          [1659609763.323402][3355:3355] CHIP:DMG:                         Attribute = 0x0000_0000,
+          [1659609763.323433][3355:3355] CHIP:DMG:                 }
+          [1659609763.323471][3355:3355] CHIP:DMG:
+          [1659609763.323497][3355:3355] CHIP:DMG:         ],
+          [1659609763.323536][3355:3355] CHIP:DMG:
+          [1659609763.323563][3355:3355] CHIP:DMG:         isFabricFiltered = true,
+          [1659609763.323597][3355:3355] CHIP:DMG:         InteractionModelRevision = 1
+          [1659609763.323621][3355:3355] CHIP:DMG: },
+          [1659609763.323719][3355:3355] CHIP:DMG: IM RH moving to [GeneratingReports]
+          [1659609763.323834][3355:3355] CHIP:DMG: Building Reports for ReadHandler with LastReportGeneration = 0 DirtyGeneration = 0
       disabled: true
 
     - label: "DUT reads the Networks attribute from the TH"
@@ -46,14 +66,29 @@
       verification: |
           ./chip-tool networkcommissioning read networks 1 0
 
-          Verify Networks entiries and its status on the TH/All-cluster-app Log:
+          Verify "Networks response" on the TH(All-cluster-app)Log:
 
-          [1654076774.294361][33659:33664] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Attribute 0x0000_0001 DataVersion: 609053543
-          [1654076774.294505][33659:33664] CHIP:TOO:   Networks: 1 entries
-          [1654076774.294625][33659:33664] CHIP:TOO:     [1]: {
-          [1654076774.294679][33659:33664] CHIP:TOO:       NetworkID: 6368697035
-          [1654076774.294726][33659:33664] CHIP:TOO:       Connected: TRUE
-          [1654076774.294774][33659:33664] CHIP:TOO:      }
+          [1659609799.625479][3355:3355] CHIP:EM: Received message of type 0x2 with protocolId (0, 1) and MessageCounter:137580527 on exchange 7860r
+          [1659609799.625525][3355:3355] CHIP:EM: Handling via exchange: 7860r, Delegate: 0xaaaac00e4f08
+          [1659609799.625564][3355:3355] CHIP:IM: Received Read request
+          [1659609799.625641][3355:3355] CHIP:DMG: ReadRequestMessage =
+          [1659609799.625667][3355:3355] CHIP:DMG: {
+          [1659609799.625688][3355:3355] CHIP:DMG:         AttributePathIBs =
+          [1659609799.625714][3355:3355] CHIP:DMG:         [
+          [1659609799.625737][3355:3355] CHIP:DMG:                 AttributePathIB =
+          [1659609799.625765][3355:3355] CHIP:DMG:                 {
+          [1659609799.625797][3355:3355] CHIP:DMG:                         Endpoint = 0x0,
+          [1659609799.625828][3355:3355] CHIP:DMG:                         Cluster = 0x31,
+          [1659609799.625860][3355:3355] CHIP:DMG:                         Attribute = 0x0000_0001,
+          [1659609799.625888][3355:3355] CHIP:DMG:                 }
+          [1659609799.625916][3355:3355] CHIP:DMG:
+          [1659609799.625941][3355:3355] CHIP:DMG:         ],
+          [1659609799.625968][3355:3355] CHIP:DMG:
+          [1659609799.625994][3355:3355] CHIP:DMG:         isFabricFiltered = true,
+          [1659609799.626019][3355:3355] CHIP:DMG:         InteractionModelRevision = 1
+          [1659609799.626042][3355:3355] CHIP:DMG: },
+          [1659609799.626114][3355:3355] CHIP:DMG: IM RH moving to [GeneratingReports]
+          [1659609799.626196][3355:3355] CHIP:DMG: Building Reports for ReadHandler with LastReportGeneration = 0 DirtyGeneration = 0
       disabled: true
 
     - label: "DUT reads InterfaceEnabled attribute from the TH"
@@ -61,15 +96,29 @@
       verification: |
           ./chip-tool networkcommissioning read interface-enabled 1 0
 
-          Verify InterfaceEnabled on the TH/All-cluster-app Log:
+          Verify "InterfaceEnabled response" on the TH(All-cluster-app) Log:
 
-          [1646226615.428003][2502:2507] CHIP:DMG:
-          [1646226615.428035][2502:2507] CHIP:DMG:        SuppressResponse = true,
-          [1646226615.428064][2502:2507] CHIP:DMG:        InteractionModelRevision = 1
-          [1646226615.428094][2502:2507] CHIP:DMG: }
-          [1646226615.428270][2502:2507] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Attribute 0x0000_0004DataVersion: 3622667250
-          [1646226615.428331][2502:2507] CHIP:TOO:   InterfaceEnabled: TRUE
-          [1646226615.428415][2502:2507] CHIP:EM: Sending Standalone Ack for MessageCounter:3894401 on exchange 55691i
+          [1659609853.345019][3355:3355] CHIP:EM: Received message of type 0x2 with protocolId (0, 1) and MessageCounter:239370134 on exchange 36452r
+          [1659609853.345063][3355:3355] CHIP:EM: Handling via exchange: 36452r, Delegate: 0xaaaac00e4f08
+          [1659609853.345100][3355:3355] CHIP:IM: Received Read request
+          [1659609853.345179][3355:3355] CHIP:DMG: ReadRequestMessage =
+          [1659609853.345206][3355:3355] CHIP:DMG: {
+          [1659609853.345226][3355:3355] CHIP:DMG:         AttributePathIBs =
+          [1659609853.345252][3355:3355] CHIP:DMG:         [
+          [1659609853.345275][3355:3355] CHIP:DMG:                 AttributePathIB =
+          [1659609853.345303][3355:3355] CHIP:DMG:                 {
+          [1659609853.345332][3355:3355] CHIP:DMG:                         Endpoint = 0x0,
+          [1659609853.345372][3355:3355] CHIP:DMG:                         Cluster = 0x31,
+          [1659609853.345403][3355:3355] CHIP:DMG:                         Attribute = 0x0000_0004,
+          [1659609853.345433][3355:3355] CHIP:DMG:                 }
+          [1659609853.345461][3355:3355] CHIP:DMG:
+          [1659609853.345485][3355:3355] CHIP:DMG:         ],
+          [1659609853.345513][3355:3355] CHIP:DMG:
+          [1659609853.345539][3355:3355] CHIP:DMG:         isFabricFiltered = true,
+          [1659609853.345564][3355:3355] CHIP:DMG:         InteractionModelRevision = 1
+          [1659609853.345588][3355:3355] CHIP:DMG: },
+          [1659609853.345662][3355:3355] CHIP:DMG: IM RH moving to [GeneratingReports]
+          [1659609853.345744][3355:3355] CHIP:DMG: Building Reports for ReadHandler with LastReportGeneration = 0 DirtyGeneration = 0
       disabled: true
 
     - label: "DUT reads LastNetworkingStatus attribute from the TH"
@@ -77,25 +126,61 @@
       verification: |
           ./chip-tool networkcommissioning read last-networking-status 1 0
 
-          Verify LastNetworkingStatus on the TH/All-cluster-app Log:
+          Verify "LastNetworkingStatus response" on the TH(All-cluster-app) Log:
 
-          [1646227167.614060][2533:2538] CHIP:DMG:        SuppressResponse = true,
-          [1646227167.614095][2533:2538] CHIP:DMG:        InteractionModelRevision = 1
-          [1646227167.614126][2533:2538] CHIP:DMG: }
-          [1646227167.614299][2533:2538] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Attribute 0x0000_0005DataVersion: 3622667250
-          [1646227167.614385][2533:2538] CHIP:TOO:   LastNetworkingStatus: 0
-          [1646227167.614468][2533:2538] CHIP:EM: Sending Standalone Ack for MessageCounter:8947540 on exchange 12532i
+          [1659609891.554817][3355:3355] CHIP:EM: Received message of type 0x2 with protocolId (0, 1) and MessageCounter:196428434 on exchange 50438r
+          [1659609891.554892][3355:3355] CHIP:EM: Handling via exchange: 50438r, Delegate: 0xaaaac00e4f08
+          [1659609891.554942][3355:3355] CHIP:IM: Received Read request
+          [1659609891.555037][3355:3355] CHIP:DMG: ReadRequestMessage =
+          [1659609891.555064][3355:3355] CHIP:DMG: {
+          [1659609891.555089][3355:3355] CHIP:DMG:         AttributePathIBs =
+          [1659609891.555119][3355:3355] CHIP:DMG:         [
+          [1659609891.555147][3355:3355] CHIP:DMG:                 AttributePathIB =
+          [1659609891.555179][3355:3355] CHIP:DMG:                 {
+          [1659609891.555210][3355:3355] CHIP:DMG:                         Endpoint = 0x0,
+          [1659609891.555243][3355:3355] CHIP:DMG:                         Cluster = 0x31,
+          [1659609891.555286][3355:3355] CHIP:DMG:                         Attribute = 0x0000_0005,
+          [1659609891.555325][3355:3355] CHIP:DMG:                 }
+          [1659609891.555357][3355:3355] CHIP:DMG:
+          [1659609891.555387][3355:3355] CHIP:DMG:         ],
+          [1659609891.555418][3355:3355] CHIP:DMG:
+          [1659609891.555449][3355:3355] CHIP:DMG:         isFabricFiltered = true,
+          [1659609891.555478][3355:3355] CHIP:DMG:         InteractionModelRevision = 1
+          [1659609891.555505][3355:3355] CHIP:DMG: },
+          [1659609891.555595][3355:3355] CHIP:DMG: IM RH moving to [GeneratingReports]
+          [1659609891.555710][3355:3355] CHIP:DMG: Building Reports for ReadHandler with LastReportGeneration = 0 DirtyGeneration = 0
+          [1659609891.555746][3355:3355] CHIP:DMG: <RE:Run> Cluster 31, Attribute 5 is dirty
+          [1659609891.555770][3355:3355] CHIP:DMG: Reading attribute: Cluster=0x0000_0031 Endpoint=0 AttributeId=0x0000_0005 (expanded=0)
       disabled: true
 
     - label: "DUT reads LastNetworkID attribute from the TH"
       PICS: CNET.S.A0006
       verification: |
-          ./chip-tool networkcommissioning read last-network-id 1
+          ./chip-tool networkcommissioning read last-network-id 1 0
 
-          Verify LastNetworkID on the TH/All-cluster-app Log:
+          Verify "LastNetworkID response" on the TH(All-cluster-app) Log:
 
-          [1654076802.288579][33669:33674] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Attribute 0x0000_0006 DataVersion: 609053543
-          [1654076802.288708][33669:33674] CHIP:TOO:   LastNetworkID: 6368697035
+          [1659610135.551323][3355:3355] CHIP:EM: Received message of type 0x2 with protocolId (0, 1) and MessageCounter:254677399 on exchange 52969r
+          [1659610135.551381][3355:3355] CHIP:EM: Handling via exchange: 52969r, Delegate: 0xaaaac00e4f08
+          [1659610135.551423][3355:3355] CHIP:IM: Received Read request
+          [1659610135.551505][3355:3355] CHIP:DMG: ReadRequestMessage =
+          [1659610135.551531][3355:3355] CHIP:DMG: {
+          [1659610135.551553][3355:3355] CHIP:DMG:         AttributePathIBs =
+          [1659610135.551579][3355:3355] CHIP:DMG:         [
+          [1659610135.551603][3355:3355] CHIP:DMG:                 AttributePathIB =
+          [1659610135.551630][3355:3355] CHIP:DMG:                 {
+          [1659610135.551658][3355:3355] CHIP:DMG:                         Endpoint = 0x0,
+          [1659610135.551695][3355:3355] CHIP:DMG:                         Cluster = 0x31,
+          [1659610135.551727][3355:3355] CHIP:DMG:                         Attribute = 0x0000_0006,
+          [1659610135.551758][3355:3355] CHIP:DMG:                 }
+          [1659610135.551788][3355:3355] CHIP:DMG:
+          [1659610135.551812][3355:3355] CHIP:DMG:         ],
+          [1659610135.551840][3355:3355] CHIP:DMG:
+          [1659610135.551866][3355:3355] CHIP:DMG:         isFabricFiltered = true,
+          [1659610135.551891][3355:3355] CHIP:DMG:         InteractionModelRevision = 1
+          [1659610135.551914][3355:3355] CHIP:DMG: },
+          [1659610135.551990][3355:3355] CHIP:DMG: IM RH moving to [GeneratingReports]
+          [1659610135.552075][3355:3355] CHIP:DMG: Building Reports for ReadHandler with LastReportGeneration = 0 DirtyGeneration = 0
       disabled: true
 
     - label: "DUT reads LastConnectErrorValue attribute from the TH"
@@ -103,9 +188,29 @@
       verification: |
           ./chip-tool networkcommissioning read last-connect-error-value 1 0
 
-          Verify LastConnectErrorValue on the TH/All-cluster-app Log:
+          Verify "LastConnectErrorValue response" on the TH(All-cluster-app) Log:
 
-          [1653483224.839873][28189:28194] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Attribute 0x0000_0007 DataVersion: 3189790698
-          [1653483224.839927][28189:28194] CHIP:TOO:   LastConnectErrorValue: null
-          [1653483224.840028][28189:28194] CHIP:EM: Sending Standalone Ack for MessageCounter:289132 on exchange 60682i
+          [1659610208.727464][3355:3355] CHIP:EM: Received message of type 0x2 with protocolId (0, 1) and MessageCounter:26873449 on exchange 27253r
+          [1659610208.727511][3355:3355] CHIP:EM: Handling via exchange: 27253r, Delegate: 0xaaaac00e4f08
+          [1659610208.727551][3355:3355] CHIP:IM: Received Read request
+          [1659610208.727629][3355:3355] CHIP:DMG: ReadRequestMessage =
+          [1659610208.727655][3355:3355] CHIP:DMG: {
+          [1659610208.727678][3355:3355] CHIP:DMG:         AttributePathIBs =
+          [1659610208.727704][3355:3355] CHIP:DMG:         [
+          [1659610208.727727][3355:3355] CHIP:DMG:                 AttributePathIB =
+          [1659610208.727763][3355:3355] CHIP:DMG:                 {
+          [1659610208.727791][3355:3355] CHIP:DMG:                         Endpoint = 0x0,
+          [1659610208.727822][3355:3355] CHIP:DMG:                         Cluster = 0x31,
+          [1659610208.727854][3355:3355] CHIP:DMG:                         Attribute = 0x0000_0007,
+          [1659610208.727882][3355:3355] CHIP:DMG:                 }
+          [1659610208.727909][3355:3355] CHIP:DMG:
+          [1659610208.727934][3355:3355] CHIP:DMG:         ],
+          [1659610208.727963][3355:3355] CHIP:DMG:
+          [1659610208.727988][3355:3355] CHIP:DMG:         isFabricFiltered = true,
+          [1659610208.728014][3355:3355] CHIP:DMG:         InteractionModelRevision = 1
+          [1659610208.728036][3355:3355] CHIP:DMG: },
+          [1659610208.728112][3355:3355] CHIP:DMG: IM RH moving to [GeneratingReports]
+          [1659610208.728196][3355:3355] CHIP:DMG: Building Reports for ReadHandler with LastReportGeneration = 0 DirtyGeneration = 0
+          [1659610208.728226][3355:3355] CHIP:DMG: <RE:Run> Cluster 31, Attribute 7 is dirty
+          [1659610208.728247][3355:3355] CHIP:DMG: Reading attribute: Cluster=0x0000_0031 Endpoint=0 AttributeId=0x0000_0007 (expanded=0)
       disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_CNET_4_2.yaml b/src/app/tests/suites/certification/Test_TC_CNET_4_2.yaml
index 476ca11..1314b35 100644
--- a/src/app/tests/suites/certification/Test_TC_CNET_4_2.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CNET_4_2.yaml
@@ -41,7 +41,7 @@
       verification: |
           ./chip-tool descriptor read server-list 54 0
 
-          Verify the "ServerList" in the TH(chip-tool) Log:
+          Verify the "ServerList" in the TH(Chip-tool) Log:
 
           [1645772414.100694][3827:3832] CHIP:DMG:         SuppressResponse = true,
           [1645772414.100718][3827:3832] CHIP:DMG:         InteractionModelRevision = 1
@@ -76,7 +76,7 @@
       verification: |
           ./chip-tool networkcommissioning read feature-map 54 0
 
-          Verify the "FeatureMap: 2" in  the TH(chip-tool) Log:
+          Verify the "FeatureMap: 2" in  the TH(Chip-tool) Log:
 
           [1645772204.502545][3809:3814] CHIP:DMG:         SuppressResponse = true,
           [1645772204.502608][3809:3814] CHIP:DMG:         InteractionModelRevision = 1
@@ -91,7 +91,7 @@
       verification: |
           ./chip-tool networkcommissioning read max-networks 54 0
 
-          Verify "MaxNetworks" on the TH(chip-tool) Log:
+          Verify "MaxNetworks" on the TH(Chip-tool) Log:
 
           [1645772548.257320][3837:3842] CHIP:DMG:         SuppressResponse = true,
           [1645772548.257381][3837:3842] CHIP:DMG:         InteractionModelRevision = 1
@@ -113,7 +113,7 @@
       verification: |
           ./chip-tool networkcommissioning read networks 54 0
 
-          Verify "Networks entries and its status" on the TH(chip-tool) Log:
+          Verify "Networks entries and its status" on the TH(Chip-tool) Log:
 
           [1645772651.445097][3856:3861] CHIP:DMG:         SuppressResponse = true,
           [1645772651.445149][3856:3861] CHIP:DMG:         InteractionModelRevision = 1
@@ -132,7 +132,7 @@
       verification: |
           ./chip-tool networkcommissioning read scan-max-time-seconds 54 0
 
-          Verify  "ScanMaxTimeSeconds" on the TH(chip-tool) Log:
+          Verify  "ScanMaxTimeSeconds" on the TH(Chip-tool) Log:
 
           [1645772820.740795][3867:3872] CHIP:DMG:         SuppressResponse = true,
           [1645772820.740855][3867:3872] CHIP:DMG:         InteractionModelRevision = 1
@@ -147,7 +147,7 @@
       verification: |
           ./chip-tool networkcommissioning read connect-max-time-seconds 54 0
 
-          Verify "ConnectMaxTimeSeconds" on the TH(chip-tool) Log:
+          Verify "ConnectMaxTimeSeconds" on the TH(Chip-tool) Log:
 
           [1645772901.118880][3879:3884] CHIP:DMG:         SuppressResponse = true,
           [1645772901.119008][3879:3884] CHIP:DMG:         InteractionModelRevision = 1
@@ -162,7 +162,7 @@
       verification: |
           ./chip-tool networkcommissioning read interface-enabled 54 0
 
-          Verify "InterfaceEnabled" on the TH(chip-tool) Log:
+          Verify "InterfaceEnabled" on the TH(Chip-tool) Log:
 
           [1645772984.653996][3895:3900] CHIP:DMG:         SuppressResponse = true,
           [1645772984.654043][3895:3900] CHIP:DMG:         InteractionModelRevision = 1
@@ -178,7 +178,7 @@
           ./chip-tool networkcommissioning read last-networking-status 54 0
 
 
-          Verify "LastNetworkingStatus" on the TH(chip-tool) Log:
+          Verify "LastNetworkingStatus" on the TH(Chip-tool) Log:
 
           [1645773078.930516][3905:3910] CHIP:DMG:         SuppressResponse = true,
           [1645773078.930579][3905:3910] CHIP:DMG:         InteractionModelRevision = 1
@@ -196,7 +196,7 @@
           ./chip-tool networkcommissioning read last-network-id 54 0
 
 
-          Verify "LastNetworkID" on the TH(chip-tool) Log:
+          Verify "LastNetworkID" on the TH(Chip-tool) Log:
 
           [1645773167.178501][3913:3918] CHIP:DMG:         SuppressResponse = true,
           [1645773167.178561][3913:3918] CHIP:DMG:         InteractionModelRevision = 1
@@ -211,7 +211,7 @@
       verification: |
           ./chip-tool networkcommissioning read last-connect-error-value 54 0
 
-          Verify "LastConnectErrorValue" on the TH(chip-tool) Log:
+          Verify "LastConnectErrorValue" on the TH(Chip-tool) Log:
 
           [1645773318.752774][3938:3943] CHIP:DMG:         SuppressResponse = true,
           [1645773318.752861][3938:3943] CHIP:DMG:         InteractionModelRevision = 1
diff --git a/src/app/tests/suites/certification/Test_TC_CNET_4_20.yaml b/src/app/tests/suites/certification/Test_TC_CNET_4_20.yaml
index 779589a..c1bcc52 100644
--- a/src/app/tests/suites/certification/Test_TC_CNET_4_20.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CNET_4_20.yaml
@@ -25,156 +25,38 @@
     endpoint: 0
 
 tests:
+    - label: "Note"
+      verification: |
+          Chip-tool command used below are an example to verify the  DUT as client test cases. For certification test, we expect DUT should have a capability or way to run the equivalent command.
+      disabled: true
+
     - label: "DUT sends the ScanNetwork command to the TH"
       PICS: CNET.C.C00.Tx
       verification: |
           ./chip-tool networkcommissioning scan-networks 1 0 --Ssid null --Breadcrumb 1
 
-          Verify ScanNetworksResponse status on the TH/All-cluster-app Log:
+          Verify "ScanNetworksResponse status" on the TH(all-cluster-app) Log:
 
-          [1653475026.012811][29937:29942] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Command 0x0000_0001
-          [1653475026.012942][29937:29942] CHIP:TOO:   ScanNetworksResponse: {
-          [1653475026.012983][29937:29942] CHIP:TOO:     networkingStatus: 0
-          [1653475026.013075][29937:29942] CHIP:TOO:     wiFiScanResults: 15 entries
-          [1653475026.013143][29937:29942] CHIP:TOO:       [1]: {
-          [1653475026.013169][29937:29942] CHIP:TOO:         Security: 8
-          [1653475026.013195][29937:29942] CHIP:TOO:         Ssid: 47524C507269766174655F455854
-          [1653475026.013219][29937:29942] CHIP:TOO:         Bssid: E01CFCE4B236
-          [1653475026.013242][29937:29942] CHIP:TOO:         Channel: 11
-          [1653475026.013264][29937:29942] CHIP:TOO:         WiFiBand: 0
-          [1653475026.013286][29937:29942] CHIP:TOO:         Rssi: -9
-          [1653475026.013310][29937:29942] CHIP:TOO:        }
-          [1653475026.013344][29937:29942] CHIP:TOO:       [2]: {
-          [1653475026.013368][29937:29942] CHIP:TOO:         Security: 8
-          [1653475026.013390][29937:29942] CHIP:TOO:         Ssid: 47524C50726976617465
-          [1653475026.013414][29937:29942] CHIP:TOO:         Bssid: C006C3F95EEB
-          [1653475026.013436][29937:29942] CHIP:TOO:         Channel: 153
-          [1653475026.013458][29937:29942] CHIP:TOO:         WiFiBand: 2
-          [1653475026.013479][29937:29942] CHIP:TOO:         Rssi: -52
-          [1653475026.013500][29937:29942] CHIP:TOO:        }
-          [1653475026.013531][29937:29942] CHIP:TOO:       [3]: {
-          [1653475026.013556][29937:29942] CHIP:TOO:         Security: 8
-          [1653475026.013578][29937:29942] CHIP:TOO:         Ssid:
-          [1653475026.013599][29937:29942] CHIP:TOO:         Bssid: C606C3F95EEB
-          [1653475026.013621][29937:29942] CHIP:TOO:         Channel: 153
-          [1653475026.013642][29937:29942] CHIP:TOO:         WiFiBand: 2
-          [1653475026.013663][29937:29942] CHIP:TOO:         Rssi: -52
-          [1653475026.013684][29937:29942] CHIP:TOO:        }
-          [1653475026.013715][29937:29942] CHIP:TOO:       [4]: {
-          [1653475026.013738][29937:29942] CHIP:TOO:         Security: 12
-          [1653475026.013762][29937:29942] CHIP:TOO:         Ssid: 7A69676265652D7468726561642D3547487A
-          [1653475026.013784][29937:29942] CHIP:TOO:         Bssid: 6C198FC83ABE
-          [1653475026.013806][29937:29942] CHIP:TOO:         Channel: 44
-          [1653475026.013827][29937:29942] CHIP:TOO:         WiFiBand: 2
-          [1653475026.013848][29937:29942] CHIP:TOO:         Rssi: -55
-          [1653475026.013869][29937:29942] CHIP:TOO:        }
-          [1653475026.013900][29937:29942] CHIP:TOO:       [5]: {
-          [1653475026.013923][29937:29942] CHIP:TOO:         Security: 8
-          [1653475026.013945][29937:29942] CHIP:TOO:         Ssid: 47524C50726976617465
-          [1653475026.013967][29937:29942] CHIP:TOO:         Bssid: C006C3F95F31
-          [1653475026.013988][29937:29942] CHIP:TOO:         Channel: 48
-          [1653475026.014029][29937:29942] CHIP:TOO:         WiFiBand: 2
-          [1653475026.014051][29937:29942] CHIP:TOO:         Rssi: -65
-          [1653475026.014073][29937:29942] CHIP:TOO:        }
-          [1653475026.014106][29937:29942] CHIP:TOO:       [6]: {
-          [1653475026.014129][29937:29942] CHIP:TOO:         Security: 8
-          [1653475026.014151][29937:29942] CHIP:TOO:         Ssid:
-          [1653475026.014172][29937:29942] CHIP:TOO:         Bssid: C606C3F95F31
-          [1653475026.014194][29937:29942] CHIP:TOO:         Channel: 48
-          [1653475026.014215][29937:29942] CHIP:TOO:         WiFiBand: 2
-          [1653475026.014236][29937:29942] CHIP:TOO:         Rssi: -65
-          [1653475026.014257][29937:29942] CHIP:TOO:        }
-          [1653475026.014288][29937:29942] CHIP:TOO:       [7]: {
-          [1653475026.014311][29937:29942] CHIP:TOO:         Security: 8
-          [1653475026.014335][29937:29942] CHIP:TOO:         Ssid: 47524C50726976617465
-          [1653475026.014357][29937:29942] CHIP:TOO:         Bssid: C006C3F95ECF
-          [1653475026.014379][29937:29942] CHIP:TOO:         Channel: 153
-          [1653475026.014400][29937:29942] CHIP:TOO:         WiFiBand: 2
-          [1653475026.014421][29937:29942] CHIP:TOO:         Rssi: -68
-          [1653475026.014442][29937:29942] CHIP:TOO:        }
-          [1653475026.014473][29937:29942] CHIP:TOO:       [8]: {
-          [1653475026.014496][29937:29942] CHIP:TOO:         Security: 8
-          [1653475026.014518][29937:29942] CHIP:TOO:         Ssid: 47524C50726976617465
-          [1653475026.014540][29937:29942] CHIP:TOO:         Bssid: 1027F5374EC7
-          [1653475026.014561][29937:29942] CHIP:TOO:         Channel: 153
-          [1653475026.014582][29937:29942] CHIP:TOO:         WiFiBand: 2
-          [1653475026.014603][29937:29942] CHIP:TOO:         Rssi: -73
-          [1653475026.014624][29937:29942] CHIP:TOO:        }
-          [1653475026.014654][29937:29942] CHIP:TOO:       [9]: {
-          [1653475026.014677][29937:29942] CHIP:TOO:         Security: 8
-          [1653475026.014698][29937:29942] CHIP:TOO:         Ssid:
-          [1653475026.014720][29937:29942] CHIP:TOO:         Bssid: 1627F5374EC7
-          [1653475026.014741][29937:29942] CHIP:TOO:         Channel: 153
-          [1653475026.014762][29937:29942] CHIP:TOO:         WiFiBand: 2
-          [1653475026.014783][29937:29942] CHIP:TOO:         Rssi: -72
-          [1653475026.014804][29937:29942] CHIP:TOO:        }
-          [1653475026.014834][29937:29942] CHIP:TOO:       [10]: {
-          [1653475026.014858][29937:29942] CHIP:TOO:         Security: 12
-          [1653475026.014880][29937:29942] CHIP:TOO:         Ssid: 4368697031
-          [1653475026.014902][29937:29942] CHIP:TOO:         Bssid: 0C0E764EF1C8
-          [1653475026.014923][29937:29942] CHIP:TOO:         Channel: 11
-          [1653475026.014944][29937:29942] CHIP:TOO:         WiFiBand: 0
-          [1653475026.014965][29937:29942] CHIP:TOO:         Rssi: -38
-          [1653475026.014986][29937:29942] CHIP:TOO:        }
-          [1653475026.015017][29937:29942] CHIP:TOO:       [11]: {
-          [1653475026.015039][29937:29942] CHIP:TOO:         Security: 8
-          [1653475026.015061][29937:29942] CHIP:TOO:         Ssid: 4368697073657475703442
-          [1653475026.015083][29937:29942] CHIP:TOO:         Bssid: E01CFCEA2A46
-          [1653475026.015105][29937:29942] CHIP:TOO:         Channel: 11
-          [1653475026.015126][29937:29942] CHIP:TOO:         WiFiBand: 0
-          [1653475026.015147][29937:29942] CHIP:TOO:         Rssi: -34
-          [1653475026.015168][29937:29942] CHIP:TOO:        }
-          [1653475026.015198][29937:29942] CHIP:TOO:       [12]: {
-          [1653475026.015221][29937:29942] CHIP:TOO:         Security: 8
-          [1653475026.015244][29937:29942] CHIP:TOO:         Ssid: 47524C50726976617465
-          [1653475026.015266][29937:29942] CHIP:TOO:         Bssid: 6032B197B89E
-          [1653475026.015288][29937:29942] CHIP:TOO:         Channel: 11
-          [1653475026.015309][29937:29942] CHIP:TOO:         WiFiBand: 0
-          [1653475026.015330][29937:29942] CHIP:TOO:         Rssi: -37
-          [1653475026.015351][29937:29942] CHIP:TOO:        }
-          [1653475026.015381][29937:29942] CHIP:TOO:       [13]: {
-          [1653475026.015404][29937:29942] CHIP:TOO:         Security: 12
-          [1653475026.015427][29937:29942] CHIP:TOO:         Ssid: 7A69676265652D746872656164
-          [1653475026.015449][29937:29942] CHIP:TOO:         Bssid: 6C198FC83ABC
-          [1653475026.015470][29937:29942] CHIP:TOO:         Channel: 2
-          [1653475026.015491][29937:29942] CHIP:TOO:         WiFiBand: 0
-          [1653475026.015512][29937:29942] CHIP:TOO:         Rssi: -40
-          [1653475026.015533][29937:29942] CHIP:TOO:        }
-          [1653475026.015563][29937:29942] CHIP:TOO:       [14]: {
-          [1653475026.015587][29937:29942] CHIP:TOO:         Security: 8
-          [1653475026.015609][29937:29942] CHIP:TOO:         Ssid: 47524C50726976617465
-          [1653475026.015631][29937:29942] CHIP:TOO:         Bssid: 1027F5374EC6
-          [1653475026.015652][29937:29942] CHIP:TOO:         Channel: 6
-          [1653475026.015673][29937:29942] CHIP:TOO:         WiFiBand: 0
-          [1653475026.015694][29937:29942] CHIP:TOO:         Rssi: -53
-          [1653475026.015714][29937:29942] CHIP:TOO:        }
-          [1653475026.015745][29937:29942] CHIP:TOO:       [15]: {
-          [1653475026.015768][29937:29942] CHIP:TOO:         Security: 8
-          [1653475026.015789][29937:29942] CHIP:TOO:         Ssid: 47524C50726976617465
-          [1653475026.015811][29937:29942] CHIP:TOO:         Bssid: C006C3F95ECE
-          [1653475026.015832][29937:29942] CHIP:TOO:         Channel: 6
-          [1653475026.015853][29937:29942] CHIP:TOO:         WiFiBand: 0
-          [1653475026.015874][29937:29942] CHIP:TOO:         Rssi: -50
-          [1653475026.015896][29937:29942] CHIP:TOO:        }
-          [1653475026.015920][29937:29942] CHIP:TOO:    }
-          [1653475026.016050][29937:29942] CHIP:DMG: ICR moving to [AwaitingDe]
-          [1653475026.016114][29937:29942] CHIP:EM: Sending Standalone Ack for MessageCounter:14684023 on exchange 35456i
+          [1659616712.104331][8402:8402] CHIP:DMG: AccessControl: checking f=1 a=c s=0x000000000001B669 t= c=0x0000_0031 e=0 p=a
+          [1659616712.104371][8402:8402] CHIP:DMG: AccessControl: allowed
+          [1659616712.104399][8402:8402] CHIP:DMG: Received command for Endpoint=0 Cluster=0x0000_0031 Command=0x0000_0000
+          [1659616712.104439][8402:8402] CHIP:EM: Sending Standalone Ack for MessageCounter:229325863 on exchange 34793r
       disabled: true
 
     - label: "DUT sends the ArmFailSafe command to the TH"
       verification: |
           ./chip-tool generalcommissioning arm-fail-safe 60 0 1 0
 
-          Verify ArmFailSafeResponse on the TH/All-cluster-app Log:
+          Verify "ArmFailSafeResponse" on the TH(All-cluster-app) Log:
 
-          [1650371269.889246][42481:42486] CHIP:DMG: Received Command Response Data, Endpoint=0 Cluster=0x0000_0030 Command=0x0000_0001
-          [1650371269.889331][42481:42486] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0030 Command 0x0000_0001
-          [1650371269.889471][42481:42486] CHIP:TOO:   ArmFailSafeResponse: {
-          [1650371269.889556][42481:42486] CHIP:TOO:     errorCode: 0
-          [1650371269.889607][42481:42486] CHIP:TOO:     debugText:
-          [1650371269.889657][42481:42486] CHIP:TOO:    }
-          [1650371269.889733][42481:42486] CHIP:DMG: ICR moving to [AwaitingDe]
-          [1650371269.889821][42481:42486] CHIP:EM: Sending Standalone Ack for MessageCounter:2428907 on exchange 60841i
+          [1659616767.476289][8402:8402] CHIP:DMG:         InteractionModelRevision = 1
+          [1659616767.476315][8402:8402] CHIP:DMG: },
+          [1659616767.476389][8402:8402] CHIP:DMG: AccessControl: checking f=1 a=c s=0x000000000001B669 t= c=0x0000_0030 e=0 p=a
+          [1659616767.476429][8402:8402] CHIP:DMG: AccessControl: allowed
+          [1659616767.476461][8402:8402] CHIP:DMG: Received command for Endpoint=0 Cluster=0x0000_0030 Command=0x0000_0000
+          [1659616767.476498][8402:8402] CHIP:FS: GeneralCommissioning: Received ArmFailSafe (60s)
+          [1659616767.476543][8402:8402] CHIP:DMG: Endpoint 0, Cluster 0x0000_0030 update version to 2dd33a83
+          [1659616767.476587][8402:8402] CHIP:DMG: ICR moving to [ Preparing]
       disabled: true
 
     - label: "DUT sends the AddOrUpdateWiFiNetwork command to the TH"
@@ -186,16 +68,15 @@
 
           ./chip-tool networkcommissioning add-or-update-wi-fi-network hex:47524C50726976617465 grlprivatewifi092010 1 0
 
-          Verify NetworkConfigResponse and its arguments on the TH/All-cluster-app Log:
+          Verify "AddOrUpdateWiFiNetwork Response" on the TH(All-cluster-app) Log:
 
-          [1650371276.622265][42488:42493] CHIP:DMG: Received Command Response Data, Endpoint=0 Cluster=0x0000_0031 Command=0x0000_0005
-          [1650371276.622332][42488:42493] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Command 0x0000_0005
-          [1650371276.622445][42488:42493] CHIP:TOO:   NetworkConfigResponse: {
-          [1650371276.622515][42488:42493] CHIP:TOO:     networkingStatus: 0
-          [1650371276.622557][42488:42493] CHIP:TOO:     networkIndex: 0
-          [1650371276.622595][42488:42493] CHIP:TOO:    }
-          [1650371276.622655][42488:42493] CHIP:DMG: ICR moving to [AwaitingDe]
-          [1650371276.622728][42488:42493] CHIP:EM: Sending Standalone Ack for MessageCounter:9593846 on exchange 33754i
+          [1659616812.403722][8402:8402] CHIP:DMG:
+          [1659616812.403755][8402:8402] CHIP:DMG:         InteractionModelRevision = 1
+          [1659616812.403786][8402:8402] CHIP:DMG: },
+          [1659616812.403872][8402:8402] CHIP:DMG: AccessControl: checking f=1 a=c s=0x000000000001B669 t= c=0x0000_0031 e=0 p=a
+          [1659616812.403920][8402:8402] CHIP:DMG: AccessControl: allowed
+          [1659616812.403957][8402:8402] CHIP:DMG: Received command for Endpoint=0 Cluster=0x0000_0031 Command=0x0000_0002
+          [1659616812.404024][8402:8402] CHIP:DMG: ICR moving to [ Preparing]
       disabled: true
 
     - label: "DUT sends the ConnectNetwork command to the TH"
@@ -207,16 +88,15 @@
 
            ./chip-tool networkcommissioning connect-network hex:47524C50726976617465 1 0
 
-          Verify ConnectNetworkResponse and its arguments on the TH/All-cluster-app Log:
+          Verify "ConnectNetworkResponse" on the TH(All-cluster-app) Log:
 
-          [1650376217.124606][42876:42881] CHIP:DMG: Received Command Response Data, Endpoint=0 Cluster=0x0000_0031 Command=0x0000_0007
-          [1650376217.124707][42876:42881] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Command 0x0000_0007
-          [1650376217.124870][42876:42881] CHIP:TOO:   ConnectNetworkResponse: {
-          [1650376217.124968][42876:42881] CHIP:TOO:     networkingStatus: 0
-          [1650376217.125030][42876:42881] CHIP:TOO:     errorValue: null
-          [1650376217.125087][42876:42881] CHIP:TOO:    }
-          [1650376217.125179][42876:42881] CHIP:DMG: ICR moving to [AwaitingDe]
-          [1650376217.125282][42876:42881] CHIP:EM: Sending Standalone Ack for MessageCounter:7901929 on exchange 1050i
+          [1659616840.500694][8402:8402] CHIP:DMG:         InteractionModelRevision = 1
+          [1659616840.500733][8402:8402] CHIP:DMG: },
+          [1659616840.500833][8402:8402] CHIP:DMG: AccessControl: checking f=1 a=c s=0x000000000001B669 t= c=0x0000_0031 e=0 p=a
+          [1659616840.500889][8402:8402] CHIP:DMG: AccessControl: allowed
+          [1659616840.500932][8402:8402] CHIP:DMG: Received command for Endpoint=0 Cluster=0x0000_0031 Command=0x0000_0006
+          [1659616840.501003][8402:8402] CHIP:DMG: ICR moving to [ Preparing]
+          [1659616840.501053][8402:8402] CHIP:DMG: ICR moving to [AddingComm]
       disabled: true
 
     - label: "DUT sends the ReorderNetwork command to the TH"
@@ -228,16 +108,15 @@
 
           ./chip-tool networkcommissioning reorder-network hex:47524C50726976617465 3 1 0
 
-          Verify NetworkConfigResponse and its arguments on the TH/All-cluster-app Log:
+          Verify "ReorderNetworkResponse" on the TH(All-cluster-app) Log:
 
-          [1650381494.820649][44087:44092] CHIP:DMG: Received Command Response Data, Endpoint=0 Cluster=0x0000_0031 Command=0x0000_0005
-          [1650381494.820749][44087:44092] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Command 0x0000_0005
-          [1650381494.820860][44087:44092] CHIP:TOO:   NetworkConfigResponse: {
-          [1650381494.820940][44087:44092] CHIP:TOO:     networkingStatus: 0
-          [1650381494.820979][44087:44092] CHIP:TOO:     networkIndex: 3
-          [1650381494.821016][44087:44092] CHIP:TOO:    }
-          [1650381494.821087][44087:44092] CHIP:DMG: ICR moving to [AwaitingDe]
-          [1650381494.821174][44087:44092] CHIP:EM: Sending Standalone Ack for MessageCounter:5656346 on exchange 4849i
+          [1659617048.989226][8402:8402] CHIP:DMG:         InteractionModelRevision = 1
+          [1659617048.989284][8402:8402] CHIP:DMG: },
+          [1659617048.989447][8402:8402] CHIP:DMG: AccessControl: checking f=1 a=c s=0x000000000001B669 t= c=0x0000_0031 e=0 p=a
+          [1659617048.989554][8402:8402] CHIP:DMG: AccessControl: allowed
+          [1659617048.989622][8402:8402] CHIP:DMG: Received command for Endpoint=0 Cluster=0x0000_0031 Command=0x0000_0008
+          [1659617048.989747][8402:8402] CHIP:DMG: ICR moving to [ Preparing]
+          [1659617048.989822][8402:8402] CHIP:DMG: ICR moving to [AddingComm]
       disabled: true
 
     - label: "DUT sends the RemoveNetwork command to the TH"
@@ -249,14 +128,14 @@
 
           ./chip-tool networkcommissioning remove-network hex:47524C50726976617465 1 0
 
-          Verify NetworkConfigResponse and its arguments on the TH/All-cluster-app Log:
+          Verify "RemoveNetworkResponse" on the TH(All-cluster-app) Log:
 
-          [1650373300.704806][42697:42702] CHIP:DMG: Received Command Response Data, Endpoint=0 Cluster=0x0000_0031 Command=0x0000_0005
-          [1650373300.704864][42697:42702] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Command 0x0000_0005
-          [1650373300.704957][42697:42702] CHIP:TOO:   NetworkConfigResponse: {
-          [1650373300.705012][42697:42702] CHIP:TOO:     networkingStatus: 0
-          [1650373300.705044][42697:42702] CHIP:TOO:     networkIndex: 0
-          [1650373300.705073][42697:42702] CHIP:TOO:    }
-          [1650373300.705120][42697:42702] CHIP:DMG: ICR moving to [AwaitingDe]
-          [1650373300.705181][42697:42702] CHIP:EM: Sending Standalone Ack for MessageCounter:9924068 on exchange 3557i
+          [1659617136.123532][8402:8402] CHIP:DMG:
+          [1659617136.123555][8402:8402] CHIP:DMG:         InteractionModelRevision = 1
+          [1659617136.123578][8402:8402] CHIP:DMG: },
+          [1659617136.123645][8402:8402] CHIP:DMG: AccessControl: checking f=1 a=c s=0x000000000001B669 t= c=0x0000_0031 e=0 p=a
+          [1659617136.123682][8402:8402] CHIP:DMG: AccessControl: allowed
+          [1659617136.123709][8402:8402] CHIP:DMG: Received command for Endpoint=0 Cluster=0x0000_0031 Command=0x0000_0004
+          [1659617136.123758][8402:8402] CHIP:DMG: ICR moving to [ Preparing]
+          [1659617136.123789][8402:8402] CHIP:DMG: ICR moving to [AddingComm]
       disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_CNET_4_21.yaml b/src/app/tests/suites/certification/Test_TC_CNET_4_21.yaml
index 2b804c7..fd1cabf 100644
--- a/src/app/tests/suites/certification/Test_TC_CNET_4_21.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CNET_4_21.yaml
@@ -26,12 +26,17 @@
     endpoint: 0
 
 tests:
+    - label: "Note"
+      verification: |
+          Chip-tool command used below are an example to verify the  DUT as client test cases. For certification test, we expect DUT should have a capability or way to run the equivalent command.
+      disabled: true
+
     - label: "DUT sends the ScanNetwork command to the TH"
       PICS: CNET.C.C00.Tx
       verification: |
           ./chip-tool networkcommissioning scan-networks 54 0
 
-          Verify ScanNetworksResponse status on the TH/All-cluster-app Log:
+          Verify "ScanNetworksResponse status" on the TH(All-cluster-app) Log:
 
           D: 14385336 [SC]Allocated SecureSession (0x20003510) - waiting for Sigma1 msg
           I: 14385344 [EM]Received message of type 0x8 with protocolId (0, 1) and MessageCounter:197483196 on exchr
@@ -61,7 +66,7 @@
       verification: |
           ./chip-tool generalcommissioning arm-fail-safe 900 1 54 0
 
-          Verify ArmFailSafeResponse on the TH/All-cluster-app Log:
+          Verify "ArmFailSafeResponse" on the TH(All-cluster-app) Log:
 
           D: 14447757 [SC]Allocated SecureSession (0x200035c8) - waiting for Sigma1 msg
           I: 14447765 [EM]Received message of type 0x8 with protocolId (0, 1) and MessageCounter:60910764 on exchar
@@ -81,9 +86,13 @@
     - label: "DUT sends the AddOrUpdateThreadNetwork command to the TH"
       PICS: CNET.C.C03.Tx
       verification: |
+          ./chip-tool networkcommissioning add-or-update-thread-network-network hex:<your network id in hex> 1 0
+
+          Below is an example:
+
           ./chip-tool networkcommissioning add-or-update-thread-network hex:0e080000000000010000000300000f35060004001fffe0020811111111072222220708fd9957a92dadc7aa051000112233445966778899aabbccddeeff030f4f70656e54687265616444656d6f6a0102123404106ad73489ca556d19f8c47fd2150e58e30c0402a0fff8 54 0
 
-          Verify NetworkConfigResponse and its arguments on the TH/All-cluster-app Log:
+          Verify "NetworkConfigResponse and its arguments" on the TH(All-cluster-app) Log:
 
           D: 14484538 [SC]Allocated SecureSession (0x20003680) - waiting for Sigma1 msg
           D: 14484545 [EM]Retransmitting MessageCounter:53368100 on exchange 24385r Send Cnt 1
@@ -103,9 +112,13 @@
     - label: "DUT sends the ConnectNetwork command to the TH"
       PICS: CNET.C.C06.Tx
       verification: |
+          ./chip-tool networkcommissioning connect-network hex:<your network id in hex> 1 0
+
+          Below is an example:
+
           ./chip-tool networkcommissioning connect-network hex:1111111107222222 54 0
 
-          Verify ConnectNetworkResponse and its arguments on the TH/All-cluster-app/All-cluster-app Log:
+          Verify "ConnectNetworkResponse" on the TH(All-cluster-app) Log:
 
           D: 14513760 [IN]SecureSession[0x20003738]: Allocated Type:2 LSID:13367
           D: 14513766 [SC]Allocated SecureSession (0x20003738) - waiting for Sigma1 msg
@@ -125,9 +138,13 @@
     - label: "DUT sends the ReorderNetwork command to the TH"
       PICS: CNET.C.C08.Tx
       verification: |
-          ./chip-tool networkcommissioning reorder-network 0119100899082022 3 54 0
+          ./chip-tool networkcommissioning reorder-network hex:<your network id in hex> 1 0
 
-          Verify NetworkConfigResponse and its arguments on the TH/All-cluster-app Log:
+          Below is an example:
+
+          ./chip-tool networkcommissioning reorder-network hex:0119100899082022 3 54 0
+
+          Verify "ReorderNetworkResponse" on the TH(All-cluster-app) Log:
 
           D: 14569275 [IN]SecureSession[0x20002c70]: Allocated Type:2 LSID:13369
           D: 14569282 [SC]Allocated SecureSession (0x20002c70) - waiting for Sigma1 msg
@@ -146,9 +163,13 @@
     - label: "DUT sends the RemoveNetwork command to the TH"
       PICS: CNET.C.C04.Tx
       verification: |
-          ./chip-tool networkcommissioning  remove-network 0119100899082022 54 0
+          ./chip-tool networkcommissioning remove-network hex:<your network id in hex> 1 0
 
-          Verify NetworkConfigResponse and its arguments on the TH/All-cluster-app Log:
+          Below is an example:
+
+          ./chip-tool networkcommissioning  remove-network hex:0119100899082022 54 0
+
+          Verify "RemoveNetworkResponse" on the TH(All-cluster-app) Log:
 
           D: 14591036 [IN]SecureSession[0x20002de0]: Allocated Type:2 LSID:13370
           D: 14591042 [SC]Allocated SecureSession (0x20002de0) - waiting for Sigma1 msg
diff --git a/src/app/tests/suites/certification/Test_TC_CNET_4_22.yaml b/src/app/tests/suites/certification/Test_TC_CNET_4_22.yaml
index 2addac1..6fa3d67 100644
--- a/src/app/tests/suites/certification/Test_TC_CNET_4_22.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CNET_4_22.yaml
@@ -33,7 +33,7 @@
       verification: |
           ./chip-tool networkcommissioning scan-networks 54 0 --Breadcrumb 1
 
-          Verify  ScanNetworksResponse and its arguments on the TH/All-cluster-app Log:
+          Verify  "ScanNetworksResponse and its arguments" on the TH(Chip-tool) Log:
 
           [1658297246.000815][7679:7684] CHIP:DMG: Received Command Response Data, Endpoint=0 Cluster=0x0000_0031 Command=0x0000_0001
           [1658297246.001029][7679:7684] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Command 0x0000_0001
@@ -111,7 +111,7 @@
       verification: |
           ./chip-tool generalcommissioning read breadcrumb 54 0
 
-          Verify Breadcrumb: 2 on the TH/All-cluster-app Log:
+          Verify "Breadcrumb: 2" on the TH(Chip-tool)  Log:
 
 
           [1657688397.398564][1626:1631] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0030 Attribute 0x0000_0000 DataVersion: 829017613
@@ -127,7 +127,7 @@
       verification: |
           ./chip-tool networkcommissioning scan-networks 54 0 --Breadcrumb 3
 
-          Verify  ScanNetworksResponse and its arguments on the TH/All-cluster-app Log:
+          Verify  "ScanNetworksResponse and its arguments" on the TH(Chip-tool)  Log:
 
           [1658297312.201709][7708:7713] CHIP:DMG: },
           [1658297312.201898][7708:7713] CHIP:DMG: Received Command Response Data, Endpoint=0 Cluster=0x0000_0031 Command=0x0000_0001
@@ -155,7 +155,7 @@
       verification: |
           ./chip-tool generalcommissioning read breadcrumb 54 0
 
-          Verify Breadcrumb: 3 on the TH/All-cluster-app Log:
+          Verify "Breadcrumb: 3" on the TH(Chip-tool)  Log:
 
           [1657688489.553742][1639:1644] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0030 Attribute 0x0000_0000 DataVersion: 829017614
           [1657688489.553897][1639:1644] CHIP:TOO:   Breadcrumb: 3
diff --git a/src/app/tests/suites/certification/Test_TC_CNET_4_3.yaml b/src/app/tests/suites/certification/Test_TC_CNET_4_3.yaml
index d1cd39b..d7ba1f3 100644
--- a/src/app/tests/suites/certification/Test_TC_CNET_4_3.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CNET_4_3.yaml
@@ -42,7 +42,7 @@
       verification: |
           ./chip-tool descriptor read server-list 1 0
 
-          Verify "server list" on the TH(chip-tool) Log:
+          Verify "server list" on the TH(Chip-tool) Log:
 
           [1646226258.250313][2446:2451] CHIP:DMG:        SuppressResponse = true,
           [1646226258.250337][2446:2451] CHIP:DMG:        InteractionModelRevision = 1
@@ -81,7 +81,7 @@
       verification: |
           ./chip-tool networkcommissioning read feature-map 1 0
 
-          Verify "FeatureMap: 4 on the TH(chip-tool) Log:
+          Verify "FeatureMap: 4 on the TH(Chip-tool) Log:
 
 
           [1649309323.273092][2611:2617] CHIP:DMG: }
@@ -95,7 +95,7 @@
       verification: |
           ./chip-tool networkcommissioning read max-networks 1 0
 
-          Verify "MaxNetworks" on the TH(chip-tool) Log:
+          Verify "MaxNetworks" on the TH(Chip-tool) Log:
 
           [1646226441.815782][2475:2480] CHIP:DMG:        SuppressResponse = true,
           [1646226441.815849][2475:2480] CHIP:DMG:        InteractionModelRevision = 1
@@ -117,7 +117,7 @@
       verification: |
           ./chip-tool networkcommissioning read networks 1 0
 
-          Verify "Networks entiries and its status" on the TH(chip-tool) Log:
+          Verify "Networks entiries and its status" on the TH(Chip-tool) Log:
 
           [1654076774.294361][33659:33664] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Attribute 0x0000_0001 DataVersion: 609053543
           [1654076774.294505][33659:33664] CHIP:TOO:   Networks: 1 entries
@@ -138,14 +138,11 @@
       verification: |
           ./chip-tool networkcommissioning read last-networking-status 1 0
 
-          Verify "LastNetworkingStatus" on the TH(chip-tool) Log:
+          Verify "LastNetworkingStatus" on the TH(Chip-tool) Log:
 
-          [1646227167.614060][2533:2538] CHIP:DMG:        SuppressResponse = true,
-          [1646227167.614095][2533:2538] CHIP:DMG:        InteractionModelRevision = 1
-          [1646227167.614126][2533:2538] CHIP:DMG: }
-          [1646227167.614299][2533:2538] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Attribute 0x0000_0005DataVersion: 3622667250
-          [1646227167.614385][2533:2538] CHIP:TOO:   LastNetworkingStatus: 0
-          [1646227167.614468][2533:2538] CHIP:EM: Sending Standalone Ack for MessageCounter:8947540 on exchange 12532i
+          [1659609891.611493][3877:3882] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Attribute 0x0000_0005 DataVersion: 4108508964
+          [1659609891.611559][3877:3882] CHIP:TOO:   LastNetworkingStatus: null
+          [1659609891.611689][3877:3882] CHIP:EM: Sending Standalone Ack for MessageCounter:172102677 on exchange 50438i
       disabled: true
 
     - label:
@@ -155,10 +152,11 @@
       verification: |
           ./chip-tool networkcommissioning read last-network-id 1 0
 
-          Verify "LastNetworkID" on the TH(chip-tool) Log:
+          Verify "LastNetworkID" on the TH(Chip-tool) Log:
 
-          [1654076802.288579][33669:33674] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Attribute 0x0000_0006 DataVersion: 609053543
-          [1654076802.288708][33669:33674] CHIP:TOO:   LastNetworkID: 6368697035
+          [1659610135.589352][3895:3900] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Attribute 0x0000_0006 DataVersion: 4108508964
+          [1659610135.589410][3895:3900] CHIP:TOO:   LastNetworkID: null
+          [1659610135.589549][3895:3900] CHIP:EM: Sending Standalone Ack for MessageCounter:28696356 on exchange 52969i
       disabled: true
 
     - label: "TH reads the LastConnectErrorValue attribute from the DUT"
@@ -166,7 +164,7 @@
       verification: |
           ./chip-tool networkcommissioning read last-connect-error-value 1 0
 
-          Verify "LastConnectErrorValue" on the TH(chip-tool) Log:
+          Verify "LastConnectErrorValue" on the TH(Chip-tool) Log:
 
           [1653483224.839873][28189:28194] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Attribute 0x0000_0007 DataVersion: 3189790698
           [1653483224.839927][28189:28194] CHIP:TOO:   LastConnectErrorValue: null
diff --git a/src/app/tests/suites/certification/Test_TC_CNET_4_4.yaml b/src/app/tests/suites/certification/Test_TC_CNET_4_4.yaml
index c6c2507..8fa6d52 100644
--- a/src/app/tests/suites/certification/Test_TC_CNET_4_4.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CNET_4_4.yaml
@@ -33,7 +33,7 @@
       verification: |
           ./chip-tool networkcommissioning scan-networks 1 0 --Ssid null --Breadcrumb 1
 
-          Verify "wiFiScanResults entries and its arguments" on the TH(chip-tool) Log:
+          Verify "wiFiScanResults entries and its arguments" on the TH(Chip-tool) Log:
 
           [1653475026.012811][29937:29942] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Command 0x0000_0001
           [1653475026.012942][29937:29942] CHIP:TOO:   ScanNetworksResponse: {
@@ -170,7 +170,7 @@
       verification: |
           ./chip-tool generalcommissioning read breadcrumb 1 0
 
-          Verify  "Breadcrumb: 1" on the TH(chip-tool) Log:
+          Verify  "Breadcrumb: 1" on the TH(Chip-tool) Log:
 
           [1657190614.753193][5241:5246] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0030 Attribute 0x0000_0000 DataVersion: 2805642039
           [1657190614.753305][5241:5246] CHIP:TOO:   Breadcrumb: 1
@@ -182,11 +182,10 @@
           field  set to 2"
       PICS: CNET.S.C00.Rsp && CNET.S.C01.Tx
       verification: |
-          ./chip-tool networkcommissioning scan-network hex:<your network id in hex> 1 0
           Below is an example:
-          ./chip-tool networkcommissioning scan-networks 1 0 --Ssid 47524C50726976617465 --Breadcrumb 2
+          ./chip-tool networkcommissioning scan-networks 1 0 --Ssid hex:47524C50726976617465 --Breadcrumb 2
 
-          Verify "ScanNetworksResponse and its arguments" on the TH(chip-tool) Log:
+          Verify "ScanNetworksResponse and its arguments" on the TH(Chip-tool) Log:
 
           [1653475824.575642][30076:30081] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Command 0x0000_0001
           [1653475824.575807][30076:30081] CHIP:TOO:   ScanNetworksResponse: {
@@ -211,7 +210,7 @@
       verification: |
           ./chip-tool generalcommissioning read breadcrumb 1 0
 
-          Verify "Breadcrumb: 2" on the TH(chip-tool) Log:
+          Verify "Breadcrumb: 2" on the TH(Chip-tool) Log:
 
           [1657197542.352377][5661:5666] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0030 Attribute 0x0000_0000 DataVersion: 2805642042
           [1657197542.352450][5661:5666] CHIP:TOO:   Breadcrumb: 2
diff --git a/src/app/tests/suites/certification/Test_TC_CNET_4_5.yaml b/src/app/tests/suites/certification/Test_TC_CNET_4_5.yaml
index b6de8c3..8de8180 100644
--- a/src/app/tests/suites/certification/Test_TC_CNET_4_5.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CNET_4_5.yaml
@@ -38,7 +38,7 @@
 
           ./chip-tool networkcommissioning add-or-update-wi-fi-network hex:47524C50726976617465 grlprivatewifi092010 1 0
 
-          Verify  "FAILSAFE_REQUIRED status code"  on the TH(chip-tool) Log:
+          Verify  "FAILSAFE_REQUIRED status code"  on the TH(Chip-tool) Log:
 
           [1657619600.364023][2056:2061] CHIP:DMG: Received Command Response Status for Endpoint=0 Cluster=0x0000_0031 Command=0x0000_0003 Status=0xca
           [1657619600.364102][2056:2061] CHIP:TOO: Error: IM Error 0x000005CA: General error: 0xca (FAILSAFE_REQUIRED)
@@ -56,7 +56,7 @@
 
           ./chip-tool networkcommissioning remove-network hex:47524C50726976617465 1 0
 
-          Verify  "FAILSAFE_REQUIRED status code"  on the TH(chip-tool) Log:
+          Verify  "FAILSAFE_REQUIRED status code"  on the TH(Chip-tool) Log:
 
           [1657619600.364023][2056:2061] CHIP:DMG: Received Command Response Status for Endpoint=0 Cluster=0x0000_0031 Command=0x0000_0003 Status=0xca
           [1657619600.364102][2056:2061] CHIP:TOO: Error: IM Error 0x000005CA: General error: 0xca (FAILSAFE_REQUIRED)
@@ -74,7 +74,7 @@
 
           ./chip-tool networkcommissioning connect-network hex:47524C50726976617465 1 0
 
-          Verify  "FAILSAFE_REQUIRED status code"  on the TH(chip-tool) Log:
+          Verify  "FAILSAFE_REQUIRED status code"  on the TH(Chip-tool) Log:
 
           [1657619600.364023][2056:2061] CHIP:DMG: Received Command Response Status for Endpoint=0 Cluster=0x0000_0031 Command=0x0000_0003 Status=0xca
           [1657619600.364102][2056:2061] CHIP:TOO: Error: IM Error 0x000005CA: General error: 0xca (FAILSAFE_REQUIRED)
diff --git a/src/app/tests/suites/certification/Test_TC_CNET_4_6.yaml b/src/app/tests/suites/certification/Test_TC_CNET_4_6.yaml
index 0880d11..0f38ac3 100644
--- a/src/app/tests/suites/certification/Test_TC_CNET_4_6.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CNET_4_6.yaml
@@ -36,9 +36,9 @@
 
           Below is an example:
 
-          ./chip-tool networkcommissioning add-or-update-thread-network 1232034768527434274  51 0
+          ./chip-tool networkcommissioning add-or-update-thread-network hex:1232034768527434274  51 0
 
-          Verify  "FAILSAFE_REQUIRED status code"  on the TH(chip-tool) Log:
+          Verify  "FAILSAFE_REQUIRED status code"  on the TH(Chip-tool) Log:
 
           [1657619600.364023][2056:2061] CHIP:DMG: Received Command Response Status for Endpoint=0 Cluster=0x0000_0031 Command=0x0000_0003 Status=0xca
           [1657619600.364102][2056:2061] CHIP:TOO: Error: IM Error 0x000005CA: General error: 0xca (FAILSAFE_REQUIRED)
@@ -54,9 +54,9 @@
 
           Below is an example:
 
-          /chip-tool networkcommissioning remove-network 1232034768527434274 51 0
+          /chip-tool networkcommissioning remove-network hex:1232034768527434274 51 0
 
-          Verify  "FAILSAFE_REQUIRED status code"  on the TH(chip-tool) Log:
+          Verify  "FAILSAFE_REQUIRED status code"  on the TH(Chip-tool) Log:
 
           [1657619600.364023][2056:2061] CHIP:DMG: Received Command Response Status for Endpoint=0 Cluster=0x0000_0031 Command=0x0000_0003 Status=0xca
           [1657619600.364102][2056:2061] CHIP:TOO: Error: IM Error 0x000005CA: General error: 0xca (FAILSAFE_REQUIRED)
@@ -72,7 +72,7 @@
 
           Below is an example:
 
-          ./chip-tool networkcommissioning connect-network 1232034768527434274 51 0
+          ./chip-tool networkcommissioning connect-network hex:1232034768527434274 51 0
 
           Verify  "FAILSAFE_REQUIRED status code"  on the TH(chip-tool) Log:
 
diff --git a/src/app/tests/suites/certification/Test_TC_CNET_4_9.yaml b/src/app/tests/suites/certification/Test_TC_CNET_4_9.yaml
index edb2890..8bbc9c3 100644
--- a/src/app/tests/suites/certification/Test_TC_CNET_4_9.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CNET_4_9.yaml
@@ -32,7 +32,7 @@
       verification: |
           ./chip-tool generalcommissioning arm-fail-safe 900 1 1 0
 
-          Verify "ArmFailSafeResponse" on the TH(chip-tool) Log:
+          Verify "ArmFailSafeResponse" on the TH(Chip-tool) Log:
 
           [1653478311.640549][30368:30373] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0030 Command 0x0000_0001
           [1653478311.640646][30368:30373] CHIP:TOO:   ArmFailSafeResponse: {
@@ -48,7 +48,7 @@
       verification: |
           ./chip-tool networkcommissioning read networks 1 0
 
-          Verify "Networks entiries and its status" on the TH(chip-tool) Log:
+          Verify "Networks entiries and its status" on the TH(Chip-tool) Log:
 
           [1654250379.881780][5309:5314] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Attribute 0x0000_0001 DataVersion: 3741733376
           [1654250379.881974][5309:5314] CHIP:TOO:   Networks: 1 entries
@@ -65,7 +65,7 @@
       verification: |
           ./chip-tool networkcommissioning read last-network-id 1 0
 
-          Verify "LastNetworkID" on the TH(chip-tool) Log:
+          Verify "LastNetworkID" on the TH(Chip-tool) Log:
 
           [1657198553.376268][5799:5804] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Attribute 0x0000_0006 DataVersion: 2494552649
           [1657198553.376351][5799:5804] CHIP:TOO:   LastNetworkID: 47524C50726976617465
@@ -82,7 +82,7 @@
 
           ./chip-tool networkcommissioning remove-network hex:47524C50726976617465 1 0
 
-          Verify "NetworkConfigResponse and its arguments" on the TH(chip-tool) Log:
+          Verify "NetworkConfigResponse and its arguments" on the TH(Chip-tool) Log:
 
 
           [1653478327.351092][30388:30393] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Command 0x0000_0005
@@ -99,7 +99,7 @@
       verification: |
           ./chip-tool networkcommissioning read networks 1 0
 
-          Verify "Networks entiries and its status" on the TH(chip-tool) Log:
+          Verify "Networks entiries and its status" on the TH(Chip-tool) Log:
 
           [1653478331.979300][30395:30400] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Attribute 0x0000_0001 DataVersion: 1600858167
           [1653478331.979380][30395:30400] CHIP:TOO:   Networks: 0 entries
@@ -111,7 +111,7 @@
       verification: |
           ./chip-tool networkcommissioning read last-networking-status 1 0
 
-          Verify "LastNetworkingStatus" on the TH(chip-tool) Log:
+          Verify "LastNetworkingStatus" on the TH(Chip-tool) Log:
 
           [1653478850.425096][30420:30425] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Attribute 0x0000_0005 DataVersion: 1600858167
           [1653478850.425170][30420:30425] CHIP:TOO:   LastNetworkingStatus: 0
@@ -123,7 +123,7 @@
       verification: |
           ./chip-tool networkcommissioning read last-network-id 1 0
 
-          Verify "LastNetworkID" on the TH(chip-tool) Log:
+          Verify "LastNetworkID" on the TH(Chip-tool) Log:
 
           [1657197861.497831][5737:5742] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Attribute 0x0000_0006 DataVersion: 2494552649
           [1657197861.497897][5737:5742] CHIP:TOO:   LastNetworkID: 47524C50726976617465
@@ -136,7 +136,7 @@
       verification: |
           ./chip-tool generalcommissioning read breadcrumb 1 0
 
-          Verify "Breadcrumb: 1" on the TH(chip-tool) Log:
+          Verify "Breadcrumb: 1" on the TH(Chip-tool) Log:
 
           [1657197903.686316][5745:5750] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0030 Attribute 0x0000_0000 DataVersion: 2805642043
           [1657197903.686428][5745:5750] CHIP:TOO:   Breadcrumb: 1
@@ -154,7 +154,7 @@
 
           ./chip-tool networkcommissioning connect-network hex:47524C50726976617465 1 0 --Breadcrumb 2
 
-          Verify "ConnectNetworkResponse and its arguments" on the TH(chip-tool) Log:
+          Verify "ConnectNetworkResponse and its arguments" on the TH(Chip-tool) Log:
 
           [1657288261.892249][2347:2352] CHIP:DMG: Received Command Response Data, Endpoint=0 Cluster=0x0000_0031 Command=0x0000_0007
           [1657288261.892304][2347:2352] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Command 0x0000_0007
@@ -171,7 +171,7 @@
       verification: |
           ./chip-tool generalcommissioning read breadcrumb 1 0
 
-          Verify "Breadcrumb: 1" on the TH(chip-tool) Log:
+          Verify "Breadcrumb: 1" on the TH(Chip-tool) Log:
 
           [1657288331.671111][2360:2365] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0030 Attribute 0x0000_0000 DataVersion: 3470734109
           [1657288331.671207][2360:2365] CHIP:TOO:   Breadcrumb: 1
@@ -183,7 +183,7 @@
       verification: |
           ./chip-tool generalcommissioning arm-fail-safe 0 0 1 0
 
-          Verify "ArmFailSafeResponse" on the TH(chip-tool) Log:
+          Verify "ArmFailSafeResponse" on the TH(Chip-tool) Log:
 
           [1657288382.006035][2369:2374] CHIP:DMG: Received Command Response Data, Endpoint=0 Cluster=0x0000_0030 Command=0x0000_0001
           [1657288382.006094][2369:2374] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0030 Command 0x0000_0001
@@ -198,7 +198,7 @@
       verification: |
           ./chip-tool networkcommissioning read networks 1 0
 
-          Verify "Networks entiries and its status" on the TH(chip-tool) Log:
+          Verify "Networks entiries and its status" on the TH(Chip-tool) Log:
 
           [1657288403.226567][2376:2381] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Attribute 0x0000_0001 DataVersion: 1420716065
           [1657288403.226663][2376:2381] CHIP:TOO:   Networks: 0 entries
@@ -210,7 +210,7 @@
       verification: |
           ./chip-tool generalcommissioning arm-fail-safe 90 1 1 0
 
-          Verify "ArmFailSafeResponse" on the TH(chip-tool) Log:
+          Verify "ArmFailSafeResponse" on the TH(Chip-tool) Log:
 
           [1657288428.409103][2382:2388] CHIP:DMG: Received Command Response Data, Endpoint=0 Cluster=0x0000_0030 Command=0x0000_0001
           [1657288428.409191][2382:2388] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0030 Command 0x0000_0001
@@ -230,7 +230,7 @@
 
           ./chip-tool networkcommissioning remove-network hex:47524C50726976617465 1  0 --Breadcrumb 1
 
-          Verify "NetworkConfigResponse and its arguments" on the TH(chip-tool) Log:
+          Verify "NetworkConfigResponse and its arguments" on the TH(Chip-tool) Log:
 
           [1657288459.534546][2390:2395] CHIP:DMG: Received Command Response Data, Endpoint=0 Cluster=0x0000_0031 Command=0x0000_0005
           [1657288459.534622][2390:2395] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Command 0x0000_0005
@@ -244,7 +244,7 @@
       verification: |
           ./chip-tool generalcommissioning commissioning-complete 1 0
 
-          Verify "CommissioningCompleteResponse and its arguments" on the TH(chip-tool) Log:
+          Verify "CommissioningCompleteResponse and its arguments" on the TH(Chip-tool) Log:
 
           [1657288504.905001][2397:2402] CHIP:DMG: Received Command Response Data, Endpoint=0 Cluster=0x0000_0030 Command=0x0000_0005
           [1657288504.905050][2397:2402] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0030 Command 0x0000_0005
@@ -262,7 +262,7 @@
       verification: |
           ./chip-tool generalcommissioning arm-fail-safe 0 0 1 0
 
-          Verify "ArmFailSafeResponse" on the TH(chip-tool) Log:
+          Verify "ArmFailSafeResponse" on the TH(Chip-tool) Log:
 
           [1657288529.987350][2404:2409] CHIP:DMG: Received Command Response Data, Endpoint=0 Cluster=0x0000_0030 Command=0x0000_0001
           [1657288529.987514][2404:2409] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0030 Command 0x0000_0001
@@ -277,7 +277,7 @@
       verification: |
           ./chip-tool networkcommissioning read networks 1 0
 
-          Verify "Networks entiries and its status" on the TH(chip-tool) Log:
+          Verify "Networks entiries and its status" on the TH(Chip-tool) Log:
 
           [1657288549.446752][2412:2417] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Attribute 0x0000_0001 DataVersion: 1420716065
           [1657288549.446852][2412:2417] CHIP:TOO:   Networks: 0 entries
diff --git a/src/app/tests/suites/certification/Test_TC_DA_1_1.yaml b/src/app/tests/suites/certification/Test_TC_DA_1_1.yaml
index 691c0ae..17004ee 100644
--- a/src/app/tests/suites/certification/Test_TC_DA_1_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DA_1_1.yaml
@@ -44,7 +44,7 @@
       verification: |
           ./chip-tool operationalcredentials read fabrics 1 0
 
-          Verify that there is a single entry in the list
+          Verify that there is a single entry in the list TH (chip-tool) Log
 
           [1655471672.386120][13377:13382] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_003E Attribute 0x0000_0001 DataVersion: 2667297992
           [1655471672.386213][13377:13382] CHIP:TOO:   Fabrics: 1 entries
@@ -64,7 +64,7 @@
       verification: |
           ./chip-tool operationalcredentials read nocs 1 0
 
-          Verify there is single entry and Fabric ID matches FabricID of TH1
+          Verify there is single entry and Fabric ID matches FabricID of TH1 on TH(chip-tool) log:
 
           [1658392350.745452][3254:3259] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_003E Attribute 0x0000_0000 DataVersion: 1660110003
           [1658392350.748972][3254:3259] CHIP:TOO:   NOCs: 1 entries
@@ -93,7 +93,7 @@
           To commission DUT to TH2 follow below procedure
           1../chip-tool  pairing open-commissioning-window 1 1 400 2000 3840  on TH
 
-          Verify in TH Log:
+          Verify manual parin code on TH1 (chip-tool) Log:
           CHIP:IN: Sending encrypted msg 0xaaaad3464d10 with MessageCounter:0 to 0x0000000000000001 at monotonic time: 5805157 msec
           [1635691999.946536][3822:3827] CHIP:DMG: ICR moving to [CommandSen]
           [1635691999.946586][3822:3827] CHIP:CTL: Manual pairing code: [35407541839]
@@ -104,9 +104,9 @@
           [1635691999.946983][3822:3827] CHIP:EM: Flushed pending ack for MessageCounter:3234931243 on exchange 35324i
 
 
-          2. manualcode will be provided by TH when we pass above command pass manualcode in TH2 to commission by using "./chip-tool pairing code 2 36199720672" considering 36199720672 as manualcode generated in TH
+          2. Verify TH2 is commissioned  by using "./chip-tool pairing code 2 36199720672" considering 36199720672 as manualcode generated in TH1
 
-          Verify whether you got below message in the log of TH
+          Verify whether you got below message on TH2 (chip-tool) log
           Device commissioning completed with success
       disabled: true
 
@@ -116,7 +116,7 @@
       verification: |
           ./chip-tool operationalcredentials read fabrics 2 0
 
-          Verify there is single entry and FabricID matches the FabricID of TH2
+          Verify there is single entry and FabricID matches the FabricID of TH2 on TH2 (chip-tool) log
 
           [1655471672.386120][13377:13382] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_003E Attribute 0x0000_0001 DataVersion: 2667297992
           [1655471672.386213][13377:13382] CHIP:TOO:   Fabrics: 1 entries
@@ -133,9 +133,9 @@
     - label:
           "TH2 does a non-fabric-filtered read of NOCs attribute list from DUT"
       verification: |
-          "./chip-tool operationalcredentials read nocs 2 0
+          ./chip-tool operationalcredentials read nocs 2 0
 
-          Verify there is single entry and verify the NOC entry of TH1 and NOC entry of TH2 are different
+          Verify there is single entry on TH2 (chip-tool) log
 
           [1655471146.098327][13302:13307] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_003E Attribute 0x0000_0000 DataVersion: 2667297991
           [1655471146.098416][13302:13307] CHIP:TOO:   NOCs: 1 entries
@@ -146,4 +146,6 @@
           [1655471146.098660][13302:13307] CHIP:TOO:      }
 
           "
+
+          Verify the NOC entry of TH1 and NOC entry of TH2 are different in TH
       disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_DA_1_2.yaml b/src/app/tests/suites/certification/Test_TC_DA_1_2.yaml
index b7bc74d..bec42cb 100644
--- a/src/app/tests/suites/certification/Test_TC_DA_1_2.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DA_1_2.yaml
@@ -39,9 +39,9 @@
           "TH1 sends AttestationRequest Command with a random 32 bytes
           AttestationNonce` to the DUT."
       verification: |
-          ./chip-tool operationalcredentials attestation-request hex:hex:97B823C0207728BEC509CFE4D413C95AA693140D1F5D60215913ABB1F220E631 1 0
+          ./chip-tool operationalcredentials attestation-request hex:97B823C0207728BEC509CFE4D413C95AA693140D1F5D60215913ABB1F220E631 1 0 --trace_decode 1
 
-          Verify  attestation response in TH Log:
+          Verify  attestation response in TH(chip-tool) Log:
 
           [1657814395.876850][2481:2486] CHIP:DMG: Received Command Response Data, Endpoint=0 Cluster=0x0000_003E Command=0x0000_0001
           [1657814395.876900][2481:2486] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_003E Command 0x0000_0001
@@ -56,16 +56,132 @@
           "Verify that the DUT generates the Attestation Information and that it
           is sent to TH1 using AttestationResponse Command"
       verification: |
-          Verify DUT generates Attestation Information
+          Verify the attestation information field on TH(chip-tool) Log generated from the previous step
+
+          [1655374218.453303][35023:35028] CHIP:DMG: Attestation Elements (585 bytes) =
+          [1655374218.453366][35023:35028] CHIP:DMG: {
+          [1655374218.453431][35023:35028] CHIP:DMG:     Certification Declaration =
+          [1655374218.453483][35023:35028] CHIP:DMG:     {
+          [1655374218.455342][35023:35028] CHIP:DMG:         Format Version = 1
+          [1655374218.455398][35023:35028] CHIP:DMG:         Vendor Id = 65521
+          [1655374218.455438][35023:35028] CHIP:DMG:         Product Ids =
+          [1655374218.455474][35023:35028] CHIP:DMG:         {
+          [1655374218.455512][35023:35028] CHIP:DMG:             Product Id = 32768
+          [1655374218.455552][35023:35028] CHIP:DMG:             Product Id = 32769
+          [1655374218.455590][35023:35028] CHIP:DMG:             Product Id = 32770
+          [1655374218.455628][35023:35028] CHIP:DMG:             Product Id = 32771
+          [1655374218.455666][35023:35028] CHIP:DMG:             Product Id = 32772
+          [1655374218.455704][35023:35028] CHIP:DMG:             Product Id = 32773
+          [1655374218.455742][35023:35028] CHIP:DMG:             Product Id = 32774
+          [1655374218.455780][35023:35028] CHIP:DMG:             Product Id = 32775
+          [1655374218.455818][35023:35028] CHIP:DMG:             Product Id = 32776
+          [1655374218.455855][35023:35028] CHIP:DMG:             Product Id = 32777
+          [1655374218.455893][35023:35028] CHIP:DMG:             Product Id = 32778
+          [1655374218.455931][35023:35028] CHIP:DMG:             Product Id = 32779
+          [1655374218.455969][35023:35028] CHIP:DMG:             Product Id = 32780
+          [1655374218.456007][35023:35028] CHIP:DMG:             Product Id = 32781
+          [1655374218.456045][35023:35028] CHIP:DMG:             Product Id = 32782
+          [1655374218.456082][35023:35028] CHIP:DMG:             Product Id = 32783
+          [1655374218.456120][35023:35028] CHIP:DMG:             Product Id = 32784
+          [1655374218.456158][35023:35028] CHIP:DMG:             Product Id = 32785
+          [1655374218.456196][35023:35028] CHIP:DMG:             Product Id = 32786
+          [1655374218.456234][35023:35028] CHIP:DMG:             Product Id = 32787
+          [1655374218.456271][35023:35028] CHIP:DMG:             Product Id = 32788
+          [1655374218.456309][35023:35028] CHIP:DMG:             Product Id = 32789
+          [1655374218.456347][35023:35028] CHIP:DMG:             Product Id = 32790
+          [1655374218.456385][35023:35028] CHIP:DMG:             Product Id = 32791
+          [1655374218.456423][35023:35028] CHIP:DMG:             Product Id = 32792
+          [1655374218.456461][35023:35028] CHIP:DMG:             Product Id = 32793
+          [1655374218.456498][35023:35028] CHIP:DMG:             Product Id = 32794
+          [1655374218.456536][35023:35028] CHIP:DMG:             Product Id = 32795
+          [1655374218.456573][35023:35028] CHIP:DMG:             Product Id = 32796
+          [1655374218.456611][35023:35028] CHIP:DMG:             Product Id = 32797
+          [1655374218.456649][35023:35028] CHIP:DMG:             Product Id = 32798
+          [1655374218.456687][35023:35028] CHIP:DMG:             Product Id = 32799
+          [1655374218.456724][35023:35028] CHIP:DMG:             Product Id = 32800
+          [1655374218.456761][35023:35028] CHIP:DMG:             Product Id = 32801
+          [1655374218.456799][35023:35028] CHIP:DMG:             Product Id = 32802
+          [1655374218.456836][35023:35028] CHIP:DMG:             Product Id = 32803
+          [1655374218.456874][35023:35028] CHIP:DMG:             Product Id = 32804
+          [1655374218.456912][35023:35028] CHIP:DMG:             Product Id = 32805
+          [1655374218.456949][35023:35028] CHIP:DMG:             Product Id = 32806
+          [1655374218.456987][35023:35028] CHIP:DMG:             Product Id = 32807
+          [1655374218.457024][35023:35028] CHIP:DMG:             Product Id = 32808
+          [1655374218.457061][35023:35028] CHIP:DMG:             Product Id = 32809
+          [1655374218.457099][35023:35028] CHIP:DMG:             Product Id = 32810
+          [1655374218.457138][35023:35028] CHIP:DMG:             Product Id = 32811
+          [1655374218.457175][35023:35028] CHIP:DMG:             Product Id = 32812
+          [1655374218.457212][35023:35028] CHIP:DMG:             Product Id = 32813
+          [1655374218.457250][35023:35028] CHIP:DMG:             Product Id = 32814
+          [1655374218.457288][35023:35028] CHIP:DMG:             Product Id = 32815
+          [1655374218.457326][35023:35028] CHIP:DMG:             Product Id = 32816
+          [1655374218.457363][35023:35028] CHIP:DMG:             Product Id = 32817
+          [1655374218.457401][35023:35028] CHIP:DMG:             Product Id = 32818
+          [1655374218.457439][35023:35028] CHIP:DMG:             Product Id = 32819
+          [1655374218.457476][35023:35028] CHIP:DMG:             Product Id = 32820
+          [1655374218.457514][35023:35028] CHIP:DMG:             Product Id = 32821
+          [1655374218.457552][35023:35028] CHIP:DMG:             Product Id = 32822
+          [1655374218.457590][35023:35028] CHIP:DMG:             Product Id = 32823
+          [1655374218.457627][35023:35028] CHIP:DMG:             Product Id = 32824
+          [1655374218.457665][35023:35028] CHIP:DMG:             Product Id = 32825
+          [1655374218.457702][35023:35028] CHIP:DMG:             Product Id = 32826
+          [1655374218.457740][35023:35028] CHIP:DMG:             Product Id = 32827
+          [1655374218.457777][35023:35028] CHIP:DMG:             Product Id = 32828
+          [1655374218.457833][35023:35028] CHIP:DMG:             Product Id = 32829
+          [1655374218.457874][35023:35028] CHIP:DMG:             Product Id = 32830
+          [1655374218.457912][35023:35028] CHIP:DMG:             Product Id = 32831
+          [1655374218.457950][35023:35028] CHIP:DMG:             Product Id = 32832
+          [1655374218.457987][35023:35028] CHIP:DMG:             Product Id = 32833
+          [1655374218.458026][35023:35028] CHIP:DMG:             Product Id = 32834
+          [1655374218.458063][35023:35028] CHIP:DMG:             Product Id = 32835
+          [1655374218.458101][35023:35028] CHIP:DMG:             Product Id = 32836
+          [1655374218.458139][35023:35028] CHIP:DMG:             Product Id = 32837
+          [1655374218.458177][35023:35028] CHIP:DMG:             Product Id = 32838
+          [1655374218.458215][35023:35028] CHIP:DMG:             Product Id = 32839
+          [1655374218.458253][35023:35028] CHIP:DMG:             Product Id = 32840
+          [1655374218.458291][35023:35028] CHIP:DMG:             Product Id = 32841
+          [1655374218.458328][35023:35028] CHIP:DMG:             Product Id = 32842
+          [1655374218.458366][35023:35028] CHIP:DMG:             Product Id = 32843
+          [1655374218.458404][35023:35028] CHIP:DMG:             Product Id = 32844
+          [1655374218.458441][35023:35028] CHIP:DMG:             Product Id = 32845
+          [1655374218.458480][35023:35028] CHIP:DMG:             Product Id = 32846
+          [1655374218.458517][35023:35028] CHIP:DMG:             Product Id = 32847
+          [1655374218.458555][35023:35028] CHIP:DMG:             Product Id = 32848
+          [1655374218.458592][35023:35028] CHIP:DMG:             Product Id = 32849
+          [1655374218.458630][35023:35028] CHIP:DMG:             Product Id = 32850
+          [1655374218.458667][35023:35028] CHIP:DMG:             Product Id = 32851
+          [1655374218.458706][35023:35028] CHIP:DMG:             Product Id = 32852
+          [1655374218.458743][35023:35028] CHIP:DMG:             Product Id = 32853
+          [1655374218.458781][35023:35028] CHIP:DMG:             Product Id = 32854
+          [1655374218.458818][35023:35028] CHIP:DMG:             Product Id = 32855
+          [1655374218.458856][35023:35028] CHIP:DMG:             Product Id = 32856
+          [1655374218.458893][35023:35028] CHIP:DMG:             Product Id = 32857
+          [1655374218.458932][35023:35028] CHIP:DMG:             Product Id = 32858
+          [1655374218.458969][35023:35028] CHIP:DMG:             Product Id = 32859
+          [1655374218.459007][35023:35028] CHIP:DMG:             Product Id = 32860
+          [1655374218.459045][35023:35028] CHIP:DMG:             Product Id = 32861
+          [1655374218.459082][35023:35028] CHIP:DMG:             Product Id = 32862
+          [1655374218.459120][35023:35028] CHIP:DMG:             Product Id = 32863
+          [1655374218.459159][35023:35028] CHIP:DMG:             Product Id = 32864
+          [1655374218.459196][35023:35028] CHIP:DMG:             Product Id = 32865
+          [1655374218.459234][35023:35028] CHIP:DMG:             Product Id = 32866
+          [1655374218.459271][35023:35028] CHIP:DMG:             Product Id = 32867
+          [1655374218.459309][35023:35028] CHIP:DMG:         }
+          [1655374218.459347][35023:35028] CHIP:DMG:         Device Type Id = 22
+          [1655374218.459390][35023:35028] CHIP:DMG:         Certificate Id (19) = ZIG20142ZB330003-24
+          [1655374218.459430][35023:35028] CHIP:DMG:         Security Level = 0
+          [1655374218.459470][35023:35028] CHIP:DMG:         Security Information = 0
+          [1655374218.459508][35023:35028] CHIP:DMG:         Version Number = 9876
+          [1655374218.459546][35023:35028] CHIP:DMG:         Certification Type = 0
       disabled: true
 
     - label:
           "TH1 sends CertificateChainRequest Command with CertificateType field
           set to DACCertificate (1) to DUT to obtain DAC"
       verification: |
-          ./chip-tool operationalcredentials certificate-chain-request 1 1 0
+          ./chip-tool operationalcredentials certificate-chain-request 1 1 0  --trace_decode 1
 
-          Verify certificate chain response in TH Log:
+          Verify certificate chain response in TH (chip-tool) Log:
 
           CertificateChainResponse: {
           [1657814457.685538][2491:2496] CHIP:TOO:     certificate: 308201E73082018EA003020102020869CDF10DE9E54ED1300A06082A8648CE3D040302303D3125302306035504030C1C4D6174746572204465762050414920307846464631206E6F2050494431143012060A2B0601040182A27C02010C04464646313020170D3232303230353030303030305A180F39393939313233313233353935395A30533125302306035504030C1C4D61747465722044657620444143203078464646312F30783830303131143012060A2B0601040182A27C02010C044646463131143012060A2B0601040182A27C02020C04383030313059301306072A8648CE3D020106082A8648CE3D03010703420004463AC69342910A0E5588FC6FF56BB63E62ECCECB148F7D4EB03EE552601415767D16A5C663F793E49123260B8297A7CD7E7CFC7B316B39D98E90D29377738E82A360305E300C0603551D130101FF04023000300E0603551D0F0101FF040403020780301D0603551D0E0416041488DDE7B300382932CFF734C04624810F44168A6F301F0603551D2304183016801463540E47F64B1C38D13884A462D16C195D8FFB3C300A06082A8648CE3D040302
@@ -84,9 +200,9 @@
           "TH1 sends CertificateChainRequest Command with CertificateType field
           set to PAICertificate (2) to DUT to obtain DAC"
       verification: |
-          ./chip-tool operationalcredentials certificate-chain-request 2 1 0
+          ./chip-tool operationalcredentials certificate-chain-request 2 1 0  --trace_decode 1
 
-          Verify CertificateChainResponse and the size is 600 bytes in TH Log:
+          Verify CertificateChainResponse and the size is 600 bytes in TH (chip-tool) Log:
 
           [1657814533.325960][2501:2506] CHIP:DMG: Received Command Response Data, Endpoint=0 Cluster=0x0000_003E Command=0x0000_0003
           [1657814533.326064][2501:2506] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_003E Command 0x0000_0003
@@ -107,9 +223,9 @@
           "TH1 Reads the VendorID attribute of the Basic Information cluster and
           saves it as basic_info_vendor_id"
       verification: |
-          ./chip-tool basic read vendor-id 1 0
+          ./chip-tool basic read vendor-id 1 0  --trace_decode 1
 
-          Verify the vendorId in TH Log:
+          Verify the vendorId in TH (chip-tool) Log
 
           [1654068802.514300][10990:10995] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0028 Attribute 0x0000_0002 DataVersion: 2079473956
           [1654068802.514357][10990:10995] CHIP:TOO:   VendorID: 65521
@@ -120,9 +236,9 @@
           "TH1 Reads the ProductID attribute of the Basic Information cluster
           and saves it as basic_info_product_id"
       verification: |
-          ./chip-tool basic read product-id 1 0
+          ./chip-tool basic read product-id 1 0  --trace_decode 1
 
-          Verify  ProductId in TH Log:
+          Verify  ProductId in TH (chip-tool) Log
 
           [1654068987.385768][11050:11055] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0028 Attribute 0x0000_0004 DataVersion: 2079473956
           [1654068987.385820][11050:11055] CHIP:TOO:   ProductID: 32769
@@ -137,9 +253,10 @@
            echo hex:$(hexdump -vn32 -e"4/4 "%08X" " /dev/urandom)
 
 
-          ./chip-tool operationalcredentials attestation-request hex:3577CA6EFFFC560E287604663AE5BE2F11D1B1CF99BE326AF5B3B114A2E91395 1 0
+          ./chip-tool operationalcredentials attestation-request hex:3577CA6EFFFC560E287604663AE5BE2F11D1B1CF99BE326AF5B3B114A2E91395 1 0 --trace_decode 1
 
-          Verify attestation response in TH Log
+
+          Verify attestation response in TH (chip-tool) Log
 
           [1658223434.718871][5712:5717] CHIP:DMG: Received Command Response Data, Endpoint=0 Cluster=0x0000_003E Command=0x0000_0001
           [1658223434.718921][5712:5717] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_003E Command 0x0000_0001
@@ -150,11 +267,9 @@
           [1658223434.719135][5712:5717] CHIP:TOO:    }
       disabled: true
 
-    - label:
-          "Verify that the DUT generated the AttestationResponse has the
-          following fields:AttestationElements ,AttestationSignature"
+    - label: ""
       verification: |
-          Verify that the DUT generated the AttestationResponse has the following fields:
+          Verify that the DUT generated the AttestationResponse has the following fields in the TH (Chip-Tool ) log generated from the previous step command
           1. AttestationElements
           2. AttestationSignature
 
@@ -166,7 +281,8 @@
 
     - label: "Read the attestation_elements_message structure fields"
       verification: |
-          Verify the attestation elements field
+          Verify the attestation elements field on TH(chip-tool) Log generated  from  step 5
+          1. AttestationElements
 
           [1655374218.453303][35023:35028] CHIP:DMG: Attestation Elements (585 bytes) =
           [1655374218.453366][35023:35028] CHIP:DMG: {
@@ -289,7 +405,7 @@
           "Verify that the attestation_elements_message structure fields satisfy
           the following conditions:"
       verification: |
-          Verify that the attestation_elements_message structure fields satisfy the following conditions
+          Verify that the attestation_elements_message structure fields satisfy the following conditions on TH(chip-tool) Log
           1. AttestationElements field size should not be greater than RESP_MAX(900 bytes)
           2. certification_declaration is present and is an octet string
 
@@ -414,7 +530,7 @@
           "AttestationElements field size should not be greater than
           RESP_MAX(900 bytes)"
       verification: |
-          AttestationElements field size should not be greater than RESP_MAX(900 bytes)
+          Verify AttestationElements field size should not be greater than RESP_MAX(900 bytes) on TH(chip-tool) log from step 5
 
           Attestation Elements (585 bytes) =
           [1655374218.453366][35023:35028] CHIP:DMG: {
@@ -430,7 +546,7 @@
           representation CMS-format certification declaration, as described in
           section 6.3.1"
       verification: |
-          Verify  certification_declaration is present and is an octet string in TH log:
+          Verify  certification_declaration is present and is an octet string in TH(chip-tool) log:
 
           [1655374218.453303][35023:35028] CHIP:DMG: Attestation Elements (585 bytes) =
           [1655374218.453366][35023:35028] CHIP:DMG: {
@@ -558,7 +674,7 @@
           ,security level = 0 ,security_information = 0 ,version_number is an
           integer in range 0..65535 ,certification_type has a value between 1..2"
       verification: |
-          Verify Verify for the following contents of CD in TH log:
+          Verify Verify for the following contents of CD (certificate declaration) in TH (chip-tool) log:
           format_version = 1,
           vendor_id matches the basic_info_vendor_id,
           product_id_array matches the basic_info_product_id saved earlier,
@@ -569,7 +685,122 @@
           version_number should be in range 0..65535,
           certification_type should be  between 1..2
 
-          https://github.com/project-chip/connectedhomeip/issues/21578
+
+          [1655374218.453303][35023:35028] CHIP:DMG: Attestation Elements (585 bytes) =
+          [1655374218.453366][35023:35028] CHIP:DMG: {
+          [1655374218.453431][35023:35028] CHIP:DMG:     Certification Declaration =
+          [1655374218.453483][35023:35028] CHIP:DMG:     {
+          [1655374218.455342][35023:35028] CHIP:DMG:         Format Version = 1
+          [1655374218.455398][35023:35028] CHIP:DMG:         Vendor Id = 65521
+          [1655374218.455438][35023:35028] CHIP:DMG:         Product Ids =
+          [1655374218.455474][35023:35028] CHIP:DMG:         {
+          [1655374218.455512][35023:35028] CHIP:DMG:             Product Id = 32768
+          [1655374218.455552][35023:35028] CHIP:DMG:             Product Id = 32769
+          [1655374218.455590][35023:35028] CHIP:DMG:             Product Id = 32770
+          [1655374218.455628][35023:35028] CHIP:DMG:             Product Id = 32771
+          [1655374218.455666][35023:35028] CHIP:DMG:             Product Id = 32772
+          [1655374218.455704][35023:35028] CHIP:DMG:             Product Id = 32773
+          [1655374218.455742][35023:35028] CHIP:DMG:             Product Id = 32774
+          [1655374218.455780][35023:35028] CHIP:DMG:             Product Id = 32775
+          [1655374218.455818][35023:35028] CHIP:DMG:             Product Id = 32776
+          [1655374218.455855][35023:35028] CHIP:DMG:             Product Id = 32777
+          [1655374218.455893][35023:35028] CHIP:DMG:             Product Id = 32778
+          [1655374218.455931][35023:35028] CHIP:DMG:             Product Id = 32779
+          [1655374218.455969][35023:35028] CHIP:DMG:             Product Id = 32780
+          [1655374218.456007][35023:35028] CHIP:DMG:             Product Id = 32781
+          [1655374218.456045][35023:35028] CHIP:DMG:             Product Id = 32782
+          [1655374218.456082][35023:35028] CHIP:DMG:             Product Id = 32783
+          [1655374218.456120][35023:35028] CHIP:DMG:             Product Id = 32784
+          [1655374218.456158][35023:35028] CHIP:DMG:             Product Id = 32785
+          [1655374218.456196][35023:35028] CHIP:DMG:             Product Id = 32786
+          [1655374218.456234][35023:35028] CHIP:DMG:             Product Id = 32787
+          [1655374218.456271][35023:35028] CHIP:DMG:             Product Id = 32788
+          [1655374218.456309][35023:35028] CHIP:DMG:             Product Id = 32789
+          [1655374218.456347][35023:35028] CHIP:DMG:             Product Id = 32790
+          [1655374218.456385][35023:35028] CHIP:DMG:             Product Id = 32791
+          [1655374218.456423][35023:35028] CHIP:DMG:             Product Id = 32792
+          [1655374218.456461][35023:35028] CHIP:DMG:             Product Id = 32793
+          [1655374218.456498][35023:35028] CHIP:DMG:             Product Id = 32794
+          [1655374218.456536][35023:35028] CHIP:DMG:             Product Id = 32795
+          [1655374218.456573][35023:35028] CHIP:DMG:             Product Id = 32796
+          [1655374218.456611][35023:35028] CHIP:DMG:             Product Id = 32797
+          [1655374218.456649][35023:35028] CHIP:DMG:             Product Id = 32798
+          [1655374218.456687][35023:35028] CHIP:DMG:             Product Id = 32799
+          [1655374218.456724][35023:35028] CHIP:DMG:             Product Id = 32800
+          [1655374218.456761][35023:35028] CHIP:DMG:             Product Id = 32801
+          [1655374218.456799][35023:35028] CHIP:DMG:             Product Id = 32802
+          [1655374218.456836][35023:35028] CHIP:DMG:             Product Id = 32803
+          [1655374218.456874][35023:35028] CHIP:DMG:             Product Id = 32804
+          [1655374218.456912][35023:35028] CHIP:DMG:             Product Id = 32805
+          [1655374218.456949][35023:35028] CHIP:DMG:             Product Id = 32806
+          [1655374218.456987][35023:35028] CHIP:DMG:             Product Id = 32807
+          [1655374218.457024][35023:35028] CHIP:DMG:             Product Id = 32808
+          [1655374218.457061][35023:35028] CHIP:DMG:             Product Id = 32809
+          [1655374218.457099][35023:35028] CHIP:DMG:             Product Id = 32810
+          [1655374218.457138][35023:35028] CHIP:DMG:             Product Id = 32811
+          [1655374218.457175][35023:35028] CHIP:DMG:             Product Id = 32812
+          [1655374218.457212][35023:35028] CHIP:DMG:             Product Id = 32813
+          [1655374218.457250][35023:35028] CHIP:DMG:             Product Id = 32814
+          [1655374218.457288][35023:35028] CHIP:DMG:             Product Id = 32815
+          [1655374218.457326][35023:35028] CHIP:DMG:             Product Id = 32816
+          [1655374218.457363][35023:35028] CHIP:DMG:             Product Id = 32817
+          [1655374218.457401][35023:35028] CHIP:DMG:             Product Id = 32818
+          [1655374218.457439][35023:35028] CHIP:DMG:             Product Id = 32819
+          [1655374218.457476][35023:35028] CHIP:DMG:             Product Id = 32820
+          [1655374218.457514][35023:35028] CHIP:DMG:             Product Id = 32821
+          [1655374218.457552][35023:35028] CHIP:DMG:             Product Id = 32822
+          [1655374218.457590][35023:35028] CHIP:DMG:             Product Id = 32823
+          [1655374218.457627][35023:35028] CHIP:DMG:             Product Id = 32824
+          [1655374218.457665][35023:35028] CHIP:DMG:             Product Id = 32825
+          [1655374218.457702][35023:35028] CHIP:DMG:             Product Id = 32826
+          [1655374218.457740][35023:35028] CHIP:DMG:             Product Id = 32827
+          [1655374218.457777][35023:35028] CHIP:DMG:             Product Id = 32828
+          [1655374218.457833][35023:35028] CHIP:DMG:             Product Id = 32829
+          [1655374218.457874][35023:35028] CHIP:DMG:             Product Id = 32830
+          [1655374218.457912][35023:35028] CHIP:DMG:             Product Id = 32831
+          [1655374218.457950][35023:35028] CHIP:DMG:             Product Id = 32832
+          [1655374218.457987][35023:35028] CHIP:DMG:             Product Id = 32833
+          [1655374218.458026][35023:35028] CHIP:DMG:             Product Id = 32834
+          [1655374218.458063][35023:35028] CHIP:DMG:             Product Id = 32835
+          [1655374218.458101][35023:35028] CHIP:DMG:             Product Id = 32836
+          [1655374218.458139][35023:35028] CHIP:DMG:             Product Id = 32837
+          [1655374218.458177][35023:35028] CHIP:DMG:             Product Id = 32838
+          [1655374218.458215][35023:35028] CHIP:DMG:             Product Id = 32839
+          [1655374218.458253][35023:35028] CHIP:DMG:             Product Id = 32840
+          [1655374218.458291][35023:35028] CHIP:DMG:             Product Id = 32841
+          [1655374218.458328][35023:35028] CHIP:DMG:             Product Id = 32842
+          [1655374218.458366][35023:35028] CHIP:DMG:             Product Id = 32843
+          [1655374218.458404][35023:35028] CHIP:DMG:             Product Id = 32844
+          [1655374218.458441][35023:35028] CHIP:DMG:             Product Id = 32845
+          [1655374218.458480][35023:35028] CHIP:DMG:             Product Id = 32846
+          [1655374218.458517][35023:35028] CHIP:DMG:             Product Id = 32847
+          [1655374218.458555][35023:35028] CHIP:DMG:             Product Id = 32848
+          [1655374218.458592][35023:35028] CHIP:DMG:             Product Id = 32849
+          [1655374218.458630][35023:35028] CHIP:DMG:             Product Id = 32850
+          [1655374218.458667][35023:35028] CHIP:DMG:             Product Id = 32851
+          [1655374218.458706][35023:35028] CHIP:DMG:             Product Id = 32852
+          [1655374218.458743][35023:35028] CHIP:DMG:             Product Id = 32853
+          [1655374218.458781][35023:35028] CHIP:DMG:             Product Id = 32854
+          [1655374218.458818][35023:35028] CHIP:DMG:             Product Id = 32855
+          [1655374218.458856][35023:35028] CHIP:DMG:             Product Id = 32856
+          [1655374218.458893][35023:35028] CHIP:DMG:             Product Id = 32857
+          [1655374218.458932][35023:35028] CHIP:DMG:             Product Id = 32858
+          [1655374218.458969][35023:35028] CHIP:DMG:             Product Id = 32859
+          [1655374218.459007][35023:35028] CHIP:DMG:             Product Id = 32860
+          [1655374218.459045][35023:35028] CHIP:DMG:             Product Id = 32861
+          [1655374218.459082][35023:35028] CHIP:DMG:             Product Id = 32862
+          [1655374218.459120][35023:35028] CHIP:DMG:             Product Id = 32863
+          [1655374218.459159][35023:35028] CHIP:DMG:             Product Id = 32864
+          [1655374218.459196][35023:35028] CHIP:DMG:             Product Id = 32865
+          [1655374218.459234][35023:35028] CHIP:DMG:             Product Id = 32866
+          [1655374218.459271][35023:35028] CHIP:DMG:             Product Id = 32867
+          [1655374218.459309][35023:35028] CHIP:DMG:         }
+          [1655374218.459347][35023:35028] CHIP:DMG:         Device Type Id = 22
+          [1655374218.459390][35023:35028] CHIP:DMG:         Certificate Id (19) = ZIG20142ZB330003-24
+          [1655374218.459430][35023:35028] CHIP:DMG:         Security Level = 0
+          [1655374218.459470][35023:35028] CHIP:DMG:         Security Information = 0
+          [1655374218.459508][35023:35028] CHIP:DMG:         Version Number = 9876
+          [1655374218.459546][35023:35028] CHIP:DMG:         Certification Type = 0
       disabled: true
 
     - label:
@@ -581,7 +812,7 @@
           MCORE.DA.CERTDECL_ORIGIN_VENDORID &&
           MCORE.DA.CERTDECL_ORIGIN_PRODUCTID
       verification: |
-          Verify vendor_id and product_id are present in Certification Declaration in TH log:
+          Verify vendor_id and product_id are present in Certification Declaration in TH(chip-tool) log:
 
           [1655374218.453303][35023:35028] CHIP:DMG: Attestation Elements (585 bytes) =
           [1655374218.453366][35023:35028] CHIP:DMG: {
@@ -714,21 +945,33 @@
           MCORE.DA.CERTDECL_ORIGIN_VENDORID &&
           MCORE.DA.CERTDECL_ORIGIN_PRODUCTID
       verification: |
-          Verify both vendorID has same value
-
-          Verify in DUT log:
-          [1655374218.453431][35023:35028] CHIP:DMG:     Certification Declaration =
-          [1655374218.453483][35023:35028] CHIP:DMG:     {
-          [1655374218.455342][35023:35028] CHIP:DMG:         Format Version = 1
-          [1655374218.455398][35023:35028] CHIP:DMG:         Vendor Id = 65521
+          Verify The Vendor ID (VID) in the DAC subject and PAI subject are the same as the vendor_id field in the Certification Declaration.
+          To decode the DAC/PAI subject, refer TC-DA-1.7 - step 6 & then verify the vendorID and ProductID is same from the previous step log output.
 
 
-          "./chip-tool basic read vendor-id 1 0
 
-          Verify in TH log:
-          [1654068750.496162][10974:10979] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0028 Attribute 0x0000_0002 DataVersion: 2079473956
-          [1654068750.496206][10974:10979] CHIP:TOO:   VendorID: 65521
-          [1654068750.496287][10974:10979] CHIP:EM: Sending Standalone Ack for MessageCounter:5436360 on exchange 400i"
+          Certificate:
+              Data:
+                  Version: 3 (0x2)
+                  Serial Number: 7624014786269105873 (0x69cdf10de9e54ed1)
+                  Signature Algorithm: ecdsa-with-SHA256
+                  Issuer: CN = Matter Dev PAI 0xFFF1 no PID, 1.3.6.1.4.1.37244.2.1 = FFF1
+                  Validity
+                      Not Before: Feb  5 00:00:00 2022 GMT
+                      Not After : Dec 31 23:59:59 9999 GMT
+                  Subject: CN = Matter Dev DAC 0xFFF1/0x8001, 1.3.6.1.4.1.37244.2.1 = FFF1, 1.3.6.1.4.1.37244.2.2 = 8001
+                  Subject Public Key Info:
+                      Public Key Algorithm: id-ecPublicKey
+                          Public-Key: (256 bit)
+                          pub:
+                              04:46:3a:c6:93:42:91:0a:0e:55:88:fc:6f:f5:6b:
+                              b6:3e:62:ec:ce:cb:14:8f:7d:4e:b0:3e:e5:52:60:
+                              14:15:76:7d:16:a5:c6:63:f7:93:e4:91:23:26:0b:
+                              82:97:a7:cd:7e:7c:fc:7b:31:6b:39:d9:8e:90:d2:
+                              93:77:73:8e:82
+                          ASN1 OID: prime256v1
+                          NIST CURVE: P-256
+                  X509v3 extensions:
       disabled: true
 
     - label:
@@ -746,20 +989,31 @@
           MCORE.DA.CERTDECL_ORIGIN_PRODUCTID
       verification: |
           Verify The Vendor ID (VID) in the DAC subject and PAI subject are the same as the vendor_id field in the Certification Declaration.
-
-          Verify in DUT log:
-          [1655374218.453431][35023:35028] CHIP:DMG:     Certification Declaration =
-          [1655374218.453483][35023:35028] CHIP:DMG:     {
-          [1655374218.455342][35023:35028] CHIP:DMG:         Format Version = 1
-          [1655374218.455398][35023:35028] CHIP:DMG:         Vendor Id = 65521
+          To decode the DAC/PAI subject, refer TC-DA-1.7 - step 6 & then verify the vendorID and ProductID is same from the previous step log output.
 
 
-          "./chip-tool basic read vendor-id 1 0
-
-          Verify in TH log:
-          [1654068750.496162][10974:10979] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0028 Attribute 0x0000_0002 DataVersion: 2079473956
-          [1654068750.496206][10974:10979] CHIP:TOO:   VendorID: 65521
-          [1654068750.496287][10974:10979] CHIP:EM: Sending Standalone Ack for MessageCounter:5436360 on exchange 400i"
+          Certificate:
+              Data:
+                  Version: 3 (0x2)
+                  Serial Number: 7624014786269105873 (0x69cdf10de9e54ed1)
+                  Signature Algorithm: ecdsa-with-SHA256
+                  Issuer: CN = Matter Dev PAI 0xFFF1 no PID, 1.3.6.1.4.1.37244.2.1 = FFF1
+                  Validity
+                      Not Before: Feb  5 00:00:00 2022 GMT
+                      Not After : Dec 31 23:59:59 9999 GMT
+                  Subject: CN = Matter Dev DAC 0xFFF1/0x8001, 1.3.6.1.4.1.37244.2.1 = FFF1, 1.3.6.1.4.1.37244.2.2 = 8001
+                  Subject Public Key Info:
+                      Public Key Algorithm: id-ecPublicKey
+                          Public-Key: (256 bit)
+                          pub:
+                              04:46:3a:c6:93:42:91:0a:0e:55:88:fc:6f:f5:6b:
+                              b6:3e:62:ec:ce:cb:14:8f:7d:4e:b0:3e:e5:52:60:
+                              14:15:76:7d:16:a5:c6:63:f7:93:e4:91:23:26:0b:
+                              82:97:a7:cd:7e:7c:fc:7b:31:6b:39:d9:8e:90:d2:
+                              93:77:73:8e:82
+                          ASN1 OID: prime256v1
+                          NIST CURVE: P-256
+                  X509v3 extensions:
       disabled: true
 
     - label:
@@ -776,7 +1030,7 @@
           verified with the well-known Certification Declaration public key used
           to originally sign the Certification Declaration"
       verification: |
-          Not verifiable
+          Not verifiable, which requires a specific decode tool
       disabled: true
 
     - label:
@@ -811,7 +1065,7 @@
           secure session over which the AttestationResponse was obtained, using
           the subject public key found in the DAC."
       verification: |
-          Not verifiable
+          Not verifiable, which requires a specific decode tool to decode the signature & construct a new message.
       disabled: true
 
     - label:
@@ -825,9 +1079,9 @@
           "TH1 sends AttestationRequestCommand with Invalid AttestationNonce
           (size> 32 bytes) as the field to the DUT."
       verification: |
-          Verify INVALID_COMMAND error when Attestation Request sent with attestation nonce >32 byte  in TH Log:
+          Verify INVALID_COMMAND error when Attestation Request sent with attestation nonce >32 byte  in TH(chip-tool) Log:
 
-           ./chip-tool operationalcredentials attestation-request   762B6B9DA08F7FC63BB693E38634EC6F87CEFF28AB1554A16AD43DCEC24C2466A16AD43DCEC24C2466   1 0
+           ./chip-tool operationalcredentials attestation-request   762B6B9DA08F7FC63BB693E38634EC6F87CEFF28AB1554A16AD43DCEC24C2466A16AD43DCEC24C2466   1 0  --trace_decode 1
 
           [1655984597.150863][23339:23344] CHIP:DMG: InvokeResponseMessage =
           [1655984597.150923][23339:23344] CHIP:DMG: {
@@ -867,9 +1121,9 @@
           "TH1 sends AttestationRequestCommand with invalid AttestationNonce
           (size < 32 bytes) as the field to the DUT."
       verification: |
-          Verify INVALID_COMMAND error when Attestation Request sent with attestation nonce <32 byte  in TH Log:
+          Verify INVALID_COMMAND error when Attestation Request sent with attestation nonce <32 byte  in TH(chip-tool) Log:
 
-          ./chip-tool operationalcredentials attestation-request   762B6B9DA08F7FC63BB693E38634EC6F87CEFF28AB1554A1   1 0
+          ./chip-tool operationalcredentials attestation-request   762B6B9DA08F7FC63BB693E38634EC6F87CEFF28AB1554A1   1 0  --trace_decode 1
 
 
           [1655984597.150863][23339:23344] CHIP:DMG: InvokeResponseMessage =
diff --git a/src/app/tests/suites/certification/Test_TC_DA_1_3.yaml b/src/app/tests/suites/certification/Test_TC_DA_1_3.yaml
index 45bac3d..05ce3ac 100644
--- a/src/app/tests/suites/certification/Test_TC_DA_1_3.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DA_1_3.yaml
@@ -26,421 +26,176 @@
     endpoint: 0
 
 tests:
+    - label: "Note"
+      verification: |
+          Chip-tool command used below are an example to verify the  DUT as client test cases. For certification test, we expect DUT should have a capability or way to run the equivalent command.
+      disabled: true
+
     - label: "Start the commissioning process of TH1 on DUT"
       verification: |
-          sudo ./chip-all-clusters-app --wifi
+          sudo ./chip-all-clusters-app --wifi  --trace_decode 1
 
           DUT as commissioner side:
           ./chip-tool pairing ble-wifi 1 zigbeehome matter123 20202021 3841 --trace_decode 1
-
-          [1650455358.501816][4366:4371] CHIP:TOO: Device commissioning completed with success
       disabled: true
 
     - label: "DUT generates 32-byte AttestationNonce"
       verification: |
-          Verify  attestation Nonce in DUT as commissioner side:
+          During provision, DUT sends AttestationRequest Command with AttestationNonce
 
-          [1655374218.117635][35023:35028] CHIP:CTL: Sent Attestation request, waiting for the Attestation Information
-          [1655374218.117686][35023:35028] CHIP:DMG: ICR moving to [AwaitingDe]
-          [1655374218.204040][35023:35028] CHIP:DL: HandlePlatformSpecificBLEEvent 16387
-          [1655374218.252180][35023:35026] CHIP:DL: Indication received, conn = 0xffff8003c0c0
-          [1655374218.252405][35023:35028] CHIP:DL: HandlePlatformSpecificBLEEvent 16389
-          [1655374218.352372][35023:35026] CHIP:DL: Indication received, conn = 0xffff8003c0c0
-          [1655374218.352509][35023:35028] CHIP:DL: HandlePlatformSpecificBLEEvent 16389
-          [1655374218.450622][35023:35026] CHIP:DL: Indication received, conn = 0xffff8003c0c0
-          [1655374218.450870][35023:35028] CHIP:DL: HandlePlatformSpecificBLEEvent 16389
-          [1655374218.452138][35023:35028] CHIP:DMG: << from BLE | 224958145 | [Interaction Model  (1) / InvokeCommandResponse (0x09) / Session = 19710 / Exchange = 1302]
-          [1655374218.452241][35023:35028] CHIP:DMG: Header Flags =
-          [1655374218.452300][35023:35028] CHIP:DMG: {
-          [1655374218.452395][35023:35028] CHIP:DMG: }
-          [1655374218.452449][35023:35028] CHIP:DMG:
-          [1655374218.452521][35023:35028] CHIP:DMG: Encrypted Payload (716 bytes) =
-          [1655374218.452579][35023:35028] CHIP:DMG: {
-          [1655374218.452634][35023:35028] CHIP:DMG:     data = 00fe4c00c196680d30c5e98d35a6d844102a8b0067edba80e2adf97e28751f8353657dacb7c9706c2c22add28d18adca15378d16af57f0f4092893cfc5d3e85f6e409f70e39bcb9e0bd3397947e927d20e5bf5173e3def7218d0152cf40e7cb16db615efbd282fd6e84c710bd2c7441228eb5dbbcf0dc76a3eaa0b04655f434d3c8223c7016703b8082c9984c3a91432d12271c87f4d09e90cb6e78d07c81d6359cd5a756f2bace60a7a216896949b536e5583f22db64aeae0279ba2fd279813be383e4324ab63472e3d9877f6c9fa539e577dc50fbcc5a7124a14ea78abdd6ada4ec256a3ee0a242747d636215ffab3c8b4291023eb51b3701939e153912b0f5764479b05e1cf472c350304d1ead872295c80fed3a545530f773e729b6f7bd7d5547de03076a72b8855191beb12d8194477bc9798b6177557cccf3b11b2c1f82cee31d451408359650112394dc2c1592cd2eb1e75881aa340885e65ef9a9905947842574ddcac832d68188b0a3a20fb223258d766692b13a6cde0de34d4f9047046d38ad94caf0a9cc7a786c082d5ae8c62346d69684c6ed5ae958ab68c0685922751ff04d922a838c9d2257a7af6e72af524b459a45ea6311431d30c7de32b3d79581ac119d6e7f63a877b53fda9d69256c5870f2af36f74e08b22e1217a0324b772394a4a596ff237331c623b8d7746077826088dddd2a741f19011cde09f1e897f92ac975fd9a157de0b780f6551b11a50ffe12c781f304dbda9dd75465fb3a8ec52d30f7ddb9179f1b9dfe415ae2d66a53bad67bcf27b3351b8a5cdc9e8b54095c81774007237c8a14a3e2c9cf350616cf5ebf7f6ae5a8c77207924b0e1cddc6c7e77c2a514319947c5988af1dd77325259f496293e53041941d45a1355f56b8036008ab696f7d47d17f9fc4890aa78c2811560b7b4d79a460b7dcd3d9bc3bdd5f72d27bb0060f722aa9c22e7d635895404c832bf2371321d1ababa954482c847fedd0d4676bd188365
-          [1655374218.452884][35023:35028] CHIP:DMG:     buffer_ptr = 281472627984864
-          [1655374218.452941][35023:35028] CHIP:DMG: }
-          [1655374218.452992][35023:35028] CHIP:DMG:
-          [1655374218.453303][35023:35028] CHIP:DMG: Attestation Elements (585 bytes) =
-          [1655374218.453366][35023:35028] CHIP:DMG: {
-          [1655374218.453431][35023:35028] CHIP:DMG:     Certification Declaration =
-          [1655374218.453483][35023:35028] CHIP:DMG:     {
-          [1655374218.455342][35023:35028] CHIP:DMG:         Format Version = 1
-          [1655374218.455398][35023:35028] CHIP:DMG:         Vendor Id = 65521
-          [1655374218.455438][35023:35028] CHIP:DMG:         Product Ids =
-          [1655374218.455474][35023:35028] CHIP:DMG:         {
-          [1655374218.455512][35023:35028] CHIP:DMG:             Product Id = 32768
-          [1655374218.455552][35023:35028] CHIP:DMG:             Product Id = 32769
-          [1655374218.455590][35023:35028] CHIP:DMG:             Product Id = 32770
-          [1655374218.455628][35023:35028] CHIP:DMG:             Product Id = 32771
-          [1655374218.455666][35023:35028] CHIP:DMG:             Product Id = 32772
-          [1655374218.455704][35023:35028] CHIP:DMG:             Product Id = 32773
-          [1655374218.455742][35023:35028] CHIP:DMG:             Product Id = 32774
-          [1655374218.455780][35023:35028] CHIP:DMG:             Product Id = 32775
-          [1655374218.455818][35023:35028] CHIP:DMG:             Product Id = 32776
-          [1655374218.455855][35023:35028] CHIP:DMG:             Product Id = 32777
-          [1655374218.455893][35023:35028] CHIP:DMG:             Product Id = 32778
-          [1655374218.455931][35023:35028] CHIP:DMG:             Product Id = 32779
-          [1655374218.455969][35023:35028] CHIP:DMG:             Product Id = 32780
-          [1655374218.456007][35023:35028] CHIP:DMG:             Product Id = 32781
-          [1655374218.456045][35023:35028] CHIP:DMG:             Product Id = 32782
-          [1655374218.456082][35023:35028] CHIP:DMG:             Product Id = 32783
-          [1655374218.456120][35023:35028] CHIP:DMG:             Product Id = 32784
-          [1655374218.456158][35023:35028] CHIP:DMG:             Product Id = 32785
-          [1655374218.456196][35023:35028] CHIP:DMG:             Product Id = 32786
-          [1655374218.456234][35023:35028] CHIP:DMG:             Product Id = 32787
-          [1655374218.456271][35023:35028] CHIP:DMG:             Product Id = 32788
-          [1655374218.456309][35023:35028] CHIP:DMG:             Product Id = 32789
-          [1655374218.456347][35023:35028] CHIP:DMG:             Product Id = 32790
-          [1655374218.456385][35023:35028] CHIP:DMG:             Product Id = 32791
-          [1655374218.456423][35023:35028] CHIP:DMG:             Product Id = 32792
-          [1655374218.456461][35023:35028] CHIP:DMG:             Product Id = 32793
-          [1655374218.456498][35023:35028] CHIP:DMG:             Product Id = 32794
-          [1655374218.456536][35023:35028] CHIP:DMG:             Product Id = 32795
-          [1655374218.456573][35023:35028] CHIP:DMG:             Product Id = 32796
-          [1655374218.456611][35023:35028] CHIP:DMG:             Product Id = 32797
-          [1655374218.456649][35023:35028] CHIP:DMG:             Product Id = 32798
-          [1655374218.456687][35023:35028] CHIP:DMG:             Product Id = 32799
-          [1655374218.456724][35023:35028] CHIP:DMG:             Product Id = 32800
-          [1655374218.456761][35023:35028] CHIP:DMG:             Product Id = 32801
-          [1655374218.456799][35023:35028] CHIP:DMG:             Product Id = 32802
-          [1655374218.456836][35023:35028] CHIP:DMG:             Product Id = 32803
-          [1655374218.456874][35023:35028] CHIP:DMG:             Product Id = 32804
-          [1655374218.456912][35023:35028] CHIP:DMG:             Product Id = 32805
-          [1655374218.456949][35023:35028] CHIP:DMG:             Product Id = 32806
-          [1655374218.456987][35023:35028] CHIP:DMG:             Product Id = 32807
-          [1655374218.457024][35023:35028] CHIP:DMG:             Product Id = 32808
-          [1655374218.457061][35023:35028] CHIP:DMG:             Product Id = 32809
-          [1655374218.457099][35023:35028] CHIP:DMG:             Product Id = 32810
-          [1655374218.457138][35023:35028] CHIP:DMG:             Product Id = 32811
-          [1655374218.457175][35023:35028] CHIP:DMG:             Product Id = 32812
-          [1655374218.457212][35023:35028] CHIP:DMG:             Product Id = 32813
-          [1655374218.457250][35023:35028] CHIP:DMG:             Product Id = 32814
-          [1655374218.457288][35023:35028] CHIP:DMG:             Product Id = 32815
-          [1655374218.457326][35023:35028] CHIP:DMG:             Product Id = 32816
-          [1655374218.457363][35023:35028] CHIP:DMG:             Product Id = 32817
-          [1655374218.457401][35023:35028] CHIP:DMG:             Product Id = 32818
-          [1655374218.457439][35023:35028] CHIP:DMG:             Product Id = 32819
-          [1655374218.457476][35023:35028] CHIP:DMG:             Product Id = 32820
-          [1655374218.457514][35023:35028] CHIP:DMG:             Product Id = 32821
-          [1655374218.457552][35023:35028] CHIP:DMG:             Product Id = 32822
-          [1655374218.457590][35023:35028] CHIP:DMG:             Product Id = 32823
-          [1655374218.457627][35023:35028] CHIP:DMG:             Product Id = 32824
-          [1655374218.457665][35023:35028] CHIP:DMG:             Product Id = 32825
-          [1655374218.457702][35023:35028] CHIP:DMG:             Product Id = 32826
-          [1655374218.457740][35023:35028] CHIP:DMG:             Product Id = 32827
-          [1655374218.457777][35023:35028] CHIP:DMG:             Product Id = 32828
-          [1655374218.457833][35023:35028] CHIP:DMG:             Product Id = 32829
-          [1655374218.457874][35023:35028] CHIP:DMG:             Product Id = 32830
-          [1655374218.457912][35023:35028] CHIP:DMG:             Product Id = 32831
-          [1655374218.457950][35023:35028] CHIP:DMG:             Product Id = 32832
-          [1655374218.457987][35023:35028] CHIP:DMG:             Product Id = 32833
-          [1655374218.458026][35023:35028] CHIP:DMG:             Product Id = 32834
-          [1655374218.458063][35023:35028] CHIP:DMG:             Product Id = 32835
-          [1655374218.458101][35023:35028] CHIP:DMG:             Product Id = 32836
-          [1655374218.458139][35023:35028] CHIP:DMG:             Product Id = 32837
-          [1655374218.458177][35023:35028] CHIP:DMG:             Product Id = 32838
-          [1655374218.458215][35023:35028] CHIP:DMG:             Product Id = 32839
-          [1655374218.458253][35023:35028] CHIP:DMG:             Product Id = 32840
-          [1655374218.458291][35023:35028] CHIP:DMG:             Product Id = 32841
-          [1655374218.458328][35023:35028] CHIP:DMG:             Product Id = 32842
-          [1655374218.458366][35023:35028] CHIP:DMG:             Product Id = 32843
-          [1655374218.458404][35023:35028] CHIP:DMG:             Product Id = 32844
-          [1655374218.458441][35023:35028] CHIP:DMG:             Product Id = 32845
-          [1655374218.458480][35023:35028] CHIP:DMG:             Product Id = 32846
-          [1655374218.458517][35023:35028] CHIP:DMG:             Product Id = 32847
-          [1655374218.458555][35023:35028] CHIP:DMG:             Product Id = 32848
-          [1655374218.458592][35023:35028] CHIP:DMG:             Product Id = 32849
-          [1655374218.458630][35023:35028] CHIP:DMG:             Product Id = 32850
-          [1655374218.458667][35023:35028] CHIP:DMG:             Product Id = 32851
-          [1655374218.458706][35023:35028] CHIP:DMG:             Product Id = 32852
-          [1655374218.458743][35023:35028] CHIP:DMG:             Product Id = 32853
-          [1655374218.458781][35023:35028] CHIP:DMG:             Product Id = 32854
-          [1655374218.458818][35023:35028] CHIP:DMG:             Product Id = 32855
-          [1655374218.458856][35023:35028] CHIP:DMG:             Product Id = 32856
-          [1655374218.458893][35023:35028] CHIP:DMG:             Product Id = 32857
-          [1655374218.458932][35023:35028] CHIP:DMG:             Product Id = 32858
-          [1655374218.458969][35023:35028] CHIP:DMG:             Product Id = 32859
-          [1655374218.459007][35023:35028] CHIP:DMG:             Product Id = 32860
-          [1655374218.459045][35023:35028] CHIP:DMG:             Product Id = 32861
-          [1655374218.459082][35023:35028] CHIP:DMG:             Product Id = 32862
-          [1655374218.459120][35023:35028] CHIP:DMG:             Product Id = 32863
-          [1655374218.459159][35023:35028] CHIP:DMG:             Product Id = 32864
-          [1655374218.459196][35023:35028] CHIP:DMG:             Product Id = 32865
-          [1655374218.459234][35023:35028] CHIP:DMG:             Product Id = 32866
-          [1655374218.459271][35023:35028] CHIP:DMG:             Product Id = 32867
-          [1655374218.459309][35023:35028] CHIP:DMG:         }
-          [1655374218.459347][35023:35028] CHIP:DMG:         Device Type Id = 22
-          [1655374218.459390][35023:35028] CHIP:DMG:         Certificate Id (19) = ZIG20142ZB330003-24
-          [1655374218.459430][35023:35028] CHIP:DMG:         Security Level = 0
-          [1655374218.459470][35023:35028] CHIP:DMG:         Security Information = 0
-          [1655374218.459508][35023:35028] CHIP:DMG:         Version Number = 9876
-          [1655374218.459546][35023:35028] CHIP:DMG:         Certification Type = 0
-          [1655374218.459584][35023:35028] CHIP:DMG:     }
-          [1655374218.459627][35023:35028] CHIP:DMG:     Attestation Nonce (32) = 762B6B9DA08F7FC63BB693E38634EC6F87CEFF28AB1554A16AD43DCEC24C2466
-          [1655374218.459664][35023:35028] CHIP:DMG:     Timestamp = 0
-          [1655374218.459699][35023:35028] CHIP:DMG: }
+          [1659763321.702266][2548:2548] CHIP:DMG:     }
+          [1659763321.702302][2548:2548] CHIP:DMG:     Attestation Nonce (32) = CF9146F33636FEC51CDCB9161D2F5EE72E4F1196CC9D5FAB417F388AFA42F110
+          [1659763321.702332][2548:2548] CHIP:DMG:     Timestamp = 0
       disabled: true
 
     - label:
           "DUT sends AttestationRequest Command with AttestationNonce as field
           to the TH1."
       verification: |
-          DUT  Verify  attestation Nonce in DUT as commissioner side:
+          During provision, DUT sends AttestationRequest Command with AttestationNonce as field to the TH. verify the below log in TH(all-clusters-app). As the current TH ref app (all-clusters-app) doesnot decode the received request message, nonce value has been shown from the TH ref app response message , as TH ref app use the same nonce value in the response message
 
-          [1655374218.459627][35023:35028] CHIP:DMG:     Attestation Nonce (32) = 762B6B9DA08F7FC63BB693E38634EC6F87CEFF28AB1554A16AD43DCEC24C2466
-          [1655374218.459664][35023:35028] CHIP:DMG:     Timestamp = 0
-          [1655374218.459699][35023:35028] CHIP:DMG: }
+          [1659763321.692977][2548:2548] CHIP:DMG: AccessControl: implicit admin (PASE)
+          [1659763321.693005][2548:2548] CHIP:DMG: Received command for Endpoint=0 Cluster=0x0000_003E Command=0x0000_0000
+          [1659763321.693048][2548:2548] CHIP:ZCL: OpCreds: Received an AttestationRequest command
+          [1659763321.693074][2548:2548] CHIP:EM: Sending Standalone Ack for MessageCounter:128550767 on exchange 38669r
+          [1659763321.693328][2548:2548] CHIP:IN: Prepared secure message 0xfffff076ad48 to 0xFFFFFFFB00000000 (0)  of type 0x10 and protocolId (0, 0) on exchange 38669r with MessageCounter:160974649.
+          [1659763321.693377][2548:2548] CHIP:IN: Sending encrypted msg 0xfffff076ad48 with MessageCounter:160974649 to 0xFFFFFFFB00000000 (0) at monotonic time: 000000000011C37A msec
+          [1659763321.693710][2548:2548] CHIP:DMG: >> to UDP:[fe80::e65f:1ff:fe0f:3baf%eth0]:40837 | 160974649 | [Secure Channel  (0) / Standalone Ack (0x10) / Session = 11953 / Exchange = 38669]
+          [1659763321.693756][2548:2548] CHIP:DMG: Header Flags =
+          [1659763321.693778][2548:2548] CHIP:DMG: {
+
+          [1659763321.698173][2548:2548] CHIP:DMG:
+          [1659763321.698335][2548:2548] CHIP:DMG: Attestation Elements (585 bytes) =
+          [1659763321.698363][2548:2548] CHIP:DMG: {
+          [1659763321.698393][2548:2548] CHIP:DMG:     Certification Declaration =
+          [1659763321.698414][2548:2548] CHIP:DMG:     {
+          [1659763321.699353][2548:2548] CHIP:DMG:         Format Version = 1
+          [1659763321.699394][2548:2548] CHIP:DMG:         Vendor Id = 65521
+          [1659763321.699418][2548:2548] CHIP:DMG:         Product Ids =
+          [1659763321.699440][2548:2548] CHIP:DMG:         {
+          [1659763321.699463][2548:2548] CHIP:DMG:             Product Id = 32768
+          [1659763321.699486][2548:2548] CHIP:DMG:             Product Id = 32769
+          [1659763321.699509][2548:2548] CHIP:DMG:             Product Id = 32770
+          [1659763321.700010][2548:2548] CHIP:DMG:             Product Id = 32789
+
+          [1659763321.702099][2548:2548] CHIP:DMG:         }
+          [1659763321.702123][2548:2548] CHIP:DMG:         Device Type Id = 22
+          [1659763321.702149][2548:2548] CHIP:DMG:         Certificate Id (19) = ZIG20142ZB330003-24
+          [1659763321.702173][2548:2548] CHIP:DMG:         Security Level = 0
+          [1659763321.702197][2548:2548] CHIP:DMG:         Security Information = 0
+          [1659763321.702220][2548:2548] CHIP:DMG:         Version Number = 9876
+          [1659763321.702243][2548:2548] CHIP:DMG:         Certification Type = 0
+          [1659763321.702266][2548:2548] CHIP:DMG:     }
+          [1659763321.702302][2548:2548] CHIP:DMG:     Attestation Nonce (32) = CF9146F33636FEC51CDCB9161D2F5EE72E4F1196CC9D5FAB417F388AFA42F110
+          [1659763321.702332][2548:2548] CHIP:DMG:     Timestamp = 0
+          [1659763321.702353][2548:2548] CHIP:DMG: }
+          [1659763321.702381][2548:2548] CHIP:DMG:
+          [1659763321.702423][2548:2548] CHIP:DMG: InvokeResponseMessage =
+          [1659763321.702457][2548:2548] CHIP:DMG: {
+          [1659763321.702486][2548:2548] CHIP:DMG:         suppressResponse = false,
+          [1659763321.702510][2548:2548] CHIP:DMG:         InvokeResponseIBs =
+          [1659763321.702542][2548:2548] CHIP:DMG:         [
+          [1659763321.702576][2548:2548] CHIP:DMG:                 InvokeResponseIB =
+          [1659763321.702609][2548:2548] CHIP:DMG:                 {
+          [1659763321.702644][2548:2548] CHIP:DMG:                         CommandDataIB =
+          [1659763321.702685][2548:2548] CHIP:DMG:                         {
+          [1659763321.702715][2548:2548] CHIP:DMG:                                 CommandPathIB =
+          [1659763321.702757][2548:2548] CHIP:DMG:                                 {
+          [1659763321.702791][2548:2548] CHIP:DMG:                                         EndpointId = 0x0,
+          [1659763321.702836][2548:2548] CHIP:DMG:                                         ClusterId = 0x3e,
+          [1659763321.702877][2548:2548] CHIP:DMG:                                         CommandId = 0x1,
+          [1659763321.702909][2548:2548] CHIP:DMG:                                 },
+          [1659763321.702953][2548:2548] CHIP:DMG:
+          [1659763321.702992][2548:2548] CHIP:DMG:                                 CommandFields =
+          [1659763321.703025][2548:2548] CHIP:DMG:                                 {
+          [1659763321.703069][2548:2548] CHIP:DMG:                                         0x0 = [
+          [1659763321.703255][2548:2548] CHIP:DMG:                                                         0x15, 0x31, 0x1, 0x1d, 0x2, 0x30, 0x82, 0x2, 0x19, 0x6, 0x9, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0xd, 0x1, 0x7, 0x2, 0xa0, 0x82, 0x2, 0xa, 0x30, 0x82, 0x2, 0x6, 0x2, 0x1, 0x3, 0x31, 0xd, 0x30, 0xb, 0x6, 0x9, 0x60, 0x86, 0x48, 0x1, 0x65, 0x3, 0x4, 0x2, 0x1, 0x30, 0x82, 0x1, 0x71, 0x6, 0x9, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0xd, 0x1, 0x7, 0x1, 0xa0, 0x82, 0x1, 0x62, 0x4, 0x82, 0x1, 0x5e, 0x15, 0x24, 0x0, 0x1, 0x25, 0x1, 0xf1, 0xff, 0x36, 0x2, 0x5, 0x0, 0x80, 0x5, 0x1, 0x80, 0x5, 0x2, 0x80, 0x5, 0x3, 0x80, 0x5, 0x4, 0x80, 0x5, 0x5, 0x80, 0x5, 0x6, 0x80, 0x5, 0x7, 0x80, 0x5, 0x8, 0x80, 0x5, 0x9, 0x80, 0x5, 0xa, 0x80, 0x5, 0xb, 0x80, 0x5, 0xc, 0x80, 0x5, 0xd, 0x80, 0x5, 0xe, 0x80, 0x5, 0xf, 0x80, 0x5, 0x10, 0x80, 0x5, 0x11, 0x80, 0x5, 0x12, 0x80, 0x5, 0x13, 0x80, 0x5, 0x14, 0x80, 0x5, 0x15, 0x80, 0x5, 0x16, 0x80, 0x5, 0x17, 0x80, 0x5, 0x18, 0x80, 0x5, 0x19, 0x80, 0x5, 0x1a, 0x80, 0x5, 0x1b, 0x80, 0x5, 0x1c, 0x80, 0x5, 0x1d, 0x80, 0x5, 0x1e, 0x80, 0x5, 0x1f, 0x80, 0x5, 0x20, 0x80, 0x5, 0x21, 0x80, 0x5, 0x22, 0x80, 0x5, 0x23, 0x80, 0x5, 0x24, 0x80, 0x5, 0x25, 0x80, 0x5, 0x26, 0x80, 0x5, 0x27, 0x80, 0x5, 0x28, 0x80, 0x5, 0x29, 0x80, 0x5, 0x2a, 0x80, 0x5, 0x2b, 0x80, 0x5, 0x2c, 0x80, 0x5, 0x2d, 0x80, 0x5, 0x2e, 0x80, 0x5, 0x2f, 0x80, 0x5, 0x30, 0x80, 0x5, 0x31, 0x80, 0x5, 0x32, 0x80, 0x5, 0x33, 0x80, 0x5, 0x34, 0x80, 0x5, 0x35, 0x80, 0x5, 0x36, 0x80, 0x5, 0x37, 0x80, 0x5, 0x38, 0x80, 0x5, 0x39, 0x80, 0x5, 0x3a, 0x80, 0x5, 0x3b, 0x80, 0x5, 0x3c, 0x80, 0x5, 0x3d, 0x80, 0x5, 0x3e, 0x80, 0x5, 0x3f, 0x80, 0x5, 0x40, 0x80, 0x5, 0x41, 0x80, 0x5, 0x42, 0x80, 0x5, 0x43, 0x80, 0x5, 0x44, 0x80, 0x5, 0x45, 0x80, 0x5, 0x46, 0x80, 0x5, 0x47, 0x80, 0x5, 0x48, 0x80, 0x5, 0x49, 0x80, 0x5, 0x4a, 0x80, 0x5, 0
+          [1659763321.703346][2548:2548] CHIP:DMG:                                         ] (585 bytes)
+          [1659763321.703385][2548:2548] CHIP:DMG:                                         0x1 = [
+          [1659763321.703437][2548:2548] CHIP:DMG:                                                         0x10, 0x8d, 0x56, 0xec, 0x4f, 0x23, 0xe, 0x70, 0x29, 0x34, 0x30, 0x39, 0xcf, 0xae, 0xe1, 0x29, 0xb8, 0x9, 0x11, 0x78, 0xc6, 0x96, 0xe6, 0xf, 0x80, 0x9e, 0x4e, 0xf4, 0xe1, 0xd2, 0x74, 0xb1, 0x50, 0xa7, 0x51, 0xff, 0xc1, 0x9f, 0x8a, 0x93, 0xc0, 0x6c, 0xc8, 0xd7, 0x5a, 0xbe, 0x43, 0x4b, 0xf2, 0x6a, 0x75, 0xfd, 0x15, 0xac, 0xc4, 0xdc, 0x99, 0x7, 0xd9, 0xd5, 0xab, 0xee, 0x70, 0x9e,
+          [1659763321.703477][2548:2548] CHIP:DMG:                                         ] (64 bytes)
+          [1659763321.703527][2548:2548] CHIP:DMG:                                 },
+          [1659763321.703559][2548:2548] CHIP:DMG:                         },
+          [1659763321.703603][2548:2548] CHIP:DMG:
+          [1659763321.703637][2548:2548] CHIP:DMG:                 },
+          [1659763321.703670][2548:2548] CHIP:DMG:
+          [1659763321.703704][2548:2548] CHIP:DMG:         ],
+          [1659763321.703735][2548:2548] CHIP:DMG:
+          [1659763321.703768][2548:2548] CHIP:DMG:         InteractionModelRevision = 1
+          [1659763321.703792][2548:2548] CHIP:DMG: },
+          [1659763321.703825][2548:2548] CHIP:DMG:
+          [1659763321.704081][2548:2548] CHIP:DMG: ICR moving to [CommandSen]
+          [1659763321.704116][2548:2548] CHIP:DMG: ICR moving to [AwaitingDe]
       disabled: true
 
     - label:
           "TH1 records the AttestationNonce received in AttestationRequest as
           Nonce_1"
       verification: |
-          See above
+          During provision, TH1(all-clusters-app) records the AttestationNonce received in AttestationRequest as Nonce_1  for usage in later steps.
+
+
+          [1659763321.702266][2548:2548] CHIP:DMG:     }
+          [1659763321.702302][2548:2548] CHIP:DMG:     Attestation Nonce (32) = CF9146F33636FEC51CDCB9161D2F5EE72E4F1196CC9D5FAB417F388AFA42F110
+          [1659763321.702332][2548:2548] CHIP:DMG:     Timestamp = 0
       disabled: true
 
     - label: "TH1 responds with a well-formed AttestationResponse Command"
       verification: |
-          Verify TH responds with a well-formed AttestationResponse Command
+          During provision,  On TH(all-clusters-app) Verify that DUT responds with a well-formed AttestationResponse Command.
 
-          "SendDACCertificateRequest" -> "SendAttestationRequest"
-          [1655979686.298628][22876:22881] CHIP:CTL: Performing next commissioning step "SendAttestationRequest"
-          [1655979686.298679][22876:22881] CHIP:CTL: Sending Attestation Request to the device.
-          [1655979686.298730][22876:22881] CHIP:CTL: Sending Attestation request to 0xffff9c000b60 device
-          [1655979686.298850][22876:22881] CHIP:DMG: ICR moving to [AddingComm]
-          [1655979686.298922][22876:22881] CHIP:DMG: ICR moving to [AddedComma]
-          [1655979686.299422][22876:22881] CHIP:IN: Prepared secure message 0xffffb22c8958 to 0xFFFFFFFB00000000 (0)  of type 0x8 and protocolId (0, 1) on exchange 35315i with MessageCounter:234566666.
-          [1655979686.299520][22876:22881] CHIP:IN: Sending encrypted msg 0xffffb22c8958 with MessageCounter:234566666 to 0xFFFFFFFB00000000 (0) at monotonic time: 000000000648827A msec
-          [1655979686.299982][22876:22881] CHIP:DMG: >> to BLE | 234566666 | [Interaction Model  (1) / InvokeCommandRequest (0x08) / Session = 62649 / Exchange = 35315]
-          [1655979686.300073][22876:22881] CHIP:DMG: Header Flags =
-          [1655979686.300133][22876:22881] CHIP:DMG: {
-          [1655979686.300216][22876:22881] CHIP:DMG:     Exchange (0x01) =
-          [1655979686.300270][22876:22881] CHIP:DMG:     {
-          [1655979686.300319][22876:22881] CHIP:DMG:         Initiator = true
-          [1655979686.300371][22876:22881] CHIP:DMG:     }
-          [1655979686.300439][22876:22881] CHIP:DMG: }
-          [1655979686.300492][22876:22881] CHIP:DMG:
-          [1655979686.300557][22876:22881] CHIP:DMG: Encrypted Payload (94 bytes) =
-          [1655979686.300610][22876:22881] CHIP:DMG: {
-          [1655979686.300662][22876:22881] CHIP:DMG:     data = 00b9f4000a34fb0d54a953a30ca458bf899535f272656bf0051b3b0b830191d861e602260d9a5143b4159c1d7db8c2aeabea67d3647d200006758c67bdc6b5df5972310a5d5fa7c480062972692e785cb333f9c881525c98d8900a5489c4
-          [1655979686.300717][22876:22881] CHIP:DMG:     buffer_ptr = 281473299056208
-          [1655979686.300768][22876:22881] CHIP:DMG: }
-          [1655979686.300817][22876:22881] CHIP:DMG:
-          [1655979686.300969][22876:22881] CHIP:DMG: InvokeRequestMessage =
-          [1655979686.301032][22876:22881] CHIP:DMG: {
-          [1655979686.301088][22876:22881] CHIP:DMG:         suppressResponse = false,
-          [1655979686.301151][22876:22881] CHIP:DMG:         timedRequest = false,
-          [1655979686.301247][22876:22881] CHIP:DMG:         InvokeRequests =
-          [1655979686.301323][22876:22881] CHIP:DMG:         [
-          [1655979686.301382][22876:22881] CHIP:DMG:                 CommandDataIB =
-          [1655979686.301455][22876:22881] CHIP:DMG:                 {
-          [1655979686.301521][22876:22881] CHIP:DMG:                         CommandPathIB =
-          [1655979686.301597][22876:22881] CHIP:DMG:                         {
-          [1655979686.301669][22876:22881] CHIP:DMG:                                 EndpointId = 0x0,
-          [1655979686.301750][22876:22881] CHIP:DMG:                                 ClusterId = 0x3e,
-          [1655979686.301828][22876:22881] CHIP:DMG:                                 CommandId = 0x0,
-          [1655979686.301900][22876:22881] CHIP:DMG:                         },
-          [1655979686.301972][22876:22881] CHIP:DMG:
-          [1655979686.302040][22876:22881] CHIP:DMG:                         CommandFields =
-          [1655979686.302115][22876:22881] CHIP:DMG:                         {
-          [1655979686.302198][22876:22881] CHIP:DMG:                                 0x0 = [
-          [1655979686.302295][22876:22881] CHIP:DMG:                                                 0xa2, 0x7a, 0xbc, 0xfc, 0xeb, 0x61, 0xa2, 0xf4, 0x3e, 0x76, 0xcb, 0x9, 0x5d, 0x64, 0x7e, 0x13, 0x91, 0x94, 0xe2, 0x16, 0xe3, 0xd6, 0x90, 0x79, 0xbd, 0x8a, 0xf, 0xfd, 0xda, 0x58, 0x38, 0x6b,
-          [1655979686.302386][22876:22881] CHIP:DMG:                                 ]
-          [1655979686.302466][22876:22881] CHIP:DMG:                         },
-          [1655979686.302536][22876:22881] CHIP:DMG:                 },
-          [1655979686.302612][22876:22881] CHIP:DMG:
-          [1655979686.302670][22876:22881] CHIP:DMG:         ],
-          [1655979686.302741][22876:22881] CHIP:DMG:
-          [1655979686.302800][22876:22881] CHIP:DMG:         InteractionModelRevision = 1
-          [1655979686.302856][22876:22881] CHIP:DMG: },
-          [1655979686.302911][22876:22881] CHIP:DMG:
-          [1655979686.303153][22876:22881] CHIP:DMG: ICR moving to [CommandSen]
-          [1655979686.303226][22876:22881] CHIP:CTL: Sent Attestation request, waiting for the Attestation Information
-          [1655979686.303327][22876:22881] CHIP:DMG: ICR moving to [AwaitingDe]
-          [1655979686.388892][22876:22881] CHIP:DL: HandlePlatformSpecificBLEEvent 16387
-          [1655979686.437235][22876:22879] CHIP:DL: Indication received, conn = 0xffffa806f3f0
-          [1655979686.437904][22876:22881] CHIP:DL: HandlePlatformSpecificBLEEvent 16389
-          [1655979686.635272][22876:22879] CHIP:DL: Indication received, conn = 0xffffa806f3f0
-          [1655979686.635523][22876:22881] CHIP:DL: HandlePlatformSpecificBLEEvent 16389
-          [1655979686.732083][22876:22879] CHIP:DL: Indication received, conn = 0xffffa806f3f0
-          [1655979686.732507][22876:22881] CHIP:DL: HandlePlatformSpecificBLEEvent 16389
-          [1655979686.733410][22876:22881] CHIP:DMG: << from BLE | 226447061 | [Interaction Model  (1) / InvokeCommandResponse (0x09) / Session = 21486 / Exchange = 35315]
-          [1655979686.733478][22876:22881] CHIP:DMG: Header Flags =
-          [1655979686.733513][22876:22881] CHIP:DMG: {
-          [1655979686.733573][22876:22881] CHIP:DMG: }
-          [1655979686.733606][22876:22881] CHIP:DMG:
-          [1655979686.733652][22876:22881] CHIP:DMG: Encrypted Payload (716 bytes) =
-          [1655979686.733685][22876:22881] CHIP:DMG: {
-          [1655979686.733718][22876:22881] CHIP:DMG:     data = 00ee5300d54e7f0d5bf07943fb109abb6059e067ad0c66876bec0d70c165fcfa3d74ede74faeebf96c7ea54887ebba5d24c6498b240037896fb5a730262a6fe8aa049c1431a18ba7f70a20af03af064ae4f9817aa172762051ac880e69b73eba6d2ec3a3c0cbc209e19f650b9b1ba8f43c8087e105759946ae60124a18e85282099b371992664b450bc5bf410463798bf8ef4b4ab468c5732fedc9abda22ea5f598176116287754122aab594d0bd438a3974eb6bf7b0c9289e168a3c6c6ece8b45b83b41c4b700da215eff124ecdda14ebf42d0c6760f7dccfb0a4d889c08f133af4af162a5cfc7601aa4d4c99b0bd421d392ad3e352bbad3b43bea32a1dcd59082278387e5980fcadd9cef0615d4bf7fd3a9aa0329c6471f52df66d047e8bb1140aef05930688e6179aa27d2792ee41921a02c401a2df027799bbd66e7692cb71a854e455b0a4b51a08b983cd5322931605b04fbb10a90aec97e3e4313acd839aa7fb915cfd2a3de3ce65e76f8f06f947d3108543932483f7d2b1fa7c5e79fceea421c7cdda346872372994d2830e0666dc9b6acc71b5071ada4755203943b600a740c109622e8cdb866e22b60538d9f727a7a59fd2417787efcd2f741cd1571b84bf9561101efabf27ad8686231dd70ec427a305fcf6206e2c54e9e33755c529f6a52410f1feb70413f808bed7d46c2813a7877ccd18baf5668b9f7999ebb51c51ad3a8903dbe2c047c139a0b5cb67c1d7a8acd633425d26cb7846db4b8c13e546611af5472dbdf3d6768a3d5fa4c698f49f7e238af74debd7ca19722f679cfd4703201e7e604c95754d7491ca10969d1f7c1c04e1591f6f2d56fcc6ce2f17fec28cc20af9fc7f59a0dfbbd52033c7b5d165cc32974959497d213a94198787f9a17a78593b354357be1ab7bec050c32702496710f548e773dfcb13ce1f8a1b070be7192c45417710d08e407aee8d796900acf04c3b0cdf55847628c2374958346109f8ec8e010ee75617ac
-          [1655979686.733793][22876:22881] CHIP:DMG:     buffer_ptr = 281473299067744
-          [1655979686.733824][22876:22881] CHIP:DMG: }
-          [1655979686.733853][22876:22881] CHIP:DMG:
-          [1655979686.734050][22876:22881] CHIP:DMG: Attestation Elements (585 bytes) =
-          [1655979686.734090][22876:22881] CHIP:DMG: {
-          [1655979686.734122][22876:22881] CHIP:DMG:     Certification Declaration =
-          [1655979686.734153][22876:22881] CHIP:DMG:     {
-          [1655979686.735443][22876:22881] CHIP:DMG:         Format Version = 1
-          [1655979686.735503][22876:22881] CHIP:DMG:         Vendor Id = 65521
-          [1655979686.735540][22876:22881] CHIP:DMG:         Product Ids =
-          [1655979686.735572][22876:22881] CHIP:DMG:         {
-          [1655979686.735606][22876:22881] CHIP:DMG:             Product Id = 32768
-          [1655979686.735642][22876:22881] CHIP:DMG:             Product Id = 32769
-          [1655979686.735677][22876:22881] CHIP:DMG:             Product Id = 32770
-          [1655979686.735711][22876:22881] CHIP:DMG:             Product Id = 32771
-          [1655979686.735746][22876:22881] CHIP:DMG:             Product Id = 32772
-          [1655979686.735780][22876:22881] CHIP:DMG:             Product Id = 32773
-          [1655979686.735815][22876:22881] CHIP:DMG:             Product Id = 32774
-          [1655979686.735850][22876:22881] CHIP:DMG:             Product Id = 32775
-          [1655979686.735884][22876:22881] CHIP:DMG:             Product Id = 32776
-          [1655979686.735918][22876:22881] CHIP:DMG:             Product Id = 32777
-          [1655979686.735953][22876:22881] CHIP:DMG:             Product Id = 32778
-          [1655979686.735987][22876:22881] CHIP:DMG:             Product Id = 32779
-          [1655979686.736022][22876:22881] CHIP:DMG:             Product Id = 32780
-          [1655979686.736056][22876:22881] CHIP:DMG:             Product Id = 32781
-          [1655979686.736090][22876:22881] CHIP:DMG:             Product Id = 32782
-          [1655979686.736124][22876:22881] CHIP:DMG:             Product Id = 32783
-          [1655979686.736158][22876:22881] CHIP:DMG:             Product Id = 32784
-          [1655979686.736193][22876:22881] CHIP:DMG:             Product Id = 32785
-          [1655979686.736227][22876:22881] CHIP:DMG:             Product Id = 32786
-          [1655979686.736262][22876:22881] CHIP:DMG:             Product Id = 32787
-          [1655979686.736296][22876:22881] CHIP:DMG:             Product Id = 32788
-          [1655979686.736331][22876:22881] CHIP:DMG:             Product Id = 32789
-          [1655979686.736365][22876:22881] CHIP:DMG:             Product Id = 32790
-          [1655979686.736399][22876:22881] CHIP:DMG:             Product Id = 32791
-          [1655979686.736434][22876:22881] CHIP:DMG:             Product Id = 32792
-          [1655979686.736468][22876:22881] CHIP:DMG:             Product Id = 32793
-          [1655979686.736503][22876:22881] CHIP:DMG:             Product Id = 32794
-          [1655979686.736537][22876:22881] CHIP:DMG:             Product Id = 32795
-          [1655979686.736571][22876:22881] CHIP:DMG:             Product Id = 32796
-          [1655979686.736606][22876:22881] CHIP:DMG:             Product Id = 32797
-          [1655979686.736641][22876:22881] CHIP:DMG:             Product Id = 32798
-          [1655979686.736675][22876:22881] CHIP:DMG:             Product Id = 32799
-          [1655979686.736709][22876:22881] CHIP:DMG:             Product Id = 32800
-          [1655979686.736743][22876:22881] CHIP:DMG:             Product Id = 32801
-          [1655979686.736778][22876:22881] CHIP:DMG:             Product Id = 32802
-          [1655979686.736812][22876:22881] CHIP:DMG:             Product Id = 32803
-          [1655979686.736847][22876:22881] CHIP:DMG:             Product Id = 32804
-          [1655979686.736881][22876:22881] CHIP:DMG:             Product Id = 32805
-          [1655979686.736915][22876:22881] CHIP:DMG:             Product Id = 32806
-          [1655979686.736950][22876:22881] CHIP:DMG:             Product Id = 32807
-          [1655979686.736984][22876:22881] CHIP:DMG:             Product Id = 32808
-          [1655979686.737018][22876:22881] CHIP:DMG:             Product Id = 32809
-          [1655979686.737053][22876:22881] CHIP:DMG:             Product Id = 32810
-          [1655979686.737087][22876:22881] CHIP:DMG:             Product Id = 32811
-          [1655979686.737122][22876:22881] CHIP:DMG:             Product Id = 32812
-          [1655979686.737156][22876:22881] CHIP:DMG:             Product Id = 32813
-          [1655979686.737215][22876:22881] CHIP:DMG:             Product Id = 32814
-          [1655979686.737250][22876:22881] CHIP:DMG:             Product Id = 32815
-          [1655979686.737285][22876:22881] CHIP:DMG:             Product Id = 32816
-          [1655979686.737319][22876:22881] CHIP:DMG:             Product Id = 32817
-          [1655979686.737354][22876:22881] CHIP:DMG:             Product Id = 32818
-          [1655979686.737388][22876:22881] CHIP:DMG:             Product Id = 32819
-          [1655979686.737423][22876:22881] CHIP:DMG:             Product Id = 32820
-          [1655979686.737457][22876:22881] CHIP:DMG:             Product Id = 32821
-          [1655979686.737491][22876:22881] CHIP:DMG:             Product Id = 32822
-          [1655979686.737525][22876:22881] CHIP:DMG:             Product Id = 32823
-          [1655979686.737559][22876:22881] CHIP:DMG:             Product Id = 32824
-          [1655979686.737594][22876:22881] CHIP:DMG:             Product Id = 32825
-          [1655979686.737628][22876:22881] CHIP:DMG:             Product Id = 32826
-          [1655979686.737662][22876:22881] CHIP:DMG:             Product Id = 32827
-          [1655979686.737697][22876:22881] CHIP:DMG:             Product Id = 32828
-          [1655979686.737731][22876:22881] CHIP:DMG:             Product Id = 32829
-          [1655979686.737766][22876:22881] CHIP:DMG:             Product Id = 32830
-          [1655979686.737800][22876:22881] CHIP:DMG:             Product Id = 32831
-          [1655979686.737835][22876:22881] CHIP:DMG:             Product Id = 32832
-          [1655979686.737869][22876:22881] CHIP:DMG:             Product Id = 32833
-          [1655979686.738006][22876:22881] CHIP:DMG:             Product Id = 32834
-          [1655979686.738044][22876:22881] CHIP:DMG:             Product Id = 32835
-          [1655979686.738079][22876:22881] CHIP:DMG:             Product Id = 32836
-          [1655979686.738114][22876:22881] CHIP:DMG:             Product Id = 32837
-          [1655979686.738149][22876:22881] CHIP:DMG:             Product Id = 32838
-          [1655979686.738189][22876:22881] CHIP:DMG:             Product Id = 32839
-          [1655979686.738226][22876:22881] CHIP:DMG:             Product Id = 32840
-          [1655979686.738261][22876:22881] CHIP:DMG:             Product Id = 32841
-          [1655979686.738297][22876:22881] CHIP:DMG:             Product Id = 32842
-          [1655979686.738332][22876:22881] CHIP:DMG:             Product Id = 32843
-          [1655979686.738367][22876:22881] CHIP:DMG:             Product Id = 32844
-          [1655979686.738401][22876:22881] CHIP:DMG:             Product Id = 32845
-          [1655979686.738436][22876:22881] CHIP:DMG:             Product Id = 32846
-          [1655979686.738470][22876:22881] CHIP:DMG:             Product Id = 32847
-          [1655979686.738505][22876:22881] CHIP:DMG:             Product Id = 32848
-          [1655979686.738539][22876:22881] CHIP:DMG:             Product Id = 32849
-          [1655979686.738574][22876:22881] CHIP:DMG:             Product Id = 32850
-          [1655979686.738609][22876:22881] CHIP:DMG:             Product Id = 32851
-          [1655979686.738643][22876:22881] CHIP:DMG:             Product Id = 32852
-          [1655979686.738678][22876:22881] CHIP:DMG:             Product Id = 32853
-          [1655979686.738712][22876:22881] CHIP:DMG:             Product Id = 32854
-          [1655979686.738747][22876:22881] CHIP:DMG:             Product Id = 32855
-          [1655979686.738781][22876:22881] CHIP:DMG:             Product Id = 32856
-          [1655979686.738816][22876:22881] CHIP:DMG:             Product Id = 32857
-          [1655979686.738851][22876:22881] CHIP:DMG:             Product Id = 32858
-          [1655979686.738885][22876:22881] CHIP:DMG:             Product Id = 32859
-          [1655979686.738919][22876:22881] CHIP:DMG:             Product Id = 32860
-          [1655979686.738954][22876:22881] CHIP:DMG:             Product Id = 32861
-          [1655979686.738990][22876:22881] CHIP:DMG:             Product Id = 32862
-          [1655979686.739025][22876:22881] CHIP:DMG:             Product Id = 32863
-          [1655979686.739059][22876:22881] CHIP:DMG:             Product Id = 32864
-          [1655979686.739094][22876:22881] CHIP:DMG:             Product Id = 32865
-          [1655979686.739129][22876:22881] CHIP:DMG:             Product Id = 32866
-          [1655979686.739163][22876:22881] CHIP:DMG:             Product Id = 32867
-          [1655979686.739198][22876:22881] CHIP:DMG:         }
-          [1655979686.739234][22876:22881] CHIP:DMG:         Device Type Id = 22
-          [1655979686.739274][22876:22881] CHIP:DMG:         Certificate Id (19) = ZIG20142ZB330003-24
-          [1655979686.739312][22876:22881] CHIP:DMG:         Security Level = 0
-          [1655979686.739339][22876:22881] CHIP:DMG:         Security Information = 0
-          [1655979686.739363][22876:22881] CHIP:DMG:         Version Number = 9876
-          [1655979686.739387][22876:22881] CHIP:DMG:         Certification Type = 0
-          [1655979686.739409][22876:22881] CHIP:DMG:     }
-          [1655979686.739436][22876:22881] CHIP:DMG:     Attestation Nonce (32) = A27ABCFCEB61A2F43E76CB095D647E139194E216E3D69079BD8A0FFDDA58386B
-          [1655979686.739513][22876:22881] CHIP:DMG:     Timestamp = 0
-          [1655979686.739536][22876:22881] CHIP:DMG: }
-          [1655979686.739556][22876:22881] CHIP:DMG:
-          [1655979686.739586][22876:22881] CHIP:DMG:
-          [1655979686.739642][22876:22881] CHIP:DMG: Additional Fields =
-          [1655979686.739665][22876:22881] CHIP:DMG: {
-          [1655979686.739692][22876:22881] CHIP:DMG:     peer_address = BLE
-          [1655979686.739714][22876:22881] CHIP:DMG: }
-          [1655979686.739734][22876:22881] CHIP:DMG:
-          [1655979686.739772][22876:22881] CHIP:EM: Received message of type 0x9 with protocolId (0, 1) and MessageCounter:226447061 on exchange 35315i
-          [1655979686.739801][22876:22881] CHIP:EM: Found matching exchange: 35315i, Delegate: 0xffff9c00c6b0
-          [1655979686.739850][22876:22881] CHIP:DMG: ICR moving to [ResponseRe]
-          [1655979686.739894][22876:22881] CHIP:DMG: InvokeResponseMessage =
-          [1655979686.739919][22876:22881] CHIP:DMG: {
-          [1655979686.739943][22876:22881] CHIP:DMG:         suppressResponse = false,
-          [1655979686.739971][22876:22881] CHIP:DMG:         InvokeResponseIBs =
-          [1655979686.740003][22876:22881] CHIP:DMG:         [
-          [1655979686.740028][22876:22881] CHIP:DMG:                 InvokeResponseIB =
-          [1655979686.740080][22876:22881] CHIP:DMG:                 {
-          [1655979686.740111][22876:22881] CHIP:DMG:                         CommandDataIB =
-          [1655979686.740156][22876:22881] CHIP:DMG:                         {
-          [1655979686.740200][22876:22881] CHIP:DMG:                                 CommandPathIB =
-          [1655979686.740250][22876:22881] CHIP:DMG:                                 {
-          [1655979686.740301][22876:22881] CHIP:DMG:                                         EndpointId = 0x0,
-          [1655979686.740352][22876:22881] CHIP:DMG:                                         ClusterId = 0x3e,
-          [1655979686.740402][22876:22881] CHIP:DMG:                                         CommandId = 0x1,
-          [1655979686.740449][22876:22881] CHIP:DMG:                                 },
-          [1655979686.740486][22876:22881] CHIP:DMG:
-          [1655979686.740528][22876:22881] CHIP:DMG:                                 CommandFields =
-          [1655979686.740563][22876:22881] CHIP:DMG:                                 {
-          [1655979686.740602][22876:22881] CHIP:DMG:                                         0x0 = [
-          [1655979686.740742][22876:22881] CHIP:DMG:                                                         0x15, 0x31, 0x1, 0x1d, 0x2, 0x30, 0x82, 0x2, 0x19, 0x6, 0x9, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0xd, 0x1, 0x7, 0x2, 0xa0, 0x82, 0x2, 0xa, 0x30, 0x82, 0x2, 0x6, 0x2, 0x1, 0x3, 0x31, 0xd, 0x30, 0xb, 0x6, 0x9, 0x60, 0x86, 0x48, 0x1, 0x65, 0x3, 0x4, 0x2, 0x1, 0x30, 0x82, 0x1, 0x71, 0x6, 0x9, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0xd, 0x1, 0x7, 0x1, 0xa0, 0x82, 0x1, 0x62, 0x4, 0x82, 0x1, 0x5e, 0x15, 0x24, 0x0, 0x1, 0x25, 0x1, 0xf1, 0xff, 0x36, 0x2, 0x5, 0x0, 0x80, 0x5, 0x1, 0x80, 0x5, 0x2, 0x80, 0x5, 0x3, 0x80, 0x5, 0x4, 0x80, 0x5, 0x5, 0x80, 0x5, 0x6, 0x80, 0x5, 0x7, 0x80, 0x5, 0x8, 0x80, 0x5, 0x9, 0x80, 0x5, 0xa, 0x80, 0x5, 0xb, 0x80, 0x5, 0xc, 0x80, 0x5, 0xd, 0x80, 0x5, 0xe, 0x80, 0x5, 0xf, 0x80, 0x5, 0x10, 0x80, 0x5, 0x11, 0x80, 0x5, 0x12, 0x80, 0x5, 0x13, 0x80, 0x5, 0x14, 0x80, 0x5, 0x15, 0x80, 0x5, 0x16, 0x80, 0x5, 0x17, 0x80, 0x5, 0x18, 0x80, 0x5, 0x19, 0x80, 0x5, 0x1a, 0x80, 0x5, 0x1b, 0x80, 0x5, 0x1c, 0x80, 0x5, 0x1d, 0x80, 0x5, 0x1e, 0x80, 0x5, 0x1f, 0x80, 0x5, 0x20, 0x80, 0x5, 0x21, 0x80, 0x5, 0x22, 0x80, 0x5, 0x23, 0x80, 0x5, 0x24, 0x80, 0x5, 0x25, 0x80, 0x5, 0x26, 0x80, 0x5, 0x27, 0x80, 0x5, 0x28, 0x80, 0x5, 0x29, 0x80, 0x5, 0x2a, 0x80, 0x5, 0x2b, 0x80, 0x5, 0x2c, 0x80, 0x5, 0x2d, 0x80, 0x5, 0x2e, 0x80, 0x5, 0x2f, 0x80, 0x5, 0x30, 0x80, 0x5, 0x31, 0x80, 0x5, 0x32, 0x80, 0x5, 0x33, 0x80, 0x5, 0x34, 0x80, 0x5, 0x35, 0x80, 0x5, 0x36, 0x80, 0x5, 0x37, 0x80, 0x5, 0x38, 0x80, 0x5, 0x39, 0x80, 0x5, 0x3a, 0x80, 0x5, 0x3b, 0x80, 0x5, 0x3c, 0x80, 0x5, 0x3d, 0x80, 0x5, 0x3e, 0x80, 0x5, 0x3f, 0x80, 0x5, 0x40, 0x80, 0x5, 0x41, 0x80, 0x5, 0x42, 0x80, 0x5, 0x43, 0x80, 0x5, 0x44, 0x80, 0x5, 0x45, 0x80, 0x5, 0x46, 0x80, 0x5, 0x47, 0x80, 0x5, 0x48, 0x80, 0x5, 0x49, 0x80, 0x5, 0x4a, 0x80, 0x5, 0
-          [1655979686.740822][22876:22881] CHIP:DMG:                                         ]
-          [1655979686.740860][22876:22881] CHIP:DMG:                                         0x1 = [
-          [1655979686.740918][22876:22881] CHIP:DMG:                                                         0x64, 0x5d, 0x6b, 0xc7, 0xcf, 0x0, 0x7d, 0x2b, 0x4f, 0x7d, 0xa5, 0x6b, 0x40, 0x37, 0xe8, 0xc7, 0x1b, 0x7d, 0xd6, 0x39, 0xd5, 0x5, 0xad, 0x12, 0xdb, 0xb5, 0x54, 0x94, 0x4d, 0xd2, 0x2f, 0xc5, 0xd5, 0x9a, 0x66, 0x6d, 0x92, 0xcc, 0x40, 0xc6, 0xbb, 0xe3, 0x24, 0xc9, 0x9e, 0xfc, 0xa5, 0xc8, 0xb, 0xc4, 0xc6, 0x3f, 0xb8, 0xe7, 0x46, 0x6d, 0x2f, 0x2d, 0x24, 0x13, 0x83, 0xf5, 0xaa, 0xec,
-          [1655979686.740966][22876:22881] CHIP:DMG:                                         ]
-          [1655979686.741004][22876:22881] CHIP:DMG:                                 },
-          [1655979686.741039][22876:22881] CHIP:DMG:                         },
-          [1655979686.741077][22876:22881] CHIP:DMG:
-          [1655979686.741104][22876:22881] CHIP:DMG:                 },
-          [1655979686.741137][22876:22881] CHIP:DMG:
-          [1655979686.741174][22876:22881] CHIP:DMG:         ],
-          [1655979686.741206][22876:22881] CHIP:DMG:
-          [1655979686.741231][22876:22881] CHIP:DMG:         InteractionModelRevision = 1
-          [1655979686.741254][22876:22881] CHIP:DMG: },
-          [1655979686.741316][22876:22881] CHIP:DMG: Received Command Response Data, Endpoint=0 Cluster=0x0000_003E Command=0x0000_0001
-          [1655979686.741353][22876:22881] CHIP:CTL: Received Attestation Information from the device
-          [1655979686.741382][22876:22881] CHIP:CTL: Successfully finished commissioning step "SendAttestationRequest"
-          [1655979686.741451][22876:22881] CHIP:CTL: Commissioning stage next step: "SendAttestationRequest" -> "AttestationVerification"
+          [1659763321.702423][2548:2548] CHIP:DMG: InvokeResponseMessage =
+          [1659763321.702457][2548:2548] CHIP:DMG: {
+          [1659763321.702486][2548:2548] CHIP:DMG:         suppressResponse = false,
+          [1659763321.702510][2548:2548] CHIP:DMG:         InvokeResponseIBs =
+          [1659763321.702542][2548:2548] CHIP:DMG:         [
+          [1659763321.702576][2548:2548] CHIP:DMG:                 InvokeResponseIB =
+          [1659763321.702609][2548:2548] CHIP:DMG:                 {
+          [1659763321.702644][2548:2548] CHIP:DMG:                         CommandDataIB =
+          [1659763321.702685][2548:2548] CHIP:DMG:                         {
+          [1659763321.702715][2548:2548] CHIP:DMG:                                 CommandPathIB =
+          [1659763321.702757][2548:2548] CHIP:DMG:                                 {
+          [1659763321.702791][2548:2548] CHIP:DMG:                                         EndpointId = 0x0,
+          [1659763321.702836][2548:2548] CHIP:DMG:                                         ClusterId = 0x3e,
+          [1659763321.702877][2548:2548] CHIP:DMG:                                         CommandId = 0x1,
+          [1659763321.702909][2548:2548] CHIP:DMG:                                 },
+          [1659763321.702953][2548:2548] CHIP:DMG:
+          [1659763321.702992][2548:2548] CHIP:DMG:                                 CommandFields =
+          [1659763321.703025][2548:2548] CHIP:DMG:                                 {
+          [1659763321.703069][2548:2548] CHIP:DMG:                                         0x0 = [
+          [1659763321.703255][2548:2548] CHIP:DMG:                                                         0x15, 0x31, 0x1, 0x1d, 0x2, 0x30, 0x82, 0x2, 0x19, 0x6, 0x9, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0xd, 0x1, 0x7, 0x2, 0xa0, 0x82, 0x2, 0xa, 0x30, 0x82, 0x2, 0x6, 0x2, 0x1, 0x3, 0x31, 0xd, 0x30, 0xb, 0x6, 0x9, 0x60, 0x86, 0x48, 0x1, 0x65, 0x3, 0x4, 0x2, 0x1, 0x30, 0x82, 0x1, 0x71, 0x6, 0x9, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0xd, 0x1, 0x7, 0x1, 0xa0, 0x82, 0x1, 0x62, 0x4, 0x82, 0x1, 0x5e, 0x15, 0x24, 0x0, 0x1, 0x25, 0x1, 0xf1, 0xff, 0x36, 0x2, 0x5, 0x0, 0x80, 0x5, 0x1, 0x80, 0x5, 0x2, 0x80, 0x5, 0x3, 0x80, 0x5, 0x4, 0x80, 0x5, 0x5, 0x80, 0x5, 0x6, 0x80, 0x5, 0x7, 0x80, 0x5, 0x8, 0x80, 0x5, 0x9, 0x80, 0x5, 0xa, 0x80, 0x5, 0xb, 0x80, 0x5, 0xc, 0x80, 0x5, 0xd, 0x80, 0x5, 0xe, 0x80, 0x5, 0xf, 0x80, 0x5, 0x10, 0x80, 0x5, 0x11, 0x80, 0x5, 0x12, 0x80, 0x5, 0x13, 0x80, 0x5, 0x14, 0x80, 0x5, 0x15, 0x80, 0x5, 0x16, 0x80, 0x5, 0x17, 0x80, 0x5, 0x18, 0x80, 0x5, 0x19, 0x80, 0x5, 0x1a, 0x80, 0x5, 0x1b, 0x80, 0x5, 0x1c, 0x80, 0x5, 0x1d, 0x80, 0x5, 0x1e, 0x80, 0x5, 0x1f, 0x80, 0x5, 0x20, 0x80, 0x5, 0x21, 0x80, 0x5, 0x22, 0x80, 0x5, 0x23, 0x80, 0x5, 0x24, 0x80, 0x5, 0x25, 0x80, 0x5, 0x26, 0x80, 0x5, 0x27, 0x80, 0x5, 0x28, 0x80, 0x5, 0x29, 0x80, 0x5, 0x2a, 0x80, 0x5, 0x2b, 0x80, 0x5, 0x2c, 0x80, 0x5, 0x2d, 0x80, 0x5, 0x2e, 0x80, 0x5, 0x2f, 0x80, 0x5, 0x30, 0x80, 0x5, 0x31, 0x80, 0x5, 0x32, 0x80, 0x5, 0x33, 0x80, 0x5, 0x34, 0x80, 0x5, 0x35, 0x80, 0x5, 0x36, 0x80, 0x5, 0x37, 0x80, 0x5, 0x38, 0x80, 0x5, 0x39, 0x80, 0x5, 0x3a, 0x80, 0x5, 0x3b, 0x80, 0x5, 0x3c, 0x80, 0x5, 0x3d, 0x80, 0x5, 0x3e, 0x80, 0x5, 0x3f, 0x80, 0x5, 0x40, 0x80, 0x5, 0x41, 0x80, 0x5, 0x42, 0x80, 0x5, 0x43, 0x80, 0x5, 0x44, 0x80, 0x5, 0x45, 0x80, 0x5, 0x46, 0x80, 0x5, 0x47, 0x80, 0x5, 0x48, 0x80, 0x5, 0x49, 0x80, 0x5, 0x4a, 0x80, 0x5, 0
+          [1659763321.703346][2548:2548] CHIP:DMG:                                         ] (585 bytes)
+          [1659763321.703385][2548:2548] CHIP:DMG:                                         0x1 = [
+          [1659763321.703437][2548:2548] CHIP:DMG:                                                         0x10, 0x8d, 0x56, 0xec, 0x4f, 0x23, 0xe, 0x70, 0x29, 0x34, 0x30, 0x39, 0xcf, 0xae, 0xe1, 0x29, 0xb8, 0x9, 0x11, 0x78, 0xc6, 0x96, 0xe6, 0xf, 0x80, 0x9e, 0x4e, 0xf4, 0xe1, 0xd2, 0x74, 0xb1, 0x50, 0xa7, 0x51, 0xff, 0xc1, 0x9f, 0x8a, 0x93, 0xc0, 0x6c, 0xc8, 0xd7, 0x5a, 0xbe, 0x43, 0x4b, 0xf2, 0x6a, 0x75, 0xfd, 0x15, 0xac, 0xc4, 0xdc, 0x99, 0x7, 0xd9, 0xd5, 0xab, 0xee, 0x70, 0x9e,
+          [1659763321.703477][2548:2548] CHIP:DMG:                                         ] (64 bytes)
+          [1659763321.703527][2548:2548] CHIP:DMG:                                 },
+          [1659763321.703559][2548:2548] CHIP:DMG:                         },
+          [1659763321.703603][2548:2548] CHIP:DMG:
+          [1659763321.703637][2548:2548] CHIP:DMG:                 },
+          [1659763321.703670][2548:2548] CHIP:DMG:
+          [1659763321.703704][2548:2548] CHIP:DMG:         ],
+          [1659763321.703735][2548:2548] CHIP:DMG:
+          [1659763321.703768][2548:2548] CHIP:DMG:         InteractionModelRevision = 1
+          [1659763321.703792][2548:2548] CHIP:DMG: },
+          [1659763321.703825][2548:2548] CHIP:DMG:
+          [1659763321.704081][2548:2548] CHIP:DMG: ICR moving to [CommandSen]
+          [1659763321.704116][2548:2548] CHIP:DMG: ICR moving to [AwaitingDe]"
+      disabled: true
+
+    - label: ""
+      verification: |
+          Verify that DUT Completes the commissioning process successfully on TH(all-clusters-app)
+
+          [1655979694.071847][22876:22881] CHIP:CTL: Received CommissioningComplete response, errorCode=0
+          [1655979694.071913][22876:22881] CHIP:CTL: Successfully finished commissioning step "SendComplete"
+          [1655979694.071968][22876:22881] CHIP:CTL: Commissioning stage next step: "SendComplete" -> "Cleanup"
+          [1655979694.072031][22876:22881] CHIP:CTL: Performing next commissioning step "Cleanup"
+          [1655979694.072081][22876:22881] CHIP:DIS: Closing all BLE connections
+          [1655979694.072136][22876:22881] CHIP:IN: Clearing BLE pending packets.
+          [1655979694.072268][22876:22881] CHIP:BLE: Auto-closing end point"s BLE connection.
+          [1655979694.072328][22876:22881] CHIP:DL: Closing BLE GATT connection (con 0xffffa806f3f0)
+          [1655979694.072477][22876:22881] CHIP:CTL: Successfully finished commissioning step "Cleanup"
+          [1655979694.072547][22876:22881] CHIP:TOO: Device commissioning completed with success
       disabled: true
 
     - label: "Factory Reset TH1 so that it is commissionable again"
@@ -451,9 +206,8 @@
 
     - label: "Start the commissioning process of TH1 on DUT again"
       verification: |
-          sudo ./chip-all-clusters-app --wifi
+          sudo ./chip-all-clusters-app --wifi   --trace_decode 1
 
-          DUT as commissioner side:
           ./chip-tool pairing ble-wifi 1 zigbeehome matter123 20202021 3841 --trace_decode 1
 
           [1650455358.501816][4366:4371] CHIP:TOO: Device commissioning completed with success
@@ -461,262 +215,106 @@
 
     - label: "DUT generates 32-byte AttestationNonce"
       verification: |
-          Verify  attestation Nonce in DUT as commissioner side:
+          To generate the Attestation Nonce give below command
 
-          [1655968443.635813][21387:21392] CHIP:DMG:     }
-          [1655968443.635876][21387:21392] CHIP:DMG:     Attestation Nonce (32) = 8A02A4533766C4310201E4E6DE820A51877AF337961BF2D12848268B8F323363
-          [1655968443.635933][21387:21392] CHIP:DMG:     Timestamp = 0
-          [1655968443.635985][21387:21392] CHIP:DMG: }
+          echo hex:$(hexdump -vn32 -e"4/4 "%08X" " /dev/urandom)
+
+          The generated Attestation Nonce is hex:8A02A4533766C4310201E4E6DE820A51877AF337961BF2D12848268B8F323363
       disabled: true
 
     - label:
           "DUT sends AttestationRequest Command with AttestationNonce as field
           to the TH1."
       verification: |
-          DUT  Verify  attestation Nonce in DUT as commissioner side:
+          ./chip-tool operationalcredentials attestation-request hex:8A02A4533766C4310201E4E6DE820A51877AF337961BF2D12848268B8F323363 1 0  --trace_decode 1
 
-          [1655968443.238850][21387:21392] CHIP:CTL: Commissioning stage next step: "SendDACCertificateRequest" -> "SendAttestationRequest"
-          [1655968443.238918][21387:21392] CHIP:CTL: Performing next commissioning step "SendAttestationRequest"
-          [1655968443.238971][21387:21392] CHIP:CTL: Sending Attestation Request to the device.
-          [1655968443.239021][21387:21392] CHIP:CTL: Sending Attestation request to 0xffff88000b60 device
-          [1655968443.239143][21387:21392] CHIP:DMG: ICR moving to [AddingComm]
-          [1655968443.239218][21387:21392] CHIP:DMG: ICR moving to [AddedComma]
-          [1655968443.239760][21387:21392] CHIP:IN: Prepared secure message 0xffff9afdc958 to 0xFFFFFFFB00000000 (0)  of type 0x8 and protocolId (0, 1) on exchange 11674i with MessageCounter:162800414.
-          [1655968443.239876][21387:21392] CHIP:IN: Sending encrypted msg 0xffff9afdc958 with MessageCounter:162800414 to 0xFFFFFFFB00000000 (0) at monotonic time: 00000000059CF446 msec
-          [1655968443.240366][21387:21392] CHIP:DMG: >> to BLE | 162800414 | [Interaction Model  (1) / InvokeCommandRequest (0x08) / Session = 52324 / Exchange = 11674]
-          [1655968443.240462][21387:21392] CHIP:DMG: Header Flags =
-          [1655968443.240517][21387:21392] CHIP:DMG: {
-          [1655968443.240601][21387:21392] CHIP:DMG:     Exchange (0x01) =
-          [1655968443.240655][21387:21392] CHIP:DMG:     {
-          [1655968443.240703][21387:21392] CHIP:DMG:         Initiator = true
-          [1655968443.240754][21387:21392] CHIP:DMG:     }
-          [1655968443.240821][21387:21392] CHIP:DMG: }
-          [1655968443.240877][21387:21392] CHIP:DMG:
-          [1655968443.240942][21387:21392] CHIP:DMG: Encrypted Payload (94 bytes) =
-          [1655968443.240996][21387:21392] CHIP:DMG: {
-          [1655968443.241048][21387:21392] CHIP:DMG:     data = 0064cc001e23b409b5afa9bd2bb3de206e818cc5af07da0982488815e5b83f6bd533a4d997416c9f18774dc3aa1b98c9dbb94d8d76188e230bdc8cc5cde8b8606d5e8e7041a700efe9bc4b48a66c9120631ef0553d850f70701829ab81ed
-          [1655968443.241105][21387:21392] CHIP:DMG:     buffer_ptr = 281472963527376
-          [1655968443.241156][21387:21392] CHIP:DMG: }
-          [1655968443.241302][21387:21392] CHIP:DMG:
-          [1655968443.241469][21387:21392] CHIP:DMG: InvokeRequestMessage =
-          [1655968443.241535][21387:21392] CHIP:DMG: {
-          [1655968443.241591][21387:21392] CHIP:DMG:         suppressResponse = false,
-          [1655968443.241654][21387:21392] CHIP:DMG:         timedRequest = false,
-          [1655968443.241713][21387:21392] CHIP:DMG:         InvokeRequests =
-          [1655968443.241786][21387:21392] CHIP:DMG:         [
-          [1655968443.241849][21387:21392] CHIP:DMG:                 CommandDataIB =
-          [1655968443.241981][21387:21392] CHIP:DMG:                 {
-          [1655968443.242047][21387:21392] CHIP:DMG:                         CommandPathIB =
-          [1655968443.242125][21387:21392] CHIP:DMG:                         {
-          [1655968443.242204][21387:21392] CHIP:DMG:                                 EndpointId = 0x0,
-          [1655968443.242288][21387:21392] CHIP:DMG:                                 ClusterId = 0x3e,
-          [1655968443.242368][21387:21392] CHIP:DMG:                                 CommandId = 0x0,
-          [1655968443.242444][21387:21392] CHIP:DMG:                         },
-          [1655968443.242525][21387:21392] CHIP:DMG:
-          [1655968443.242591][21387:21392] CHIP:DMG:                         CommandFields =
-          [1655968443.242667][21387:21392] CHIP:DMG:                         {
-          [1655968443.242745][21387:21392] CHIP:DMG:                                 0x0 = [
-          [1655968443.242847][21387:21392] CHIP:DMG:                                                 0x8a, 0x2, 0xa4, 0x53, 0x37, 0x66, 0xc4, 0x31, 0x2, 0x1, 0xe4, 0xe6, 0xde, 0x82, 0xa, 0x51, 0x87, 0x7a, 0xf3, 0x37, 0x96, 0x1b, 0xf2, 0xd1, 0x28, 0x48, 0x26, 0x8b, 0x8f, 0x32, 0x33, 0x63,
-          [1655968443.242937][21387:21392] CHIP:DMG:                                 ]
-          [1655968443.243017][21387:21392] CHIP:DMG:                         },
-          [1655968443.243088][21387:21392] CHIP:DMG:                 },
-          [1655968443.243161][21387:21392] CHIP:DMG:
-          [1655968443.243221][21387:21392] CHIP:DMG:         ],
-          [1655968443.243293][21387:21392] CHIP:DMG:
-          [1655968443.243354][21387:21392] CHIP:DMG:         InteractionModelRevision = 1
-          [1655968443.243411][21387:21392] CHIP:DMG: },
-          [1655968443.243466][21387:21392] CHIP:DMG:
-          [1655968443.243733][21387:21392] CHIP:DMG: ICR moving to [CommandSen]
-          [1655968443.243814][21387:21392] CHIP:CTL: Sent Attestation request, waiting for the Attestation Information
-          [1655968443.243913][21387:21392] CHIP:DMG: ICR moving to [AwaitingDe]
-          [1655968443.377585][21387:21392] CHIP:DL: HandlePlatformSpecificBLEEvent 16387
-          [1655968443.425671][21387:21390] CHIP:DL: Indication received, conn = 0xffff900200d0
-          [1655968443.425933][21387:21392] CHIP:DL: HandlePlatformSpecificBLEEvent 16389
-          [1655968443.526449][21387:21390] CHIP:DL: Indication received, conn = 0xffff900200d0
-          [1655968443.526705][21387:21392] CHIP:DL: HandlePlatformSpecificBLEEvent 16389
-          [1655968443.623985][21387:21390] CHIP:DL: Indication received, conn = 0xffff900200d0
-          [1655968443.624679][21387:21392] CHIP:DL: HandlePlatformSpecificBLEEvent 16389
-          [1655968443.626106][21387:21392] CHIP:DMG: << from BLE | 163275440 | [Interaction Model  (1) / InvokeCommandResponse (0x09) / Session = 42825 / Exchange = 11674]
-          [1655968443.626225][21387:21392] CHIP:DMG: Header Flags =
-          [1655968443.626282][21387:21392] CHIP:DMG: {
-          [1655968443.626381][21387:21392] CHIP:DMG: }
-          [1655968443.626434][21387:21392] CHIP:DMG:
-          [1655968443.626507][21387:21392] CHIP:DMG: Encrypted Payload (716 bytes) =
-          [1655968443.626561][21387:21392] CHIP:DMG: {
-          [1655968443.626614][21387:21392] CHIP:DMG:     data = 0049a700b062bb0923457d8fefc710b7ad04681eed0dae3bdab2dd3f1a74ed767f5f21220b66a8848209e1d6cf9192cbe38656e0c90075ff926fa241d824328c05b9adb20ef1b0fa26479db4b03daff247c0823c4068a6c0e10c15cdf487354ff2ed897eabb41e9748c993ed4ca0833e4802d609fc228056e244b6e9131f83baeb98636d1b7bea66c49b79a860e62f86d91da04b27513a61e04ac3c1f902886bf877c6a8460c974204cde916ded0177e64d7d1cec19391bb02c60a294ef7f98789a87a55cbe7146163da7fe990ea9a231c597c32250353a525b124272afcccd9f74535f8c9eeed98dbb9b2ef21d0300ec76ccf58d1b162eb081dd8b7373f8a33e8122a2b4ed1f4ea61669443ef7b02acd9f8ff64168b3b61fa77545beaf8e2ded4d99618c528f67c4c421ef4dc58ef2c7eab0d85cfecb5a67ab354dc9e42c83386afc0b294b18e097ce17a1933cf363de9863e594dfbd772c0ca469d15b3ec5b61b5615f5f29ee3440a7338031dcb9ab4bfb60dc8598cccd050aea5b6cc972ef84fd5487b61fb4922c2407111d8250c1d5bebae187fb4e757c58247b295da551723d7670cd347c774842e1f20be2dc14da73888ffac99fc92ca1db1d246e567b94539dcdc44aa339ce928211958bc7254fd5c09fed1b90375ed22f5160adddc77344ddd6649fc3c8c6f1b8904167d369f80e38ccaaa463ddfc9bd61c590bfe35a8a51704828ba599c63ccb26ff9026fd6178ac045c322e3df5a98a17fa6bafeeab5f603a90389fb21a3aaa7558b324b76528882f658d52fc439d103316a1ee6767c0f9441554ac0c9b34176960e72ae74c74f6286339dc0292c1a069ec2f43da81d73c4767eb6629fe1545dd25bab4e034b68b618da401747f798fe1fb166356c3bdbca93394dad6d3607a3f7a1301c386ac7d561d9d6c893391fe1e9887ad58a3625ec1582b0c2a48af2eafb5a32a089e084e47bcaa08cfe4c0d8ecae356fcff8b5d85f2668b7b87a3aba18
-          [1655968443.626737][21387:21392] CHIP:DMG:     buffer_ptr = 281472963520464
-          [1655968443.626788][21387:21392] CHIP:DMG: }
-          [1655968443.626837][21387:21392] CHIP:DMG:
-          [1655968443.627153][21387:21392] CHIP:DMG: Attestation Elements (585 bytes) =
-          [1655968443.627217][21387:21392] CHIP:DMG: {
-          [1655968443.627269][21387:21392] CHIP:DMG:     Certification Declaration =
-          [1655968443.627320][21387:21392] CHIP:DMG:     {
-          [1655968443.629460][21387:21392] CHIP:DMG:         Format Version = 1
-          [1655968443.629555][21387:21392] CHIP:DMG:         Vendor Id = 65521
-          [1655968443.629616][21387:21392] CHIP:DMG:         Product Ids =
-          [1655968443.629670][21387:21392] CHIP:DMG:         {
-          [1655968443.629727][21387:21392] CHIP:DMG:             Product Id = 32768
-          [1655968443.629785][21387:21392] CHIP:DMG:             Product Id = 32769
-          [1655968443.629842][21387:21392] CHIP:DMG:             Product Id = 32770
-          [1655968443.629899][21387:21392] CHIP:DMG:             Product Id = 32771
-          [1655968443.629955][21387:21392] CHIP:DMG:             Product Id = 32772
-          [1655968443.630011][21387:21392] CHIP:DMG:             Product Id = 32773
-          [1655968443.630069][21387:21392] CHIP:DMG:             Product Id = 32774
-          [1655968443.630125][21387:21392] CHIP:DMG:             Product Id = 32775
-          [1655968443.630182][21387:21392] CHIP:DMG:             Product Id = 32776
-          [1655968443.630239][21387:21392] CHIP:DMG:             Product Id = 32777
-          [1655968443.630287][21387:21392] CHIP:DMG:             Product Id = 32778
-          [1655968443.630334][21387:21392] CHIP:DMG:             Product Id = 32779
-          [1655968443.630387][21387:21392] CHIP:DMG:             Product Id = 32780
-          [1655968443.630443][21387:21392] CHIP:DMG:             Product Id = 32781
-          [1655968443.630499][21387:21392] CHIP:DMG:             Product Id = 32782
-          [1655968443.630556][21387:21392] CHIP:DMG:             Product Id = 32783
-          [1655968443.630612][21387:21392] CHIP:DMG:             Product Id = 32784
-          [1655968443.630670][21387:21392] CHIP:DMG:             Product Id = 32785
-          [1655968443.630727][21387:21392] CHIP:DMG:             Product Id = 32786
-          [1655968443.630783][21387:21392] CHIP:DMG:             Product Id = 32787
-          [1655968443.630839][21387:21392] CHIP:DMG:             Product Id = 32788
-          [1655968443.630896][21387:21392] CHIP:DMG:             Product Id = 32789
-          [1655968443.630952][21387:21392] CHIP:DMG:             Product Id = 32790
-          [1655968443.631009][21387:21392] CHIP:DMG:             Product Id = 32791
-          [1655968443.631067][21387:21392] CHIP:DMG:             Product Id = 32792
-          [1655968443.631129][21387:21392] CHIP:DMG:             Product Id = 32793
-          [1655968443.631186][21387:21392] CHIP:DMG:             Product Id = 32794
-          [1655968443.631243][21387:21392] CHIP:DMG:             Product Id = 32795
-          [1655968443.631298][21387:21392] CHIP:DMG:             Product Id = 32796
-          [1655968443.631355][21387:21392] CHIP:DMG:             Product Id = 32797
-          [1655968443.631411][21387:21392] CHIP:DMG:             Product Id = 32798
-          [1655968443.631467][21387:21392] CHIP:DMG:             Product Id = 32799
-          [1655968443.631524][21387:21392] CHIP:DMG:             Product Id = 32800
-          [1655968443.631581][21387:21392] CHIP:DMG:             Product Id = 32801
-          [1655968443.631637][21387:21392] CHIP:DMG:             Product Id = 32802
-          [1655968443.631693][21387:21392] CHIP:DMG:             Product Id = 32803
-          [1655968443.631749][21387:21392] CHIP:DMG:             Product Id = 32804
-          [1655968443.631806][21387:21392] CHIP:DMG:             Product Id = 32805
-          [1655968443.631862][21387:21392] CHIP:DMG:             Product Id = 32806
-          [1655968443.631918][21387:21392] CHIP:DMG:             Product Id = 32807
-          [1655968443.631974][21387:21392] CHIP:DMG:             Product Id = 32808
-          [1655968443.632031][21387:21392] CHIP:DMG:             Product Id = 32809
-          [1655968443.632088][21387:21392] CHIP:DMG:             Product Id = 32810
-          [1655968443.632146][21387:21392] CHIP:DMG:             Product Id = 32811
-          [1655968443.632202][21387:21392] CHIP:DMG:             Product Id = 32812
-          [1655968443.632259][21387:21392] CHIP:DMG:             Product Id = 32813
-          [1655968443.632315][21387:21392] CHIP:DMG:             Product Id = 32814
-          [1655968443.632371][21387:21392] CHIP:DMG:             Product Id = 32815
-          [1655968443.632428][21387:21392] CHIP:DMG:             Product Id = 32816
-          [1655968443.632485][21387:21392] CHIP:DMG:             Product Id = 32817
-          [1655968443.632541][21387:21392] CHIP:DMG:             Product Id = 32818
-          [1655968443.632597][21387:21392] CHIP:DMG:             Product Id = 32819
-          [1655968443.632653][21387:21392] CHIP:DMG:             Product Id = 32820
-          [1655968443.632709][21387:21392] CHIP:DMG:             Product Id = 32821
-          [1655968443.632766][21387:21392] CHIP:DMG:             Product Id = 32822
-          [1655968443.632822][21387:21392] CHIP:DMG:             Product Id = 32823
-          [1655968443.632879][21387:21392] CHIP:DMG:             Product Id = 32824
-          [1655968443.632935][21387:21392] CHIP:DMG:             Product Id = 32825
-          [1655968443.632991][21387:21392] CHIP:DMG:             Product Id = 32826
-          [1655968443.633047][21387:21392] CHIP:DMG:             Product Id = 32827
-          [1655968443.633104][21387:21392] CHIP:DMG:             Product Id = 32828
-          [1655968443.633188][21387:21392] CHIP:DMG:             Product Id = 32829
-          [1655968443.633251][21387:21392] CHIP:DMG:             Product Id = 32830
-          [1655968443.633307][21387:21392] CHIP:DMG:             Product Id = 32831
-          [1655968443.633364][21387:21392] CHIP:DMG:             Product Id = 32832
-          [1655968443.633420][21387:21392] CHIP:DMG:             Product Id = 32833
-          [1655968443.633477][21387:21392] CHIP:DMG:             Product Id = 32834
-          [1655968443.633533][21387:21392] CHIP:DMG:             Product Id = 32835
-          [1655968443.633590][21387:21392] CHIP:DMG:             Product Id = 32836
-          [1655968443.633646][21387:21392] CHIP:DMG:             Product Id = 32837
-          [1655968443.633702][21387:21392] CHIP:DMG:             Product Id = 32838
-          [1655968443.633759][21387:21392] CHIP:DMG:             Product Id = 32839
-          [1655968443.633816][21387:21392] CHIP:DMG:             Product Id = 32840
-          [1655968443.633873][21387:21392] CHIP:DMG:             Product Id = 32841
-          [1655968443.633928][21387:21392] CHIP:DMG:             Product Id = 32842
-          [1655968443.633985][21387:21392] CHIP:DMG:             Product Id = 32843
-          [1655968443.634041][21387:21392] CHIP:DMG:             Product Id = 32844
-          [1655968443.634098][21387:21392] CHIP:DMG:             Product Id = 32845
-          [1655968443.634154][21387:21392] CHIP:DMG:             Product Id = 32846
-          [1655968443.634211][21387:21392] CHIP:DMG:             Product Id = 32847
-          [1655968443.634267][21387:21392] CHIP:DMG:             Product Id = 32848
-          [1655968443.634324][21387:21392] CHIP:DMG:             Product Id = 32849
-          [1655968443.634381][21387:21392] CHIP:DMG:             Product Id = 32850
-          [1655968443.634438][21387:21392] CHIP:DMG:             Product Id = 32851
-          [1655968443.634494][21387:21392] CHIP:DMG:             Product Id = 32852
-          [1655968443.634551][21387:21392] CHIP:DMG:             Product Id = 32853
-          [1655968443.634607][21387:21392] CHIP:DMG:             Product Id = 32854
-          [1655968443.634663][21387:21392] CHIP:DMG:             Product Id = 32855
-          [1655968443.634719][21387:21392] CHIP:DMG:             Product Id = 32856
-          [1655968443.634776][21387:21392] CHIP:DMG:             Product Id = 32857
-          [1655968443.634833][21387:21392] CHIP:DMG:             Product Id = 32858
-          [1655968443.634889][21387:21392] CHIP:DMG:             Product Id = 32859
-          [1655968443.634946][21387:21392] CHIP:DMG:             Product Id = 32860
-          [1655968443.635003][21387:21392] CHIP:DMG:             Product Id = 32861
-          [1655968443.635059][21387:21392] CHIP:DMG:             Product Id = 32862
-          [1655968443.635116][21387:21392] CHIP:DMG:             Product Id = 32863
-          [1655968443.635173][21387:21392] CHIP:DMG:             Product Id = 32864
-          [1655968443.635230][21387:21392] CHIP:DMG:             Product Id = 32865
-          [1655968443.635287][21387:21392] CHIP:DMG:             Product Id = 32866
-          [1655968443.635343][21387:21392] CHIP:DMG:             Product Id = 32867
-          [1655968443.635399][21387:21392] CHIP:DMG:         }
-          [1655968443.635457][21387:21392] CHIP:DMG:         Device Type Id = 22
-          [1655968443.635521][21387:21392] CHIP:DMG:         Certificate Id (19) = ZIG20142ZB330003-24
-          [1655968443.635582][21387:21392] CHIP:DMG:         Security Level = 0
-          [1655968443.635641][21387:21392] CHIP:DMG:         Security Information = 0
-          [1655968443.635699][21387:21392] CHIP:DMG:         Version Number = 9876
-          [1655968443.635757][21387:21392] CHIP:DMG:         Certification Type = 0
-          [1655968443.635813][21387:21392] CHIP:DMG:     }
-          [1655968443.635876][21387:21392] CHIP:DMG:     Attestation Nonce (32) = 8A02A4533766C4310201E4E6DE820A51877AF337961BF2D12848268B8F323363
-          [1655968443.635933][21387:21392] CHIP:DMG:     Timestamp = 0
-          [1655968443.635985][21387:21392] CHIP:DMG: }
-          [1655968443.636035][21387:21392] CHIP:DMG:
-          [1655968443.636102][21387:21392] CHIP:DMG:
-          [1655968443.636210][21387:21392] CHIP:DMG: Additional Fields =
-          [1655968443.636267][21387:21392] CHIP:DMG: {
-          [1655968443.636328][21387:21392] CHIP:DMG:     peer_address = BLE
-          [1655968443.636382][21387:21392] CHIP:DMG: }
-          [1655968443.636431][21387:21392] CHIP:DMG:
-          [1655968443.636508][21387:21392] CHIP:EM: Received message of type 0x9 with protocolId (0, 1) and MessageCounter:163275440 on exchange 11674i
-          [1655968443.636575][21387:21392] CHIP:EM: Found matching exchange: 11674i, Delegate: 0xffff88005ab0
-          [1655968443.636680][21387:21392] CHIP:DMG: ICR moving to [ResponseRe]
-          [1655968443.636777][21387:21392] CHIP:DMG: InvokeResponseMessage =
-          [1655968443.636837][21387:21392] CHIP:DMG: {
-          [1655968443.636895][21387:21392] CHIP:DMG:         suppressResponse = false,
-          [1655968443.636954][21387:21392] CHIP:DMG:         InvokeResponseIBs =
-          [1655968443.637030][21387:21392] CHIP:DMG:         [
-          [1655968443.637090][21387:21392] CHIP:DMG:                 InvokeResponseIB =
-          [1655968443.637204][21387:21392] CHIP:DMG:                 {
-          [1655968443.637271][21387:21392] CHIP:DMG:                         CommandDataIB =
-          [1655968443.637363][21387:21392] CHIP:DMG:                         {
-          [1655968443.637448][21387:21392] CHIP:DMG:                                 CommandPathIB =
-          [1655968443.637530][21387:21392] CHIP:DMG:                                 {
-          [1655968443.637624][21387:21392] CHIP:DMG:                                         EndpointId = 0x0,
-          [1655968443.637721][21387:21392] CHIP:DMG:                                         ClusterId = 0x3e,
-          [1655968443.637816][21387:21392] CHIP:DMG:                                         CommandId = 0x1,
-          [1655968443.637905][21387:21392] CHIP:DMG:                                 },
-          [1655968443.637990][21387:21392] CHIP:DMG:
-          [1655968443.638076][21387:21392] CHIP:DMG:                                 CommandFields =
-          [1655968443.638165][21387:21392] CHIP:DMG:                                 {
-          [1655968443.638247][21387:21392] CHIP:DMG:                                         0x0 = [
-          [1655968443.638586][21387:21392] CHIP:DMG:                                                         0x15, 0x31, 0x1, 0x1d, 0x2, 0x30, 0x82, 0x2, 0x19, 0x6, 0x9, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0xd, 0x1, 0x7, 0x2, 0xa0, 0x82, 0x2, 0xa, 0x30, 0x82, 0x2, 0x6, 0x2, 0x1, 0x3, 0x31, 0xd, 0x30, 0xb, 0x6, 0x9, 0x60, 0x86, 0x48, 0x1, 0x65, 0x3, 0x4, 0x2, 0x1, 0x30, 0x82, 0x1, 0x71, 0x6, 0x9, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0xd, 0x1, 0x7, 0x1, 0xa0, 0x82, 0x1, 0x62, 0x4, 0x82, 0x1, 0x5e, 0x15, 0x24, 0x0, 0x1, 0x25, 0x1, 0xf1, 0xff, 0x36, 0x2, 0x5, 0x0, 0x80, 0x5, 0x1, 0x80, 0x5, 0x2, 0x80, 0x5, 0x3, 0x80, 0x5, 0x4, 0x80, 0x5, 0x5, 0x80, 0x5, 0x6, 0x80, 0x5, 0x7, 0x80, 0x5, 0x8, 0x80, 0x5, 0x9, 0x80, 0x5, 0xa, 0x80, 0x5, 0xb, 0x80, 0x5, 0xc, 0x80, 0x5, 0xd, 0x80, 0x5, 0xe, 0x80, 0x5, 0xf, 0x80, 0x5, 0x10, 0x80, 0x5, 0x11, 0x80, 0x5, 0x12, 0x80, 0x5, 0x13, 0x80, 0x5, 0x14, 0x80, 0x5, 0x15, 0x80, 0x5, 0x16, 0x80, 0x5, 0x17, 0x80, 0x5, 0x18, 0x80, 0x5, 0x19, 0x80, 0x5, 0x1a, 0x80, 0x5, 0x1b, 0x80, 0x5, 0x1c, 0x80, 0x5, 0x1d, 0x80, 0x5, 0x1e, 0x80, 0x5, 0x1f, 0x80, 0x5, 0x20, 0x80, 0x5, 0x21, 0x80, 0x5, 0x22, 0x80, 0x5, 0x23, 0x80, 0x5, 0x24, 0x80, 0x5, 0x25, 0x80, 0x5, 0x26, 0x80, 0x5, 0x27, 0x80, 0x5, 0x28, 0x80, 0x5, 0x29, 0x80, 0x5, 0x2a, 0x80, 0x5, 0x2b, 0x80, 0x5, 0x2c, 0x80, 0x5, 0x2d, 0x80, 0x5, 0x2e, 0x80, 0x5, 0x2f, 0x80, 0x5, 0x30, 0x80, 0x5, 0x31, 0x80, 0x5, 0x32, 0x80, 0x5, 0x33, 0x80, 0x5, 0x34, 0x80, 0x5, 0x35, 0x80, 0x5, 0x36, 0x80, 0x5, 0x37, 0x80, 0x5, 0x38, 0x80, 0x5, 0x39, 0x80, 0x5, 0x3a, 0x80, 0x5, 0x3b, 0x80, 0x5, 0x3c, 0x80, 0x5, 0x3d, 0x80, 0x5, 0x3e, 0x80, 0x5, 0x3f, 0x80, 0x5, 0x40, 0x80, 0x5, 0x41, 0x80, 0x5, 0x42, 0x80, 0x5, 0x43, 0x80, 0x5, 0x44, 0x80, 0x5, 0x45, 0x80, 0x5, 0x46, 0x80, 0x5, 0x47, 0x80, 0x5, 0x48, 0x80, 0x5, 0x49, 0x80, 0x5, 0x4a, 0x80, 0x5, 0
-          [1655968443.638783][21387:21392] CHIP:DMG:                                         ]
-          [1655968443.638877][21387:21392] CHIP:DMG:                                         0x1 = [
-          [1655968443.639021][21387:21392] CHIP:DMG:                                                         0x9a, 0xd9, 0x9c, 0x10, 0x25, 0x22, 0xe0, 0xe7, 0x83, 0xb3, 0x78, 0x28, 0xb5, 0xa, 0xb4, 0x9b, 0xb7, 0xe6, 0x32, 0x1, 0x26, 0xe7, 0x8b, 0x6, 0x62, 0x28, 0x9c, 0x71, 0xe8, 0xc8, 0x72, 0x1a, 0x45, 0x56, 0x1e, 0xaf, 0x30, 0xd0, 0xdb, 0xb6, 0xda, 0xce, 0x31, 0xcc, 0x20, 0x38, 0x42, 0x2a, 0x2e, 0xd5, 0x6c, 0x5, 0x48, 0x5, 0xab, 0xc5, 0xa6, 0xff, 0x97, 0x3f, 0x1f, 0x9b, 0xd7, 0x27,
-          [1655968443.639140][21387:21392] CHIP:DMG:                                         ]
-          [1655968443.639235][21387:21392] CHIP:DMG:                                 },
-          [1655968443.639311][21387:21392] CHIP:DMG:                         },
-          [1655968443.639399][21387:21392] CHIP:DMG:
-          [1655968443.639468][21387:21392] CHIP:DMG:                 },
-          [1655968443.639549][21387:21392] CHIP:DMG:
-          [1655968443.639608][21387:21392] CHIP:DMG:         ],
-          [1655968443.639683][21387:21392] CHIP:DMG:
-          [1655968443.639742][21387:21392] CHIP:DMG:         InteractionModelRevision = 1
-          [1655968443.639799][21387:21392] CHIP:DMG: },
-          [1655968443.639943][21387:21392] CHIP:DMG: Received Command Response Data, Endpoint=0 Cluster=0x0000_003E Command=0x0000_0001
-          [1655968443.640024][21387:21392] CHIP:CTL: Received Attestation Information from the device
-          [1655968443.640090][21387:21392] CHIP:CTL: Successfully finished commissioning step "SendAttestationRequest"
+          DUT sends AttestationRequest Command with AttestationNonce as field to the TH. verify the below log in TH(all-clusters-app). As the current TH ref app (all-clusters-app) doesnot decode the received request message, nonce value has been shown from the TH ref app response message , as TH ref app use the same nonce value in the response message
+
+
+          [1659766925.553077][2548:2548] CHIP:EM: Flushed pending ack for MessageCounter:21300581 on exchange 25753r
+          [1659766925.553529][2548:2548] CHIP:ZCL: OpCreds: AttestationRequest successful.
+          [1659766925.553593][2548:2548] CHIP:DMG: ICR moving to [ Preparing]
+          [1659766925.553626][2548:2548] CHIP:DMG: ICR moving to [AddingComm]
+          [1659766925.553656][2548:2548] CHIP:DMG: ICR moving to [AddedComma]
+          [1659766925.553723][2548:2548] CHIP:DMG: Decreasing reference count for CommandHandler, remaining 0
+          [1659766925.553762][2548:2548] CHIP:EM: Piggybacking Ack for MessageCounter:21300581 on exchange: 25753r
+          [1659766925.554133][2548:2548] CHIP:IN: Prepared secure message 0xaaab005405e8 to 0x000000000001B669 (1)  of type 0x9 and protocolId (0, 1) on exchange 25753r with MessageCounter:12111678.
+          [1659766925.554186][2548:2548] CHIP:IN: Sending encrypted msg 0xaaab005405e8 with MessageCounter:12111678 to 0x000000000001B669 (1) at monotonic time: 000000000048C10F msec
+          [1659766925.554596][2548:2548] CHIP:DMG: >> to UDP:[fe80::e65f:1ff:fe0f:3baf%eth0]:42934 | 12111678 | [Interaction Model  (1) / InvokeCommandResponse (0x09) / Session = 5451 / Exchange = 25753]
+          [1659766925.554641][2548:2548] CHIP:DMG: Header Flags =
+
+          [1659766925.555048][2548:2548] CHIP:DMG:
+          [1659766925.555215][2548:2548] CHIP:DMG: Attestation Elements (585 bytes) =
+          [1659766925.555241][2548:2548] CHIP:DMG: {
+          [1659766925.555263][2548:2548] CHIP:DMG:     Certification Declaration =
+          [1659766925.555283][2548:2548] CHIP:DMG:     {
+          [1659766925.556165][2548:2548] CHIP:DMG:         Format Version = 1
+          [1659766925.556207][2548:2548] CHIP:DMG:         Vendor Id = 65521
+          [1659766925.556231][2548:2548] CHIP:DMG:         Product Ids =
+          [1659766925.556253][2548:2548] CHIP:DMG:         {
+          [1659766925.556276][2548:2548] CHIP:DMG:             Product Id = 32768
+          [1659766925.556300][2548:2548] CHIP:DMG:             Product Id = 32769
+          [1659766925.556323][2548:2548] CHIP:DMG:             Product Id = 32770
+          [1659766925.556346][2548:2548] CHIP:DMG:             Product Id = 32771
+          [1659766925.556394][2548:2548] CHIP:DMG:             Product Id = 32772
+          [1659766925.556418][2548:2548] CHIP:DMG:             Product Id = 32773
+
+          [1659766925.558571][2548:2548] CHIP:DMG:         }
+          [1659766925.558595][2548:2548] CHIP:DMG:         Device Type Id = 22
+          [1659766925.558621][2548:2548] CHIP:DMG:         Certificate Id (19) = ZIG20142ZB330003-24
+          [1659766925.558646][2548:2548] CHIP:DMG:         Security Level = 0
+          [1659766925.558669][2548:2548] CHIP:DMG:         Security Information = 0
+          [1659766925.558692][2548:2548] CHIP:DMG:         Version Number = 9876
+          [1659766925.558715][2548:2548] CHIP:DMG:         Certification Type = 0
+          [1659766925.558737][2548:2548] CHIP:DMG:     }
+          [1659766925.558763][2548:2548] CHIP:DMG:     Attestation Nonce (32) = 8A02A4533766C4310201E4E6DE820A51877AF337961BF2D12848268B8F323363
+          [1659766925.558785][2548:2548] CHIP:DMG:     Timestamp = 0
+          [1659766925.558805][2548:2548] CHIP:DMG: }
+          [1659766925.558824][2548:2548] CHIP:DMG:
+          [1659766925.558863][2548:2548] CHIP:DMG: InvokeResponseMessage =
+          [1659766925.558888][2548:2548] CHIP:DMG: {
+          [1659766925.558911][2548:2548] CHIP:DMG:         suppressResponse = false,
+          [1659766925.558934][2548:2548] CHIP:DMG:         InvokeResponseIBs =
+          [1659766925.558965][2548:2548] CHIP:DMG:         [
+          [1659766925.558988][2548:2548] CHIP:DMG:                 InvokeResponseIB =
+          [1659766925.559021][2548:2548] CHIP:DMG:                 {
+          [1659766925.559046][2548:2548] CHIP:DMG:                         CommandDataIB =
+          [1659766925.559078][2548:2548] CHIP:DMG:                         {
+          [1659766925.559106][2548:2548] CHIP:DMG:                                 CommandPathIB =
+          [1659766925.559216][2548:2548] CHIP:DMG:                                 {
+          [1659766925.559256][2548:2548] CHIP:DMG:                                         EndpointId = 0x0,
+          [1659766925.559293][2548:2548] CHIP:DMG:                                         ClusterId = 0x3e,
+          [1659766925.559327][2548:2548] CHIP:DMG:                                         CommandId = 0x1,
+          [1659766925.559358][2548:2548] CHIP:DMG:                                 },
+          [1659766925.559392][2548:2548] CHIP:DMG:
+          [1659766925.559422][2548:2548] CHIP:DMG:                                 CommandFields =
+          [1659766925.559454][2548:2548] CHIP:DMG:                                 {
+          [1659766925.559486][2548:2548] CHIP:DMG:                                         0x0 = [
+          [1659766925.559624][2548:2548] CHIP:DMG:                                                         0x15, 0x31, 0x1, 0x1d, 0x2, 0x30, 0x82, 0x2, 0x19, 0x6, 0x9, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0xd, 0x1, 0x7, 0x2, 0xa0, 0x82, 0x2, 0xa, 0x30, 0x82, 0x2, 0x6, 0x2, 0x1, 0x3, 0x31, 0xd, 0x30, 0xb, 0x6, 0x9, 0x60, 0x86, 0x48, 0x1, 0x65, 0x3, 0x4, 0x2, 0x1, 0x30, 0x82, 0x1, 0x71, 0x6, 0x9, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0xd, 0x1, 0x7, 0x1, 0xa0, 0x82, 0x1, 0x62, 0x4, 0x82, 0x1, 0x5e, 0x15, 0x24, 0x0, 0x1, 0x25, 0x1, 0xf1, 0xff, 0x36, 0x2, 0x5, 0x0, 0x80, 0x5, 0x1, 0x80, 0x5, 0x2, 0x80, 0x5, 0x3, 0x80, 0x5, 0x4, 0x80, 0x5, 0x5, 0x80, 0x5, 0x6, 0x80, 0x5, 0x7, 0x80, 0x5, 0x8, 0x80, 0x5, 0x9, 0x80, 0x5, 0xa, 0x80, 0x5, 0xb, 0x80, 0x5, 0xc, 0x80, 0x5, 0xd, 0x80, 0x5, 0xe, 0x80, 0x5, 0xf, 0x80, 0x5, 0x10, 0x80, 0x5, 0x11, 0x80, 0x5, 0x12, 0x80, 0x5, 0x13, 0x80, 0x5, 0x14, 0x80, 0x5, 0x15, 0x80, 0x5, 0x16, 0x80, 0x5, 0x17, 0x80, 0x5, 0x18, 0x80, 0x5, 0x19, 0x80, 0x5, 0x1a, 0x80, 0x5, 0x1b, 0x80, 0x5, 0x1c, 0x80, 0x5, 0x1d, 0x80, 0x5, 0x1e, 0x80, 0x5, 0x1f, 0x80, 0x5, 0x20, 0x80, 0x5, 0x21, 0x80, 0x5, 0x22, 0x80, 0x5, 0x23, 0x80, 0x5, 0x24, 0x80, 0x5, 0x25, 0x80, 0x5, 0x26, 0x80, 0x5, 0x27, 0x80, 0x5, 0x28, 0x80, 0x5, 0x29, 0x80, 0x5, 0x2a, 0x80, 0x5, 0x2b, 0x80, 0x5, 0x2c, 0x80, 0x5, 0x2d, 0x80, 0x5, 0x2e, 0x80, 0x5, 0x2f, 0x80, 0x5, 0x30, 0x80, 0x5, 0x31, 0x80, 0x5, 0x32, 0x80, 0x5, 0x33, 0x80, 0x5, 0x34, 0x80, 0x5, 0x35, 0x80, 0x5, 0x36, 0x80, 0x5, 0x37, 0x80, 0x5, 0x38, 0x80, 0x5, 0x39, 0x80, 0x5, 0x3a, 0x80, 0x5, 0x3b, 0x80, 0x5, 0x3c, 0x80, 0x5, 0x3d, 0x80, 0x5, 0x3e, 0x80, 0x5, 0x3f, 0x80, 0x5, 0x40, 0x80, 0x5, 0x41, 0x80, 0x5, 0x42, 0x80, 0x5, 0x43, 0x80, 0x5, 0x44, 0x80, 0x5, 0x45, 0x80, 0x5, 0x46, 0x80, 0x5, 0x47, 0x80, 0x5, 0x48, 0x80, 0x5, 0x49, 0x80, 0x5, 0x4a, 0x80, 0x5, 0
+          [1659766925.559699][2548:2548] CHIP:DMG:                                         ] (585 bytes)
+          [1659766925.559740][2548:2548] CHIP:DMG:                                         0x1 = [
+          [1659766925.559795][2548:2548] CHIP:DMG:                                                         0x1d, 0x25, 0x59, 0xf0, 0xa2, 0x23, 0xcf, 0x54, 0x4e, 0x46, 0xa3, 0x6d, 0x46, 0x57, 0x32, 0xa9, 0xd7, 0xed, 0x9f, 0x97, 0x4d, 0xbc, 0xbc, 0xc1, 0x1b, 0x37, 0x18, 0x29, 0x1c, 0x40, 0x94, 0xc, 0x80, 0x7, 0x6c, 0x78, 0xfd, 0xc7, 0xfc, 0x2b, 0x8e, 0x5a, 0x55, 0x70, 0xac, 0xed, 0x40, 0xd2, 0xf, 0x4b, 0xa7, 0x7d, 0x9c, 0x58, 0x31, 0x3, 0xee, 0x2a, 0x15, 0xd8, 0xda, 0x82, 0xfb, 0x53,
+          [1659766925.559840][2548:2548] CHIP:DMG:                                         ] (64 bytes)
       disabled: true
 
     - label:
           "TH1 records the AttestationNonce received in AttestationRequest as
           Nonce_2"
       verification: |
-          save
+          ./chip-tool operationalcredentials attestation-request hex:8A02A4533766C4310201E4E6DE820A51877AF337961BF2D12848268B8F323363 1 0  --trace_decode 1
+
+          TH1 records the AttestationNonce received in AttestationRequest as Nonce_2 for usage in later steps.
+
+          [1659766925.558737][2548:2548] CHIP:DMG:     }
+          [1659766925.558763][2548:2548] CHIP:DMG:     Attestation Nonce (32) = 8A02A4533766C4310201E4E6DE820A51877AF337961BF2D12848268B8F323363
+          [1659766925.558785][2548:2548] CHIP:DMG:     Timestamp = 0
+          [1659766925.558805][2548:2548] CHIP:DMG: }
+      disabled: true
+
+    - label: ""
+      verification: |
+          Verify the value of NONCE in step 9 and 3 are different
+
+          NONCE value in step 3 is      Attestation Nonce (32) = CF9146F33636FEC51CDCB9161D2F5EE72E4F1196CC9D5FAB417F388AFA42F110
+          NONCE value in step 9 is Attestation Nonce (32) = 8A02A4533766C4310201E4E6DE820A51877AF337961BF2D12848268B8F323363
       disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_DA_1_4.yaml b/src/app/tests/suites/certification/Test_TC_DA_1_4.yaml
index 54e3ae4..056047d 100644
--- a/src/app/tests/suites/certification/Test_TC_DA_1_4.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DA_1_4.yaml
@@ -26,11 +26,15 @@
     endpoint: 0
 
 tests:
+    - label: "Note"
+      verification: |
+          Chip-tool command used below are an example to verify the  DUT as client test cases. For certification test, we expect DUT should have a capability or way to run the equivalent command.
+      disabled: true
+
     - label: "Start the commissioning process of TH1 on DUT"
       verification: |
           sudo ./chip-all-clusters-app --wifi
 
-          DUT as commissioner side:
           ./chip-tool pairing ble-wifi 1 zigbeehome matter123 20202021 3841 --trace_decode 1
 
           [1650455358.501816][4366:4371] CHIP:TOO: Device commissioning completed with success
@@ -49,7 +53,7 @@
           "DUT sends AttestationRequest Command with AttestationNonce as field
           to the TH1."
       verification: |
-          DUT sends AttestationRequest Command with AttestationNonce as field to the TH1.
+          DUT sends AttestationRequest Command with AttestationNonce as field to the TH1, verify attestation response is received on TH(all-clusters-app) log
 
            ./chip-tool operationalcredentials attestation-request hex:F573438E58E445EAB50665023A298E351446F5E5E9493F05F4C63CCC02E1F834 1 0
 
@@ -79,7 +83,7 @@
 
           3. Copy the result from step 2 in json file and transfer the json file to Raspi That will be running chip-all-clusters-app
 
-          4. Commission DUT to TH using the above generated CD by using dac_provider parameter
+          4. Commission TH to DUT using the above generated CD by using dac_provider parameter
 
           ------>sudo ./chip-all-clusters-app --dac_provide /dec_message.json
 
@@ -164,7 +168,7 @@
 
           3. Copy the result from step 2 in json file and transfer the json file to Raspi That will be running chip-all-clusters-app
 
-          4. Commission DUT to TH using the above generated CD by using dac_provider parameter
+          4. Commission TH to DUT using the above generated CD by using dac_provider parameter
 
           sudo rm -rf /tmp/chip_*
           ./all-cluster-app --wifi --dac_provider /dec_3.json
@@ -216,7 +220,7 @@
 
           3. Copy the result from step 2 in json file and transfer the json file to Raspi That will be running chip-all-clusters-app
 
-          4. Commission DUT to TH using the above generated CD by using dac_provider parameter
+          4. Commission TH to DUT using the above generated CD by using dac_provider parameter
 
           sudo rm -rf /tmp/chip_*
           sudo ./chip-all-clusters-app  --dac_provider /cd.json
diff --git a/src/app/tests/suites/certification/Test_TC_DA_1_6.yaml b/src/app/tests/suites/certification/Test_TC_DA_1_6.yaml
index bfd0dbd..8881c34 100644
--- a/src/app/tests/suites/certification/Test_TC_DA_1_6.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DA_1_6.yaml
@@ -24,6 +24,11 @@
     endpoint: 0
 
 tests:
+    - label: "Note"
+      verification: |
+          Chip-tool command used below are an example to verify the  DUT as client test cases. For certification test, we expect DUT should have a capability or way to run the equivalent command.
+      disabled: true
+
     - label:
           "Pre-Conditions 1. Device Attestation is completed 2. PAI, DAC
           certificates are obtained and validated against externally obtained
@@ -34,7 +39,7 @@
 
     - label: "DUT completes the attestation procedure"
       verification: |
-          DUT as commissioner side:
+          Veriy attestation request is sent on TH(all-clusters-app)
 
           [1655374218.114327][35023:35028] CHIP:CTL: Performing next commissioning step "SendAttestationRequest"
           [1655374218.114378][35023:35028] CHIP:CTL: Sending Attestation Request to the device.
@@ -285,7 +290,7 @@
 
           ./chip-tool generalcommissioning arm-fail-safe 500 900 1 0
 
-          Verify ArmFailSafeResponse in TH log :
+          Verify ArmFailSafeResponse in TH(all-clusters-app) log :
           [1657546015.217932][18649:18654] CHIP:DMG: Received Command Response Data, Endpoint=0 Cluster=0x0000_0030 Command=0x0000_0001
           [1657546015.217979][18649:18654] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0030 Command 0x0000_0001
           [1657546015.218043][18649:18654] CHIP:TOO:   ArmFailSafeResponse: {
@@ -296,7 +301,7 @@
 
           ./chip-tool operationalcredentials csrrequest hex:F707BFC795117AAD94D5D95586B3B33984B475E00FFB5950BA21736FFB0FAFDE 1 0 --IsForUpdateNOC true
 
-          Verify CSRResponse in TH log:
+          Verify CSRResponse in TH(all-cluster-app) log:
           [1657546020.124932][18656:18661] CHIP:DMG: Received Command Response Data, Endpoint=0 Cluster=0x0000_003E Command=0x0000_0005
           [1657546020.124991][18656:18661] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_003E Command 0x0000_0005
           [1657546020.125052][18656:18661] CHIP:TOO:   CSRResponse: {
diff --git a/src/app/tests/suites/certification/Test_TC_DA_1_7.yaml b/src/app/tests/suites/certification/Test_TC_DA_1_7.yaml
index 184b655..471121b 100644
--- a/src/app/tests/suites/certification/Test_TC_DA_1_7.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DA_1_7.yaml
@@ -43,23 +43,13 @@
           "TH sends CertificateChainRequest Command to DUT1 with the
           CertificateType set to PAICertificate"
       verification: |
-          To get DAC value, send below command.
-          ./chip-tool operationalcredentials certificate-chain-request 1 1 0
-
-          "Verify in TH log:
-
-          [1657774717.721972][7956:7961] CHIP:DMG: Received Command Response Data, Endpoint=0 Cluster=0x0000_003E Command=0x0000_0003
-          [1657774717.722019][7956:7961] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_003E Command 0x0000_0003
-          [1657774717.722135][7956:7961] CHIP:TOO:   CertificateChainResponse: {
-          [1657774717.722181][7956:7961] CHIP:TOO:     certificate: 308201E73082018EA003020102020869CDF10DE9E54ED1300A06082A8648CE3D040302303D3125302306035504030C1C4D6174746572204465762050414920307846464631206E6F2050494431143012060A2B0601040182A27C02010C04464646313020170D3232303230353030303030305A180F39393939313233313233353935395A30533125302306035504030C1C4D61747465722044657620444143203078464646312F30783830303131143012060A2B0601040182A27C02010C044646463131143012060A2B0601040182A27C02020C04383030313059301306072A8648CE3D020106082A8648CE3D03010703420004463AC69342910A0E5588FC6FF56BB63E62ECCECB148F7D4EB03EE552601415767D16A5C663F793E49123260B8297A7CD7E7CFC7B316B39D98E90D29377738E82A360305E300C0603551D130101FF04023000300E0603551D0F0101FF040403020780301D0603551D0E0416041488DDE7B300382932CFF734C04624810F44168A6F301F0603551D2304183016801463540E47F64B1C38D13884A462D16C195D8FFB3C300A06082A8648CE3D040302
-          [1657774717.722269][7956:7961] CHIP:TOO:     ...........: 034700304402200127A27B4B44610EE2FCDC4D2B7885563660BC0F76F17219ED6A08DFB2B3C1CD02206B59E0AF45F3EB2A85B919D35731528C6028C415239545E108E4E54E70971353
-          [1657774717.722297][7956:7961] CHIP:TOO:    }
-
+          Verify that the DUT returns a CertificateChainResponse. Save the returned Certificate as "pai_1"
 
           To get PAI value, send below command.
-          ./chip-tool operationalcredentials certificate-chain-request 2 1 0
 
-          "Verify in TH log:
+          ./chip-tool operationalcredentials certificate-chain-request 2 1 0  --trace_decode 1
+
+          "Verify in TH(chip-tool) log:
 
           [1657774756.281112][7964:7969] CHIP:DMG: Received Command Response Data, Endpoint=0 Cluster=0x0000_003E Command=0x0000_0003
           [1657774756.281164][7964:7969] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_003E Command 0x0000_0003
@@ -73,12 +63,25 @@
           "TH sends CertificateChainRequest Command to DUT1 with the
           CertificateType set to DACCertificate"
       verification: |
-          See above
+          Verify that the DUT returns a CertificateChainResponse. Save the returned Certificate as "dac_1"
+
+          To get DAC value, send below command.
+
+          ./chip-tool operationalcredentials certificate-chain-request 1 1 0  --trace_decode 1
+
+          "Verify in TH(all-clusters-app) log:
+
+          [1657774717.721972][7956:7961] CHIP:DMG: Received Command Response Data, Endpoint=0 Cluster=0x0000_003E Command=0x0000_0003
+          [1657774717.722019][7956:7961] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_003E Command 0x0000_0003
+          [1657774717.722135][7956:7961] CHIP:TOO:   CertificateChainResponse: {
+          [1657774717.722181][7956:7961] CHIP:TOO:     certificate: 308201E73082018EA003020102020869CDF10DE9E54ED1300A06082A8648CE3D040302303D3125302306035504030C1C4D6174746572204465762050414920307846464631206E6F2050494431143012060A2B0601040182A27C02010C04464646313020170D3232303230353030303030305A180F39393939313233313233353935395A30533125302306035504030C1C4D61747465722044657620444143203078464646312F30783830303131143012060A2B0601040182A27C02010C044646463131143012060A2B0601040182A27C02020C04383030313059301306072A8648CE3D020106082A8648CE3D03010703420004463AC69342910A0E5588FC6FF56BB63E62ECCECB148F7D4EB03EE552601415767D16A5C663F793E49123260B8297A7CD7E7CFC7B316B39D98E90D29377738E82A360305E300C0603551D130101FF04023000300E0603551D0F0101FF040403020780301D0603551D0E0416041488DDE7B300382932CFF734C04624810F44168A6F301F0603551D2304183016801463540E47F64B1C38D13884A462D16C195D8FFB3C300A06082A8648CE3D040302
+          [1657774717.722269][7956:7961] CHIP:TOO:     ...........: 034700304402200127A27B4B44610EE2FCDC4D2B7885563660BC0F76F17219ED6A08DFB2B3C1CD02206B59E0AF45F3EB2A85B919D35731528C6028C415239545E108E4E54E70971353
+          [1657774717.722297][7956:7961] CHIP:TOO:    }
       disabled: true
 
     - label: "TH extracts the Authority Key Identifier from the PAI certificate"
       verification: |
-          During commissioning we will get PAI  certificate,  see in below log:
+          During commissioning we will get PAI  certificate, see on TH(chip-tool) log:
 
           [1659415376.883870][2666:2671] CHIP:CTL: Performing next commissioning step "SendPAICertificateRequest"
           [1659415376.883925][2666:2671] CHIP:CTL: Sending request for PAI certificate
@@ -273,6 +276,225 @@
 
     - label: "TH extracts the public key from the DAC and saves as pk_1"
       verification: |
+          During commissioning we will get DAC certificate,  see on TH(chip-tool) log:
+
+          [1659509320.714103][3165:3170] CHIP:CTL: Performing next commissioning step "SendDACCertificateRequest"
+          [1659509320.714155][3165:3170] CHIP:CTL: Sending request for DAC certificate
+          [1659509320.714225][3165:3170] CHIP:CTL: Sending Certificate Chain request to 0xffff74000b60 device
+          [1659509320.714397][3165:3170] CHIP:DMG: ICR moving to [AddingComm]
+          [1659509320.714470][3165:3170] CHIP:DMG: ICR moving to [AddedComma]
+          [1659509320.715027][3165:3170] CHIP:IN: Prepared secure message 0xffff74001d38 to 0xFFFFFFFB00000000 (0)  of type 0x8 and protocolId (0, 1) on exchange 17089i with MessageCounter:86888459.
+          [1659509320.715128][3165:3170] CHIP:IN: Sending encrypted msg 0xffff74001d38 with MessageCounter:86888459 to 0xFFFFFFFB00000000 (0) at monotonic time: 0000000000ADAD48 msec
+          [1659509320.715804][3165:3170] CHIP:DMG: >> to UDP:[fe80::e65f:1ff:fe0f:2753%eth0]:5540 | 86888459 | [Interaction Model  (1) / InvokeCommandRequest (0x08) / Session = 29587 / Exchange = 17089]
+          [1659509320.715898][3165:3170] CHIP:DMG: Header Flags =
+          [1659509320.715952][3165:3170] CHIP:DMG: {
+          [1659509320.716035][3165:3170] CHIP:DMG:     Exchange (0x05) =
+          [1659509320.716089][3165:3170] CHIP:DMG:     {
+          [1659509320.716158][3165:3170] CHIP:DMG:         Initiator = true
+          [1659509320.716212][3165:3170] CHIP:DMG:         NeedsAck = true
+          [1659509320.716264][3165:3170] CHIP:DMG:     }
+          [1659509320.716353][3165:3170] CHIP:DMG: }
+          [1659509320.716405][3165:3170] CHIP:DMG:
+          [1659509320.716491][3165:3170] CHIP:DMG: Encrypted Payload (62 bytes) =
+          [1659509320.716544][3165:3170] CHIP:DMG: {
+          [1659509320.716616][3165:3170] CHIP:DMG:     data = 009373000bd02d05c296dbc864194390f3d020eb61ee335c0d61263dd0d5f4849a5c6a601f73c80e6775d2b422e816cf8e3ae224d59c01f53783a657bd0d
+          [1659509320.716672][3165:3170] CHIP:DMG:     buffer_ptr = 281472627949680
+          [1659509320.716742][3165:3170] CHIP:DMG: }
+          [1659509320.716793][3165:3170] CHIP:DMG:
+          [1659509320.716965][3165:3170] CHIP:DMG: InvokeRequestMessage =
+          [1659509320.717029][3165:3170] CHIP:DMG: {
+          [1659509320.717084][3165:3170] CHIP:DMG:         suppressResponse = false,
+          [1659509320.717148][3165:3170] CHIP:DMG:         timedRequest = false,
+          [1659509320.717206][3165:3170] CHIP:DMG:         InvokeRequests =
+          [1659509320.717276][3165:3170] CHIP:DMG:         [
+          [1659509320.717335][3165:3170] CHIP:DMG:                 CommandDataIB =
+          [1659509320.717399][3165:3170] CHIP:DMG:                 {
+          [1659509320.717461][3165:3170] CHIP:DMG:                         CommandPathIB =
+          [1659509320.717535][3165:3170] CHIP:DMG:                         {
+          [1659509320.717788][3165:3170] CHIP:DMG:                                 EndpointId = 0x0,
+          [1659509320.717870][3165:3170] CHIP:DMG:                                 ClusterId = 0x3e,
+          [1659509320.717947][3165:3170] CHIP:DMG:                                 CommandId = 0x2,
+          [1659509320.718019][3165:3170] CHIP:DMG:                         },
+          [1659509320.718116][3165:3170] CHIP:DMG:
+          [1659509320.718181][3165:3170] CHIP:DMG:                         CommandFields =
+          [1659509320.718273][3165:3170] CHIP:DMG:                         {
+          [1659509320.718436][3165:3170] CHIP:DMG:                                 0x0 = 1,
+          [1659509320.718521][3165:3170] CHIP:DMG:                         },
+          [1659509320.718609][3165:3170] CHIP:DMG:                 },
+          [1659509320.718706][3165:3170] CHIP:DMG:
+          [1659509320.718766][3165:3170] CHIP:DMG:         ],
+          [1659509320.718855][3165:3170] CHIP:DMG:
+          [1659509320.718915][3165:3170] CHIP:DMG:         InteractionModelRevision = 1
+          [1659509320.718971][3165:3170] CHIP:DMG: },
+          [1659509320.719024][3165:3170] CHIP:DMG:
+          [1659509320.719407][3165:3170] CHIP:DMG: ICR moving to [CommandSen]
+          [1659509320.719536][3165:3170] CHIP:DMG: ICR moving to [AwaitingDe]
+          [1659509320.719608][3165:3170] CHIP:EM: Sending Standalone Ack for MessageCounter:148943591 on exchange 17088i
+          [1659509320.720332][3165:3170] CHIP:IN: Prepared secure message 0xffff88e5c9e8 to 0xFFFFFFFB00000000 (0)  of type 0x10 and protocolId (0, 0) on exchange 17088i with MessageCounter:86888460.
+          [1659509320.720493][3165:3170] CHIP:IN: Sending encrypted msg 0xffff88e5c9e8 with MessageCounter:86888460 to 0xFFFFFFFB00000000 (0) at monotonic time: 0000000000ADAD4E msec
+          [1659509320.721152][3165:3170] CHIP:DMG: >> to UDP:[fe80::e65f:1ff:fe0f:2753%eth0]:5540 | 86888460 | [Secure Channel  (0) / Standalone Ack (0x10) / Session = 29587 / Exchange = 17088]
+          [1659509320.721242][3165:3170] CHIP:DMG: Header Flags =
+          [1659509320.721298][3165:3170] CHIP:DMG: {
+          [1659509320.721381][3165:3170] CHIP:DMG:     Exchange (0x03) =
+          [1659509320.721434][3165:3170] CHIP:DMG:     {
+          [1659509320.721505][3165:3170] CHIP:DMG:         Initiator = true
+          [1659509320.721562][3165:3170] CHIP:DMG:         AckMsg = 148943591
+          [1659509320.721634][3165:3170] CHIP:DMG:     }
+          [1659509320.721706][3165:3170] CHIP:DMG: }
+          [1659509320.721759][3165:3170] CHIP:DMG:
+          [1659509320.721846][3165:3170] CHIP:DMG: Encrypted Payload (34 bytes) =
+          [1659509320.721901][3165:3170] CHIP:DMG: {
+          [1659509320.721972][3165:3170] CHIP:DMG:     data = 009373000cd02d05ff4214e467b1c7a3664b8d8c5628c4e291f833b9f2f35d953235
+          [1659509320.722027][3165:3170] CHIP:DMG:     buffer_ptr = 281472627939824
+          [1659509320.722077][3165:3170] CHIP:DMG: }
+          [1659509320.722125][3165:3170] CHIP:DMG:
+          [1659509320.722485][3165:3170] CHIP:EM: Flushed pending ack for MessageCounter:148943591 on exchange 17088i
+          [1659509320.724260][3165:3170] CHIP:DMG: << from UDP:[fe80::e65f:1ff:fe0f:2753%eth0]:5540 | 148943592 | [Interaction Model  (1) / InvokeCommandResponse (0x09) / Session = 49327 / Exchange = 17089]
+          [1659509320.724362][3165:3170] CHIP:DMG: Header Flags =
+          [1659509320.724417][3165:3170] CHIP:DMG: {
+          [1659509320.724503][3165:3170] CHIP:DMG:     Exchange (0x06) =
+          [1659509320.724558][3165:3170] CHIP:DMG:     {
+          [1659509320.724647][3165:3170] CHIP:DMG:         AckMsg = 86888459
+          [1659509320.724704][3165:3170] CHIP:DMG:         NeedsAck = true
+          [1659509320.724756][3165:3170] CHIP:DMG:     }
+          [1659509320.724827][3165:3170] CHIP:DMG: }
+          [1659509320.724879][3165:3170] CHIP:DMG:
+          [1659509320.724950][3165:3170] CHIP:DMG: Encrypted Payload (559 bytes) =
+          [1659509320.725003][3165:3170] CHIP:DMG: {
+          [1659509320.725056][3165:3170] CHIP:DMG:     data = 00afc000e8b2e008b40e7ea031654ba52d0e71f9a877ec233377ef9eef00611412271b31992e30753df53f0bfac6b5f9a30217f67d03a17653c5ee991a0266f3ef286188e3f977d3dd94fbbb60323a74c2b685309d607af14c0b4c7214c7579cf43e9ed90d4256382e5d40bc46796e06fdb6b220bbc5e7b6fc812f2c5bc357fcbda79d6dcb464f42d04ab1708fdfb5ea8b90c3720257e9da78ba877b24b99d7f104c4ee199923c876d8c07903beab5f93a784f226d1e82f8d5f001f23457965c9ddbcc8661d00b7202a9932b1ae92ff36d80b8e5ac2d18d65e8a3957486ef86ca4f056218677958f9be17ab6c54d3dedb7e88a144ef607f692d3131276dbb2803e6e93dc5d330ef13b0e00289e6a9186e1f1c0e5b9615ace2c1d544f4b6bc58f700b47a11fc2278977b2a1595c96532daefe44db899e3f75f473ffbf4ac1e93ba76033dfa562beedf4b9a5fe9b985e6a0227efdcf5ced1b966bd78addb1ad5950c6378dc149a6372888683a8539a4d59958c7460b1968b0d8dcfa2d3660dc07c4e0e44095ef14c4cdd249727caad086e8630f9df296d8fa426f01f58f532ac1a91cb1da874055711edd4f13c722a0e66f850d0f455c09fbc2c049852ec936545b2bf2798f9c614e4488707a1f38fee8c08fe3c886fd89d9e3578fad68077133c7e086d5ba7df2a7323d10f03602d46c1e172e993fd3b6d5d468b7da8dc315711d53ded3ab7f38f7517f23394c7c9438ce5726449cca510956add995f76140fe3bd0a63ea024058898635373e68e9e3
+          [1659509320.725163][3165:3170] CHIP:DMG:     buffer_ptr = 281472627931376
+          [1659509320.725214][3165:3170] CHIP:DMG: }
+          [1659509320.725263][3165:3170] CHIP:DMG:
+          [1659509320.725501][3165:3170] CHIP:DMG: DAC/PAI (491) =
+          [1659509320.725616][3165:3170] CHIP:DMG: {
+          -----BEGIN CERTIFICATE-----
+          MIIB5zCCAY6gAwIBAgIIac3xDenlTtEwCgYIKoZIzj0EAwIwPTElMCMGA1UEAwwc
+          TWF0dGVyIERldiBQQUkgMHhGRkYxIG5vIFBJRDEUMBIGCisGAQQBgqJ8AgEMBEZG
+          RjEwIBcNMjIwMjA1MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMFMxJTAjBgNVBAMM
+          HE1hdHRlciBEZXYgREFDIDB4RkZGMS8weDgwMDExFDASBgorBgEEAYKifAIBDARG
+          RkYxMRQwEgYKKwYBBAGConwCAgwEODAwMTBZMBMGByqGSM49AgEGCCqGSM49AwEH
+          A0IABEY6xpNCkQoOVYj8b/Vrtj5i7M7LFI99TrA+5VJgFBV2fRalxmP3k+SRIyYL
+          gpenzX58/HsxaznZjpDSk3dzjoKjYDBeMAwGA1UdEwEB/wQCMAAwDgYDVR0PAQH/
+          BAQDAgeAMB0GA1UdDgQWBBSI3eezADgpMs/3NMBGJIEPRBaKbzAfBgNVHSMEGDAW
+          gBRjVA5H9kscONE4hKRi0WwZXY/7PDAKBggqhkjOPQQDAgNHADBEAiABJ6J7S0Rh
+          DuL83E0reIVWNmC8D3bxchntagjfsrPBzQIga1ngr0Xz6yqFuRnTVzFSjGAoxBUj
+          lUXhCOTlTnCXE1M=
+          -----END CERTIFICATE-----
+          [1659509320.725847][3165:3170] CHIP:DMG: }
+          [1659509320.725898][3165:3170] CHIP:DMG:
+          [1659509320.725961][3165:3170] CHIP:DMG:
+          [1659509320.726043][3165:3170] CHIP:DMG: Additional Fields =
+          [1659509320.726099][3165:3170] CHIP:DMG: {
+          [1659509320.726158][3165:3170] CHIP:DMG:     peer_address = UDP:[fe80::e65f:1ff:fe0f:2753%eth0]:5540
+          [1659509320.726215][3165:3170] CHIP:DMG: }
+          [1659509320.726265][3165:3170] CHIP:DMG:
+          [1659509320.726334][3165:3170] CHIP:EM: Received message of type 0x9 with protocolId (0, 1) and MessageCounter:148943592 on exchange 17089i
+          [1659509320.726446][3165:3170] CHIP:EM: Found matching exchange: 17089i, Delegate: 0xffff74009c78
+          [1659509320.726534][3165:3170] CHIP:EM: Rxd Ack; Removing MessageCounter:86888459 from Retrans Table on exchange 17089i
+          [1659509320.726594][3165:3170] CHIP:EM: Removed CHIP MessageCounter:86888459 from RetransTable on exchange 17089i
+          [1659509320.726669][3165:3170] CHIP:DMG: ICR moving to [ResponseRe]
+          [1659509320.726761][3165:3170] CHIP:DMG: InvokeResponseMessage =
+          [1659509320.726818][3165:3170] CHIP:DMG: {
+          [1659509320.726876][3165:3170] CHIP:DMG:         suppressResponse = false,
+          [1659509320.726934][3165:3170] CHIP:DMG:         InvokeResponseIBs =
+          [1659509320.727010][3165:3170] CHIP:DMG:         [
+          [1659509320.727068][3165:3170] CHIP:DMG:                 InvokeResponseIB =
+          [1659509320.727154][3165:3170] CHIP:DMG:                 {
+          [1659509320.727217][3165:3170] CHIP:DMG:                         CommandDataIB =
+          [1659509320.727291][3165:3170] CHIP:DMG:                         {
+          [1659509320.727362][3165:3170] CHIP:DMG:                                 CommandPathIB =
+          [1659509320.727442][3165:3170] CHIP:DMG:                                 {
+          [1659509320.727523][3165:3170] CHIP:DMG:                                         EndpointId = 0x0,
+          [1659509320.727607][3165:3170] CHIP:DMG:                                         ClusterId = 0x3e,
+          [1659509320.727698][3165:3170] CHIP:DMG:                                         CommandId = 0x3,
+          [1659509320.727777][3165:3170] CHIP:DMG:                                 },
+          [1659509320.727857][3165:3170] CHIP:DMG:
+          [1659509320.727928][3165:3170] CHIP:DMG:                                 CommandFields =
+          [1659509320.728004][3165:3170] CHIP:DMG:                                 {
+          [1659509320.728081][3165:3170] CHIP:DMG:                                         0x0 = [
+          [1659509320.728404][3165:3170] CHIP:DMG:                                                         0x30, 0x82, 0x1, 0xe7, 0x30, 0x82, 0x1, 0x8e, 0xa0, 0x3, 0x2, 0x1, 0x2, 0x2, 0x8, 0x69, 0xcd, 0xf1, 0xd, 0xe9, 0xe5, 0x4e, 0xd1, 0x30, 0xa, 0x6, 0x8, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x4, 0x3, 0x2, 0x30, 0x3d, 0x31, 0x25, 0x30, 0x23, 0x6, 0x3, 0x55, 0x4, 0x3, 0xc, 0x1c, 0x4d, 0x61, 0x74, 0x74, 0x65, 0x72, 0x20, 0x44, 0x65, 0x76, 0x20, 0x50, 0x41, 0x49, 0x20, 0x30, 0x78, 0x46, 0x46, 0x46, 0x31, 0x20, 0x6e, 0x6f, 0x20, 0x50, 0x49, 0x44, 0x31, 0x14, 0x30, 0x12, 0x6, 0xa, 0x2b, 0x6, 0x1, 0x4, 0x1, 0x82, 0xa2, 0x7c, 0x2, 0x1, 0xc, 0x4, 0x46, 0x46, 0x46, 0x31, 0x30, 0x20, 0x17, 0xd, 0x32, 0x32, 0x30, 0x32, 0x30, 0x35, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x5a, 0x18, 0xf, 0x39, 0x39, 0x39, 0x39, 0x31, 0x32, 0x33, 0x31, 0x32, 0x33, 0x35, 0x39, 0x35, 0x39, 0x5a, 0x30, 0x53, 0x31, 0x25, 0x30, 0x23, 0x6, 0x3, 0x55, 0x4, 0x3, 0xc, 0x1c, 0x4d, 0x61, 0x74, 0x74, 0x65, 0x72, 0x20, 0x44, 0x65, 0x76, 0x20, 0x44, 0x41, 0x43, 0x20, 0x30, 0x78, 0x46, 0x46, 0x46, 0x31, 0x2f, 0x30, 0x78, 0x38, 0x30, 0x30, 0x31, 0x31, 0x14, 0x30, 0x12, 0x6, 0xa, 0x2b, 0x6, 0x1, 0x4, 0x1, 0x82, 0xa2, 0x7c, 0x2, 0x1, 0xc, 0x4, 0x46, 0x46, 0x46, 0x31, 0x31, 0x14, 0x30, 0x12, 0x6, 0xa, 0x2b, 0x6, 0x1, 0x4, 0x1, 0x82, 0xa2, 0x7c, 0x2, 0x2, 0xc, 0x4, 0x38, 0x30, 0x30, 0x31, 0x30, 0x59, 0x30, 0x13, 0x6, 0x7, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x2, 0x1, 0x6, 0x8, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x3, 0x1, 0x7, 0x3, 0x42, 0x0, 0x4, 0x46, 0x3a, 0xc6, 0x93, 0x42, 0x91, 0xa, 0xe, 0x55, 0x88, 0xfc, 0x6f, 0xf5, 0x6b, 0xb6, 0x3e, 0x62, 0xec, 0xce, 0xcb, 0x14, 0x8f, 0x7d, 0x4e, 0xb0, 0x3e, 0xe5, 0x52, 0x60, 0x14, 0x15, 0x76, 0x7d, 0x16, 0xa5, 0xc6, 0x63, 0xf7, 0x93, 0xe4, 0x91, 0x23, 0x26, 0xb, 0x82, 0x97, 0xa7, 0xcd, 0x7e, 0x7c, 0xfc, 0x
+          [1659509320.728579][3165:3170] CHIP:DMG:                                         ] (491 bytes)
+          [1659509320.728664][3165:3170] CHIP:DMG:                                 },
+          [1659509320.728738][3165:3170] CHIP:DMG:                         },
+          [1659509320.728818][3165:3170] CHIP:DMG:
+          [1659509320.728879][3165:3170] CHIP:DMG:                 },
+          [1659509320.728952][3165:3170] CHIP:DMG:
+          [1659509320.729010][3165:3170] CHIP:DMG:         ],
+          [1659509320.729082][3165:3170] CHIP:DMG:
+          [1659509320.729140][3165:3170] CHIP:DMG:         InteractionModelRevision = 1
+          [1659509320.729197][3165:3170] CHIP:DMG: },
+          [1659509320.729335][3165:3170] CHIP:DMG: Received Command Response Data, Endpoint=0 Cluster=0x0000_003E Command=0x0000_0003
+          [1659509320.729409][3165:3170] CHIP:CTL: Received certificate chain from the device
+          [1659509320.729476][3165:3170] CHIP:CTL: Successfully finished commissioning step "SendDACCertificateRequest"
+
+
+
+
+
+          "1. Save the DAC value from commissioning log of TH in the file as below
+          vi dac.pem
+
+          2. Give the below command to extract the Authority key ID
+          openssl x509 -in dac.pem -text
+
+          Below certificate has been extracted using the sample DUT, hence the Authority key ID is same as SDK"s test PAA
+
+          grl@grl-ThinkPad-L480:~/jul14_2ndcntrl/connectedhomeip$ openssl x509 -in dac.pem -text
+          Certificate:
+              Data:
+                  Version: 3 (0x2)
+                  Serial Number: 7624014786269105873 (0x69cdf10de9e54ed1)
+                  Signature Algorithm: ecdsa-with-SHA256
+                  Issuer: CN = Matter Dev PAI 0xFFF1 no PID, 1.3.6.1.4.1.37244.2.1 = FFF1
+                  Validity
+                      Not Before: Feb  5 00:00:00 2022 GMT
+                      Not After : Dec 31 23:59:59 9999 GMT
+                  Subject: CN = Matter Dev DAC 0xFFF1/0x8001, 1.3.6.1.4.1.37244.2.1 = FFF1, 1.3.6.1.4.1.37244.2.2 = 8001
+                  Subject Public Key Info:
+                      Public Key Algorithm: id-ecPublicKey
+                          Public-Key: (256 bit)
+                          pub:
+                              04:46:3a:c6:93:42:91:0a:0e:55:88:fc:6f:f5:6b:
+                              b6:3e:62:ec:ce:cb:14:8f:7d:4e:b0:3e:e5:52:60:
+                              14:15:76:7d:16:a5:c6:63:f7:93:e4:91:23:26:0b:
+                              82:97:a7:cd:7e:7c:fc:7b:31:6b:39:d9:8e:90:d2:
+                              93:77:73:8e:82
+                          ASN1 OID: prime256v1
+                          NIST CURVE: P-256
+                  X509v3 extensions:
+                      X509v3 Basic Constraints: critical
+                          CA:FALSE
+                      X509v3 Key Usage: critical
+                          Digital Signature
+                      X509v3 Subject Key Identifier:
+                          88:DD:E7:B3:00:38:29:32:CF:F7:34:C0:46:24:81:0F:44:16:8A:6F
+                      X509v3 Authority Key Identifier:
+                          keyid:63:54:0E:47:F6:4B:1C:38:D1:38:84:A4:62:D1:6C:19:5D:8F:FB:3C
+
+              Signature Algorithm: ecdsa-with-SHA256
+                   30:44:02:20:01:27:a2:7b:4b:44:61:0e:e2:fc:dc:4d:2b:78:
+                   85:56:36:60:bc:0f:76:f1:72:19:ed:6a:08:df:b2:b3:c1:cd:
+                   02:20:6b:59:e0:af:45:f3:eb:2a:85:b9:19:d3:57:31:52:8c:
+                   60:28:c4:15:23:95:45:e1:08:e4:e5:4e:70:97:13:53
+          -----BEGIN CERTIFICATE-----
+          MIIB5zCCAY6gAwIBAgIIac3xDenlTtEwCgYIKoZIzj0EAwIwPTElMCMGA1UEAwwc
+          TWF0dGVyIERldiBQQUkgMHhGRkYxIG5vIFBJRDEUMBIGCisGAQQBgqJ8AgEMBEZG
+          RjEwIBcNMjIwMjA1MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMFMxJTAjBgNVBAMM
+          HE1hdHRlciBEZXYgREFDIDB4RkZGMS8weDgwMDExFDASBgorBgEEAYKifAIBDARG
+          RkYxMRQwEgYKKwYBBAGConwCAgwEODAwMTBZMBMGByqGSM49AgEGCCqGSM49AwEH
+          A0IABEY6xpNCkQoOVYj8b/Vrtj5i7M7LFI99TrA+5VJgFBV2fRalxmP3k+SRIyYL
+          gpenzX58/HsxaznZjpDSk3dzjoKjYDBeMAwGA1UdEwEB/wQCMAAwDgYDVR0PAQH/
+          BAQDAgeAMB0GA1UdDgQWBBSI3eezADgpMs/3NMBGJIEPRBaKbzAfBgNVHSMEGDAW
+          gBRjVA5H9kscONE4hKRi0WwZXY/7PDAKBggqhkjOPQQDAgNHADBEAiABJ6J7S0Rh
+          DuL83E0reIVWNmC8D3bxchntagjfsrPBzQIga1ngr0Xz6yqFuRnTVzFSjGAoxBUj
+          lUXhCOTlTnCXE1M=
+          -----END CERTIFICATE-----
+      disabled: true
+
+    - label:
+          "Repeat Step 1 to 4 with DUT2, saving the PAI, DAC and public key as
+          pk_2"
+      verification: |
           To commission DUT2 to TH
 
           "sudo ./chip-all-clusters-app --wifi --discriminator 3844
@@ -283,9 +505,9 @@
           [1650455358.501816][4366:4371] CHIP:TOO: Device commissioning completed with success"
 
 
-          Verify in TH log:
+          Verify in TH(chip-tool) log:
 
-          ./chip-tool operationalcredentials certificate-chain-request 1 1 0
+          ./chip-tool operationalcredentials certificate-chain-request 1 1 0  --trace_decode 1
           [1657774717.721972][7956:7961] CHIP:DMG: Received Command Response Data, Endpoint=0 Cluster=0x0000_003E Command=0x0000_0003
           [1657774717.722019][7956:7961] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_003E Command 0x0000_0003
           [1657774717.722135][7956:7961] CHIP:TOO:   CertificateChainResponse: {
@@ -295,7 +517,7 @@
 
 
 
-          ./chip-tool operationalcredentials certificate-chain-request 2 1 0
+          ./chip-tool operationalcredentials certificate-chain-request 2 1 0  --trace_decode 1
 
           [1657774756.281112][7964:7969] CHIP:DMG: Received Command Response Data, Endpoint=0 Cluster=0x0000_003E Command=0x0000_0003
           [1657774756.281164][7964:7969] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_003E Command 0x0000_0003
@@ -305,7 +527,7 @@
           [1657774756.281388][7964:7969] CHIP:TOO:    }
 
 
-          During commissioning we will get PAI  certificate,  see in below log:
+          During commissioning we will get PAI  certificate,  see on TH(chip-tool) log:
 
           [1659415376.883870][2666:2671] CHIP:CTL: Performing next commissioning step "SendPAICertificateRequest"
           [1659415376.883925][2666:2671] CHIP:CTL: Sending request for PAI certificate
diff --git a/src/app/tests/suites/certification/Test_TC_DESC_2_1.yaml b/src/app/tests/suites/certification/Test_TC_DESC_2_1.yaml
index b7975a1..206342e 100644
--- a/src/app/tests/suites/certification/Test_TC_DESC_2_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DESC_2_1.yaml
@@ -27,11 +27,11 @@
     - label:
           "TH reads DeviceTypeList and PartsList attributes from DUT for
           Endpoint 0"
-      PICS: DESC.S.A0000 && DESC.S.A0004 && DESC.S.A0003
+      PICS: DESC.S.A0000 && DESC.S.A0003
       verification: |
           ./chip-tool descriptor read device-list 1 0
 
-          Verify on the TH Log:
+          Verify DeviceList response on the TH (Chip-tool) Log:
 
           [1641454498.809603][16120:16125] CHIP:TOO: Descriptor.DeviceList response: 1 entries
           [1641454498.809737][16120:16125] CHIP:TOO:   [1]: {
@@ -44,11 +44,11 @@
     - label:
           "TH reads DeviceTypeList and PartsList attributes from DUT for each
           Endpoint supported by DUT (except Endpoint 0)."
-      PICS: DESC.S.A0000 && DESC.S.A0004 && DESC.S.A0003
+      PICS: DESC.S.A0000 && DESC.S.A0003
       verification: |
           ./chip-tool descriptor read device-list 1 1
 
-          Verify on the TH Log:
+          Verify DeviceList response on the TH(Chip-tool) Log:
 
 
           [1657200303.724408][2509:2514] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_001D Attribute 0x0000_0000 DataVersion: 1624758542
@@ -64,7 +64,7 @@
       verification: |
           ./chip-tool descriptor read server-list 1 0
 
-          Verify on the TH Log:
+          Verify server list on the TH (Chip-tool) Log:
 
           [1654155402.956829][3701:3706] CHIP:TOO:   server list: 26 entries
           [1654155402.956863][3701:3706] CHIP:TOO:     [1]: 3
@@ -100,7 +100,7 @@
       verification: |
           ./chip-tool descriptor read client-list 1 0
 
-          Verify on the TH Log:
+          Verify client list on the TH (Chip-tool) Log:
 
           [1650281818.533446][9679:9684] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_001D Attribute 0x0000_0002 DataVersion: 1976976904
           [1650281818.533514][9679:9684] CHIP:TOO:   client list: 1 entries
@@ -112,7 +112,7 @@
       verification: |
           ./chip-tool descriptor read  parts-list 1 0
 
-          Verify on the TH Log:
+          Verify PartsList response on the TH (Chip-tool) Log:
 
           [1641456769.777217][16238:16244] CHIP:DMG:      SuppressResponse = true,
           [1641456769.777267][16238:16244] CHIP:DMG: }
diff --git a/src/app/tests/suites/certification/Test_TC_DESC_2_2.yaml b/src/app/tests/suites/certification/Test_TC_DESC_2_2.yaml
index 01e05b3..3a880dd 100644
--- a/src/app/tests/suites/certification/Test_TC_DESC_2_2.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DESC_2_2.yaml
@@ -24,14 +24,19 @@
     endpoint: 0
 
 tests:
+    - label: "Note"
+      verification: |
+          Chip-tool command used below are an example to verify the  DUT as client test cases. For certification test, we expect DUT should have a capability or way to run the equivalent command.
+      disabled: true
+
     - label: "DUT reads DeviceTypeList from TH."
       PICS: DESC.C.A0000
       verification: |
+          Product maker needs to provide instructions for how to trigger the command on the DUT. For comparison, the DUT behavior for this test step can be simulated using chip-tool (when DUT is a commissioner/Client)
+
           ./chip-tool descriptor read device-list 1 0
 
-          verify TH(On a reference app) receives the right Read Request Message for the data sent in the above command
-
-          Verify in DUT as client side:
+          verify the " device-list response" on the TH (all-cluster-app) log:
 
           [1657095358.858070][3443:3448] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_001D Attribute 0x0000_0000 DataVersion: 2880250959
           [1657095358.858130][3443:3448] CHIP:TOO:   device list: 1 entries
@@ -46,10 +51,7 @@
       verification: |
           ./chip-tool descriptor read server-list 1 0
 
-          verify TH(On a reference app) receives the right Read Request Message for the data sent in the above command
-
-          Verify in DUT as client side:
-
+          verify the " server-list response" on the TH (all-cluster-app) log:
 
           [1657095388.496869][3451:3456] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_001D Attribute 0x0000_0001 DataVersion: 2880250959
           [1657095388.496964][3451:3456] CHIP:TOO:   server list: 26 entries
@@ -86,10 +88,7 @@
       verification: |
           ./chip-tool descriptor read client-list 1 0
 
-          verify TH(On a reference app) receives the right Read Request Message for the data sent in the above command
-
-          Verify in DUT as client side:
-
+          verify the " client-list response" on the TH (all-cluster-app) log:
 
           [1657095415.492647][3459:3464] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_001D Attribute 0x0000_0002 DataVersion: 2880250959
           [1657095415.492717][3459:3464] CHIP:TOO:   client list: 1 entries
@@ -101,10 +100,7 @@
       verification: |
           ./chip-tool descriptor read  parts-list 1 0
 
-          verify TH(On a reference app) receives the right Read Request Message for the data sent in the above command
-
-          Verify in DUT as client side:
-
+          verify the " parts-list response" on the TH (all-cluster-app) log:
 
           [1657095439.967554][3470:3475] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_001D Attribute 0x0000_0003 DataVersion: 2880250959
           [1657095439.967633][3470:3475] CHIP:TOO:   parts list: 2 entries
diff --git a/src/app/tests/suites/certification/Test_TC_DGETH_1_1.yaml b/src/app/tests/suites/certification/Test_TC_DGETH_1_1.yaml
index 673f4f9..4be61d1 100644
--- a/src/app/tests/suites/certification/Test_TC_DGETH_1_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DGETH_1_1.yaml
@@ -33,7 +33,7 @@
       verification: |
           ./chip-tool ethernetnetworkdiagnostics read cluster-revision 1 0
 
-          Verify cluster revision value is 1 in TH log:
+          Verify cluster revision value is 1 in TH(chip-tool) log:
 
           [1653911336.371533][3567:3572] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0037 Attribute 0x0000_FFFD DataVersion: 2944003194
           [1653911336.371751][3567:3572] CHIP:TOO:   ClusterRevision: 1
@@ -44,7 +44,7 @@
       verification: |
           ./chip-tool ethernetnetworkdiagnostics read feature-map 1 0
 
-          Verify featuremap value is 3 in TH log:
+          Verify featuremap value is 3 in TH(chip-tool) log:
 
           [1651786827.582555][240914:240920] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0037 Attribute 0x0000_FFFC DataVersion: 2811403040
           [1651786827.582608][240914:240920] CHIP:TOO:   FeatureMap: 3
@@ -54,7 +54,7 @@
       verification: |
           ./chip-tool ethernetnetworkdiagnostics read attribute-list 1 0
 
-          Verify  list of supported attributes in TH log:
+          Verify  list of supported attributes in TH(chip-tool) log:
 
           [1651786900.043572][240929:240934] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0037 Attribute 0x0000_FFFB DataVersion: 2811403040
           [1651786900.043655][240929:240934] CHIP:TOO:   AttributeList: 14 entries
@@ -78,7 +78,7 @@
       verification: |
           ./chip-tool ethernetnetworkdiagnostics read accepted-command-list 1 0
 
-          Verify list of Acccepted Command in TH log:
+          Verify list of Acccepted Command in TH(chip-tool) log:
 
           [1651786971.201258][240944:240949] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0037 Attribute 0x0000_FFF9 DataVersion: 2811403040
           [1651786971.201322][240944:240949] CHIP:TOO:   AcceptedCommandList: 1 entries
@@ -89,7 +89,7 @@
       verification: |
           ./chip-tool ethernetnetworkdiagnostics read generated-command-list 1 0
 
-          Verify list of Generated Command, this list SHALL have zero entry in TH log:
+          Verify list of Generated Command, this list SHALL have zero entry in TH(chip-tool) log:
 
           [1651787190.403639][240971:240976] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0037 Attribute 0x0000_FFF8 DataVersion: 2811403040
           [1651787190.403729][240971:240976] CHIP:TOO:   GeneratedCommandList: 0 entries
diff --git a/src/app/tests/suites/certification/Test_TC_DGETH_3_1.yaml b/src/app/tests/suites/certification/Test_TC_DGETH_3_1.yaml
index 115201c..8e623c1 100644
--- a/src/app/tests/suites/certification/Test_TC_DGETH_3_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DGETH_3_1.yaml
@@ -24,6 +24,11 @@
     endpoint: 0
 
 tests:
+    - label: "Note"
+      verification: |
+          Chip-tool command used below are an example to verify the  DUT as client test cases. For certification test, we expect DUT should have a capability or way to run the equivalent command.
+      disabled: true
+
     - label: "Commission TH to DUT"
       verification: |
           verification step to be updated.
@@ -34,10 +39,32 @@
       verification: |
           ./chip-tool ethernetnetworkdiagnostics read phyrate 1 0
 
-          Verify the value of PHYRate is in range of PHYRate enum in DUT as Client side Log
+          Verify the value of PHYRate is in range of PHYRate enum in TH(all-clusters-app)Log
 
-          CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0037 Attribute 0x0000_0000 DataVersion: 3872576452
-          [1649663425.191426][8076:8082] CHIP:TOO:   PHYRate: 1
+          [1659971284.056816][3458:3458] CHIP:IM: Received Read request
+          [1659971284.056893][3458:3458] CHIP:DMG: ReadRequestMessage =
+          [1659971284.056920][3458:3458] CHIP:DMG: {
+          [1659971284.056942][3458:3458] CHIP:DMG: 	AttributePathIBs =
+          [1659971284.056968][3458:3458] CHIP:DMG: 	[
+          [1659971284.056992][3458:3458] CHIP:DMG: 		AttributePathIB =
+          [1659971284.057036][3458:3458] CHIP:DMG: 		{
+          [1659971284.057066][3458:3458] CHIP:DMG: 			Endpoint = 0x0,
+          [1659971284.057097][3458:3458] CHIP:DMG: 			Cluster = 0x37,
+          [1659971284.057126][3458:3458] CHIP:DMG: 			Attribute = 0x0000_0000,
+          [1659971284.057157][3458:3458] CHIP:DMG: 		}
+          [1659971284.057185][3458:3458] CHIP:DMG:
+          [1659971284.057209][3458:3458] CHIP:DMG: 	],
+          [1659971284.057237][3458:3458] CHIP:DMG:
+          [1659971284.057263][3458:3458] CHIP:DMG: 	isFabricFiltered = true,
+          [1659971284.057287][3458:3458] CHIP:DMG: 	InteractionModelRevision = 1
+          [1659971284.057310][3458:3458] CHIP:DMG: },
+          [1659971284.057384][3458:3458] CHIP:DMG: IM RH moving to [GeneratingReports]
+          [1659971284.057468][3458:3458] CHIP:DMG: Building Reports for ReadHandler with LastReportGeneration = 0 DirtyGeneration = 0
+          [1659971284.057497][3458:3458] CHIP:DMG: <RE:Run> Cluster 37, Attribute 0 is dirty
+          [1659971284.057518][3458:3458] CHIP:DMG: Reading attribute: Cluster=0x0000_0037 Endpoint=0 AttributeId=0x0000_0000 (expanded=0)
+          [1659971284.057545][3458:3458] CHIP:DMG: AccessControl: checking f=1 a=c s=0x000000000001B669 t= c=0x0000_0037 e=0 p=v
+          [1659971284.057577][3458:3458] CHIP:DMG: AccessControl: allowed
+          [1659971284.057707][3458:3458] CHIP:ZCL: The current nominal, usable speed at the top of the physical layer of the Node: 1
       disabled: true
 
     - label: "DUT reads a attribute value from TH."
@@ -45,10 +72,31 @@
       verification: |
           ./chip-tool ethernetnetworkdiagnostics read full-duplex 1 0
 
-          Verify the value of FullDuplex is boolean in DUT as Client side Log
+          Verify the value of FullDuplex is boolean in TH(all-clusters-app) Log
 
-          CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0037 Attribute 0x0000_0001 DataVersion: 3872576452
-          [1649663520.936873][8088:8093] CHIP:TOO:   FullDuplex: TRUE
+          [1659971415.211787][3458:3458] CHIP:IM: Received Read request
+          [1659971415.211891][3458:3458] CHIP:DMG: ReadRequestMessage =
+          [1659971415.211931][3458:3458] CHIP:DMG: {
+          [1659971415.211963][3458:3458] CHIP:DMG: 	AttributePathIBs =
+          [1659971415.212001][3458:3458] CHIP:DMG: 	[
+          [1659971415.212036][3458:3458] CHIP:DMG: 		AttributePathIB =
+          [1659971415.212084][3458:3458] CHIP:DMG: 		{
+          [1659971415.212126][3458:3458] CHIP:DMG: 			Endpoint = 0x0,
+          [1659971415.212171][3458:3458] CHIP:DMG: 			Cluster = 0x37,
+          [1659971415.212219][3458:3458] CHIP:DMG: 			Attribute = 0x0000_0001,
+          [1659971415.212262][3458:3458] CHIP:DMG: 		}
+          [1659971415.212303][3458:3458] CHIP:DMG:
+          [1659971415.212340][3458:3458] CHIP:DMG: 	],
+          [1659971415.212380][3458:3458] CHIP:DMG:
+          [1659971415.212419][3458:3458] CHIP:DMG: 	isFabricFiltered = true,
+          [1659971415.212456][3458:3458] CHIP:DMG: 	InteractionModelRevision = 1
+          [1659971415.212490][3458:3458] CHIP:DMG: },
+          [1659971415.212590][3458:3458] CHIP:DMG: IM RH moving to [GeneratingReports]
+          [1659971415.212704][3458:3458] CHIP:DMG: Building Reports for ReadHandler with LastReportGeneration = 0 DirtyGeneration = 0
+          [1659971415.212746][3458:3458] CHIP:DMG: <RE:Run> Cluster 37, Attribute 1 is dirty
+          [1659971415.212777][3458:3458] CHIP:DMG: Reading attribute: Cluster=0x0000_0037 Endpoint=0 AttributeId=0x0000_0001 (expanded=0)
+          [1659971415.212816][3458:3458] CHIP:DMG: AccessControl: checking f=1 a=c s=0x000000000001B669 t= c=0x0000_0037 e=0 p=v
+          [1659971415.212862][3458:3458] CHIP:DMG: AccessControl: allowed
       disabled: true
 
     - label: "DUT reads a attribute value from TH."
@@ -56,10 +104,31 @@
       verification: |
           ./chip-tool ethernetnetworkdiagnostics read packet-rx-count 1 0
 
-          Verify the value of PacketRxCount is in range uint64 in DUT as Client side Log
+          Verify the value of PacketRxCount is in range uint64 on TH(all-clusters-app) Log
 
-          CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0037 Attribute 0x0000_0002 DataVersion: 3872576452
-          [1649663623.009973][8103:8108] CHIP:TOO:   PacketRxCount: 3322
+          [1659971446.614287][3458:3458] CHIP:IM: Received Read request
+          [1659971446.614366][3458:3458] CHIP:DMG: ReadRequestMessage =
+          [1659971446.614393][3458:3458] CHIP:DMG: {
+          [1659971446.614414][3458:3458] CHIP:DMG:         AttributePathIBs =
+          [1659971446.614441][3458:3458] CHIP:DMG:         [
+          [1659971446.614464][3458:3458] CHIP:DMG:                 AttributePathIB =
+          [1659971446.614492][3458:3458] CHIP:DMG:                 {
+          [1659971446.614519][3458:3458] CHIP:DMG:                         Endpoint = 0x0,
+          [1659971446.614551][3458:3458] CHIP:DMG:                         Cluster = 0x37,
+          [1659971446.614582][3458:3458] CHIP:DMG:                         Attribute = 0x0000_0002,
+          [1659971446.614610][3458:3458] CHIP:DMG:                 }
+          [1659971446.614637][3458:3458] CHIP:DMG:
+          [1659971446.614661][3458:3458] CHIP:DMG:         ],
+          [1659971446.614689][3458:3458] CHIP:DMG:
+          [1659971446.614713][3458:3458] CHIP:DMG:         isFabricFiltered = true,
+          [1659971446.614738][3458:3458] CHIP:DMG:         InteractionModelRevision = 1
+          [1659971446.614761][3458:3458] CHIP:DMG: },
+          [1659971446.614831][3458:3458] CHIP:DMG: IM RH moving to [GeneratingReports]
+          [1659971446.614913][3458:3458] CHIP:DMG: Building Reports for ReadHandler with LastReportGeneration = 0 DirtyGeneration = 0
+          [1659971446.614942][3458:3458] CHIP:DMG: <RE:Run> Cluster 37, Attribute 2 is dirty
+          [1659971446.614963][3458:3458] CHIP:DMG: Reading attribute: Cluster=0x0000_0037 Endpoint=0 AttributeId=0x0000_0002 (expanded=0)
+          [1659971446.614991][3458:3458] CHIP:DMG: AccessControl: checking f=1 a=c s=0x000000000001B669 t= c=0x0000_0037 e=0 p=v
+          [1659971446.615023][3458:3458] CHIP:DMG: AccessControl: allowed
       disabled: true
 
     - label: "DUT reads a attribute value from TH."
@@ -67,10 +136,31 @@
       verification: |
           ./chip-tool ethernetnetworkdiagnostics read packet-tx-count 1 0
 
-          Verify the value of PacketTxCount is in range uint64 in DUT as Client side Log
+          Verify the value of PacketTxCount is in range uint64 on TH(all-clusters-app) Log
 
-          CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0037 Attribute 0x0000_0003 DataVersion: 3872576452
-          [1649663793.192934][8117:8122] CHIP:TOO:   PacketTxCount: 3220
+          [1659971467.437214][3458:3458] CHIP:IM: Received Read request
+          [1659971467.437292][3458:3458] CHIP:DMG: ReadRequestMessage =
+          [1659971467.437318][3458:3458] CHIP:DMG: {
+          [1659971467.437339][3458:3458] CHIP:DMG:         AttributePathIBs =
+          [1659971467.437365][3458:3458] CHIP:DMG:         [
+          [1659971467.437388][3458:3458] CHIP:DMG:                 AttributePathIB =
+          [1659971467.437423][3458:3458] CHIP:DMG:                 {
+          [1659971467.437451][3458:3458] CHIP:DMG:                         Endpoint = 0x0,
+          [1659971467.437482][3458:3458] CHIP:DMG:                         Cluster = 0x37,
+          [1659971467.437513][3458:3458] CHIP:DMG:                         Attribute = 0x0000_0003,
+          [1659971467.437542][3458:3458] CHIP:DMG:                 }
+          [1659971467.437569][3458:3458] CHIP:DMG:
+          [1659971467.437594][3458:3458] CHIP:DMG:         ],
+          [1659971467.437622][3458:3458] CHIP:DMG:
+          [1659971467.437648][3458:3458] CHIP:DMG:         isFabricFiltered = true,
+          [1659971467.437672][3458:3458] CHIP:DMG:         InteractionModelRevision = 1
+          [1659971467.437693][3458:3458] CHIP:DMG: },
+          [1659971467.437765][3458:3458] CHIP:DMG: IM RH moving to [GeneratingReports]
+          [1659971467.437848][3458:3458] CHIP:DMG: Building Reports for ReadHandler with LastReportGeneration = 0 DirtyGeneration = 0
+          [1659971467.437877][3458:3458] CHIP:DMG: <RE:Run> Cluster 37, Attribute 3 is dirty
+          [1659971467.437898][3458:3458] CHIP:DMG: Reading attribute: Cluster=0x0000_0037 Endpoint=0 AttributeId=0x0000_0003 (expanded=0)
+          [1659971467.437926][3458:3458] CHIP:DMG: AccessControl: checking f=1 a=c s=0x000000000001B669 t= c=0x0000_0037 e=0 p=v
+          [1659971467.437958][3458:3458] CHIP:DMG: AccessControl: allowed
       disabled: true
 
     - label: "DUT reads a attribute value from TH."
@@ -78,10 +168,31 @@
       verification: |
           ./chip-tool ethernetnetworkdiagnostics read tx-err-count 1 1
 
-          Verify the value of TxErrCount is in range uint64 in DUT as Client side Log
+          Verify the value of TxErrCount is in range uint64 on TH(all-clusters-app) Log
 
-          CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0037 Attribute 0x0000_0004 DataVersion: 3872576452
-          [1649663843.295395][8123:8128] CHIP:TOO:   TxErrCount: 0
+          [1659971467.437214][3458:3458] CHIP:IM: Received Read request
+          [1659971467.437292][3458:3458] CHIP:DMG: ReadRequestMessage =
+          [1659971467.437318][3458:3458] CHIP:DMG: {
+          [1659971467.437339][3458:3458] CHIP:DMG:         AttributePathIBs =
+          [1659971467.437365][3458:3458] CHIP:DMG:         [
+          [1659971467.437388][3458:3458] CHIP:DMG:                 AttributePathIB =
+          [1659971467.437423][3458:3458] CHIP:DMG:                 {
+          [1659971467.437451][3458:3458] CHIP:DMG:                         Endpoint = 0x0,
+          [1659971467.437482][3458:3458] CHIP:DMG:                         Cluster = 0x37,
+          [1659971467.437513][3458:3458] CHIP:DMG:                         Attribute = 0x0000_0004,
+          [1659971467.437542][3458:3458] CHIP:DMG:                 }
+          [1659971467.437569][3458:3458] CHIP:DMG:
+          [1659971467.437594][3458:3458] CHIP:DMG:         ],
+          [1659971467.437622][3458:3458] CHIP:DMG:
+          [1659971467.437648][3458:3458] CHIP:DMG:         isFabricFiltered = true,
+          [1659971467.437672][3458:3458] CHIP:DMG:         InteractionModelRevision = 1
+          [1659971467.437693][3458:3458] CHIP:DMG: },
+          [1659971467.437765][3458:3458] CHIP:DMG: IM RH moving to [GeneratingReports]
+          [1659971467.437848][3458:3458] CHIP:DMG: Building Reports for ReadHandler with LastReportGeneration = 0 DirtyGeneration = 0
+          [1659971467.437877][3458:3458] CHIP:DMG: <RE:Run> Cluster 37, Attribute 3 is dirty
+          [1659971467.437898][3458:3458] CHIP:DMG: Reading attribute: Cluster=0x0000_0037 Endpoint=0 AttributeId=0x0000_0003 (expanded=0)
+          [1659971467.437926][3458:3458] CHIP:DMG: AccessControl: checking f=1 a=c s=0x000000000001B669 t= c=0x0000_0037 e=0 p=v
+          [1659971467.437958][3458:3458] CHIP:DMG: AccessControl: allowed
       disabled: true
 
     - label: "DUT reads a attribute value from TH."
@@ -89,10 +200,31 @@
       verification: |
           ./chip-tool ethernetnetworkdiagnostics read collision-count 1 1
 
-          Verify the value of  CollisionCount is in range uint64 in DUT as Client side Log
+          Verify the value of  CollisionCount is in range uint64 on TH(all-clusters-app) Log
 
-          CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0037 Attribute 0x0000_0005 DataVersion: 3872576452
-          [1649663870.221742][8133:8138] CHIP:TOO:   CollisionCount: 0
+          [1659971467.437214][3458:3458] CHIP:IM: Received Read request
+          [1659971467.437292][3458:3458] CHIP:DMG: ReadRequestMessage =
+          [1659971467.437318][3458:3458] CHIP:DMG: {
+          [1659971467.437339][3458:3458] CHIP:DMG:         AttributePathIBs =
+          [1659971467.437365][3458:3458] CHIP:DMG:         [
+          [1659971467.437388][3458:3458] CHIP:DMG:                 AttributePathIB =
+          [1659971467.437423][3458:3458] CHIP:DMG:                 {
+          [1659971467.437451][3458:3458] CHIP:DMG:                         Endpoint = 0x0,
+          [1659971467.437482][3458:3458] CHIP:DMG:                         Cluster = 0x37,
+          [1659971467.437513][3458:3458] CHIP:DMG:                         Attribute = 0x0000_0005,
+          [1659971467.437542][3458:3458] CHIP:DMG:                 }
+          [1659971467.437569][3458:3458] CHIP:DMG:
+          [1659971467.437594][3458:3458] CHIP:DMG:         ],
+          [1659971467.437622][3458:3458] CHIP:DMG:
+          [1659971467.437648][3458:3458] CHIP:DMG:         isFabricFiltered = true,
+          [1659971467.437672][3458:3458] CHIP:DMG:         InteractionModelRevision = 1
+          [1659971467.437693][3458:3458] CHIP:DMG: },
+          [1659971467.437765][3458:3458] CHIP:DMG: IM RH moving to [GeneratingReports]
+          [1659971467.437848][3458:3458] CHIP:DMG: Building Reports for ReadHandler with LastReportGeneration = 0 DirtyGeneration = 0
+          [1659971467.437877][3458:3458] CHIP:DMG: <RE:Run> Cluster 37, Attribute 3 is dirty
+          [1659971467.437898][3458:3458] CHIP:DMG: Reading attribute: Cluster=0x0000_0037 Endpoint=0 AttributeId=0x0000_0003 (expanded=0)
+          [1659971467.437926][3458:3458] CHIP:DMG: AccessControl: checking f=1 a=c s=0x000000000001B669 t= c=0x0000_0037 e=0 p=v
+          [1659971467.437958][3458:3458] CHIP:DMG: AccessControl: allowed
       disabled: true
 
     - label: "DUT reads a attribute value from TH."
@@ -100,10 +232,31 @@
       verification: |
           ./chip-tool ethernetnetworkdiagnostics read overrun-count 1 1
 
-          Verify in DUT as Client side Log
+          Verify on TH(all-clusters-app) Log
 
-          CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0037 Attribute 0x0000_0006 DataVersion: 3872576452
-          [1649663948.738274][8142:8147] CHIP:TOO:   OverrunCount: 0
+          [1659971467.437214][3458:3458] CHIP:IM: Received Read request
+          [1659971467.437292][3458:3458] CHIP:DMG: ReadRequestMessage =
+          [1659971467.437318][3458:3458] CHIP:DMG: {
+          [1659971467.437339][3458:3458] CHIP:DMG:         AttributePathIBs =
+          [1659971467.437365][3458:3458] CHIP:DMG:         [
+          [1659971467.437388][3458:3458] CHIP:DMG:                 AttributePathIB =
+          [1659971467.437423][3458:3458] CHIP:DMG:                 {
+          [1659971467.437451][3458:3458] CHIP:DMG:                         Endpoint = 0x0,
+          [1659971467.437482][3458:3458] CHIP:DMG:                         Cluster = 0x37,
+          [1659971467.437513][3458:3458] CHIP:DMG:                         Attribute = 0x0000_0006,
+          [1659971467.437542][3458:3458] CHIP:DMG:                 }
+          [1659971467.437569][3458:3458] CHIP:DMG:
+          [1659971467.437594][3458:3458] CHIP:DMG:         ],
+          [1659971467.437622][3458:3458] CHIP:DMG:
+          [1659971467.437648][3458:3458] CHIP:DMG:         isFabricFiltered = true,
+          [1659971467.437672][3458:3458] CHIP:DMG:         InteractionModelRevision = 1
+          [1659971467.437693][3458:3458] CHIP:DMG: },
+          [1659971467.437765][3458:3458] CHIP:DMG: IM RH moving to [GeneratingReports]
+          [1659971467.437848][3458:3458] CHIP:DMG: Building Reports for ReadHandler with LastReportGeneration = 0 DirtyGeneration = 0
+          [1659971467.437877][3458:3458] CHIP:DMG: <RE:Run> Cluster 37, Attribute 3 is dirty
+          [1659971467.437898][3458:3458] CHIP:DMG: Reading attribute: Cluster=0x0000_0037 Endpoint=0 AttributeId=0x0000_0003 (expanded=0)
+          [1659971467.437926][3458:3458] CHIP:DMG: AccessControl: checking f=1 a=c s=0x000000000001B669 t= c=0x0000_0037 e=0 p=v
+          [1659971467.437958][3458:3458] CHIP:DMG: AccessControl: allowed
       disabled: true
 
     - label: "DUT reads a attribute value from TH."
@@ -111,10 +264,31 @@
       verification: |
           ./chip-tool ethernetnetworkdiagnostics read carrier-detect 1 1
 
-          Verify the value of CarrierDetect is either bool or null in DUT as Client side Log
+          Verify the value of CarrierDetect is either bool or null on TH(all-clusters-app) Log
 
-          CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0037 Attribute 0x0000_0007 DataVersion: 3872576452
-          [1649663972.829304][8149:8154] CHIP:TOO:   CarrierDetect: null
+          [1659971467.437214][3458:3458] CHIP:IM: Received Read request
+          [1659971467.437292][3458:3458] CHIP:DMG: ReadRequestMessage =
+          [1659971467.437318][3458:3458] CHIP:DMG: {
+          [1659971467.437339][3458:3458] CHIP:DMG:         AttributePathIBs =
+          [1659971467.437365][3458:3458] CHIP:DMG:         [
+          [1659971467.437388][3458:3458] CHIP:DMG:                 AttributePathIB =
+          [1659971467.437423][3458:3458] CHIP:DMG:                 {
+          [1659971467.437451][3458:3458] CHIP:DMG:                         Endpoint = 0x0,
+          [1659971467.437482][3458:3458] CHIP:DMG:                         Cluster = 0x37,
+          [1659971467.437513][3458:3458] CHIP:DMG:                         Attribute = 0x0000_0007,
+          [1659971467.437542][3458:3458] CHIP:DMG:                 }
+          [1659971467.437569][3458:3458] CHIP:DMG:
+          [1659971467.437594][3458:3458] CHIP:DMG:         ],
+          [1659971467.437622][3458:3458] CHIP:DMG:
+          [1659971467.437648][3458:3458] CHIP:DMG:         isFabricFiltered = true,
+          [1659971467.437672][3458:3458] CHIP:DMG:         InteractionModelRevision = 1
+          [1659971467.437693][3458:3458] CHIP:DMG: },
+          [1659971467.437765][3458:3458] CHIP:DMG: IM RH moving to [GeneratingReports]
+          [1659971467.437848][3458:3458] CHIP:DMG: Building Reports for ReadHandler with LastReportGeneration = 0 DirtyGeneration = 0
+          [1659971467.437877][3458:3458] CHIP:DMG: <RE:Run> Cluster 37, Attribute 3 is dirty
+          [1659971467.437898][3458:3458] CHIP:DMG: Reading attribute: Cluster=0x0000_0037 Endpoint=0 AttributeId=0x0000_0003 (expanded=0)
+          [1659971467.437926][3458:3458] CHIP:DMG: AccessControl: checking f=1 a=c s=0x000000000001B669 t= c=0x0000_0037 e=0 p=v
+          [1659971467.437958][3458:3458] CHIP:DMG: AccessControl: allowed
       disabled: true
 
     - label: "DUT reads a attribute value from TH."
@@ -122,8 +296,29 @@
       verification: |
           ./chip-tool ethernetnetworkdiagnostics read  time-since-reset 1 1
 
-          Verify the value of TimeSinceReset is in range uint64 in DUT as Client side Log
+          Verify the value of TimeSinceReset is in range uint64 on TH(all-clusters-app) Log
 
-          CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0037 Attribute 0x0000_0008 DataVersion: 3872576452
-          [1649664046.010810][8158:8163] CHIP:TOO:   TimeSinceReset: 5219
+          [1659971467.437214][3458:3458] CHIP:IM: Received Read request
+          [1659971467.437292][3458:3458] CHIP:DMG: ReadRequestMessage =
+          [1659971467.437318][3458:3458] CHIP:DMG: {
+          [1659971467.437339][3458:3458] CHIP:DMG:         AttributePathIBs =
+          [1659971467.437365][3458:3458] CHIP:DMG:         [
+          [1659971467.437388][3458:3458] CHIP:DMG:                 AttributePathIB =
+          [1659971467.437423][3458:3458] CHIP:DMG:                 {
+          [1659971467.437451][3458:3458] CHIP:DMG:                         Endpoint = 0x0,
+          [1659971467.437482][3458:3458] CHIP:DMG:                         Cluster = 0x37,
+          [1659971467.437513][3458:3458] CHIP:DMG:                         Attribute = 0x0000_0008,
+          [1659971467.437542][3458:3458] CHIP:DMG:                 }
+          [1659971467.437569][3458:3458] CHIP:DMG:
+          [1659971467.437594][3458:3458] CHIP:DMG:         ],
+          [1659971467.437622][3458:3458] CHIP:DMG:
+          [1659971467.437648][3458:3458] CHIP:DMG:         isFabricFiltered = true,
+          [1659971467.437672][3458:3458] CHIP:DMG:         InteractionModelRevision = 1
+          [1659971467.437693][3458:3458] CHIP:DMG: },
+          [1659971467.437765][3458:3458] CHIP:DMG: IM RH moving to [GeneratingReports]
+          [1659971467.437848][3458:3458] CHIP:DMG: Building Reports for ReadHandler with LastReportGeneration = 0 DirtyGeneration = 0
+          [1659971467.437877][3458:3458] CHIP:DMG: <RE:Run> Cluster 37, Attribute 3 is dirty
+          [1659971467.437898][3458:3458] CHIP:DMG: Reading attribute: Cluster=0x0000_0037 Endpoint=0 AttributeId=0x0000_0003 (expanded=0)
+          [1659971467.437926][3458:3458] CHIP:DMG: AccessControl: checking f=1 a=c s=0x000000000001B669 t= c=0x0000_0037 e=0 p=v
+          [1659971467.437958][3458:3458] CHIP:DMG: AccessControl: allowed
       disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_DGETH_3_2.yaml b/src/app/tests/suites/certification/Test_TC_DGETH_3_2.yaml
index ae5029c..6afcb6b 100644
--- a/src/app/tests/suites/certification/Test_TC_DGETH_3_2.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DGETH_3_2.yaml
@@ -24,6 +24,11 @@
     endpoint: 0
 
 tests:
+    - label: "Note"
+      verification: |
+          Chip-tool command used below are an example to verify the  DUT as client test cases. For certification test, we expect DUT should have a capability or way to run the equivalent command.
+      disabled: true
+
     - label: "Commission TH to DUT"
       verification: |
           verification step to be updated.
@@ -36,37 +41,30 @@
 
           ./chip-tool ethernetnetworkdiagnostics reset-counts 1 1
 
-          Verify Command data recieved from running the below command is a success in DUT as Client side Log
+          Verify Command data recieved from running the below command is a success on TH(all-clusters-app) Log
 
-          CHIP:DMG: InvokeResponseMessage =
-          [1649664146.639743][8173:8178] CHIP:DMG: {
-          [1649664146.639789][8173:8178] CHIP:DMG:         suppressResponse = false,
-          [1649664146.639836][8173:8178] CHIP:DMG:         InvokeResponseIBs =
-          [1649664146.639895][8173:8178] CHIP:DMG:         [
-          [1649664146.639941][8173:8178] CHIP:DMG:                 InvokeResponseIB =
-          [1649664146.640006][8173:8178] CHIP:DMG:                 {
-          [1649664146.640059][8173:8178] CHIP:DMG:                         CommandStatusIB =
-          [1649664146.640119][8173:8178] CHIP:DMG:                         {
-          [1649664146.640175][8173:8178] CHIP:DMG:                                 CommandPathIB =
-          [1649664146.640238][8173:8178] CHIP:DMG:                                 {
-          [1649664146.640302][8173:8178] CHIP:DMG:                                         EndpointId = 0x0,
-          [1649664146.640373][8173:8178] CHIP:DMG:                                         ClusterId = 0x37,
-          [1649664146.640438][8173:8178] CHIP:DMG:                                         CommandId = 0x0,
-          [1649664146.640500][8173:8178] CHIP:DMG:                                 },
-          [1649664146.640574][8173:8178] CHIP:DMG:
-          [1649664146.640632][8173:8178] CHIP:DMG:                                 StatusIB =
-          [1649664146.640693][8173:8178] CHIP:DMG:                                 {
-          [1649664146.640762][8173:8178] CHIP:DMG:                                         status = 0x00 (SUCCESS),
-          [1649664146.640824][8173:8178] CHIP:DMG:                                 },
-          [1649664146.640886][8173:8178] CHIP:DMG:
-          [1649664146.640943][8173:8178] CHIP:DMG:                         },
-          [1649664146.641007][8173:8178] CHIP:DMG:
-          [1649664146.641058][8173:8178] CHIP:DMG:                 },
-          [1649664146.641126][8173:8178] CHIP:DMG:
-          [1649664146.641174][8173:8178] CHIP:DMG:         ],
-          [1649664146.641230][8173:8178] CHIP:DMG:
-          [1649664146.641275][8173:8178] CHIP:DMG:         InteractionModelRevision = 1
-          [1649664146.641318][8173:8178] CHIP:DMG: },
-          [1649664146.641424][8173:8178] CHIP:DMG: Received Command Response Status for Endpoint=0 Cluster=0x0000_0037 Command=0x0000_0000 Status=0x0
-          [1649664146.641499][8173:8178] CHIP:DMG: ICR moving to [AwaitingDe]
+          [1659960382.148753][4826:4826] CHIP:DMG: InvokeRequestMessage =
+          [1659960382.148777][4826:4826] CHIP:DMG: {
+          [1659960382.148798][4826:4826] CHIP:DMG:         suppressResponse = false,
+          [1659960382.148822][4826:4826] CHIP:DMG:         timedRequest = false,
+          [1659960382.148856][4826:4826] CHIP:DMG:         InvokeRequests =
+          [1659960382.148889][4826:4826] CHIP:DMG:         [
+          [1659960382.148921][4826:4826] CHIP:DMG:                 CommandDataIB =
+          [1659960382.148948][4826:4826] CHIP:DMG:                 {
+          [1659960382.148981][4826:4826] CHIP:DMG:                         CommandPathIB =
+          [1659960382.149013][4826:4826] CHIP:DMG:                         {
+          [1659960382.149051][4826:4826] CHIP:DMG:                                 EndpointId = 0x0,
+          [1659960382.149081][4826:4826] CHIP:DMG:                                 ClusterId = 0x37,
+          [1659960382.149119][4826:4826] CHIP:DMG:                                 CommandId = 0x0,
+          [1659960382.149149][4826:4826] CHIP:DMG:                         },
+          [1659960382.149178][4826:4826] CHIP:DMG:
+          [1659960382.149212][4826:4826] CHIP:DMG:                         CommandFields =
+          [1659960382.149239][4826:4826] CHIP:DMG:                         {
+          [1659960382.149276][4826:4826] CHIP:DMG:                         },
+          [1659960382.149302][4826:4826] CHIP:DMG:                 },
+          [1659960382.149337][4826:4826] CHIP:DMG:
+          [1659960382.149358][4826:4826] CHIP:DMG:         ],
+          [1659960382.149392][4826:4826] CHIP:DMG:
+          [1659960382.149413][4826:4826] CHIP:DMG:         InteractionModelRevision = 1
+          [1659960382.149433][4826:4826] CHIP:DMG: },
       disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_DGGEN_2_2.yaml b/src/app/tests/suites/certification/Test_TC_DGGEN_2_2.yaml
index d0f6d21..91486a9 100644
--- a/src/app/tests/suites/certification/Test_TC_DGGEN_2_2.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DGGEN_2_2.yaml
@@ -39,38 +39,24 @@
       PICS: DGGEN.S.E00
       verification: |
           Optional attribute so its not compulsory to get the expected outcome
-          On Raspi platform the event is triggered with this command, Pls use equivalent command on the respective DUT
+
+          On Raspi platform the event is triggered with below command, Pls use equivalent command on the respective DUT
+          "echo "{"Name":"HardwareFaultChange"}" > /tmp/chip_all_clusters_fifo-<PID>  (PID of all-clusters-app)"
 
           ./chip-tool generaldiagnostics read-event hardware-fault-change 1 0
 
-          On TH verify that HardwareFaultChange Event SHALL indicate a change in the set of hardware faults currently
+          On TH(chip-tool) verify that HardwareFaultChange Event SHALL indicate a change in the set of hardware faults currently
           detected by the Node. The current and previous field SHALL represent the set of faults as per Section 11.11.6.1,
           “HardwareFault enum”
-          CHIP:DMG: ReportDataMessage =
-          [1651562132.028543][7867:7872] CHIP:DMG: {
-          [1651562132.028586][7867:7872] CHIP:DMG:         SuppressResponse = true,
-          [1651562132.028632][7867:7872] CHIP:DMG:         InteractionModelRevision = 1
-          [1651562132.028675][7867:7872] CHIP:DMG: }
-          [1651562132.028788][7867:7872] CHIP:EM: Sending Standalone Ack for MessageCounter:10343932 on exchange 65462i
 
-          1. Launch chip-tool into interactive mode with the below command
-          ./chip-tool interactive start
-           generaldiagnostics subscribe-event hardware-fault-change 100 1000 1 0
-
-          On TH verify that TH reads and subscrition response message showing subscrition ID
-
-          [1653659428.373913][242542:242547] CHIP:EM: Received message of type 0x4 with protocolId (0, 1) and MessageCounter:15916168 on exchange 65448i
-          [1653659428.373971][242542:242547] CHIP:EM: Found matching exchange: 65448i, Delegate: 0x7ff474004ae0
-          [1653659428.374015][242542:242547] CHIP:EM: Rxd Ack; Removing MessageCounter:7607034 from Retrans Table on exchange 65448i
-          [1653659428.374041][242542:242547] CHIP:EM: Removed CHIP MessageCounter:7607034 from RetransTable on exchange 65448i
-          [1653659428.374100][242542:242547] CHIP:DMG: SubscribeResponseMessage =
-          [1653659428.374122][242542:242547] CHIP:DMG: {
-          [1653659428.374146][242542:242547] CHIP:DMG:         SubscriptionId = 0xc90581ad3918815d,
-          [1653659428.374168][242542:242547] CHIP:DMG:         MinIntervalFloorSeconds = 0x64,
-          [1653659428.374189][242542:242547] CHIP:DMG:         MaxIntervalCeilingSeconds = 0x3e8,
-          [1653659428.374209][242542:242547] CHIP:DMG:         InteractionModelRevision = 1
-          [1653659428.374228][242542:242547] CHIP:DMG: }
-          [1653659428.374257][242542:242547] CHIP:DMG: Subscription established with SubscriptionID = 0xC90581AD3918815D MinInterval = 100s MaxInterval = 1000s Peer = 01:0000000000000002
+          [1659530031.316459][4951:4956] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0033 Event 0x0000_0000
+          [1659530031.316486][4951:4956] CHIP:TOO:   Event number: 6
+          [1659530031.316505][4951:4956] CHIP:TOO:   Priority: Critical
+          [1659530031.316524][4951:4956] CHIP:TOO:   Timestamp: 32093879
+          [1659530031.316629][4951:4956] CHIP:TOO:   HardwareFaultChange: {
+          [1659530031.316697][4951:4956] CHIP:TOO:     Current: 0 entries
+          [1659530031.316752][4951:4956] CHIP:TOO:     Previous: 0 entries
+          [1659530031.316778][4951:4956] CHIP:TOO:    }
       disabled: true
 
     - label:
@@ -83,16 +69,22 @@
       verification: |
           Optional attribute so its not compulsory to get the expected outcome
 
-          On TH verify that RadioFaultChange Event SHALL indicate a change in the set of radio faults currently detected
-          by the Node.
+          On Raspi platform the event is triggered with below command, Pls use equivalent command on the respective DUT
+           "echo "{"Name":"RadioFaultChange"}" > /tmp/chip_all_clusters_fifo-<PID>   (PID of all-clusters-app)"
+
           ./chip-tool generaldiagnostics read-event radio-fault-change 1 0
 
-          CHIP:DMG: ReportDataMessage =
-          [1651562132.028543][7867:7872] CHIP:DMG: {
-          [1651562132.028586][7867:7872] CHIP:DMG:         SuppressResponse = true,
-          [1651562132.028632][7867:7872] CHIP:DMG:         InteractionModelRevision = 1
-          [1651562132.028675][7867:7872] CHIP:DMG: }
-          [1651562132.028788][7867:7872] CHIP:EM: Sending Standalone Ack for MessageCounter:10343932 on exchange 65462i
+          On TH (chip-tool) verify that RadioFaultChange Event SHALL indicate a change in the set of radio faults currently detected
+          by the Node.
+
+          [1659530181.319598][4969:4975] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0033 Event 0x0000_0001
+          [1659530181.319628][4969:4975] CHIP:TOO:   Event number: 7
+          [1659530181.319652][4969:4975] CHIP:TOO:   Priority: Critical
+          [1659530181.319675][4969:4975] CHIP:TOO:   Timestamp: 32245892
+          [1659530181.319768][4969:4975] CHIP:TOO:   RadioFaultChange: {
+          [1659530181.319814][4969:4975] CHIP:TOO:     Current: 0 entries
+          [1659530181.319848][4969:4975] CHIP:TOO:     Previous: 0 entries
+          [1659530181.319878][4969:4975] CHIP:TOO:    }
       disabled: true
 
     - label:
@@ -103,22 +95,20 @@
           rejoining DUT back to previous TH fabric.)"
       PICS: DGGEN.S.E02
       verification: |
-          sudo ./chip-tool generaldiagnostics subscribe-event radio-fault-change 100 1000 1 0
+          On Raspi platform the event is triggered with below command, Pls use equivalent command on the respective DUT
+           "echo "{"Name":"NetworkFaultChange"}" > /tmp/chip_all_clusters_fifo-<PID>   (PID of all-clusters-app)"
 
-          On TH verify that subscription response  of RadioFault event shows subscrition ID
+           ./chip-tool generaldiagnostics read-event network-fault-change 1 0
+          On TH(chip-tool) verify that read  response  of NetworkFault event is shown
 
-          [1653659768.885436][242582:242587] CHIP:EM: Received message of type 0x4 with protocolId (0, 1) and MessageCounter:13730082 on exchange 33170i
-          [1653659768.885490][242582:242587] CHIP:EM: Found matching exchange: 33170i, Delegate: 0x7f1d40006300
-          [1653659768.885520][242582:242587] CHIP:EM: Rxd Ack; Removing MessageCounter:6045655 from Retrans Table on exchange 33170i
-          [1653659768.885539][242582:242587] CHIP:EM: Removed CHIP MessageCounter:6045655 from RetransTable on exchange 33170i
-          [1653659768.885591][242582:242587] CHIP:DMG: SubscribeResponseMessage =
-          [1653659768.885609][242582:242587] CHIP:DMG: {
-          [1653659768.885623][242582:242587] CHIP:DMG:         SubscriptionId = 0x3487b97e17eb62c7,
-          [1653659768.885637][242582:242587] CHIP:DMG:         MinIntervalFloorSeconds = 0x64,
-          [1653659768.885651][242582:242587] CHIP:DMG:         MaxIntervalCeilingSeconds = 0x3e8,
-          [1653659768.885668][242582:242587] CHIP:DMG:         InteractionModelRevision = 1
-          [1653659768.885684][242582:242587] CHIP:DMG: }
-          [1653659768.885708][242582:242587] CHIP:DMG: Subscription established with SubscriptionID = 0x3487B97E17EB62C7 MinInterval = 100s MaxInterval = 1000s Peer = 01:0000000000000002
+          [1659530237.352498][4985:4990] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0033 Event 0x0000_0002
+          [1659530237.352541][4985:4990] CHIP:TOO:   Event number: 8
+          [1659530237.352573][4985:4990] CHIP:TOO:   Priority: Critical
+          [1659530237.352604][4985:4990] CHIP:TOO:   Timestamp: 32301872
+          [1659530237.352728][4985:4990] CHIP:TOO:   NetworkFaultChange: {
+          [1659530237.352786][4985:4990] CHIP:TOO:     Current: 0 entries
+          [1659530237.352831][4985:4990] CHIP:TOO:     Previous: 0 entries
+          [1659530237.352874][4985:4990] CHIP:TOO:    }
       disabled: true
 
     - label:
@@ -128,26 +118,32 @@
       verification: |
           Optional attribute so its not compulsory to get the expected outcome
 
+          On Raspi platform the event is triggered with below command, Pls use equivalent command on the respective DUT
+           "echo "{"Name":"<BootReason>"}" > /tmp/chip_all_clusters_fifo-<PID>  (PID of all-clusters-app)"
 
-          ./chip-tool generaldiagnostics read-event network-fault-change 1 0
+          ./chip-tool generaldiagnostics read-event boot-reason 1 0
 
-          On TH verify that The NetworkFaultChange Event SHALL indicate a change in the set of network faults currently
+          On TH(chip-tool) verify that The NetworkFaultChange Event SHALL indicate a change in the set of network faults currently
           detected by the Node.
-          CHIP:DMG: ReportDataMessage =
-          [1651562132.028543][7867:7872] CHIP:DMG: {
-          [1651562132.028586][7867:7872] CHIP:DMG:         SuppressResponse = true,
-          [1651562132.028632][7867:7872] CHIP:DMG:         InteractionModelRevision = 1
-          [1651562132.028675][7867:7872] CHIP:DMG: }
-          [1651562132.028788][7867:7872] CHIP:EM: Sending Standalone Ack for MessageCounter:10343932 on exchange 65462i
+          [1659530352.583608][4993:4998] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0033 Event 0x0000_0003
+          [1659530352.583636][4993:4998] CHIP:TOO:   Event number: 0
+          [1659530352.583656][4993:4998] CHIP:TOO:   Priority: Critical
+          [1659530352.583675][4993:4998] CHIP:TOO:   Timestamp: 29669541
+          [1659530352.583750][4993:4998] CHIP:TOO:   BootReason: {
+          [1659530352.583789][4993:4998] CHIP:TOO:     BootReason: 0
+          [1659530352.583813][4993:4998] CHIP:TOO:    }
       disabled: true
 
     - label: "TH initiates the subscription of NetworkFault event from DUT."
       PICS: DGGEN.S.E02
       verification: |
-          On Raspi platform the event is triggered with this command, Pls use equivalent command on the respective DUT
+          On Raspi platform the event is triggered with below command, Pls use equivalent command on the respective DUT
+
+           "echo "{"Name":"NetworkFaultChange"}" > /tmp/chip_all_clusters_fifo-<PID>   (PID of all-clusters-app)"
+
 
           sudo ./chip-tool generaldiagnostics subscribe-event network-fault-change 100 1000 1 0
-          On TH verify that subscription response  of NetworkFault event  shows subscrition ID
+          On TH(chip-tool) verify that subscription response  of NetworkFault event  shows subscrition ID
 
           [1653659901.757441][242605:242610] CHIP:EM: Received message of type 0x4 with protocolId (0, 1) and MessageCounter:11933575 on exchange 20223i
           [1653659901.757513][242605:242610] CHIP:EM: Found matching exchange: 20223i, Delegate: 0x7fd058003950
@@ -168,9 +164,14 @@
           TH fabric."
       PICS: DGGEN.S.E03
       verification: |
+          On Raspi platform the event is triggered with below command, Pls use equivalent command on the respective DUT
+
+           "echo "{"Name":"<BootReason>"}" > /tmp/chip_all_clusters_fifo-<PID>  (PID of all-clusters-app)"
+
+
           1. Reboot DUT with a normal reboot process
           2. ./chip-tool generaldiagnostics read-event boot-reason 1 0
-          On TH verify that the event data of BootReason specified by Table 103 BootReason ENUM table.
+          On TH(chip-tool) verify that the event data of BootReason specified by Table 103 BootReason ENUM table.
 
           CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0033 Event 0x0000_0003
           [1651562139.644134][7873:7878] CHIP:TOO:          Event number: 1
diff --git a/src/app/tests/suites/certification/Test_TC_DGGEN_2_3.yaml b/src/app/tests/suites/certification/Test_TC_DGGEN_2_3.yaml
index 0e067df..90db2c6 100644
--- a/src/app/tests/suites/certification/Test_TC_DGGEN_2_3.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DGGEN_2_3.yaml
@@ -30,26 +30,41 @@
           verification step to be updated.
       disabled: true
 
+    - label: "Commission DUT to TH"
+      verification: |
+          verification step to be updated.
+      disabled: true
+
+    - label: "TH reads TestEventTriggersEnabled attribute value"
+      verification: |
+          ./chip-tool generaldiagnostics read test-event-triggers-enabled 1 0
+          On TH(chip-tool) verify that the TestEventTriggersEnabled value is of bool type. If this value is set to True, then proceed with step 3, otherwise skip step 3.
+          [1659425031.608557][4213:4218] CHIP:DMG: }
+          [1659425031.608771][4213:4218] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0033 Attribute 0x0000_0008 DataVersion: 1691505311
+          [1659425031.608815][4213:4218] CHIP:TOO:   TestEventTriggersEnabled: TRUE
+          [1659425031.608915][4213:4218] CHIP:EM: Sending Standalone Ack for MessageCounter:126478710 on exchange 37049i
+      disabled: true
+
     - label:
-          "Provision TH with EnableKey with 128 bit value provided and matched a
-          value chosen by the manufacturer and configured on the DUT using
-          manufacturer-specific means. EventTrigger value is configured and
-          SHALL indicate the test or test mode which TH wants to trigger the
-          testing use by manufacturers."
+          "Invoke the TestEventTrigger command with EnableKey field set to
+          PIXIT.DGGEN.ENABLEKEY and EventTrigger field set to 0."
       PICS: DGGEN.S.C00.Rsp
       verification: |
-          1. Read if TestEventTriggersEnabled attribute is set to true using ./chip-tool generaldiagnostics read test-event-triggers-enabled  1 0
+          Based on Spec, EnableKey value is to be provided by  manufacturer
+          below mentioned the example command to verify
+           ./chip-tool generaldiagnostics  <EnableKey> test-event-trigger   0 1 0
+      disabled: true
 
-          Spec Issue:-5265
-           ./chip-tool generaldiagnostics read   test-event-triggers-enabled  1 0
-
-          Verify in TH log
-
-          [1655188892.957794][2868:2873] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0033 Attribute 0x0000_0008 DataVersion: 3562689442
-          [1655188892.957869][2868:2873] CHIP:TOO:   TestEventTriggersEnabled: FALSE
-          [1655188892.957999][2868:2873] CHIP:EM: Sending Standalone Ack for MessageCounter:133140817 on exchange 23176i
-
-          2. when this attribute is false, do not need to verify rest of the below commands.
-          3. When this attribute is true, the Node has been configured with one or more test event triggers by virtue of the internally programmed EnableKey value by the product vendor
-          4. Use the manufacturer-provided EnableKey value and the EventTrigger value and send command using "./chip-tool generaldiagnostics test-event-trigger <EnableKey> <EventTrigger destination-id> " 1 0 and verify if the DUT generated the desired event.
+    - label:
+          "Invoke the TestEventTrigger command with EnableKey field set to 16
+          bytes of all zeroes and EventTrigger field set to 0."
+      PICS: DGGEN.S.C00.Rsp
+      verification: |
+          ./chip-tool generaldiagnostics  test-event-trigger hex:0000000000000000  0 1 0
+          On TH(chip-tool) Verify that DUT responds with CONSTRAINT_ERROR.
+          [1659426470.994413][4451:4456] CHIP:DMG:         InteractionModelRevision = 1
+          [1659426470.994442][4451:4456] CHIP:DMG: },
+          [1659426470.994513][4451:4456] CHIP:DMG: Received Command Response Status for Endpoint=0 Cluster=0x0000_0033 Command=0x0000_0000 Status=0x87
+          [1659426470.994553][4451:4456] CHIP:TOO: Error: IM Error 0x00000587: General error: 0x87 (CONSTRAINT_ERROR)
+          [1659426470.994618][4451:4456] CHIP:DMG: ICR moving to [AwaitingDe]
       disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_DGGEN_3_1.yaml b/src/app/tests/suites/certification/Test_TC_DGGEN_3_1.yaml
index 6a0b3e8..d9bac3b 100644
--- a/src/app/tests/suites/certification/Test_TC_DGGEN_3_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DGGEN_3_1.yaml
@@ -24,6 +24,11 @@
     endpoint: 0
 
 tests:
+    - label: "Note"
+      verification: |
+          Chip-tool command used below are an example to verify the  DUT as client test cases. For certification test, we expect DUT should have a capability or way to run the equivalent command.
+      disabled: true
+
     - label: "Commission TH to DUT"
       verification: |
           verification step to be updated.
@@ -32,140 +37,196 @@
     - label: "DUT reads NetworkInterfaces structure attribute from TH."
       PICS: DGGEN.C.A0000
       verification: |
+          Product maker needs to provide instructions for how to trigger the command on the DUT. For comparison, the DUT behavior for this test step can be simulated using chip-tool (when DUT is a commissioner/Client)
+
           ./chip-tool generaldiagnostics read network-interfaces 1 0
 
-          Verify in DUT as client side: verify that list of supported NetworkInterfaces structures,  Structure data includes Name, IsOperational, OffPremiseServicesReachableIPv4, OffPremiseServicesReachableIPv6,   HardwareAddress, IPv4Addresses,  IPv6Addresses and type.
+           verify that list of supported NetworkInterfaces structures,  Structure data includes Name, IsOperational, OffPremiseServicesReachableIPv4, OffPremiseServicesReachableIPv6,   HardwareAddress, IPv4Addresses,  IPv6Addresses and type on TH(all-clusters-app)
 
-          [1654682355.830733][32933:32938] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0033 Attribute 0x0000_0000 DataVersion: 2161135285
-          [1654682355.830907][32933:32938] CHIP:TOO:   NetworkInterfaces: 11 entries
-          [1654682355.831236][32933:32938] CHIP:TOO:     [1]: {
-          [1654682355.831270][32933:32938] CHIP:TOO:       Name: vethf7aa085
-          [1654682355.831294][32933:32938] CHIP:TOO:       IsOperational: TRUE
-          [1654682355.831331][32933:32938] CHIP:TOO:       OffPremiseServicesReachableIPv4: null
-          [1654682355.831356][32933:32938] CHIP:TOO:       OffPremiseServicesReachableIPv6: null
-          [1654682355.831380][32933:32938] CHIP:TOO:       HardwareAddress: 96C640A56417
-          [1654682355.831415][32933:32938] CHIP:TOO:       IPv4Addresses: 0 entries
-          [1654682355.831444][32933:32938] CHIP:TOO:       IPv6Addresses: 1 entries
-          [1654682355.831474][32933:32938] CHIP:TOO:         [1]: FE8000000000000094C640FFFEA56417
-          [1654682355.831502][32933:32938] CHIP:TOO:       Type: 0
-          [1654682355.831527][32933:32938] CHIP:TOO:      }
-          [1654682355.831567][32933:32938] CHIP:TOO:     [2]: {
-          [1654682355.831591][32933:32938] CHIP:TOO:       Name: veth2598e21
-          [1654682355.831612][32933:32938] CHIP:TOO:       IsOperational: TRUE
-          [1654682355.831633][32933:32938] CHIP:TOO:       OffPremiseServicesReachableIPv4: null
-          [1654682355.831654][32933:32938] CHIP:TOO:       OffPremiseServicesReachableIPv6: null
-          [1654682355.831677][32933:32938] CHIP:TOO:       HardwareAddress: 3A177D3B1F89
-          [1654682355.831700][32933:32938] CHIP:TOO:       IPv4Addresses: 0 entries
-          [1654682355.831726][32933:32938] CHIP:TOO:       IPv6Addresses: 1 entries
-          [1654682355.831752][32933:32938] CHIP:TOO:         [1]: FE8000000000000038177DFFFE3B1F89
-          [1654682355.831777][32933:32938] CHIP:TOO:       Type: 0
-          [1654682355.831800][32933:32938] CHIP:TOO:      }
-          [1654682355.831834][32933:32938] CHIP:TOO:     [3]: {
-          [1654682355.831856][32933:32938] CHIP:TOO:       Name: veth8b3fd7e
-          [1654682355.831877][32933:32938] CHIP:TOO:       IsOperational: TRUE
-          [1654682355.831899][32933:32938] CHIP:TOO:       OffPremiseServicesReachableIPv4: null
-          [1654682355.831920][32933:32938] CHIP:TOO:       OffPremiseServicesReachableIPv6: null
-          [1654682355.831942][32933:32938] CHIP:TOO:       HardwareAddress: 866D1837E8EC
-          [1654682355.831965][32933:32938] CHIP:TOO:       IPv4Addresses: 0 entries
-          [1654682355.831990][32933:32938] CHIP:TOO:       IPv6Addresses: 1 entries
-          [1654682355.832016][32933:32938] CHIP:TOO:         [1]: FE80000000000000846D18FFFE37E8EC
-          [1654682355.832041][32933:32938] CHIP:TOO:       Type: 0
-          [1654682355.832063][32933:32938] CHIP:TOO:      }
-          [1654682355.832096][32933:32938] CHIP:TOO:     [4]: {
-          [1654682355.832119][32933:32938] CHIP:TOO:       Name: vethb477521
-          [1654682355.832140][32933:32938] CHIP:TOO:       IsOperational: TRUE
-          [1654682355.832161][32933:32938] CHIP:TOO:       OffPremiseServicesReachableIPv4: null
-          [1654682355.832183][32933:32938] CHIP:TOO:       OffPremiseServicesReachableIPv6: null
-          [1654682355.832205][32933:32938] CHIP:TOO:       HardwareAddress: 46D8B6E48B90
-          [1654682355.832228][32933:32938] CHIP:TOO:       IPv4Addresses: 0 entries
-          [1654682355.832253][32933:32938] CHIP:TOO:       IPv6Addresses: 1 entries
-          [1654682355.832280][32933:32938] CHIP:TOO:         [1]: FE8000000000000044D8B6FFFEE48B90
-          [1654682355.832305][32933:32938] CHIP:TOO:       Type: 0
-          [1654682355.832327][32933:32938] CHIP:TOO:      }
-          [1654682355.832362][32933:32938] CHIP:TOO:     [5]: {
-          [1654682355.832385][32933:32938] CHIP:TOO:       Name: vethaf676ee
-          [1654682355.832405][32933:32938] CHIP:TOO:       IsOperational: TRUE
-          [1654682355.832427][32933:32938] CHIP:TOO:       OffPremiseServicesReachableIPv4: null
-          [1654682355.832448][32933:32938] CHIP:TOO:       OffPremiseServicesReachableIPv6: null
-          [1654682355.832471][32933:32938] CHIP:TOO:       HardwareAddress: 9EA9BC908F4D
-          [1654682355.832493][32933:32938] CHIP:TOO:       IPv4Addresses: 0 entries
-          [1654682355.832518][32933:32938] CHIP:TOO:       IPv6Addresses: 1 entries
-          [1654682355.832545][32933:32938] CHIP:TOO:         [1]: FE800000000000009CA9BCFFFE908F4D
-          [1654682355.832571][32933:32938] CHIP:TOO:       Type: 0
-          [1654682355.832593][32933:32938] CHIP:TOO:      }
-          [1654682355.832629][32933:32938] CHIP:TOO:     [6]: {
-          [1654682355.832651][32933:32938] CHIP:TOO:       Name: br-6ab75b625e42
-          [1654682355.832672][32933:32938] CHIP:TOO:       IsOperational: TRUE
-          [1654682355.832693][32933:32938] CHIP:TOO:       OffPremiseServicesReachableIPv4: null
-          [1654682355.832715][32933:32938] CHIP:TOO:       OffPremiseServicesReachableIPv6: null
-          [1654682355.832737][32933:32938] CHIP:TOO:       HardwareAddress: 0242DF8961A4
-          [1654682355.832761][32933:32938] CHIP:TOO:       IPv4Addresses: 1 entries
-          [1654682355.832786][32933:32938] CHIP:TOO:         [1]: AC130001
-          [1654682355.832812][32933:32938] CHIP:TOO:       IPv6Addresses: 1 entries
-          [1654682355.832838][32933:32938] CHIP:TOO:         [1]: FE800000000000000042DFFFFE8961A4
-          [1654682355.832863][32933:32938] CHIP:TOO:       Type: 0
-          [1654682355.832884][32933:32938] CHIP:TOO:      }
-          [1654682355.832918][32933:32938] CHIP:TOO:     [7]: {
-          [1654682355.832941][32933:32938] CHIP:TOO:       Name: docker0
-          [1654682355.832962][32933:32938] CHIP:TOO:       IsOperational: FALSE
-          [1654682355.832983][32933:32938] CHIP:TOO:       OffPremiseServicesReachableIPv4: null
-          [1654682355.833005][32933:32938] CHIP:TOO:       OffPremiseServicesReachableIPv6: null
-          [1654682355.833027][32933:32938] CHIP:TOO:       HardwareAddress: 0242F708AABC
-          [1654682355.833051][32933:32938] CHIP:TOO:       IPv4Addresses: 1 entries
-          [1654682355.833076][32933:32938] CHIP:TOO:         [1]: AC110001
-          [1654682355.833101][32933:32938] CHIP:TOO:       IPv6Addresses: 1 entries
-          [1654682355.833129][32933:32938] CHIP:TOO:         [1]: Elided value too large of size 0
-          [1654682355.833154][32933:32938] CHIP:TOO:       Type: 0
-          [1654682355.833176][32933:32938] CHIP:TOO:      }
-          [1654682355.833229][32933:32938] CHIP:TOO:     [8]: {
-          [1654682355.833254][32933:32938] CHIP:TOO:       Name: br-01617d2fb6b6
-          [1654682355.833275][32933:32938] CHIP:TOO:       IsOperational: TRUE
-          [1654682355.833297][32933:32938] CHIP:TOO:       OffPremiseServicesReachableIPv4: null
-          [1654682355.833318][32933:32938] CHIP:TOO:       OffPremiseServicesReachableIPv6: null
-          [1654682355.833341][32933:32938] CHIP:TOO:       HardwareAddress: 0242261CAA10
-          [1654682355.833365][32933:32938] CHIP:TOO:       IPv4Addresses: 1 entries
-          [1654682355.833391][32933:32938] CHIP:TOO:         [1]: AC120001
-          [1654682355.833418][32933:32938] CHIP:TOO:       IPv6Addresses: 3 entries
-          [1654682355.833444][32933:32938] CHIP:TOO:         [1]: FD006D61747465720000000000000001
-          [1654682355.833471][32933:32938] CHIP:TOO:         [2]: FE80000000000000004226FFFE1CAA10
-          [1654682355.833607][32933:32938] CHIP:TOO:         [3]: FE800000000000000000000000000001
-          [1654682355.833636][32933:32938] CHIP:TOO:       Type: 0
-          [1654682355.833658][32933:32938] CHIP:TOO:      }
-          [1654682355.833693][32933:32938] CHIP:TOO:     [9]: {
-          [1654682355.833716][32933:32938] CHIP:TOO:       Name: wlan0
-          [1654682355.833737][32933:32938] CHIP:TOO:       IsOperational: FALSE
-          [1654682355.833759][32933:32938] CHIP:TOO:       OffPremiseServicesReachableIPv4: null
-          [1654682355.833780][32933:32938] CHIP:TOO:       OffPremiseServicesReachableIPv6: null
-          [1654682355.833802][32933:32938] CHIP:TOO:       HardwareAddress: E45F016961B3
-          [1654682355.833825][32933:32938] CHIP:TOO:       IPv4Addresses: 0 entries
-          [1654682355.833850][32933:32938] CHIP:TOO:       IPv6Addresses: 0 entries
-          [1654682355.833874][32933:32938] CHIP:TOO:       Type: 1
-          [1654682355.833896][32933:32938] CHIP:TOO:      }
-          [1654682355.833930][32933:32938] CHIP:TOO:     [10]: {
-          [1654682355.833953][32933:32938] CHIP:TOO:       Name: eth0
-          [1654682355.833973][32933:32938] CHIP:TOO:       IsOperational: TRUE
-          [1654682355.833994][32933:32938] CHIP:TOO:       OffPremiseServicesReachableIPv4: null
-          [1654682355.834016][32933:32938] CHIP:TOO:       OffPremiseServicesReachableIPv6: null
-          [1654682355.834039][32933:32938] CHIP:TOO:       HardwareAddress: E45F016961B1
-          [1654682355.834062][32933:32938] CHIP:TOO:       IPv4Addresses: 1 entries
-          [1654682355.834087][32933:32938] CHIP:TOO:         [1]: C0A80064
-          [1654682355.834113][32933:32938] CHIP:TOO:       IPv6Addresses: 1 entries
-          [1654682355.834139][32933:32938] CHIP:TOO:         [1]: FE80000000000000E65F01FFFE6961B1
-          [1654682355.834164][32933:32938] CHIP:TOO:       Type: 2
-          [1654682355.834186][32933:32938] CHIP:TOO:      }
-          [1654682355.834220][32933:32938] CHIP:TOO:     [11]: {
-          [1654682355.834243][32933:32938] CHIP:TOO:       Name: lo
-          [1654682355.834264][32933:32938] CHIP:TOO:       IsOperational: TRUE
-          [1654682355.834286][32933:32938] CHIP:TOO:       OffPremiseServicesReachableIPv4: null
-          [1654682355.834307][32933:32938] CHIP:TOO:       OffPremiseServicesReachableIPv6: null
-          [1654682355.834329][32933:32938] CHIP:TOO:       HardwareAddress: 000000000000
-          [1654682355.834353][32933:32938] CHIP:TOO:       IPv4Addresses: 1 entries
-          [1654682355.834378][32933:32938] CHIP:TOO:         [1]: 7F000001
-          [1654682355.834403][32933:32938] CHIP:TOO:       IPv6Addresses: 1 entries
-          [1654682355.834429][32933:32938] CHIP:TOO:         [1]: 00000000000000000000000000000001
-          [1654682355.834454][32933:32938] CHIP:TOO:       Type: 0
-          [1654682355.834476][32933:32938] CHIP:TOO:      }
-          [1654682355.834653][32933:32938] CHIP:EM: Sending Standalone Ack for MessageCounter:226724572 on exchange 53960i
+
+          1659772635.992784][17263:17263] CHIP:DMG: }
+          [1659772635.992786][17263:17263] CHIP:DMG:
+          [1659772635.992848][17263:17263] CHIP:DMG: ReportDataMessage =
+          [1659772635.992851][17263:17263] CHIP:DMG: {
+          [1659772635.992853][17263:17263] CHIP:DMG:         AttributeReportIBs =
+          [1659772635.992858][17263:17263] CHIP:DMG:         [
+          [1659772635.992860][17263:17263] CHIP:DMG:                 AttributeReportIB =
+          [1659772635.992865][17263:17263] CHIP:DMG:                 {
+          [1659772635.992868][17263:17263] CHIP:DMG:                         AttributeDataIB =
+          [1659772635.992871][17263:17263] CHIP:DMG:                         {
+          [1659772635.992874][17263:17263] CHIP:DMG:                                 DataVersion = 0x4dcd1218,
+          [1659772635.992877][17263:17263] CHIP:DMG:                                 AttributePathIB =
+          [1659772635.992880][17263:17263] CHIP:DMG:                                 {
+          [1659772635.992885][17263:17263] CHIP:DMG:                                         Endpoint = 0x0,
+          [1659772635.992890][17263:17263] CHIP:DMG:                                         Cluster = 0x33,
+          [1659772635.992894][17263:17263] CHIP:DMG:                                         Attribute = 0x0000_0000,
+          [1659772635.992898][17263:17263] CHIP:DMG:                                 }
+          [1659772635.992902][17263:17263] CHIP:DMG:
+          [1659772635.992906][17263:17263] CHIP:DMG:                                 Data = [
+          [1659772635.992910][17263:17263] CHIP:DMG:
+          [1659772635.992914][17263:17263] CHIP:DMG:                                 ],
+          [1659772635.992918][17263:17263] CHIP:DMG:                         },
+          [1659772635.992923][17263:17263] CHIP:DMG:
+          [1659772635.992926][17263:17263] CHIP:DMG:                 },
+          [1659772635.992935][17263:17263] CHIP:DMG:
+          [1659772635.992939][17263:17263] CHIP:DMG:                 AttributeReportIB =
+          [1659772635.992946][17263:17263] CHIP:DMG:                 {
+          [1659772635.992949][17263:17263] CHIP:DMG:                         AttributeDataIB =
+          [1659772635.992953][17263:17263] CHIP:DMG:                         {
+          [1659772635.992957][17263:17263] CHIP:DMG:                                 DataVersion = 0x4dcd1218,
+          [1659772635.992960][17263:17263] CHIP:DMG:                                 AttributePathIB =
+          [1659772635.992964][17263:17263] CHIP:DMG:                                 {
+          [1659772635.992968][17263:17263] CHIP:DMG:                                         Endpoint = 0x0,
+          [1659772635.992973][17263:17263] CHIP:DMG:                                         Cluster = 0x33,
+          [1659772635.992977][17263:17263] CHIP:DMG:                                         Attribute = 0x0000_0000,
+          [1659772635.992981][17263:17263] CHIP:DMG:                                         ListIndex = Null,
+          [1659772635.992986][17263:17263] CHIP:DMG:                                 }
+          [1659772635.992990][17263:17263] CHIP:DMG:
+          [1659772635.992994][17263:17263] CHIP:DMG:                                 Data =
+          [1659772635.992998][17263:17263] CHIP:DMG:                                 {
+          [1659772635.993003][17263:17263] CHIP:DMG:                                         0x0 = "docker0" (7 chars),
+          [1659772635.993007][17263:17263] CHIP:DMG:                                         0x1 = false,
+          [1659772635.993012][17263:17263] CHIP:DMG:                                         0x2 = NULL
+          [1659772635.993016][17263:17263] CHIP:DMG:                                         0x3 = NULL
+          [1659772635.993021][17263:17263] CHIP:DMG:                                         0x4 = [
+          [1659772635.993025][17263:17263] CHIP:DMG:                                                         0x2, 0x42, 0x2d, 0x7f, 0xa5, 0x93,
+          [1659772635.993031][17263:17263] CHIP:DMG:                                         ] (6 bytes)
+          [1659772635.993035][17263:17263] CHIP:DMG:                                         0x5 = [
+          [1659772635.993041][17263:17263] CHIP:DMG:                                                         [
+          [1659772635.993045][17263:17263] CHIP:DMG:                                                         0xac, 0x11, 0x0, 0x1,
+          [1659772635.993051][17263:17263] CHIP:DMG:                                                 ] (4 bytes)
+          [1659772635.993057][17263:17263] CHIP:DMG:                                         ],
+          [1659772635.993060][17263:17263] CHIP:DMG:                                         0x6 = [
+          [1659772635.993064][17263:17263] CHIP:DMG:                                                         [
+          [1659772635.993068][17263:17263] CHIP:DMG:
+          [1659772635.993074][17263:17263] CHIP:DMG:                                                 ] (0 bytes)
+          [1659772635.993080][17263:17263] CHIP:DMG:                                         ],
+          [1659772635.993084][17263:17263] CHIP:DMG:                                         0x7 = 0,
+          [1659772635.993088][17263:17263] CHIP:DMG:                                 },
+          [1659772635.993091][17263:17263] CHIP:DMG:                         },
+          [1659772635.993098][17263:17263] CHIP:DMG:
+          [1659772635.993101][17263:17263] CHIP:DMG:                 },
+          [1659772635.993113][17263:17263] CHIP:DMG:
+          [1659772635.993116][17263:17263] CHIP:DMG:                 AttributeReportIB =
+          [1659772635.993125][17263:17263] CHIP:DMG:                 {
+          [1659772635.993128][17263:17263] CHIP:DMG:                         AttributeDataIB =
+          [1659772635.993131][17263:17263] CHIP:DMG:                         {
+          [1659772635.993135][17263:17263] CHIP:DMG:                                 DataVersion = 0x4dcd1218,
+          [1659772635.993139][17263:17263] CHIP:DMG:                                 AttributePathIB =
+          [1659772635.993143][17263:17263] CHIP:DMG:                                 {
+          [1659772635.993146][17263:17263] CHIP:DMG:                                         Endpoint = 0x0,
+          [1659772635.993150][17263:17263] CHIP:DMG:                                         Cluster = 0x33,
+          [1659772635.993154][17263:17263] CHIP:DMG:                                         Attribute = 0x0000_0000,
+          [1659772635.993159][17263:17263] CHIP:DMG:                                         ListIndex = Null,
+          [1659772635.993163][17263:17263] CHIP:DMG:                                 }
+          [1659772635.993167][17263:17263] CHIP:DMG:
+          [1659772635.993171][17263:17263] CHIP:DMG:                                 Data =
+          [1659772635.993175][17263:17263] CHIP:DMG:                                 {
+          [1659772635.993179][17263:17263] CHIP:DMG:                                         0x0 = "wlp0s20f3" (9 chars),
+          [1659772635.993183][17263:17263] CHIP:DMG:                                         0x1 = true,
+          [1659772635.993188][17263:17263] CHIP:DMG:                                         0x2 = NULL
+          [1659772635.993193][17263:17263] CHIP:DMG:                                         0x3 = NULL
+          [1659772635.993197][17263:17263] CHIP:DMG:                                         0x4 = [
+          [1659772635.993202][17263:17263] CHIP:DMG:                                                         0x8, 0x71, 0x90, 0x45, 0x8b, 0x2f,
+          [1659772635.993207][17263:17263] CHIP:DMG:                                         ] (6 bytes)
+          [1659772635.993211][17263:17263] CHIP:DMG:                                         0x5 = [
+          [1659772635.993216][17263:17263] CHIP:DMG:                                                         [
+          [1659772635.993220][17263:17263] CHIP:DMG:                                                         0xc0, 0xa8, 0x64, 0xa,
+          [1659772635.993226][17263:17263] CHIP:DMG:                                                 ] (4 bytes)
+          [1659772635.993231][17263:17263] CHIP:DMG:                                         ],
+          [1659772635.993235][17263:17263] CHIP:DMG:                                         0x6 = [
+          [1659772635.993239][17263:17263] CHIP:DMG:                                                         [
+          [1659772635.993246][17263:17263] CHIP:DMG:                                                         0xfe, 0x80, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x4e, 0x4e, 0xd5, 0x79, 0x10, 0xe8, 0x45, 0xb5,
+          [1659772635.993252][17263:17263] CHIP:DMG:                                                 ] (16 bytes)
+          [1659772635.993257][17263:17263] CHIP:DMG:                                         ],
+          [1659772635.993261][17263:17263] CHIP:DMG:                                         0x7 = 1,
+          [1659772635.993264][17263:17263] CHIP:DMG:                                 },
+          [1659772635.993268][17263:17263] CHIP:DMG:                         },
+          [1659772635.993275][17263:17263] CHIP:DMG:
+          [1659772635.993278][17263:17263] CHIP:DMG:                 },
+          [1659772635.993289][17263:17263] CHIP:DMG:
+          [1659772635.993292][17263:17263] CHIP:DMG:                 AttributeReportIB =
+          [1659772635.993299][17263:17263] CHIP:DMG:                 {
+          [1659772635.993302][17263:17263] CHIP:DMG:                         AttributeDataIB =
+          [1659772635.993306][17263:17263] CHIP:DMG:                         {
+          [1659772635.993310][17263:17263] CHIP:DMG:                                 DataVersion = 0x4dcd1218,
+          [1659772635.993314][17263:17263] CHIP:DMG:                                 AttributePathIB =
+          [1659772635.993317][17263:17263] CHIP:DMG:                                 {
+          [1659772635.993321][17263:17263] CHIP:DMG:                                         Endpoint = 0x0,
+          [1659772635.993326][17263:17263] CHIP:DMG:                                         Cluster = 0x33,
+          [1659772635.993330][17263:17263] CHIP:DMG:                                         Attribute = 0x0000_0000,
+          [1659772635.993335][17263:17263] CHIP:DMG:                                         ListIndex = Null,
+          [1659772635.993338][17263:17263] CHIP:DMG:                                 }
+          [1659772635.993343][17263:17263] CHIP:DMG:
+          [1659772635.993347][17263:17263] CHIP:DMG:                                 Data =
+          [1659772635.993351][17263:17263] CHIP:DMG:                                 {
+          [1659772635.993355][17263:17263] CHIP:DMG:                                         0x0 = "enp3s0" (6 chars),
+          [1659772635.993359][17263:17263] CHIP:DMG:                                         0x1 = true,
+          [1659772635.993363][17263:17263] CHIP:DMG:                                         0x2 = NULL
+          [1659772635.993367][17263:17263] CHIP:DMG:                                         0x3 = NULL
+          [1659772635.993372][17263:17263] CHIP:DMG:                                         0x4 = [
+          [1659772635.993376][17263:17263] CHIP:DMG:                                                         0xe4, 0x54, 0xe8, 0x15, 0x1d, 0xb3,
+          [1659772635.993382][17263:17263] CHIP:DMG:                                         ] (6 bytes)
+          [1659772635.993385][17263:17263] CHIP:DMG:                                         0x5 = [
+          [1659772635.993390][17263:17263] CHIP:DMG:                                                         [
+          [1659772635.993394][17263:17263] CHIP:DMG:                                                         0xc0, 0xa8, 0x64, 0xb,
+          [1659772635.993400][17263:17263] CHIP:DMG:                                                 ] (4 bytes)
+          [1659772635.993406][17263:17263] CHIP:DMG:                                         ],
+          [1659772635.993410][17263:17263] CHIP:DMG:                                         0x6 = [
+          [1659772635.993414][17263:17263] CHIP:DMG:                                                         [
+          [1659772635.993420][17263:17263] CHIP:DMG:                                                         0xfe, 0x80, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xe6, 0x54, 0xe8, 0xff, 0xfe, 0x15, 0x1d, 0xb3,
+          [1659772635.993426][17263:17263] CHIP:DMG:                                                 ] (16 bytes)
+          [1659772635.993430][17263:17263] CHIP:DMG:                                         ],
+          [1659772635.993434][17263:17263] CHIP:DMG:                                         0x7 = 2,
+          [1659772635.993438][17263:17263] CHIP:DMG:                                 },
+          [1659772635.993442][17263:17263] CHIP:DMG:                         },
+          [1659772635.993450][17263:17263] CHIP:DMG:
+          [1659772635.993453][17263:17263] CHIP:DMG:                 },
+          [1659772635.993463][17263:17263] CHIP:DMG:
+          [1659772635.993466][17263:17263] CHIP:DMG:                 AttributeReportIB =
+          [1659772635.993474][17263:17263] CHIP:DMG:                 {
+          [1659772635.993477][17263:17263] CHIP:DMG:                         AttributeDataIB =
+          [1659772635.993480][17263:17263] CHIP:DMG:                         {
+          [1659772635.993484][17263:17263] CHIP:DMG:                                 DataVersion = 0x4dcd1218,
+          [1659772635.993488][17263:17263] CHIP:DMG:                                 AttributePathIB =
+          [1659772635.993492][17263:17263] CHIP:DMG:                                 {
+          [1659772635.993496][17263:17263] CHIP:DMG:                                         Endpoint = 0x0,
+          [1659772635.993501][17263:17263] CHIP:DMG:                                         Cluster = 0x33,
+          [1659772635.993505][17263:17263] CHIP:DMG:                                         Attribute = 0x0000_0000,
+          [1659772635.993509][17263:17263] CHIP:DMG:                                         ListIndex = Null,
+          [1659772635.993513][17263:17263] CHIP:DMG:                                 }
+          [1659772635.993517][17263:17263] CHIP:DMG:
+          [1659772635.993521][17263:17263] CHIP:DMG:                                 Data =
+          [1659772635.993525][17263:17263] CHIP:DMG:                                 {
+          [1659772635.993529][17263:17263] CHIP:DMG:                                         0x0 = "lo" (2 chars),
+          [1659772635.993534][17263:17263] CHIP:DMG:                                         0x1 = true,
+          [1659772635.993538][17263:17263] CHIP:DMG:                                         0x2 = NULL
+          [1659772635.993542][17263:17263] CHIP:DMG:                                         0x3 = NULL
+          [1659772635.993545][17263:17263] CHIP:DMG:                                         0x4 = [
+          [1659772635.993550][17263:17263] CHIP:DMG:                                                         0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+          [1659772635.993556][17263:17263] CHIP:DMG:                                         ] (6 bytes)
+          [1659772635.993559][17263:17263] CHIP:DMG:                                         0x5 = [
+          [1659772635.993565][17263:17263] CHIP:DMG:                                                         [
+          [1659772635.993570][17263:17263] CHIP:DMG:                                                         0x7f, 0x0, 0x0, 0x1,
+          [1659772635.993575][17263:17263] CHIP:DMG:                                                 ] (4 bytes)
+          [1659772635.993579][17263:17263] CHIP:DMG:                                         ],
+          [1659772635.993583][17263:17263] CHIP:DMG:                                         0x6 = [
+          [1659772635.993587][17263:17263] CHIP:DMG:                                                         [
+          [1659772635.993594][17263:17263] CHIP:DMG:                                                         0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1,
+          [1659772635.993600][17263:17263] CHIP:DMG:                                                 ] (16 bytes)
+          [1659772635.993605][17263:17263] CHIP:DMG:                                         ],
+          [1659772635.993609][17263:17263] CHIP:DMG:                                         0x7 = 0,
+          [1659772635.993613][17263:17263] CHIP:DMG:                                 },
+          [1659772635.993617][17263:17263] CHIP:DMG:                         },
+          [1659772635.993623][17263:17263] CHIP:DMG:
+          [1659772635.993627][17263:17263] CHIP:DMG:                 },
+          [1659772635.993634][17263:17263] CHIP:DMG:
+          [1659772635.993637][17263:17263] CHIP:DMG:         ],
+          [1659772635.993656][17263:17263] CHIP:DMG:
+          [1659772635.993659][17263:17263] CHIP:DMG:         SuppressResponse = true,
+          [1659772635.993662][17263:17263] CHIP:DMG:         InteractionModelRevision = 1
+          [1659772635.993665][17263:17263] CHIP:DMG: }
+          [1659772635.993669][17263:17263] CHIP:DMG:
       disabled: true
 
     - label:
@@ -173,12 +234,43 @@
           gets rebooted more than 2 times."
       PICS: DGGEN.C.A0001
       verification: |
+          Product maker needs to provide instructions for how to trigger the command on the DUT. For comparison, the DUT behavior for this test step can be simulated using chip-tool (when DUT is a commissioner/Client)
+
           ./chip-tool generaldiagnostics read reboot-count 1 0
           Verify in DUT as client side: verify that RebootCount attribute data type must be UINT16 and the count should match with the number of rebooted times.
 
-          [1650873646.874760][19568:19573] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0033 Attribute 0x0000_0001 DataVersion: 2777668989
-          [1650873646.874854][19568:19573] CHIP:TOO:   RebootCount: 2
-          [1650873646.874974][19568:19573] CHIP:EM: Sending Standalone Ack for MessageCounter:3185095 on exchange 6631i
+          [1659772809.009830][17263:17263] CHIP:DMG:     buffer_ptr = 94267919976192
+          [1659772809.009842][17263:17263] CHIP:DMG: }
+          [1659772809.009854][17263:17263] CHIP:DMG:
+          [1659772809.009924][17263:17263] CHIP:DMG: ReportDataMessage =
+          [1659772809.009939][17263:17263] CHIP:DMG: {
+          [1659772809.009951][17263:17263] CHIP:DMG:         AttributeReportIBs =
+          [1659772809.009973][17263:17263] CHIP:DMG:         [
+          [1659772809.009987][17263:17263] CHIP:DMG:                 AttributeReportIB =
+          [1659772809.010008][17263:17263] CHIP:DMG:                 {
+          [1659772809.010022][17263:17263] CHIP:DMG:                         AttributeDataIB =
+          [1659772809.010036][17263:17263] CHIP:DMG:                         {
+          [1659772809.010052][17263:17263] CHIP:DMG:                                 DataVersion = 0x4dcd1218,
+          [1659772809.010068][17263:17263] CHIP:DMG:                                 AttributePathIB =
+          [1659772809.010084][17263:17263] CHIP:DMG:                                 {
+          [1659772809.010107][17263:17263] CHIP:DMG:                                         Endpoint = 0x0,
+          [1659772809.010124][17263:17263] CHIP:DMG:                                         Cluster = 0x33,
+          [1659772809.010141][17263:17263] CHIP:DMG:                                         Attribute = 0x0000_0001,
+          [1659772809.010156][17263:17263] CHIP:DMG:                                 }
+          [1659772809.010173][17263:17263] CHIP:DMG:
+          [1659772809.010190][17263:17263] CHIP:DMG:                                 Data = 2,
+          [1659772809.010205][17263:17263] CHIP:DMG:                         },
+          [1659772809.010223][17263:17263] CHIP:DMG:
+          [1659772809.010236][17263:17263] CHIP:DMG:                 },
+          [1659772809.010256][17263:17263] CHIP:DMG:
+          [1659772809.010269][17263:17263] CHIP:DMG:         ],
+          [1659772809.010289][17263:17263] CHIP:DMG:
+          [1659772809.010303][17263:17263] CHIP:DMG:         SuppressResponse = true,
+          [1659772809.010315][17263:17263] CHIP:DMG:         InteractionModelRevision = 1
+          [1659772809.010327][17263:17263] CHIP:DMG: }
+          [1659772809.010340][17263:17263] CHIP:DMG:
+          [1659772809.010472][17263:17263] CHIP:DMG: <RE> OnReportConfirm: NumReports = 0
+          [1659772809.010651][17263:17263] CHIP:DMG: <RE> ReportsIn
       disabled: true
 
     - label:
@@ -186,32 +278,160 @@
           arbitrary start time of TH rebooting."
       PICS: DGGEN.C.A0002
       verification: |
+          Product maker needs to provide instructions for how to trigger the command on the DUT. For comparison, the DUT behavior for this test step can be simulated using chip-tool (when DUT is a commissioner/Client)
+
           ./chip-tool generaldiagnostics read up-time 1 0
 
           Verify in DUT as client side: Verify that UpTime attribute data type must be UINT64 and the time duratoin should be represented in seconds since DUT (node) has been rebooted.
-          [1650877936.462457][2360:2365] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0033 Attribute 0x0000_0002 DataVersion: 3419113433
-          [1650877936.462538][2360:2365] CHIP:TOO:   UpTime: 368
+
+          659772924.705797][17263:17263] CHIP:DMG: }
+          [1659772924.705813][17263:17263] CHIP:DMG:
+          [1659772924.705907][17263:17263] CHIP:DMG: ReportDataMessage =
+          [1659772924.705928][17263:17263] CHIP:DMG: {
+          [1659772924.705943][17263:17263] CHIP:DMG:         AttributeReportIBs =
+          [1659772924.705973][17263:17263] CHIP:DMG:         [
+          [1659772924.705990][17263:17263] CHIP:DMG:                 AttributeReportIB =
+          [1659772924.706019][17263:17263] CHIP:DMG:                 {
+          [1659772924.706037][17263:17263] CHIP:DMG:                         AttributeDataIB =
+          [1659772924.706060][17263:17263] CHIP:DMG:                         {
+          [1659772924.706084][17263:17263] CHIP:DMG:                                 DataVersion = 0x4dcd1218,
+          [1659772924.706105][17263:17263] CHIP:DMG:                                 AttributePathIB =
+          [1659772924.706128][17263:17263] CHIP:DMG:                                 {
+          [1659772924.706152][17263:17263] CHIP:DMG:                                         Endpoint = 0x0,
+          [1659772924.706173][17263:17263] CHIP:DMG:                                         Cluster = 0x33,
+          [1659772924.706195][17263:17263] CHIP:DMG:                                         Attribute = 0x0000_0002,
+          [1659772924.706221][17263:17263] CHIP:DMG:                                 }
+          [1659772924.706248][17263:17263] CHIP:DMG:
+          [1659772924.706273][17263:17263] CHIP:DMG:                                 Data = 804,
+          [1659772924.706293][17263:17263] CHIP:DMG:                         },
+          [1659772924.706318][17263:17263] CHIP:DMG:
+          [1659772924.706335][17263:17263] CHIP:DMG:                 },
+          [1659772924.706361][17263:17263] CHIP:DMG:
+          [1659772924.706375][17263:17263] CHIP:DMG:         ],
+          [1659772924.706401][17263:17263] CHIP:DMG:
+          [1659772924.706422][17263:17263] CHIP:DMG:         SuppressResponse = true,
+          [1659772924.706441][17263:17263] CHIP:DMG:         InteractionModelRevision = 1
+          [1659772924.706461][17263:17263] CHIP:DMG: }
+          [1659772924.706480][17263:17263] CHIP:DMG:
       disabled: true
 
     - label: "DUT reads a TotalOperationalHours attribute value from TH."
       PICS: DGGEN.C.A0003
       verification: |
+          Product maker needs to provide instructions for how to trigger the command on the DUT. For comparison, the DUT behavior for this test step can be simulated using chip-tool (when DUT is a commissioner/Client)
+
           ./chip-tool generaldiagnostics read total-operational-hours 1 0
           Verify in DUT as client side: verify that TotalOperationalHours attribute data type must be UINT32 and the value indicates the number of hours the node has been operational since DUT (node) has been rebooted.
 
-          [1650877969.904265][2369:2374] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0033 Attribute 0x0000_0003 DataVersion: 3419113433
-          [1650877969.904339][2369:2374] CHIP:TOO:   TotalOperationalHours: 0
+          [1659971129.330245][3458:3458] CHIP:IM: Received Read request
+          [1659971129.330322][3458:3458] CHIP:DMG: ReadRequestMessage =
+          [1659971129.330349][3458:3458] CHIP:DMG: {
+          [1659971129.330370][3458:3458] CHIP:DMG: 	AttributePathIBs =
+          [1659971129.330397][3458:3458] CHIP:DMG: 	[
+          [1659971129.330420][3458:3458] CHIP:DMG: 		AttributePathIB =
+          [1659971129.330454][3458:3458] CHIP:DMG: 		{
+          [1659971129.330483][3458:3458] CHIP:DMG: 			Endpoint = 0x0,
+          [1659971129.330513][3458:3458] CHIP:DMG: 			Cluster = 0x33,
+          [1659971129.330545][3458:3458] CHIP:DMG: 			Attribute = 0x0000_0003,
+          [1659971129.330574][3458:3458] CHIP:DMG: 		}
+          [1659971129.330602][3458:3458] CHIP:DMG:
+          [1659971129.330626][3458:3458] CHIP:DMG: 	],
+          [1659971129.330654][3458:3458] CHIP:DMG:
+          [1659971129.330680][3458:3458] CHIP:DMG: 	isFabricFiltered = true,
+          [1659971129.330705][3458:3458] CHIP:DMG: 	InteractionModelRevision = 1
+          [1659971129.330727][3458:3458] CHIP:DMG: },
+          [1659971129.330800][3458:3458] CHIP:DMG: IM RH moving to [GeneratingReports]
+          [1659971129.330881][3458:3458] CHIP:DMG: Building Reports for ReadHandler with LastReportGeneration = 0 DirtyGeneration = 0
+          [1659971129.330910][3458:3458] CHIP:DMG: <RE:Run> Cluster 33, Attribute 3 is dirty
+          [1659971129.330931][3458:3458] CHIP:DMG: Reading attribute: Cluster=0x0000_0033 Endpoint=0 AttributeId=0x0000_0003 (expanded=0)
+          [1659971129.330958][3458:3458] CHIP:DMG: AccessControl: checking f=1 a=c s=0x000000000001B669 t= c=0x0000_0033 e=0 p=v
+          [1659971129.330990][3458:3458] CHIP:DMG: AccessControl: allowed
       disabled: true
 
     - label:
           "TH undergoes a reboot process. DUT reads a attribute value from TH."
       PICS: DGGEN.C.A0004
       verification: |
+          Product maker needs to provide instructions for how to trigger the command on the DUT. For comparison, the DUT behavior for this test step can be simulated using chip-tool (when DUT is a commissioner/Client)
+
           ./chip-tool generaldiagnostics read boot-reasons 1 0
 
           Verify in DUT as client side: verify that  bootreason attribute data type must match the value listed in Table 105 BootReason ENUM table in spec
-          [1650877998.693012][2377:2382] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0033 Attribute 0x0000_0004 DataVersion: 3419113433
-          [1650877998.693118][2377:2382] CHIP:TOO:   BootReasons: 0
+          [1659971157.321998][3458:3458] CHIP:IM: Received Read request
+          [1659971157.322081][3458:3458] CHIP:DMG: ReadRequestMessage =
+          [1659971157.322109][3458:3458] CHIP:DMG: {
+          [1659971157.322133][3458:3458] CHIP:DMG: 	AttributePathIBs =
+          [1659971157.322160][3458:3458] CHIP:DMG: 	[
+          [1659971157.322185][3458:3458] CHIP:DMG: 		AttributePathIB =
+          [1659971157.322217][3458:3458] CHIP:DMG: 		{
+          [1659971157.322247][3458:3458] CHIP:DMG: 			Endpoint = 0x0,
+          [1659971157.322280][3458:3458] CHIP:DMG: 			Cluster = 0x33,
+          [1659971157.322313][3458:3458] CHIP:DMG: 			Attribute = 0x0000_0004,
+          [1659971157.322344][3458:3458] CHIP:DMG: 		}
+          [1659971157.322374][3458:3458] CHIP:DMG:
+          [1659971157.322400][3458:3458] CHIP:DMG: 	],
+          [1659971157.322429][3458:3458] CHIP:DMG:
+          [1659971157.322456][3458:3458] CHIP:DMG: 	isFabricFiltered = true,
+          [1659971157.322483][3458:3458] CHIP:DMG: 	InteractionModelRevision = 1
+          [1659971157.322507][3458:3458] CHIP:DMG: },
+          [1659971157.322585][3458:3458] CHIP:DMG: IM RH moving to [GeneratingReports]
+          [1659971157.322672][3458:3458] CHIP:DMG: Building Reports for ReadHandler with LastReportGeneration = 0 DirtyGeneration = 0
+          [1659971157.322703][3458:3458] CHIP:DMG: <RE:Run> Cluster 33, Attribute 4 is dirty
+          [1659971157.322725][3458:3458] CHIP:DMG: Reading attribute: Cluster=0x0000_0033 Endpoint=0 AttributeId=0x0000_0004 (expanded=0)
+          [1659971157.322753][3458:3458] CHIP:DMG: AccessControl: checking f=1 a=c s=0x000000000001B669 t= c=0x0000_0033 e=0 p=v
+          [1659971157.322788][3458:3458] CHIP:DMG: AccessControl: allowed
+          [1659971157.321998][3458:3458] CHIP:IM: Received Read request
+          [1659971157.322081][3458:3458] CHIP:DMG: ReadRequestMessage =
+          [1659971157.322109][3458:3458] CHIP:DMG: {
+          [1659971157.322133][3458:3458] CHIP:DMG: 	AttributePathIBs =
+          [1659971157.322160][3458:3458] CHIP:DMG: 	[
+          [1659971157.322185][3458:3458] CHIP:DMG: 		AttributePathIB =
+          [1659971157.322217][3458:3458] CHIP:DMG: 		{
+          [1659971157.322247][3458:3458] CHIP:DMG: 			Endpoint = 0x0,
+          [1659971157.322280][3458:3458] CHIP:DMG: 			Cluster = 0x33,
+          [1659971157.322313][3458:3458] CHIP:DMG: 			Attribute = 0x0000_0004,
+          [1659971157.322344][3458:3458] CHIP:DMG: 		}
+          [1659971157.322374][3458:3458] CHIP:DMG:
+          [1659971157.322400][3458:3458] CHIP:DMG: 	],
+          [1659971157.322429][3458:3458] CHIP:DMG:
+          [1659971157.322456][3458:3458] CHIP:DMG: 	isFabricFiltered = true,
+          [1659971157.322483][3458:3458] CHIP:DMG: 	InteractionModelRevision = 1
+          [1659971157.322507][3458:3458] CHIP:DMG: },
+          [1659971157.322585][3458:3458] CHIP:DMG: IM RH moving to [GeneratingReports]
+          [1659971157.322672][3458:3458] CHIP:DMG: Building Reports for ReadHandler with LastReportGeneration = 0 DirtyGeneration = 0
+          [1659971157.322703][3458:3458] CHIP:DMG: <RE:Run> Cluster 33, Attribute 4 is dirty
+          [1659971157.322725][3458:3458] CHIP:DMG: Reading attribute: Cluster=0x0000_0033 Endpoint=0 AttributeId=0x0000_0004 (expanded=0)
+          [1659971157.322753][3458:3458] CHIP:DMG: AccessControl: checking f=1 a=c s=0x000000000001B669 t= c=0x0000_0033 e=0 p=v
+          [1659971157.322788][3458:3458] CHIP:DMG: AccessControl: allowed
+
+
+          1659773092.660797][17263:17263] CHIP:DMG: ReportDataMessage =
+          [1659773092.660823][17263:17263] CHIP:DMG: {
+          [1659773092.660855][17263:17263] CHIP:DMG:         AttributeReportIBs =
+          [1659773092.660879][17263:17263] CHIP:DMG:         [
+          [1659773092.660893][17263:17263] CHIP:DMG:                 AttributeReportIB =
+          [1659773092.660917][17263:17263] CHIP:DMG:                 {
+          [1659773092.660931][17263:17263] CHIP:DMG:                         AttributeDataIB =
+          [1659773092.660948][17263:17263] CHIP:DMG:                         {
+          [1659773092.660964][17263:17263] CHIP:DMG:                                 DataVersion = 0x4dcd1218,
+          [1659773092.660983][17263:17263] CHIP:DMG:                                 AttributePathIB =
+          [1659773092.660999][17263:17263] CHIP:DMG:                                 {
+          [1659773092.661017][17263:17263] CHIP:DMG:                                         Endpoint = 0x0,
+          [1659773092.661053][17263:17263] CHIP:DMG:                                         Cluster = 0x33,
+          [1659773092.661082][17263:17263] CHIP:DMG:                                         Attribute = 0x0000_0004,
+          [1659773092.661104][17263:17263] CHIP:DMG:                                 }
+          [1659773092.661130][17263:17263] CHIP:DMG:
+          [1659773092.661152][17263:17263] CHIP:DMG:                                 Data = 0,
+          [1659773092.661168][17263:17263] CHIP:DMG:                         },
+          [1659773092.661212][17263:17263] CHIP:DMG:
+          [1659773092.661230][17263:17263] CHIP:DMG:                 },
+          [1659773092.661251][17263:17263] CHIP:DMG:
+          [1659773092.661263][17263:17263] CHIP:DMG:         ],
+          [1659773092.661284][17263:17263] CHIP:DMG:
+          [1659773092.661297][17263:17263] CHIP:DMG:         SuppressResponse = true,
+          [1659773092.661311][17263:17263] CHIP:DMG:         InteractionModelRevision = 1
+          [1659773092.661323][17263:17263] CHIP:DMG: }
+          [1659773092.661337][17263:17263] CHIP:DMG:
       disabled: true
 
     - label:
@@ -219,12 +439,42 @@
           is possible option for this attribute."
       PICS: DGGEN.C.A0005
       verification: |
+          Product maker needs to provide instructions for how to trigger the command on the DUT. For comparison, the DUT behavior for this test step can be simulated using chip-tool (when DUT is a commissioner/Client)
+
           ./chip-tool generaldiagnostics read active-hardware-faults 1 0
 
           Verify in DUT as client side: verify that ActiveHardwareFaults attribute the attribute response should be empty. But when a hardware fault occurs, the return attribute value must match the value listed in the HardwareFault ENUM table 11.11.6.1
 
-          [1650878034.133792][2385:2390] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0033 Attribute 0x0000_0005 DataVersion: 3419113433
-          [1650878034.133891][2385:2390] CHIP:TOO:   ActiveHardwareFaults: 0 entries
+          [1659773303.234177][17263:17263] CHIP:DMG:
+          [1659773303.234225][17263:17263] CHIP:DMG: ReportDataMessage =
+          [1659773303.234234][17263:17263] CHIP:DMG: {
+          [1659773303.234241][17263:17263] CHIP:DMG:         AttributeReportIBs =
+          [1659773303.234256][17263:17263] CHIP:DMG:         [
+          [1659773303.234264][17263:17263] CHIP:DMG:                 AttributeReportIB =
+          [1659773303.234278][17263:17263] CHIP:DMG:                 {
+          [1659773303.234286][17263:17263] CHIP:DMG:                         AttributeDataIB =
+          [1659773303.234296][17263:17263] CHIP:DMG:                         {
+          [1659773303.234306][17263:17263] CHIP:DMG:                                 DataVersion = 0x4dcd1218,
+          [1659773303.234316][17263:17263] CHIP:DMG:                                 AttributePathIB =
+          [1659773303.234326][17263:17263] CHIP:DMG:                                 {
+          [1659773303.234336][17263:17263] CHIP:DMG:                                         Endpoint = 0x0,
+          [1659773303.234346][17263:17263] CHIP:DMG:                                         Cluster = 0x33,
+          [1659773303.234357][17263:17263] CHIP:DMG:                                         Attribute = 0x0000_0005,
+          [1659773303.234367][17263:17263] CHIP:DMG:                                 }
+          [1659773303.234378][17263:17263] CHIP:DMG:
+          [1659773303.234388][17263:17263] CHIP:DMG:                                 Data = [
+          [1659773303.234401][17263:17263] CHIP:DMG:
+          [1659773303.234417][17263:17263] CHIP:DMG:                                 ],
+          [1659773303.234428][17263:17263] CHIP:DMG:                         },
+          [1659773303.234444][17263:17263] CHIP:DMG:
+          [1659773303.234457][17263:17263] CHIP:DMG:                 },
+          [1659773303.234475][17263:17263] CHIP:DMG:
+          [1659773303.234485][17263:17263] CHIP:DMG:         ],
+          [1659773303.234503][17263:17263] CHIP:DMG:
+          [1659773303.234512][17263:17263] CHIP:DMG:         SuppressResponse = true,
+          [1659773303.234523][17263:17263] CHIP:DMG:         InteractionModelRevision = 1
+          [1659773303.234533][17263:17263] CHIP:DMG: }
+          [1659773303.234544][17263:17263] CHIP:DMG:
       disabled: true
 
     - label:
@@ -232,10 +482,34 @@
           possible option for this attribute."
       PICS: DGGEN.C.A0006
       verification: |
+          Product maker needs to provide instructions for how to trigger the command on the DUT. For comparison, the DUT behavior for this test step can be simulated using chip-tool (when DUT is a commissioner/Client)
+
           ./chip-tool generaldiagnostics read active-radio-faults 1 0
           Verify in DUT as client side:verify that  the attribute response should be empty. But when a radio fault occurs, the return attribute value must match the value listed in the RadioFault ENUM table. 11.11.6.2
-          [1650878056.266314][2391:2396] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0033 Attribute 0x0000_0006 DataVersion: 3419113433
-          [1650878056.266428][2391:2396] CHIP:TOO:   ActiveRadioFaults: 0 entries
+
+          [1659971190.358722][3458:3458] CHIP:IM: Received Read request
+          [1659971190.358800][3458:3458] CHIP:DMG: ReadRequestMessage =
+          [1659971190.358827][3458:3458] CHIP:DMG: {
+          [1659971190.358848][3458:3458] CHIP:DMG: 	AttributePathIBs =
+          [1659971190.358874][3458:3458] CHIP:DMG: 	[
+          [1659971190.358897][3458:3458] CHIP:DMG: 		AttributePathIB =
+          [1659971190.358924][3458:3458] CHIP:DMG: 		{
+          [1659971190.358952][3458:3458] CHIP:DMG: 			Endpoint = 0x0,
+          [1659971190.358988][3458:3458] CHIP:DMG: 			Cluster = 0x33,
+          [1659971190.359019][3458:3458] CHIP:DMG: 			Attribute = 0x0000_0006,
+          [1659971190.359049][3458:3458] CHIP:DMG: 		}
+          [1659971190.359077][3458:3458] CHIP:DMG:
+          [1659971190.359101][3458:3458] CHIP:DMG: 	],
+          [1659971190.359129][3458:3458] CHIP:DMG:
+          [1659971190.359154][3458:3458] CHIP:DMG: 	isFabricFiltered = true,
+          [1659971190.359178][3458:3458] CHIP:DMG: 	InteractionModelRevision = 1
+          [1659971190.359201][3458:3458] CHIP:DMG: },
+          [1659971190.359274][3458:3458] CHIP:DMG: IM RH moving to [GeneratingReports]
+          [1659971190.359356][3458:3458] CHIP:DMG: Building Reports for ReadHandler with LastReportGeneration = 0 DirtyGeneration = 0
+          [1659971190.359385][3458:3458] CHIP:DMG: <RE:Run> Cluster 33, Attribute 6 is dirty
+          [1659971190.359406][3458:3458] CHIP:DMG: Reading attribute: Cluster=0x0000_0033 Endpoint=0 AttributeId=0x0000_0006 (expanded=0)
+          [1659971190.359434][3458:3458] CHIP:DMG: AccessControl: checking f=1 a=c s=0x000000000001B669 t= c=0x0000_0033 e=0 p=v
+          [1659971190.359466][3458:3458] CHIP:DMG: AccessControl: allowed
       disabled: true
 
     - label:
@@ -243,10 +517,41 @@
           is possible option for this attribute."
       PICS: DGGEN.C.A0007
       verification: |
+          Product maker needs to provide instructions for how to trigger the command on the DUT. For comparison, the DUT behavior for this test step can be simulated using chip-tool (when DUT is a commissioner/Client)
+
           ./chip-tool generaldiagnostics read active-network-faults 1 0
           Verify in DUT as client side: verify that ActiveNetworkFaults attribute value attribute response should be empty. But when a network fault occurs, the return attribute value must match the value listed in the NetworkFault ENUM ta
-          [1650878077.694616][2399:2404] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0033 Attribute 0x0000_0007 DataVersion: 3419113433
-          [1650878077.694781][2399:2404] CHIP:TOO:   ActiveNetworkFaults: 0 entries
+
+          [1659773398.933596][17263:17263] CHIP:DMG: }
+          [1659773398.933607][17263:17263] CHIP:DMG:
+          [1659773398.933677][17263:17263] CHIP:DMG: ReportDataMessage =
+          [1659773398.933692][17263:17263] CHIP:DMG: {
+          [1659773398.933703][17263:17263] CHIP:DMG:         AttributeReportIBs =
+          [1659773398.933725][17263:17263] CHIP:DMG:         [
+          [1659773398.933738][17263:17263] CHIP:DMG:                 AttributeReportIB =
+          [1659773398.933759][17263:17263] CHIP:DMG:                 {
+          [1659773398.933773][17263:17263] CHIP:DMG:                         AttributeDataIB =
+          [1659773398.933787][17263:17263] CHIP:DMG:                         {
+          [1659773398.933803][17263:17263] CHIP:DMG:                                 DataVersion = 0x4dcd1218,
+          [1659773398.933818][17263:17263] CHIP:DMG:                                 AttributePathIB =
+          [1659773398.933834][17263:17263] CHIP:DMG:                                 {
+          [1659773398.933850][17263:17263] CHIP:DMG:                                         Endpoint = 0x0,
+          [1659773398.933867][17263:17263] CHIP:DMG:                                         Cluster = 0x33,
+          [1659773398.933883][17263:17263] CHIP:DMG:                                         Attribute = 0x0000_0006,
+          [1659773398.933898][17263:17263] CHIP:DMG:                                 }
+          [1659773398.933916][17263:17263] CHIP:DMG:
+          [1659773398.933931][17263:17263] CHIP:DMG:                                 Data = [
+          [1659773398.933947][17263:17263] CHIP:DMG:
+          [1659773398.933963][17263:17263] CHIP:DMG:                                 ],
+          [1659773398.933977][17263:17263] CHIP:DMG:                         },
+          [1659773398.933996][17263:17263] CHIP:DMG:
+          [1659773398.934009][17263:17263] CHIP:DMG:                 },
+          [1659773398.934029][17263:17263] CHIP:DMG:
+          [1659773398.934042][17263:17263] CHIP:DMG:         ],
+          [1659773398.934062][17263:17263] CHIP:DMG:
+          [1659773398.934076][17263:17263] CHIP:DMG:         SuppressResponse = true,
+          [1659773398.934090][17263:17263] CHIP:DMG:         InteractionModelRevision = 1
+          [1659773398.934102][17263:17263] CHIP:DMG: }
       disabled: true
 
     - label:
@@ -255,9 +560,38 @@
           according to pre-provisioned client and server test mode."
       PICS: DGGEN.C.A0008
       verification: |
+          Product maker needs to provide instructions for how to trigger the command on the DUT. For comparison, the DUT behavior for this test step can be simulated using chip-tool (when DUT is a commissioner/Client)
+
           ./chip-tool generaldiagnostics read   test-event-triggers-enabled  1 0
           Verify in DUT as client side: verify that TestEventTriggersEnabled attribute value should be data type bool
-          [1655188892.957794][2868:2873] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0033 Attribute 0x0000_0008 DataVersion: 3562689442
-          [1655188892.957869][2868:2873] CHIP:TOO:   TestEventTriggersEnabled: FALSE
-          [1655188892.957999][2868:2873] CHIP:EM: Sending Standalone Ack for MessageCounter:133140817 on exchange 23176i
+
+          [1659773457.295991][17263:17263] CHIP:DMG: ReportDataMessage =
+          [1659773457.296017][17263:17263] CHIP:DMG: {
+          [1659773457.296036][17263:17263] CHIP:DMG:         AttributeReportIBs =
+          [1659773457.296068][17263:17263] CHIP:DMG:         [
+          [1659773457.296087][17263:17263] CHIP:DMG:                 AttributeReportIB =
+          [1659773457.296119][17263:17263] CHIP:DMG:                 {
+          [1659773457.296139][17263:17263] CHIP:DMG:                         AttributeDataIB =
+          [1659773457.296162][17263:17263] CHIP:DMG:                         {
+          [1659773457.296187][17263:17263] CHIP:DMG:                                 DataVersion = 0x4dcd1218,
+          [1659773457.296210][17263:17263] CHIP:DMG:                                 AttributePathIB =
+          [1659773457.296235][17263:17263] CHIP:DMG:                                 {
+          [1659773457.296259][17263:17263] CHIP:DMG:                                         Endpoint = 0x0,
+          [1659773457.296284][17263:17263] CHIP:DMG:                                         Cluster = 0x33,
+          [1659773457.296315][17263:17263] CHIP:DMG:                                         Attribute = 0x0000_0008,
+          [1659773457.296339][17263:17263] CHIP:DMG:                                 }
+          [1659773457.296366][17263:17263] CHIP:DMG:
+          [1659773457.296390][17263:17263] CHIP:DMG:                                 Data = false,
+          [1659773457.296405][17263:17263] CHIP:DMG:                         },
+          [1659773457.296428][17263:17263] CHIP:DMG:
+          [1659773457.296446][17263:17263] CHIP:DMG:                 },
+          [1659773457.296468][17263:17263] CHIP:DMG:
+          [1659773457.296481][17263:17263] CHIP:DMG:         ],
+          [1659773457.296510][17263:17263] CHIP:DMG:
+          [1659773457.296531][17263:17263] CHIP:DMG:         SuppressResponse = true,
+          [1659773457.296549][17263:17263] CHIP:DMG:         InteractionModelRevision = 1
+          [1659773457.296566][17263:17263] CHIP:DMG: }
+          [1659773457.296585][17263:17263] CHIP:DMG:
+          [1659773457.296794][17263:17263] CHIP:DMG: <RE> OnReportConfirm: NumReports = 0
+          [1659773457.296849][17263:17263] CHIP:DMG: <RE> ReportsInFlight = 0 with readHandle
       disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_DGSW_1_1.yaml b/src/app/tests/suites/certification/Test_TC_DGSW_1_1.yaml
index 5c3ebef..ed474bb 100644
--- a/src/app/tests/suites/certification/Test_TC_DGSW_1_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DGSW_1_1.yaml
@@ -33,7 +33,7 @@
       verification: |
           ./chip-tool softwarediagnostics read cluster-revision 1 0
 
-          Verify ClusterRevision attribute is of uint16, in this case it should be 1 in TH Log
+          Verify ClusterRevision attribute is of uint16, in this case it should be 1 in TH(chip-tool) Log
 
           [1651787699.397201][241075:241080] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0034 Attribute 0x0000_FFFD DataVersion: 1343666373
           [1651787699.397254][241075:241080] CHIP:TOO:   ClusterRevision: 1
@@ -43,7 +43,7 @@
       verification: |
           ./chip-tool softwarediagnostics read feature-map 1  0
 
-          Verify the featuremap value is 1 in TH Log
+          Verify the featuremap value is 1 in TH(chip-tool) Log
 
           [1651787772.992060][241090:241095] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0034 Attribute 0x0000_FFFC DataVersion: 1343666373
           [1651787772.992110][241090:241095] CHIP:TOO:   FeatureMap: 1
@@ -53,7 +53,7 @@
       verification: |
           ./chip-tool softwarediagnostics read attribute-list 1 0
 
-          Verify a list of supported attributes in TH Log
+          Verify a list of supported attributes in TH(chip-tool) Log
 
           [1651787823.737029][241102:241107] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0034 Attribute 0x0000_FFFB DataVersion: 1343666373
           [1651787823.737115][241102:241107] CHIP:TOO:   AttributeList: 9 entries
@@ -72,7 +72,7 @@
       verification: |
           ./chip-tool softwarediagnostics read accepted-command-list 1 0
 
-          Verify a list of Accepted Command that DUT implemented as mandatory or optional or features supported
+          Verify a list of Accepted Command that DUT implemented as mandatory or optional or features supported on TH(chip-tool) Log
 
           [1651787861.534707][241117:241122] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0034 Attribute 0x0000_FFF9 DataVersion: 1343666373
           [1651787861.534769][241117:241122] CHIP:TOO:   AcceptedCommandList: 1 entries
@@ -83,7 +83,7 @@
       verification: |
           ./chip-tool softwarediagnostics read generated-command-list 1 0
 
-          Verify a list of Generated Command, this list should be empty in TH Log
+          Verify a list of Generated Command, this list should be empty in TH(chip-tool) Log
 
           [1651787918.020673][241128:241133] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0034 Attribute 0x0000_FFF8 DataVersion: 1343666373
           [1651787918.020734][241128:241133] CHIP:TOO:   GeneratedCommandList: 0 entries
diff --git a/src/app/tests/suites/certification/Test_TC_DGSW_3_1.yaml b/src/app/tests/suites/certification/Test_TC_DGSW_3_1.yaml
index d2a3e8b..a30e6ea 100644
--- a/src/app/tests/suites/certification/Test_TC_DGSW_3_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DGSW_3_1.yaml
@@ -24,6 +24,11 @@
     endpoint: 0
 
 tests:
+    - label: "Note"
+      verification: |
+          Chip-tool command used below are an example to verify the  DUT as client test cases. For certification test, we expect DUT should have a capability or way to run the equivalent command.
+      disabled: true
+
     - label: "Commission TH to DUT"
       verification: |
           verification step to be updated.
@@ -32,96 +37,126 @@
     - label: "DUT reads a list of ThreadMetrics struct attribute from TH."
       PICS: DGSW.C.A0000
       verification: |
-          ./chip-tool softwarediagnostics read reset-watermarks 1 0
+          ./chip-tool softwarediagnostics read thread-metrics 1 0
 
-          Verify the success response in DUT as client side Log:
+          Verify the thread-metrics attribute has entries with ThreadMetrics Struct on TH(all-clusters-app) Log:
 
-          [1657022305.316864][7266:7271] CHIP:DMG: InvokeResponseMessage =
-          [1657022305.316900][7266:7271] CHIP:DMG: {
-          [1657022305.316935][7266:7271] CHIP:DMG:         suppressResponse = false,
-          [1657022305.316972][7266:7271] CHIP:DMG:         InvokeResponseIBs =
-          [1657022305.317018][7266:7271] CHIP:DMG:         [
-          [1657022305.317055][7266:7271] CHIP:DMG:                 InvokeResponseIB =
-          [1657022305.317109][7266:7271] CHIP:DMG:                 {
-          [1657022305.317151][7266:7271] CHIP:DMG:                         CommandStatusIB =
-          [1657022305.317200][7266:7271] CHIP:DMG:                         {
-          [1657022305.317244][7266:7271] CHIP:DMG:                                 CommandPathIB =
-          [1657022305.317294][7266:7271] CHIP:DMG:                                 {
-          [1657022305.317344][7266:7271] CHIP:DMG:                                         EndpointId = 0x0,
-          [1657022305.317397][7266:7271] CHIP:DMG:                                         ClusterId = 0x34,
-          [1657022305.317447][7266:7271] CHIP:DMG:                                         CommandId = 0x0,
-          [1657022305.317496][7266:7271] CHIP:DMG:                                 },
-          [1657022305.317551][7266:7271] CHIP:DMG:
-          [1657022305.317596][7266:7271] CHIP:DMG:                                 StatusIB =
-          [1657022305.317645][7266:7271] CHIP:DMG:                                 {
-          [1657022305.317694][7266:7271] CHIP:DMG:                                         status = 0x00 (SUCCESS),
-          [1657022305.317743][7266:7271] CHIP:DMG:                                 },
-          [1657022305.317797][7266:7271] CHIP:DMG:
-          [1657022305.317928][7266:7271] CHIP:DMG:                         },
-          [1657022305.317980][7266:7271] CHIP:DMG:
-          [1657022305.318021][7266:7271] CHIP:DMG:                 },
-          [1657022305.318067][7266:7271] CHIP:DMG:
-          [1657022305.318103][7266:7271] CHIP:DMG:         ],
-          [1657022305.318146][7266:7271] CHIP:DMG:
-          [1657022305.318182][7266:7271] CHIP:DMG:         InteractionModelRevision = 1
-          [1657022305.318217][7266:7271] CHIP:DMG: },
-          [1657022305.318300][7266:7271] CHIP:DMG: Received Command Response Status for Endpoint=0 Cluster=0x0000_0034 Command=0x0000_0000 Status=0x0
-          [1657022305.318359][7266:7271] CHIP:DMG: ICR moving to [AwaitingDe]
+          [1659971993.647303][3458:3458] CHIP:IM: Received Read request
+          [1659971993.647386][3458:3458] CHIP:DMG: ReadRequestMessage =
+          [1659971993.647414][3458:3458] CHIP:DMG: {
+          [1659971993.647436][3458:3458] CHIP:DMG: 	AttributePathIBs =
+          [1659971993.647462][3458:3458] CHIP:DMG: 	[
+          [1659971993.647486][3458:3458] CHIP:DMG: 		AttributePathIB =
+          [1659971993.647514][3458:3458] CHIP:DMG: 		{
+          [1659971993.647542][3458:3458] CHIP:DMG: 			Endpoint = 0x0,
+          [1659971993.647578][3458:3458] CHIP:DMG: 			Cluster = 0x34,
+          [1659971993.647607][3458:3458] CHIP:DMG: 			Attribute = 0x0000_0000,
+          [1659971993.647634][3458:3458] CHIP:DMG: 		}
+          [1659971993.647663][3458:3458] CHIP:DMG:
+          [1659971993.647687][3458:3458] CHIP:DMG: 	],
+          [1659971993.647716][3458:3458] CHIP:DMG:
+          [1659971993.647742][3458:3458] CHIP:DMG: 	isFabricFiltered = true,
+          [1659971993.647767][3458:3458] CHIP:DMG: 	InteractionModelRevision = 1
+          [1659971993.647791][3458:3458] CHIP:DMG: },
+          [1659971993.647866][3458:3458] CHIP:DMG: IM RH moving to [GeneratingReports]
+          [1659971993.647967][3458:3458] CHIP:DMG: Building Reports for ReadHandler with LastReportGeneration = 0 DirtyGeneration = 0
+          [1659971993.647998][3458:3458] CHIP:DMG: <RE:Run> Cluster 34, Attribute 0 is dirty
+          [1659971993.648020][3458:3458] CHIP:DMG: Reading attribute: Cluster=0x0000_0034 Endpoint=0 AttributeId=0x0000_0000 (expanded=0)
+          [1659971993.648047][3458:3458] CHIP:DMG: AccessControl: checking f=1 a=c s=0x000000000001B669 t= c=0x0000_0034 e=0 p=v
+          [1659971993.648080][3458:3458] CHIP:DMG: AccessControl: allowed
       disabled: true
 
     - label: "DUT reads an attribute value from TH."
       PICS: DGSW.C.A0001
       verification: |
-          ./chip-tool softwarediagnostics read thread-metrics 1 0
+          ./chip-tool softwarediagnostics read current-heap-free 1 0
+          Verify the thread-metrics attribute has entries with ThreadMetrics Struct on TH(all-clusters-app) Log:
 
-          Verify the thread-metrics attribute has entries with ThreadMetrics Struct in DUT as client side Log:
-
-          [1654697032.107109][7037:7042] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0034 Attribute 0x0000_0000 DataVersion: 1044289564
-          [1654697032.107255][7037:7042] CHIP:TOO:   ThreadMetrics: 6 entries
-          [1654697032.107333][7037:7042] CHIP:TOO:     [1]: {
-          [1654697032.107376][7037:7042] CHIP:TOO:       Id: 8972
-          [1654697032.107413][7037:7042] CHIP:TOO:       Name: 8972
-          [1654697032.107449][7037:7042] CHIP:TOO:      }
-          [1654697032.107492][7037:7042] CHIP:TOO:     [2]: {
-          [1654697032.107526][7037:7042] CHIP:TOO:       Id: 8971
-          [1654697032.107559][7037:7042] CHIP:TOO:       Name: 8971
-          [1654697032.107591][7037:7042] CHIP:TOO:      }
-          [1654697032.107632][7037:7042] CHIP:TOO:     [3]: {
-          [1654697032.107667][7037:7042] CHIP:TOO:       Id: 8970
-          [1654697032.107700][7037:7042] CHIP:TOO:       Name: 8970
-          [1654697032.107733][7037:7042] CHIP:TOO:      }
-          [1654697032.107774][7037:7042] CHIP:TOO:     [4]: {
-          [1654697032.107808][7037:7042] CHIP:TOO:       Id: 8969
-          [1654697032.107842][7037:7042] CHIP:TOO:       Name: 8969
-          [1654697032.107875][7037:7042] CHIP:TOO:      }
-          [1654697032.107915][7037:7042] CHIP:TOO:     [5]: {
-          [1654697032.107950][7037:7042] CHIP:TOO:       Id: 8968
-          [1654697032.107982][7037:7042] CHIP:TOO:       Name: 8968
-          [1654697032.108015][7037:7042] CHIP:TOO:      }
-          [1654697032.108056][7037:7042] CHIP:TOO:     [6]: {
-          [1654697032.108090][7037:7042] CHIP:TOO:       Id: 8967
-          [1654697032.108122][7037:7042] CHIP:TOO:       Name: 8967
-          [1654697032.108154][7037:7042] CHIP:TOO:      }
+          [1659972026.540043][3458:3458] CHIP:IM: Received Read request
+          [1659972026.540208][3458:3458] CHIP:DMG: ReadRequestMessage =
+          [1659972026.540273][3458:3458] CHIP:DMG: {
+          [1659972026.540325][3458:3458] CHIP:DMG: 	AttributePathIBs =
+          [1659972026.540387][3458:3458] CHIP:DMG: 	[
+          [1659972026.540444][3458:3458] CHIP:DMG: 		AttributePathIB =
+          [1659972026.540510][3458:3458] CHIP:DMG: 		{
+          [1659972026.540577][3458:3458] CHIP:DMG: 			Endpoint = 0x0,
+          [1659972026.540661][3458:3458] CHIP:DMG: 			Cluster = 0x34,
+          [1659972026.540737][3458:3458] CHIP:DMG: 			Attribute = 0x0000_0001,
+          [1659972026.540810][3458:3458] CHIP:DMG: 		}
+          [1659972026.540878][3458:3458] CHIP:DMG:
+          [1659972026.540939][3458:3458] CHIP:DMG: 	],
+          [1659972026.541006][3458:3458] CHIP:DMG:
+          [1659972026.541118][3458:3458] CHIP:DMG: 	isFabricFiltered = true,
+          [1659972026.541182][3458:3458] CHIP:DMG: 	InteractionModelRevision = 1
+          [1659972026.541239][3458:3458] CHIP:DMG: },
+          [1659972026.541397][3458:3458] CHIP:DMG: IM RH moving to [GeneratingReports]
+          [1659972026.541584][3458:3458] CHIP:DMG: Building Reports for ReadHandler with LastReportGeneration = 0 DirtyGeneration = 0
+          [1659972026.541651][3458:3458] CHIP:DMG: <RE:Run> Cluster 34, Attribute 1 is dirty
+          [1659972026.541702][3458:3458] CHIP:DMG: Reading attribute: Cluster=0x0000_0034 Endpoint=0 AttributeId=0x0000_0001 (expanded=0)
+          [1659972026.541773][3458:3458] CHIP:DMG: AccessControl: checking f=1 a=c s=0x000000000001B669 t= c=0x0000_0034 e=0 p=v
+          [1659972026.541845][3458:3458] CHIP:DMG: AccessControl: allowed
       disabled: true
 
     - label: "DUT reads an attribute value from TH."
       PICS: DGSW.C.A0002
       verification: |
-          ./chip-tool softwarediagnostics read current-heap-high-watermark 1 0
+          ./chip-tool  softwarediagnostics  read current-heap-used 1 0
 
-          Verify the value of CurrentHeapHighWatermark is in range uint64 in DUT as client side Log:
+          Verify the value of CurrentHeapUsed is in range uint6 on TH(all-clusters-app) Log:
 
-          CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0034 Attribute 0x0000_0003 DataVersion: 3412237516
-          [1649662865.831203][8025:8030] CHIP:TOO:   CurrentHeapHighWatermark: 1099312
+          [1659972063.411625][3458:3458] CHIP:IM: Received Read request
+          [1659972063.411702][3458:3458] CHIP:DMG: ReadRequestMessage =
+          [1659972063.411740][3458:3458] CHIP:DMG: {
+          [1659972063.411763][3458:3458] CHIP:DMG: 	AttributePathIBs =
+          [1659972063.411789][3458:3458] CHIP:DMG: 	[
+          [1659972063.411822][3458:3458] CHIP:DMG: 		AttributePathIB =
+          [1659972063.411852][3458:3458] CHIP:DMG: 		{
+          [1659972063.411892][3458:3458] CHIP:DMG: 			Endpoint = 0x0,
+          [1659972063.411932][3458:3458] CHIP:DMG: 			Cluster = 0x34,
+          [1659972063.411964][3458:3458] CHIP:DMG: 			Attribute = 0x0000_0002,
+          [1659972063.412003][3458:3458] CHIP:DMG: 		}
+          [1659972063.412032][3458:3458] CHIP:DMG:
+          [1659972063.412069][3458:3458] CHIP:DMG: 	],
+          [1659972063.412106][3458:3458] CHIP:DMG:
+          [1659972063.412133][3458:3458] CHIP:DMG: 	isFabricFiltered = true,
+          [1659972063.412165][3458:3458] CHIP:DMG: 	InteractionModelRevision = 1
+          [1659972063.412191][3458:3458] CHIP:DMG: },
+          [1659972063.412273][3458:3458] CHIP:DMG: IM RH moving to [GeneratingReports]
+          [1659972063.412375][3458:3458] CHIP:DMG: Building Reports for ReadHandler with LastReportGeneration = 0 DirtyGeneration = 0
+          [1659972063.412403][3458:3458] CHIP:DMG: <RE:Run> Cluster 34, Attribute 2 is dirty
+          [1659972063.412424][3458:3458] CHIP:DMG: Reading attribute: Cluster=0x0000_0034 Endpoint=0 AttributeId=0x0000_0002 (expanded=0)
+          [1659972063.412451][3458:3458] CHIP:DMG: AccessControl: checking f=1 a=c s=0x000000000001B669 t= c=0x0000_0034 e=0 p=v
+          [1659972063.412483][3458:3458] CHIP:DMG: AccessControl: allowed
       disabled: true
 
     - label: "DUT reads an attribute value from TH."
       PICS: DGSW.C.A0003
       verification: |
-          ./chip-tool  softwarediagnostics  read current-heap-used 1 0
+          ./chip-tool softwarediagnostics read current-heap-high-watermark 1 0
 
-          Verify the value of CurrentHeapUsed is in range uint6 in DUT as client side Log:
+          Verify the value of CurrentHeapHighWatermark is in range uint64 on TH(all-clusters-app) Log:
 
-          CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0034 Attribute 0x0000_0002 DataVersion: 3412237516
-          [1649662811.289909][8018:8023] CHIP:TOO:   CurrentHeapUsed: 1098368
+          [1659972088.497642][3458:3458] CHIP:IM: Received Read request
+          [1659972088.497747][3458:3458] CHIP:DMG: ReadRequestMessage =
+          [1659972088.497787][3458:3458] CHIP:DMG: {
+          [1659972088.497816][3458:3458] CHIP:DMG: 	AttributePathIBs =
+          [1659972088.497854][3458:3458] CHIP:DMG: 	[
+          [1659972088.497889][3458:3458] CHIP:DMG: 		AttributePathIB =
+          [1659972088.497928][3458:3458] CHIP:DMG: 		{
+          [1659972088.497970][3458:3458] CHIP:DMG: 			Endpoint = 0x0,
+          [1659972088.498016][3458:3458] CHIP:DMG: 			Cluster = 0x34,
+          [1659972088.498061][3458:3458] CHIP:DMG: 			Attribute = 0x0000_0003,
+          [1659972088.498103][3458:3458] CHIP:DMG: 		}
+          [1659972088.498144][3458:3458] CHIP:DMG:
+          [1659972088.498180][3458:3458] CHIP:DMG: 	],
+          [1659972088.498219][3458:3458] CHIP:DMG:
+          [1659972088.498257][3458:3458] CHIP:DMG: 	isFabricFiltered = true,
+          [1659972088.498294][3458:3458] CHIP:DMG: 	InteractionModelRevision = 1
+          [1659972088.498328][3458:3458] CHIP:DMG: },
+          [1659972088.498431][3458:3458] CHIP:DMG: IM RH moving to [GeneratingReports]
+          [1659972088.498545][3458:3458] CHIP:DMG: Building Reports for ReadHandler with LastReportGeneration = 0 DirtyGeneration = 0
+          [1659972088.498587][3458:3458] CHIP:DMG: <RE:Run> Cluster 34, Attribute 3 is dirty
+          [1659972088.498618][3458:3458] CHIP:DMG: Reading attribute: Cluster=0x0000_0034 Endpoint=0 AttributeId=0x0000_0003 (expanded=0)
+          [1659972088.498657][3458:3458] CHIP:DMG: AccessControl: checking f=1 a=c s=0x000000000001B669 t= c=0x0000_0034 e=0 p=v
+          [1659972088.498702][3458:3458] CHIP:DMG: AccessControl: allowed
       disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_DGSW_3_2.yaml b/src/app/tests/suites/certification/Test_TC_DGSW_3_2.yaml
index 569b753..9569b1c 100644
--- a/src/app/tests/suites/certification/Test_TC_DGSW_3_2.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DGSW_3_2.yaml
@@ -24,6 +24,11 @@
     endpoint: 0
 
 tests:
+    - label: "Note"
+      verification: |
+          Chip-tool command used below are an example to verify the  DUT as client test cases. For certification test, we expect DUT should have a capability or way to run the equivalent command.
+      disabled: true
+
     - label: "Commission TH to DUT"
       verification: |
           verification step to be updated.
@@ -34,37 +39,30 @@
       verification: |
           ./chip-tool softwarediagnostics read reset-watermarks 1 0
 
-          Verify the success response in DUT as client side Log:
+          Verify the success response on TH(all-clusters-app) Log:
 
-          [1657022305.316864][7266:7271] CHIP:DMG: InvokeResponseMessage =
-          [1657022305.316900][7266:7271] CHIP:DMG: {
-          [1657022305.316935][7266:7271] CHIP:DMG:         suppressResponse = false,
-          [1657022305.316972][7266:7271] CHIP:DMG:         InvokeResponseIBs =
-          [1657022305.317018][7266:7271] CHIP:DMG:         [
-          [1657022305.317055][7266:7271] CHIP:DMG:                 InvokeResponseIB =
-          [1657022305.317109][7266:7271] CHIP:DMG:                 {
-          [1657022305.317151][7266:7271] CHIP:DMG:                         CommandStatusIB =
-          [1657022305.317200][7266:7271] CHIP:DMG:                         {
-          [1657022305.317244][7266:7271] CHIP:DMG:                                 CommandPathIB =
-          [1657022305.317294][7266:7271] CHIP:DMG:                                 {
-          [1657022305.317344][7266:7271] CHIP:DMG:                                         EndpointId = 0x0,
-          [1657022305.317397][7266:7271] CHIP:DMG:                                         ClusterId = 0x34,
-          [1657022305.317447][7266:7271] CHIP:DMG:                                         CommandId = 0x0,
-          [1657022305.317496][7266:7271] CHIP:DMG:                                 },
-          [1657022305.317551][7266:7271] CHIP:DMG:
-          [1657022305.317596][7266:7271] CHIP:DMG:                                 StatusIB =
-          [1657022305.317645][7266:7271] CHIP:DMG:                                 {
-          [1657022305.317694][7266:7271] CHIP:DMG:                                         status = 0x00 (SUCCESS),
-          [1657022305.317743][7266:7271] CHIP:DMG:                                 },
-          [1657022305.317797][7266:7271] CHIP:DMG:
-          [1657022305.317928][7266:7271] CHIP:DMG:                         },
-          [1657022305.317980][7266:7271] CHIP:DMG:
-          [1657022305.318021][7266:7271] CHIP:DMG:                 },
-          [1657022305.318067][7266:7271] CHIP:DMG:
-          [1657022305.318103][7266:7271] CHIP:DMG:         ],
-          [1657022305.318146][7266:7271] CHIP:DMG:
-          [1657022305.318182][7266:7271] CHIP:DMG:         InteractionModelRevision = 1
-          [1657022305.318217][7266:7271] CHIP:DMG: },
-          [1657022305.318300][7266:7271] CHIP:DMG: Received Command Response Status for Endpoint=0 Cluster=0x0000_0034 Command=0x0000_0000 Status=0x0
-          [1657022305.318359][7266:7271] CHIP:DMG: ICR moving to [AwaitingDe]
+          [1659960382.148753][4826:4826] CHIP:DMG: InvokeRequestMessage =
+          [1659960382.148777][4826:4826] CHIP:DMG: {
+          [1659960382.148798][4826:4826] CHIP:DMG:         suppressResponse = false,
+          [1659960382.148822][4826:4826] CHIP:DMG:         timedRequest = false,
+          [1659960382.148856][4826:4826] CHIP:DMG:         InvokeRequests =
+          [1659960382.148889][4826:4826] CHIP:DMG:         [
+          [1659960382.148921][4826:4826] CHIP:DMG:                 CommandDataIB =
+          [1659960382.148948][4826:4826] CHIP:DMG:                 {
+          [1659960382.148981][4826:4826] CHIP:DMG:                         CommandPathIB =
+          [1659960382.149013][4826:4826] CHIP:DMG:                         {
+          [1659960382.149051][4826:4826] CHIP:DMG:                                 EndpointId = 0x0,
+          [1659960382.149081][4826:4826] CHIP:DMG:                                 ClusterId = 0x34,
+          [1659960382.149119][4826:4826] CHIP:DMG:                                 CommandId = 0x0,
+          [1659960382.149149][4826:4826] CHIP:DMG:                         },
+          [1659960382.149178][4826:4826] CHIP:DMG:
+          [1659960382.149212][4826:4826] CHIP:DMG:                         CommandFields =
+          [1659960382.149239][4826:4826] CHIP:DMG:                         {
+          [1659960382.149276][4826:4826] CHIP:DMG:                         },
+          [1659960382.149302][4826:4826] CHIP:DMG:                 },
+          [1659960382.149337][4826:4826] CHIP:DMG:
+          [1659960382.149358][4826:4826] CHIP:DMG:         ],
+          [1659960382.149392][4826:4826] CHIP:DMG:
+          [1659960382.149413][4826:4826] CHIP:DMG:         InteractionModelRevision = 1
+          [1659960382.149433][4826:4826] CHIP:DMG: },
       disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_DGTHREAD_2_5.yaml b/src/app/tests/suites/certification/Test_TC_DGTHREAD_2_5.yaml
index e9c0a2e..eab7dae 100644
--- a/src/app/tests/suites/certification/Test_TC_DGTHREAD_2_5.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DGTHREAD_2_5.yaml
@@ -29,60 +29,53 @@
     - label: "Induce a DUT by an Unspecified failure"
       PICS: DGTHREAD.S.E01
       verification: |
-          Not Implemented in CHIP Tool
+          There is no implementation in TH (chip-tool) to read these optional events. Pls mark as Not Applicable
       disabled: true
 
     - label: "Induce a DUT by LinkDown failure"
       PICS: DGTHREAD.S.E01
       verification: |
-          Not Implemented in CHIP Tool
+          There is no implementation in TH (chip-tool) to read these optional events. Pls mark as Not Applicable
       disabled: true
 
     - label: "Induce a DUT by HardwareFailure"
       PICS: DGTHREAD.S.E01
       verification: |
-          Not Implemented in CHIP Tool
+          There is no implementation in TH (chip-tool) to read these optional events. Pls mark as Not Applicable
       disabled: true
 
     - label: "Induce a DUT by NetworkJammed Failure"
       PICS: DGTHREAD.S.E01
       verification: |
-          Not Implemented in CHIP Tool
+          There is no implementation in TH (chip-tool) to read these optional events. Pls mark as Not Applicable
       disabled: true
 
     - label: "Induce a DUT by an Unspecified failure"
       PICS: DGTHREAD.S.E01
       verification: |
-          Not Implemented in CHIP Tool
+          There is no implementation in TH (chip-tool) to read these optional events. Pls mark as Not Applicable
       disabled: true
 
     - label: "Induce a DUT by LinkDown failure"
       PICS: DGTHREAD.S.E01
       verification: |
-          Not Implemented in CHIP Tool
+          There is no implementation in TH (chip-tool) to read these optional events. Pls mark as Not Applicable
       disabled: true
 
     - label: "Induce a DUT by HardwareFailure"
       PICS: DGTHREAD.S.E01
       verification: |
-          Not Implemented in CHIP Tool
+          There is no implementation in TH (chip-tool) to read these optional events. Pls mark as Not Applicable
       disabled: true
 
     - label: "Induce a DUT by NetworkJammed Failure"
       PICS: DGTHREAD.S.E01
       verification: |
-          Not Implemented in CHIP Tool
+          There is no implementation in TH (chip-tool) to read these optional events. Pls mark as Not Applicable
       disabled: true
 
     - label: "Disconnect and reconnect a node to a Thread network"
       PICS: DGTHREAD.S.E00
       verification: |
-          ./chip-tool  threadnetworkdiagnostics  read-event connection-status 137 0
-
-          [1651233430.972821][7560:7565] CHIP:DMG: ReportDataMessage =
-          [1651233430.972891][7560:7565] CHIP:DMG: {
-          [1651233430.972950][7560:7565] CHIP:DMG: 	SuppressResponse = true,
-          [1651233430.973013][7560:7565] CHIP:DMG: 	InteractionModelRevision = 1
-          [1651233430.973070][7560:7565] CHIP:DMG: }
-          [1651233430.973222][7560:7565] CHIP:EM: Sending Standalone Ack for MessageCounter:6424591 on exchange 2503i
+          Optional Event so it is not mandatory to verify in v1.0. Pls mark as Not Applicable.
       disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_DGTHREAD_3_1.yaml b/src/app/tests/suites/certification/Test_TC_DGTHREAD_3_1.yaml
index ae4a342..868372c 100644
--- a/src/app/tests/suites/certification/Test_TC_DGTHREAD_3_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DGTHREAD_3_1.yaml
@@ -24,457 +24,540 @@
     endpoint: 0
 
 tests:
+    - label: "Note"
+      verification: |
+          Chip-tool command used below are an example to verify the  DUT as client test cases. For certification test, we expect DUT should have a capability or way to run the equivalent command.
+      disabled: true
+
     - label: "Commission DUT to TH"
       verification: |
-
+          verification step to be updated.
       disabled: true
 
     - label: "DUT reads Channel attribute value from TH"
       PICS: DGTHREAD.C.A0000
       verification: |
-          ./chip-tool threadnetworkdiagnostics read channel 65 0
+          ./chip-tool threadnetworkdiagnostics read channel 54 0
 
-          Verify on the TH Log:
+          Verify "channel response" on the TH(All-cluster-app) Log:
 
 
-          [1649824566.453007][3222:3227] CHIP:DMG: SuppressResponse = true,
-          [1649824566.453070][3222:3227] CHIP:DMG: InteractionModelRevision = 1
-          [1649824566.453127][3222:3227] CHIP:DMG: }
-          [1649824566.453482][3222:3227] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0035 Attribute 0x0000_0000 DataVersion: 2758196590
-          [1649824566.453644][3222:3227] CHIP:TOO: channel: 15
+          D: 499352 [EM]Handling via exchange: 37813r, Delegate: 0x200070ec
+          D: 499358 [IM]Received Read request
+          D: 499362 [DMG]IM RH moving to [GeneratingReports]
+          D: 499367 [DMG]Building Reports for ReadHandler with LastReportGeneration = 0 DirtyGeneration = 0
+          D: 499375 [DMG]<RE:Run> Cluster 35, Attribute 0 is dirty
+          D: 499381 [DMG]Reading attribute: Cluster=0x0000_0035 Endpoint=0 AttributeId=0x0000_0000 (expanded=0)
+          exchanr
+          D: 499492 [EM]Found matching exchange: 37813r, Delegate: (nil)
+          D: 499498 [EM]Rxd Ack; Removing MessageCounter:30700790 from Retrans Table on exchange 37813r
+          D: 499506 [EM]Removed CHIP MessageCounter:30700790 from RetransTable on exchange 37813r
       disabled: true
 
     - label: "DUT reads RoutingRole attribute value from TH"
       PICS: DGTHREAD.C.A0001
       verification: |
-          ./chip-tool threadnetworkdiagnostics read routing-role 65 0
+          ./chip-tool threadnetworkdiagnostics read routing-role 54 0
 
-          Verify on the TH Log:
+          Verify "RoutingRole response" on the TH(All-cluster-app) Log:
 
-          [1649824620.074789][3232:3237] CHIP:DMG:        SuppressResponse = true,
-          [1649824620.074852][3232:3237] CHIP:DMG:        InteractionModelRevision = 1
-          [1649824620.074911][3232:3237] CHIP:DMG: }
-          [1649824620.075220][3232:3237] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0035 Attribute 0x0000_0001 DataVersion: 2758196590
-          [1649824620.075380][3232:3237] CHIP:TOO:   RoutingRole: 3
+          D: 857084 [EM]Handling via exchange: 46068r, Delegate: 0x200070ec
+          D: 857090 [IM]Received Read request
+          D: 857094 [DMG]IM RH moving to [GeneratingReports]
+          D: 857099 [DMG]Building Reports for ReadHandler with LastReportGeneration = 0 DirtyGeneration = 0
+          D: 857108 [DMG]<RE:Run> Cluster 35, Attribute 1 is dirty
+          D: 857113 [DMG]Reading attribute: Cluster=0x0000_0035 Endpoint=0 AttributeId=0x0000_0001 (expanded=0)
+          D: 857122 [DMG]<RE> Sending report (payload has 36 bytes)...
       disabled: true
 
     - label: "DUT reads NetworkName attribute value from TH."
       PICS: DGTHREAD.C.A0002
       verification: |
-          ./chip-tool threadnetworkdiagnostics read network-name 65 0
+          ./chip-tool threadnetworkdiagnostics read network-name 54 0
 
-          Verify on the TH Log:
+          Verify "NetworkName response" on the TH(All-cluster-app) Log:
 
-          [1649823714.280544][3183:3188] CHIP:DMG:
-          [1649823714.280605][3183:3188] CHIP:DMG:        SuppressResponse = true,
-          [1649823714.280668][3183:3188] CHIP:DMG:        InteractionModelRevision = 1
-          [1649823714.280725][3183:3188] CHIP:DMG: }
-          [1649823714.281032][3183:3188] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0035 Attribute 0x0000_0002 DataVersion: 2758196590
-          [1649823714.281135][3183:3188] CHIP:TOO:   NetworkName: OpenThreaddDemo
+          D: 906029 [EM]Handling via exchange: 28293r, Delegate: 0x200070ec
+          D: 906035 [IM]Received Read request
+          D: 906039 [DMG]IM RH moving to [GeneratingReports]
+          D: 906043 [DMG]Building Reports for ReadHandler with LastReportGeneration = 0 DirtyGeneration = 0
+          D: 906052 [DMG]<RE:Run> Cluster 35, Attribute 2 is dirty
+          D: 906057 [DMG]Reading attribute: Cluster=0x0000_0035 Endpoint=0 AttributeId=0x0000_0002 (expanded=0)
+          D: 906066 [DMG]<RE> Sending report (payload has 51 bytes)...
       disabled: true
 
     - label: "DUT reads PanId attribute value from TH."
       PICS: DGTHREAD.C.A0003
       verification: |
-          ./chip-tool threadnetworkdiagnostics read pan-id 65 0
+          ./chip-tool threadnetworkdiagnostics read pan-id 54 0
 
-          Verify on the TH Log:
+          Verify "PanId response" on the TH(All-cluster-app) Log:
 
-           [1649824713.095280][3292:3297] CHIP:DMG:        SuppressResponse = true,
-          [1649824713.095343][3292:3297] CHIP:DMG:        InteractionModelRevision = 1
-          [1649824713.095402][3292:3297] CHIP:DMG: }
-          [1649824713.095703][3292:3297] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0035 Attribute 0x0000_0003 DataVersion: 2758196590
-          [1649824713.095867][3292:3297] CHIP:TOO:   PanId: 4660
+          D: 967006 [EM]Handling via exchange: 44794r, Delegate: 0x200070ec
+          D: 967011 [IM]Received Read request
+          D: 967015 [DMG]IM RH moving to [GeneratingReports]
+          D: 967020 [DMG]Building Reports for ReadHandler with LastReportGeneration = 0 DirtyGeneration = 0
+          D: 967029 [DMG]<RE:Run> Cluster 35, Attribute 3 is dirty
+          D: 967034 [DMG]Reading attribute: Cluster=0x0000_0035 Endpoint=0 AttributeId=0x0000_0003 (expanded=0)
+          D: 967043 [DMG]<RE> Sending report (payload has 37 bytes)...
       disabled: true
 
     - label: "DUT reads ExtendedPanId attribute value from TH."
       PICS: DGTHREAD.C.A0004
       verification: |
-          ./chip-tool threadnetworkdiagnostics read extended-pan-id 65 0
+          ./chip-tool threadnetworkdiagnostics read extended-pan-id 54 0
 
-          Verify on the TH Log:
+          Verify "ExtendedPanId response" on the TH(All-cluster-app) Log:
 
-          [1649824746.370824][3300:3305] CHIP:DMG:        SuppressResponse = true,
-          [1649824746.370887][3300:3305] CHIP:DMG:        InteractionModelRevision = 1
-          [1649824746.370946][3300:3305] CHIP:DMG: }
-          [1649824746.371245][3300:3305] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0035 Attribute 0x0000_0004 DataVersion: 2758196590
-          [1649824746.371387][3300:3305] CHIP:TOO:   ExtendedPanId: 1229782942828601890
+          D: 992402 [EM]Handling via exchange: 49565r, Delegate: 0x200070ec
+          D: 992409 [IM]Received Read request
+          D: 992413 [DMG]IM RH moving to [GeneratingReports]
+          D: 992418 [DMG]Building Reports for ReadHandler with LastReportGeneration = 0 DirtyGeneration = 0
+          D: 992427 [DMG]<RE:Run> Cluster 35, Attribute 4 is dirty
+          D: 992432 [DMG]Reading attribute: Cluster=0x0000_0035 Endpoint=0 AttributeId=0x0000_0004 (expanded=0)
+          D: 992441 [DMG]<RE> Sending report (payload has 43 bytes)...
       disabled: true
 
     - label: "DUT reads MeshLocalPrefix attribute value from TH."
       PICS: DGTHREAD.C.A0005
       verification: |
-          ./chip-tool threadnetworkdiagnostics read mesh-local-prefix 65 0
+          ./chip-tool threadnetworkdiagnostics read mesh-local-prefix 54 0
 
-          Verify on the TH Log:
+          Verify "MeshLocalPrefix response" on the TH(All-cluster-app) Log:
 
-          [1649824777.961973][3306:3311] CHIP:DMG:        SuppressResponse = true,
-          [1649824777.962035][3306:3311] CHIP:DMG:        InteractionModelRevision = 1
-          [1649824777.962093][3306:3311] CHIP:DMG: }
-          [1649824777.962401][3306:3311] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0035 Attribute 0x0000_0005 DataVersion: 2758196590
-          [1649824777.962509][3306:3311] CHIP:TOO:   MeshLocalPrefix: 40FD7B3042ED5F42CF
+          D: 1037614 [EM]Handling via exchange: 42980r, Delegate: 0x200070ec
+          D: 1037620 [IM]Received Read request
+          D: 1037624 [DMG]IM RH moving to [GeneratingReports]
+          D: 1037628 [DMG]Building Reports for ReadHandler with LastReportGeneration = 0 DirtyGeneration = 0
+          D: 1037637 [DMG]<RE:Run> Cluster 35, Attribute 5 is dirty
+          D: 1037642 [DMG]Reading attribute: Cluster=0x0000_0035 Endpoint=0 AttributeId=0x0000_0005 (expanded=0)
+          D: 1037652 [DMG]<RE> Sending report (payload has 45 bytes)...
       disabled: true
 
     - label: "DUT reads OverrunCount attribute value from TH."
       PICS: DGTHREAD.C.A0006
       verification: |
-          ./chip-tool threadnetworkdiagnostics read overrun-count 65 0
+          ./chip-tool threadnetworkdiagnostics read overrun-count 54 0
 
-          Verify on the TH Log:
+          Verify "OverrunCount response" on the TH(All-cluster-app) Log:
 
-           [1649824808.714398][3314:3319] CHIP:DMG:        SuppressResponse = true,
-          [1649824808.714482][3314:3319] CHIP:DMG:        InteractionModelRevision = 1
-          [1649824808.714539][3314:3319] CHIP:DMG: }
-          [1649824808.714898][3314:3319] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0035 Attribute 0x0000_0006 DataVersion: 2758196590
-          [1649824808.715038][3314:3319] CHIP:TOO:   OverrunCount: 0
+          D: 1085229 [SC]Allocated SecureSession (0x20003680) - waiting for Sigma1 msg
+          I: 1085236 [EM]Received message of type 0x2 with protocolId (0, 1) and MessageCounter:86023668 on exchanr
+          D: 1085246 [EM]Handling via exchange: 16079r, Delegate: 0x200070ec
+          D: 1085252 [IM]Received Read request
+          D: 1085256 [DMG]IM RH moving to [GeneratingReports]
+          D: 1085261 [DMG]Building Reports for ReadHandler with LastReportGeneration = 0 DirtyGeneration = 0
+          D: 1085270 [DMG]<RE:Run> Cluster 35, Attribute 6 is dirty
+          D: 1085275 [DMG]Reading attribute: Cluster=0x0000_0035 Endpoint=0 AttributeId=0x0000_0006 (expanded=0)
+          D: 1085284 [DMG]<RE> Sending report (payload has 36 bytes)...
       disabled: true
 
     - label: "DUT reads NeighborTable attribute value from TH."
       PICS: DGTHREAD.C.A0007
       verification: |
-          ./chip-tool threadnetworkdiagnostics read neighbor-table-list 65 0
+          ./chip-tool threadnetworkdiagnostics read neighbor-table-list 54 0
 
-          Verify on the TH Log:
+          Verify "NeighborTableList response" on the TH(All-cluster-app) Log:
 
-          [1649824841.785721][3322:3327] CHIP:DMG:        SuppressResponse = true,
-          [1649824841.785783][3322:3327] CHIP:DMG:        InteractionModelRevision = 1
-          [1649824841.785841][3322:3327] CHIP:DMG: }
-          [1649824841.786186][3322:3327] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0035 Attribute 0x0000_0007 DataVersion: 2758196590
-          [1649824841.786317][3322:3327] CHIP:TOO:   NeighborTableList: 0 entries
+          D: 1133597 [SC]Allocated SecureSession (0x20003738) - waiting for Sigma1 msg
+          I: 1133606 [EM]Received message of type 0x2 with protocolId (0, 1) and MessageCounter:213814779 on exchar
+          D: 1133616 [EM]Handling via exchange: 57703r, Delegate: 0x200070ec
+          D: 1133622 [IM]Received Read request
+          D: 1133626 [DMG]IM RH moving to [GeneratingReports]
+          D: 1133631 [DMG]Building Reports for ReadHandler with LastReportGeneration = 0 DirtyGeneration = 0
+          D: 1133640 [DMG]<RE:Run> Cluster 35, Attribute 7 is dirty
+          D: 1133645 [DMG]Reading attribute: Cluster=0x0000_0035 Endpoint=0 AttributeId=0x0000_0007 (expanded=0)
+          D: 1133654 [DMG]<RE> Sending report (payload has 110 bytes)..
       disabled: true
 
     - label: "DUT reads RouteTable attribute value from TH."
       PICS: DGTHREAD.C.A0008
       verification: |
-          ./chip-tool threadnetworkdiagnostics read route-table-list 65 0
+          ./chip-tool threadnetworkdiagnostics read route-table-list 54 0
 
-          Verify on the TH Log:
+          Verify "RouteTableList response" on the TH(All-cluster-app) Log:
 
-          [1649824896.844773][3329:3334] CHIP:DMG:        SuppressResponse = true,
-          [1649824896.844809][3329:3334] CHIP:DMG:        InteractionModelRevision = 1
-          [1649824896.844834][3329:3334] CHIP:DMG: }
-          [1649824896.845182][3329:3334] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0035 Attribute 0x0000_0008 DataVersion: 2758196590
-          [1649824896.845283][3329:3334] CHIP:TOO:   RouteTableList: 1 entries
-          [1649824896.845422][3329:3334] CHIP:TOO:     [1]: {
-          [1649824896.845467][3329:3334] CHIP:TOO:       ExtAddress: 0
-          [1649824896.845498][3329:3334] CHIP:TOO:       Rloc16: 39936
-          [1649824896.845527][3329:3334] CHIP:TOO:       RouterId: 39
-          [1649824896.845554][3329:3334] CHIP:TOO:       NextHop: 39
-          [1649824896.845581][3329:3334] CHIP:TOO:       PathCost: 1
-          [1649824896.845607][3329:3334] CHIP:TOO:       LQIIn: 0
-          [1649824896.845634][3329:3334] CHIP:TOO:       LQIOut: 0
-          [1649824896.845656][3329:3334] CHIP:TOO:       Age: 60
-          [1649824896.845681][3329:3334] CHIP:TOO:       Allocated: TRUE
-          [1649824896.845707][3329:3334] CHIP:TOO:       LinkEstablished: FALSE
-          [1649824896.845736][3329:3334] CHIP:TOO:      }
-          [1649824896.845829][3329:3334] CHIP:EM: Sending Standalone Ack for MessageCounter:14412289 on exchange 3041i
+          D: 1193349 [SC]Allocated SecureSession (0x200037f0) - waiting for Sigma1 msg
+          I: 1193357 [EM]Received message of type 0x2 with protocolId (0, 1) and MessageCounter:137272867 on exchar
+          D: 1193367 [EM]Handling via exchange: 5101r, Delegate: 0x200070ec
+          D: 1193372 [IM]Received Read request
+          D: 1193376 [DMG]IM RH moving to [GeneratingReports]
+          D: 1193381 [DMG]Building Reports for ReadHandler with LastReportGeneration = 0 DirtyGeneration = 0
+          D: 1193390 [DMG]<RE:Run> Cluster 35, Attribute 8 is dirty
+          D: 1193395 [DMG]Reading attribute: Cluster=0x0000_0035 Endpoint=0 AttributeId=0x0000_0008 (expanded=0)
+          D: 1193405 [DMG]<RE> Sending report (payload has 100 bytes)...
       disabled: true
 
     - label: "DUT reads PartitionId attribute value from TH"
       PICS: DGTHREAD.C.A0009
       verification: |
-          ./chip-tool threadnetworkdiagnostics read partition-id 65 0
+          ./chip-tool threadnetworkdiagnostics read partition-id 54 0
 
-          Verify on the TH Log:
+          Verify "PartitionId response" on the TH(All-cluster-app) Log:
 
-          [1649824939.713304][3339:3344] CHIP:DMG:        SuppressResponse = true,
-          [1649824939.713366][3339:3344] CHIP:DMG:        InteractionModelRevision = 1
-          [1649824939.713424][3339:3344] CHIP:DMG: }
-          [1649824939.713721][3339:3344] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0035 Attribute 0x0000_0009 DataVersion: 2758196590
-          [1649824939.713862][3339:3344] CHIP:TOO:   PartitionId: 1864110017
+          D: 1251223 [SC]Allocated SecureSession (0x20002c70) - waiting for Sigma1 msg
+          I: 1251230 [EM]Received message of type 0x2 with protocolId (0, 1) and MessageCounter:191202632 on exchar
+          D: 1251241 [EM]Handling via exchange: 25875r, Delegate: 0x200070ec
+          D: 1251247 [IM]Received Read request
+          D: 1251251 [DMG]IM RH moving to [GeneratingReports]
+          D: 1251256 [EM]Retransmitting MessageCounter:53367772 on exchange 25874r Send Cnt 1
+          I: 1251265 [IN]Sending unauthenticated msg 0x2000489c with MessageCounter:53367772 to 0x0000000000000000c
+          D: 1251279 [DMG]Building Reports for ReadHandler with LastReportGeneration = 0 DirtyGeneration = 0
+          D: 1251288 [DMG]<RE:Run> Cluster 35, Attribute 9 is dirty
+          D: 1251294 [DMG]Reading attribute: Cluster=0x0000_0035 Endpoint=0 AttributeId=0x0000_0009 (expanded=0)
+          D: 1251303 [DMG]<RE> Sending report (payload has 39 bytes)...
       disabled: true
 
     - label: "DUT reads Weighting attribute value from TH"
       PICS: DGTHREAD.C.A000a
       verification: |
-          ./chip-tool threadnetworkdiagnostics read weighting 65 0
+          ./chip-tool threadnetworkdiagnostics read weighting 54 0
 
-          Verify on the TH Log:
+          Verify "weighting response" on the TH(All-cluster-app) Log:
 
-          [1649824976.023194][3349:3354] CHIP:DMG:        SuppressResponse = true,
-          [1649824976.023258][3349:3354] CHIP:DMG:        InteractionModelRevision = 1
-          [1649824976.023318][3349:3354] CHIP:DMG: }
-          [1649824976.023619][3349:3354] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0035 Attribute 0x0000_000A DataVersion: 2758196590
-          [1649824976.023783][3349:3354] CHIP:TOO:   weighting: 64
+          D: 1299900 [SC]Allocated SecureSession (0x20002de0) - waiting for Sigma1 msg
+          I: 1299907 [EM]Received message of type 0x2 with protocolId (0, 1) and MessageCounter:55560128 on exchanr
+          D: 1299917 [EM]Handling via exchange: 45722r, Delegate: 0x200070ec
+          D: 1299923 [IM]Received Read request
+          D: 1299927 [DMG]IM RH moving to [GeneratingReports]
+          D: 1299932 [DMG]Building Reports for ReadHandler with LastReportGeneration = 0 DirtyGeneration = 0
+          D: 1299941 [DMG]<RE:Run> Cluster 35, Attribute a is dirty
+          D: 1299946 [DMG]Reading attribute: Cluster=0x0000_0035 Endpoint=0 AttributeId=0x0000_000A (expanded=0)
+          D: 1299955 [DMG]<RE> Sending report (payload has 36 bytes)...
       disabled: true
 
     - label: "DUT reads DataVersion attribute value from TH"
       PICS: DGTHREAD.C.A000b
       verification: |
-          ./chip-tool threadnetworkdiagnostics read data-version 65 0
+          ./chip-tool threadnetworkdiagnostics read data-version 54 0
 
-          Verify on the TH Log:
+          Verify "DataVersion response" on the TH(All-cluster-app) Log:
 
-          [1649825003.853216][3355:3360] CHIP:DMG:        SuppressResponse = true,
-          [1649825003.853300][3355:3360] CHIP:DMG:        InteractionModelRevision = 1
-          [1649825003.853358][3355:3360] CHIP:DMG: }
-          [1649825003.853718][3355:3360] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0035 Attribute 0x0000_000B DataVersion: 2758196590
-          [1649825003.853881][3355:3360] CHIP:TOO:   DataVersion: 194
+          I: 1354333 [IN]Sending unauthenticated msg 0x2000489c with MessageCounter:53367780 to 0x0000000000000000c
+          I: 1354350 [EM]Received message of type 0x2 with protocolId (0, 1) and MessageCounter:157453720 on exchar
+          D: 1354362 [EM]Handling via exchange: 38823r, Delegate: 0x200070ec
+          D: 1354368 [IM]Received Read request
+          D: 1354372 [DMG]IM RH moving to [GeneratingReports]
+          D: 1354376 [DMG]Building Reports for ReadHandler with LastReportGeneration = 0 DirtyGeneration = 0
+          D: 1354385 [DMG]<RE:Run> Cluster 35, Attribute b is dirty
+          D: 1354390 [DMG]Reading attribute: Cluster=0x0000_0035 Endpoint=0 AttributeId=0x0000_000B (expanded=0)
+          D: 1354400 [DMG]<RE> Sending report (payload has 36 bytes)...
       disabled: true
 
     - label: "DUT reads StableDataVersion attribute value from TH"
       PICS: DGTHREAD.C.A000c
       verification: |
-          ./chip-tool threadnetworkdiagnostics read stable-data-version 65 0
+          ./chip-tool threadnetworkdiagnostics read stable-data-version 54 0
 
-          Verify on the TH Log:
+          Verify "StableDataVersion response" on the TH(All-cluster-app) Log:
 
 
-          [1649825030.808949][3363:3368] CHIP:DMG:        SuppressResponse = true,
-          [1649825030.809013][3363:3368] CHIP:DMG:        InteractionModelRevision = 1
-          [1649825030.809071][3363:3368] CHIP:DMG: }
-          [1649825030.809368][3363:3368] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0035 Attribute 0x0000_000C DataVersion: 2758196590
-          [1649825030.809530][3363:3368] CHIP:TOO:   StableDataVersion: 151
+          I: 1392842 [IN]Sending unauthenticated msg 0x2000489c with MessageCounter:53367784 to 0x0000000000000000c
+          I: 1392857 [EM]Received message of type 0x2 with protocolId (0, 1) and MessageCounter:43531416 on exchanr
+          D: 1392867 [EM]Handling via exchange: 51957r, Delegate: 0x200070ec
+          D: 1392875 [IM]Received Read request
+          D: 1392879 [DMG]IM RH moving to [GeneratingReports]
+          D: 1392884 [DMG]Building Reports for ReadHandler with LastReportGeneration = 0 DirtyGeneration = 0
+          D: 1392894 [DMG]<RE:Run> Cluster 35, Attribute c is dirty
+          D: 1392900 [DMG]Reading attribute: Cluster=0x0000_0035 Endpoint=0 AttributeId=0x0000_000C (expanded=0)
+          D: 1392909 [DMG]<RE> Sending report (payload has 36 bytes)...
       disabled: true
 
     - label: "DUT reads LeaderRouterId attribute value from TH"
       PICS: DGTHREAD.C.A000d
       verification: |
-          ./chip-tool threadnetworkdiagnostics read leader-router-id 65 0
+          ./chip-tool threadnetworkdiagnostics read leader-router-id 54 0
 
-          Verify on the TH Log:
+          Verify "LeaderRouterId response" on the TH(All-cluster-app) Log:
 
 
-          [1649825375.599441][3380:3385] CHIP:DMG:        SuppressResponse = true,
-          [1649825375.599484][3380:3385] CHIP:DMG:        InteractionModelRevision = 1
-          [1649825375.599522][3380:3385] CHIP:DMG: }
-          [1649825375.599735][3380:3385] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0035 Attribute 0x0000_000D DataVersion: 2758196590
-          [1649825375.599850][3380:3385] CHIP:TOO:   LeaderRouterId: 39
+          D: 1455932 [SC]Allocated SecureSession (0x20002f50) - waiting for Sigma1 msg
+          I: 1455940 [EM]Received message of type 0x2 with protocolId (0, 1) and MessageCounter:149451326 on exchar
+          D: 1455950 [EM]Handling via exchange: 39274r, Delegate: 0x200070ec
+          D: 1455956 [IM]Received Read request
+          D: 1455960 [DMG]IM RH moving to [GeneratingReports]
+          D: 1455965 [EM]Retransmitting MessageCounter:53367788 on exchange 39273r Send Cnt 1
+          I: 1455972 [IN]Sending unauthenticated msg 0x2000489c with MessageCounter:53367788 to 0x0000000000000000c
+          D: 1455988 [DMG]Building Reports for ReadHandler with LastReportGeneration = 0 DirtyGeneration = 0
+          D: 1455997 [DMG]<RE:Run> Cluster 35, Attribute d is dirty
+          D: 1456002 [DMG]Reading attribute: Cluster=0x0000_0035 Endpoint=0 AttributeId=0x0000_000D (expanded=0)
+          D: 1456013 [DMG]<RE> Sending report (payload has 36 bytes)...
       disabled: true
 
     - label: "DUT reads DetachedRoleCount attribute value from TH"
       PICS: DGTHREAD.C.A000e
       verification: |
-          ./chip-tool threadnetworkdiagnostics read detached-role-count 65 0
+          ./chip-tool threadnetworkdiagnostics read detached-role-count 54 0
 
-          Verify on the TH Log:
+          Verify "DetachedRoleCount response" on the TH(All-cluster-app) Log:
 
-          [1649825500.911386][3393:3398] CHIP:DMG:        SuppressResponse = true,
-          [1649825500.911449][3393:3398] CHIP:DMG:        InteractionModelRevision = 1
-          [1649825500.911506][3393:3398] CHIP:DMG: }
-          [1649825500.911805][3393:3398] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0035 Attribute 0x0000_000E DataVersion: 2758196590
-          [1649825500.911969][3393:3398] CHIP:TOO:   DetachedRoleCount: 1
+          I: 1532319 [IN]Sending unauthenticated msg 0x2000489c with MessageCounter:53367792 to 0x0000000000000000c
+          I: 1532333 [EM]Received message of type 0x2 with protocolId (0, 1) and MessageCounter:268029320 on exchar
+          D: 1532344 [EM]Handling via exchange: 16217r, Delegate: 0x200070ec
+          D: 1532350 [IM]Received Read request
+          D: 1532354 [DMG]IM RH moving to [GeneratingReports]
+          D: 1532361 [DMG]Building Reports for ReadHandler with LastReportGeneration = 0 DirtyGeneration = 0
+          D: 1532371 [DMG]<RE:Run> Cluster 35, Attribute e is dirty
+          D: 1532376 [DMG]Reading attribute: Cluster=0x0000_0035 Endpoint=0 AttributeId=0x0000_000E (expanded=0)
+          D: 1532385 [DMG]<RE> Sending report (payload has 36 bytes)...
       disabled: true
 
     - label: "DUT reads ChildRoleCount attribute value from TH"
       PICS: DGTHREAD.C.A000f
       verification: |
-          ./chip-tool threadnetworkdiagnostics read child-role-count 65 0
+          ./chip-tool threadnetworkdiagnostics read child-role-count 54 0
 
-          Verify on the TH Log:
+          Verify "ChildRoleCount response" on the TH(All-cluster-app) Log:
 
-
-           [1649825527.705564][3399:3404] CHIP:DMG:        SuppressResponse = true,
-          [1649825527.705628][3399:3404] CHIP:DMG:        InteractionModelRevision = 1
-          [1649825527.705687][3399:3404] CHIP:DMG: }
-          [1649825527.705991][3399:3404] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0035 Attribute 0x0000_000F DataVersion: 2758196590
-          [1649825527.706153][3399:3404] CHIP:TOO:   ChildRoleCount: 1
+          D: 1566935 [SC]Allocated SecureSession (0x200030c0) - waiting for Sigma1 msg
+          I: 1566943 [EM]Received message of type 0x2 with protocolId (0, 1) and MessageCounter:48367315 on exchanr
+          D: 1566953 [EM]Handling via exchange: 7022r, Delegate: 0x200070ec
+          D: 1566958 [IM]Received Read request
+          D: 1566962 [DMG]IM RH moving to [GeneratingReports]
+          D: 1566967 [EM]Retransmitting MessageCounter:53367796 on exchange 7021r Send Cnt 1
+          I: 1566975 [IN]Sending unauthenticated msg 0x2000489c with MessageCounter:53367796 to 0x0000000000000000c
+          D: 1566989 [DMG]Building Reports for ReadHandler with LastReportGeneration = 0 DirtyGeneration = 0
+          D: 1566998 [DMG]<RE:Run> Cluster 35, Attribute f is dirty
+          D: 1567005 [DMG]Reading attribute: Cluster=0x0000_0035 Endpoint=0 AttributeId=0x0000_000F (expanded=0)
+          D: 1567014 [DMG]<RE> Sending report (payload has 36 bytes)...
       disabled: true
 
     - label: "DUT reads RouterRoleCount attribute value from TH"
       PICS: DGTHREAD.C.A0010
       verification: |
-          ./chip-tool threadnetworkdiagnostics read router-role-count 65 0
+          ./chip-tool threadnetworkdiagnostics read router-role-count 54 0
 
-          Verify on the TH Log:
+          Verify "RouterRoleCount response" on the TH(All-cluster-app) Log:
 
-
-          [1649825557.312082][3406:3411] CHIP:DMG:        SuppressResponse = true,
-          [1649825557.312107][3406:3411] CHIP:DMG:        InteractionModelRevision = 1
-          [1649825557.312130][3406:3411] CHIP:DMG: }
-          [1649825557.312271][3406:3411] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0035 Attribute 0x0000_0010 DataVersion: 2758196590
-          [1649825557.312352][3406:3411] CHIP:TOO:   RouterRoleCount: 0
+          D: 1600012 [SC]Allocated SecureSession (0x20003178) - waiting for Sigma1 msg
+          I: 1600020 [EM]Received message of type 0x2 with protocolId (0, 1) and MessageCounter:78525212 on exchanr
+          D: 1600030 [EM]Handling via exchange: 10230r, Delegate: 0x200070ec
+          D: 1600036 [IM]Received Read request
+          D: 1600040 [DMG]IM RH moving to [GeneratingReports]
+          D: 1600045 [DMG]Building Reports for ReadHandler with LastReportGeneration = 0 DirtyGeneration = 0
+          D: 1600054 [DMG]<RE:Run> Cluster 35, Attribute 10 is dirty
+          D: 1600059 [DMG]Reading attribute: Cluster=0x0000_0035 Endpoint=0 AttributeId=0x0000_0010 (expanded=0)
+          D: 1600068 [DMG]<RE> Sending report (payload has 36 bytes)...
       disabled: true
 
     - label: "DUT reads LeaderRoleCount attribute value from TH"
       PICS: DGTHREAD.C.A0011
       verification: |
-          ./chip-tool threadnetworkdiagnostics read leader-role-count 65 0
+          ./chip-tool threadnetworkdiagnostics read leader-role-count 54 0
 
-          Verify on the TH Log:
+          Verify "LeaderRoleCount response" on the TH(All-cluster-app) Log:
 
-          [1649825586.086657][3414:3419] CHIP:DMG:        SuppressResponse = true,
-          [1649825586.086722][3414:3419] CHIP:DMG:        InteractionModelRevision = 1
-          [1649825586.086781][3414:3419] CHIP:DMG: }
-          [1649825586.087080][3414:3419] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0035 Attribute 0x0000_0011 DataVersion: 2758196590
-          [1649825586.087243][3414:3419] CHIP:TOO:   LeaderRoleCount: 0
+          I: 1712400 [IN]Sending unauthenticated msg 0x2000489c with MessageCounter:53367804 to 0x0000000000000000c
+          I: 1712415 [EM]Received message of type 0x2 with protocolId (0, 1) and MessageCounter:173936026 on exchar
+          D: 1712425 [EM]Handling via exchange: 56738r, Delegate: 0x200070ec
+          D: 1712431 [IM]Received Read request
+          D: 1712436 [DMG]IM RH moving to [GeneratingReports]
+          D: 1712440 [DMG]Building Reports for ReadHandler with LastReportGeneration = 0 DirtyGeneration = 0
+          D: 1712452 [DMG]<RE:Run> Cluster 35, Attribute 11 is dirty
+          D: 1712459 [DMG]Reading attribute: Cluster=0x0000_0035 Endpoint=0 AttributeId=0x0000_0011 (expanded=0)
+          D: 1712468 [DMG]<RE> Sending report (payload has 36 bytes)...
       disabled: true
 
     - label: "DUT reads AttachAttemptCount attribute value from TH"
       PICS: DGTHREAD.C.A0012
       verification: |
-          ./chip-tool threadnetworkdiagnostics read attach-attempt-count 65 0
+          ./chip-tool threadnetworkdiagnostics read attach-attempt-count 54 0
 
-          Verify on the TH Log:
+          Verify "AttachAttemptCount response" on the TH(All-cluster-app) Log:
 
-           [1649825623.630934][3422:3427] CHIP:DMG:        SuppressResponse = true,
-          [1649825623.630959][3422:3427] CHIP:DMG:        InteractionModelRevision = 1
-          [1649825623.630982][3422:3427] CHIP:DMG: }
-          [1649825623.631123][3422:3427] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0035 Attribute 0x0000_0012 DataVersion: 2758196590
-          [1649825623.631203][3422:3427] CHIP:TOO:   AttachAttemptCount: 0
+          D: 1762338 [SC]Allocated SecureSession (0x200032e8) - waiting for Sigma1 msg
+          I: 1762346 [EM]Received message of type 0x2 with protocolId (0, 1) and MessageCounter:45359373 on exchanr
+          D: 1762356 [EM]Handling via exchange: 7899r, Delegate: 0x200070ec
+          D: 1762362 [IM]Received Read request
+          D: 1762366 [DMG]IM RH moving to [GeneratingReports]
+          D: 1762371 [DMG]Building Reports for ReadHandler with LastReportGeneration = 0 DirtyGeneration = 0
+          D: 1762381 [DMG]<RE:Run> Cluster 35, Attribute 12 is dirty
+          D: 1762386 [DMG]Reading attribute: Cluster=0x0000_0035 Endpoint=0 AttributeId=0x0000_0012 (expanded=0)
+          D: 1762395 [DMG]<RE> Sending report (payload has 36 bytes)...
       disabled: true
 
     - label: "DUT reads PartitionIdChangeCount attribute value from TH"
       PICS: DGTHREAD.C.A0013
       verification: |
-          ./chip-tool threadnetworkdiagnostics read partition-id-change-count 65 0
+          ./chip-tool threadnetworkdiagnostics read partition-id-change-count 54 0
 
-          Verify on the TH Log:
+          Verify "PartitionIdChangeCount response" on the TH(All-cluster-app) Log:
 
-          [1649825649.945786][3428:3433] CHIP:DMG:        SuppressResponse = true,
-          [1649825649.945847][3428:3433] CHIP:DMG:        InteractionModelRevision = 1
-          [1649825649.945903][3428:3433] CHIP:DMG: }
-          [1649825649.946204][3428:3433] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0035 Attribute 0x0000_0013 DataVersion: 2758196590
-          [1649825649.946364][3428:3433] CHIP:TOO:   PartitionIdChangeCount: 1
+          D: 1988080 [SC]Allocated SecureSession (0x200033a0) - waiting for Sigma1 msg
+          I: 1988087 [EM]Received message of type 0x2 with protocolId (0, 1) and MessageCounter:211482637 on exchar
+          D: 1988097 [EM]Handling via exchange: 39932r, Delegate: 0x200070ec
+          D: 1988103 [IM]Received Read request
+          D: 1988107 [DMG]IM RH moving to [GeneratingReports]
+          D: 1988112 [DMG]Building Reports for ReadHandler with LastReportGeneration = 0 DirtyGeneration = 0
+          D: 1988123 [DMG]<RE:Run> Cluster 35, Attribute 13 is dirty
+          D: 1988128 [DMG]Reading attribute: Cluster=0x0000_0035 Endpoint=0 AttributeId=0x0000_0013 (expanded=0)
+          D: 1988137 [DMG]<RE> Sending report (payload has 36 bytes)...
       disabled: true
 
     - label:
           "DUT reads BetterPartitionAttachAttemptCount attribute value from TH"
       PICS: DGTHREAD.C.A0014
       verification: |
-          ./chip-tool threadnetworkdiagnostics read better-partition-attach-attempt-count 65 0
+          ./chip-tool threadnetworkdiagnostics read better-partition-attach-attempt-count 54 0
 
-          Verify on the TH Log:
+          Verify "BetterPartitionAttachAttemptCount response" on the TH(All-cluster-app) Log:
 
-          [1649825690.990362][3434:3440] CHIP:DMG:        SuppressResponse = true,
-          [1649825690.990447][3434:3440] CHIP:DMG:        InteractionModelRevision = 1
-          [1649825690.990507][3434:3440] CHIP:DMG: }
-          [1649825690.991119][3434:3440] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0035 Attribute 0x0000_0014 DataVersion: 2758196590
-          [1649825690.991286][3434:3440] CHIP:TOO:   BetterPartitionAttachAttemptCount: 0
+          D: 2082976 [SC]Allocated SecureSession (0x20003458) - waiting for Sigma1 msg
+          I: 2082984 [EM]Received message of type 0x2 with protocolId (0, 1) and MessageCounter:221024802 on exchar
+          D: 2082994 [EM]Handling via exchange: 41742r, Delegate: 0x200070ec
+          D: 2083000 [IM]Received Read request
+          D: 2083004 [DMG]IM RH moving to [GeneratingReports]
+          D: 2083009 [DMG]Building Reports for ReadHandler with LastReportGeneration = 0 DirtyGeneration = 0
+          D: 2083017 [DMG]<RE:Run> Cluster 35, Attribute 14 is dirty
+          D: 2083023 [DMG]Reading attribute: Cluster=0x0000_0035 Endpoint=0 AttributeId=0x0000_0014 (expanded=0)
+          D: 2083032 [DMG]<RE> Sending report (payload has 36 bytes)...
       disabled: true
 
     - label: "DUT reads ParentChangeCount attribute value from TH"
       PICS: DGTHREAD.C.A0015
       verification: |
-          ./chip-tool threadnetworkdiagnostics read parent-change-count 65 0
+          ./chip-tool threadnetworkdiagnostics read parent-change-count 54 0
 
-          Verify on the TH Log:
+          Verify "ParentChangeCount response" on the TH(All-cluster-app) Log:
 
-          [1649825732.057481][3442:3447] CHIP:DMG:        SuppressResponse = true,
-          [1649825732.057523][3442:3447] CHIP:DMG:        InteractionModelRevision = 1
-          [1649825732.057562][3442:3447] CHIP:DMG: }
-          [1649825732.057776][3442:3447] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0035 Attribute 0x0000_0015 DataVersion: 2758196590
-          [1649825732.057890][3442:3447] CHIP:TOO:   ParentChangeCount: 0
+          D: 2167609 [SC]Allocated SecureSession (0x20003510) - waiting for Sigma1 msg
+          I: 2167617 [EM]Received message of type 0x2 with protocolId (0, 1) and MessageCounter:197446435 on exchar
+          D: 2167627 [EM]Handling via exchange: 13205r, Delegate: 0x200070ec
+          D: 2167633 [IM]Received Read request
+          D: 2167637 [DMG]IM RH moving to [GeneratingReports]
+          D: 2167642 [DMG]Building Reports for ReadHandler with LastReportGeneration = 0 DirtyGeneration = 0
+          D: 2167651 [DMG]<RE:Run> Cluster 35, Attribute 15 is dirty
+          D: 2167656 [DMG]Reading attribute: Cluster=0x0000_0035 Endpoint=0 AttributeId=0x0000_0015 (expanded=0)
+          D: 2167665 [DMG]<RE> Sending report (payload has 36 bytes)...
       disabled: true
 
     - label: "DUT reads ActiveTimestamp attribute value from TH"
       PICS: DGTHREAD.C.A0038
       verification: |
-          ./chip-tool threadnetworkdiagnostics read active-timestamp 65 0
+          ./chip-tool threadnetworkdiagnostics read active-timestamp 54 0
 
-          Verify on the TH Log:
+          Verify "ActiveTimestamp response" on the TH(All-cluster-app) Log:
 
-          [1649825762.185133][3451:3456] CHIP:DMG:        SuppressResponse = true,
-          [1649825762.185195][3451:3456] CHIP:DMG:        InteractionModelRevision = 1
-          [1649825762.185253][3451:3456] CHIP:DMG: }
-          [1649825762.185553][3451:3456] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0035 Attribute 0x0000_0038 DataVersion: 2758196590
-          [1649825762.185691][3451:3456] CHIP:TOO:   ActiveTimestamp: 0
+          I: 2257044 [IN]Sending unauthenticated msg 0x2000489c with MessageCounter:53367824 to 0x0000000000000000c
+          I: 2257059 [EM]Received message of type 0x2 with protocolId (0, 1) and MessageCounter:197064524 on exchar
+          D: 2257070 [EM]Handling via exchange: 61923r, Delegate: 0x200070ec
+          D: 2257077 [IM]Received Read request
+          D: 2257083 [DMG]IM RH moving to [GeneratingReports]
+          D: 2257088 [DMG]Building Reports for ReadHandler with LastReportGeneration = 0 DirtyGeneration = 0
+          D: 2257097 [DMG]<RE:Run> Cluster 35, Attribute 38 is dirty
+          D: 2257102 [DMG]Reading attribute: Cluster=0x0000_0035 Endpoint=0 AttributeId=0x0000_0038 (expanded=0)
+          D: 2257113 [DMG]<RE> Sending report (payload has 36 bytes)...
       disabled: true
 
     - label: "DUT reads PendingTimestamp attribute value from TH"
       PICS: DGTHREAD.C.A0039
       verification: |
-          ./chip-tool threadnetworkdiagnostics read pending-timestamp 65 0
+          ./chip-tool threadnetworkdiagnostics read pending-timestamp 54 0
 
-          Verify on the TH Log:
+          Verify "PendingTimestamp response" on the TH(All-cluster-app) Log:
 
-          [1649825790.438764][3458:3463] CHIP:DMG:        SuppressResponse = true,
-          [1649825790.438826][3458:3463] CHIP:DMG:        InteractionModelRevision = 1
-          [1649825790.438884][3458:3463] CHIP:DMG: }
-          [1649825790.439186][3458:3463] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0035 Attribute 0x0000_0039 DataVersion: 2758196590
-          [1649825790.439328][3458:3463] CHIP:TOO:   PendingTimestamp: 0
+          D: 2368307 [SC]Allocated SecureSession (0x20003680) - waiting for Sigma1 msg
+          I: 2368315 [EM]Received message of type 0x2 with protocolId (0, 1) and MessageCounter:262013622 on exchar
+          D: 2368325 [EM]Handling via exchange: 17994r, Delegate: 0x200070ec
+          D: 2368331 [IM]Received Read request
+          D: 2368336 [DMG]IM RH moving to [GeneratingReports]
+          D: 2368341 [DMG]Building Reports for ReadHandler with LastReportGeneration = 0 DirtyGeneration = 0
+          D: 2368350 [DMG]<RE:Run> Cluster 35, Attribute 39 is dirty
+          D: 2368355 [DMG]Reading attribute: Cluster=0x0000_0035 Endpoint=0 AttributeId=0x0000_0039 (expanded=0)
+          D: 2368367 [DMG]<RE> Sending report (payload has 36 bytes)...
       disabled: true
 
     - label: "DUT reads Delay attribute value from TH"
       PICS: DGTHREAD.C.A003a
       verification: |
-          ./chip-tool threadnetworkdiagnostics read delay 65 0
+          ./chip-tool threadnetworkdiagnostics read delay 54 0
 
-          Verify on the TH Log:
-
-          [1649825817.908699][3465:3470] CHIP:DMG:        SuppressResponse = true,
-          [1649825817.908762][3465:3470] CHIP:DMG:        InteractionModelRevision = 1
-          [1649825817.908819][3465:3470] CHIP:DMG: }
-          [1649825817.909116][3465:3470] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0035 Attribute 0x0000_003A DataVersion: 2758196590
-          [1649825817.909360][3465:3470] CHIP:TOO:   delay: 0
+          Verify "delay response" on the TH(All-cluster-app) Log:
+           D: 2395612 [SC]Allocated SecureSession (0x20003738) - waiting for Sigma1 msg
+          I: 2395619 [EM]Received message of type 0x2 with protocolId (0, 1) and MessageCounter:102223401 on exchar
+          D: 2395629 [EM]Handling via exchange: 39913r, Delegate: 0x200070ec
+          D: 2395635 [IM]Received Read request
+          D: 2395639 [DMG]IM RH moving to [GeneratingReports]
+          D: 2395644 [DMG]Building Reports for ReadHandler with LastReportGeneration = 0 DirtyGeneration = 0
+          D: 2395653 [DMG]<RE:Run> Cluster 35, Attribute 3a is dirty
+          D: 2395658 [DMG]Reading attribute: Cluster=0x0000_0035 Endpoint=0 AttributeId=0x0000_003A (expanded=0)
+          D: 2395670 [DMG]<RE> Sending report (payload has 36 bytes)...
       disabled: true
 
     - label: "DUT reads SecurityPolicy attribute value from TH"
       PICS: DGTHREAD.C.A003b
       verification: |
-          ./chip-tool threadnetworkdiagnostics read security-policy 65 0
+          ./chip-tool threadnetworkdiagnostics read security-policy 54 0
 
-          Verify on the TH Log:
+          Verify "SecurityPolicy response" on the TH(All-cluster-app) Log:
 
-          [1649825860.866762][3472:3477] CHIP:DMG:        SuppressResponse = true,
-          [1649825860.866826][3472:3477] CHIP:DMG:        InteractionModelRevision = 1
-          [1649825860.866883][3472:3477] CHIP:DMG: }
-          [1649825860.867425][3472:3477] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0035 Attribute 0x0000_003B DataVersion: 2758196590
-          [1649825860.867583][3472:3477] CHIP:TOO:   SecurityPolicy: 1 entries
-          [1649825860.867743][3472:3477] CHIP:TOO:     [1]: {
-          [1649825860.867804][3472:3477] CHIP:TOO:       RotationTime: 672
-          [1649825860.867862][3472:3477] CHIP:TOO:       Flags: 8479
-          [1649825860.867921][3472:3477] CHIP:TOO:      }
+          D: 2430403 [SC]Allocated SecureSession (0x200037f0) - waiting for Sigma1 msg
+          I: 2430410 [EM]Received message of type 0x2 with protocolId (0, 1) and MessageCounter:23336336 on exchanr
+          D: 2430420 [EM]Handling via exchange: 57373r, Delegate: 0x200070ec
+          D: 2430426 [IM]Received Read request
+          D: 2430430 [DMG]IM RH moving to [GeneratingReports]
+          D: 2430437 [EM]Retransmitting MessageCounter:53367836 on exchange 57372r Send Cnt 1
+          I: 2430445 [IN]Sending unauthenticated msg 0x2000489c with MessageCounter:53367836 to 0x0000000000000000c
+          D: 2430459 [DMG]Building Reports for ReadHandler with LastReportGeneration = 0 DirtyGeneration = 0
+          D: 2430467 [DMG]<RE:Run> Cluster 35, Attribute 3b is dirty
+          D: 2430473 [DMG]Reading attribute: Cluster=0x0000_0035 Endpoint=0 AttributeId=0x0000_003B (expanded=0)
+          D: 2430486 [DMG]<RE> Sending report (payload has 44 bytes)...
       disabled: true
 
     - label: "DUT reads ChannelPage0Mask attribute value from TH"
       PICS: DGTHREAD.C.A003c
       verification: |
-          ./chip-tool threadnetworkdiagnostics read channel-mask 65 0
+          ./chip-tool threadnetworkdiagnostics read channel-mask 54 0
 
-          Verify on the TH Log:
+          Verify "ChannelMask response" on the TH(All-cluster-app) Log:
 
-          [1649825907.715226][3481:3486] CHIP:DMG:        SuppressResponse = true,
-          [1649825907.715288][3481:3486] CHIP:DMG:        InteractionModelRevision = 1
-          [1649825907.715346][3481:3486] CHIP:DMG: }
-          [1649825907.715653][3481:3486] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0035 Attribute 0x0000_003C DataVersion: 2758196590
-          [1649825907.715783][3481:3486] CHIP:TOO:   ChannelMask: 001FFFE0
+          I: 2464057 [IN]Sending unauthenticated msg 0x2000489c with MessageCounter:53367840 to 0x0000000000000000c
+          I: 2464071 [EM]Received message of type 0x2 with protocolId (0, 1) and MessageCounter:147354356 on exchar
+          D: 2464082 [EM]Handling via exchange: 1863r, Delegate: 0x200070ec
+          D: 2464088 [IM]Received Read request
+          D: 2464092 [DMG]IM RH moving to [GeneratingReports]
+          D: 2464099 [DMG]Building Reports for ReadHandler with LastReportGeneration = 0 DirtyGeneration = 0
+          D: 2464107 [DMG]<RE:Run> Cluster 35, Attribute 3c is dirty
+          D: 2464113 [DMG]Reading attribute: Cluster=0x0000_0035 Endpoint=0 AttributeId=0x0000_003C (expanded=0)
+          D: 2464124 [DMG]<RE> Sending report (payload has 40 bytes)...
       disabled: true
 
     - label: "DUT reads OperationalDatasetComponents attribute from TH"
       PICS: DGTHREAD.C.A003d
       verification: |
-          ./chip-tool threadnetworkdiagnostics read operational-dataset-components 65 0
+          ./chip-tool threadnetworkdiagnostics read operational-dataset-components 54 0
 
-          Verify on the TH Log:
+          Verify "OperationalDatasetComponents response" on the TH(All-cluster-app) Log:
 
-
-          [1649825944.956668][3489:3494] CHIP:DMG:        SuppressResponse = true,
-          [1649825944.956730][3489:3494] CHIP:DMG:        InteractionModelRevision = 1
-          [1649825944.956877][3489:3494] CHIP:DMG: }
-          [1649825944.957504][3489:3494] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0035 Attribute 0x0000_003D DataVersion: 2758196590
-          [1649825944.957787][3489:3494] CHIP:TOO:   OperationalDatasetComponents: 1 entries
-          [1649825944.957942][3489:3494] CHIP:TOO:     [1]: {
-          [1649825944.958002][3489:3494] CHIP:TOO:       ActiveTimestampPresent: TRUE
-          [1649825944.958058][3489:3494] CHIP:TOO:       PendingTimestampPresent: FALSE
-          [1649825944.958113][3489:3494] CHIP:TOO:       MasterKeyPresent: TRUE
-          [1649825944.958169][3489:3494] CHIP:TOO:       NetworkNamePresent: TRUE
-          [1649825944.958222][3489:3494] CHIP:TOO:       ExtendedPanIdPresent: TRUE
-          [1649825944.958277][3489:3494] CHIP:TOO:       MeshLocalPrefixPresent: TRUE
-          [1649825944.958330][3489:3494] CHIP:TOO:       DelayPresent: FALSE
-          [1649825944.958480][3489:3494] CHIP:TOO:       PanIdPresent: TRUE
-          [1649825944.958537][3489:3494] CHIP:TOO:       ChannelPresent: TRUE
-          [1649825944.958590][3489:3494] CHIP:TOO:       PskcPresent: TRUE
-          [1649825944.958643][3489:3494] CHIP:TOO:       SecurityPolicyPresent: TRUE
-          [1649825944.958696][3489:3494] CHIP:TOO:       ChannelMaskPresent: TRUE
-          [1649825944.958753][3489:3494] CHIP:TOO:      }
+          D: 2559492 [SC]Allocated SecureSession (0x20002de0) - waiting for Sigma1 msg
+          D: 2559499 [EM]Retransmitting MessageCounter:53367844 on exchange 11177r Send Cnt 1
+          I: 2559507 [IN]Sending unauthenticated msg 0x2000489c with MessageCounter:53367844 to 0x0000000000000000c
+          I: 2559522 [EM]Received message of type 0x2 with protocolId (0, 1) and MessageCounter:72374798 on exchanr
+          D: 2559532 [EM]Handling via exchange: 11178r, Delegate: 0x200070ec
+          D: 2559540 [IM]Received Read request
+          D: 2559544 [DMG]IM RH moving to [GeneratingReports]
+          D: 2559550 [DMG]Building Reports for ReadHandler with LastReportGeneration = 0 DirtyGeneration = 0
+          D: 2559559 [DMG]<RE:Run> Cluster 35, Attribute 3d is dirty
+          D: 2559564 [DMG]Reading attribute: Cluster=0x0000_0035 Endpoint=0 AttributeId=0x0000_003D (expanded=0)
+          D: 2559576 [DMG]<RE> Sending report (payload has 60 bytes)...
       disabled: true
 
     - label: "DUT reads ActiveNetworkFaults attribute value from TH"
       PICS: DGTHREAD.C.A003e
       verification: |
-          ./chip-tool threadnetworkdiagnostics read active-network-faults-list 65 0
+          ./chip-tool threadnetworkdiagnostics read active-network-faults-list 54 0
 
-          Verify on the TH Log:
+          Verify "ActiveNetworkFaultsList response" on the TH(All-cluster-app) Log:
 
-
-          [1649825973.752458][3495:3500] CHIP:DMG:        SuppressResponse = true,
-          [1649825973.752521][3495:3500] CHIP:DMG:        InteractionModelRevision = 1
-          [1649825973.752579][3495:3500] CHIP:DMG: }
-          [1649825973.753523][3495:3500] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0035 Attribute 0x0000_003E DataVersion: 2758196590
-          [1649825973.753679][3495:3500] CHIP:TOO:   ActiveNetworkFaultsList: 4 entries
-          [1649825973.753755][3495:3500] CHIP:TOO:     [1]: 0
-          [1649825973.753819][3495:3500] CHIP:TOO:     [2]: 0
-          [1649825973.753881][3495:3500] CHIP:TOO:     [3]: 0
-          [1649825973.753943][3495:3500] CHIP:TOO:     [4]: 0
+          D: 2608568 [SC]Allocated SecureSession (0x20002d28) - waiting for Sigma1 msg
+          D: 2608575 [EM]Retransmitting MessageCounter:53367848 on exchange 40328r Send Cnt 1
+          I: 2608583 [IN]Sending unauthenticated msg 0x2000489c with MessageCounter:53367848 to 0x0000000000000000c
+          I: 2608598 [EM]Received message of type 0x2 with protocolId (0, 1) and MessageCounter:83976838 on exchanr
+          D: 2608608 [EM]Handling via exchange: 40329r, Delegate: 0x200070ec
+          D: 2608614 [IM]Received Read request
+          D: 2608618 [DMG]IM RH moving to [GeneratingReports]
+          D: 2608625 [DMG]Building Reports for ReadHandler with LastReportGeneration = 0 DirtyGeneration = 0
+          D: 2608633 [DMG]<RE:Run> Cluster 35, Attribute 3e is dirty
+          D: 2608639 [DMG]Reading attribute: Cluster=0x0000_0035 Endpoint=0 AttributeId=0x0000_003E (expanded=0)
+          D: 2608650 [DMG]<RE> Sending report (payload has 148 bytes)...
       disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_DGTHREAD_3_2.yaml b/src/app/tests/suites/certification/Test_TC_DGTHREAD_3_2.yaml
index 2892702..c40933d 100644
--- a/src/app/tests/suites/certification/Test_TC_DGTHREAD_3_2.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DGTHREAD_3_2.yaml
@@ -24,233 +24,319 @@
     endpoint: 0
 
 tests:
+    - label: "Note"
+      verification: |
+          Chip-tool command used below are an example to verify the  DUT as client test cases. For certification test, we expect DUT should have a capability or way to run the equivalent command.
+      disabled: true
+
     - label: "Commission DUT to TH"
       verification: |
-
+          verification step to be updated.
       disabled: true
 
     - label: "DUT reads TxTotalCount attribute value from TH"
       PICS: DGTHREAD.C.A0016
       verification: |
-          ./chip-tool threadnetworkdiagnostics read tx-total-count 65 0
+          ./chip-tool threadnetworkdiagnostics read tx-total-count 54 0
 
-          Verify on the TH Log:
+          Verify "TxTotalCount response" on the TH(All-cluster-app) Log:
 
-          [1649826011.966538][3502:3507] CHIP:DMG:        SuppressResponse = true,
-          [1649826011.966580][3502:3507] CHIP:DMG:        InteractionModelRevision = 1
-          [1649826011.966618][3502:3507] CHIP:DMG: }
-          [1649826011.966832][3502:3507] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0035 Attribute 0x0000_0016 DataVersion: 2758196590
-          [1649826011.966933][3502:3507] CHIP:TOO:   TxTotalCount: 432
+          D: 2843340 [SC]Allocated SecureSession (0x20002e98) - waiting for Sigma1 msg
+          I: 2843348 [EM]Received message of type 0x2 with protocolId (0, 1) and MessageCounter:148275633 on exchar
+          D: 2843358 [EM]Handling via exchange: 4328r, Delegate: 0x200070ec
+          D: 2843364 [IM]Received Read request
+          D: 2843369 [DMG]IM RH moving to [GeneratingReports]
+          D: 2843374 [EM]Retransmitting MessageCounter:53367852 on exchange 4327r Send Cnt 1
+          I: 2843382 [IN]Sending unauthenticated msg 0x2000489c with MessageCounter:53367852 to 0x0000000000000000c
+          D: 2843396 [DMG]Building Reports for ReadHandler with LastReportGeneration = 0 DirtyGeneration = 0
+          D: 2843405 [DMG]<RE:Run> Cluster 35, Attribute 16 is dirty
+          D: 2843412 [DMG]Reading attribute: Cluster=0x0000_0035 Endpoint=0 AttributeId=0x0000_0016 (expanded=0)
+          D: 2843421 [DMG]<RE> Sending report (payload has 37 bytes)...
       disabled: true
 
     - label: "DUT reads TxUnicastCount attribute value from TH"
       PICS: DGTHREAD.C.A0017
       verification: |
-          ./chip-tool threadnetworkdiagnostics read tx-unicast-count 65 0
+          ./chip-tool threadnetworkdiagnostics read tx-unicast-count 54 0
 
-          Verify on the TH Log:
+          Verify "TxUnicastCount response" on the TH(All-cluster-app) Log:
 
-          [1649826032.959906][3511:3516] CHIP:DMG:        SuppressResponse = true,
-          [1649826032.959968][3511:3516] CHIP:DMG:        InteractionModelRevision = 1
-          [1649826032.960025][3511:3516] CHIP:DMG: }
-          [1649826032.960325][3511:3516] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0035 Attribute 0x0000_0017 DataVersion: 2758196590
-          [1649826032.960575][3511:3516] CHIP:TOO:   TxUnicastCount: 439
+          D: 3036505 [SC]Allocated SecureSession (0x20002f50) - waiting for Sigma1 msg
+          I: 3036513 [EM]Received message of type 0x2 with protocolId (0, 1) and MessageCounter:134883675 on exchar
+          D: 3036523 [EM]Handling via exchange: 50096r, Delegate: 0x200070ec
+          D: 3036529 [IM]Received Read request
+          D: 3036533 [DMG]IM RH moving to [GeneratingReports]
+          D: 3036538 [DMG]Building Reports for ReadHandler with LastReportGeneration = 0 DirtyGeneration = 0
+          D: 3036546 [DMG]<RE:Run> Cluster 35, Attribute 17 is dirty
+          D: 3036552 [DMG]Reading attribute: Cluster=0x0000_0035 Endpoint=0 AttributeId=0x0000_0017 (expanded=0)
+          D: 3036563 [DMG]<RE> Sending report (payload has 37 bytes)...
       disabled: true
 
     - label: "DUT reads TxBroadcastCount attribute value from TH"
       PICS: DGTHREAD.C.A0018
       verification: |
-          ./chip-tool threadnetworkdiagnostics read tx-broadcast-count 65 0
+          ./chip-tool threadnetworkdiagnostics read tx-broadcast-count 54 0
 
-          Verify on the TH Log:
+          Verify "TxBroadcastCount response" on the TH(All-cluster-app) Log:
 
-          [1649826061.534516][3519:3524] CHIP:DMG:        SuppressResponse = true,
-          [1649826061.534579][3519:3524] CHIP:DMG:        InteractionModelRevision = 1
-          [1649826061.534636][3519:3524] CHIP:DMG: }
-          [1649826061.534936][3519:3524] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0035 Attribute 0x0000_0018 DataVersion: 2758196590
-          [1649826061.535078][3519:3524] CHIP:TOO:   TxBroadcastCount: 4
+          I: 3080325 [IN]Sending unauthenticated msg 0x2000489c with MessageCounter:53367860 to 0x0000000000000000c
+          I: 3080339 [EM]Received message of type 0x2 with protocolId (0, 1) and MessageCounter:187366260 on exchar
+          D: 3080349 [EM]Handling via exchange: 4630r, Delegate: 0x200070ec
+          D: 3080357 [IM]Received Read request
+          D: 3080362 [DMG]IM RH moving to [GeneratingReports]
+          D: 3080367 [DMG]Building Reports for ReadHandler with LastReportGeneration = 0 DirtyGeneration = 0
+          D: 3080377 [DMG]<RE:Run> Cluster 35, Attribute 18 is dirty
+          D: 3080382 [DMG]Reading attribute: Cluster=0x0000_0035 Endpoint=0 AttributeId=0x0000_0018 (expanded=0)
+          D: 3080391 [DMG]<RE> Sending report (payload has 36 bytes)...
       disabled: true
 
     - label: "DUT reads TxAckRequestedCount attribute value from TH"
       PICS: DGTHREAD.C.A0019
       verification: |
-          ./chip-tool threadnetworkdiagnostics read tx-ack-requested-count 65 0
+          ./chip-tool threadnetworkdiagnostics read tx-ack-requested-count 54 0
 
-          Verify on the TH Log:
+          Verify "TxAckRequestedCount response" on the TH(All-cluster-app) Log:
 
-          [1649826091.335485][3525:3530] CHIP:DMG:        SuppressResponse = true,
-          [1649826091.335549][3525:3530] CHIP:DMG:        InteractionModelRevision = 1
-          [1649826091.335607][3525:3530] CHIP:DMG: }
-          [1649826091.335905][3525:3530] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0035 Attribute 0x0000_0019 DataVersion: 2758196590
-          [1649826091.336042][3525:3530] CHIP:TOO:   TxAckRequestedCount: 461
+          I: 3120921 [IN]Sending unauthenticated msg 0x2000489c with MessageCounter:53367864 to 0x0000000000000000c
+          I: 3120937 [EM]Received message of type 0x2 with protocolId (0, 1) and MessageCounter:2317510 on exchangr
+          D: 3120947 [EM]Handling via exchange: 48251r, Delegate: 0x200070ec
+          D: 3120954 [IM]Received Read request
+          D: 3120959 [DMG]IM RH moving to [GeneratingReports]
+          D: 3120964 [DMG]Building Reports for ReadHandler with LastReportGeneration = 0 DirtyGeneration = 0
+          D: 3120973 [DMG]<RE:Run> Cluster 35, Attribute 19 is dirty
+          D: 3120978 [DMG]Reading attribute: Cluster=0x0000_0035 Endpoint=0 AttributeId=0x0000_0019 (expanded=0)
+          D: 3120988 [DMG]<RE> Sending report (payload has 37 bytes)...
       disabled: true
 
     - label: "DUT reads TxAckedCount attribute value from TH"
       PICS: DGTHREAD.C.A001a
       verification: |
-          ./chip-tool threadnetworkdiagnostics read tx-acked-count 65 0
+          ./chip-tool threadnetworkdiagnostics read tx-acked-count 54 0
 
-          Verify on the TH Log:
+          Verify "TxAckedCount response" on the TH(All-cluster-app) Log:
 
-          [1649826121.430757][3534:3539] CHIP:DMG:        SuppressResponse = true,
-          [1649826121.430799][3534:3539] CHIP:DMG:        InteractionModelRevision = 1
-          [1649826121.430837][3534:3539] CHIP:DMG: }
-          [1649826121.431047][3534:3539] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0035 Attribute 0x0000_001A DataVersion: 2758196590
-          [1649826121.431144][3534:3539] CHIP:TOO:   TxAckedCount: 462
+          D: 3176183 [SC]Allocated SecureSession (0x20003178) - waiting for Sigma1 msg
+          I: 3176190 [EM]Received message of type 0x2 with protocolId (0, 1) and MessageCounter:96627054 on exchanr
+          D: 3176200 [EM]Handling via exchange: 13382r, Delegate: 0x200070ec
+          D: 3176206 [IM]Received Read request
+          D: 3176210 [DMG]IM RH moving to [GeneratingReports]
+          D: 3176217 [DMG]Building Reports for ReadHandler with LastReportGeneration = 0 DirtyGeneration = 0
+          D: 3176226 [DMG]<RE:Run> Cluster 35, Attribute 1a is dirty
+          D: 3176232 [DMG]Reading attribute: Cluster=0x0000_0035 Endpoint=0 AttributeId=0x0000_001A (expanded=0)
+          D: 3176241 [DMG]<RE> Sending report (payload has 37 bytes)...
       disabled: true
 
     - label: "DUT reads TxNoAckRequestedCount attribute value from TH"
       PICS: DGTHREAD.C.A001b
       verification: |
-          ./chip-tool threadnetworkdiagnostics read tx-no-ack-requested-count 65 0
-          Verify on the TH Log:
+          ./chip-tool threadnetworkdiagnostics read tx-no-ack-requested-count 54 0
+          Verify "TxNoAckRequestedCount response" on the TH(All-cluster-app) Log:
 
-          [1649826152.539898][3540:3545] CHIP:DMG:        SuppressResponse = true,
-          [1649826152.539960][3540:3545] CHIP:DMG:        InteractionModelRevision = 1
-          [1649826152.540017][3540:3545] CHIP:DMG: }
-          [1649826152.540314][3540:3545] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0035 Attribute 0x0000_001B DataVersion: 2758196590
-          [1649826152.540550][3540:3545] CHIP:TOO:   TxNoAckRequestedCount: 4
+          D: 3223768 [SC]Allocated SecureSession (0x20003230) - waiting for Sigma1 msg
+          I: 3223776 [EM]Received message of type 0x2 with protocolId (0, 1) and MessageCounter:222085508 on exchar
+          D: 3223786 [EM]Handling via exchange: 38957r, Delegate: 0x200070ec
+          D: 3223792 [IM]Received Read request
+          D: 3223796 [DMG]IM RH moving to [GeneratingReports]
+          D: 3223801 [DMG]Building Reports for ReadHandler with LastReportGeneration = 0 DirtyGeneration = 0
+          D: 3223809 [DMG]<RE:Run> Cluster 35, Attribute 1b is dirty
+          D: 3223815 [DMG]Reading attribute: Cluster=0x0000_0035 Endpoint=0 AttributeId=0x0000_001B (expanded=0)
+          D: 3223824 [DMG]<RE> Sending report (payload has 36 bytes)...
       disabled: true
 
     - label: "DUT reads TxDataCount attribute value from TH"
       PICS: DGTHREAD.C.A001c
       verification: |
-          ./chip-tool threadnetworkdiagnostics read tx-data-count 65 0
-          Verify on the TH Log:
+          ./chip-tool threadnetworkdiagnostics read tx-data-count 54 0
+          Verify "TxDataCount response" on the TH(All-cluster-app) Log:
 
-          [1649826184.869528][3547:3552] CHIP:DMG:        SuppressResponse = true,
-          [1649826184.869589][3547:3552] CHIP:DMG:        InteractionModelRevision = 1
-          [1649826184.869646][3547:3552] CHIP:DMG: }
-          [1649826184.869951][3547:3552] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0035 Attribute 0x0000_001C DataVersion: 2758196590
-          [1649826184.870089][3547:3552] CHIP:TOO:   TxDataCount: 503
+          D: 3259870 [SC]Allocated SecureSession (0x200032e8) - waiting for Sigma1 msg
+          I: 3259878 [EM]Received message of type 0x2 with protocolId (0, 1) and MessageCounter:111520680 on exchar
+          D: 3259888 [EM]Handling via exchange: 55695r, Delegate: 0x200070ec
+          D: 3259894 [IM]Received Read request
+          D: 3259898 [DMG]IM RH moving to [GeneratingReports]
+          D: 3259903 [EM]Retransmitting MessageCounter:53367876 on exchange 55694r Send Cnt 1
+          I: 3259911 [IN]Sending unauthenticated msg 0x2000489c with MessageCounter:53367876 to 0x0000000000000000c
+          D: 3259925 [DMG]Building Reports for ReadHandler with LastReportGeneration = 0 DirtyGeneration = 0
+          D: 3259934 [DMG]<RE:Run> Cluster 35, Attribute 1c is dirty
+          D: 3259941 [DMG]Reading attribute: Cluster=0x0000_0035 Endpoint=0 AttributeId=0x0000_001C (expanded=0)
+          D: 3259951 [DMG]<RE> Sending report (payload has 37 bytes)...
       disabled: true
 
     - label: "DUT reads TxDataPollCount attribute value from TH"
       PICS: DGTHREAD.C.A001d
       verification: |
-          ./chip-tool threadnetworkdiagnostics read tx-data-poll-count 65 0
-          Verify on the TH Log:
+          ./chip-tool threadnetworkdiagnostics read tx-data-poll-count 54 0
+          Verify "TxDataPollCount response" on the TH(All-cluster-app) Log:
 
-          [1649826215.573121][3553:3558] CHIP:DMG:        SuppressResponse = true,
-          [1649826215.573185][3553:3558] CHIP:DMG:        InteractionModelRevision = 1
-          [1649826215.573242][3553:3558] CHIP:DMG: }
-          [1649826215.573541][3553:3558] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0035 Attribute 0x0000_001D DataVersion: 2758196590
-          [1649826215.573679][3553:3558] CHIP:TOO:   TxDataPollCount: 0
+          D: 3325107 [SC]Allocated SecureSession (0x200033a0) - waiting for Sigma1 msg
+          I: 3325115 [EM]Received message of type 0x2 with protocolId (0, 1) and MessageCounter:39487161 on exchanr
+          D: 3325125 [EM]Handling via exchange: 61775r, Delegate: 0x200070ec
+          D: 3325131 [IM]Received Read request
+          D: 3325135 [DMG]IM RH moving to [GeneratingReports]
+          D: 3325140 [EM]Retransmitting MessageCounter:53367880 on exchange 61774r Send Cnt 1
+          I: 3325148 [IN]Sending unauthenticated msg 0x2000489c with MessageCounter:53367880 to 0x0000000000000000c
+          D: 3325163 [DMG]Building Reports for ReadHandler with LastReportGeneration = 0 DirtyGeneration = 0
+          D: 3325173 [DMG]<RE:Run> Cluster 35, Attribute 1d is dirty
+          D: 3325179 [DMG]Reading attribute: Cluster=0x0000_0035 Endpoint=0 AttributeId=0x0000_001D (expanded=0)
+          D: 3325189 [DMG]<RE> Sending report (payload has 36 bytes)...
       disabled: true
 
     - label: "DUT reads TxBeaconCount attribute value from TH"
       PICS: DGTHREAD.C.A001e
       verification: |
-          ./chip-tool threadnetworkdiagnostics read tx-beacon-count 65 0
-           Verify on the TH Log:
+          ./chip-tool threadnetworkdiagnostics read tx-beacon-count 54 0
+           Verify "TxBeaconCount response" on the TH(All-cluster-app) Log:
 
-          [1649826252.581671][3561:3566] CHIP:DMG:        SuppressResponse = true,
-          [1649826252.581733][3561:3566] CHIP:DMG:        InteractionModelRevision = 1
-          [1649826252.581789][3561:3566] CHIP:DMG: }
-          [1649826252.582088][3561:3566] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0035 Attribute 0x0000_001E DataVersion: 2758196590
-          [1649826252.582224][3561:3566] CHIP:TOO:   TxBeaconCount: 0
+          D: 3354772 [SC]Allocated SecureSession (0x20003458) - waiting for Sigma1 msg
+          D: 3354779 [EM]Retransmitting MessageCounter:53367884 on exchange 50547r Send Cnt 1
+          I: 3354786 [IN]Sending unauthenticated msg 0x2000489c with MessageCounter:53367884 to 0x0000000000000000c
+          I: 3354801 [EM]Received message of type 0x2 with protocolId (0, 1) and MessageCounter:80147352 on exchanr
+          D: 3354811 [EM]Handling via exchange: 50548r, Delegate: 0x200070ec
+          D: 3354818 [IM]Received Read request
+          D: 3354822 [DMG]IM RH moving to [GeneratingReports]
+          D: 3354828 [DMG]Building Reports for ReadHandler with LastReportGeneration = 0 DirtyGeneration = 0
+          D: 3354837 [DMG]<RE:Run> Cluster 35, Attribute 1e is dirty
+          D: 3354842 [DMG]Reading attribute: Cluster=0x0000_0035 Endpoint=0 AttributeId=0x0000_001E (expanded=0)
+          D: 3354853 [DMG]<RE> Sending report (payload has 36 bytes)...
       disabled: true
 
     - label: "DUT reads TxBeaconRequestCount attribute value from TH"
       PICS: DGTHREAD.C.A001f
       verification: |
-          ./chip-tool threadnetworkdiagnostics read tx-beacon-request-count 65 0
-          Verify on the TH Log:
+          ./chip-tool threadnetworkdiagnostics read tx-beacon-request-count 54 0
+          Verify "TxBeaconRequestCount response" on the TH(All-cluster-app) Log:
 
-          [1649826283.345936][3568:3573] CHIP:DMG:        SuppressResponse = true,
-          [1649826283.345998][3568:3573] CHIP:DMG:        InteractionModelRevision = 1
-          [1649826283.346055][3568:3573] CHIP:DMG: }
-          [1649826283.346357][3568:3573] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0035 Attribute 0x0000_001F DataVersion: 2758196590
-          [1649826283.346499][3568:3573] CHIP:TOO:   TxBeaconRequestCount: 0
+          D: 3383318 [SC]Allocated SecureSession (0x20003510) - waiting for Sigma1 msg
+          I: 3383326 [EM]Received message of type 0x2 with protocolId (0, 1) and MessageCounter:29889571 on exchanr
+          D: 3383338 [EM]Handling via exchange: 53268r, Delegate: 0x200070ec
+          D: 3383344 [IM]Received Read request
+          D: 3383348 [DMG]IM RH moving to [GeneratingReports]
+          D: 3383353 [EM]Retransmitting MessageCounter:53367888 on exchange 53267r Send Cnt 1
+          I: 3383360 [IN]Sending unauthenticated msg 0x2000489c with MessageCounter:53367888 to 0x0000000000000000c
+          D: 3383374 [DMG]Building Reports for ReadHandler with LastReportGeneration = 0 DirtyGeneration = 0
+          D: 3383383 [DMG]<RE:Run> Cluster 35, Attribute 1f is dirty
+          D: 3383389 [DMG]Reading attribute: Cluster=0x0000_0035 Endpoint=0 AttributeId=0x0000_001F (expanded=0)
+          D: 3383400 [DMG]<RE> Sending report (payload has 36 bytes)...
       disabled: true
 
     - label: "DUT reads TxOtherCount attribute value from TH"
       PICS: DGTHREAD.C.A0020
       verification: |
-          ./chip-tool threadnetworkdiagnostics read tx-other-count 65 0
-          Verify on the TH Log:
+          ./chip-tool threadnetworkdiagnostics read tx-other-count 54 0
+          Verify "TxOtherCount response" on the TH(All-cluster-app) Log:
 
-          [1649826328.386892][3574:3579] CHIP:DMG:        SuppressResponse = true,
-          [1649826328.386953][3574:3579] CHIP:DMG:        InteractionModelRevision = 1
-          [1649826328.387010][3574:3579] CHIP:DMG: }
-          [1649826328.387310][3574:3579] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0035 Attribute 0x0000_0020 DataVersion: 2758196590
-          [1649826328.387453][3574:3579] CHIP:TOO:   TxOtherCount: 0
+          D: 3549567 [SC]Allocated SecureSession (0x200035c8) - waiting for Sigma1 msg
+          I: 3549574 [EM]Received message of type 0x2 with protocolId (0, 1) and MessageCounter:196573482 on exchar
+          D: 3549585 [EM]Handling via exchange: 49239r, Delegate: 0x200070ec
+          D: 3549591 [IM]Received Read request
+          D: 3549595 [DMG]IM RH moving to [GeneratingReports]
+          D: 3549599 [DMG]Building Reports for ReadHandler with LastReportGeneration = 0 DirtyGeneration = 0
+          D: 3549608 [DMG]<RE:Run> Cluster 35, Attribute 20 is dirty
+          D: 3549613 [DMG]Reading attribute: Cluster=0x0000_0035 Endpoint=0 AttributeId=0x0000_0020 (expanded=0)
+          D: 3549623 [DMG]<RE> Sending report (payload has 36 bytes)...
       disabled: true
 
     - label: "DUT reads TxRetryCount attribute value from TH"
       PICS: DGTHREAD.C.A0021
       verification: |
-          ./chip-tool threadnetworkdiagnostics read tx-retry-count 65 0
-          Verify on the TH Log:
+          ./chip-tool threadnetworkdiagnostics read tx-retry-count 54 0
+          Verify "TxRetryCount response" on the TH(All-cluster-app) Log:
 
-          [1649826365.526774][3584:3589] CHIP:DMG:        SuppressResponse = true,
-          [1649826365.526838][3584:3589] CHIP:DMG:        InteractionModelRevision = 1
-          [1649826365.526915][3584:3589] CHIP:DMG: }
-          [1649826365.527258][3584:3589] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0035 Attribute 0x0000_0021 DataVersion: 2758196590
-          [1649826365.527400][3584:3589] CHIP:TOO:   TxRetryCount: 986
+          D: 3579614 [SC]Allocated SecureSession (0x20003680) - waiting for Sigma1 msg
+          I: 3579622 [EM]Received message of type 0x2 with protocolId (0, 1) and MessageCounter:236977137 on exchar
+          D: 3579632 [EM]Handling via exchange: 26757r, Delegate: 0x200070ec
+          D: 3579638 [IM]Received Read request
+          D: 3579642 [DMG]IM RH moving to [GeneratingReports]
+          D: 3579647 [EM]Retransmitting MessageCounter:53367896 on exchange 26756r Send Cnt 1
+          I: 3579654 [IN]Sending unauthenticated msg 0x2000489c with MessageCounter:53367896 to 0x0000000000000000c
+          D: 3579669 [DMG]Building Reports for ReadHandler with LastReportGeneration = 0 DirtyGeneration = 0
+          D: 3579678 [DMG]<RE:Run> Cluster 35, Attribute 21 is dirty
+          D: 3579684 [DMG]Reading attribute: Cluster=0x0000_0035 Endpoint=0 AttributeId=0x0000_0021 (expanded=0)
+          D: 3579695 [DMG]<RE> Sending report (payload has 36 bytes)...
       disabled: true
 
     - label: "DUT reads TxDirectMaxRetryExpiryCount attribute value from TH"
       PICS: DGTHREAD.C.A0022
       verification: |
-          ./chip-tool threadnetworkdiagnostics read tx-direct-max-retry-expiry-count 65 0
-           Verify on the TH Log:
+          ./chip-tool threadnetworkdiagnostics read tx-direct-max-retry-expiry-count 54 0
+           Verify "TxDirectMaxRetryExpiryCount response" on the TH(All-cluster-app) Log:
 
-          [1649826396.738205][3590:3595] CHIP:DMG:        SuppressResponse = true,
-          [1649826396.738269][3590:3595] CHIP:DMG:        InteractionModelRevision = 1
-          [1649826396.738353][3590:3595] CHIP:DMG: }
-          [1649826396.738698][3590:3595] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0035 Attribute 0x0000_0022 DataVersion: 2758196590
-          [1649826396.738841][3590:3595] CHIP:TOO:   TxDirectMaxRetryExpiryCount: 15
+          D: 3783161 [SC]Allocated SecureSession (0x20003738) - waiting for Sigma1 msg
+          I: 3783169 [EM]Received message of type 0x2 with protocolId (0, 1) and MessageCounter:218163522 on exchar
+          D: 3783179 [EM]Handling via exchange: 24150r, Delegate: 0x200070ec
+          D: 3783185 [IM]Received Read request
+          D: 3783189 [DMG]IM RH moving to [GeneratingReports]
+          D: 3783194 [DMG]Building Reports for ReadHandler with LastReportGeneration = 0 DirtyGeneration = 0
+          D: 3783202 [DMG]<RE:Run> Cluster 35, Attribute 22 is dirty
+          D: 3783208 [DMG]Reading attribute: Cluster=0x0000_0035 Endpoint=0 AttributeId=0x0000_0022 (expanded=0)
+          D: 3783217 [DMG]<RE> Sending report (payload has 36 bytes)...
       disabled: true
 
     - label: "DUT reads TxIndirectMaxRetryExpiryCount attribute value from TH"
       PICS: DGTHREAD.C.A0023
       verification: |
-          ./chip-tool threadnetworkdiagnostics read tx-indirect-max-retry-expiry-count 65 0
-          Verify on the TH Log:
+          ./chip-tool threadnetworkdiagnostics read tx-indirect-max-retry-expiry-count 54 0
+          Verify "TxIndirectMaxRetryExpiryCount response" on the TH(All-cluster-app) Log:
 
-          [1649826428.732746][3598:3603] CHIP:DMG:        SuppressResponse = true,
-          [1649826428.732810][3598:3603] CHIP:DMG:        InteractionModelRevision = 1
-          [1649826428.732868][3598:3603] CHIP:DMG: }
-          [1649826428.733168][3598:3603] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0035 Attribute 0x0000_0023 DataVersion: 2758196590
-          [1649826428.733307][3598:3603] CHIP:TOO:   TxIndirectMaxRetryExpiryCount: 0
+          D: 3821837 [SC]Allocated SecureSession (0x200037f0) - waiting for Sigma1 msg
+          I: 3821844 [EM]Received message of type 0x2 with protocolId (0, 1) and MessageCounter:265981625 on exchar
+          D: 3821855 [EM]Handling via exchange: 43311r, Delegate: 0x200070ec
+          D: 3821860 [IM]Received Read request
+          D: 3821864 [DMG]IM RH moving to [GeneratingReports]
+          D: 3821869 [EM]Retransmitting MessageCounter:53367904 on exchange 43310r Send Cnt 1
+          I: 3821877 [IN]Sending unauthenticated msg 0x2000489c with MessageCounter:53367904 to 0x0000000000000000c
+          D: 3821891 [DMG]Building Reports for ReadHandler with LastReportGeneration = 0 DirtyGeneration = 0
+          D: 3821900 [DMG]<RE:Run> Cluster 35, Attribute 23 is dirty
+          D: 3821907 [DMG]Reading attribute: Cluster=0x0000_0035 Endpoint=0 AttributeId=0x0000_0023 (expanded=0)
+          D: 3821917 [DMG]<RE> Sending report (payload has 36 bytes)...
       disabled: true
 
     - label: "DUT reads TxErrCcaCount attribute value from TH"
       PICS: DGTHREAD.C.A0024
       verification: |
-          ./chip-tool threadnetworkdiagnostics read tx-err-cca-count 65 0
-          Verify on the TH Log:
-
-          [1649826459.644117][3606:3611] CHIP:DMG:        SuppressResponse = true,
-          [1649826459.644179][3606:3611] CHIP:DMG:        InteractionModelRevision = 1
-          [1649826459.644236][3606:3611] CHIP:DMG: }
-          [1649826459.644572][3606:3611] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0035 Attribute 0x0000_0024 DataVersion: 2758196590
-          [1649826459.644713][3606:3611] CHIP:TOO:   TxErrCcaCount: 8
+          ./chip-tool threadnetworkdiagnostics read tx-err-cca-count 54 0
+          Verify "TxErrCcaCount response" on the TH(All-cluster-app) Log:
+          D: 3851430 [SC]Allocated SecureSession (0x20002c70) - waiting for Sigma1 msg
+          I: 3851438 [EM]Received message of type 0x2 with protocolId (0, 1) and MessageCounter:99541923 on exchanr
+          D: 3851448 [EM]Handling via exchange: 35297r, Delegate: 0x200070ec
+          D: 3851454 [IM]Received Read request
+          D: 3851458 [DMG]IM RH moving to [GeneratingReports]
+          D: 3851463 [DMG]Building Reports for ReadHandler with LastReportGeneration = 0 DirtyGeneration = 0
+          D: 3851472 [DMG]<RE:Run> Cluster 35, Attribute 24 is dirty
+          D: 3851477 [DMG]Reading attribute: Cluster=0x0000_0035 Endpoint=0 AttributeId=0x0000_0024 (expanded=0)
+          D: 3851486 [DMG]<RE> Sending report (payload has 36 bytes)...
       disabled: true
 
     - label: "DUT reads TxErrAbortCount attribute value from TH"
       PICS: DGTHREAD.C.A0025
       verification: |
-          ./chip-tool threadnetworkdiagnostics read tx-err-abort-count 65 0
-           Verify on the TH Log:
+          ./chip-tool threadnetworkdiagnostics read tx-err-abort-count 54 0
+           Verify "TxErrAbortCount response" on the TH(All-cluster-app) Log:
 
-          [1649826488.510290][3614:3619] CHIP:DMG:        SuppressResponse = true,
-          [1649826488.510353][3614:3619] CHIP:DMG:        InteractionModelRevision = 1
-          [1649826488.510411][3614:3619] CHIP:DMG: }
-          [1649826488.510711][3614:3619] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0035 Attribute 0x0000_0025 DataVersion: 2758196590
-          [1649826488.510848][3614:3619] CHIP:TOO:   TxErrAbortCount: 0
+          I: 3878371 [IN]Sending unauthenticated msg 0x2000489c with MessageCounter:53367912 to 0x0000000000000000c
+          I: 3878386 [EM]Received message of type 0x2 with protocolId (0, 1) and MessageCounter:20729896 on exchanr
+          D: 3878397 [EM]Handling via exchange: 34017r, Delegate: 0x200070ec
+          D: 3878405 [IM]Received Read request
+          D: 3878409 [DMG]IM RH moving to [GeneratingReports]
+          D: 3878414 [DMG]Building Reports for ReadHandler with LastReportGeneration = 0 DirtyGeneration = 0
+          D: 3878422 [DMG]<RE:Run> Cluster 35, Attribute 25 is dirty
+          D: 3878428 [DMG]Reading attribute: Cluster=0x0000_0035 Endpoint=0 AttributeId=0x0000_0025 (expanded=0)
+          D: 3878437 [DMG]<RE> Sending report (payload has 36 bytes)...
       disabled: true
 
     - label: "DUT reads TxErrBusyChannelCount attribute value from TH"
       PICS: DGTHREAD.C.A0026
       verification: |
-          ./chip-tool threadnetworkdiagnostics read tx-err-busy-channel-count 65 0
-          Verify on the TH Log:
+          ./chip-tool threadnetworkdiagnostics read tx-err-busy-channel-count 54 0
+          Verify "TxErrBusyChannelCount response" on the TH(All-cluster-app) Log:
 
-          [1649826519.384125][3621:3626] CHIP:DMG:        SuppressResponse = true,
-          [1649826519.384189][3621:3626] CHIP:DMG:        InteractionModelRevision = 1
-          [1649826519.384269][3621:3626] CHIP:DMG: }
-          [1649826519.384665][3621:3626] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0035 Attribute 0x0000_0026 DataVersion: 2758196590
-          [1649826519.384810][3621:3626] CHIP:TOO:   TxErrBusyChannelCount: 0
+          D: 3925250 [SC]Allocated SecureSession (0x20002d28) - waiting for Sigma1 msg
+          I: 3925257 [EM]Received message of type 0x2 with protocolId (0, 1) and MessageCounter:68236194 on exchanr
+          D: 3925267 [EM]Handling via exchange: 58143r, Delegate: 0x200070ec
+          D: 3925273 [IM]Received Read request
+          D: 3925277 [DMG]IM RH moving to [GeneratingReports]
+          D: 3925282 [DMG]Building Reports for ReadHandler with LastReportGeneration = 0 DirtyGeneration = 0
+          D: 3925292 [DMG]<RE:Run> Cluster 35, Attribute 26 is dirty
+          D: 3925298 [DMG]Reading attribute: Cluster=0x0000_0035 Endpoint=0 AttributeId=0x0000_0026 (expanded=0)
+          D: 3925307 [DMG]<RE> Sending report (payload has 36 bytes)...
       disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_DGTHREAD_3_3.yaml b/src/app/tests/suites/certification/Test_TC_DGTHREAD_3_3.yaml
index ff9d3b9..eac8cbd 100644
--- a/src/app/tests/suites/certification/Test_TC_DGTHREAD_3_3.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DGTHREAD_3_3.yaml
@@ -24,229 +24,311 @@
     endpoint: 0
 
 tests:
+    - label: "Note"
+      verification: |
+          Chip-tool command used below are an example to verify the  DUT as client test cases. For certification test, we expect DUT should have a capability or way to run the equivalent command.
+      disabled: true
+
     - label: "Commission DUT to TH"
       verification: |
-
+          verification step to be updated.
       disabled: true
 
     - label: "DUT reads RxTotalCount attribute value from TH"
       PICS: DGTHREAD.C.A0027
       verification: |
-          ./chip-tool threadnetworkdiagnostics read rx-total-count 65 0
-          Verify on the TH Log:
+          ./chip-tool threadnetworkdiagnostics read rx-total-count 54 0
+          Verify "RxTotalCount response" on the TH(All-cluster-app) Log:
 
-
-          [1649826557.581996][3628:3633] CHIP:DMG:        SuppressResponse = true,
-          [1649826557.582060][3628:3633] CHIP:DMG:        InteractionModelRevision = 1
-          [1649826557.582140][3628:3633] CHIP:DMG: }
-          [1649826557.582440][3628:3633] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0035 Attribute 0x0000_0027 DataVersion: 2758196590
-          [1649826557.582577][3628:3633] CHIP:TOO:   RxTotalCount: 1800
+          D: 4079810 [SC]Allocated SecureSession (0x20002e98) - waiting for Sigma1 msg
+          I: 4079818 [EM]Received message of type 0x2 with protocolId (0, 1) and MessageCounter:21934806 on exchanr
+          D: 4079828 [EM]Handling via exchange: 8058r, Delegate: 0x200070ec
+          D: 4079834 [IM]Received Read request
+          D: 4079838 [DMG]IM RH moving to [GeneratingReports]
+          D: 4079844 [EM]Retransmitting MessageCounter:53367920 on exchange 8057r Send Cnt 1
+          I: 4079852 [IN]Sending unauthenticated msg 0x2000489c with MessageCounter:53367920 to 0x0000000000000000c
+          D: 4079866 [DMG]Building Reports for ReadHandler with LastReportGeneration = 0 DirtyGeneration = 0
+          D: 4079875 [DMG]<RE:Run> Cluster 35, Attribute 27 is dirty
+          D: 4079880 [DMG]Reading attribute: Cluster=0x0000_0035 Endpoint=0 AttributeId=0x0000_0027 (expanded=0)
+          D: 4079890 [DMG]<RE> Sending report (payload has 37 bytes)...
       disabled: true
 
     - label: "DUT reads RxUnicastCount attribute value from TH"
       PICS: DGTHREAD.C.A0028
       verification: |
-          ./chip-tool threadnetworkdiagnostics read rx-unicast-count 65 0
-          Verify on the TH Log:
+          ./chip-tool threadnetworkdiagnostics read rx-unicast-count 54 0
+          Verify "RxUnicastCount response" on the TH(All-cluster-app) Log:
 
-          [1649826579.815407][3637:3642] CHIP:DMG:        SuppressResponse = true,
-          [1649826579.815471][3637:3642] CHIP:DMG:        InteractionModelRevision = 1
-          [1649826579.815528][3637:3642] CHIP:DMG: }
-          [1649826579.815826][3637:3642] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0035 Attribute 0x0000_0028 DataVersion: 2758196590
-          [1649826579.815967][3637:3642] CHIP:TOO:   RxUnicastCount: 1170
+          D: 4108122 [SC]Allocated SecureSession (0x20002f50) - waiting for Sigma1 msg
+          I: 4108130 [EM]Received message of type 0x2 with protocolId (0, 1) and MessageCounter:146842823 on exchar
+          D: 4108140 [EM]Handling via exchange: 31466r, Delegate: 0x200070ec
+          D: 4108146 [IM]Received Read request
+          D: 4108150 [DMG]IM RH moving to [GeneratingReports]
+          D: 4108154 [DMG]Building Reports for ReadHandler with LastReportGeneration = 0 DirtyGeneration = 0
+          D: 4108163 [DMG]<RE:Run> Cluster 35, Attribute 28 is dirty
+          D: 4108168 [DMG]Reading attribute: Cluster=0x0000_0035 Endpoint=0 AttributeId=0x0000_0028 (expanded=0)
+          D: 4108178 [DMG]<RE> Sending report (payload has 37 bytes)...
       disabled: true
 
     - label: "DUT reads RxBroadcastCount attribute value from TH"
       PICS: DGTHREAD.C.A0029
       verification: |
-          ./chip-tool threadnetworkdiagnostics read rx-broadcast-count 65 0
-          Verify on the TH Log:
+          ./chip-tool threadnetworkdiagnostics read rx-broadcast-count 54 0
+          Verify "RxBroadcastCount response" on the TH(All-cluster-app) Log:
 
-          [1649826618.938816][3643:3648] CHIP:DMG:        SuppressResponse = true,
-          [1649826618.938878][3643:3648] CHIP:DMG:        InteractionModelRevision = 1
-          [1649826618.938937][3643:3648] CHIP:DMG: }
-          [1649826618.939235][3643:3648] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0035 Attribute 0x0000_0029 DataVersion: 2758196590
-          [1649826618.939376][3643:3648] CHIP:TOO:   RxBroadcastCount: 91
+          D: 4630447 [SC]Allocated SecureSession (0x20003008) - waiting for Sigma1 msg
+          I: 4630454 [EM]Received message of type 0x2 with protocolId (0, 1) and MessageCounter:32416455 on exchanr
+          D: 4630464 [EM]Handling via exchange: 25526r, Delegate: 0x200070ec
+          D: 4630470 [IM]Received Read request
+          D: 4630474 [DMG]IM RH moving to [GeneratingReports]
+          D: 4630479 [DMG]Building Reports for ReadHandler with LastReportGeneration = 0 DirtyGeneration = 0
+          D: 4630488 [DMG]<RE:Run> Cluster 35, Attribute 29 is dirty
+          D: 4630493 [DMG]Reading attribute: Cluster=0x0000_0035 Endpoint=0 AttributeId=0x0000_0029 (expanded=0)
+          D: 4630502 [DMG]<RE> Sending report (payload has 36 bytes)...
       disabled: true
 
     - label: "DUT reads RxDataCount attribute value from TH"
       PICS: DGTHREAD.C.A002a
       verification: |
-          ./chip-tool threadnetworkdiagnostics read rx-data-count 65 0
-          Verify on the TH Log:
+          ./chip-tool threadnetworkdiagnostics read rx-data-count 54 0
+          Verify "RxDataCount response" on the TH(All-cluster-app) Log:
 
-          [1649826651.375014][3653:3658] CHIP:DMG:        SuppressResponse = true,
-          [1649826651.375076][3653:3658] CHIP:DMG:        InteractionModelRevision = 1
-          [1649826651.375134][3653:3658] CHIP:DMG: }
-          [1649826651.375439][3653:3658] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0035 Attribute 0x0000_002A DataVersion: 2758196590
-          [1649826651.375576][3653:3658] CHIP:TOO:   RxDataCount: 1137
+          D: 5193071 [SC]Allocated SecureSession (0x200030c0) - waiting for Sigma1 msg
+          I: 5193079 [EM]Received message of type 0x2 with protocolId (0, 1) and MessageCounter:49592654 on exchanr
+          D: 5193089 [EM]Handling via exchange: 37413r, Delegate: 0x200070ec
+          D: 5193095 [IM]Received Read request
+          D: 5193099 [DMG]IM RH moving to [GeneratingReports]
+          D: 5193103 [DMG]Building Reports for ReadHandler with LastReportGeneration = 0 DirtyGeneration = 0
+          D: 5193112 [DMG]<RE:Run> Cluster 35, Attribute 2a is dirty
+          D: 5193119 [DMG]Reading attribute: Cluster=0x0000_0035 Endpoint=0 AttributeId=0x0000_002A (expanded=0)
+          D: 5193128 [DMG]<RE> Sending report (payload has 37 bytes)...
       disabled: true
 
     - label: "DUT reads RxDataPollCount attribute value from TH"
       PICS: DGTHREAD.C.A002b
       verification: |
-          ./chip-tool threadnetworkdiagnostics read rx-data-poll-count 65 0
-           Verify on the TH Log:
+          ./chip-tool threadnetworkdiagnostics read rx-data-poll-count 54 0
+           Verify "RxDataPollCount response" on the TH(All-cluster-app) Log:
 
-          [1649826681.548001][3659:3664] CHIP:DMG:        SuppressResponse = true,
-          [1649826681.548086][3659:3664] CHIP:DMG:        InteractionModelRevision = 1
-          [1649826681.548146][3659:3664] CHIP:DMG: }
-          [1649826681.548573][3659:3664] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0035 Attribute 0x0000_002B DataVersion: 2758196590
-          [1649826681.548717][3659:3664] CHIP:TOO:   RxDataPollCount: 0
+          D: 5612663 [SC]Allocated SecureSession (0x20003230) - waiting for Sigma1 msg
+          D: 5612670 [EM]Retransmitting MessageCounter:53367940 on exchange 23136r Send Cnt 1
+          I: 5612678 [IN]Sending unauthenticated msg 0x2000489c with MessageCounter:53367940 to 0x0000000000000000c
+          I: 5612693 [EM]Received message of type 0x2 with protocolId (0, 1) and MessageCounter:94938048 on exchanr
+          D: 5612703 [EM]Handling via exchange: 23137r, Delegate: 0x200070ec
+          D: 5612711 [IM]Received Read request
+          D: 5612716 [DMG]IM RH moving to [GeneratingReports]
+          D: 5612720 [DMG]Building Reports for ReadHandler with LastReportGeneration = 0 DirtyGeneration = 0
+          D: 5612731 [DMG]<RE:Run> Cluster 35, Attribute 2b is dirty
+          D: 5612736 [DMG]Reading attribute: Cluster=0x0000_0035 Endpoint=0 AttributeId=0x0000_002B (expanded=0)
+          D: 5612745 [DMG]<RE> Sending report (payload has 36 bytes)...
       disabled: true
 
     - label: "DUT reads RxBeaconCount attribute value from TH"
       PICS: DGTHREAD.C.A002c
       verification: |
-          ./chip-tool threadnetworkdiagnostics read rx-beacon-count 65 0
-          Verify on the TH Log:
+          ./chip-tool threadnetworkdiagnostics read rx-beacon-count 54 0
+          Verify "RxBeaconCount response" on the TH(All-cluster-app) Log:
 
-          [1649826720.298790][3667:3672] CHIP:DMG:        SuppressResponse = true,
-          [1649826720.298852][3667:3672] CHIP:DMG:        InteractionModelRevision = 1
-          [1649826720.298909][3667:3672] CHIP:DMG: }
-          [1649826720.299210][3667:3672] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0035 Attribute 0x0000_002C DataVersion: 2758196590
-          [1649826720.299349][3667:3672] CHIP:TOO:   RxBeaconCount: 0
+          D: 5685067 [SC]Allocated SecureSession (0x200032e8) - waiting for Sigma1 msg
+          D: 5685074 [EM]Retransmitting MessageCounter:53367944 on exchange 27673r Send Cnt 1
+          I: 5685083 [IN]Sending unauthenticated msg 0x2000489c with MessageCounter:53367944 to 0x0000000000000000c
+          I: 5685098 [EM]Received message of type 0x2 with protocolId (0, 1) and MessageCounter:229974593 on exchar
+          D: 5685108 [EM]Handling via exchange: 27674r, Delegate: 0x200070ec
+          D: 5685115 [IM]Received Read request
+          D: 5685119 [DMG]IM RH moving to [GeneratingReports]
+          D: 5685125 [DMG]Building Reports for ReadHandler with LastReportGeneration = 0 DirtyGeneration = 0
+          D: 5685134 [DMG]<RE:Run> Cluster 35, Attribute 2c is dirty
+          D: 5685139 [DMG]Reading attribute: Cluster=0x0000_0035 Endpoint=0 AttributeId=0x0000_002C (expanded=0)
+          D: 5685148 [DMG]<RE> Sending report (payload has 36 bytes)...
       disabled: true
 
     - label: "DUT reads RxBeaconRequestCount attribute value from TH"
       PICS: DGTHREAD.C.A002d
       verification: |
-          ./chip-tool threadnetworkdiagnostics read rx-beacon-request-count 65 0
-          Verify on the TH Log:
+          ./chip-tool threadnetworkdiagnostics read rx-beacon-request-count 54 0
+          Verify "RxBeaconRequestCount response" on the TH(All-cluster-app) Log:
 
-          [1649826748.246273][3675:3680] CHIP:DMG:        SuppressResponse = true,
-          [1649826748.246337][3675:3680] CHIP:DMG:        InteractionModelRevision = 1
-          [1649826748.246394][3675:3680] CHIP:DMG: }
-          [1649826748.246689][3675:3680] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0035 Attribute 0x0000_002D DataVersion: 2758196590
-          [1649826748.246829][3675:3680] CHIP:TOO:   RxBeaconRequestCount: 0
+          I: 6354933 [IN]Sending unauthenticated msg 0x2000489c with MessageCounter:53367948 to 0x0000000000000000c
+          I: 6354947 [EM]Received message of type 0x2 with protocolId (0, 1) and MessageCounter:189386222 on exchar
+          D: 6354958 [EM]Handling via exchange: 40234r, Delegate: 0x200070ec
+          D: 6354964 [IM]Received Read request
+          D: 6354968 [DMG]IM RH moving to [GeneratingReports]
+          D: 6354974 [DMG]Building Reports for ReadHandler with LastReportGeneration = 0 DirtyGeneration = 0
+          D: 6354983 [DMG]<RE:Run> Cluster 35, Attribute 2d is dirty
+          D: 6354989 [DMG]Reading attribute: Cluster=0x0000_0035 Endpoint=0 AttributeId=0x0000_002D (expanded=0)
+          D: 6354999 [DMG]<RE> Sending report (payload has 36 bytes)...
       disabled: true
 
     - label: "DUT reads RxOtherCount attribute value from TH"
       PICS: DGTHREAD.C.A002e
       verification: |
-          ./chip-tool threadnetworkdiagnostics read rx-other-count 65 0
-          Verify on the TH Log:
+          ./chip-tool threadnetworkdiagnostics read rx-other-count 54 0
+          Verify "RxOtherCount response" on the TH(All-cluster-app) Log:
 
-           [1649826777.590499][3682:3687] CHIP:DMG:        SuppressResponse = true,
-          [1649826777.590561][3682:3687] CHIP:DMG:        InteractionModelRevision = 1
-          [1649826777.590618][3682:3687] CHIP:DMG: }
-          [1649826777.590919][3682:3687] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0035 Attribute 0x0000_002E DataVersion: 2758196590
-          [1649826777.591058][3682:3687] CHIP:TOO:   RxOtherCount: 0
+          D: 6440317 [SC]Allocated SecureSession (0x20003458) - waiting for Sigma1 msg
+          I: 6440325 [EM]Received message of type 0x2 with protocolId (0, 1) and MessageCounter:185096786 on exchar
+          D: 6440335 [EM]Handling via exchange: 54133r, Delegate: 0x200070ec
+          D: 6440341 [IM]Received Read request
+          D: 6440345 [DMG]IM RH moving to [GeneratingReports]
+          D: 6440350 [DMG]Building Reports for ReadHandler with LastReportGeneration = 0 DirtyGeneration = 0
+          D: 6440360 [DMG]<RE:Run> Cluster 35, Attribute 2e is dirty
+          D: 6440366 [DMG]Reading attribute: Cluster=0x0000_0035 Endpoint=0 AttributeId=0x0000_002E (expanded=0)
+          D: 6440375 [DMG]<RE> Sending report (payload has 36 bytes)...
       disabled: true
 
     - label: "DUT reads RxAddressFilteredCount attribute value from TH"
       PICS: DGTHREAD.C.A002f
       verification: |
-          ./chip-tool threadnetworkdiagnostics read rx-address-filtered-count 65 0
-          Verify on the TH Log:
+          ./chip-tool threadnetworkdiagnostics read rx-address-filtered-count 54 0
+          Verify "RxAddressFilteredCount response" on the TH(All-cluster-app) Log:
 
-          [1649826804.387075][3688:3693] CHIP:DMG:        SuppressResponse = true,
-          [1649826804.387139][3688:3693] CHIP:DMG:        InteractionModelRevision = 1
-          [1649826804.387197][3688:3693] CHIP:DMG: }
-          [1649826804.387498][3688:3693] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0035 Attribute 0x0000_002F DataVersion: 2758196590
-          [1649826804.387640][3688:3693] CHIP:TOO:   RxAddressFilteredCount: 0
+          D: 6500252 [SC]Allocated SecureSession (0x20003510) - waiting for Sigma1 msg
+          I: 6500260 [EM]Received message of type 0x2 with protocolId (0, 1) and MessageCounter:17427447 on exchanr
+          D: 6500270 [EM]Handling via exchange: 733r, Delegate: 0x200070ec
+          D: 6500276 [IM]Received Read request
+          D: 6500280 [DMG]IM RH moving to [GeneratingReports]
+          D: 6500284 [DMG]Building Reports for ReadHandler with LastReportGeneration = 0 DirtyGeneration = 0
+          D: 6500293 [DMG]<RE:Run> Cluster 35, Attribute 2f is dirty
+          D: 6500299 [DMG]Reading attribute: Cluster=0x0000_0035 Endpoint=0 AttributeId=0x0000_002F (expanded=0)
+          D: 6500308 [DMG]<RE> Sending report (payload has 36 bytes)...
       disabled: true
 
     - label: "DUT reads RxDestAddrFilteredCount attribute value from TH"
       PICS: DGTHREAD.C.A0030
       verification: |
-          ./chip-tool threadnetworkdiagnostics read rx-dest-addr-filtered-count 65 0
-          Verify on the TH Log:
+          ./chip-tool threadnetworkdiagnostics read rx-dest-addr-filtered-count 54 0
+          Verify "RxDestAddrFilteredCount response" on the TH(All-cluster-app) Log:
 
-          [1649826829.993945][3697:3702] CHIP:DMG:        SuppressResponse = true,
-          [1649826829.994007][3697:3702] CHIP:DMG:        InteractionModelRevision = 1
-          [1649826829.994066][3697:3702] CHIP:DMG: }
-          [1649826829.994369][3697:3702] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0035 Attribute 0x0000_0030 DataVersion: 2758196590
-          [1649826829.994509][3697:3702] CHIP:TOO:   RxDestAddrFilteredCount: 65
+          D: 6546865 [SC]Allocated SecureSession (0x200035c8) - waiting for Sigma1 msg
+          I: 6546873 [EM]Received message of type 0x2 with protocolId (0, 1) and MessageCounter:74235822 on exchanr
+          D: 6546883 [EM]Handling via exchange: 35034r, Delegate: 0x200070ec
+          D: 6546890 [IM]Received Read request
+          D: 6546894 [DMG]IM RH moving to [GeneratingReports]
+          D: 6546899 [DMG]Building Reports for ReadHandler with LastReportGeneration = 0 DirtyGeneration = 0
+          D: 6546908 [DMG]<RE:Run> Cluster 35, Attribute 30 is dirty
+          D: 6546913 [DMG]Reading attribute: Cluster=0x0000_0035 Endpoint=0 AttributeId=0x0000_0030 (expanded=0)
+          D: 6546922 [DMG]<RE> Sending report (payload has 36 bytes)...
       disabled: true
 
     - label: "DUT reads RxDuplicatedCount attribute value from TH"
       PICS: DGTHREAD.C.A0031
       verification: |
-          ./chip-tool threadnetworkdiagnostics read rx-duplicated-count 65 0
-          Verify on the TH Log:
+          ./chip-tool threadnetworkdiagnostics read rx-duplicated-count 54 0
+          Verify "RxDuplicatedCount response" on the TH(All-cluster-app) Log:
 
-          [1649826865.904951][3703:3708] CHIP:DMG:        SuppressResponse = true,
-          [1649826865.905034][3703:3708] CHIP:DMG:        InteractionModelRevision = 1
-          [1649826865.905094][3703:3708] CHIP:DMG: }
-          [1649826865.905397][3703:3708] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0035 Attribute 0x0000_0031 DataVersion: 2758196590
-          [1649826865.905541][3703:3708] CHIP:TOO:   RxDuplicatedCount: 194
+          D: 6599281 [SC]Allocated SecureSession (0x20003680) - waiting for Sigma1 msg
+          I: 6599288 [EM]Received message of type 0x2 with protocolId (0, 1) and MessageCounter:36119403 on exchanr
+          D: 6599298 [EM]Handling via exchange: 9572r, Delegate: 0x200070ec
+          D: 6599304 [IM]Received Read request
+          D: 6599308 [DMG]IM RH moving to [GeneratingReports]
+          D: 6599313 [DMG]Building Reports for ReadHandler with LastReportGeneration = 0 DirtyGeneration = 0
+          D: 6599322 [DMG]<RE:Run> Cluster 35, Attribute 31 is dirty
+          D: 6599327 [DMG]Reading attribute: Cluster=0x0000_0035 Endpoint=0 AttributeId=0x0000_0031 (expanded=0)
+          D: 6599336 [DMG]<RE> Sending report (payload has 36 bytes)...
       disabled: true
 
     - label: "DUT reads RxErrNoFrameCount attribute value from TH"
       PICS: DGTHREAD.C.A0032
       verification: |
-          ./chip-tool threadnetworkdiagnostics read rx-err-no-frame-count 65 0
-          Verify on the TH Log:
+          ./chip-tool threadnetworkdiagnostics read rx-err-no-frame-count 54 0
+          Verify "RxErrNoFrameCount response" on the TH(All-cluster-app) Log:
 
-          [1649826895.919770][3711:3716] CHIP:DMG:        SuppressResponse = true,
-          [1649826895.919832][3711:3716] CHIP:DMG:        InteractionModelRevision = 1
-          [1649826895.919890][3711:3716] CHIP:DMG: }
-          [1649826895.920190][3711:3716] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0035 Attribute 0x0000_0032 DataVersion: 2758196590
-          [1649826895.920328][3711:3716] CHIP:TOO:   RxErrNoFrameCount: 7
+          D: 6634879 [SC]Allocated SecureSession (0x20003738) - waiting for Sigma1 msg
+          D: 6634886 [EM]Retransmitting MessageCounter:53367968 on exchange 23023r Send Cnt 1
+          I: 6634893 [IN]Sending unauthenticated msg 0x2000489c with MessageCounter:53367968 to 0x0000000000000000c
+          I: 6634908 [EM]Received message of type 0x2 with protocolId (0, 1) and MessageCounter:125719359 on exchar
+          D: 6634919 [EM]Handling via exchange: 23024r, Delegate: 0x200070ec
+          D: 6634925 [IM]Received Read request
+          D: 6634931 [DMG]IM RH moving to [GeneratingReports]
+          D: 6634936 [DMG]Building Reports for ReadHandler with LastReportGeneration = 0 DirtyGeneration = 0
+          D: 6634945 [DMG]<RE:Run> Cluster 35, Attribute 32 is dirty
+          D: 6634951 [DMG]Reading attribute: Cluster=0x0000_0035 Endpoint=0 AttributeId=0x0000_0032 (expanded=0)
+          D: 6634962 [DMG]<RE> Sending report (payload has 36 bytes)...
       disabled: true
 
     - label: "DUT reads RxErrUnknownNeighborCount attribute value from TH"
       PICS: DGTHREAD.C.A0033
       verification: |
-          ./chip-tool threadnetworkdiagnostics read rx-err-unknown-neighbor-count 65 0
-          Verify on the TH Log:
+          ./chip-tool threadnetworkdiagnostics read rx-err-unknown-neighbor-count 54 0
+          Verify "RxErrUnknownNeighborCount response" on the TH(All-cluster-app) Log:
 
-          [1649826928.095373][3718:3723] CHIP:DMG:        SuppressResponse = true,
-          [1649826928.095435][3718:3723] CHIP:DMG:        InteractionModelRevision = 1
-          [1649826928.095492][3718:3723] CHIP:DMG: }
-          [1649826928.095796][3718:3723] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0035 Attribute 0x0000_0033 DataVersion: 2758196590
-          [1649826928.095936][3718:3723] CHIP:TOO:   RxErrUnknownNeighborCount: 0
+          D: 6673331 [SC]Allocated SecureSession (0x200037f0) - waiting for Sigma1 msg
+          I: 6673338 [EM]Received message of type 0x2 with protocolId (0, 1) and MessageCounter:5756147 on exchangr
+          D: 6673348 [EM]Handling via exchange: 27489r, Delegate: 0x200070ec
+          D: 6673354 [IM]Received Read request
+          D: 6673358 [DMG]IM RH moving to [GeneratingReports]
+          D: 6673363 [DMG]Building Reports for ReadHandler with LastReportGeneration = 0 DirtyGeneration = 0
+          D: 6673372 [DMG]<RE:Run> Cluster 35, Attribute 33 is dirty
+          D: 6673377 [DMG]Reading attribute: Cluster=0x0000_0035 Endpoint=0 AttributeId=0x0000_0033 (expanded=0)
+          D: 6673386 [DMG]<RE> Sending report (payload has 36 bytes)...
       disabled: true
 
     - label: "DUT reads RxErrInvalidScrAddrCount attribute value from TH"
       PICS: DGTHREAD.C.A0034
       verification: |
-          ./chip-tool threadnetworkdiagnostics read rx-err-invalid-src-addr-count 65 0
-          Verify on the TH Log:
+          ./chip-tool threadnetworkdiagnostics read rx-err-invalid-src-addr-count 54 0
+          Verify "RxErrInvalidSrcAddrCount response" on the TH(All-cluster-app) Log:
 
-          [1649826953.827775][3727:3732] CHIP:DMG:        SuppressResponse = true,
-          [1649826953.827837][3727:3732] CHIP:DMG:        InteractionModelRevision = 1
-          [1649826953.827894][3727:3732] CHIP:DMG: }
-          [1649826953.828197][3727:3732] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0035 Attribute 0x0000_0034 DataVersion: 2758196590
-          [1649826953.828346][3727:3732] CHIP:TOO:   RxErrInvalidSrcAddrCount: 0
+          D: 6729267 [SC]Allocated SecureSession (0x20002c70) - waiting for Sigma1 msg
+          I: 6729275 [EM]Received message of type 0x2 with protocolId (0, 1) and MessageCounter:63567787 on exchanr
+          D: 6729285 [EM]Handling via exchange: 51938r, Delegate: 0x200070ec
+          D: 6729291 [IM]Received Read request
+          D: 6729295 [DMG]IM RH moving to [GeneratingReports]
+          D: 6729300 [EM]Retransmitting MessageCounter:53367976 on exchange 51937r Send Cnt 1
+          I: 6729307 [IN]Sending unauthenticated msg 0x2000489c with MessageCounter:53367976 to 0x0000000000000000c
+          D: 6729321 [DMG]Building Reports for ReadHandler with LastReportGeneration = 0 DirtyGeneration = 0
+          D: 6729332 [DMG]<RE:Run> Cluster 35, Attribute 34 is dirty
+          D: 6729338 [DMG]Reading attribute: Cluster=0x0000_0035 Endpoint=0 AttributeId=0x0000_0034 (expanded=0)
+          D: 6729347 [DMG]<RE> Sending report (payload has 36 bytes)...
       disabled: true
 
     - label: "DUT reads RxErrSecCount attribute value from TH"
       PICS: DGTHREAD.C.A0035
       verification: |
-          ./chip-tool threadnetworkdiagnostics read rx-err-sec-count 65 0
-          Verify on the TH Log:
+          ./chip-tool threadnetworkdiagnostics read rx-err-sec-count 54 0
+          Verify "RxErrSecCount response" on the TH(All-cluster-app) Log:
 
-          [1649826991.014971][3733:3738] CHIP:DMG:        SuppressResponse = true,
-          [1649826991.015035][3733:3738] CHIP:DMG:        InteractionModelRevision = 1
-          [1649826991.015093][3733:3738] CHIP:DMG: }
-          [1649826991.015394][3733:3738] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0035 Attribute 0x0000_0035 DataVersion: 2758196590
-          [1649826991.015534][3733:3738] CHIP:TOO:   RxErrSecCount: 0
+          D: 6776643 [SC]Allocated SecureSession (0x20002de0) - waiting for Sigma1 msg
+          I: 6776651 [EM]Received message of type 0x2 with protocolId (0, 1) and MessageCounter:62796965 on exchanr
+          D: 6776661 [EM]Handling via exchange: 37020r, Delegate: 0x200070ec
+          D: 6776667 [IM]Received Read request
+          D: 6776671 [DMG]IM RH moving to [GeneratingReports]
+          D: 6776676 [DMG]Building Reports for ReadHandler with LastReportGeneration = 0 DirtyGeneration = 0
+          D: 6776685 [DMG]<RE:Run> Cluster 35, Attribute 35 is dirty
+          D: 6776690 [DMG]Reading attribute: Cluster=0x0000_0035 Endpoint=0 AttributeId=0x0000_0035 (expanded=0)
+          D: 6776701 [DMG]<RE> Sending report (payload has 36 bytes)...
       disabled: true
 
     - label: "DUT reads RxErrFcsCount attribute value from TH"
       PICS: DGTHREAD.C.A0036
       verification: |
-          ./chip-tool threadnetworkdiagnostics read rx-err-fcs-count 65 0
-          Verify on the TH Log:
+          ./chip-tool threadnetworkdiagnostics read rx-err-fcs-count 54 0
+          Verify "RxErrFcsCount response" on the TH(All-cluster-app) Log:
 
-           [1649827019.107248][3740:3745] CHIP:DMG:        SuppressResponse = true,
-          [1649827019.107310][3740:3745] CHIP:DMG:        InteractionModelRevision = 1
-          [1649827019.107367][3740:3745] CHIP:DMG: }
-          [1649827019.107664][3740:3745] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0035 Attribute 0x0000_0036 DataVersion: 2758196590
-          [1649827019.107803][3740:3745] CHIP:TOO:   RxErrFcsCount: 674
+          D: 6844438 [SC]Allocated SecureSession (0x20002d28) - waiting for Sigma1 msg
+          I: 6844445 [EM]Received message of type 0x2 with protocolId (0, 1) and MessageCounter:26761069 on exchanr
+          D: 6844455 [EM]Handling via exchange: 326r, Delegate: 0x200070ec
+          D: 6844461 [IM]Received Read request
+          D: 6844465 [DMG]IM RH moving to [GeneratingReports]
+          D: 6844470 [DMG]Building Reports for ReadHandler with LastReportGeneration = 0 DirtyGeneration = 0
+          D: 6844480 [DMG]<RE:Run> Cluster 35, Attribute 36 is dirty
+          D: 6844485 [DMG]Reading attribute: Cluster=0x0000_0035 Endpoint=0 AttributeId=0x0000_0036 (expanded=0)
+          D: 6844495 [DMG]<RE> Sending report (payload has 37 bytes)...
       disabled: true
 
     - label: "DUT reads RxErrOtherCount attribute value from TH"
       PICS: DGTHREAD.C.A0037
       verification: |
-          ./chip-tool threadnetworkdiagnostics read rx-err-other-count 65 0
-          Verify on the TH Log:
+          ./chip-tool threadnetworkdiagnostics read rx-err-other-count 54 0
+          Verify "RxErrOtherCount response" on the TH(All-cluster-app) Log:
 
-          [1649827053.305098][3750:3755] CHIP:DMG:        SuppressResponse = true,
-          [1649827053.305160][3750:3755] CHIP:DMG:        InteractionModelRevision = 1
-          [1649827053.305217][3750:3755] CHIP:DMG: }
-          [1649827053.305513][3750:3755] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0035 Attribute 0x0000_0037 DataVersion: 2758196590
-          [1649827053.305651][3750:3755] CHIP:TOO:   RxErrOtherCount: 5
+          D: 6866596 [SC]Allocated SecureSession (0x20002e98) - waiting for Sigma1 msg
+          I: 6866604 [EM]Received message of type 0x2 with protocolId (0, 1) and MessageCounter:179617390 on exchar
+          D: 6866614 [EM]Handling via exchange: 3843r, Delegate: 0x200070ec
+          D: 6866619 [IM]Received Read request
+          D: 6866623 [DMG]IM RH moving to [GeneratingReports]
+          D: 6866628 [DMG]Building Reports for ReadHandler with LastReportGeneration = 0 DirtyGeneration = 0
+          D: 6866639 [DMG]<RE:Run> Cluster 35, Attribute 37 is dirty
+          D: 6866644 [DMG]Reading attribute: Cluster=0x0000_0035 Endpoint=0 AttributeId=0x0000_0037 (expanded=0)
+          D: 6866653 [DMG]<RE> Sending report (payload has 36 bytes)...
       disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_DGTHREAD_3_4.yaml b/src/app/tests/suites/certification/Test_TC_DGTHREAD_3_4.yaml
index 3c335c6..76cf3cf 100644
--- a/src/app/tests/suites/certification/Test_TC_DGTHREAD_3_4.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DGTHREAD_3_4.yaml
@@ -24,44 +24,62 @@
     endpoint: 0
 
 tests:
+    - label: "Note"
+      verification: |
+          Chip-tool command used below are an example to verify the  DUT as client test cases. For certification test, we expect DUT should have a capability or way to run the equivalent command.
+      disabled: true
+
     - label: "Commission TH to DUT"
       verification: |
-
+          verification step to be updated.
       disabled: true
 
     - label: "DUT sends ResetCounts Command to TH"
       PICS: DGTHREAD.C.C00.Tx
       verification: |
-          ./chip-tool threadnetworkdiagnostics reset-counts 65 0
-          Verify on the TH Log:
+          ./chip-tool threadnetworkdiagnostics reset-counts 54 0
+          Verify "success response"  on the TH(All-cluster-app) Log:
 
-          [1649229224.437208][22196:22201] CHIP:DMG:                                 StatusIB =
-          [1649229224.437366][22196:22201] CHIP:DMG:                                 {
-          [1649229224.437574][22196:22201] CHIP:DMG:                                         status = 0x00 (SUCCESS),
-          [1649229224.437744][22196:22201] CHIP:DMG:                                 },
-          [1649229224.437859][22196:22201] CHIP:DMG:
-          [1649229224.438046][22196:22201] CHIP:DMG:                         },
-          [1649229224.438207][22196:22201] CHIP:DMG:
-          [1649229224.438349][22196:22201] CHIP:DMG:                 },
-          [1649229224.438500][22196:22201] CHIP:DMG:
-          [1649229224.438640][22196:22201] CHIP:DMG:         ],
-          [1649229224.438790][22196:22201] CHIP:DMG:
-          [1649229224.438857][22196:22201] CHIP:DMG:         InteractionModelRevision = 1
-          [1649229224.438998][22196:22201] CHIP:DMG: },
-          [1649229224.439236][22196:22201] CHIP:DMG: Received Command Response Status for Endpoint=0 Cluster=0x0000_0035 Command=0x0000_0000 Status=0x0
-          [1649229224.439461][22196:22201] CHIP:DMG: ICR moving to [AwaitingDe]
-          [1649229224.439668][22196:22201] CHIP:EM: Sending Standalone Ack for MessageCounter:5619016 on exchange 39890i
+          D: 6932849 [SC]Allocated SecureSession (0x20002f50) - waiting for Sigma1 msg
+          I: 6932856 [EM]Received message of type 0x8 with protocolId (0, 1) and MessageCounter:25984238 on exchanr
+          D: 6932866 [EM]Handling via exchange: 5441r, Delegate: 0x200070ec
+          D: 6932873 [DMG]Received command for Endpoint=0 Cluster=0x0000_0035 Command=0x0000_0000
+          D: 6932881 [DMG]ICR moving to [ Preparing]
+          D: 6932884 [DMG]ICR moving to [AddingComm]
+          D: 6932888 [DMG]ICR moving to [AddedComma]
+          D: 6932894 [DMG]Decreasing reference count for CommandHandler, remaining 0
+          I: 6932901 [IN]Prepared secure message 0x200048b4 to 0x000000000001B669 (1)  of type 0x9 and protocolId .
+          I: 6932916 [IN]Sending encrypted msg 0x200048b4 with MessageCounter:151760493 to 0x000000000001B669 (1) c
+          D: 6932930 [DMG]ICR moving to [CommandSen]
+          D: 6932934 [DMG]ICR moving to [AwaitingDe]
+          D: 6932938 [EM]Retransmitting MessageCounter:53367992 on exchange 5440r Send Cnt 1
+          I: 6932946 [IN]Sending unauthenticated msg 0x2000489c with MessageCounter:53367992 to 0x0000000000000000c
+          I: 6932962 [EM]Received message of type 0x10 with protocolId (0, 0) and MessageCounter:229191096 on exchr
+          D: 6932972 [EM]Found matching exchange: 5440r, Delegate: (nil)
+          D: 6932979 [EM]Rxd Ack; Removing MessageCounter:53367992 from Retrans Table on exchange 5440r
+          D: 6932988 [EM]Removed CHIP MessageCounter:53367992 from RetransTable on exchange 5440r
+          D: 6932998 [IN]Received a duplicate message with MessageCounter:25984238 on exchange 5441r
+          I: 6933006 [EM]Received message of type 0x8 with protocolId (0, 1) and MessageCounter:25984238 on exchanr
+          D: 6933016 [EM]Found matching exchange: 5441r, Delegate: (nil)
+          D: 6933022 [EM]Forcing tx of solitary ack for duplicate MessageCounter:25984238 on exchange 5441r
+          D: 6933030 [EM]Sending Standalone Ack for MessageCounter:25984238 on exchange 5441r
       disabled: true
 
     - label: "DUT reads OverrunCount attribute from TH"
       PICS: DGTHREAD.C.A0006
       verification: |
-          ./chip-tool threadnetworkdiagnostics read overrun-count 180 0
-           Verify on the TH Log:
+          ./chip-tool threadnetworkdiagnostics read overrun-count 54 0
+           Verify "OverrunCount response" on the TH(All-cluster-app) Log:
 
-          [1649827143.462761][3767:3772] CHIP:DMG:        SuppressResponse = true,
-          [1649827143.462823][3767:3772] CHIP:DMG:        InteractionModelRevision = 1
-          [1649827143.462880][3767:3772] CHIP:DMG: }
-          [1649827143.463177][3767:3772] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0035 Attribute 0x0000_0006 DataVersion: 2758196590
-          [1649827143.463312][3767:3772] CHIP:TOO:   OverrunCount: 0
+          D: 7011179 [SC]Allocated SecureSession (0x20003008) - waiting for Sigma1 msg
+          I: 7011187 [EM]Received message of type 0x2 with protocolId (0, 1) and MessageCounter:245187273 on exchar
+          D: 7011197 [EM]Handling via exchange: 37861r, Delegate: 0x200070ec
+          D: 7011203 [IM]Received Read request
+          D: 7011207 [DMG]IM RH moving to [GeneratingReports]
+          D: 7011212 [EM]Retransmitting MessageCounter:53367996 on exchange 37860r Send Cnt 1
+          I: 7011219 [IN]Sending unauthenticated msg 0x2000489c with MessageCounter:53367996 to 0x0000000000000000c
+          D: 7011235 [DMG]Building Reports for ReadHandler with LastReportGeneration = 0 DirtyGeneration = 0
+          D: 7011244 [DMG]<RE:Run> Cluster 35, Attribute 6 is dirty
+          D: 7011250 [DMG]Reading attribute: Cluster=0x0000_0035 Endpoint=0 AttributeId=0x0000_0006 (expanded=0)
+          D: 7011260 [DMG]<RE> Sending report (payload has 36 bytes)...
       disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_DGTHREAD_3_5.yaml b/src/app/tests/suites/certification/Test_TC_DGTHREAD_3_5.yaml
index db0eed1..95fb489 100644
--- a/src/app/tests/suites/certification/Test_TC_DGTHREAD_3_5.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DGTHREAD_3_5.yaml
@@ -29,62 +29,53 @@
     - label: "Simulate an Unspecified failure on TH"
       PICS: DGTHREAD.C.E01
       verification: |
-          Not Implemented in CHIP Tool
+          Optional Event so it is not mandatory to verify in v1.0. Pls mark as Not Applicable.
       disabled: true
 
     - label: "Simulate a LinkDown failure on TH"
       PICS: DGTHREAD.C.E01
       verification: |
-          Not Implemented in CHIP Tool
+          Optional Event so it is not mandatory to verify in v1.0. Pls mark as Not Applicable.
       disabled: true
 
     - label: "Simulate a HardwareFailure on TH"
       PICS: DGTHREAD.C.E01
       verification: |
-          Not Implemented in CHIP Tool
+          Optional Event so it is not mandatory to verify in v1.0. Pls mark as Not Applicable.
       disabled: true
 
     - label: "Simulate a NetworkJammed Failure on TH"
       PICS: DGTHREAD.C.E01
       verification: |
-          Not Implemented in CHIP Tool
+          Optional Event so it is not mandatory to verify in v1.0. Pls mark as Not Applicable.
       disabled: true
 
     - label: "Simulate an Unspecified failure on TH"
       PICS: DGTHREAD.C.E01
       verification: |
-          Not Implemented in CHIP Tool
+          Optional Event so it is not mandatory to verify in v1.0. Pls mark as Not Applicable.
       disabled: true
 
     - label: "Simulate a LinkDown failure on TH"
       PICS: DGTHREAD.C.E01
       verification: |
-          Not Implemented in CHIP Tool
+          Optional Event so it is not mandatory to verify in v1.0. Pls mark as Not Applicable.
       disabled: true
 
     - label: "Simulate a HardwareFailure on TH"
       PICS: DGTHREAD.C.E01
       verification: |
-          Not Implemented in CHIP Tool
+          Optional Event so it is not mandatory to verify in v1.0. Pls mark as Not Applicable.
       disabled: true
 
     - label: "Simulate a NetworkJammed Failure on TH"
       PICS: DGTHREAD.C.E01
       verification: |
-          Not Implemented in CHIP Tool
+          Optional Event so it is not mandatory to verify in v1.0. Pls mark as Not Applicable.
       disabled: true
 
     - label: "Simulate disconnecting and reconnecting to a Thread network on TH"
       PICS: DGTHREAD.C.E00
       verification: |
-          ./chip-tool  threadnetworkdiagnostics  read-event connection-status 137 0
-
-          Verify on the TH Log:
-
-          [1651233430.972821][7560:7565] CHIP:DMG: ReportDataMessage =
-          [1651233430.972891][7560:7565] CHIP:DMG: {
-          [1651233430.972950][7560:7565] CHIP:DMG:         SuppressResponse = true,
-          [1651233430.973013][7560:7565] CHIP:DMG:         InteractionModelRevision = 1
-          [1651233430.973070][7560:7565] CHIP:DMG: }
-          [1651233430.973222][7560:7565] CHIP:EM: Sending Standalone Ack for MessageCounter:6424591 on exchange 2503i
+          Optional Event so it is not mandatory to verify in v1.0. Pls mark as Not Applicable.
       disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_DGWIFI_1_1.yaml b/src/app/tests/suites/certification/Test_TC_DGWIFI_1_1.yaml
index 72213b0..3f6060a 100644
--- a/src/app/tests/suites/certification/Test_TC_DGWIFI_1_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DGWIFI_1_1.yaml
@@ -33,7 +33,7 @@
       verification: |
           ./chip-tool wifinetworkdiagnostics read cluster-revision 1 0
 
-          On TH, verify that DUT sends ClusterRevision attribute  value as 1
+          Verify " ClusterRevision " on the TH(Chip-tool) Log:
 
           [1651834623.658618][3910:3916] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0036 Attribute 0x0000_FFFD DataVersion: 2858283115
           [1651834623.658776][3910:3916] CHIP:TOO:   ClusterRevision: 1
@@ -43,7 +43,7 @@
       verification: |
           ./chip-tool wifinetworkdiagnostics read feature-map 1 0
 
-          On TH, verify that DUT sends  FeatureMap attribute value as 0
+          Verify " Featuremap " on the TH(Chip-tool) Log:
 
           [1651834671.432383][3919:3924] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0036 Attribute 0x0000_FFFC DataVersion: 2858283115
           [1651834671.432466][3919:3924] CHIP:TOO:   FeatureMap: 3
@@ -53,7 +53,7 @@
       verification: |
           ./chip-tool wifinetworkdiagnostics read attribute-list 1 0
 
-          On TH, verify that DUT  sends a list of supported attributes
+          Verify " AttributeList " on the TH(Chip-tool) Log:
 
           [1651834734.844051][3928:3933] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0036 Attribute 0x0000_FFFB DataVersion: 2858283115
           [1651834734.844159][3928:3933] CHIP:TOO:   AttributeList: 18 entries
@@ -81,7 +81,7 @@
       verification: |
           ./chip-tool wifinetworkdiagnostics read accepted-command-list 1 0
 
-          On TH, verify that DUT  responds as list of Accepted Command as 1 entries.
+          Verify " AcceptedCommandList " on the TH(Chip-tool) Log:
 
           [1651788161.332422][241228:241233] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0036 Attribute 0x0000_FFF9 DataVersion: 3097381936
           [1651788161.332475][241228:241233] CHIP:TOO:   AcceptedCommandList: 1 entries
@@ -92,7 +92,7 @@
       verification: |
           ./chip-tool wifinetworkdiagnostics read generated-command-list 1 0
 
-          On TH, verify that DUT  responds as list of GeneratedCommandList as 0 entries.
+          Verify " GeneratedCommandList " on the TH(Chip-tool) Log:
 
           [1651788208.608429][241239:241244] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0036 Attribute 0x0000_FFF8 DataVersion: 3097381936
           [1651788208.608490][241239:241244] CHIP:TOO:   GeneratedCommandList: 0 entries
diff --git a/src/app/tests/suites/certification/Test_TC_DGWIFI_2_2.yaml b/src/app/tests/suites/certification/Test_TC_DGWIFI_2_2.yaml
index 1be2db3..facee9e 100644
--- a/src/app/tests/suites/certification/Test_TC_DGWIFI_2_2.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DGWIFI_2_2.yaml
@@ -29,11 +29,11 @@
           dis-association."
       PICS: DGWIFI.S.E00
       verification: |
-          This is an Optional event so its not compulsory to get the expected outcome
+          Disconnection is an optional event so its not compulsory to get the expected outcome
 
           ./chip-tool wifinetworkdiagnostics read-event disconnection 1 0
 
-          Verify on the TH Log:
+          Verify  Disconnection event on the TH Log:
 
           [1655734228.476828][18708:18713] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0036 Event 0x0000_0000
           [1655734228.476890][18708:18713] CHIP:TOO:          Event number: 2
@@ -49,11 +49,11 @@
           dis-association. DUT exhausts all internal retries."
       PICS: DGWIFI.S.E01
       verification: |
-          This is an Optional event so its not compulsory to get the expected outcome
+          AssociationFailure is an Optional event so its not compulsory to get the expected outcome
 
           ./chip-tool wifinetworkdiagnostics read-event association-failure 1 0
 
-          Verify on the TH Log:
+          VerifyAssociationFailure event on the TH Log:
 
            CHIP:DMG: ReportDataMessage =
           [1651574380.297222][8941:8946] CHIP:DMG: {
@@ -66,11 +66,11 @@
     - label: "Disconnect and reconnect node WiFi."
       PICS: DGWIFI.S.E02
       verification: |
-          This is an Optional event so its not compulsory to get the expected outcome
+          ConnectionStatus is an Optional event so its not compulsory to get the expected outcome
 
           ./chip-tool wifinetworkdiagnostics read-event connection-status 1 0
 
-          Verify on the TH Log:
+          Verify ConnectionStatus event on the TH Log:
 
           [1655734276.513474][18731:18736] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0036 Event 0x0000_0002
           [1655734276.513504][18731:18736] CHIP:TOO:          Event number: 3
diff --git a/src/app/tests/suites/certification/Test_TC_DGWIFI_3_1.yaml b/src/app/tests/suites/certification/Test_TC_DGWIFI_3_1.yaml
index c7d9cb2..eb49f9c 100644
--- a/src/app/tests/suites/certification/Test_TC_DGWIFI_3_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DGWIFI_3_1.yaml
@@ -25,6 +25,11 @@
     endpoint: 0
 
 tests:
+    - label: "Note"
+      verification: |
+          Chip-tool command used below are an example to verify the  DUT as client test cases. For certification test, we expect DUT should have a capability or way to run the equivalent command.
+      disabled: true
+
     - label: "Commission TH to DUT"
       verification: |
           verification step to be updated.
@@ -35,11 +40,25 @@
       verification: |
           ./chip-tool wifinetworkdiagnostics read bssid 1 0
 
+          verify the " bssid  Received Read response" on the TH (all-cluster-app) log:
 
-          On DUT as a client side, verify that TH all-clusters-app   bssid value.
-
-          [1650451782.025188][9063:9068] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0036 Attribute 0x0000_0000 DataVersion: 1028539580
-          [1650451782.025262][9063:9068] CHIP:TOO:   bssid:  21020000FFFF
+          [1659959901.791873][4826:4826] CHIP:IM: Received Read request
+          [1659959901.791946][4826:4826] CHIP:DMG: ReadRequestMessage =
+          [1659959901.791970][4826:4826] CHIP:DMG: {
+          [1659959901.791989][4826:4826] CHIP:DMG:         AttributePathIBs =
+          [1659959901.792012][4826:4826] CHIP:DMG:         [
+          [1659959901.792033][4826:4826] CHIP:DMG:                 AttributePathIB =
+          [1659959901.792064][4826:4826] CHIP:DMG:                 {
+          [1659959901.792091][4826:4826] CHIP:DMG:                         Endpoint = 0x0,
+          [1659959901.792121][4826:4826] CHIP:DMG:                         Cluster = 0x36,
+          [1659959901.792151][4826:4826] CHIP:DMG:                         Attribute = 0x0000_0000,
+          [1659959901.792178][4826:4826] CHIP:DMG:                 }
+          [1659959901.792203][4826:4826] CHIP:DMG:
+          [1659959901.792227][4826:4826] CHIP:DMG:         ],
+          [1659959901.792251][4826:4826] CHIP:DMG:
+          [1659959901.792274][4826:4826] CHIP:DMG:         isFabricFiltered = true,
+          [1659959901.792296][4826:4826] CHIP:DMG:         InteractionModelRevision = 1
+          [1659959901.792316][4826:4826] CHIP:DMG: },
       disabled: true
 
     - label: "DUT reads a SecurityType attribute value from TH."
@@ -47,10 +66,25 @@
       verification: |
           ./chip-tool wifinetworkdiagnostics read security-type 1 0
 
-          On DUT as a client side, verify that TH all-clusters-app   security-type value.
+          verify the " security-type  Received Read  response" on the TH (all-cluster-app) log:
 
-          [1650451927.587236][9086:9091] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0036 Attribute 0x0000_0001 DataVersion: 1028539580
-          [1650451927.587329][9086:9091] CHIP:TOO:   SecurityType: 4
+          [1659959989.666920][4826:4826] CHIP:IM: Received Read request
+          [1659959989.667091][4826:4826] CHIP:DMG: ReadRequestMessage =
+          [1659959989.667158][4826:4826] CHIP:DMG: {
+          [1659959989.667214][4826:4826] CHIP:DMG:         AttributePathIBs =
+          [1659959989.667279][4826:4826] CHIP:DMG:         [
+          [1659959989.667342][4826:4826] CHIP:DMG:                 AttributePathIB =
+          [1659959989.667419][4826:4826] CHIP:DMG:                 {
+          [1659959989.667491][4826:4826] CHIP:DMG:                         Endpoint = 0x0,
+          [1659959989.667582][4826:4826] CHIP:DMG:                         Cluster = 0x36,
+          [1659959989.667668][4826:4826] CHIP:DMG:                         Attribute = 0x0000_0001,
+          [1659959989.667746][4826:4826] CHIP:DMG:                 }
+          [1659959989.667817][4826:4826] CHIP:DMG:
+          [1659959989.667881][4826:4826] CHIP:DMG:         ],
+          [1659959989.667950][4826:4826] CHIP:DMG:
+          [1659959989.668017][4826:4826] CHIP:DMG:         isFabricFiltered = true,
+          [1659959989.668082][4826:4826] CHIP:DMG:         InteractionModelRevision = 1
+          [1659959989.668143][4826:4826] CHIP:DMG: },
       disabled: true
 
     - label: "DUT reads a WiFiVersion attribute value from TH."
@@ -58,10 +92,24 @@
       verification: |
           ./chip-tool wifinetworkdiagnostics read wi-fi-version 1 0
 
-          On DUT as a client side, verify that TH all-clusters-app  WiFiVersion value.
-
-          [1650451948.677197][9092:9097] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0036 Attribute 0x0000_0002 DataVersion: 1028539580
-          [1650451948.677299][9092:9097] CHIP:TOO:   WiFiVersion: 3
+          verify the " wi-fi-version Received Read  response" on the TH (all-cluster-app) log:
+          [1659960013.130130][4826:4826] CHIP:IM: Received Read request
+          [1659960013.130211][4826:4826] CHIP:DMG: ReadRequestMessage =
+          [1659960013.130252][4826:4826] CHIP:DMG: {
+          [1659960013.130276][4826:4826] CHIP:DMG:         AttributePathIBs =
+          [1659960013.130303][4826:4826] CHIP:DMG:         [
+          [1659960013.130339][4826:4826] CHIP:DMG:                 AttributePathIB =
+          [1659960013.130371][4826:4826] CHIP:DMG:                 {
+          [1659960013.130413][4826:4826] CHIP:DMG:                         Endpoint = 0x0,
+          [1659960013.130450][4826:4826] CHIP:DMG:                         Cluster = 0x36,
+          [1659960013.130492][4826:4826] CHIP:DMG:                         Attribute = 0x0000_0002,
+          [1659960013.130523][4826:4826] CHIP:DMG:                 }
+          [1659960013.130561][4826:4826] CHIP:DMG:
+          [1659960013.130590][4826:4826] CHIP:DMG:         ],
+          [1659960013.130619][4826:4826] CHIP:DMG:
+          [1659960013.130657][4826:4826] CHIP:DMG:         isFabricFiltered = true,
+          [1659960013.130683][4826:4826] CHIP:DMG:         InteractionModelRevision = 1
+          [1659960013.130716][4826:4826] CHIP:DMG: },
       disabled: true
 
     - label: "DUT reads a ChannelNumber attribute value from TH."
@@ -69,10 +117,25 @@
       verification: |
           ./chip-tool wifinetworkdiagnostics read channel-number 1 0
 
-          On DUT as a client side, verify that TH all-clusters-app  WiFiVersion value.
-
-          [1650451989.021486][9112:9117] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0036 Attribute 0x0000_0003 DataVersion: 1028539580
-          [1650451989.021547][9112:9117] CHIP:TOO:   ChannelNumber: 1
+          verify the " channel-number  Received Read  response" on the TH (all-cluster-app) log:
+          [1659960026.962902][4826:4826] CHIP:IM: Received Read request
+          [1659960026.962973][4826:4826] CHIP:DMG: ReadRequestMessage =
+          [1659960026.963007][4826:4826] CHIP:DMG: {
+          [1659960026.963026][4826:4826] CHIP:DMG:         AttributePathIBs =
+          [1659960026.963058][4826:4826] CHIP:DMG:         [
+          [1659960026.963080][4826:4826] CHIP:DMG:                 AttributePathIB =
+          [1659960026.963111][4826:4826] CHIP:DMG:                 {
+          [1659960026.963143][4826:4826] CHIP:DMG:                         Endpoint = 0x0,
+          [1659960026.963172][4826:4826] CHIP:DMG:                         Cluster = 0x36,
+          [1659960026.963209][4826:4826] CHIP:DMG:                         Attribute = 0x0000_0003,
+          [1659960026.963234][4826:4826] CHIP:DMG:                 }
+          [1659960026.963271][4826:4826] CHIP:DMG:
+          [1659960026.963295][4826:4826] CHIP:DMG:         ],
+          [1659960026.963326][4826:4826] CHIP:DMG:
+          [1659960026.963350][4826:4826] CHIP:DMG:         isFabricFiltered = true,
+          [1659960026.963372][4826:4826] CHIP:DMG:         InteractionModelRevision = 1
+          [1659960026.963400][4826:4826] CHIP:DMG: },
+          [1659960026.963475][4826:4826] CHIP:DMG: IM RH moving to [GeneratingReports]
       disabled: true
 
     - label: "DUT reads a RSSI attribute value from TH."
@@ -80,10 +143,25 @@
       verification: |
           ./chip-tool wifinetworkdiagnostics read rssi 1 0
 
-          On DUT as a client side, verify that TH all-clusters-app  attribute data value is present. If the value is 0, no packet loss was recorded or it was just reset from a node reboot.
+          verify the " rssi  Received Read response" on the TH (all-cluster-app) log:
 
-          [1650452156.130334][9132:9137] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0036 Attribute 0x0000_0004 DataVersion: 1028539580
-          [1650452156.130405][9132:9137] CHIP:TOO:   Rssi: -11
+          [1659960043.760899][4826:4826] CHIP:IM: Received Read request
+          [1659960043.760997][4826:4826] CHIP:DMG: ReadRequestMessage =
+          [1659960043.761024][4826:4826] CHIP:DMG: {
+          [1659960043.761046][4826:4826] CHIP:DMG:         AttributePathIBs =
+          [1659960043.761071][4826:4826] CHIP:DMG:         [
+          [1659960043.761095][4826:4826] CHIP:DMG:                 AttributePathIB =
+          [1659960043.761130][4826:4826] CHIP:DMG:                 {
+          [1659960043.761158][4826:4826] CHIP:DMG:                         Endpoint = 0x0,
+          [1659960043.761188][4826:4826] CHIP:DMG:                         Cluster = 0x36,
+          [1659960043.761219][4826:4826] CHIP:DMG:                         Attribute = 0x0000_0004,
+          [1659960043.761248][4826:4826] CHIP:DMG:                 }
+          [1659960043.761275][4826:4826] CHIP:DMG:
+          [1659960043.761302][4826:4826] CHIP:DMG:         ],
+          [1659960043.761329][4826:4826] CHIP:DMG:
+          [1659960043.761354][4826:4826] CHIP:DMG:         isFabricFiltered = true,
+          [1659960043.761378][4826:4826] CHIP:DMG:         InteractionModelRevision = 1
+          [1659960043.761401][4826:4826] CHIP:DMG: },
       disabled: true
 
     - label: "DUT reads a BeaconLostCount attribute value from TH."
@@ -91,10 +169,24 @@
       verification: |
           ./chip-tool wifinetworkdiagnostics read beacon-lost-count 1 0
 
-          On DUT as a client side, verify that TH all-clusters-app  attribute data value is present. If the value is 0, no packet loss was recorded or it was just reset from a node reboot.
-
-          [1650450239.341208][5252:5257] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0036 Attribute 0x0000_0005 DataVersion: 1626643502
-          [1650450239.341280][5252:5257] CHIP:TOO:   BeaconLostCount: 0
+          verify the " beacon-lost-count Received Read  response" on the TH (all-cluster-app) log:
+          [1659960064.667073][4826:4826] CHIP:IM: Received Read request
+          [1659960064.667144][4826:4826] CHIP:DMG: ReadRequestMessage =
+          [1659960064.667168][4826:4826] CHIP:DMG: {
+          [1659960064.667203][4826:4826] CHIP:DMG:         AttributePathIBs =
+          [1659960064.667227][4826:4826] CHIP:DMG:         [
+          [1659960064.667258][4826:4826] CHIP:DMG:                 AttributePathIB =
+          [1659960064.667290][4826:4826] CHIP:DMG:                 {
+          [1659960064.667325][4826:4826] CHIP:DMG:                         Endpoint = 0x0,
+          [1659960064.667356][4826:4826] CHIP:DMG:                         Cluster = 0x36,
+          [1659960064.667392][4826:4826] CHIP:DMG:                         Attribute = 0x0000_0005,
+          [1659960064.667419][4826:4826] CHIP:DMG:                 }
+          [1659960064.667451][4826:4826] CHIP:DMG:
+          [1659960064.667475][4826:4826] CHIP:DMG:         ],
+          [1659960064.667508][4826:4826] CHIP:DMG:
+          [1659960064.667531][4826:4826] CHIP:DMG:         isFabricFiltered = true,
+          [1659960064.667553][4826:4826] CHIP:DMG:         InteractionModelRevision = 1
+          [1659960064.667580][4826:4826] CHIP:DMG: },
       disabled: true
 
     - label: "DUT reads a BeaconRxCount attribute value from TH."
@@ -102,10 +194,24 @@
       verification: |
           ./chip-tool wifinetworkdiagnostics read beacon-rx-count 1 0
 
-          On DUT as a client side, verify that TH all-clusters-app  attribute data value is present. If the value is 0, no packet loss was recorded or it was just reset from a node reboot.
-
-          [1650454625.960728][9290:9295] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0036 Attribute 0x0000_0006 DataVersion: 1028539580
-          [1650454625.960813][9290:9295] CHIP:TOO:   BeaconRxCount: 0
+          verify the " beacon-rx-count  Received Read  response" on the TH (all-cluster-app) log:
+          [1659960081.979736][4826:4826] CHIP:IM: Received Read request
+          [1659960081.979809][4826:4826] CHIP:DMG: ReadRequestMessage =
+          [1659960081.979832][4826:4826] CHIP:DMG: {
+          [1659960081.979851][4826:4826] CHIP:DMG:         AttributePathIBs =
+          [1659960081.979874][4826:4826] CHIP:DMG:         [
+          [1659960081.979895][4826:4826] CHIP:DMG:                 AttributePathIB =
+          [1659960081.979924][4826:4826] CHIP:DMG:                 {
+          [1659960081.979950][4826:4826] CHIP:DMG:                         Endpoint = 0x0,
+          [1659960081.979979][4826:4826] CHIP:DMG:                         Cluster = 0x36,
+          [1659960081.980007][4826:4826] CHIP:DMG:                         Attribute = 0x0000_0006,
+          [1659960081.980032][4826:4826] CHIP:DMG:                 }
+          [1659960081.980059][4826:4826] CHIP:DMG:
+          [1659960081.980082][4826:4826] CHIP:DMG:         ],
+          [1659960081.980106][4826:4826] CHIP:DMG:
+          [1659960081.980129][4826:4826] CHIP:DMG:         isFabricFiltered = true,
+          [1659960081.980151][4826:4826] CHIP:DMG:         InteractionModelRevision = 1
+          [1659960081.980171][4826:4826] CHIP:DMG: },
       disabled: true
 
     - label: "DUT reads a PacketMultiRxCount attribute value from TH."
@@ -113,11 +219,26 @@
       verification: |
           ./chip-tool wifinetworkdiagnostics read packet-multicast-rx-count 1 0
 
+          verify the " packet-multicast-rx-count  Received Read  response" on the TH (all-cluster-app) log:
 
-          On DUT as a client side, verify that TH all-clusters-app  attribute data value is present. If the value is 0, no packet loss was recorded or it was just reset from a node reboot.
-
-          [1650454695.550436][9303:9308] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0036 Attribute 0x0000_0007 DataVersion: 1028539580
-          [1650454695.550515][9303:9308] CHIP:TOO:   PacketMulticastRxCount: 401028
+          [1659960106.003457][4826:4826] CHIP:IM: Received Read request
+          [1659960106.003544][4826:4826] CHIP:DMG: ReadRequestMessage =
+          [1659960106.003573][4826:4826] CHIP:DMG: {
+          [1659960106.003597][4826:4826] CHIP:DMG:         AttributePathIBs =
+          [1659960106.003626][4826:4826] CHIP:DMG:         [
+          [1659960106.003654][4826:4826] CHIP:DMG:                 AttributePathIB =
+          [1659960106.003691][4826:4826] CHIP:DMG:                 {
+          [1659960106.003725][4826:4826] CHIP:DMG:                         Endpoint = 0x0,
+          [1659960106.003762][4826:4826] CHIP:DMG:                         Cluster = 0x36,
+          [1659960106.003800][4826:4826] CHIP:DMG:                         Attribute = 0x0000_0007,
+          [1659960106.003830][4826:4826] CHIP:DMG:                 }
+          [1659960106.003860][4826:4826] CHIP:DMG:
+          [1659960106.003890][4826:4826] CHIP:DMG:         ],
+          [1659960106.003921][4826:4826] CHIP:DMG:
+          [1659960106.003950][4826:4826] CHIP:DMG:         isFabricFiltered = true,
+          [1659960106.003977][4826:4826] CHIP:DMG:         InteractionModelRevision = 1
+          [1659960106.004007][4826:4826] CHIP:DMG: },
+          [1659960106.004085][4826:4826] CHIP:DMG: IM RH moving to [GeneratingReports]
       disabled: true
 
     - label: "DUT reads a PacketMultiTxCount attribute value from TH."
@@ -125,10 +246,25 @@
       verification: |
           ./chip-tool wifinetworkdiagnostics read packet-multicast-tx-count 1 0
 
-          On DUT as a client side, verify that TH all-clusters-app  attribute data value is present. If the value is 0, no packet loss was recorded or it was just reset from a node reboot.
+          verify the " packet-multicast-tx-count  Received Read response" on the TH (all-cluster-app) log:
 
-          [1650454724.371654][9311:9316] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0036 Attribute 0x0000_0008 DataVersion: 1028539580
-          [1650454724.371740][9311:9316] CHIP:TOO:   PacketMulticastTxCount: 0
+          [1659960130.770866][4826:4826] CHIP:IM: Received Read request
+          [1659960130.770973][4826:4826] CHIP:DMG: ReadRequestMessage =
+          [1659960130.771002][4826:4826] CHIP:DMG: {
+          [1659960130.771025][4826:4826] CHIP:DMG:         AttributePathIBs =
+          [1659960130.771052][4826:4826] CHIP:DMG:         [
+          [1659960130.771077][4826:4826] CHIP:DMG:                 AttributePathIB =
+          [1659960130.771106][4826:4826] CHIP:DMG:                 {
+          [1659960130.771143][4826:4826] CHIP:DMG:                         Endpoint = 0x0,
+          [1659960130.771176][4826:4826] CHIP:DMG:                         Cluster = 0x36,
+          [1659960130.771212][4826:4826] CHIP:DMG:                         Attribute = 0x0000_0008,
+          [1659960130.771244][4826:4826] CHIP:DMG:                 }
+          [1659960130.771272][4826:4826] CHIP:DMG:
+          [1659960130.771301][4826:4826] CHIP:DMG:         ],
+          [1659960130.771330][4826:4826] CHIP:DMG:
+          [1659960130.771357][4826:4826] CHIP:DMG:         isFabricFiltered = true,
+          [1659960130.771382][4826:4826] CHIP:DMG:         InteractionModelRevision = 1
+          [1659960130.771409][4826:4826] CHIP:DMG: },
       disabled: true
 
     - label: "DUT reads a PacketUniRxCount attribute value from TH."
@@ -137,10 +273,25 @@
           ./chip-tool wifinetworkdiagnostics read packet-unicast-rx-count 1 0
 
 
-          On DUT as a client side, verify that TH all-clusters-app  attribute data value is present. If the value is 0, no packet loss was recorded or it was just reset from a node reboot.
+          verify the " packet-unicast-rx-count  Received Read response" on the TH (all-cluster-app) log:
 
-          [1650454751.954086][9317:9322] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0036 Attribute 0x0000_0009 DataVersion: 1028539580
-          [1650454751.954174][9317:9322] CHIP:TOO:   PacketUnicastRxCount:  4855
+          [1659960152.073162][4826:4826] CHIP:IM: Received Read request
+          [1659960152.073238][4826:4826] CHIP:DMG: ReadRequestMessage =
+          [1659960152.073264][4826:4826] CHIP:DMG: {
+          [1659960152.073283][4826:4826] CHIP:DMG:         AttributePathIBs =
+          [1659960152.073307][4826:4826] CHIP:DMG:         [
+          [1659960152.073328][4826:4826] CHIP:DMG:                 AttributePathIB =
+          [1659960152.073400][4826:4826] CHIP:DMG:                 {
+          [1659960152.073455][4826:4826] CHIP:DMG:                         Endpoint = 0x0,
+          [1659960152.073504][4826:4826] CHIP:DMG:                         Cluster = 0x36,
+          [1659960152.073560][4826:4826] CHIP:DMG:                         Attribute = 0x0000_0009,
+          [1659960152.073595][4826:4826] CHIP:DMG:                 }
+          [1659960152.073638][4826:4826] CHIP:DMG:
+          [1659960152.073688][4826:4826] CHIP:DMG:         ],
+          [1659960152.073722][4826:4826] CHIP:DMG:
+          [1659960152.073746][4826:4826] CHIP:DMG:         isFabricFiltered = true,
+          [1659960152.073768][4826:4826] CHIP:DMG:         InteractionModelRevision = 1
+          [1659960152.073797][4826:4826] CHIP:DMG: },
       disabled: true
 
     - label: "DUT reads a PacketUniTxCount attribute value from TH."
@@ -148,10 +299,25 @@
       verification: |
           ./chip-tool wifinetworkdiagnostics read packet-unicast-tx-count 1 0
 
-          On DUT as a client side, verify that TH all-clusters-app  attribute data value is present. If the value is 0, no packet loss was recorded or it was just reset from a node reboot.
+          verify the " packet-unicast-tx-count  Received Read response" on the TH (all-cluster-app) log:
 
-          [1650454782.789340][9323:9328] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0036 Attribute 0x0000_000A DataVersion: 1028539580
-          [1650454782.789426][9323:9328] CHIP:TOO:   PacketUnicastTxCount: 0
+          [1659960169.216377][4826:4826] CHIP:IM: Received Read request
+          [1659960169.216476][4826:4826] CHIP:DMG: ReadRequestMessage =
+          [1659960169.216504][4826:4826] CHIP:DMG: {
+          [1659960169.216527][4826:4826] CHIP:DMG:         AttributePathIBs =
+          [1659960169.216554][4826:4826] CHIP:DMG:         [
+          [1659960169.216579][4826:4826] CHIP:DMG:                 AttributePathIB =
+          [1659960169.216611][4826:4826] CHIP:DMG:                 {
+          [1659960169.216642][4826:4826] CHIP:DMG:                         Endpoint = 0x0,
+          [1659960169.216677][4826:4826] CHIP:DMG:                         Cluster = 0x36,
+          [1659960169.216711][4826:4826] CHIP:DMG:                         Attribute = 0x0000_000A,
+          [1659960169.216742][4826:4826] CHIP:DMG:                 }
+          [1659960169.216773][4826:4826] CHIP:DMG:
+          [1659960169.216801][4826:4826] CHIP:DMG:         ],
+          [1659960169.216830][4826:4826] CHIP:DMG:
+          [1659960169.216857][4826:4826] CHIP:DMG:         isFabricFiltered = true,
+          [1659960169.216883][4826:4826] CHIP:DMG:         InteractionModelRevision = 1
+          [1659960169.216907][4826:4826] CHIP:DMG: },
       disabled: true
 
     - label: "DUT reads CurrentMaxRate attribute value from TH."
@@ -159,11 +325,24 @@
       verification: |
           ./chip-tool wifinetworkdiagnostics read current-max-rate 1 0
 
-
-          On DUT as a client side, verify that TH all-clusters-app  attribute data value is present. If the value is 0, no packet loss was recorded or it was just reset from a node reboot. log
-
-          [1650451685.092993][5470:5475] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0036 Attribute 0x0000_000B DataVersion: 1626643502
-          [1650451685.093078][5470:5475] CHIP:TOO:   CurrentMaxRate: 24000000
+          verify the " current-max-rate  Received Read response" on the TH (all-cluster-app) log:
+          [1659960187.413661][4826:4826] CHIP:IM: Received Read request
+          [1659960187.413732][4826:4826] CHIP:DMG: ReadRequestMessage =
+          [1659960187.413755][4826:4826] CHIP:DMG: {
+          [1659960187.413774][4826:4826] CHIP:DMG:         AttributePathIBs =
+          [1659960187.413797][4826:4826] CHIP:DMG:         [
+          [1659960187.413818][4826:4826] CHIP:DMG:                 AttributePathIB =
+          [1659960187.413846][4826:4826] CHIP:DMG:                 {
+          [1659960187.413871][4826:4826] CHIP:DMG:                         Endpoint = 0x0,
+          [1659960187.413902][4826:4826] CHIP:DMG:                         Cluster = 0x36,
+          [1659960187.413932][4826:4826] CHIP:DMG:                         Attribute = 0x0000_000B,
+          [1659960187.413959][4826:4826] CHIP:DMG:                 }
+          [1659960187.413985][4826:4826] CHIP:DMG:
+          [1659960187.414009][4826:4826] CHIP:DMG:         ],
+          [1659960187.414034][4826:4826] CHIP:DMG:
+          [1659960187.414056][4826:4826] CHIP:DMG:         isFabricFiltered = true,
+          [1659960187.414078][4826:4826] CHIP:DMG:         InteractionModelRevision = 1
+          [1659960187.414098][4826:4826] CHIP:DMG: },
       disabled: true
 
     - label: "DUT reads a OverrunCount attribute value from TH."
@@ -171,9 +350,23 @@
       verification: |
           ./chip-tool wifinetworkdiagnostics read overrun-count 1 0
 
+          verify the " overrun-count Received Read  response" on the TH (all-cluster-app) log:
 
-          On DUT as a client side, verify that TH all-clusters-app  attribute data value is present. If the value is 0, no packet loss was recorded or it was just reset from a node reboot.
-
-          [1650451635.634814][9056:9061] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0036 Attribute 0x0000_000C DataVersion: 1028539580
-          [1650451635.634882][9056:9061] CHIP:TOO:   OverrunCount: 0
+          [1659960222.155944][4826:4826] CHIP:IM: Received Read request
+          [1659960222.156039][4826:4826] CHIP:DMG: ReadRequestMessage =
+          [1659960222.156073][4826:4826] CHIP:DMG: {
+          [1659960222.156101][4826:4826] CHIP:DMG:         AttributePathIBs =
+          [1659960222.156134][4826:4826] CHIP:DMG:         [
+          [1659960222.156165][4826:4826] CHIP:DMG:                 AttributePathIB =
+          [1659960222.156206][4826:4826] CHIP:DMG:                 {
+          [1659960222.156243][4826:4826] CHIP:DMG:                         Endpoint = 0x0,
+          [1659960222.156290][4826:4826] CHIP:DMG:                         Cluster = 0x36,
+          [1659960222.156333][4826:4826] CHIP:DMG:                         Attribute = 0x0000_000C,
+          [1659960222.156372][4826:4826] CHIP:DMG:                 }
+          [1659960222.156411][4826:4826] CHIP:DMG:
+          [1659960222.156489][4826:4826] CHIP:DMG:         ],
+          [1659960222.156526][4826:4826] CHIP:DMG:
+          [1659960222.156560][4826:4826] CHIP:DMG:         isFabricFiltered = true,
+          [1659960222.156593][4826:4826] CHIP:DMG:         InteractionModelRevision = 1
+          [1659960222.156629][4826:4826] CHIP:DMG: },
       disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_DGWIFI_3_2.yaml b/src/app/tests/suites/certification/Test_TC_DGWIFI_3_2.yaml
index a561675..e321298 100644
--- a/src/app/tests/suites/certification/Test_TC_DGWIFI_3_2.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DGWIFI_3_2.yaml
@@ -24,6 +24,11 @@
     endpoint: 0
 
 tests:
+    - label: "Note"
+      verification: |
+          Chip-tool command used below are an example to verify the  DUT as client test cases. For certification test, we expect DUT should have a capability or way to run the equivalent command.
+      disabled: true
+
     - label: "Commission TH to DUT"
       verification: |
           verification step to be updated.
@@ -34,38 +39,30 @@
       verification: |
           ./chip-tool wifinetworkdiagnostics reset-counts 1 0
 
+          verify the " reset-count command receives request response" on the TH (all-cluster-app) log:
 
-          verify On TH(Reference app) receives the right Read Request Message for the data sent in the above command
-
-          CHIP:DMG: InvokeResponseMessage =
-          [1649664146.639743][8173:8178] CHIP:DMG: {
-          [1649664146.639789][8173:8178] CHIP:DMG:         suppressResponse = false,
-          [1649664146.639836][8173:8178] CHIP:DMG:         InvokeResponseIBs =
-          [1649664146.639895][8173:8178] CHIP:DMG:         [
-          [1649664146.639941][8173:8178] CHIP:DMG:                 InvokeResponseIB =
-          [1649664146.640006][8173:8178] CHIP:DMG:                 {
-          [1649664146.640059][8173:8178] CHIP:DMG:                         CommandStatusIB =
-          [1649664146.640119][8173:8178] CHIP:DMG:                         {
-          [1649664146.640175][8173:8178] CHIP:DMG:                                 CommandPathIB =
-          [1649664146.640238][8173:8178] CHIP:DMG:                                 {
-          [1649664146.640302][8173:8178] CHIP:DMG:                                         EndpointId = 0x0,
-          [1649664146.640373][8173:8178] CHIP:DMG:                                         ClusterId = 0x36,
-          [1649664146.640438][8173:8178] CHIP:DMG:                                         CommandId = 0x0,
-          [1649664146.640500][8173:8178] CHIP:DMG:                                 },
-          [1649664146.640574][8173:8178] CHIP:DMG:
-          [1649664146.640632][8173:8178] CHIP:DMG:                                 StatusIB =
-          [1649664146.640693][8173:8178] CHIP:DMG:                                 {
-          [1649664146.640762][8173:8178] CHIP:DMG:                                         status = 0x00 (SUCCESS),
-          [1649664146.640824][8173:8178] CHIP:DMG:                                 },
-          [1649664146.640886][8173:8178] CHIP:DMG:
-          [1649664146.640943][8173:8178] CHIP:DMG:                         },
-          [1649664146.641007][8173:8178] CHIP:DMG:
-          [1649664146.641058][8173:8178] CHIP:DMG:                 },
-          [1649664146.641126][8173:8178] CHIP:DMG:
-          [1649664146.641174][8173:8178] CHIP:DMG:         ],
-          [1649664146.641230][8173:8178] CHIP:DMG:
-          [1649664146.641275][8173:8178] CHIP:DMG:         InteractionModelRevision = 1
-          [1649664146.641318][8173:8178] CHIP:DMG: },
-          [1649664146.641424][8173:8178] CHIP:DMG: Received Command Response Status for Endpoint=0 Cluster=0x0000_0036 Command=0x0000_0000 Status=0x0
-          [1649664146.641499][8173:8178] CHIP:DMG: ICR moving to [AwaitingDe]
+          [1659960382.148753][4826:4826] CHIP:DMG: InvokeRequestMessage =
+          [1659960382.148777][4826:4826] CHIP:DMG: {
+          [1659960382.148798][4826:4826] CHIP:DMG:         suppressResponse = false,
+          [1659960382.148822][4826:4826] CHIP:DMG:         timedRequest = false,
+          [1659960382.148856][4826:4826] CHIP:DMG:         InvokeRequests =
+          [1659960382.148889][4826:4826] CHIP:DMG:         [
+          [1659960382.148921][4826:4826] CHIP:DMG:                 CommandDataIB =
+          [1659960382.148948][4826:4826] CHIP:DMG:                 {
+          [1659960382.148981][4826:4826] CHIP:DMG:                         CommandPathIB =
+          [1659960382.149013][4826:4826] CHIP:DMG:                         {
+          [1659960382.149051][4826:4826] CHIP:DMG:                                 EndpointId = 0x0,
+          [1659960382.149081][4826:4826] CHIP:DMG:                                 ClusterId = 0x36,
+          [1659960382.149119][4826:4826] CHIP:DMG:                                 CommandId = 0x0,
+          [1659960382.149149][4826:4826] CHIP:DMG:                         },
+          [1659960382.149178][4826:4826] CHIP:DMG:
+          [1659960382.149212][4826:4826] CHIP:DMG:                         CommandFields =
+          [1659960382.149239][4826:4826] CHIP:DMG:                         {
+          [1659960382.149276][4826:4826] CHIP:DMG:                         },
+          [1659960382.149302][4826:4826] CHIP:DMG:                 },
+          [1659960382.149337][4826:4826] CHIP:DMG:
+          [1659960382.149358][4826:4826] CHIP:DMG:         ],
+          [1659960382.149392][4826:4826] CHIP:DMG:
+          [1659960382.149413][4826:4826] CHIP:DMG:         InteractionModelRevision = 1
+          [1659960382.149433][4826:4826] CHIP:DMG: },
       disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_DRLK_3_3.yaml b/src/app/tests/suites/certification/Test_TC_DRLK_3_3.yaml
index 804047c..749d108 100644
--- a/src/app/tests/suites/certification/Test_TC_DRLK_3_3.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DRLK_3_3.yaml
@@ -25,31 +25,26 @@
     endpoint: 0
 
 tests:
+    - label: "Note"
+      verification: |
+          Chip-tool command used below are an example to verify the  DUT as client test cases. For certification test, we expect DUT should have a capability or way to run the equivalent command.
+      disabled: true
+
     - label: "TH will initiate DoorLockAlarm Event (LockJammed scenario)"
       PICS: DRLK.C.E00
       verification: |
           ./chip-tool doorlock read-event door-lock-alarm 1 1
 
-          Verify DUT receives the DoorLockAlarm event on TH / lock app log:
+          Verify "DUT receives the DoorLockAlarm event " on the TH(Lock-app) Log:
 
-          [1658399559.467861][2474:2474] CHIP:IM: Received Read request
-          [1658399559.467960][2474:2474] CHIP:DMG: ReadRequestMessage =
-          [1658399559.467994][2474:2474] CHIP:DMG: {
-          [1658399559.468022][2474:2474] CHIP:DMG:        EventPathIBs =
-          [1658399559.468054][2474:2474] CHIP:DMG:        [
-          [1658399559.468084][2474:2474] CHIP:DMG:                EventPath =
-          [1658399559.468118][2474:2474] CHIP:DMG:                {
-          [1658399559.468154][2474:2474] CHIP:DMG:                        Endpoint = 0x1,
-          [1658399559.468200][2474:2474] CHIP:DMG:                        Cluster = 0x101,
-          [1658399559.468238][2474:2474] CHIP:DMG:                        Event = 0x0,
-          [1658399559.468274][2474:2474] CHIP:DMG:                },
-          [1658399559.468308][2474:2474] CHIP:DMG:
-          [1658399559.468337][2474:2474] CHIP:DMG:        ],
-          [1658399559.468371][2474:2474] CHIP:DMG:
-          [1658399559.468403][2474:2474] CHIP:DMG:        isFabricFiltered = true,
-          [1658399559.468434][2474:2474] CHIP:DMG:        InteractionModelRevision = 1
-          [1658399559.468463][2474:2474] CHIP:DMG: },
-          [1658399559.468543][2474:2474] CHIP:DMG: IM RH moving to [GeneratingReports]
+          [1659520755.536021][3987:3992] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0101 Event 0x0000_0000
+          [1659520755.536048][3987:3992] CHIP:TOO:   Event number: 4
+          [1659520755.536069][3987:3992] CHIP:TOO:   Priority: Critical
+          [1659520755.536089][3987:3992] CHIP:TOO:   Timestamp: 22818908
+          [1659520755.536198][3987:3992] CHIP:TOO:   DoorLockAlarm: {
+          [1659520755.536234][3987:3992] CHIP:TOO:     AlarmCode: 0
+          [1659520755.536259][3987:3992] CHIP:TOO:    }
+          [1659520755.536347][3987:3992] CHIP:EM: Sending Standalone Ack for MessageCounter:229373286 on exchange 22555i
       disabled: true
 
     - label: "DUT sends the Unlock Door command to the TH with valid PINCode"
@@ -57,7 +52,7 @@
       verification: |
           ./chip-tool doorlock set-user 0 1 xxx 6452 1 0 0 1 1  --timedInteractionTimeoutMs 1000
 
-          Verify Test Harness receives the Set User Door command from the DUT on TH / lock app log:
+          Verify "DUT receives the set-user response " on the TH(Lock-app) Log:
 
           [1658399917.774631][2474:2474] CHIP:DMG:                        CommandFields =
           [1658399917.774662][2474:2474] CHIP:DMG:                        {
@@ -82,7 +77,7 @@
 
           ./chip-tool doorlock set-credential 0 "{ "credentialType" : 1 , "credentialIndex" : 1 }" 123456 1 0 0 1 1 --timedInteractionTimeoutMs 1000
 
-          Verify Test Harness receives the Set Credential command from the DUT on TH / lock app log:
+          Verify "DUT receives the set-credential response " on the TH(Lock-app) Log:
 
           [1658400025.688730][2474:2474] CHIP:DMG:                        CommandFields =
           [1658400025.688777][2474:2474] CHIP:DMG:                        {
@@ -113,7 +108,7 @@
 
           ./chip-tool doorlock unlock-door 1 1 --timedInteractionTimeoutMs 1000 --PinCode 123456
 
-          Verify Test Harness receives the Unlock Door command from the DUT on TH / lock app log:
+          Verify "DUT receives the unlock-door response " on the TH(Lock-app) Log:
 
           [1658143429.670361][3057:3062] CHIP:DMG:                                },
           [1658143429.670411][3057:3062] CHIP:DMG:
@@ -168,7 +163,18 @@
     - label: "TH initiates DoorStateChange event with Doorstate set to DoorOpen"
       PICS: DRLK.C.F05 && DRLK.C.E01
       verification: |
-          There is no way to change the door state over Matter.
+          ./chip-tool doorlock read-event door-state-change 1 1
+
+          Verify "DUT receives DoorStateChange Event" on the TH(Lock-app) Log:
+
+          [1659521149.394340][4046:4051] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0101 Event 0x0000_0001
+          [1659521149.394391][4046:4051] CHIP:TOO:   Event number: 1
+          [1659521149.394412][4046:4051] CHIP:TOO:   Priority: Critical
+          [1659521149.394433][4046:4051] CHIP:TOO:   Timestamp: 22783568
+          [1659521149.394503][4046:4051] CHIP:TOO:   DoorStateChange: {
+          [1659521149.394539][4046:4051] CHIP:TOO:     DoorState: 1
+          [1659521149.394564][4046:4051] CHIP:TOO:    }
+          [1659521149.394654][4046:4051] CHIP:EM: Sending Standalone Ack for MessageCounter:231120057 on exchange 10153i
       disabled: true
 
     - label: "DUT sends the Lock Door command to the TH with valid PINCode"
@@ -176,7 +182,7 @@
       verification: |
           ./chip-tool doorlock lock-door 1 1 --timedInteractionTimeoutMs 1000 --PinCode 123456
 
-          Verify Test Harness receives the lock Door command from the DUT on TH / lock app log:
+          Verify "DUT receives lock Door response" on the TH(Lock-app) Log:
 
 
           [1658400315.379482][2474:2474] CHIP:DMG:                        CommandPathIB =
@@ -215,7 +221,8 @@
       verification: |
           ./chip-tool doorlock read-event lock-operation 1 1
 
-          Verify DUT receives the LockOperation event on TH / lock app log:
+
+          Verify "DUT receives LockOperation event  response" on the TH(Lock-app) Log:
 
 
           [1658400639.617399][3227:3227] CHIP:IM: Received Read request
@@ -247,7 +254,7 @@
       verification: |
           ./chip-tool doorlock unlock-door 1 1 --timedInteractionTimeoutMs 1000 --PinCode 12345678
 
-          Verify Test Harness receives the Unlock Door command from the DUT on TH / lock app log:
+          Verify "DUT receives Unlock Door command  response" on the TH(Lock-app) Log:
 
 
           [1658400708.187116][3227:3227] CHIP:DMG:                        CommandPathIB =
@@ -280,7 +287,7 @@
       verification: |
           ./chip-tool doorlock read-event lock-operation-error 1 1
 
-          Verify DUT receives the LockOperationError event on TH / lock app log:
+          Verify "DUT receives LockOperationError event  response" on the TH(Lock-app) Log:
 
 
           [1658400788.866836][3227:3227] CHIP:IM: Received Read request
@@ -312,7 +319,7 @@
       verification: |
           ./chip-tool doorlock set-user 0 3 xxx 6452 1 0 0 1 1  --timedInteractionTimeoutMs 1000
 
-          Verify Test Harness receives the Set User Door command from the DUT on TH / lock app log:
+          Verify "DUT receives Set User command response" on the TH(Lock-app) Log:
 
 
           [1658400855.689218][3227:3227] CHIP:DMG:                        CommandPathIB =
@@ -356,8 +363,7 @@
       verification: |
           ./chip-tool doorlock read-event lock-user-change 1 1
 
-          verify  DUT receives LockUserChange from TH on TH / lock app log:
-
+          Verify "DUT receives read-event lock-user-change response" on the TH(Lock-app) Log:
 
           [1658400921.173789][3227:3227] CHIP:IM: Received Read request
           [1658400921.173921][3227:3227] CHIP:DMG: ReadRequestMessage =
diff --git a/src/app/tests/suites/certification/Test_TC_FLABEL_1_1.yaml b/src/app/tests/suites/certification/Test_TC_FLABEL_1_1.yaml
index 7c3e823..67c2cff 100644
--- a/src/app/tests/suites/certification/Test_TC_FLABEL_1_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_FLABEL_1_1.yaml
@@ -33,7 +33,7 @@
       verification: |
           ./chip-tool fixedlabel read cluster-revision 1 0
 
-          On TH, verify that  DUT  responsds ClusterRevision attribute  value as 1
+          On TH(chip-tool), verify that the DUT responsds ClusterRevision attribute as the value 1
 
           [1651124058.497301][2367:2372] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0040 Attribute 0x0000_FFFD DataVersion: 3688229931
           [1651124058.498753][2367:2372] CHIP:TOO:   ClusterRevision: 1
@@ -44,7 +44,7 @@
       verification: |
           ./chip-tool fixedlabel read feature-map 1 0
 
-          On TH, verify that DUT responsds FeatureMap attribute  value as 0
+          On TH(chip-tool), verify that DUT responds the  Featuremap  value as 0
 
           [1653459204.749193][24610:24615] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0040 Attribute 0x0000_FFFC DataVersion: 4022759920
           [1653459204.749266][24610:24615] CHIP:TOO:   FeatureMap: 0
@@ -55,7 +55,7 @@
       verification: |
           ./chip-tool fixedlabel read attribute-list 1 0
 
-          On TH, verify that DUT responsds as list of supported attributes
+          On TH(chip-tool), verify that DUT responds as list of supported attributes as 6 entries
 
           [1656929388.949001][6141:6146] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0040 Attribute 0x0000_FFFB DataVersion: 2146772891
           [1656929388.949100][6141:6146] CHIP:TOO:   AttributeList: 6 entries
@@ -77,7 +77,7 @@
       verification: |
           ./chip-tool fixedlabel read accepted-command-list 1 0
 
-          On TH, verify that DUT  responsds as list of Accepted Command as 0 entries.
+          On TH(chip-tool), verify that DUT responds as list of Accepted Commands as 0 entries
 
           [1651124239.450485][2392:2397] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0040 Attribute 0x0000_FFF9 DataVersion: 3688229931
           [1651124239.450576][2392:2397] CHIP:TOO:   AcceptedCommandList: 0 entries
@@ -88,7 +88,7 @@
       verification: |
           ./chip-tool fixedlabel read generated-command-list 1 0
 
-          On TH, verify that DUT responsds as list of GeneratedCommandList as 0 entries.
+          On TH(chip-tool), verify that DUT responds as list of GeneratedCommands as 0 entries
 
           [1651124266.980698][2527:2532] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0040 Attribute 0x0000_FFF8 DataVersion: 3688229931
           [1651124266.980776][2527:2532] CHIP:TOO:   GeneratedCommandList: 0 entries
diff --git a/src/app/tests/suites/certification/Test_TC_FLABEL_2_1.yaml b/src/app/tests/suites/certification/Test_TC_FLABEL_2_1.yaml
index 51265c5..8eba3aa 100644
--- a/src/app/tests/suites/certification/Test_TC_FLABEL_2_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_FLABEL_2_1.yaml
@@ -29,7 +29,7 @@
       verification: |
           ./chip-tool fixedlabel read label-list 1 0
 
-          On TH verify that DUT responds with labellist  empty or has one or more entries, each entry should contain label and value field
+          On TH(chip-tool), verify that DUT responds with labellist  empty or has one or more entries, each entry should contain label and value field
 
           [1651124649.820293][2819:2824] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0040 Attribute 0x0000_0000 DataVersion: 3688229931
           [1651124649.820478][2819:2824] CHIP:TOO:   label list: 4 entries
@@ -59,7 +59,7 @@
       verification: |
           ./chip-tool fixedlabel write-by-id  0x00 "["label","Testlabel", "value","testvalue"]" 1 0
 
-          On TH, verify that DUT responds with UNSUPPORTED_WRITE
+          On TH(chip-tool), Verify the  status code  as UNSUPPORTED_WRITE
 
           [1657629968.892879][2505:2510] CHIP:DMG: WriteResponseMessage =
           [1657629968.892909][2505:2510] CHIP:DMG: {
@@ -94,9 +94,7 @@
       verification: |
           ./chip-tool fixedlabel read label-list 1 0
 
-
-          On TH verify that  LabelList should be same as step 1
-
+          On TH(all-clusters-app) Verify that the LabelList value is same as value from step 1
 
           [1651124649.820293][2819:2824] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0040 Attribute 0x0000_0000 DataVersion: 3688229931
           [1651124649.820478][2819:2824] CHIP:TOO:   label list: 4 entries
diff --git a/src/app/tests/suites/certification/Test_TC_FLABEL_3_1.yaml b/src/app/tests/suites/certification/Test_TC_FLABEL_3_1.yaml
index f48b659..e3cb71e 100644
--- a/src/app/tests/suites/certification/Test_TC_FLABEL_3_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_FLABEL_3_1.yaml
@@ -24,30 +24,35 @@
     endpoint: 0
 
 tests:
+    - label: "Note"
+      verification: |
+          Chip-tool command used below are an example to verify the  DUT as client test cases. For certification test, we expect DUT should have a capability or way to run the equivalent command.
+      disabled: true
+
     - label: "DUT reads LabelList from the TH"
       PICS: FLABEL.C.A0000
       verification: |
+          Product maker needs to provide instructions for how to trigger the command on the DUT. For comparison, the DUT behavior for this test step can be simulated using chip-tool (when DUT is a commissioner/Client)
+
           ./chip-tool fixedlabel read label-list 1 0
+          Verify DUT receives LabelList attribute response on the TH(all-clusters-app) Log:
 
-          Verify in DUT as client side, verify that DUT reads LabelList successfully
-
-          [1651124649.820293][2819:2824] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0040 Attribute 0x0000_0000 DataVersion: 3688229931
-          [1651124649.820478][2819:2824] CHIP:TOO:   label list: 4 entries
-          [1651124649.820534][2819:2824] CHIP:TOO:     [1]: {
-          [1651124649.820570][2819:2824] CHIP:TOO:       Label: room
-          [1651124649.820602][2819:2824] CHIP:TOO:       Value: bedroom 2
-          [1651124649.820636][2819:2824] CHIP:TOO:      }
-          [1651124649.820676][2819:2824] CHIP:TOO:     [2]: {
-          [1651124649.820709][2819:2824] CHIP:TOO:       Label: orientation
-          [1651124649.820741][2819:2824] CHIP:TOO:       Value: North
-          [1651124649.820773][2819:2824] CHIP:TOO:      }
-          [1651124649.820812][2819:2824] CHIP:TOO:     [3]: {
-          [1651124649.820845][2819:2824] CHIP:TOO:       Label: floor
-          [1651124649.820875][2819:2824] CHIP:TOO:       Value: 2
-          [1651124649.820906][2819:2824] CHIP:TOO:      }
-          [1651124649.820945][2819:2824] CHIP:TOO:     [4]: {
-          [1651124649.820977][2819:2824] CHIP:TOO:       Label: direction
-          [1651124649.821008][2819:2824] CHIP:TOO:       Value: up
-          [1651124649.821039][2819:2824] CHIP:TOO:      }
-          [1651124649.821193][2819:2824] CHIP:EM: Sending Standalone Ack for MessageCounter:2439070 on exchange 10798i
+          [1659609299.722973][2409:2409] CHIP:IM: Received Read request
+          [1659609299.723073][2409:2409] CHIP:DMG: ReadRequestMessage =
+          [1659609299.723107][2409:2409] CHIP:DMG: {
+          [1659609299.723135][2409:2409] CHIP:DMG:         AttributePathIBs =
+          [1659609299.723164][2409:2409] CHIP:DMG:         [
+          [1659609299.723190][2409:2409] CHIP:DMG:                 AttributePathIB =
+          [1659609299.723224][2409:2409] CHIP:DMG:                 {
+          [1659609299.723261][2409:2409] CHIP:DMG:                         Endpoint = 0x0,
+          [1659609299.723357][2409:2409] CHIP:DMG:                         Cluster = 0x40,
+          [1659609299.723404][2409:2409] CHIP:DMG:                         Attribute = 0x0000_0000,
+          [1659609299.723444][2409:2409] CHIP:DMG:                 }
+          [1659609299.723483][2409:2409] CHIP:DMG:
+          [1659609299.723518][2409:2409] CHIP:DMG:         ],
+          [1659609299.723555][2409:2409] CHIP:DMG:
+          [1659609299.723589][2409:2409] CHIP:DMG:         isFabricFiltered = true,
+          [1659609299.723624][2409:2409] CHIP:DMG:         InteractionModelRevision = 1
+          [1659609299.723654][2409:2409] CHIP:DMG: },
+          [1659609299.723746][2409:2409] CHIP:DMG: IM RH moving to [GeneratingReports]
       disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_FLW_3_1.yaml b/src/app/tests/suites/certification/Test_TC_FLW_3_1.yaml
index 39aeca6..ce6ffd3 100644
--- a/src/app/tests/suites/certification/Test_TC_FLW_3_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_FLW_3_1.yaml
@@ -28,13 +28,18 @@
     endpoint: 0
 
 tests:
+    - label: "Note"
+      verification: |
+          Chip-tool command used below are an example to verify the  DUT as client test cases. For certification test, we expect DUT should have a capability or way to run the equivalent command.
+      disabled: true
+
     - label:
           "DUT reads all supported mandatory attributes from TH one at a time in
           a manufacturer specific order"
       verification: |
           ./chip-tool flowmeasurement read measured-value 1 1
 
-          Verify read command is received in DUT as client side log
+          Verify read command is received on TH(all-clusters-app) log
 
           [1658853801.750840][29347:29347] CHIP:IM: Received Read request
           [1658853801.750918][29347:29347] CHIP:DMG: ReadRequestMessage =
@@ -64,7 +69,7 @@
 
           "./chip-tool flowmeasurement read min-measured-value 1 1
 
-          Verify read command is received in DUT as client side log
+          Verify read command is received on TH(all-clusters-app) log
 
           [1658853849.969073][29347:29347] CHIP:IM: Received Read request
           [1658853849.969151][29347:29347] CHIP:DMG: ReadRequestMessage =
@@ -91,7 +96,7 @@
 
           "./chip-tool flowmeasurement read max-measured-value 1 1
 
-          Verify read command is received in DUT as client side log
+          Verify read command is received on TH(all-clusters-app) log
 
           [1658853898.416395][29347:29347] CHIP:IM: Received Read request
           [1658853898.416472][29347:29347] CHIP:DMG: ReadRequestMessage =
@@ -121,7 +126,7 @@
       verification: |
           chip-tool flowmeasurement read tolerance 1 1
 
-          Verify in DUT as client side log
+          Verify read command is received on TH(all-clusters-app) log
 
           [1658853991.266232][29347:29347] CHIP:IM: Received Read request
           [1658853991.266328][29347:29347] CHIP:DMG: ReadRequestMessage =
@@ -167,7 +172,7 @@
       verification: |
           ./chip-tool flowmeasurement read attribute-list 1 1
 
-          Verify a list of supported attributes which contains mandatory in DUT as client side log
+          Verify a list of supported attributes which contains mandatory on TH(all-clusters-minimal-app) log
 
           [1656478164937] [49517:5732586] CHIP: [TOO] Endpoint: 1 Cluster: 0x0000_0404 Attribute 0x0000_FFFB DataVersion: 3423686907
           [1656478164937] [49517:5732586] CHIP: [TOO]   AttributeList: 8 entries
@@ -182,7 +187,7 @@
 
           ./chip-tool flowmeasurement read feature-map 1 1
 
-          Verify featuremap value is 0 in DUT as client side log
+          Verify featuremap value is 0 on TH(all-clusters-minimal-app) log
 
           [1656478242820] [49526:5733040] CHIP: [TOO] Endpoint: 1 Cluster: 0x0000_0404 Attribute 0x0000_FFFC DataVersion: 3423686907
           [1656478242820] [49526:5733040] CHIP: [TOO]   FeatureMap: 0
@@ -190,7 +195,7 @@
 
           "./chip-tool flowmeasurement read measured-value 1 1
 
-          Verify read command is received in DUT as client side log
+          Verify read command is received on TH(all-clusters-minimal-app) log
 
           [1658853801.750840][29347:29347] CHIP:IM: Received Read request
           [1658853801.750918][29347:29347] CHIP:DMG: ReadRequestMessage =
@@ -220,7 +225,7 @@
 
           ""./chip-tool flowmeasurement read min-measured-value 1 1
 
-          Verify read command is received in DUT as client side log
+          Verify read command is received on TH(all-clusters-minimal-app) log
 
           [1658853849.969073][29347:29347] CHIP:IM: Received Read request
           [1658853849.969151][29347:29347] CHIP:DMG: ReadRequestMessage =
@@ -247,7 +252,7 @@
 
           ""./chip-tool flowmeasurement read max-measured-value 1 1
 
-          Verify read command is received in DUT as client side log
+          Verify read command is received on TH(all-clusters-minimal-app) log
 
           [1658853898.416395][29347:29347] CHIP:IM: Received Read request
           [1658853898.416472][29347:29347] CHIP:DMG: ReadRequestMessage =
@@ -276,7 +281,7 @@
           "DUT reads all supported optional attributes from TH one at a time in
           a manufacturer specific order"
       verification: |
-          Verify in DUT as client side log
+          Verify read command is received on TH(all-clusters-minimal-app) log
 
           ./chip-tool flowmeasurement read tolerance 1 1
 
diff --git a/src/app/tests/suites/certification/Test_TC_G_1_1.yaml b/src/app/tests/suites/certification/Test_TC_G_1_1.yaml
index 163ae6b..2e2c1d9 100644
--- a/src/app/tests/suites/certification/Test_TC_G_1_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_G_1_1.yaml
@@ -26,14 +26,14 @@
 tests:
     - label: "Commission DUT to TH"
       verification: |
-
+          verification step to be updated.
       disabled: true
 
     - label: "TH reads the ClusterRevision from DUT"
       verification: |
           ./chip-tool groups read cluster-revision 1 1
 
-          Verify on the TH Log:
+          Verify the "clusterrevision value" on the TH(Chip-tool)  Log:
 
           [1651216621.203474][2391:2396] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0004 Attribute 0x0000_FFFD DataVersion: 745654550
           [1651216621.204919][2391:2396] CHIP:TOO:   ClusterRevision: 4
@@ -43,7 +43,7 @@
       verification: |
           ./chip-tool groups read feature-map 1 1
 
-          Verify on the TH Log:
+          Verify the "featuremap value" on the TH(Chip-tool)  Log:
 
           [1653556224.547920][18764:18769] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0004 Attribute 0x0000_FFFC DataVersion: 3409054639
           [1653556224.548038][18764:18769] CHIP:TOO:   FeatureMap: 1
@@ -53,7 +53,7 @@
       verification: |
           ./chip-tool groups read attribute-list 1 1
 
-          Verify on the TH Log:
+          Verify the "attibute list contains the mandatory attributes and global attributes" on the TH(Chip-tool)  Log:
 
           [1653556295.417734][18773:18779] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0004 Attribute 0x0000_FFFB DataVersion: 3409054639
           [1653556295.417900][18773:18779] CHIP:TOO:   AttributeList: 6 entries
@@ -67,14 +67,14 @@
 
     - label: "TH reads EventList from DUT"
       verification: |
-          Event List is not implemented
+          Out of scope for V1.0
       disabled: true
 
     - label: "TH reads AcceptedCommandList from DUT"
       verification: |
           ./chip-tool groups read accepted-command-list 1 1
 
-          Verify on the TH Log:
+          Verify the "AcceptedCommands" on the TH(Chip-tool)  Log:
 
           [1651217107.034926][2435:2440] CHIP:TOO:   AcceptedCommandList: 6 entries
           [1651217107.034984][2435:2440] CHIP:TOO:     [1]: 0
@@ -89,7 +89,7 @@
       verification: |
           ./chip-tool groups read generated-command-list 1 1
 
-          Verify on the TH Log:
+          Verify the "GeneratedCommands" on the TH(Chip-tool)  Log:
 
           [1651217152.020233][2444:2449] CHIP:TOO:   GeneratedCommandList: 4 entries
           [1651217152.020276][2444:2449] CHIP:TOO:     [1]: 0
diff --git a/src/app/tests/suites/certification/Test_TC_G_2_1.yaml b/src/app/tests/suites/certification/Test_TC_G_2_1.yaml
index 64acf2b..d7ea24c 100644
--- a/src/app/tests/suites/certification/Test_TC_G_2_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_G_2_1.yaml
@@ -29,7 +29,7 @@
       verification: |
           ./chip-tool groups read name-support 1 1
 
-          Verify the name support value on the TH Log:
+          Verify the "name support value" on the TH(Chip-tool)  Log:
 
           [1651217306.461810][2457:2462] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0004 Attribute 0x0000_0000 DataVersion: 745654550
           [1651217306.461894][2457:2462] CHIP:TOO:   name support: 128(binary:10000000)
@@ -41,7 +41,7 @@
       verification: |
           ./chip-tool groups write-by-id 0x0000 126 1 1
 
-          Verify the response is UNSUPPORTED_WRITE on the TH Log:
+          Verify the "response is UNSUPPORTED_WRITE" on the TH(Chip-tool)  Log:
 
           [1651217949.041814][2514:2519] CHIP:DMG: }
           [1651217949.041889][2514:2519] CHIP:TOO: Response Failure: IM Error 0x00000588: General error: 0x88 (UNSUPPORTED_WRITE)
@@ -51,7 +51,7 @@
       verification: |
           ./chip-tool groups read name-support 1 1
 
-          Verify the name support value on the TH Log:
+          Verify the "name support value" on the TH(Chip-tool)  Log:
 
           [1651217306.461810][2457:2462] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0004 Attribute 0x0000_0000 DataVersion: 745654550
           [1651217306.461894][2457:2462] CHIP:TOO:   name support: 128
diff --git a/src/app/tests/suites/certification/Test_TC_G_2_2.yaml b/src/app/tests/suites/certification/Test_TC_G_2_2.yaml
index 12f6123..98ce3b8 100644
--- a/src/app/tests/suites/certification/Test_TC_G_2_2.yaml
+++ b/src/app/tests/suites/certification/Test_TC_G_2_2.yaml
@@ -33,7 +33,7 @@
       verification: |
           ./chip-tool groups add-group 0x0001 grp1 1 1
 
-          Verify the status is success on the TH Log:
+          Verify the "status is success" on the TH(Chip-tool)  Log:
 
           [1651218084.427102][2526:2531] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0004 Command 0x0000_0000
           [1651218084.427203][2526:2531] CHIP:TOO:   AddGroupResponse: {
@@ -49,7 +49,7 @@
       verification: |
           ./chip-tool groupkeymanagement read group-table 1 0
 
-          Verify the grouptable entries on the TH Log:
+          Verify the "grouptable entries" on the TH(Chip-tool)  Log:
 
           [1651218198.062850][2538:2543] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_003F Attribute 0x0000_0001 DataVersion: 2261933069
           [1651218198.062980][2538:2543] CHIP:TOO:   GroupTable: 1 entries
@@ -69,7 +69,7 @@
       verification: |
           ./chip-tool groups add-group 0x0002 grp2 1 1
 
-          Verify the status is success on the TH Log:
+          Verify the "status is success" on the TH(Chip-tool)  Log:
 
           [1653484028.897698][11275:11280] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0004 Command 0x0000_0000
           [1653484028.897804][11275:11280] CHIP:TOO:   AddGroupResponse: {
@@ -85,7 +85,7 @@
       verification: |
           ./chip-tool groupkeymanagement read group-table 1 0
 
-          Verify the grouptable entries on the TH Log:
+          Verify the "grouptable entries" on the TH(Chip-tool)  Log:
 
           [1653484065.934504][11281:11286] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_003F Attribute 0x0000_0001 DataVersion: 1368205390
           [1653484065.934631][11281:11286] CHIP:TOO:   GroupTable: 2 entries
@@ -112,7 +112,7 @@
       verification: |
           ./chip-tool groups add-group 0x0003 grp3 1 1
 
-          Verify the status is success on the TH Log:
+          Verify the "status is success" on the TH(Chip-tool)  Log:
 
           [1653484116.857523][11289:11294] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0004 Command 0x0000_0000
           [1653484116.857675][11289:11294] CHIP:TOO:   AddGroupResponse: {
@@ -128,7 +128,7 @@
       verification: |
           ./chip-tool groupkeymanagement read group-table 1 0
 
-          Verify the grouptable entries on the TH Log:
+          Verify the "grouptable entries" on the TH(Chip-tool)  Log:
 
           [1653484156.968253][11299:11304] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_003F Attribute 0x0000_0001 DataVersion: 1368205390
           [1653484156.968414][11299:11304] CHIP:TOO:   GroupTable: 3 entries
@@ -162,7 +162,7 @@
       verification: |
           ./chip-tool groups add-group 0x0004 grp4 1 1
 
-          Verify the status is RESOURCE_EXHAUSTED on the TH Log:
+          Verify the "status is RESOURCE_EXHAUSTED" on the TH(Chip-tool)  Log:
 
           [1653484187.170553][11306:11311] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0004 Command 0x0000_0000
           [1653484187.170637][11306:11311] CHIP:TOO:   AddGroupResponse: {
@@ -178,7 +178,7 @@
       verification: |
           ./chip-tool groupkeymanagement read group-table 1 0
 
-          Verify the grouptable entries on the TH Log:
+          Verify the "grouptable entries" on the TH(Chip-tool)  Log:
 
           [1653484324.735216][11318:11323] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_003F Attribute 0x0000_0001 DataVersion: 1368205390
           [1653484324.735368][11318:11323] CHIP:TOO:   GroupTable: 3 entries
@@ -212,7 +212,7 @@
       verification: |
           ./chip-tool groups add-group 0x0000 grp6 1 1
 
-          Verify the status is CONSTRAINT_ERROR on the TH Log:
+          Verify the "status is CONSTRAINT_ERROR" on the TH(Chip-tool)  Log:
 
           [1653484439.884144][11341:11346] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0004 Command 0x0000_0000
           [1653484439.884258][11341:11346] CHIP:TOO:   AddGroupResponse: {
@@ -228,7 +228,7 @@
       verification: |
           ./chip-tool groups add-group 0x0005 grp5 1 1
 
-          Verify the status is UNSUPPORTED_ACCESS on the TH Log:
+          Verify the "status is UNSUPPORTED_ACCESS" on the TH(Chip-tool)  Log:
 
           [1658302176.951047][2747:2752] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0004 Command 0x0000_0000
           [1658302176.951103][2747:2752] CHIP:TOO:   AddGroupResponse: {
@@ -244,7 +244,7 @@
       verification: |
           ./chip-tool groups view-group 0x0001 1 1
 
-          Verify the status is success on the TH Log:
+          Verify the "status is success" on the TH(Chip-tool)  Log:
 
           1653484504.667714][11349:11354] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0004 Command 0x0000_0001
           [1653484504.667841][11349:11354] CHIP:TOO: ViewGroupResponse: {
@@ -261,7 +261,7 @@
       verification: |
           ./chip-tool groups view-group 0x0000 1 1
 
-          Verify the status is CONSTRAINT_ERROR on the TH Log:
+          Verify the "status is CONSTRAINT_ERROR" on the TH(Chip-tool)  Log:
 
           [1653484611.595344][11412:11417] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0004 Command 0x0000_0001
           [1653484611.595454][11412:11417] CHIP:TOO:   ViewGroupResponse: {
@@ -278,7 +278,7 @@
       verification: |
           ./chip-tool groups remove-group 0x0001 1 1
 
-          Verify the status is success on the TH Log:
+          Verify the "status is success" on the TH(Chip-tool)  Log:
 
           [1653484876.432744][11451:11456] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0004 Command 0x0000_0003
           [1653484876.432915][11451:11456] CHIP:TOO:   RemoveGroupResponse: {
@@ -294,7 +294,7 @@
       verification: |
           ./chip-tool groups view-group 0x0001 1 1
 
-          Verify the status is NOT_FOUND on the TH Log:
+          Verify the "status is NOT_FOUND" on the TH(Chip-tool)  Log:
 
           [1653484952.142387][11458:11463] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0004 Command 0x0000_0001
           [1653484952.142476][11458:11463] CHIP:TOO:   ViewGroupResponse: {
@@ -309,7 +309,7 @@
       verification: |
           ./chip-tool groupkeymanagement read group-table 1 0
 
-          Verify the grouptable entries on the TH Log:
+          Verify the "grouptable entries" on the TH(Chip-tool)  Log:
 
           [1655125356.123370][27657:27662] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_003F Attribute 0x0000_0001 DataVersion: 1860794324
           [1655125356.123494][27657:27662] CHIP:TOO:   GroupTable: 2 entries
@@ -336,7 +336,7 @@
       verification: |
           ./chip-tool groups remove-group 0x0000 1 1
 
-          Verify the status as CONSTRAINT_ERROR on the TH Log:
+          Verify the "status as CONSTRAINT_ERROR" on the TH(Chip-tool)  Log:
 
           [1653485045.328766][11473:11478] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0004 Command 0x0000_0003
           [1653485045.328896][11473:11478] CHIP:TOO:   RemoveGroupResponse: {
@@ -352,7 +352,7 @@
       verification: |
           ./chip-tool groups remove-group 0x0001 1 1
 
-          Verify the status is NOT_FOUND  on the TH Log:
+          Verify the "status is NOT_FOUND"  on the TH(Chip-tool)  Log:
 
           [1653485126.672869][11483:11488] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0004 Command 0x0000_0003
           [1653485126.672969][11483:11488] CHIP:TOO:   RemoveGroupResponse: {
@@ -366,7 +366,7 @@
       verification: |
           ./chip-tool groupkeymanagement read group-table 1 0
 
-          Verify the grouptable entries on the TH Log:
+          Verify the "grouptable entries" on the TH(Chip-tool)  Log:
 
           [1655125356.123370][27657:27662] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_003F Attribute 0x0000_0001 DataVersion: 1860794324
           [1655125356.123494][27657:27662] CHIP:TOO:   GroupTable: 2 entries
@@ -391,7 +391,7 @@
       verification: |
           ./chip-tool groups remove-all-groups 1 1
 
-          Verify the status is success on the TH Log:
+          Verify the "status is success" on the TH(Chip-tool)  Log:
 
           [1653485455.344097][11508:11513] CHIP:DMG:                              StatusIB =
           [1653485455.344141][11508:11513] CHIP:DMG:                              {
@@ -406,7 +406,7 @@
       verification: |
           ./chip-tool groups view-group 0x0001 1 1
 
-          Verify the status is NOT_FOUND on the TH Log:
+          Verify the "status is NOT_FOUND" on the TH(Chip-tool)  Log:
 
           [1653559917.259920][3227:3232] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0004 Command 0x0000_0001
           [1653559917.259993][3227:3232] CHIP:TOO:   ViewGroupResponse: {
@@ -421,7 +421,7 @@
       verification: |
           ./chip-tool groupkeymanagement read group-table 1 0
 
-          Verify the grouptable entries on the TH Log:
+          Verify the "grouptable entries" on the TH(Chip-tool)  Log:
 
           [1656332191.739327][27032:27037] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_003F Attribute 0x0000_0001 DataVersion: 3761602970
           [1656332191.739391][27032:27037] CHIP:TOO:   GroupTable: 0 entries
diff --git a/src/app/tests/suites/certification/Test_TC_G_2_3.yaml b/src/app/tests/suites/certification/Test_TC_G_2_3.yaml
index 83cb535..8bbdae9 100644
--- a/src/app/tests/suites/certification/Test_TC_G_2_3.yaml
+++ b/src/app/tests/suites/certification/Test_TC_G_2_3.yaml
@@ -33,7 +33,7 @@
       verification: |
           ./chip-tool groups add-group 0x0002 gp2 1 1
 
-          Verify the status is success and groupid on the TH Log:
+          Verify the "status is success and groupid" on the TH(Chip-tool)  Log:
 
           [1653552285.195099][2464:2469] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0004 Command 0x0000_0000
           [1653552285.197783][2464:2469] CHIP:TOO:   AddGroupResponse: {
@@ -47,7 +47,7 @@
       verification: |
           ./chip-tool groupkeymanagement read group-table 1 0
 
-          Verify the grouptable entries on the TH Log:
+          Verify the "grouptable entries" on the TH(Chip-tool)  Log:
 
           [1653552351.250570][2474:2479] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_003F Attribute 0x0000_0001 DataVersion: 1424397362
           [1653552351.253012][2474:2479] CHIP:TOO:   GroupTable: 1 entries
@@ -67,7 +67,7 @@
       verification: |
           ./chip-tool groups add-group 0x0003 gp3 1 1
 
-          Verify the status is success and groupid on the TH Log:
+          Verify the "status is success and groupid" on the TH(Chip-tool)  Log:
 
           [1653552417.870291][2482:2487] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0004 Command 0x0000_0000
           [1653552417.870407][2482:2487] CHIP:TOO:   AddGroupResponse: {
@@ -83,7 +83,7 @@
       verification: |
           ./chip-tool groupkeymanagement read group-table 1 0
 
-          Verify the grouptable entries on the TH Log:
+          Verify the "grouptable entries" on the TH(Chip-tool)  Log:
 
           [1653552448.373558][2491:2496] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_003F Attribute 0x0000_0001 DataVersion: 1424397362
           [1653552448.373710][2491:2496] CHIP:TOO:   GroupTable: 2 entries
@@ -110,7 +110,7 @@
       verification: |
           ./chip-tool groups get-group-membership [] 1 1
 
-          Verify the grouplist on the TH Log:
+          Verify the "grouplist" on the TH(Chip-tool)  Log:
 
           [1653552493.052711][2501:2506] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0004 Command 0x0000_0002
           [1653552493.052792][2501:2506] CHIP:TOO:   GetGroupMembershipResponse: {
@@ -128,7 +128,7 @@
       verification: |
           ./chip-tool groups get-group-membership [0002] 1 1
 
-          Verify the grouplist on the TH Log:
+          Verify the "grouplist" on the TH(Chip-tool)  Log:
 
 
           [1653294426.515523][3638:3643] CHIP:TOO:   GetGroupMembershipResponse: {
@@ -147,7 +147,7 @@
           ./chip-tool groups get-group-membership [0002,0003] 1 1
 
 
-          Verify grouplist entries on the TH Log:
+          Verify "grouplist entries" on the TH(Chip-tool)  Log:
 
           [1653294490.030740][3646:3651] CHIP:TOO:   GetGroupMembershipResponse: {
           [1653294490.030775][3646:3651] CHIP:TOO:     capacity: null
@@ -162,7 +162,7 @@
       verification: |
           ./chip-tool groups remove-all-groups 1 1
 
-          Verify the status is success on the TH Log:
+          Verify the "status is success" on the TH(Chip-tool)  Log:
 
           [1651224377.831704][2989:2994] CHIP:DMG:                                StatusIB =
           [1651224377.831757][2989:2994] CHIP:DMG:                                {
@@ -178,7 +178,7 @@
       verification: |
           ./chip-tool identify identify 0x0078 1 1
 
-          Verify the status is success on the TH Log:
+          Verify the "status is success" on the TH(Chip-tool)  Log:
 
           [1658306666.592846][3044:3049] CHIP:DMG:                                StatusIB =
           [1658306666.592889][3044:3049] CHIP:DMG:                                {
@@ -191,7 +191,7 @@
       verification: |
           ./chip-tool identify read identify-time 1 1
 
-          Verify the identifytime on the TH Log:
+          Verify the "identifytime" on the TH(Chip-tool)  Log:
 
           [1658306684.629338][3050:3055] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0003 Attribute 0x0000_0000 DataVersion: 3871913205
           [1658306684.629394][3050:3055] CHIP:TOO:   identify time: 102
@@ -205,7 +205,7 @@
       verification: |
           ./chip-tool groups  add-group-if-identifying 0x0006 gp6 1 1
 
-          Verify the status is success on the TH Log:
+          Verify the "status is success" on the TH(Chip-tool)  Log:
 
           [1653552667.307794][2571:2576] CHIP:DMG:                                StatusIB =
           [1653552667.307831][2571:2576] CHIP:DMG:                                {
@@ -218,7 +218,7 @@
       verification: |
           ./chip-tool groupkeymanagement read group-table 1 0
 
-          Verify grouplist entries on the TH Log:
+          Verify "grouplist entries" on the TH(Chip-tool)  Log:
 
           [1658306579.092336][3028:3033] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_003F Attribute 0x0000_0001 DataVersion: 656741762
           [1658306579.094919][3028:3033] CHIP:TOO:   GroupTable: 1 entries
@@ -239,7 +239,7 @@
       verification: |
           ./chip-tool groups  add-group-if-identifying 0x0007 gp7 1 1
 
-          Verify the status is success on the TH Log:
+          Verify the "status is success" on the TH(Chip-tool)  Log:
 
           [1658306847.237724][3125:3130] CHIP:DMG:                                StatusIB =
           [1658306847.237765][3125:3130] CHIP:DMG:                                {
@@ -252,7 +252,7 @@
       verification: |
           ./chip-tool groupkeymanagement read group-table 1 0
 
-          Verify the grouplist entries on the TH Log:
+          Verify the "grouplist entries" on the TH(Chip-tool)  Log:
 
           [1658306870.013290][3132:3137] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_003F Attribute 0x0000_0001 DataVersion: 656741774
           [1658306870.013392][3132:3137] CHIP:TOO:   GroupTable: 2 entries
@@ -279,7 +279,7 @@
       verification: |
           ./chip-tool groups  add-group-if-identifying 0x0008 gp8 1 1
 
-          Verify the status is success on the TH Log:
+          Verify the "status is success" on the TH(Chip-tool)  Log:
 
           [1653552667.307794][2571:2576] CHIP:DMG:                                StatusIB =
           [1653552667.307831][2571:2576] CHIP:DMG:                                {
@@ -294,7 +294,7 @@
       verification: |
           ./chip-tool groups  add-group-if-identifying 0x0009 gp9 1 1
 
-          Verify the status is success on the TH Log:
+          Verify the "status is success" on the TH(Chip-tool)  Log:
 
           [1658317372.589336][4296:4301] CHIP:DMG:                                StatusIB =
           [1658317372.589363][4296:4301] CHIP:DMG:                                {
@@ -309,7 +309,7 @@
       verification: |
           ./chip-tool groupkeymanagement read group-table 1 0
 
-          Verify the grouptable entries on the TH Log:
+          Verify the "grouptable entries" on the TH(Chip-tool)  Log:
 
           [1658309507.902666][3452:3457] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_003F Attribute 0x0000_0001 DataVersion: 656741784
           [1658309507.902779][3452:3457] CHIP:TOO:   GroupTable: 3 entries
@@ -341,7 +341,7 @@
       verification: |
           ./chip-tool groups remove-all-groups 1 1
 
-          Verify the status is success on the TH Log:
+          Verify the "status is success" on the TH(Chip-tool)  Log:
 
           [1651224377.831704][2989:2994] CHIP:DMG:                                StatusIB =
           [1651224377.831757][2989:2994] CHIP:DMG:                                {
@@ -358,7 +358,7 @@
           ./chip-tool groups  add-group-if-identifying 0x0000 gp45 1 1
 
 
-          Verify the status is constraint error on the TH Log:
+          Verify the "status is constraint error" on the TH(Chip-tool)  Log:
 
           [1658307266.719438][3251:3256] CHIP:DMG:                                StatusIB =
           [1658307266.719482][3251:3256] CHIP:DMG:                                {
@@ -373,7 +373,7 @@
       verification: |
           ./chip-tool groups  add-group-if-identifying 0x0045 gp46 1 1
 
-          Verify the status is unsupported access on the TH Log:
+          Verify the "status is unsupported access" on the TH(Chip-tool)  Log:
 
           [1658307298.568727][3257:3262] CHIP:DMG:                                StatusIB =
           [1658307298.568761][3257:3262] CHIP:DMG:                                {
@@ -388,7 +388,7 @@
       verification: |
           ./chip-tool identify identify 0x0000 1 1
 
-          Verify the status is success on the TH Log:
+          Verify the "status is success" on the TH(Chip-tool)  Log:
 
           [1658307387.097433][3268:3273] CHIP:DMG:                                StatusIB =
           [1658307387.097464][3268:3273] CHIP:DMG:                                {
@@ -401,7 +401,7 @@
       verification: |
           ./chip-tool identify read identify-time 1 1
 
-          Verify the identify time on the TH Log:
+          Verify the "identify time" on the TH(Chip-tool)  Log:
 
           [1658307393.820520][3274:3279] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0003 Attribute 0x0000_0000 DataVersion: 3871913767
           [1658307393.820575][3274:3279] CHIP:TOO:   identify time: 0
@@ -414,7 +414,7 @@
       verification: |
           ./chip-tool groups  add-group-if-identifying 0x0004 gp4 1 1
 
-          Verify the status is success on the TH Log:
+          Verify the "status is success" on the TH(Chip-tool)  Log:
 
           [1651224746.146005][3038:3043] CHIP:DMG:                                StatusIB =
           [1651224746.146038][3038:3043] CHIP:DMG:                                {
@@ -427,7 +427,7 @@
       verification: |
           ./chip-tool groupkeymanagement read group-table 1 0
 
-          Verify the grouptable entries on the TH Log:
+          Verify the "grouptable entries" on the TH(Chip-tool)  Log:
 
           [1658317914.656772][4650:4655] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_003F Attribute 0x0000_0001 DataVersion: 3844079664
           [1658317914.656843][4650:4655] CHIP:TOO:   GroupTable: 0 entries
diff --git a/src/app/tests/suites/certification/Test_TC_G_3_1.yaml b/src/app/tests/suites/certification/Test_TC_G_3_1.yaml
index 5476976..36dbb0a 100644
--- a/src/app/tests/suites/certification/Test_TC_G_3_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_G_3_1.yaml
@@ -24,30 +24,41 @@
     endpoint: 0
 
 tests:
+    - label: "Note"
+      verification: |
+          Chip-tool command used below are an example to verify the  DUT as client test cases. For certification test, we expect DUT should have a capability or way to run the equivalent command.
+      disabled: true
+
     - label: "DUT reads NameSupport attribute from TH"
       PICS: G.C.A0000
       verification: |
+          Product maker needs to provide instructions for how to trigger the command on the DUT. For comparison, the DUT behavior for this test step can be simulated using chip-tool (when DUT is a commissioner/Client)
+
+
           ./chip-tool groups read name-support 1 1
 
-          Verify on the TH Log:
+          Verify the "NameSupport attribute response" on the TH(Allcluster-app) Log:
 
-          [1657706054.756051][5404:5409] CHIP:DMG:                                DataVersion = 0x80c3ec09,
-          [1657706054.756108][5404:5409] CHIP:DMG:                                AttributePathIB =
-          [1657706054.756162][5404:5409] CHIP:DMG:                                {
-          [1657706054.756218][5404:5409] CHIP:DMG:                                        Endpoint = 0x1,
-          [1657706054.756274][5404:5409] CHIP:DMG:                                        Cluster = 0x4,
-          [1657706054.756330][5404:5409] CHIP:DMG:                                        Attribute = 0x0000_0000,
-          [1657706054.756384][5404:5409] CHIP:DMG:                                }
-          [1657706054.756435][5404:5409] CHIP:DMG:
-          [1657706054.756491][5404:5409] CHIP:DMG:                                Data = 128,
-          [1657706054.756536][5404:5409] CHIP:DMG:                        },
-          [1657706054.756635][5404:5409] CHIP:DMG:                },
-          [1657706054.756684][5404:5409] CHIP:DMG:
-          [1657706054.756723][5404:5409] CHIP:DMG:        ],
-          [1657706054.756770][5404:5409] CHIP:DMG:
-          [1657706054.756810][5404:5409] CHIP:DMG:        SuppressResponse = true,
-          [1657706054.756851][5404:5409] CHIP:DMG:        InteractionModelRevision = 1
-          [1657706054.756890][5404:5409] CHIP:DMG: }
-          [1657706054.757195][5404:5409] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0004 Attribute 0x0000_0000 DataVersion: 2160323593
-          [1657706054.757284][5404:5409] CHIP:TOO:   name support: 128
+          [1659609024.739969][3355:3355] CHIP:EM: Received message of type 0x2 with protocolId (0, 1) and MessageCounter:210252834 on exchange 15944r
+          [1659609024.740058][3355:3355] CHIP:EM: Handling via exchange: 15944r, Delegate: 0xaaaac00e4f08
+          [1659609024.740133][3355:3355] CHIP:IM: Received Read request
+          [1659609024.740275][3355:3355] CHIP:DMG: ReadRequestMessage =
+          [1659609024.740330][3355:3355] CHIP:DMG: {
+          [1659609024.740375][3355:3355] CHIP:DMG:         AttributePathIBs =
+          [1659609024.740429][3355:3355] CHIP:DMG:         [
+          [1659609024.740479][3355:3355] CHIP:DMG:                 AttributePathIB =
+          [1659609024.740535][3355:3355] CHIP:DMG:                 {
+          [1659609024.740594][3355:3355] CHIP:DMG:                         Endpoint = 0x1,
+          [1659609024.740659][3355:3355] CHIP:DMG:                         Cluster = 0x4,
+          [1659609024.740725][3355:3355] CHIP:DMG:                         Attribute = 0x0000_0000,
+          [1659609024.740810][3355:3355] CHIP:DMG:                 }
+          [1659609024.740872][3355:3355] CHIP:DMG:
+          [1659609024.740925][3355:3355] CHIP:DMG:         ],
+          [1659609024.740983][3355:3355] CHIP:DMG:
+          [1659609024.741037][3355:3355] CHIP:DMG:         isFabricFiltered = true,
+          [1659609024.741091][3355:3355] CHIP:DMG:         InteractionModelRevision = 1
+          [1659609024.741140][3355:3355] CHIP:DMG: },
+          [1659609024.741283][3355:3355] CHIP:DMG: IM RH moving to [GeneratingReports]
+          [1659609024.741436][3355:3355] CHIP:DMG: Building Reports for ReadHandler with LastReportGeneration = 0 DirtyGeneration = 0
+          [1659609024.741494][3355:3355] CHIP:DMG: <RE:Run> Cluster 4, Attribute 0 is dirty
       disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_G_3_2.yaml b/src/app/tests/suites/certification/Test_TC_G_3_2.yaml
index 6188907..eb88b75 100644
--- a/src/app/tests/suites/certification/Test_TC_G_3_2.yaml
+++ b/src/app/tests/suites/certification/Test_TC_G_3_2.yaml
@@ -24,19 +24,26 @@
     endpoint: 0
 
 tests:
+    - label: "Note"
+      verification: |
+          Chip-tool command used below are an example to verify the  DUT as client test cases. For certification test, we expect DUT should have a capability or way to run the equivalent command.
+      disabled: true
+
     - label: "DUT sends GetGroupMembership command to TH"
       PICS: G.C.C02.Tx
       verification: |
+          Product maker needs to provide instructions for how to trigger the command on the DUT. For comparison, the DUT behavior for this test step can be simulated using chip-tool (when DUT is a commissioner/Client)
+
           ./chip-tool groups get-group-membership "[33]" 1 1
 
-          Verify on the TH Log:
+          Verify the "GetGroupMembership command response" on the TH(Allcluster-app)  Log:
 
-          [1657095129.620336][3411:3416] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0004 Command 0x0000_0002
-          [1657095129.620430][3411:3416] CHIP:TOO:   GetGroupMembershipResponse: {
-          [1657095129.620457][3411:3416] CHIP:TOO:     capacity: null
-          [1657095129.620506][3411:3416] CHIP:TOO:     groupList: 1 entries
-          [1657095129.620539][3411:3416] CHIP:TOO:       [1]: 33
-          [1657095129.620564][3411:3416] CHIP:TOO:    }
+
+          [1659609064.738513][3355:3355] CHIP:DMG: },
+          [1659609064.738580][3355:3355] CHIP:DMG: AccessControl: checking f=1 a=c s=0x000000000001B669 t= c=0x0000_0004 e=1 p=o
+          [1659609064.738619][3355:3355] CHIP:DMG: AccessControl: allowed
+          [1659609064.738648][3355:3355] CHIP:DMG: Received command for Endpoint=1 Cluster=0x0000_0004 Command=0x0000_0002
+          [1659609064.738825][3355:3355] CHIP:DMG: ICR moving to [ Preparing]
       disabled: true
 
     - label: "DUT sends RemoveGroup command to TH"
@@ -44,13 +51,13 @@
       verification: |
           ./chip-tool groups remove-group 0x0021 1 1
 
-          Verify on the TH Log:
-
-          [1657095157.846618][3417:3422] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0004 Command 0x0000_0003
-          [1657095157.846703][3417:3422] CHIP:TOO:   RemoveGroupResponse: {
-          [1657095157.846761][3417:3422] CHIP:TOO:     status: 0
-          [1657095157.846804][3417:3422] CHIP:TOO:     groupId: 21
-          [1657095157.846845][3417:3422] CHIP:TOO:    }
+          Verify the "RemoveGroup command response" on the TH(Allcluster-app)  Log:
+          [1659609128.634829][3355:3355] CHIP:DMG:         InteractionModelRevision = 1
+          [1659609128.634852][3355:3355] CHIP:DMG: },
+          [1659609128.634916][3355:3355] CHIP:DMG: AccessControl: checking f=1 a=c s=0x000000000001B669 t= c=0x0000_0004 e=1 p=m
+          [1659609128.634952][3355:3355] CHIP:DMG: AccessControl: allowed
+          [1659609128.634981][3355:3355] CHIP:DMG: Received command for Endpoint=1 Cluster=0x0000_0004 Command=0x0000_0003
+          [1659609128.635123][3355:3355] CHIP:DMG: ICR moving to [ Preparing]
       disabled: true
 
     - label: "DUT sends RemoveAllGroups command to TH"
@@ -58,38 +65,14 @@
       verification: |
           ./chip-tool groups  remove-all-groups 1 1
 
-          Verify on the TH Log:
+          Verify the "RemoveAllGroups command response"  on the TH(Allcluster-app)  Log:
 
-          [1657706539.252762][5487:5492] CHIP:DMG: ICR moving to [ResponseRe]
-          [1657706539.252820][5487:5492] CHIP:DMG: InvokeResponseMessage =
-          [1657706539.252851][5487:5492] CHIP:DMG: {
-          [1657706539.252881][5487:5492] CHIP:DMG:        suppressResponse = false,
-          [1657706539.252912][5487:5492] CHIP:DMG:        InvokeResponseIBs =
-          [1657706539.252950][5487:5492] CHIP:DMG:        [
-          [1657706539.252979][5487:5492] CHIP:DMG:                InvokeResponseIB =
-          [1657706539.253020][5487:5492] CHIP:DMG:                {
-          [1657706539.253051][5487:5492] CHIP:DMG:                        CommandStatusIB =
-          [1657706539.253089][5487:5492] CHIP:DMG:                        {
-          [1657706539.253125][5487:5492] CHIP:DMG:                                CommandPathIB =
-          [1657706539.253167][5487:5492] CHIP:DMG:                                {
-          [1657706539.253213][5487:5492] CHIP:DMG:                                        EndpointId = 0x1,
-          [1657706539.253259][5487:5492] CHIP:DMG:                                        ClusterId = 0x4,
-          [1657706539.253298][5487:5492] CHIP:DMG:                                        CommandId = 0x4,
-          [1657706539.253338][5487:5492] CHIP:DMG:                                },
-          [1657706539.253379][5487:5492] CHIP:DMG:
-          [1657706539.253415][5487:5492] CHIP:DMG:                                StatusIB =
-          [1657706539.253457][5487:5492] CHIP:DMG:                                {
-          [1657706539.253503][5487:5492] CHIP:DMG:                                        status = 0x00 (SUCCESS),
-          [1657706539.253543][5487:5492] CHIP:DMG:                                },
-          [1657706539.253583][5487:5492] CHIP:DMG:
-          [1657706539.253619][5487:5492] CHIP:DMG:                        },
-          [1657706539.253659][5487:5492] CHIP:DMG:
-          [1657706539.253690][5487:5492] CHIP:DMG:                },
-          [1657706539.253727][5487:5492] CHIP:DMG:
-          [1657706539.253757][5487:5492] CHIP:DMG:        ],
-          [1657706539.253794][5487:5492] CHIP:DMG:
-          [1657706539.253824][5487:5492] CHIP:DMG:        InteractionModelRevision = 1
-          [1657706539.253852][5487:5492] CHIP:DMG: },
+          [1659609158.078774][3355:3355] CHIP:DMG:         InteractionModelRevision = 1
+          [1659609158.078797][3355:3355] CHIP:DMG: },
+          [1659609158.078876][3355:3355] CHIP:DMG: AccessControl: checking f=1 a=c s=0x000000000001B669 t= c=0x0000_0004 e=1 p=m
+          [1659609158.078911][3355:3355] CHIP:DMG: AccessControl: allowed
+          [1659609158.078949][3355:3355] CHIP:DMG: Received command for Endpoint=1 Cluster=0x0000_0004 Command=0x0000_0004
+          [1659609158.079188][3355:3355] CHIP:DMG: ICR moving to [ Preparing]
       disabled: true
 
     - label: "DUT sends AddGroupIfIdentifying command to TH"
@@ -97,36 +80,13 @@
       verification: |
           ./chip-tool groups  add-group-if-identifying 0x0052 gp54 1 0
 
-          Verify on the TH Log:
+          Verify the "AddGroupIfIdentifying command response" on the TH(Allcluster-app)  Log:
 
-          [1657706689.647809][5502:5507] CHIP:DMG: ICR moving to [ResponseRe]
-          [1657706689.647906][5502:5507] CHIP:DMG: InvokeResponseMessage =
-          [1657706689.647954][5502:5507] CHIP:DMG: {
-          [1657706689.648014][5502:5507] CHIP:DMG:        suppressResponse = false,
-          [1657706689.648069][5502:5507] CHIP:DMG:        InvokeResponseIBs =
-          [1657706689.648143][5502:5507] CHIP:DMG:        [
-          [1657706689.648188][5502:5507] CHIP:DMG:                InvokeResponseIB =
-          [1657706689.648263][5502:5507] CHIP:DMG:                {
-          [1657706689.648311][5502:5507] CHIP:DMG:                        CommandStatusIB =
-          [1657706689.648384][5502:5507] CHIP:DMG:                        {
-          [1657706689.648460][5502:5507] CHIP:DMG:                                CommandPathIB =
-          [1657706689.648528][5502:5507] CHIP:DMG:                                {
-          [1657706689.648607][5502:5507] CHIP:DMG:                                        EndpointId = 0x0,
-          [1657706689.648689][5502:5507] CHIP:DMG:                                        ClusterId = 0x4,
-          [1657706689.648755][5502:5507] CHIP:DMG:                                        CommandId = 0x5,
-          [1657706689.648835][5502:5507] CHIP:DMG:                                },
-          [1657706689.648922][5502:5507] CHIP:DMG:
-          [1657706689.648979][5502:5507] CHIP:DMG:                                StatusIB =
-          [1657706689.649024][5502:5507] CHIP:DMG:                                {
-          [1657706689.649070][5502:5507] CHIP:DMG:                                        status = 0x00 (SUCCESS),
-          [1657706689.649167][5502:5507] CHIP:DMG:                                },
-          [1657706689.649213][5502:5507] CHIP:DMG:
-          [1657706689.649248][5502:5507] CHIP:DMG:                        },
-          [1657706689.649296][5502:5507] CHIP:DMG:
-          [1657706689.649323][5502:5507] CHIP:DMG:                },
-          [1657706689.649365][5502:5507] CHIP:DMG:
-          [1657706689.649390][5502:5507] CHIP:DMG:        ],
-          [1657706689.649431][5502:5507] CHIP:DMG:
-          [1657706689.649457][5502:5507] CHIP:DMG:        InteractionModelRevision = 1
-          [1657706689.649491][5502:5507] CHIP:DMG: },
+          [1659609228.441181][3355:3355] CHIP:DMG:
+          [1659609228.441208][3355:3355] CHIP:DMG:         InteractionModelRevision = 1
+          [1659609228.441234][3355:3355] CHIP:DMG: },
+          [1659609228.441306][3355:3355] CHIP:DMG: AccessControl: checking f=1 a=c s=0x000000000001B669 t= c=0x0000_0004 e=0 p=m
+          [1659609228.441346][3355:3355] CHIP:DMG: AccessControl: allowed
+          [1659609228.441378][3355:3355] CHIP:DMG: Received command for Endpoint=0 Cluster=0x0000_0004 Command=0x0000_0005
+          [1659609228.441436][3355:3355] CHIP:DMG: ICR moving to [ Preparing]
       disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_IDM_1_1.yaml b/src/app/tests/suites/certification/Test_TC_IDM_1_1.yaml
index 9cd88fe..bf513be 100644
--- a/src/app/tests/suites/certification/Test_TC_IDM_1_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_IDM_1_1.yaml
@@ -24,12 +24,17 @@
     endpoint: 0
 
 tests:
+    - label: "Note"
+      verification: |
+          Chip-tool command used below are an example to verify the  DUT as client test cases. For certification test, we expect DUT should have a capability or way to run the equivalent command.
+      disabled: true
+
     - label:
           "DUT sends the Invoke Request Message to the TH. The Message should
           contain one valid CommandDataIB, which has the specific Endpoint,
           Specific Cluster and Specific Command."
       verification: |
-          In case of chip tool, here is an example command to use
+          Product maker needs to provide instructions for how to trigger the command on the DUT. For comparison, the DUT behavior for this test step can be simulated using chip-tool (when DUT is a commissioner/Client)
 
           ./chip-tool onoff on 1 1
 
@@ -93,7 +98,7 @@
           Specific Cluster and Specific Command. Send 2 more Invoke Request
           Messages to the TH."
       verification: |
-          In case of chip tool, here is an example command to use
+          Product maker needs to provide instructions for how to trigger the command on the DUT. For comparison, the DUT behavior for this test step can be simulated using chip-tool (when DUT is a commissioner/Client)
           ./chip-tool onoff off 1 1
 
           On TH all-clusters-app, verify that we are getting EndpointID, CommandID, ClusterID in the response data (as below) matching with the data sent in the above command
diff --git a/src/app/tests/suites/certification/Test_TC_IDM_1_2.yaml b/src/app/tests/suites/certification/Test_TC_IDM_1_2.yaml
index 842f223..ee1bd01 100644
--- a/src/app/tests/suites/certification/Test_TC_IDM_1_2.yaml
+++ b/src/app/tests/suites/certification/Test_TC_IDM_1_2.yaml
@@ -326,7 +326,7 @@
            ./chip-tool onoff on 1 1 --timedInteractionTimeoutMs 100
           On TH, verify DUT  responsds as UNSUPPORTED_ACCESS  for the data sent in the above command
           [1659422136.353455][2014:2019] CHIP:DMG:
-          [1659422136.353482][2014:2019] CHIP:DMG: 	InteractionModelRevision = 1
+          [1659422136.353482][2014:2019] CHIP:DMG:         InteractionModelRevision = 1
           [1659422136.353510][2014:2019] CHIP:DMG: },
           [1659422136.353575][2014:2019] CHIP:DMG: Received Command Response Status for Endpoint=1 Cluster=0x0000_0006 Command=0x0000_0001 Status=0x7e
           [1659422136.353612][2014:2019] CHIP:TOO: Error: IM Error 0x0000057E: General error: 0x7e (UNSUPPORTED_ACCESS)
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 720bd06..b3797d4 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
@@ -24,6 +24,11 @@
     endpoint: 0
 
 tests:
+    - label: "Note"
+      verification: |
+          Chip-tool command used below are an example to verify the  DUT as client test cases. For certification test, we expect DUT should have a capability or way to run the equivalent command.
+      disabled: true
+
     - label:
           "DUT sends the Read Request Message to the TH to read one attribute on
           a given cluster and endpoint. AttributePath = [[Endpoint = Specific
@@ -31,7 +36,7 @@
           Attribute]] On receipt of this message, TH should send a report data
           action with the attribute value to the DUT."
       verification: |
-          In case of chip tool, here is an example command to use
+          Product maker needs to provide instructions for how to trigger the command on the DUT. For comparison, the DUT behavior for this test step can be simulated using chip-tool (when DUT is a commissioner/Client)
 
           ./chip-tool identify read identify-time 1 1
 
@@ -56,7 +61,7 @@
           [1655720917.721144][10909:10909] CHIP:DMG: },
           [1655720917.721267][10909:10909] CHIP:DMG: IM RH moving to [GeneratingReports]
 
-          On DUT as a client side, verify that TH all-clusters-app sent success response
+          If the DUT has to provision to verify the logs,  verify that TH all-clusters-app sent success response
 
           [1657881522.001890][2575:2580] CHIP:DMG: }
           [1657881522.002053][2575:2580] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0003 Attribute 0x0000_0000 DataVersion: 3999381333
@@ -71,7 +76,7 @@
           TH should send a report data action with the attribute value to the
           DUT."
       verification: |
-          In case of chip tool, here is an example command to use
+          Product maker needs to provide instructions for how to trigger the command on the DUT. For comparison, the DUT behavior for this test step can be simulated using chip-tool (when DUT is a commissioner/Client)
 
           ./chip-tool any read-by-id 0x3 0xFFFFFFFF 1 0
 
@@ -99,7 +104,7 @@
 
 
 
-          On DUT as a client side, verify that TH all-clusters-app sent success response
+          If the DUT has to provision to verify the logs, verify that TH all-clusters-app sent success response
           [1657881584.166241][2584:2589] CHIP:DMG: }
           [1657881584.166599][2584:2589] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0003 Attribute 0x0000_0000 DataVersion: 4079829024
           [1657881584.166672][2584:2589] CHIP:TOO:   identify time: 0
@@ -133,12 +138,12 @@
           message, TH should send a report data action with the attribute values
           to the DUT."
       verification: |
-          In case of chip tool, here is an example command to use
+          Product maker needs to provide instructions for how to trigger the command on the DUT. For comparison, the DUT behavior for this test step can be simulated using chip-tool (when DUT is a commissioner/Client)
 
           ./chip-tool any read-by-id 0xFFFFFFFF 0xFFFFFFFF  1 0xFFFF
 
           verify On TH(Reference app) receives the right Read Request Message for the data sent in the above command and
-          On DUT as a client side, verify that TH all-clusters-app sent success response with attribute values
+          If the DUT has to provision to verify the logs, verify that TH all-clusters-app sent success response with attribute values
       disabled: true
 
     - label:
@@ -147,6 +152,7 @@
           Attribute = Specific Attribute]] On receipt of this message, TH should
           send a report data action with the attribute value to the DUT."
       verification: |
+          Product maker needs to provide instructions for how to trigger the command on the DUT. For comparison, the DUT behavior for this test step can be simulated using chip-tool (when DUT is a commissioner/Client)
           ./chip-tool any read-by-id 0xFFFFFFFF 0xFFFD  1 0xFFFF
 
           verify On TH(Reference app) receives the right Read Request Message for the data sent in the above command
@@ -168,7 +174,7 @@
           [1655721447.463382][10909:10909] CHIP:DMG: },
           [1655721447.463503][10909:10909] CHIP:DMG: IM RH moving to [GeneratingReports]
 
-          On DUT as a client side, verify that TH all-clusters-app sent success response with attribute values
+          If the DUT has to provision to verify the logs, verify that TH all-clusters-app sent success response with attribute values
       disabled: true
 
     - label:
@@ -177,7 +183,7 @@
           Specific ClusterID]] On receipt of this message, TH should send a
           report data action with the attribute value to the DUT."
       verification: |
-          In case of chip tool, here is an example command to use
+          Product maker needs to provide instructions for how to trigger the command on the DUT. For comparison, the DUT behavior for this test step can be simulated using chip-tool (when DUT is a commissioner/Client)
 
           ./chip-tool any read-by-id 0x03 0xFFFFFFFF  1 0xFFFF
           verify On TH(Reference app) receives the right Read Request Message for the data sent in the above command
@@ -201,7 +207,7 @@
           [1655721586.588403][10909:10909] CHIP:DMG: IM RH moving to [GeneratingReports]
           [1655721586.588510][10909:10909] CHIP:DMG: Building Reports for ReadHandler with LastReportGeneration = 0 DirtyGeneration = 0
 
-          On DUT as a client side, verify that TH all-clusters-app sent success response with attribute values
+          If the DUT has to provision to verify the logs, verify that TH all-clusters-app sent success response with attribute values
           [1657881729.900518][2608:2613] CHIP:DMG: }
           [1657881729.901108][2608:2613] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0003 Attribute 0x0000_0000 DataVersion: 4079829024
           [1657881729.901182][2608:2613] CHIP:TOO:   identify time: 0
@@ -259,7 +265,7 @@
           receipt of this message, TH should send a report data action with the
           attribute value to the DUT."
       verification: |
-          In case of chip tool, here is an example command to use
+          Product maker needs to provide instructions for how to trigger the command on the DUT. For comparison, the DUT behavior for this test step can be simulated using chip-tool (when DUT is a commissioner/Client)
 
           ./chip-tool any read-by-id 0x03 0x01  1 0xFFFF
           verify On TH(Reference app) receives the right Read Request Message for the data sent in the above command
@@ -283,7 +289,7 @@
           [1655721699.305990][10909:10909] CHIP:DMG: IM RH moving to [GeneratingReports]
 
 
-          On DUT as a client side, verify that TH all-clusters-app sent success response with attribute values
+          If the DUT has to provision to verify the logs, verify that TH all-clusters-app sent success response with attribute values
           [1657881792.350417][2616:2621] CHIP:DMG: }
           [1657881792.350641][2616:2621] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0003 Attribute 0x0000_0001 DataVersion: 4079829024
           [1657881792.350742][2616:2621] CHIP:TOO:   identify type: 2
@@ -298,7 +304,7 @@
           Specific Endpoint]] On receipt of this message, TH should send a
           report data action with the attribute value to the DUT."
       verification: |
-          In case of chip tool, here is an example command to use
+          Product maker needs to provide instructions for how to trigger the command on the DUT. For comparison, the DUT behavior for this test step can be simulated using chip-tool (when DUT is a commissioner/Client)
 
           ./chip-tool any read-by-id 0xFFFFFFFF 0xFFFFFFFF  1 1
 
@@ -324,7 +330,7 @@
 
 
 
-          On DUT as a client side, verify that TH all-clusters-app sent success response with attribute values
+          If the DUT has to provision to verify the logs, verify that TH all-clusters-app sent success response with attribute values
       disabled: true
 
     - label:
@@ -334,7 +340,7 @@
           attribute]] On receipt of this message, TH should send a report data
           action with the attribute value to the DUT."
       verification: |
-          In case of chip tool, here is an example command to use
+          Product maker needs to provide instructions for how to trigger the command on the DUT. For comparison, the DUT behavior for this test step can be simulated using chip-tool (when DUT is a commissioner/Client)
 
           ./chip-tool any read-by-id 0xFFFFFFFF 0xFFFD  1 0
 
@@ -360,7 +366,7 @@
           [1655721935.484595][10909:10909] CHIP:DMG: IM RH moving to [GeneratingReports]
 
 
-          On DUT as a client side, verify that TH all-clusters-app sent success response with attribute values
+          If the DUT has to provision to verify the logs, verify that TH all-clusters-app sent success response with attribute values
           [1657881935.225146][2631:2636] CHIP:DMG: }
           [1657881935.225620][2631:2636] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0003 Attribute 0x0000_FFFD DataVersion: 4079829024
           [1657881935.225700][2631:2636] CHIP:TOO:   ClusterRevision: 4
@@ -422,7 +428,7 @@
           data type bool."
       PICS: MCORE.IDM.C.ReadRequest.Attribute.DataType_Bool
       verification: |
-          In case of chip tool, here is an example command to use
+          Product maker needs to provide instructions for how to trigger the command on the DUT. For comparison, the DUT behavior for this test step can be simulated using chip-tool (when DUT is a commissioner/Client)
 
            ./chip-tool onoff read on-off 1 1
 
@@ -449,7 +455,7 @@
           [1655722298.459820][10909:10909] CHIP:DMG: IM RH moving to [GeneratingReports]
 
 
-          On DUT as a client side, verify that TH all-clusters-app sent success response with attribute values
+          If the DUT has to provision to verify the logs, verify that TH all-clusters-app sent success response with attribute values
           [1657881978.415828][2640:2645] CHIP:DMG: }
           [1657881978.416014][2640:2645] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0006 Attribute 0x0000_0000 DataVersion: 4019194565
           [1657881978.416091][2640:2645] CHIP:TOO:   OnOff: FALSE
@@ -461,7 +467,7 @@
           data type string."
       PICS: MCORE.IDM.C.ReadRequest.Attribute.DataType_String
       verification: |
-          In case of chip tool, here is an example command to use
+          Product maker needs to provide instructions for how to trigger the command on the DUT. For comparison, the DUT behavior for this test step can be simulated using chip-tool (when DUT is a commissioner/Client)
 
           ./chip-tool modeselect read description  1 1
           verify On TH(Reference app) receives the right Read Request Message for the data sent in the above command
@@ -487,7 +493,7 @@
           [1655722750.453457][10909:10909] CHIP:DMG: IM RH moving to [GeneratingReports]
 
 
-          On DUT as a client side, verify that TH all-clusters-app sent success response with attribute values
+          If the DUT has to provision to verify the logs, verify that TH all-clusters-app sent success response with attribute values
           [1657882077.867099][2655:2660] CHIP:DMG: }
           [1657882077.867278][2655:2660] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0050 Attribute 0x0000_0000 DataVersion: 321966114
           [1657882077.867352][2655:2660] CHIP:TOO:   Description: Coffee
@@ -499,7 +505,7 @@
           data type unsigned integer."
       PICS: MCORE.IDM.C.ReadRequest.Attribute.DataType_UnsignedInteger
       verification: |
-          In case of chip tool, here is an example command to use
+          Product maker needs to provide instructions for how to trigger the command on the DUT. For comparison, the DUT behavior for this test step can be simulated using chip-tool (when DUT is a commissioner/Client)
 
           ./chip-tool any read-by-id 0x3 0x1 1 0
 
@@ -526,7 +532,7 @@
 
 
 
-          On DUT as a client side, verify that TH all-clusters-app sent success response with attribute values
+          If the DUT has to provision to verify the logs, verify that TH all-clusters-app sent success response with attribute values
           [1657882043.053353][2648:2653] CHIP:DMG: }
           [1657882043.053561][2648:2653] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0003 Attribute 0x0000_0001 DataVersion: 4079829024
           [1657882043.053662][2648:2653] CHIP:TOO:   identify type: 2
@@ -538,7 +544,7 @@
           data type signed integer."
       PICS: MCORE.IDM.C.ReadRequest.Attribute.DataType_SignedInteger
       verification: |
-          In case of chip tool, here is an example command to use
+          Product maker needs to provide instructions for how to trigger the command on the DUT. For comparison, the DUT behavior for this test step can be simulated using chip-tool (when DUT is a commissioner/Client)
 
           ./chip-tool pressuremeasurement read measured-value 1 1
 
@@ -565,7 +571,7 @@
 
 
 
-          On DUT as a client side, verify that TH all-clusters-app sent success response with attribute values
+          If the DUT has to provision to verify the logs, verify that TH all-clusters-app sent success response with attribute values
           [1657882152.821695][2665:2670] CHIP:DMG: }
           [1657882152.821886][2665:2670] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0403 Attribute 0x0000_0000 DataVersion: 1184750328
           [1657882152.821981][2665:2670] CHIP:TOO:   MeasuredValue: 0
@@ -585,7 +591,7 @@
           data type Octet String."
       PICS: MCORE.IDM.C.ReadRequest.Attribute.DataType_OctetString
       verification: |
-          In case of chip tool, here is an example command to use
+          Product maker needs to provide instructions for how to trigger the command on the DUT. For comparison, the DUT behavior for this test step can be simulated using chip-tool (when DUT is a commissioner/Client)
 
           ./chip-tool operationalcredentials read trusted-root-certificates 1 0
 
@@ -611,8 +617,7 @@
           [1655723062.691494][10909:10909] CHIP:DMG: },
           [1655723062.691635][10909:10909] CHIP:DMG: IM RH moving to [GeneratingReports]
 
-
-          On DUT as a client side, verify that TH all-clusters-app sent success response with attribute values
+          If the DUT has to provision to verify the logs , verify that TH all-clusters-app sent success response with attribute values
           [1657882197.831561][2673:2678] CHIP:DMG: }
           [1657882197.831802][2673:2678] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_003E Attribute 0x0000_0004 DataVersion: 1112172817
           [1657882197.831892][2673:2678] CHIP:TOO:   TrustedRootCertificates: 1 entries
@@ -625,7 +630,7 @@
           data type Struct."
       PICS: MCORE.IDM.C.ReadRequest.Attribute.DataType_Struct
       verification: |
-          In case of chip tool, here is an example command to use
+          Product maker needs to provide instructions for how to trigger the command on the DUT. For comparison, the DUT behavior for this test step can be simulated using chip-tool (when DUT is a commissioner/Client)
 
            sudo ./chip-tool  generalcommissioning read  basic-commissioning-info   1 0
 
@@ -652,7 +657,7 @@
           [1655723112.902782][10909:10909] CHIP:DMG: IM RH moving to [GeneratingReports]
 
 
-          On DUT as a client side, verify that TH all-clusters-app sent success response with attribute values
+          If the DUT has to provision to verify the logs, verify that TH all-clusters-app sent success response with attribute values
           [1657882247.469521][2681:2686] CHIP:DMG:         InteractionModelRevision = 1
           [1657882247.469553][2681:2686] CHIP:DMG: }
           [1657882247.469732][2681:2686] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0030 Attribute 0x0000_0001 DataVersion: 3643421834
@@ -668,7 +673,7 @@
           data type List."
       PICS: MCORE.IDM.C.ReadRequest.Attribute.DataType_List
       verification: |
-          In case of chip tool, here is an example command to use
+          Product maker needs to provide instructions for how to trigger the command on the DUT. For comparison, the DUT behavior for this test step can be simulated using chip-tool (when DUT is a commissioner/Client)
 
            ./chip-tool modeselect read  supported-modes 1 1
 
@@ -695,7 +700,7 @@
           [1655723151.160243][10909:10909] CHIP:DMG: IM RH moving to [GeneratingReports]
 
 
-          On DUT as a client side, verify that TH all-clusters-app sent success response with attribute values
+          If the DUT has to provision to verify the logs, verify that TH all-clusters-app sent success response with attribute values
 
           [1657882339.679133][2701:2706] CHIP:DMG: }
           [1657882339.679605][2701:2706] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0050 Attribute 0x0000_0002 DataVersion: 321966114
@@ -735,7 +740,7 @@
           data type enum."
       PICS: MCORE.IDM.C.ReadRequest.Attribute.DataType_Enum
       verification: |
-          In case of chip tool, here is an example command to use
+          Product maker needs to provide instructions for how to trigger the command on the DUT. For comparison, the DUT behavior for this test step can be simulated using chip-tool (when DUT is a commissioner/Client)
 
           ./chip-tool  occupancysensing read   occupancy-sensor-type 1 1
           verify On TH(Reference app) receives the right Read Request Message for the data sent in the above command
@@ -760,7 +765,7 @@
           [1655723234.549097][10909:10909] CHIP:DMG: },
           [1655723234.549241][10909:10909] CHIP:DMG: IM RH moving to [GeneratingReports]
 
-          On DUT as a client side, verify that TH all-clusters-app sent success response with attribute values
+          If the DUT has to provision to verify the logs, verify that TH all-clusters-app sent success response with attribute values
           [1657882403.876372][2715:2720] CHIP:DMG: }
           [1657882403.876514][2715:2720] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0406 Attribute 0x0000_0001 DataVersion: 737072536
           [1657882403.876595][2715:2720] CHIP:TOO:   occupancy sensor type: 0
@@ -772,7 +777,7 @@
           data type bitmap."
       PICS: MCORE.IDM.C.ReadRequest.Attribute.DataType_Bitmap
       verification: |
-          In case of chip tool, here is an example command to use
+          Product maker needs to provide instructions for how to trigger the command on the DUT. For comparison, the DUT behavior for this test step can be simulated using chip-tool (when DUT is a commissioner/Client)
 
           ./chip-tool levelcontrol read options 1 1
 
@@ -798,7 +803,7 @@
           [1655723282.098206][10909:10909] CHIP:DMG: IM RH moving to [GeneratingReports]
 
 
-          On DUT as a client side, verify that TH all-clusters-app sent success response with attribute values
+          If the DUT has to provision to verify the logs, verify that TH all-clusters-app sent success response with attribute values
           [1657882440.996840][2725:2730] CHIP:DMG:         InteractionModelRevision = 1
           [1657882440.996862][2725:2730] CHIP:DMG: }
           [1657882440.997003][2725:2730] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0008 Attribute 0x0000_000F DataVersion: 3900213102
@@ -810,7 +815,7 @@
           "DUT sends the Read Request Message to the TH to read an attribute
           Repeat the above steps 3 times."
       verification: |
-          In case of chip tool, here is an example command to use
+          Product maker needs to provide instructions for how to trigger the command on the DUT. For comparison, the DUT behavior for this test step can be simulated using chip-tool (when DUT is a commissioner/Client)
 
            ./chip-tool  occupancysensing read occupancy    1 1
           verify On TH(Reference app) receives the right Read Request Message for the data sent in the above command
@@ -835,7 +840,7 @@
           [1655723372.329162][10909:10909] CHIP:DMG: IM RH moving to [GeneratingReports]
 
 
-          On DUT as a client side, verify that TH all-clusters-app sent success response with attribute values
+          If the DUT has to provision to verify the logs verify that TH all-clusters-app sent success response with attribute values
           [1657883628.582877][2780:2785] CHIP:DMG:         InteractionModelRevision = 1
           [1657883628.582909][2780:2785] CHIP:DMG: }
           [1657883628.583066][2780:2785] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0406 Attribute 0x0000_0000 DataVersion: 737072536
@@ -891,6 +896,8 @@
           TH should send a report data action with the attribute values to the
           DUT."
       verification: |
+          Product maker needs to provide instructions for how to trigger the command on the DUT. For comparison, the DUT behavior for this test step can be simulated using chip-tool (when DUT is a commissioner/Client)
+
           sudo ./chip-tool any read-by-id 0xFFFFFFFF 0xFFFFFFFF 1 0xFFFF --timeout 40
           On TH verify that Read Request Message received from DUT
       disabled: true
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 b2ce2fd..f5dedc2 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
@@ -1137,7 +1137,7 @@
 
 
           ./chip-tool any read-by-id 0xFFFFFFFF 0xFFFFFFFF 1 0
-          On TH, verify DUT  responsds as UNSUPPORTED_ACCESS  for the data sent in the above command
+           Verify that there are no errors sent back for attributes the TH has no access to.
           [1659422360.478947][2049:2054] CHIP:DMG: }
           [1659422360.479556][2049:2054] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_001F Attribute 0x0000_0000 DataVersion: 3949809681
           [1659422360.479619][2049:2054] CHIP:TOO:   ACL: 1 entries
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 2bdadf3..d76e212 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
@@ -653,6 +653,7 @@
           one attribute on a given cluster and endpoint to null. +"
       verification: |
           Out of Scope for V1.0
+          https://github.com/project-chip/connectedhomeip/issues/8043
       disabled: true
 
     - label:
@@ -660,6 +661,7 @@
           value +"
       verification: |
           Out of Scope for V1.0
+          https://github.com/project-chip/connectedhomeip/issues/8043
       disabled: true
 
     - label:
@@ -667,6 +669,7 @@
           value +"
       verification: |
           Out of Scope for V1.0
+          https://github.com/project-chip/connectedhomeip/issues/8043
       disabled: true
 
     - label:
@@ -674,6 +677,7 @@
           one attribute and Set SuppressResponse to True. +"
       verification: |
           Out of Scope for V1.0
+          https://github.com/project-chip/connectedhomeip/issues/8043
       disabled: true
 
     - label:
diff --git a/src/app/tests/suites/certification/Test_TC_IDM_4_2.yaml b/src/app/tests/suites/certification/Test_TC_IDM_4_2.yaml
index 64ef2bc..d8783a1 100644
--- a/src/app/tests/suites/certification/Test_TC_IDM_4_2.yaml
+++ b/src/app/tests/suites/certification/Test_TC_IDM_4_2.yaml
@@ -26,6 +26,12 @@
     endpoint: 0
 
 tests:
+    - label: "Note"
+      verification: |
+          Please use Interactive mode to Verify subscription test cases
+          Here the command to enter interactive mode:--   ./chip-tool interactive start
+      disabled: true
+
     - label:
           "TH sends a subscription message to the DUT with MaxIntervalCeiling
           set to a value greater than 60 mins. DUT sends a report data action to
@@ -33,6 +39,10 @@
           Subscribe Response Message to the TH to activate the subscription."
       verification: |
           The cluster used in the below command is an example, User can use any supported chip cluster.
+
+           Please use Interactive mode to Verify subscription test cases
+          Here the command to enter interactive mode:--   ./chip-tool interactive start
+
            onoff subscribe on-off  100  3900(65 mins) 1 1
           On TH, verify that the report data message is received from DUT and check it contains all the data which mentioned in expected outcome
           m RetransTable on exchange 33626i
@@ -85,6 +95,10 @@
           Subscribe Response Message to the TH to activate the subscription."
       verification: |
           The cluster used in the below command is an example, User can use any supported chip cluster.
+
+           Please use Interactive mode to Verify subscription test cases
+          Here the command to enter interactive mode:--   ./chip-tool interactive start
+
            basic subscribe location 10 2400 1 0
           On TH, verify that the report data message is received from DUT and check it contains all the data which mentioned in expected outcome
           m RetransTable on exchange 33628i
@@ -138,7 +152,8 @@
           AttributePath = [[Attribute = Attribute, Cluster = ClusterID, Endpoint
           = EndpointID ]]."
       verification: |
-          https://github.com/CHIP-Specifications/chip-test-plans/issues/1700
+          Out of scope for V1.0
+          https://github.com/CHIP-Specifications/chip-test-plans/issues/1984
       disabled: true
 
     - label:
@@ -147,7 +162,8 @@
           subscribe to all attributes for which it does not have access.
           AttributePath = [[Cluster = ClusterID, Endpoint = EndpointID ]]."
       verification: |
-          https://github.com/CHIP-Specifications/chip-test-plans/issues/1700
+          Out of scope for V1.0
+          https://github.com/CHIP-Specifications/chip-test-plans/issues/1984
       disabled: true
 
     - label:
@@ -156,51 +172,8 @@
           on a specific Endpoint for which it does not have access.
           AttributePath = [[ Endpoint = EndpointID ]]."
       verification: |
-          The cluster used in the below command is an example, User can use any supported chip cluster.
-
-          To Setup the TH2 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 identify cluster(3), So except identify cluster command if try to send any other command will get status as unsupported access.
-
-           accesscontrol write acl "[{"fabricIndex": 1, "privilege": 5, "authMode": 2, "subjects": [112233], "targets":[{ "cluster": 3, "endpoint": 1, "deviceType": null }]}]" 1 0
-
-          thermostatuserinterfaceconfiguration subscribe temperature-display-mode 100 1000 1 1
-
-          on TH verify DUT is responsds with UNSUPPORTED_ACCESS  for the data sent in the above command
-
-          [1654862486.785468][32309:32314] CHIP:DMG: ReportDataMessage =
-          [1654862486.785508][32309:32314] CHIP:DMG: {
-          [1654862486.785544][32309:32314] CHIP:DMG:         SubscriptionId = 0x111a3e69,
-          [1654862486.785581][32309:32314] CHIP:DMG:         AttributeReportIBs =
-          [1654862486.785627][32309:32314] CHIP:DMG:         [
-          [1654862486.785662][32309:32314] CHIP:DMG:                 AttributeReportIB =
-          [1654862486.785713][32309:32314] CHIP:DMG:                 {
-          [1654862486.785752][32309:32314] CHIP:DMG:                         AttributeStatusIB =
-          [1654862486.785797][32309:32314] CHIP:DMG:                         {
-          [1654862486.785842][32309:32314] CHIP:DMG:                                 AttributePathIB =
-          [1654862486.785895][32309:32314] CHIP:DMG:                                 {
-          [1654862486.785945][32309:32314] CHIP:DMG:                                         Endpoint = 0x1,
-          [1654862486.785998][32309:32314] CHIP:DMG:                                         Cluster = 0x204,
-          [1654862486.786050][32309:32314] CHIP:DMG:                                         Attribute = 0x0000_0000,
-          [1654862486.786099][32309:32314] CHIP:DMG:                                 }
-          [1654862486.786153][32309:32314] CHIP:DMG:
-          [1654862486.786204][32309:32314] CHIP:DMG:                                 StatusIB =
-          [1654862486.786253][32309:32314] CHIP:DMG:                                 {
-          [1654862486.786302][32309:32314] CHIP:DMG:                                         status = 0x7e (UNSUPPORTED_ACCESS),
-          [1654862486.786350][32309:32314] CHIP:DMG:                                 },
-          [1654862486.786399][32309:32314] CHIP:DMG:
-          [1654862486.786441][32309:32314] CHIP:DMG:                         },
-          [1654862486.786489][32309:32314] CHIP:DMG:
-          [1654862486.786528][32309:32314] CHIP:DMG:                 },
-          [1654862486.786572][32309:32314] CHIP:DMG:
-          [1654862486.786606][32309:32314] CHIP:DMG:         ],
-          [1654862486.786650][32309:32314] CHIP:DMG:
-          [1654862486.786685][32309:32314] CHIP:DMG:         InteractionModelRevision = 1
-          [1654862486.786720][32309:32314] CHIP:DMG: }
-          [1654862486.786862][32309:32314] CHIP:TOO: Response Failure: IM Error 0x0000057E: General error: 0x7e (UNSUPPORTED_ACCESS)
-          [1654862486.786918][32309:32314] CHIP:DMG: MoveToState ReadClient[0xffff840040e0]: Moving to
-
-
-          With the above command, we are overwriting the default privilege that chip-tool has as an admin. After this test step you need to factory reset the DUT and reprovision the DUT again, Otherwise the below steps can not be executed.
+          Out of scope for V1.0
+          https://github.com/CHIP-Specifications/chip-test-plans/issues/1984
       disabled: true
 
     - label:
@@ -209,7 +182,8 @@
           all endpoints on a Node for which it does not have access.
           AttributePath = [[ ]]."
       verification: |
-          https://github.com/CHIP-Specifications/chip-test-plans/issues/1700
+          Out of scope for V1.0
+          https://github.com/CHIP-Specifications/chip-test-plans/issues/1984
       disabled: true
 
     - label:
@@ -221,6 +195,9 @@
       verification: |
           The cluster used in the below command is an example, User can use any supported chip cluster.
 
+           Please use Interactive mode to Verify subscription test cases
+          Here the command to enter interactive mode:--   ./chip-tool interactive start
+
           onoff  subscribe start-up-on-off  50 800 1 1
 
           On reference app verify that subscription is activated between TH and DUT
@@ -287,6 +264,8 @@
       verification: |
           The cluster used in the below command is an example, User can use any supported chip cluster.
 
+           Please use Interactive mode to Verify subscription test cases
+          Here the command to enter interactive mode:--   ./chip-tool interactive start
 
           onoff subscribe on-time 100 100 1 1
 
@@ -330,6 +309,9 @@
       verification: |
           The cluster used in the below command is an example, User can use any supported chip cluster.
 
+           Please use Interactive mode to Verify subscription test cases
+          Here the command to enter interactive mode:--   ./chip-tool interactive start
+
            onoff subscribe on-time 500 100 1 1
 
           On TH Verify that the DUT sends an error message
@@ -350,6 +332,9 @@
       verification: |
           The cluster used in the below command is an example, User can use any supported chip cluster.
 
+           Please use Interactive mode to Verify subscription test cases
+          Here the command to enter interactive mode:--   ./chip-tool interactive start
+
            any subscribe-by-id 0xFFFFFFFF 0xFFFD  10 300 1 0xFFFF
 
           On TH Verify that the Subscription succeeds and the DUT sends back the attribute values for the global attribute
@@ -362,6 +347,9 @@
       verification: |
           The cluster used in the below command is an example, User can use any supported chip cluster.
 
+           Please use Interactive mode to Verify subscription test cases
+          Here the command to enter interactive mode:--   ./chip-tool interactive start
+
           any subscribe-by-id 0xFFFFFFFF 0xFFFD  10 300 1 0
 
           On TH Verify that the Subscription succeeds and the DUT sends back the attribute values for the global attribute
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 4afd862..e98f252 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
@@ -26,6 +26,12 @@
     endpoint: 0
 
 tests:
+    - label: "Note"
+      verification: |
+          Please use Interactive mode to Verify subscription test cases
+          Here the command to enter interactive mode:--   ./chip-tool interactive start
+      disabled: true
+
     - label:
           "DUT and TH activate the subscription. Change the value of the
           attribute which has been subscribed on the DUT by manually changing
@@ -33,6 +39,9 @@
           the value of the room temperature. Turning on/off on a light bulb."
       verification: |
           DUT dependency
+          test step is execpting to Change the value of the attribute which has been subscribed on the DUT by manually changing some settings on the device.
+           Example: Temperature sensor may update the value of the room temperature.
+           Turning on/off on a light bulb.
       disabled: true
 
     - label:
@@ -42,6 +51,9 @@
       verification: |
           The cluster used in the below command is an example, User can use any supported chip cluster.
 
+           Please use Interactive mode to Verify subscription test cases
+          Here the command to enter interactive mode:--   ./chip-tool interactive start
+
           onoff  subscribe start-up-on-off  30 100 1 1
           on TH, verify that DUT is responds right attribute value for above command
 
@@ -117,6 +129,9 @@
       verification: |
           The cluster used in the below command is an example, User can use any supported chip cluster.
 
+           Please use Interactive mode to Verify subscription test cases
+          Here the command to enter interactive mode:--   ./chip-tool interactive start
+
            onoff  subscribe on-off 10 200  1 1
            on TH  verify Verify that DUT is responds right attribute value for above command
 
@@ -181,10 +196,12 @@
       verification: |
           The cluster used in the below command is an example, User can use any supported chip cluster.
 
+           Please use Interactive mode to Verify subscription test cases
+          Here the command to enter interactive mode:--   ./chip-tool interactive start
 
-           on TH verify that DUT is responds right attribute value for below command and then send write command to change the attribute value, verify the attribute value is modified or not.
 
            basic subscribe local-config-disabled 100 200 1 0
+           on TH verify that DUT is responds right attribute value for above command and then send write command to change the attribute value, verify the attribute value is modified or not.
           [1657451690.259096][11635:11640] CHIP:EM: Removed CHIP MessageCounter:190733078 from RetransTable on exchange 33639i
           [1657451690.259223][11635:11640] CHIP:DMG: ReportDataMessage =
           [1657451690.259295][11635:11640] CHIP:DMG: {
@@ -267,8 +284,12 @@
       verification: |
           The cluster used in the below command is an example, User can use any supported chip cluster.
 
-          basic subscribe node-label 10 100 1 0
 
+           Please use Interactive mode to Verify subscription test cases
+          Here the command to enter interactive mode:--   ./chip-tool interactive start
+
+
+          basic subscribe node-label 10 100 1 0
 
           on TH  verify that DUT is responds right attribute value for below command and then send write command to change the attribute value, verify the attribute value is modified or not.
 
@@ -351,6 +372,10 @@
       verification: |
           The cluster used in the below command is an example, User can use any supported chip cluster.
 
+
+           Please use Interactive mode to Verify subscription test cases
+          Here the command to enter interactive mode:--   ./chip-tool interactive start
+
           any subscribe-by-id 0x0008 0x0010 10 100  1 1
 
            on TH verify that DUT is responds right attribute value for below command and then send write command to change the attribute value, verify the attribute value is modified or not.
@@ -458,6 +483,9 @@
           The cluster used in the below command is an example, User can use any supported chip cluster.
 
 
+           Please use Interactive mode to Verify subscription test cases
+          Here the command to enter interactive mode:--   ./chip-tool interactive start
+
 
            userlabel subscribe label-list 100 500 1 0
            On TH verify that  DUT is responds right attribute value for above  command
@@ -495,6 +523,9 @@
           The cluster used in the below command is an example, User can use any supported chip cluster.
 
 
+           Please use Interactive mode to Verify subscription test cases
+          Here the command to enter interactive mode:--   ./chip-tool interactive start
+
           basic subscribe local-config-disabled 10 100  1 0 --keepSubscriptions 0
           on TH verify that DUT is responds right attribute value for below command and then send write command to change the attribute value, verify the attribute value is modified or not.
 
@@ -604,12 +635,14 @@
       verification: |
           The cluster used in the below command is an example, User can use any supported chip cluster.
 
+           Please use Interactive mode to Verify subscription test cases
+          Here the command to enter interactive mode:--   ./chip-tool interactive start
+
+
            levelcontrol subscribe  on-level 10 80 1 1
 
-
           On TH verify that DUT is responds right attribute value for below command and then send write command to change the attribute value, verify the attribute value is modified or not.
 
-
           [1657453503.538054][11635:11640] CHIP:EM: Removed CHIP MessageCounter:190733149 from RetransTable on exchange 33661i
           [1657453503.538172][11635:11640] CHIP:DMG: ReportDataMessage =
           [1657453503.538262][11635:11640] CHIP:DMG: {
@@ -683,8 +716,12 @@
           The cluster used in the below command is an example, User can use any supported chip cluster.
 
 
-          On TH Verify that the DUT sends a Report Data action and  There are no attribute value changes before MaxInterval elapses.
+           Please use Interactive mode to Verify subscription test cases
+          Here the command to enter interactive mode:--   ./chip-tool interactive start
+
+
           onoff subscribe on-time 100 1000 1 1
+          On TH 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,
@@ -729,6 +766,10 @@
       verification: |
           The cluster used in the below command is an example, User can use any supported chip cluster.
 
+
+           Please use Interactive mode to Verify subscription test cases
+          Here the command to enter interactive mode:--   ./chip-tool interactive start
+
           >>>  onoff subscribe off-wait-time 10 500 1 1 --keepSubscriptions 1
 
 
@@ -872,6 +913,8 @@
       verification: |
           The cluster used in the below command is an example, User can use any supported chip cluster.
 
+           Please use Interactive mode to Verify subscription test cases
+          Here the command to enter interactive mode:--   ./chip-tool interactive start
 
           onoff subscribe on-time 10 100 1 1 --keepSubscriptions 1
 
@@ -1032,7 +1075,8 @@
           the value of the attribute and trigger an action on the DUT to trigger
           any event."
       verification: |
-          https://github.com/project-chip/connectedhomeip/issues/20479
+          Out of Scope for V1.0
+          https://github.com/project-chip/connectedhomeip/issues/15999
       disabled: true
 
     - label:
@@ -1042,6 +1086,7 @@
           of the attributes on the DUT"
       verification: |
           Out of Scope for V1.0
+          https://github.com/project-chip/connectedhomeip/issues/15999
       disabled: true
 
     - label:
@@ -1050,6 +1095,9 @@
           Attribute, Cluster = ClusterID ]]. Set the MinIntervalFloor to some
           value say N(seconds). Change the attribute on the DUT"
       verification: |
+          Please use Interactive mode to Verify subscription test cases
+          Here the command to enter interactive mode:--   ./chip-tool interactive start
+
           onoff subscribe-by-id 0x4001 200 700  1 0xFFFF
            on TH, verify that DUT is responds right attribute value for  command and then send write command to change the attribute value,
           [1658322253.825601][4866:4871] CHIP:DMG: ReportDataMessage =
@@ -1142,6 +1190,7 @@
           the attributes on the DUT"
       verification: |
           Out of Scope for V1.0
+          https://github.com/project-chip/connectedhomeip/issues/15999
       disabled: true
 
     - label:
@@ -1151,6 +1200,7 @@
           Change all or few of the attributes on the DUT"
       verification: |
           Out of Scope for V1.0
+          https://github.com/project-chip/connectedhomeip/issues/15999
       disabled: true
 
     - label:
@@ -1160,4 +1210,5 @@
           Change all or few of the attributes on the DUT"
       verification: |
           Out of Scope for V1.0
+          https://github.com/project-chip/connectedhomeip/issues/15999
       disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_IDM_5_1.yaml b/src/app/tests/suites/certification/Test_TC_IDM_5_1.yaml
index 3f5a286..eb18f9a 100644
--- a/src/app/tests/suites/certification/Test_TC_IDM_5_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_IDM_5_1.yaml
@@ -24,6 +24,11 @@
     endpoint: 0
 
 tests:
+    - label: "Note"
+      verification: |
+          Chip-tool command used below are an example to verify the  DUT as client test cases. For certification test, we expect DUT should have a capability or way to run the equivalent command.
+      disabled: true
+
     - label:
           "DUT sends the Timed Request to the TH and then sends an Invoke
           Request Message to the TH after receiving the status response message
@@ -31,7 +36,8 @@
           in milliseconds. (Example - 200 milliseconds)"
       PICS: MCORE.IDM.C.InvokeRequest
       verification: |
-          In the case of chip tool as a client, here is an example command the client can send invoke request  to the TH
+          Product maker needs to provide instructions for how to trigger the command on the DUT. For comparison, the DUT behavior for this test step can be simulated using chip-tool (when DUT is a commissioner/Client)
+
           ./chip-tool onoff on 1 1 --timedInteractionTimeoutMs 200
 
           On TH (On the reference app) Verify if DUT is responding with the below status response for the above command
@@ -121,7 +127,8 @@
           timeout value in milliseconds. (Example - 200 milliseconds)"
       PICS: MCORE.IDM.C.WriteRequest
       verification: |
-          Chip-tool as controller , here is the example command you can use
+          Product maker needs to provide instructions for how to trigger the command on the DUT. For comparison, the DUT behavior for this test step can be simulated using chip-tool (when DUT is a commissioner/Client)
+
            ./chip-tool onoff write  on-time 2 1 1 --timedInteractionTimeoutMs 200
 
           On TH (On the reference app) Verify if DUT is responding with the below status response for the above command
diff --git a/src/app/tests/suites/certification/Test_TC_IDM_5_2.yaml b/src/app/tests/suites/certification/Test_TC_IDM_5_2.yaml
index 39a4fdc..7af4f90 100644
--- a/src/app/tests/suites/certification/Test_TC_IDM_5_2.yaml
+++ b/src/app/tests/suites/certification/Test_TC_IDM_5_2.yaml
@@ -28,7 +28,7 @@
 tests:
     - label:
           "TH sends a Timed Request Message with the timeout value set. (Example
-          - 200 milliseconds)."
+          - 200 milliseconds). +"
       verification: |
           The cluster used in the below command is an example, User can use any supported chip cluster.
           ./chip-tool onoff on 1 1 --timedInteractionTimeoutMs 200
diff --git a/src/app/tests/suites/certification/Test_TC_IDM_6_1.yaml b/src/app/tests/suites/certification/Test_TC_IDM_6_1.yaml
index a9db713..f086a2f 100644
--- a/src/app/tests/suites/certification/Test_TC_IDM_6_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_IDM_6_1.yaml
@@ -418,9 +418,52 @@
           The cluster used in the below command is an example, User can use any supported chip cluster.
 
           To Setup the TH 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 identify cluster(3), So except identify cluster command if try to send any other command will get status as unsupported access.
+          Here by sending below mentioned ACL command giving only access for ACL cluster(31), So except identify 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": [112233], "targets":[{ "cluster": 3, "endpoint": 1, "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 =
+          [1659419722.669727][1915:1920] CHIP:DMG:         [
+          [1659419722.669758][1915:1920] CHIP:DMG:                 AttributeStatusIB =
+          [1659419722.669796][1915:1920] CHIP:DMG:                 {
+          [1659419722.669833][1915:1920] CHIP:DMG:                         AttributePathIB =
+          [1659419722.669871][1915:1920] CHIP:DMG:                         {
+          [1659419722.669912][1915:1920] CHIP:DMG:                                 Endpoint = 0x0,
+          [1659419722.669953][1915:1920] CHIP:DMG:                                 Cluster = 0x1f,
+          [1659419722.669993][1915:1920] CHIP:DMG:                                 Attribute = 0x0000_0000,
+          [1659419722.670034][1915:1920] CHIP:DMG:                         }
+          [1659419722.670077][1915:1920] CHIP:DMG:
+          [1659419722.670114][1915:1920] CHIP:DMG:                         StatusIB =
+          [1659419722.670153][1915:1920] CHIP:DMG:                         {
+          [1659419722.670191][1915:1920] CHIP:DMG:                                 status = 0x00 (SUCCESS),
+          [1659419722.670229][1915:1920] CHIP:DMG:                         },
+          [1659419722.670266][1915:1920] CHIP:DMG:
+          [1659419722.670300][1915:1920] CHIP:DMG:                 },
+          [1659419722.670343][1915:1920] CHIP:DMG:
+          [1659419722.670373][1915:1920] CHIP:DMG:                 AttributeStatusIB =
+          [1659419722.670405][1915:1920] CHIP:DMG:                 {
+          [1659419722.670436][1915:1920] CHIP:DMG:                         AttributePathIB =
+          [1659419722.670471][1915:1920] CHIP:DMG:                         {
+          [1659419722.670510][1915:1920] CHIP:DMG:                                 Endpoint = 0x0,
+          [1659419722.670550][1915:1920] CHIP:DMG:                                 Cluster = 0x1f,
+          [1659419722.670590][1915:1920] CHIP:DMG:                                 Attribute = 0x0000_0000,
+          [1659419722.670661][1915:1920] CHIP:DMG:                                 ListIndex = Null,
+          [1659419722.670700][1915:1920] CHIP:DMG:                         }
+          [1659419722.670740][1915:1920] CHIP:DMG:
+          [1659419722.670776][1915:1920] CHIP:DMG:                         StatusIB =
+          [1659419722.670813][1915:1920] CHIP:DMG:                         {
+          [1659419722.670851][1915:1920] CHIP:DMG:                                 status = 0x00 (SUCCESS),
+          [1659419722.670888][1915:1920] CHIP:DMG:                         },
+          [1659419722.670925][1915:1920] CHIP:DMG:
+          [1659419722.670958][1915:1920] CHIP:DMG:                 },
+          [1659419722.670994][1915:1920] CHIP:DMG:
+          [1659419722.671022][1915:1920] CHIP:DMG:         ],
+          [1659419722.671062][1915:1920] CHIP:DMG:
+          [1659419722.671092][1915:1920] CHIP:DMG:         InteractionModelRevision = 1
+          [1659419722.671120][1915:1920] CHIP:DMG: }
+          [1659419722.671244][1915:1920] CHIP:DMG: WriteClient moving to [AwaitingDe]
+          [1659419722.671314][1915:1920] CHIP:EM: Sending Standalone Ack for MessageCounter:153124628 on
 
            ./chip-tool any read-event-by-id 0x28 0 1 0
 
@@ -456,7 +499,9 @@
           [1653054249.515090][12265:12270] CHIP:DMG:         InteractionModelRevision = 1
           [1653054249.515102][12265:12270] CHIP:DMG: }
 
-          With the above command, we are overwriting the default privilege that chip-tool has as an admin. After this test step you need to factory reset the DUT and reprovision the DUT again, Otherwise the below steps can not be executed.
+          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
       disabled: true
 
     - label:
@@ -466,7 +511,7 @@
       verification: |
           To Setup the TH such that there is no accessing fabric, 1st we need to send below mentioned ACL command
 
-          ./chip-tool accesscontrol write acl '[{"fabricIndex": 1, "privilege": 5, "authMode": 2, "subjects": [1234], "targets": null}]' 1 0
+          ./chip-tool accesscontrol write acl "[{"fabricIndex": 1, "privilege": 5, "authMode": 2, "subjects": [1234], "targets": null}]" 1 0
           ./chip-tool any read-event-by-id 0xFFFFFFFF 0xFFFFFFFF 1 0xFFFF
           On TH verify DUT sends Report Data Message with no entry for that event in EventReports list.
 
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 c0040bd..5ebd36b 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
@@ -26,6 +26,17 @@
     endpoint: 0
 
 tests:
+    - label: "Note"
+      verification: |
+          Please use Interactive mode to Verify subscription test cases
+          Here the command to enter interactive mode:--   ./chip-tool interactive start
+      disabled: true
+
+    - label: "Note"
+      verification: |
+          Chip-tool command used below are an example to verify the  DUT as client test cases. For certification test, we expect DUT should have a capability or way to run the equivalent command.
+      disabled: true
+
     - label:
           "TH sends Subscribe Request Message to DUT with EventRequests set to a
           specific event from a specific cluster on a specific endpoint on a
@@ -1318,131 +1329,5 @@
           reset on DUT, re-subscribe to events and continue to change attribute
           values on DUT to create events multiple times."
       verification: |
-          The cluster used in the below command is an example, User can use any supported chip cluster.
-
-          Please  run this test in chip tool interactive mode ./chip-tool interactive start
-
-          On Raspi platform the event is triggered with this command, Pls use equivalent command on the respective DUT
-
-          accesscontrol subscribe-event access-control-entry-changed  20 500 1 0
-          On TH 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
-          [1658405014.975608][4236:4241] CHIP:TOO:          Event number: 2
-          [1658405014.975632][4236:4241] CHIP:TOO:          Priority: Info
-          [1658405014.975656][4236:4241] CHIP:TOO:          Timestamp: 24429982
-          [1658405014.975774][4236:4241] CHIP:TOO:   AccessControlEntryChanged: {
-          [1658405014.975802][4236:4241] CHIP:TOO:     AdminNodeID: null
-          [1658405014.975837][4236:4241] CHIP:TOO:     AdminPasscodeID: 0
-          [1658405014.975864][4236:4241] CHIP:TOO:     ChangeType: 1
-          [1658405014.975889][4236:4241] CHIP:TOO:     LatestValue: {
-          [1658405014.975913][4236:4241] CHIP:TOO:       Privilege: 5
-          [1658405014.975938][4236:4241] CHIP:TOO:       AuthMode: 2
-          [1658405014.975968][4236:4241] CHIP:TOO:       Subjects: 1 entries
-          [1658405014.975999][4236:4241] CHIP:TOO:         [1]: 112233
-          [1658405014.976027][4236:4241] CHIP:TOO:       Targets: null
-          [1658405014.976052][4236:4241] CHIP:TOO:       FabricIndex: 1
-          [1658405014.976075][4236:4241] CHIP:TOO:      }
-          [1658405014.976100][4236:4241] CHIP:TOO:     AdminFabricIndex: 1
-          [1658405014.976124][4236:4241] CHIP:TOO:    }
-          [1658405014.976188][4236:4241] CHIP:DMG: MoveToState ReadClient[0xffffa4008e30]: Moving to [AwaitingSu]
-
-          By sending the command mentioned below, change attribute values on DUT to create events multiple times.
-
-          accesscontrol write acl "[{"fabricIndex": 1, "privilege": 5, "authMode": 2, "subjects": [112233], "targets": null}, {"fabricIndex": 1, "privilege": 1, "authMode": 3, "subjects": [111,222,333,444], "targets": [{"cluster":11 , "endpoint":22, "deviceType": null}]}, {"fabricIndex": 1, "privilege": 3, "authMode": 3, "subjects": [555,666,777,888], "targets": [{"cluster": 55, "endpoint": 66, "deviceType":null }]}]" 1 0
-
-          On TH Verify that each event record is assigned a number that is exactly 1 greater than the last created event record on that Node.
-
-          [1658405515.109232][4236:4241] CHIP:DMG: }
-          [1658405515.109475][4236:4241] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_001F Event 0x0000_0000
-          [1658405515.109503][4236:4241] CHIP:TOO:          Event number: 3
-          [1658405515.109529][4236:4241] CHIP:TOO:          Priority: Info
-          [1658405515.109555][4236:4241] CHIP:TOO:          Timestamp: 24557931
-          [1658405515.109621][4236:4241] CHIP:TOO:   AccessControlEntryChanged: {
-          [1658405515.109654][4236:4241] CHIP:TOO:     AdminNodeID: 112233
-          [1658405515.109682][4236:4241] CHIP:TOO:     AdminPasscodeID: null
-          [1658405515.109710][4236:4241] CHIP:TOO:     ChangeType: 2
-          [1658405515.109736][4236:4241] CHIP:TOO:     LatestValue: {
-          [1658405515.109762][4236:4241] CHIP:TOO:       Privilege: 5
-          [1658405515.109788][4236:4241] CHIP:TOO:       AuthMode: 2
-          [1658405515.109819][4236:4241] CHIP:TOO:       Subjects: 1 entries
-          [1658405515.109852][4236:4241] CHIP:TOO:         [1]: 112233
-          [1658405515.109881][4236:4241] CHIP:TOO:       Targets: null
-          [1658405515.109907][4236:4241] CHIP:TOO:       FabricIndex: 1
-          [1658405515.109933][4236:4241] CHIP:TOO:      }
-          [1658405515.109960][4236:4241] CHIP:TOO:     AdminFabricIndex: 1
-          [1658405515.109985][4236:4241] CHIP:TOO:    }
-          [1658405515.110118][4236:4241] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_001F Event 0x0000_0000
-          [1658405515.110146][4236:4241] CHIP:TOO:          Event number: 4
-          [1658405515.110171][4236:4241] CHIP:TOO:          Priority: Info
-          [1658405515.110196][4236:4241] CHIP:TOO:          Timestamp: 24557933
-          [1658405515.110240][4236:4241] CHIP:TOO:   AccessControlEntryChanged: {
-          [1658405515.110269][4236:4241] CHIP:TOO:     AdminNodeID: 112233
-          [1658405515.110296][4236:4241] CHIP:TOO:     AdminPasscodeID: null
-          [1658405515.110322][4236:4241] CHIP:TOO:     ChangeType: 1
-          [1658405515.110348][4236:4241] CHIP:TOO:     LatestValue: {
-          [1658405515.110373][4236:4241] CHIP:TOO:       Privilege: 5
-          [1658405515.110399][4236:4241] CHIP:TOO:       AuthMode: 2
-          [1658405515.110427][4236:4241] CHIP:TOO:       Subjects: 1 entries
-          [1658405515.110457][4236:4241] CHIP:TOO:         [1]: 112233
-          [1658405515.110485][4236:4241] CHIP:TOO:       Targets: null
-          [1658405515.110511][4236:4241] CHIP:TOO:       FabricIndex: 1
-          [1658405515.110536][4236:4241] CHIP:TOO:      }
-          [1658405515.110562][4236:4241] CHIP:TOO:     AdminFabricIndex: 1
-          [1658405515.110587][4236:4241] CHIP:TOO:    }
-          [1658405515.110735][4236:4241] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_001F Event 0x0000_0000
-          [1658405515.110762][4236:4241] CHIP:TOO:          Event number: 5
-          [1658405515.110788][4236:4241] CHIP:TOO:          Priority: Info
-          [1658405515.110813][4236:4241] CHIP:TOO:          Timestamp: 24557935
-          [1658405515.110861][4236:4241] CHIP:TOO:   AccessControlEntryChanged: {
-          [1658405515.110890][4236:4241] CHIP:TOO:     AdminNodeID: 112233
-          [1658405515.110917][4236:4241] CHIP:TOO:     AdminPasscodeID: null
-          [1658405515.110943][4236:4241] CHIP:TOO:     ChangeType: 1
-          [1658405515.110969][4236:4241] CHIP:TOO:     LatestValue: {
-          [1658405515.110994][4236:4241] CHIP:TOO:       Privilege: 1
-          [1658405515.111020][4236:4241] CHIP:TOO:       AuthMode: 3
-          [1658405515.111050][4236:4241] CHIP:TOO:       Subjects: 4 entries
-          [1658405515.111080][4236:4241] CHIP:TOO:         [1]: 111
-          [1658405515.111109][4236:4241] CHIP:TOO:         [2]: 222
-          [1658405515.111137][4236:4241] CHIP:TOO:         [3]: 333
-          [1658405515.111166][4236:4241] CHIP:TOO:         [4]: 444
-          [1658405515.111198][4236:4241] CHIP:TOO:       Targets: 1 entries
-          [1658405515.111240][4236:4241] CHIP:TOO:         [1]: {
-          [1658405515.111268][4236:4241] CHIP:TOO:           Cluster: 11
-          [1658405515.111296][4236:4241] CHIP:TOO:           Endpoint: 22
-          [1658405515.111322][4236:4241] CHIP:TOO:           DeviceType: null
-          [1658405515.111348][4236:4241] CHIP:TOO:          }
-          [1658405515.111376][4236:4241] CHIP:TOO:       FabricIndex: 1
-          [1658405515.111402][4236:4241] CHIP:TOO:      }
-          [1658405515.111428][4236:4241] CHIP:TOO:     AdminFabricIndex: 1
-          [1658405515.111453][4236:4241] CHIP:TOO:    }
-          [1658405515.111600][4236:4241] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_001F Event 0x0000_0000
-          [1658405515.111628][4236:4241] CHIP:TOO:          Event number: 6
-          [1658405515.111653][4236:4241] CHIP:TOO:          Priority: Info
-          [1658405515.111678][4236:4241] CHIP:TOO:          Timestamp: 24557937
-          [1658405515.111726][4236:4241] CHIP:TOO:   AccessControlEntryChanged: {
-          [1658405515.111755][4236:4241] CHIP:TOO:     AdminNodeID: 112233
-          [1658405515.111781][4236:4241] CHIP:TOO:     AdminPasscodeID: null
-          [1658405515.111807][4236:4241] CHIP:TOO:     ChangeType: 1
-          [1658405515.111833][4236:4241] CHIP:TOO:     LatestValue: {
-          [1658405515.111859][4236:4241] CHIP:TOO:       Privilege: 3
-          [1658405515.111884][4236:4241] CHIP:TOO:       AuthMode: 3
-          [1658405515.111914][4236:4241] CHIP:TOO:       Subjects: 4 entries
-          [1658405515.111944][4236:4241] CHIP:TOO:         [1]: 555
-          [1658405515.111973][4236:4241] CHIP:TOO:         [2]: 666
-          [1658405515.112002][4236:4241] CHIP:TOO:         [3]: 777
-          [1658405515.112030][4236:4241] CHIP:TOO:         [4]: 888
-          [1658405515.112063][4236:4241] CHIP:TOO:       Targets: 1 entries
-          [1658405515.112097][4236:4241] CHIP:TOO:         [1]: {
-          [1658405515.112125][4236:4241] CHIP:TOO:           Cluster: 55
-          [1658405515.112151][4236:4241] CHIP:TOO:           Endpoint: 66
-          [1658405515.112177][4236:4241] CHIP:TOO:           DeviceType: null
-          [1658405515.112203][4236:4241] CHIP:TOO:          }
-          [1658405515.112231][4236:4241] CHIP:TOO:       FabricIndex: 1
-          [1658405515.112257][4236:4241] CHIP:TOO:      }
-          [1658405515.112283][4236:4241] CHIP:TOO:     AdminFabricIndex: 1
-          [1658405515.112308][4236:4241] CHIP:TOO:    }
-          [1658405515.112462][4236:4241] CHIP:DMG: Refresh LivenessCheckTime for 525000 milliseconds with SubscriptionId = 0x0a5a629c Peer = 01:0000000000000001
-
-          After this test step you need to factory reset the DUT and reprovision the DUT again, and  re-subscribe  the events to continue to change attribute values on DUT to create events multiple times
+          Mark this as not testable /NA. Out of Scope for V1.0
       disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_IDM_6_3.yaml b/src/app/tests/suites/certification/Test_TC_IDM_6_3.yaml
index 90fdf60..f9c1545 100644
--- a/src/app/tests/suites/certification/Test_TC_IDM_6_3.yaml
+++ b/src/app/tests/suites/certification/Test_TC_IDM_6_3.yaml
@@ -32,8 +32,10 @@
           Please  run this test in chip tool interactive mode ./chip-tool interactive start
 
           sudo ./chip-tool any  read-event-by-id 0xFFFFFFFF 0xFFFFFFFF 1 0xFFFF
+           On TH(Reference app) verify  the Read Request Message received has these fields
+           EventRequests, EventFilters and FabricFiltered
 
-          On TH(Reference app) verify that Read Request Message received has these fields  EventRequests, EventFilters, and FabricFiltered.
+          If the DUT has to provision to verify the logs,   verify that Read Request Message received has these fields  EventRequests, EventFilters, and FabricFiltered.
 
 
 
diff --git a/src/app/tests/suites/certification/Test_TC_IDM_6_4.yaml b/src/app/tests/suites/certification/Test_TC_IDM_6_4.yaml
index eaaef32..b902f4b 100644
--- a/src/app/tests/suites/certification/Test_TC_IDM_6_4.yaml
+++ b/src/app/tests/suites/certification/Test_TC_IDM_6_4.yaml
@@ -26,10 +26,21 @@
     endpoint: 0
 
 tests:
+    - label: "Note"
+      verification: |
+          Please use Interactive mode to Verify subscription test cases
+          Here the command to enter interactive mode:--   ./chip-tool interactive start
+      disabled: true
+
+    - label: "Note"
+      verification: |
+          Chip-tool command used below are an example to verify the  DUT as client test cases. For certification test, we expect DUT should have a capability or way to run the equivalent command.
+      disabled: true
+
     - label:
           "DUT sends Subscribe Request Message to the TH for a supported event."
       verification: |
-          The cluster used in the below command is an example, User can use any supported chip cluster.
+          Product maker needs to provide instructions for how to trigger the command on the DUT. For comparison, the DUT behavior for this test step can be simulated using chip-tool (when DUT is a commissioner/Client)
 
           Please  run this test in chip tool interactive mode ./chip-tool interactive start
 
@@ -64,7 +75,8 @@
           [1657455555.195766][11525:11525] CHIP:DMG: IM RH moving to [GeneratingReports]
           [1657455555.195955][11525:11525] CHIP:DMG: Building Reports for ReadHandler with LastReportGeneration = 0 DirtyGeneration = 0
 
-          On DUT as a client side, verify that TH all-clusters-app sent  ReportDataMessage
+
+          If the DUT has to provision to verify the logs, verify that TH all-clusters-app sent  ReportDataMessage
 
           [1657886501.456822][3430:3435] CHIP:DMG: ReportDataMessage =
           [1657886501.456851][3430:3435] CHIP:DMG: {
@@ -112,7 +124,7 @@
           "DUT sends Subscribe Request Message to the TH. TH sends Report Data
           message to DUT."
       verification: |
-          The cluster used in the below command is an example, User can use any supported chip cluster.
+          Product maker needs to provide instructions for how to trigger the command on the DUT. For comparison, the DUT behavior for this test step can be simulated using chip-tool (when DUT is a commissioner/Client)
 
           Please  run this test in chip tool interactive mode ./chip-tool interactive start
 
@@ -129,7 +141,8 @@
           [1657455691.695600][11525:11525] CHIP:IM: Received status response, status is 0x00 (SUCCESS)
           [1657455691.695643][11525:11525] CHIP:DMG: Refresh Subscribe Sync Timer with max 400 seconds
 
-          On DUT as a client side, verify that TH all-clusters-app sent  ReportDataMessage
+
+          If the DUT has to provision to verify the logs,  verify that TH all-clusters-app sent  ReportDataMessage
 
           [1657886532.588762][3430:3435] CHIP:DMG: }
           [1657886532.588882][3430:3435] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0028 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 8e41afd..0f47f5b 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
@@ -24,6 +24,12 @@
     endpoint: 0
 
 tests:
+    - label: "Note"
+      verification: |
+          Please use Interactive mode to Verify subscription test cases
+          Here the command to enter interactive mode:--   ./chip-tool interactive start
+      disabled: true
+
     - label:
           "RD1, RD2, RD3, RD4, RD5 send 3 Subscribe Request Messages to
           DUT.(Total - 15 active subscriptions) Each subscribe request should
diff --git a/src/app/tests/suites/certification/Test_TC_IDM_8_1.yaml b/src/app/tests/suites/certification/Test_TC_IDM_8_1.yaml
index b9f16c3..a3e3dcd 100644
--- a/src/app/tests/suites/certification/Test_TC_IDM_8_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_IDM_8_1.yaml
@@ -24,6 +24,12 @@
     endpoint: 0
 
 tests:
+    - label: "Note"
+      verification: |
+          Please use Interactive mode to Verify subscription test cases
+          Here the command to enter interactive mode:--   ./chip-tool interactive start
+      disabled: true
+
     - label:
           "Send a Read Request Message from RC1 and RC2 to read the ACL
           attribute, which is a fabric scoped list, from the DUT. Fabric
@@ -606,5 +612,5 @@
           where an event in the path is fabric-sensitive and the associated
           fabric does not match the accessing fabric."
       verification: |
-          Waiting for test-plan author input
+          Mark this as not testable /NA. Out of Scope for V1.0
       disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_ILL_2_2.yaml b/src/app/tests/suites/certification/Test_TC_ILL_2_2.yaml
index 03df7f3..8b72b89 100644
--- a/src/app/tests/suites/certification/Test_TC_ILL_2_2.yaml
+++ b/src/app/tests/suites/certification/Test_TC_ILL_2_2.yaml
@@ -36,16 +36,13 @@
       PICS: ILL.S.A0001 && ILL.S.A0002
       verification: |
           ./chip-tool illuminancemeasurement read min-measured-value 1 1
-          On TH, verify the MinMeasuredValue as 1
-
+          On TH(chip-tool), verify the MinMeasuredValue as 1
           [1650881571.375482][2777:2782] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0400 Attribute 0x0000_0001 DataVersion: 1034665079
           [1650881571.375596][2777:2782] CHIP:TOO:   MinMeasuredValue: 1
 
           ./chip-tool illuminancemeasurement read max-measured-value 1 1
-          On TH, verify the MaxMeasuredValue as 65534
-
+          On TH(chip-tool), verify the MaxMeasuredValue as 65534
           [1650881715.935533][2791:2797] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0400 Attribute 0x0000_0002 DataVersion: 1034665079
-          Verify in TH Log
           [1650881715.935645][2791:2797] CHIP:TOO:   MaxMeasuredValue: 65534
       disabled: true
 
diff --git a/src/app/tests/suites/certification/Test_TC_ILL_3_1.yaml b/src/app/tests/suites/certification/Test_TC_ILL_3_1.yaml
index 6ce029e..830f81e 100644
--- a/src/app/tests/suites/certification/Test_TC_ILL_3_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_ILL_3_1.yaml
@@ -28,12 +28,19 @@
     endpoint: 0
 
 tests:
+    - label: "Note"
+      verification: |
+          Chip-tool command used below are an example to verify the  DUT as client test cases. For certification test, we expect DUT should have a capability or way to run the equivalent command.
+      disabled: true
+
     - label:
           "DUT reads all supported mandatory attributes from TH one at a time in
           a manufacturer specific order"
       verification: |
+          Product maker needs to provide instructions for how to trigger the command on the DUT. For comparison, the DUT behavior for this test step can be simulated using chip-tool (when DUT is a commissioner/Client)
+
           sudo ./chip-tool illuminancemeasurement read min-measured-value 1 1
-          verify On TH(Reference app) receives the right Read Request Message for the data sent in the above command
+          Verify DUT receives  min-measured-value attribute response on the TH(all-clusters-app) Log:
 
           [1658142106.966504][13946:13946] CHIP:IM: Received Read request
           [1658142106.966671][13946:13946] CHIP:DMG: ReadRequestMessage =
@@ -55,14 +62,8 @@
           [1658142106.967568][13946:13946] CHIP:DMG: IM RH moving to [GeneratingReports]
           [1658142106.967676][13946:13946] CHIP:DMG: Building Reports for ReadHandler with LastReportGeneration = 0 DirtyGeneration = 0
 
-          On DUT as a client side, verify that TH all-clusters-app sent MinMeasuredValue attribute value
-          [1657175568.648126][4333:4338] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0400 Attribute 0x0000_0001 DataVersion: 891386989
-          [1657175568.648195][4333:4338] CHIP:TOO:   MinMeasuredValue: 1
-          [1657175568.648282][4333:4338] CHIP:EM: Sending Standalone Ack for MessageCounter:69575282 on exchange 26638i
-
-
           sudo ./chip-tool illuminancemeasurement read max-measured-value 1 1
-          verify On TH(Reference app) receives the right Read Request Message for the data sent in the above command
+          Verify DUT receives  max-measured-value attribute response on the TH(all-clusters-app) Log:
           [1658142397.298817][13946:13946] CHIP:IM: Received Read request
           [1658142397.298895][13946:13946] CHIP:DMG: ReadRequestMessage =
           [1658142397.298932][13946:13946] CHIP:DMG: {
@@ -84,14 +85,8 @@
           [1658142397.299556][13946:13946] CHIP:DMG: Building Reports for ReadHandler with LastReportGeneration = 0 DirtyGeneration = 0
 
 
-          On DUT as a client side, verify that TH all-clusters-app sent MaxMeasuredValue attribute value
-          [1658142397.323460][8822:8827] CHIP:DMG: }
-          [1658142397.323671][8822:8827] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0400 Attribute 0x0000_0002 DataVersion: 2941193782
-          [1658142397.323776][8822:8827] CHIP:TOO:   MaxMeasuredValue: 65534
-          [1658142397.323890][8822:8827] CHIP:EM: Sending Standalone Ack for MessageCounter:116176039 on exchange 61750i
-
-
           sudo ./chip-tool illuminancemeasurement read measured-value 1 1
+          Verify DUT receives  measured-value attribute response on the TH(all-clusters-app) Log:
           verify On TH(Reference app) receives the right Read Request Message for the data sent in the above command
           [1658142471.266188][13946:13946] CHIP:IM: Received Read request
           [1658142471.266273][13946:13946] CHIP:DMG: ReadRequestMessage =
@@ -112,23 +107,16 @@
           [1658142471.266740][13946:13946] CHIP:DMG: },
           [1658142471.266826][13946:13946] CHIP:DMG: IM RH moving to [GeneratingReports]
           [1658142471.266939][13946:13946] CHIP:DMG: Building Reports for ReadHandler with LastReportGeneration = 0 DirtyGeneration = 0
-
-          On DUT as a client side, verify that TH all-clusters-app sent MeasuredValue attribute value
-          [1658142471.287159][8830:8835] CHIP:DMG: }
-          [1658142471.287366][8830:8835] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0400 Attribute 0x0000_0000 DataVersion: 2941193782
-          [1658142471.287467][8830:8835] CHIP:TOO:   MeasuredValue: 0
-          [1658142471.287576][8830:8835] CHIP:EM: Sending Standalone Ack for MessageCounter:72762651 on exchange 45776i
       disabled: true
 
     - label:
           "DUT reads all supported optional attributes from TH one at a time in
           a manufacturer specific order"
       verification: |
-          verify on Reference app receives the right response for the data sent in the above commands
-
+          Product maker needs to provide instructions for how to trigger the command on the DUT. For comparison, the DUT behavior for this test step can be simulated using chip-tool (when DUT is a commissioner/Client)
 
           ./chip-tool illuminancemeasurement read tolerance 1 1
-          verify On TH(Reference app) receives the right Read Request Message for the data sent in the above command
+          Verify DUT receives tolerance attribute response on the TH(all-clusters-app) Log:
           [1658142553.001113][13946:13946] CHIP:IM: Received Read request
           [1658142553.001197][13946:13946] CHIP:DMG: ReadRequestMessage =
           [1658142553.001258][13946:13946] CHIP:DMG: {
@@ -148,15 +136,9 @@
           [1658142553.001717][13946:13946] CHIP:DMG: },
           [1658142553.001801][13946:13946] CHIP:DMG: IM RH moving to [GeneratingReports]
 
-          On DUT as a client side, verify that TH all-clusters-app sent success response
-          [1657175695.088331][4349:4354] CHIP:DMG: }
-          [1657175695.088479][4349:4354] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0400 Attribute 0x0000_0003 DataVersion: 891386989
-          [1657175695.088540][4349:4354] CHIP:TOO:   Tolerance: 0
-          [1657175695.088624][4349:4354] CHIP:EM: Sending Standalone Ack for MessageCounter:263371247 on exchange 59872i
-
 
           ./chip-tool illuminancemeasurement read light-sensor-type 1 1
-          verify On TH(Reference app) receives the right Read Request Message for the data sent in the above command
+          Verify DUT receives  light-sensor-type attribute response on the TH(all-clusters-app) Log:
           [1658142581.619138][13946:13946] CHIP:IM: Received Read request
           [1658142581.619214][13946:13946] CHIP:DMG: ReadRequestMessage =
           [1658142581.619265][13946:13946] CHIP:DMG: {
@@ -175,14 +157,6 @@
           [1658142581.619616][13946:13946] CHIP:DMG:         InteractionModelRevision = 1
           [1658142581.619639][13946:13946] CHIP:DMG: },
           [1658142581.619714][13946:13946] CHIP:DMG: IM RH moving to [GeneratingReports]
-
-          On DUT as a client side, verify that TH all-clusters-app sent success response
-          [1657175720.644987][4357:4362] CHIP:DMG: }
-          [1657175720.645166][4357:4362] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0400 Attribute 0x0000_0004 DataVersion: 891386989
-          [1657175720.645232][4357:4362] CHIP:TOO:   LightSensorType: null
-          [1657175720.645342][4357:4362] CHIP:EM: Sending Standalone Ack for MessageCounter:146392428 on exchange 31713i
-
-           as per Spec, when we read LightSensorType attribute we can get null value as default
       disabled: true
 
     - label:
@@ -205,8 +179,10 @@
           also reflects this in global attributes such as FeatureMap and
           AttributeList. Commission DUT to TH again"
       verification: |
+          Product maker needs to provide instructions for how to trigger the command on the DUT. For comparison, the DUT behavior for this test step can be simulated using chip-tool (when DUT is a commissioner/Client)
+
           sudo ./chip-tool illuminancemeasurement read min-measured-value 1 1
-          verify On TH(Reference app) receives the right Read Request Message for the data sent in the above command
+          Verify DUT receives  min-measured-value attribute response on the TH(all-clusters-minimal-app) Log:
 
           [1658142106.966504][13946:13946] CHIP:IM: Received Read request
           [1658142106.966671][13946:13946] CHIP:DMG: ReadRequestMessage =
@@ -228,14 +204,10 @@
           [1658142106.967568][13946:13946] CHIP:DMG: IM RH moving to [GeneratingReports]
           [1658142106.967676][13946:13946] CHIP:DMG: Building Reports for ReadHandler with LastReportGeneration = 0 DirtyGeneration = 0
 
-          On DUT as a client side, verify that TH all-clusters-app sent MinMeasuredValue attribute value
-          [1657175568.648126][4333:4338] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0400 Attribute 0x0000_0001 DataVersion: 891386989
-          [1657175568.648195][4333:4338] CHIP:TOO:   MinMeasuredValue: 1
-          [1657175568.648282][4333:4338] CHIP:EM: Sending Standalone Ack for MessageCounter:69575282 on exchange 26638i
 
 
           sudo ./chip-tool illuminancemeasurement read max-measured-value 1 1
-          verify On TH(Reference app) receives the right Read Request Message for the data sent in the above command
+          Verify DUT receives  max-measured-value attribute response on the TH(all-clusters-minimal-app) Log:
           [1658142397.298817][13946:13946] CHIP:IM: Received Read request
           [1658142397.298895][13946:13946] CHIP:DMG: ReadRequestMessage =
           [1658142397.298932][13946:13946] CHIP:DMG: {
@@ -257,15 +229,8 @@
           [1658142397.299556][13946:13946] CHIP:DMG: Building Reports for ReadHandler with LastReportGeneration = 0 DirtyGeneration = 0
 
 
-          On DUT as a client side, verify that TH all-clusters-app sent MaxMeasuredValue attribute value
-          [1658142397.323460][8822:8827] CHIP:DMG: }
-          [1658142397.323671][8822:8827] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0400 Attribute 0x0000_0002 DataVersion: 2941193782
-          [1658142397.323776][8822:8827] CHIP:TOO:   MaxMeasuredValue: 65534
-          [1658142397.323890][8822:8827] CHIP:EM: Sending Standalone Ack for MessageCounter:116176039 on exchange 61750i
-
-
           sudo ./chip-tool illuminancemeasurement read measured-value 1 1
-          verify On TH(Reference app) receives the right Read Request Message for the data sent in the above command
+          Verify DUT receives  measured-value attribute response on the TH(all-clusters-minimal-app) Log:
           [1658142471.266188][13946:13946] CHIP:IM: Received Read request
           [1658142471.266273][13946:13946] CHIP:DMG: ReadRequestMessage =
           [1658142471.266303][13946:13946] CHIP:DMG: {
@@ -285,26 +250,21 @@
           [1658142471.266740][13946:13946] CHIP:DMG: },
           [1658142471.266826][13946:13946] CHIP:DMG: IM RH moving to [GeneratingReports]
           [1658142471.266939][13946:13946] CHIP:DMG: Building Reports for ReadHandler with LastReportGeneration = 0 DirtyGeneration = 0
-
-          On DUT as a client side, verify that TH all-clusters-app sent MeasuredValue attribute value
-          [1658142471.287159][8830:8835] CHIP:DMG: }
-          [1658142471.287366][8830:8835] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0400 Attribute 0x0000_0000 DataVersion: 2941193782
-          [1658142471.287467][8830:8835] CHIP:TOO:   MeasuredValue: 0
-          [1658142471.287576][8830:8835] CHIP:EM: Sending Standalone Ack for MessageCounter:72762651 on exchange 45776i
       disabled: true
 
     - label:
           "DUT reads all supported optional attributes from TH one at a time in
           a manufacturer specific order"
       verification: |
-          ./chip-tool illuminancemeasurement read  tolerance  1 1
+          Product maker needs to provide instructions for how to trigger the command on the DUT. For comparison, the DUT behavior for this test step can be simulated using chip-tool (when DUT is a commissioner/Client)
 
-          On DUT as a client side, verify that TH all-clusters-app sent UNSUPPORTED_ATTRIBUTE response
+           ./chip-tool illuminancemeasurement read  tolerance  1 1
+
+          on TH all-clusters-minimal-app verify status response a  UNSUPPORTED_ATTRIBUTE
            General error: 0x86 (UNSUPPORTED_ATTRIBUTE)
 
           ./chip-tool illuminancemeasurement read light-sensor-type 1 1
-
-          On DUT as a client side, verify that TH all-clusters-app sent UNSUPPORTED_ATTRIBUTE response
+          on TH all-clusters-minimal-app verify status response a  UNSUPPORTED_ATTRIBUTE
            General error: 0x86 (UNSUPPORTED_ATTRIBUTE)
       disabled: true
 
diff --git a/src/app/tests/suites/certification/Test_TC_I_3_1.yaml b/src/app/tests/suites/certification/Test_TC_I_3_1.yaml
index 6dca72c..89a498b 100644
--- a/src/app/tests/suites/certification/Test_TC_I_3_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_I_3_1.yaml
@@ -28,12 +28,18 @@
     endpoint: 0
 
 tests:
+    - label: "Note"
+      verification: |
+          Chip-tool command used below are an example to verify the  DUT as client test cases. For certification test, we expect DUT should have a capability or way to run the equivalent command.
+      disabled: true
+
     - label:
           "DUT reads all supported mandatory attributes from TH one at a time in
           a manufacturer specific order"
       verification: |
+          Product maker needs to provide instructions for how to trigger the command on the DUT. For comparison, the DUT behavior for this test step can be simulated using chip-tool (when DUT is a commissioner/Client)
           ./chip-tool identify read identify-time 1 1
-          verify On TH(Reference app) receives the right Read Request Message for the data sent in the above command
+          Verify DUT receives  identify-time attribute response on the TH(all-clusters-app) Log:
 
           [1648015371.159715][2506:2506] CHIP:IM: Received Read request
           [1648015371.159805][2506:2506] CHIP:DMG: ReadRequestMessage =
@@ -53,15 +59,9 @@
           [1648015371.160300][2506:2506] CHIP:DMG:         InteractionModelRevision = 1
           [1648015371.160324][2506:2506] CHIP:DMG: },
 
-          On DUT as a client side, verify that TH all-clusters-app sent identify time attribute value
-          [1658144129.651688][8964:8969] CHIP:DMG: }
-          [1658144129.651919][8964:8969] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0003 Attribute 0x0000_0000 DataVersion: 774797081
-          [1658144129.652113][8964:8969] CHIP:TOO:   identify time: 0
-          [1658144129.652237][8964:8969] CHIP:EM: Sending Standalone Ack for MessageCounter:17091478 on exchange 42014i
-
 
            ./chip-tool identify  read   identify-type 1 1
-          verify On TH(Reference app) receives the right Read Request Message for the data sent in the above command
+          Verify DUT receives   identify-type attribute response on the TH(all-clusters-app) Log:
 
           [1648015519.017225][2506:2506] CHIP:IM: Received Read request
           [1648015519.017293][2506:2506] CHIP:DMG: ReadRequestMessage =
@@ -80,12 +80,6 @@
           [1648015519.017932][2506:2506] CHIP:DMG:         isFabricFiltered = true,
           [1648015519.017969][2506:2506] CHIP:DMG:         InteractionModelRevision = 1
           [1648015519.018003][2506:2506] CHIP:DMG: },
-
-          On DUT as a client side, verify that TH all-clusters-app sent identify type attribute value
-          [1658144152.172514][8970:8975] CHIP:DMG: }
-          [1658144152.172661][8970:8975] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0003 Attribute 0x0000_0001 DataVersion: 774797081
-          [1658144152.172726][8970:8975] CHIP:TOO:   identify type: 2
-          [1658144152.172813][8970:8975] CHIP:EM: Sending Standalone Ack for MessageCounter:190112026 on exchange 9214i
       disabled: true
 
     - label:
@@ -99,9 +93,11 @@
           "DUT writes a suitable value to all supported mandatory attributes on
           the TH one at a time in a manufacturer specific order"
       verification: |
+          Product maker needs to provide instructions for how to trigger the command on the DUT. For comparison, the DUT behavior for this test step can be simulated using chip-tool (when DUT is a commissioner/Client)
+
           ./chip-tool identify  write   identify-time  1 1 1
 
-          verify On TH(Reference app) receives the right write Request Message for the data sent in the above command
+          Verify DUT receives  identify-time attribute write response on the TH(all-clusters-app) Log:
           [1646012277.591912][33190:33190] CHIP:IM: Received Write request
           [1646012277.591936][33190:33190] CHIP:DMG: IM WH moving to [Initialized]
           [1646012277.591987][33190:33190] CHIP:DMG: WriteRequestMessage =
@@ -128,20 +124,13 @@
           [1646012277.592589][33190:33190] CHIP:DMG: },
           [1646012277.592669][33190:33190] CHIP:DMG: AccessControl: checking f=1 a=c s=0x000000000001B669 t= c=0x0000_0003 e=1 p=o
           [1646012277.592721][33190:33190] CHIP:DMG: Endpoint 1, Cluster 0x0000_0003 update version to d4fdf520
-
-          On DUT as a client side, verify that TH all-clusters-app sent success response
-          [1658144181.287676][8979:8984] CHIP:DMG:
-          [1658144181.287736][8979:8984] CHIP:DMG:                         StatusIB =
-          [1658144181.287792][8979:8984] CHIP:DMG:                         {
-          [1658144181.287849][8979:8984] CHIP:DMG:                                 status = 0x00 (SUCCESS),
-          [1658144181.287907][8979:8984] CHIP:DMG:                         },
       disabled: true
 
     - label:
           "DUT writes a suitable value to all supported optional attributes on
           the TH one at a time in a manufacturer specific order"
       verification: |
-          There is no optional attibute for this cluster
+          There is no write optional attibute for this cluster
       disabled: true
 
     - label:
@@ -150,8 +139,10 @@
           also reflects this in global attributes such as FeatureMap and
           AttributeList. Commission DUT to TH again"
       verification: |
+          Product maker needs to provide instructions for how to trigger the command on the DUT. For comparison, the DUT behavior for this test step can be simulated using chip-tool (when DUT is a commissioner/Client)
+
           ./chip-tool identify read identify-time 1 1
-          verify On TH(Reference app) receives the right Read Request Message for the data sent in the above command
+          Verify DUT receives  identify-time attribute response on theTH(all-clusters-minimal-app)
 
           [1648015371.159715][2506:2506] CHIP:IM: Received Read request
           [1648015371.159805][2506:2506] CHIP:DMG: ReadRequestMessage =
@@ -171,15 +162,9 @@
           [1648015371.160300][2506:2506] CHIP:DMG:         InteractionModelRevision = 1
           [1648015371.160324][2506:2506] CHIP:DMG: },
 
-          On DUT as a client side, verify that TH all-clusters-app sent identify time attribute value
-          [1658144129.651688][8964:8969] CHIP:DMG: }
-          [1658144129.651919][8964:8969] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0003 Attribute 0x0000_0000 DataVersion: 774797081
-          [1658144129.652113][8964:8969] CHIP:TOO:   identify time: 0
-          [1658144129.652237][8964:8969] CHIP:EM: Sending Standalone Ack for MessageCounter:17091478 on exchange 42014i
-
 
            ./chip-tool identify  read   identify-type 1 1
-          verify On TH(Reference app) receives the right Read Request Message for the data sent in the above command
+          Verify DUT receives  identify-type attribute response on theTH(all-clusters-minimal-app)
 
           [1648015519.017225][2506:2506] CHIP:IM: Received Read request
           [1648015519.017293][2506:2506] CHIP:DMG: ReadRequestMessage =
@@ -198,12 +183,6 @@
           [1648015519.017932][2506:2506] CHIP:DMG:         isFabricFiltered = true,
           [1648015519.017969][2506:2506] CHIP:DMG:         InteractionModelRevision = 1
           [1648015519.018003][2506:2506] CHIP:DMG: },
-
-          On DUT as a client side, verify that TH all-clusters-app sent identify type attribute value
-          [1658144152.172514][8970:8975] CHIP:DMG: }
-          [1658144152.172661][8970:8975] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0003 Attribute 0x0000_0001 DataVersion: 774797081
-          [1658144152.172726][8970:8975] CHIP:TOO:   identify type: 2
-          [1658144152.172813][8970:8975] CHIP:EM: Sending Standalone Ack for MessageCounter:190112026 on exchange 9214i
       disabled: true
 
     - label:
@@ -217,5 +196,5 @@
           "DUT writes a suitable value to all supported optional attributes on
           the TH one at a time in a manufacturer specific order"
       verification: |
-          There is no optional attibute for this cluster
+          There is no optional write attibute for this cluster
       disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_I_3_2.yaml b/src/app/tests/suites/certification/Test_TC_I_3_2.yaml
index 7cf72dd..69b14fa 100644
--- a/src/app/tests/suites/certification/Test_TC_I_3_2.yaml
+++ b/src/app/tests/suites/certification/Test_TC_I_3_2.yaml
@@ -24,14 +24,22 @@
     endpoint: 0
 
 tests:
+    - label: "Note"
+      verification: |
+          Chip-tool command used below are an example to verify the  DUT as client test cases. For certification test, we expect DUT should have a capability or way to run the equivalent command.
+      disabled: true
+
     - label:
           "DUT issues an Identify command to the Test Harness, with the
           IdentifyTime argument set to 0x003C (60 seconds) or a reasonable time
           that is supported by the DUT."
       PICS: I.C.C00.Tx
       verification: |
+          Product maker needs to provide instructions for how to trigger the command on the DUT. For comparison, the DUT behavior for this test step can be simulated using chip-tool (when DUT is a commissioner/Client)
+
+
           ./chip-tool identify identify 60 1 1
-          verify On TH(Reference app) receives the right invoke Request Message for the data sent in the above command
+          Verify DUT receives  Identify command response on the TH(all-clusters-app) Log:
           [1646010972.583498][33190:33190] CHIP:EM: Handling via exchange: 60250r, Delegate: 0xaaaace1730c8
           [1646010972.583578][33190:33190] CHIP:DMG: InvokeRequestMessage =
           [1646010972.583611][33190:33190] CHIP:DMG: {
@@ -83,8 +91,9 @@
           IdentifyTime argument set to 0x0000 (Stop)."
       PICS: I.C.C00.Tx
       verification: |
+          Product maker needs to provide instructions for how to trigger the command on the DUT. For comparison, the DUT behavior for this test step can be simulated using chip-tool (when DUT is a commissioner/Client)
           ./chip-tool identify identify 0 1 1
-          verify On TH(Reference app) receives the right invoke Request Message for the data sent in the above command
+          Verify DUT receives  Identify command response on the TH(all-clusters-app) Log:
           [1646011311.206353][33190:33190] CHIP:EM: Handling via exchange: 12024r, Delegate: 0xaaaace1730c8
           [1646011311.206436][33190:33190] CHIP:DMG: InvokeRequestMessage =
           [1646011311.206462][33190:33190] CHIP:DMG: {
@@ -115,12 +124,6 @@
           [1646011311.207295][33190:33190] CHIP:DMG: Received command for Endpoint=1 Cluster=0x0000_0003 Command=0x0000_0000
           [1646011311.207342][33190:33190] CHIP:DMG: Endpoint 1, Cluster 0x0000_0003 update version to d4fdf4a5
           [1646011311.207377][33190:33190] CHIP:ZCL: OnIdentifyStop
-
-          On DUT as a client side, verify that TH all-clusters-app sent success response
-          [1658144495.036737][9002:9007] CHIP:DMG: },
-          [1658144495.036829][9002:9007] CHIP:DMG: Received Command Response Status for Endpoint=1 Cluster=0x0000_0003 Command=0x0000_0000 Status=0x0
-          [1658144495.036893][9002:9007] CHIP:DMG: ICR moving to [AwaitingDe]
-          [1658144495.036970][9002:9007] CHIP:EM: Sending Standalone Ack for MessageCounter:97481310 on exchange 7554i
       disabled: true
 
     - label:
@@ -128,8 +131,10 @@
           supported EffectIdentifier argument and EffectVariant set to 0."
       PICS: I.C.C40.Tx
       verification: |
+          Product maker needs to provide instructions for how to trigger the command on the DUT. For comparison, the DUT behavior for this test step can be simulated using chip-tool (when DUT is a commissioner/Client)
+
           ./chip-tool identify trigger-effect 0 0 1 1
-          verify On TH(Reference app) receives the right invoke Request Message for the data sent in the above command
+          Verify DUT receives  Identify command response on the TH(all-clusters-app) Log:
           [1646011549.034604][33190:33190] CHIP:EM: Received message of type 0x8 with protocolId (0, 1) and MessageCounter:3605482 on exchange 36067r
           [1646011549.034646][33190:33190] CHIP:EM: Handling via exchange: 36067r, Delegate: 0xaaaace1730c8
           [1646011549.034790][33190:33190] CHIP:DMG: InvokeRequestMessage =
@@ -161,10 +166,4 @@
           [1646011549.035975][33190:33190] CHIP:DMG: AccessControl: checking f=1 a=c s=0x000000000001B669 t= c=0x0000_0003 e=1 p=o
           [1646011549.036017][33190:33190] CHIP:DMG: Received command for Endpoint=1 Cluster=0x0000_0003 Command=0x0000_0040
           [1646011549.036052][33190:33190] CHIP:ZCL: RX identify:trigger effect 0x1 variant 0x0
-
-          On DUT as a client side, verify that TH all-clusters-app sent success response
-          [1658144515.570727][9010:9015] CHIP:DMG: },
-          [1658144515.570854][9010:9015] CHIP:DMG: Received Command Response Status for Endpoint=1 Cluster=0x0000_0003 Command=0x0000_0040 Status=0x0
-          [1658144515.570922][9010:9015] CHIP:DMG: ICR moving to [AwaitingDe]
-          [1658144515.570999][9010:9015] CHIP:EM: Sending Standalone Ack for MessageCounter:226820812 on exchange 14189i
       disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_KEYPADINPUT_3_1.yaml b/src/app/tests/suites/certification/Test_TC_KEYPADINPUT_3_1.yaml
new file mode 100644
index 0000000..8e091da
--- /dev/null
+++ b/src/app/tests/suites/certification/Test_TC_KEYPADINPUT_3_1.yaml
@@ -0,0 +1,59 @@
+# Copyright (c) 2021 Project CHIP Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# Auto-generated scripts for harness use only, please review before automation. The endpoints and cluster names are currently set to default
+
+name: 3.3.1. [TC-KEYPADINPUT-3.1] Send Key Command Verification (DUT as Client)
+
+config:
+    nodeId: 0x12344321
+    cluster: "Basic"
+    endpoint: 0
+
+tests:
+    - label: "DUT sends SendKey command to TH"
+      PICS: KEYPADINPUT.C.C00.Tx
+      verification: |
+          Product maker needs to provide instructions for how to trigger the command on the DUT. For comparison, the DUT behavior for this test step can be simulated using chip-tool (when DUT is a commissioner) or tv-casting-app (when DUT is a commissionee):
+          ./chip-tool keypadinput send-key 10 1 1
+          ./chip-tv-casting-app keypadinput send-key 10 1 1
+
+
+          The log below shows the resulting log on the TH (tv-app or all-clusters-app):
+
+          [1658530264507] [21469:308294] CHIP: [DMG] InvokeRequestMessage =
+          [1658530264507] [21469:308294] CHIP: [DMG] {
+          [1658530264507] [21469:308294] CHIP: [DMG]         suppressResponse = false,
+          [1658530264507] [21469:308294] CHIP: [DMG]         timedRequest = false,
+          [1658530264507] [21469:308294] CHIP: [DMG]         InvokeRequests =
+          [1658530264507] [21469:308294] CHIP: [DMG]         [
+          [1658530264507] [21469:308294] CHIP: [DMG]                 CommandDataIB =
+          [1658530264507] [21469:308294] CHIP: [DMG]                 {
+          [1658530264507] [21469:308294] CHIP: [DMG]                         CommandPathIB =
+          [1658530264507] [21469:308294] CHIP: [DMG]                         {
+          [1658530264507] [21469:308294] CHIP: [DMG]                                 EndpointId = 0x1,
+          [1658530264507] [21469:308294] CHIP: [DMG]                                 ClusterId = 0x509,
+          [1658530264507] [21469:308294] CHIP: [DMG]                                 CommandId = 0x0,
+          [1658530264507] [21469:308294] CHIP: [DMG]                         },
+          [1658530264507] [21469:308294] CHIP: [DMG]
+          [1658530264507] [21469:308294] CHIP: [DMG]                         CommandFields =
+          [1658530264507] [21469:308294] CHIP: [DMG]                         {
+          [1658530264507] [21469:308294] CHIP: [DMG]                                 0x0 = 10,
+          [1658530264507] [21469:308294] CHIP: [DMG]                         },
+          [1658530264507] [21469:308294] CHIP: [DMG]                 },
+          [1658530264507] [21469:308294] CHIP: [DMG]
+          [1658530264507] [21469:308294] CHIP: [DMG]         ],
+          [1658530264507] [21469:308294] CHIP: [DMG]
+          [1658530264507] [21469:308294] CHIP: [DMG]         InteractionModelRevision = 1
+          [1658530264507] [21469:308294] CHIP: [DMG] },
+      disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_LCFG_1_1.yaml b/src/app/tests/suites/certification/Test_TC_LCFG_1_1.yaml
index df503d7..d94ff98 100644
--- a/src/app/tests/suites/certification/Test_TC_LCFG_1_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_LCFG_1_1.yaml
@@ -26,14 +26,14 @@
 tests:
     - label: "Commission TH to DUT"
       verification: |
-
+          verification step to be updated.
       disabled: true
 
-    - label: "TH reads from the DUT the (0xFFFD) ClusterRevision attribute"
+    - label: "{THread} (0xFFFD) ClusterRevision attribute"
       verification: |
           ./chip-tool localizationconfiguration read cluster-revision 1 0
 
-          On TH, verify that DUT sends ClusterRevision attribute value as 1
+          On TH(chip-tool), verify that DUT sends ClusterRevision attribute value as 1
 
           [1649330698.587235][4440:4445] CHIP:DMG:
           [1649330698.587269][4440:4445] CHIP:DMG:        SuppressResponse = true,
@@ -43,20 +43,20 @@
           [1649330698.587643][4440:4445] CHIP:TOO:   ClusterRevision: 1
       disabled: true
 
-    - label: "TH reads from the DUT the (0xFFFC) FeatureMap attribute"
+    - label: "{THread} (0xFFFC) FeatureMap attribute"
       verification: |
           ./chip-tool localizationconfiguration read feature-map 1 0
 
-          On TH, verify that DUT sends  FeatureMap attribute value as 0
+          On TH(chip-tool), verify that DUT sends  FeatureMap attribute value as 0
           [1653462414.221894][29485:29490] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_002B Attribute 0x0000_FFFC DataVersion: 2352052086
           [1653462414.222033][29485:29490] CHIP:TOO:   FeatureMap: 0
           [1653462414.222207][29485:29490] CHIP:EM: Sending Standalone Ack for MessageCounter:4940181 on exchange 7821i
       disabled: true
 
-    - label: "TH reads from the DUT the (0xFFFB) AttributeList attribute"
+    - label: "{THread} (0xFFFB) AttributeList attribute"
       verification: |
           ./chip-tool localizationconfiguration read  attribute-list 1 0
-          On TH, verify that DUT  sends a list of supported attributes
+          On TH(chip-tool), verify that DUT  sends a list of supported attributes
 
           [1653462309.061114][29477:29482] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_002B Attribute 0x0000_FFFB DataVersion: 2352052086
           [1653462309.061199][29477:29482] CHIP:TOO:   AttributeList: 7 entries
@@ -70,15 +70,15 @@
           [1653462309.061492][29477:29482] CHIP:EM: Sending Standalone Ack for MessageCounter:13553423 on exchange 61180i
       disabled: true
 
-    - label: "TH reads from the DUT the (0xFFFA) EventList attribute"
+    - label: "{THread} (0xFFFA) EventList attribute"
       verification: |
           out 0f scope for V1.0
       disabled: true
 
-    - label: "TH reads from the DUT the (0xFFF9) AcceptedCommandList attribute"
+    - label: "{THread} (0xFFF9) AcceptedCommandList attribute"
       verification: |
           ./chip-tool localizationconfiguration read accepted-command-list 1 0
-          On TH, verify that DUT  responsds as list of Accepted Command as 0 entries.
+          On TH(chip-too), verify that DUT  responsds as list of Accepted Command as 0 entries.
 
           [1649331020.031045][4520:4525] CHIP:DMG:
           [1649331020.031081][4520:4525] CHIP:DMG:        SuppressResponse = true,
@@ -88,10 +88,10 @@
           [1649331020.031470][4520:4525] CHIP:TOO:   AcceptedCommandList: 0 entries
       disabled: true
 
-    - label: "TH reads from the DUT the (0xFFF8) GeneratedCommandList attribute"
+    - label: "{THread} (0xFFF8) GeneratedCommandList attribute"
       verification: |
           ./chip-tool localizationconfiguration read  generated-command-list 1 0
-          On TH, verify that DUT  responsds as list of GeneratedCommandList as 0 entries.
+          On TH(chip-tool), verify that DUT  responsds as list of GeneratedCommandList as 0 entries.
 
           [1649330937.798986][4508:4513] CHIP:DMG:
           [1649330937.799022][4508:4513] CHIP:DMG:        SuppressResponse = true,
diff --git a/src/app/tests/suites/certification/Test_TC_LCFG_2_1.yaml b/src/app/tests/suites/certification/Test_TC_LCFG_2_1.yaml
index aa0050d..4663422 100644
--- a/src/app/tests/suites/certification/Test_TC_LCFG_2_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_LCFG_2_1.yaml
@@ -14,7 +14,7 @@
 # Auto-generated scripts for harness use only, please review before automation. The endpoints and cluster names are currently set to default
 
 name:
-    99.2.1. [TC-LCFG-2.1] Localization Configuration Cluster
+    102.2.1. [TC-LCFG-2.1] Localization Configuration Cluster
     Attributes[DUT-Server]
 
 PICS:
@@ -30,7 +30,7 @@
       PICS: LCFG.S.A0001
       verification: |
           ./chip-tool localizationconfiguration read supported-locales 1 0
-          On TH verify that the entry values in the SupportedLocales attribute are not repeated
+          On TH(chip-tool) verify that the entry values in the SupportedLocales attribute are not repeated
 
           [1651129546.170573][174082:174087] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_002B Attribute 0x0000_0002 DataVersion: 3111654481
           [1651129546.170622][174082:174087] CHIP:TOO:   SupportedLocales: 8 entries
@@ -44,10 +44,10 @@
           [1651129546.170697][174082:174087] CHIP:TOO:     [8]: ja-JP
       disabled: true
 
-    - label: 'TH writes "xx-XX" to SupportedLocales attribute'
+    - label: "TH writes xx-XX to SupportedLocales attribute"
       verification: |
-          ./chip-tool any write-by-id 0x002B 1 '"xx-XX"' 1 0
-          On TH verify that DUT responds as UNSUPPORTED_WRITE
+          ./chip-tool any write-by-id 0x002B 1 ""xx-XX"" 1 0
+          On TH(chip-tool) verify that DUT responds as UNSUPPORTED_WRITE
 
           [1653996674.832226][7281:7286] CHIP:DMG: WriteClient moving to [AwaitingDe]
           [1653996674.832300][7281:7286] CHIP:TOO: Response Failure: IM Error 0x00000588: General error: 0x88 (UNSUPPORTED_WRITE)
@@ -57,7 +57,7 @@
     - label: "TH reads SupportedLocales attribute"
       verification: |
           ./chip-tool localizationconfiguration read supported-locales 1 0
-          On TH verify that the entries same as step 1
+          On TH(chip-tool) verify that the entries same as step 1
           [1645772065.848431][3762:3767] CHIP:TOO:   SupportedLocales: 8 entries
           [1645772065.850249][3762:3767] CHIP:TOO:     [1]: en-US
           [1645772065.850298][3762:3767] CHIP:TOO:     [2]: de-DE
@@ -74,7 +74,7 @@
       PICS: LCFG.S.A0000
       verification: |
           ./chip-tool localizationconfiguration read active-locale 1 0
-          On TH verify  that the ActiveLocale Attribute value is present in the SupportedLocales attribute list
+          On TH(chip-tool) verify  that the ActiveLocale Attribute value is present in the SupportedLocales attribute list
 
           [1651035208.064278][2761:2766] CHIP:DMG:        SuppressResponse = true,
           [1651035208.064316][2761:2766] CHIP:DMG:        InteractionModelRevision = 1
@@ -88,7 +88,7 @@
           ActiveLocale Attribute."
       verification: |
           ./chip-tool localizationconfiguration write active-locale fw-GB 1 0
-          On TH verify that DUT responds as CONSTRAINT_ERROR
+          On TH(chip-tool) verify that DUT responds as CONSTRAINT_ERROR
 
           [[1651130076.882814][174458:174463] CHIP:DMG: WriteResponseMessage =
           [1651130076.882819][174458:174463] CHIP:DMG: {
@@ -124,7 +124,7 @@
           ActiveLocale Attribute"
       verification: |
           ./chip-tool localizationconfiguration write active-locale fr-FR 1 0
-          On TH verify that DUT responds as SUCCESS
+          On TH(chip-tool) verify that DUT responds as SUCCESS
 
           [1651035259.959116][2776:2781] CHIP:DMG:                        StatusIB =
           [1651035259.959158][2776:2781] CHIP:DMG:                        {
@@ -143,7 +143,7 @@
     - label: "TH Reads ActiveLocale"
       verification: |
           ./chip-tool localizationconfiguration read active-locale 1 0
-          On TH Verify that the value of the ActiveLocale attribute is changed
+          On TH(chip-tool) Verify that the value of the ActiveLocale attribute is changed
 
           [1645772597.252904][3816:3821] CHIP:DMG:
           [1645772597.252948][3816:3821] CHIP:DMG:        SuppressResponse = true,
diff --git a/src/app/tests/suites/certification/Test_TC_LCFG_3_1.yaml b/src/app/tests/suites/certification/Test_TC_LCFG_3_1.yaml
index 6f88ddc..59008c4 100644
--- a/src/app/tests/suites/certification/Test_TC_LCFG_3_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_LCFG_3_1.yaml
@@ -14,7 +14,7 @@
 # Auto-generated scripts for harness use only, please review before automation. The endpoints and cluster names are currently set to default
 
 name:
-    99.3.1. [TC-LCFG-3.1] Localization Configuration Cluster
+    102.3.1. [TC-LCFG-3.1] Localization Configuration Cluster
     Attributes[DUT-Client]
 
 PICS:
@@ -26,30 +26,61 @@
     endpoint: 0
 
 tests:
+    - label: "Note"
+      verification: |
+          Chip-tool command used below are an example to verify the  DUT as client test cases. For certification test, we expect DUT should have a capability or way to run the equivalent command.
+      disabled: true
+
     - label: "DUT reads SupportedLocales attribute from TH"
       PICS: LCFG.C.A0001
       verification: |
-          ./chip-tool localizationconfiguration read supported-locales 1 0
-          Verify in DUT as client side: verify that DUT reads SupportedLocales attribute from the TH successfully
+          Product maker needs to provide instructions for how to trigger the command on the DUT. For comparison, the DUT behavior for this test step can be simulated using chip-tool (when DUT is a commissioner/Client)
 
-          [1657111931.771994][5357:5363] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_002B Attribute 0x0000_0001 DataVersion: 3168433155
-          [1657111931.772105][5357:5363] CHIP:TOO:   SupportedLocales: 8 entries
-          [1657111931.772175][5357:5363] CHIP:TOO:     [1]: en-US
-          [1657111931.772220][5357:5363] CHIP:TOO:     [2]: de-DE
-          [1657111931.772262][5357:5363] CHIP:TOO:     [3]: fr-FR
-          [1657111931.772303][5357:5363] CHIP:TOO:     [4]: en-GB
-          [1657111931.772344][5357:5363] CHIP:TOO:     [5]: es-ES
-          [1657111931.772385][5357:5363] CHIP:TOO:     [6]: zh-CN
-          [1657111931.772426][5357:5363] CHIP:TOO:     [7]: it-IT
-          [1657111931.772466][5357:5363] CHIP:TOO:     [8]: ja-JP
+          ./chip-tool localizationconfiguration read supported-locales 1 0
+          Verify DUT receives supported-locales attribute  response on the TH(all-clusters-app) Log:
+          659616748.134098][11438:11438] CHIP:IM: Received Read request
+          [1659616748.134248][11438:11438] CHIP:DMG: ReadRequestMessage =
+          [1659616748.134307][11438:11438] CHIP:DMG: {
+          [1659616748.134355][11438:11438] CHIP:DMG:         AttributePathIBs =
+          [1659616748.134410][11438:11438] CHIP:DMG:         [
+          [1659616748.134463][11438:11438] CHIP:DMG:                 AttributePathIB =
+          [1659616748.134536][11438:11438] CHIP:DMG:                 {
+          [1659616748.134599][11438:11438] CHIP:DMG:                         Endpoint = 0x0,
+          [1659616748.134673][11438:11438] CHIP:DMG:                         Cluster = 0x2b,
+          [1659616748.134743][11438:11438] CHIP:DMG:                         Attribute = 0x0000_0001,
+          [1659616748.134808][11438:11438] CHIP:DMG:                 }
+          [1659616748.134875][11438:11438] CHIP:DMG:
+          [1659616748.134936][11438:11438] CHIP:DMG:         ],
+          [1659616748.134996][11438:11438] CHIP:DMG:
+          [1659616748.135053][11438:11438] CHIP:DMG:         isFabricFiltered = true,
+          [1659616748.135109][11438:11438] CHIP:DMG:         InteractionModelRevision = 1
+          [1659616748.135160][11438:11438] CHIP:DMG: },
+          [1659616748.135322][11438:11438] CHIP:DMG: IM RH moving to [GeneratingReports]
       disabled: true
 
     - label: "DUT reads ActiveLocale attribute from the TH"
       PICS: LCFG.C.A0000
       verification: |
-          ./chip-tool localizationconfiguration read active-locale 1 0
-          Verify in DUT as client side: verify that DUT reads  ActiveLocale attribute from the TH successfully
+          Product maker needs to provide instructions for how to trigger the command on the DUT. For comparison, the DUT behavior for this test step can be simulated using chip-tool (when DUT is a commissioner/Client)
 
-          [1651564394.281211][8392:8397] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_002B Attribute 0x0000_0001 DataVersion: 1726343234
-          [1651564394.281289][8392:8397] CHIP:TOO:   ActiveLocale: en-US
+          ./chip-tool localizationconfiguration read active-locale 1 0
+          Verify DUT receives active-locale attribute  response on the TH(all-clusters-app) Log:
+
+          [1659616904.401632][11438:11438] CHIP:DMG: ReadRequestMessage =
+          [1659616904.401657][11438:11438] CHIP:DMG: {
+          [1659616904.401676][11438:11438] CHIP:DMG:         AttributePathIBs =
+          [1659616904.401699][11438:11438] CHIP:DMG:         [
+          [1659616904.401720][11438:11438] CHIP:DMG:                 AttributePathIB =
+          [1659616904.401754][11438:11438] CHIP:DMG:                 {
+          [1659616904.401786][11438:11438] CHIP:DMG:                         Endpoint = 0x0,
+          [1659616904.401819][11438:11438] CHIP:DMG:                         Cluster = 0x2b,
+          [1659616904.401851][11438:11438] CHIP:DMG:                         Attribute = 0x0000_0000,
+          [1659616904.401880][11438:11438] CHIP:DMG:                 }
+          [1659616904.401906][11438:11438] CHIP:DMG:
+          [1659616904.401930][11438:11438] CHIP:DMG:         ],
+          [1659616904.401955][11438:11438] CHIP:DMG:
+          [1659616904.401978][11438:11438] CHIP:DMG:         isFabricFiltered = true,
+          [1659616904.402000][11438:11438] CHIP:DMG:         InteractionModelRevision = 1
+          [1659616904.402020][11438:11438] CHIP:DMG: },
+          [1659616904.402087][11438:11438] CHIP:DMG: IM RH moving to [GeneratingReports]
       disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_LTIME_1_1.yaml b/src/app/tests/suites/certification/Test_TC_LTIME_1_1.yaml
index f2c118f..b9caa8a 100644
--- a/src/app/tests/suites/certification/Test_TC_LTIME_1_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_LTIME_1_1.yaml
@@ -24,6 +24,11 @@
     endpoint: 0
 
 tests:
+    - label: "Note"
+      verification: |
+          Chip-tool command used below are an example to verify the  DUT as client test cases. For certification test, we expect DUT should have a capability or way to run the equivalent command.
+      disabled: true
+
     - label: "Commission DUT to TH"
       verification: |
           verification step to be updated.
@@ -33,39 +38,59 @@
       PICS: LTIME.C.Afffd
       verification: |
           ./chip-tool timeformatlocalization read  cluster-revision 1 0
-          Verify in DUT as client side:  verify that TH sends ClusterRevision attribute value as 1
-
-          [1651185991606] [10988:109915] CHIP: [TOO] Endpoint: 0 Cluster: 0x0000_002C Attribute 0x0000_FFFD DataVersion: 3316530441
-          [1651185991606] [10988:109915] CHIP: [TOO]   ClusterRevision: 1
+          Verify DUT receives  cluster-revision attribute response on the TH(all-clusters-app) Log:
+          [1659778215.939476][17263:17263] CHIP:IM: Received Read request
+          [1659778215.939559][17263:17263] CHIP:DMG: ReadRequestMessage =
+          [1659778215.939577][17263:17263] CHIP:DMG: {
+          [1659778215.939592][17263:17263] CHIP:DMG:         AttributePathIBs =
+          [1659778215.939611][17263:17263] CHIP:DMG:         [
+          [1659778215.939625][17263:17263] CHIP:DMG:                 AttributePathIB =
+          [1659778215.939650][17263:17263] CHIP:DMG:                 {
+          [1659778215.939670][17263:17263] CHIP:DMG:                         Endpoint = 0x0,
+          [1659778215.939696][17263:17263] CHIP:DMG:                         Cluster = 0x2c,
+          [1659778215.939716][17263:17263] CHIP:DMG:                         Attribute = 0x0000_FFFD,
+          [1659778215.939732][17263:17263] CHIP:DMG:                 }
+          [1659778215.939753][17263:17263] CHIP:DMG:
+          [1659778215.939766][17263:17263] CHIP:DMG:         ],
+          [1659778215.939786][17263:17263] CHIP:DMG:
+          [1659778215.939804][17263:17263] CHIP:DMG:         isFabricFiltered = true,
+          [1659778215.939821][17263:17263] CHIP:DMG:         InteractionModelRevision = 1
+          [1659778215.939836][17263:17263] CHIP:DMG: },
+          [1659778215.939918][17263:17263] CHIP:DMG: IM RH moving to [GeneratingReports]
+          [1659778215.939984][17263:17263] CHIP:DMG: Building Reports for ReadHandler with LastReportGeneration = 0 DirtyGeneration = 0
       disabled: true
 
     - label: "{DUTread} (0xFFFC) FeatureMap attribute"
       PICS: LTIME.C.Afffc
       verification: |
-          ./chip-tool timeformatlocalization read feature-map 1 0
+          Out of scope for V1.0
 
-          Verify in DUT as client side:  verify that TH sends  FeatureMap attribute value as 1
-
-          [1653379129.497852][7509:7514] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_002C Attribute 0x0000_FFFC DataVersion: 724978222
-          [1653379129.497936][7509:7514] CHIP:TOO:   FeatureMap: 0
+          https://github.com/project-chip/connectedhomeip/issues/18989
       disabled: true
 
     - label: "{DUTread} (0xFFFB) AttributeList attribute"
       PICS: LTIME.C.Afffb
       verification: |
           ./chip-tool timeformatlocalization read attribute-list 1 0
-          Verify in DUT as client side: verify that TH  sends a list of supported attributes
-          [1653999139.214139][7477:7482] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_002C Attribute 0x0000_FFFB DataVersion: 3201720795
-          [1653999139.214208][7477:7482] CHIP:TOO:   AttributeList: 8 entries
-          [1653999139.214241][7477:7482] CHIP:TOO:     [1]: 0
-          [1653999139.214267][7477:7482] CHIP:TOO:     [2]: 1
-          [1653999139.214293][7477:7482] CHIP:TOO:     [3]: 2
-          [1653999139.214320][7477:7482] CHIP:TOO:     [4]: 65528
-          [1653999139.214345][7477:7482] CHIP:TOO:     [5]: 65529
-          [1653999139.214371][7477:7482] CHIP:TOO:     [6]: 65531
-          [1653999139.214397][7477:7482] CHIP:TOO:     [7]: 65532
-          [1653999139.214422][7477:7482] CHIP:TOO:     [8]: 65533
-          [1653999139.214522][7477:7482] CHIP:EM: Sending Standalone Ack for MessageCounter:5643805 on exchange 4737i
+          Verify DUT receives attribute-list attribute response on the TH(all-clusters-app) Log:
+          [1659778367.039215][17263:17263] CHIP:IM: Received Read request
+          [1659778367.039321][17263:17263] CHIP:DMG: ReadRequestMessage =
+          [1659778367.039342][17263:17263] CHIP:DMG: {
+          [1659778367.039357][17263:17263] CHIP:DMG:         AttributePathIBs =
+          [1659778367.039378][17263:17263] CHIP:DMG:         [
+          [1659778367.039397][17263:17263] CHIP:DMG:                 AttributePathIB =
+          [1659778367.039419][17263:17263] CHIP:DMG:                 {
+          [1659778367.039443][17263:17263] CHIP:DMG:                         Endpoint = 0x0,
+          [1659778367.039468][17263:17263] CHIP:DMG:                         Cluster = 0x2c,
+          [1659778367.039492][17263:17263] CHIP:DMG:                         Attribute = 0x0000_FFFB,
+          [1659778367.039515][17263:17263] CHIP:DMG:                 }
+          [1659778367.039540][17263:17263] CHIP:DMG:
+          [1659778367.039559][17263:17263] CHIP:DMG:         ],
+          [1659778367.039585][17263:17263] CHIP:DMG:
+          [1659778367.039602][17263:17263] CHIP:DMG:         isFabricFiltered = true,
+          [1659778367.039621][17263:17263] CHIP:DMG:         InteractionModelRevision = 1
+          [1659778367.039640][17263:17263] CHIP:DMG: },
+          [1659778367.039748][17263:17263] CHIP:DMG: IM RH moving to [GeneratingReports]
       disabled: true
 
     - label: "{DUTread} (0xFFFA) EventList attribute"
@@ -78,17 +103,54 @@
       PICS: LTIME.C.Afff9
       verification: |
           ./chip-tool timeformatlocalization read accepted-command-list 1 0
-          Verify in DUT as client side: verify that TH  responsds as list of Accepted Command as 0 entries.
+          Verify DUT receives AcceptedCommandList attribute response on the TH(all-clusters-app) Log:
 
-          [1651186189564] [11076:112595] CHIP: [TOO] Endpoint: 0 Cluster: 0x0000_002C Attribute 0x0000_FFF9 DataVersion: 3316530441
-          [1651186189564] [11076:112595] CHIP: [TOO]   AcceptedCommandList: 0 entries
+          [1659778416.327618][17263:17263] CHIP:IM: Received Read request
+          [1659778416.327695][17263:17263] CHIP:DMG: ReadRequestMessage =
+          [1659778416.327711][17263:17263] CHIP:DMG: {
+          [1659778416.327723][17263:17263] CHIP:DMG:         AttributePathIBs =
+          [1659778416.327738][17263:17263] CHIP:DMG:         [
+          [1659778416.327751][17263:17263] CHIP:DMG:                 AttributePathIB =
+          [1659778416.327767][17263:17263] CHIP:DMG:                 {
+          [1659778416.327783][17263:17263] CHIP:DMG:                         Endpoint = 0x0,
+          [1659778416.327799][17263:17263] CHIP:DMG:                         Cluster = 0x2c,
+          [1659778416.327815][17263:17263] CHIP:DMG:                         Attribute = 0x0000_FFF9,
+          [1659778416.327829][17263:17263] CHIP:DMG:                 }
+          [1659778416.327846][17263:17263] CHIP:DMG:
+          [1659778416.327859][17263:17263] CHIP:DMG:         ],
+          [1659778416.327876][17263:17263] CHIP:DMG:
+          [1659778416.327891][17263:17263] CHIP:DMG:         isFabricFiltered = true,
+          [1659778416.327905][17263:17263] CHIP:DMG:         InteractionModelRevision = 1
+          [1659778416.327917][17263:17263] CHIP:DMG: },
       disabled: true
 
     - label: "{DUTread} (0xFFF8) GeneratedCommandList attribute"
       PICS: LTIME.C.Afff8
       verification: |
           ./chip-tool timeformatlocalization read generated-command-list 1 0
-          Verify in DUT as client side:  verify that TH responsds as list of GeneratedCommandList as 0 entries.
-          [1651191789962] [13591:180646] CHIP: [TOO] Endpoint: 0 Cluster: 0x0000_002C Attribute 0x0000_FFF8 DataVersion: 3316530441
-          [1651191789963] [13591:180646] CHIP: [TOO]   GeneratedCommandList: 0 entries
+          Verify DUT receives GeneratedCommandList attribute response on the TH(all-clusters-app) Log:
+          [1659778463.618184][17263:17263] CHIP:IM: Received Read request
+          [1659778463.618262][17263:17263] CHIP:DMG: ReadRequestMessage =
+          [1659778463.618278][17263:17263] CHIP:DMG: {
+          [1659778463.618291][17263:17263] CHIP:DMG:         AttributePathIBs =
+          [1659778463.618310][17263:17263] CHIP:DMG:         [
+          [1659778463.618325][17263:17263] CHIP:DMG:                 AttributePathIB =
+          [1659778463.618345][17263:17263] CHIP:DMG:                 {
+          [1659778463.618364][17263:17263] CHIP:DMG:                         Endpoint = 0x0,
+          [1659778463.618383][17263:17263] CHIP:DMG:                         Cluster = 0x2c,
+          [1659778463.618402][17263:17263] CHIP:DMG:                         Attribute = 0x0000_FFF8,
+          [1659778463.618418][17263:17263] CHIP:DMG:                 }
+          [1659778463.618442][17263:17263] CHIP:DMG:
+          [1659778463.618458][17263:17263] CHIP:DMG:         ],
+          [1659778463.618479][17263:17263] CHIP:DMG:
+          [1659778463.618496][17263:17263] CHIP:DMG:         isFabricFiltered = true,
+          [1659778463.618513][17263:17263] CHIP:DMG:         InteractionModelRevision = 1
+          [1659778463.618529][17263:17263] CHIP:DMG: },
+          [1659778463.618601][17263:17263] CHIP:DMG: IM RH moving to [GeneratingReports]
+          [1659778463.618663][17263:17263] CHIP:DMG: Building Reports for ReadHandler with LastReportGeneration = 0 DirtyGeneration = 0
+      disabled: true
+
+    - label: ""
+      verification: |
+          verification step to be updated.
       disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_LTIME_1_2.yaml b/src/app/tests/suites/certification/Test_TC_LTIME_1_2.yaml
index b121593..5a3b286 100644
--- a/src/app/tests/suites/certification/Test_TC_LTIME_1_2.yaml
+++ b/src/app/tests/suites/certification/Test_TC_LTIME_1_2.yaml
@@ -33,7 +33,7 @@
       PICS: LTIME.S.Afffd
       verification: |
           ./chip-tool timeformatlocalization read  cluster-revision 1 0
-          On TH, verify that DUT sends ClusterRevision attribute value as 1
+          On TH(chip-tool), verify that DUT sends ClusterRevision attribute value as 1
 
           [1651185991606] [10988:109915] CHIP: [TOO] Endpoint: 0 Cluster: 0x0000_002C Attribute 0x0000_FFFD DataVersion: 3316530441
           [1651185991606] [10988:109915] CHIP: [TOO]   ClusterRevision: 1
@@ -42,13 +42,9 @@
     - label: "{THread} (0xFFFC) FeatureMap attribute"
       PICS: LTIME.S.Afffc
       verification: |
-          ./chip-tool timeformatlocalization read feature-map 1 0
+          Out of scope for V1.0
 
-          On TH, verify that DUT sends  FeatureMap attribute value as 1
-
-          [1653400472.682259][11385:11390] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_002C Attribute 0x0000_FFFC DataVersion: 4156010624
-          [1653400472.682314][11385:11390] CHIP:TOO:   FeatureMap: 0
-          [1653400472.682416][11385:11390] CHIP:EM: Sending Standalone Ack for MessageCounter:10442089 on exchange 10027i
+          https://github.com/project-chip/connectedhomeip/issues/18989
       disabled: true
 
     - label: "{THread} (0xFFFB) AttributeList attribute"
@@ -57,7 +53,7 @@
           ./chip-tool timeformatlocalization read attribute-list 1 0
 
 
-          On TH, verify that DUT  sends a list of supported attributes
+          On TH(chip-tool), verify that DUT  sends a list of supported attributes
 
           [1653999139.214139][7477:7482] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_002C Attribute 0x0000_FFFB DataVersion: 3201720795
           [1653999139.214208][7477:7482] CHIP:TOO:   AttributeList: 8 entries
@@ -83,7 +79,7 @@
       verification: |
           ./chip-tool timeformatlocalization read accepted-command-list 1 0
 
-          On TH, verify that DUT  responsds as list of Accepted Command as 0 entries.
+          On TH(chip-tool), verify that DUT  responsds as list of Accepted Command as 0 entries.
 
           [1651186189564] [11076:112595] CHIP: [TOO] Endpoint: 0 Cluster: 0x0000_002C Attribute 0x0000_FFF9 DataVersion: 3316530441
           [1651186189564] [11076:112595] CHIP: [TOO]   AcceptedCommandList: 0 entries
@@ -95,7 +91,7 @@
           ./chip-tool timeformatlocalization read generated-command-list 1 0
 
 
-          On TH, verify that DUT  responsds as list of GeneratedCommandList as 0 entries.
+          On TH(chip-tool), verify that DUT  responsds as list of GeneratedCommandList as 0 entries.
 
           [1651191789962] [13591:180646] CHIP: [TOO] Endpoint: 0 Cluster: 0x0000_002C Attribute 0x0000_FFF8 DataVersion: 3316530441
           [1651191789963] [13591:180646] CHIP: [TOO]   GeneratedCommandList: 0 entries
diff --git a/src/app/tests/suites/certification/Test_TC_LTIME_2_1.yaml b/src/app/tests/suites/certification/Test_TC_LTIME_2_1.yaml
index 166be27..461fcd7 100644
--- a/src/app/tests/suites/certification/Test_TC_LTIME_2_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_LTIME_2_1.yaml
@@ -26,134 +26,222 @@
     endpoint: 0
 
 tests:
+    - label: "Note"
+      verification: |
+          Chip-tool command used below are an example to verify the  DUT as client test cases. For certification test, we expect DUT should have a capability or way to run the equivalent command.
+      disabled: true
+
     - label: "DUT reads HourFormat attribute from TH"
       PICS: LTIME.C.A0000
       verification: |
-          ./chip-tool timeformatlocalization read hour-format 1 0
-          Verify in DUT as client side: Verify that the HourFormat attribute value
+          Product maker needs to provide instructions for how to trigger the command on the DUT. For comparison, the DUT behavior for this test step can be simulated using chip-tool (when DUT is a commissioner/Client)
 
-          [1657106866.828694][4891:4896] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_002C Attribute 0x0000_0000 DataVersion: 2232855152
-          [1657106866.828763][4891:4896] CHIP:TOO:   HourFormat: 0
+          ./chip-tool timeformatlocalization read hour-format 1 0
+          Verify DUT receives  HourFormat attribute  response on the TH(all-clusters-app) Log:
+
+          [1659774501.435219][17263:17263] CHIP:IM: Received Read request
+          [1659774501.435303][17263:17263] CHIP:DMG: ReadRequestMessage =
+          [1659774501.435321][17263:17263] CHIP:DMG: {
+          [1659774501.435337][17263:17263] CHIP:DMG:         AttributePathIBs =
+          [1659774501.435356][17263:17263] CHIP:DMG:         [
+          [1659774501.435370][17263:17263] CHIP:DMG:                 AttributePathIB =
+          [1659774501.435386][17263:17263] CHIP:DMG:                 {
+          [1659774501.435402][17263:17263] CHIP:DMG:                         Endpoint = 0x0,
+          [1659774501.435418][17263:17263] CHIP:DMG:                         Cluster = 0x2c,
+          [1659774501.435438][17263:17263] CHIP:DMG:                         Attribute = 0x0000_0000,
+          [1659774501.435455][17263:17263] CHIP:DMG:                 }
+          [1659774501.435476][17263:17263] CHIP:DMG:
+          [1659774501.435490][17263:17263] CHIP:DMG:         ],
+          [1659774501.435513][17263:17263] CHIP:DMG:
+          [1659774501.435529][17263:17263] CHIP:DMG:         isFabricFiltered = true,
+          [1659774501.435547][17263:17263] CHIP:DMG:         InteractionModelRevision = 1
+          [1659774501.435561][17263:17263] CHIP:DMG: },
       disabled: true
 
     - label:
           "If (LTIME.C.A0000.12HR) DUT writes 0 to HourFormat attribute on TH"
       PICS: LTIME.C.A0000.12HR
       verification: |
-          ./chip-tool timeformatlocalization write hour-format 0 1 0
-          Verify in DUT as client side: verify that  TH sends a success response
+          Product maker needs to provide instructions for how to trigger the command on the DUT. For comparison, the DUT behavior for this test step can be simulated using chip-tool (when DUT is a commissioner/Client)
 
-          [1657106893.878113][4897:4902] CHIP:DMG: WriteResponseMessage =
-          [1657106893.878138][4897:4902] CHIP:DMG: {
-          [1657106893.878161][4897:4902] CHIP:DMG:         AttributeStatusIBs =
-          [1657106893.878213][4897:4902] CHIP:DMG:         [
-          [1657106893.878241][4897:4902] CHIP:DMG:                 AttributeStatusIB =
-          [1657106893.878277][4897:4902] CHIP:DMG:                 {
-          [1657106893.878306][4897:4902] CHIP:DMG:                         AttributePathIB =
-          [1657106893.878343][4897:4902] CHIP:DMG:                         {
-          [1657106893.878391][4897:4902] CHIP:DMG:                                 Endpoint = 0x0,
-          [1657106893.878430][4897:4902] CHIP:DMG:                                 Cluster = 0x2c,
-          [1657106893.878466][4897:4902] CHIP:DMG:                                 Attribute = 0x0000_0000,
-          [1657106893.878501][4897:4902] CHIP:DMG:                         }
-          [1657106893.878537][4897:4902] CHIP:DMG:
-          [1657106893.878568][4897:4902] CHIP:DMG:                         StatusIB =
-          [1657106893.878599][4897:4902] CHIP:DMG:                         {
-          [1657106893.878630][4897:4902] CHIP:DMG:                                 status = 0x00 (SUCCESS),
-          [1657106893.878661][4897:4902] CHIP:DMG:                         },
-          [1657106893.878692][4897:4902] CHIP:DMG:
-          [1657106893.878717][4897:4902] CHIP:DMG:                 },
-          [1657106893.878746][4897:4902] CHIP:DMG:
-          [1657106893.878769][4897:4902] CHIP:DMG:         ],
-          [1657106893.878798][4897:4902] CHIP:DMG:
-          [1657106893.878822][4897:4902] CHIP:DMG:         InteractionModelRevision = 1
-          [1657106893.878844][4897:4902] CHIP:DMG: }
-          [1657106893.878914][4897:4902] CHIP:DMG: WriteClient moving to [AwaitingDe]
+          ./chip-tool timeformatlocalization write hour-format 0 1 0
+          Verify DUT receives  HourFormat attribute  write response on the TH(all-clusters-app) Log:
+          [1659778546.653556][17263:17263] CHIP:IM: Received Write request
+          [1659778546.653566][17263:17263] CHIP:DMG: IM WH moving to [Initialized]
+          [1659778546.653597][17263:17263] CHIP:DMG: WriteRequestMessage =
+          [1659778546.653607][17263:17263] CHIP:DMG: {
+          [1659778546.653615][17263:17263] CHIP:DMG:         suppressResponse = false,
+          [1659778546.653623][17263:17263] CHIP:DMG:         timedRequest = false,
+          [1659778546.653632][17263:17263] CHIP:DMG:         AttributeDataIBs =
+          [1659778546.653645][17263:17263] CHIP:DMG:         [
+          [1659778546.653653][17263:17263] CHIP:DMG:                 AttributeDataIB =
+          [1659778546.653664][17263:17263] CHIP:DMG:                 {
+          [1659778546.653673][17263:17263] CHIP:DMG:                         AttributePathIB =
+          [1659778546.653686][17263:17263] CHIP:DMG:                         {
+          [1659778546.653696][17263:17263] CHIP:DMG:                                 Endpoint = 0x0,
+          [1659778546.653706][17263:17263] CHIP:DMG:                                 Cluster = 0x2c,
+          [1659778546.653717][17263:17263] CHIP:DMG:                                 Attribute = 0x0000_0000,
+          [1659778546.653727][17263:17263] CHIP:DMG:                         }
+          [1659778546.653739][17263:17263] CHIP:DMG:
+          [1659778546.653750][17263:17263] CHIP:DMG:                         Data = 0,
+          [1659778546.653759][17263:17263] CHIP:DMG:                 },
+          [1659778546.653774][17263:17263] CHIP:DMG:
+          [1659778546.653782][17263:17263] CHIP:DMG:         ],
+          [1659778546.653794][17263:17263] CHIP:DMG:
+          [1659778546.653803][17263:17263] CHIP:DMG:         moreChunkedMessages = false,
+          [1659778546.653813][17263:17263] CHIP:DMG:         InteractionModelRevision = 1
+          [1659778546.653821][17263:17263] CHIP:DMG: },
+          [1659778546.653868][17263:17263] CHIP:DMG: AccessControl: checking f=1 a=c s=0x000000000001B669 t= c=0x0000_002C e=0 p=o
       disabled: true
 
     - label: "DUT reads HourFormat attribute from TH"
       PICS: LTIME.C.A0000
       verification: |
-          ./chip-tool timeformatlocalization read hour-format 1 0
-          Verify in DUT as client side: Verify that the HourFormat attribute value as 0
+          Product maker needs to provide instructions for how to trigger the command on the DUT. For comparison, the DUT behavior for this test step can be simulated using chip-tool (when DUT is a commissioner/Client)
 
-          [1657106866.828694][4891:4896] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_002C Attribute 0x0000_0000 DataVersion: 2232855152
-          [1657106866.828763][4891:4896] CHIP:TOO:   HourFormat: 0
+          ./chip-tool timeformatlocalization read hour-format 1 0
+          Verify DUT receives   HourFormat attribute  response on the TH(all-clusters-app) Log:
+          [1659778596.981932][17263:17263] CHIP:IM: Received Read request
+          [1659778596.982009][17263:17263] CHIP:DMG: ReadRequestMessage =
+          [1659778596.982024][17263:17263] CHIP:DMG: {
+          [1659778596.982035][17263:17263] CHIP:DMG:         AttributePathIBs =
+          [1659778596.982051][17263:17263] CHIP:DMG:         [
+          [1659778596.982064][17263:17263] CHIP:DMG:                 AttributePathIB =
+          [1659778596.982079][17263:17263] CHIP:DMG:                 {
+          [1659778596.982094][17263:17263] CHIP:DMG:                         Endpoint = 0x0,
+          [1659778596.982111][17263:17263] CHIP:DMG:                         Cluster = 0x2c,
+          [1659778596.982127][17263:17263] CHIP:DMG:                         Attribute = 0x0000_0000,
+          [1659778596.982142][17263:17263] CHIP:DMG:                 }
+          [1659778596.982162][17263:17263] CHIP:DMG:
+          [1659778596.982175][17263:17263] CHIP:DMG:         ],
+          [1659778596.982189][17263:17263] CHIP:DMG:
+          [1659778596.982206][17263:17263] CHIP:DMG:         isFabricFiltered = true,
+          [1659778596.982220][17263:17263] CHIP:DMG:         InteractionModelRevision = 1
+          [1659778596.982229][17263:17263] CHIP:DMG: },
+          [1659778596.982301][17263:17263] CHIP:DMG: IM RH moving to [GeneratingReports]
+          [1659778596.982362][17263:17263] CHIP:DMG: Building Reports for ReadHandler with LastReportGeneration = 0 DirtyGeneration = 0
       disabled: true
 
     - label:
           "If (LTIME.C.A0000.24HR) DUT writes 1 to HourFormat attribute on TH"
       PICS: LTIME.C.A0000.24HR
       verification: |
-          ./chip-tool timeformatlocalization write hour-format 1 1 0
-          Verify in DUT as client side: verify that  TH sends a success response
+          Product maker needs to provide instructions for how to trigger the command on the DUT. For comparison, the DUT behavior for this test step can be simulated using chip-tool (when DUT is a commissioner/Client)
 
-          [1657106989.102102][4907:4912] CHIP:DMG: WriteResponseMessage =
-          [1657106989.102137][4907:4912] CHIP:DMG: {
-          [1657106989.102178][4907:4912] CHIP:DMG:         AttributeStatusIBs =
-          [1657106989.102220][4907:4912] CHIP:DMG:         [
-          [1657106989.102263][4907:4912] CHIP:DMG:                 AttributeStatusIB =
-          [1657106989.102304][4907:4912] CHIP:DMG:                 {
-          [1657106989.102350][4907:4912] CHIP:DMG:                         AttributePathIB =
-          [1657106989.102450][4907:4912] CHIP:DMG:                         {
-          [1657106989.102494][4907:4912] CHIP:DMG:                                 Endpoint = 0x0,
-          [1657106989.102554][4907:4912] CHIP:DMG:                                 Cluster = 0x2c,
-          [1657106989.102611][4907:4912] CHIP:DMG:                                 Attribute = 0x0000_0000,
-          [1657106989.102658][4907:4912] CHIP:DMG:                         }
-          [1657106989.102718][4907:4912] CHIP:DMG:
-          [1657106989.102768][4907:4912] CHIP:DMG:                         StatusIB =
-          [1657106989.102810][4907:4912] CHIP:DMG:                         {
-          [1657106989.102865][4907:4912] CHIP:DMG:                                 status = 0x00 (SUCCESS),
-          [1657106989.102907][4907:4912] CHIP:DMG:                         },
-          [1657106989.102960][4907:4912] CHIP:DMG:
-          [1657106989.103008][4907:4912] CHIP:DMG:                 },
-          [1657106989.103049][4907:4912] CHIP:DMG:
-          [1657106989.103091][4907:4912] CHIP:DMG:         ],
-          [1657106989.103132][4907:4912] CHIP:DMG:
-          [1657106989.103174][4907:4912] CHIP:DMG:         InteractionModelRevision = 1
-          [1657106989.103206][4907:4912] CHIP:DMG: }
-          [1657106989.103306][4907:4912] CHIP:DMG: WriteClient moving to [AwaitingDe]
+          ./chip-tool timeformatlocalization write hour-format 1 1 0
+          Verify DUT receives   HourFormat attribute write  response on the TH(all-clusters-app) Log:
+          and MessageCounter:194900121 on exchange 38069r
+          [1659778652.656546][17263:17263] CHIP:EM: Handling via exchange: 38069r, Delegate: 0x55bc75d00d28
+          [1659778652.656587][17263:17263] CHIP:IM: Received Write request
+          [1659778652.656608][17263:17263] CHIP:DMG: IM WH moving to [Initialized]
+          [1659778652.656667][17263:17263] CHIP:DMG: WriteRequestMessage =
+          [1659778652.656690][17263:17263] CHIP:DMG: {
+          [1659778652.656708][17263:17263] CHIP:DMG:         suppressResponse = false,
+          [1659778652.656730][17263:17263] CHIP:DMG:         timedRequest = false,
+          [1659778652.656786][17263:17263] CHIP:DMG:         AttributeDataIBs =
+          [1659778652.656816][17263:17263] CHIP:DMG:         [
+          [1659778652.656835][17263:17263] CHIP:DMG:                 AttributeDataIB =
+          [1659778652.656872][17263:17263] CHIP:DMG:                 {
+          [1659778652.656889][17263:17263] CHIP:DMG:                         AttributePathIB =
+          [1659778652.656908][17263:17263] CHIP:DMG:                         {
+          [1659778652.656928][17263:17263] CHIP:DMG:                                 Endpoint = 0x0,
+          [1659778652.656947][17263:17263] CHIP:DMG:                                 Cluster = 0x2c,
+          [1659778652.656970][17263:17263] CHIP:DMG:                                 Attribute = 0x0000_0000,
+          [1659778652.656989][17263:17263] CHIP:DMG:                         }
+          [1659778652.657013][17263:17263] CHIP:DMG:
+          [1659778652.657035][17263:17263] CHIP:DMG:                         Data = 1,
+          [1659778652.657053][17263:17263] CHIP:DMG:                 },
+          [1659778652.657077][17263:17263] CHIP:DMG:
+          [1659778652.657093][17263:17263] CHIP:DMG:         ],
+          [1659778652.657119][17263:17263] CHIP:DMG:
+          [1659778652.657137][17263:17263] CHIP:DMG:         moreChunkedMessages = false,
+          [1659778652.657156][17263:17263] CHIP:DMG:         InteractionModelRevision = 1
+          [1659778652.657171][17263:17263] CHIP:DMG: },
+          [1659778652.657292][17263:17263] CHIP:DMG: AccessControl: checking f=1 a=c s=0x000000000001B669 t= c=0x0000_002C e=0 p=o
       disabled: true
 
     - label: "DUT reads HourFormat attribute on TH"
       PICS: LTIME.C.A0000
       verification: |
+          Product maker needs to provide instructions for how to trigger the command on the DUT. For comparison, the DUT behavior for this test step can be simulated using chip-tool (when DUT is a commissioner/Client)
+
           ./chip-tool timeformatlocalization read hour-format 1 0
-          Verify in DUT as client side: Verify that  HourFormat attribute value as 1
-          [1654605170.332304][7266:7271] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_002C Attribute 0x0000_0000 DataVersion: 3185003975
-          [1654605170.332388][7266:7271] CHIP:TOO:   HourFormat: 1
-          [1654605170.332493][7266:7271] CHIP:EM: Sending Standalone Ack for MessageCounter:6045450 on exchange 44106i
+          Verify DUT receives   HourFormat attribut  response on the TH(all-clusters-app) Log:
+          d28
+          [1659778711.163963][17263:17263] CHIP:IM: Received Read request
+          [1659778711.164030][17263:17263] CHIP:DMG: ReadRequestMessage =
+          [1659778711.164043][17263:17263] CHIP:DMG: {
+          [1659778711.164055][17263:17263] CHIP:DMG:         AttributePathIBs =
+          [1659778711.164068][17263:17263] CHIP:DMG:         [
+          [1659778711.164079][17263:17263] CHIP:DMG:                 AttributePathIB =
+          [1659778711.164092][17263:17263] CHIP:DMG:                 {
+          [1659778711.164105][17263:17263] CHIP:DMG:                         Endpoint = 0x0,
+          [1659778711.164118][17263:17263] CHIP:DMG:                         Cluster = 0x2c,
+          [1659778711.164132][17263:17263] CHIP:DMG:                         Attribute = 0x0000_0000,
+          [1659778711.164143][17263:17263] CHIP:DMG:                 }
+          [1659778711.164158][17263:17263] CHIP:DMG:
+          [1659778711.164169][17263:17263] CHIP:DMG:         ],
+          [1659778711.164184][17263:17263] CHIP:DMG:
+          [1659778711.164196][17263:17263] CHIP:DMG:         isFabricFiltered = true,
+          [1659778711.164208][17263:17263] CHIP:DMG:         InteractionModelRevision = 1
+          [1659778711.164218][17263:17263] CHIP:DMG: },
       disabled: true
 
     - label: "DUT reads ActiveCalendarType attribute on TH"
       PICS: LTIME.C.A0001
       verification: |
-          ./chip-tool timeformatlocalization read active-calendar-type 1 0
-          Verify in DUT as client side: Verify that  the ActiveCalendarType attribute value
+          Product maker needs to provide instructions for how to trigger the command on the DUT. For comparison, the DUT behavior for this test step can be simulated using chip-tool (when DUT is a commissioner/Client)
 
-          [1657107039.005036][4917:4922] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_002C Attribute 0x0000_0001 DataVersion: 2232855154
-          [1657107039.005112][4917:4922] CHIP:TOO:   ActiveCalendarType: 0
+          ./chip-tool timeformatlocalization read active-calendar-type 1 0
+          Verify DUT receives   active-calendar-type response on the TH(all-clusters-app) Log:
+          [1659783212.637408][3747:3747] CHIP:EM: Received message of type 0x2 with protocolId (0, 1) and MessageCounter:132309637 on exchange 18527r
+          [1659783212.637454][3747:3747] CHIP:EM: Handling via exchange: 18527r, Delegate: 0xaaaadeb88fa0
+          [1659783212.637493][3747:3747] CHIP:IM: Received Read request
+          [1659783212.637569][3747:3747] CHIP:DMG: ReadRequestMessage =
+          [1659783212.637597][3747:3747] CHIP:DMG: {
+          [1659783212.637619][3747:3747] CHIP:DMG:         AttributePathIBs =
+          [1659783212.637645][3747:3747] CHIP:DMG:         [
+          [1659783212.637668][3747:3747] CHIP:DMG:                 AttributePathIB =
+          [1659783212.637697][3747:3747] CHIP:DMG:                 {
+          [1659783212.637726][3747:3747] CHIP:DMG:                         Endpoint = 0x0,
+          [1659783212.637756][3747:3747] CHIP:DMG:                         Cluster = 0x2c,
+          [1659783212.637788][3747:3747] CHIP:DMG:                         Attribute = 0x0000_0001,
+          [1659783212.637817][3747:3747] CHIP:DMG:                 }
+          [1659783212.637845][3747:3747] CHIP:DMG:
+          [1659783212.637872][3747:3747] CHIP:DMG:         ],
+          [1659783212.637900][3747:3747] CHIP:DMG:
+          [1659783212.637926][3747:3747] CHIP:DMG:         isFabricFiltered = true,
+          [1659783212.637952][3747:3747] CHIP:DMG:         InteractionModelRevision = 1
+          [1659783212.637974][3747:3747] CHIP:DMG: },
+          [1659783212.638046][3747:3747] CHIP:DMG: IM RH moving to [GeneratingReports]
       disabled: true
 
     - label: "DUT reads SupportedCalendarTypes attribute TH"
       PICS: LTIME.C.A0002
       verification: |
-          ./chip-tool timeformatlocalization read supported-calendar-types 1 0
-          Verify in DUT as client side: Verify that  SupportedCalendarTypes attribute value
+          Product maker needs to provide instructions for how to trigger the command on the DUT. For comparison, the DUT behavior for this test step can be simulated using chip-tool (when DUT is a commissioner/Client)
 
-          [1657107056.982007][4924:4929] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_002C Attribute 0x0000_0002 DataVersion: 2232855154
-          [1657107056.982095][4924:4929] CHIP:TOO:   SupportedCalendarTypes: 12 entries
-          [1657107056.982148][4924:4929] CHIP:TOO:     [1]: 0
-          [1657107056.982181][4924:4929] CHIP:TOO:     [2]: 1
-          [1657107056.982211][4924:4929] CHIP:TOO:     [3]: 2
-          [1657107056.982241][4924:4929] CHIP:TOO:     [4]: 3
-          [1657107056.982270][4924:4929] CHIP:TOO:     [5]: 4
-          [1657107056.982299][4924:4929] CHIP:TOO:     [6]: 5
-          [1657107056.982329][4924:4929] CHIP:TOO:     [7]: 6
-          [1657107056.982358][4924:4929] CHIP:TOO:     [8]: 8
-          [1657107056.982402][4924:4929] CHIP:TOO:     [9]: 9
-          [1657107056.982434][4924:4929] CHIP:TOO:     [10]: 10
-          [1657107056.982464][4924:4929] CHIP:TOO:     [11]: 11
-          [1657107056.982494][4924:4929] CHIP:TOO:     [12]: 7
+          ./chip-tool timeformatlocalization read supported-calendar-types 1 0
+          Verify DUT receives supported-calendar-types response on the TH(all-clusters-app) Log:
+
+          [1659783261.108812][3747:3747] CHIP:IM: Received Read request
+          [1659783261.108892][3747:3747] CHIP:DMG: ReadRequestMessage =
+          [1659783261.108920][3747:3747] CHIP:DMG: {
+          [1659783261.108943][3747:3747] CHIP:DMG:         AttributePathIBs =
+          [1659783261.108971][3747:3747] CHIP:DMG:         [
+          [1659783261.108997][3747:3747] CHIP:DMG:                 AttributePathIB =
+          [1659783261.109029][3747:3747] CHIP:DMG:                 {
+          [1659783261.109059][3747:3747] CHIP:DMG:                         Endpoint = 0x0,
+          [1659783261.109089][3747:3747] CHIP:DMG:                         Cluster = 0x2c,
+          [1659783261.109121][3747:3747] CHIP:DMG:                         Attribute = 0x0000_0002,
+          [1659783261.109155][3747:3747] CHIP:DMG:                 }
+          [1659783261.109187][3747:3747] CHIP:DMG:
+          [1659783261.109214][3747:3747] CHIP:DMG:         ],
+          [1659783261.109243][3747:3747] CHIP:DMG:
+          [1659783261.109271][3747:3747] CHIP:DMG:         isFabricFiltered = true,
+          [1659783261.109297][3747:3747] CHIP:DMG:         InteractionModelRevision = 1
+          [1659783261.109322][3747:3747] CHIP:DMG: },
+          [1659783261.109398][3747:3747] CHIP:DMG: IM RH moving to [GeneratingReports]
       disabled: true
 
     - label:
@@ -161,44 +249,64 @@
           on TH, followed by reading the ActiveCalendarType attribute from TH"
       PICS: LTIME.C.A0001
       verification: |
-          ./chip-tool timeformatlocalization write active-calendar-type 0 1 0
-          Verify in DUT as client side: verify that  TH sends a success response
+          Product maker needs to provide instructions for how to trigger the command on the DUT. For comparison, the DUT behavior for this test step can be simulated using chip-tool (when DUT is a commissioner/Client)
 
-          [1657107074.760869][4932:4937] CHIP:DMG: WriteResponseMessage =
-          [1657107074.760897][4932:4937] CHIP:DMG: {
-          [1657107074.760919][4932:4937] CHIP:DMG:         AttributeStatusIBs =
-          [1657107074.760950][4932:4937] CHIP:DMG:         [
-          [1657107074.760975][4932:4937] CHIP:DMG:                 AttributeStatusIB =
-          [1657107074.761009][4932:4937] CHIP:DMG:                 {
-          [1657107074.761035][4932:4937] CHIP:DMG:                         AttributePathIB =
-          [1657107074.761068][4932:4937] CHIP:DMG:                         {
-          [1657107074.761102][4932:4937] CHIP:DMG:                                 Endpoint = 0x0,
-          [1657107074.761137][4932:4937] CHIP:DMG:                                 Cluster = 0x2c,
-          [1657107074.761171][4932:4937] CHIP:DMG:                                 Attribute = 0x0000_0001,
-          [1657107074.761203][4932:4937] CHIP:DMG:                         }
-          [1657107074.761239][4932:4937] CHIP:DMG:
-          [1657107074.761270][4932:4937] CHIP:DMG:                         StatusIB =
-          [1657107074.761302][4932:4937] CHIP:DMG:                         {
-          [1657107074.761334][4932:4937] CHIP:DMG:                                 status = 0x00 (SUCCESS),
-          [1657107074.761366][4932:4937] CHIP:DMG:                         },
-          [1657107074.761397][4932:4937] CHIP:DMG:
-          [1657107074.761422][4932:4937] CHIP:DMG:                 },
-          [1657107074.761452][4932:4937] CHIP:DMG:
-          [1657107074.761475][4932:4937] CHIP:DMG:         ],
-          [1657107074.761504][4932:4937] CHIP:DMG:
-          [1657107074.761528][4932:4937] CHIP:DMG:         InteractionModelRevision = 1
-          [1657107074.761551][4932:4937] CHIP:DMG: }
-          [1657107074.761621][4932:4937] CHIP:DMG: WriteClient moving to [AwaitingDe]
+          ./chip-tool timeformatlocalization write active-calendar-type 0 1 0
+          Verify DUT receives  active-calendar-type write response  on the TH(all-clusters-app) Log:
+          [1659783303.930585][3747:3747] CHIP:DMG: WriteRequestMessage =
+          [1659783303.930628][3747:3747] CHIP:DMG: {
+          [1659783303.930666][3747:3747] CHIP:DMG:         suppressResponse = false,
+          [1659783303.930724][3747:3747] CHIP:DMG:         timedRequest = false,
+          [1659783303.930765][3747:3747] CHIP:DMG:         AttributeDataIBs =
+          [1659783303.930829][3747:3747] CHIP:DMG:         [
+          [1659783303.930868][3747:3747] CHIP:DMG:                 AttributeDataIB =
+          [1659783303.930933][3747:3747] CHIP:DMG:                 {
+          [1659783303.930988][3747:3747] CHIP:DMG:                         AttributePathIB =
+          [1659783303.931039][3747:3747] CHIP:DMG:                         {
+          [1659783303.931108][3747:3747] CHIP:DMG:                                 Endpoint = 0x0,
+          [1659783303.931187][3747:3747] CHIP:DMG:                                 Cluster = 0x2c,
+          [1659783303.931261][3747:3747] CHIP:DMG:                                 Attribute = 0x0000_0001,
+          [1659783303.931334][3747:3747] CHIP:DMG:                         }
+          [1659783303.931388][3747:3747] CHIP:DMG:
+          [1659783303.931454][3747:3747] CHIP:DMG:                         Data = 0,
+          [1659783303.931521][3747:3747] CHIP:DMG:                 },
+          [1659783303.931569][3747:3747] CHIP:DMG:
+          [1659783303.931621][3747:3747] CHIP:DMG:         ],
+          [1659783303.931670][3747:3747] CHIP:DMG:
+          [1659783303.931723][3747:3747] CHIP:DMG:         moreChunkedMessages = false,
+          [1659783303.931765][3747:3747] CHIP:DMG:         InteractionModelRevision = 1
+          [1659783303.931803][3747:3747] CHIP:DMG: },
+          [1659783303.932021][3747:3747] CHIP:DMG: AccessControl: checking f=1 a=c s=0x000000000001B669 t= c=0x0000_002C e=0 p=o
+          [1659783303.932077][3747:3747] CHIP:DMG: AccessControl: allowed
+
+
 
           ./chip-tool timeformatlocalization read active-calendar-type 1 0
-          Verify in DUT as client side: Verify that the  ActiveCalendarType attribute value as 0
-
-          [1657107039.005036][4917:4922] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_002C Attribute 0x0000_0001 DataVersion: 2232855154
-          [1657107039.005112][4917:4922] CHIP:TOO:   ActiveCalendarType: 0
+          Verify DUT receives  active-calendar-type response  on the TH(all-clusters-app) Log:
+          [1659783379.903757][3747:3747] CHIP:EM: Handling via exchange: 59887r, Delegate: 0xaaaadeb88fa0
+          [1659783379.903796][3747:3747] CHIP:IM: Received Read request
+          [1659783379.903873][3747:3747] CHIP:DMG: ReadRequestMessage =
+          [1659783379.903912][3747:3747] CHIP:DMG: {
+          [1659783379.903942][3747:3747] CHIP:DMG:         AttributePathIBs =
+          [1659783379.903969][3747:3747] CHIP:DMG:         [
+          [1659783379.903992][3747:3747] CHIP:DMG:                 AttributePathIB =
+          [1659783379.904020][3747:3747] CHIP:DMG:                 {
+          [1659783379.904056][3747:3747] CHIP:DMG:                         Endpoint = 0x0,
+          [1659783379.904090][3747:3747] CHIP:DMG:                         Cluster = 0x2c,
+          [1659783379.904129][3747:3747] CHIP:DMG:                         Attribute = 0x0000_0001,
+          [1659783379.904158][3747:3747] CHIP:DMG:                 }
+          [1659783379.904196][3747:3747] CHIP:DMG:
+          [1659783379.904221][3747:3747] CHIP:DMG:         ],
+          [1659783379.904258][3747:3747] CHIP:DMG:
+          [1659783379.904284][3747:3747] CHIP:DMG:         isFabricFiltered = true,
+          [1659783379.904319][3747:3747] CHIP:DMG:         InteractionModelRevision = 1
+          [1659783379.904343][3747:3747] CHIP:DMG: },
+          [1659783379.904435][3747:3747] CHIP:DMG: IM RH moving to [GeneratingReports]
+          [1659783379.904527][3747:3747] CHIP:DMG: Building Reports for ReadHandler with L
       disabled: true
 
     - label: "Repeat step 8 for all the values in PIXIT.LTIME.SCT"
       PICS: LTIME.C.A0001
       verification: |
-          Repeat the test step 8 for below mentioned values 1, 2,3, 4, 5, 6,7, 8, 9,10 and 11 and verify that TH receives the write command and updates the respective value. Verify that TH reads ActiveCalendarType attribute value and it is the same as the value that was set before
+          Repeat the test step 8 for  1, 2,3, 4, 5, 6,7, 8, 9,10 and 11 values and verify that TH receives the write command and updates the respective value. Verify that TH reads ActiveCalendarType attribute value and it is the same as the value that was set before
       disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_LTIME_3_1.yaml b/src/app/tests/suites/certification/Test_TC_LTIME_3_1.yaml
index 182a4c8..267c5c1 100644
--- a/src/app/tests/suites/certification/Test_TC_LTIME_3_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_LTIME_3_1.yaml
@@ -30,7 +30,7 @@
       PICS: LTIME.S.A0000
       verification: |
           ./chip-tool timeformatlocalization read hour-format 1 0
-          On TH, verify that  HourFormat attribute value is of Enum8 datatype
+          On TH(chip-tool), verify that  HourFormat attribute value is of Enum8 datatype
 
           [1651191944157] [13649:182326] CHIP: [TOO] Endpoint: 0 Cluster: 0x0000_002C Attribute 0x0000_0000 DataVersion: 3316530441
           [1651191944158] [13649:182326] CHIP: [TOO]   HourFormat: 0
@@ -41,7 +41,7 @@
       verification: |
           ./chip-tool timeformatlocalization write hour-format 0 1 0
 
-          On TH verify that DUT sends a success response
+          On TH(chip-tool) verify that DUT sends a success response
           [1651192743588] [14026:192208] CHIP: [DMG] WriteResponseMessage =
           [1651192743588] [14026:192208] CHIP: [DMG] {
           [1651192743588] [14026:192208] CHIP: [DMG]         AttributeStatusIBs =
@@ -72,7 +72,7 @@
       PICS: LTIME.S.A0000
       verification: |
           ./chip-tool timeformatlocalization read hour-format 1 0
-          On TH verify that  HourFormat attribute value changed as  0
+          On TH(chip-tool) verify that  HourFormat attribute value changed as  0
           [1651193120969] [14169:196901] CHIP: [TOO] Endpoint: 0 Cluster: 0x0000_002C Attribute 0x0000_0000 DataVersion: 3316530443
           [1651193120969] [14169:196901] CHIP: [TOO]   HourFormat: 0
       disabled: true
@@ -82,7 +82,7 @@
       verification: |
           ./chip-tool timeformatlocalization write hour-format 1 1 0
 
-          On TH verify that DUT sends a success response
+          On TH(chip-tool) verify that DUT sends a success response
           [1651193043035] [14140:195730] CHIP: [DMG] WriteResponseMessage =
           [1651193043035] [14140:195730] CHIP: [DMG] {
           [1651193043035] [14140:195730] CHIP: [DMG]         AttributeStatusIBs =
@@ -114,7 +114,7 @@
       PICS: LTIME.S.A0000
       verification: |
           ./chip-tool timeformatlocalization read hour-format 1 0
-          On TH verify that  HourFormat attribute value changed as  1
+          On TH(chip-tool) verify that  HourFormat attribute value changed as  1
           [1651193120969] [14169:196901] CHIP: [TOO] Endpoint: 0 Cluster: 0x0000_002C Attribute 0x0000_0000 DataVersion: 3316530443
           [1651193120969] [14169:196901] CHIP: [TOO]   HourFormat: 1
       disabled: true
@@ -123,7 +123,7 @@
       PICS: LTIME.S.A0001
       verification: |
           ./chip-tool timeformatlocalization read active-calendar-type 1 0
-          On TH, verify that  ActiveCalendarType attribute value is in between 0 to 11
+          On TH(chip-tool), verify that  ActiveCalendarType attribute value is in between 0 to 11
           [1651193250602] [14215:198406] CHIP: [TOO] Endpoint: 0 Cluster: 0x0000_002C Attribute 0x0000_0001 DataVersion: 3316530443
           [1651193250602] [14215:198406] CHIP: [TOO]   ActiveCalendarType: 0
       disabled: true
@@ -132,7 +132,7 @@
       PICS: LTIME.S.A0002
       verification: |
           ./chip-tool timeformatlocalization read supported-calendar-types 1 0
-          On TH, verify that  SupportedCalendarTypes attribute value is in between 0 to 11
+          On TH(chip-tool), verify that  SupportedCalendarTypes attribute value is in between 0 to 11
           [1651194334793] [14653:210647] CHIP: [TOO] Endpoint: 0 Cluster: 0x0000_002C Attribute 0x0000_0002 DataVersion: 3316530443
           [1651194334794] [14653:210647] CHIP: [TOO]   SupportedCalendarTypes: 12 entries
           [1651194334794] [14653:210647] CHIP: [TOO]     [1]: 0
@@ -156,7 +156,7 @@
       verification: |
           ./chip-tool timeformatlocalization write active-calendar-type 0 1 0
 
-          On TH verify that DUT sends a success response
+          On TH(chip-tool) verify that DUT sends a success response
           [1651194449245] [14699:212201] CHIP: [DMG] WriteResponseMessage =
           [1651194449245] [14699:212201] CHIP: [DMG] {
           [1651194449245] [14699:212201] CHIP: [DMG]         AttributeStatusIBs =
@@ -202,7 +202,7 @@
       PICS: LTIME.S.A0001
       verification: |
           ./chip-tool timeformatlocalization write  active-calendar-type 50 1 0
-          On TH verify that DUT sends a CONSTRAINT_ERROR response
+          On TH(chip-tool) verify that DUT sends a CONSTRAINT_ERROR response
           [1658742658.653019][3572:3577] CHIP:DMG:         ],
           [1658742658.653047][3572:3577] CHIP:DMG:
           [1658742658.653071][3572:3577] CHIP:DMG:         InteractionModelRevision = 1
@@ -216,7 +216,7 @@
       PICS: LTIME.S.A0000
       verification: |
           ./chip-tool timeformatlocalization write   hour-format  5 1 0
-          On TH verify that DUT sends a CONSTRAINT_ERROR response
+          On TH(chip-tool) verify that DUT sends a CONSTRAINT_ERROR response
 
           [1656934321.910991][6387:6392] CHIP:DMG: WriteResponseMessage =
           [1656934321.911025][6387:6392] CHIP:DMG: {
diff --git a/src/app/tests/suites/certification/Test_TC_LUNIT_1_1.yaml b/src/app/tests/suites/certification/Test_TC_LUNIT_1_1.yaml
index 48f70b5..4a27353 100644
--- a/src/app/tests/suites/certification/Test_TC_LUNIT_1_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_LUNIT_1_1.yaml
@@ -24,6 +24,11 @@
     endpoint: 0
 
 tests:
+    - label: "Note"
+      verification: |
+          Chip-tool command used below are an example to verify the  DUT as client test cases. For certification test, we expect DUT should have a capability or way to run the equivalent command.
+      disabled: true
+
     - label: "Commission DUT to TH"
       verification: |
           verification step to be updated.
@@ -32,28 +37,71 @@
     - label: "{DUTread} (0xFFFD) ClusterRevision attribute"
       PICS: LUNIT.C.Afffd
       verification: |
+          Product maker needs to provide instructions for how to trigger the command on the DUT. For comparison, the DUT behavior for this test step can be simulated using chip-tool (when DUT is a commissioner/Client)
+
           ./chip-tool unitlocalization read  cluster-revision 1 0
-          Verify in DUT as client side:  verify that TH sends ClusterRevision attribute value as 1
-          [1651186310867] [11123:114108] CHIP: [TOO] Endpoint: 0 Cluster: 0x0000_002D Attribute 0x0000_FFFD DataVersion: 486381485
-          [1651186310867] [11123:114108] CHIP: [TOO]   ClusterRevision: 1
+          Verify DUT receives  cluster-revision attribute response on the TH(all-clusters-app) Log:
+          [1659785279.519464][4122:4122] CHIP:EM: Received message of type 0x2 with protocolId (0, 1) and MessageCounter:239393541 on exchange 51048r
+          [1659785279.519511][4122:4122] CHIP:EM: Handling via exchange: 51048r, Delegate: 0xaaaaeaa68fa0
+          [1659785279.519548][4122:4122] CHIP:IM: Received Read request
+          [1659785279.519625][4122:4122] CHIP:DMG: ReadRequestMessage =
+          [1659785279.519652][4122:4122] CHIP:DMG: {
+          [1659785279.519679][4122:4122] CHIP:DMG: 	AttributePathIBs =
+          [1659785279.519705][4122:4122] CHIP:DMG: 	[
+          [1659785279.519729][4122:4122] CHIP:DMG: 		AttributePathIB =
+          [1659785279.519759][4122:4122] CHIP:DMG: 		{
+          [1659785279.519790][4122:4122] CHIP:DMG: 			Endpoint = 0x0,
+          [1659785279.519822][4122:4122] CHIP:DMG: 			Cluster = 0x2d,
+          [1659785279.519853][4122:4122] CHIP:DMG: 			Attribute = 0x0000_FFFD,
+          [1659785279.519877][4122:4122] CHIP:DMG: 		}
+          [1659785279.519904][4122:4122] CHIP:DMG:
+          [1659785279.519932][4122:4122] CHIP:DMG: 	],
+          [1659785279.519960][4122:4122] CHIP:DMG:
+          [1659785279.519986][4122:4122] CHIP:DMG: 	isFabricFiltered = true,
+          [1659785279.520011][4122:4122] CHIP:DMG: 	InteractionModelRevision = 1
+          [1659785279.520034][4122:4122] CHIP:DMG: },
+          [1659785279.520108][4122:4122] CHIP:DMG: IM RH moving to [GeneratingReports]
+          [1659785279.520189][4122:4122] CHIP:DMG: Building Reports for ReadHandler with LastReportGeneration = 0 DirtyGeneration = 0
       disabled: true
 
     - label: "{DUTread} (0xFFFC) FeatureMap attribute"
       PICS: LUNIT.C.Afffc
       verification: |
-          ./chip-tool unitlocalization read  feature-map 1 0
-          Verify in DUT as client side:  verify that TH sends  FeatureMap attribute value as 1
+          Product maker needs to provide instructions for how to trigger the command on the DUT. For comparison, the DUT behavior for this test step can be simulated using chip-tool (when DUT is a commissioner/Client)
 
-          [1651186357789] [11140:114768] CHIP: [TOO] Endpoint: 0 Cluster: 0x0000_002D Attribute 0x0000_FFFC DataVersion: 486381485
-          [1651186357789] [11140:114768] CHIP: [TOO]   FeatureMap: 1
+          ./chip-tool unitlocalization read  feature-map 1 0
+          Verify DUT receives feature-map attribute response on the TH(all-clusters-app) Log:
+
+          [1659785328.533426][4122:4122] CHIP:IM: Received Read request
+          [1659785328.533548][4122:4122] CHIP:DMG: ReadRequestMessage =
+          [1659785328.533596][4122:4122] CHIP:DMG: {
+          [1659785328.533637][4122:4122] CHIP:DMG:         AttributePathIBs =
+          [1659785328.533685][4122:4122] CHIP:DMG:         [
+          [1659785328.533730][4122:4122] CHIP:DMG:                 AttributePathIB =
+          [1659785328.533785][4122:4122] CHIP:DMG:                 {
+          [1659785328.533837][4122:4122] CHIP:DMG:                         Endpoint = 0x0,
+          [1659785328.533894][4122:4122] CHIP:DMG:                         Cluster = 0x2d,
+          [1659785328.533958][4122:4122] CHIP:DMG:                         Attribute = 0x0000_FFFC,
+          [1659785328.534017][4122:4122] CHIP:DMG:                 }
+          [1659785328.534072][4122:4122] CHIP:DMG:
+          [1659785328.534124][4122:4122] CHIP:DMG:         ],
+          [1659785328.534176][4122:4122] CHIP:DMG:
+          [1659785328.534224][4122:4122] CHIP:DMG:         isFabricFiltered = true,
+          [1659785328.534275][4122:4122] CHIP:DMG:         InteractionModelRevision = 1
+          [1659785328.534319][4122:4122] CHIP:DMG: },
+          [1659785328.534443][4122:4122] CHIP:DMG: IM RH moving to [GeneratingReports]
+          [1659785328.534578][4122:4122] CHIP:DMG: Building Reports for ReadHandler with LastReportGeneration = 0 DirtyGeneration = 0
+          [1659785328.534629][4122:4122] CHIP:DMG: <RE:Run> Cluster 2d, Attribute fffc is dirty
       disabled: true
 
     - label: "{DUTread} (0xFFFB) AttributeList attribute"
       PICS: LUNIT.C.Afffb
       verification: |
+          Product maker needs to provide instructions for how to trigger the command on the DUT. For comparison, the DUT behavior for this test step can be simulated using chip-tool (when DUT is a commissioner/Client)
+
           ./chip-tool unitlocalization read attribute-list 1 0
 
-          Verify in DUT as client side: verify that TH  sends a list of supported attributes
+          Verify DUT receives attribute-list attribute response on the TH(all-clusters-app) Log:
           [1652335691.917681][3124:3129] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_002D Attribute 0x0000_FFFB DataVersion: 3157629909
           [1652335691.917762][3124:3129] CHIP:TOO:   AttributeList: 6 entries
           [1652335691.917802][3124:3129] CHIP:TOO:     [1]: 0
@@ -73,17 +121,54 @@
     - label: "{DUTread} (0xFFF9) AcceptedCommandList attribute"
       PICS: LUNIT.C.Afff9
       verification: |
+          Product maker needs to provide instructions for how to trigger the command on the DUT. For comparison, the DUT behavior for this test step can be simulated using chip-tool (when DUT is a commissioner/Client)
+
           ./chip-tool unitlocalization read accepted-command-list 1 0
-          Verify in DUT as client side: verify that TH  responsds as list of Accepted Command as 0 entries.
-          [1651186469211] [11184:116328] CHIP: [TOO] Endpoint: 0 Cluster: 0x0000_002D Attribute 0x0000_FFF9 DataVersion: 486381485
-          [1651186469211] [11184:116328] CHIP: [TOO]   AcceptedCommandList: 0 entries
+          Verify DUT receives AcceptedCommandList attribute response on the TH(all-clusters-app) Log:
+          [1659785385.381041][4122:4122] CHIP:EM: Handling via exchange: 60781r, Delegate: 0xaaaaeaa68fa0
+          [1659785385.381113][4122:4122] CHIP:IM: Received Read request
+          [1659785385.381253][4122:4122] CHIP:DMG: ReadRequestMessage =
+          [1659785385.381309][4122:4122] CHIP:DMG: {
+          [1659785385.381354][4122:4122] CHIP:DMG: 	AttributePathIBs =
+          [1659785385.381415][4122:4122] CHIP:DMG: 	[
+          [1659785385.381466][4122:4122] CHIP:DMG: 		AttributePathIB =
+          [1659785385.381523][4122:4122] CHIP:DMG: 		{
+          [1659785385.381583][4122:4122] CHIP:DMG: 			Endpoint = 0x0,
+          [1659785385.381650][4122:4122] CHIP:DMG: 			Cluster = 0x2d,
+          [1659785385.381717][4122:4122] CHIP:DMG: 			Attribute = 0x0000_FFFB,
+          [1659785385.381780][4122:4122] CHIP:DMG: 		}
+          [1659785385.381842][4122:4122] CHIP:DMG:
+          [1659785385.381900][4122:4122] CHIP:DMG: 	],
+          [1659785385.381959][4122:4122] CHIP:DMG:
+          [1659785385.382019][4122:4122] CHIP:DMG: 	isFabricFiltered = true,
+          [1659785385.382072][4122:4122] CHIP:DMG: 	InteractionModelRevision = 1
+          [1659785385.382121][4122:4122] CHIP:DMG: },
+          [1659785385.382261][4122:4122] CHIP:DMG: IM RH moving to [GeneratingReports]
       disabled: true
 
     - label: "{DUTread} (0xFFF8) GeneratedCommandList attribute"
       PICS: LUNIT.C.Afff8
       verification: |
+          Product maker needs to provide instructions for how to trigger the command on the DUT. For comparison, the DUT behavior for this test step can be simulated using chip-tool (when DUT is a commissioner/Client)
+
           ./chip-tool unitlocalization read generated-command-list 1 0
-          Verify in DUT as client side:  verify that TH responsds as list of GeneratedCommandList as 0 entries.
-          [1651191485645] [13481:177154] CHIP: [TOO] Endpoint: 0 Cluster: 0x0000_002D Attribute 0x0000_FFF8 DataVersion: 486381492
-          [1651191485646] [13481:177154] CHIP: [TOO]   GeneratedCommandList: 0 entries
+          Verify DUT receives GeneratedCommandList attribute response on the TH(all-clusters-app) Log:
+          [1659785447.481659][4122:4122] CHIP:IM: Received Read request
+          [1659785447.481736][4122:4122] CHIP:DMG: ReadRequestMessage =
+          [1659785447.481763][4122:4122] CHIP:DMG: {
+          [1659785447.481785][4122:4122] CHIP:DMG: 	AttributePathIBs =
+          [1659785447.481813][4122:4122] CHIP:DMG: 	[
+          [1659785447.481837][4122:4122] CHIP:DMG: 		AttributePathIB =
+          [1659785447.481864][4122:4122] CHIP:DMG: 		{
+          [1659785447.481892][4122:4122] CHIP:DMG: 			Endpoint = 0x0,
+          [1659785447.481923][4122:4122] CHIP:DMG: 			Cluster = 0x2d,
+          [1659785447.481958][4122:4122] CHIP:DMG: 			Attribute = 0x0000_FFF8,
+          [1659785447.481985][4122:4122] CHIP:DMG: 		}
+          [1659785447.482014][4122:4122] CHIP:DMG:
+          [1659785447.482039][4122:4122] CHIP:DMG: 	],
+          [1659785447.482067][4122:4122] CHIP:DMG:
+          [1659785447.482093][4122:4122] CHIP:DMG: 	isFabricFiltered = true,
+          [1659785447.482118][4122:4122] CHIP:DMG: 	InteractionModelRevision = 1
+          [1659785447.482142][4122:4122] CHIP:DMG: },
+          [1659785447.482215][4122:4122] CHIP:DMG: IM RH moving to [GeneratingReports]
       disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_LUNIT_2_1.yaml b/src/app/tests/suites/certification/Test_TC_LUNIT_2_1.yaml
index 2fe55ef..d3ceb77 100644
--- a/src/app/tests/suites/certification/Test_TC_LUNIT_2_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_LUNIT_2_1.yaml
@@ -14,7 +14,7 @@
 # Auto-generated scripts for harness use only, please review before automation. The endpoints and cluster names are currently set to default
 
 name:
-    105.2.1. [TC-LUNIT-2.1] Read and Write Unit Localization Cluster Attributes
+    106.2.1. [TC-LUNIT-2.1] Read and Write Unit Localization Cluster Attributes
     [DUT as Client]
 
 PICS:
@@ -26,60 +26,99 @@
     endpoint: 0
 
 tests:
+    - label: "Note"
+      verification: |
+          Chip-tool command used below are an example to verify the  DUT as client test cases. For certification test, we expect DUT should have a capability or way to run the equivalent command.
+      disabled: true
+
     - label: "DUT reads TemperatureUnit attribute from TH"
       PICS: LUNIT.C.A0000
       verification: |
+          Product maker needs to provide instructions for how to trigger the command on the DUT. For comparison, the DUT behavior for this test step can be simulated using chip-tool (when DUT is a commissioner/Client)
+
           ./chip-tool unitlocalization read temperature-unit 1 0
-          Verify in DUT as client side: Verify that DUT reads TemperatureUnit attribute value  is in the range 0 to 3
-          [1658246774.701510][2262:2267] CHIP:DMG: }
-          [1658246774.701747][2262:2267] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_002D Attribute 0x0000_0000 DataVersion: 2312195207
-          [1658246774.702985][2262:2267] CHIP:TOO:   TemperatureUnit: 0
-          [1658246774.703107][2262:2267] CHIP:EM: Sending Standalone Ack for MessageCounter:177086388 on exchange 32231i
+          Verify DUT receives TemperatureUnit attribute response on the TH(all-clusters-app) Log:
+          [1659785506.642187][4122:4122] CHIP:EM: Handling via exchange: 35080r, Delegate: 0xaaaaeaa68fa0
+          [1659785506.642224][4122:4122] CHIP:IM: Received Read request
+          [1659785506.642300][4122:4122] CHIP:DMG: ReadRequestMessage =
+          [1659785506.642327][4122:4122] CHIP:DMG: {
+          [1659785506.642349][4122:4122] CHIP:DMG: 	AttributePathIBs =
+          [1659785506.642375][4122:4122] CHIP:DMG: 	[
+          [1659785506.642399][4122:4122] CHIP:DMG: 		AttributePathIB =
+          [1659785506.642428][4122:4122] CHIP:DMG: 		{
+          [1659785506.642456][4122:4122] CHIP:DMG: 			Endpoint = 0x0,
+          [1659785506.642484][4122:4122] CHIP:DMG: 			Cluster = 0x2d,
+          [1659785506.642512][4122:4122] CHIP:DMG: 			Attribute = 0x0000_0000,
+          [1659785506.642535][4122:4122] CHIP:DMG: 		}
+          [1659785506.642565][4122:4122] CHIP:DMG:
+          [1659785506.642590][4122:4122] CHIP:DMG: 	],
+          [1659785506.642618][4122:4122] CHIP:DMG:
+          [1659785506.642645][4122:4122] CHIP:DMG: 	isFabricFiltered = true,
+          [1659785506.642670][4122:4122] CHIP:DMG: 	InteractionModelRevision = 1
+          [1659785506.642693][4122:4122] CHIP:DMG: },
+          [1659785506.642766][4122:4122] CHIP:DMG: IM RH moving to [GeneratingReports]
       disabled: true
 
     - label: "DUT writes 3 to TemperatureUnit attribute on TH"
       PICS: LUNIT.C.A0000
       verification: |
-          ./chip-tool unitlocalization write temperature-unit 3 1 0
-          Verify in DUT as client side: verify that DUT sends a success response
+          Product maker needs to provide instructions for how to trigger the command on the DUT. For comparison, the DUT behavior for this test step can be simulated using chip-tool (when DUT is a commissioner/Client)
 
-          [1658246841.988723][2274:2279] CHIP:DMG: WriteClient moving to [ResponseRe]
-          [1658246841.988793][2274:2279] CHIP:DMG: WriteResponseMessage =
-          [1658246841.988835][2274:2279] CHIP:DMG: {
-          [1658246841.988871][2274:2279] CHIP:DMG:         AttributeStatusIBs =
-          [1658246841.988921][2274:2279] CHIP:DMG:         [
-          [1658246841.988960][2274:2279] CHIP:DMG:                 AttributeStatusIB =
-          [1658246841.989005][2274:2279] CHIP:DMG:                 {
-          [1658246841.989046][2274:2279] CHIP:DMG:                         AttributePathIB =
-          [1658246841.989102][2274:2279] CHIP:DMG:                         {
-          [1658246841.989153][2274:2279] CHIP:DMG:                                 Endpoint = 0x0,
-          [1658246841.989208][2274:2279] CHIP:DMG:                                 Cluster = 0x2d,
-          [1658246841.989261][2274:2279] CHIP:DMG:                                 Attribute = 0x0000_0000,
-          [1658246841.989313][2274:2279] CHIP:DMG:                         }
-          [1658246841.989369][2274:2279] CHIP:DMG:
-          [1658246841.989418][2274:2279] CHIP:DMG:                         StatusIB =
-          [1658246841.989469][2274:2279] CHIP:DMG:                         {
-          [1658246841.989518][2274:2279] CHIP:DMG:                                 status = 0x00 (SUCCESS),
-          [1658246841.989569][2274:2279] CHIP:DMG:                         },
-          [1658246841.989620][2274:2279] CHIP:DMG:
-          [1658246841.989664][2274:2279] CHIP:DMG:                 },
-          [1658246841.989712][2274:2279] CHIP:DMG:
-          [1658246841.989750][2274:2279] CHIP:DMG:         ],
-          [1658246841.989797][2274:2279] CHIP:DMG:
-          [1658246841.989836][2274:2279] CHIP:DMG:         InteractionModelRevision = 1
-          [1658246841.989874][2274:2279] CHIP:DMG: }
-          [1658246841.990021][2274:2279] CHIP:DMG: WriteClient moving to [AwaitingDe]
-          [1658246841.990103][2274:2279] CHIP:EM: Sending Standalone Ack for MessageCounter:83846292 on exchange 33799i
+          ./chip-tool unitlocalization write temperature-unit 3 1 0
+          Verify DUT receives TemperatureUnit attribute write response on the TH(all-clusters-app) Log:
+
+          [1659785555.542655][4122:4122] CHIP:DMG: WriteRequestMessage =
+          [1659785555.542689][4122:4122] CHIP:DMG: {
+          [1659785555.542719][4122:4122] CHIP:DMG: 	suppressResponse = false,
+          [1659785555.542754][4122:4122] CHIP:DMG: 	timedRequest = false,
+          [1659785555.542787][4122:4122] CHIP:DMG: 	AttributeDataIBs =
+          [1659785555.542827][4122:4122] CHIP:DMG: 	[
+          [1659785555.542859][4122:4122] CHIP:DMG: 		AttributeDataIB =
+          [1659785555.542895][4122:4122] CHIP:DMG: 		{
+          [1659785555.542934][4122:4122] CHIP:DMG: 			AttributePathIB =
+          [1659785555.542975][4122:4122] CHIP:DMG: 			{
+          [1659785555.543017][4122:4122] CHIP:DMG: 				Endpoint = 0x0,
+          [1659785555.543062][4122:4122] CHIP:DMG: 				Cluster = 0x2d,
+          [1659785555.543107][4122:4122] CHIP:DMG: 				Attribute = 0x0000_0000,
+          [1659785555.543172][4122:4122] CHIP:DMG: 			}
+          [1659785555.543218][4122:4122] CHIP:DMG:
+          [1659785555.543260][4122:4122] CHIP:DMG: 			Data = 3,
+          [1659785555.543321][4122:4122] CHIP:DMG: 		},
+          [1659785555.543362][4122:4122] CHIP:DMG:
+          [1659785555.543395][4122:4122] CHIP:DMG: 	],
+          [1659785555.543434][4122:4122] CHIP:DMG:
+          [1659785555.543468][4122:4122] CHIP:DMG: 	moreChunkedMessages = false,
+          [1659785555.543502][4122:4122] CHIP:DMG: 	InteractionModelRevision = 1
+          [1659785555.543534][4122:4122] CHIP:DMG: },
+          [1659785555.543637][4122:4122] CHIP:DMG: AccessControl: checking f=1 a=c s=0x000000000001B669 t=
       disabled: true
 
     - label: "DUT reads TemperatureUnit attribute from TH"
       PICS: LUNIT.C.A0000
       verification: |
-          ./chip-tool unitlocalization read temperature-unit 1 0
-          Verify in DUT as client side: Verify that DUT reads TemperatureUnit attribute value  as 3
+          Product maker needs to provide instructions for how to trigger the command on the DUT. For comparison, the DUT behavior for this test step can be simulated using chip-tool (when DUT is a commissioner/Client)
 
-          [1658246890.082009][2283:2288] CHIP:DMG: }
-          [1658246890.082194][2283:2288] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_002D Attribute 0x0000_0000 DataVersion: 2312195208
-          [1658246890.082278][2283:2288] CHIP:TOO:   TemperatureUnit: 3
-          [1658246890.082378][2283:2288] CHIP:EM: Sending Standalone Ack for MessageCounter:2721421 on exchange 29345i
+          ./chip-tool unitlocalization read temperature-unit 1 0
+          Verify DUT receives TemperatureUnit attribute response on the TH(all-clusters-app) Log:
+
+          [1659785612.134440][4122:4122] CHIP:IM: Received Read request
+          [1659785612.134567][4122:4122] CHIP:DMG: ReadRequestMessage =
+          [1659785612.134616][4122:4122] CHIP:DMG: {
+          [1659785612.134656][4122:4122] CHIP:DMG: 	AttributePathIBs =
+          [1659785612.134703][4122:4122] CHIP:DMG: 	[
+          [1659785612.134746][4122:4122] CHIP:DMG: 		AttributePathIB =
+          [1659785612.134808][4122:4122] CHIP:DMG: 		{
+          [1659785612.134860][4122:4122] CHIP:DMG: 			Endpoint = 0x0,
+          [1659785612.134917][4122:4122] CHIP:DMG: 			Cluster = 0x2d,
+          [1659785612.134983][4122:4122] CHIP:DMG: 			Attribute = 0x0000_0000,
+          [1659785612.135041][4122:4122] CHIP:DMG: 		}
+          [1659785612.135093][4122:4122] CHIP:DMG:
+          [1659785612.135167][4122:4122] CHIP:DMG: 	],
+          [1659785612.135223][4122:4122] CHIP:DMG:
+          [1659785612.135272][4122:4122] CHIP:DMG: 	isFabricFiltered = true,
+          [1659785612.135320][4122:4122] CHIP:DMG: 	InteractionModelRevision = 1
+          [1659785612.135364][4122:4122] CHIP:DMG: },
+          [1659785612.135489][4122:4122] CHIP:DMG: IM RH moving to [GeneratingReports]
+          [1659785612.135628][4122:4122] CHIP:DMG: Building Reports for ReadHandler with LastReportGeneration = 0 DirtyGeneration = 0
+          [1659785612.135679][4122:4122] CHIP:DMG: <RE:Run> Cluster 2d, Attribute 0 is dirty
       disabled: true
diff --git a/src/app/tests/suites/certification/ci-pics-values b/src/app/tests/suites/certification/ci-pics-values
index 0dd3b30..527de2f 100644
--- a/src/app/tests/suites/certification/ci-pics-values
+++ b/src/app/tests/suites/certification/ci-pics-values
@@ -239,6 +239,7 @@
 CC.C.A003b=1
 CC.C.A003c=1
 CC.C.C00.Rsp=1
+CC.C.C0a.Rsp=1
 CC.C.C01.Rsp=1
 CC.C.C02.Rsp=1
 CC.C.C03.Rsp=1
@@ -249,9 +250,9 @@
 CC.C.C08.Rsp=1
 CC.C.C47.Rsp=1
 CC.C.C09.Rsp=1
-CC.C.C0A.Rsp=1
-CC.C.C4B.Rsp=1
-CC.C.C4C.Rsp=1
+CC.C.C0a.Rsp=1
+CC.C.C4b.Rsp=1
+CC.C.C4c.Rsp=1
 CC.C.C40.Rsp=1
 CC.C.C41.Rsp=1
 CC.C.C42.Rsp=1
@@ -287,6 +288,7 @@
 KEYPADINPUT.S.NK=1
 KEYPADINPUT.S.NV=1
 KEYPADINPUT.S.C00.Rsp=1
+KEYPADINPUT.C.C00.Tx=1
 MEDIAINPUT.S.NU=0
 
 LOWPOWER.S=1
diff --git a/src/app/tests/suites/tests.js b/src/app/tests/suites/tests.js
index 88d0031..b590de3 100644
--- a/src/app/tests/suites/tests.js
+++ b/src/app/tests/suites/tests.js
@@ -210,6 +210,7 @@
         "Test_TC_CHANNEL_5_4",
         "Test_TC_CHANNEL_5_5",
         "Test_TC_CHANNEL_5_6",
+        "Test_TC_KEYPADINPUT_3_1",
         "Test_TC_MEDIAPLAYBACK_6_5",
         "Test_TC_MEDIAPLAYBACK_6_7",
         "Test_TC_AUDIOOUTPUT_7_3",
diff --git a/zzz_generated/chip-tool/zap-generated/test/Commands.h b/zzz_generated/chip-tool/zap-generated/test/Commands.h
index 56dc5e2..b050a00 100644
--- a/zzz_generated/chip-tool/zap-generated/test/Commands.h
+++ b/zzz_generated/chip-tool/zap-generated/test/Commands.h
@@ -379,6 +379,7 @@
         printf("Test_TC_CHANNEL_5_4\n");
         printf("Test_TC_CHANNEL_5_5\n");
         printf("Test_TC_CHANNEL_5_6\n");
+        printf("Test_TC_KEYPADINPUT_3_1\n");
         printf("Test_TC_MEDIAPLAYBACK_6_5\n");
         printf("Test_TC_MEDIAPLAYBACK_6_7\n");
         printf("Test_TC_AUDIOOUTPUT_7_3\n");
@@ -76958,6 +76959,63 @@
     }
 };
 
+class Test_TC_KEYPADINPUT_3_1Suite : public TestCommand
+{
+public:
+    Test_TC_KEYPADINPUT_3_1Suite(CredentialIssuerCommands * credsIssuerConfig) :
+        TestCommand("Test_TC_KEYPADINPUT_3_1", 0, credsIssuerConfig)
+    {
+        AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
+        AddArgument("cluster", &mCluster);
+        AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
+        AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
+    }
+
+    ~Test_TC_KEYPADINPUT_3_1Suite() {}
+
+    chip::System::Clock::Timeout GetWaitDuration() const override
+    {
+        return chip::System::Clock::Seconds16(mTimeout.ValueOr(kTimeoutInSeconds));
+    }
+
+private:
+    chip::Optional<chip::NodeId> mNodeId;
+    chip::Optional<chip::CharSpan> mCluster;
+    chip::Optional<chip::EndpointId> mEndpoint;
+    chip::Optional<uint16_t> mTimeout;
+
+    chip::EndpointId GetEndpoint(chip::EndpointId endpoint) { return mEndpoint.HasValue() ? mEndpoint.Value() : endpoint; }
+
+    //
+    // Tests methods
+    //
+
+    void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override
+    {
+        bool shouldContinue = false;
+
+        switch (mTestIndex - 1)
+        {
+        default:
+            LogErrorOnFailure(ContinueOnChipMainThread(CHIP_ERROR_INVALID_ARGUMENT));
+        }
+
+        if (shouldContinue)
+        {
+            ContinueOnChipMainThread(CHIP_NO_ERROR);
+        }
+    }
+
+    CHIP_ERROR DoTestStep(uint16_t testIndex) override
+    {
+        using namespace chip::app::Clusters;
+        switch (testIndex)
+        {
+        }
+        return CHIP_NO_ERROR;
+    }
+};
+
 class Test_TC_MEDIAPLAYBACK_6_5Suite : public TestCommand
 {
 public:
@@ -95694,6 +95752,7 @@
         make_unique<Test_TC_CHANNEL_5_4Suite>(credsIssuerConfig),
         make_unique<Test_TC_CHANNEL_5_5Suite>(credsIssuerConfig),
         make_unique<Test_TC_CHANNEL_5_6Suite>(credsIssuerConfig),
+        make_unique<Test_TC_KEYPADINPUT_3_1Suite>(credsIssuerConfig),
         make_unique<Test_TC_MEDIAPLAYBACK_6_5Suite>(credsIssuerConfig),
         make_unique<Test_TC_MEDIAPLAYBACK_6_7Suite>(credsIssuerConfig),
         make_unique<Test_TC_AUDIOOUTPUT_7_3Suite>(credsIssuerConfig),