Added Updated Manual scripts (#21797)

* Added Manual scripts

* Added Auto generated Files

* Added PICS.yaml script

* Restyled by clang-format

Co-authored-by: Restyled.io <commits@restyled.io>
diff --git a/src/app/tests/suites/certification/PICS.yaml b/src/app/tests/suites/certification/PICS.yaml
index 7cba75b..ee05898 100644
--- a/src/app/tests/suites/certification/PICS.yaml
+++ b/src/app/tests/suites/certification/PICS.yaml
@@ -1676,6 +1676,11 @@
           QueryImageResponse Command?"
       id: OTAP.S.M.UserConsentNeeded
 
+    - label:
+          "Does the DUT support sending the DelayedActionTime field in
+          QueryImageResponse Command?"
+      id: OTAP.S.M.DelayedActionTime
+
     - label: "Does the DUT support sending the AnnounceOTAProvider Command?"
       id: OTAR.C.M.AnnounceOTAProvider
 
@@ -2395,6 +2400,11 @@
       id: TGTNAV.S.C00.Rsp
 
     - label:
+          "Does the DUT support the Target Navigator client cluster,
+          NavigateTarget command?"
+      id: TGTNAV.C.C00.Tx
+
+    - label:
           "Does the DUT support the Application Basic server cluster VendorName
           attribute?"
       id: APBSC.S.A0000
@@ -3219,6 +3229,11 @@
           advertisements?"
       id: MCORE.DD.COMMISSIONING_SUBTYPE_T
 
+    - label:
+          "Does the commissioner support fetching DCL data from a device being
+          commissioned?"
+      id: MCORE.DD.FETCH_DCL
+
     #Ethernet Network Diagnostics Cluster
     - label: "Does the device implement the ResetCounts command?"
       id: DGETH.S.C00.Rsp
@@ -5078,6 +5093,9 @@
     - label: "Does the Controller DUT support Service Advertising?"
       id: MCORE.SC.ADV
 
+    - label: "Does the Controller DUT support Service Advertising?"
+      id: MCORE.SC.ADV
+
     #133.1. Bridged Device Basic Information Cluster
     - label: "Does the DUT(server) support the DataModelRevision attribute?"
       id: BRBINFO.S.A0000
diff --git a/src/app/tests/suites/certification/Test_TC_CADMIN_1_1.yaml b/src/app/tests/suites/certification/Test_TC_CADMIN_1_1.yaml
index 208e9ae..17d28c1 100644
--- a/src/app/tests/suites/certification/Test_TC_CADMIN_1_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CADMIN_1_1.yaml
@@ -47,7 +47,7 @@
 
           ./chip-tool  pairing open-commissioning-window 1 1 400 2000 3841
 
-          Controller:
+          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]
@@ -58,7 +58,7 @@
           [1635691999.946895][3822:3827] CHIP:IN: Sending plaintext msg 0xffffaa58a960 with MessageCounter:1726016118 to 0x0000000000000000 at monotonic time: 5805158 msec
           [1635691999.946983][3822:3827] CHIP:EM: Flushed pending ack for MessageCounter:3234931243 on exchange 35324i
 
-          Device:
+          On DUT as server side
 
           CHIP minimal mDNS started advertising.
           [1635687658.683388][3792:3792] CHIP:DIS: Failed to find a valid admin pairing. Node ID unknown
@@ -399,6 +399,7 @@
           ./chip-tool pairing code 1  34995354639
 
           verify you got the following message in the TH log
+
           CHIP:SC: PASESession timed out while waiting for a response from the peer. Expected message type was 33
           CHIP:TOO: Secure Pairing Failed
           CHIP:TOO: Pairing Failure: ../../third_party/connectedhomeip/src/protocols/secure_channel/PASESession.cpp:324: CHIP Error 0x00000032: Timeout
@@ -446,7 +447,7 @@
           ./chip-tool basic read node-label 2 0
 
           CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0028 Attribute 0x0000_0005 DataVersion: 3061847068
-          [1649245950.006849][10116:10121] CHIP:TOO:   NodeLabel: te8
+          [1649245950.006849][10116:10121] CHIP:TOO:   NodeLabel: te5new
           [1649245950.007024][10116:10121] CHIP:EM: Sending Standalone Ack for MessageCounter:12495101 on exchange 24816i
       disabled: true
 
diff --git a/src/app/tests/suites/certification/Test_TC_CADMIN_1_15.yaml b/src/app/tests/suites/certification/Test_TC_CADMIN_1_15.yaml
index 8f3cebd..6bbc924 100644
--- a/src/app/tests/suites/certification/Test_TC_CADMIN_1_15.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CADMIN_1_15.yaml
@@ -143,7 +143,7 @@
           CHIP:EM: Sending Standalone Ack for MessageCounter:9143157 on exchange 1147i
       disabled: true
 
-    - label: "TH_CR2 sends RemoveFabric with FabricIndex = 2command to DUT_CE"
+    - label: "TH_CR2 sends RemoveFabric with FabricIndex = 2 command to DUT_CE"
       PICS: OPCREDS.S.C0a.Rsp
       verification: |
           on 2nd controller using chip tool, remove fabric with FabricIndex=2
@@ -170,13 +170,13 @@
           ./chip-tool basic write node-label te5new 2 0
 
            Received error (protocol code 2) during pairing process. ../../third_party/connectedhomeip/src/protocols/secure_channel/CASESession.cpp:1551: CHIP Error 0x00000054: Invalid CASE parameter
-          [1651819620.929567][4359:4364] CHIP:CTL: OperationalSessionSetup[B8070CD13C99D367:0000000000000002]: State change 3 --> 2
+          [1651819620.929567][4359:4364] CHIP:CTL: OperationalDeviceProxy[B8070CD13C99D367:0000000000000002]: State change 3 --> 2
           [1651819620.929700][4359:4364] CHIP:-: ../../third_party/connectedhomeip/src/protocols/secure_channel/CASESession.cpp:1551: CHIP Error 0x00000054: Invalid CASE parameter at ../../commands/clusters/ModelCommand.cpp:53
 
           ./chip-tool basic read node-label 2 0
 
            Received error (protocol code 2) during pairing process. ../../third_party/connectedhomeip/src/protocols/secure_channel/CASESession.cpp:1551: CHIP Error 0x00000054: Invalid CASE parameter
-          [1651819620.929567][4359:4364] CHIP:CTL: OperationalSessionSetup[B8070CD13C99D367:0000000000000002]: State change 3 --> 2
+          [1651819620.929567][4359:4364] CHIP:CTL: OperationalDeviceProxy[B8070CD13C99D367:0000000000000002]: State change 3 --> 2
           [1651819620.929700][4359:4364] CHIP:-: ../../third_party/connectedhomeip/src/protocols/secure_channel/CASESession.cpp:1551: CHIP Error 0x00000054: Invalid CASE parameter at ../../commands/clusters/ModelCommand.cpp:53
       disabled: true
 
@@ -211,26 +211,6 @@
       disabled: true
 
     - label:
-          "Verify DUT_CE is now discoverable over DNS-SD with 2 Operational
-          service records (_matter._tcp SRV records)."
-      verification: |
-          grl@grl-ThinkPad-L480:~/may16_cntrl03/connectedhomeip/examples/chip-tool/out/debug$ avahi-browse -rt _matter._tcp
-          + wlp5s0 IPv6 8E50A59FAF52A809-0000000000000001             _matter._tcp         local
-          + wlp5s0 IPv6 03E707466A904C7E-0000000000000003             _matter._tcp         local
-          = wlp5s0 IPv6 8E50A59FAF52A809-0000000000000001             _matter._tcp         local
-             hostname = [E45F010F27530000.local]
-             address = [fe80::e65f:1ff:fe0f:2753]
-             port = [5540]
-             txt = ["T=1" "SAI=300" "SII=5000"]
-          = wlp5s0 IPv6 03E707466A904C7E-0000000000000003             _matter._tcp         local
-             hostname = [E45F010F27530000.local]
-             address = [fe80::e65f:1ff:fe0f:2753]
-             port = [5540]
-             txt = ["T=1" "SAI=300" "SII=5000"]
-          grl@grl-ThinkPad-L480:~/may16_cntrl03/connectedhomeip/examples/chip-tool/out/debug$
-      disabled: true
-
-    - label:
           "TH_CR1 opens a commissioning window on DUT_CE using a commissioning
           timeout of PIXIT.CADMIN.CwDuration seconds using ECM"
       PICS: CADMIN.S.C00.Rsp
diff --git a/src/app/tests/suites/certification/Test_TC_CADMIN_1_16.yaml b/src/app/tests/suites/certification/Test_TC_CADMIN_1_16.yaml
index 85eb8c8..46e79b3 100644
--- a/src/app/tests/suites/certification/Test_TC_CADMIN_1_16.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CADMIN_1_16.yaml
@@ -181,7 +181,7 @@
           CHIP:EM: Sending Standalone Ack for MessageCounter:9143157 on exchange 1147i
       disabled: true
 
-    - label: "TH_CR2 sends RemoveFabric with FabricIndex = 2command to DUT_CE"
+    - label: "TH_CR2 sends RemoveFabric with FabricIndex = 2 command to DUT_CE"
       PICS: OPCREDS.S.C0a.Rsp
       verification: |
           on 2nd controller using chip tool, remove fabric with FabricIndex=2
@@ -208,13 +208,13 @@
           ./chip-tool basic write node-label te5new 2 0
 
            Received error (protocol code 2) during pairing process. ../../third_party/connectedhomeip/src/protocols/secure_channel/CASESession.cpp:1551: CHIP Error 0x00000054: Invalid CASE parameter
-          [1651819620.929567][4359:4364] CHIP:CTL: OperationalSessionSetup[B8070CD13C99D367:0000000000000002]: State change 3 --> 2
+          [1651819620.929567][4359:4364] CHIP:CTL: OperationalDeviceProxy[B8070CD13C99D367:0000000000000002]: State change 3 --> 2
           [1651819620.929700][4359:4364] CHIP:-: ../../third_party/connectedhomeip/src/protocols/secure_channel/CASESession.cpp:1551: CHIP Error 0x00000054: Invalid CASE parameter at ../../commands/clusters/ModelCommand.cpp:53
 
           ./chip-tool basic read node-label 2 0
 
            Received error (protocol code 2) during pairing process. ../../third_party/connectedhomeip/src/protocols/secure_channel/CASESession.cpp:1551: CHIP Error 0x00000054: Invalid CASE parameter
-          [1651819620.929567][4359:4364] CHIP:CTL: OperationalSessionSetup[B8070CD13C99D367:0000000000000002]: State change 3 --> 2
+          [1651819620.929567][4359:4364] CHIP:CTL: OperationalDeviceProxy[B8070CD13C99D367:0000000000000002]: State change 3 --> 2
           [1651819620.929700][4359:4364] CHIP:-: ../../third_party/connectedhomeip/src/protocols/secure_channel/CASESession.cpp:1551: CHIP Error 0x00000054: Invalid CASE parameter at ../../commands/clusters/ModelCommand.cpp:53
       disabled: true
 
diff --git a/src/app/tests/suites/certification/Test_TC_CADMIN_1_17.yaml b/src/app/tests/suites/certification/Test_TC_CADMIN_1_17.yaml
index ec3887d..adc6fdc 100644
--- a/src/app/tests/suites/certification/Test_TC_CADMIN_1_17.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CADMIN_1_17.yaml
@@ -203,13 +203,13 @@
           ./chip-tool basic write node-label te5new 2 0
 
            Received error (protocol code 2) during pairing process. ../../third_party/connectedhomeip/src/protocols/secure_channel/CASESession.cpp:1551: CHIP Error 0x00000054: Invalid CASE parameter
-          [1651819620.929567][4359:4364] CHIP:CTL: OperationalSessionSetup[B8070CD13C99D367:0000000000000002]: State change 3 --> 2
+          [1651819620.929567][4359:4364] CHIP:CTL: OperationalDeviceProxy[B8070CD13C99D367:0000000000000002]: State change 3 --> 2
           [1651819620.929700][4359:4364] CHIP:-: ../../third_party/connectedhomeip/src/protocols/secure_channel/CASESession.cpp:1551: CHIP Error 0x00000054: Invalid CASE parameter at ../../commands/clusters/ModelCommand.cpp:53
 
           ./chip-tool basic read node-label 2 0
 
            Received error (protocol code 2) during pairing process. ../../third_party/connectedhomeip/src/protocols/secure_channel/CASESession.cpp:1551: CHIP Error 0x00000054: Invalid CASE parameter
-          [1651819620.929567][4359:4364] CHIP:CTL: OperationalSessionSetup[B8070CD13C99D367:0000000000000002]: State change 3 --> 2
+          [1651819620.929567][4359:4364] CHIP:CTL: OperationalDeviceProxy[B8070CD13C99D367:0000000000000002]: State change 3 --> 2
           [1651819620.929700][4359:4364] CHIP:-: ../../third_party/connectedhomeip/src/protocols/secure_channel/CASESession.cpp:1551: CHIP Error 0x00000054: Invalid CASE parameter at ../../commands/clusters/ModelCommand.cpp:53
       disabled: true
 
diff --git a/src/app/tests/suites/certification/Test_TC_CADMIN_1_18.yaml b/src/app/tests/suites/certification/Test_TC_CADMIN_1_18.yaml
index dda7a23..c77b298 100644
--- a/src/app/tests/suites/certification/Test_TC_CADMIN_1_18.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CADMIN_1_18.yaml
@@ -215,13 +215,13 @@
           ./chip-tool basic write node-label te5new 2 0
 
            Received error (protocol code 2) during pairing process. ../../third_party/connectedhomeip/src/protocols/secure_channel/CASESession.cpp:1551: CHIP Error 0x00000054: Invalid CASE parameter
-          [1651819620.929567][4359:4364] CHIP:CTL: OperationalSessionSetup[B8070CD13C99D367:0000000000000002]: State change 3 --> 2
+          [1651819620.929567][4359:4364] CHIP:CTL: OperationalDeviceProxy[B8070CD13C99D367:0000000000000002]: State change 3 --> 2
           [1651819620.929700][4359:4364] CHIP:-: ../../third_party/connectedhomeip/src/protocols/secure_channel/CASESession.cpp:1551: CHIP Error 0x00000054: Invalid CASE parameter at ../../commands/clusters/ModelCommand.cpp:53
 
           ./chip-tool basic read node-label 2 0
 
            Received error (protocol code 2) during pairing process. ../../third_party/connectedhomeip/src/protocols/secure_channel/CASESession.cpp:1551: CHIP Error 0x00000054: Invalid CASE parameter
-          [1651819620.929567][4359:4364] CHIP:CTL: OperationalSessionSetup[B8070CD13C99D367:0000000000000002]: State change 3 --> 2
+          [1651819620.929567][4359:4364] CHIP:CTL: OperationalDeviceProxy[B8070CD13C99D367:0000000000000002]: State change 3 --> 2
           [1651819620.929700][4359:4364] CHIP:-: ../../third_party/connectedhomeip/src/protocols/secure_channel/CASESession.cpp:1551: CHIP Error 0x00000054: Invalid CASE parameter at ../../commands/clusters/ModelCommand.cpp:53
       disabled: true
 
@@ -370,3 +370,9 @@
           [1647863342.982512][9309:9314] CHIP:TOO:      }
           [1647863342.982738][9309:9314] CHIP:EM: Sending Standalone Ack for MessageCounter:5772016 on exchange 3310i
       disabled: true
+
+    - label: "TH_CR2 sends command to TH_CE to read the list of Fabrics"
+      PICS: OPCREDS.C.A0001
+      verification: |
+          verification step to be updated.
+      disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_CADMIN_1_22.yaml b/src/app/tests/suites/certification/Test_TC_CADMIN_1_22.yaml
index c618c42..4529cc6 100644
--- a/src/app/tests/suites/certification/Test_TC_CADMIN_1_22.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CADMIN_1_22.yaml
@@ -66,7 +66,25 @@
 
     - label: "Wait for commissioning Window to 901 seconds"
       verification: |
-          Wait for commissioning Window to Timeout
+          On 1st controller chip tool, open commissioning window
+
+          Below is the example when using chip tool as controller
+
+
+          For ECM,
+          ./chip-tool pairing open-commissioning-window 1 1 900 1000 3840
+
+          [1635925713.966786][9695:9700] CHIP:SC: Success status report received. Session was established
+          [1635925713.966839][9695:9700] CHIP:IN: New secure session created for device 0x0000000000000001, key 33!!
+          [1635925713.966938][9695:9700] CHIP:CTL: OpenCommissioningWindow for device ID 1
+          [1635925713.972601][9695:9700] CHIP:DMG: ICR moving to [AddingComm]
+          [1635925713.972705][9695:9700] CHIP:DMG: ICR moving to [AddedComma]
+          [1635925713.972815][9695:9700] CHIP:IN: Prepared encrypted message 0xaaaad9b57d10 to 0x0000000000000001 of type 0x8 and protocolId (0, 1) on exchange 31056i with MessageCounter:0.
+          [1635925713.972876][9695:9700] CHIP:IN: Sending encrypted msg 0xaaaad9b57d10 with MessageCounter:0 to 0x0000000000000001 at monotonic time: 13449459 msec
+          [1635925713.973006][9695:9700] CHIP:DMG: ICR moving to [CommandSen]
+          [1635925713.973061][9695:9700] CHIP:CTL: Manual pairing code: [35484132896]
+          [1635925713.973120][9695:9700] CHIP:CTL: SetupQRCode: [MT:00000CQM00A7F87ZT10]
+          [1635925713.973178][9695:9700] CHIP:EM: Sending Standalone Ack for MessageCounter:1964916542 on exchange 31055i
       disabled: true
 
     - label:
diff --git a/src/app/tests/suites/certification/Test_TC_DD_1_12.yaml b/src/app/tests/suites/certification/Test_TC_DD_1_12.yaml
index 96706bc..78dfc1d 100644
--- a/src/app/tests/suites/certification/Test_TC_DD_1_12.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DD_1_12.yaml
@@ -75,8 +75,7 @@
           $  ./chip-tool pairing code 1 MT:-24J0AFN00KA0648G00
           ...
           [1657214364908] [29006:16612760] CHIP: [CTL] Starting commissioning discovery over DNS-SD
-          [1657214364908] [29006:16612760] CHIP: [DL] Browsing for: _matterc._udp,_L3840
-          [1657214365080] [29006:16612761] CHIP: [DL] Mdns: OnBrowseAdd  name: E5EFE5FB9DC494B9, type: _matterc._udp., domain: local., interface: 7        [1657214365080] [29006:16612761] CHIP: [DL] Resolve type=_matterc._udp name=E5EFE5FB9DC494B9 interface=7
+          [1657214364908] [29006:16612760] CHIP: [DL] Browsing for: _matterc._udp,_L3840         [1657214365080] [29006:16612761] CHIP: [DL] Mdns: OnBrowseAdd  name: E5EFE5FB9DC494B9, type: _matterc._udp., domain: local., interface: 7        [1657214365080] [29006:16612761] CHIP: [DL] Resolve type=_matterc._udp name=E5EFE5FB9DC494B9 interface=7
           [1657214365080] [29006:16612761] CHIP: [DL] Mdns : OnNewInterface hostname:DCA6328D2B9F0000.local. fullname:E5EFE5FB9DC494B9._matterc._udp.local. interface: 7        [1657214365082] [29006:16612761] CHIP: [DL] Mdns: OnNewAddress interface: 7 ip:fd54:23a1:c6de:4637:4c4:ee82:2a0f:b5e2
           [1657214365082] [29006:16612761] CHIP: [DL] Mdns: OnNewAddress interface: 7 ip:fe80::1e81:3e0:3865:2d29
           [1657214365082] [29006:16612761] CHIP: [DL] Mdns: OnNewAddress interface: 7 ip:192.168.1.10
diff --git a/src/app/tests/suites/certification/Test_TC_DD_1_5.yaml b/src/app/tests/suites/certification/Test_TC_DD_1_5.yaml
index 441cf91..f2b6606 100644
--- a/src/app/tests/suites/certification/Test_TC_DD_1_5.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DD_1_5.yaml
@@ -30,7 +30,6 @@
     - label:
           "Keep the DUT in packaging and bring in TH NFC scanner close to the
           DUT packaging."
-      PICS: MCORE.DD.SCAN_NFC
       verification: |
           Vendor specific field verification
       disabled: true
@@ -39,7 +38,6 @@
           "Unpack DUT from its packaging, make sure DUT is not powered on and do
           not put the DUT in pairing mode. Bring in TH NFC scanner close to the
           DUTs NFC tag"
-      PICS: MCORE.DD.SCAN_NFC
       verification: |
           Vendor specific field verification
       disabled: true
@@ -47,7 +45,7 @@
     - label:
           "Power on DUT and do not put the DUT in pairing mode. Bring in TH NFC
           scanner close to the DUTs NFC tag"
-      PICS: MCORE.DD.PHYSICAL_TAMPERING && MCORE.DD.SCAN_NFC
+      PICS: MCORE.DD.PHYSICAL_TAMPERING
       verification: |
           Vendor specific field verification
       disabled: true
@@ -61,13 +59,13 @@
     - label:
           "Power on DUT and put the DUT in pairing mode. Bring in TH NFC scanner
           close to NFC tag"
-      PICS: MCORE.DD.PHYSICAL_TAMPERING && MCORE.DD.SCAN_NFC
+      PICS: MCORE.DD.PHYSICAL_TAMPERING
       verification: |
           Vendor specific field verification
       disabled: true
 
     - label: "Power on DUT. Bring in NFC scanner close to NFC tag"
-      PICS: MCORE.DD.PHYSICAL_TAMPERING && MCORE.DD.SCAN_NFC
+      PICS: MCORE.DD.PHYSICAL_TAMPERING
       verification: |
           Vendor specific field verification
       disabled: true
@@ -97,7 +95,6 @@
       disabled: true
 
     - label: "Using TH NFC scanner - read NFC tag Reader type"
-      PICS: MCORE.DD.SCAN_NFC
       verification: |
           Vendor specific field verification
       disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_DD_1_8.yaml b/src/app/tests/suites/certification/Test_TC_DD_1_8.yaml
index f57fbb5..26a0b75 100644
--- a/src/app/tests/suites/certification/Test_TC_DD_1_8.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DD_1_8.yaml
@@ -82,7 +82,6 @@
     - label:
           "Using the DUT, parse the THs QR code to onboard the TH Device onto
           the Matter network."
-      PICS: ""
       verification: |
           ./chip-tool pairing code 1 MT:-24J042C00KA0648G00
 
@@ -118,7 +117,6 @@
     - label:
           "Using the DUT, parse the THs QR code to onboard the TH Device onto
           the Matter network."
-      PICS: ""
       verification: |
           ./chip-tool pairing code 1 MT:-24J0AFN00KA064IJ3P0IXZB0DK5N1K8SQ1RYCU1-A40
 
@@ -130,3 +128,37 @@
           [1657210956708] [28601:16575811] CHIP: [CTL] Successfully finished commissioning step "Cleanup"
           [1657210956709] [28601:16575811] CHIP: [TOO] Device commissioning completed with success
       disabled: true
+
+    - label:
+          "Scan the TH Devices QR code (that includes the additional large TLV
+          data) using DUT. For an example using 1000 bytes of data, the payload
+          would be
+          MT:-24J0AFN00KA064IJ3P0JFQB7TZZL15PKP1CD5T1VFSK1S3DO1ZTZR1UNMJ1DK5N1K8SQ1RYCU1ZL15PKP1CD5T1VFSK1S3DO1ZTZR1UNMJ1DK5N1K8SQ1RYCU1ZL15PKP1CD5T1VFSK1S3DO1ZTZR1UNMJ1DK5N1K8SQ1RYCU1ZL15PKP1CD5T1VFSK1S3DO1ZTZR1UNMJ1DK5N1K8SQ1RYCU1ZL15PKP1CD5T1VFSK1S3DO1ZTZR1UNMJ1DK5N1K8SQ1RYCU1ZL15PKP1CD5T1VFSK1S3DO1ZTZR1UNMJ1DK5N1K8SQ1RYCU1ZL15PKP1CD5T1VFSK1S3DO1ZTZR1UNMJ1DK5N1K8SQ1RYCU1ZL15PKP1CD5T1VFSK1S3DO1ZTZR1UNMJ1DK5N1K8SQ1RYCU1ZL15PKP1CD5T1VFSK1S3DO1ZTZR1UNMJ1DK5N1K8SQ1RYCU1ZL15PKP1CD5T1VFSK1S3DO1ZTZR1UNMJ1DK5N1K8SQ1RYCU1ZL15PKP1CD5T1VFSK1S3DO1ZTZR1UNMJ1DK5N1K8SQ1RYCU1ZL15PKP1CD5T1VFSK1S3DO1ZTZR1UNMJ1DK5N1K8SQ1RYCU1ZL15PKP1CD5T1VFSK1S3DO1ZTZR1UNMJ1DK5N1K8SQ1RYCU1ZL15PKP1CD5T1VFSK1S3DO1ZTZR1UNMJ1DK5N1K8SQ1RYCU1ZL15PKP1CD5T1VFSK1S3DO1ZTZR1UNMJ1DK5N1K8SQ1RYCU1ZL15PKP1CD5T1VFSK1S3DO1ZTZR1UNMJ1DK5N1K8SQ1RYCU1ZL15PKP1CD5T1VFSK1S3DO1ZTZR1UNMJ1DK5N1K8SQ1RYCU1ZL15PKP1CD5T1VFSK1S3DO1ZTZR1UNMJ1DK5N1K8SQ1RYCU1ZL15PKP1CD5T1VFSK1S3DO1ZTZR1UNMJ1DK5N1K8SQ1RYCU1ZL15PKP1CD5T1VFSK1S3DO1ZTZR1UNMJ1DK5N1K8SQ1RYCU1ZL15PKP1CD5T1VFSK1S3DO1ZTZR1UNMJ1DK5N1K8SQ1RYCU1ZL15PKP1CD5T1VFSK1S3DO1ZTZR1UNMJ1DK5N1K8SQ1RYCU1ZL15PKP1CD5T1VFSK1S3DO1ZTZR1UNMJ1DK5N1K8SQ1RYCU1ZL15PKP1CD5T1VFSK1S3DO1ZTZR1UNMJ1DK5N1K8SQ1RYCU1ZL15PKP1CD5T1VFSK1S3DO1ZTZR1UNMJ1DK5N1K8SQ1RYCU1ZL15PKP1CD5T1VFSK1S3DO1ZTZR1UNMJ1DK5N1K8SQ1RYCU1ZL15PKP1CD5T1VFSK1S3DO1ZTZR1UNMJ1DK5N1K8SQ1RYCU1ZL15PKP1CD5T1VFSK1S3DO1ZTZR1UNMJ1DK5N1K8SQ1RYCU1ZL15PKP1CD5T1VFSK1S3DO1ZTZR1UNMJ1DK5N1K8SQ1RYCU1ZL15PKP1CD5T1VFSK1S3DO1ZTZR1UNMJ1DK5N1K8SQ1RYCU1ZL15PKP1CD5T1VFSK1S3DO1ZTZR1UNMJ1DK5N1K8SQ1RYCU1ZL15PKP1CD5T1VFSK1S3DO1ZTZR1UNMJ1DK5N1K8SQ1RYCU1ZL15PKP1CD5T1VFSK1S3DO1ZTZR1UNMJ1DK5N1K8SQ1RYCU1ZL15PKP1CD5T11UXS0.
+          Where the TLV payload was 0x15 0x2d 0x82 0xe8 0x03 <1000 bytes of
+          data> 0x18 (using tag type 0x2d=UTF-8 string, 2-octet length, vendor
+          tag 0x82, length 0x03e8)"
+      PICS: MCORE.DD.SCAN_QR_CODE
+      verification: |
+          $ ./out/all-clusters-app/chip-all-clusters-app
+
+          1. To generate the QR code containing the 1000-byte TLV data, use the following command and piece together the 2 log lines of output. NOTE: The finished QR code is in the Test step already.
+
+          ./chip-tool payload generate-qrcode --existing-payload MT:-24J0AFN00KA0648G00  --tlvBytes hex:152d82e8033132333435363738393031323334353637383930313233343536373839303132333435363738393031323334353637383930313233343536373839303132333435363738393031323334353637383930313233343536373839303132333435363738393031323334353637383930313233343536373839303132333435363738393031323334353637383930313233343536373839303132333435363738393031323334353637383930313233343536373839303132333435363738393031323334353637383930313233343536373839303132333435363738393031323334353637383930313233343536373839303132333435363738393031323334353637383930313233343536373839303132333435363738393031323334353637383930313233343536373839303132333435363738393031323334353637383930313233343536373839303132333435363738393031323334353637383930313233343536373839303132333435363738393031323334353637383930313233343536373839303132333435363738393031323334353637383930313233343536373839303132333435363738393031323334353637383930313233343536373839303132333435363738393031323334353637383930313233343536373839303132333435363738393031323334353637383930313233343536373839303132333435363738393031323334353637383930313233343536373839303132333435363738393031323334353637383930313233343536373839303132333435363738393031323334353637383930313233343536373839303132333435363738393031323334353637383930313233343536373839303132333435363738393031323334353637383930313233343536373839303132333435363738393031323334353637383930313233343536373839303132333435363738393031323334353637383930313233343536373839303132333435363738393031323334353637383930313233343536373839303132333435363738393031323334353637383930313233343536373839303132333435363738393031323334353637383930313233343536373839303132333435363738393031323334353637383930313233343536373839303132333435363738393031323334353637383930313233343536373839303132333435363738393031323334353637383930313233343536373839303132333435363738393031323334353637383930313233343536373839303132333435363738393031323334353637383930313233343536373839303132333435363738393031323334353637383930313233343536373839303132333435363738393018
+          [1659491902.799305][3965:3965] CHIP:TOO: QR Code: MT:-24J0AFN00KA064IJ3P0JFQB7TZZL15PKP1CD5T1VFSK1S3DO1ZTZR1UNMJ1DK5N1K8SQ1RYCU1--ZL15PKP1CD5T1VFSK1S3DO1ZTZR1UNMJ1DK5N1K8SQ1RYCU1--ZL15PKP1CD5T1VFSK1S3DO1ZTZR1UNMJ1DK5N1K8SQ1RYCU1--ZL15PKP1CD5T1VFSK1S3DO1ZTZR1UNMJ1DK5N1K8SQ1RYCU1--ZL15PKP1CD5T1VFSK1S3DO1ZTZR1UNMJ1DK5N1K8SQ1RYCU1--ZL15PKP1CD5T1VFSK1S3DO1ZTZR1UNMJ1DK5N1K8SQ1RYCU1--ZL15PKP1CD5T1VFSK1S3DO1ZTZR1UNMJ1DK5N1K8SQ1RYCU1--ZL15PKP1CD5T1VFSK1S3DO1ZTZR1UNMJ1DK5N1K8SQ1RYCU1--ZL15PKP1CD5T1VFSK1S3DO1ZTZR1UNMJ1DK5N1K8SQ1RYCU1--ZL15PKP1CD5T1VFSK1S3DO1ZTZR1UNMJ1DK5N1K8SQ1RYCU1--ZL15PKP1CD5T1VFSK1S3DO1ZTZR1UNMJ1DK5N1K8SQ1RYCU1--ZL15PKP1CD5T1VFSK1S3DO1ZTZR1UNMJ1DK5N1K8SQ1RYCU1--ZL15PKP1CD5T1VFSK1S3DO1ZTZR1UNMJ1DK5N1K8SQ1RYCU1--ZL15PKP1CD5T1VFSK1S3DO1ZTZR1UNMJ1DK5N1K8SQ1RYCU1--ZL15PKP1CD5T1VFSK1S3DO1ZTZR1UNMJ1DK5N1K8SQ1RYCU1--ZL15PKP1CD5T1VFSK1S3DO1ZTZR1UNMJ1DK5N1K8SQ1RYCU1--ZL15PKP1CD5T1VFSK1S3DO1Z
+
+          [1659491902.799413][3965:3965] CHIP:TOO: QR Code: TZR1UNMJ1DK5N1K8SQ1RYCU1--ZL15PKP1CD5T1VFSK1S3DO1ZTZR1UNMJ1DK5N1K8SQ1RYCU1--ZL15PKP1CD5T1VFSK1S3DO1ZTZR1UNMJ1DK5N1K8SQ1RYCU1--ZL15PKP1CD5T1VFSK1S3DO1ZTZR1UNMJ1DK5N1K8SQ1RYCU1--ZL15PKP1CD5T1VFSK1S3DO1ZTZR1UNMJ1DK5N1K8SQ1RYCU1--ZL15PKP1CD5T1VFSK1S3DO1ZTZR1UNMJ1DK5N1K8SQ1RYCU1--ZL15PKP1CD5T1VFSK1S3DO1ZTZR1UNMJ1DK5N1K8SQ1RYCU1--ZL15PKP1CD5T1VFSK1S3DO1ZTZR1UNMJ1DK5N1K8SQ1RYCU1--ZL15PKP1CD5T1VFSK1S3DO1ZTZR1UNMJ1DK5N1K8SQ1RYCU1--ZL15PKP1CD5T1VFSK1S3DO1ZTZR1UNMJ1DK5N1K8SQ1RYCU1--ZL15PKP1CD5T1VFSK1S3DO1ZTZR1UNMJ1DK5N1K8SQ1RYCU1--ZL15PKP1CD5T1VFSK1S3DO1ZTZR1UNMJ1DK5N1K8SQ1RYCU1--ZL15PKP1CD5T1VFSK1S3DO1ZTZR1UNMJ1DK5N1K8SQ1RYCU1--ZL15PKP1CD5T1VFSK1S3DO1ZTZR1UNMJ1DK5N1K8SQ1RYCU1--ZL15PKP1CD5T1VFSK1S3DO1ZTZR1UNMJ1DK5N1K8SQ1RYCU1--ZL15PKP1CD5T1VFSK1S3DO1ZTZR1UNMJ1DK5N1K8SQ1RYCU1--ZL15PKP1CD5T1VFSK1S3DO1ZTZR1UNMJ1DK5N1K8SQ1RYCU1--ZL15PKP1CD5T11UXS0
+      disabled: true
+
+    - label:
+          "Using the DUT, parse the THs QR code to onboard the TH Device onto
+          the Matter network."
+      verification: |
+          ./chip-tool pairing code 1 MT:-24J0AFN00KA064IJ3P0JFQB7TZZL15PKP1CD5T1VFSK1S3DO1ZTZR1UNMJ1DK5N1K8SQ1RYCU1--ZL15PKP1CD5T1VFSK1S3DO1ZTZR1UNMJ1DK5N1K8SQ1RYCU1--ZL15PKP1CD5T1VFSK1S3DO1ZTZR1UNMJ1DK5N1K8SQ1RYCU1--ZL15PKP1CD5T1VFSK1S3DO1ZTZR1UNMJ1DK5N1K8SQ1RYCU1--ZL15PKP1CD5T1VFSK1S3DO1ZTZR1UNMJ1DK5N1K8SQ1RYCU1--ZL15PKP1CD5T1VFSK1S3DO1ZTZR1UNMJ1DK5N1K8SQ1RYCU1--ZL15PKP1CD5T1VFSK1S3DO1ZTZR1UNMJ1DK5N1K8SQ1RYCU1--ZL15PKP1CD5T1VFSK1S3DO1ZTZR1UNMJ1DK5N1K8SQ1RYCU1--ZL15PKP1CD5T1VFSK1S3DO1ZTZR1UNMJ1DK5N1K8SQ1RYCU1--ZL15PKP1CD5T1VFSK1S3DO1ZTZR1UNMJ1DK5N1K8SQ1RYCU1--ZL15PKP1CD5T1VFSK1S3DO1ZTZR1UNMJ1DK5N1K8SQ1RYCU1--ZL15PKP1CD5T1VFSK1S3DO1ZTZR1UNMJ1DK5N1K8SQ1RYCU1--ZL15PKP1CD5T1VFSK1S3DO1ZTZR1UNMJ1DK5N1K8SQ1RYCU1--ZL15PKP1CD5T1VFSK1S3DO1ZTZR1UNMJ1DK5N1K8SQ1RYCU1--ZL15PKP1CD5T1VFSK1S3DO1ZTZR1UNMJ1DK5N1K8SQ1RYCU1--ZL15PKP1CD5T1VFSK1S3DO1ZTZR1UNMJ1DK5N1K8SQ1RYCU1--ZL15PKP1CD5T1VFSK1S3DO1ZTZR1UNMJ1DK5N1K8SQ1RYCU1--ZL15PKP1CD5T1VFSK1S3DO1ZTZR1UNMJ1DK5N1K8SQ1RYCU1--ZL15PKP1CD5T1VFSK1S3DO1ZTZR1UNMJ1DK5N1K8SQ1RYCU1--ZL15PKP1CD5T1VFSK1S3DO1ZTZR1UNMJ1DK5N1K8SQ1RYCU1--ZL15PKP1CD5T1VFSK1S3DO1ZTZR1UNMJ1DK5N1K8SQ1RYCU1--ZL15PKP1CD5T1VFSK1S3DO1ZTZR1UNMJ1DK5N1K8SQ1RYCU1--ZL15PKP1CD5T1VFSK1S3DO1ZTZR1UNMJ1DK5N1K8SQ1RYCU1--ZL15PKP1CD5T1VFSK1S3DO1ZTZR1UNMJ1DK5N1K8SQ1RYCU1--ZL15PKP1CD5T1VFSK1S3DO1ZTZR1UNMJ1DK5N1K8SQ1RYCU1--ZL15PKP1CD5T1VFSK1S3DO1ZTZR1UNMJ1DK5N1K8SQ1RYCU1--ZL15PKP1CD5T1VFSK1S3DO1ZTZR1UNMJ1DK5N1K8SQ1RYCU1--ZL15PKP1CD5T1VFSK1S3DO1ZTZR1UNMJ1DK5N1K8SQ1RYCU1--ZL15PKP1CD5T1VFSK1S3DO1ZTZR1UNMJ1DK5N1K8SQ1RYCU1--ZL15PKP1CD5T1VFSK1S3DO1ZTZR1UNMJ1DK5N1K8SQ1RYCU1--ZL15PKP1CD5T1VFSK1S3DO1ZTZR1UNMJ1DK5N1K8SQ1RYCU1--ZL15PKP1CD5T1VFSK1S3DO1ZTZR1UNMJ1DK5N1K8SQ1RYCU1--ZL15PKP1CD5T1VFSK1S3DO1ZTZR1UNMJ1DK5N1K8SQ1RYCU1--ZL15PKP1CD5T11UXS0
+
+          Verify in TH as server side:
+          [1659491845.473705][3953:3953] CHIP:SVR: Commissioning completed successfully
+
+
+          Verify on the DUT as client side:
+          [1659491845308] [14021:5374393] CHIP: [TOO] Device commissioning completed with success
+      disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_DD_1_9.yaml b/src/app/tests/suites/certification/Test_TC_DD_1_9.yaml
index 9d32b1c..2d38a07 100644
--- a/src/app/tests/suites/certification/Test_TC_DD_1_9.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DD_1_9.yaml
@@ -30,7 +30,6 @@
     - label:
           "Provide the 11-digit/21-digit Manual Pairing Code from the TH Device
           in text, speech or any format supported by DUT"
-      PICS: ""
       verification: |
           1. Launch all-clusters-app on the raspi , get the Manual Pairing code from the log
 
diff --git a/src/app/tests/suites/certification/Test_TC_DD_2_1.yaml b/src/app/tests/suites/certification/Test_TC_DD_2_1.yaml
index 6c29605..be9a358 100644
--- a/src/app/tests/suites/certification/Test_TC_DD_2_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DD_2_1.yaml
@@ -50,13 +50,13 @@
       disabled: true
 
     - label: "TH does not respond to DUT and DUT keeps sending ADVs"
-      PICS: MCORE.DD.BLE
+      PICS: MCORE.COM.BLE
       verification: |
           [5855][P][DIS]Advertise commission parameter vendorID=65521 productID=32773 discriminator=3840/15
       disabled: true
 
     - label: "TH does not respond to DUT and DUT keeps sending ADVs"
-      PICS: MCORE.DD.BLE
+      PICS: MCORE.COM.BLE
       verification: |
           This step can be verified using a BLE discovery tool of choice.
           Try NRF Connect app (https://www.nordicsemi.com/Products/Development-tools/nrf-connect-for-desktop)
@@ -65,7 +65,7 @@
       disabled: true
 
     - label: "TH does not respond to DUT and DUT keeps sending ADVs"
-      PICS: MCORE.DD.BLE
+      PICS: MCORE.COM.BLE
       verification: |
           This step can be verified using  BLE discovery tool of choice (Try NRF Connect OR HCIDump)
           ->For T0 and 30s we have to get advertisement range between 20ms to 60ms
@@ -95,7 +95,7 @@
       disabled: true
 
     - label: "TH does not respond to DUT. User power cycles the DUT"
-      PICS: MCORE.DD.BLE
+      PICS: MCORE.COM.BLE
       verification: |
           sudo reboot
       disabled: true
@@ -103,7 +103,7 @@
     - label:
           "TH does not respond to DUT and DUT keeps sending ADVs. TH waits at
           least 15 minutes"
-      PICS: MCORE.DD.BLE
+      PICS: MCORE.COM.BLE
       verification: |
           Check timestamp, ADV stop after 15 mins
 
@@ -112,7 +112,7 @@
       disabled: true
 
     - label: "TH scans and finds the DUT SSID"
-      PICS: MCORE.DD.WIFI
+      PICS: MCORE.COM.WIFI
       verification: |
           Out of Scope for V1.0
           SoftAP commissioning not currently supported on TH=chip-tool
@@ -122,7 +122,7 @@
           "TH scans and finds the DUT SSID TH sends to DUT a 1st power cycle
           command (or reset manually) TH sends to DUT a 2nd power cycle command
           (or reset manually)"
-      PICS: MCORE.DD.WIFI
+      PICS: MCORE.COM.WIFI
       verification: |
           Out of Scope for V1.0
           SoftAP commissioning not currently supported on TH=chip-tool
diff --git a/src/app/tests/suites/certification/Test_TC_DD_3_1.yaml b/src/app/tests/suites/certification/Test_TC_DD_3_1.yaml
index 7e8d68c..7d21c82 100644
--- a/src/app/tests/suites/certification/Test_TC_DD_3_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DD_3_1.yaml
@@ -378,8 +378,8 @@
           CHIP:CTL: Commissioning stage next step: "SendNOC" -> "FindOperational"
           [1653471976.344532][30157:30162] CHIP:CTL: Performing next commissioning step "FindOperational"
           [1653471976.344586][30157:30162] CHIP:CSM: FindOrEstablishSession: PeerId = CCCB8A2597E4538B:0000000000000001
-          [1653471976.344642][30157:30162] CHIP:CSM: FindOrEstablishSession: No existing OperationalSessionSetup instance found
-          [1653471976.344715][30157:30162] CHIP:CTL: OperationalSessionSetup[CCCB8A2597E4538B:0000000000000001]: State change 1 --> 2
+          [1653471976.344642][30157:30162] CHIP:CSM: FindOrEstablishSession: No existing OperationalDeviceProxy instance found
+          [1653471976.344715][30157:30162] CHIP:CTL: OperationalDeviceProxy[CCCB8A2597E4538B:0000000000000001]: State change 1 --> 2
           [1653471976.344783][30157:30162] CHIP:DIS: Resolving CCCB8A2597E4538B:0000000000000001 ...
           [1653471976.346864][30157:30162] CHIP:DIS: Operational node lookup already in progress. Will NOT start a new one.
           [1653471976.347000][30157:30162] CHIP:DMG: ICR moving to [AwaitingDe]
diff --git a/src/app/tests/suites/certification/Test_TC_DD_3_10.yaml b/src/app/tests/suites/certification/Test_TC_DD_3_10.yaml
index ec7d566..fd3cd61 100644
--- a/src/app/tests/suites/certification/Test_TC_DD_3_10.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DD_3_10.yaml
@@ -50,6 +50,7 @@
     - label:
           "DUT fetches commissioning data from DCL using VID and PID from
           Onboarding Payload"
+      PICS: MCORE.DD.FETCH_DCL
       verification: |
           1. Observe the TH"s DCL on the DUT
       disabled: true
@@ -58,6 +59,7 @@
           "Using the instructions located at the CommissioningCustomFlowURL from
           the DCL, DUT guides the user in next steps to prepare the commissionee
           (TH) for commissioning"
+      PICS: MCORE.DD.FETCH_DCL
       verification: |
           1. Follow instructions for commissioning using the URL contained in the DCL
       disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_DD_3_17.yaml b/src/app/tests/suites/certification/Test_TC_DD_3_17.yaml
index 09c3b4a..3673030 100644
--- a/src/app/tests/suites/certification/Test_TC_DD_3_17.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DD_3_17.yaml
@@ -240,7 +240,10 @@
           "Provide each of the Manual Pairing Codes, generated in the previous
           step, to the DUT in any format supported by the DUT"
       verification: |
-          (0xFFF1)
+          1. Run each of the following DUT commands below containing invalid Vendor IDs.
+          2. Verify that the TH commissionee=all-cluserters-app does not get commissioned -or- the DUT make the user fully aware of the security risks of providing an uncertified device with operational and networking credentials
+
+           (0xFFF1)
            $  ./chip-tool pairing code 1 749701123365521327694
 
            (0xFFF2)
diff --git a/src/app/tests/suites/certification/Test_TC_DD_3_5.yaml b/src/app/tests/suites/certification/Test_TC_DD_3_5.yaml
index 3b325e8..92c0210 100644
--- a/src/app/tests/suites/certification/Test_TC_DD_3_5.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DD_3_5.yaml
@@ -275,8 +275,8 @@
           Commissioning stage next step: "WiFiNetworkEnable" -> "FindOperational"
           [1653471976.344532][30157:30162] CHIP:CTL: Performing next commissioning step "FindOperational"
           [1653471976.344586][30157:30162] CHIP:CSM: FindOrEstablishSession: PeerId = CCCB8A2597E4538B:0000000000000001
-          [1653471976.344642][30157:30162] CHIP:CSM: FindOrEstablishSession: No existing OperationalSessionSetup instance found
-          [1653471976.344715][30157:30162] CHIP:CTL: OperationalSessionSetup[CCCB8A2597E4538B:0000000000000001]: State change 1 --> 2
+          [1653471976.344642][30157:30162] CHIP:CSM: FindOrEstablishSession: No existing OperationalDeviceProxy instance found
+          [1653471976.344715][30157:30162] CHIP:CTL: OperationalDeviceProxy[CCCB8A2597E4538B:0000000000000001]: State change 1 --> 2
           [1653471976.344783][30157:30162] CHIP:DIS: Resolving CCCB8A2597E4538B:0000000000000001 ...
           [1653471976.346864][30157:30162] CHIP:DIS: Operational node lookup already in progress. Will NOT start a new one.
           [1653471976.347000][30157:30162] CHIP:DMG: ICR moving to [AwaitingDe]
diff --git a/src/app/tests/suites/certification/Test_TC_DD_3_7.yaml b/src/app/tests/suites/certification/Test_TC_DD_3_7.yaml
index 68eaf6b..cbf22f8 100644
--- a/src/app/tests/suites/certification/Test_TC_DD_3_7.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DD_3_7.yaml
@@ -419,7 +419,7 @@
 
           CHIP:CTL: Performing next commissioning step "FindOperational"
           CHIP:CSM: FindOrEstablishSession: PeerId = BFCBED670D527591:000000000001B669
-          CHIP:CSM: FindOrEstablishSession: No existing OperationalSessionSetup instance found
+          CHIP:CSM: FindOrEstablishSession: No existing OperationalDeviceProxy instance found
       disabled: true
 
     - label: "Reboot TH"
@@ -446,7 +446,7 @@
 
           CHIP:CTL: Performing next commissioning step "FindOperational"
           CHIP:CSM: FindOrEstablishSession: PeerId = BFCBED670D527591:000000000001B669
-          CHIP:CSM: FindOrEstablishSession: No existing OperationalSessionSetup instance found
+          CHIP:CSM: FindOrEstablishSession: No existing OperationalDeviceProxy instance found
       disabled: true
 
     - label: "Commissioner starts discovery of TH using Operational Discovery"
diff --git a/src/app/tests/suites/certification/Test_TC_LVL_2_3.yaml b/src/app/tests/suites/certification/Test_TC_LVL_2_3.yaml
index 5e11664..d8e61b7 100644
--- a/src/app/tests/suites/certification/Test_TC_LVL_2_3.yaml
+++ b/src/app/tests/suites/certification/Test_TC_LVL_2_3.yaml
@@ -32,8 +32,10 @@
           "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 levelcontrol read current-level 1 1
-          Verify in TH all-clusters-app
+          Verify DUT receives  current-level attribute response on the TH(all-clusters-app) Log:
           [1657279115.433005][4417:4417] CHIP:IM: Received Read request
           [1657279115.433184][4417:4417] CHIP:DMG: ReadRequestMessage =
           [1657279115.433258][4417:4417] CHIP:DMG: {
@@ -54,7 +56,7 @@
 
 
           ./chip-tool levelcontrol read on-level 1 1
-          Verify in TH all-clusters-app
+          verify On TH(all-clusters-app) receives the right Read Request Message for the data sent in the above command
           [1657279142.246433][4417:4417] CHIP:IM: Received Read request
           [1657279142.246605][4417:4417] CHIP:DMG: ReadRequestMessage =
           [1657279142.246670][4417:4417] CHIP:DMG: {
@@ -75,7 +77,7 @@
 
 
           ./chip-tool levelcontrol read options 1 1
-          Verify in TH all-clusters-app
+          Verify DUT receives  options attribute response on the TH(all-clusters-app) Log:
           [1657279166.425514][4417:4417] CHIP:IM: Received Read request
           [1657279166.425770][4417:4417] CHIP:DMG: ReadRequestMessage =
           [1657279166.425842][4417:4417] CHIP:DMG: {
@@ -99,8 +101,10 @@
           "DUT reads all supported optional 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 levelcontrol read remaining-time 1 1
-          Verify in TH all-clusters-app
+          Verify DUT receives  remaining-time  attribute response on the TH(all-clusters-app) Log:
           1657913316.919773][3126:3126] CHIP:IM: Received Read request
           [1657913316.919880][3126:3126] CHIP:DMG: ReadRequestMessage =
           [1657913316.919920][3126:3126] CHIP:DMG: {
@@ -121,7 +125,7 @@
 
 
           ./chip-tool levelcontrol read min-level 1 1
-          Verify in TH all-clusters-app
+          Verify DUT receives  min-level   attribute response on the TH(all-clusters-app) Log:
           [1657913332.319502][3126:3126] CHIP:IM: Received Read request
           [1657913332.319628][3126:3126] CHIP:DMG: ReadRequestMessage =
           [1657913332.319675][3126:3126] CHIP:DMG: {
@@ -142,7 +146,7 @@
 
 
           ./chip-tool levelcontrol read max-level 1 1
-          Verify in TH all-clusters-app
+          Verify DUT receives  max-level   attribute response on the TH(all-clusters-app) Log:
           [1657913350.880504][3126:3126] CHIP:IM: Received Read request
           [1657913350.880648][3126:3126] CHIP:DMG: ReadRequestMessage =
           [1657913350.880703][3126:3126] CHIP:DMG: {
@@ -163,7 +167,7 @@
 
 
           ./chip-tool levelcontrol read current-frequency 1 1
-          Verify in TH all-clusters-app
+          Verify DUT receives current-frequency  attribute response on the TH(all-clusters-app) Log:
           [1657913381.091563][3126:3126] CHIP:IM: Received Read request
           [1657913381.091690][3126:3126] CHIP:DMG: ReadRequestMessage =
           [1657913381.091738][3126:3126] CHIP:DMG: {
@@ -184,7 +188,7 @@
 
 
           ./chip-tool levelcontrol read min-frequency 1 1
-          Verify in TH all-clusters-app
+          Verify DUT receives min-frequency  attribute response on the TH(all-clusters-app) Log:
           [1657913397.410411][3126:3126] CHIP:IM: Received Read request
           [1657913397.410539][3126:3126] CHIP:DMG: ReadRequestMessage =
           [1657913397.410588][3126:3126] CHIP:DMG: {
@@ -205,7 +209,7 @@
 
 
           ./chip-tool levelcontrol read max-frequency 1 1
-          Verify in TH all-clusters-app
+          Verify DUT receives max-frequency  attribute response on the TH(all-clusters-app) Log:
           [1657913412.416960][3126:3126] CHIP:IM: Received Read request
           [1657913412.417086][3126:3126] CHIP:DMG: ReadRequestMessage =
           [1657913412.417134][3126:3126] CHIP:DMG: {
@@ -226,7 +230,7 @@
 
 
           ./chip-tool levelcontrol read on-off-transition-time 1 1
-          Verify in TH all-clusters-app
+          Verify DUT receives on-off-transition-time  attribute response on the TH(all-clusters-app) Log:
           [1657913438.117302][3126:3126] CHIP:IM: Received Read request
           [1657913438.117462][3126:3126] CHIP:DMG: ReadRequestMessage =
           [1657913438.117526][3126:3126] CHIP:DMG: {
@@ -247,7 +251,7 @@
 
 
           ./chip-tool levelcontrol read on-transition-time 1 1
-          Verify in TH all-clusters-app
+          Verify DUT receives on-transition-time  attribute response on the TH(all-clusters-app) Log:
           [1657913454.127158][3126:3126] CHIP:IM: Received Read request
           [1657913454.127241][3126:3126] CHIP:DMG: ReadRequestMessage =
           [1657913454.127268][3126:3126] CHIP:DMG: {
@@ -262,13 +266,13 @@
           [1657913454.127556][3126:3126] CHIP:DMG:
           [1657913454.127582][3126:3126] CHIP:DMG:        ],
           [1657913454.127610][3126:3126] CHIP:DMG:
-          [1657913454.127636][3126:3126] CHIP:DMG:        isFabricFiltered = true,
+          [1657913Verify in DUT as client side: 454.127636][3126:3126] CHIP:DMG:        isFabricFiltered = true,
           [1657913454.127661][3126:3126] CHIP:DMG:        InteractionModelRevision = 1
           [1657913454.127685][3126:3126] CHIP:DMG: },
 
 
           ./chip-tool levelcontrol read off-transition-time 1 1
-          Verify in TH all-clusters-app
+          Verify DUT receives off-transition-time  attribute response on the TH(all-clusters-app) Log:
           [1657913518.488375][3126:3126] CHIP:IM: Received Read request
           [1657913518.488457][3126:3126] CHIP:DMG: ReadRequestMessage =
           [1657913518.488486][3126:3126] CHIP:DMG: {
@@ -289,7 +293,7 @@
 
 
           ./chip-tool levelcontrol read default-move-rate 1 1
-          Verify in TH all-clusters-app
+          Verify DUT receives default-move-rate  attribute response on the TH(all-clusters-app) Log:
           [1657913537.304689][3126:3126] CHIP:IM: Received Read request
           [1657913537.304828][3126:3126] CHIP:DMG: ReadRequestMessage =
           [1657913537.304884][3126:3126] CHIP:DMG: {
@@ -310,7 +314,7 @@
 
 
           ./chip-tool levelcontrol read start-up-current-level 1 1
-          Verify in TH all-clusters-app
+          Verify DUT receives start-up-current-level   attribute response on the TH(all-clusters-app) Log:
           [1657913554.968190][3126:3126] CHIP:IM: Received Read request
           [1657913554.968312][3126:3126] CHIP:DMG: ReadRequestMessage =
           [1657913554.968343][3126:3126] CHIP:DMG: {
@@ -334,8 +338,10 @@
           "DUT writes a suitable value to all supported mandatory attributes on
           the TH one at a time in a manufacturer specific order"
       verification: |
-          ./chip-tool levelcontrol write on-level 5 (replace with your value) 123123 1
-          Verify in TH all-clusters-app
+          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 write on-level 5 (replace with your value) 1 1
+          Verify DUT receives on-level attribute write response on the TH(all-clusters-app) Log:
           [1657913667.893875][3126:3126] CHIP:DMG: WriteRequestMessage =
           [1657913667.893923][3126:3126] CHIP:DMG: {
           [1657913667.893965][3126:3126] CHIP:DMG:        suppressResponse = false,
@@ -365,8 +371,10 @@
           "DUT writes a suitable value to all supported optional 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 levelcontrol write on-off-transition-time 5 (replace with your own value) 123123 1
-          Verify in TH all-clusters-app
+          Verify DUT receives on-off-transition-time attribute write response on the TH(all-clusters-app) Log:
           [1657913716.044424][3126:3126] CHIP:DMG: WriteRequestMessage =
           [1657913716.044478][3126:3126] CHIP:DMG: {
           [1657913716.044527][3126:3126] CHIP:DMG:        suppressResponse = false,
@@ -393,7 +401,7 @@
 
 
           ./chip-tool levelcontrol write on-transition-time 5 (replace with your value) 1 1
-          Verify in TH all-clusters-app
+          Verify DUT receives on-transition-time attribute write response on the TH(all-clusters-app) Log:
           [1657913743.728014][3126:3126] CHIP:DMG: WriteRequestMessage =
           [1657913743.728046][3126:3126] CHIP:DMG: {
           [1657913743.728145][3126:3126] CHIP:DMG:        suppressResponse = false,
@@ -420,7 +428,7 @@
 
 
           ./chip-tool levelcontrol write off-transition-time 5 1 1
-          Verify in TH all-clusters-app
+          Verify DUT receives off-transition-time attribute write response on the TH(all-clusters-app) Log:
 
           [1657913763.836957][3126:3126] CHIP:DMG: WriteRequestMessage =
           [1657913763.837010][3126:3126] CHIP:DMG: {
@@ -448,7 +456,7 @@
 
 
           ./chip-tool levelcontrol write default-move-rate 5 1 1
-          Verify in TH all-clusters-app
+          Verify DUT receives default-move-rate attribute write response on the TH(all-clusters-app) Log:
           [1657913781.895720][3126:3126] CHIP:DMG: WriteRequestMessage =
           [1657913781.895799][3126:3126] CHIP:DMG: {
           [1657913781.895824][3126:3126] CHIP:DMG:        suppressResponse = false,
@@ -475,7 +483,7 @@
 
 
           ./chip-tool levelcontrol write start-up-current-level 5 (replace with your value) 123123 1
-          Verify in TH all-clusters-app
+          Verify DUT receives start-up-current-level attribute write response on the TH(all-clusters-app) Log:
           [1657913811.290764][3126:3126] CHIP:DMG: WriteRequestMessage =
           [1657913811.290809][3126:3126] CHIP:DMG: {
           [1657913811.290850][3126:3126] CHIP:DMG:        suppressResponse = false,
@@ -507,8 +515,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 levelcontrol read current-level 1 1
-          Verify in TH all-clusters-app
+          Verify DUT receives  current-level attribute response on the TH(all-clusters-minimal-app) Log:
           [1657913862.815749][3126:3126] CHIP:IM: Received Read request
           [1657913862.815884][3126:3126] CHIP:DMG: ReadRequestMessage =
           [1657913862.815935][3126:3126] CHIP:DMG: {
@@ -529,7 +539,7 @@
 
 
           ./chip-tool levelcontrol read on-level 1 1
-          Verify in TH all-clusters-app
+          Verify DUT receives  on-level attribute response on the TH(all-clusters-minimal-app) Log:
           [1657913877.850398][3126:3126] CHIP:IM: Received Read request
           [1657913877.850525][3126:3126] CHIP:DMG: ReadRequestMessage =
           [1657913877.850574][3126:3126] CHIP:DMG: {
@@ -551,7 +561,7 @@
 
 
           ./chip-tool levelcontrol read options 1 1
-          Verify in TH all-clusters-app
+          Verify DUT receives  options attribute response on the TH(all-clusters-minimal-app) Log:
           [1657913895.195563][3126:3126] CHIP:IM: Received Read request
           [1657913895.195705][3126:3126] CHIP:DMG: ReadRequestMessage =
           [1657913895.195732][3126:3126] CHIP:DMG: {
@@ -572,7 +582,7 @@
 
 
           ./chip-tool levelcontrol read attribute-list 1 1
-          Verify in TH all-clusters-app
+          Verify DUT receives   attribute-list attribute response on the TH(all-clusters-minimal-app) Log:
           [1657913906.648918][3126:3126] CHIP:IM: Received Read request
           [1657913906.649061][3126:3126] CHIP:DMG: ReadRequestMessage =
           [1657913906.649115][3126:3126] CHIP:DMG: {
@@ -596,288 +606,36 @@
           "DUT reads all supported optional attributes from TH one at a time in
           a manufacturer specific order"
       verification: |
-          ./chip-tool levelcontrol read remaining-time 1 1
-          Verify in TH all-clusters-app
+          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)
 
-          [1657913955.033202][3126:3126] CHIP:IM: Received Read request
-          [1657913955.033289][3126:3126] CHIP:DMG: ReadRequestMessage =
-          [1657913955.033319][3126:3126] CHIP:DMG: {
-          [1657913955.033345][3126:3126] CHIP:DMG:        AttributePathIBs =
-          [1657913955.033377][3126:3126] CHIP:DMG:        [
-          [1657913955.033404][3126:3126] CHIP:DMG:                AttributePathIB =
-          [1657913955.033436][3126:3126] CHIP:DMG:                {
-          [1657913955.033470][3126:3126] CHIP:DMG:                        Endpoint = 0x1,
-          [1657913955.033506][3126:3126] CHIP:DMG:                        Cluster = 0x8,
-          [1657913955.033540][3126:3126] CHIP:DMG:                        Attribute = 0x0000_0001,
-          [1657913955.033577][3126:3126] CHIP:DMG:                }
-          [1657913955.033611][3126:3126] CHIP:DMG:
-          [1657913955.033642][3126:3126] CHIP:DMG:        ],
-          [1657913955.033675][3126:3126] CHIP:DMG:
-          [1657913955.033706][3126:3126] CHIP:DMG:        isFabricFiltered = true,
-          [1657913955.033737][3126:3126] CHIP:DMG:        InteractionModelRevision = 1
-          [1657913955.033764][3126:3126] CHIP:DMG: },
-
+          TH all-clusters-minimal-app does not support optional attributes
+          To verify this behaviour send the below mentioned commands and check the result as unsupported attribute
+           ./chip-tool levelcontrol read remaining-time 1 1
 
            ./chip-tool levelcontrol read min-level 1 1
-          Verify in TH all-clusters-app
-
-          [1657914034.938109][3245:3245] CHIP:DMG: ReadRequestMessage =
-          [1657914034.938157][3245:3245] CHIP:DMG: {
-          [1657914034.938197][3245:3245] CHIP:DMG:        AttributePathIBs =
-          [1657914034.938245][3245:3245] CHIP:DMG:        [
-          [1657914034.938351][3245:3245] CHIP:DMG:                AttributePathIB =
-          [1657914034.938417][3245:3245] CHIP:DMG:                {
-          [1657914034.938467][3245:3245] CHIP:DMG:                        Endpoint = 0x1,
-          [1657914034.938523][3245:3245] CHIP:DMG:                        Cluster = 0x8,
-          [1657914034.938582][3245:3245] CHIP:DMG:                        Attribute = 0x0000_0002,
-          [1657914034.938637][3245:3245] CHIP:DMG:                }
-          [1657914034.938741][3245:3245] CHIP:DMG:
-          [1657914034.938789][3245:3245] CHIP:DMG:        ],
-          [1657914034.938841][3245:3245] CHIP:DMG:
-          [1657914034.938889][3245:3245] CHIP:DMG:        isFabricFiltered = true,
-          [1657914034.938980][3245:3245] CHIP:DMG:        InteractionModelRevision = 1
-          [1657914034.939024][3245:3245] CHIP:DMG: },
-
 
            ./chip-tool levelcontrol read max-level 1 1
-          Verify in TH all-clusters-app
-
-          [1657914049.937379][3245:3245] CHIP:IM: Received Read request
-          [1657914049.937458][3245:3245] CHIP:DMG: ReadRequestMessage =
-          [1657914049.937487][3245:3245] CHIP:DMG: {
-          [1657914049.937526][3245:3245] CHIP:DMG:        AttributePathIBs =
-          [1657914049.937555][3245:3245] CHIP:DMG:        [
-          [1657914049.937579][3245:3245] CHIP:DMG:                AttributePathIB =
-          [1657914049.937607][3245:3245] CHIP:DMG:                {
-          [1657914049.937659][3245:3245] CHIP:DMG:                        Endpoint = 0x1,
-          [1657914049.937693][3245:3245] CHIP:DMG:                        Cluster = 0x8,
-          [1657914049.937725][3245:3245] CHIP:DMG:                        Attribute = 0x0000_0003,
-          [1657914049.937758][3245:3245] CHIP:DMG:                }
-          [1657914049.937787][3245:3245] CHIP:DMG:
-          [1657914049.937809][3245:3245] CHIP:DMG:        ],
-          [1657914049.937833][3245:3245] CHIP:DMG:
-          [1657914049.937855][3245:3245] CHIP:DMG:        isFabricFiltered = true,
-          [1657914049.937891][3245:3245] CHIP:DMG:        InteractionModelRevision = 1
-          [1657914049.937916][3245:3245] CHIP:DMG: },
-
 
           ./chip-tool levelcontrol read current-frequency 1 1
-          Verify in TH all-clusters-app
-          [1657914066.583478][3245:3245] CHIP:DMG: ReadRequestMessage =
-          [1657914066.583530][3245:3245] CHIP:DMG: {
-          [1657914066.583568][3245:3245] CHIP:DMG:        AttributePathIBs =
-          [1657914066.583610][3245:3245] CHIP:DMG:        [
-          [1657914066.583649][3245:3245] CHIP:DMG:                AttributePathIB =
-          [1657914066.583693][3245:3245] CHIP:DMG:                {
-          [1657914066.583759][3245:3245] CHIP:DMG:                        Endpoint = 0x1,
-          [1657914066.583810][3245:3245] CHIP:DMG:                        Cluster = 0x8,
-          [1657914066.583860][3245:3245] CHIP:DMG:                        Attribute = 0x0000_0004,
-          [1657914066.583920][3245:3245] CHIP:DMG:                }
-          [1657914066.583967][3245:3245] CHIP:DMG:
-          [1657914066.584008][3245:3245] CHIP:DMG:        ],
-          [1657914066.584110][3245:3245] CHIP:DMG:
-          [1657914066.584157][3245:3245] CHIP:DMG:        isFabricFiltered = true,
-          [1657914066.584198][3245:3245] CHIP:DMG:        InteractionModelRevision = 1
-          [1657914066.584235][3245:3245] CHIP:DMG: },
-
 
           ./chip-tool levelcontrol read min-frequency 1 1
-          Verify in TH all-clusters-app
-          [1657914086.207991][3245:3245] CHIP:IM: Received Read request
-          [1657914086.208155][3245:3245] CHIP:DMG: ReadRequestMessage =
-          [1657914086.208207][3245:3245] CHIP:DMG: {
-          [1657914086.208264][3245:3245] CHIP:DMG:        AttributePathIBs =
-          [1657914086.208313][3245:3245] CHIP:DMG:        [
-          [1657914086.208357][3245:3245] CHIP:DMG:                AttributePathIB =
-          [1657914086.208400][3245:3245] CHIP:DMG:                {
-          [1657914086.208468][3245:3245] CHIP:DMG:                        Endpoint = 0x1,
-          [1657914086.208533][3245:3245] CHIP:DMG:                        Cluster = 0x8,
-          [1657914086.208606][3245:3245] CHIP:DMG:                        Attribute = 0x0000_0005,
-          [1657914086.208659][3245:3245] CHIP:DMG:                }
-          [1657914086.208709][3245:3245] CHIP:DMG:
-          [1657914086.208774][3245:3245] CHIP:DMG:        ],
-          [1657914086.208827][3245:3245] CHIP:DMG:
-          [1657914086.208874][3245:3245] CHIP:DMG:        isFabricFiltered = true,
-          [1657914086.208935][3245:3245] CHIP:DMG:        InteractionModelRevision = 1
-          [1657914086.208980][3245:3245] CHIP:DMG: },
-
 
            ./chip-tool levelcontrol read max-frequency 1 1
-          Verify in TH all-clusters-app
-          [1657914105.798625][3245:3245] CHIP:IM: Received Read request
-          [1657914105.798770][3245:3245] CHIP:DMG: ReadRequestMessage =
-          [1657914105.798846][3245:3245] CHIP:DMG: {
-          [1657914105.798896][3245:3245] CHIP:DMG:        AttributePathIBs =
-          [1657914105.798943][3245:3245] CHIP:DMG:        [
-          [1657914105.798993][3245:3245] CHIP:DMG:                AttributePathIB =
-          [1657914105.799117][3245:3245] CHIP:DMG:                {
-          [1657914105.799190][3245:3245] CHIP:DMG:                        Endpoint = 0x1,
-          [1657914105.799303][3245:3245] CHIP:DMG:                        Cluster = 0x8,
-          [1657914105.799406][3245:3245] CHIP:DMG:                        Attribute = 0x0000_0006,
-          [1657914105.799520][3245:3245] CHIP:DMG:                }
-          [1657914105.799586][3245:3245] CHIP:DMG:
-          [1657914105.799643][3245:3245] CHIP:DMG:        ],
-          [1657914105.799722][3245:3245] CHIP:DMG:
-          [1657914105.799777][3245:3245] CHIP:DMG:        isFabricFiltered = true,
-          [1657914105.799809][3245:3245] CHIP:DMG:        InteractionModelRevision = 1
-          [1657914105.799842][3245:3245] CHIP:DMG: },
 
           ./chip-tool levelcontrol read on-off-transition-time 1 1
-          Verify in TH all-clusters-app
-          [1657914125.515789][3245:3245] CHIP:IM: Received Read request
-          [1657914125.515917][3245:3245] CHIP:DMG: ReadRequestMessage =
-          [1657914125.515964][3245:3245] CHIP:DMG: {
-          [1657914125.516012][3245:3245] CHIP:DMG:        AttributePathIBs =
-          [1657914125.516097][3245:3245] CHIP:DMG:        [
-          [1657914125.516144][3245:3245] CHIP:DMG:                AttributePathIB =
-          [1657914125.516198][3245:3245] CHIP:DMG:                {
-          [1657914125.516248][3245:3245] CHIP:DMG:                        Endpoint = 0x1,
-          [1657914125.516307][3245:3245] CHIP:DMG:                        Cluster = 0x8,
-          [1657914125.516361][3245:3245] CHIP:DMG:                        Attribute = 0x0000_0010,
-          [1657914125.516420][3245:3245] CHIP:DMG:                }
-          [1657914125.516474][3245:3245] CHIP:DMG:
-          [1657914125.516521][3245:3245] CHIP:DMG:        ],
-          [1657914125.516572][3245:3245] CHIP:DMG:
-          [1657914125.516619][3245:3245] CHIP:DMG:        isFabricFiltered = true,
-          [1657914125.516665][3245:3245] CHIP:DMG:        InteractionModelRevision = 1
-          [1657914125.516707][3245:3245] 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: |
-          ./chip-tool levelcontrol write on-off-transition-time 5 1 1
-          Verify in TH all-clusters-app
+          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)
 
-          [1657914163.137445][3245:3245] CHIP:DMG: WriteRequestMessage =
-          [1657914163.137491][3245:3245] CHIP:DMG: {
-          [1657914163.137533][3245:3245] CHIP:DMG:        suppressResponse = false,
-          [1657914163.137581][3245:3245] CHIP:DMG:        timedRequest = false,
-          [1657914163.137626][3245:3245] CHIP:DMG:        AttributeDataIBs =
-          [1657914163.137679][3245:3245] CHIP:DMG:        [
-          [1657914163.137724][3245:3245] CHIP:DMG:                AttributeDataIB =
-          [1657914163.137774][3245:3245] CHIP:DMG:                {
-          [1657914163.137821][3245:3245] CHIP:DMG:                        AttributePathIB =
-          [1657914163.137883][3245:3245] CHIP:DMG:                        {
-          [1657914163.137940][3245:3245] CHIP:DMG:                                Endpoint = 0x1,
-          [1657914163.138000][3245:3245] CHIP:DMG:                                Cluster = 0x8,
-          [1657914163.138057][3245:3245] CHIP:DMG:                                Attribute = 0x0000_0010,
-          [1657914163.138115][3245:3245] CHIP:DMG:                        }
-          [1657914163.138176][3245:3245] CHIP:DMG:
-          [1657914163.138234][3245:3245] CHIP:DMG:                        Data = 5,
-          [1657914163.138291][3245:3245] CHIP:DMG:                },
-          [1657914163.138348][3245:3245] CHIP:DMG:
-          [1657914163.138391][3245:3245] CHIP:DMG:        ],
-          [1657914163.138443][3245:3245] CHIP:DMG:
-          [1657914163.138489][3245:3245] CHIP:DMG:        moreChunkedMessages = false,
-          [1657914163.138535][3245:3245] CHIP:DMG:        InteractionModelRevision = 1
-          [1657914163.138575][3245:3245] CHIP:DMG: },
-
-
+          TH all-clusters-minimal-app does not support optional attributes
+          To verify this behaviour send the below mentioned commands and check the result as unsupported attribute
+           ./chip-tool levelcontrol write on-off-transition-time 5 1 1
            ./chip-tool levelcontrol write on-transition-time 5 1 1
-          Verify in TH all-clusters-app
-
-          [1657914187.402168][3245:3245] CHIP:DMG: WriteRequestMessage =
-          [1657914187.402215][3245:3245] CHIP:DMG: {
-          [1657914187.402258][3245:3245] CHIP:DMG:        suppressResponse = false,
-          [1657914187.402306][3245:3245] CHIP:DMG:        timedRequest = false,
-          [1657914187.402357][3245:3245] CHIP:DMG:        AttributeDataIBs =
-          [1657914187.402406][3245:3245] CHIP:DMG:        [
-          [1657914187.402450][3245:3245] CHIP:DMG:                AttributeDataIB =
-          [1657914187.402504][3245:3245] CHIP:DMG:                {
-          [1657914187.402552][3245:3245] CHIP:DMG:                        AttributePathIB =
-          [1657914187.402608][3245:3245] CHIP:DMG:                        {
-          [1657914187.402667][3245:3245] CHIP:DMG:                                Endpoint = 0x1,
-          [1657914187.402729][3245:3245] CHIP:DMG:                                Cluster = 0x8,
-          [1657914187.402790][3245:3245] CHIP:DMG:                                Attribute = 0x0000_0012,
-          [1657914187.402846][3245:3245] CHIP:DMG:                        }
-          [1657914187.402905][3245:3245] CHIP:DMG:
-          [1657914187.402965][3245:3245] CHIP:DMG:                        Data = 5,
-          [1657914187.403017][3245:3245] CHIP:DMG:                },
-          [1657914187.403070][3245:3245] CHIP:DMG:
-          [1657914187.403114][3245:3245] CHIP:DMG:        ],
-          [1657914187.403167][3245:3245] CHIP:DMG:
-          [1657914187.403212][3245:3245] CHIP:DMG:        moreChunkedMessages = false,
-          [1657914187.403261][3245:3245] CHIP:DMG:        InteractionModelRevision = 1
-          [1657914187.403304][3245:3245] CHIP:DMG: },
-
-
            ./chip-tool levelcontrol write off-transition-time 5 1 1
-          [1657914206.148363][3245:3245] CHIP:DMG: WriteRequestMessage =
-          [1657914206.148411][3245:3245] CHIP:DMG: {
-          [1657914206.148452][3245:3245] CHIP:DMG:        suppressResponse = false,
-          [1657914206.148500][3245:3245] CHIP:DMG:        timedRequest = false,
-          [1657914206.148545][3245:3245] CHIP:DMG:        AttributeDataIBs =
-          [1657914206.148599][3245:3245] CHIP:DMG:        [
-          [1657914206.148643][3245:3245] CHIP:DMG:                AttributeDataIB =
-          [1657914206.148693][3245:3245] CHIP:DMG:                {
-          [1657914206.148740][3245:3245] CHIP:DMG:                        AttributePathIB =
-          [1657914206.148803][3245:3245] CHIP:DMG:                        {
-          [1657914206.148861][3245:3245] CHIP:DMG:                                Endpoint = 0x1,
-          [1657914206.148922][3245:3245] CHIP:DMG:                                Cluster = 0x8,
-          [1657914206.148983][3245:3245] CHIP:DMG:                                Attribute = 0x0000_0013,
-          [1657914206.149040][3245:3245] CHIP:DMG:                        }
-          [1657914206.149098][3245:3245] CHIP:DMG:
-          [1657914206.149156][3245:3245] CHIP:DMG:                        Data = 5,
-          [1657914206.149207][3245:3245] CHIP:DMG:                },
-          [1657914206.149260][3245:3245] CHIP:DMG:
-          [1657914206.149303][3245:3245] CHIP:DMG:        ],
-          [1657914206.149356][3245:3245] CHIP:DMG:
-          [1657914206.149400][3245:3245] CHIP:DMG:        moreChunkedMessages = false,
-          [1657914206.149447][3245:3245] CHIP:DMG:        InteractionModelRevision = 1
-          [1657914206.149489][3245:3245] CHIP:DMG: },
-
            ./chip-tool levelcontrol write default-move-rate 5 1 1
-          Verify in TH all-clusters-app
-
-          [1657914228.843788][3245:3245] CHIP:DMG: WriteRequestMessage =
-          [1657914228.843839][3245:3245] CHIP:DMG: {
-          [1657914228.843881][3245:3245] CHIP:DMG:        suppressResponse = false,
-          [1657914228.843929][3245:3245] CHIP:DMG:        timedRequest = false,
-          [1657914228.843974][3245:3245] CHIP:DMG:        AttributeDataIBs =
-          [1657914228.844028][3245:3245] CHIP:DMG:        [
-          [1657914228.844154][3245:3245] CHIP:DMG:                AttributeDataIB =
-          [1657914228.844215][3245:3245] CHIP:DMG:                {
-          [1657914228.844263][3245:3245] CHIP:DMG:                        AttributePathIB =
-          [1657914228.844319][3245:3245] CHIP:DMG:                        {
-          [1657914228.844383][3245:3245] CHIP:DMG:                                Endpoint = 0x1,
-          [1657914228.844446][3245:3245] CHIP:DMG:                                Cluster = 0x8,
-          [1657914228.844565][3245:3245] CHIP:DMG:                                Attribute = 0x0000_0014,
-          [1657914228.844625][3245:3245] CHIP:DMG:                        }
-          [1657914228.844686][3245:3245] CHIP:DMG:
-          [1657914228.844751][3245:3245] CHIP:DMG:                        Data = 5,
-          [1657914228.844858][3245:3245] CHIP:DMG:                },
-          [1657914228.844928][3245:3245] CHIP:DMG:
-          [1657914228.844975][3245:3245] CHIP:DMG:        ],
-          [1657914228.845028][3245:3245] CHIP:DMG:
-          [1657914228.845073][3245:3245] CHIP:DMG:        moreChunkedMessages = false,
-          [1657914228.845119][3245:3245] CHIP:DMG:        InteractionModelRevision = 1
-          [1657914228.845162][3245:3245] CHIP:DMG: },
-
-
            ./chip-tool levelcontrol write start-up-current-level 5 1 1
-          [1657914257.054344][3245:3245] CHIP:DMG: WriteRequestMessage =
-          [1657914257.054391][3245:3245] CHIP:DMG: {
-          [1657914257.054433][3245:3245] CHIP:DMG:        suppressResponse = false,
-          [1657914257.054482][3245:3245] CHIP:DMG:        timedRequest = false,
-          [1657914257.054527][3245:3245] CHIP:DMG:        AttributeDataIBs =
-          [1657914257.054582][3245:3245] CHIP:DMG:        [
-          [1657914257.054627][3245:3245] CHIP:DMG:                AttributeDataIB =
-          [1657914257.054688][3245:3245] CHIP:DMG:                {
-          [1657914257.054736][3245:3245] CHIP:DMG:                        AttributePathIB =
-          [1657914257.054794][3245:3245] CHIP:DMG:                        {
-          [1657914257.054851][3245:3245] CHIP:DMG:                                Endpoint = 0x1,
-          [1657914257.054913][3245:3245] CHIP:DMG:                                Cluster = 0x8,
-          [1657914257.054975][3245:3245] CHIP:DMG:                                Attribute = 0x0000_4000,
-          [1657914257.055037][3245:3245] CHIP:DMG:                        }
-          [1657914257.055097][3245:3245] CHIP:DMG:
-          [1657914257.055153][3245:3245] CHIP:DMG:                        Data = 5,
-          [1657914257.055204][3245:3245] CHIP:DMG:                },
-          [1657914257.055258][3245:3245] CHIP:DMG:
-          [1657914257.055302][3245:3245] CHIP:DMG:        ],
-          [1657914257.055355][3245:3245] CHIP:DMG:
-          [1657914257.055402][3245:3245] CHIP:DMG:        moreChunkedMessages = false,
-          [1657914257.055448][3245:3245] CHIP:DMG:        InteractionModelRevision = 1
-          [1657914257.055491][3245:3245] CHIP:DMG: },
       disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_LVL_7_1.yaml b/src/app/tests/suites/certification/Test_TC_LVL_7_1.yaml
index 02b907a..192c5a0 100644
--- a/src/app/tests/suites/certification/Test_TC_LVL_7_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_LVL_7_1.yaml
@@ -27,41 +27,82 @@
     endpoint: 0
 
 tests:
+    - label: "TH writes 0x00 to the Options attribute"
+      PICS: LVL.S.A000f
+      verification: |
+          ./chip-tool onoff on 1 1
+          On TH(chip-tool)  verify that DUT sends a success response
+          [1658731148.428641][2894:2899] CHIP:DMG:         InteractionModelRevision = 1
+          [1658731148.428665][2894:2899] CHIP:DMG: },
+          [1658731148.428723][2894:2899] CHIP:DMG: Received Command Response Status for Endpoint=1 Cluster=0x0000_0006 Command=0x0000_0001 Status=0x0
+          [1658731148.428766][2894:2899] CHIP:DMG: ICR moving to [AwaitingDe]
+          [1658731148.428828][2894:2899] CHIP:EM: Sending Standalone Ack for MessageCounter:77812182 on exchange 38946i
+      disabled: true
+
+    - label: "TH sends On command to DUT"
+      PICS: OO.S.C01.Rsp
+      verification: |
+          ./chip-tool levelcontrol write  options 0x00 1 1
+          On TH(chip-tool)  verify that DUT sends a success response
+          [1658732283.094610][3087:3092] CHIP:DMG: WriteResponseMessage =
+          [1658732283.094656][3087:3092] CHIP:DMG: {
+          [1658732283.094696][3087:3092] CHIP:DMG:         AttributeStatusIBs =
+          [1658732283.094863][3087:3092] CHIP:DMG:         [
+          [1658732283.094914][3087:3092] CHIP:DMG:                 AttributeStatusIB =
+          [1658732283.094965][3087:3092] CHIP:DMG:                 {
+          [1658732283.095012][3087:3092] CHIP:DMG:                         AttributePathIB =
+          [1658732283.095068][3087:3092] CHIP:DMG:                         {
+          [1658732283.095129][3087:3092] CHIP:DMG:                                 Endpoint = 0x1,
+          [1658732283.095197][3087:3092] CHIP:DMG:                                 Cluster = 0x8,
+          [1658732283.095259][3087:3092] CHIP:DMG:                                 Attribute = 0x0000_000F,
+          [1658732283.095322][3087:3092] CHIP:DMG:                         }
+          [1658732283.095385][3087:3092] CHIP:DMG:
+          [1658732283.095446][3087:3092] CHIP:DMG:                         StatusIB =
+          [1658732283.095505][3087:3092] CHIP:DMG:                         {
+          [1658732283.095564][3087:3092] CHIP:DMG:                                 status = 0x00 (SUCCESS),
+          [1658732283.095626][3087:3092] CHIP:DMG:                         },
+          [1658732283.095682][3087:3092] CHIP:DMG:
+          [1658732283.095731][3087:3092] CHIP:DMG:                 },
+          [1658732283.095786][3087:3092] CHIP:DMG:
+          [1658732283.095830][3087:3092] CHIP:DMG:         ],
+          [1658732283.095883][3087:3092] CHIP:DMG:
+          [1658732283.095927][3087:3092] CHIP:DMG:         InteractionModelRevision = 1
+          [1658732283.095970][3087:3092] CHIP:DMG: }
+      disabled: true
+
     - label: "TH reads the MinLevel attribute from the DUT"
       PICS: LVL.S.A0002
       verification: |
-          Verify in TH Log
+          ./chip-tool levelcontrol read min-level 1 1
 
-           ./chip-tool levelcontrol read min-level 1 1
-
-          [1654065563.003862][10039:10044] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0008 Attribute 0x0000_0002 DataVersion: 540248549
-          [1654065563.003916][10039:10044] CHIP:TOO:   MinLevel: 0
-          [1654065563.003992][10039:10044] CHIP:EM: Sending Standalone Ack for MessageCounter:10228121 on exchange 38337i
+          On TH, Record the MinLevel attribute value for usage in later steps
+          [1658919507.800574][3717:3722] CHIP:DMG: }
+          [1658919507.800774][3717:3722] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0008 Attribute 0x0000_0002 DataVersion: 3233313015
+          [1658919507.800931][3717:3722] CHIP:TOO:   min level: 1
+          [1658919507.801058][3717:3722] CHIP:EM: Sending Standalone Ack for MessageCounter:165803473 on exchange 38651i
       disabled: true
 
     - label: "TH reads the MaxLevel attribute from the DUT"
       PICS: LVL.S.A0003
       verification: |
-          Verify in TH Log
-
           ./chip-tool levelcontrol read max-level 1 1
+          On TH(chip-tool)  Record the MaxLevel attribute value for usage in later steps
 
 
           [1654065684.869569][10048:10053] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0008 Attribute 0x0000_0003 DataVersion: 540248549
-          [1654065684.869621][10048:10053] CHIP:TOO:   MaxLevel: 254
+          [1654065684.869621][10048:10053] CHIP:TOO:   max level: 254
           [1654065684.869737][10048:10053] CHIP:EM: Sending Standalone Ack for MessageCounter:9018536 on exchange 12814i
       disabled: true
 
     - label:
-          "TH sends a MoveToLevelWithOnOff command to DUT, with the Level field
-          set to a value between the MinLevel and MaxLevel values (if present,
-          otherwise between 0x01 and 0xFE) and the TransitionTime field set to
-          0x0000 (move immediately)."
-      PICS: LVL.S.C04.Rsp
+          "TH sends a MoveToLevel command to DUT, with the Level field set to a
+          value between the MinLevel and MaxLevel values (if present, otherwise
+          between 0x01 and 0xFE) and the TransitionTime field set to 0x0000
+          (move immediately)."
+      PICS: LVL.S.C00.Rsp
       verification: |
-          Verify in TH Log
-
-          ./chip-tool levelcontrol move-to-level-with-on-off  253 0 1 1
+          ./chip-tool levelcontrol move-to-level  253 0 0 0 1 1
+          On TH(chip-tool) verify that DUT sends a success response
 
           [1654065833.084144][10181:10186] CHIP:DMG: InvokeResponseMessage =
           [1654065833.084161][10181:10186] CHIP:DMG: {
@@ -96,25 +137,21 @@
       disabled: true
 
     - label: "TH reads CurrentLevel attribute from DUT"
-      PICS: LVL.S.C04.Rsp && LVL.S.A0000
+      PICS: LVL.S.C00.Rsp && LVL.S.A0000
       verification: |
-          Verify in TH Log
-
           ./chip-tool levelcontrol read current-level 1 1
+          On TH(chip-tool) verify that the CurrentLevel attribute has the value given in 1c
 
           [1654065859.401140][10188:10193] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0008 Attribute 0x0000_0000 DataVersion: 540248551
-          [1654065859.401197][10188:10193] CHIP:TOO:   CurrentLevel: 253
+          [1654065859.401197][10188:10193] CHIP:TOO:   current level: 253
           [1654065859.401268][10188:10193] CHIP:EM: Sending Standalone Ack for MessageCounter:2942065 on exchange 21982i
       disabled: true
 
     - label: "TH reads the CurrentFrequency attribute."
       PICS: LVL.S.A0004
       verification: |
-          Verify in TH Log
-
-
           ./chip-tool levelcontrol read current-frequency 1 1
-
+          On TH(chip-tool) verify the CurrentFrequency attribute value
           [1654065889.927185][10196:10201] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0008 Attribute 0x0000_0004 DataVersion: 540248551
           [1654065889.927213][10196:10201] CHIP:TOO:   current frequency: 0
           [1654065889.927247][10196:10201] CHIP:EM: Sending Standalone Ack for MessageCounter:9499985 on exchange 53579i
@@ -123,9 +160,8 @@
     - label: "TH reads the MinFrequency attribute."
       PICS: LVL.S.A0005
       verification: |
-          Verify in TH Log
-
-           ./chip-tool levelcontrol read min-frequency 1 1
+          ./chip-tool levelcontrol read min-frequency 1 1
+          On TH(chip-tool) verify the MinFrequency attribute value
 
           [1654066011.412756][10228:10233] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0008 Attribute 0x0000_0005 DataVersion: 540248551
           [1654066011.412814][10228:10233] CHIP:TOO:   min frequency: 0
@@ -135,9 +171,8 @@
     - label: "TH reads the MaxFrequency attribute."
       PICS: LVL.S.A0006
       verification: |
-          Verify in TH Log
-
-           ./chip-tool levelcontrol read max-frequency 1 1
+          ./chip-tool levelcontrol read max-frequency 1 1
+          On TH(chip-tool) verify the MaxFrequency attribute value
 
           [1654066035.586373][10241:10246] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0008 Attribute 0x0000_0006 DataVersion: 540248551
           [1654066035.586435][10241:10246] CHIP:TOO:   max frequency: 0
@@ -150,9 +185,7 @@
           fmax"
       PICS: LVL.S.C08.Rsp
       verification: |
-          Optional command based on Feature support
-
-          Frequency feature for level control cluster is not supporting in chip-tool
+          Frequency feature is Optional & is not verifiable at this moment. Please skip this step
       disabled: true
 
     - label: "TH reads the CurrentFrequency attribute."
@@ -167,8 +200,6 @@
       PICS: LVL.S.C08.Rsp
       verification: |
           Optional command based on Feature support
-
-          Frequency feature for level control cluster is not supporting in chip-tool
       disabled: true
 
     - label: "TH reads the CurrentFrequency attribute."
@@ -182,9 +213,7 @@
           field set to fmin - 1"
       PICS: LVL.S.C08.Rsp
       verification: |
-          Optional command based on Feature support
-
-          Frequency feature for level control cluster is not supporting in chip-tool
+          Frequency feature is Optional & is not verifiable at this moment. Please skip this step
       disabled: true
 
     - label: "TH reads the CurrentFrequency attribute."
diff --git a/src/app/tests/suites/certification/Test_TC_LVL_8_1.yaml b/src/app/tests/suites/certification/Test_TC_LVL_8_1.yaml
index ccdb825..038eb6b 100644
--- a/src/app/tests/suites/certification/Test_TC_LVL_8_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_LVL_8_1.yaml
@@ -28,8 +28,10 @@
           "TH prompts the operator to make the DUT send one or more supported
           commands from the Level Control cluster"
       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 levelcontrol move-to-level 125 10 0 0 1 1
-          Verify in TH all-clusters-app
+          Verify DUT receives  move-to-level  command response on the TH(all-clusters-app) Log:
           [1657915209.151256][3245:3245] CHIP:DMG: InvokeRequestMessage =
           [1657915209.151306][3245:3245] CHIP:DMG: {
           [1657915209.151348][3245:3245] CHIP:DMG:        suppressResponse = false,
@@ -61,7 +63,7 @@
 
 
           ./chip-tool levelcontrol move 1 5 0 0 1 1
-          Verify in TH all-clusters-app
+          Verify DUT receives  move command response on the TH(all-clusters-app) Log:
           [1657915236.437571][3245:3245] CHIP:DMG: InvokeRequestMessage =
           [1657915236.437601][3245:3245] CHIP:DMG: {
           [1657915236.437624][3245:3245] CHIP:DMG:        suppressResponse = false,
@@ -92,42 +94,43 @@
           [1657915236.438402][3245:3245] CHIP:DMG: },
 
 
-          ./chip-tool levelcontrol step 1 10 0 0 1 1
-          Verify in TH all-clusters-app
-          [1657915270.774746][3245:3245] CHIP:DMG: InvokeRequestMessage =
-          [1657915270.774833][3245:3245] CHIP:DMG: {
-          [1657915270.774859][3245:3245] CHIP:DMG:        suppressResponse = false,
-          [1657915270.774916][3245:3245] CHIP:DMG:        timedRequest = false,
-          [1657915270.774947][3245:3245] CHIP:DMG:        InvokeRequests =
-          [1657915270.774979][3245:3245] CHIP:DMG:        [
-          [1657915270.775003][3245:3245] CHIP:DMG:                CommandDataIB =
-          [1657915270.775035][3245:3245] CHIP:DMG:                {
-          [1657915270.775064][3245:3245] CHIP:DMG:                        CommandPathIB =
-          [1657915270.775097][3245:3245] CHIP:DMG:                        {
-          [1657915270.775130][3245:3245] CHIP:DMG:                                EndpointId = 0x1,
-          [1657915270.775164][3245:3245] CHIP:DMG:                                ClusterId = 0x8,
-          [1657915270.775228][3245:3245] CHIP:DMG:                                CommandId = 0x2,
-          [1657915270.775266][3245:3245] CHIP:DMG:                        },
-          [1657915270.775300][3245:3245] CHIP:DMG:
-          [1657915270.775329][3245:3245] CHIP:DMG:                        CommandFields =
-          [1657915270.775360][3245:3245] CHIP:DMG:                        {
-          [1657915270.775394][3245:3245] CHIP:DMG:                                0x0 = 1,
-          [1657915270.775427][3245:3245] CHIP:DMG:                                0x1 = 10,
-          [1657915270.775461][3245:3245] CHIP:DMG:                                0x2 = 20,
-          [1657915270.775494][3245:3245] CHIP:DMG:                                0x3 = 0,
-          [1657915270.775527][3245:3245] CHIP:DMG:                                0x4 = 0,
-          [1657915270.775587][3245:3245] CHIP:DMG:                        },
-          [1657915270.775619][3245:3245] CHIP:DMG:                },
-          [1657915270.775653][3245:3245] CHIP:DMG:
-          [1657915270.775676][3245:3245] CHIP:DMG:        ],
-          [1657915270.775708][3245:3245] CHIP:DMG:
-          [1657915270.775732][3245:3245] CHIP:DMG:        InteractionModelRevision = 1
-          [1657915270.775755][3245:3245] CHIP:DMG: },
+           ./chip-tool levelcontrol step 1 10 0   0 0 1 1
+          Verify DUT receives  step  command response on the TH(all-clusters-app) Log:
+          [1659607055.170850][3434:3434] CHIP:DMG: InvokeRequestMessage =
+          [1659607055.170877][3434:3434] CHIP:DMG: {
+          [1659607055.170900][3434:3434] CHIP:DMG:         suppressResponse = false,
+          [1659607055.170927][3434:3434] CHIP:DMG:         timedRequest = false,
+          [1659607055.170952][3434:3434] CHIP:DMG:         InvokeRequests =
+          [1659607055.170983][3434:3434] CHIP:DMG:         [
+          [1659607055.171008][3434:3434] CHIP:DMG:                 CommandDataIB =
+          [1659607055.171035][3434:3434] CHIP:DMG:                 {
+          [1659607055.171061][3434:3434] CHIP:DMG:                         CommandPathIB =
+          [1659607055.171093][3434:3434] CHIP:DMG:                         {
+          [1659607055.171124][3434:3434] CHIP:DMG:                                 EndpointId = 0x1,
+          [1659607055.171160][3434:3434] CHIP:DMG:                                 ClusterId = 0x8,
+          [1659607055.171193][3434:3434] CHIP:DMG:                                 CommandId = 0x2,
+          [1659607055.171219][3434:3434] CHIP:DMG:                         },
+          [1659607055.171251][3434:3434] CHIP:DMG:
+          [1659607055.171277][3434:3434] CHIP:DMG:                         CommandFields =
+          [1659607055.171307][3434:3434] CHIP:DMG:                         {
+          [1659607055.171340][3434:3434] CHIP:DMG:                                 0x0 = 1,
+          [1659607055.171373][3434:3434] CHIP:DMG:                                 0x1 = 10,
+          [1659607055.171409][3434:3434] CHIP:DMG:                                 0x2 = 0,
+          [1659607055.171439][3434:3434] CHIP:DMG:                                 0x3 = 0,
+          [1659607055.171474][3434:3434] CHIP:DMG:                                 0x4 = 0,
+          [1659607055.171504][3434:3434] CHIP:DMG:                         },
+          [1659607055.171532][3434:3434] CHIP:DMG:                 },
+          [1659607055.171563][3434:3434] CHIP:DMG:
+          [1659607055.171586][3434:3434] CHIP:DMG:         ],
+          [1659607055.171617][3434:3434] CHIP:DMG:
+          [1659607055.171641][3434:3434] CHIP:DMG:         InteractionModelRevision = 1
+          [1659607055.171665][3434:3434] CHIP:DMG: },
+          [1659607055.171731][3434:3434] CHIP:DMG: AccessControl: checking f=1 a=c s=0x000000000001B669 t= c=0x0000_0008 e=1 p=o
+
 
 
           ./chip-tool levelcontrol stop 0 0 1 1
-          Verify in TH all-clusters-app
-
+          Verify DUT receives  stop command response on the TH(all-clusters-app) Log:
           [1657915273.417099][3245:3245] CHIP:DMG: InvokeRequestMessage =
           [1657915273.417157][3245:3245] CHIP:DMG: {
           [1657915273.417205][3245:3245] CHIP:DMG:        suppressResponse = false,
@@ -156,147 +159,150 @@
           [1657915273.418483][3245:3245] CHIP:DMG: },
 
 
-          ./chip-tool levelcontrol move-to-level-with-on-off 1 0 1 1
-          Verify in TH all-clusters-app
-          [1657915305.113831][3245:3245] CHIP:DMG: InvokeRequestMessage =
-          [1657915305.113860][3245:3245] CHIP:DMG: {
-          [1657915305.113885][3245:3245] CHIP:DMG:        suppressResponse = false,
-          [1657915305.113913][3245:3245] CHIP:DMG:        timedRequest = false,
-          [1657915305.113935][3245:3245] CHIP:DMG:        InvokeRequests =
-          [1657915305.113963][3245:3245] CHIP:DMG:        [
-          [1657915305.113985][3245:3245] CHIP:DMG:                CommandDataIB =
-          [1657915305.114013][3245:3245] CHIP:DMG:                {
-          [1657915305.114038][3245:3245] CHIP:DMG:                        CommandPathIB =
-          [1657915305.114072][3245:3245] CHIP:DMG:                        {
-          [1657915305.114105][3245:3245] CHIP:DMG:                                EndpointId = 0x1,
-          [1657915305.114141][3245:3245] CHIP:DMG:                                ClusterId = 0x8,
-          [1657915305.114177][3245:3245] CHIP:DMG:                                CommandId = 0x4,
-          [1657915305.114209][3245:3245] CHIP:DMG:                        },
-          [1657915305.114241][3245:3245] CHIP:DMG:
-          [1657915305.114268][3245:3245] CHIP:DMG:                        CommandFields =
-          [1657915305.114298][3245:3245] CHIP:DMG:                        {
-          [1657915305.114331][3245:3245] CHIP:DMG:                                0x0 = 1,
-          [1657915305.114367][3245:3245] CHIP:DMG:                                0x1 = 0,
-          [1657915305.114400][3245:3245] CHIP:DMG:                        },
-          [1657915305.114429][3245:3245] CHIP:DMG:                },
-          [1657915305.114461][3245:3245] CHIP:DMG:
-          [1657915305.114484][3245:3245] CHIP:DMG:        ],
-          [1657915305.114514][3245:3245] CHIP:DMG:
-          [1657915305.114538][3245:3245] CHIP:DMG:        InteractionModelRevision = 1
-          [1657915305.114561][3245:3245] CHIP:DMG: },
-          [1657915305.114630][3245:3245] CHIP:DMG: AccessControl: checking f=1 a=c s=0x000000000001B669 t= c=0x0000_0008 e=1 p=o
-          [1657915305.114670][3245:3245] CHIP:DMG: AccessControl: allowed
-          [1657915305.114699][3245:3245] CHIP:DMG: Received command for Endpoint=1 Cluster=0x0000_0008 Command=0x0000_0004
-          [1657915305.114732][3245:3245] CHIP:ZCL: 0xaaaabbef41a0MOVE_TO_LEVEL_WITH_ON_OFF 1  0
-          [1657915305.114768][3245:3245] CHIP:ZCL: Setting on/off to 0xaaaabbef4140 due to level change
-          [1657915305.114790][3245:3245] CHIP:ZCL: On/Off set value: 1 0
-          [1657915305.114811][3245:3245] CHIP:ZCL: On/off already set to new value
+           ./chip-tool levelcontrol move-to-level-with-on-off 1 0 0 0 1 1
+          Verify DUT receives  move-to-level-with-on-off  command response on the TH(all-clusters-app) Log:
+          [1659607213.257973][3434:3434] CHIP:DMG: InvokeRequestMessage =
+          [1659607213.258015][3434:3434] CHIP:DMG: {
+          [1659607213.258039][3434:3434] CHIP:DMG:         suppressResponse = false,
+          [1659607213.258066][3434:3434] CHIP:DMG:         timedRequest = false,
+          [1659607213.258090][3434:3434] CHIP:DMG:         InvokeRequests =
+          [1659607213.258132][3434:3434] CHIP:DMG:         [
+          [1659607213.258158][3434:3434] CHIP:DMG:                 CommandDataIB =
+          [1659607213.258219][3434:3434] CHIP:DMG:                 {
+          [1659607213.258254][3434:3434] CHIP:DMG:                         CommandPathIB =
+          [1659607213.258300][3434:3434] CHIP:DMG:                         {
+          [1659607213.258339][3434:3434] CHIP:DMG:                                 EndpointId = 0x1,
+          [1659607213.258387][3434:3434] CHIP:DMG:                                 ClusterId = 0x8,
+          [1659607213.258432][3434:3434] CHIP:DMG:                                 CommandId = 0x4,
+          [1659607213.258467][3434:3434] CHIP:DMG:                         },
+          [1659607213.258512][3434:3434] CHIP:DMG:
+          [1659607213.258550][3434:3434] CHIP:DMG:                         CommandFields =
+          [1659607213.258587][3434:3434] CHIP:DMG:                         {
+          [1659607213.258629][3434:3434] CHIP:DMG:                                 0x0 = 1,
+          [1659607213.258677][3434:3434] CHIP:DMG:                                 0x1 = 0,
+          [1659607213.258715][3434:3434] CHIP:DMG:                                 0x2 = 0,
+          [1659607213.258761][3434:3434] CHIP:DMG:                                 0x3 = 0,
+          [1659607213.258801][3434:3434] CHIP:DMG:                         },
+          [1659607213.258834][3434:3434] CHIP:DMG:                 },
+          [1659607213.258876][3434:3434] CHIP:DMG:
+          [1659607213.258909][3434:3434] CHIP:DMG:         ],
+          [1659607213.258942][3434:3434] CHIP:DMG:
+          [1659607213.258974][3434:3434] CHIP:DMG:         InteractionModelRevision = 1
+          [1659607213.258999][3434:3434] CHIP:DMG: },
+          [1659607213.259078][3434:3434] CHIP:DMG: AccessControl: checking f=1 a=c s=0x000000000001B669 t= c=0x0000_0008 e=1 p=o
+          [1659607213.259117][3434:3434] CHIP:DMG: AccessControl: allowed
+          [1659607213.259146][3434:3434] CHIP:DMG: Received command for Endpoint=1 Cluster=0x0000_0008 Command=0x0000_0004
+          [1659607213.259181][3434:3434] CHIP:ZCL: 0xaaaad3c4a860MOVE_TO_LEVEL_WITH_ON_OFF 1  0
+          [1659607213.259217][3434:3434] CHIP:ZCL: Setting on/off to 0xaaaad3c4a800 due to level change
 
 
-          ./chip-tool levelcontrol move-with-on-off 1 5 1 1
-          Verify in TH all-clusters-app
 
-          [1657915329.088787][3245:3245] CHIP:DMG: InvokeRequestMessage =
-          [1657915329.088824][3245:3245] CHIP:DMG: {
-          [1657915329.088854][3245:3245] CHIP:DMG:        suppressResponse = false,
-          [1657915329.088890][3245:3245] CHIP:DMG:        timedRequest = false,
-          [1657915329.088918][3245:3245] CHIP:DMG:        InvokeRequests =
-          [1657915329.088975][3245:3245] CHIP:DMG:        [
-          [1657915329.089009][3245:3245] CHIP:DMG:                CommandDataIB =
-          [1657915329.089047][3245:3245] CHIP:DMG:                {
-          [1657915329.089083][3245:3245] CHIP:DMG:                        CommandPathIB =
-          [1657915329.089127][3245:3245] CHIP:DMG:                        {
-          [1657915329.089172][3245:3245] CHIP:DMG:                                EndpointId = 0x1,
-          [1657915329.089223][3245:3245] CHIP:DMG:                                ClusterId = 0x8,
-          [1657915329.089272][3245:3245] CHIP:DMG:                                CommandId = 0x5,
-          [1657915329.089310][3245:3245] CHIP:DMG:                        },
-          [1657915329.089346][3245:3245] CHIP:DMG:
-          [1657915329.089380][3245:3245] CHIP:DMG:                        CommandFields =
-          [1657915329.089422][3245:3245] CHIP:DMG:                        {
-          [1657915329.089471][3245:3245] CHIP:DMG:                                0x0 = 1,
-          [1657915329.089521][3245:3245] CHIP:DMG:                                0x1 = 5,
-          [1657915329.089570][3245:3245] CHIP:DMG:                        },
-          [1657915329.089610][3245:3245] CHIP:DMG:                },
-          [1657915329.089653][3245:3245] CHIP:DMG:
-          [1657915329.089694][3245:3245] CHIP:DMG:        ],
-          [1657915329.089736][3245:3245] CHIP:DMG:
-          [1657915329.089769][3245:3245] CHIP:DMG:        InteractionModelRevision = 1
-          [1657915329.089800][3245:3245] CHIP:DMG: },
-          [1657915329.089888][3245:3245] CHIP:DMG: AccessControl: checking f=1 a=c s=0x000000000001B669 t= c=0x0000_0008 e=1 p=o
-          [1657915329.089937][3245:3245] CHIP:DMG: AccessControl: allowed
-          [1657915329.089975][3245:3245] CHIP:DMG: Received command for Endpoint=1 Cluster=0x0000_0008 Command=0x0000_0005
-          [1657915329.090018][3245:3245] CHIP:ZCL: 0xaaaabbef41a0MOVE_WITH_ON_OFF 1 5
-          [1657915329.090063][3245:3245] CHIP:ZCL: Setting on/off to 0xaaaabbef4140 due to level change
-          [1657915329.090104][3245:3245] CHIP:ZCL: On/Off set value: 1 0
-          [1657915329.090135][3245:3245] CHIP:ZCL: On/off already set to new value
+          ./chip-tool levelcontrol move-with-on-off 1 5 0 0 1 1
+          Verify DUT receives  move-with-on-off  command response on the TH(all-clusters-app) Log:
+          [1659607307.208156][3434:3434] CHIP:DMG: InvokeRequestMessage =
+          [1659607307.208184][3434:3434] CHIP:DMG: {
+          [1659607307.208208][3434:3434] CHIP:DMG:         suppressResponse = false,
+          [1659607307.208234][3434:3434] CHIP:DMG:         timedRequest = false,
+          [1659607307.208258][3434:3434] CHIP:DMG:         InvokeRequests =
+          [1659607307.208290][3434:3434] CHIP:DMG:         [
+          [1659607307.208315][3434:3434] CHIP:DMG:                 CommandDataIB =
+          [1659607307.208343][3434:3434] CHIP:DMG:                 {
+          [1659607307.208368][3434:3434] CHIP:DMG:                         CommandPathIB =
+          [1659607307.208420][3434:3434] CHIP:DMG:                         {
+          [1659607307.208457][3434:3434] CHIP:DMG:                                 EndpointId = 0x1,
+          [1659607307.208496][3434:3434] CHIP:DMG:                                 ClusterId = 0x8,
+          [1659607307.208533][3434:3434] CHIP:DMG:                                 CommandId = 0x5,
+          [1659607307.208568][3434:3434] CHIP:DMG:                         },
+          [1659607307.208601][3434:3434] CHIP:DMG:
+          [1659607307.208628][3434:3434] CHIP:DMG:                         CommandFields =
+          [1659607307.208659][3434:3434] CHIP:DMG:                         {
+          [1659607307.208694][3434:3434] CHIP:DMG:                                 0x0 = 1,
+          [1659607307.208731][3434:3434] CHIP:DMG:                                 0x1 = 5,
+          [1659607307.208769][3434:3434] CHIP:DMG:                                 0x2 = 0,
+          [1659607307.208806][3434:3434] CHIP:DMG:                                 0x3 = 0,
+          [1659607307.208842][3434:3434] CHIP:DMG:                         },
+          [1659607307.208871][3434:3434] CHIP:DMG:                 },
+          [1659607307.208902][3434:3434] CHIP:DMG:
+          [1659607307.208926][3434:3434] CHIP:DMG:         ],
+          [1659607307.208956][3434:3434] CHIP:DMG:
+          [1659607307.208980][3434:3434] CHIP:DMG:         InteractionModelRevision = 1
+          [1659607307.209004][3434:3434] CHIP:DMG: },
+          [1659607307.209073][3434:3434] CHIP:DMG: AccessControl: checking f=1 a=c s=0x000000000001B669 t= c=0x0000_0008 e=1 p=o
+          [1659607307.209111][3434:3434] CHIP:DMG: AccessControl: allowed
+          [1659607307.209139][3434:3434] CHIP:DMG: Received command for Endpoint=1 Cluster=0x0000_0008 Command=0x0000_0005
+          [1659607307.209176][3434:3434] CHIP:ZCL: 0xaaaad3c4a860MOVE_WITH_ON_OFF 1 5
 
 
-           ./chip-tool levelcontrol step-with-on-off 1 15 123 1 1
-          Verify in TH all-clusters-app
-          [1657915396.576207][3245:3245] CHIP:DMG: InvokeRequestMessage =
-          [1657915396.576236][3245:3245] CHIP:DMG: {
-          [1657915396.576255][3245:3245] CHIP:DMG:        suppressResponse = false,
-          [1657915396.576278][3245:3245] CHIP:DMG:        timedRequest = false,
-          [1657915396.576298][3245:3245] CHIP:DMG:        InvokeRequests =
-          [1657915396.576327][3245:3245] CHIP:DMG:        [
-          [1657915396.576347][3245:3245] CHIP:DMG:                CommandDataIB =
-          [1657915396.576371][3245:3245] CHIP:DMG:                {
-          [1657915396.576392][3245:3245] CHIP:DMG:                        CommandPathIB =
-          [1657915396.576420][3245:3245] CHIP:DMG:                        {
-          [1657915396.576451][3245:3245] CHIP:DMG:                                EndpointId = 0x1,
-          [1657915396.576488][3245:3245] CHIP:DMG:                                ClusterId = 0x8,
-          [1657915396.576522][3245:3245] CHIP:DMG:                                CommandId = 0x6,
-          [1657915396.576554][3245:3245] CHIP:DMG:                        },
-          [1657915396.576587][3245:3245] CHIP:DMG:
-          [1657915396.576617][3245:3245] CHIP:DMG:                        CommandFields =
-          [1657915396.576647][3245:3245] CHIP:DMG:                        {
-          [1657915396.576678][3245:3245] CHIP:DMG:                                0x0 = 1,
-          [1657915396.576704][3245:3245] CHIP:DMG:                                0x1 = 15,
-          [1657915396.576741][3245:3245] CHIP:DMG:                                0x2 = 123,
-          [1657915396.576774][3245:3245] CHIP:DMG:                        },
-          [1657915396.576804][3245:3245] CHIP:DMG:                },
-          [1657915396.576835][3245:3245] CHIP:DMG:
-          [1657915396.576858][3245:3245] CHIP:DMG:        ],
-          [1657915396.576889][3245:3245] CHIP:DMG:
-          [1657915396.576913][3245:3245] CHIP:DMG:        InteractionModelRevision = 1
-          [1657915396.576935][3245:3245] CHIP:DMG: },
-          [1657915396.577006][3245:3245] CHIP:DMG: AccessControl: checking f=1 a=c s=0x000000000001B669 t= c=0x0000_0008 e=1 p=o
-          [1657915396.577046][3245:3245] CHIP:DMG: AccessControl: allowed
-          [1657915396.577071][3245:3245] CHIP:DMG: Received command for Endpoint=1 Cluster=0x0000_0008 Command=0x0000_0006
-          [1657915396.577106][3245:3245] CHIP:ZCL: 0xaaaabbef41a0STEP_WITH_ON_OFF 1 f 7b
-          [1657915396.577142][3245:3245] CHIP:ZCL: Setting on/off to 0xaaaabbef4140 due to level change
-          [1657915396.577164][3245:3245] CHIP:ZCL: On/Off set value: 1 0
-          [1657915396.577186][3245:3245] CHIP:ZCL: On/off already set to new value
+
+           ./chip-tool levelcontrol step-with-on-off 1 15 123 0 0 1 1
+          Verify DUT receives  step-with-on-off   command response on the TH(all-clusters-app) Log:
+          [1659607424.990107][3434:3434] CHIP:DMG: InvokeRequestMessage =
+          [1659607424.990142][3434:3434] CHIP:DMG: {
+          [1659607424.990173][3434:3434] CHIP:DMG:         suppressResponse = false,
+          [1659607424.990235][3434:3434] CHIP:DMG:         timedRequest = false,
+          [1659607424.990282][3434:3434] CHIP:DMG:         InvokeRequests =
+          [1659607424.990326][3434:3434] CHIP:DMG:         [
+          [1659607424.990360][3434:3434] CHIP:DMG:                 CommandDataIB =
+          [1659607424.990397][3434:3434] CHIP:DMG:                 {
+          [1659607424.990431][3434:3434] CHIP:DMG:                         CommandPathIB =
+          [1659607424.990470][3434:3434] CHIP:DMG:                         {
+          [1659607424.990512][3434:3434] CHIP:DMG:                                 EndpointId = 0x1,
+          [1659607424.990557][3434:3434] CHIP:DMG:                                 ClusterId = 0x8,
+          [1659607424.990602][3434:3434] CHIP:DMG:                                 CommandId = 0x6,
+          [1659607424.990648][3434:3434] CHIP:DMG:                         },
+          [1659607424.990692][3434:3434] CHIP:DMG:
+          [1659607424.990727][3434:3434] CHIP:DMG:                         CommandFields =
+          [1659607424.990773][3434:3434] CHIP:DMG:                         {
+          [1659607424.990816][3434:3434] CHIP:DMG:                                 0x0 = 1,
+          [1659607424.990862][3434:3434] CHIP:DMG:                                 0x1 = 15,
+          [1659607424.990910][3434:3434] CHIP:DMG:                                 0x2 = 123,
+          [1659607424.990951][3434:3434] CHIP:DMG:                                 0x3 = 0,
+          [1659607424.990996][3434:3434] CHIP:DMG:                                 0x4 = 0,
+          [1659607424.991035][3434:3434] CHIP:DMG:                         },
+          [1659607424.991073][3434:3434] CHIP:DMG:                 },
+          [1659607424.991118][3434:3434] CHIP:DMG:
+          [1659607424.991150][3434:3434] CHIP:DMG:         ],
+          [1659607424.991192][3434:3434] CHIP:DMG:
+          [1659607424.991225][3434:3434] CHIP:DMG:         InteractionModelRevision = 1
+          [1659607424.991260][3434:3434] CHIP:DMG: },
+          [1659607424.991350][3434:3434] CHIP:DMG: AccessControl: checking f=1 a=c s=0x000000000001B669 t= c=0x0000_0008 e=1 p=o
+          [1659607424.991400][3434:3434] CHIP:DMG: AccessControl: allowed
+          [1659607424.991438][3434:3434] CHIP:DMG: Received command for Endpoint=1 Cluster=0x0000_0008 Command=0x0000_0006
+          [1659607424.991490][3434:3434] CHIP:ZCL: 0xaaaad3c4a860STEP_WITH_ON_OFF 1 f 7b
 
 
-          ./chip-tool levelcontrol stop-with-on-off 1 1
-          Verify in TH all-clusters-app
-          [1657915357.332886][3245:3245] CHIP:DMG: InvokeRequestMessage =
-          [1657915357.332935][3245:3245] CHIP:DMG: {
-          [1657915357.332977][3245:3245] CHIP:DMG:        suppressResponse = false,
-          [1657915357.333037][3245:3245] CHIP:DMG:        timedRequest = false,
-          [1657915357.333083][3245:3245] CHIP:DMG:        InvokeRequests =
-          [1657915357.333137][3245:3245] CHIP:DMG:        [
-          [1657915357.333181][3245:3245] CHIP:DMG:                CommandDataIB =
-          [1657915357.333230][3245:3245] CHIP:DMG:                {
-          [1657915357.333277][3245:3245] CHIP:DMG:                        CommandPathIB =
-          [1657915357.333332][3245:3245] CHIP:DMG:                        {
-          [1657915357.333391][3245:3245] CHIP:DMG:                                EndpointId = 0x1,
-          [1657915357.333452][3245:3245] CHIP:DMG:                                ClusterId = 0x8,
-          [1657915357.333512][3245:3245] CHIP:DMG:                                CommandId = 0x7,
-          [1657915357.333569][3245:3245] CHIP:DMG:                        },
-          [1657915357.333635][3245:3245] CHIP:DMG:
-          [1657915357.333686][3245:3245] CHIP:DMG:                        CommandFields =
-          [1657915357.333742][3245:3245] CHIP:DMG:                        {
-          [1657915357.333784][3245:3245] CHIP:DMG:                        },
-          [1657915357.333812][3245:3245] CHIP:DMG:                },
-          [1657915357.333840][3245:3245] CHIP:DMG:
-          [1657915357.333863][3245:3245] CHIP:DMG:        ],
-          [1657915357.333947][3245:3245] CHIP:DMG:
-          [1657915357.333972][3245:3245] CHIP:DMG:        InteractionModelRevision = 1
-          [1657915357.333995][3245:3245] CHIP:DMG: },
-          [1657915357.334059][3245:3245] CHIP:DMG: AccessControl: checking f=1 a=c s=0x000000000001B669 t= c=0x0000_0008 e=1 p=o
-          [1657915357.334094][3245:3245] CHIP:DMG: AccessControl: allowed
-          [1657915357.334121][3245:3245] CHIP:DMG: Received command for Endpoint=1 Cluster=0x0000_0008 Command=0x0000_0007
-          [1657915357.334150][3245:3245] CHIP:ZCL: 0xaaaabbef41a0STOP_WITH_ON_OFF
+          ./chip-tool levelcontrol stop-with-on-off 0 0 1 1
+          Verify DUT receives  stop-with-on-off   command response on the TH(all-clusters-app) Log:
+          Verify in TH all-clusters-app[1659607566.304117][3434:3434] CHIP:DMG: InvokeRequestMessage =
+          [1659607566.304146][3434:3434] CHIP:DMG: {
+          [1659607566.304169][3434:3434] CHIP:DMG:         suppressResponse = false,
+          [1659607566.304196][3434:3434] CHIP:DMG:         timedRequest = false,
+          [1659607566.304220][3434:3434] CHIP:DMG:         InvokeRequests =
+          [1659607566.304252][3434:3434] CHIP:DMG:         [
+          [1659607566.304276][3434:3434] CHIP:DMG:                 CommandDataIB =
+          [1659607566.304303][3434:3434] CHIP:DMG:                 {
+          [1659607566.304328][3434:3434] CHIP:DMG:                         CommandPathIB =
+          [1659607566.304363][3434:3434] CHIP:DMG:                         {
+          [1659607566.304396][3434:3434] CHIP:DMG:                                 EndpointId = 0x1,
+          [1659607566.304434][3434:3434] CHIP:DMG:                                 ClusterId = 0x8,
+          [1659607566.304471][3434:3434] CHIP:DMG:                                 CommandId = 0x7,
+          [1659607566.304506][3434:3434] CHIP:DMG:                         },
+          [1659607566.304539][3434:3434] CHIP:DMG:
+          [1659607566.304565][3434:3434] CHIP:DMG:                         CommandFields =
+          [1659607566.304596][3434:3434] CHIP:DMG:                         {
+          [1659607566.304629][3434:3434] CHIP:DMG:                                 0x0 = 0,
+          [1659607566.304667][3434:3434] CHIP:DMG:                                 0x1 = 0,
+          [1659607566.304703][3434:3434] CHIP:DMG:                         },
+          [1659607566.304733][3434:3434] CHIP:DMG:                 },
+          [1659607566.304762][3434:3434] CHIP:DMG:
+          [1659607566.304786][3434:3434] CHIP:DMG:         ],
+          [1659607566.304817][3434:3434] CHIP:DMG:
+          [1659607566.304841][3434:3434] CHIP:DMG:         InteractionModelRevision = 1
+          [1659607566.304865][3434:3434] CHIP:DMG: },
+          [1659607566.304932][3434:3434] CHIP:DMG: AccessControl: checking f=1 a=c s=0x000000000001B669 t= c=0x0000_0008 e=1 p=o
+          [1659607566.304970][3434:3434] CHIP:DMG: AccessControl: allowed
+          [1659607566.304999][3434:3434] CHIP:DMG: Received command for Endpoint=1 Cluster=0x0000_0008 Command=0x0000_0007
+          [1659607566.305032][3434:3434] CHIP:ZCL: 0xaaaad3c4a860STOP_WITH_ON_OFF
+          [1659607566.305069][3434:3434] CHIP:DMG: Endpoint 1, Cluster 0x0000_0008 update version to 671abea5
+          [1659607566.305110][3434:3434] CHIP:DMG: ICR moving to [ Preparing]
       disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_MOD_1_2.yaml b/src/app/tests/suites/certification/Test_TC_MOD_1_2.yaml
index c4726cb..1fc5adc 100644
--- a/src/app/tests/suites/certification/Test_TC_MOD_1_2.yaml
+++ b/src/app/tests/suites/certification/Test_TC_MOD_1_2.yaml
@@ -29,7 +29,7 @@
       verification: |
           ./chip-tool modeselect read supported-modes 1 1
 
-          on TH,Verify that the DUT response provides a list of supported modes
+          Verify on TH(chip-tool) logs supported modes provides a list of mode, each mode should be a struct containing a label and All of these values should be no larger than 16 bits
 
           [1654595167.600241][14362:14367] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0050 Attribute 0x0000_0002 DataVersion: 366231602
           [1654595167.600345][14362:14367] CHIP:TOO:   SupportedModes: 3 entries
@@ -67,7 +67,7 @@
       verification: |
           ./chip-tool modeselect read current-mode 1 1
 
-          on TH,Verify that the DUT response is an integer that is in the list of modes returned in step 1.
+          Verify on TH(chip-tool) logs ,current-mode value is in the list of modes from step 1
 
           [1645776767.611140][4667:4672] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0050 Attribute 0x0000_0000DataVersion: 3781469718
 
@@ -79,7 +79,7 @@
       verification: |
           ./chip-tool modeselect read on-mode 1 1
 
-          on TH,Verify that the DUT response The attribute is nullable, and null is  valid value.
+          Verify on TH(chip-tool) logs ,onmode value is listed in the supported modes or null is also acceptable
 
 
           [1649676072.465968][10754:10759] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0050 Attribute 0x0000_0005 DataVersion: 4277065072
@@ -92,7 +92,7 @@
       verification: |
           ./chip-tool modeselect read start-up-mode 1 1
 
-          on TH,Verify that the DUT response is an integer that is in the list of modes returned in step 1.
+          Verify on TH(chip-tool) logs ,start-up-mode  value is in the list of modes from step 1
 
 
           [1649677014.496348][10778:10784] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0050 Attribute 0x0000_0004 DataVersion: 4277065072
@@ -105,8 +105,7 @@
       verification: |
           ./chip-tool modeselect read description 1 1
 
-
-          on TH,Verify that the DUT response is an integer that is in the list of modes returned in step 1.
+          Verify on TH(chip-tool) logs , Description value has human readable text string
 
           [1649677114.614974][10787:10792] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0050 Attribute 0x0000_0000 DataVersion: 4277065072
 
@@ -118,10 +117,7 @@
       verification: |
           ./chip-tool modeselect read standard-namespace 1 1
 
-
-          on TH,Verify that the DUT response  is an integer that is in the list of modes returned in step 1.(OR)
-           The attribute is nullable, and null is  valid value.
-
+          Verify on TH(chip-tool) logs ,standard-namespace value is listed in the supported modes from step 1 or null is also acceptable
 
           [1649677167.900539][10795:10801] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0050 Attribute 0x0000_0001 DataVersion: 4277065072
 
diff --git a/src/app/tests/suites/certification/Test_TC_MOD_1_3.yaml b/src/app/tests/suites/certification/Test_TC_MOD_1_3.yaml
index db48ccb..dedbb27 100644
--- a/src/app/tests/suites/certification/Test_TC_MOD_1_3.yaml
+++ b/src/app/tests/suites/certification/Test_TC_MOD_1_3.yaml
@@ -32,11 +32,9 @@
           "DUT reads all supported mandatory attributes from TH one at a time in
           a manufacturer specific order"
       verification: |
-          verify on Reference app receives the right request for the data sent in the above commands
-
           ./chip-tool modeselect read supported-modes 1 1
 
-          Verify in TH all-clusters-app log
+          verify the "supported-modes response" on the TH (all-cluster-app) log:
 
           [1650968776.863713][12747:12747] CHIP:IM: Received Read request
           [1650968776.863767][12747:12747] CHIP:DMG: ReadRequestMessage =
@@ -65,7 +63,7 @@
 
           ./chip-tool modeselect read current-mode 1 1
 
-          Verify in TH all-clusters-app log
+          verify the "current-modes response" on the TH (all-cluster-app) log:
 
           1650968848.687576][12747:12747] CHIP:IM: Received Read request
           [1650968848.687628][12747:12747] CHIP:DMG: ReadRequestMessage =
@@ -91,7 +89,7 @@
 
            ./chip-tool modeselect read standard-namespace 1 1
 
-          Verify in TH all-clusters-app log
+          verify the "standard-namespace response" on the TH (all-cluster-app) log:
 
           1650968644.223891][12747:12747] CHIP:IM: Received Read request
           [1650968644.223954][12747:12747] CHIP:DMG: ReadRequestMessage =
@@ -121,7 +119,7 @@
 
           ./chip-tool modeselect read description 1 1
 
-          Verify in TH all-clusters-app log
+          verify the "description response" on the TH (all-cluster-app) log:
 
           [1650969447.413679][12747:12747] CHIP:EM: Handling via exchange: 65381r, Delegate: 0xaaaae5201098
           [1650969447.413718][12747:12747] CHIP:IM: Received Read request
@@ -148,10 +146,10 @@
           "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
-
           ./chip-tool modeselect read on-mode 1 1
 
+          verify the "on-modes response" on the TH (all-cluster-app) log:
+
           [1650969570.494960][12747:12747] CHIP:IM: Received Read request
           [1650969570.495012][12747:12747] CHIP:DMG: ReadRequestMessage =
           [1650969570.495038][12747:12747] CHIP:DMG: {
@@ -173,6 +171,9 @@
 
           ./chip-tool modeselect read start-up-mode 1 1
 
+
+          verify the "start-up-modes response" on the TH (all-cluster-app) log:
+
           [1650970821.970899][12747:12747] CHIP:IM: Received Read request
           [1650970821.970950][12747:12747] CHIP:DMG: ReadRequestMessage =
           [1650970821.970975][12747:12747] CHIP:DMG: {
@@ -213,31 +214,33 @@
           also reflects this in global attributes such as FeatureMap and
           AttributeList. Commission DUT to TH again"
       verification: |
-          verify on Reference app receives the right response for the data sent in the above commands
-
-
           ./chip-tool modeselect read attribute-list  1 1
 
-          Verify in TH all-clusters-app log
+          verify the "attribute-list response" on the TH (all-cluster-minimal-app) log:
 
-          [1654244736050] [91506:3999585] CHIP: [TOO] Endpoint: 1 Cluster: 0x0000_0050 Attribute 0x0000_FFFB DataVersion: 1865308556
-          [1654244736050] [91506:3999585] CHIP: [TOO]   AttributeList: 9 entries
-          [1654244736050] [91506:3999585] CHIP: [TOO]     [1]: 0
-          [1654244736050] [91506:3999585] CHIP: [TOO]     [2]: 1
-          [1654244736050] [91506:3999585] CHIP: [TOO]     [3]: 2
-          [1654244736050] [91506:3999585] CHIP: [TOO]     [4]: 3
-          [1654244736050] [91506:3999585] CHIP: [TOO]     [5]: 65528
-          [1654244736050] [91506:3999585] CHIP: [TOO]     [6]: 65529
-          [1654244736050] [91506:3999585] CHIP: [TOO]     [7]: 65531
-          [1654244736050] [91506:3999585] CHIP: [TOO]     [8]: 65532
-          [1654244736050] [91506:3999585] CHIP: [TOO]     [9]: 65533
+          [1659589890.492170][3088:3088] CHIP:IM: Received Read request
+          [1659589890.492250][3088:3088] CHIP:DMG: ReadRequestMessage =
+          [1659589890.492274][3088:3088] CHIP:DMG: {
+          [1659589890.492292][3088:3088] CHIP:DMG:         AttributePathIBs =
+          [1659589890.492315][3088:3088] CHIP:DMG:         [
+          [1659589890.492350][3088:3088] CHIP:DMG:                 AttributePathIB =
+          [1659589890.492382][3088:3088] CHIP:DMG:                 {
+          [1659589890.492416][3088:3088] CHIP:DMG:                         Endpoint = 0x1,
+          [1659589890.492444][3088:3088] CHIP:DMG:                         Cluster = 0x50,
+          [1659589890.492481][3088:3088] CHIP:DMG:                         Attribute = 0x0000_FFFB,
+          [1659589890.492510][3088:3088] CHIP:DMG:                 }
+          [1659589890.492545][3088:3088] CHIP:DMG:
+          [1659589890.492569][3088:3088] CHIP:DMG:         ],
+          [1659589890.492603][3088:3088] CHIP:DMG:
+          [1659589890.492627][3088:3088] CHIP:DMG:         isFabricFiltered = true,
+          [1659589890.492658][3088:3088] CHIP:DMG:         InteractionModelRevision = 1
+          [1659589890.492679][3088:3088] CHIP:DMG: },
 
 
 
+          ./chip-tool modeselect read supported-modes 1 1
 
-          "./chip-tool modeselect read supported-modes 1 1
-
-          Verify in TH all-clusters-app log
+          verify the "supported-modes response" on the TH (all-cluster-minimal-app) log:
 
           [1650968776.863713][12747:12747] CHIP:IM: Received Read request
           [1650968776.863767][12747:12747] CHIP:DMG: ReadRequestMessage =
@@ -266,7 +269,7 @@
 
           ./chip-tool modeselect read current-mode 1 1
 
-          Verify in TH all-clusters-app log
+          verify the "current-modes response" on the TH (all-cluster-minimal-app) log:
 
           1650968848.687576][12747:12747] CHIP:IM: Received Read request
           [1650968848.687628][12747:12747] CHIP:DMG: ReadRequestMessage =
@@ -292,7 +295,7 @@
 
            ./chip-tool modeselect read standard-namespace 1 1
 
-          Verify in TH all-clusters-app log
+          verify the "standard-namespace response" on the TH (all-cluster-minimal-app) log:
 
           1650968644.223891][12747:12747] CHIP:IM: Received Read request
           [1650968644.223954][12747:12747] CHIP:DMG: ReadRequestMessage =
@@ -322,7 +325,7 @@
 
           ./chip-tool modeselect read description 1 1
 
-          Verify in TH all-clusters-app log
+          verify the "description response" on the TH (all-cluster-minimal-app) log:
 
           [1650969447.413679][12747:12747] CHIP:EM: Handling via exchange: 65381r, Delegate: 0xaaaae5201098
           [1650969447.413718][12747:12747] CHIP:IM: Received Read request
@@ -349,15 +352,10 @@
           "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
-
-          Verify in TH all-clusters-app log
+          TH all-clusters-minimal-app does not support optional attributes
 
           ./chip-tool modeselect read on-mode 1 1
-           General error: 0x86 (UNSUPPORTED_ATTRIBUTE)
-
           ./chip-tool modeselect read start-up-mode 1 1
-           General error: 0x86 (UNSUPPORTED_ATTRIBUTE)
       disabled: true
 
     - label:
diff --git a/src/app/tests/suites/certification/Test_TC_MOD_2_1.yaml b/src/app/tests/suites/certification/Test_TC_MOD_2_1.yaml
index 57414da..28d3713 100644
--- a/src/app/tests/suites/certification/Test_TC_MOD_2_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_MOD_2_1.yaml
@@ -29,7 +29,7 @@
       verification: |
           /chip-tool modeselect read supported-modes 1 1
 
-          on TH,Verify that the DUT response provides a list of supported modes
+          Verify on TH(chip-tool),  supported modes provides a list ofmodes
 
 
           [1654595268.854568][14400:14405] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0050 Attribute 0x0000_0002 DataVersion: 366231602
@@ -70,7 +70,7 @@
       verification: |
           ./chip-tool modeselect read current-mode 1 1
 
-          on TH,Verify that the DUT responds with the integer provided in step 2a.
+          Verify on TH(chip-tool),  current modes provides a list of modes
 
           [1649678800.298128][10854:10861] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0050 Attribute 0x0000_0003 DataVersion: 4277065073
 
@@ -79,12 +79,12 @@
 
     - label:
           "TH sends a ChangeToMode command to the DUT with a integer from the
-          list in step 1."
+          list in step 1,but different from the integer from step 2"
       PICS: MOD.S.C00.Rsp
       verification: |
           ./chip-tool modeselect change-to-mode 4 1 1
 
-          on TH,Verify that the DUT response with a successful (value 0x00) status response
+          Verify on TH(chip-tool) log,shows successful status response
 
 
           [1649677293.280207][10810:10815] CHIP:DMG:                                 StatusIB =
@@ -98,7 +98,7 @@
       verification: |
           ./chip-tool modeselect read current-mode 1 1
 
-          on TH,Verify that the DUT responds with the integer provided in step 2a.
+          Verify on TH(chip-tool),  current modes provides a list ofmodes
 
           [1649678800.298128][10854:10861] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0050 Attribute 0x0000_0003 DataVersion: 4277065073
 
@@ -112,7 +112,7 @@
       verification: |
           ./chip-tool modeselect change-to-mode 2 1 1
 
-          on TH,Verify DUT responds with a INVALID_COMMAND (hex value 0x85/decimal 133)
+          Verify on TH(chip-tool)logs , with a INVALID_COMMAND (hex value 0x85/decimal 133)
 
           CHIP:DMG: Received Command Response Status for Endpoint=1 Cluster=0x0000_0050 Command=0x0000_0000 Status=0x85
           CHIP:TOO: Error: IM Error 0x00000585: General error: 0x85 (INVALID_COMMAND)
diff --git a/src/app/tests/suites/certification/Test_TC_MOD_2_2.yaml b/src/app/tests/suites/certification/Test_TC_MOD_2_2.yaml
index f33f8ed..e665307 100644
--- a/src/app/tests/suites/certification/Test_TC_MOD_2_2.yaml
+++ b/src/app/tests/suites/certification/Test_TC_MOD_2_2.yaml
@@ -25,83 +25,77 @@
 
 tests:
     - label: "DUT reads the SupportedModes attribute from the TH"
+      PICS: MOD.C.A0002
       verification: |
-          verify on Reference app receives the right response for the data sent in the above commands
-
           ./chip-tool modeselect read supported-modes 1 1
 
-          Verify in TH all-clusters-app
+          verify the "supported-modes response" on the TH (all-cluster-app) log:
 
-          [1657112483.855657][5411:5417] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0050 Attribute 0x0000_0002 DataVersion: 736180028
-          [1657112483.855821][5411:5417] CHIP:TOO:   SupportedModes: 3 entries
-          [1657112483.856016][5411:5417] CHIP:TOO:     [1]: {
-          [1657112483.856069][5411:5417] CHIP:TOO:       Label: Black
-          [1657112483.856158][5411:5417] CHIP:TOO:       Mode: 0
-          [1657112483.856218][5411:5417] CHIP:TOO:       SemanticTags: 1 entries
-          [1657112483.856281][5411:5417] CHIP:TOO:         [1]: {
-          [1657112483.856397][5411:5417] CHIP:TOO:           MfgCode: 0
-          [1657112483.856466][5411:5417] CHIP:TOO:           Value: 0
-          [1657112483.856515][5411:5417] CHIP:TOO:          }
-          [1657112483.856582][5411:5417] CHIP:TOO:      }
-          [1657112483.856652][5411:5417] CHIP:TOO:     [2]: {
-          [1657112483.856700][5411:5417] CHIP:TOO:       Label: Cappuccino
-          [1657112483.856864][5411:5417] CHIP:TOO:       Mode: 4
-          [1657112483.856924][5411:5417] CHIP:TOO:       SemanticTags: 1 entries
-          [1657112483.857004][5411:5417] CHIP:TOO:         [1]: {
-          [1657112483.857055][5411:5417] CHIP:TOO:           MfgCode: 0
-          [1657112483.857102][5411:5417] CHIP:TOO:           Value: 0
-          [1657112483.857166][5411:5417] CHIP:TOO:          }
-          [1657112483.857215][5411:5417] CHIP:TOO:      }
-          [1657112483.857302][5411:5417] CHIP:TOO:     [3]: {
-          [1657112483.857351][5411:5417] CHIP:TOO:       Label: Espresso
-          [1657112483.857414][5411:5417] CHIP:TOO:       Mode: 7
-          [1657112483.857469][5411:5417] CHIP:TOO:       SemanticTags: 1 entries
-          [1657112483.857549][5411:5417] CHIP:TOO:         [1]: {
-          [1657112483.857598][5411:5417] CHIP:TOO:           MfgCode: 0
-          [1657112483.857665][5411:5417] CHIP:TOO:           Value: 0
-          [1657112483.857713][5411:5417] CHIP:TOO:          }
-          [1657112483.857778][5411:5417] CHIP:TOO:      }
+          [1659591404.431063][3214:3214] CHIP:IM: Received Read request
+          [1659591404.431235][3214:3214] CHIP:DMG: ReadRequestMessage =
+          [1659591404.431304][3214:3214] CHIP:DMG: {
+          [1659591404.431360][3214:3214] CHIP:DMG:         AttributePathIBs =
+          [1659591404.431482][3214:3214] CHIP:DMG:         [
+          [1659591404.431549][3214:3214] CHIP:DMG:                 AttributePathIB =
+          [1659591404.431687][3214:3214] CHIP:DMG:                 {
+          [1659591404.431820][3214:3214] CHIP:DMG:                         Endpoint = 0x1,
+          [1659591404.432034][3214:3214] CHIP:DMG:                         Cluster = 0x50,
+          [1659591404.432118][3214:3214] CHIP:DMG:                         Attribute = 0x0000_0002,
+          [1659591404.432192][3214:3214] CHIP:DMG:                 }
+          [1659591404.432260][3214:3214] CHIP:DMG:
+          [1659591404.432322][3214:3214] CHIP:DMG:         ],
+          [1659591404.432384][3214:3214] CHIP:DMG:
+          [1659591404.432441][3214:3214] CHIP:DMG:         isFabricFiltered = true,
+          [1659591404.432497][3214:3214] CHIP:DMG:         InteractionModelRevision = 1
+          [1659591404.432549][3214:3214] CHIP:DMG: },
+          [1659591404.432701][3214:3214] CHIP:DMG: IM RH moving to [GeneratingReports]
+          [1659591404.432906][3214:3214] CHIP:DMG: Building Reports for ReadHandler with LastReportGeneration = 0 DirtyGeneration = 0
+          [1659591404.432967][3214:3214] CHIP:DMG: <RE:Run> Cluster 50, Attribute 2 is dirty
+          [1659591404.433013][3214:3214] CHIP:DMG: Reading attribute: Cluster=0x0000_0050 Endpoint=1 AttributeId=0x0000_0002 (expanded=0)
+          [1659591404.433321][3214:3214] CHIP:DMG: AccessControl: checking f=1 a=c s=0x000000000001B669 t= c=0x0000_0050 e=1 p=v
+          [1659591404.433466][3214:3214] CHIP:DMG: AccessControl: allowed
       disabled: true
 
     - label:
           "DUT sends a ChangeToMode command to the TH with a integer from the
-          list in step 1"
+          list in step 1."
+      PICS: MOD.C.C00.Tx
       verification: |
-          verify on Reference app receives the right response for the data sent in the above commands
+          ./chip-tool modeselect change-to-mode 4 1 1
 
-           ./chip-tool modeselect change-to-mode 4 1 1
+          verify the "change-to-modes response" on the TH (all-cluster-app) log:
 
-          Verify in TH all-clusters-app
-
-          [1657112505.553012][5418:5423] CHIP:DMG: InvokeResponseMessage =
-          [1657112505.553052][5418:5423] CHIP:DMG: {
-          [1657112505.553091][5418:5423] CHIP:DMG:         suppressResponse = false,
-          [1657112505.553133][5418:5423] CHIP:DMG:         InvokeResponseIBs =
-          [1657112505.553183][5418:5423] CHIP:DMG:         [
-          [1657112505.553223][5418:5423] CHIP:DMG:                 InvokeResponseIB =
-          [1657112505.553276][5418:5423] CHIP:DMG:                 {
-          [1657112505.553319][5418:5423] CHIP:DMG:                         CommandStatusIB =
-          [1657112505.553371][5418:5423] CHIP:DMG:                         {
-          [1657112505.553418][5418:5423] CHIP:DMG:                                 CommandPathIB =
-          [1657112505.553473][5418:5423] CHIP:DMG:                                 {
-          [1657112505.553527][5418:5423] CHIP:DMG:                                         EndpointId = 0x1,
-          [1657112505.553588][5418:5423] CHIP:DMG:                                         ClusterId = 0x50,
-          [1657112505.553645][5418:5423] CHIP:DMG:                                         CommandId = 0x0,
-          [1657112505.553698][5418:5423] CHIP:DMG:                                 },
-          [1657112505.553762][5418:5423] CHIP:DMG:
-          [1657112505.553810][5418:5423] CHIP:DMG:                                 StatusIB =
-          [1657112505.553870][5418:5423] CHIP:DMG:                                 {
-          [1657112505.553929][5418:5423] CHIP:DMG:                                         status = 0x00 (SUCCESS),
-          [1657112505.553983][5418:5423] CHIP:DMG:                                 },
-          [1657112505.554037][5418:5423] CHIP:DMG:
-          [1657112505.554085][5418:5423] CHIP:DMG:                         },
-          [1657112505.554136][5418:5423] CHIP:DMG:
-          [1657112505.554181][5418:5423] CHIP:DMG:                 },
-          [1657112505.554238][5418:5423] CHIP:DMG:
-          [1657112505.554277][5418:5423] CHIP:DMG:         ],
-          [1657112505.554325][5418:5423] CHIP:DMG:
-          [1657112505.554364][5418:5423] CHIP:DMG:         InteractionModelRevision = 1
-          [1657112505.554432][5418:5423] CHIP:DMG: },
-          [1657112505.554523][5418:5423] CHIP:DMG: Received Command Response Status for Endpoint=1 Cluster=0x0000_0050 Command=0x0000_0000 Status=0x0
-          [1657112505.554587][5418:5423] CHIP:DMG: ICR moving to [AwaitingDe]
+          [1659591478.638391][3214:3214] CHIP:DMG: InvokeRequestMessage =
+          [1659591478.638460][3214:3214] CHIP:DMG: {
+          [1659591478.638519][3214:3214] CHIP:DMG:         suppressResponse = false,
+          [1659591478.638588][3214:3214] CHIP:DMG:         timedRequest = false,
+          [1659591478.638652][3214:3214] CHIP:DMG:         InvokeRequests =
+          [1659591478.638730][3214:3214] CHIP:DMG:         [
+          [1659591478.638792][3214:3214] CHIP:DMG:                 CommandDataIB =
+          [1659591478.638863][3214:3214] CHIP:DMG:                 {
+          [1659591478.638938][3214:3214] CHIP:DMG:                         CommandPathIB =
+          [1659591478.639019][3214:3214] CHIP:DMG:                         {
+          [1659591478.639101][3214:3214] CHIP:DMG:                                 EndpointId = 0x1,
+          [1659591478.639198][3214:3214] CHIP:DMG:                                 ClusterId = 0x50,
+          [1659591478.639285][3214:3214] CHIP:DMG:                                 CommandId = 0x0,
+          [1659591478.639366][3214:3214] CHIP:DMG:                         },
+          [1659591478.639495][3214:3214] CHIP:DMG:
+          [1659591478.639572][3214:3214] CHIP:DMG:                         CommandFields =
+          [1659591478.639654][3214:3214] CHIP:DMG:                         {
+          [1659591478.639739][3214:3214] CHIP:DMG:                                 0x0 = 4,
+          [1659591478.639833][3214:3214] CHIP:DMG:                         },
+          [1659591478.639917][3214:3214] CHIP:DMG:                 },
+          [1659591478.639998][3214:3214] CHIP:DMG:
+          [1659591478.640060][3214:3214] CHIP:DMG:         ],
+          [1659591478.640135][3214:3214] CHIP:DMG:
+          [1659591478.640197][3214:3214] CHIP:DMG:         InteractionModelRevision = 1
+          [1659591478.640257][3214:3214] CHIP:DMG: },
+          [1659591478.640403][3214:3214] CHIP:DMG: AccessControl: checking f=1 a=c s=0x000000000001B669 t= c=0x0000_0050 e=1 p=o
+          [1659591478.640486][3214:3214] CHIP:DMG: AccessControl: allowed
+          [1659591478.640556][3214:3214] CHIP:DMG: Received command for Endpoint=1 Cluster=0x0000_0050 Command=0x0000_0000
+          [1659591478.640631][3214:3214] CHIP:ZCL: ModeSelect: Entering emberAfModeSelectClusterChangeToModeCallback
+          [1659591478.641038][3214:3214] CHIP:DL: writing settings to file (/tmp/chip_kvs-FK3J0v)
+          [1659591478.642863][3214:3214] CHIP:DL: renamed tmp file to file (/tmp/chip_kvs)
+          [1659591478.643014][3214:3214] CHIP:DMG: Endpoint 1, Cluster 0x0000_0050 update version to dad78d3a
+          [1659591478.643085][3214:3214] CHIP:ZCL: ModeSelect: ChangeToMode successful
       disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_MOD_3_1.yaml b/src/app/tests/suites/certification/Test_TC_MOD_3_1.yaml
index a1b67ea..f94f850 100644
--- a/src/app/tests/suites/certification/Test_TC_MOD_3_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_MOD_3_1.yaml
@@ -29,10 +29,10 @@
       verification: |
           ./chip-tool modeselect read on-mode 1 1
 
-          on TH,Verify that the DUT response The attribute is nullable, and null is  valid value.
+          on TH(chip-tool),Verify that the DUT response The attribute is nullable, and null is also acceptable
 
           [1649678983.679893][10871:10876] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0050 Attribute 0x0000_0005 DataVersion: 4277065073
-          [1649678983.680002][10871:10876] CHIP:TOO:   OnMode: null
+          [1649678983.680002][10871:10876] CHIP:TOO:   OnMode: 0
       disabled: true
 
     - label: "TH reads the CurrentMode attribute from the DUT"
@@ -40,10 +40,10 @@
       verification: |
           ./chip-tool modeselect read current-mode 1 1
 
-          on TH,Verify that the DUT response is an integer. Record this value for usage in steps 2b.
+          on TH(chip-tool),Verify that the DUT response is an integer. Record this value for usage in steps 2b.
 
           [1649679034.895848][10879:10884] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0050 Attribute 0x0000_0003 DataVersion: 4277065073
-          [1649679034.895972][10879:10884] CHIP:TOO:   CurrentMode: 4
+          [1649679034.895972][10879:10884] CHIP:TOO:   CurrentMode: 0
       disabled: true
 
     - label:
@@ -60,7 +60,7 @@
       verification: |
           ./chip-tool modeselect read supported-modes 1 1
 
-          on TH,Verify that the DUT response provides a list of supported modes
+          on TH(chip-tool),Verify that the DUT response provides a list of supported modes
 
           [1654595268.854568][14400:14405] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0050 Attribute 0x0000_0002 DataVersion: 366231602
           [1654595268.854678][14400:14405] CHIP:TOO:   SupportedModes: 3 entries
@@ -103,27 +103,27 @@
       verification: |
           ./chip-tool modeselect change-to-mode 7 1 1
 
-          on TH,Verify that the DUT response with a successful (value 0x00) status response.
+          on TH(chip-tool),Verify that the DUT response with a successful (value 0x00) status response.
 
           [1645777419.711572][4798:4803] CHIP:DMG: Received Command Response Status for Endpoint=1 Cluster=0x0000_0050 Command=0x0000_0000 Status=0x0
       disabled: true
 
-    - label: "TH reads sends an Off command to the DUT"
+    - label: "TH sends an Off command to the DUT"
       PICS: OO.S.C00.Rsp && MOD.S.F00
       verification: |
           ./chip-tool onoff off 1 1
 
-          on TH,Verify that the DUT response with a successful (value 0x00) status response.
+          on TH(chip-tool),Verify that the DUT response with a successful (value 0x00) status response.
 
           [1649679101.658594][10886:10891] CHIP:DMG: Received Command Response Status for Endpoint=1 Cluster=0x0000_0006 Command=0x0000_0000 Status=0x0
       disabled: true
 
-    - label: "TH reads sends an On command to the DUT"
+    - label: "TH sends an On command to the DUT"
       PICS: OO.S.C01.Rsp && MOD.S.F00
       verification: |
           ./chip-tool onoff on 1 1
 
-          on TH,Verify that the DUT response with a successful (value 0x00) status response.
+          on TH(chip-tool),Verify that the DUT response with a successful (value 0x00) status response.
 
           [1649679156.146015][10893:10898] CHIP:DMG: Received Command Response Status for Endpoint=1 Cluster=0x0000_0006 Command=0x0000_0001 Status=0x0
       disabled: true
@@ -133,8 +133,8 @@
       verification: |
           ./chip-tool modeselect read current-mode 1 1
 
-          on TH,Verify that the DUT response is the integer recorded in step 1.
+          on TH(chip-tool),Verify that the DUT response is the integer recorded in step 1.
 
           [1649679202.069163][10899:10904] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0050 Attribute 0x0000_0003 DataVersion: 4277065073
-          [1649679202.069278][10899:10904] CHIP:TOO:   CurrentMode: 4
+          [1649679202.069278][10899:10904] CHIP:TOO:   CurrentMode: 0
       disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_MOD_3_2.yaml b/src/app/tests/suites/certification/Test_TC_MOD_3_2.yaml
index f0a19b1..6b91261 100644
--- a/src/app/tests/suites/certification/Test_TC_MOD_3_2.yaml
+++ b/src/app/tests/suites/certification/Test_TC_MOD_3_2.yaml
@@ -29,7 +29,7 @@
       verification: |
           ./chip-tool modeselect read start-up-mode 1 1
 
-          on TH,Verify that the DUT response is the integer. Record this value for usage in step 2.
+          on TH(chip-tool),Verify that the DUT response is the integer. Record this value for usage in step 2.
 
           [1645777708.406864][4841:4846] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0050 Attribute 0x0000_0003DataVersion: 3781469721
           [1645777708.406933][4841:4846] CHIP:TOO:   StartUpMode: 0
@@ -40,10 +40,10 @@
       verification: |
           ./chip-tool modeselect read current-mode 1 1
 
-          on TH,Verify that the DUT response is the integer. Record this value for usage in step 2b.
+          on TH(chip-tool),Verify that the DUT response is the integer. Record this value for usage in step 2b.
 
           [1645778146.171510][4876:4881] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0050 Attribute 0x0000_0000DataVersion: 3781469721
-          [1645778146.171602][4876:4881] CHIP:TOO:   CurrentMode: 4
+          [1645778146.171602][4876:4881] CHIP:TOO:   CurrentMode: 0
       disabled: true
 
     - label:
@@ -60,7 +60,7 @@
       verification: |
           ./chip-tool modeselect read supported-modes 1 1
 
-          on TH,Verify that the DUT response provides a list of supported modes
+          on TH(chip-tool),Verify that the DUT response provides a list of supported modes
 
           [1654153500.212649][3409:3414] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0050 Attribute 0x0000_0002 DataVersion: 2392545814
           [1654153500.212776][3409:3414] CHIP:TOO:   SupportedModes: 3 entries
@@ -101,7 +101,7 @@
       verification: |
           ./chip-tool modeselect change-to-mode 4 1 1
 
-          on TH,Verify that the DUT responds with a successful (value 0x00) status response.
+          on TH(chip-tool),Verify that the DUT responds with a successful (value 0x00) status response.
 
           [1645778189.045030][4888:4893] CHIP:DMG: Received Command Response Status for Endpoint=1 Cluster=0x0000_0050 Command=0x0000_0000 Status=0x0
       disabled: true
@@ -116,7 +116,7 @@
       verification: |
           ./chip-tool modeselect read current-mode 1 1
 
-          on TH,Verify that the DUT response is the integer recorded in step 1.
+          on TH(chip-tool),Verify that the DUT response is the integer recorded in step 1.
 
           [1645778146.171510][4876:4881] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0050 Attribute 0x0000_0000DataVersion: 3781469721
           [1645778146.171602][4876:4881] CHIP:TOO:   CurrentMode: 0
diff --git a/src/app/tests/suites/certification/Test_TC_MOD_3_3.yaml b/src/app/tests/suites/certification/Test_TC_MOD_3_3.yaml
index f7ae56c..1dec78d 100644
--- a/src/app/tests/suites/certification/Test_TC_MOD_3_3.yaml
+++ b/src/app/tests/suites/certification/Test_TC_MOD_3_3.yaml
@@ -29,7 +29,7 @@
       verification: |
           ./chip-tool modeselect read start-up-mode 1 1
 
-          on TH,Verify that the DUT response is the integer. Record this value for usage in step 2.
+          on TH(chip-tool),Verify that the DUT response is the integer. Record this value for usage in step 2.
 
           [1645778279.693082][4898:4903] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0050 Attribute 0x0000_0003DataVersion: 3781469722
           [1645778279.693151][4898:4903] CHIP:TOO:   StartUpMode: 0
@@ -40,10 +40,10 @@
       verification: |
           ./chip-tool modeselect read current-mode 1 1
 
-          on TH,Verify that the DUT response is the integer. Record this value for usage in step 2b and 3.
+          on TH(chip-tool),Verify that the DUT response is the integer. Record this value for usage in step 2b and 3.
 
           [1645778146.171510][4876:4881] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0050 Attribute 0x0000_0000DataVersion: 3781469721
-          [1645778146.171602][4876:4881] CHIP:TOO:   CurrentMode: 7
+          [1645778146.171602][4876:4881] CHIP:TOO:   CurrentMode: 0
       disabled: true
 
     - label:
@@ -60,7 +60,7 @@
       verification: |
           ./chip-tool modeselect read supported-modes 1 1
 
-          on TH,Verify that the DUT response provides a list of supported modes
+          on TH(chip-tool),Verify that the DUT response provides a list of supported modes
 
           [1645776742.667057][4661:4666] CHIP:TOO:   SupportedModes: 3 entries
           [1645776742.669546][4661:4666] CHIP:TOO:     [1]: {
@@ -88,7 +88,7 @@
       verification: |
           ./chip-tool modeselect change-to-mode 4 1 1
 
-          on TH,Verify that the DUT responds with a successful (value 0x00) status response.
+          on TH(chip-tool),Verify that the DUT responds with a successful (value 0x00) status response.
 
           [1645778189.045030][4888:4893] CHIP:DMG: Received Command Response Status for Endpoint=1 Cluster=0x0000_0050 Command=0x0000_0000 Status=0x0
       disabled: true
@@ -97,7 +97,17 @@
           "Perform an OTA update on the device that requires a reboot. Allow for
           the DUT to update and fully reboot."
       verification: |
-          Perform an OTA update on the device that requires a reboot. Allow for the DUT to update and fully reboot.
+          To perform an OTA update on Thread device follow the cmmds below:
+
+          Step-1 : ./chip-ota-provider-app -f ~/chip_repos/connectedhomeip/examples/all-clusters-app/nrfconnect/build2/zephyr/matter.ota
+
+          Step-2: ./chip-tool pairing onnetwork 2 20202021
+
+          Step-3 : ./chip-tool accesscontrol write acl "[{"fabricIndex": 1, "privilege": 5, "authMode": 2, "subjects": [112233], "targets": null}, {"fabricIndex": 1, "privilege": 3, "authMode": 2, "subjects": null, "targets": [{"cluster": 41, "endpoint": null, "deviceType": null}]}]" 2 0
+
+          Step-4: ./chip-tool otasoftwareupdaterequestor write default-ota-providers "[{"fabricIndex": 1, "providerNodeID": 2, "endpoint": 0}]" 1 0
+
+          Step-5: ./chip-tool otasoftwareupdaterequestor announce-ota-provider 2 0 0 0 1 0
       disabled: true
 
     - label: "TH reads the CurrentMode attribute from the DUT"
@@ -105,7 +115,7 @@
       verification: |
           ./chip-tool modeselect read current-mode 1 1
 
-          on TH,Verify that the DUT response is the integer recorded in step 2a or, if the mode was changed, 2d.
+          on TH(chip-tool),Verify that the DUT response is the integer recorded in step 2a or, if the mode was changed, 2d.
 
           [1645778146.171510][4876:4881] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0050 Attribute 0x0000_0000DataVersion: 3781469721
           [1645778146.171602][4876:4881] CHIP:TOO:   CurrentMode: 4
diff --git a/src/app/tests/suites/certification/Test_TC_MOD_3_4.yaml b/src/app/tests/suites/certification/Test_TC_MOD_3_4.yaml
index b6c5134..56dc6c9 100644
--- a/src/app/tests/suites/certification/Test_TC_MOD_3_4.yaml
+++ b/src/app/tests/suites/certification/Test_TC_MOD_3_4.yaml
@@ -31,7 +31,7 @@
       verification: |
           ./chip-tool modeselect read start-up-mode 1 1
 
-          on TH,Verify that the DUT response is the integer. Record this value for usage in step 2.
+          on TH(chip-tool),Verify that the DUT response is the integer. Record this value for usage in step 2.
 
 
           [1651099663211] [82177:7560652] CHIP: [TOO] Endpoint: 1 Cluster: 0x0000_0050 Attribute 0x0000_0004 DataVersion: 2609052118
@@ -43,7 +43,7 @@
       verification: |
           ./chip-tool modeselect read on-mode 1 1
 
-          on TH,Verify that the DUT response is the integer. Record this value for usage in step 2b.
+          on TH(chip-tool),Verify that the DUT response is the integer. Record this value for usage in step 2b.
 
 
           [1654780979.979743][61542:61547] CHIP:DMG: }
@@ -65,7 +65,7 @@
       verification: |
           ./chip-tool modeselect read supported-modes 1 1
 
-          on TH,Verify that the DUT response provides a list of supported modes
+          on TH(chip-tool),Verify that the DUT response provides a list of supported modes
 
           [1654154058.284710][3492:3497] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0050 Attribute 0x0000_0002 DataVersion: 694763126
           [1654154058.284829][3492:3497] CHIP:TOO:   SupportedModes: 3 entries
@@ -106,7 +106,7 @@
       verification: |
           ./chip-tool modeselect write on-mode 7 1 1
 
-          on TH,Verify that the DUT with a successful (value 0x00) status response.
+          on TH(chip-tool),Verify that the DUT with a successful (value 0x00) status response.
 
           [1651099941884] [84269:7567211] CHIP: [DMG] WriteResponseMessage =
           [1651099941884] [84269:7567211] CHIP: [DMG] {
@@ -139,10 +139,10 @@
       verification: |
           ./chip-tool modeselect read on-mode 1 1
 
-          on TH,Verify that the DUT responds with an integer
+          on TH(chip-tool),Verify that the DUT responds with an integer
 
           [1651100140426] [84609:7569911] CHIP: [TOO] Endpoint: 1 Cluster: 0x0000_0050 Attribute 0x0000_0005 DataVersion: 2609052120
-          [1651100140426] [84609:7569911] CHIP: [TOO]   OnMode: 7
+          [1651100140426] [84609:7569911] CHIP: [TOO]   OnMode: 4
       disabled: true
 
     - label:
@@ -151,7 +151,7 @@
       verification: |
           ./chip-tool onoff write start-up-on-off 1 1 1
 
-          on TH,Verify that the response status was success
+          on TH(chip-tool),Verify that the response status was success
 
           [1651101661959] [90832:7598169] CHIP: [DMG] WriteResponseMessage =
           [1651101661959] [90832:7598169] CHIP: [DMG] {
@@ -190,7 +190,7 @@
           ./chip-tool modeselect read current-mode 1 1
 
 
-          on TH,Verify that this number is the same with the number recorded in step 3
+          on TH(chip-tool),Verify that this number is the same with the number recorded in step 3
 
           [1645778146.171510][4876:4881] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0050 Attribute 0x0000_0003 DataVersion: 2609052120
           [1645778146.171602][4876:4881] CHIP:TOO:   CurrentMode: 4
diff --git a/src/app/tests/suites/certification/Test_TC_OCC_2_2.yaml b/src/app/tests/suites/certification/Test_TC_OCC_2_2.yaml
index c86fb0a..5149c82 100644
--- a/src/app/tests/suites/certification/Test_TC_OCC_2_2.yaml
+++ b/src/app/tests/suites/certification/Test_TC_OCC_2_2.yaml
@@ -34,7 +34,7 @@
       verification: |
           ./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
+          verify the " occupancy response" on the TH (all-cluster-app) log:
 
           [1657906563.293939][2361:2361] CHIP:IM: Received Read request
           [1657906563.294045][2361:2361] CHIP:DMG: ReadRequestMessage =
@@ -60,7 +60,7 @@
       verification: |
           ./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
+          verify the " occupancy-sensor-type response" on the TH (all-cluster-app) log:
 
           [1657906599.161154][2361:2361] CHIP:IM: Received Read request
           [1657906599.161269][2361:2361] CHIP:DMG: ReadRequestMessage =
@@ -88,7 +88,7 @@
       verification: |
           ./chip-tool occupancysensing read occupancy-sensor-type-bitmap 1 1
 
-          verify On TH(Reference app) receives the right Read Request Message for the data sent in the above command
+          verify the " occupancy-sensor-type-bitmap response" on the TH (all-cluster-app) log:
 
           [1657906629.182638][2361:2361] CHIP:IM: Received Read request
           [1657906629.182760][2361:2361] CHIP:DMG: ReadRequestMessage =
@@ -119,7 +119,7 @@
 
           ./chip-tool occupancysensing read pir-occupied-to-unoccupied-delay 1 1
 
-          verify On TH(Reference app) receives the right Read Request Message for the data sent in the above command
+          verify the " pir-occupied-to-unoccupied-delay response" on the TH (all-cluster-app) log:
 
           [1657906650.927182][2361:2361] CHIP:IM: Received Read request
           [1657906650.927324][2361:2361] CHIP:DMG: ReadRequestMessage =
@@ -150,7 +150,7 @@
 
            ./chip-tool occupancysensing read  pir-unoccupied-to-occupied-delay  1 1
 
-          verify On TH(Reference app) receives the right Read Request Message for the data sent in the above command
+          verify the " pir-unoccupied-to-occupied-delay response" on the TH (all-cluster-app) log:
 
           [1657906670.678493][2361:2361] CHIP:IM: Received Read request
           [1657906670.678680][2361:2361] CHIP:DMG: ReadRequestMessage =
@@ -181,7 +181,7 @@
 
           ./chip-tool occupancysensing read pir-unoccupied-to-occupied-threshold  1 1
 
-          verify On TH(Reference app) receives the right Read Request Message for the data sent in the above command
+          verify the " pir-unoccupied-to-occupied-threshold response" on the TH (all-cluster-app) log:
 
           [1657906696.122069][2361:2361] CHIP:IM: Received Read request
           [1657906696.122210][2361:2361] CHIP:DMG: ReadRequestMessage =
@@ -213,7 +213,7 @@
 
           ./chip-tool occupancysensing read ultrasonic-occupied-to-unoccupied-delay  1 1
 
-          verify On TH(Reference app) receives the right Read Request Message for the data sent in the above command
+          verify the " ultrasonic-occupied-to-unoccupied-delay response" on the TH (all-cluster-app) log:
 
           [1657906729.107330][2361:2361] CHIP:IM: Received Read request
           [1657906729.107455][2361:2361] CHIP:DMG: ReadRequestMessage =
@@ -245,7 +245,7 @@
 
           ./chip-tool occupancysensing read  ultrasonic-unoccupied-to-occupied-delay 1 1
 
-          verify On TH(Reference app) receives the right Read Request Message for the data sent in the above command
+          verify the " ultrasonic-unoccupied-to-occupied-delay response" on the TH (all-cluster-app) log:
 
           [1657906752.147785][2361:2361] CHIP:IM: Received Read request
           [1657906752.147914][2361:2361] CHIP:DMG: ReadRequestMessage =
@@ -278,7 +278,7 @@
 
           ./chip-tool occupancysensing read ultrasonic-unoccupied-to-occupied-threshold 1 1
 
-          verify On TH(Reference app) receives the right Read Request Message for the data sent in the above command
+          verify the " ultrasonic-unoccupied-to-occupied-threshold response" on the TH (all-cluster-app) log:
 
           [1657906770.663661][2361:2361] CHIP:IM: Received Read request
           [1657906770.663787][2361:2361] CHIP:DMG: ReadRequestMessage =
@@ -309,7 +309,7 @@
 
           ./chip-tool occupancysensing read physical-contact-occupied-to-unoccupied-delay 1 1
 
-          verify On TH(Reference app) receives the right Read Request Message for the data sent in the above command
+          verify the " physical-contact-occupied-to-unoccupied-delay response" on the TH (all-cluster-app) log:
 
           [1657906788.836643][2361:2361] CHIP:IM: Received Read request
           [1657906788.836806][2361:2361] CHIP:DMG: ReadRequestMessage =
@@ -341,7 +341,7 @@
 
           ./chip-tool occupancysensing read physical-contact-unoccupied-to-occupied-delay 1 1
 
-          verify On TH(Reference app) receives the right Read Request Message for the data sent in the above command
+          verify the " physical-contact-unoccupied-to-occupied-delay response" on the TH (all-cluster-app) log:
 
           [1657906806.229307][2361:2361] CHIP:IM: Received Read request
           [1657906806.229449][2361:2361] CHIP:DMG: ReadRequestMessage =
@@ -373,7 +373,7 @@
 
           ./chip-tool occupancysensing read  physical-contact-unoccupied-to-occupied-threshold 1 1
 
-          verify On TH(Reference app) receives the right Read Request Message for the data sent in the above command
+          verify the " physical-contact-unoccupied-to-occupied-threshold response" on the TH (all-cluster-app) log:
 
           [1657906821.965692][2361:2361] CHIP:IM: Received Read request
           [1657906821.965776][2361:2361] CHIP:DMG: ReadRequestMessage =
diff --git a/src/app/tests/suites/certification/Test_TC_OCC_2_3.yaml b/src/app/tests/suites/certification/Test_TC_OCC_2_3.yaml
index f87b86e..83249b0 100644
--- a/src/app/tests/suites/certification/Test_TC_OCC_2_3.yaml
+++ b/src/app/tests/suites/certification/Test_TC_OCC_2_3.yaml
@@ -36,7 +36,7 @@
       verification: |
           ./chip-tool occupancysensing read occupancy-sensor-type 1 1
 
-          on TH , Verify that the DUT response contains a non-reserved value:
+          Verify occupancy sensor type value on the TH(Chip-tool) Log:
 
           [1648461912.765825][9300:9306] CHIP:DMG: }
           [1648461912.766013][9300:9306] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0406 Attribute 0x0000_0001 DataVersion: 3082917122
@@ -48,7 +48,7 @@
       verification: |
           ./chip-tool occupancysensing read occupancy-sensor-type-bitmap 1 1
 
-          on TH , Verify that the DUT response contains a bitmap value:
+          Verify occupancy sensor type bitmap value on the TH(Chip-tool) Log:
 
           [1648461918.499009][9307:9312] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0406 Attribute 0x0000_0002 DataVersion: 3082917122
           [1648461918.499082][9307:9312] CHIP:TOO:   occupancy sensor type bitmap: 1
diff --git a/src/app/tests/suites/certification/Test_TC_OCC_2_4.yaml b/src/app/tests/suites/certification/Test_TC_OCC_2_4.yaml
index 53f3b28..a44fb8e 100644
--- a/src/app/tests/suites/certification/Test_TC_OCC_2_4.yaml
+++ b/src/app/tests/suites/certification/Test_TC_OCC_2_4.yaml
@@ -36,7 +36,7 @@
       verification: |
           ./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
+          verify the " occupancy-sensor-type response" on the TH (all-cluster-app) log:
 
           [1657906852.014556][2361:2361] CHIP:IM: Received Read request
           [1657906852.014724][2361:2361] CHIP:DMG: ReadRequestMessage =
@@ -62,7 +62,7 @@
       verification: |
           ./chip-tool occupancysensing read occupancy-sensor-type-bitmap 1 1
 
-          verify On TH(Reference app) receives the right Read Request Message for the data sent in the above command
+          verify the " occupancy-sensor-type-bitmap response" on the TH (all-cluster-app) log:
 
           [1657906867.937264][2361:2361] CHIP:IM: Received Read request
           [1657906867.937390][2361:2361] CHIP:DMG: ReadRequestMessage =
diff --git a/src/app/tests/suites/certification/Test_TC_OO_3_1.yaml b/src/app/tests/suites/certification/Test_TC_OO_3_1.yaml
index db9849c..d4affdb 100644
--- a/src/app/tests/suites/certification/Test_TC_OO_3_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_OO_3_1.yaml
@@ -36,7 +36,7 @@
 
           ./chip-tool onoff read on-off 1 1
 
-          Verify in TH all-clusters-app log
+          verify the " on-off response" on the TH (all-cluster-app) log:
 
           [1650535426.653349][3678:3678] CHIP:IM: Received Read request
           [1650535426.653451][3678:3678] CHIP:DMG: ReadRequestMessage =
@@ -58,7 +58,7 @@
 
           ./chip-tool onoff read global-scene-control 1 1
 
-          Verify in TH all-clusters-app log
+          verify the " global-scene-control response" on the TH (all-cluster-app) log:
 
           [...]
           [1650535491.289766][3678:3678] CHIP:IM: Received Read request
@@ -81,7 +81,7 @@
 
           ./chip-tool onoff read on-time 1 1
 
-          Verify in TH all-clusters-app log
+          verify the " on-time-control response" on the TH (all-cluster-app) log:
 
           [...]
           [1650535552.255428][3678:3678] CHIP:IM: Received Read request
@@ -105,7 +105,7 @@
 
           ./chip-tool onoff read off-wait-time 1 1
 
-          Verify in TH all-clusters-app log
+          verify the " off-wait-time response" on the TH (all-cluster-app) log:
 
           [...]
           [1650535606.512822][3678:3678] CHIP:IM: Received Read request
@@ -128,7 +128,7 @@
 
           ./chip-tool onoff read start-up-on-off 1 1
 
-          Verify in TH all-clusters-app log
+          verify the " start-up-on-off response" on the TH (all-cluster-app) log:
 
           [...]
           [1650535667.846050][3678:3678] CHIP:IM: Received Read request
@@ -154,7 +154,7 @@
           "DUT reads all supported optional attributes from TH one at a time in
           a manufacturer specific order"
       verification: |
-          This cluster doesn't have any  optional attribute
+          This cluster doesn"t have any  optional attribute
       disabled: true
 
     - label:
@@ -167,7 +167,7 @@
 
           ./chip-tool onoff write on-time 1 1 1
 
-          Verify in TH all-clusters-app log
+          verify the WriteRequestMessage of " on-time" on the TH (all-cluster-app) log:
 
           [1650536057.105214][3678:3678] CHIP:DMG: WriteRequestMessage =
           [1650536057.105276][3678:3678] CHIP:DMG: {
@@ -195,7 +195,7 @@
 
           ./chip-tool onoff write off-wait-time 22 1 1
 
-          Verify in TH all-clusters-app log
+          verify the WriteRequestMessage of " off-wait-time" on the TH (all-cluster-app) log:
 
           [1650536319.716722][3678:3678] CHIP:IM: Received Write request
           [1650536319.716777][3678:3678] CHIP:DMG: IM WH moving to [Initialized]
@@ -223,14 +223,14 @@
 
           ./chip-tool onoff write start-up-on-off 60 1 1
 
-          Verify in TH all-clusters-app log
+          verify the WriteRequestMessage of " start-up-on-off " on the TH (all-cluster-app) log:
 
           [1650536431.411044][3678:3678] CHIP:DMG: WriteRequestMessage =
           [1650536431.411090][3678:3678] CHIP:DMG: {
           [1650536431.411132][3678:3678] CHIP:DMG:         suppressResponse = false,
           [1650536431.411180][3678:3678] CHIP:DMG:         timedRequest = false,
           [1650536431.411224][3678:3678] CHIP:DMG:         AttributeDataIBs =
-          [1650536431.411278][3678:3678] CHIP:DMG:         [
+          [1650536431.411278][3678:3678] CHIP:DMG:         [4
           [1650536431.411323][3678:3678] CHIP:DMG:                 AttributeDataIB =
           [1650536431.411386][3678:3678] CHIP:DMG:                 {
           [1650536431.411434][3678:3678] CHIP:DMG:                         AttributePathIB =
@@ -254,7 +254,7 @@
           "DUT writes a suitable value to all supported optional attributes on
           the TH one at a time in a manufacturer specific order"
       verification: |
-          This cluster doesn't have any optional attributes
+          This cluster doesn"t have any optional attributes
       disabled: true
 
     - label:
@@ -270,21 +270,30 @@
 
            ./chip-tool onoff read attribute-list 1 1
 
-          Verify in TH all-clusters-app log
+          verify the " attribute-list response" on the TH (all-cluster-minimal-app) log:
 
-          [1654242750470] [91276:3990451] CHIP: [TOO] Endpoint: 1 Cluster: 0x0000_0006 Attribute 0x0000_FFFB DataVersion: 2879590817
-          [1654242750471] [91276:3990451] CHIP: [TOO]   AttributeList: 6 entries
-          [1654242750471] [91276:3990451] CHIP: [TOO]     [1]: 0
-          [1654242750471] [91276:3990451] CHIP: [TOO]     [2]: 65528
-          [1654242750471] [91276:3990451] CHIP: [TOO]     [3]: 65529
-          [1654242750471] [91276:3990451] CHIP: [TOO]     [4]: 65531
-          [1654242750471] [91276:3990451] CHIP: [TOO]     [5]: 65532
-          [1654242750471] [91276:3990451] CHIP: [TOO]     [6]: 65533
+          [1657906380.687418][2361:2361] CHIP:DMG: ReadRequestMessage =
+          [1657906380.687448][2361:2361] CHIP:DMG: {
+          [1657906380.687471][2361:2361] CHIP:DMG:        AttributePathIBs =
+          [1657906380.687497][2361:2361] CHIP:DMG:        [
+          [1657906380.687520][2361:2361] CHIP:DMG:                AttributePathIB =
+          [1657906380.687556][2361:2361] CHIP:DMG:                {
+          [1657906380.687587][2361:2361] CHIP:DMG:                        Endpoint = 0x1,
+          [1657906380.687624][2361:2361] CHIP:DMG:                        Cluster = 0x6,
+          [1657906380.687677][2361:2361] CHIP:DMG:                        Attribute = 0x0000_FFFB,
+          [1657906380.687712][2361:2361] CHIP:DMG:                }
+          [1657906380.687744][2361:2361] CHIP:DMG:
+          [1657906380.687783][2361:2361] CHIP:DMG:        ],
+          [1657906380.687814][2361:2361] CHIP:DMG:
+          [1657906380.687844][2361:2361] CHIP:DMG:        isFabricFiltered = true,
+          [1657906380.687872][2361:2361] CHIP:DMG:        InteractionModelRevision = 1
+          [1657906380.687904][2361:2361] CHIP:DMG: },
+
 
 
           ./chip-tool onoff read on-off 1 1
 
-          Verify in TH all-clusters-app log
+          verify the " on-off response" on the TH (all-cluster-minimal-app) log:
 
           [1650535426.653349][3678:3678] CHIP:IM: Received Read request
           [1650535426.653451][3678:3678] CHIP:DMG: ReadRequestMessage =
@@ -306,7 +315,7 @@
 
           ./chip-tool onoff read global-scene-control 1 1
 
-          Verify in TH all-clusters-app log
+          verify the " global-scene-control response" on the TH (all-cluster-minimal-app) log:
 
           [...]
           [1650535491.289766][3678:3678] CHIP:IM: Received Read request
@@ -329,7 +338,7 @@
 
           ./chip-tool onoff read on-time 1 1
 
-          Verify in TH all-clusters-app log
+          verify the " on-time response" on the TH (all-cluster-minimal-app) log:
 
           [...]
           [1650535552.255428][3678:3678] CHIP:IM: Received Read request
@@ -353,7 +362,7 @@
 
           ./chip-tool onoff read off-wait-time 1 1
 
-          Verify in TH all-clusters-app log
+          verify the " off-wait-time response" on the TH (all-cluster-minimal-app) log:
 
           [...]
           [1650535606.512822][3678:3678] CHIP:IM: Received Read request
@@ -376,7 +385,7 @@
 
           ./chip-tool onoff read start-up-on-off 1 1
 
-          Verify in TH all-clusters-app log
+          verify the " start-up-on-off response" on the TH (all-cluster-minimal-app) log:
 
           [...]
           [1650535667.846050][3678:3678] CHIP:IM: Received Read request
@@ -402,12 +411,12 @@
           "DUT reads all supported optional attributes from TH one at a time in
           a manufacturer specific order"
       verification: |
-          This cluster doesn't have any optional attributes
+          This cluster doesn"t have any optional attributes
       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: |
-          This cluster doesn't have any optional attributes
+          This cluster doesn"t have any optional attributes
       disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_OO_3_2.yaml b/src/app/tests/suites/certification/Test_TC_OO_3_2.yaml
index 4f04e12..5730c31 100644
--- a/src/app/tests/suites/certification/Test_TC_OO_3_2.yaml
+++ b/src/app/tests/suites/certification/Test_TC_OO_3_2.yaml
@@ -31,8 +31,14 @@
 
           ./chip-tool onoff off 1 1
 
+          verify the " Off command response" on the TH (all-cluster-app) log:
 
-          Verify in TH all-clusters-app log
+          StatusIB =
+          {
+                  status = 0x00,
+          },
+
+          Verify in TH as all-clusters app (Optional log verification in TH as server side)
 
           [1650537121.464763][3678:3678] CHIP:DMG: InvokeRequestMessage =
           [1650537121.464818][3678:3678] CHIP:DMG: {
@@ -73,7 +79,7 @@
           ./chip-tool onoff on 1 1
 
 
-          Verify in TH all-clusters-app log
+          verify the " On command response" on the TH (all-cluster-app) log:
 
           [1650537309.217556][3678:3678] CHIP:DMG: InvokeRequestMessage =
           [1650537309.217647][3678:3678] CHIP:DMG: {
@@ -114,7 +120,7 @@
           ./chip-tool onoff toggle 1 1
 
 
-          Verify in TH all-clusters-app log
+          verify the " Toggle command response" on the TH (all-cluster-app) log:
 
           [1650537502.260837][3678:3678] CHIP:DMG: InvokeRequestMessage =
           [1650537502.260877][3678:3678] CHIP:DMG: {
@@ -155,7 +161,7 @@
           ./chip-tool onoff off-with-effect 1 2 1 1
 
 
-          Verify in TH all-clusters-app log
+          verify the " OffWithEffect command response" on the TH (all-cluster-app) log:
 
           [1650538107.639049][3678:3678] CHIP:DMG: InvokeRequestMessage =
           [1650538107.639115][3678:3678] CHIP:DMG: {
@@ -205,7 +211,7 @@
           ./chip-tool onoff on-with-recall-global-scene 1 1
 
 
-          Verify in TH all-clusters-app log
+          verify the " OnWithRecallGlobalScene command response" on the TH (all-cluster-app) log:
 
           [1650537790.690122][3678:3678] CHIP:DMG: InvokeRequestMessage =
           [1650537790.690188][3678:3678] CHIP:DMG: {
@@ -249,7 +255,7 @@
           ./chip-tool onoff on-with-timed-off 0 120 5 1 1
 
 
-          Verify in TH all-clusters-app log
+          verify the " OnWithTimedOff command response" on the TH (all-cluster-app) log:
 
           [1650538315.673606][3678:3678] CHIP:DMG: InvokeRequestMessage =
           [1650538315.673697][3678:3678] CHIP:DMG: {
diff --git a/src/app/tests/suites/certification/Test_TC_PCC_3_1.yaml b/src/app/tests/suites/certification/Test_TC_PCC_3_1.yaml
index 854da1c..1c3774b 100644
--- a/src/app/tests/suites/certification/Test_TC_PCC_3_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_PCC_3_1.yaml
@@ -32,11 +32,10 @@
           "DUT reads all supported mandatory 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
-
           ./chip-tool pumpconfigurationandcontrol read max-pressure 1 1
 
-          Verify in TH all-clusters-app log
+          verify on TH all-cluster-app receives the right ReadRequest for the data sent in the above command
+
 
           [1651148412.273866][2336:2336] CHIP:IM: Received Read request
           [1651148412.273922][2336:2336] CHIP:DMG: ReadRequestMessage =
@@ -59,7 +58,7 @@
 
           ./chip-tool pumpconfigurationandcontrol read max-speed 1 1
 
-          Verify in TH all-clusters-app log
+          Verify in DUT as client side Log
 
           [1651148440.471321][2336:2336] CHIP:IM: Received Read request
           [1651148440.471389][2336:2336] CHIP:DMG: ReadRequestMessage =
@@ -83,7 +82,7 @@
 
           ./chip-tool pumpconfigurationandcontrol read max-flow 1 1
 
-          Verify in TH all-clusters-app log
+          Verify in DUT as client side Log
 
           [1651148472.518933][2336:2336] CHIP:IM: Received Read request
           [1651148472.518993][2336:2336] CHIP:DMG: ReadRequestMessage =
@@ -107,7 +106,7 @@
 
           ./chip-tool pumpconfigurationandcontrol read effective-operation-mode 1 1
 
-          Verify in TH all-clusters-app log
+          Verify in DUT as client side Log
 
           [1651570515.206834][9246:9246] CHIP:IM: Received Read request
           [1651570515.206917][9246:9246] CHIP:DMG: ReadRequestMessage =
@@ -129,7 +128,7 @@
 
           ./chip-tool pumpconfigurationandcontrol read effective-control-mode 1 1
 
-          Verify in TH all-clusters-app log
+          Verify in DUT as client side Log
 
           [1651570975.559213][9246:9246] CHIP:IM: Received Read request
           [1651570975.559268][9246:9246] CHIP:DMG: ReadRequestMessage =
@@ -148,7 +147,7 @@
 
           ./chip-tool pumpconfigurationandcontrol read capacity  1 1
 
-          Verify in TH all-clusters-app log
+          Verify in DUT as client side Log
 
           [1651571009.295069][9246:9246] CHIP:IM: Received Read request
           [1651571009.295158][9246:9246] CHIP:DMG: ReadRequestMessage =
@@ -167,7 +166,7 @@
 
           ./chip-tool pumpconfigurationandcontrol read  operation-mode 1 1
 
-          Verify in TH all-clusters-app log
+          Verify in DUT as client side Log
 
           [1651571334.617100][9337:9337] CHIP:IM: Received Read request
           [1651571334.617155][9337:9337] CHIP:DMG: ReadRequestMessage =
@@ -193,7 +192,7 @@
 
           ./chip-tool pumpconfigurationandcontrol read min-const-pressure 1 1
 
-          Verify in TH all-clusters-app log
+          Verify in DUT as client side Log
 
           [1651148507.711384][2336:2336] CHIP:IM: Received Read request
           [1651148507.711452][2336:2336] CHIP:DMG: ReadRequestMessage =
@@ -217,7 +216,7 @@
 
           ./chip-tool pumpconfigurationandcontrol read max-const-pressure 1 1
 
-          Verify in TH all-clusters-app log
+          Verify in DUT as client side Log
 
           [1651148537.336390][2336:2336] CHIP:IM: Received Read request
           [1651148537.336445][2336:2336] CHIP:DMG: ReadRequestMessage =
@@ -241,7 +240,7 @@
 
           ./chip-tool pumpconfigurationandcontrol read min-comp-pressure  1 1
 
-          Verify in TH all-clusters-app log
+          Verify in DUT as client side Log
 
           [1651148566.361843][2336:2336] CHIP:IM: Received Read request
           [1651148566.361897][2336:2336] CHIP:DMG: ReadRequestMessage =
@@ -263,7 +262,7 @@
 
           ./chip-tool pumpconfigurationandcontrol read max-comp-pressure  1 1
 
-          Verify in TH all-clusters-app log
+          Verify in DUT as client side Log
 
           [1651148595.417817][2336:2336] CHIP:IM: Received Read request
           [1651148595.417901][2336:2336] CHIP:DMG: ReadRequestMessage =
@@ -287,7 +286,7 @@
 
           ./chip-tool pumpconfigurationandcontrol read min-const-speed 1 1
 
-          Verify in TH all-clusters-app log
+          Verify in DUT as client side Log
 
           [1651148626.823098][2336:2336] CHIP:IM: Received Read request
           [1651148626.823201][2336:2336] CHIP:DMG: ReadRequestMessage =
@@ -332,7 +331,7 @@
 
           ./chip-tool pumpconfigurationandcontrol read min-const-flow 1 1
 
-          Verify in TH all-clusters-app log
+          Verify in DUT as client side Log
 
           [1651564163.319315][8748:8748] CHIP:IM: Received Read request
           [1651564163.319399][8748:8748] CHIP:DMG: ReadRequestMessage =
@@ -356,7 +355,7 @@
 
           ./chip-tool pumpconfigurationandcontrol read min-const-flow 1 1
 
-          Verify in TH all-clusters-app log
+          Verify in DUT as client side Log
 
           [1651564163.319315][8748:8748] CHIP:IM: Received Read request
           [1651564163.319399][8748:8748] CHIP:DMG: ReadRequestMessage =
@@ -379,7 +378,7 @@
 
           ./chip-tool pumpconfigurationandcontrol read max-const-flow  1 1
 
-          Verify in TH all-clusters-app log
+          Verify in DUT as client side Log
 
           [1651564281.857728][8748:8748] CHIP:IM: Received Read request
           [1651564281.857784][8748:8748] CHIP:DMG: ReadRequestMessage =
@@ -401,7 +400,7 @@
 
           ./chip-tool pumpconfigurationandcontrol read min-const-temp 1 1
 
-          Verify in TH all-clusters-app log
+          Verify in DUT as client side Log
 
           [1651564317.488333][8748:8748] CHIP:IM: Received Read request
           [1651564317.488417][8748:8748] CHIP:DMG: ReadRequestMessage =
@@ -423,7 +422,7 @@
 
           ./chip-tool pumpconfigurationandcontrol read max-const-temp 1 1
 
-          Verify in TH all-clusters-app log
+          Verify in DUT as client side Log
 
           [1651564350.267434][8748:8748] CHIP:IM: Received Read request
           [1651564350.267489][8748:8748] CHIP:DMG: ReadRequestMessage =
@@ -445,7 +444,7 @@
 
            ./chip-tool pumpconfigurationandcontrol read pump-status 1 1
 
-          Verify in TH all-clusters-app log
+          Verify in DUT as client side Log
 
           [1651564415.272861][8748:8748] CHIP:IM: Received Read request
           [1651564415.272946][8748:8748] CHIP:DMG: ReadRequestMessage =
@@ -467,7 +466,7 @@
 
           ./chip-tool pumpconfigurationandcontrol read speed  1 1
 
-          Verify in TH all-clusters-app log
+          Verify in DUT as client side Log
 
           [1651571041.252491][9246:9246] CHIP:IM: Received Read request
           [1651571041.252548][9246:9246] CHIP:DMG: ReadRequestMessage =
@@ -511,7 +510,7 @@
 
           ./chip-tool pumpconfigurationandcontrol read  power 1 1
 
-          Verify in TH all-clusters-app log
+          Verify in DUT as client side Log
 
           [1651571264.121840][9337:9337] CHIP:IM: Received Read request
           [1651571264.121896][9337:9337] CHIP:DMG: ReadRequestMessage =
@@ -533,7 +532,7 @@
 
           ./chip-tool pumpconfigurationandcontrol read  lifetime-energy-consumed  1  1
 
-          Verify in TH all-clusters-app log
+          Verify in DUT as client side Log
 
           [1651571293.017448][9337:9337] CHIP:IM: Received Read request
           [1651571293.017534][9337:9337] CHIP:DMG: ReadRequestMessage =
@@ -555,7 +554,7 @@
 
           ./chip-tool pumpconfigurationandcontrol read  control-mode 1 1
 
-          Verify in TH all-clusters-app log
+          Verify in DUT as client side Log
 
           [1651571369.365807][9337:9337] CHIP:IM: Received Read request
           [1651571369.365907][9337:9337] CHIP:DMG: ReadRequestMessage =
@@ -584,7 +583,7 @@
 
           ./chip-tool pumpconfigurationandcontrol write operation-mode 0 1 1
 
-          Verify in TH all-clusters-app log
+          Verify in DUT as client side Log
 
           [1652858465.008652][2107:2107] CHIP:IM: Received Write request
           [1652858465.008695][2107:2107] CHIP:DMG: IM WH moving to [Initialized]
@@ -623,7 +622,7 @@
 
           ./chip-tool pumpconfigurationandcontrol write control-mode 0 1 1
 
-          Verify in TH all-clusters-app log
+          Verify in DUT as client side Log
 
           [1652858653.083434][2107:2107] CHIP:IM: Received Write request
           [1652858653.083469][2107:2107] CHIP:DMG: IM WH moving to [Initialized]
@@ -656,7 +655,7 @@
 
            ./chip-tool pumpconfigurationandcontrol write lifetime-running-hours 1 1 1
 
-          Verify in TH all-clusters-app log
+          Verify in DUT as client side Log
 
           [1652858777.844427][2107:2107] CHIP:IM: Received Write request
           [1652858777.844450][2107:2107] CHIP:DMG: IM WH moving to [Initialized]
@@ -689,7 +688,7 @@
 
           ./chip-tool pumpconfigurationandcontrol write lifetime-energy-consumed  1 1 1
 
-          Verify in TH all-clusters-app log
+          Verify in DUT as client side Log
 
           [1652858844.149759][2107:2107] CHIP:IM: Received Write request
           [1652858844.149801][2107:2107] CHIP:DMG: IM WH moving to [Initialized]
@@ -731,7 +730,7 @@
 
            ./chip-tool pumpconfigurationandcontrol read attribute-list  1 1
 
-          Verify in TH all-clusters-app log
+          Verify in DUT as client side Log
 
           [1654247307401] [91803:4011207] CHIP: [TOO] Endpoint: 1 Cluster: 0x0000_0200 Attribute 0x0000_FFFB DataVersion: 3055704159
           [1654247307401] [91803:4011207] CHIP: [TOO]   AttributeList: 12 entries
@@ -751,7 +750,7 @@
 
           ./chip-tool pumpconfigurationandcontrol  read feature-map  1 1
 
-          Verify in TH all-clusters-app log
+          Verify in DUT as client side Log
 
           [1656478569086] [49565:5734437] CHIP: [TOO] Endpoint: 1 Cluster: 0x0000_0200 Attribute 0x0000_FFFC DataVersion: 1816685251
           [1656478569086] [49565:5734437] CHIP: [TOO]   FeatureMap: 0
@@ -760,7 +759,7 @@
 
           ./chip-tool pumpconfigurationandcontrol read max-pressure 1 1
 
-          Verify in TH all-clusters-app log
+          Verify in DUT as client side Log
 
           [1651148412.273866][2336:2336] CHIP:IM: Received Read request
           [1651148412.273922][2336:2336] CHIP:DMG: ReadRequestMessage =
@@ -783,7 +782,7 @@
 
           ./chip-tool pumpconfigurationandcontrol read max-speed 1 1
 
-          Verify in TH all-clusters-app log
+          Verify in DUT as client side Log
 
           [1651148440.471321][2336:2336] CHIP:IM: Received Read request
           [1651148440.471389][2336:2336] CHIP:DMG: ReadRequestMessage =
@@ -807,7 +806,7 @@
 
           ./chip-tool pumpconfigurationandcontrol read max-flow 1 1
 
-          Verify in TH all-clusters-app log
+          Verify in DUT as client side Log
 
           [1651148472.518933][2336:2336] CHIP:IM: Received Read request
           [1651148472.518993][2336:2336] CHIP:DMG: ReadRequestMessage =
@@ -831,7 +830,7 @@
 
           ./chip-tool pumpconfigurationandcontrol read effective-operation-mode 1 1
 
-          Verify in TH all-clusters-app log
+          Verify in DUT as client side Log
 
 
           [1651570515.206834][9246:9246] CHIP:IM: Received Read request
@@ -854,7 +853,7 @@
 
           ./chip-tool pumpconfigurationandcontrol read effective-control-mode 1 1
 
-          Verify in TH all-clusters-app log
+          Verify in DUT as client side Log
 
           [1651570975.559213][9246:9246] CHIP:IM: Received Read request
           [1651570975.559268][9246:9246] CHIP:DMG: ReadRequestMessage =
@@ -873,7 +872,7 @@
 
           ./chip-tool pumpconfigurationandcontrol read capacity  1 1
 
-          Verify in TH all-clusters-app log
+          Verify in DUT as client side Log
 
           [1651571009.295069][9246:9246] CHIP:IM: Received Read request
           [1651571009.295158][9246:9246] CHIP:DMG: ReadRequestMessage =
@@ -892,7 +891,7 @@
 
           ./chip-tool pumpconfigurationandcontrol read  operation-mode 1 1
 
-          Verify in TH all-clusters-app log
+          Verify in DUT as client side Log
 
           [1651571334.617100][9337:9337] CHIP:IM: Received Read request
           [1651571334.617155][9337:9337] CHIP:DMG: ReadRequestMessage =
diff --git a/src/app/tests/suites/certification/Test_TC_PRS_2_2.yaml b/src/app/tests/suites/certification/Test_TC_PRS_2_2.yaml
index 6e1416a..e592f5e 100644
--- a/src/app/tests/suites/certification/Test_TC_PRS_2_2.yaml
+++ b/src/app/tests/suites/certification/Test_TC_PRS_2_2.yaml
@@ -36,7 +36,7 @@
           ./chip-tool pressuremeasurement read measured-value 1 1
 
 
-          On TH, verify that DUT  responds value  read is successful and note down the value read
+           verify MeasuredValue on TH(chip-tool) logs:
 
           CHIP:TOO:   MeasuredValue: 0
       disabled: true
@@ -54,5 +54,7 @@
       verification: |
           ./chip-tool pressuremeasurement read measured-value 1 1
 
-          DUT action missing [cant verify using Raspi]
+           verify MeasuredValue on TH(chip-tool) logs:
+
+          CHIP:TOO:   MeasuredValue: 1
       disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_PRS_3_1.yaml b/src/app/tests/suites/certification/Test_TC_PRS_3_1.yaml
index ccb58ca..ea7108c 100644
--- a/src/app/tests/suites/certification/Test_TC_PRS_3_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_PRS_3_1.yaml
@@ -32,11 +32,9 @@
           "DUT reads all supported mandatory 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
-
           ./chip-tool pressuremeasurement read measured-value 1 1
 
-          Verify in TH all-clusters-app log
+          verify the " measured-value response" on the TH (all-cluster-app) log:
 
           [1653992317.047323][2347:2347] CHIP:IM: Received Read request
           [1653992317.047382][2347:2347] CHIP:DMG: ReadRequestMessage =
@@ -59,7 +57,7 @@
 
           ./chip-tool pressuremeasurement read  min-measured-value 1 1
 
-          Verify in TH all-clusters-app log
+          verify the " min-measured-value response" on the TH (all-cluster-app) log:
 
           [1653992385.759474][2347:2347] CHIP:IM: Received Read request
           [1653992385.759533][2347:2347] CHIP:DMG: ReadRequestMessage =
@@ -77,12 +75,12 @@
           [1653992385.760049][2347:2347] CHIP:DMG:
           [1653992385.760100][2347:2347] CHIP:DMG:         isFabricFiltered = true,
           [1653992385.760125][2347:2347] CHIP:DMG:         InteractionModelRevision = 1
-          [1653992385.760168][2347:2347] CHIP:DMG: },
+          [1653992385.760168][2347:2347] CHIP:DMG: }
 
 
           ./chip-tool pressuremeasurement read  max-measured-value 1 1
 
-          Verify in TH all-clusters-app log
+          verify the " max-measured-value response" on the TH (all-cluster-app) log:
 
           [1653992415.580348][2347:2347] CHIP:IM: Received Read request
           [1653992415.580414][2347:2347] CHIP:DMG: ReadRequestMessage =
@@ -100,7 +98,7 @@
           [1653992415.580852][2347:2347] CHIP:DMG:
           [1653992415.580879][2347:2347] CHIP:DMG:         isFabricFiltered = true,
           [1653992415.580913][2347:2347] CHIP:DMG:         InteractionModelRevision = 1
-          [1653992415.580936][2347:2347] CHIP:DMG: },
+          [1653992415.580936][2347:2347] CHIP:DMG: }
       disabled: true
 
     - label:
@@ -121,14 +119,14 @@
           "DUT writes a suitable value to all supported mandatory attributes on
           the TH one at a time in a manufacturer specific order"
       verification: |
-          This cluster doesn't have any writable attributes
+          This cluster doesn"t have any writable attributes
       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: |
-          This cluster doesn't have any writable attributes
+          This cluster doesn"t have any writable attributes
       disabled: true
 
     - label:
@@ -137,27 +135,39 @@
           also reflects this in global attributes such as FeatureMap and
           AttributeList. Commission DUT to TH again"
       verification: |
-          verify on Reference app receives the right response for the data sent in the above
+          ./chip-tool pressuremeasurement read attribute-list  1 1
 
-           ./chip-tool pressuremeasurement read attribute-list  1 1
+          verify the " attribute-list response" on the TH (all-cluster-minimal-app) log:
 
-          Verify in TH all-clusters-app log
+          [1659606175.282588][7312:7312] CHIP:EM: Handling via exchange: 12368r, Delegate: 0xaaaaad2c4f68
+          [1659606175.282635][7312:7312] CHIP:IM: Received Read request
+          [1659606175.282718][7312:7312] CHIP:DMG: ReadRequestMessage =
+          [1659606175.282746][7312:7312] CHIP:DMG: {
+          [1659606175.282768][7312:7312] CHIP:DMG:         AttributePathIBs =
+          [1659606175.282794][7312:7312] CHIP:DMG:         [
+          [1659606175.282818][7312:7312] CHIP:DMG:                 AttributePathIB =
+          [1659606175.282846][7312:7312] CHIP:DMG:                 {
+          [1659606175.282874][7312:7312] CHIP:DMG:                         Endpoint = 0x1,
+          [1659606175.282910][7312:7312] CHIP:DMG:                         Cluster = 0x403,
+          [1659606175.282946][7312:7312] CHIP:DMG:                         Attribute = 0x0000_FFFB,
+          [1659606175.282975][7312:7312] CHIP:DMG:                 }
+          [1659606175.283004][7312:7312] CHIP:DMG:
+          [1659606175.283029][7312:7312] CHIP:DMG:         ],
+          [1659606175.283056][7312:7312] CHIP:DMG:
+          [1659606175.283083][7312:7312] CHIP:DMG:         isFabricFiltered = true,
+          [1659606175.283108][7312:7312] CHIP:DMG:         InteractionModelRevision = 1
+          [1659606175.283132][7312:7312] CHIP:DMG: },
+          [1659606175.283211][7312:7312] CHIP:DMG: IM RH moving to [GeneratingReports]
+          [1659606175.283312][7312:7312] CHIP:DMG: Building Reports for ReadHandler with LastReportGeneration = 0 DirtyGeneration = 0
+          [1659606175.283343][7312:7312] CHIP:DMG: <RE:Run> Cluster 403, Attribute fffb is dirty
+          [1659606175.283364][7312:7312] CHIP:DMG: Reading attribute: Cluster=0x0000_0403 Endpoint=1 AttributeId=0x0000_FFFB (expanded=0)
 
-          [1654246805586] [91746:4008896] CHIP: [TOO] Endpoint: 1 Cluster: 0x0000_0403 Attribute 0x0000_FFFB DataVersion: 2053900777
-          [1654246805586] [91746:4008896] CHIP: [TOO]   AttributeList: 8 entries
-          [1654246805586] [91746:4008896] CHIP: [TOO]     [1]: 0
-          [1654246805586] [91746:4008896] CHIP: [TOO]     [2]: 1
-          [1654246805586] [91746:4008896] CHIP: [TOO]     [3]: 2
-          [1654246805586] [91746:4008896] CHIP: [TOO]     [4]: 65528
-          [1654246805586] [91746:4008896] CHIP: [TOO]     [5]: 65529
-          [1654246805586] [91746:4008896] CHIP: [TOO]     [6]: 65531
-          [1654246805586] [91746:4008896] CHIP: [TOO]     [7]: 65532
-          [1654246805586] [91746:4008896] CHIP: [TOO]     [8]: 65533
+
 
 
            ./chip-tool pressuremeasurement read measured-value 1 1
 
-          Verify in TH all-clusters-app log
+          verify the " measured-value response" on the TH (all-cluster-minimal-app) log:
 
           [1653992317.047323][2347:2347] CHIP:IM: Received Read request
           [1653992317.047382][2347:2347] CHIP:DMG: ReadRequestMessage =
@@ -180,7 +190,7 @@
 
           ./chip-tool pressuremeasurement read  min-measured-value 1 1
 
-          Verify in TH all-clusters-app log
+          verify the " min-measured-value response" on the TH (all-cluster-minimal-app) log:
 
           [1653992385.759474][2347:2347] CHIP:IM: Received Read request
           [1653992385.759533][2347:2347] CHIP:DMG: ReadRequestMessage =
@@ -203,7 +213,7 @@
 
           ./chip-tool pressuremeasurement read  max-measured-value 1 1
 
-          Verify in TH all-clusters-app log
+          verify the " max-measured-value response" on the TH (all-cluster-minimal-app) log:
 
           [1653992415.580348][2347:2347] CHIP:IM: Received Read request
           [1653992415.580414][2347:2347] CHIP:DMG: ReadRequestMessage =
@@ -228,30 +238,19 @@
           "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
+          TH all-clusters-minimal-app does not support optional attributes
 
           ./chip-tool pressuremeasurement read  tolerance 1 1
-           General error: 0x86 (UNSUPPORTED_ATTRIBUTE)
-
           ./chip-tool pressuremeasurement read scaled-value 1 1
-           General error: 0x86 (UNSUPPORTED_ATTRIBUTE)
-
           ./chip-tool pressuremeasurement read  min-scaled-value  1 1
-           General error: 0x86 (UNSUPPORTED_ATTRIBUTE)
-
           ./chip-tool pressuremeasurement read  max-scaled-value  1 1
-           General error: 0x86 (UNSUPPORTED_ATTRIBUTE)
-
           ./chip-tool pressuremeasurement read scaled-tolerance 1 1
-           General error: 0x86 (UNSUPPORTED_ATTRIBUTE)
-
           ./chip-tool pressuremeasurement read scale 1 1
-           General error: 0x86 (UNSUPPORTED_ATTRIBUTE)
       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: |
-          This cluster doesn't have any writable attributes
+          This cluster doesn"t have any writable attributes
       disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_PSCFG_2_1.yaml b/src/app/tests/suites/certification/Test_TC_PSCFG_2_1.yaml
index 6c75857..9d559f8 100644
--- a/src/app/tests/suites/certification/Test_TC_PSCFG_2_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_PSCFG_2_1.yaml
@@ -34,7 +34,7 @@
       verification: |
           ./chip-tool powersourceconfiguration read sources 1 0
 
-          On TH, verify that that the DUT response provides a list
+           verify on TH(chip-tool) that source attribute provides a list, and each entry in the list has to be  number of an endpoint having a Power Source cluster.
 
           The response should look like this:
 
diff --git a/src/app/tests/suites/certification/Test_TC_PSCFG_2_2.yaml b/src/app/tests/suites/certification/Test_TC_PSCFG_2_2.yaml
index c73c625..0cd5f3d 100644
--- a/src/app/tests/suites/certification/Test_TC_PSCFG_2_2.yaml
+++ b/src/app/tests/suites/certification/Test_TC_PSCFG_2_2.yaml
@@ -34,7 +34,7 @@
       verification: |
           ./chip-tool powersourceconfiguration read sources 1 0
 
-          On TH, verify that that the DUT response provides a list
+           verify on TH(chip-tool) that source attribute provides a list has not more than 6 entries.
 
           [...]
           CHIP:TOO: Endpoint: 0 Cluster: 0x0000_002E Attribute 0x0000_0000DataVersion: 502821112
@@ -50,9 +50,24 @@
       verification: |
           ./chip-tool powersource read order 1 1
 
-          On TH, verify that that the DUT Respond succeeds with no error.The order value is the same or greater than the order value of the previous iteration
+          verify on TH(chip-tool) that order attribute succeeds with no error.The order value is the same or greater than the order value of the previous iteration
 
           [...]
           [1653564242.694964][36231:36236] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_002F Attribute 0x0000_0001 DataVersion: 4212858705
           [1653564242.695038][36231:36236] CHIP:TOO:   Order: 2
+
+          ./chip-tool powersource read order 1 2
+
+          verify on TH(chip-tool) that order attribute succeeds with no error.The order value is the same or greater than the order value of the previous iteration
+
+          [1659879820.566144][2615:2620] CHIP:TOO: Endpoint: 2 Cluster: 0x0000_002F Attribute 0x0000_0001 DataVersion: 1842182672
+          [1659879820.569572][2615:2620] CHIP:TOO:   Order: 1
+
+           ./chip-tool powersource read order 1 0
+
+          verify on TH(chip-tool) that order attribute succeeds with no error.The order value is the same or greater than the order value of the previous iteration
+
+          [1659879944.863570][2633:2638] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_002F Attribute 0x0000_0001 DataVersion: 1479870496
+          [1659879944.863664][2633:2638] CHIP:TOO:   Order: 3
+          [1659879944.863854][2633:2638] CHIP:EM: Sending Standalone Ack for MessageCounter:4546692 on exchange 20518i
       disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_PSCFG_3_1.yaml b/src/app/tests/suites/certification/Test_TC_PSCFG_3_1.yaml
index 50e700c..f82b198 100644
--- a/src/app/tests/suites/certification/Test_TC_PSCFG_3_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_PSCFG_3_1.yaml
@@ -34,7 +34,7 @@
       verification: |
           ./chip-tool powersourceconfiguration read sources 1 0
 
-          Verify,On TestHarnes (all-cluster-app) a received read of the Sources attribute (id 0) looks like this:
+          verify the " sources response" on the TH (all-cluster-app) log:
 
           [1650881032.387446][2715:2715] CHIP:IM: Received Read request
           [1650881032.387500][2715:2715] CHIP:DMG: ReadRequestMessage =
@@ -88,7 +88,7 @@
       verification: |
           ./chip-tool powersourceconfiguration read sources 1 0
 
-          Verify,On TestHarnes (all-cluster-app) a received read of the Sources attribute (id 0) looks like this:
+          verify the " sources response" on the TH (all-cluster-minimal-app) log:
 
           [1650881032.387446][2715:2715] CHIP:IM: Received Read request
           [1650881032.387500][2715:2715] CHIP:DMG: ReadRequestMessage =
diff --git a/src/app/tests/suites/certification/Test_TC_PS_2_2.yaml b/src/app/tests/suites/certification/Test_TC_PS_2_2.yaml
index 2e9129a..f4745a0 100644
--- a/src/app/tests/suites/certification/Test_TC_PS_2_2.yaml
+++ b/src/app/tests/suites/certification/Test_TC_PS_2_2.yaml
@@ -37,11 +37,11 @@
 
     - label: "TH reads the ActiveWiredFaults attribute from the DUT"
       verification: |
-          Optional attribute so its not compulsory to get the expected outcome
+          Optional Attribute - If it is supported, then in TH log it will results in displaying the value, else it will display UNSUPPORTED_ATTRIBUTE
 
           ./chip-tool powersource read active-wired-faults 1 1
 
-
+          Verify on TH logs:
           General error: 0x86 (UNSUPPORTED_ATTRIBUTE)
       disabled: true
 
@@ -84,7 +84,7 @@
     - label: "TH reads the ActiveWiredFaults attribute from the DUT"
       PICS: PS.S.A000a && PS.M.ManualWiredFault
       verification: |
-          Optional attribute so its not compulsory to get the expected outcome
+          Optional Attribute - If it is supported, then in TH log it will results in displaying the value, else it will display UNSUPPORTED_ATTRIBUTE
 
           ./chip-tool powersource read active-wired-faults 1 1
 
@@ -107,12 +107,12 @@
 
     - label: "TH reads the ActiveBatFaults attribute from the DUT"
       verification: |
-          Optional attribute so its not compulsory to get the expected outcome
+          Optional Attribute - If it is supported, then in TH log it will results in displaying the value, else it will display UNSUPPORTED_ATTRIBUTE
 
           ./chip-tool powersource read active-battery-faults 12345 1
 
-
           Verify on the TH Log:
+
           General error: 0x86 (UNSUPPORTED_ATTRIBUTE)
       disabled: true
 
@@ -154,7 +154,7 @@
     - label: "TH reads the ActiveBatFaults attribute from the DUT"
       PICS: PS.S.A0012 && PS.M.ManualBatFault
       verification: |
-          Optional attribute so its not compulsory to get the expected outcome
+          Optional Attribute - If it is supported, then in TH log it will results in displaying the value, else it will display UNSUPPORTED_ATTRIBUTE
 
           ./chip-tool powersource read active-battery-faults 1 1
 
@@ -176,7 +176,7 @@
 
     - label: "TH reads the ActiveBatChargeFaults attribute from the DUT"
       verification: |
-          Optional attribute so its not compulsory to get the expected outcome
+          Optional Attribute - If it is supported, then in TH log it will results in displaying the value, else it will display UNSUPPORTED_ATTRIBUTE
 
           ./chip-tool powersource read active-battery-charge-faults 1 1
 
@@ -223,7 +223,8 @@
     - label: "TH reads the ActiveBatChargeFaults attribute from the DUT"
       PICS: PS.S.A001e && PS.M.ManualBatChargeFault
       verification: |
-          Optional attribute so its not compulsory to get the expected outcome
+          Optional Attribute - If it is supported, then in TH log it will results in displaying the value, else it will display UNSUPPORTED_ATTRIBUTE
+
           ./chip-tool powersource read active-battery-charge-faults 1 1
 
           Verify on the TH Log:
diff --git a/src/app/tests/suites/certification/Test_TC_PS_3_1.yaml b/src/app/tests/suites/certification/Test_TC_PS_3_1.yaml
index 080d581..755d4a9 100644
--- a/src/app/tests/suites/certification/Test_TC_PS_3_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_PS_3_1.yaml
@@ -34,7 +34,7 @@
       verification: |
           ./chip-tool powersource read status 1 1
 
-          Verify,On TestHarnes (all-cluster-app) a received read of Staus attribute looks like this:
+          verify the " status response" on the TH (all-cluster-app) log:
 
 
           [1646155382.977445][33190:33190] CHIP:EM: Received message of type 0x2 with protocolId (0, 1) and MessageCounter:685127 on exchange 16568r
@@ -64,7 +64,7 @@
 
           ./chip-tool powersource read order 1 1
 
-          On TestHarnes (all-cluster-app) a received read of order attribute looks like this:
+          verify the " order response" on the TH (all-cluster-app) log:
 
           [1653395573.862606][19412:19412] CHIP:IM: Received Read request
           [1653395573.862690][19412:19412] CHIP:DMG: ReadRequestMessage =
@@ -88,7 +88,7 @@
 
           ./chip-tool powersource read description 1 1
 
-          Verify,On TestHarnes (all-cluster-app) a received read of description attribute looks like this:
+          verify the " description response" on the TH (all-cluster-app) log:
 
           CHIP:IM: Received Read request
           [1653395620.020314][19412:19412] CHIP:DMG: ReadRequestMessage =
@@ -139,26 +139,32 @@
       verification: |
           ./chip-tool powersource read attribute-list 1 0
 
-          Verify the attribute-list contains list of mandatory attribute in TH all-clusters-app log
+          verify the " attribute-list response" on the TH (all-cluster-minimal-app) log:
 
-          [1658911139.284282][13908:13913] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_002F Attribute 0x0000_FFFB DataVersion: 2172946531
-          [1658911139.284369][13908:13913] CHIP:TOO:   AttributeList: 8 entries
-          [1658911139.284417][13908:13913] CHIP:TOO:     [1]: 0
-          [1658911139.284446][13908:13913] CHIP:TOO:     [2]: 1
-          [1658911139.284474][13908:13913] CHIP:TOO:     [3]: 2
-          [1658911139.284501][13908:13913] CHIP:TOO:     [4]: 65528
-          [1658911139.284528][13908:13913] CHIP:TOO:     [5]: 65529
-          [1658911139.284554][13908:13913] CHIP:TOO:     [6]: 65531
-          [1658911139.284581][13908:13913] CHIP:TOO:     [7]: 65532
-          [1658911139.284608][13908:13913] CHIP:TOO:     [8]: 65533
+          [1659596771.124636][2409:2409] CHIP:IM: Received Read request
+          [1659596771.124765][2409:2409] CHIP:DMG: ReadRequestMessage =
+          [1659596771.124795][2409:2409] CHIP:DMG: {
+          [1659596771.124814][2409:2409] CHIP:DMG:         AttributePathIBs =
+          [1659596771.124838][2409:2409] CHIP:DMG:         [
+          [1659596771.124859][2409:2409] CHIP:DMG:                 AttributePathIB =
+          [1659596771.124901][2409:2409] CHIP:DMG:                 {
+          [1659596771.124928][2409:2409] CHIP:DMG:                         Endpoint = 0x0,
+          [1659596771.124963][2409:2409] CHIP:DMG:                         Cluster = 0x2f,
+          [1659596771.124989][2409:2409] CHIP:DMG:                         Attribute = 0x0000_FFFB,
+          [1659596771.125020][2409:2409] CHIP:DMG:                 }
+          [1659596771.125045][2409:2409] CHIP:DMG:
+          [1659596771.125077][2409:2409] CHIP:DMG:         ],
+          [1659596771.125102][2409:2409] CHIP:DMG:
+          [1659596771.125134][2409:2409] CHIP:DMG:         isFabricFiltered = true,
+          [1659596771.125156][2409:2409] CHIP:DMG:         InteractionModelRevision = 1
+          [1659596771.125177][2409:2409] CHIP:DMG: },
 
 
 
           ./chip-tool powersource read status 1 1
 
-          Verify, On TestHarnes (all-cluster-app) a received read of Staus attribute looks like this:
+          verify the " status response" on the TH (all-cluster-minimal-app) log:
 
-          [1646155382.977445][33190:33190] CHIP:EM: Received message of type 0x2 with protocolId (0, 1) and MessageCounter:685127 on exchange 16568r
           [1646155382.977534][33190:33190] CHIP:EM: Handling via exchange: 16568r, Delegate: 0xaaaace1730c8
           [1646155382.978021][33190:33190] CHIP:IM: Received Read request
           [1646155382.978109][33190:33190] CHIP:DMG: ReadRequestMessage =
@@ -185,7 +191,7 @@
 
           ./chip-tool powersource read order 1 1
 
-          Verify, On TestHarnes (all-cluster-app)  received read of order attribute looks like this:
+          verify the " order response" on the TH (all-cluster-minimal-app) log:
 
           [1653395573.862606][19412:19412] CHIP:IM: Received Read request
           [1653395573.862690][19412:19412] CHIP:DMG: ReadRequestMessage =
@@ -209,7 +215,7 @@
 
           ./chip-tool powersource read description 1 1
 
-          verify , On TestHarnes (all-cluster-app) a received read of description attribute looks like this:
+          verify the " description response" on the TH (all-cluster-minimal-app) log:
 
           CHIP:IM: Received Read request
           [1653395620.020314][19412:19412] CHIP:DMG: ReadRequestMessage =
@@ -228,7 +234,7 @@
           [1653395620.021052][19412:19412] CHIP:DMG:         isFabricFiltered = true,
           [1653395620.021104][19412:19412] CHIP:DMG:         InteractionModelRevision = 1
           [1653395620.021153][19412:19412] CHIP:DMG: },
-          [1653395620.021252][19412:19412] CHIP:DMG: IM RH moving to [GeneratingReports]"
+          [1653395620.021252][19412:19412] CHIP:DMG: IM RH moving to [GeneratingReports]
       disabled: true
 
     - label:
diff --git a/src/app/tests/suites/certification/Test_TC_RH_3_1.yaml b/src/app/tests/suites/certification/Test_TC_RH_3_1.yaml
index 912a2d7..dca4b64 100644
--- a/src/app/tests/suites/certification/Test_TC_RH_3_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_RH_3_1.yaml
@@ -32,12 +32,10 @@
           "DUT reads all supported mandatory attributes from TH one at a time in
           a manufacturer specific order"
       verification: |
-          On TestHarnes (all-cluster-app) a received read of MeasuredValue (id 0) looks like this:
-
-
-
           ./chip-tool relativehumiditymeasurement read measured-value 1 1
-          Verify in DUT as client side Log
+
+          verify the "measured-value response" on the TH (all-cluster-app) log:
+
           [1651147639.252032][2336:2336] CHIP:IM: Received Read request
           [1651147639.252086][2336:2336] CHIP:DMG: ReadRequestMessage =
           [1651147639.252136][2336:2336] CHIP:DMG: {
@@ -59,7 +57,9 @@
           [1651147639.252925][2336:2336] CHIP:DMG: Building Reports for ReadHandler with LastReportGeneration = 0 DirtyGeneration = 0
 
            ./chip-tool relativehumiditymeasurement read min-measured-value 1 1
-          Verify in DUT as client side Log
+
+          verify the "min-measured-value response" on the TH (all-cluster-app) log:
+
           1651147834.075387][2336:2336] CHIP:IM: Received Read request
           [1651147834.075454][2336:2336] CHIP:DMG: ReadRequestMessage =
           [1651147834.075481][2336:2336] CHIP:DMG: {
@@ -81,7 +81,9 @@
           [1651147834.076111][2336:2336] CHIP:DMG: Building Reports for ReadHandler with LastReportGeneration = 0 DirtyGeneration = 0
 
           ./chip-tool relativehumiditymeasurement read max-measured-value 1 1
-          Verify in DUT as client side Log
+
+          verify the "max-measured-value response" on the TH (all-cluster-app) log:
+
           [1651147902.966904][2336:2336] CHIP:IM: Received Read request
           [1651147902.966980][2336:2336] CHIP:DMG: ReadRequestMessage =
           [1651147902.967012][2336:2336] CHIP:DMG: {
@@ -110,8 +112,8 @@
       verification: |
           ./chip-tool relativehumiditymeasurement read tolerance 1 1
 
+          verify the "tolerance response" on the TH (all-cluster-app) log:
 
-          Verify in DUT as client side Log
           [1651148035.585189][2336:2336] CHIP:IM: Received Read request
           [1651148035.585247][2336:2336] CHIP:DMG: ReadRequestMessage =
           [1651148035.585276][2336:2336] CHIP:DMG: {
@@ -156,25 +158,32 @@
           ./chip-tool relativehumiditymeasurement read attribute-list  1 1
 
 
-          Verify in DUT as client side Log
+          verify the "attribute-list response" on the TH (all-cluster-minimal-app) log:
 
-          [1654247077216] [91776:4010112] CHIP: [TOO] Endpoint: 1 Cluster: 0x0000_0405 Attribute 0x0000_FFFB DataVersion: 1294674518
-          [1654247077217] [91776:4010112] CHIP: [TOO]   AttributeList: 8 entries
-          [1654247077217] [91776:4010112] CHIP: [TOO]     [1]: 0
-          [1654247077217] [91776:4010112] CHIP: [TOO]     [2]: 1
-          [1654247077217] [91776:4010112] CHIP: [TOO]     [3]: 2
-          [1654247077217] [91776:4010112] CHIP: [TOO]     [4]: 65528
-          [1654247077217] [91776:4010112] CHIP: [TOO]     [5]: 65529
-          [1654247077217] [91776:4010112] CHIP: [TOO]     [6]: 65531
-          [1654247077217] [91776:4010112] CHIP: [TOO]     [7]: 65532
-          [1654247077217] [91776:4010112] CHIP: [TOO]     [8]: 65533
+          [1659607458.517237][7312:7312] CHIP:IM: Received Read request
+          [1659607458.517318][7312:7312] CHIP:DMG: ReadRequestMessage =
+          [1659607458.517345][7312:7312] CHIP:DMG: {
+          [1659607458.517367][7312:7312] CHIP:DMG:         AttributePathIBs =
+          [1659607458.517392][7312:7312] CHIP:DMG:         [
+          [1659607458.517415][7312:7312] CHIP:DMG:                 AttributePathIB =
+          [1659607458.517443][7312:7312] CHIP:DMG:                 {
+          [1659607458.517470][7312:7312] CHIP:DMG:                         Endpoint = 0x1,
+          [1659607458.517506][7312:7312] CHIP:DMG:                         Cluster = 0x405,
+          [1659607458.517536][7312:7312] CHIP:DMG:                         Attribute = 0x0000_FFFB,
+          [1659607458.517564][7312:7312] CHIP:DMG:                 }
+          [1659607458.517591][7312:7312] CHIP:DMG:
+          [1659607458.517616][7312:7312] CHIP:DMG:         ],
+          [1659607458.517643][7312:7312] CHIP:DMG:
+          [1659607458.517670][7312:7312] CHIP:DMG:         isFabricFiltered = true,
+          [1659607458.517695][7312:7312] CHIP:DMG:         InteractionModelRevision = 1
+          [1659607458.517718][7312:7312] CHIP:DMG: },
 
 
-          "On TestHarnes (all-cluster-app) a received read of MeasuredValue (id 0) looks like this:
+
 
           ./chip-tool relativehumiditymeasurement read measured-value 1 1
 
-          Verify in DUT as client side Log
+          verify the "measured-value response" on the TH (all-cluster-minimal-app) log:
 
           [1651147639.252032][2336:2336] CHIP:IM: Received Read request
 
@@ -198,7 +207,8 @@
           [1651147639.252925][2336:2336] CHIP:DMG: Building Reports for ReadHandler with LastReportGeneration = 0 DirtyGeneration = 0
 
            ./chip-tool relativehumiditymeasurement read min-measured-value 1 1
-          Verify in DUT as client side Log
+
+          verify the "min-measured-value response" on the TH (all-cluster-minimal-app) log:
 
           1651147834.075387][2336:2336] CHIP:IM: Received Read request
 
@@ -222,7 +232,8 @@
           [1651147834.076111][2336:2336] CHIP:DMG: Building Reports for ReadHandler with LastReportGeneration = 0 DirtyGeneration = 0
 
           ./chip-tool relativehumiditymeasurement read max-measured-value 1 1
-          Verify in DUT as client side Log
+
+          verify the "max-measured-value response" on the TH (all-cluster-minimal-app) log:
 
           [1651147902.966904][2336:2336] CHIP:IM: Received Read request
           [1651147902.966980][2336:2336] CHIP:DMG: ReadRequestMessage =
@@ -250,10 +261,10 @@
           "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
+          TH all-clusters-minimal-app does not support optional attributes
+
 
           ./chip-tool relativehumiditymeasurement read tolerance 1 1
-           General error: 0x86 (UNSUPPORTED_ATTRIBUTE)
       disabled: true
 
     - label:
diff --git a/src/app/tests/suites/certification/Test_TC_SC_4_1.yaml b/src/app/tests/suites/certification/Test_TC_SC_4_1.yaml
index cd0535e..3888005 100644
--- a/src/app/tests/suites/certification/Test_TC_SC_4_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_SC_4_1.yaml
@@ -31,7 +31,7 @@
       verification: |
           ./chip-tool administratorcommissioning open-basic-commissioning-window 200 1 0 --timedInteractionTimeoutMs 1000
 
-          verify on TH Logs:
+          verify on TH (Chip-tool) Logs:
 
           [1652340903.034346][2874:2879] CHIP:DMG: InvokeResponseMessage =
           [1652340903.034398][2874:2879] CHIP:DMG: {
@@ -76,61 +76,24 @@
           MCORE.SC.DT_KEY&& MCORE.SC.DN_KEY && MCORE.SC.RI_KEY &&
           MCORE.SC.PH_KEY && MCORE.SC.PI_KEY
       verification: |
+          Run the below avahi browse command in the TH terminal
+
           avahi-browse -rt _matterc._udp
 
 
           ubuntu@ubuntu:~$   avahi-browse -rt _matterc._udp
 
-          Verify on the DUT Log:
+          Verify the device is advertising _matterc._udp service like below output in TH terminal Log: (Verify for the DUT"s actual values (like vendor ID, PID ..etc) as mentioned in the expected outcome of the test plan, The below log contains the data from the reference raspi accessory)
 
-          + vethd8d0eac IPv6 279142392CEB80C3                              _matterc._udp        local
-          + vethbbadff8 IPv6 279142392CEB80C3                              _matterc._udp        local
-          + veth15cb450 IPv6 279142392CEB80C3                              _matterc._udp        local
-          + veth811acb4 IPv6 279142392CEB80C3                              _matterc._udp        local
-          + veth588856b IPv6 279142392CEB80C3                              _matterc._udp        local
+
           + br-f08e8f665bd1 IPv6 279142392CEB80C3                              _matterc._udp        local
           + br-6fe235aff062 IPv6 279142392CEB80C3                              _matterc._udp        local
-          +   eth0 IPv6 279142392CEB80C3                              _matterc._udp        local
           = vethd8d0eac IPv6 279142392CEB80C3                              _matterc._udp        local
              hostname = [E45F0149AE290000.local]
              address = [fe80::4070:50ff:fe90:759d]
              port = [5540]
              txt = ["PI=" "PH=36" "CM=1" "D=3840" "T=1" "SAI=300" "SII=5000" "VP=65521+32769"]
-          = vethbbadff8 IPv6 279142392CEB80C3                              _matterc._udp        local
-             hostname = [E45F0149AE290000.local]
-             address = [fe80::a849:d3ff:fefa:72a3]
-             port = [5540]
-             txt = ["PI=" "PH=36" "CM=1" "D=3840" "T=1" "SAI=300" "SII=5000" "VP=65521+32769"]
-          = veth15cb450 IPv6 279142392CEB80C3                              _matterc._udp        local
-             hostname = [E45F0149AE290000.local]
-             address = [fe80::5c30:4fff:fe7f:51d]
-             port = [5540]
-             txt = ["PI=" "PH=36" "CM=1" "D=3840" "T=1" "SAI=300" "SII=5000" "VP=65521+32769"]
-          = veth811acb4 IPv6 279142392CEB80C3                              _matterc._udp        local
-             hostname = [E45F0149AE290000.local]
-             address = [fe80::4c41:b1ff:feb2:abfa]
-             port = [5540]
-             txt = ["PI=" "PH=36" "CM=1" "D=3840" "T=1" "SAI=300" "SII=5000" "VP=65521+32769"]
-          = veth588856b IPv6 279142392CEB80C3                              _matterc._udp        local
-             hostname = [E45F0149AE290000.local]
-             address = [fe80::4003:6ff:fe78:9663]
-             port = [5540]
-             txt = ["PI=" "PH=36" "CM=1" "D=3840" "T=1" "SAI=300" "SII=5000" "VP=65521+32769"]
-          = br-f08e8f665bd1 IPv6 279142392CEB80C3                              _matterc._udp        local
-             hostname = [E45F0149AE290000.local]
-             address = [fe80::42:4ff:fe41:2db2]
-             port = [5540]
-             txt = ["PI=" "PH=36" "CM=1" "D=3840" "T=1" "SAI=300" "SII=5000" "VP=65521+32769"]
-          = br-6fe235aff062 IPv6 279142392CEB80C3                              _matterc._udp        local
-             hostname = [E45F0149AE290000.local]
-             address = [fe80::1]
-             port = [5540]
-             txt = ["PI=" "PH=36" "CM=1" "D=3840" "T=1" "SAI=300" "SII=5000" "VP=65521+32769"]
-          =   eth0 IPv6 279142392CEB80C3                              _matterc._udp        local
-             hostname = [E45F0149AE290000.local]
-             address = [fe80::e65f:1ff:fe49:ae29]
-             port = [5540]
-             txt = ["PI=" "PH=36" "CM=1" "D=3840" "T=1" "SAI=300" "SII=5000" "VP=65521+32769"]
+
 
 
           Service Domain 422F10CDC290A406.local
@@ -150,12 +113,11 @@
           Mode using Open Basic Commissioning Window command, starting
           advertising Commissionable Node Discovery service using DNS- SD"
       verification: |
-          Reboot the device
-          if the device proivisioning state persists, run the chip-tool cmd in Step2
+          Reboot the device and commission the DUT again. Open the commissioning window using the below command in the TH (Chip-tool) terminal
 
           ./chip-tool administratorcommissioning open-basic-commissioning-window 200 1 0 --timedInteractionTimeoutMs 1000
 
-          verify on TH logs:
+          verify on TH (Chip-tool) logs:
 
           [1652341174.803430][2893:2898] CHIP:DMG: InvokeResponseMessage =
           [1652341174.803488][2893:2898] CHIP:DMG: {
@@ -199,17 +161,15 @@
           MCORE.SC.DT_KEY && MCORE.SC.DN_KEY && MCORE.SC.RI_KEY &&
           MCORE.SC.PH_KEY && MCORE.SC.PI_KEY
       verification: |
-          avahi-browse -rt _matterc._udp
+          Run the below avahi browse command in  TH terminal
 
-          Verify on the DUT Log:
+           avahi-browse -rt _matterc._udp
+
+          Verify on  the below output in TH terminal Log:
 
           + veth721e1d9 IPv6 19DDF06C3B5DD0C8                              _matterc._udp        local
           + veth961779b IPv6 19DDF06C3B5DD0C8                              _matterc._udp        local
-          + veth6995c44 IPv6 19DDF06C3B5DD0C8                              _matterc._udp        local
-          + veth6c964b1 IPv6 19DDF06C3B5DD0C8                              _matterc._udp        local
-          + veth3222831 IPv6 19DDF06C3B5DD0C8                              _matterc._udp        local
-          + br-6fe235aff062 IPv6 19DDF06C3B5DD0C8                              _matterc._udp        local
-          + br-f08e8f665bd1 IPv6 19DDF06C3B5DD0C8                              _matterc._udp        local
+
           +   eth0 IPv6 19DDF06C3B5DD0C8                              _matterc._udp        local
           = veth721e1d9 IPv6 19DDF06C3B5DD0C8                              _matterc._udp        local
              hostname = [E45F0149AE290000.local]
@@ -221,36 +181,8 @@
              address = [fe80::d417:1eff:fe03:eb81]
              port = [5540]
              txt = ["PI=" "PH=36" "CM=1" "D=3840" "T=1" "SAI=300" "SII=5000" "VP=65521+32769"]
-          = veth6995c44 IPv6 19DDF06C3B5DD0C8                              _matterc._udp        local
-             hostname = [E45F0149AE290000.local]
-             address = [fe80::24ae:58ff:fe2f:5609]
-             port = [5540]
-             txt = ["PI=" "PH=36" "CM=1" "D=3840" "T=1" "SAI=300" "SII=5000" "VP=65521+32769"]
-          = veth6c964b1 IPv6 19DDF06C3B5DD0C8                              _matterc._udp        local
-             hostname = [E45F0149AE290000.local]
-             address = [fe80::cca1:6aff:fe6e:f76d]
-             port = [5540]
-             txt = ["PI=" "PH=36" "CM=1" "D=3840" "T=1" "SAI=300" "SII=5000" "VP=65521+32769"]
-          = veth3222831 IPv6 19DDF06C3B5DD0C8                              _matterc._udp        local
-             hostname = [E45F0149AE290000.local]
-             address = [fe80::410:b8ff:fe10:8cfe]
-             port = [5540]
-             txt = ["PI=" "PH=36" "CM=1" "D=3840" "T=1" "SAI=300" "SII=5000" "VP=65521+32769"]
-          = br-6fe235aff062 IPv6 19DDF06C3B5DD0C8                              _matterc._udp        local
-             hostname = [E45F0149AE290000.local]
-             address = [fe80::1]
-             port = [5540]
-             txt = ["PI=" "PH=36" "CM=1" "D=3840" "T=1" "SAI=300" "SII=5000" "VP=65521+32769"]
-          = br-f08e8f665bd1 IPv6 19DDF06C3B5DD0C8                              _matterc._udp        local
-             hostname = [E45F0149AE290000.local]
-             address = [fe80::42:43ff:fe99:75b3]
-             port = [5540]
-             txt = ["PI=" "PH=36" "CM=1" "D=3840" "T=1" "SAI=300" "SII=5000" "VP=65521+32769"]
-          =   eth0 IPv6 19DDF06C3B5DD0C8                              _matterc._udp        local
-             hostname = [E45F0149AE290000.local]
-             address = [fe80::e65f:1ff:fe49:ae29]
-             port = [5540]
-             txt = ["PI=" "PH=36" "CM=1" "D=3840" "T=1" "SAI=300" "SII=5000" "VP=65521+32769"]
+
+
 
 
 
@@ -270,11 +202,11 @@
           "DUT is Commissioned and instructed to enter in commissioning mode
           using Open Commissioning Window command"
       verification: |
-          run chip tool command to open
+          Run the below open-commissioning-window in TH Terminal
 
           ./chip-tool pairing open-commissioning-window 1 1 200 2000 3840
 
-          Verify on the TH Log:
+          verify on TH (Chip-tool) logs:
 
           [1652341411.383669][2929:2934] CHIP:DMG: InvokeResponseMessage =
           [1652341411.383720][2929:2934] CHIP:DMG: {
@@ -317,44 +249,15 @@
           MCORE.SC.DT_KEY && MCORE.SC.DN_KEY && MCORE.SC.RI_KEY &&
           MCORE.SC.PH_KEY && MCORE.SC.PI_KEY
       verification: |
-          Same verification steps as Step 3, Except Verify CM flag to be 2
+          Same verification steps as Step 3, Except Verify CM flag  value to be 2
 
 
           ubuntu@ubuntu:~$ avahi-browse -rt _matterc._udp
 
-          Verify on the DUT Log:
-
-          + veth721e1d9 IPv6 9BFF1DCA106E337B                              _matterc._udp        local
-          + veth721e1d9 IPv6 19DDF06C3B5DD0C8                              _matterc._udp        local
-          + veth961779b IPv6 9BFF1DCA106E337B                              _matterc._udp        local
-          + veth961779b IPv6 19DDF06C3B5DD0C8                              _matterc._udp        local
-          + veth6995c44 IPv6 9BFF1DCA106E337B                              _matterc._udp        local
-          + veth6995c44 IPv6 19DDF06C3B5DD0C8                              _matterc._udp        local
-          + veth6c964b1 IPv6 9BFF1DCA106E337B                              _matterc._udp        local
-          + veth6c964b1 IPv6 19DDF06C3B5DD0C8                              _matterc._udp        local
-          + veth3222831 IPv6 9BFF1DCA106E337B                              _matterc._udp        local
-          + veth3222831 IPv6 19DDF06C3B5DD0C8                              _matterc._udp        local
-          + br-6fe235aff062 IPv6 9BFF1DCA106E337B                              _matterc._udp        local
-          + br-6fe235aff062 IPv6 19DDF06C3B5DD0C8                              _matterc._udp        local
-          + br-f08e8f665bd1 IPv6 9BFF1DCA106E337B                              _matterc._udp        local
-          + br-f08e8f665bd1 IPv6 19DDF06C3B5DD0C8                              _matterc._udp        local
-          +   eth0 IPv6 9BFF1DCA106E337B                              _matterc._udp        local
-          +   eth0 IPv6 19DDF06C3B5DD0C8                              _matterc._udp        local
+          Verify on  the below output in TH terminal Log:
 
 
-             txt = ["PI=" "PH=36" "CM=1" "D=3840" "T=1" "SAI=300" "SII=5000" "VP=65521+32769"]
-          = veth3222831 IPv6 19DDF06C3B5DD0C8                              _matterc._udp        local
-             hostname = [E45F0149AE290000.local]
-             address = [fe80::410:b8ff:fe10:8cfe]
-             port = [5540]
-             txt = ["PI=" "PH=36" "CM=1" "D=3840" "T=1" "SAI=300" "SII=5000" "VP=65521+32769"]
-          = br-6fe235aff062 IPv6 19DDF06C3B5DD0C8                              _matterc._udp        local
-             hostname = [E45F0149AE290000.local]
-             address = [fe80::1]
-             port = [5540]
-             txt = ["PI=" "PH=36" "CM=1" "D=3840" "T=1" "SAI=300" "SII=5000" "VP=65521+32769"]
 
-             txt = ["PI=" "PH=36" "CM=2" "D=3840" "T=1" "SAI=300" "SII=5000" "VP=65521+32769"]
           = veth961779b IPv6 9BFF1DCA106E337B                              _matterc._udp        local
              hostname = [E45F0149AE290000.local]
              address = [fe80::d417:1eff:fe03:eb81]
@@ -374,16 +277,16 @@
 
     - label: "Wait for OCW timeout to expire"
       verification: |
-          Wait until timeout to expire
+          Wait until open-commissioning-window time to expire. (In our example above its 200 sec)
       disabled: true
 
     - label: "If (MCORE.SC.EXTENDED_DISCOVERY ) enable Extended Discovery"
       PICS: MCORE.SC.EXTENDED_DISCOVERY
       verification: |
-          If the device supports Discovery for extended period of time, Device should continue to advertise that duration
+          If the device supports Discovery for an extended period of time, the Device should continue to advertise. Use the avahi-browse command and you should see the _matterc._udp advertisement
 
 
-          Raspberrypi device is not supporting extended discovery.
+          Reference Raspberrypi device is not supporting extended discovery.
       disabled: true
 
     - label: "If (PICS_EXTENDED_DISCOVERY) check DNS-SD subtypes used by DUT"
@@ -394,6 +297,9 @@
           MCORE.SC.SAI_OP_DISCOVERY_KEY && MCORE.SC.DT_KEY && MCORE.SC.DN_KEY &&
           MCORE.SC.RI_KEY && MCORE.SC.PH_KEY && MCORE.SC.PI_KEY
       verification: |
+          Run and Verify on  the below output in TH terminal Log: (Below is the sample log , as RPI doesn"t support the extended discovery)
+          Verify the CM flag value is 0
+
           avahi-browse -rt _matterc._udp
           +   eth0 IPv6 DD200C20D25AE5F7                              _matterc._udp        local
           +   eth0 IPv4 DD200C20D25AE5F7                              _matterc._udp        local
diff --git a/src/app/tests/suites/certification/Test_TC_SC_4_10.yaml b/src/app/tests/suites/certification/Test_TC_SC_4_10.yaml
index abb4e9c..78cc1e2 100644
--- a/src/app/tests/suites/certification/Test_TC_SC_4_10.yaml
+++ b/src/app/tests/suites/certification/Test_TC_SC_4_10.yaml
@@ -48,3 +48,211 @@
              port = [5540]
              txt = ["T=0" "SAI=300" "SII=5000"]
       disabled: true
+
+    - label: "TH writes ACL entry by setting AuthMode as Group to DUT"
+      verification: |
+          ./chip-tool accesscontrol write acl "[{"fabricIndex": 1, "privilege": 5, "authMode": 2, "subjects": [112233], "targets": null },{"fabricIndex": 1, "privilege": 4, "authMode": 3, "subjects": [1], "targets": null }]" 1 0
+
+          Verify success response on the TH Log:
+
+          [1652330385.328196][3240:3245] CHIP:DMG:                        StatusIB =
+          [1652330385.328229][3240:3245] CHIP:DMG:                        {
+          [1652330385.328264][3240:3245] CHIP:DMG:                                status = 0x00 (SUCCESS),
+          [1652330385.328298][3240:3245] CHIP:DMG:                        },
+      disabled: true
+
+    - label:
+          "Admin generates fabric-unique GroupID, GroupName, random key,
+          EpochKey0 and GroupKeySetID. Admin sets GroupKeySecurityPolicy =
+          TrustFirst (1) GroupKeyMulticastPolicy = PerGroupID (0)
+          EpochStartTime0 = 0"
+      verification: |
+          As Admin generates it is not required to verify
+      disabled: true
+
+    - label:
+          "Admin sends KeySetWrite command to GroupKeyManagement cluster to DUT
+          on PIXIT.G.ENDPOINT"
+      verification: |
+          ./chip-tool groupkeymanagement key-set-write "{"groupKeySetID": 42,
+          "groupKeySecurityPolicy": 0, "epochKey0":
+          "d0d1d2d3d4d5d6d7d8d9dadbdcdddedf", "epochStartTime0": 2220000,"epochKey1":
+          "d1d1d2d3d4d5d6d7d8d9dadbdcdddedf", "epochStartTime1": 2220001,"epochKey2":
+          "d2d1d2d3d4d5d6d7d8d9dadbdcdddedf", "epochStartTime2": 2220002 }" 1 0
+
+          Verify success response on the TH Log:
+
+          [1650610345.847233][2626:2631] CHIP:DMG:
+          [1650610345.847274][2626:2631] CHIP:DMG:                                StatusIB =
+          [1650610345.847317][2626:2631] CHIP:DMG:                                {
+          [1650610345.847383][2626:2631] CHIP:DMG:                                        status = 0x00 (SUCCESS),
+          [1650610345.847429][2626:2631] CHIP:DMG:                                },
+          [1650610345.847477][2626:2631] CHIP:DMG:
+      disabled: true
+
+    - label:
+          "Admin binds GroupId with GroupKeySetID in the GroupKeyMap attribute
+          list on GroupKeyManagement cluster"
+      verification: |
+          ./chip-tool groupkeymanagement write group-key-map "[{"groupId": 1, "groupKeySetID": 42, "fabricIndex": 1}]" 1 0
+
+          Verify success response on the TH Log:
+
+          [1652352019.875893][2552:2557] CHIP:DMG: WriteResponseMessage =
+          [1652352019.875922][2552:2557] CHIP:DMG: {
+          [1652352019.875946][2552:2557] CHIP:DMG:        AttributeStatusIBs =
+          [1652352019.875981][2552:2557] CHIP:DMG:        [
+          [1652352019.876008][2552:2557] CHIP:DMG:                AttributeStatusIB =
+          [1652352019.876041][2552:2557] CHIP:DMG:                {
+          [1652352019.876070][2552:2557] CHIP:DMG:                        AttributePathIB =
+          [1652352019.876104][2552:2557] CHIP:DMG:                        {
+          [1652352019.876143][2552:2557] CHIP:DMG:                                Endpoint = 0x0,
+          [1652352019.876183][2552:2557] CHIP:DMG:                                Cluster = 0x3f,
+          [1652352019.876225][2552:2557] CHIP:DMG:                                Attribute = 0x0000_0000,
+          [1652352019.876263][2552:2557] CHIP:DMG:                        }
+          [1652352019.876303][2552:2557] CHIP:DMG:
+          [1652352019.876337][2552:2557] CHIP:DMG:                        StatusIB =
+          [1652352019.876375][2552:2557] CHIP:DMG:                        {
+          [1652352019.876414][2552:2557] CHIP:DMG:                                status = 0x00 (SUCCESS),
+          [1652352019.876450][2552:2557] CHIP:DMG:                        },
+          [1652352019.876489][2552:2557] CHIP:DMG:
+          [1652352019.876519][2552:2557] CHIP:DMG:                },
+          [1652352019.876562][2552:2557] CHIP:DMG:
+          [1652352019.876590][2552:2557] CHIP:DMG:                AttributeStatusIB =
+          [1652352019.876622][2552:2557] CHIP:DMG:                {
+          [1652352019.876652][2552:2557] CHIP:DMG:                        AttributePathIB =
+          [1652352019.876690][2552:2557] CHIP:DMG:                        {
+          [1652352019.876728][2552:2557] CHIP:DMG:                                Endpoint = 0x0,
+          [1652352019.876768][2552:2557] CHIP:DMG:                                Cluster = 0x3f,
+          [1652352019.876809][2552:2557] CHIP:DMG:                                Attribute = 0x0000_0000,
+          [1652352019.876849][2552:2557] CHIP:DMG:                                ListIndex = Null,
+          [1652352019.876885][2552:2557] CHIP:DMG:                        }
+          [1652352019.876923][2552:2557] CHIP:DMG:
+          [1652352019.876961][2552:2557] CHIP:DMG:                        StatusIB =
+          [1652352019.876995][2552:2557] CHIP:DMG:                        {
+          [1652352019.877029][2552:2557] CHIP:DMG:                                status = 0x00 (SUCCESS),
+          [1652352019.877077][2552:2557] CHIP:DMG:                        },
+          [1652352019.877132][2552:2557] CHIP:DMG:
+          [1652352019.877179][2552:2557] CHIP:DMG:                },
+          [1652352019.877224][2552:2557] CHIP:DMG:
+          [1652352019.877262][2552:2557] CHIP:DMG:        ],
+          [1652352019.877339][2552:2557] CHIP:DMG:
+          [1652352019.877381][2552:2557] CHIP:DMG:        InteractionModelRevision = 1
+          [1652352019.877419][2552:2557] CHIP:DMG: }
+      disabled: true
+
+    - label:
+          "Admin sends AddGroup Command to DUT with the GroupID set by Admin on
+          PIXIT.SC.ENDPOINT"
+      verification: |
+          ./chip-tool groups add-group 0x0001 grp1 1 1
+
+          Verify AddGroupResponse on the TH Log:
+
+          [1651218084.427102][2526:2531] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0004 Command 0x0000_0000
+          [1651218084.427203][2526:2531] CHIP:TOO:   AddGroupResponse: {
+          [1651218084.427241][2526:2531] CHIP:TOO:     status: 0
+          [1651218084.427264][2526:2531] CHIP:TOO:     groupId: 1
+          [1651218084.427314][2526:2531] CHIP:TOO:    }
+      disabled: true
+
+    - label:
+          "Admin sends ViewGroup command with the GroupID to the Group cluster
+          on the DUT on PIXIT.SC.ENDPOINT"
+      verification: |
+          ./chip-tool groups view-group 0x0001 1 1
+
+          Verify  ViewGroupResponse on the TH Log:
+
+          [1651218576.149152][2635:2640] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0004 Command 0x0000_0001
+          [1651218576.149231][2635:2640] CHIP:TOO:   ViewGroupResponse: {
+          [1651218576.149265][2635:2640] CHIP:TOO:     status: 0
+          [1651218576.149289][2635:2640] CHIP:TOO:     groupId: 1
+          [1651218576.149311][2635:2640] CHIP:TOO:     groupName: grp1
+          [1651218576.149335][2635:2640] CHIP:TOO:    }
+      disabled: true
+
+    - label: "Admin sends KeySetRead Command to DUT"
+      verification: |
+          ./chip-tool groupkeymanagement key-set-read 42 1 0
+
+          Verify KeySetReadResponse on the TH Log:
+
+          [1650610759.578043][2739:2744] CHIP:DMG: Received Command Response Data, Endpoint=0 Cluster=0x0000_003F Command=0x0000_0002
+          [1650610759.578099][2739:2744] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_003F Command 0x0000_0002
+          [1650610759.578220][2739:2744] CHIP:TOO:   KeySetReadResponse: {
+          [1650610759.578251][2739:2744] CHIP:TOO:     groupKeySet: {
+          [1650610759.578291][2739:2744] CHIP:TOO:       GroupKeySetID: 42
+          [1650610759.578334][2739:2744] CHIP:TOO:       GroupKeySecurityPolicy: 0
+          [1650610759.578363][2739:2744] CHIP:TOO:       EpochKey0: null
+          [1650610759.578391][2739:2744] CHIP:TOO:       EpochStartTime0: 2220000
+          [1650610759.578418][2739:2744] CHIP:TOO:       EpochKey1: null
+          [1650610759.578445][2739:2744] CHIP:TOO:       EpochStartTime1: 2220001
+          [1650610759.578472][2739:2744] CHIP:TOO:       EpochKey2: null
+          [1650610759.578498][2739:2744] CHIP:TOO:       EpochStartTime2: 2220002
+          [1650610759.578527][2739:2744] CHIP:TOO:      }
+          [1650610759.578553][2739:2744] CHIP:TOO:    }
+      disabled: true
+
+    - label:
+          "TH reads GroupKeyMap Attribute from the GroupKeyManagement cluster
+          from DUT"
+      verification: |
+          ./chip-tool groupkeymanagement read group-key-map 1 0
+
+          Verify  GroupKeyMapStruct on the TH Log:
+
+          1652429573.936605][2883:2888] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_003F Attribute 0x0000_0000 DataVersion: 75110822
+          [1652429573.936744][2883:2888] CHIP:TOO:   GroupKeyMap: 1 entries
+          [1652429573.936819][2883:2888] CHIP:TOO:     [1]: {
+          [1652429573.936860][2883:2888] CHIP:TOO:       GroupId: 1
+          [1652429573.936896][2883:2888] CHIP:TOO:       GroupKeySetID: 42
+          [1652429573.936932][2883:2888] CHIP:TOO:       FabricIndex: 1
+          [1652429573.936969][2883:2888] CHIP:TOO:      }
+      disabled: true
+
+    - label:
+          "TH reads GroupTable attribute from GroupKeyManagement cluster on DUT."
+      verification: |
+          ./chip-tool groupkeymanagement read group-table 1 0
+
+          Verify  GroupTable on the TH Log:
+
+          [1655965817.917300][3012:3017] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_003F Attribute 0x0000_0001 DataVersion: 1208492408
+          [1655965817.917408][3012:3017] CHIP:TOO:   GroupTable: 1 entries
+          [1655965817.917506][3012:3017] CHIP:TOO:     [1]: {
+          [1655965817.917559][3012:3017] CHIP:TOO:       GroupId: 1
+          [1655965817.917600][3012:3017] CHIP:TOO:       Endpoints: 2 entries
+          [1655965817.917642][3012:3017] CHIP:TOO:         [1]: 0
+          [1655965817.917680][3012:3017] CHIP:TOO:         [2]: 1
+          [1655965817.917718][3012:3017] CHIP:TOO:       GroupName: grp1
+          [1655965817.917752][3012:3017] CHIP:TOO:       FabricIndex: 1
+          [1655965817.917784][3012:3017] CHIP:TOO:      }
+      disabled: true
+
+    - label:
+          "Configure the TH for sending Group message Add the group that was
+          created in step 3 to the client side Add the keysets with the
+          GroupKeySetID from the step 2 for the client side Bind the
+          GroupKeySetID with the GroupID created View the GroupID, GroupName and
+          GroupKeySetID which is binded for sending the Group message"
+      verification: |
+          ./chip-tool groupsettings add-group grp1 0x0001
+
+          ./chip-tool groupsettings add-keysets 0x0042 0 0x000000000021dfe0 hex:d0d1d2d3d4d5d6d7d8d9dadbdcdddedf
+
+          ./chip-tool groupsettings bind-keyset 0x0001 0x0042
+
+          ./chip-tool groupsettings show-groups
+
+          Verify groups on the TH Log:
+
+            +-------------------------------------------------------------------------------------+
+            | Available Groups :                                                                  |
+            +-------------------------------------------------------------------------------------+
+            | Group Id   |  KeySet Id     |   Group Name                                          |
+            | 0x101           0x1a1            Group #1                                           |
+            | 0x102           0x1a2            Group #2                                           |
+            | 0x1               0x42              grp1                                                   |
+            +-------------------------------------------------------------------------------------+
+      disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_SC_4_3.yaml b/src/app/tests/suites/certification/Test_TC_SC_4_3.yaml
index 42bbfa1..e0f8cda 100644
--- a/src/app/tests/suites/certification/Test_TC_SC_4_3.yaml
+++ b/src/app/tests/suites/certification/Test_TC_SC_4_3.yaml
@@ -51,17 +51,9 @@
           "TH is instructed to start advertising an operational service using
           DNS-SD with non-standard TXT record keys"
       verification: |
-          ubuntu@ubuntu:~$ avahi-browse -rt _matter._tcp
+          Run the publish service command on TH:
 
-
-          Verify on the TH Log:
-
-          ++ veth34b1077 IPv6 4B475AAEB62F42A1-0000000000000001             _matter._tcp         local
-          = veth34b1077 IPv6 4B475AAEB62F42A1-0000000000000001             _matter._tcp         local
-             hostname = [E45F0149AE290000.local]
-             address = [fe80::14ad:64ff:fe95:d164]
-             port = [5540]
-             txt = ["T=1" "SAI=300" "SII=5000"]
+          avahi-publish-service --subtype=_S3._sub._matter._tcp --subtype=_L840._sub._matter._tcp DD200C20D25AE5F7 --subtype=_CM._sub._matter._tcp _matter._tcp 11111 D=840 CM=2  INVALID_TEST=40
       disabled: true
 
     - label:
@@ -69,68 +61,19 @@
           Mode using Open Basic Commissioning Window command, DUT is instructed
           to advertise its service with the modified TXT record."
       verification: |
-          avahi-publish-service --subtype=_S3._sub._matter._tcp --subtype=_L840._sub._matter._tcp DD200C20D25AE5F7 --subtype=_CM._sub._matter._tcp _matter._tcp 11111 D=840 CM=2  INVALID_TEST=40
+          ./chip-tool administratorcommissioning open-basic-commissioning-window 200 1 0 --timedInteractionTimeoutMs 1000
 
+          verify on TH (Chip-tool) logs:
 
-          Verify on the TH Log:
-
-          ubuntu@ubuntu:~$ avahi-browse -rt _matter._tcp
-
-
-          + br-21ec3c459020 IPv4 DD200C20D25AE5F7                              _matter._tcp         local
-          + docker0 IPv4 DD200C20D25AE5F7                              _matter._tcp         local
-          + br-50884ced4bd8 IPv4 DD200C20D25AE5F7                              _matter._tcp         local
-          +   eth0 IPv6 DD200C20D25AE5F7                              _matter._tcp         local
-          +   eth0 IPv4 DD200C20D25AE5F7                              _matter._tcp         local
-          +     lo IPv4 DD200C20D25AE5F7                              _matter._tcp         local
-          = br-21ec3c459020 IPv4 DD200C20D25AE5F7                              _matter._tcp         local
-             hostname = [ubuntu-2.local]
-             address = [172.18.0.1]
-             port = [11111]
-             txt = ["INVALID_TEST=40" "CM=2" "D=840"]
-          = docker0 IPv4 DD200C20D25AE5F7                              _matter._tcp         local
-             hostname = [ubuntu-2.local]
-             address = [172.17.0.1]
-             port = [11111]
-             txt = ["INVALID_TEST=40" "CM=2" "D=840"]
-          = br-50884ced4bd8 IPv4 DD200C20D25AE5F7                              _matter._tcp         local
-             hostname = [ubuntu-2.local]
-             address = [172.19.0.1]
-             port = [11111]
-             txt = ["INVALID_TEST=40" "CM=2" "D=840"]
-          =   eth0 IPv6 DD200C20D25AE5F7                              _matter._tcp         local
-             hostname = [ubuntu-2.local]
-             address = [fd00::ef]
-             port = [11111]
-             txt = ["INVALID_TEST=40" "CM=2" "D=840"]
-          =   eth0 IPv4 DD200C20D25AE5F7                              _matter._tcp         local
-             hostname = [ubuntu-2.local]
-             address = [192.168.1.70]
-             port = [11111]
-             txt = ["INVALID_TEST=40" "CM=2" "D=840"]
-          =     lo IPv4 DD200C20D25AE5F7                              _matter._tcp         local
-             hostname = [ubuntu-2.local]
-             address = [127.0.0.1]
-             port = [11111]
-             txt = ["INVALID_TEST=40" "CM=2" "D=840"]
-          +   eth0 IPv6 21F41C9933CAAF62-000000000000003C             _matter._tcp         local
-          +   eth0 IPv6 5DA80B8DD9E64426-0000000000000046             _matter._tcp         local
-          +   eth0 IPv6 B1605B84E886EDCF-0000000000000258             _matter._tcp         local
-          =   eth0 IPv6 21F41C9933CAAF62-000000000000003C             _matter._tcp         local
-             hostname = [E45F010EBE440000.local]
-             address = [fe80::e65f:1ff:fe0e:be44]
-             port = [5540]
-             txt = ["T=1" "SAI=300" "SII=5000"]
-          =   eth0 IPv6 5DA80B8DD9E64426-0000000000000046             _matter._tcp         local
-             hostname = [E45F010EBE440000.local]
-             address = [fe80::e65f:1ff:fe0e:be44]
-             port = [5540]
-             txt = ["T=1" "SAI=300" "SII=5000"]
-          =   eth0 IPv6 B1605B84E886EDCF-0000000000000258             _matter._tcp         local
-             hostname = [E45F010EBE440000.local]
-             address = [fe80::e65f:1ff:fe0e:be44]
-             port = [5540]
-             txt = ["T=1" "SAI=300" "SII=5000"]
+          [1650873075.234374][7964:7969] CHIP:DMG:                                         EndpointId = 0x0,
+          [1650873075.234449][7964:7969] CHIP:DMG:                                         ClusterId = 0x3c,
+          [1650873075.234542][7964:7969] CHIP:DMG:                                         CommandId = 0x1,
+          [1650873075.234613][7964:7969] CHIP:DMG:                                 },
+          [1650873075.234693][7964:7969] CHIP:DMG:
+          [1650873075.234758][7964:7969] CHIP:DMG:                                 StatusIB =
+          [1650873075.234829][7964:7969] CHIP:DMG:                                 {
+          [1650873075.234909][7964:7969] CHIP:DMG:                                         status = 0x00 (SUCCESS),
+          [1650873075.234984][7964:7969] CHIP:DMG:                                 },
       disabled: true
 
     - label: "Scan for DNS-SD advertising"
@@ -139,5 +82,13 @@
           MCORE.SC.SII_OP_DISCOVERY_KEY && MCORE.SC.SAI_OP_DISCOVERY_KEY &&
           MCORE.SC.T_KEY
       verification: |
-          verification step to be updated.
+          ubuntu@ubuntu:~$ avahi-browse -rt _matter._tcp
+          Verify on the TH Log:
+
+          +   eth0 IPv6 B1605B84E886EDCF-0000000000000258             _matter._tcp         local
+          =   eth0 IPv6 21F41C9933CAAF62-000000000000003C             _matter._tcp         local
+             hostname = [E45F010EBE440000.local]
+             address = [fe80::e65f:1ff:fe0e:be44]
+             port = [5540]
+             txt = ["T=1" "SAI=300" "SII=5000"]
       disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_SC_4_4.yaml b/src/app/tests/suites/certification/Test_TC_SC_4_4.yaml
index dfd0fd3..aa9d9da 100644
--- a/src/app/tests/suites/certification/Test_TC_SC_4_4.yaml
+++ b/src/app/tests/suites/certification/Test_TC_SC_4_4.yaml
@@ -24,71 +24,18 @@
     endpoint: 0
 
 tests:
-    - label: "TH is instructed to start advertising a service using DNS-SD"
+    - label: "TH starts commissioning process with DUT"
       verification: |
           verification step to be updated.
       disabled: true
 
-    - label: "Scan for DNS-SD advertising"
-      PICS:
-          MCORE.COM.WIFI && MCORE.COM.ETH && MCORE.COM.THR &&
-          MCORE.SC.SII_OP_DISCOVERY_KEY && MCORE.SC.SAI_OP_DISCOVERY_KEY &&
-          MCORE.SC.T_KEY
-      verification: |
-          ubuntu@ubuntu:~$ avahi-browse _matter._tcp -r
-
-          Verify on the TH Log:
-
-          + veth721e1d9 IPv6 433B62F8F07F4327-0000000000000001             _matter._tcp         local
-          +   eth0 IPv6 433B62F8F07F4327-0000000000000001             _matter._tcp         local
-          = veth721e1d9 IPv6 433B62F8F07F4327-0000000000000001             _matter._tcp         local
-             hostname = [E45F0149AE290000.local]
-             address = [fe80::28e0:95ff:fed9:3085]
-             port = [5540]
-             txt = ["T=1" "SAI=300" "SII=5000"]
-          =   eth0 IPv6 433B62F8F07F4327-0000000000000001             _matter._tcp         local
-             hostname = [E45F0149AE290000.local]
-             address = [fe80::e65f:1ff:fe49:ae29]
-             port = [5540]
-             txt = ["T=1" "SAI=300" "SII=5000"]
-      disabled: true
-
-    - label: "DUT is instructed to advertise its service"
-      PICS: MCORE.SC.ADV
+    - label: "DUT reads nodelabel attribute from TH"
+      PICS: BINFO.C.A0005
       verification: |
           verification step to be updated.
       disabled: true
 
-    - label: "Scan for DNS-SD advertising"
-      PICS:
-          MCORE.COM.WIFI && MCORE.COM.ETH && MCORE.COM.THR &&
-          MCORE.SC.SII_OP_DISCOVERY_KEY && MCORE.SC.SAI_OP_DISCOVERY_KEY &&
-          MCORE.SC.T_KEY && MCORE.SC.ADV
-      verification: |
-          avahi-browse _matter._tcp -r
-
-          Verify on the TH Log:
-
-          + veth721e1d9 IPv6 433B62F8F07F4327-0000000000000001             _matter._tcp         local
-          +   eth0 IPv6 433B62F8F07F4327-0000000000000001             _matter._tcp         local
-          = veth721e1d9 IPv6 433B62F8F07F4327-0000000000000001             _matter._tcp         local
-             hostname = [E45F0149AE290000.local]
-             address = [fe80::28e0:95ff:fed9:3085]
-             port = [5540]
-             txt = ["T=1" "SAI=300" "SII=5000"]
-          =   eth0 IPv6 433B62F8F07F4327-0000000000000001             _matter._tcp         local
-             hostname = [E45F0149AE290000.local]
-             address = [fe80::e65f:1ff:fe49:ae29]
-             port = [5540]
-             txt = ["T=1" "SAI=300" "SII=5000"]
-      disabled: true
-
-    - label: "DUT is instructed to query the TH for its services"
-      verification: |
-          verification step to be updated.
-      disabled: true
-
-    - label: "Change its IP address by any means"
+    - label: "Change the IP address of TH by any means within the same network"
       verification: |
           1. Take two routers connected to the same ISP as input.
           2. Execute step 1 to step 5 using Router1 Configuration.
@@ -97,16 +44,8 @@
           5. Check the IP so that the Routers(Router1 and Router2) will have different IPs to Raspi.
       disabled: true
 
-    - label: "DUT is instructed to query the TH for its services"
+    - label: "DUT reads nodelabel attribute from TH"
+      PICS: BINFO.C.A0005
       verification: |
-          ubuntu@ubuntu:~$ avahi-browse _matter._tcp -r
-
-          Verify on the TH Log:
-
-          + veth721e1d9 IPv6 433B62F8F07F4327-0000000000000001             _matter._tcp         local
-          = veth721e1d9 IPv6 433B62F8F07F4327-0000000000000001             _matter._tcp         local
-             hostname = [E45F0149AE290000.local]
-             address = [fe80::28e0:95ff:fed9:3085]
-             port = [5540]
-             txt = ["T=1" "SAI=300" "SII=5000"]
+          verification step to be updated.
       disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_SC_4_6.yaml b/src/app/tests/suites/certification/Test_TC_SC_4_6.yaml
index a4fd533..5f28f3d 100644
--- a/src/app/tests/suites/certification/Test_TC_SC_4_6.yaml
+++ b/src/app/tests/suites/certification/Test_TC_SC_4_6.yaml
@@ -30,7 +30,7 @@
           "DUT is instructed to start advertising its presence as a commissioner
           in the network"
       verification: |
-          verification step to be updated.
+          To verify this test case use TV Reference app
       disabled: true
 
     - label: "Check DNS-SD subtypes used by DUT"
@@ -38,24 +38,21 @@
           MCORE.SC.DEVTYPE_SUBTYPE && MCORE.SC.VP_KEY && MCORE.SC.DT_KEY &&
           MCORE.SC.DN_KEY
       verification: |
-          avahi-publish-service --subtype=_V123._sub._matterd._udp DD200C20D25AE5F7 _matterd._udp 33333 VP=123+456 DT=35 DN="Living Room TV"
+          Execute the following command on the TH and verify the AAA records:
 
-          Verify on the TH Log:
+          ubuntu@ubuntu:~$
+          avahi-browse -rt _matterd._udp
 
-          ubuntu@ubuntu:~$ avahi-browse _matterd._udp -r
+          ++   eth0 IPv6 8BA9B3B40B98E9BB                              _matterd._udp        local
+          =   eth0 IPv6 8BA9B3B40B98E9BB                              _matterd._udp        local
+             hostname = [E45F0149AE290000.local]
+             address = [fe80::e65f:1ff:fe49:ae29]
+             port = [5650]
+             txt = ["T=1" "SAI=300" "SII=5000" "DN=Test TV" "DT=35" "VP=65521+32769"]
 
-          +   eth0 IPv6 DD200C20D25AE5F7                              _matterd._udp        local
-          +   eth0 IPv4 DD200C20D25AE5F7                              _matterd._udp        local
-          =   eth0 IPv6 DD200C20D25AE5F7                              _matterd._udp        local
-             hostname = [ubuntu-4.local]
-             address = [fd00::9e]
-             port = [33333]
-             txt = ["DN=Living Room TV" "DT=35" "VP=123+456"]
-          =   eth0 IPv4 DD200C20D25AE5F7                              _matterd._udp        local
-             hostname = [ubuntu-4.local]
-             address = [192.168.1.47]
-             port = [33333]
-             txt = ["DN=Living Room TV" "DT=35" "VP=123+456"]
+
+
+
 
 
 
diff --git a/src/app/tests/suites/certification/Test_TC_SC_4_7.yaml b/src/app/tests/suites/certification/Test_TC_SC_4_7.yaml
index fff47a1..f5cf0c1 100644
--- a/src/app/tests/suites/certification/Test_TC_SC_4_7.yaml
+++ b/src/app/tests/suites/certification/Test_TC_SC_4_7.yaml
@@ -28,7 +28,7 @@
           "TH is instructed to start advertising its presence as a commissioner
           in the network"
       verification: |
-          Launch Example TV app
+          To verify this test case use TV Reference app
       disabled: true
 
     - label: "Scan for DNS-SD commissioner advertisements from TH"
@@ -38,37 +38,16 @@
       verification: |
           if DUT supports discovering UDC, DUT should be able to scan the TV-app
 
-          Execute the below command on TH terminal.
+          Execute the below command on TH terminal and verify the AAA records:
 
 
+           $  avahi-browse -rt _matterd._udp
 
-          ~$ avahi-browse -rt _matterd._udp
-
-          Verify on the TH Log:
-
-          =+ wlp3s0 IPv4 DD200C20D25AE5F7                              _matterd._udp        local
-          + enp2s0 IPv6 DD200C20D25AE5F7                              _matterd._udp        local
-          + enp2s0 IPv4 DD200C20D25AE5F7                              _matterd._udp        local
-          = wlp3s0 IPv4 DD200C20D25AE5F7                              _matterd._udp        local
-             hostname = [matter-7.local]
-             address = [192.168.1.105]
-             port = [33333]
-             txt = ["DN=Living Room TV" "DT=35" "VP=123+456"]
-          = enp2s0 IPv6 DD200C20D25AE5F7                              _matterd._udp        local
-             hostname = [matter-7.local]
-             address = [2002:c0a8:40c:10:e65f:1ff:fe0f:2877]
-             port = [33333]
-             txt = ["DN=Living Room TV" "DT=35" "VP=123+456"]
-          = enp2s0 IPv4 DD200C20D25AE5F7                              _matterd._udp        local
-             hostname = [matter-7.local]
-             address = [192.168.1.105]
-             port = [33333]
-             txt = ["DN=Living Room TV" "DT=35" "VP=123+456"]
-          + enp2s0 IPv6 20B078AC19BDBCF9                              _matterd._udp        local
-          = enp2s0 IPv6 20B078AC19BDBCF9                              _matterd._udp        local
-             hostname = [E45F010F28770000.local]
-             address = [fe80::e65f:1ff:fe0f:2877]
-             port = [5550]
+          ++   eth0 IPv6 8BA9B3B40B98E9BB                              _matterd._udp        local
+          =   eth0 IPv6 8BA9B3B40B98E9BB                              _matterd._udp        local
+             hostname = [E45F0149AE290000.local]
+             address = [fe80::e65f:1ff:fe49:ae29]
+             port = [5650]
              txt = ["T=1" "SAI=300" "SII=5000" "DN=Test TV" "DT=35" "VP=65521+32769"]
       disabled: true
 
@@ -76,25 +55,45 @@
           "By any means, TH adds an unknown key/value pair in the advertised
           data(e.g. AB=12345)"
       verification: |
+          Run the  unknown key/value pair on TH Terminal:
+
           avahi-publish-service --subtype=_V123._sub._matterd._udp DD200C20D25AE5F7 _matterd._udp 33333 VP=123+456 DT=35 DN="Living Room TV" INVALID_TEST=40
       disabled: true
 
     - label: "Scan for DNS-SD commissioner advertisements from TH"
       verification: |
-          ubuntu@ubuntu:~$ avahi-browse -rt _matterd._udp
+          Verify the DUT commissioner is able to discover the TH.
 
-          Verify on the TH Log:
+          As an example, In the case of chip-tool as commissioner, you can verify with the below command, (Use the equivalent command on the DUT)
 
-          +   eth0 IPv6 DD200C20D25AE5F7                              _matterd._udp        local
-          +   eth0 IPv4 DD200C20D25AE5F7                              _matterd._udp        local
-          =   eth0 IPv6 DD200C20D25AE5F7                              _matterd._udp        local
-             hostname = [ubuntu-4.local]
-             address = [fd00::9e]
-             port = [11111]
-             txt = ["INVALID_TEST=40" "CM=2" "D=840"]
-          =   eth0 IPv4 DD200C20D25AE5F7                              _matterc._udp        local
-             hostname = [ubuntu-4.local]
-             address = [192.168.1.47]
-             port = [11111]
-             txt = ["INVALID_TEST=40" "CM=2" "D=840"]
+          % sudo ./out/debug/chip-tool discover commissionables
+
+          [1659544548029] [13752:9267297] CHIP: [DL] _OnPlatformEvent
+          [1659544548030] [13752:9267297] CHIP: [DIS] Browsing for: _matterc._udp
+          [1659544548031] [13752:9267297] CHIP: [DIS] Mdns: OnBrowseAdd  name: DD200C20D25AE5F7, type: _matterc._udp., domain: local., interface: 8        [1659544548031] [13752:9267297] CHIP: [DIS] Resolve type=_matterc._udp name=DD200C20D25AE5F7 interface=8
+          [1659544548032] [13752:9267297] CHIP: [DIS] Mdns : OnNewInterface hostname:ubuntuserverAccessory1.local. fullname:DD200C20D25AE5F7._matterc._udp.local. interface: 8 port: 26411 TXT:D=840CM=2INVALID_TEST=40        [1659544548033] [13752:9267297] CHIP: [DIS] Mdns: OnNewAddress interface: 8 ip:fd5d:9cc0:fc52:0:dea6:32ff:fe8d:7072
+          [1659544548033] [13752:9267297] CHIP: [DIS] Mdns: Resolve success on interface 8
+          [1659544548033] [13752:9267297] CHIP: [DIS] Discovered node:
+          [1659544548033] [13752:9267297] CHIP: [DIS]         Hostname: ubuntuserverAcce        [1659544548033] [13752:9267297] CHIP: [DIS]         IP Address #1: fd5d:9cc0:fc52:0:dea6:32ff:fe8d:7072
+          [1659544548033] [13752:9267297] CHIP: [DIS]         Port: 11111
+          [1659544548033] [13752:9267297] CHIP: [DIS]         Mrp Interval idle: not present
+          [1659544548033] [13752:9267297] CHIP: [DIS]         Mrp Interval active: not present
+          [1659544548033] [13752:9267297] CHIP: [DIS]         TCP Supported: 0
+          [1659544548033] [13752:9267297] CHIP: [DIS]         Long Discriminator: 840
+          [1659544548033] [13752:9267297] CHIP: [DIS]         Instance Name: DD200C20D25AE5F7
+          [1659544548033] [13752:9267297] CHIP: [DIS]         Commissioning Mode: 2
+          [1659544548033] [13752:9267297] CHIP: [DIS] Discovered node:
+          [1659544548033] [13752:9267297] CHIP: [DIS]         Hostname: ubuntuserverAcce        [1659544548033] [13752:9267297] CHIP: [DIS]         IP Address #1: fd5d:9cc0:fc52:0:dea6:32ff:fe8d:7072
+          [1659544548033] [13752:9267297] CHIP: [DIS]         Port: 11111
+          [1659544548033] [13752:9267297] CHIP: [DIS]         Mrp Interval idle: not present
+          [1659544548033] [13752:9267297] CHIP: [DIS]         Mrp Interval active: not present
+          [1659544548033] [13752:9267297] CHIP: [DIS]         TCP Supported: 0
+          [1659544548033] [13752:9267297] CHIP: [DIS]         Long Discriminator: 840
+          [1659544548033] [13752:9267297] CHIP: [DIS]         Instance Name: DD200C20D25AE5F7
+          [1659544548033] [13752:9267297] CHIP: [DIS]         Commissioning Mode: 2
+          [1659544578034] [13752:9267291] CHIP: [CTL] Shutting down the commissioner
+          [1659544578034] [13752:9267291] CHIP: [CTL] Stopping commissioning discovery over DNS-SD
+          [1659544578034] [13752:9267291] CHIP: [CTL] Shutting down the controller
+          [1659544578034] [13752:9267291] CHIP: [IN] Expiring all sessions for fabric 0x4!!
+          [1659544578034] [13752:9267291] CHIP: [FP] Forgetting fabric 0x4
       disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_SC_4_8.yaml b/src/app/tests/suites/certification/Test_TC_SC_4_8.yaml
index e406d3e..2ffd0fd 100644
--- a/src/app/tests/suites/certification/Test_TC_SC_4_8.yaml
+++ b/src/app/tests/suites/certification/Test_TC_SC_4_8.yaml
@@ -30,13 +30,12 @@
       verification: |
           1. Provision the device using 1st controller chip-tool (as example commissioner) on the raspi (use above instructions)
 
-
           ./chip-tool pairing onnetwork 2 20202021
 
 
           avahi-browse _matter._tcp -rt
 
-          Verify on the TH Log:
+          Verify Compressed Fabric ID on the TH Log:
 
           eth0 IPv6 8840D142C33AB653-0000000000000001             _matter._tcp         local
       disabled: true
@@ -51,13 +50,10 @@
 
 
 
-          Verify you got below message
-          Device commissioning completed with success
-
 
           avahi-browse _matter._tcp -rt
 
-          Verify on the TH Log:
+          Verify Compressed Fabric ID on the TH Log:
 
           +   eth0 IPv6 8840D142C33AB653-0000000000000001             _matter._tcp         local
       disabled: true
@@ -69,7 +65,6 @@
           Verify in TH all-clusters-app log
 
 
-
           CHIP:DMG: Received Command Response Data, Endpoint=0 Cluster=0x0000_003E Command=0x0000_0008
           [1651571274.154864][10562:10567] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_003E Command 0x0000_0008
           [1651571274.155030][10562:10567] CHIP:TOO:   NOCResponse: {
@@ -82,7 +77,7 @@
 
           avahi-browse _matter._tcp -rt
 
-          Verify on the TH Log:
+          Verify Compressed Fabric ID on the TH Log:
 
           +   eth0 IPv6 8840D142C33AB653-0000000000000001             _matter._tcp         local
       disabled: true
@@ -101,13 +96,13 @@
           [1657628679275] [78509:912135] CHIP: [TOO]    }
           [1657628679275] [78509:912135] CHIP: [DMG] ICR mov
 
-          ./chip-tool pairing ble-wifi 1 chipsetup4 matter123 20202021 3841
+
 
           ./chip-tool pairing onnetwork 2 20202021
 
           avahi-browse _matter._tcp -rt
 
-          Verify on the TH Log:
+          VerifyCompressed Fabric ID on the TH Log:
 
           +   eth0 IPv6 8840D142C33AB653-0000000000000002
       disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_SC_4_9.yaml b/src/app/tests/suites/certification/Test_TC_SC_4_9.yaml
index 584362f..b8d8dbb 100644
--- a/src/app/tests/suites/certification/Test_TC_SC_4_9.yaml
+++ b/src/app/tests/suites/certification/Test_TC_SC_4_9.yaml
@@ -26,83 +26,43 @@
     endpoint: 0
 
 tests:
-    - label:
-          "Starts a commissioning process with DUT_CE including an access
-          control list entry on DUT_CE that gives Operate Privilege to TH_CR2
-          against every endpoint of DUT_CE"
+    - label: "Using TH_CR1, commission the DUT_CE onto the Matter network"
       verification: |
-          ./chip-tool accesscontrol write acl "[{"fabricIndex": 1, "privilege": 5, "authMode": 2, "subjects": [112233], "targets": [{"cluster": null, "endpoint": 0, "deviceType": null}]}, {"fabricIndex": 1, "privilege": 3, "authMode": 3, "subjects": null, "targets": [{"cluster": null, "endpoint": 1, "deviceType": null}]}]" 77 0
+          Using chip-tool (TH_CR1) provision the device using cmd
 
-          Verify SUCCESS on the TH Log:
-
-          [1652330385.328196][3240:3245] CHIP:DMG:                        StatusIB =
-          [1652330385.328229][3240:3245] CHIP:DMG:                        {
-          [1652330385.328264][3240:3245] CHIP:DMG:                                status = 0x00 (SUCCESS),
-          [1652330385.328298][3240:3245] CHIP:DMG:                        },
-      disabled: true
-
-    - label:
-          "Reads Basic Information Cluster NodeLabel attribute as
-          PreviousNodeLabel"
-      verification: |
-          ./chip-tool basic read node-label 77 0
-
-          Verify NodeLabel on the TH Log:
-
-          [1652420234.342201][2403:2408] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0028 Attribute 0x0000_0005 DataVersion: 2144347768
-          [1652420234.342277][2403:2408] CHIP:TOO:   NodeLabel:
-          [1652420234.342452][2403:2408] CHIP:EM: Sending Standalone Ack for MessageCounter:123718 on exchange 57159i
-      disabled: true
-
-    - label: "Writes TestRIO to the NodeLabel attribute"
-      verification: |
-          ./chip-tool basic write node-label testrio 77 0
-
-          Verify SUCCESS on the TH Log:
-
-          StatusIB =
-          [1652421063.833937][2454:2459] CHIP:DMG:                         {
-          [1652421063.834016][2454:2459] CHIP:DMG:                                 status = 0x00 (SUCCESS),
-          [1652421063.834118][2454:2459] CHIP:DMG:                         },
-      disabled: true
-
-    - label: "Reads NodeLabel attribute"
-      verification: |
-          ./chip-tool basic read node-label 77 0
-
-          Verify NodeLabel on the TH Log:
-
-          [1652421068.143200][2460:2465] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0028 Attribute 0x0000_0005 DataVersion: 2144347769
-          [1652421068.143276][2460:2465] CHIP:TOO:   NodeLabel: testrio
-          [1652421068.143457][2460:2465] CHIP:EM: Sending Standalone Ack for MessageCounter:2274062 on exchange 46531i
-      disabled: true
-
-    - label: "Writes TestRIO2 to the NodeLabel attribute"
-      verification: |
-          ./chip-tool basic write node-label testrio2 77 0
-
-          Verify SUCCESS on the TH Log:
-
-          StatusIB =
-          [1652421082.185625][2467:2473] CHIP:DMG:                         {
-          [1652421082.185696][2467:2473] CHIP:DMG:                                 status = 0x00 (SUCCESS),
-          [1652421082.185766][2467:2473] CHIP:DMG:                         },
-      disabled: true
-
-    - label: "Reads NodeLabel attribute"
-      verification: |
-          ./chip-tool basic read node-label 77 0
-
-          Verify NodeLabel on the TH Log:
-
-          [1652421088.232903][2474:2479] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0028 Attribute 0x0000_0005 DataVersion: 2144347770
-          [1652421088.232983][2474:2479] CHIP:TOO:   NodeLabel: testrio2
-          [1652421088.233169][2474:2479] CHIP:EM: Sending Standalone Ack for MessageCounter:4743745 on exchange 61019i
+          ./out/debug/chip-tool pairing ble-wifi node-id ssid password setup-pin-code discriminator
       disabled: true
 
     - label: "Bring the TH_CR2 onto the thread network"
       verification: |
-          verification step to be updated.
+          Build openthread posix app with RCP and have it join the thread network that the BR is part of. If you don"t have the app, follow the below Instructions to build the posix app
+
+          if you have the RCP connected to the raspi, launch the ot-cli app with RCP
+          $ sudo ./build/posix/src/posix/ot-cli "spinel+hdlc+uart:///dev/ttyACM0?uart-baudrate=115200" -v
+          ./build/posix/src/posix/ot-cli[68007]: Running OPENTHREAD/thread-reference-20200818-1820-g095f530bd; POSIX; Jul 18 2022 22:44:35
+          ./build/posix/src/posix/ot-cli[68007]: Thread version: 4
+          ./build/posix/src/posix/ot-cli[68007]: Thread interface:
+          ./build/posix/src/posix/ot-cli[68007]: RCP version: OPENTHREAD/thread-reference-20200818-1615-gfdf3c3034; NRF52840; Jul 17 2022 17:10:13
+          > dataset set active <PROVIDE THE DATASET OF THE BR THAT YOU NEED TO JOIN>
+          > dataset commit active
+          > ifconfig up
+          > thread start
+
+          With the above set of commands, the RCP should join the thread network hosted by the BR.
+          >srp client autostart enable
+
+
+          Instructions to build the posix app.
+          1. Get Nordic nRF52840 dongle.
+          2. Attach it to the raspi/Ubuntu machine
+          Follow the instructions at https://github.com/openthread/openthread/blob/main/src/posix/README.md
+          3. git clone --recursive git@github.com:openthread/openthread.git
+          4. cd openthread/
+          5. ./script/bootstrap
+          6. ./bootstrap
+          7. ./script/cmake-build posix
+          8. follow the instructions to build the RCP dongle (or get the RCP image from README file in the test harness and flash it on the RCP)
+          8. ./build/posix/src/posix/ot-cli "spinel+hdlc+uart:///dev/ttyACM0?uart-baudrate=115200" -v
       disabled: true
 
     - label:
@@ -112,5 +72,19 @@
           operational service record (_matter._tcp service instance) of DUT_CE
           done by TH_CR2."
       verification: |
-          verification step to be updated.
+          In the RCP Shell , have the TH_CR2 discover the device IP address using
+          > dns service 177AC531F48BE736-0000000000000190 _matter._tcp.default.service.arpa.
+          DNS service resolution response for 177AC531F48BE736-0000000000000190 for service _matter._tcp.default.service.arpa.
+          Port:5540, Priority:0, Weight:0, TTL:6913
+          Host:72FF282E7739731F.default.service.arpa.
+          HostAddress:fd11:66:0:0:22ae:27fe:13ac:54df TTL:6915
+          TXT:[SII=35303030, SAI=333030, T=30] TTL:6913
+          Ping the IP address of the wifi device
+
+          > ping fd11:66:0:0:22ae:27fe:13ac:54df
+          16 bytes from fd11:66:0:0:22ae:27fe:13ac:54df : icmp_seq=2 hlim=64 time=14ms
+          1 packets transmitted, 1 packets received. Packet loss = 0.0%. Round-trip min/avg/max = 14/14.0/14 ms.
+          Done
+
+          The ping command should be successful.
       disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_SU_1_1.yaml b/src/app/tests/suites/certification/Test_TC_SU_1_1.yaml
index 60d7a0f..2d8008f 100644
--- a/src/app/tests/suites/certification/Test_TC_SU_1_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_SU_1_1.yaml
@@ -31,7 +31,7 @@
 
           where 0x1234567890 is OTA Requestor node ID and 0xDEADBEEF is OTA Provider node ID
 
-          Verify on the OTA Requestor logs:
+          Verify on the OTA Requestor logs receives AnnounceOTAProvider:
 
           [1645743053311] [97809:20280821] CHIP: [SWU] OTA Requestor received AnnounceOTAProvider
           [1645743053311] [97809:20280821] CHIP: [SWU]   FabricIndex: 1
diff --git a/src/app/tests/suites/certification/Test_TC_SU_2_1.yaml b/src/app/tests/suites/certification/Test_TC_SU_2_1.yaml
index 287f6ec..d8adbc2 100644
--- a/src/app/tests/suites/certification/Test_TC_SU_2_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_SU_2_1.yaml
@@ -30,7 +30,7 @@
 
           where 0x1234567890 is OTA Requestor node ID and 0xDEADBEEF is OTA Provider node ID
 
-          Verify on the OTA Provider logs:
+          Verify on the OTA Provider logs received QueryImage:
 
           [1645743053317] [97806:20280749] CHIP: [ZCL] OTA Provider received QueryImage
           [1645743053317] [97806:20280749] CHIP: [ZCL]   VendorID: 0xfff1
@@ -65,7 +65,7 @@
 
           where 0x1234567890 is OTA Requestor node ID and 0xDEADBEEF is OTA Provider node ID
 
-          Verify on the OTA Provider logs:
+          Verify on the OTA Provider logs received QueryImage:
 
           [1645743053317] [97806:20280749] CHIP: [ZCL] OTA Provider received QueryImage
           [1645743053317] [97806:20280749] CHIP: [ZCL]   VendorID: 0xfff1
diff --git a/src/app/tests/suites/certification/Test_TC_SU_2_2.yaml b/src/app/tests/suites/certification/Test_TC_SU_2_2.yaml
index a3f357e..60c480a 100644
--- a/src/app/tests/suites/certification/Test_TC_SU_2_2.yaml
+++ b/src/app/tests/suites/certification/Test_TC_SU_2_2.yaml
@@ -27,10 +27,9 @@
 
 tests:
     - label:
-          'DUT sends a QueryImage command to the TH/OTA-P. TH/OTA-P sends a
-          QueryImageResponse back to DUT. QueryStatus is set to
-          "UpdateAvailable". Set ImageURI to the location where the image is
-          located.'
+          "DUT sends a QueryImage command to the TH/OTA-P. TH/OTA-P sends a
+          QueryImageResponse back to DUT. QueryStatus is set to UpdateAvailable.
+          Set ImageURI to the location where the image is located."
       verification: |
           Run the OTA Provider App using the command:
 
@@ -47,9 +46,9 @@
       disabled: true
 
     - label:
-          'DUT sends a QueryImage command to the TH/OTA-P. TH/OTA-P sends a
-          QueryImageResponse back to DUT. QueryStatus is set to "Busy",
-          DelayedActionTime is set to 60 seconds.'
+          "DUT sends a QueryImage command to the TH/OTA-P. TH/OTA-P sends a
+          QueryImageResponse back to DUT. QueryStatus is set to Busy,
+          DelayedActionTime is set to 60 seconds."
       verification: |
           Run the OTA Provider App using the command:
 
@@ -63,8 +62,8 @@
       disabled: true
 
     - label:
-          'DUT sends a QueryImage command to the TH/OTA-P. TH/OTA-P sends a
-          QueryImageResponse back to DUT. QueryStatus is set to "NotAvailable".'
+          "DUT sends a QueryImage command to the TH/OTA-P. TH/OTA-P sends a
+          QueryImageResponse back to DUT. QueryStatus is set to NotAvailable."
       verification: |
           Run the OTA Provider App using the command:
 
@@ -79,11 +78,11 @@
       disabled: true
 
     - label:
-          'DUT sends a QueryImage command to the TH/OTA-P.+ TH/OTA-P sends a
+          "DUT sends a QueryImage command to the TH/OTA-P.+ TH/OTA-P sends a
           QueryImageResponse back to DUT. QueryStatus is set to Busy, Set
           DelayedActionTime to 3 minutes. . On the subsequent QueryImage
           command, TH/OTA-P sends a QueryImageResponse back to DUT. QueryStatus
-          is set to "UpdateAvailable".'
+          is set to UpdateAvailable."
       verification: |
           Run the OTA Provider App using the command:
 
@@ -98,20 +97,20 @@
       disabled: true
 
     - label:
-          'DUT sends a QueryImage command to the TH/OTA-P. TH/OTA-P sends a
-          QueryImageResponse back to DUT. QueryStatus is set to
-          "UpdateAvailable", ImageURI should have the https url from where the
-          image can be downloaded.'
+          "DUT sends a QueryImage command to the TH/OTA-P. TH/OTA-P sends a
+          QueryImageResponse back to DUT. QueryStatus is set to UpdateAvailable,
+          ImageURI should have the https url from where the image can be
+          downloaded."
       PICS: MCORE.OTA.HTTPS
       verification: |
           Out of scope for V1.0
       disabled: true
 
     - label:
-          'DUT sends a QueryImage command to the TH/OTA-P. TH/OTA-P sends a
-          QueryImageResponse back to DUT. QueryStatus is set to
-          "UpdateAvailable", Software Version should be set to the same or an
-          older (numerically lower) version.'
+          "DUT sends a QueryImage command to the TH/OTA-P. TH/OTA-P sends a
+          QueryImageResponse back to DUT. QueryStatus is set to UpdateAvailable,
+          Software Version should be set to the same or an older (numerically
+          lower) version."
       verification: |
           Run the OTA Provider App using the command:
 
@@ -127,9 +126,9 @@
       disabled: true
 
     - label:
-          'DUT sends a QueryImage command to the TH/OTA-P. TH/OTA-P sends a
-          QueryImageResponse back to DUT. QueryStatus is set to
-          "UpdateAvailable", ImageURI field contains an invalid BDX ImageURI.'
+          "DUT sends a QueryImage command to the TH/OTA-P. TH/OTA-P sends a
+          QueryImageResponse back to DUT. QueryStatus is set to UpdateAvailable,
+          ImageURI field contains an invalid BDX ImageURI."
       verification: |
           Run the OTA Provider App using the command:
 
diff --git a/src/app/tests/suites/certification/Test_TC_SU_2_3.yaml b/src/app/tests/suites/certification/Test_TC_SU_2_3.yaml
index 28266d5..b25c6ad 100644
--- a/src/app/tests/suites/certification/Test_TC_SU_2_3.yaml
+++ b/src/app/tests/suites/certification/Test_TC_SU_2_3.yaml
@@ -43,10 +43,9 @@
       disabled: true
 
     - label:
-          'IF DUT sends a QueryImage command to the TH/OTA-P. TH/OTA-P sends a
-          QueryImageResponse back to DUT. QueryStatus is set to
-          "UpdateAvailable". Set ImageURI to the location where the image is
-          located.'
+          "DUT sends a QueryImage command to the TH/OTA-P. TH/OTA-P sends a
+          QueryImageResponse back to DUT. QueryStatus is set to UpdateAvailable.
+          Set ImageURI to the location where the image is located."
       verification: |
           "Run the OTA Provider App using the command:
 
@@ -63,10 +62,9 @@
       disabled: true
 
     - label:
-          'DUT sends a QueryImage command to the TH/OTA-P. TH/OTA-P sends a
-          QueryImageResponse back to DUT. QueryStatus is set to
-          "UpdateAvailable". Set ImageURI with the https url of the software
-          image.'
+          "DUT sends a QueryImage command to the TH/OTA-P. TH/OTA-P sends a
+          QueryImageResponse back to DUT. QueryStatus is set to UpdateAvailable.
+          Set ImageURI with the https url of the software image."
       PICS: MCORE.OTA.HTTPS
       verification: |
           Out of scope for V1.0
diff --git a/src/app/tests/suites/certification/Test_TC_SU_2_4.yaml b/src/app/tests/suites/certification/Test_TC_SU_2_4.yaml
index 65ce85a..46135eb 100644
--- a/src/app/tests/suites/certification/Test_TC_SU_2_4.yaml
+++ b/src/app/tests/suites/certification/Test_TC_SU_2_4.yaml
@@ -28,8 +28,8 @@
 tests:
     - label:
           "DUT sends a QueryImage command to the TH/OTA-P + TH/OTA-P sends a
-          QueryImageResponse back to DUT. QueryStatus is set to Available. Set
-          ImageURI to the location where the image is located.After the DUT
+          QueryImageResponse back to DUT. QueryStatus is set to UpdateAvailable.
+          Set ImageURI to the location where the image is located.After the DUT
           transfers the image, the DUT should send ApplyUpdateRequest to the
           OTA-P."
       verification: |
diff --git a/src/app/tests/suites/certification/Test_TC_SU_2_5.yaml b/src/app/tests/suites/certification/Test_TC_SU_2_5.yaml
index b8c5eec..fea7477 100644
--- a/src/app/tests/suites/certification/Test_TC_SU_2_5.yaml
+++ b/src/app/tests/suites/certification/Test_TC_SU_2_5.yaml
@@ -27,8 +27,8 @@
 
 tests:
     - label:
-          'OTA-P/TH sends the ApplyUpdateResponse Command to the DUT. Action
-          field is set to "Proceed" DelayedActionTime is set to 0.'
+          "OTA-P/TH sends the ApplyUpdateResponse Command to the DUT. Action
+          field is set to Proceed DelayedActionTime is set to 0."
       verification: |
           Verify that the DUT starts updating its software.
           Once the update is finished verify the software version on the DUT to match the version downloaded for the software update.
@@ -46,8 +46,8 @@
       disabled: true
 
     - label:
-          'OTA-P/TH sends the ApplyUpdateResponse Command to the DUT. Action
-          field is set to "Proceed" DelayedActionTime is set to 3 minutes'
+          "OTA-P/TH sends the ApplyUpdateResponse Command to the DUT. Action
+          field is set to Proceed DelayedActionTime is set to 3 minutes"
       verification: |
           Run the OTA Provider App using the command:
 
@@ -66,9 +66,8 @@
       disabled: true
 
     - label:
-          'OTA-P/TH sends the ApplyUpdateResponse Command to the DUT. Action
-          field is set to "AwaitNextAction", DelayedActionTime is set to 1
-          minute.'
+          "OTA-P/TH sends the ApplyUpdateResponse Command to the DUT. Action
+          field is set to AwaitNextAction, DelayedActionTime is set to 1 minute."
       verification: |
           Run the OTA Provider App using the command:
 
@@ -84,10 +83,10 @@
       disabled: true
 
     - label:
-          'OTA-P/TH sends the ApplyUpdateResponse Command to the DUT. Action
-          field is set to "AwaitNextAction", DelayedActionTime is set to 3
+          "OTA-P/TH sends the ApplyUpdateResponse Command to the DUT. Action
+          field is set to AwaitNextAction, DelayedActionTime is set to 3
           minutes. On the subsequent ApplyUpdateRequest command, TH/OTA-P sends
-          the ApplyUpdateResponse back to DUT. Action field is set to "Proceed".'
+          the ApplyUpdateResponse back to DUT. Action field is set to Proceed."
       verification: |
           Run the OTA Provider App using the command:
 
@@ -105,8 +104,8 @@
       disabled: true
 
     - label:
-          'OTA-P/TH sends the ApplyUpdateResponse Command to the DUT. Action
-          field is set to "Discontinue".'
+          "OTA-P/TH sends the ApplyUpdateResponse Command to the DUT. Action
+          field is set to Discontinue."
       verification: |
           Run the OTA Provider App using the command:
           ./chip-ota-provider-app --discriminator 22 --secured-device-port 5565 --KVS /tmp/chip_kvs_provider --filepath /tmp/test.bin -a  discontinue
diff --git a/src/app/tests/suites/certification/Test_TC_SU_2_7.yaml b/src/app/tests/suites/certification/Test_TC_SU_2_7.yaml
index 4e9233f..4b161cf 100644
--- a/src/app/tests/suites/certification/Test_TC_SU_2_7.yaml
+++ b/src/app/tests/suites/certification/Test_TC_SU_2_7.yaml
@@ -70,8 +70,8 @@
       disabled: true
 
     - label:
-          'DUT sends a QueryImage command to the TH/OTA-P. TH/OTA-P sends a
-          QueryImageResponse back to DUT. QueryStatus is set to "Busy".'
+          "DUT sends a QueryImage command to the TH/OTA-P. TH/OTA-P sends a
+          QueryImageResponse back to DUT. QueryStatus is set to Busy."
       verification: |
           ./chip-tool interactive start
 
@@ -194,9 +194,9 @@
       disabled: true
 
     - label:
-          'After the OTA image is transferred, DUT sends ApplyUpdateRequest to
+          "After the OTA image is transferred, DUT sends ApplyUpdateRequest to
           the OTA-P. OTA-P/TH sends the ApplyUpdateResponse Command to the DUT.
-          Action field is set to "AwaitNextAction".'
+          Action field is set to AwaitNextAction."
       verification: |
           ./chip-tool interactive start
 
diff --git a/src/app/tests/suites/certification/Test_TC_SU_2_8.yaml b/src/app/tests/suites/certification/Test_TC_SU_2_8.yaml
index 9579a66..afafe49 100644
--- a/src/app/tests/suites/certification/Test_TC_SU_2_8.yaml
+++ b/src/app/tests/suites/certification/Test_TC_SU_2_8.yaml
@@ -26,11 +26,11 @@
 tests:
     - label: "DUT sends a QueryImage command to the TH1/OTA-P"
       verification: |
-          ./chip-tool otasoftwareupdaterequestor write default-ota-providers '[{"fabricIndex": 1, "providerNodeID": 3735928559, "endpoint": 0}]' 0x0000001234567890 0
+          ./chip-tool otasoftwareupdaterequestor write default-ota-providers "[{"fabricIndex": 1, "providerNodeID": 3735928559, "endpoint": 0}]" 0x0000001234567890 0
 
           where 0x1234567890 is OTA Requestor node ID and 0xDEADBEEF is OTA Provider node ID
 
-          Verify on the OTA Provider logs:
+          Verify on the OTA Provider logs receives QueryImage:
 
           [1645743053317] [97806:20280749] CHIP: [ZCL] OTA Provider received QueryImage
           [1645743053317] [97806:20280749] CHIP: [ZCL]   VendorID: 0xfff1
@@ -48,9 +48,9 @@
           "DUT sends a QueryImage command to TH1/OTA-P. TH1/OTA-P does not
           respond with QueryImageResponse."
       verification: |
-          ./chip-tool otasoftwareupdaterequestor write default-ota-providers '[{"fabricIndex": 1, "providerNodeID": 3735928559, "endpoint": 0}]' 0x0000001234567890 0
+          ./chip-tool otasoftwareupdaterequestor write default-ota-providers "[{"fabricIndex": 1, "providerNodeID": 3735928559, "endpoint": 0}]" 0x0000001234567890 0
 
-          ./chip-tool otasoftwareupdaterequestor write default-ota-providers '[{"fabricIndex": 2, "providerNodeID": 1, "endpoint": 0}]' 0x858 0 --commissioner-name beta
+          ./chip-tool otasoftwareupdaterequestor write default-ota-providers "[{"fabricIndex": 2, "providerNodeID": 1, "endpoint": 0}]" 0x858 0 --commissioner-name beta
 
           Kill Default OTA Provider for fabric index 1 before DUT sends a query
 
@@ -61,7 +61,7 @@
           "DUT sends a QueryImage command to TH2/OTA-P. TH2/OTA-P sends a
           QueryImageResponse back to the DUT. Status is set to UpdateAvailable."
       verification: |
-          ./chip-tool otasoftwareupdaterequestor write default-ota-providers '[{"fabricIndex": 2, "providerNodeID": 1, "endpoint": 0}]' 0x858 0 --commissioner-name beta
+          ./chip-tool otasoftwareupdaterequestor write default-ota-providers "[{"fabricIndex": 2, "providerNodeID": 1, "endpoint": 0}]" 0x858 0 --commissioner-name beta
 
           Verify there is a transfer of the software image from TH2/OTA-P to the DUT
       disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_SU_3_1.yaml b/src/app/tests/suites/certification/Test_TC_SU_3_1.yaml
index 0999999..ca23a13 100644
--- a/src/app/tests/suites/certification/Test_TC_SU_3_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_SU_3_1.yaml
@@ -32,7 +32,7 @@
 
           where 0x1234567890 is OTA Requestor node ID and 0xDEADBEEF is OTA Provider node ID
 
-          Verify on the OTA Requestor logs
+          Verify on the OTA Requestor logs receives QueryImageResponse
 
           [1651265462659] [21768:35233106] CHIP: [SWU] QueryImageResponse:
           [1651265462659] [21768:35233106] CHIP: [SWU]   status: 0
diff --git a/src/app/tests/suites/certification/Test_TC_SU_3_2.yaml b/src/app/tests/suites/certification/Test_TC_SU_3_2.yaml
index 0d4fe6a..57df1b8 100644
--- a/src/app/tests/suites/certification/Test_TC_SU_3_2.yaml
+++ b/src/app/tests/suites/certification/Test_TC_SU_3_2.yaml
@@ -35,7 +35,7 @@
 
           where 0x1234567890 is OTA Requestor node ID and 0xDEADBEEF is OTA Provider node ID
 
-          Verify on the OTA Requestor logs
+          Verify on the OTA Requestor logs receives QueryImageResponse
 
           [1651265462659] [21768:35233106] CHIP: [SWU] QueryImageResponse:
           [1651265462659] [21768:35233106] CHIP: [SWU]   status: 0
@@ -60,7 +60,7 @@
 
           where 0x1234567890 is OTA Requestor node ID and 0xDEADBEEF is OTA Provider node ID
 
-          Verify on the OTA Requestor logs
+          Verify on the OTA Requestor logs receives QueryImageResponse
 
           [1645819644181] [21592:21187907] CHIP: [SWU] QueryImageResponse:
           [1645819644181] [21592:21187907] CHIP: [SWU]   status: 2
@@ -78,7 +78,7 @@
 
           where 0x1234567890 is OTA Requestor node ID and 0xDEADBEEF is OTA Provider node ID
 
-          Verify on the OTA Requestor logs
+          Verify on the OTA Requestor logs receives QueryImageResponse
 
           [1651265462659] [21768:35233106] CHIP: [SWU] QueryImageResponse:
           [1651265462659] [21768:35233106] CHIP: [SWU]   status: 0
@@ -95,20 +95,20 @@
       disabled: true
 
     - label:
-          'OTA-R/TH sends a QueryImage Command to the DUT. ProtocolSupported
-          field should list "https". DUT responds with a QueryImageResponse to
-          the OTA-R/TH.'
+          "OTA-R/TH sends a QueryImage Command to the DUT. ProtocolSupported
+          field should list https. DUT responds with a QueryImageResponse to the
+          OTA-R/TH."
       verification: |
           Out of scope for V1.0
       disabled: true
 
     - label:
-          'OTA-R/TH sends a QueryImage Command to the DUT. DUT responds with the
-          QueryImageResponse with QueryStatus set to "Busy", DelayedActionTime
-          set to 3 minutes. On the subsequent QueryImage command, DUT sends a
+          "OTA-R/TH sends a QueryImage Command to the DUT. DUT responds with the
+          QueryImageResponse with QueryStatus set to Busy, DelayedActionTime set
+          to 3 minutes. On the subsequent QueryImage command, DUT sends a
           QueryImageResponse back to OTA-R/TH. QueryStatus is set to
-          "UpdateAvailable".'
-      PICS: OTAS.S.M.DelayedActionTime
+          UpdateAvailable."
+      PICS: OTAP.S.M.DelayedActionTime
       verification: |
           ./chip-ota-provider-app --discriminator 22 --secured-device-port 5565 --KVS /tmp/chip_kvs_provider --filepath /tmp/test.bin -q busy -t 180
 
@@ -116,7 +116,8 @@
 
           where 0x1234567890 is OTA Requestor node ID and 0xDEADBEEF is OTA Provider node ID
 
-          Verify on the OTA Requestor logs
+          Verify on the OTA Requestor logs receives QueryImageResponse
+
           [1651265271074] [21764:35230537] CHIP: [SWU] QueryImageResponse:
           [1651265271074] [21764:35230537] CHIP: [SWU]   status: 1
           [1651265271074] [21764:35230537] CHIP: [SWU]   delayedActionTime: 180 seconds
@@ -124,6 +125,7 @@
           [1651265271074] [21764:35230537] CHIP: [SWU]   metadataForRequestor: 0
 
           Verify that the OTA-R/TH starts the download from the DUT after the second QueryImageResponse with UpdateAvailable status.
+
           [1651265462659] [21768:35233106] CHIP: [SWU] QueryImageResponse:
           [1651265462659] [21768:35233106] CHIP: [SWU]   status: 0
           [1651265462659] [21768:35233106] CHIP: [SWU]   delayedActionTime: 0 seconds
diff --git a/src/app/tests/suites/certification/Test_TC_SU_3_3.yaml b/src/app/tests/suites/certification/Test_TC_SU_3_3.yaml
index a80315a..372cb6b 100644
--- a/src/app/tests/suites/certification/Test_TC_SU_3_3.yaml
+++ b/src/app/tests/suites/certification/Test_TC_SU_3_3.yaml
@@ -34,7 +34,7 @@
 
           where 0x1234567890 is OTA Requestor node ID and 0xDEADBEEF is OTA Provider node ID
 
-          Verify on the OTA Requestor logs
+          Verify on the OTA Requestor logs receives QueryImageResponse
 
           [1645743053319] [97809:20280821] CHIP: [SWU] QueryImageResponse:
           [1645743053319] [97809:20280821] CHIP: [SWU]   status: 0
diff --git a/src/app/tests/suites/certification/Test_TC_SU_3_4.yaml b/src/app/tests/suites/certification/Test_TC_SU_3_4.yaml
index bff4b67..ce5efd9 100644
--- a/src/app/tests/suites/certification/Test_TC_SU_3_4.yaml
+++ b/src/app/tests/suites/certification/Test_TC_SU_3_4.yaml
@@ -30,7 +30,7 @@
           "OTA-R/TH on completion of image download sends an
           ApplyUpdateRequestCommand to the DUT."
       verification: |
-          Verify on the OTA Requestor logs
+          Verify on the OTA Requestor logs receives ApplyUpdateResponse
 
           [1645743059328] [97809:20280957] CHIP: [SWU] ApplyUpdateResponse:
           [1645743059328] [97809:20280957] CHIP: [SWU]   action: 0
@@ -38,11 +38,11 @@
       disabled: true
 
     - label:
-          'OTA-R/TH on completion of image download sends an ApplyUpdateRequest
+          "OTA-R/TH on completion of image download sends an ApplyUpdateRequest
           command to the DUT. DUT responds with the ApplyUpdateResponse with
-          Action set to "AwaitNextAction", DelayedActionTime set to 3 minutes.
-          On the subsequent ApplyUpdateRequest command, DUT sends a
-          ApplyUpdateResponse back to DUT. Action is set to Proceed.'
+          Action set to AwaitNextAction, DelayedActionTime set to 3 minutes. On
+          the subsequent ApplyUpdateRequest command, DUT sends a
+          ApplyUpdateResponse back to DUT. Action is set to Proceed."
       verification: |
           Run the OTA Requestor App using command
 
@@ -50,7 +50,7 @@
 
           chip-ota-provider-app --discriminator 22 --secured-device-port 5565 --KVS /tmp/chip_kvs_provider --filepath /tmp/test.bin -a awaitNextAction -p 180
 
-          Verify on the OTA Requestor logs:
+          Verify on the OTA Requestor logs receives ApplyUpdateResponse:
 
           [1651273867647] [25752:35374182] CHIP: [SWU] ApplyUpdateResponse:
           [1651273867647] [25752:35374182] CHIP: [SWU]   action: 1
@@ -64,10 +64,10 @@
       disabled: true
 
     - label:
-          'OTA-R/TH on completion of image download sends an ApplyUpdateRequest
+          "OTA-R/TH on completion of image download sends an ApplyUpdateRequest
           command to the DUT. DUT responds with the ApplyUpdateResponse with
-          Action set to "Discontinue". Initiate another QueryImage Command from
-          OTA-R/TH to the DUT.'
+          Action set to Discontinue. Initiate another QueryImage Command from
+          OTA-R/TH to the DUT."
       verification: |
           Run the OTA Requestor App using command
 
diff --git a/src/app/tests/suites/certification/Test_TC_SU_4_1.yaml b/src/app/tests/suites/certification/Test_TC_SU_4_1.yaml
index 11b5311..e86f7dc 100644
--- a/src/app/tests/suites/certification/Test_TC_SU_4_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_SU_4_1.yaml
@@ -29,9 +29,9 @@
           first fabric to the DUT. TH2 is set as the default Provider for the
           fabric."
       verification: |
-          ./chip-tool otasoftwareupdaterequestor write default-ota-providers '[{"fabricIndex": 1, "providerNodeID": 3735928559, "endpoint": 0}]' 0x0000001234567890 0
+          ./chip-tool otasoftwareupdaterequestor write default-ota-providers "[{"fabricIndex": 1, "providerNodeID": 3735928559, "endpoint": 0}]" 0x0000001234567890 0
 
-          verify on chip-tool logs:
+          verify success response on chip-tool logs:
 
           status = 0x00 (SUCCESS),
       disabled: true
@@ -57,9 +57,9 @@
           second fabric to the DUT. TH3 is set as the default Provider for the
           fabric."
       verification: |
-          ./chip-tool otasoftwareupdaterequestor write default-ota-providers '[{"fabricIndex": 2, "providerNodeID": 1, "endpoint": 0}]' 0x858 0 --commissioner-name beta
+          ./chip-tool otasoftwareupdaterequestor write default-ota-providers "[{"fabricIndex": 2, "providerNodeID": 1, "endpoint": 0}]" 0x858 0 --commissioner-name beta
 
-          verify on chip-tool logs:
+          verify success response in chip-tool logs:
 
           status = 0x00 (SUCCESS),
       disabled: true
@@ -98,7 +98,7 @@
           fabric. TH sends a read request to read the DefaultOTAProviders
           Attribute on the first and second fabric to the DUT."
       verification: |
-          ./chip-tool otasoftwareupdaterequestor write default-ota-providers '[{"fabricIndex": 1, "providerNodeID": 10, "endpoint": 0}, {"fabricIndex": 1, "providerNodeID": 20, "endpoint": 0}]' 0x0000001234567890 0
+          ./chip-tool otasoftwareupdaterequestor write default-ota-providers "[{"fabricIndex": 1, "providerNodeID": 10, "endpoint": 0}, {"fabricIndex": 1, "providerNodeID": 20, "endpoint": 0}]" 0x0000001234567890 0
 
           verify on chip-tool logs:
 
@@ -133,7 +133,7 @@
           read request to read the DefaultOTAProviders Attribute on the first
           and second fabric to the DUT."
       verification: |
-          chip-tool otasoftwareupdaterequestor write default-ota-providers '[]' 0x858 0 --commissioner-name beta
+          chip-tool otasoftwareupdaterequestor write default-ota-providers "[]" 0x858 0 --commissioner-name beta
 
           verify on chip-tool logs:
 
@@ -166,7 +166,7 @@
 
           where 0x1234567890 is OTA Requestor node ID
 
-          Verify on the chip-tool logs
+          Verify update-possible on the chip-tool logs is set to True:
 
           [1645822694702] [22599:21229305] CHIP: [DMG] ReportDataMessage =
           [1645822694702] [22599:21229305] CHIP: [DMG] {
@@ -204,7 +204,7 @@
 
           where 0x1234567890 is OTA Requestor node ID
 
-          verify on chip-tool logs:
+          verify  UpdateState value on chip-tool logs as 1:
 
           Verify that the value is set to one of the valid attribute values based on the current update state on the chip-tool logs
           [1655444388.600153][6051:6056] CHIP:DMG: ReportDataMessage =
diff --git a/src/app/tests/suites/certification/Test_TC_TGTNAV_8_2.yaml b/src/app/tests/suites/certification/Test_TC_TGTNAV_8_2.yaml
new file mode 100644
index 0000000..f65c215
--- /dev/null
+++ b/src/app/tests/suites/certification/Test_TC_TGTNAV_8_2.yaml
@@ -0,0 +1,63 @@
+# 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.10.2. [TC-TGTNAV-8.2] Navigate Target Verification (DUT as Client)
+
+PICS:
+    - TGTNAV.S
+
+config:
+    nodeId: 0x12344321
+    cluster: "Basic"
+    endpoint: 0
+
+tests:
+    - label: "DUT sends NavigateTarget command to TH"
+      PICS: TGTNAV.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 targetnavigator navigate-target 1 1 1
+          ./chip-tv-casting-app targetnavigator navigate-target 1 1 1
+
+
+          The log below shows the resulting log on the TH (tv-app or all-clusters-app):
+
+          [1658531406475] [21924:325733] CHIP: [DMG] InvokeRequestMessage =
+          [1658531406475] [21924:325733] CHIP: [DMG] {
+          [1658531406475] [21924:325733] CHIP: [DMG]         suppressResponse = false,
+          [1658531406475] [21924:325733] CHIP: [DMG]         timedRequest = false,
+          [1658531406475] [21924:325733] CHIP: [DMG]         InvokeRequests =
+          [1658531406475] [21924:325733] CHIP: [DMG]         [
+          [1658531406475] [21924:325733] CHIP: [DMG]                 CommandDataIB =
+          [1658531406475] [21924:325733] CHIP: [DMG]                 {
+          [1658531406475] [21924:325733] CHIP: [DMG]                         CommandPathIB =
+          [1658531406475] [21924:325733] CHIP: [DMG]                         {
+          [1658531406475] [21924:325733] CHIP: [DMG]                                 EndpointId = 0x1,
+          [1658531406475] [21924:325733] CHIP: [DMG]                                 ClusterId = 0x505,
+          [1658531406475] [21924:325733] CHIP: [DMG]                                 CommandId = 0x0,
+          [1658531406475] [21924:325733] CHIP: [DMG]                         },
+          [1658531406475] [21924:325733] CHIP: [DMG]
+          [1658531406475] [21924:325733] CHIP: [DMG]                         CommandFields =
+          [1658531406475] [21924:325733] CHIP: [DMG]                         {
+          [1658531406475] [21924:325733] CHIP: [DMG]                                 0x0 = 1,
+          [1658531406475] [21924:325733] CHIP: [DMG]                         },
+          [1658531406475] [21924:325733] CHIP: [DMG]                 },
+          [1658531406475] [21924:325733] CHIP: [DMG]
+          [1658531406475] [21924:325733] CHIP: [DMG]         ],
+          [1658531406475] [21924:325733] CHIP: [DMG]
+          [1658531406475] [21924:325733] CHIP: [DMG]         InteractionModelRevision = 1
+          [1658531406475] [21924:325733] CHIP: [DMG] },
+      disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_TMP_3_1.yaml b/src/app/tests/suites/certification/Test_TC_TMP_3_1.yaml
index 787e939..e4101b1 100644
--- a/src/app/tests/suites/certification/Test_TC_TMP_3_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_TMP_3_1.yaml
@@ -32,9 +32,11 @@
           "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 temperaturemeasurement read measured-value 1 1
 
-          on TH(all-cluster-app) verify the ReadRequestMessage
+          Verify DUT receives measured-value attribute response on the TH(all-clusters-app) Log:
 
           1650880412.037722][15013:15013] CHIP:DMG: ReadRequestMessage =
           [1650880412.037749][15013:15013] CHIP:DMG: {
@@ -57,7 +59,7 @@
 
           ./chip-tool temperaturemeasurement read max-measured-value 1 1
 
-          on TH(all-cluster-app) verify the ReadRequestMessage
+          Verify DUT receives max-measured-value  attribute response on the TH(all-clusters-app) Log:
 
           [1650880462.518114][15013:15013] CHIP:DMG: ReadRequestMessage =
           [1650880462.518149][15013:15013] CHIP:DMG: {
@@ -79,7 +81,7 @@
 
           ./chip-tool temperaturemeasurement read min-measured-value 1 1
 
-          on TH(all-cluster-app) verify the ReadRequestMessage
+          Verify DUT receives min-measured-value  attribute response on the TH(all-clusters-app) Log:
 
           [1650880507.409653][15013:15013] CHIP:DMG: ReadRequestMessage =
           [1650880507.409703][15013:15013] CHIP:DMG: {
@@ -103,11 +105,11 @@
           "DUT reads all supported optional attributes from TH one at a time in
           a manufacturer specific order"
       verification: |
-          On Reference app  verify TH receives the read command and knows this attribute for this cluster and provides a plausable 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)
 
           ./chip-tool temperaturemeasurement read tolerance  1 1
 
-          on TH(all-cluster-app) verify the ReadRequestMessage
+          Verify DUT receives  tolerance attribute response on the TH(all-clusters-app) Log:
 
           [1658141616.808771][13946:13946] CHIP:IM: Received Read request
           [1658141616.808855][13946:13946] CHIP:DMG: ReadRequestMessage =
@@ -150,10 +152,11 @@
           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)
           To verify all below steps use all-clusters-minimal-app
 
            ./chip-tool temperaturemeasurement read measured-value 1 1
-          on TH(all-clusters-minimal-app) verify the ReadRequestMessage
+          Verify DUT receives measured-value attribute response on the TH(all-clusters-minimal-app) Log:
           1650880412.037722][15013:15013] CHIP:DMG: ReadRequestMessage =
           [1650880412.037749][15013:15013] CHIP:DMG: {
           [1650880412.037772][15013:15013] CHIP:DMG:         AttributePathIBs =
@@ -174,7 +177,7 @@
 
 
           ./chip-tool temperaturemeasurement read max-measured-value 1 1
-          on TH(all-clusters-minimal-app) verify the ReadRequestMessage
+          Verify DUT receives max-measured-value attribute response on the TH(all-clusters-minimal-app) Log:
           [1650880462.518114][15013:15013] CHIP:DMG: ReadRequestMessage =
           [1650880462.518149][15013:15013] CHIP:DMG: {
           [1650880462.518176][15013:15013] CHIP:DMG:         AttributePathIBs =
@@ -194,7 +197,7 @@
 
 
           ./chip-tool temperaturemeasurement read min-measured-value 1 1
-          on TH(all-clusters-minimal-app) verify the ReadRequestMessage
+          Verify DUT receives min-measured-value attribute response on the TH(all-clusters-minimal-app) Log:
           [1650880507.409653][15013:15013] CHIP:DMG: ReadRequestMessage =
           [1650880507.409703][15013:15013] CHIP:DMG: {
           [1650880507.409727][15013:15013] CHIP:DMG:         AttributePathIBs =
@@ -217,9 +220,11 @@
           "DUT reads all supported optional attributes from TH one at a time in
           a manufacturer specific order"
       verification: |
-          ./chip-tool temperaturemeasurement 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-minimal-app sent  UNSUPPORTED_ATTRIBUTE response
+          /chip-tool temperaturemeasurement read tolerance 1 1
+
+          Verify DUT receives tolerence attribute response on the TH(all-clusters-minimal-app) Log:
            General error: 0x86 (UNSUPPORTED_ATTRIBUTE)
       disabled: true
 
diff --git a/src/app/tests/suites/certification/Test_TC_TSTAT_3_1.yaml b/src/app/tests/suites/certification/Test_TC_TSTAT_3_1.yaml
index f2597b2..5ee9d5d 100644
--- a/src/app/tests/suites/certification/Test_TC_TSTAT_3_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_TSTAT_3_1.yaml
@@ -32,8 +32,10 @@
           "DUT reads all supported mandatory attributes from TH one at a time in
           a manufacturer specific order"
       verification: |
-          ./chip-tool thermostat read  local-temperature  1 1
-          On TH(thermostat app), verify the read request
+          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 thermostat read  local-temperature  1 1
+
+          Verify the ReadRequestMessage on TH(all-clusters-app)
 
           [1652264555.303895][7099:7099] CHIP:IM: Received Read request
           [1652264555.303980][7099:7099] CHIP:DMG: ReadRequestMessage =
@@ -56,7 +58,8 @@
 
           ./chip-tool thermostat read  control-sequence-of-operation 1 1
 
-          On TH(thermostat app), verify the read request
+
+          Verify the ReadRequestMessage on TH(all-clusters-app)
 
           [1652265275.022068][7099:7099] CHIP:DMG: ReadRequestMessage =
           [1652265275.022110][7099:7099] CHIP:DMG: {
@@ -77,7 +80,7 @@
 
           ./chip-tool thermostat read   system-mode    1 1
 
-          On TH(thermostat app), verify the read request
+          Verify the ReadRequestMessage on TH(all-clusters-app)
           [1652265332.311723][7099:7099] CHIP:DMG: ReadRequestMessage =
           [1652265332.311772][7099:7099] CHIP:DMG: {
           [1652265332.311812][7099:7099] CHIP:DMG:         AttributePathIBs =
@@ -110,11 +113,13 @@
           "DUT writes a suitable value to all supported mandatory attributes on
           the TH one at a time in a manufacturer specific order"
       verification: |
-          verify on Reference app receives the right Read Request Message for the data sent in the below 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 thermostat write system-mode 2 1 1
-          On TH(thermostat app), verify the write request
+
+          Verify the WriteRequestMessage on TH(all-clusters-app)
+
           [1652265582.913625][7099:7099] CHIP:IM: Received Write request
           [1652265582.913672][7099:7099] CHIP:DMG: IM WH moving to [Initialized]
           [1652265582.913768][7099:7099] CHIP:DMG: WriteRequestMessage =
@@ -144,7 +149,8 @@
 
 
            ./chip-tool thermostat write  control-sequence-of-operation 1 1 1
-          On TH(thermostat app), verify the write request
+          Verify the WriteRequestMessage on TH(all-clusters-app)
+
           [1652265678.578137][7099:7099] CHIP:IM: Received Write request
           [1652265678.578192][7099:7099] CHIP:DMG: IM WH moving to [Initialized]
           [1652265678.578284][7099:7099] CHIP:DMG: WriteRequestMessage =
@@ -187,12 +193,12 @@
           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)
           To verify all below steps use all-clusters-minimal-app
-          verify on Reference app receives the right Read Request Message for the data sent in the below commands
 
           ./chip-tool thermostat read attribute-list 1 1
-          On  TH(all-clusters-minimal-app) verify the read request
-          [1657179340.726622][2249:2249] CHIP:IM: Received Read request
+          verify on TH(all-cluster-minimal-app) receives the right Read Request Message for the data sent in the below commands
+          1657179340.726622][2249:2249] CHIP:IM: Received Read request
           [1657179340.726762][2249:2249] CHIP:DMG: ReadRequestMessage =
           [1657179340.726817][2249:2249] CHIP:DMG: {
           [1657179340.726863][2249:2249] CHIP:DMG:         AttributePathIBs =
@@ -215,7 +221,7 @@
 
 
           ./chip-tool thermostat read  local-temperature  1 1
-          On  TH(all-clusters-minimal-app) verify the read request
+          verify on TH(all-cluster-minimal-app) receives the right Read Request Message for the data sent in the below commands
           [1652264555.303895][7099:7099] CHIP:IM: Received Read request
           [1652264555.303980][7099:7099] CHIP:DMG: ReadRequestMessage =
           [1652264555.304045][7099:7099] CHIP:DMG: {
@@ -236,7 +242,8 @@
 
 
           ./chip-tool thermostat read  control-sequence-of-operation 1 1
-          On  TH(all-clusters-minimal-app) verify the read request
+
+          Verify the ReadRequestMessage on TH(all-clusters-app)
           [1652265275.022068][7099:7099] CHIP:DMG: ReadRequestMessage =
           [1652265275.022110][7099:7099] CHIP:DMG: {
           [1652265275.022145][7099:7099] CHIP:DMG:         AttributePathIBs =
@@ -255,7 +262,8 @@
           [1652265275.022756][7099:7099] CHIP:DMG: },
 
           ./chip-tool thermostat read   system-mode    1 1
-          On  TH(all-clusters-minimal-app) verify the read request
+
+          Verify the ReadRequestMessage on TH(all-clusters-app)
           [1652265332.311723][7099:7099] CHIP:DMG: ReadRequestMessage =
           [1652265332.311772][7099:7099] CHIP:DMG: {
           [1652265332.311812][7099:7099] CHIP:DMG:         AttributePathIBs =
diff --git a/src/app/tests/suites/certification/Test_TC_TSTAT_3_2.yaml b/src/app/tests/suites/certification/Test_TC_TSTAT_3_2.yaml
index 2f606a8..1aaa744 100644
--- a/src/app/tests/suites/certification/Test_TC_TSTAT_3_2.yaml
+++ b/src/app/tests/suites/certification/Test_TC_TSTAT_3_2.yaml
@@ -30,11 +30,13 @@
           reasonable positive value that is supported by the DUT."
       PICS: TSTAT.C.C00.Tx
       verification: |
-          verify on Reference app receives the right Read Request Message for the data sent in the below 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 thermostat setpoint-raise-lower 0 10 1 1
 
-          Verify in DUT as client side:Verify that Test Harness(Thermostat app) receives the SetpointRaiseLower command from the DUT
+
+          verify On TH(all-clusters-app) receives the right invoke Request Message for the data sent in the above command
+
 
           [1646064221.719107][33190:33190] CHIP:EM: Received message of type 0x8 with protocolId (0, 1) and MessageCounter:4540287 on exchange 31012r
           [1646064221.719148][33190:33190] CHIP:EM: Handling via exchange: 31012r, Delegate: 0xaaaace1730c8
@@ -74,9 +76,12 @@
           reasonable negative value that is supported by the DUT."
       PICS: TSTAT.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 thermostat setpoint-raise-lower 0 -10 1 1
 
-          Verify in DUT as client side: verify that, Test Harness(thermostat-app) receives the SetpointRaiseLower command from the DUT
+          verify On TH(all-clusters-app) receives the right invoke Request Message for the data sent in the above command
+
 
           [1646064525.675075][33190:33190] CHIP:EM: Received message of type 0x8 with protocolId (0, 1) and MessageCounter:16717414 on exchange 9698r
           [1646064525.675116][33190:33190] CHIP:EM: Handling via exchange: 9698r, Delegate: 0xaaaace1730c8
diff --git a/src/app/tests/suites/certification/Test_TC_TSUIC_3_1.yaml b/src/app/tests/suites/certification/Test_TC_TSUIC_3_1.yaml
index 9e57f00..b166729 100644
--- a/src/app/tests/suites/certification/Test_TC_TSUIC_3_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_TSUIC_3_1.yaml
@@ -32,8 +32,10 @@
           "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 thermostatuserinterfaceconfiguration read temperature-display-mode 1 1
-          verify On TH(Reference app) receives the right Read Request Message for the data sent in the above command
+          Verify DUT receives  temperature-display-mode attribute response on the TH(all-clusters-app) Log:
           [1658142864.198892][13946:13946] CHIP:IM: Received Read request
           [1658142864.198979][13946:13946] CHIP:DMG: ReadRequestMessage =
           [1658142864.199008][13946:13946] CHIP:DMG: {
@@ -53,18 +55,9 @@
           [1658142864.199421][13946:13946] CHIP:DMG: },
           [1658142864.199502][13946:13946] CHIP:DMG: IM RH moving to [GeneratingReports]
 
-          On DUT as a client side, verify that TH all-clusters-app sent  temperature display mode attribute value
-          [1658142864.203659][8868:8873] CHIP:DMG: }
-          [1658142864.203865][8868:8873] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0204 Attribute 0x0000_0000 DataVersion: 682086754
-          [1658142864.203966][8868:8873] CHIP:TOO:   temperature display mode: 0
-          [1658142864.204082][8868:8873] CHIP:EM: Sending Standalone Ack for MessageCounter:26677540 on exchange 12305i
-
-
-
-
 
           ./chip-tool thermostatuserinterfaceconfiguration read keypad-lockout 1 1
-          verify On TH(Reference app) receives the right Read Request Message for the data sent in the above command
+          Verify DUT receives keypad-lockout attribute response on the TH(all-clusters-app) Log:
           [1658142905.390042][13946:13946] CHIP:IM: Received Read request
           [1658142905.390148][13946:13946] CHIP:DMG: ReadRequestMessage =
           [1658142905.390177][13946:13946] CHIP:DMG: {
@@ -84,20 +77,16 @@
           [1658142905.390557][13946:13946] CHIP:DMG: },
           [1658142905.390634][13946:13946] CHIP:DMG: IM RH moving to [GeneratingReports]
           [1658142905.390718][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  keypad lockout attribute value
-          [1658142905.393178][8876:8881] CHIP:DMG: }
-          [1658142905.393364][8876:8881] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0204 Attribute 0x0000_0001 DataVersion: 682086754
-          [1658142905.393454][8876:8881] CHIP:TOO:   keypad lockout: 0
-          [1658142905.393558][8876:8881] CHIP:EM: Sending Standalone Ack for MessageCounter:118574768 on exchange 20562i
       disabled: true
 
     - label:
           "DUT reads all supported optional 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 thermostatuserinterfaceconfiguration read  schedule-programming-visibility  1 1
-          verify On TH(Reference app) receives the right Read Request Message for the data sent in the above command
+          Verify DUT receives  schedule-programming-visibility  attribute response on the TH(all-clusters-app) Log:
           [1658143293.502829][13946:13946] CHIP:EM: Handling via exchange: 655r, Delegate: 0xaaaad3403ed0
           [1658143293.502867][13946:13946] CHIP:IM: Received Read request
           [1658143293.502943][13946:13946] CHIP:DMG: ReadRequestMessage =
@@ -117,20 +106,16 @@
           [1658143293.503351][13946:13946] CHIP:DMG:         InteractionModelRevision = 1
           [1658143293.503374][13946:13946] CHIP:DMG: },
           [1658143293.503450][13946:13946] CHIP:DMG: IM RH moving to [GeneratingReports]
-
-          On DUT as a client side, verify that TH all-clusters-app sent  schedule programming visibility attribute value
-          [1658143293.447125][8901:8906] CHIP:DMG: }
-          [1658143293.447279][8901:8906] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0204 Attribute 0x0000_0002 DataVersion: 682086754
-          [1658143293.447352][8901:8906] CHIP:TOO:   schedule programming visibility: 0
-          [1658143293.447431][8901:8906] CHIP:EM: Sending Standalone Ack for MessageCounter:142018492 on exchange 655i
       disabled: true
 
     - label:
           "DUT writes a suitable value to all supported mandatory attributes on
           the TH one at a time in a manufacturer specific order"
       verification: |
-          ./chip-tool thermostatuserinterfaceconfiguration write keypad-lockout 1 1 1
-          verify On TH(Reference app) receives the right write Request Message for the data sent in the above command
+          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 thermostatuserinterfaceconfiguration write temperature-display-mode  1 1 1
+          Verify DUT receives  temperature-display-mode   attribute  write response on the TH(all-clusters-app) Log:
           [1658143515.699171][13946:13946] CHIP:DMG: WriteRequestMessage =
           [1658143515.699197][13946:13946] CHIP:DMG: {
           [1658143515.699221][13946:13946] CHIP:DMG:         suppressResponse = false,
@@ -156,17 +141,9 @@
           [1658143515.699792][13946:13946] CHIP:DMG: },
           [1658143515.699876][13946:13946] CHIP:DMG: AccessControl: checking f=1 a=c s=0x000000000001B669 t= c=0x0000_0204 e=1 p=m
 
-          On DUT as a client side, verify that TH all-clusters-app sent  success response
-          [1658143515.619630][8919:8924] CHIP:DMG:                         StatusIB =
-          [1658143515.619669][8919:8924] CHIP:DMG:                         {
-          [1658143515.619707][8919:8924] CHIP:DMG:                                 status = 0x00 (SUCCESS),
-          [1658143515.619747][8919:8924] CHIP:DMG:                         },
-
-
-
 
            ./chip-tool thermostatuserinterfaceconfiguration write keypad-lockout 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 keypad-lockout  attribute  write response on the TH(all-clusters-app) Log:
           [1658143708.436060][13946:13946] CHIP:DMG: WriteRequestMessage =
           [1658143708.436090][13946:13946] CHIP:DMG: {
           [1658143708.436115][13946:13946] CHIP:DMG:         suppressResponse = false,
@@ -192,20 +169,16 @@
           [1658143708.436770][13946:13946] CHIP:DMG: },
           [1658143708.436862][13946:13946] CHIP:DMG: AccessControl: checking f=1 a=c s=0x000000000001B669 t= c=0x0000_0204 e=1 p=m
           [1658143708.436903][13946:13946] CHIP:DMG: AccessControl: allowed
-
-          On DUT as a client side, verify that TH all-clusters-app sent  success response
-          [1658143708.341102][8933:8938] CHIP:DMG:                         StatusIB =
-          [1658143708.341156][8933:8938] CHIP:DMG:                         {
-          [1658143708.341211][8933:8938] CHIP:DMG:                                 status = 0x00 (SUCCESS),
-          [1658143708.341257][8933:8938] 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: |
+          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 thermostatuserinterfaceconfiguration write schedule-programming-visibility 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 schedule-programming-visibility   attribute  write response on the TH(all-clusters-app) Log:
           [1658143828.619738][13946:13946] CHIP:DMG: WriteRequestMessage =
           [1658143828.619764][13946:13946] CHIP:DMG: {
           [1658143828.619787][13946:13946] CHIP:DMG:         suppressResponse = false,
@@ -230,15 +203,6 @@
           [1658143828.620330][13946:13946] CHIP:DMG:         InteractionModelRevision = 1
           [1658143828.620353][13946:13946] CHIP:DMG: },
           [1658143828.620434][13946:13946] CHIP:DMG: AccessControl: checking f=1 a=c s=0x000000000001B669 t= c=0x0000_0204 e=1 p=m
-
-
-          On DUT as a client side, verify that TH all-clusters-app sent  success response
-          [1658143828.519585][8944:8949] CHIP:DMG:
-          [1658143828.519632][8944:8949] CHIP:DMG:                         StatusIB =
-          [1658143828.519683][8944:8949] CHIP:DMG:                         {
-          [1658143828.519734][8944:8949] CHIP:DMG:                                 status = 0x00 (SUCCESS),
-          [1658143828.519784][8944:8949] CHIP:DMG:                         },
-          [1658143828.519834][8944:8949] CHIP:DMG:
       disabled: true
 
     - label:
@@ -247,8 +211,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 thermostatuserinterfaceconfiguration read temperature-display-mode 1 1
-          verify On TH(Reference app) receives the right Read Request Message for the data sent in the above command
+          Verify DUT receives  temperature-display-mode attribute response on the TH(all-clusters-minimal-app) Log:
           [1658142864.198892][13946:13946] CHIP:IM: Received Read request
           [1658142864.198979][13946:13946] CHIP:DMG: ReadRequestMessage =
           [1658142864.199008][13946:13946] CHIP:DMG: {
@@ -268,18 +234,9 @@
           [1658142864.199421][13946:13946] CHIP:DMG: },
           [1658142864.199502][13946:13946] CHIP:DMG: IM RH moving to [GeneratingReports]
 
-          On DUT as a client side, verify that TH all-clusters-app sent  temperature display mode attribute value
-          [1658142864.203659][8868:8873] CHIP:DMG: }
-          [1658142864.203865][8868:8873] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0204 Attribute 0x0000_0000 DataVersion: 682086754
-          [1658142864.203966][8868:8873] CHIP:TOO:   temperature display mode: 0
-          [1658142864.204082][8868:8873] CHIP:EM: Sending Standalone Ack for MessageCounter:26677540 on exchange 12305i
-
-
-
-
 
           ./chip-tool thermostatuserinterfaceconfiguration read keypad-lockout 1 1
-          verify On TH(Reference app) receives the right Read Request Message for the data sent in the above command
+          Verify DUT receives  keypad-lockout attribute response on the TH(all-clusters-minimal-app) Log:
           [1658142905.390042][13946:13946] CHIP:IM: Received Read request
           [1658142905.390148][13946:13946] CHIP:DMG: ReadRequestMessage =
           [1658142905.390177][13946:13946] CHIP:DMG: {
@@ -299,21 +256,17 @@
           [1658142905.390557][13946:13946] CHIP:DMG: },
           [1658142905.390634][13946:13946] CHIP:DMG: IM RH moving to [GeneratingReports]
           [1658142905.390718][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  keypad lockout attribute value
-          [1658142905.393178][8876:8881] CHIP:DMG: }
-          [1658142905.393364][8876:8881] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0204 Attribute 0x0000_0001 DataVersion: 682086754
-          [1658142905.393454][8876:8881] CHIP:TOO:   keypad lockout: 0
-          [1658142905.393558][8876:8881] CHIP:EM: Sending Standalone Ack for MessageCounter:118574768 on exchange 20562i
       disabled: true
 
     - label:
           "DUT reads all supported optional 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 thermostatuserinterfaceconfiguration read  schedule-programming-visibility  1 1
 
-          On DUT as a client side, verify that TH all-clusters-app sent  UNSUPPORTED_ATTRIBUTE response
+          Verify DUT receives   schedule-programming-visibility attribute response on the TH(all-clusters-minimal-app) Log:
            General error: 0x86 (UNSUPPORTED_ATTRIBUTE)
       disabled: true
 
@@ -321,7 +274,10 @@
           "DUT writes a suitable value to all supported optional 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 thermostatuserinterfaceconfiguration write schedule-programming-visibility 1 1 1
-          On DUT as a client side, verify that TH all-clusters-app sent  UNSUPPORTED_ATTRIBUTE response
+
+          Verify DUT receives   schedule-programming-visibility attribute write response on the TH(all-clusters-minimal-app) Log:
            General error: 0x86 (UNSUPPORTED_ATTRIBUTE)
       disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_ULABEL_2_1.yaml b/src/app/tests/suites/certification/Test_TC_ULABEL_2_1.yaml
new file mode 100644
index 0000000..99753e6
--- /dev/null
+++ b/src/app/tests/suites/certification/Test_TC_ULABEL_2_1.yaml
@@ -0,0 +1,41 @@
+# 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.2.1. [TC-ULABEL-2.1] User label cluster read verification [DUT-server]
+
+PICS:
+    - ULABEL.S
+
+config:
+    nodeId: 0x12344321
+    cluster: "Basic"
+    endpoint: 0
+
+tests:
+    - label: "TH reads LabelList from the DUT"
+      PICS: ULABEL.S.A0000
+      verification: |
+          ./chip-tool userlabel read label-list 1 0
+
+          On TH(chip-tool), Verify that the LabelList is empty or has one or more entries.  Each tuple has following fields:  Label field is of type string and have a length up to 16 bytes, Value field is of type string and have a length up to 16 bytes
+
+          OO: Endpoint: 0 Cluster: 0x0000_0041 Attribute 0x0000_0000 DataVersion: 3074415053
+          [1657180589.654586][4697:4702] CHIP:TOO:   label list: 1 entries
+          [1657180589.654652][4697:4702] CHIP:TOO:     [1]: {
+          [1657180589.654696][4697:4702] CHIP:TOO:       Label: roomName
+          [1657180589.654737][4697:4702] CHIP:TOO:       Value: master bedroom 1
+          [1657180589.654778][4697:4702] CHIP:TOO:      }
+          [1657180589.654901][4697:4702] CHIP:EM: Sending Standalone Ack for MessageCounter:68497701 on exchange 45271i
+      disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_ULABEL_3_1.yaml b/src/app/tests/suites/certification/Test_TC_ULABEL_3_1.yaml
index 6b988bc..099a684 100644
--- a/src/app/tests/suites/certification/Test_TC_ULABEL_3_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_ULABEL_3_1.yaml
@@ -27,15 +27,30 @@
     - label: "DUT reads LabelList from the TH"
       PICS: ULABEL.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 userlabel read label-list 1 0
 
-
-          Verify in DUT as client side: Verify that DUT reads LabelList from the TH successfully
-
-
-          [1651124790.936078][2829:2834] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0041 Attribute 0x0000_0000 DataVersion: 953549512
-          [1651124790.936142][2829:2834] CHIP:TOO:   label list: 0 entries
-          [1651124790.936236][2829:2834] CHIP:EM: Sending Standalone Ack for MessageCounter:5651248 on exchange 8394i
+          Verify DUT receives LabelList attribute response on the TH(all-clusters-app) Log:
+          [1659609723.950391][2409:2409] CHIP:EM: Handling via exchange: 38919r, Delegate: 0xaaaadba0fee0
+          [1659609723.950455][2409:2409] CHIP:IM: Received Read request
+          [1659609723.950570][2409:2409] CHIP:DMG: ReadRequestMessage =
+          [1659609723.950611][2409:2409] CHIP:DMG: {
+          [1659609723.950644][2409:2409] CHIP:DMG:         AttributePathIBs =
+          [1659609723.950685][2409:2409] CHIP:DMG:         [
+          [1659609723.950722][2409:2409] CHIP:DMG:                 AttributePathIB =
+          [1659609723.950770][2409:2409] CHIP:DMG:                 {
+          [1659609723.950814][2409:2409] CHIP:DMG:                         Endpoint = 0x0,
+          [1659609723.950868][2409:2409] CHIP:DMG:                         Cluster = 0x41,
+          [1659609723.950926][2409:2409] CHIP:DMG:                         Attribute = 0x0000_0000,
+          [1659609723.950980][2409:2409] CHIP:DMG:                 }
+          [1659609723.951024][2409:2409] CHIP:DMG:
+          [1659609723.951065][2409:2409] CHIP:DMG:         ],
+          [1659609723.951111][2409:2409] CHIP:DMG:
+          [1659609723.951152][2409:2409] CHIP:DMG:         isFabricFiltered = true,
+          [1659609723.951192][2409:2409] CHIP:DMG:         InteractionModelRevision = 1
+          [1659609723.951228][2409:2409] CHIP:DMG: },
+          [1659609723.951341][2409:2409] CHIP:DMG: IM RH moving to [GeneratingReports]
       disabled: true
 
     - label:
@@ -43,69 +58,73 @@
           LabelList"
       PICS: ULABEL.C.A0000
       verification: |
-          ./chip-tool userlabel write label-list "[{"label":"room", "value":"bedroom 1"}, {"label":"orientation", "value":"east"}]" 1 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)
 
+           ./chip-tool userlabel write label-list "[{"label":"room", "value":"bedroom 1"}, {"label":"orientation", "value":"east"}]" 1 0
 
-          Verify in DUT as client side: Verify that DUT is able to write to the LabelList entries successfully
+          Verify DUT receives LabelList attribute response on the TH(all-clusters-app) Log:
 
-
-          [1657187118.343190][4999:5005] CHIP:DMG: WriteResponseMessage =
-          [1657187118.343215][4999:5005] CHIP:DMG: {
-          [1657187118.343237][4999:5005] CHIP:DMG:         AttributeStatusIBs =
-          [1657187118.343267][4999:5005] CHIP:DMG:         [
-          [1657187118.343291][4999:5005] CHIP:DMG:                 AttributeStatusIB =
-          [1657187118.343318][4999:5005] CHIP:DMG:                 {
-          [1657187118.343343][4999:5005] CHIP:DMG:                         AttributePathIB =
-          [1657187118.343372][4999:5005] CHIP:DMG:                         {
-          [1657187118.343407][4999:5005] CHIP:DMG:                                 Endpoint = 0x0,
-          [1657187118.343441][4999:5005] CHIP:DMG:                                 Cluster = 0x41,
-          [1657187118.343516][4999:5005] CHIP:DMG:                                 Attribute = 0x0000_0000,
-          [1657187118.343548][4999:5005] CHIP:DMG:                         }
-          [1657187118.343582][4999:5005] CHIP:DMG:
-          [1657187118.343612][4999:5005] CHIP:DMG:                         StatusIB =
-          [1657187118.343642][4999:5005] CHIP:DMG:                         {
-          [1657187118.343673][4999:5005] CHIP:DMG:                                 status = 0x00 (SUCCESS),
-          [1657187118.343706][4999:5005] CHIP:DMG:                         },
-          [1657187118.343736][4999:5005] CHIP:DMG:
-          [1657187118.343760][4999:5005] CHIP:DMG:                 },
-          [1657187118.343794][4999:5005] CHIP:DMG:
-          [1657187118.343818][4999:5005] CHIP:DMG:                 AttributeStatusIB =
-          [1657187118.343846][4999:5005] CHIP:DMG:                 {
-          [1657187118.343872][4999:5005] CHIP:DMG:                         AttributePathIB =
-          [1657187118.343903][4999:5005] CHIP:DMG:                         {
-          [1657187118.343934][4999:5005] CHIP:DMG:                                 Endpoint = 0x0,
-          [1657187118.343969][4999:5005] CHIP:DMG:                                 Cluster = 0x41,
-          [1657187118.344002][4999:5005] CHIP:DMG:                                 Attribute = 0x0000_0000,
-          [1657187118.344036][4999:5005] CHIP:DMG:                                 ListIndex = Null,
-          [1657187118.344065][4999:5005] CHIP:DMG:                         }
-          [1657187118.344098][4999:5005] CHIP:DMG:
-          [1657187118.344127][4999:5005] CHIP:DMG:                         StatusIB =
-          [1657187118.344155][4999:5005] CHIP:DMG:                         {
-          [1657187118.344186][4999:5005] CHIP:DMG:                                 status = 0x00 (SUCCESS),
-          [1657187118.344214][4999:5005] CHIP:DMG:                         },
-          [1657187118.344243][4999:5005] CHIP:DMG:
-          [1657187118.344270][4999:5005] CHIP:DMG:                 },
-          [1657187118.344327][4999:5005] CHIP:DMG:
-          [1657187118.344385][4999:5005] CHIP:DMG:                 AttributeStatusIB =
-          [1657187118.344458][4999:5005] CHIP:DMG:                 {
-          [1657187118.344524][4999:5005] CHIP:DMG:                         AttributePathIB =
-          [1657187118.344598][4999:5005] CHIP:DMG:                         {
-          [1657187118.344674][4999:5005] CHIP:DMG:                                 Endpoint = 0x0,
-          [1657187118.344864][4999:5005] CHIP:DMG:                                 Cluster = 0x41,
-          [1657187118.344954][4999:5005] CHIP:DMG:                                 Attribute = 0x0000_0000,
-          [1657187118.345030][4999:5005] CHIP:DMG:                                 ListIndex = Null,
-          [1657187118.345110][4999:5005] CHIP:DMG:                         }
-          [1657187118.345192][4999:5005] CHIP:DMG:
-          [1657187118.345263][4999:5005] CHIP:DMG:                         StatusIB =
-          [1657187118.345337][4999:5005] CHIP:DMG:                         {
-          [1657187118.345410][4999:5005] CHIP:DMG:                                 status = 0x00 (SUCCESS),
-          [1657187118.345487][4999:5005] CHIP:DMG:                         },
-          [1657187118.345559][4999:5005] CHIP:DMG:
-          [1657187118.345625][4999:5005] CHIP:DMG:                 },
-          [1657187118.345699][4999:5005] CHIP:DMG:
-          [1657187118.345757][4999:5005] CHIP:DMG:         ],
-          [1657187118.345844][4999:5005] CHIP:DMG:
-          [1657187118.345902][4999:5005] CHIP:DMG:         InteractionModelRevision = 1
-          [1657187118.345960][4999:5005] CHIP:DMG: }
-          [1657187118.346260][4999:5005] CHIP:DMG: WriteClient moving to [AwaitingDe]
+          [1659609795.578716][2409:2409] CHIP:DMG: IM WH moving to [Initialized]
+          [1659609795.578784][2409:2409] CHIP:DMG: WriteRequestMessage =
+          [1659609795.578809][2409:2409] CHIP:DMG: {
+          [1659609795.578829][2409:2409] CHIP:DMG:         suppressResponse = false,
+          [1659609795.578852][2409:2409] CHIP:DMG:         timedRequest = false,
+          [1659609795.578873][2409:2409] CHIP:DMG:         AttributeDataIBs =
+          [1659609795.578900][2409:2409] CHIP:DMG:         [
+          [1659609795.578922][2409:2409] CHIP:DMG:                 AttributeDataIB =
+          [1659609795.578951][2409:2409] CHIP:DMG:                 {
+          [1659609795.578974][2409:2409] CHIP:DMG:                         AttributePathIB =
+          [1659609795.579007][2409:2409] CHIP:DMG:                         {
+          [1659609795.579035][2409:2409] CHIP:DMG:                                 Endpoint = 0x0,
+          [1659609795.579069][2409:2409] CHIP:DMG:                                 Cluster = 0x41,
+          [1659609795.579101][2409:2409] CHIP:DMG:                                 Attribute = 0x0000_0000,
+          [1659609795.579133][2409:2409] CHIP:DMG:                         }
+          [1659609795.579166][2409:2409] CHIP:DMG:
+          [1659609795.579197][2409:2409] CHIP:DMG:                         Data = [
+          [1659609795.579227][2409:2409] CHIP:DMG:
+          [1659609795.579345][2409:2409] CHIP:DMG:                         ],
+          [1659609795.579372][2409:2409] CHIP:DMG:                 },
+          [1659609795.579401][2409:2409] CHIP:DMG:
+          [1659609795.579422][2409:2409] CHIP:DMG:                 AttributeDataIB =
+          [1659609795.579446][2409:2409] CHIP:DMG:                 {
+          [1659609795.579468][2409:2409] CHIP:DMG:                         AttributePathIB =
+          [1659609795.579498][2409:2409] CHIP:DMG:                         {
+          [1659609795.579526][2409:2409] CHIP:DMG:                                 Endpoint = 0x0,
+          [1659609795.579558][2409:2409] CHIP:DMG:                                 Cluster = 0x41,
+          [1659609795.579591][2409:2409] CHIP:DMG:                                 Attribute = 0x0000_0000,
+          [1659609795.579623][2409:2409] CHIP:DMG:                                 ListIndex = Null,
+          [1659609795.579653][2409:2409] CHIP:DMG:                         }
+          [1659609795.579682][2409:2409] CHIP:DMG:
+          [1659609795.579712][2409:2409] CHIP:DMG:                         Data =
+          [1659609795.579743][2409:2409] CHIP:DMG:                         {
+          [1659609795.579777][2409:2409] CHIP:DMG:                                 0x0 = "room" (4 chars),
+          [1659609795.579809][2409:2409] CHIP:DMG:                                 0x1 = "bedroom 1" (9 chars),
+          [1659609795.579841][2409:2409] CHIP:DMG:                         },
+          [1659609795.579871][2409:2409] CHIP:DMG:                 },
+          [1659609795.579903][2409:2409] CHIP:DMG:
+          [1659609795.579924][2409:2409] CHIP:DMG:                 AttributeDataIB =
+          [1659609795.579950][2409:2409] CHIP:DMG:                 {
+          [1659609795.579972][2409:2409] CHIP:DMG:                         AttributePathIB =
+          [1659609795.580002][2409:2409] CHIP:DMG:                         {
+          [1659609795.580033][2409:2409] CHIP:DMG:                                 Endpoint = 0x0,
+          [1659609795.580065][2409:2409] CHIP:DMG:                                 Cluster = 0x41,
+          [1659609795.580098][2409:2409] CHIP:DMG:                                 Attribute = 0x0000_0000,
+          [1659609795.580130][2409:2409] CHIP:DMG:                                 ListIndex = Null,
+          [1659609795.580157][2409:2409] CHIP:DMG:                         }
+          [1659609795.580186][2409:2409] CHIP:DMG:
+          [1659609795.580215][2409:2409] CHIP:DMG:                         Data =
+          [1659609795.580241][2409:2409] CHIP:DMG:                         {
+          [1659609795.580270][2409:2409] CHIP:DMG:                                 0x0 = "orientation" (11 chars),
+          [1659609795.580302][2409:2409] CHIP:DMG:                                 0x1 = "east" (4 chars),
+          [1659609795.580332][2409:2409] CHIP:DMG:                         },
+          [1659609795.580357][2409:2409] CHIP:DMG:                 },
+          [1659609795.580383][2409:2409] CHIP:DMG:
+          [1659609795.580404][2409:2409] CHIP:DMG:         ],
+          [1659609795.580437][2409:2409] CHIP:DMG:
+          [1659609795.580459][2409:2409] CHIP:DMG:         moreChunkedMessages = false,
+          [1659609795.580480][2409:2409] CHIP:DMG:         InteractionModelRevision = 1
+          [1659609795.580500][2409:2409] CHIP:DMG: },
+          [1659609795.580591][2409:2409] CHIP:DMG: AccessControl: checking f=1 a=c s=0x000000000001B669 t= c=0x0000_0041 e=0 p=m
+          [1659609795.580626][2409:2409] CHIP:DMG: AccessControl: allowed
+          [1659609795.580892][2409:2409] CHIP:DL: writing settings to file (/tmp/chip_kvs-utHZk3)
       disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_WNCV_5_1.yaml b/src/app/tests/suites/certification/Test_TC_WNCV_5_1.yaml
index 078a813..d1b9f43 100644
--- a/src/app/tests/suites/certification/Test_TC_WNCV_5_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_WNCV_5_1.yaml
@@ -35,11 +35,25 @@
           On TestHarnes (all-cluster-app) a received read of feature-map looks like this:
 
           ./chip-tool windowcovering read feature-map 1 1
+          Verify the "feature-map  " read response on TH(all-cluster-app):
 
-          Verify in TH all-clusters-app log data type is map32
-
-          [1657103226.784391][4633:4638] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0102 Attribute 0x0000_FFFC DataVersion: 383647307
-          [1657103226.784460][4633:4638] CHIP:TOO:   FeatureMap: 23
+          [1659944836.658724][2742:2742] CHIP:IM: Received Read request
+          [1659944836.658804][2742:2742] CHIP:DMG: ReadRequestMessage =
+          [1659944836.658833][2742:2742] CHIP:DMG: {
+          [1659944836.658854][2742:2742] CHIP:DMG:         AttributePathIBs =
+          [1659944836.658880][2742:2742] CHIP:DMG:         [
+          [1659944836.658904][2742:2742] CHIP:DMG:                 AttributePathIB =
+          [1659944836.658932][2742:2742] CHIP:DMG:                 {
+          [1659944836.658960][2742:2742] CHIP:DMG:                         Endpoint = 0x1,
+          [1659944836.658995][2742:2742] CHIP:DMG:                         Cluster = 0x102,
+          [1659944836.659031][2742:2742] CHIP:DMG:                         Attribute = 0x0000_FFFC,
+          [1659944836.659062][2742:2742] CHIP:DMG:                 }
+          [1659944836.659091][2742:2742] CHIP:DMG:
+          [1659944836.659116][2742:2742] CHIP:DMG:         ],
+          [1659944836.659144][2742:2742] CHIP:DMG:
+          [1659944836.659171][2742:2742] CHIP:DMG:         isFabricFiltered = true,
+          [1659944836.659196][2742:2742] CHIP:DMG:         InteractionModelRevision = 1
+          [1659944836.659219][2742:2742] CHIP:DMG: },
       disabled: true
 
     - label: "Check Attribute defining the product"
@@ -54,10 +68,23 @@
 
           ./chip-tool windowcovering read type 1 1
 
-          Verify in TH all-clusters-app log  data type is enum8
-
-          [1657103199.191382][4627:4632] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0102 Attribute 0x0000_0000 DataVersion: 383647307
-          [1657103199.191447][4627:4632] CHIP:TOO:   Type: 8
+          Verify the "type" read response on TH(all-cluster-app):
+          [1659944958.215763][2742:2742] CHIP:DMG: ReadRequestMessage =
+          [1659944958.215792][2742:2742] CHIP:DMG: {
+          [1659944958.215813][2742:2742] CHIP:DMG:         AttributePathIBs =
+          [1659944958.215839][2742:2742] CHIP:DMG:         [
+          [1659944958.215863][2742:2742] CHIP:DMG:                 AttributePathIB =
+          [1659944958.215892][2742:2742] CHIP:DMG:                 {
+          [1659944958.215920][2742:2742] CHIP:DMG:                         Endpoint = 0x1,
+          [1659944958.215955][2742:2742] CHIP:DMG:                         Cluster = 0x102,
+          [1659944958.215989][2742:2742] CHIP:DMG:                         Attribute = 0x0000_0000,
+          [1659944958.216019][2742:2742] CHIP:DMG:                 }
+          [1659944958.216050][2742:2742] CHIP:DMG:
+          [1659944958.216077][2742:2742] CHIP:DMG:         ],
+          [1659944958.216106][2742:2742] CHIP:DMG:
+          [1659944958.216134][2742:2742] CHIP:DMG:         isFabricFiltered = true,
+          [1659944958.216160][2742:2742] CHIP:DMG:         InteractionModelRevision = 1
+          [1659944958.216185][2742:2742] CHIP:DMG: },
       disabled: true
 
     - label: "DUT reads the EndProductType attribute from TH"
@@ -67,10 +94,24 @@
 
           ./chip-tool windowcovering read end-product-type 1 1
 
-          Verify in TH all-clusters-app log  data type is enum8
-
-          [1657103251.203086][4641:4646] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0102 Attribute 0x0000_000D DataVersion: 383647307
-          [1657103251.203153][4641:4646] CHIP:TOO:   EndProductType: 0
+          Verify the "end-product-type "read response on TH(all-cluster-app):
+          [1659945106.066589][2742:2742] CHIP:IM: Received Read request
+          [1659945106.066665][2742:2742] CHIP:DMG: ReadRequestMessage =
+          [1659945106.066691][2742:2742] CHIP:DMG: {
+          [1659945106.066713][2742:2742] CHIP:DMG: 	AttributePathIBs =
+          [1659945106.066741][2742:2742] CHIP:DMG: 	[
+          [1659945106.066765][2742:2742] CHIP:DMG: 		AttributePathIB =
+          [1659945106.066795][2742:2742] CHIP:DMG: 		{
+          [1659945106.066824][2742:2742] CHIP:DMG: 			Endpoint = 0x1,
+          [1659945106.066862][2742:2742] CHIP:DMG: 			Cluster = 0x102,
+          [1659945106.066920][2742:2742] CHIP:DMG: 			Attribute = 0x0000_000D,
+          [1659945106.066973][2742:2742] CHIP:DMG: 		}
+          [1659945106.067020][2742:2742] CHIP:DMG:
+          [1659945106.067065][2742:2742] CHIP:DMG: 	],
+          [1659945106.067110][2742:2742] CHIP:DMG:
+          [1659945106.067154][2742:2742] CHIP:DMG: 	isFabricFiltered = true,
+          [1659945106.067196][2742:2742] CHIP:DMG: 	InteractionModelRevision = 1
+          [1659945106.067235][2742:2742] CHIP:DMG: },
       disabled: true
 
     - label: "Check Attribute defining the working status"
@@ -85,10 +126,25 @@
 
           ./chip-tool windowcovering read mode 1 1
 
-          Verify in TH all-clusters-app log  data type is map8
+          Verify the "mode" read response on TH(all-cluster-app):
 
-          [1657103273.905725][4647:4652] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0102 Attribute 0x0000_0017 DataVersion: 383647307
-          [1657103273.905816][4647:4652] CHIP:TOO:   Mode: 0
+          [1659945146.241332][2742:2742] CHIP:IM: Received Read request
+          [1659945146.241409][2742:2742] CHIP:DMG: ReadRequestMessage =
+          [1659945146.241436][2742:2742] CHIP:DMG: {
+          [1659945146.241457][2742:2742] CHIP:DMG: 	AttributePathIBs =
+          [1659945146.241483][2742:2742] CHIP:DMG: 	[
+          [1659945146.241507][2742:2742] CHIP:DMG: 		AttributePathIB =
+          [1659945146.241535][2742:2742] CHIP:DMG: 		{
+          [1659945146.241562][2742:2742] CHIP:DMG: 			Endpoint = 0x1,
+          [1659945146.241594][2742:2742] CHIP:DMG: 			Cluster = 0x102,
+          [1659945146.241625][2742:2742] CHIP:DMG: 			Attribute = 0x0000_0017,
+          [1659945146.241655][2742:2742] CHIP:DMG: 		}
+          [1659945146.241682][2742:2742] CHIP:DMG:
+          [1659945146.241707][2742:2742] CHIP:DMG: 	],
+          [1659945146.241735][2742:2742] CHIP:DMG:
+          [1659945146.241761][2742:2742] CHIP:DMG: 	isFabricFiltered = true,
+          [1659945146.241787][2742:2742] CHIP:DMG: 	InteractionModelRevision = 1
+          [1659945146.241810][2742:2742] CHIP:DMG: },
       disabled: true
 
     - label: "DUT reads the ConfigStatus attribute from TH"
@@ -98,8 +154,23 @@
 
           ./chip-tool windowcovering read config-status 1 1
 
-          Verify in TH all-clusters-app log  data type is map8
+          Verify the "config-status"read response on TH(all-cluster-app):
 
-          [1657103295.608407][4654:4659] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0102 Attribute 0x0000_0007 DataVersion: 383647307
-          [1657103295.608521][4654:4659] CHIP:TOO:   ConfigStatus: 27
+          [1659945171.752215][2742:2742] CHIP:IM: Received Read request
+          [1659945171.752329][2742:2742] CHIP:DMG: ReadRequestMessage =
+          [1659945171.752367][2742:2742] CHIP:DMG: {
+          [1659945171.752389][2742:2742] CHIP:DMG: 	AttributePathIBs =
+          [1659945171.752426][2742:2742] CHIP:DMG: 	[
+          [1659945171.752458][2742:2742] CHIP:DMG: 		AttributePathIB =
+          [1659945171.752497][2742:2742] CHIP:DMG: 		{
+          [1659945171.752536][2742:2742] CHIP:DMG: 			Endpoint = 0x1,
+          [1659945171.752569][2742:2742] CHIP:DMG: 			Cluster = 0x102,
+          [1659945171.752608][2742:2742] CHIP:DMG: 			Attribute = 0x0000_0007,
+          [1659945171.752640][2742:2742] CHIP:DMG: 		}
+          [1659945171.752680][2742:2742] CHIP:DMG:
+          [1659945171.752719][2742:2742] CHIP:DMG: 	],
+          [1659945171.752750][2742:2742] CHIP:DMG:
+          [1659945171.752778][2742:2742] CHIP:DMG: 	isFabricFiltered = true,
+          [1659945171.752815][2742:2742] CHIP:DMG: 	InteractionModelRevision = 1
+          [1659945171.752840][2742:2742] CHIP:DMG: },
       disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_WNCV_6_1.yaml b/src/app/tests/suites/certification/Test_TC_WNCV_6_1.yaml
index eec44d9..5a5ca6f 100644
--- a/src/app/tests/suites/certification/Test_TC_WNCV_6_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_WNCV_6_1.yaml
@@ -34,39 +34,28 @@
       verification: |
           ./chip-tool windowcovering up-or-open 1 1
 
-          verify On TH(Reference app) receives the right Read Request Message for the data sent in the above command
+          Verify the " DUT responds with request response" on TH(all-clusters-app):
 
-          [1657103322.822782][4661:4666] CHIP:DMG: InvokeResponseMessage =
-          [1657103322.822822][4661:4666] CHIP:DMG: {
-          [1657103322.822862][4661:4666] CHIP:DMG:         suppressResponse = false,
-          [1657103322.822911][4661:4666] CHIP:DMG:         InvokeResponseIBs =
-          [1657103322.822962][4661:4666] CHIP:DMG:         [
-          [1657103322.823002][4661:4666] CHIP:DMG:                 InvokeResponseIB =
-          [1657103322.823054][4661:4666] CHIP:DMG:                 {
-          [1657103322.823097][4661:4666] CHIP:DMG:                         CommandStatusIB =
-          [1657103322.823147][4661:4666] CHIP:DMG:                         {
-          [1657103322.823200][4661:4666] CHIP:DMG:                                 CommandPathIB =
-          [1657103322.823256][4661:4666] CHIP:DMG:                                 {
-          [1657103322.823313][4661:4666] CHIP:DMG:                                         EndpointId = 0x1,
-          [1657103322.823370][4661:4666] CHIP:DMG:                                         ClusterId = 0x102,
-          [1657103322.823426][4661:4666] CHIP:DMG:                                         CommandId = 0x0,
-          [1657103322.823479][4661:4666] CHIP:DMG:                                 },
-          [1657103322.823537][4661:4666] CHIP:DMG:
-          [1657103322.823585][4661:4666] CHIP:DMG:                                 StatusIB =
-          [1657103322.823644][4661:4666] CHIP:DMG:                                 {
-          [1657103322.823684][4661:4666] CHIP:DMG:                                         status = 0x00 (SUCCESS),
-          [1657103322.823724][4661:4666] CHIP:DMG:                                 },
-          [1657103322.823821][4661:4666] CHIP:DMG:
-          [1657103322.823860][4661:4666] CHIP:DMG:                         },
-          [1657103322.823902][4661:4666] CHIP:DMG:
-          [1657103322.823933][4661:4666] CHIP:DMG:                 },
-          [1657103322.823970][4661:4666] CHIP:DMG:
-          [1657103322.823999][4661:4666] CHIP:DMG:         ],
-          [1657103322.824035][4661:4666] CHIP:DMG:
-          [1657103322.824064][4661:4666] CHIP:DMG:         InteractionModelRevision = 1
-          [1657103322.824093][4661:4666] CHIP:DMG: },
-          [1657103322.824161][4661:4666] CHIP:DMG: Received Command Response Status for Endpoint=1 Cluster=0x0000_0102 Command=0x0000_0000 Status=0x0
-          [1657103322.824210][4661:4666] CHIP:DMG: ICR moving to [AwaitingDe]
+          1659945239.794637][2742:2742] CHIP:DMG: InvokeRequestMessage =
+          [1659945239.794680][2742:2742] CHIP:DMG: {
+          [1659945239.794718][2742:2742] CHIP:DMG:         suppressResponse = false,
+          [1659945239.794762][2742:2742] CHIP:DMG:         timedRequest = false,
+          [1659945239.794801][2742:2742] CHIP:DMG:         InvokeRequests =
+          [1659945239.794851][2742:2742] CHIP:DMG:         [
+          [1659945239.794891][2742:2742] CHIP:DMG:                 CommandDataIB =
+          [1659945239.794936][2742:2742] CHIP:DMG:                 {
+          [1659945239.794997][2742:2742] CHIP:DMG:                         CommandPathIB =
+          [1659945239.795055][2742:2742] CHIP:DMG:                         {
+          [1659945239.795112][2742:2742] CHIP:DMG:                                 EndpointId = 0x1,
+          [1659945239.795177][2742:2742] CHIP:DMG:                                 ClusterId = 0x102,
+          [1659945239.795239][2742:2742] CHIP:DMG:                                 CommandId = 0x0,
+          [1659945239.795297][2742:2742] CHIP:DMG:                         },
+          [1659945239.795353][2742:2742] CHIP:DMG:
+          [1659945239.795403][2742:2742] CHIP:DMG:                         CommandFields =
+          [1659945239.795451][2742:2742] CHIP:DMG:                         {
+          [1659945239.795500][2742:2742] CHIP:DMG:                         },
+          [1659945239.795547][2742:2742] CHIP:DMG:                 },
+          [1659945239.795594][2742:2742] CHIP:DMG:
       disabled: true
 
     - label: "Check DownOrClose command"
@@ -80,43 +69,35 @@
           ./chip-tool windowcovering down-or-close 1 1
 
 
-          verify On TH(Reference app) receives the right Read Request Message for the data sent in the above command
+          Verify the " DUT responds with request response" on TH(all-clusters-app):
 
-          [1657103347.810523][4668:4673] CHIP:DMG: InvokeResponseMessage =
-          [1657103347.810548][4668:4673] CHIP:DMG: {
-          [1657103347.810572][4668:4673] CHIP:DMG:         suppressResponse = false,
-          [1657103347.810597][4668:4673] CHIP:DMG:         InvokeResponseIBs =
-          [1657103347.810628][4668:4673] CHIP:DMG:         [
-          [1657103347.810653][4668:4673] CHIP:DMG:                 InvokeResponseIB =
-          [1657103347.810685][4668:4673] CHIP:DMG:                 {
-          [1657103347.810711][4668:4673] CHIP:DMG:                         CommandStatusIB =
-          [1657103347.810744][4668:4673] CHIP:DMG:                         {
-          [1657103347.810776][4668:4673] CHIP:DMG:                                 CommandPathIB =
-          [1657103347.810816][4668:4673] CHIP:DMG:                                 {
-          [1657103347.810855][4668:4673] CHIP:DMG:                                         EndpointId = 0x1,
-          [1657103347.810895][4668:4673] CHIP:DMG:                                         ClusterId = 0x102,
-          [1657103347.810933][4668:4673] CHIP:DMG:                                         CommandId = 0x1,
-          [1657103347.810969][4668:4673] CHIP:DMG:                                 },
-          [1657103347.811011][4668:4673] CHIP:DMG:
-          [1657103347.811041][4668:4673] CHIP:DMG:                                 StatusIB =
-          [1657103347.811078][4668:4673] CHIP:DMG:                                 {
-          [1657103347.811112][4668:4673] CHIP:DMG:                                         status = 0x00 (SUCCESS),
-          [1657103347.811149][4668:4673] CHIP:DMG:                                 },
-          [1657103347.811183][4668:4673] CHIP:DMG:
-          [1657103347.811212][4668:4673] CHIP:DMG:                         },
-          [1657103347.811245][4668:4673] CHIP:DMG:
-          [1657103347.811271][4668:4673] CHIP:DMG:                 },
-          [1657103347.811300][4668:4673] CHIP:DMG:
-          [1657103347.811324][4668:4673] CHIP:DMG:         ],
-          [1657103347.811353][4668:4673] CHIP:DMG:
-          [1657103347.811378][4668:4673] CHIP:DMG:         InteractionModelRevision = 1
-          [1657103347.811401][4668:4673] CHIP:DMG: },
-          [1657103347.811461][4668:4673] CHIP:DMG: Received Command Response Status for Endpoint=1 Cluster=0x0000_0102 Command=0x0000_0001 Status=0x0
-          [1657103347.811504][4668:4673] CHIP:DMG: ICR moving to [AwaitingDe]
+          [1659945343.976313][2742:2742] CHIP:DMG: InvokeRequestMessage =
+          [1659945343.976344][2742:2742] CHIP:DMG: {
+          [1659945343.976367][2742:2742] CHIP:DMG:         suppressResponse = false,
+          [1659945343.976399][2742:2742] CHIP:DMG:         timedRequest = false,
+          [1659945343.976424][2742:2742] CHIP:DMG:         InvokeRequests =
+          [1659945343.976454][2742:2742] CHIP:DMG:         [
+          [1659945343.976479][2742:2742] CHIP:DMG:                 CommandDataIB =
+          [1659945343.976510][2742:2742] CHIP:DMG:                 {
+          [1659945343.976539][2742:2742] CHIP:DMG:                         CommandPathIB =
+          [1659945343.976571][2742:2742] CHIP:DMG:                         {
+          [1659945343.976605][2742:2742] CHIP:DMG:                                 EndpointId = 0x1,
+          [1659945343.976639][2742:2742] CHIP:DMG:                                 ClusterId = 0x102,
+          [1659945343.976672][2742:2742] CHIP:DMG:                                 CommandId = 0x1,
+          [1659945343.976701][2742:2742] CHIP:DMG:                         },
+          [1659945343.976734][2742:2742] CHIP:DMG:
+          [1659945343.976764][2742:2742] CHIP:DMG:                         CommandFields =
+          [1659945343.976792][2742:2742] CHIP:DMG:                         {
+          [1659945343.976823][2742:2742] CHIP:DMG:                         },
+          [1659945343.976852][2742:2742] CHIP:DMG:                 },
+          [1659945343.976882][2742:2742] CHIP:DMG:
+          [1659945343.976906][2742:2742] CHIP:DMG:         ],
+          [1659945343.976936][2742:2742] CHIP:DMG:
+          [1659945343.976960][2742:2742] CHIP:DMG:         InteractionModelRevision = 1
+          [1659945343.976984][2742:2742] CHIP:DMG: },
       disabled: true
 
     - label: "Check StopMotion command"
-      PICS: ""
       verification: |
           verification step to be updated.
       disabled: true
@@ -127,7 +108,7 @@
           ./chip-tool windowcovering stop-motion 1 1
 
 
-          verify On TH(Reference app) receives the right Read Request Message for the data sent in the above command
+          Verify the " DUT responds with status as SUCCESS" on TH(all-clusters-app):
 
           [1657103367.961698][4676:4681] CHIP:DMG: InvokeResponseMessage =
           [1657103367.961722][4676:4681] CHIP:DMG: {
diff --git a/src/app/tests/suites/certification/Test_TC_WNCV_7_1.yaml b/src/app/tests/suites/certification/Test_TC_WNCV_7_1.yaml
index 605240a..9140778 100644
--- a/src/app/tests/suites/certification/Test_TC_WNCV_7_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_WNCV_7_1.yaml
@@ -32,42 +32,35 @@
     - label: "DUT sends GoToLiftPercentage command with 50% to TH"
       PICS: WNCV.C.C05.Tx
       verification: |
-          ./chip-tool windowcovering go-to-lift-percentage 50 1 1
+          ./chip-tool windowcovering go-to-lift-percentage 5000 1 1
 
+          Verify the "DUT responds with right request response"
 
-          verify On TH(Reference app) receives the right Read Request Message for the data sent in the above command
-
-          [1657103392.913017][4682:4687] CHIP:DMG: InvokeResponseMessage =
-          [1657103392.913042][4682:4687] CHIP:DMG: {
-          [1657103392.913066][4682:4687] CHIP:DMG:         suppressResponse = false,
-          [1657103392.913090][4682:4687] CHIP:DMG:         InvokeResponseIBs =
-          [1657103392.913120][4682:4687] CHIP:DMG:         [
-          [1657103392.913145][4682:4687] CHIP:DMG:                 InvokeResponseIB =
-          [1657103392.913184][4682:4687] CHIP:DMG:                 {
-          [1657103392.913212][4682:4687] CHIP:DMG:                         CommandStatusIB =
-          [1657103392.913247][4682:4687] CHIP:DMG:                         {
-          [1657103392.913276][4682:4687] CHIP:DMG:                                 CommandPathIB =
-          [1657103392.913310][4682:4687] CHIP:DMG:                                 {
-          [1657103392.913345][4682:4687] CHIP:DMG:                                         EndpointId = 0x1,
-          [1657103392.913380][4682:4687] CHIP:DMG:                                         ClusterId = 0x102,
-          [1657103392.913413][4682:4687] CHIP:DMG:                                         CommandId = 0x5,
-          [1657103392.913442][4682:4687] CHIP:DMG:                                 },
-          [1657103392.913477][4682:4687] CHIP:DMG:
-          [1657103392.913505][4682:4687] CHIP:DMG:                                 StatusIB =
-          [1657103392.913536][4682:4687] CHIP:DMG:                                 {
-          [1657103392.913571][4682:4687] CHIP:DMG:                                         status = 0x00 (SUCCESS),
-          [1657103392.913603][4682:4687] CHIP:DMG:                                 },
-          [1657103392.913635][4682:4687] CHIP:DMG:
-          [1657103392.913664][4682:4687] CHIP:DMG:                         },
-          [1657103392.913696][4682:4687] CHIP:DMG:
-          [1657103392.913723][4682:4687] CHIP:DMG:                 },
-          [1657103392.913753][4682:4687] CHIP:DMG:
-          [1657103392.913776][4682:4687] CHIP:DMG:         ],
-          [1657103392.913805][4682:4687] CHIP:DMG:
-          [1657103392.913828][4682:4687] CHIP:DMG:         InteractionModelRevision = 1
-          [1657103392.913851][4682:4687] CHIP:DMG: },
-          [1657103392.913912][4682:4687] CHIP:DMG: Received Command Response Status for Endpoint=1 Cluster=0x0000_0102 Command=0x0000_0005 Status=0x0
-          [1657103392.913952][4682:4687] CHIP:DMG: ICR moving to [AwaitingDe]
+          [1659945446.669477][2742:2742] CHIP:DMG: InvokeRequestMessage =
+          [1659945446.669520][2742:2742] CHIP:DMG: {
+          [1659945446.669555][2742:2742] CHIP:DMG:         suppressResponse = false,
+          [1659945446.669599][2742:2742] CHIP:DMG:         timedRequest = false,
+          [1659945446.669639][2742:2742] CHIP:DMG:         InvokeRequests =
+          [1659945446.669688][2742:2742] CHIP:DMG:         [
+          [1659945446.669729][2742:2742] CHIP:DMG:                 CommandDataIB =
+          [1659945446.669773][2742:2742] CHIP:DMG:                 {
+          [1659945446.669815][2742:2742] CHIP:DMG:                         CommandPathIB =
+          [1659945446.669866][2742:2742] CHIP:DMG:                         {
+          [1659945446.669919][2742:2742] CHIP:DMG:                                 EndpointId = 0x1,
+          [1659945446.669975][2742:2742] CHIP:DMG:                                 ClusterId = 0x102,
+          [1659945446.670033][2742:2742] CHIP:DMG:                                 CommandId = 0x5,
+          [1659945446.670084][2742:2742] CHIP:DMG:                         },
+          [1659945446.670137][2742:2742] CHIP:DMG:
+          [1659945446.670191][2742:2742] CHIP:DMG:                         CommandFields =
+          [1659945446.670247][2742:2742] CHIP:DMG:                         {
+          [1659945446.670302][2742:2742] CHIP:DMG:                                 0x0 = 5000,
+          [1659945446.670361][2742:2742] CHIP:DMG:                         },
+          [1659945446.670409][2742:2742] CHIP:DMG:                 },
+          [1659945446.670460][2742:2742] CHIP:DMG:
+          [1659945446.670499][2742:2742] CHIP:DMG:         ],
+          [1659945446.670548][2742:2742] CHIP:DMG:
+          [1659945446.670587][2742:2742] CHIP:DMG:         InteractionModelRevision = 1
+          [1659945446.670626][2742:2742] CHIP:DMG: },
       disabled: true
 
     - label: "Check GoToTiltPercentage command 50%"
@@ -78,40 +71,34 @@
     - label: "DUT sends GoToTiltPercentage command with 50% to TH"
       PICS: WNCV.C.C08.Tx
       verification: |
-          ./chip-tool windowcovering go-to-tilt-percentage 50 1 1
+          ./chip-tool windowcovering go-to-tilt-percentage 5000 1 1
 
 
-          verify On TH(Reference app) receives the right Read Request Message for the data sent in the above command
+          Verify the "DUT responds with right  request response"
 
-          [1657103413.915095][4688:4693] CHIP:DMG: InvokeResponseMessage =
-          [1657103413.915136][4688:4693] CHIP:DMG: {
-          [1657103413.915175][4688:4693] CHIP:DMG:         suppressResponse = false,
-          [1657103413.915216][4688:4693] CHIP:DMG:         InvokeResponseIBs =
-          [1657103413.915267][4688:4693] CHIP:DMG:         [
-          [1657103413.915308][4688:4693] CHIP:DMG:                 InvokeResponseIB =
-          [1657103413.915361][4688:4693] CHIP:DMG:                 {
-          [1657103413.915403][4688:4693] CHIP:DMG:                         CommandStatusIB =
-          [1657103413.915456][4688:4693] CHIP:DMG:                         {
-          [1657103413.915508][4688:4693] CHIP:DMG:                                 CommandPathIB =
-          [1657103413.915563][4688:4693] CHIP:DMG:                                 {
-          [1657103413.915614][4688:4693] CHIP:DMG:                                         EndpointId = 0x1,
-          [1657103413.915672][4688:4693] CHIP:DMG:                                         ClusterId = 0x102,
-          [1657103413.915729][4688:4693] CHIP:DMG:                                         CommandId = 0x8,
-          [1657103413.915782][4688:4693] CHIP:DMG:                                 },
-          [1657103413.915839][4688:4693] CHIP:DMG:
-          [1657103413.915889][4688:4693] CHIP:DMG:                                 StatusIB =
-          [1657103413.915943][4688:4693] CHIP:DMG:                                 {
-          [1657103413.915992][4688:4693] CHIP:DMG:                                         status = 0x00 (SUCCESS),
-          [1657103413.916046][4688:4693] CHIP:DMG:                                 },
-          [1657103413.916095][4688:4693] CHIP:DMG:
-          [1657103413.916142][4688:4693] CHIP:DMG:                         },
-          [1657103413.916197][4688:4693] CHIP:DMG:
-          [1657103413.916238][4688:4693] CHIP:DMG:                 },
-          [1657103413.916287][4688:4693] CHIP:DMG:
-          [1657103413.916326][4688:4693] CHIP:DMG:         ],
-          [1657103413.916366][4688:4693] CHIP:DMG:
-          [1657103413.916396][4688:4693] CHIP:DMG:         InteractionModelRevision = 1
-          [1657103413.916425][4688:4693] CHIP:DMG: },
-          [1657103413.916507][4688:4693] CHIP:DMG: Received Command Response Status for Endpoint=1 Cluster=0x0000_0102 Command=0x0000_0008 Status=0x0
-          [1657103413.916558][4688:4693] CHIP:DMG: ICR moving to [AwaitingDe]
+          [1659945481.649337][2742:2742] CHIP:DMG: InvokeRequestMessage =
+          [1659945481.649367][2742:2742] CHIP:DMG: {
+          [1659945481.649393][2742:2742] CHIP:DMG:         suppressResponse = false,
+          [1659945481.649424][2742:2742] CHIP:DMG:         timedRequest = false,
+          [1659945481.649452][2742:2742] CHIP:DMG:         InvokeRequests =
+          [1659945481.649487][2742:2742] CHIP:DMG:         [
+          [1659945481.649515][2742:2742] CHIP:DMG:                 CommandDataIB =
+          [1659945481.649551][2742:2742] CHIP:DMG:                 {
+          [1659945481.649582][2742:2742] CHIP:DMG:                         CommandPathIB =
+          [1659945481.649622][2742:2742] CHIP:DMG:                         {
+          [1659945481.649660][2742:2742] CHIP:DMG:                                 EndpointId = 0x1,
+          [1659945481.649702][2742:2742] CHIP:DMG:                                 ClusterId = 0x102,
+          [1659945481.649743][2742:2742] CHIP:DMG:                                 CommandId = 0x8,
+          [1659945481.649778][2742:2742] CHIP:DMG:                         },
+          [1659945481.649819][2742:2742] CHIP:DMG:
+          [1659945481.649856][2742:2742] CHIP:DMG:                         CommandFields =
+          [1659945481.649892][2742:2742] CHIP:DMG:                         {
+          [1659945481.649929][2742:2742] CHIP:DMG:                                 0x0 = 5000,
+          [1659945481.649970][2742:2742] CHIP:DMG:                         },
+          [1659945481.650002][2742:2742] CHIP:DMG:                 },
+          [1659945481.650037][2742:2742] CHIP:DMG:
+          [1659945481.650065][2742:2742] CHIP:DMG:         ],
+          [1659945481.650099][2742:2742] CHIP:DMG:
+          [1659945481.650126][2742:2742] CHIP:DMG:         InteractionModelRevision = 1
+          [1659945481.650153][2742:2742] CHIP:DMG: },
       disabled: true
diff --git a/src/app/tests/suites/certification/ci-pics-values b/src/app/tests/suites/certification/ci-pics-values
index c2575d1..87d1ad4 100644
--- a/src/app/tests/suites/certification/ci-pics-values
+++ b/src/app/tests/suites/certification/ci-pics-values
@@ -275,6 +275,7 @@
 MEDIAPLAYBACK.S.AS=1
 MEDIAPLAYBACK.S.VS=1
 TGTNAV.S.A0001=1
+TGTNAV.C.C00.Tx=1
 APBSC.S=1
 APBSC.S.A0000=1
 APBSC.S.A0001=1
@@ -653,6 +654,7 @@
 MCORE.ACL.Administrator=1
 OTAS.S.M.DelayedActionTime=1
 OTAP.S.M.UserConsentNeeded=1
+OTAP.S.M.DelayedActionTime=1
 OTAR.C.M.NotifyUpdateApplied=1
 OTAR.C.M.AnnounceOTAProvider=1
 
@@ -859,6 +861,7 @@
 MCORE.DD.EXTENDED_DISCOVERY=1
 MCORE.DD.COMMISSIONING_SUBTYPE_V=1
 MCORE.DD.COMMISSIONING_SUBTYPE_T=1
+MCORE.DD.FETCH_DCL=1
 
 
 #Ethernet Network Diagnostics Cluster
diff --git a/src/app/tests/suites/tests.js b/src/app/tests/suites/tests.js
index b590de3..72a6a94 100644
--- a/src/app/tests/suites/tests.js
+++ b/src/app/tests/suites/tests.js
@@ -500,6 +500,7 @@
     ];
 
     const UserLabel = [
+        "Test_TC_ULABEL_2_1",
         "Test_TC_ULABEL_3_1",
     ];
 
@@ -675,6 +676,7 @@
         "Test_TC_MEDIAPLAYBACK_1_7",
         "Test_TC_AUDIOOUTPUT_1_8",
         "Test_TC_TGTNAV_1_9",
+        "Test_TC_TGTNAV_8_2",
         "Test_TC_APBSC_1_10",
         "Test_TC_CONTENTLAUNCHER_1_11",
         "Test_TC_ALOGIN_1_12",
diff --git a/zzz_generated/chip-tool/zap-generated/test/Commands.h b/zzz_generated/chip-tool/zap-generated/test/Commands.h
index 644b5e5..0f57ee2 100644
--- a/zzz_generated/chip-tool/zap-generated/test/Commands.h
+++ b/zzz_generated/chip-tool/zap-generated/test/Commands.h
@@ -90,6 +90,7 @@
         printf("Test_TC_MEDIAPLAYBACK_1_7\n");
         printf("Test_TC_AUDIOOUTPUT_1_8\n");
         printf("Test_TC_TGTNAV_1_9\n");
+        printf("Test_TC_TGTNAV_8_2\n");
         printf("Test_TC_APBSC_1_10\n");
         printf("Test_TC_CONTENTLAUNCHER_1_11\n");
         printf("Test_TC_ALOGIN_1_12\n");
@@ -568,6 +569,7 @@
         printf("Test_TC_ACL_2_8\n");
         printf("Test_TC_ACL_2_9\n");
         printf("Test_TC_ACL_2_10\n");
+        printf("Test_TC_ULABEL_2_1\n");
         printf("Test_TC_ULABEL_3_1\n");
         printf("Test_TC_BRBINFO_1_1\n");
         printf("Test_TC_BRBINFO_2_1\n");
@@ -20306,6 +20308,62 @@
     }
 };
 
+class Test_TC_TGTNAV_8_2Suite : public TestCommand
+{
+public:
+    Test_TC_TGTNAV_8_2Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_TGTNAV_8_2", 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_TGTNAV_8_2Suite() {}
+
+    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_APBSC_1_10Suite : public TestCommand
 {
 public:
@@ -97260,6 +97318,62 @@
     }
 };
 
+class Test_TC_ULABEL_2_1Suite : public TestCommand
+{
+public:
+    Test_TC_ULABEL_2_1Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_ULABEL_2_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_ULABEL_2_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_ULABEL_3_1Suite : public TestCommand
 {
 public:
@@ -97610,6 +97724,7 @@
         make_unique<Test_TC_MEDIAPLAYBACK_1_7Suite>(credsIssuerConfig),
         make_unique<Test_TC_AUDIOOUTPUT_1_8Suite>(credsIssuerConfig),
         make_unique<Test_TC_TGTNAV_1_9Suite>(credsIssuerConfig),
+        make_unique<Test_TC_TGTNAV_8_2Suite>(credsIssuerConfig),
         make_unique<Test_TC_APBSC_1_10Suite>(credsIssuerConfig),
         make_unique<Test_TC_CONTENTLAUNCHER_1_11Suite>(credsIssuerConfig),
         make_unique<Test_TC_ALOGIN_1_12Suite>(credsIssuerConfig),
@@ -98077,6 +98192,7 @@
         make_unique<Test_TC_ACL_2_8Suite>(credsIssuerConfig),
         make_unique<Test_TC_ACL_2_9Suite>(credsIssuerConfig),
         make_unique<Test_TC_ACL_2_10Suite>(credsIssuerConfig),
+        make_unique<Test_TC_ULABEL_2_1Suite>(credsIssuerConfig),
         make_unique<Test_TC_ULABEL_3_1Suite>(credsIssuerConfig),
         make_unique<Test_TC_BRBINFO_1_1Suite>(credsIssuerConfig),
         make_unique<Test_TC_BRBINFO_2_1Suite>(credsIssuerConfig),
diff --git a/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h b/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h
index a7380dc..1c4c07e 100644
--- a/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h
+++ b/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h
@@ -88,6 +88,7 @@
         printf("Test_TC_MEDIAPLAYBACK_1_7\n");
         printf("Test_TC_AUDIOOUTPUT_1_8\n");
         printf("Test_TC_TGTNAV_1_9\n");
+        printf("Test_TC_TGTNAV_8_2\n");
         printf("Test_TC_APBSC_1_10\n");
         printf("Test_TC_CONTENTLAUNCHER_1_11\n");
         printf("Test_TC_ALOGIN_1_12\n");
@@ -34809,6 +34810,76 @@
     }
 };
 
+class Test_TC_TGTNAV_8_2 : public TestCommandBridge {
+public:
+    // NOLINTBEGIN(clang-analyzer-nullability.NullPassedToNonnull): Test constructor nullability not enforced
+    Test_TC_TGTNAV_8_2()
+        : TestCommandBridge("Test_TC_TGTNAV_8_2")
+        , mTestIndex(0)
+    {
+        AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
+        AddArgument("cluster", &mCluster);
+        AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
+        AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
+    }
+    // NOLINTEND(clang-analyzer-nullability.NullPassedToNonnull)
+
+    ~Test_TC_TGTNAV_8_2() {}
+
+    /////////// TestCommand Interface /////////
+    void NextTest() override
+    {
+        CHIP_ERROR err = CHIP_NO_ERROR;
+
+        if (0 == mTestIndex) {
+            ChipLogProgress(chipTool, " **** Test Start: Test_TC_TGTNAV_8_2\n");
+        }
+
+        if (mTestCount == mTestIndex) {
+            ChipLogProgress(chipTool, " **** Test Complete: Test_TC_TGTNAV_8_2\n");
+            SetCommandExitStatus(CHIP_NO_ERROR);
+            return;
+        }
+
+        Wait();
+
+        // Ensure we increment mTestIndex before we start running the relevant
+        // command.  That way if we lose the timeslice after we send the message
+        // but before our function call returns, we won't end up with an
+        // incorrect mTestIndex value observed when we get the response.
+        switch (mTestIndex++) {
+        }
+
+        if (CHIP_NO_ERROR != err) {
+            ChipLogError(chipTool, " ***** Test Failure: %s\n", chip::ErrorStr(err));
+            SetCommandExitStatus(err);
+        }
+    }
+
+    void OnStatusUpdate(const chip::app::StatusIB & status) override
+    {
+        switch (mTestIndex - 1) {
+        }
+
+        // Go on to the next test.
+        ContinueOnChipMainThread(CHIP_NO_ERROR);
+    }
+
+    chip::System::Clock::Timeout GetWaitDuration() const override
+    {
+        return chip::System::Clock::Seconds16(mTimeout.ValueOr(kTimeoutInSeconds));
+    }
+
+private:
+    std::atomic_uint16_t mTestIndex;
+    const uint16_t mTestCount = 0;
+
+    chip::Optional<chip::NodeId> mNodeId;
+    chip::Optional<chip::CharSpan> mCluster;
+    chip::Optional<chip::EndpointId> mEndpoint;
+    chip::Optional<uint16_t> mTimeout;
+};
+
 class Test_TC_APBSC_1_10 : public TestCommandBridge {
 public:
     // NOLINTBEGIN(clang-analyzer-nullability.NullPassedToNonnull): Test constructor nullability not enforced
@@ -123085,6 +123156,7 @@
         make_unique<Test_TC_MEDIAPLAYBACK_1_7>(),
         make_unique<Test_TC_AUDIOOUTPUT_1_8>(),
         make_unique<Test_TC_TGTNAV_1_9>(),
+        make_unique<Test_TC_TGTNAV_8_2>(),
         make_unique<Test_TC_APBSC_1_10>(),
         make_unique<Test_TC_CONTENTLAUNCHER_1_11>(),
         make_unique<Test_TC_ALOGIN_1_12>(),