diff --git a/src/app/tests/suites/certification/PICS.yaml b/src/app/tests/suites/certification/PICS.yaml
index 763e551ca6a18f..d8b2d12612f08b 100644
--- a/src/app/tests/suites/certification/PICS.yaml
+++ b/src/app/tests/suites/certification/PICS.yaml
@@ -536,30 +536,39 @@ PICS:
 
       # Relative Humidity cluster
     - label: "Does the device implement the MeasuredValue attribute?"
-      id: A_RELATIVEHUMIDITY
+      id: RH.S.A0000
 
     - label: "Does the device implement the MinMeasuredValue attribute?"
-      id: A_RELATIVEHUMIDITY_MIN
+      id: RH.S.A0001
 
     - label: "Does the device implement the MaxMeasuredValue attribute?"
-      id: A_RELATIVEHUMIDITY_MAX
+      id: RH.S.A0002
 
     - label: "Does the device implement the Tolerance attribute?"
-      id: A_RELATIVEHUMIDITY_TOLERANCE
+      id: RH.S.A0003
 
     - label:
           "Can the MeasuredValue attribute changed by physical control at the
           device?"
-      id: MANUAL_RELATIVEHUMIDITY_CHANGE
+      id: RH.M.ManuallyControlled
 
       # Temperature Measurement cluster
-    - label: "Does the device implement the MeasuredValue attribute"
-      id: A_TEMPERATURE
+    - label: "Does the device implement the MeasuredValue attribute?"
+      id: TM.S.A0000
+
+    - label: "Does the device implement the MinMeasuredValue attribute?"
+      id: TM.S.A0001
+
+    - label: "Does the device implement the MaxMeasuredValue attribute?"
+      id: TM.S.A0002
+
+    - label: "Does the device implement the Tolerance attribute?"
+      id: TM.S.A0003
 
     - label:
           "Can the MeasuredValue attribute changed by physical control at the
-          device"
-      id: MANUAL_TEMPERATURE_CHANGE
+          device?"
+      id: TM.M.ManuallyControlled
 
       # Thermostat User Configuration cluster
     - label: "Does the device implement the TemperatureDisplayMode attribute?"
@@ -826,33 +835,63 @@ PICS:
 
       # On/Off Cluster
     - label: "Does the device implement the OnOff attribute?"
-      id: A_ONOFF
+      id: OO.S.A0000
 
     - label: "Does the device implement the GlobalSceneControl attribute?"
-      id: A_GLOBALSCENECONTROL
+      id: OO.S.A4000
 
     - label: "Does the device implement the OnTime attribute?"
-      id: A_ONTIME
+      id: OO.S.A4001
 
     - label: "Does the device implement the OffWaitTime attribute?"
-      id: A_OFFWAITTIME
+      id: OO.S.A4002
+
+    - label: "Does the device implement the StartUpOnOff attribute?"
+      id: OO.S.A4003
 
     - label: "Does the device implement receiving the Off command?"
-      id: CR_OFF
+      id: OO.S.C00.Rsp
 
-    - label: "Does the device implement sending the On command?"
-      id: CR_ON
+    - label: "Does the device implement receiving the On command?"
+      id: OO.S.C01.Rsp
+
+    - label: "Does the device implement receiving the Toggle command?"
+      id: OO.S.C02.Rsp
 
     - label: "Does the device implement receiving the OffWithEffect command?"
-      id: CR_OFFWITHEFFECT
+      id: OO.S.C40.Rsp
 
     - label:
           "Does the device implement receiving the OnWithRecallGlobalScene
           command?"
-      id: CR_ONWITHRECALL
+      id: OO.S.C41.Rsp
 
     - label: "Does the device implement receiving the OnWithTimedOff command?"
-      id: CR_ONWITHTIMEOFF
+      id: OO.S.C42.Rsp
+
+    - label:
+          "Can the OnOff attribute changed by physical control at the device?"
+      id: OO.M.ManuallyControlled
+
+    - label: "Does the device implement sending the Off command?"
+      id: OO.C.C00.Tx
+
+    - label: "Does the device implement sending the On command?"
+      id: OO.C.C01.Tx
+
+    - label: "Does the device implement sending the Toggle command?"
+      id: OO.C.C02.Tx
+
+    - label: "Does the device implement sending the OffWithEffect command?"
+      id: OO.C.C40.Tx
+
+    - label:
+          "Does the device implement sending the OnWithRecallGlobalScene
+          command?"
+      id: OO.C.C41.Tx
+
+    - label: "Does the device implement sending the OnWithTimedOff command?"
+      id: OO.C.C42.Tx
 
     - label: "Does Dnssd advertisment broadcast Vendor ID"
       id: VENDOR_SUBTYPE
@@ -2656,3 +2695,107 @@ PICS:
           PacketMulticastRxCount, PacketMulticastTxCount, PacketUnicastRxCount,
           PacketUnicastTxCount"
       id: DGWIFI.S.C00
+    #Actions Cluster
+    - label: "Does the device implement the ActionList attribute?"
+      id: ACT.S.A0000
+
+    - label: "Does the device implement the EndpointLists attribute?"
+      id: ACT.S.A0001
+
+    - label: "Does the device implement the SetupURL attribute?"
+      id: ACT.S.A0002
+
+    - label: "Can the ActionList attribute be changed by some means?"
+      id: ACT.S.M.FillActionList
+
+    - label: "Can the EndpointLists attribute be changed by some means?"
+      id: ACT.S.M.FillEndpointLists
+
+    - label: "Does the DUT support sending the InstantAction command?"
+      id: ACT.C.C00.Tx
+
+    - label:
+          "Does the DUT support sending the InstantActionWithTransition command?"
+      id: ACT.C.C01.Tx
+
+    - label: "Does the DUT support sending the StartAction command?"
+      id: ACT.C.C02.Tx
+
+    - label: "Does the DUT support sending the StartActionWithDuration command?"
+      id: ACT.C.C03.Tx
+
+    - label: "Does the DUT support sending the StopAction command?"
+      id: ACT.C.C04.Tx
+
+    - label: "Does the DUT support sending the PauseAction command?"
+      id: ACT.C.C05.Tx
+
+    - label: "Does the DUT support sending the PauseActionWithDuration command?"
+      id: ACT.C.C06.Tx
+
+    - label: "Does the DUT support sending the ResumeAction command?"
+      id: ACT.C.C07.Tx
+
+    - label: "Does the DUT support sending the EnableAction command?"
+      id: ACT.C.C08.Tx
+
+    - label:
+          "Does the DUT support sending the EnableActionWithDuration command?"
+      id: ACT.C.C09.Tx
+
+    - label: "Does the DUT support sending the DisableAction command?"
+      id: ACT.C.C0a.Tx
+
+    - label:
+          "Does the DUT support sending the DisableActionWithDuration command?"
+      id: ACT.C.C0b.Tx
+
+    #Boolean State Cluster
+    - label: "Does the device implement the StateValue attribute?"
+      id: BOOL.S.A0000
+
+    - label:
+          "Can the StateValue attribute be changed by manual operation at the
+          DUT?"
+      id: BOOL.M.ManuallyControlled
+
+    - label: "Does the device implement the StateChange event?"
+      id: BOOL.S.E00
+
+    #Diagnostics Logs Cluster
+    - label:
+          "Does the Device(Server) implement receiving the RetrieveLogsRequest
+          command?"
+      id: DLOG.S.C00.Rsp
+
+    - label:
+          "Does the Device(Server) invoking/generating the RetrieveLogsResponse
+          command?"
+      id: DLOG.S.C01.Tx
+
+    - label:
+          "Does the Device(client) implement receiving the RetrieveLogsResponse
+          command?"
+      id: DLOG.C.C01.Rsp
+
+    - label:
+          "Does the Device(client) invoking/generating the RetrieveLogsRequeste
+          command?"
+      id: DLOG.C.C00.Tx
+
+    #Localization Configuration Cluster
+    - label: "Does the DUT(server) support the ActiveLocale attribute?"
+      id: LCFG.S.A0000
+
+    - label: "Does the DUT(server) support the SupportedLocales attribute?"
+      id: LCFG.S.A0001
+
+    - label: "Does the DUT(client) support the ActiveLocale attribute?"
+      id: LCFG.C.A0000
+
+    - label: "Does the DUT(server) support the SupportedLocales attribute?"
+      id: LCFG.C.A0001
+
+    #Power Source Configuration Cluster
+    - label: "Does the device implement the Sources attribute?"
+      id: PSCFG.S.A0000
diff --git a/src/app/tests/suites/certification/Test_TC_ACT_2_1.yaml b/src/app/tests/suites/certification/Test_TC_ACT_2_1.yaml
index 08520ebf2bbe95..4ca785fd0ed56d 100644
--- a/src/app/tests/suites/certification/Test_TC_ACT_2_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_ACT_2_1.yaml
@@ -31,6 +31,7 @@ tests:
           endpoints that can be exposed using the Actions server cluster (NOTE
           if this is not provided, it is assumed the DUT automagically creates
           these)"
+      PICS: ACT.S.M.FillEndpointLists
       verification: |
           no Matter messages, result will be used in steps 4a and beyond
       disabled: true
@@ -40,6 +41,7 @@ tests:
           actions that can be exposed using the Actions server cluster (NOTE if
           this is not provided, it is assumed the DUT automagically creates
           these)"
+      PICS: ACT.S.M.FillActionList
       verification: |
           no Matter messages, result will be used in steps 5a and beyond
       disabled: true
@@ -56,9 +58,8 @@ tests:
           internal TH: create list of all EP on this server
       disabled: true
 
-    - label:
-          "Read EndpointLists attribute of Actions server and validate the
-          EndpointListStructs using the following steps"
+    - label: "Read EndpointLists attribute of Actions server"
+      PICS: ACT.S.A0001
       verification: |
           Read EndpointLists attribute
       disabled: true
@@ -93,13 +94,13 @@ tests:
           "For each EndpointListStruct, verify Name and Type against the
           name/type of each group of endpoints provided by the manufacturers
           means"
+      PICS: ACT.S.A0001 && ACT.S.M.FillEndpointLists
       verification: |
           no Matter messages, but TH internal checking
       disabled: true
 
-    - label:
-          "Read ActionList attribute of Actions server and validate the
-          ActionStructs using the following steps"
+    - label: "Read ActionList attribute of Actions server"
+      PICS: ACT.S.A0000
       verification: |
           Read ActionList attribute
       disabled: true
@@ -145,18 +146,18 @@ tests:
           "For each ActionStruct, verify Name, Type and State against the
           name/type/state info for the action provided by the manufacturers
           means"
+      PICS: ACT.S.A0000 && ACT.S.M.FillActionList
       verification: |
           no Matter messages, but TH internal checking
       disabled: true
 
     - label: "Read SetupURL attribute"
+      PICS: ACT.S.A0002
       verification: |
           Read SetupURL attribute
       disabled: true
 
-    - label:
-          "Verify that its syntax follows the syntax as specified in RFC 3986,
-          max. 512 ASCII characters"
+    - label: "Verify that its syntax"
       verification: |
           no Matter messages, but TH internal checking
       disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_ACT_2_2.yaml b/src/app/tests/suites/certification/Test_TC_ACT_2_2.yaml
index 125bbd7e564c5f..400f6dfb190104 100644
--- a/src/app/tests/suites/certification/Test_TC_ACT_2_2.yaml
+++ b/src/app/tests/suites/certification/Test_TC_ACT_2_2.yaml
@@ -13,7 +13,7 @@
 # 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.2. [TC-ACT-2.2] Primary functionality with server as DUT
+name: 76.2.2. [TC-ACT-2.2] Primary functionality with server as DUT
 
 config:
     nodeId: 0x12344321
@@ -29,11 +29,13 @@ tests:
     - label:
           "Using the manufacturer provided means, create multiple groups with
           each multiple bridged devices (endpoints)"
+      PICS: ACT.S.A0001 && ACT.S.M.FillEndpointLists
       verification: |
           no Matter messages
       disabled: true
 
     - label: "Read EndpointLists attribute"
+      PICS: ACT.S.A0001 && ACT.S.M.FillEndpointLists
       verification: |
           Read EndpointLists attribute
       disabled: true
@@ -41,144 +43,170 @@ tests:
     - label:
           "Using the manufacturer provided means, update the name of one of the
           groups"
+      PICS: ACT.S.A0001 && ACT.S.M.FillEndpointLists
       verification: |
-          no Matter messages
+          Read EndpointLists attribute
       disabled: true
 
     - label: "Read EndpointLists attribute again"
+      PICS: ACT.S.A0001 && ACT.S.M.FillEndpointLists
       verification: |
-          Read EndpointLists attribute
+          TH internal checking of changes to EndpointLists attribute matching what was changed in 2c
       disabled: true
 
     - label: "compare result of step 2d to what was read in step 2b"
+      PICS: ACT.S.A0001 && ACT.S.M.FillEndpointLists
       verification: |
-          TH internal checking of changes to EndpointLists attribute matching what was changed in 2c
+          no Matter messages
       disabled: true
 
     - label:
           "Using the manufacturer provided means, move one of the bridged
           devices (one endpoint) from one group to another group"
+      PICS: ACT.S.A0001 && ACT.S.M.FillEndpointLists
       verification: |
-          no Matter messages
+          TH internal checking of changes to EndpointLists attribute matching what was changed in 2f
       disabled: true
 
     - label: "Read EndpointLists attribute again"
+      PICS: ACT.S.A0001 && ACT.S.M.FillEndpointLists
       verification: |
-          Read EndpointLists attribute
+          no Matter messages
       disabled: true
 
     - label: "compare result of step 2g to what was read in step 2e"
+      PICS: ACT.S.A0001 && ACT.S.M.FillEndpointLists
       verification: |
-          TH internal checking of changes to EndpointLists attribute matching what was changed in 2f
+          Read EndpointLists attribute
       disabled: true
 
     - label: "Using the manufacturer provided means, remove one of the groups"
+      PICS: ACT.S.A0001 && ACT.S.M.FillEndpointLists
       verification: |
           no Matter messages
       disabled: true
 
     - label: "Read EndpointLists attribute again"
+      PICS: ACT.S.A0001 && ACT.S.M.FillEndpointLists
       verification: |
           Read EndpointLists attribute
       disabled: true
 
     - label: "compare result of step 2j to what was read in step 2h"
+      PICS: ACT.S.A0001 && ACT.S.M.FillEndpointLists
       verification: |
-          TH internal checking of changes to EndpointLists attribute matching what was changed in 2i
+          TH internal checking of changes to EndpointLists attribute matching what was changed in 2l
       disabled: true
 
     - label:
           "Using the manufacturer provided means, create a new group, which
           includes one of the bridged devices also present in another group"
+      PICS: ACT.S.A0001 && ACT.S.M.FillEndpointLists
       verification: |
           no Matter messages
       disabled: true
 
     - label: "Read EndpointLists attribute again"
+      PICS: ACT.S.A0001 && ACT.S.M.FillEndpointLists
       verification: |
-          Read EndpointLists attribute
+          Read ActionList attribute
       disabled: true
 
     - label: "compare result of step 2m to what was read in step 2k"
+      PICS: ACT.S.A0001 && ACT.S.M.FillEndpointLists
       verification: |
-          TH internal checking of changes to EndpointLists attribute matching what was changed in 2l
+          no Matter messages
       disabled: true
 
     - label: "Using the manufacturer provided means, create multiple actions"
+      PICS: ACT.S.A0000 && ACT.S.M.FillActionList
       verification: |
-          no Matter messages
+          TH internal checking of changes to ActionList attribute matching what was changed in 3c
       disabled: true
 
     - label: "Read ActionList attribute"
+      PICS: ACT.S.A0000 && ACT.S.M.FillActionList
       verification: |
-          Read ActionList attribute
+          no Matter messages
       disabled: true
 
     - label:
           "Using the manufacturer provided means, update the name of one of the
           actions"
+      PICS: ACT.S.A0000 && ACT.S.M.FillActionList
       verification: |
-          no Matter messages
+          TH internal checking of changes to ActionList attribute matching what was changed in 3f
       disabled: true
 
     - label: "Read ActionList attribute again"
+      PICS: ACT.S.A0000 && ACT.S.M.FillActionList
       verification: |
-          Read ActionList attribute
+          no Matter messages
       disabled: true
 
     - label: "compare result of step 3d to what was read in step 3b"
+      PICS: ACT.S.A0000 && ACT.S.M.FillActionList
       verification: |
-          TH internal checking of changes to ActionList attribute matching what was changed in 3c
+          Read ActionList attribute
       disabled: true
 
     - label:
           "Using the manufacturer provided means, remove one of the exposed
           actions"
+      PICS: ACT.S.A0000 && ACT.S.M.FillActionList
       verification: |
-          no Matter messages
+
       disabled: true
 
     - label: "Read ActionList attribute again"
+      PICS: ACT.S.A0000 && ACT.S.M.FillActionList
       verification: |
-          Read ActionList attribute
+          no Matter messages
       disabled: true
 
     - label: "compare result of step 3g to what was read in step 3e"
+      PICS: ACT.S.A0000 && ACT.S.M.FillActionList
       verification: |
-          TH internal checking of changes to ActionList attribute matching what was changed in 3f
+          Read ActionList attribute
       disabled: true
 
     - label: "Using the manufacturer provided means, add a new exposed action"
+      PICS: ACT.S.A0000 && ACT.S.M.FillActionList
       verification: |
-          no Matter messages
+          sequence of Matter messages as described
       disabled: true
 
     - label: "Read ActionList attribute again"
+      PICS: ACT.S.A0000 && ACT.S.M.FillActionList
       verification: |
-          Read ActionList attribute
+          sequence of Matter messages as described
       disabled: true
 
     - label: "compare result of step 3j to what was read in step 3h"
+      PICS: ACT.S.A0000 && ACT.S.M.FillActionList
       verification: |
-          TH internal checking of changes to ActionList attribute matching what was changed in 3i
+
       disabled: true
 
     - label:
           "Using the manufacturer provided means, create multiple actions (NOTE
           if this is not provided, it is assumed the DUT automagically creates
           these)"
+      PICS: ACT.S.A0000
       verification: |
-          no Matter messages
+
       disabled: true
 
     - label: "Read ActionList attribute"
+      PICS: ACT.S.A0000
       verification: |
-          Read ActionList attribute
+
       disabled: true
 
     - label: "subscribe to StateChanged and ActionFailed events"
+      PICS: ACT.S.A0000
       verification: |
-          subscribe to events
+
       disabled: true
 
     - label:
@@ -186,11 +214,13 @@ tests:
           4b), perform one of the actions supported (see SupportedCommands in
           this ActionStruct) by sending the command with this particular
           ActionID and a random value for InvokeID"
+      PICS: ACT.S.A0000
       verification: |
-          sequence of Matter messages as described
+
       disabled: true
 
     - label: "repeat 4d for the other SupportedCommands of each ActionStruct"
+      PICS: ACT.S.A0000
       verification: |
-          sequence of Matter messages as described
+
       disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_ACT_3_1.yaml b/src/app/tests/suites/certification/Test_TC_ACT_3_1.yaml
index 5d389fef09934c..9aec071cf8518d 100644
--- a/src/app/tests/suites/certification/Test_TC_ACT_3_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_ACT_3_1.yaml
@@ -13,7 +13,7 @@
 # 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.3. [TC-ACT-3.1] GLobal attributes with client as DUT
+name: 76.2.3. [TC-ACT-3.1] GLobal attributes with client as DUT
 
 config:
     nodeId: 0x12344321
@@ -56,19 +56,51 @@ tests:
           also reflects this in global attributes such as FeatureMap and
           AttributeList. Commission DUT to TH again"
       verification: |
-          https://github.com/project-chip/connectedhomeip/issues/16851
+          ./chip-tool bridgedactions  read action-list 1 1
+          ./chip-tool bridgedactions  read endpoint-list   1 1
       disabled: true
 
     - label:
           "DUT reads all supported optional attributes from TH one at a time in
           a manufacturer specific order"
       verification: |
-          https://github.com/project-chip/connectedhomeip/issues/16851
+          ./chip-tool bridgedactions  read  setup-url  1 1
+
+          [1656480136859] [49753:5741500] CHIP: [DMG] ReportDataMessage =
+          [1656480136859] [49753:5741500] CHIP: [DMG] {
+          [1656480136859] [49753:5741500] CHIP: [DMG] 	AttributeReportIBs =
+          [1656480136859] [49753:5741500] CHIP: [DMG] 	[
+          [1656480136859] [49753:5741500] CHIP: [DMG] 		AttributeReportIB =
+          [1656480136859] [49753:5741500] CHIP: [DMG] 		{
+          [1656480136859] [49753:5741500] CHIP: [DMG] 			AttributeStatusIB =
+          [1656480136859] [49753:5741500] CHIP: [DMG] 			{
+          [1656480136859] [49753:5741500] CHIP: [DMG] 				AttributePathIB =
+          [1656480136859] [49753:5741500] CHIP: [DMG] 				{
+          [1656480136859] [49753:5741500] CHIP: [DMG] 					Endpoint = 0x1,
+          [1656480136859] [49753:5741500] CHIP: [DMG] 					Cluster = 0x25,
+          [1656480136859] [49753:5741500] CHIP: [DMG] 					Attribute = 0x0000_0002,
+          [1656480136859] [49753:5741500] CHIP: [DMG] 				}
+          [1656480136859] [49753:5741500] CHIP: [DMG]
+          [1656480136859] [49753:5741500] CHIP: [DMG] 				StatusIB =
+          [1656480136859] [49753:5741500] CHIP: [DMG] 				{
+          [1656480136859] [49753:5741500] CHIP: [DMG] 					status = 0x86 (UNSUPPORTED_ATTRIBUTE),
+          [1656480136859] [49753:5741500] CHIP: [DMG] 				},
+          [1656480136859] [49753:5741500] CHIP: [DMG]
+          [1656480136859] [49753:5741500] CHIP: [DMG] 			},
+          [1656480136859] [49753:5741500] CHIP: [DMG]
+          [1656480136859] [49753:5741500] CHIP: [DMG] 		},
+          [1656480136859] [49753:5741500] CHIP: [DMG]
+          [1656480136859] [49753:5741500] CHIP: [DMG] 	],
+          [1656480136859] [49753:5741500] CHIP: [DMG]
+          [1656480136859] [49753:5741500] CHIP: [DMG] 	SuppressResponse = true,
+          [1656480136859] [49753:5741500] CHIP: [DMG] 	InteractionModelRevision = 1
+          [1656480136859] [49753:5741500] CHIP: [DMG] }
+          [1656480136859] [49753:5741500] CHIP: [TOO] Response Failure: IM Error 0x00000586: 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: |
-          https://github.com/project-chip/connectedhomeip/issues/16851
+          No writeable attribute
       disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_ACT_3_2.yaml b/src/app/tests/suites/certification/Test_TC_ACT_3_2.yaml
new file mode 100644
index 00000000000000..ec4c5a908eda85
--- /dev/null
+++ b/src/app/tests/suites/certification/Test_TC_ACT_3_2.yaml
@@ -0,0 +1,94 @@
+# 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.4. [TC-ACT-3.2] Functionality with client as DUT
+
+config:
+    nodeId: 0x12344321
+    cluster: "Basic"
+    endpoint: 0
+
+tests:
+    - label: "DUT issues an InstantAction command to TH"
+      PICS: ACT.C.C00.Tx
+      verification: |
+          Optional command, needs an SDK implementation
+      disabled: true
+
+    - label: "DUT issues an StartAction command to TH"
+      PICS: ACT.C.C02.Tx
+      verification: |
+          Optional command, needs an SDK implementation
+      disabled: true
+
+    - label: "DUT issues an StopAction command to TH"
+      PICS: ACT.C.C04.Tx
+      verification: |
+          Optional command, needs an SDK implementation
+      disabled: true
+
+    - label: "DUT issues an PauseAction command to TH"
+      PICS: ACT.C.C05.Tx
+      verification: |
+          Optional command, needs an SDK implementation
+      disabled: true
+
+    - label: "DUT issues an ResumeAction command to TH"
+      PICS: ACT.C.C07.Tx
+      verification: |
+          Optional command, needs an SDK implementation
+      disabled: true
+
+    - label: "DUT issues an EnableAction command to TH"
+      PICS: ACT.C.C08.Tx
+      verification: |
+          Optional command, needs an SDK implementation
+      disabled: true
+
+    - label: "DUT issues an DisableAction command to TH"
+      PICS: ACT.C.C0a.Tx
+      verification: |
+          Optional command, needs an SDK implementation
+      disabled: true
+
+    - label: "DUT issues an StartActionWithDuration command to TH"
+      PICS: ACT.C.C03.Tx
+      verification: |
+          Optional command, needs an SDK implementation
+      disabled: true
+
+    - label: "DUT issues an PauseActionWithDuration command to TH"
+      PICS: ACT.C.C06.Tx
+      verification: |
+          Optional command, needs an SDK implementation
+      disabled: true
+
+    - label: "DUT issues an EnableActionWithDuration command to TH"
+      PICS: ACT.C.C09.Tx
+      verification: |
+          Optional command, needs an SDK implementation
+      disabled: true
+
+    - label: "DUT issues an DisableActionWithDuration command to TH"
+      PICS: ACT.C.C0b.Tx
+      verification: |
+          Optional command, needs an SDK implementation
+      disabled: true
+
+    - label: "DUT issues an InstantActionWithTransition command to TH"
+      PICS: ACT.C.C01.Tx
+      verification: |
+          Optional command, needs an SDK implementation
+      disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_BOOL_2_1.yaml b/src/app/tests/suites/certification/Test_TC_BOOL_2_1.yaml
index 93f8b42124b2e5..316b44e10edd3a 100644
--- a/src/app/tests/suites/certification/Test_TC_BOOL_2_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_BOOL_2_1.yaml
@@ -29,6 +29,7 @@ tests:
                 value: nodeId
 
     - label: "Read mandatory non-global attribute: StateValue"
+      PICS: BOOL.S.A0000
       command: "readAttribute"
       attribute: "StateValue"
       response:
diff --git a/src/app/tests/suites/certification/Test_TC_BOOL_2_2.yaml b/src/app/tests/suites/certification/Test_TC_BOOL_2_2.yaml
index 67c89012db9cdd..80d54e00220002 100644
--- a/src/app/tests/suites/certification/Test_TC_BOOL_2_2.yaml
+++ b/src/app/tests/suites/certification/Test_TC_BOOL_2_2.yaml
@@ -13,7 +13,7 @@
 # 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: 68.2.2. [TC-BOOL-2.2] Primary functionality with server as DUT
+name: 67.2.2. [TC-BOOL-2.2] Primary Functionality with Server as DUT
 
 config:
     nodeId: 0x12344321
@@ -27,11 +27,13 @@ tests:
       disabled: true
 
     - label: "Bring the DUT into a state so StateValue is FALSE"
+      PICS: BOOL.M.ManuallyControlled && BOOL.S.A0000
       verification: |
           Manual operation
       disabled: true
 
     - label: "TH reads the StateValue attribute from the DUT"
+      PICS: BOOL.M.ManuallyControlled && BOOL.S.A0000
       verification: |
           ./chip-tool booleanstate read state-value 1 1
 
@@ -40,11 +42,13 @@ tests:
       disabled: true
 
     - label: "Bring the DUT into a state so StateValue is TRUE"
+      PICS: BOOL.M.ManuallyControlled && BOOL.S.A0000
       verification: |
-
+          Manual operation
       disabled: true
 
     - label: "TH reads the StateValue attribute from the DUT"
+      PICS: BOOL.M.ManuallyControlled && BOOL.S.A0000
       verification: |
           ./chip-tool booleanstate read state-value 1 1
 
@@ -53,43 +57,20 @@ tests:
       disabled: true
 
     - label: "Set up subscription to StateChange event"
+      PICS: BOOL.M.ManuallyControlled && BOOL.S.E00 && BOOL.S.A0000
       verification: |
-          ./chip-tool booleanstate subscribe state-value 1 100 1 1 1
+          ./chip-tool booleanstate subscribe-event-by-id 0x0 1 100 2 1
       disabled: true
 
     - label: "Bring the DUT into a state so StateValue is FALSE"
+      PICS: BOOL.M.ManuallyControlled && BOOL.S.E00 && BOOL.S.A0000
       verification: |
-          [1646119162.627309][3311:3316] CHIP:DMG: ReportDataMessage =
-          [1646119162.627342][3311:3316] CHIP:DMG: {
-          [1646119162.627370][3311:3316] CHIP:DMG:        SubscriptionId = 0xb3476ff99df21d7f,
-          [1646119162.627397][3311:3316] CHIP:DMG:        AttributeReportIBs =
-          [1646119162.627432][3311:3316] CHIP:DMG:        [
-          [1646119162.627454][3311:3316] CHIP:DMG:                AttributeReportIB =
-          [1646119162.627483][3311:3316] CHIP:DMG:                {
-          [1646119162.627505][3311:3316] CHIP:DMG:                        AttributeDataIB =
-          [1646119162.627530][3311:3316] CHIP:DMG:                        {
-          [1646119162.627562][3311:3316] CHIP:DMG:                                DataVersion = 0x7ed289df,
-          [1646119162.627592][3311:3316] CHIP:DMG:                                AttributePathIB =
-          [1646119162.627623][3311:3316] CHIP:DMG:                                {
-          [1646119162.627654][3311:3316] CHIP:DMG:                                        Endpoint = 0x1,
-          [1646119162.627685][3311:3316] CHIP:DMG:                                        Cluster = 0x45,
-          [1646119162.627721][3311:3316] CHIP:DMG:                                        Attribute = 0x0000_0000,
-          [1646119162.627759][3311:3316] CHIP:DMG:                                }
-          [1646119162.627794][3311:3316] CHIP:DMG:
-          [1646119162.627830][3311:3316] CHIP:DMG:                                        Data = false,
-          [1646119162.627860][3311:3316] CHIP:DMG:                        },
-          [1646119162.627888][3311:3316] CHIP:DMG:
-          [1646119162.627909][3311:3316] CHIP:DMG:                },
-          [1646119162.627938][3311:3316] CHIP:DMG:
-          [1646119162.627960][3311:3316] CHIP:DMG:        ],
-          [1646119162.627991][3311:3316] CHIP:DMG:
-          [1646119162.628013][3311:3316] CHIP:DMG:        InteractionModelRevision = 1
-          [1646119162.628035][3311:3316] CHIP:DMG: }
           [1646119162.628169][3311:3316] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0045 Attribute 0x0000_0000DataVersion: 2127727071
           [1646119162.628207][3311:3316] CHIP:TOO:   StateValue: FALSE
       disabled: true
 
     - label: "TH reads the StateValue attribute from the DUT"
+      PICS: BOOL.M.ManuallyControlled && BOOL.S.E00 && BOOL.S.A0000
       verification: |
           ./chip-tool booleanstate read state-value 1 1
 
@@ -98,38 +79,14 @@ tests:
       disabled: true
 
     - label: "Bring the DUT into a state so StateValue is TRUE"
+      PICS: BOOL.M.ManuallyControlled && BOOL.S.E00 && BOOL.S.A0000
       verification: |
-          [1646119162.627309][3311:3316] CHIP:DMG: ReportDataMessage =
-          [1646119162.627342][3311:3316] CHIP:DMG: {
-          [1646119162.627370][3311:3316] CHIP:DMG:        SubscriptionId = 0xb3476ff99df21d7f,
-          [1646119162.627397][3311:3316] CHIP:DMG:        AttributeReportIBs =
-          [1646119162.627432][3311:3316] CHIP:DMG:        [
-          [1646119162.627454][3311:3316] CHIP:DMG:                AttributeReportIB =
-          [1646119162.627483][3311:3316] CHIP:DMG:                {
-          [1646119162.627505][3311:3316] CHIP:DMG:                        AttributeDataIB =
-          [1646119162.627530][3311:3316] CHIP:DMG:                        {
-          [1646119162.627562][3311:3316] CHIP:DMG:                                DataVersion = 0x7ed289df,
-          [1646119162.627592][3311:3316] CHIP:DMG:                                AttributePathIB =
-          [1646119162.627623][3311:3316] CHIP:DMG:                                {
-          [1646119162.627654][3311:3316] CHIP:DMG:                                        Endpoint = 0x1,
-          [1646119162.627685][3311:3316] CHIP:DMG:                                        Cluster = 0x45,
-          [1646119162.627721][3311:3316] CHIP:DMG:                                        Attribute = 0x0000_0000,
-          [1646119162.627759][3311:3316] CHIP:DMG:                                }
-          [1646119162.627794][3311:3316] CHIP:DMG:
-          [1646119162.627830][3311:3316] CHIP:DMG:                                        Data = true,
-          [1646119162.627860][3311:3316] CHIP:DMG:                        },
-          [1646119162.627888][3311:3316] CHIP:DMG:
-          [1646119162.627909][3311:3316] CHIP:DMG:                },
-          [1646119162.627938][3311:3316] CHIP:DMG:
-          [1646119162.627960][3311:3316] CHIP:DMG:        ],
-          [1646119162.627991][3311:3316] CHIP:DMG:
-          [1646119162.628013][3311:3316] CHIP:DMG:        InteractionModelRevision = 1
-          [1646119162.628035][3311:3316] CHIP:DMG: }
           [1646119162.628169][3311:3316] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0045 Attribute 0x0000_0000DataVersion: 2127727071
           [1646119162.628207][3311:3316] CHIP:TOO:   StateValue: TRUE
       disabled: true
 
     - label: "TH reads the StateValue attribute from the DUT"
+      PICS: BOOL.M.ManuallyControlled && BOOL.S.E00 && BOOL.S.A0000
       verification: |
           ./chip-tool booleanstate read state-value 1 1
 
diff --git a/src/app/tests/suites/certification/Test_TC_BOOL_3_1.yaml b/src/app/tests/suites/certification/Test_TC_BOOL_3_1.yaml
index b6c5f6ea82458d..e4a0c691297690 100644
--- a/src/app/tests/suites/certification/Test_TC_BOOL_3_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_BOOL_3_1.yaml
@@ -13,7 +13,7 @@
 # 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: 68.3.1. [TC-BOOL-3.1] Attributes with client as DUT
+name: 67.3.1. [TC-BOOL-3.1] Attributes with Client as DUT
 
 config:
     nodeId: 0x12344321
@@ -22,46 +22,91 @@ config:
 
 tests:
     - label:
-          "DUT reads all supported mandatory attributes from TH once at a time
-          in a manufacturer specific order"
+          "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 state-value (id 0) looks like this:
+          ./chip-tool booleanstate read state-value 1 1
+
+          Verify on TestHarnes (all-cluster-app) a received read of state-value printing the cluster ID endpoint used and attribute ID which is read in logs
 
           [CHIP:DMG: ReadRequestMessage =
           [1646667214.092121][11498:11498] CHIP:DMG: {
-          [1646667214.092142][11498:11498] CHIP:DMG: 	AttributePathIBs =
-          [1646667214.092179][11498:11498] CHIP:DMG: 	[
-          [1646667214.092204][11498:11498] CHIP:DMG: 		AttributePathIB =
-          [1646667214.092242][11498:11498] CHIP:DMG: 		{
-          [1646667214.092279][11498:11498] CHIP:DMG: 			Endpoint = 0x1,
-          [1646667214.092319][11498:11498] CHIP:DMG: 			Cluster = 0x45,
-          [1646667214.092359][11498:11498] CHIP:DMG: 			Attribute = 0x0000_0000,
-          [1646667214.092391][11498:11498] CHIP:DMG: 		}
+          [1646667214.092142][11498:11498] CHIP:DMG:         AttributePathIBs =
+          [1646667214.092179][11498:11498] CHIP:DMG:         [
+          [1646667214.092204][11498:11498] CHIP:DMG:                 AttributePathIB =
+          [1646667214.092242][11498:11498] CHIP:DMG:                 {
+          [1646667214.092279][11498:11498] CHIP:DMG:                         Endpoint = 0x1,
+          [1646667214.092319][11498:11498] CHIP:DMG:                         Cluster = 0x45,
+          [1646667214.092359][11498:11498] CHIP:DMG:                         Attribute = 0x0000_0000,
+          [1646667214.092391][11498:11498] CHIP:DMG:                 }
           [1646667214.092430][11498:11498] CHIP:DMG:
-          [1646667214.092456][11498:11498] CHIP:DMG: 	],
+          [1646667214.092456][11498:11498] CHIP:DMG:         ],
           [1646667214.092494][11498:11498] CHIP:DMG:
-          [1646667214.092529][11498:11498] CHIP:DMG: 	isFabricFiltered = true,
-          [1646667214.092555][11498:11498] CHIP:DMG: 	InteractionModelRevision = 1
+          [1646667214.092529][11498:11498] CHIP:DMG:         isFabricFiltered = true,
+          [1646667214.092555][11498:11498] CHIP:DMG:         InteractionModelRevision = 1
           [1646667214.092577][11498:11498] CHIP:DMG: },
+
+
+          Verify on DUT
+
+          ./chip-tool booleanstate read state-value 1 1
+
+          [1646118838.087500][3279:3284] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0045 Attribute 0x0000_0000DataVersion: 2127727071
+          [1646118838.087536][3279:3284] CHIP:TOO:   StateValue: TRUE
       disabled: true
 
     - label:
-          "DUT reads all supported optional attributes from TH once at a time in
+          "DUT reads all supported optional attributes from TH one at a time in
           a manufacturer specific order"
       verification: |
-          see above
+          No optional attribute
       disabled: true
 
     - label:
           "DUT writes a suitable value to all supported mandatory attributes on
-          the TH once at a time in a manufacturer specific order"
+          the TH one at a time in a manufacturer specific order"
       verification: |
           No writable attributes
       disabled: true
 
     - label:
           "DUT writes a suitable value to all supported optional attributes on
-          the TH once at a time in a manufacturer specific order"
+          the TH one at a time in a manufacturer specific order"
       verification: |
-          No writable attributes
+          No optional attribute
+      disabled: true
+
+    - label:
+          "Configure TH such that it implements mandatory and none of the
+          optional attributes of the server-side of the cluster, and that it
+          also reflects this in global attributes such as FeatureMap and
+          AttributeList. Commission DUT to TH again"
+      verification: |
+          ./chip-tool booleanstate read attribute-list 1 1
+          [1654244313219] [91456:3997555] CHIP: [TOO] Endpoint: 1 Cluster: 0x0000_0045 Attribute 0x0000_FFFB DataVersion: 2739318439
+          [1654244313220] [91456:3997555] CHIP: [TOO]   AttributeList: 6 entries
+          [1654244313220] [91456:3997555] CHIP: [TOO]     [1]: 0
+          [1654244313220] [91456:3997555] CHIP: [TOO]     [2]: 65528
+          [1654244313220] [91456:3997555] CHIP: [TOO]     [3]: 65529
+          [1654244313220] [91456:3997555] CHIP: [TOO]     [4]: 65531
+          [1654244313220] [91456:3997555] CHIP: [TOO]     [5]: 65532
+          [1654244313220] [91456:3997555] CHIP: [TOO]     [6]: 65533
+
+           ./chip-tool booleanstate read state-value 1 1
+          [1654244423171] [91468:3998115] CHIP: [TOO] Endpoint: 1 Cluster: 0x0000_0045 Attribute 0x0000_0000 DataVersion: 2739318439
+          [1654244423171] [91468:3998115] CHIP: [TOO]   StateValue: FALSE
+      disabled: true
+
+    - label:
+          "DUT reads all supported optional attributes from TH one at a time in
+          a manufacturer specific order"
+      verification: |
+          No optional 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: |
+          No optional attribute
       disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_DA_1_1.yaml b/src/app/tests/suites/certification/Test_TC_DA_1_1.yaml
index e82f81ae21e8fe..daef7cd71a53a5 100644
--- a/src/app/tests/suites/certification/Test_TC_DA_1_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DA_1_1.yaml
@@ -14,7 +14,7 @@
 # Auto-generated scripts for harness use only, please review before automation. The endpoints and cluster names are currently set to default
 
 name:
-    17.1.1. [TC-DA-1.1] The NOC SHALL be wiped on Factory Reset [DUT -
+    4.1.1. [TC-DA-1.1] The NOC SHALL be wiped on Factory Reset [DUT -
     Commissionee]
 
 config:
@@ -25,37 +25,78 @@ config:
 tests:
     - label: "Commission DUT to TH1s Fabric"
       verification: |
+          DUT side:
+          sudo ./chip-all-clusters-app --wifi
 
+          TH side:
+          ./chip-tool pairing ble-wifi 1 zigbeehome matter123 20202021 3841 --trace_decode 1
+
+          [1650455358.501816][4366:4371] CHIP:TOO: Device commissioning completed with success
       disabled: true
 
     - label:
-          "TH1 reads the NOCs attribute list from DUT TH1 saves the NOCs list
-          for future usage."
+          "TH1 does a non-fabric-filtered read of Fabrics attribute list from
+          DUT TH1 saves the NOCs list for future usage."
       verification: |
+          ./chip-tool operationalcredentials read fabrics 1 0
 
+          [1655471672.386120][13377:13382] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_003E Attribute 0x0000_0001 DataVersion: 2667297992
+          [1655471672.386213][13377:13382] CHIP:TOO:   Fabrics: 1 entries
+          [1655471672.386291][13377:13382] CHIP:TOO:     [1]: {
+          [1655471672.386339][13377:13382] CHIP:TOO:       RootPublicKey: 04FB421853FB8AE6AEA281845DE7C8689E7C24AD3283A3536E09BA2FAAE88F6EA4C08DC055A965D8FE0A8060A7F9F45E509B7A4C9092FB3D8D2E253B057899F5AB
+          [1655471672.386378][13377:13382] CHIP:TOO:       VendorId: 65521
+          [1655471672.386412][13377:13382] CHIP:TOO:       FabricId: 1
+          [1655471672.386445][13377:13382] CHIP:TOO:       NodeId: 1
+          [1655471672.386675][13377:13382] CHIP:TOO:       Label:
+          [1655471672.386716][13377:13382] CHIP:TOO:       FabricIndex: 1
+          [1655471672.386750][13377:13382] CHIP:TOO:      }
       disabled: true
 
     - label:
           "Factory reset DUT Perform the device discovery flow checks as covered
           in TC-DD-2.2"
       verification: |
-
+          1. TH starts matter announcement procedure using BLE transport : verify this by sending "./chip-tool discover commissionables" after launching all-clusters-app on DUT
+          2. DUT must find TH and provide onboarding data to for validation.
+          Pass Criteria: DUT is able to report the Onboarding payload as set on TH : Verify this by commissioning DUT with TH by passing "./chip-tool pairing ble-wifi 1 zigbeehome matter123 20202021 3841 --trace_decode 1"
       disabled: true
 
     - label: "Commission DUT to TH2s Fabric"
       verification: |
-
+          To commission DUT to TH2 follow below procedure
+          1../chip-tool  pairing open-commissioning-window 1 1 400 2000 3840  on TH
+          2. manualcode will be provided by TH when we pass above command pass manualcode in TH2 to commission by using "./chip-tool pairing code 2 36199720672" considering 36199720672 as manualcode generated in TH
       disabled: true
 
     - label:
           "TH2 does a non-fabric-filtered read of Fabrics attribute list from
-          DUT and saves the FabricDescriptorStruct values"
+          DUT"
       verification: |
-          Verify that there is only one entry in the 'Fabrics' List Verify that the FabricID is the same as the TH2 Fabric ID
+          ./chip-tool operationalcredentials read fabrics 2 0
+
+          [1655471672.386120][13377:13382] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_003E Attribute 0x0000_0001 DataVersion: 2667297992
+          [1655471672.386213][13377:13382] CHIP:TOO:   Fabrics: 1 entries
+          [1655471672.386291][13377:13382] CHIP:TOO:     [1]: {
+          [1655471672.386339][13377:13382] CHIP:TOO:       RootPublicKey: 04FB421853FB8AE6AEA281845DE7C8689E7C24AD3283A3536E09BA2FAAE88F6EA4C08DC055A965D8FE0A8060A7F9F45E509B7A4C9092FB3D8D2E253B057899F5AB
+          [1655471672.386378][13377:13382] CHIP:TOO:       VendorId: 65521
+          [1655471672.386412][13377:13382] CHIP:TOO:       FabricId: 1
+          [1655471672.386445][13377:13382] CHIP:TOO:       NodeId: 2
+          [1655471672.386675][13377:13382] CHIP:TOO:       Label:
+          [1655471672.386716][13377:13382] CHIP:TOO:       FabricIndex: 2
+          [1655471672.386750][13377:13382] CHIP:TOO:      }
       disabled: true
 
     - label:
-          "TH2 does a non-fabric-filtered read of NOC attribute list from DUT"
+          "TH2 does a non-fabric-filtered read of NOCs attribute list from DUT"
+      PICS: ""
       verification: |
-          Verify that there is only one entry in the 'NOC' List
+          "./chip-tool operationalcredentials read nocs 2 0
+
+          [1655471146.098327][13302:13307] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_003E Attribute 0x0000_0000 DataVersion: 2667297991
+          [1655471146.098416][13302:13307] CHIP:TOO:   NOCs: 1 entries
+          [1655471146.098486][13302:13307] CHIP:TOO:     [1]: {
+          [1655471146.098537][13302:13307] CHIP:TOO:       Noc: 1530010101240201370324130118260480228127260580254D3A37062415012411011824070124080130094104D5FA104FF03F9118BDC2A072D50DB3BED32C47F138439FBF05753D02D01AEC10F350CB77EA22844A83FF0FEF6CFA764F5B1FD48E487F3EC82A201D376F56DCC8370A350128011824020136030402040118300414BD61F9405A7A15EFA38F8B6833AB9027876482E1300514B5AED0B2C2CDBB9D4D0124755B56278B081FD4AD18300B40441AA0EE6ACE43EEA2A52321821D8B260AAFFEBD394C2FD11E83008C5AD2DF5EA58FAFA14A3EF7BAFDE190591298311D7DE6A257819D98D0E9FE239A635684B418
+          [1655471146.098591][13302:13307] CHIP:TOO:       Icac: 1530010100240201370324140018260480228127260580254D3A37062413011824070124080130094104B267483D9981A2C15E7DE8C63298FEB6DC19EAA9AEA41D9D659CD3BBBD25B943B3186716C82B297091D64B1620E8FB2C6FD095F509684E074C5B479E583CE295370A3501290118240260300414B5AED0B2C2CDBB9D4D0124755B56278B081FD4AD3005146EDE812590A5E6E4463798EB06AC3BD5284DFAAE18300B404A48E0B45704A98739C0C656B0F1A4252AEED8E1EBA5FD1032C79A4B26BF8A314EFDD7C835947DEB4B3E9F6D0BF2A561CEE54B45F311773301D4B5CFFF2F76D918
+          [1655471146.098630][13302:13307] CHIP:TOO:       FabricIndex: 2
+          [1655471146.098660][13302:13307] CHIP:TOO:      }"
       disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_DA_1_2.yaml b/src/app/tests/suites/certification/Test_TC_DA_1_2.yaml
index 322265307e05cd..2292c0db1e1c76 100644
--- a/src/app/tests/suites/certification/Test_TC_DA_1_2.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DA_1_2.yaml
@@ -14,7 +14,7 @@
 # Auto-generated scripts for harness use only, please review before automation. The endpoints and cluster names are currently set to default
 
 name:
-    17.1.2. [TC-DA-1.2] Device Attestation Request Validation [DUT -
+    4.1.2. [TC-DA-1.2] Device Attestation Request Validation [DUT -
     Commissionee]
 
 config:
@@ -25,32 +25,407 @@ config:
 tests:
     - label: "TH1 generates 32-byte AttestationNonce"
       verification: |
-
+          Verifu in TH log
+          [1655374218.117635][35023:35028] CHIP:CTL: Sent Attestation request, waiting for the Attestation Information
+          [1655374218.117686][35023:35028] CHIP:DMG: ICR moving to [AwaitingDe]
+          [1655374218.204040][35023:35028] CHIP:DL: HandlePlatformSpecificBLEEvent 16387
+          [1655374218.252180][35023:35026] CHIP:DL: Indication received, conn = 0xffff8003c0c0
+          [1655374218.252405][35023:35028] CHIP:DL: HandlePlatformSpecificBLEEvent 16389
+          [1655374218.352372][35023:35026] CHIP:DL: Indication received, conn = 0xffff8003c0c0
+          [1655374218.352509][35023:35028] CHIP:DL: HandlePlatformSpecificBLEEvent 16389
+          [1655374218.450622][35023:35026] CHIP:DL: Indication received, conn = 0xffff8003c0c0
+          [1655374218.450870][35023:35028] CHIP:DL: HandlePlatformSpecificBLEEvent 16389
+          [1655374218.452138][35023:35028] CHIP:DMG: << from BLE | 224958145 | [Interaction Model  (1) / InvokeCommandResponse (0x09) / Session = 19710 / Exchange = 1302]
+          [1655374218.452241][35023:35028] CHIP:DMG: Header Flags =
+          [1655374218.452300][35023:35028] CHIP:DMG: {
+          [1655374218.452395][35023:35028] CHIP:DMG: }
+          [1655374218.452449][35023:35028] CHIP:DMG:
+          [1655374218.452521][35023:35028] CHIP:DMG: Encrypted Payload (716 bytes) =
+          [1655374218.452579][35023:35028] CHIP:DMG: {
+          [1655374218.452634][35023:35028] CHIP:DMG:     data = 00fe4c00c196680d30c5e98d35a6d844102a8b0067edba80e2adf97e28751f8353657dacb7c9706c2c22add28d18adca15378d16af57f0f4092893cfc5d3e85f6e409f70e39bcb9e0bd3397947e927d20e5bf5173e3def7218d0152cf40e7cb16db615efbd282fd6e84c710bd2c7441228eb5dbbcf0dc76a3eaa0b04655f434d3c8223c7016703b8082c9984c3a91432d12271c87f4d09e90cb6e78d07c81d6359cd5a756f2bace60a7a216896949b536e5583f22db64aeae0279ba2fd279813be383e4324ab63472e3d9877f6c9fa539e577dc50fbcc5a7124a14ea78abdd6ada4ec256a3ee0a242747d636215ffab3c8b4291023eb51b3701939e153912b0f5764479b05e1cf472c350304d1ead872295c80fed3a545530f773e729b6f7bd7d5547de03076a72b8855191beb12d8194477bc9798b6177557cccf3b11b2c1f82cee31d451408359650112394dc2c1592cd2eb1e75881aa340885e65ef9a9905947842574ddcac832d68188b0a3a20fb223258d766692b13a6cde0de34d4f9047046d38ad94caf0a9cc7a786c082d5ae8c62346d69684c6ed5ae958ab68c0685922751ff04d922a838c9d2257a7af6e72af524b459a45ea6311431d30c7de32b3d79581ac119d6e7f63a877b53fda9d69256c5870f2af36f74e08b22e1217a0324b772394a4a596ff237331c623b8d7746077826088dddd2a741f19011cde09f1e897f92ac975fd9a157de0b780f6551b11a50ffe12c781f304dbda9dd75465fb3a8ec52d30f7ddb9179f1b9dfe415ae2d66a53bad67bcf27b3351b8a5cdc9e8b54095c81774007237c8a14a3e2c9cf350616cf5ebf7f6ae5a8c77207924b0e1cddc6c7e77c2a514319947c5988af1dd77325259f496293e53041941d45a1355f56b8036008ab696f7d47d17f9fc4890aa78c2811560b7b4d79a460b7dcd3d9bc3bdd5f72d27bb0060f722aa9c22e7d635895404c832bf2371321d1ababa954482c847fedd0d4676bd188365
+          [1655374218.452884][35023:35028] CHIP:DMG:     buffer_ptr = 281472627984864
+          [1655374218.452941][35023:35028] CHIP:DMG: }
+          [1655374218.452992][35023:35028] CHIP:DMG:
+          [1655374218.453303][35023:35028] CHIP:DMG: Attestation Elements (585 bytes) =
+          [1655374218.453366][35023:35028] CHIP:DMG: {
+          [1655374218.453431][35023:35028] CHIP:DMG:     Certification Declaration =
+          [1655374218.453483][35023:35028] CHIP:DMG:     {
+          [1655374218.455342][35023:35028] CHIP:DMG:         Format Version = 1
+          [1655374218.455398][35023:35028] CHIP:DMG:         Vendor Id = 65521
+          [1655374218.455438][35023:35028] CHIP:DMG:         Product Ids =
+          [1655374218.455474][35023:35028] CHIP:DMG:         {
+          [1655374218.455512][35023:35028] CHIP:DMG:             Product Id = 32768
+          [1655374218.455552][35023:35028] CHIP:DMG:             Product Id = 32769
+          [1655374218.455590][35023:35028] CHIP:DMG:             Product Id = 32770
+          [1655374218.455628][35023:35028] CHIP:DMG:             Product Id = 32771
+          [1655374218.455666][35023:35028] CHIP:DMG:             Product Id = 32772
+          [1655374218.455704][35023:35028] CHIP:DMG:             Product Id = 32773
+          [1655374218.455742][35023:35028] CHIP:DMG:             Product Id = 32774
+          [1655374218.455780][35023:35028] CHIP:DMG:             Product Id = 32775
+          [1655374218.455818][35023:35028] CHIP:DMG:             Product Id = 32776
+          [1655374218.455855][35023:35028] CHIP:DMG:             Product Id = 32777
+          [1655374218.455893][35023:35028] CHIP:DMG:             Product Id = 32778
+          [1655374218.455931][35023:35028] CHIP:DMG:             Product Id = 32779
+          [1655374218.455969][35023:35028] CHIP:DMG:             Product Id = 32780
+          [1655374218.456007][35023:35028] CHIP:DMG:             Product Id = 32781
+          [1655374218.456045][35023:35028] CHIP:DMG:             Product Id = 32782
+          [1655374218.456082][35023:35028] CHIP:DMG:             Product Id = 32783
+          [1655374218.456120][35023:35028] CHIP:DMG:             Product Id = 32784
+          [1655374218.456158][35023:35028] CHIP:DMG:             Product Id = 32785
+          [1655374218.456196][35023:35028] CHIP:DMG:             Product Id = 32786
+          [1655374218.456234][35023:35028] CHIP:DMG:             Product Id = 32787
+          [1655374218.456271][35023:35028] CHIP:DMG:             Product Id = 32788
+          [1655374218.456309][35023:35028] CHIP:DMG:             Product Id = 32789
+          [1655374218.456347][35023:35028] CHIP:DMG:             Product Id = 32790
+          [1655374218.456385][35023:35028] CHIP:DMG:             Product Id = 32791
+          [1655374218.456423][35023:35028] CHIP:DMG:             Product Id = 32792
+          [1655374218.456461][35023:35028] CHIP:DMG:             Product Id = 32793
+          [1655374218.456498][35023:35028] CHIP:DMG:             Product Id = 32794
+          [1655374218.456536][35023:35028] CHIP:DMG:             Product Id = 32795
+          [1655374218.456573][35023:35028] CHIP:DMG:             Product Id = 32796
+          [1655374218.456611][35023:35028] CHIP:DMG:             Product Id = 32797
+          [1655374218.456649][35023:35028] CHIP:DMG:             Product Id = 32798
+          [1655374218.456687][35023:35028] CHIP:DMG:             Product Id = 32799
+          [1655374218.456724][35023:35028] CHIP:DMG:             Product Id = 32800
+          [1655374218.456761][35023:35028] CHIP:DMG:             Product Id = 32801
+          [1655374218.456799][35023:35028] CHIP:DMG:             Product Id = 32802
+          [1655374218.456836][35023:35028] CHIP:DMG:             Product Id = 32803
+          [1655374218.456874][35023:35028] CHIP:DMG:             Product Id = 32804
+          [1655374218.456912][35023:35028] CHIP:DMG:             Product Id = 32805
+          [1655374218.456949][35023:35028] CHIP:DMG:             Product Id = 32806
+          [1655374218.456987][35023:35028] CHIP:DMG:             Product Id = 32807
+          [1655374218.457024][35023:35028] CHIP:DMG:             Product Id = 32808
+          [1655374218.457061][35023:35028] CHIP:DMG:             Product Id = 32809
+          [1655374218.457099][35023:35028] CHIP:DMG:             Product Id = 32810
+          [1655374218.457138][35023:35028] CHIP:DMG:             Product Id = 32811
+          [1655374218.457175][35023:35028] CHIP:DMG:             Product Id = 32812
+          [1655374218.457212][35023:35028] CHIP:DMG:             Product Id = 32813
+          [1655374218.457250][35023:35028] CHIP:DMG:             Product Id = 32814
+          [1655374218.457288][35023:35028] CHIP:DMG:             Product Id = 32815
+          [1655374218.457326][35023:35028] CHIP:DMG:             Product Id = 32816
+          [1655374218.457363][35023:35028] CHIP:DMG:             Product Id = 32817
+          [1655374218.457401][35023:35028] CHIP:DMG:             Product Id = 32818
+          [1655374218.457439][35023:35028] CHIP:DMG:             Product Id = 32819
+          [1655374218.457476][35023:35028] CHIP:DMG:             Product Id = 32820
+          [1655374218.457514][35023:35028] CHIP:DMG:             Product Id = 32821
+          [1655374218.457552][35023:35028] CHIP:DMG:             Product Id = 32822
+          [1655374218.457590][35023:35028] CHIP:DMG:             Product Id = 32823
+          [1655374218.457627][35023:35028] CHIP:DMG:             Product Id = 32824
+          [1655374218.457665][35023:35028] CHIP:DMG:             Product Id = 32825
+          [1655374218.457702][35023:35028] CHIP:DMG:             Product Id = 32826
+          [1655374218.457740][35023:35028] CHIP:DMG:             Product Id = 32827
+          [1655374218.457777][35023:35028] CHIP:DMG:             Product Id = 32828
+          [1655374218.457833][35023:35028] CHIP:DMG:             Product Id = 32829
+          [1655374218.457874][35023:35028] CHIP:DMG:             Product Id = 32830
+          [1655374218.457912][35023:35028] CHIP:DMG:             Product Id = 32831
+          [1655374218.457950][35023:35028] CHIP:DMG:             Product Id = 32832
+          [1655374218.457987][35023:35028] CHIP:DMG:             Product Id = 32833
+          [1655374218.458026][35023:35028] CHIP:DMG:             Product Id = 32834
+          [1655374218.458063][35023:35028] CHIP:DMG:             Product Id = 32835
+          [1655374218.458101][35023:35028] CHIP:DMG:             Product Id = 32836
+          [1655374218.458139][35023:35028] CHIP:DMG:             Product Id = 32837
+          [1655374218.458177][35023:35028] CHIP:DMG:             Product Id = 32838
+          [1655374218.458215][35023:35028] CHIP:DMG:             Product Id = 32839
+          [1655374218.458253][35023:35028] CHIP:DMG:             Product Id = 32840
+          [1655374218.458291][35023:35028] CHIP:DMG:             Product Id = 32841
+          [1655374218.458328][35023:35028] CHIP:DMG:             Product Id = 32842
+          [1655374218.458366][35023:35028] CHIP:DMG:             Product Id = 32843
+          [1655374218.458404][35023:35028] CHIP:DMG:             Product Id = 32844
+          [1655374218.458441][35023:35028] CHIP:DMG:             Product Id = 32845
+          [1655374218.458480][35023:35028] CHIP:DMG:             Product Id = 32846
+          [1655374218.458517][35023:35028] CHIP:DMG:             Product Id = 32847
+          [1655374218.458555][35023:35028] CHIP:DMG:             Product Id = 32848
+          [1655374218.458592][35023:35028] CHIP:DMG:             Product Id = 32849
+          [1655374218.458630][35023:35028] CHIP:DMG:             Product Id = 32850
+          [1655374218.458667][35023:35028] CHIP:DMG:             Product Id = 32851
+          [1655374218.458706][35023:35028] CHIP:DMG:             Product Id = 32852
+          [1655374218.458743][35023:35028] CHIP:DMG:             Product Id = 32853
+          [1655374218.458781][35023:35028] CHIP:DMG:             Product Id = 32854
+          [1655374218.458818][35023:35028] CHIP:DMG:             Product Id = 32855
+          [1655374218.458856][35023:35028] CHIP:DMG:             Product Id = 32856
+          [1655374218.458893][35023:35028] CHIP:DMG:             Product Id = 32857
+          [1655374218.458932][35023:35028] CHIP:DMG:             Product Id = 32858
+          [1655374218.458969][35023:35028] CHIP:DMG:             Product Id = 32859
+          [1655374218.459007][35023:35028] CHIP:DMG:             Product Id = 32860
+          [1655374218.459045][35023:35028] CHIP:DMG:             Product Id = 32861
+          [1655374218.459082][35023:35028] CHIP:DMG:             Product Id = 32862
+          [1655374218.459120][35023:35028] CHIP:DMG:             Product Id = 32863
+          [1655374218.459159][35023:35028] CHIP:DMG:             Product Id = 32864
+          [1655374218.459196][35023:35028] CHIP:DMG:             Product Id = 32865
+          [1655374218.459234][35023:35028] CHIP:DMG:             Product Id = 32866
+          [1655374218.459271][35023:35028] CHIP:DMG:             Product Id = 32867
+          [1655374218.459309][35023:35028] CHIP:DMG:         }
+          [1655374218.459347][35023:35028] CHIP:DMG:         Device Type Id = 22
+          [1655374218.459390][35023:35028] CHIP:DMG:         Certificate Id (19) = ZIG20142ZB330003-24
+          [1655374218.459430][35023:35028] CHIP:DMG:         Security Level = 0
+          [1655374218.459470][35023:35028] CHIP:DMG:         Security Information = 0
+          [1655374218.459508][35023:35028] CHIP:DMG:         Version Number = 9876
+          [1655374218.459546][35023:35028] CHIP:DMG:         Certification Type = 0
+          [1655374218.459584][35023:35028] CHIP:DMG:     }
+          [1655374218.459627][35023:35028] CHIP:DMG:     Attestation Nonce (32) = 762B6B9DA08F7FC63BB693E38634EC6F87CEFF28AB1554A16AD43DCEC24C2466
+          [1655374218.459664][35023:35028] CHIP:DMG:     Timestamp = 0
+          [1655374218.459699][35023:35028] CHIP:DMG: }
       disabled: true
 
     - label:
           "TH1 sends AttestationRequest Command with a random 32 bytes
-          AttestationNonce to the DUT."
+          AttestationNonce` to the DUT."
       verification: |
+          Verify in TH log
 
+          [1655374218.459627][35023:35028] CHIP:DMG:     Attestation Nonce (32) = 762B6B9DA08F7FC63BB693E38634EC6F87CEFF28AB1554A16AD43DCEC24C2466
+          [1655374218.459664][35023:35028] CHIP:DMG:     Timestamp = 0
+          [1655374218.459699][35023:35028] CHIP:DMG: }
       disabled: true
 
     - label:
-          "TH1 sends CertificateChainRequest Command to DUT for both PAI and DAC"
+          "TH1 sends CertificateChainRequest Command with CertificateType field
+          set to DACCertificate (1) to DUT to obtain DAC"
+      verification: |
+          Verify in TH log:
+
+          [1655374217.766326][35023:35028] CHIP:DMG: DAC/PAI (463) =
+          [1655374217.766373][35023:35028] CHIP:DMG: {
+          -----BEGIN CERTIFICATE-----
+          MIIByzCCAXGgAwIBAgIIVq2CIq2UW2QwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+          TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjAyMDUw
+          MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowPTElMCMGA1UEAwwcTWF0dGVyIERldiBQ
+          QUkgMHhGRkYxIG5vIFBJRDEUMBIGCisGAQQBgqJ8AgEMBEZGRjEwWTATBgcqhkjO
+          PQIBBggqhkjOPQMBBwNCAARBmpMVwhc+DIyHbQPM/JRIUmR/f+xeUIL0BZko7KiU
+          xZQVEwmsYx5MsDOSr2hLC6+35ls7gWLC9Sv5MbjneqqCo2YwZDASBgNVHRMBAf8E
+          CDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUY1QOR/ZLHDjROISk
+          YtFsGV2P+zwwHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGhcX4wCgYIKoZI
+          zj0EAwIDSAAwRQIhALLvJ/Sa6bUPuR7qyUxNC9u415KcbLiPrOUpNo0SBUwMAiBl
+          Xckrhr2QmIKmxiF3uCXX0F7b58Ivn+pxIg5+pwP4kQ==
+          -----END CERTIFICATE-----
+      disabled: true
+
+    - label: "TH1 saves DAC certificate"
       verification: |
-          Verify that DUT sends CertificateChainResponse command with the Certificate Information to TH1
+          See above
       disabled: true
 
-    - label: "TH1 saves DAC and the PAI certificates for future use"
+    - label:
+          "TH1 sends CertificateChainRequest Command with CertificateType field
+          set to PAICertificate (2) to DUT to obtain DAC"
       verification: |
+          Verify in TH log:
 
+          [1655374218.109922][35023:35028] CHIP:DMG: DAC/PAI (491) =
+          [1655374218.110041][35023:35028] CHIP:DMG: {
+          -----BEGIN CERTIFICATE-----
+          MIIB5zCCAY6gAwIBAgIIac3xDenlTtEwCgYIKoZIzj0EAwIwPTElMCMGA1UEAwwc
+          TWF0dGVyIERldiBQQUkgMHhGRkYxIG5vIFBJRDEUMBIGCisGAQQBgqJ8AgEMBEZG
+          RjEwIBcNMjIwMjA1MDAwMDAwWhgPOTk5OTEyMzEyMzU5NTlaMFMxJTAjBgNVBAMM
+          HE1hdHRlciBEZXYgREFDIDB4RkZGMS8weDgwMDExFDASBgorBgEEAYKifAIBDARG
+          RkYxMRQwEgYKKwYBBAGConwCAgwEODAwMTBZMBMGByqGSM49AgEGCCqGSM49AwEH
+          A0IABEY6xpNCkQoOVYj8b/Vrtj5i7M7LFI99TrA+5VJgFBV2fRalxmP3k+SRIyYL
+          gpenzX58/HsxaznZjpDSk3dzjoKjYDBeMAwGA1UdEwEB/wQCMAAwDgYDVR0PAQH/
+          BAQDAgeAMB0GA1UdDgQWBBSI3eezADgpMs/3NMBGJIEPRBaKbzAfBgNVHSMEGDAW
+          gBRjVA5H9kscONE4hKRi0WwZXY/7PDAKBggqhkjOPQQDAgNHADBEAiABJ6J7S0Rh
+          DuL83E0reIVWNmC8D3bxchntagjfsrPBzQIga1ngr0Xz6yqFuRnTVzFSjGAoxBUj
+          lUXhCOTlTnCXE1M=
+          -----END CERTIFICATE-----
+      disabled: true
+
+    - label: "TH1 saves PAI certificate"
+      verification: |
+          See above
+      disabled: true
+
+    - label:
+          "TH1 Reads the VendorID attribute of the Basic Information cluster and
+          saves it as basic_info_vendor_id"
+      verification: |
+          ./chip-tool basic read vendor-id 1 0
+          [1654068802.514300][10990:10995] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0028 Attribute 0x0000_0002 DataVersion: 2079473956
+          [1654068802.514357][10990:10995] CHIP:TOO:   VendorID: 65521
+          [1654068802.514447][10990:10995] CHIP:EM: Sending Standalone Ack for MessageCounter:5573281 on exchange 17510i
+      disabled: true
+
+    - label:
+          "TH1 Reads the ProductID attribute of the Basic Information cluster
+          and saves it as basic_info_product_id"
+      verification: |
+          ./chip-tool basic read product-id 1 0
+
+          [1654068987.385768][11050:11055] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0028 Attribute 0x0000_0004 DataVersion: 2079473956
+          [1654068987.385820][11050:11055] CHIP:TOO:   ProductID: 32769
+          [1654068987.385908][11050:11055] CHIP:EM: Sending Standalone Ack for MessageCounter:7653435 on exchange 20545i
       disabled: true
 
     - label:
           "Extract the attestation_elements_message structure fields from the
           AttestationResponse Command received by TH1 from DUT"
       verification: |
+          Verify in TH log
 
+          [1655374218.453303][35023:35028] CHIP:DMG: Attestation Elements (585 bytes) =
+          [1655374218.453366][35023:35028] CHIP:DMG: {
+          [1655374218.453431][35023:35028] CHIP:DMG:     Certification Declaration =
+          [1655374218.453483][35023:35028] CHIP:DMG:     {
+          [1655374218.455342][35023:35028] CHIP:DMG:         Format Version = 1
+          [1655374218.455398][35023:35028] CHIP:DMG:         Vendor Id = 65521
+          [1655374218.455438][35023:35028] CHIP:DMG:         Product Ids =
+          [1655374218.455474][35023:35028] CHIP:DMG:         {
+          [1655374218.455512][35023:35028] CHIP:DMG:             Product Id = 32768
+          [1655374218.455552][35023:35028] CHIP:DMG:             Product Id = 32769
+          [1655374218.455590][35023:35028] CHIP:DMG:             Product Id = 32770
+          [1655374218.455628][35023:35028] CHIP:DMG:             Product Id = 32771
+          [1655374218.455666][35023:35028] CHIP:DMG:             Product Id = 32772
+          [1655374218.455704][35023:35028] CHIP:DMG:             Product Id = 32773
+          [1655374218.455742][35023:35028] CHIP:DMG:             Product Id = 32774
+          [1655374218.455780][35023:35028] CHIP:DMG:             Product Id = 32775
+          [1655374218.455818][35023:35028] CHIP:DMG:             Product Id = 32776
+          [1655374218.455855][35023:35028] CHIP:DMG:             Product Id = 32777
+          [1655374218.455893][35023:35028] CHIP:DMG:             Product Id = 32778
+          [1655374218.455931][35023:35028] CHIP:DMG:             Product Id = 32779
+          [1655374218.455969][35023:35028] CHIP:DMG:             Product Id = 32780
+          [1655374218.456007][35023:35028] CHIP:DMG:             Product Id = 32781
+          [1655374218.456045][35023:35028] CHIP:DMG:             Product Id = 32782
+          [1655374218.456082][35023:35028] CHIP:DMG:             Product Id = 32783
+          [1655374218.456120][35023:35028] CHIP:DMG:             Product Id = 32784
+          [1655374218.456158][35023:35028] CHIP:DMG:             Product Id = 32785
+          [1655374218.456196][35023:35028] CHIP:DMG:             Product Id = 32786
+          [1655374218.456234][35023:35028] CHIP:DMG:             Product Id = 32787
+          [1655374218.456271][35023:35028] CHIP:DMG:             Product Id = 32788
+          [1655374218.456309][35023:35028] CHIP:DMG:             Product Id = 32789
+          [1655374218.456347][35023:35028] CHIP:DMG:             Product Id = 32790
+          [1655374218.456385][35023:35028] CHIP:DMG:             Product Id = 32791
+          [1655374218.456423][35023:35028] CHIP:DMG:             Product Id = 32792
+          [1655374218.456461][35023:35028] CHIP:DMG:             Product Id = 32793
+          [1655374218.456498][35023:35028] CHIP:DMG:             Product Id = 32794
+          [1655374218.456536][35023:35028] CHIP:DMG:             Product Id = 32795
+          [1655374218.456573][35023:35028] CHIP:DMG:             Product Id = 32796
+          [1655374218.456611][35023:35028] CHIP:DMG:             Product Id = 32797
+          [1655374218.456649][35023:35028] CHIP:DMG:             Product Id = 32798
+          [1655374218.456687][35023:35028] CHIP:DMG:             Product Id = 32799
+          [1655374218.456724][35023:35028] CHIP:DMG:             Product Id = 32800
+          [1655374218.456761][35023:35028] CHIP:DMG:             Product Id = 32801
+          [1655374218.456799][35023:35028] CHIP:DMG:             Product Id = 32802
+          [1655374218.456836][35023:35028] CHIP:DMG:             Product Id = 32803
+          [1655374218.456874][35023:35028] CHIP:DMG:             Product Id = 32804
+          [1655374218.456912][35023:35028] CHIP:DMG:             Product Id = 32805
+          [1655374218.456949][35023:35028] CHIP:DMG:             Product Id = 32806
+          [1655374218.456987][35023:35028] CHIP:DMG:             Product Id = 32807
+          [1655374218.457024][35023:35028] CHIP:DMG:             Product Id = 32808
+          [1655374218.457061][35023:35028] CHIP:DMG:             Product Id = 32809
+          [1655374218.457099][35023:35028] CHIP:DMG:             Product Id = 32810
+          [1655374218.457138][35023:35028] CHIP:DMG:             Product Id = 32811
+          [1655374218.457175][35023:35028] CHIP:DMG:             Product Id = 32812
+          [1655374218.457212][35023:35028] CHIP:DMG:             Product Id = 32813
+          [1655374218.457250][35023:35028] CHIP:DMG:             Product Id = 32814
+          [1655374218.457288][35023:35028] CHIP:DMG:             Product Id = 32815
+          [1655374218.457326][35023:35028] CHIP:DMG:             Product Id = 32816
+          [1655374218.457363][35023:35028] CHIP:DMG:             Product Id = 32817
+          [1655374218.457401][35023:35028] CHIP:DMG:             Product Id = 32818
+          [1655374218.457439][35023:35028] CHIP:DMG:             Product Id = 32819
+          [1655374218.457476][35023:35028] CHIP:DMG:             Product Id = 32820
+          [1655374218.457514][35023:35028] CHIP:DMG:             Product Id = 32821
+          [1655374218.457552][35023:35028] CHIP:DMG:             Product Id = 32822
+          [1655374218.457590][35023:35028] CHIP:DMG:             Product Id = 32823
+          [1655374218.457627][35023:35028] CHIP:DMG:             Product Id = 32824
+          [1655374218.457665][35023:35028] CHIP:DMG:             Product Id = 32825
+          [1655374218.457702][35023:35028] CHIP:DMG:             Product Id = 32826
+          [1655374218.457740][35023:35028] CHIP:DMG:             Product Id = 32827
+          [1655374218.457777][35023:35028] CHIP:DMG:             Product Id = 32828
+          [1655374218.457833][35023:35028] CHIP:DMG:             Product Id = 32829
+          [1655374218.457874][35023:35028] CHIP:DMG:             Product Id = 32830
+          [1655374218.457912][35023:35028] CHIP:DMG:             Product Id = 32831
+          [1655374218.457950][35023:35028] CHIP:DMG:             Product Id = 32832
+          [1655374218.457987][35023:35028] CHIP:DMG:             Product Id = 32833
+          [1655374218.458026][35023:35028] CHIP:DMG:             Product Id = 32834
+          [1655374218.458063][35023:35028] CHIP:DMG:             Product Id = 32835
+          [1655374218.458101][35023:35028] CHIP:DMG:             Product Id = 32836
+          [1655374218.458139][35023:35028] CHIP:DMG:             Product Id = 32837
+          [1655374218.458177][35023:35028] CHIP:DMG:             Product Id = 32838
+          [1655374218.458215][35023:35028] CHIP:DMG:             Product Id = 32839
+          [1655374218.458253][35023:35028] CHIP:DMG:             Product Id = 32840
+          [1655374218.458291][35023:35028] CHIP:DMG:             Product Id = 32841
+          [1655374218.458328][35023:35028] CHIP:DMG:             Product Id = 32842
+          [1655374218.458366][35023:35028] CHIP:DMG:             Product Id = 32843
+          [1655374218.458404][35023:35028] CHIP:DMG:             Product Id = 32844
+          [1655374218.458441][35023:35028] CHIP:DMG:             Product Id = 32845
+          [1655374218.458480][35023:35028] CHIP:DMG:             Product Id = 32846
+          [1655374218.458517][35023:35028] CHIP:DMG:             Product Id = 32847
+          [1655374218.458555][35023:35028] CHIP:DMG:             Product Id = 32848
+          [1655374218.458592][35023:35028] CHIP:DMG:             Product Id = 32849
+          [1655374218.458630][35023:35028] CHIP:DMG:             Product Id = 32850
+          [1655374218.458667][35023:35028] CHIP:DMG:             Product Id = 32851
+          [1655374218.458706][35023:35028] CHIP:DMG:             Product Id = 32852
+          [1655374218.458743][35023:35028] CHIP:DMG:             Product Id = 32853
+          [1655374218.458781][35023:35028] CHIP:DMG:             Product Id = 32854
+          [1655374218.458818][35023:35028] CHIP:DMG:             Product Id = 32855
+          [1655374218.458856][35023:35028] CHIP:DMG:             Product Id = 32856
+          [1655374218.458893][35023:35028] CHIP:DMG:             Product Id = 32857
+          [1655374218.458932][35023:35028] CHIP:DMG:             Product Id = 32858
+          [1655374218.458969][35023:35028] CHIP:DMG:             Product Id = 32859
+          [1655374218.459007][35023:35028] CHIP:DMG:             Product Id = 32860
+          [1655374218.459045][35023:35028] CHIP:DMG:             Product Id = 32861
+          [1655374218.459082][35023:35028] CHIP:DMG:             Product Id = 32862
+          [1655374218.459120][35023:35028] CHIP:DMG:             Product Id = 32863
+          [1655374218.459159][35023:35028] CHIP:DMG:             Product Id = 32864
+          [1655374218.459196][35023:35028] CHIP:DMG:             Product Id = 32865
+          [1655374218.459234][35023:35028] CHIP:DMG:             Product Id = 32866
+          [1655374218.459271][35023:35028] CHIP:DMG:             Product Id = 32867
+          [1655374218.459309][35023:35028] CHIP:DMG:         }
+          [1655374218.459347][35023:35028] CHIP:DMG:         Device Type Id = 22
+          [1655374218.459390][35023:35028] CHIP:DMG:         Certificate Id (19) = ZIG20142ZB330003-24
+          [1655374218.459430][35023:35028] CHIP:DMG:         Security Level = 0
+          [1655374218.459470][35023:35028] CHIP:DMG:         Security Information = 0
+          [1655374218.459508][35023:35028] CHIP:DMG:         Version Number = 9876
+          [1655374218.459546][35023:35028] CHIP:DMG:         Certification Type = 0
+          [1655374218.459584][35023:35028] CHIP:DMG:     }
+          [1655374218.459627][35023:35028] CHIP:DMG:     Attestation Nonce (32) = 762B6B9DA08F7FC63BB693E38634EC6F87CEFF28AB1554A16AD43DCEC24C2466
+          [1655374218.459664][35023:35028] CHIP:DMG:     Timestamp = 0
+          [1655374218.459699][35023:35028] CHIP:DMG: }
+          [1655374218.459732][35023:35028] CHIP:DMG:
+          [1655374218.459776][35023:35028] CHIP:DMG:
+          [1655374218.459846][35023:35028] CHIP:DMG: Additional Fields =
+          [1655374218.459884][35023:35028] CHIP:DMG: {
+          [1655374218.459924][35023:35028] CHIP:DMG:     peer_address = BLE
+          [1655374218.459960][35023:35028] CHIP:DMG: }
+          [1655374218.459993][35023:35028] CHIP:DMG:
+          [1655374218.460045][35023:35028] CHIP:EM: Received message of type 0x9 with protocolId (0, 1) and MessageCounter:224958145 on exchange 1302i
+          [1655374218.460090][35023:35028] CHIP:EM: Found matching exchange: 1302i, Delegate: 0xffff74005ab0
+          [1655374218.460157][35023:35028] CHIP:DMG: ICR moving to [ResponseRe]
+          [1655374218.460220][35023:35028] CHIP:DMG: InvokeResponseMessage =
+          [1655374218.460260][35023:35028] CHIP:DMG: {
+          [1655374218.460298][35023:35028] CHIP:DMG: 	suppressResponse = false,
+          [1655374218.460338][35023:35028] CHIP:DMG: 	InvokeResponseIBs =
+          [1655374218.460390][35023:35028] CHIP:DMG: 	[
+          [1655374218.460430][35023:35028] CHIP:DMG: 		InvokeResponseIB =
+          [1655374218.460487][35023:35028] CHIP:DMG: 		{
+          [1655374218.460530][35023:35028] CHIP:DMG: 			CommandDataIB =
+          [1655374218.460580][35023:35028] CHIP:DMG: 			{
+          [1655374218.460628][35023:35028] CHIP:DMG: 				CommandPathIB =
+          [1655374218.460686][35023:35028] CHIP:DMG: 				{
+          [1655374218.460745][35023:35028] CHIP:DMG: 					EndpointId = 0x0,
+          [1655374218.460802][35023:35028] CHIP:DMG: 					ClusterId = 0x3e,
+          [1655374218.460852][35023:35028] CHIP:DMG: 					CommandId = 0x1,
+          [1655374218.460906][35023:35028] CHIP:DMG: 				},
+          [1655374218.460962][35023:35028] CHIP:DMG:
+          [1655374218.461010][35023:35028] CHIP:DMG: 				CommandFields =
+          [1655374218.461068][35023:35028] CHIP:DMG: 				{
+          [1655374218.461123][35023:35028] CHIP:DMG: 					0x0 = [
+          [1655374218.461351][35023:35028] CHIP:DMG: 						0x15, 0x31, 0x1, 0x1d, 0x2, 0x30, 0x82, 0x2, 0x19, 0x6, 0x9, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0xd, 0x1, 0x7, 0x2, 0xa0, 0x82, 0x2, 0xa, 0x30, 0x82, 0x2, 0x6, 0x2, 0x1, 0x3, 0x31, 0xd, 0x30, 0xb, 0x6, 0x9, 0x60, 0x86, 0x48, 0x1, 0x65, 0x3, 0x4, 0x2, 0x1, 0x30, 0x82, 0x1, 0x71, 0x6, 0x9, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0xd, 0x1, 0x7, 0x1, 0xa0, 0x82, 0x1, 0x62, 0x4, 0x82, 0x1, 0x5e, 0x15, 0x24, 0x0, 0x1, 0x25, 0x1, 0xf1, 0xff, 0x36, 0x2, 0x5, 0x0, 0x80, 0x5, 0x1, 0x80, 0x5, 0x2, 0x80, 0x5, 0x3, 0x80, 0x5, 0x4, 0x80, 0x5, 0x5, 0x80, 0x5, 0x6, 0x80, 0x5, 0x7, 0x80, 0x5, 0x8, 0x80, 0x5, 0x9, 0x80, 0x5, 0xa, 0x80, 0x5, 0xb, 0x80, 0x5, 0xc, 0x80, 0x5, 0xd, 0x80, 0x5, 0xe, 0x80, 0x5, 0xf, 0x80, 0x5, 0x10, 0x80, 0x5, 0x11, 0x80, 0x5, 0x12, 0x80, 0x5, 0x13, 0x80, 0x5, 0x14, 0x80, 0x5, 0x15, 0x80, 0x5, 0x16, 0x80, 0x5, 0x17, 0x80, 0x5, 0x18, 0x80, 0x5, 0x19, 0x80, 0x5, 0x1a, 0x80, 0x5, 0x1b, 0x80, 0x5, 0x1c, 0x80, 0x5, 0x1d, 0x80, 0x5, 0x1e, 0x80, 0x5, 0x1f, 0x80, 0x5, 0x20, 0x80, 0x5, 0x21, 0x80, 0x5, 0x22, 0x80, 0x5, 0x23, 0x80, 0x5, 0x24, 0x80, 0x5, 0x25, 0x80, 0x5, 0x26, 0x80, 0x5, 0x27, 0x80, 0x5, 0x28, 0x80, 0x5, 0x29, 0x80, 0x5, 0x2a, 0x80, 0x5, 0x2b, 0x80, 0x5, 0x2c, 0x80, 0x5, 0x2d, 0x80, 0x5, 0x2e, 0x80, 0x5, 0x2f, 0x80, 0x5, 0x30, 0x80, 0x5, 0x31, 0x80, 0x5, 0x32, 0x80, 0x5, 0x33, 0x80, 0x5, 0x34, 0x80, 0x5, 0x35, 0x80, 0x5, 0x36, 0x80, 0x5, 0x37, 0x80, 0x5, 0x38, 0x80, 0x5, 0x39, 0x80, 0x5, 0x3a, 0x80, 0x5, 0x3b, 0x80, 0x5, 0x3c, 0x80, 0x5, 0x3d, 0x80, 0x5, 0x3e, 0x80, 0x5, 0x3f, 0x80, 0x5, 0x40, 0x80, 0x5, 0x41, 0x80, 0x5, 0x42, 0x80, 0x5, 0x43, 0x80, 0x5, 0x44, 0x80, 0x5, 0x45, 0x80, 0x5, 0x46, 0x80, 0x5, 0x47, 0x80, 0x5, 0x48, 0x80, 0x5, 0x49, 0x80, 0x5, 0x4a, 0x80, 0x5, 0x
+          [1655374218.461469][35023:35028] CHIP:DMG: 				]
+          [1655374218.461523][35023:35028] CHIP:DMG: 					0x1 = [
+          [1655374218.461611][35023:35028] CHIP:DMG: 						0xd6, 0x91, 0x3d, 0x0, 0x37, 0xd3, 0x23, 0x11, 0xa9, 0xe6, 0x23, 0xe3, 0xb0, 0x80, 0x27, 0x71, 0xc2, 0xb1, 0xdc, 0xe1, 0xb8, 0x95, 0x7c, 0x88, 0x92, 0xc6, 0x84, 0xe4, 0x21, 0xa2, 0x87, 0x22, 0x6d, 0xeb, 0x42, 0x82, 0x67, 0xe0, 0x9c, 0x17, 0xb1, 0x1c, 0x1, 0xff, 0x8b, 0xff, 0x23, 0x47, 0xc4, 0xe7, 0x6, 0x1d, 0x8f, 0x1e, 0x26, 0x8e, 0xad, 0xbd, 0xc9, 0x9e, 0x23, 0x88, 0xdb, 0xb6,
+          [1655374218.461681][35023:35028] CHIP:DMG: 				]
+          [1655374218.461733][35023:35028] CHIP:DMG: 				},
+          [1655374218.461783][35023:35028] CHIP:DMG: 			},
+          [1655374218.461855][35023:35028] CHIP:DMG:
+          [1655374218.461900][35023:35028] CHIP:DMG: 		},
+          [1655374218.461951][35023:35028] CHIP:DMG:
+          [1655374218.461990][35023:35028] CHIP:DMG: 	],
+          [1655374218.462041][35023:35028] CHIP:DMG:
+          [1655374218.462080][35023:35028] CHIP:DMG: 	InteractionModelRevision = 1
+          [1655374218.462118][35023:35028] CHIP:DMG: },
+          [1655374218.462220][35023:35028] CHIP:DMG: Received Command Response Data, Endpoint=0 Cluster=0x0000_003E Command=0x0000_0001
+          [1655374218.462275][35023:35028] CHIP:CTL: Received Attestation Information from the device
+          [1655374218.462320][35023:35028] CHIP:CTL: Successfully finished commissioning step 'SendAttestationRequest'
+          [
       disabled: true
 
     - label: "Read the attestation_elements_message structure fields"
@@ -62,12 +437,79 @@ tests:
           "TH1 sends AttestationRequestCommand with Invalid AttestationNonce
           (size> 32 bytes) as the field to the DUT."
       verification: |
-          Verify that the DUT reports an error
+          ./chip-tool operationalcredentials attestation-request   762B6B9DA08F7FC63BB693E38634EC6F87CEFF28AB1554A16AD43DCEC24C2466A16AD43DCEC24C2466   1 0
+
+          [1655984597.150863][23339:23344] CHIP:DMG: InvokeResponseMessage =
+          [1655984597.150923][23339:23344] CHIP:DMG: {
+          [1655984597.150981][23339:23344] CHIP:DMG: 	suppressResponse = false,
+          [1655984597.151042][23339:23344] CHIP:DMG: 	InvokeResponseIBs =
+          [1655984597.151117][23339:23344] CHIP:DMG: 	[
+          [1655984597.151177][23339:23344] CHIP:DMG: 		InvokeResponseIB =
+          [1655984597.151255][23339:23344] CHIP:DMG: 		{
+          [1655984597.151318][23339:23344] CHIP:DMG: 			CommandStatusIB =
+          [1655984597.151404][23339:23344] CHIP:DMG: 			{
+          [1655984597.151475][23339:23344] CHIP:DMG: 				CommandPathIB =
+          [1655984597.151561][23339:23344] CHIP:DMG: 				{
+          [1655984597.151644][23339:23344] CHIP:DMG: 					EndpointId = 0x0,
+          [1655984597.151729][23339:23344] CHIP:DMG: 					ClusterId = 0x3e,
+          [1655984597.151812][23339:23344] CHIP:DMG: 					CommandId = 0x0,
+          [1655984597.151890][23339:23344] CHIP:DMG: 				},
+          [1655984597.151978][23339:23344] CHIP:DMG:
+          [1655984597.152050][23339:23344] CHIP:DMG: 				StatusIB =
+          [1655984597.152127][23339:23344] CHIP:DMG: 				{
+          [1655984597.152216][23339:23344] CHIP:DMG: 					status = 0x85 (INVALID_COMMAND),
+          [1655984597.152297][23339:23344] CHIP:DMG: 				},
+          [1655984597.152377][23339:23344] CHIP:DMG:
+          [1655984597.152449][23339:23344] CHIP:DMG: 			},
+          [1655984597.152527][23339:23344] CHIP:DMG:
+          [1655984597.152593][23339:23344] CHIP:DMG: 		},
+          [1655984597.152666][23339:23344] CHIP:DMG:
+          [1655984597.152723][23339:23344] CHIP:DMG: 	],
+          [1655984597.152794][23339:23344] CHIP:DMG:
+          [1655984597.152852][23339:23344] CHIP:DMG: 	InteractionModelRevision = 1
+          [1655984597.152908][23339:23344] CHIP:DMG: },
+          [1655984597.153037][23339:23344] CHIP:DMG: Received Command Response Status for Endpoint=0 Cluster=0x0000_003E Command=0x0000_0000 Status=0x85
+          [1655984597.153112][23339:23344] CHIP:TOO: Error: IM Error 0x00000585: General error: 0x85 (INVALID_COMMAND)
+          [1655984597.153256][23339:23344] CHIP:DMG: ICR moving to [AwaitingDe]
       disabled: true
 
     - label:
           "TH1 sends AttestationRequestCommand with invalid AttestationNonce
           (size < 32 bytes) as the field to the DUT."
       verification: |
-          Verify that the DUT reports an error
+          ./chip-tool operationalcredentials attestation-request   762B6B9DA08F7FC63BB693E38634EC6F87CEFF28AB1554A1   1 0
+
+
+          [1655984597.150863][23339:23344] CHIP:DMG: InvokeResponseMessage =
+          [1655984597.150923][23339:23344] CHIP:DMG: {
+          [1655984597.150981][23339:23344] CHIP:DMG: 	suppressResponse = false,
+          [1655984597.151042][23339:23344] CHIP:DMG: 	InvokeResponseIBs =
+          [1655984597.151117][23339:23344] CHIP:DMG: 	[
+          [1655984597.151177][23339:23344] CHIP:DMG: 		InvokeResponseIB =
+          [1655984597.151255][23339:23344] CHIP:DMG: 		{
+          [1655984597.151318][23339:23344] CHIP:DMG: 			CommandStatusIB =
+          [1655984597.151404][23339:23344] CHIP:DMG: 			{
+          [1655984597.151475][23339:23344] CHIP:DMG: 				CommandPathIB =
+          [1655984597.151561][23339:23344] CHIP:DMG: 				{
+          [1655984597.151644][23339:23344] CHIP:DMG: 					EndpointId = 0x0,
+          [1655984597.151729][23339:23344] CHIP:DMG: 					ClusterId = 0x3e,
+          [1655984597.151812][23339:23344] CHIP:DMG: 					CommandId = 0x0,
+          [1655984597.151890][23339:23344] CHIP:DMG: 				},
+          [1655984597.151978][23339:23344] CHIP:DMG:
+          [1655984597.152050][23339:23344] CHIP:DMG: 				StatusIB =
+          [1655984597.152127][23339:23344] CHIP:DMG: 				{
+          [1655984597.152216][23339:23344] CHIP:DMG: 					status = 0x85 (INVALID_COMMAND),
+          [1655984597.152297][23339:23344] CHIP:DMG: 				},
+          [1655984597.152377][23339:23344] CHIP:DMG:
+          [1655984597.152449][23339:23344] CHIP:DMG: 			},
+          [1655984597.152527][23339:23344] CHIP:DMG:
+          [1655984597.152593][23339:23344] CHIP:DMG: 		},
+          [1655984597.152666][23339:23344] CHIP:DMG:
+          [1655984597.152723][23339:23344] CHIP:DMG: 	],
+          [1655984597.152794][23339:23344] CHIP:DMG:
+          [1655984597.152852][23339:23344] CHIP:DMG: 	InteractionModelRevision = 1
+          [1655984597.152908][23339:23344] CHIP:DMG: },
+          [1655984597.153037][23339:23344] CHIP:DMG: Received Command Response Status for Endpoint=0 Cluster=0x0000_003E Command=0x0000_0000 Status=0x85
+          [1655984597.153112][23339:23344] CHIP:TOO: Error: IM Error 0x00000585: General error: 0x85 (INVALID_COMMAND)
+          [1655984597.153256][23339:23344] CHIP:DMG: ICR moving to [AwaitingDe]
       disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_DA_1_3.yaml b/src/app/tests/suites/certification/Test_TC_DA_1_3.yaml
index 5b8998edb64b45..58b036e53212c6 100644
--- a/src/app/tests/suites/certification/Test_TC_DA_1_3.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DA_1_3.yaml
@@ -13,7 +13,9 @@
 # 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: 16.3. [TC-DA-1.3] Device Attestation Request Validation [DUT Commissioner]
+name:
+    4.1.3. [TC-DA-1.3] Device Attestation Request Validation [DUT -
+    Commissioner]
 
 config:
     nodeId: 0x12344321
@@ -21,53 +23,698 @@ config:
     endpoint: 0
 
 tests:
-    - label: "DUT generates 32-byte AttestationNonce"
+    - label: "Start the commissioning process of TH1 on DUT"
       verification: |
-          DUT send Attestation request command with attesation nonce to the reference App (lighting app or all-cluster-app)
+          DUT side:
+          sudo ./chip-all-clusters-app --wifi
+
+          TH side:
+          ./chip-tool pairing ble-wifi 1 zigbeehome matter123 20202021 3841 --trace_decode 1
+
+          [1650455358.501816][4366:4371] CHIP:TOO: Device commissioning completed with success
       disabled: true
 
-    - label: "Save the AttestationNonce as Nonce1"
+    - label: "DUT generates 32-byte AttestationNonce"
       verification: |
-
+          Verifu in TH log
+          [1655374218.117635][35023:35028] CHIP:CTL: Sent Attestation request, waiting for the Attestation Information
+          [1655374218.117686][35023:35028] CHIP:DMG: ICR moving to [AwaitingDe]
+          [1655374218.204040][35023:35028] CHIP:DL: HandlePlatformSpecificBLEEvent 16387
+          [1655374218.252180][35023:35026] CHIP:DL: Indication received, conn = 0xffff8003c0c0
+          [1655374218.252405][35023:35028] CHIP:DL: HandlePlatformSpecificBLEEvent 16389
+          [1655374218.352372][35023:35026] CHIP:DL: Indication received, conn = 0xffff8003c0c0
+          [1655374218.352509][35023:35028] CHIP:DL: HandlePlatformSpecificBLEEvent 16389
+          [1655374218.450622][35023:35026] CHIP:DL: Indication received, conn = 0xffff8003c0c0
+          [1655374218.450870][35023:35028] CHIP:DL: HandlePlatformSpecificBLEEvent 16389
+          [1655374218.452138][35023:35028] CHIP:DMG: << from BLE | 224958145 | [Interaction Model  (1) / InvokeCommandResponse (0x09) / Session = 19710 / Exchange = 1302]
+          [1655374218.452241][35023:35028] CHIP:DMG: Header Flags =
+          [1655374218.452300][35023:35028] CHIP:DMG: {
+          [1655374218.452395][35023:35028] CHIP:DMG: }
+          [1655374218.452449][35023:35028] CHIP:DMG:
+          [1655374218.452521][35023:35028] CHIP:DMG: Encrypted Payload (716 bytes) =
+          [1655374218.452579][35023:35028] CHIP:DMG: {
+          [1655374218.452634][35023:35028] CHIP:DMG:     data = 00fe4c00c196680d30c5e98d35a6d844102a8b0067edba80e2adf97e28751f8353657dacb7c9706c2c22add28d18adca15378d16af57f0f4092893cfc5d3e85f6e409f70e39bcb9e0bd3397947e927d20e5bf5173e3def7218d0152cf40e7cb16db615efbd282fd6e84c710bd2c7441228eb5dbbcf0dc76a3eaa0b04655f434d3c8223c7016703b8082c9984c3a91432d12271c87f4d09e90cb6e78d07c81d6359cd5a756f2bace60a7a216896949b536e5583f22db64aeae0279ba2fd279813be383e4324ab63472e3d9877f6c9fa539e577dc50fbcc5a7124a14ea78abdd6ada4ec256a3ee0a242747d636215ffab3c8b4291023eb51b3701939e153912b0f5764479b05e1cf472c350304d1ead872295c80fed3a545530f773e729b6f7bd7d5547de03076a72b8855191beb12d8194477bc9798b6177557cccf3b11b2c1f82cee31d451408359650112394dc2c1592cd2eb1e75881aa340885e65ef9a9905947842574ddcac832d68188b0a3a20fb223258d766692b13a6cde0de34d4f9047046d38ad94caf0a9cc7a786c082d5ae8c62346d69684c6ed5ae958ab68c0685922751ff04d922a838c9d2257a7af6e72af524b459a45ea6311431d30c7de32b3d79581ac119d6e7f63a877b53fda9d69256c5870f2af36f74e08b22e1217a0324b772394a4a596ff237331c623b8d7746077826088dddd2a741f19011cde09f1e897f92ac975fd9a157de0b780f6551b11a50ffe12c781f304dbda9dd75465fb3a8ec52d30f7ddb9179f1b9dfe415ae2d66a53bad67bcf27b3351b8a5cdc9e8b54095c81774007237c8a14a3e2c9cf350616cf5ebf7f6ae5a8c77207924b0e1cddc6c7e77c2a514319947c5988af1dd77325259f496293e53041941d45a1355f56b8036008ab696f7d47d17f9fc4890aa78c2811560b7b4d79a460b7dcd3d9bc3bdd5f72d27bb0060f722aa9c22e7d635895404c832bf2371321d1ababa954482c847fedd0d4676bd188365
+          [1655374218.452884][35023:35028] CHIP:DMG:     buffer_ptr = 281472627984864
+          [1655374218.452941][35023:35028] CHIP:DMG: }
+          [1655374218.452992][35023:35028] CHIP:DMG:
+          [1655374218.453303][35023:35028] CHIP:DMG: Attestation Elements (585 bytes) =
+          [1655374218.453366][35023:35028] CHIP:DMG: {
+          [1655374218.453431][35023:35028] CHIP:DMG:     Certification Declaration =
+          [1655374218.453483][35023:35028] CHIP:DMG:     {
+          [1655374218.455342][35023:35028] CHIP:DMG:         Format Version = 1
+          [1655374218.455398][35023:35028] CHIP:DMG:         Vendor Id = 65521
+          [1655374218.455438][35023:35028] CHIP:DMG:         Product Ids =
+          [1655374218.455474][35023:35028] CHIP:DMG:         {
+          [1655374218.455512][35023:35028] CHIP:DMG:             Product Id = 32768
+          [1655374218.455552][35023:35028] CHIP:DMG:             Product Id = 32769
+          [1655374218.455590][35023:35028] CHIP:DMG:             Product Id = 32770
+          [1655374218.455628][35023:35028] CHIP:DMG:             Product Id = 32771
+          [1655374218.455666][35023:35028] CHIP:DMG:             Product Id = 32772
+          [1655374218.455704][35023:35028] CHIP:DMG:             Product Id = 32773
+          [1655374218.455742][35023:35028] CHIP:DMG:             Product Id = 32774
+          [1655374218.455780][35023:35028] CHIP:DMG:             Product Id = 32775
+          [1655374218.455818][35023:35028] CHIP:DMG:             Product Id = 32776
+          [1655374218.455855][35023:35028] CHIP:DMG:             Product Id = 32777
+          [1655374218.455893][35023:35028] CHIP:DMG:             Product Id = 32778
+          [1655374218.455931][35023:35028] CHIP:DMG:             Product Id = 32779
+          [1655374218.455969][35023:35028] CHIP:DMG:             Product Id = 32780
+          [1655374218.456007][35023:35028] CHIP:DMG:             Product Id = 32781
+          [1655374218.456045][35023:35028] CHIP:DMG:             Product Id = 32782
+          [1655374218.456082][35023:35028] CHIP:DMG:             Product Id = 32783
+          [1655374218.456120][35023:35028] CHIP:DMG:             Product Id = 32784
+          [1655374218.456158][35023:35028] CHIP:DMG:             Product Id = 32785
+          [1655374218.456196][35023:35028] CHIP:DMG:             Product Id = 32786
+          [1655374218.456234][35023:35028] CHIP:DMG:             Product Id = 32787
+          [1655374218.456271][35023:35028] CHIP:DMG:             Product Id = 32788
+          [1655374218.456309][35023:35028] CHIP:DMG:             Product Id = 32789
+          [1655374218.456347][35023:35028] CHIP:DMG:             Product Id = 32790
+          [1655374218.456385][35023:35028] CHIP:DMG:             Product Id = 32791
+          [1655374218.456423][35023:35028] CHIP:DMG:             Product Id = 32792
+          [1655374218.456461][35023:35028] CHIP:DMG:             Product Id = 32793
+          [1655374218.456498][35023:35028] CHIP:DMG:             Product Id = 32794
+          [1655374218.456536][35023:35028] CHIP:DMG:             Product Id = 32795
+          [1655374218.456573][35023:35028] CHIP:DMG:             Product Id = 32796
+          [1655374218.456611][35023:35028] CHIP:DMG:             Product Id = 32797
+          [1655374218.456649][35023:35028] CHIP:DMG:             Product Id = 32798
+          [1655374218.456687][35023:35028] CHIP:DMG:             Product Id = 32799
+          [1655374218.456724][35023:35028] CHIP:DMG:             Product Id = 32800
+          [1655374218.456761][35023:35028] CHIP:DMG:             Product Id = 32801
+          [1655374218.456799][35023:35028] CHIP:DMG:             Product Id = 32802
+          [1655374218.456836][35023:35028] CHIP:DMG:             Product Id = 32803
+          [1655374218.456874][35023:35028] CHIP:DMG:             Product Id = 32804
+          [1655374218.456912][35023:35028] CHIP:DMG:             Product Id = 32805
+          [1655374218.456949][35023:35028] CHIP:DMG:             Product Id = 32806
+          [1655374218.456987][35023:35028] CHIP:DMG:             Product Id = 32807
+          [1655374218.457024][35023:35028] CHIP:DMG:             Product Id = 32808
+          [1655374218.457061][35023:35028] CHIP:DMG:             Product Id = 32809
+          [1655374218.457099][35023:35028] CHIP:DMG:             Product Id = 32810
+          [1655374218.457138][35023:35028] CHIP:DMG:             Product Id = 32811
+          [1655374218.457175][35023:35028] CHIP:DMG:             Product Id = 32812
+          [1655374218.457212][35023:35028] CHIP:DMG:             Product Id = 32813
+          [1655374218.457250][35023:35028] CHIP:DMG:             Product Id = 32814
+          [1655374218.457288][35023:35028] CHIP:DMG:             Product Id = 32815
+          [1655374218.457326][35023:35028] CHIP:DMG:             Product Id = 32816
+          [1655374218.457363][35023:35028] CHIP:DMG:             Product Id = 32817
+          [1655374218.457401][35023:35028] CHIP:DMG:             Product Id = 32818
+          [1655374218.457439][35023:35028] CHIP:DMG:             Product Id = 32819
+          [1655374218.457476][35023:35028] CHIP:DMG:             Product Id = 32820
+          [1655374218.457514][35023:35028] CHIP:DMG:             Product Id = 32821
+          [1655374218.457552][35023:35028] CHIP:DMG:             Product Id = 32822
+          [1655374218.457590][35023:35028] CHIP:DMG:             Product Id = 32823
+          [1655374218.457627][35023:35028] CHIP:DMG:             Product Id = 32824
+          [1655374218.457665][35023:35028] CHIP:DMG:             Product Id = 32825
+          [1655374218.457702][35023:35028] CHIP:DMG:             Product Id = 32826
+          [1655374218.457740][35023:35028] CHIP:DMG:             Product Id = 32827
+          [1655374218.457777][35023:35028] CHIP:DMG:             Product Id = 32828
+          [1655374218.457833][35023:35028] CHIP:DMG:             Product Id = 32829
+          [1655374218.457874][35023:35028] CHIP:DMG:             Product Id = 32830
+          [1655374218.457912][35023:35028] CHIP:DMG:             Product Id = 32831
+          [1655374218.457950][35023:35028] CHIP:DMG:             Product Id = 32832
+          [1655374218.457987][35023:35028] CHIP:DMG:             Product Id = 32833
+          [1655374218.458026][35023:35028] CHIP:DMG:             Product Id = 32834
+          [1655374218.458063][35023:35028] CHIP:DMG:             Product Id = 32835
+          [1655374218.458101][35023:35028] CHIP:DMG:             Product Id = 32836
+          [1655374218.458139][35023:35028] CHIP:DMG:             Product Id = 32837
+          [1655374218.458177][35023:35028] CHIP:DMG:             Product Id = 32838
+          [1655374218.458215][35023:35028] CHIP:DMG:             Product Id = 32839
+          [1655374218.458253][35023:35028] CHIP:DMG:             Product Id = 32840
+          [1655374218.458291][35023:35028] CHIP:DMG:             Product Id = 32841
+          [1655374218.458328][35023:35028] CHIP:DMG:             Product Id = 32842
+          [1655374218.458366][35023:35028] CHIP:DMG:             Product Id = 32843
+          [1655374218.458404][35023:35028] CHIP:DMG:             Product Id = 32844
+          [1655374218.458441][35023:35028] CHIP:DMG:             Product Id = 32845
+          [1655374218.458480][35023:35028] CHIP:DMG:             Product Id = 32846
+          [1655374218.458517][35023:35028] CHIP:DMG:             Product Id = 32847
+          [1655374218.458555][35023:35028] CHIP:DMG:             Product Id = 32848
+          [1655374218.458592][35023:35028] CHIP:DMG:             Product Id = 32849
+          [1655374218.458630][35023:35028] CHIP:DMG:             Product Id = 32850
+          [1655374218.458667][35023:35028] CHIP:DMG:             Product Id = 32851
+          [1655374218.458706][35023:35028] CHIP:DMG:             Product Id = 32852
+          [1655374218.458743][35023:35028] CHIP:DMG:             Product Id = 32853
+          [1655374218.458781][35023:35028] CHIP:DMG:             Product Id = 32854
+          [1655374218.458818][35023:35028] CHIP:DMG:             Product Id = 32855
+          [1655374218.458856][35023:35028] CHIP:DMG:             Product Id = 32856
+          [1655374218.458893][35023:35028] CHIP:DMG:             Product Id = 32857
+          [1655374218.458932][35023:35028] CHIP:DMG:             Product Id = 32858
+          [1655374218.458969][35023:35028] CHIP:DMG:             Product Id = 32859
+          [1655374218.459007][35023:35028] CHIP:DMG:             Product Id = 32860
+          [1655374218.459045][35023:35028] CHIP:DMG:             Product Id = 32861
+          [1655374218.459082][35023:35028] CHIP:DMG:             Product Id = 32862
+          [1655374218.459120][35023:35028] CHIP:DMG:             Product Id = 32863
+          [1655374218.459159][35023:35028] CHIP:DMG:             Product Id = 32864
+          [1655374218.459196][35023:35028] CHIP:DMG:             Product Id = 32865
+          [1655374218.459234][35023:35028] CHIP:DMG:             Product Id = 32866
+          [1655374218.459271][35023:35028] CHIP:DMG:             Product Id = 32867
+          [1655374218.459309][35023:35028] CHIP:DMG:         }
+          [1655374218.459347][35023:35028] CHIP:DMG:         Device Type Id = 22
+          [1655374218.459390][35023:35028] CHIP:DMG:         Certificate Id (19) = ZIG20142ZB330003-24
+          [1655374218.459430][35023:35028] CHIP:DMG:         Security Level = 0
+          [1655374218.459470][35023:35028] CHIP:DMG:         Security Information = 0
+          [1655374218.459508][35023:35028] CHIP:DMG:         Version Number = 9876
+          [1655374218.459546][35023:35028] CHIP:DMG:         Certification Type = 0
+          [1655374218.459584][35023:35028] CHIP:DMG:     }
+          [1655374218.459627][35023:35028] CHIP:DMG:     Attestation Nonce (32) = 762B6B9DA08F7FC63BB693E38634EC6F87CEFF28AB1554A16AD43DCEC24C2466
+          [1655374218.459664][35023:35028] CHIP:DMG:     Timestamp = 0
+          [1655374218.459699][35023:35028] CHIP:DMG: }
       disabled: true
 
     - label:
           "DUT sends AttestationRequest Command with AttestationNonce as field
           to the TH1."
       verification: |
-          Compare the attesation nonce received in the AttestationResposne is same as the one sent in Attesation Request
+          Verify in TH log
+
+          [1655374218.459627][35023:35028] CHIP:DMG:     Attestation Nonce (32) = 762B6B9DA08F7FC63BB693E38634EC6F87CEFF28AB1554A16AD43DCEC24C2466
+          [1655374218.459664][35023:35028] CHIP:DMG:     Timestamp = 0
+          [1655374218.459699][35023:35028] CHIP:DMG: }
       disabled: true
 
-    - label: "DUT generates 32-byte AttestationNonce for second time"
+    - label:
+          "TH1 records the AttestationNonce received in AttestationRequest as
+          Nonce_1"
       verification: |
-
+          See above
       disabled: true
 
-    - label: "Save the AttestationNonce as Nonce2"
+    - label: "TH1 responds with a well-formed AttestationResponse Command"
       verification: |
-          Verify that the values of Nonce1 and Nonce2 are different
+          Verify in TH log:
+
+          'SendDACCertificateRequest' -> 'SendAttestationRequest'
+          [1655979686.298628][22876:22881] CHIP:CTL: Performing next commissioning step 'SendAttestationRequest'
+          [1655979686.298679][22876:22881] CHIP:CTL: Sending Attestation Request to the device.
+          [1655979686.298730][22876:22881] CHIP:CTL: Sending Attestation request to 0xffff9c000b60 device
+          [1655979686.298850][22876:22881] CHIP:DMG: ICR moving to [AddingComm]
+          [1655979686.298922][22876:22881] CHIP:DMG: ICR moving to [AddedComma]
+          [1655979686.299422][22876:22881] CHIP:IN: Prepared secure message 0xffffb22c8958 to 0xFFFFFFFB00000000 (0)  of type 0x8 and protocolId (0, 1) on exchange 35315i with MessageCounter:234566666.
+          [1655979686.299520][22876:22881] CHIP:IN: Sending encrypted msg 0xffffb22c8958 with MessageCounter:234566666 to 0xFFFFFFFB00000000 (0) at monotonic time: 000000000648827A msec
+          [1655979686.299982][22876:22881] CHIP:DMG: >> to BLE | 234566666 | [Interaction Model  (1) / InvokeCommandRequest (0x08) / Session = 62649 / Exchange = 35315]
+          [1655979686.300073][22876:22881] CHIP:DMG: Header Flags =
+          [1655979686.300133][22876:22881] CHIP:DMG: {
+          [1655979686.300216][22876:22881] CHIP:DMG:     Exchange (0x01) =
+          [1655979686.300270][22876:22881] CHIP:DMG:     {
+          [1655979686.300319][22876:22881] CHIP:DMG:         Initiator = true
+          [1655979686.300371][22876:22881] CHIP:DMG:     }
+          [1655979686.300439][22876:22881] CHIP:DMG: }
+          [1655979686.300492][22876:22881] CHIP:DMG:
+          [1655979686.300557][22876:22881] CHIP:DMG: Encrypted Payload (94 bytes) =
+          [1655979686.300610][22876:22881] CHIP:DMG: {
+          [1655979686.300662][22876:22881] CHIP:DMG:     data = 00b9f4000a34fb0d54a953a30ca458bf899535f272656bf0051b3b0b830191d861e602260d9a5143b4159c1d7db8c2aeabea67d3647d200006758c67bdc6b5df5972310a5d5fa7c480062972692e785cb333f9c881525c98d8900a5489c4
+          [1655979686.300717][22876:22881] CHIP:DMG:     buffer_ptr = 281473299056208
+          [1655979686.300768][22876:22881] CHIP:DMG: }
+          [1655979686.300817][22876:22881] CHIP:DMG:
+          [1655979686.300969][22876:22881] CHIP:DMG: InvokeRequestMessage =
+          [1655979686.301032][22876:22881] CHIP:DMG: {
+          [1655979686.301088][22876:22881] CHIP:DMG: 	suppressResponse = false,
+          [1655979686.301151][22876:22881] CHIP:DMG: 	timedRequest = false,
+          [1655979686.301247][22876:22881] CHIP:DMG: 	InvokeRequests =
+          [1655979686.301323][22876:22881] CHIP:DMG: 	[
+          [1655979686.301382][22876:22881] CHIP:DMG: 		CommandDataIB =
+          [1655979686.301455][22876:22881] CHIP:DMG: 		{
+          [1655979686.301521][22876:22881] CHIP:DMG: 			CommandPathIB =
+          [1655979686.301597][22876:22881] CHIP:DMG: 			{
+          [1655979686.301669][22876:22881] CHIP:DMG: 				EndpointId = 0x0,
+          [1655979686.301750][22876:22881] CHIP:DMG: 				ClusterId = 0x3e,
+          [1655979686.301828][22876:22881] CHIP:DMG: 				CommandId = 0x0,
+          [1655979686.301900][22876:22881] CHIP:DMG: 			},
+          [1655979686.301972][22876:22881] CHIP:DMG:
+          [1655979686.302040][22876:22881] CHIP:DMG: 			CommandFields =
+          [1655979686.302115][22876:22881] CHIP:DMG: 			{
+          [1655979686.302198][22876:22881] CHIP:DMG: 				0x0 = [
+          [1655979686.302295][22876:22881] CHIP:DMG: 						0xa2, 0x7a, 0xbc, 0xfc, 0xeb, 0x61, 0xa2, 0xf4, 0x3e, 0x76, 0xcb, 0x9, 0x5d, 0x64, 0x7e, 0x13, 0x91, 0x94, 0xe2, 0x16, 0xe3, 0xd6, 0x90, 0x79, 0xbd, 0x8a, 0xf, 0xfd, 0xda, 0x58, 0x38, 0x6b,
+          [1655979686.302386][22876:22881] CHIP:DMG: 				]
+          [1655979686.302466][22876:22881] CHIP:DMG: 			},
+          [1655979686.302536][22876:22881] CHIP:DMG: 		},
+          [1655979686.302612][22876:22881] CHIP:DMG:
+          [1655979686.302670][22876:22881] CHIP:DMG: 	],
+          [1655979686.302741][22876:22881] CHIP:DMG:
+          [1655979686.302800][22876:22881] CHIP:DMG: 	InteractionModelRevision = 1
+          [1655979686.302856][22876:22881] CHIP:DMG: },
+          [1655979686.302911][22876:22881] CHIP:DMG:
+          [1655979686.303153][22876:22881] CHIP:DMG: ICR moving to [CommandSen]
+          [1655979686.303226][22876:22881] CHIP:CTL: Sent Attestation request, waiting for the Attestation Information
+          [1655979686.303327][22876:22881] CHIP:DMG: ICR moving to [AwaitingDe]
+          [1655979686.388892][22876:22881] CHIP:DL: HandlePlatformSpecificBLEEvent 16387
+          [1655979686.437235][22876:22879] CHIP:DL: Indication received, conn = 0xffffa806f3f0
+          [1655979686.437904][22876:22881] CHIP:DL: HandlePlatformSpecificBLEEvent 16389
+          [1655979686.635272][22876:22879] CHIP:DL: Indication received, conn = 0xffffa806f3f0
+          [1655979686.635523][22876:22881] CHIP:DL: HandlePlatformSpecificBLEEvent 16389
+          [1655979686.732083][22876:22879] CHIP:DL: Indication received, conn = 0xffffa806f3f0
+          [1655979686.732507][22876:22881] CHIP:DL: HandlePlatformSpecificBLEEvent 16389
+          [1655979686.733410][22876:22881] CHIP:DMG: << from BLE | 226447061 | [Interaction Model  (1) / InvokeCommandResponse (0x09) / Session = 21486 / Exchange = 35315]
+          [1655979686.733478][22876:22881] CHIP:DMG: Header Flags =
+          [1655979686.733513][22876:22881] CHIP:DMG: {
+          [1655979686.733573][22876:22881] CHIP:DMG: }
+          [1655979686.733606][22876:22881] CHIP:DMG:
+          [1655979686.733652][22876:22881] CHIP:DMG: Encrypted Payload (716 bytes) =
+          [1655979686.733685][22876:22881] CHIP:DMG: {
+          [1655979686.733718][22876:22881] CHIP:DMG:     data = 00ee5300d54e7f0d5bf07943fb109abb6059e067ad0c66876bec0d70c165fcfa3d74ede74faeebf96c7ea54887ebba5d24c6498b240037896fb5a730262a6fe8aa049c1431a18ba7f70a20af03af064ae4f9817aa172762051ac880e69b73eba6d2ec3a3c0cbc209e19f650b9b1ba8f43c8087e105759946ae60124a18e85282099b371992664b450bc5bf410463798bf8ef4b4ab468c5732fedc9abda22ea5f598176116287754122aab594d0bd438a3974eb6bf7b0c9289e168a3c6c6ece8b45b83b41c4b700da215eff124ecdda14ebf42d0c6760f7dccfb0a4d889c08f133af4af162a5cfc7601aa4d4c99b0bd421d392ad3e352bbad3b43bea32a1dcd59082278387e5980fcadd9cef0615d4bf7fd3a9aa0329c6471f52df66d047e8bb1140aef05930688e6179aa27d2792ee41921a02c401a2df027799bbd66e7692cb71a854e455b0a4b51a08b983cd5322931605b04fbb10a90aec97e3e4313acd839aa7fb915cfd2a3de3ce65e76f8f06f947d3108543932483f7d2b1fa7c5e79fceea421c7cdda346872372994d2830e0666dc9b6acc71b5071ada4755203943b600a740c109622e8cdb866e22b60538d9f727a7a59fd2417787efcd2f741cd1571b84bf9561101efabf27ad8686231dd70ec427a305fcf6206e2c54e9e33755c529f6a52410f1feb70413f808bed7d46c2813a7877ccd18baf5668b9f7999ebb51c51ad3a8903dbe2c047c139a0b5cb67c1d7a8acd633425d26cb7846db4b8c13e546611af5472dbdf3d6768a3d5fa4c698f49f7e238af74debd7ca19722f679cfd4703201e7e604c95754d7491ca10969d1f7c1c04e1591f6f2d56fcc6ce2f17fec28cc20af9fc7f59a0dfbbd52033c7b5d165cc32974959497d213a94198787f9a17a78593b354357be1ab7bec050c32702496710f548e773dfcb13ce1f8a1b070be7192c45417710d08e407aee8d796900acf04c3b0cdf55847628c2374958346109f8ec8e010ee75617ac
+          [1655979686.733793][22876:22881] CHIP:DMG:     buffer_ptr = 281473299067744
+          [1655979686.733824][22876:22881] CHIP:DMG: }
+          [1655979686.733853][22876:22881] CHIP:DMG:
+          [1655979686.734050][22876:22881] CHIP:DMG: Attestation Elements (585 bytes) =
+          [1655979686.734090][22876:22881] CHIP:DMG: {
+          [1655979686.734122][22876:22881] CHIP:DMG:     Certification Declaration =
+          [1655979686.734153][22876:22881] CHIP:DMG:     {
+          [1655979686.735443][22876:22881] CHIP:DMG:         Format Version = 1
+          [1655979686.735503][22876:22881] CHIP:DMG:         Vendor Id = 65521
+          [1655979686.735540][22876:22881] CHIP:DMG:         Product Ids =
+          [1655979686.735572][22876:22881] CHIP:DMG:         {
+          [1655979686.735606][22876:22881] CHIP:DMG:             Product Id = 32768
+          [1655979686.735642][22876:22881] CHIP:DMG:             Product Id = 32769
+          [1655979686.735677][22876:22881] CHIP:DMG:             Product Id = 32770
+          [1655979686.735711][22876:22881] CHIP:DMG:             Product Id = 32771
+          [1655979686.735746][22876:22881] CHIP:DMG:             Product Id = 32772
+          [1655979686.735780][22876:22881] CHIP:DMG:             Product Id = 32773
+          [1655979686.735815][22876:22881] CHIP:DMG:             Product Id = 32774
+          [1655979686.735850][22876:22881] CHIP:DMG:             Product Id = 32775
+          [1655979686.735884][22876:22881] CHIP:DMG:             Product Id = 32776
+          [1655979686.735918][22876:22881] CHIP:DMG:             Product Id = 32777
+          [1655979686.735953][22876:22881] CHIP:DMG:             Product Id = 32778
+          [1655979686.735987][22876:22881] CHIP:DMG:             Product Id = 32779
+          [1655979686.736022][22876:22881] CHIP:DMG:             Product Id = 32780
+          [1655979686.736056][22876:22881] CHIP:DMG:             Product Id = 32781
+          [1655979686.736090][22876:22881] CHIP:DMG:             Product Id = 32782
+          [1655979686.736124][22876:22881] CHIP:DMG:             Product Id = 32783
+          [1655979686.736158][22876:22881] CHIP:DMG:             Product Id = 32784
+          [1655979686.736193][22876:22881] CHIP:DMG:             Product Id = 32785
+          [1655979686.736227][22876:22881] CHIP:DMG:             Product Id = 32786
+          [1655979686.736262][22876:22881] CHIP:DMG:             Product Id = 32787
+          [1655979686.736296][22876:22881] CHIP:DMG:             Product Id = 32788
+          [1655979686.736331][22876:22881] CHIP:DMG:             Product Id = 32789
+          [1655979686.736365][22876:22881] CHIP:DMG:             Product Id = 32790
+          [1655979686.736399][22876:22881] CHIP:DMG:             Product Id = 32791
+          [1655979686.736434][22876:22881] CHIP:DMG:             Product Id = 32792
+          [1655979686.736468][22876:22881] CHIP:DMG:             Product Id = 32793
+          [1655979686.736503][22876:22881] CHIP:DMG:             Product Id = 32794
+          [1655979686.736537][22876:22881] CHIP:DMG:             Product Id = 32795
+          [1655979686.736571][22876:22881] CHIP:DMG:             Product Id = 32796
+          [1655979686.736606][22876:22881] CHIP:DMG:             Product Id = 32797
+          [1655979686.736641][22876:22881] CHIP:DMG:             Product Id = 32798
+          [1655979686.736675][22876:22881] CHIP:DMG:             Product Id = 32799
+          [1655979686.736709][22876:22881] CHIP:DMG:             Product Id = 32800
+          [1655979686.736743][22876:22881] CHIP:DMG:             Product Id = 32801
+          [1655979686.736778][22876:22881] CHIP:DMG:             Product Id = 32802
+          [1655979686.736812][22876:22881] CHIP:DMG:             Product Id = 32803
+          [1655979686.736847][22876:22881] CHIP:DMG:             Product Id = 32804
+          [1655979686.736881][22876:22881] CHIP:DMG:             Product Id = 32805
+          [1655979686.736915][22876:22881] CHIP:DMG:             Product Id = 32806
+          [1655979686.736950][22876:22881] CHIP:DMG:             Product Id = 32807
+          [1655979686.736984][22876:22881] CHIP:DMG:             Product Id = 32808
+          [1655979686.737018][22876:22881] CHIP:DMG:             Product Id = 32809
+          [1655979686.737053][22876:22881] CHIP:DMG:             Product Id = 32810
+          [1655979686.737087][22876:22881] CHIP:DMG:             Product Id = 32811
+          [1655979686.737122][22876:22881] CHIP:DMG:             Product Id = 32812
+          [1655979686.737156][22876:22881] CHIP:DMG:             Product Id = 32813
+          [1655979686.737215][22876:22881] CHIP:DMG:             Product Id = 32814
+          [1655979686.737250][22876:22881] CHIP:DMG:             Product Id = 32815
+          [1655979686.737285][22876:22881] CHIP:DMG:             Product Id = 32816
+          [1655979686.737319][22876:22881] CHIP:DMG:             Product Id = 32817
+          [1655979686.737354][22876:22881] CHIP:DMG:             Product Id = 32818
+          [1655979686.737388][22876:22881] CHIP:DMG:             Product Id = 32819
+          [1655979686.737423][22876:22881] CHIP:DMG:             Product Id = 32820
+          [1655979686.737457][22876:22881] CHIP:DMG:             Product Id = 32821
+          [1655979686.737491][22876:22881] CHIP:DMG:             Product Id = 32822
+          [1655979686.737525][22876:22881] CHIP:DMG:             Product Id = 32823
+          [1655979686.737559][22876:22881] CHIP:DMG:             Product Id = 32824
+          [1655979686.737594][22876:22881] CHIP:DMG:             Product Id = 32825
+          [1655979686.737628][22876:22881] CHIP:DMG:             Product Id = 32826
+          [1655979686.737662][22876:22881] CHIP:DMG:             Product Id = 32827
+          [1655979686.737697][22876:22881] CHIP:DMG:             Product Id = 32828
+          [1655979686.737731][22876:22881] CHIP:DMG:             Product Id = 32829
+          [1655979686.737766][22876:22881] CHIP:DMG:             Product Id = 32830
+          [1655979686.737800][22876:22881] CHIP:DMG:             Product Id = 32831
+          [1655979686.737835][22876:22881] CHIP:DMG:             Product Id = 32832
+          [1655979686.737869][22876:22881] CHIP:DMG:             Product Id = 32833
+          [1655979686.738006][22876:22881] CHIP:DMG:             Product Id = 32834
+          [1655979686.738044][22876:22881] CHIP:DMG:             Product Id = 32835
+          [1655979686.738079][22876:22881] CHIP:DMG:             Product Id = 32836
+          [1655979686.738114][22876:22881] CHIP:DMG:             Product Id = 32837
+          [1655979686.738149][22876:22881] CHIP:DMG:             Product Id = 32838
+          [1655979686.738189][22876:22881] CHIP:DMG:             Product Id = 32839
+          [1655979686.738226][22876:22881] CHIP:DMG:             Product Id = 32840
+          [1655979686.738261][22876:22881] CHIP:DMG:             Product Id = 32841
+          [1655979686.738297][22876:22881] CHIP:DMG:             Product Id = 32842
+          [1655979686.738332][22876:22881] CHIP:DMG:             Product Id = 32843
+          [1655979686.738367][22876:22881] CHIP:DMG:             Product Id = 32844
+          [1655979686.738401][22876:22881] CHIP:DMG:             Product Id = 32845
+          [1655979686.738436][22876:22881] CHIP:DMG:             Product Id = 32846
+          [1655979686.738470][22876:22881] CHIP:DMG:             Product Id = 32847
+          [1655979686.738505][22876:22881] CHIP:DMG:             Product Id = 32848
+          [1655979686.738539][22876:22881] CHIP:DMG:             Product Id = 32849
+          [1655979686.738574][22876:22881] CHIP:DMG:             Product Id = 32850
+          [1655979686.738609][22876:22881] CHIP:DMG:             Product Id = 32851
+          [1655979686.738643][22876:22881] CHIP:DMG:             Product Id = 32852
+          [1655979686.738678][22876:22881] CHIP:DMG:             Product Id = 32853
+          [1655979686.738712][22876:22881] CHIP:DMG:             Product Id = 32854
+          [1655979686.738747][22876:22881] CHIP:DMG:             Product Id = 32855
+          [1655979686.738781][22876:22881] CHIP:DMG:             Product Id = 32856
+          [1655979686.738816][22876:22881] CHIP:DMG:             Product Id = 32857
+          [1655979686.738851][22876:22881] CHIP:DMG:             Product Id = 32858
+          [1655979686.738885][22876:22881] CHIP:DMG:             Product Id = 32859
+          [1655979686.738919][22876:22881] CHIP:DMG:             Product Id = 32860
+          [1655979686.738954][22876:22881] CHIP:DMG:             Product Id = 32861
+          [1655979686.738990][22876:22881] CHIP:DMG:             Product Id = 32862
+          [1655979686.739025][22876:22881] CHIP:DMG:             Product Id = 32863
+          [1655979686.739059][22876:22881] CHIP:DMG:             Product Id = 32864
+          [1655979686.739094][22876:22881] CHIP:DMG:             Product Id = 32865
+          [1655979686.739129][22876:22881] CHIP:DMG:             Product Id = 32866
+          [1655979686.739163][22876:22881] CHIP:DMG:             Product Id = 32867
+          [1655979686.739198][22876:22881] CHIP:DMG:         }
+          [1655979686.739234][22876:22881] CHIP:DMG:         Device Type Id = 22
+          [1655979686.739274][22876:22881] CHIP:DMG:         Certificate Id (19) = ZIG20142ZB330003-24
+          [1655979686.739312][22876:22881] CHIP:DMG:         Security Level = 0
+          [1655979686.739339][22876:22881] CHIP:DMG:         Security Information = 0
+          [1655979686.739363][22876:22881] CHIP:DMG:         Version Number = 9876
+          [1655979686.739387][22876:22881] CHIP:DMG:         Certification Type = 0
+          [1655979686.739409][22876:22881] CHIP:DMG:     }
+          [1655979686.739436][22876:22881] CHIP:DMG:     Attestation Nonce (32) = A27ABCFCEB61A2F43E76CB095D647E139194E216E3D69079BD8A0FFDDA58386B
+          [1655979686.739513][22876:22881] CHIP:DMG:     Timestamp = 0
+          [1655979686.739536][22876:22881] CHIP:DMG: }
+          [1655979686.739556][22876:22881] CHIP:DMG:
+          [1655979686.739586][22876:22881] CHIP:DMG:
+          [1655979686.739642][22876:22881] CHIP:DMG: Additional Fields =
+          [1655979686.739665][22876:22881] CHIP:DMG: {
+          [1655979686.739692][22876:22881] CHIP:DMG:     peer_address = BLE
+          [1655979686.739714][22876:22881] CHIP:DMG: }
+          [1655979686.739734][22876:22881] CHIP:DMG:
+          [1655979686.739772][22876:22881] CHIP:EM: Received message of type 0x9 with protocolId (0, 1) and MessageCounter:226447061 on exchange 35315i
+          [1655979686.739801][22876:22881] CHIP:EM: Found matching exchange: 35315i, Delegate: 0xffff9c00c6b0
+          [1655979686.739850][22876:22881] CHIP:DMG: ICR moving to [ResponseRe]
+          [1655979686.739894][22876:22881] CHIP:DMG: InvokeResponseMessage =
+          [1655979686.739919][22876:22881] CHIP:DMG: {
+          [1655979686.739943][22876:22881] CHIP:DMG: 	suppressResponse = false,
+          [1655979686.739971][22876:22881] CHIP:DMG: 	InvokeResponseIBs =
+          [1655979686.740003][22876:22881] CHIP:DMG: 	[
+          [1655979686.740028][22876:22881] CHIP:DMG: 		InvokeResponseIB =
+          [1655979686.740080][22876:22881] CHIP:DMG: 		{
+          [1655979686.740111][22876:22881] CHIP:DMG: 			CommandDataIB =
+          [1655979686.740156][22876:22881] CHIP:DMG: 			{
+          [1655979686.740200][22876:22881] CHIP:DMG: 				CommandPathIB =
+          [1655979686.740250][22876:22881] CHIP:DMG: 				{
+          [1655979686.740301][22876:22881] CHIP:DMG: 					EndpointId = 0x0,
+          [1655979686.740352][22876:22881] CHIP:DMG: 					ClusterId = 0x3e,
+          [1655979686.740402][22876:22881] CHIP:DMG: 					CommandId = 0x1,
+          [1655979686.740449][22876:22881] CHIP:DMG: 				},
+          [1655979686.740486][22876:22881] CHIP:DMG:
+          [1655979686.740528][22876:22881] CHIP:DMG: 				CommandFields =
+          [1655979686.740563][22876:22881] CHIP:DMG: 				{
+          [1655979686.740602][22876:22881] CHIP:DMG: 					0x0 = [
+          [1655979686.740742][22876:22881] CHIP:DMG: 							0x15, 0x31, 0x1, 0x1d, 0x2, 0x30, 0x82, 0x2, 0x19, 0x6, 0x9, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0xd, 0x1, 0x7, 0x2, 0xa0, 0x82, 0x2, 0xa, 0x30, 0x82, 0x2, 0x6, 0x2, 0x1, 0x3, 0x31, 0xd, 0x30, 0xb, 0x6, 0x9, 0x60, 0x86, 0x48, 0x1, 0x65, 0x3, 0x4, 0x2, 0x1, 0x30, 0x82, 0x1, 0x71, 0x6, 0x9, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0xd, 0x1, 0x7, 0x1, 0xa0, 0x82, 0x1, 0x62, 0x4, 0x82, 0x1, 0x5e, 0x15, 0x24, 0x0, 0x1, 0x25, 0x1, 0xf1, 0xff, 0x36, 0x2, 0x5, 0x0, 0x80, 0x5, 0x1, 0x80, 0x5, 0x2, 0x80, 0x5, 0x3, 0x80, 0x5, 0x4, 0x80, 0x5, 0x5, 0x80, 0x5, 0x6, 0x80, 0x5, 0x7, 0x80, 0x5, 0x8, 0x80, 0x5, 0x9, 0x80, 0x5, 0xa, 0x80, 0x5, 0xb, 0x80, 0x5, 0xc, 0x80, 0x5, 0xd, 0x80, 0x5, 0xe, 0x80, 0x5, 0xf, 0x80, 0x5, 0x10, 0x80, 0x5, 0x11, 0x80, 0x5, 0x12, 0x80, 0x5, 0x13, 0x80, 0x5, 0x14, 0x80, 0x5, 0x15, 0x80, 0x5, 0x16, 0x80, 0x5, 0x17, 0x80, 0x5, 0x18, 0x80, 0x5, 0x19, 0x80, 0x5, 0x1a, 0x80, 0x5, 0x1b, 0x80, 0x5, 0x1c, 0x80, 0x5, 0x1d, 0x80, 0x5, 0x1e, 0x80, 0x5, 0x1f, 0x80, 0x5, 0x20, 0x80, 0x5, 0x21, 0x80, 0x5, 0x22, 0x80, 0x5, 0x23, 0x80, 0x5, 0x24, 0x80, 0x5, 0x25, 0x80, 0x5, 0x26, 0x80, 0x5, 0x27, 0x80, 0x5, 0x28, 0x80, 0x5, 0x29, 0x80, 0x5, 0x2a, 0x80, 0x5, 0x2b, 0x80, 0x5, 0x2c, 0x80, 0x5, 0x2d, 0x80, 0x5, 0x2e, 0x80, 0x5, 0x2f, 0x80, 0x5, 0x30, 0x80, 0x5, 0x31, 0x80, 0x5, 0x32, 0x80, 0x5, 0x33, 0x80, 0x5, 0x34, 0x80, 0x5, 0x35, 0x80, 0x5, 0x36, 0x80, 0x5, 0x37, 0x80, 0x5, 0x38, 0x80, 0x5, 0x39, 0x80, 0x5, 0x3a, 0x80, 0x5, 0x3b, 0x80, 0x5, 0x3c, 0x80, 0x5, 0x3d, 0x80, 0x5, 0x3e, 0x80, 0x5, 0x3f, 0x80, 0x5, 0x40, 0x80, 0x5, 0x41, 0x80, 0x5, 0x42, 0x80, 0x5, 0x43, 0x80, 0x5, 0x44, 0x80, 0x5, 0x45, 0x80, 0x5, 0x46, 0x80, 0x5, 0x47, 0x80, 0x5, 0x48, 0x80, 0x5, 0x49, 0x80, 0x5, 0x4a, 0x80, 0x5, 0
+          [1655979686.740822][22876:22881] CHIP:DMG: 					]
+          [1655979686.740860][22876:22881] CHIP:DMG: 					0x1 = [
+          [1655979686.740918][22876:22881] CHIP:DMG: 							0x64, 0x5d, 0x6b, 0xc7, 0xcf, 0x0, 0x7d, 0x2b, 0x4f, 0x7d, 0xa5, 0x6b, 0x40, 0x37, 0xe8, 0xc7, 0x1b, 0x7d, 0xd6, 0x39, 0xd5, 0x5, 0xad, 0x12, 0xdb, 0xb5, 0x54, 0x94, 0x4d, 0xd2, 0x2f, 0xc5, 0xd5, 0x9a, 0x66, 0x6d, 0x92, 0xcc, 0x40, 0xc6, 0xbb, 0xe3, 0x24, 0xc9, 0x9e, 0xfc, 0xa5, 0xc8, 0xb, 0xc4, 0xc6, 0x3f, 0xb8, 0xe7, 0x46, 0x6d, 0x2f, 0x2d, 0x24, 0x13, 0x83, 0xf5, 0xaa, 0xec,
+          [1655979686.740966][22876:22881] CHIP:DMG: 					]
+          [1655979686.741004][22876:22881] CHIP:DMG: 				},
+          [1655979686.741039][22876:22881] CHIP:DMG: 			},
+          [1655979686.741077][22876:22881] CHIP:DMG:
+          [1655979686.741104][22876:22881] CHIP:DMG: 		},
+          [1655979686.741137][22876:22881] CHIP:DMG:
+          [1655979686.741174][22876:22881] CHIP:DMG: 	],
+          [1655979686.741206][22876:22881] CHIP:DMG:
+          [1655979686.741231][22876:22881] CHIP:DMG: 	InteractionModelRevision = 1
+          [1655979686.741254][22876:22881] CHIP:DMG: },
+          [1655979686.741316][22876:22881] CHIP:DMG: Received Command Response Data, Endpoint=0 Cluster=0x0000_003E Command=0x0000_0001
+          [1655979686.741353][22876:22881] CHIP:CTL: Received Attestation Information from the device
+          [1655979686.741382][22876:22881] CHIP:CTL: Successfully finished commissioning step 'SendAttestationRequest'
+          [1655979686.741451][22876:22881] CHIP:CTL: Commissioning stage next step: 'SendAttestationRequest' -> 'AttestationVerification'
       disabled: true
 
-    - label:
-          "DUT sends AttestationRequest Command with AttestationNonce as field
-          to the TH1."
+    - label: "Factory Reset TH1 so that it is commissionable again"
       verification: |
-          Compare the attesation nonce received in the AttestationResposne is same as the one sent in Attesation Request
+          Both on DUT and TH side
+          sudo rm -rf /tmp/chip_*
       disabled: true
 
-    - label: "DUT generates 32-byte AttestationNonce for third time"
+    - label: "Start the commissioning process of TH1 on DUT again"
       verification: |
+          DUT side:
+          sudo ./chip-all-clusters-app --wifi
+
+          TH side:
+          ./chip-tool pairing ble-wifi 1 zigbeehome matter123 20202021 3841 --trace_decode 1
 
+          [1650455358.501816][4366:4371] CHIP:TOO: Device commissioning completed with success
       disabled: true
 
-    - label: "Save the AttestationNonce as Nonce3"
+    - label: "DUT generates 32-byte AttestationNonce"
       verification: |
-          Verify that the values of Nonce1,Nonce2 and Nonce3 are different
+          Verify in TH log:
+
+          [1655968443.635813][21387:21392] CHIP:DMG:     }
+          [1655968443.635876][21387:21392] CHIP:DMG:     Attestation Nonce (32) = 8A02A4533766C4310201E4E6DE820A51877AF337961BF2D12848268B8F323363
+          [1655968443.635933][21387:21392] CHIP:DMG:     Timestamp = 0
+          [1655968443.635985][21387:21392] CHIP:DMG: }
       disabled: true
 
     - label:
           "DUT sends AttestationRequest Command with AttestationNonce as field
           to the TH1."
       verification: |
-          Compare the attesation nonce received in the AttestationResposne is same as the one sent in Attesation Request
+          Verify in TH log :
+
+          [1655968443.238850][21387:21392] CHIP:CTL: Commissioning stage next step: 'SendDACCertificateRequest' -> 'SendAttestationRequest'
+          [1655968443.238918][21387:21392] CHIP:CTL: Performing next commissioning step 'SendAttestationRequest'
+          [1655968443.238971][21387:21392] CHIP:CTL: Sending Attestation Request to the device.
+          [1655968443.239021][21387:21392] CHIP:CTL: Sending Attestation request to 0xffff88000b60 device
+          [1655968443.239143][21387:21392] CHIP:DMG: ICR moving to [AddingComm]
+          [1655968443.239218][21387:21392] CHIP:DMG: ICR moving to [AddedComma]
+          [1655968443.239760][21387:21392] CHIP:IN: Prepared secure message 0xffff9afdc958 to 0xFFFFFFFB00000000 (0)  of type 0x8 and protocolId (0, 1) on exchange 11674i with MessageCounter:162800414.
+          [1655968443.239876][21387:21392] CHIP:IN: Sending encrypted msg 0xffff9afdc958 with MessageCounter:162800414 to 0xFFFFFFFB00000000 (0) at monotonic time: 00000000059CF446 msec
+          [1655968443.240366][21387:21392] CHIP:DMG: >> to BLE | 162800414 | [Interaction Model  (1) / InvokeCommandRequest (0x08) / Session = 52324 / Exchange = 11674]
+          [1655968443.240462][21387:21392] CHIP:DMG: Header Flags =
+          [1655968443.240517][21387:21392] CHIP:DMG: {
+          [1655968443.240601][21387:21392] CHIP:DMG:     Exchange (0x01) =
+          [1655968443.240655][21387:21392] CHIP:DMG:     {
+          [1655968443.240703][21387:21392] CHIP:DMG:         Initiator = true
+          [1655968443.240754][21387:21392] CHIP:DMG:     }
+          [1655968443.240821][21387:21392] CHIP:DMG: }
+          [1655968443.240877][21387:21392] CHIP:DMG:
+          [1655968443.240942][21387:21392] CHIP:DMG: Encrypted Payload (94 bytes) =
+          [1655968443.240996][21387:21392] CHIP:DMG: {
+          [1655968443.241048][21387:21392] CHIP:DMG:     data = 0064cc001e23b409b5afa9bd2bb3de206e818cc5af07da0982488815e5b83f6bd533a4d997416c9f18774dc3aa1b98c9dbb94d8d76188e230bdc8cc5cde8b8606d5e8e7041a700efe9bc4b48a66c9120631ef0553d850f70701829ab81ed
+          [1655968443.241105][21387:21392] CHIP:DMG:     buffer_ptr = 281472963527376
+          [1655968443.241156][21387:21392] CHIP:DMG: }
+          [1655968443.241302][21387:21392] CHIP:DMG:
+          [1655968443.241469][21387:21392] CHIP:DMG: InvokeRequestMessage =
+          [1655968443.241535][21387:21392] CHIP:DMG: {
+          [1655968443.241591][21387:21392] CHIP:DMG: 	suppressResponse = false,
+          [1655968443.241654][21387:21392] CHIP:DMG: 	timedRequest = false,
+          [1655968443.241713][21387:21392] CHIP:DMG: 	InvokeRequests =
+          [1655968443.241786][21387:21392] CHIP:DMG: 	[
+          [1655968443.241849][21387:21392] CHIP:DMG: 		CommandDataIB =
+          [1655968443.241981][21387:21392] CHIP:DMG: 		{
+          [1655968443.242047][21387:21392] CHIP:DMG: 			CommandPathIB =
+          [1655968443.242125][21387:21392] CHIP:DMG: 			{
+          [1655968443.242204][21387:21392] CHIP:DMG: 				EndpointId = 0x0,
+          [1655968443.242288][21387:21392] CHIP:DMG: 				ClusterId = 0x3e,
+          [1655968443.242368][21387:21392] CHIP:DMG: 				CommandId = 0x0,
+          [1655968443.242444][21387:21392] CHIP:DMG: 			},
+          [1655968443.242525][21387:21392] CHIP:DMG:
+          [1655968443.242591][21387:21392] CHIP:DMG: 			CommandFields =
+          [1655968443.242667][21387:21392] CHIP:DMG: 			{
+          [1655968443.242745][21387:21392] CHIP:DMG: 				0x0 = [
+          [1655968443.242847][21387:21392] CHIP:DMG: 						0x8a, 0x2, 0xa4, 0x53, 0x37, 0x66, 0xc4, 0x31, 0x2, 0x1, 0xe4, 0xe6, 0xde, 0x82, 0xa, 0x51, 0x87, 0x7a, 0xf3, 0x37, 0x96, 0x1b, 0xf2, 0xd1, 0x28, 0x48, 0x26, 0x8b, 0x8f, 0x32, 0x33, 0x63,
+          [1655968443.242937][21387:21392] CHIP:DMG: 				]
+          [1655968443.243017][21387:21392] CHIP:DMG: 			},
+          [1655968443.243088][21387:21392] CHIP:DMG: 		},
+          [1655968443.243161][21387:21392] CHIP:DMG:
+          [1655968443.243221][21387:21392] CHIP:DMG: 	],
+          [1655968443.243293][21387:21392] CHIP:DMG:
+          [1655968443.243354][21387:21392] CHIP:DMG: 	InteractionModelRevision = 1
+          [1655968443.243411][21387:21392] CHIP:DMG: },
+          [1655968443.243466][21387:21392] CHIP:DMG:
+          [1655968443.243733][21387:21392] CHIP:DMG: ICR moving to [CommandSen]
+          [1655968443.243814][21387:21392] CHIP:CTL: Sent Attestation request, waiting for the Attestation Information
+          [1655968443.243913][21387:21392] CHIP:DMG: ICR moving to [AwaitingDe]
+          [1655968443.377585][21387:21392] CHIP:DL: HandlePlatformSpecificBLEEvent 16387
+          [1655968443.425671][21387:21390] CHIP:DL: Indication received, conn = 0xffff900200d0
+          [1655968443.425933][21387:21392] CHIP:DL: HandlePlatformSpecificBLEEvent 16389
+          [1655968443.526449][21387:21390] CHIP:DL: Indication received, conn = 0xffff900200d0
+          [1655968443.526705][21387:21392] CHIP:DL: HandlePlatformSpecificBLEEvent 16389
+          [1655968443.623985][21387:21390] CHIP:DL: Indication received, conn = 0xffff900200d0
+          [1655968443.624679][21387:21392] CHIP:DL: HandlePlatformSpecificBLEEvent 16389
+          [1655968443.626106][21387:21392] CHIP:DMG: << from BLE | 163275440 | [Interaction Model  (1) / InvokeCommandResponse (0x09) / Session = 42825 / Exchange = 11674]
+          [1655968443.626225][21387:21392] CHIP:DMG: Header Flags =
+          [1655968443.626282][21387:21392] CHIP:DMG: {
+          [1655968443.626381][21387:21392] CHIP:DMG: }
+          [1655968443.626434][21387:21392] CHIP:DMG:
+          [1655968443.626507][21387:21392] CHIP:DMG: Encrypted Payload (716 bytes) =
+          [1655968443.626561][21387:21392] CHIP:DMG: {
+          [1655968443.626614][21387:21392] CHIP:DMG:     data = 0049a700b062bb0923457d8fefc710b7ad04681eed0dae3bdab2dd3f1a74ed767f5f21220b66a8848209e1d6cf9192cbe38656e0c90075ff926fa241d824328c05b9adb20ef1b0fa26479db4b03daff247c0823c4068a6c0e10c15cdf487354ff2ed897eabb41e9748c993ed4ca0833e4802d609fc228056e244b6e9131f83baeb98636d1b7bea66c49b79a860e62f86d91da04b27513a61e04ac3c1f902886bf877c6a8460c974204cde916ded0177e64d7d1cec19391bb02c60a294ef7f98789a87a55cbe7146163da7fe990ea9a231c597c32250353a525b124272afcccd9f74535f8c9eeed98dbb9b2ef21d0300ec76ccf58d1b162eb081dd8b7373f8a33e8122a2b4ed1f4ea61669443ef7b02acd9f8ff64168b3b61fa77545beaf8e2ded4d99618c528f67c4c421ef4dc58ef2c7eab0d85cfecb5a67ab354dc9e42c83386afc0b294b18e097ce17a1933cf363de9863e594dfbd772c0ca469d15b3ec5b61b5615f5f29ee3440a7338031dcb9ab4bfb60dc8598cccd050aea5b6cc972ef84fd5487b61fb4922c2407111d8250c1d5bebae187fb4e757c58247b295da551723d7670cd347c774842e1f20be2dc14da73888ffac99fc92ca1db1d246e567b94539dcdc44aa339ce928211958bc7254fd5c09fed1b90375ed22f5160adddc77344ddd6649fc3c8c6f1b8904167d369f80e38ccaaa463ddfc9bd61c590bfe35a8a51704828ba599c63ccb26ff9026fd6178ac045c322e3df5a98a17fa6bafeeab5f603a90389fb21a3aaa7558b324b76528882f658d52fc439d103316a1ee6767c0f9441554ac0c9b34176960e72ae74c74f6286339dc0292c1a069ec2f43da81d73c4767eb6629fe1545dd25bab4e034b68b618da401747f798fe1fb166356c3bdbca93394dad6d3607a3f7a1301c386ac7d561d9d6c893391fe1e9887ad58a3625ec1582b0c2a48af2eafb5a32a089e084e47bcaa08cfe4c0d8ecae356fcff8b5d85f2668b7b87a3aba18
+          [1655968443.626737][21387:21392] CHIP:DMG:     buffer_ptr = 281472963520464
+          [1655968443.626788][21387:21392] CHIP:DMG: }
+          [1655968443.626837][21387:21392] CHIP:DMG:
+          [1655968443.627153][21387:21392] CHIP:DMG: Attestation Elements (585 bytes) =
+          [1655968443.627217][21387:21392] CHIP:DMG: {
+          [1655968443.627269][21387:21392] CHIP:DMG:     Certification Declaration =
+          [1655968443.627320][21387:21392] CHIP:DMG:     {
+          [1655968443.629460][21387:21392] CHIP:DMG:         Format Version = 1
+          [1655968443.629555][21387:21392] CHIP:DMG:         Vendor Id = 65521
+          [1655968443.629616][21387:21392] CHIP:DMG:         Product Ids =
+          [1655968443.629670][21387:21392] CHIP:DMG:         {
+          [1655968443.629727][21387:21392] CHIP:DMG:             Product Id = 32768
+          [1655968443.629785][21387:21392] CHIP:DMG:             Product Id = 32769
+          [1655968443.629842][21387:21392] CHIP:DMG:             Product Id = 32770
+          [1655968443.629899][21387:21392] CHIP:DMG:             Product Id = 32771
+          [1655968443.629955][21387:21392] CHIP:DMG:             Product Id = 32772
+          [1655968443.630011][21387:21392] CHIP:DMG:             Product Id = 32773
+          [1655968443.630069][21387:21392] CHIP:DMG:             Product Id = 32774
+          [1655968443.630125][21387:21392] CHIP:DMG:             Product Id = 32775
+          [1655968443.630182][21387:21392] CHIP:DMG:             Product Id = 32776
+          [1655968443.630239][21387:21392] CHIP:DMG:             Product Id = 32777
+          [1655968443.630287][21387:21392] CHIP:DMG:             Product Id = 32778
+          [1655968443.630334][21387:21392] CHIP:DMG:             Product Id = 32779
+          [1655968443.630387][21387:21392] CHIP:DMG:             Product Id = 32780
+          [1655968443.630443][21387:21392] CHIP:DMG:             Product Id = 32781
+          [1655968443.630499][21387:21392] CHIP:DMG:             Product Id = 32782
+          [1655968443.630556][21387:21392] CHIP:DMG:             Product Id = 32783
+          [1655968443.630612][21387:21392] CHIP:DMG:             Product Id = 32784
+          [1655968443.630670][21387:21392] CHIP:DMG:             Product Id = 32785
+          [1655968443.630727][21387:21392] CHIP:DMG:             Product Id = 32786
+          [1655968443.630783][21387:21392] CHIP:DMG:             Product Id = 32787
+          [1655968443.630839][21387:21392] CHIP:DMG:             Product Id = 32788
+          [1655968443.630896][21387:21392] CHIP:DMG:             Product Id = 32789
+          [1655968443.630952][21387:21392] CHIP:DMG:             Product Id = 32790
+          [1655968443.631009][21387:21392] CHIP:DMG:             Product Id = 32791
+          [1655968443.631067][21387:21392] CHIP:DMG:             Product Id = 32792
+          [1655968443.631129][21387:21392] CHIP:DMG:             Product Id = 32793
+          [1655968443.631186][21387:21392] CHIP:DMG:             Product Id = 32794
+          [1655968443.631243][21387:21392] CHIP:DMG:             Product Id = 32795
+          [1655968443.631298][21387:21392] CHIP:DMG:             Product Id = 32796
+          [1655968443.631355][21387:21392] CHIP:DMG:             Product Id = 32797
+          [1655968443.631411][21387:21392] CHIP:DMG:             Product Id = 32798
+          [1655968443.631467][21387:21392] CHIP:DMG:             Product Id = 32799
+          [1655968443.631524][21387:21392] CHIP:DMG:             Product Id = 32800
+          [1655968443.631581][21387:21392] CHIP:DMG:             Product Id = 32801
+          [1655968443.631637][21387:21392] CHIP:DMG:             Product Id = 32802
+          [1655968443.631693][21387:21392] CHIP:DMG:             Product Id = 32803
+          [1655968443.631749][21387:21392] CHIP:DMG:             Product Id = 32804
+          [1655968443.631806][21387:21392] CHIP:DMG:             Product Id = 32805
+          [1655968443.631862][21387:21392] CHIP:DMG:             Product Id = 32806
+          [1655968443.631918][21387:21392] CHIP:DMG:             Product Id = 32807
+          [1655968443.631974][21387:21392] CHIP:DMG:             Product Id = 32808
+          [1655968443.632031][21387:21392] CHIP:DMG:             Product Id = 32809
+          [1655968443.632088][21387:21392] CHIP:DMG:             Product Id = 32810
+          [1655968443.632146][21387:21392] CHIP:DMG:             Product Id = 32811
+          [1655968443.632202][21387:21392] CHIP:DMG:             Product Id = 32812
+          [1655968443.632259][21387:21392] CHIP:DMG:             Product Id = 32813
+          [1655968443.632315][21387:21392] CHIP:DMG:             Product Id = 32814
+          [1655968443.632371][21387:21392] CHIP:DMG:             Product Id = 32815
+          [1655968443.632428][21387:21392] CHIP:DMG:             Product Id = 32816
+          [1655968443.632485][21387:21392] CHIP:DMG:             Product Id = 32817
+          [1655968443.632541][21387:21392] CHIP:DMG:             Product Id = 32818
+          [1655968443.632597][21387:21392] CHIP:DMG:             Product Id = 32819
+          [1655968443.632653][21387:21392] CHIP:DMG:             Product Id = 32820
+          [1655968443.632709][21387:21392] CHIP:DMG:             Product Id = 32821
+          [1655968443.632766][21387:21392] CHIP:DMG:             Product Id = 32822
+          [1655968443.632822][21387:21392] CHIP:DMG:             Product Id = 32823
+          [1655968443.632879][21387:21392] CHIP:DMG:             Product Id = 32824
+          [1655968443.632935][21387:21392] CHIP:DMG:             Product Id = 32825
+          [1655968443.632991][21387:21392] CHIP:DMG:             Product Id = 32826
+          [1655968443.633047][21387:21392] CHIP:DMG:             Product Id = 32827
+          [1655968443.633104][21387:21392] CHIP:DMG:             Product Id = 32828
+          [1655968443.633188][21387:21392] CHIP:DMG:             Product Id = 32829
+          [1655968443.633251][21387:21392] CHIP:DMG:             Product Id = 32830
+          [1655968443.633307][21387:21392] CHIP:DMG:             Product Id = 32831
+          [1655968443.633364][21387:21392] CHIP:DMG:             Product Id = 32832
+          [1655968443.633420][21387:21392] CHIP:DMG:             Product Id = 32833
+          [1655968443.633477][21387:21392] CHIP:DMG:             Product Id = 32834
+          [1655968443.633533][21387:21392] CHIP:DMG:             Product Id = 32835
+          [1655968443.633590][21387:21392] CHIP:DMG:             Product Id = 32836
+          [1655968443.633646][21387:21392] CHIP:DMG:             Product Id = 32837
+          [1655968443.633702][21387:21392] CHIP:DMG:             Product Id = 32838
+          [1655968443.633759][21387:21392] CHIP:DMG:             Product Id = 32839
+          [1655968443.633816][21387:21392] CHIP:DMG:             Product Id = 32840
+          [1655968443.633873][21387:21392] CHIP:DMG:             Product Id = 32841
+          [1655968443.633928][21387:21392] CHIP:DMG:             Product Id = 32842
+          [1655968443.633985][21387:21392] CHIP:DMG:             Product Id = 32843
+          [1655968443.634041][21387:21392] CHIP:DMG:             Product Id = 32844
+          [1655968443.634098][21387:21392] CHIP:DMG:             Product Id = 32845
+          [1655968443.634154][21387:21392] CHIP:DMG:             Product Id = 32846
+          [1655968443.634211][21387:21392] CHIP:DMG:             Product Id = 32847
+          [1655968443.634267][21387:21392] CHIP:DMG:             Product Id = 32848
+          [1655968443.634324][21387:21392] CHIP:DMG:             Product Id = 32849
+          [1655968443.634381][21387:21392] CHIP:DMG:             Product Id = 32850
+          [1655968443.634438][21387:21392] CHIP:DMG:             Product Id = 32851
+          [1655968443.634494][21387:21392] CHIP:DMG:             Product Id = 32852
+          [1655968443.634551][21387:21392] CHIP:DMG:             Product Id = 32853
+          [1655968443.634607][21387:21392] CHIP:DMG:             Product Id = 32854
+          [1655968443.634663][21387:21392] CHIP:DMG:             Product Id = 32855
+          [1655968443.634719][21387:21392] CHIP:DMG:             Product Id = 32856
+          [1655968443.634776][21387:21392] CHIP:DMG:             Product Id = 32857
+          [1655968443.634833][21387:21392] CHIP:DMG:             Product Id = 32858
+          [1655968443.634889][21387:21392] CHIP:DMG:             Product Id = 32859
+          [1655968443.634946][21387:21392] CHIP:DMG:             Product Id = 32860
+          [1655968443.635003][21387:21392] CHIP:DMG:             Product Id = 32861
+          [1655968443.635059][21387:21392] CHIP:DMG:             Product Id = 32862
+          [1655968443.635116][21387:21392] CHIP:DMG:             Product Id = 32863
+          [1655968443.635173][21387:21392] CHIP:DMG:             Product Id = 32864
+          [1655968443.635230][21387:21392] CHIP:DMG:             Product Id = 32865
+          [1655968443.635287][21387:21392] CHIP:DMG:             Product Id = 32866
+          [1655968443.635343][21387:21392] CHIP:DMG:             Product Id = 32867
+          [1655968443.635399][21387:21392] CHIP:DMG:         }
+          [1655968443.635457][21387:21392] CHIP:DMG:         Device Type Id = 22
+          [1655968443.635521][21387:21392] CHIP:DMG:         Certificate Id (19) = ZIG20142ZB330003-24
+          [1655968443.635582][21387:21392] CHIP:DMG:         Security Level = 0
+          [1655968443.635641][21387:21392] CHIP:DMG:         Security Information = 0
+          [1655968443.635699][21387:21392] CHIP:DMG:         Version Number = 9876
+          [1655968443.635757][21387:21392] CHIP:DMG:         Certification Type = 0
+          [1655968443.635813][21387:21392] CHIP:DMG:     }
+          [1655968443.635876][21387:21392] CHIP:DMG:     Attestation Nonce (32) = 8A02A4533766C4310201E4E6DE820A51877AF337961BF2D12848268B8F323363
+          [1655968443.635933][21387:21392] CHIP:DMG:     Timestamp = 0
+          [1655968443.635985][21387:21392] CHIP:DMG: }
+          [1655968443.636035][21387:21392] CHIP:DMG:
+          [1655968443.636102][21387:21392] CHIP:DMG:
+          [1655968443.636210][21387:21392] CHIP:DMG: Additional Fields =
+          [1655968443.636267][21387:21392] CHIP:DMG: {
+          [1655968443.636328][21387:21392] CHIP:DMG:     peer_address = BLE
+          [1655968443.636382][21387:21392] CHIP:DMG: }
+          [1655968443.636431][21387:21392] CHIP:DMG:
+          [1655968443.636508][21387:21392] CHIP:EM: Received message of type 0x9 with protocolId (0, 1) and MessageCounter:163275440 on exchange 11674i
+          [1655968443.636575][21387:21392] CHIP:EM: Found matching exchange: 11674i, Delegate: 0xffff88005ab0
+          [1655968443.636680][21387:21392] CHIP:DMG: ICR moving to [ResponseRe]
+          [1655968443.636777][21387:21392] CHIP:DMG: InvokeResponseMessage =
+          [1655968443.636837][21387:21392] CHIP:DMG: {
+          [1655968443.636895][21387:21392] CHIP:DMG: 	suppressResponse = false,
+          [1655968443.636954][21387:21392] CHIP:DMG: 	InvokeResponseIBs =
+          [1655968443.637030][21387:21392] CHIP:DMG: 	[
+          [1655968443.637090][21387:21392] CHIP:DMG: 		InvokeResponseIB =
+          [1655968443.637204][21387:21392] CHIP:DMG: 		{
+          [1655968443.637271][21387:21392] CHIP:DMG: 			CommandDataIB =
+          [1655968443.637363][21387:21392] CHIP:DMG: 			{
+          [1655968443.637448][21387:21392] CHIP:DMG: 				CommandPathIB =
+          [1655968443.637530][21387:21392] CHIP:DMG: 				{
+          [1655968443.637624][21387:21392] CHIP:DMG: 					EndpointId = 0x0,
+          [1655968443.637721][21387:21392] CHIP:DMG: 					ClusterId = 0x3e,
+          [1655968443.637816][21387:21392] CHIP:DMG: 					CommandId = 0x1,
+          [1655968443.637905][21387:21392] CHIP:DMG: 				},
+          [1655968443.637990][21387:21392] CHIP:DMG:
+          [1655968443.638076][21387:21392] CHIP:DMG: 				CommandFields =
+          [1655968443.638165][21387:21392] CHIP:DMG: 				{
+          [1655968443.638247][21387:21392] CHIP:DMG: 					0x0 = [
+          [1655968443.638586][21387:21392] CHIP:DMG: 							0x15, 0x31, 0x1, 0x1d, 0x2, 0x30, 0x82, 0x2, 0x19, 0x6, 0x9, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0xd, 0x1, 0x7, 0x2, 0xa0, 0x82, 0x2, 0xa, 0x30, 0x82, 0x2, 0x6, 0x2, 0x1, 0x3, 0x31, 0xd, 0x30, 0xb, 0x6, 0x9, 0x60, 0x86, 0x48, 0x1, 0x65, 0x3, 0x4, 0x2, 0x1, 0x30, 0x82, 0x1, 0x71, 0x6, 0x9, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0xd, 0x1, 0x7, 0x1, 0xa0, 0x82, 0x1, 0x62, 0x4, 0x82, 0x1, 0x5e, 0x15, 0x24, 0x0, 0x1, 0x25, 0x1, 0xf1, 0xff, 0x36, 0x2, 0x5, 0x0, 0x80, 0x5, 0x1, 0x80, 0x5, 0x2, 0x80, 0x5, 0x3, 0x80, 0x5, 0x4, 0x80, 0x5, 0x5, 0x80, 0x5, 0x6, 0x80, 0x5, 0x7, 0x80, 0x5, 0x8, 0x80, 0x5, 0x9, 0x80, 0x5, 0xa, 0x80, 0x5, 0xb, 0x80, 0x5, 0xc, 0x80, 0x5, 0xd, 0x80, 0x5, 0xe, 0x80, 0x5, 0xf, 0x80, 0x5, 0x10, 0x80, 0x5, 0x11, 0x80, 0x5, 0x12, 0x80, 0x5, 0x13, 0x80, 0x5, 0x14, 0x80, 0x5, 0x15, 0x80, 0x5, 0x16, 0x80, 0x5, 0x17, 0x80, 0x5, 0x18, 0x80, 0x5, 0x19, 0x80, 0x5, 0x1a, 0x80, 0x5, 0x1b, 0x80, 0x5, 0x1c, 0x80, 0x5, 0x1d, 0x80, 0x5, 0x1e, 0x80, 0x5, 0x1f, 0x80, 0x5, 0x20, 0x80, 0x5, 0x21, 0x80, 0x5, 0x22, 0x80, 0x5, 0x23, 0x80, 0x5, 0x24, 0x80, 0x5, 0x25, 0x80, 0x5, 0x26, 0x80, 0x5, 0x27, 0x80, 0x5, 0x28, 0x80, 0x5, 0x29, 0x80, 0x5, 0x2a, 0x80, 0x5, 0x2b, 0x80, 0x5, 0x2c, 0x80, 0x5, 0x2d, 0x80, 0x5, 0x2e, 0x80, 0x5, 0x2f, 0x80, 0x5, 0x30, 0x80, 0x5, 0x31, 0x80, 0x5, 0x32, 0x80, 0x5, 0x33, 0x80, 0x5, 0x34, 0x80, 0x5, 0x35, 0x80, 0x5, 0x36, 0x80, 0x5, 0x37, 0x80, 0x5, 0x38, 0x80, 0x5, 0x39, 0x80, 0x5, 0x3a, 0x80, 0x5, 0x3b, 0x80, 0x5, 0x3c, 0x80, 0x5, 0x3d, 0x80, 0x5, 0x3e, 0x80, 0x5, 0x3f, 0x80, 0x5, 0x40, 0x80, 0x5, 0x41, 0x80, 0x5, 0x42, 0x80, 0x5, 0x43, 0x80, 0x5, 0x44, 0x80, 0x5, 0x45, 0x80, 0x5, 0x46, 0x80, 0x5, 0x47, 0x80, 0x5, 0x48, 0x80, 0x5, 0x49, 0x80, 0x5, 0x4a, 0x80, 0x5, 0
+          [1655968443.638783][21387:21392] CHIP:DMG: 					]
+          [1655968443.638877][21387:21392] CHIP:DMG: 					0x1 = [
+          [1655968443.639021][21387:21392] CHIP:DMG: 							0x9a, 0xd9, 0x9c, 0x10, 0x25, 0x22, 0xe0, 0xe7, 0x83, 0xb3, 0x78, 0x28, 0xb5, 0xa, 0xb4, 0x9b, 0xb7, 0xe6, 0x32, 0x1, 0x26, 0xe7, 0x8b, 0x6, 0x62, 0x28, 0x9c, 0x71, 0xe8, 0xc8, 0x72, 0x1a, 0x45, 0x56, 0x1e, 0xaf, 0x30, 0xd0, 0xdb, 0xb6, 0xda, 0xce, 0x31, 0xcc, 0x20, 0x38, 0x42, 0x2a, 0x2e, 0xd5, 0x6c, 0x5, 0x48, 0x5, 0xab, 0xc5, 0xa6, 0xff, 0x97, 0x3f, 0x1f, 0x9b, 0xd7, 0x27,
+          [1655968443.639140][21387:21392] CHIP:DMG: 					]
+          [1655968443.639235][21387:21392] CHIP:DMG: 				},
+          [1655968443.639311][21387:21392] CHIP:DMG: 			},
+          [1655968443.639399][21387:21392] CHIP:DMG:
+          [1655968443.639468][21387:21392] CHIP:DMG: 		},
+          [1655968443.639549][21387:21392] CHIP:DMG:
+          [1655968443.639608][21387:21392] CHIP:DMG: 	],
+          [1655968443.639683][21387:21392] CHIP:DMG:
+          [1655968443.639742][21387:21392] CHIP:DMG: 	InteractionModelRevision = 1
+          [1655968443.639799][21387:21392] CHIP:DMG: },
+          [1655968443.639943][21387:21392] CHIP:DMG: Received Command Response Data, Endpoint=0 Cluster=0x0000_003E Command=0x0000_0001
+          [1655968443.640024][21387:21392] CHIP:CTL: Received Attestation Information from the device
+          [1655968443.640090][21387:21392] CHIP:CTL: Successfully finished commissioning step 'SendAttestationRequest'
+      disabled: true
+
+    - label:
+          "TH1 records the AttestationNonce received in AttestationRequest as
+          Nonce_2"
+      verification: |
+          See above
       disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_DA_1_4.yaml b/src/app/tests/suites/certification/Test_TC_DA_1_4.yaml
index 9257eb98c2f509..6a013cca334994 100644
--- a/src/app/tests/suites/certification/Test_TC_DA_1_4.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DA_1_4.yaml
@@ -14,7 +14,7 @@
 # Auto-generated scripts for harness use only, please review before automation. The endpoints and cluster names are currently set to default
 
 name:
-    17.1.4. [TC-DA-1.4] Device Attestation Request Validation-Error Scenario
+    4.1.4. [TC-DA-1.4] Device Attestation Request Validation-Error Scenario
     [DUT-Commissioner]
 
 config:
@@ -25,56 +25,345 @@ config:
 tests:
     - label: "Start the commissioning process of TH1 on DUT"
       verification: |
+          DUT side:
+          sudo ./chip-all-clusters-app --wifi
 
+          TH side:
+          ./chip-tool pairing ble-wifi 1 zigbeehome matter123 20202021 3841 --trace_decode 1
+
+          [1650455358.501816][4366:4371] CHIP:TOO: Device commissioning completed with success
       disabled: true
 
     - label: "DUT generates 32-byte AttestationNonce"
       verification: |
-
+          Verifu in TH log
+          [1655374218.117635][35023:35028] CHIP:CTL: Sent Attestation request, waiting for the Attestation Information
+          [1655374218.117686][35023:35028] CHIP:DMG: ICR moving to [AwaitingDe]
+          [1655374218.204040][35023:35028] CHIP:DL: HandlePlatformSpecificBLEEvent 16387
+          [1655374218.252180][35023:35026] CHIP:DL: Indication received, conn = 0xffff8003c0c0
+          [1655374218.252405][35023:35028] CHIP:DL: HandlePlatformSpecificBLEEvent 16389
+          [1655374218.352372][35023:35026] CHIP:DL: Indication received, conn = 0xffff8003c0c0
+          [1655374218.352509][35023:35028] CHIP:DL: HandlePlatformSpecificBLEEvent 16389
+          [1655374218.450622][35023:35026] CHIP:DL: Indication received, conn = 0xffff8003c0c0
+          [1655374218.450870][35023:35028] CHIP:DL: HandlePlatformSpecificBLEEvent 16389
+          [1655374218.452138][35023:35028] CHIP:DMG: << from BLE | 224958145 | [Interaction Model  (1) / InvokeCommandResponse (0x09) / Session = 19710 / Exchange = 1302]
+          [1655374218.452241][35023:35028] CHIP:DMG: Header Flags =
+          [1655374218.452300][35023:35028] CHIP:DMG: {
+          [1655374218.452395][35023:35028] CHIP:DMG: }
+          [1655374218.452449][35023:35028] CHIP:DMG:
+          [1655374218.452521][35023:35028] CHIP:DMG: Encrypted Payload (716 bytes) =
+          [1655374218.452579][35023:35028] CHIP:DMG: {
+          [1655374218.452634][35023:35028] CHIP:DMG:     data = 00fe4c00c196680d30c5e98d35a6d844102a8b0067edba80e2adf97e28751f8353657dacb7c9706c2c22add28d18adca15378d16af57f0f4092893cfc5d3e85f6e409f70e39bcb9e0bd3397947e927d20e5bf5173e3def7218d0152cf40e7cb16db615efbd282fd6e84c710bd2c7441228eb5dbbcf0dc76a3eaa0b04655f434d3c8223c7016703b8082c9984c3a91432d12271c87f4d09e90cb6e78d07c81d6359cd5a756f2bace60a7a216896949b536e5583f22db64aeae0279ba2fd279813be383e4324ab63472e3d9877f6c9fa539e577dc50fbcc5a7124a14ea78abdd6ada4ec256a3ee0a242747d636215ffab3c8b4291023eb51b3701939e153912b0f5764479b05e1cf472c350304d1ead872295c80fed3a545530f773e729b6f7bd7d5547de03076a72b8855191beb12d8194477bc9798b6177557cccf3b11b2c1f82cee31d451408359650112394dc2c1592cd2eb1e75881aa340885e65ef9a9905947842574ddcac832d68188b0a3a20fb223258d766692b13a6cde0de34d4f9047046d38ad94caf0a9cc7a786c082d5ae8c62346d69684c6ed5ae958ab68c0685922751ff04d922a838c9d2257a7af6e72af524b459a45ea6311431d30c7de32b3d79581ac119d6e7f63a877b53fda9d69256c5870f2af36f74e08b22e1217a0324b772394a4a596ff237331c623b8d7746077826088dddd2a741f19011cde09f1e897f92ac975fd9a157de0b780f6551b11a50ffe12c781f304dbda9dd75465fb3a8ec52d30f7ddb9179f1b9dfe415ae2d66a53bad67bcf27b3351b8a5cdc9e8b54095c81774007237c8a14a3e2c9cf350616cf5ebf7f6ae5a8c77207924b0e1cddc6c7e77c2a514319947c5988af1dd77325259f496293e53041941d45a1355f56b8036008ab696f7d47d17f9fc4890aa78c2811560b7b4d79a460b7dcd3d9bc3bdd5f72d27bb0060f722aa9c22e7d635895404c832bf2371321d1ababa954482c847fedd0d4676bd188365
+          [1655374218.452884][35023:35028] CHIP:DMG:     buffer_ptr = 281472627984864
+          [1655374218.452941][35023:35028] CHIP:DMG: }
+          [1655374218.452992][35023:35028] CHIP:DMG:
+          [1655374218.453303][35023:35028] CHIP:DMG: Attestation Elements (585 bytes) =
+          [1655374218.453366][35023:35028] CHIP:DMG: {
+          [1655374218.453431][35023:35028] CHIP:DMG:     Certification Declaration =
+          [1655374218.453483][35023:35028] CHIP:DMG:     {
+          [1655374218.455342][35023:35028] CHIP:DMG:         Format Version = 1
+          [1655374218.455398][35023:35028] CHIP:DMG:         Vendor Id = 65521
+          [1655374218.455438][35023:35028] CHIP:DMG:         Product Ids =
+          [1655374218.455474][35023:35028] CHIP:DMG:         {
+          [1655374218.455512][35023:35028] CHIP:DMG:             Product Id = 32768
+          [1655374218.455552][35023:35028] CHIP:DMG:             Product Id = 32769
+          [1655374218.455590][35023:35028] CHIP:DMG:             Product Id = 32770
+          [1655374218.455628][35023:35028] CHIP:DMG:             Product Id = 32771
+          [1655374218.455666][35023:35028] CHIP:DMG:             Product Id = 32772
+          [1655374218.455704][35023:35028] CHIP:DMG:             Product Id = 32773
+          [1655374218.455742][35023:35028] CHIP:DMG:             Product Id = 32774
+          [1655374218.455780][35023:35028] CHIP:DMG:             Product Id = 32775
+          [1655374218.455818][35023:35028] CHIP:DMG:             Product Id = 32776
+          [1655374218.455855][35023:35028] CHIP:DMG:             Product Id = 32777
+          [1655374218.455893][35023:35028] CHIP:DMG:             Product Id = 32778
+          [1655374218.455931][35023:35028] CHIP:DMG:             Product Id = 32779
+          [1655374218.455969][35023:35028] CHIP:DMG:             Product Id = 32780
+          [1655374218.456007][35023:35028] CHIP:DMG:             Product Id = 32781
+          [1655374218.456045][35023:35028] CHIP:DMG:             Product Id = 32782
+          [1655374218.456082][35023:35028] CHIP:DMG:             Product Id = 32783
+          [1655374218.456120][35023:35028] CHIP:DMG:             Product Id = 32784
+          [1655374218.456158][35023:35028] CHIP:DMG:             Product Id = 32785
+          [1655374218.456196][35023:35028] CHIP:DMG:             Product Id = 32786
+          [1655374218.456234][35023:35028] CHIP:DMG:             Product Id = 32787
+          [1655374218.456271][35023:35028] CHIP:DMG:             Product Id = 32788
+          [1655374218.456309][35023:35028] CHIP:DMG:             Product Id = 32789
+          [1655374218.456347][35023:35028] CHIP:DMG:             Product Id = 32790
+          [1655374218.456385][35023:35028] CHIP:DMG:             Product Id = 32791
+          [1655374218.456423][35023:35028] CHIP:DMG:             Product Id = 32792
+          [1655374218.456461][35023:35028] CHIP:DMG:             Product Id = 32793
+          [1655374218.456498][35023:35028] CHIP:DMG:             Product Id = 32794
+          [1655374218.456536][35023:35028] CHIP:DMG:             Product Id = 32795
+          [1655374218.456573][35023:35028] CHIP:DMG:             Product Id = 32796
+          [1655374218.456611][35023:35028] CHIP:DMG:             Product Id = 32797
+          [1655374218.456649][35023:35028] CHIP:DMG:             Product Id = 32798
+          [1655374218.456687][35023:35028] CHIP:DMG:             Product Id = 32799
+          [1655374218.456724][35023:35028] CHIP:DMG:             Product Id = 32800
+          [1655374218.456761][35023:35028] CHIP:DMG:             Product Id = 32801
+          [1655374218.456799][35023:35028] CHIP:DMG:             Product Id = 32802
+          [1655374218.456836][35023:35028] CHIP:DMG:             Product Id = 32803
+          [1655374218.456874][35023:35028] CHIP:DMG:             Product Id = 32804
+          [1655374218.456912][35023:35028] CHIP:DMG:             Product Id = 32805
+          [1655374218.456949][35023:35028] CHIP:DMG:             Product Id = 32806
+          [1655374218.456987][35023:35028] CHIP:DMG:             Product Id = 32807
+          [1655374218.457024][35023:35028] CHIP:DMG:             Product Id = 32808
+          [1655374218.457061][35023:35028] CHIP:DMG:             Product Id = 32809
+          [1655374218.457099][35023:35028] CHIP:DMG:             Product Id = 32810
+          [1655374218.457138][35023:35028] CHIP:DMG:             Product Id = 32811
+          [1655374218.457175][35023:35028] CHIP:DMG:             Product Id = 32812
+          [1655374218.457212][35023:35028] CHIP:DMG:             Product Id = 32813
+          [1655374218.457250][35023:35028] CHIP:DMG:             Product Id = 32814
+          [1655374218.457288][35023:35028] CHIP:DMG:             Product Id = 32815
+          [1655374218.457326][35023:35028] CHIP:DMG:             Product Id = 32816
+          [1655374218.457363][35023:35028] CHIP:DMG:             Product Id = 32817
+          [1655374218.457401][35023:35028] CHIP:DMG:             Product Id = 32818
+          [1655374218.457439][35023:35028] CHIP:DMG:             Product Id = 32819
+          [1655374218.457476][35023:35028] CHIP:DMG:             Product Id = 32820
+          [1655374218.457514][35023:35028] CHIP:DMG:             Product Id = 32821
+          [1655374218.457552][35023:35028] CHIP:DMG:             Product Id = 32822
+          [1655374218.457590][35023:35028] CHIP:DMG:             Product Id = 32823
+          [1655374218.457627][35023:35028] CHIP:DMG:             Product Id = 32824
+          [1655374218.457665][35023:35028] CHIP:DMG:             Product Id = 32825
+          [1655374218.457702][35023:35028] CHIP:DMG:             Product Id = 32826
+          [1655374218.457740][35023:35028] CHIP:DMG:             Product Id = 32827
+          [1655374218.457777][35023:35028] CHIP:DMG:             Product Id = 32828
+          [1655374218.457833][35023:35028] CHIP:DMG:             Product Id = 32829
+          [1655374218.457874][35023:35028] CHIP:DMG:             Product Id = 32830
+          [1655374218.457912][35023:35028] CHIP:DMG:             Product Id = 32831
+          [1655374218.457950][35023:35028] CHIP:DMG:             Product Id = 32832
+          [1655374218.457987][35023:35028] CHIP:DMG:             Product Id = 32833
+          [1655374218.458026][35023:35028] CHIP:DMG:             Product Id = 32834
+          [1655374218.458063][35023:35028] CHIP:DMG:             Product Id = 32835
+          [1655374218.458101][35023:35028] CHIP:DMG:             Product Id = 32836
+          [1655374218.458139][35023:35028] CHIP:DMG:             Product Id = 32837
+          [1655374218.458177][35023:35028] CHIP:DMG:             Product Id = 32838
+          [1655374218.458215][35023:35028] CHIP:DMG:             Product Id = 32839
+          [1655374218.458253][35023:35028] CHIP:DMG:             Product Id = 32840
+          [1655374218.458291][35023:35028] CHIP:DMG:             Product Id = 32841
+          [1655374218.458328][35023:35028] CHIP:DMG:             Product Id = 32842
+          [1655374218.458366][35023:35028] CHIP:DMG:             Product Id = 32843
+          [1655374218.458404][35023:35028] CHIP:DMG:             Product Id = 32844
+          [1655374218.458441][35023:35028] CHIP:DMG:             Product Id = 32845
+          [1655374218.458480][35023:35028] CHIP:DMG:             Product Id = 32846
+          [1655374218.458517][35023:35028] CHIP:DMG:             Product Id = 32847
+          [1655374218.458555][35023:35028] CHIP:DMG:             Product Id = 32848
+          [1655374218.458592][35023:35028] CHIP:DMG:             Product Id = 32849
+          [1655374218.458630][35023:35028] CHIP:DMG:             Product Id = 32850
+          [1655374218.458667][35023:35028] CHIP:DMG:             Product Id = 32851
+          [1655374218.458706][35023:35028] CHIP:DMG:             Product Id = 32852
+          [1655374218.458743][35023:35028] CHIP:DMG:             Product Id = 32853
+          [1655374218.458781][35023:35028] CHIP:DMG:             Product Id = 32854
+          [1655374218.458818][35023:35028] CHIP:DMG:             Product Id = 32855
+          [1655374218.458856][35023:35028] CHIP:DMG:             Product Id = 32856
+          [1655374218.458893][35023:35028] CHIP:DMG:             Product Id = 32857
+          [1655374218.458932][35023:35028] CHIP:DMG:             Product Id = 32858
+          [1655374218.458969][35023:35028] CHIP:DMG:             Product Id = 32859
+          [1655374218.459007][35023:35028] CHIP:DMG:             Product Id = 32860
+          [1655374218.459045][35023:35028] CHIP:DMG:             Product Id = 32861
+          [1655374218.459082][35023:35028] CHIP:DMG:             Product Id = 32862
+          [1655374218.459120][35023:35028] CHIP:DMG:             Product Id = 32863
+          [1655374218.459159][35023:35028] CHIP:DMG:             Product Id = 32864
+          [1655374218.459196][35023:35028] CHIP:DMG:             Product Id = 32865
+          [1655374218.459234][35023:35028] CHIP:DMG:             Product Id = 32866
+          [1655374218.459271][35023:35028] CHIP:DMG:             Product Id = 32867
+          [1655374218.459309][35023:35028] CHIP:DMG:         }
+          [1655374218.459347][35023:35028] CHIP:DMG:         Device Type Id = 22
+          [1655374218.459390][35023:35028] CHIP:DMG:         Certificate Id (19) = ZIG20142ZB330003-24
+          [1655374218.459430][35023:35028] CHIP:DMG:         Security Level = 0
+          [1655374218.459470][35023:35028] CHIP:DMG:         Security Information = 0
+          [1655374218.459508][35023:35028] CHIP:DMG:         Version Number = 9876
+          [1655374218.459546][35023:35028] CHIP:DMG:         Certification Type = 0
+          [1655374218.459584][35023:35028] CHIP:DMG:     }
+          [1655374218.459627][35023:35028] CHIP:DMG:     Attestation Nonce (32) = 762B6B9DA08F7FC63BB693E38634EC6F87CEFF28AB1554A16AD43DCEC24C2466
+          [1655374218.459664][35023:35028] CHIP:DMG:     Timestamp = 0
+          [1655374218.459699][35023:35028] CHIP:DMG: }
       disabled: true
 
     - label:
           "DUT sends AttestationRequest Command with AttestationNonce as field
           to the TH1."
       verification: |
-
+          Verifu in TH log
+          [1655374218.117635][35023:35028] CHIP:CTL: Sent Attestation request, waiting for the Attestation Information
+          [1655374218.117686][35023:35028] CHIP:DMG: ICR moving to [AwaitingDe]
+          [1655374218.204040][35023:35028] CHIP:DL: HandlePlatformSpecificBLEEvent 16387
+          [1655374218.252180][35023:35026] CHIP:DL: Indication received, conn = 0xffff8003c0c0
+          [1655374218.252405][35023:35028] CHIP:DL: HandlePlatformSpecificBLEEvent 16389
+          [1655374218.352372][35023:35026] CHIP:DL: Indication received, conn = 0xffff8003c0c0
+          [1655374218.352509][35023:35028] CHIP:DL: HandlePlatformSpecificBLEEvent 16389
+          [1655374218.450622][35023:35026] CHIP:DL: Indication received, conn = 0xffff8003c0c0
+          [1655374218.450870][35023:35028] CHIP:DL: HandlePlatformSpecificBLEEvent 16389
+          [1655374218.452138][35023:35028] CHIP:DMG: << from BLE | 224958145 | [Interaction Model  (1) / InvokeCommandResponse (0x09) / Session = 19710 / Exchange = 1302]
+          [1655374218.452241][35023:35028] CHIP:DMG: Header Flags =
+          [1655374218.452300][35023:35028] CHIP:DMG: {
+          [1655374218.452395][35023:35028] CHIP:DMG: }
+          [1655374218.452449][35023:35028] CHIP:DMG:
+          [1655374218.452521][35023:35028] CHIP:DMG: Encrypted Payload (716 bytes) =
+          [1655374218.452579][35023:35028] CHIP:DMG: {
+          [1655374218.452634][35023:35028] CHIP:DMG:     data = 00fe4c00c196680d30c5e98d35a6d844102a8b0067edba80e2adf97e28751f8353657dacb7c9706c2c22add28d18adca15378d16af57f0f4092893cfc5d3e85f6e409f70e39bcb9e0bd3397947e927d20e5bf5173e3def7218d0152cf40e7cb16db615efbd282fd6e84c710bd2c7441228eb5dbbcf0dc76a3eaa0b04655f434d3c8223c7016703b8082c9984c3a91432d12271c87f4d09e90cb6e78d07c81d6359cd5a756f2bace60a7a216896949b536e5583f22db64aeae0279ba2fd279813be383e4324ab63472e3d9877f6c9fa539e577dc50fbcc5a7124a14ea78abdd6ada4ec256a3ee0a242747d636215ffab3c8b4291023eb51b3701939e153912b0f5764479b05e1cf472c350304d1ead872295c80fed3a545530f773e729b6f7bd7d5547de03076a72b8855191beb12d8194477bc9798b6177557cccf3b11b2c1f82cee31d451408359650112394dc2c1592cd2eb1e75881aa340885e65ef9a9905947842574ddcac832d68188b0a3a20fb223258d766692b13a6cde0de34d4f9047046d38ad94caf0a9cc7a786c082d5ae8c62346d69684c6ed5ae958ab68c0685922751ff04d922a838c9d2257a7af6e72af524b459a45ea6311431d30c7de32b3d79581ac119d6e7f63a877b53fda9d69256c5870f2af36f74e08b22e1217a0324b772394a4a596ff237331c623b8d7746077826088dddd2a741f19011cde09f1e897f92ac975fd9a157de0b780f6551b11a50ffe12c781f304dbda9dd75465fb3a8ec52d30f7ddb9179f1b9dfe415ae2d66a53bad67bcf27b3351b8a5cdc9e8b54095c81774007237c8a14a3e2c9cf350616cf5ebf7f6ae5a8c77207924b0e1cddc6c7e77c2a514319947c5988af1dd77325259f496293e53041941d45a1355f56b8036008ab696f7d47d17f9fc4890aa78c2811560b7b4d79a460b7dcd3d9bc3bdd5f72d27bb0060f722aa9c22e7d635895404c832bf2371321d1ababa954482c847fedd0d4676bd188365
+          [1655374218.452884][35023:35028] CHIP:DMG:     buffer_ptr = 281472627984864
+          [1655374218.452941][35023:35028] CHIP:DMG: }
+          [1655374218.452992][35023:35028] CHIP:DMG:
+          [1655374218.453303][35023:35028] CHIP:DMG: Attestation Elements (585 bytes) =
+          [1655374218.453366][35023:35028] CHIP:DMG: {
+          [1655374218.453431][35023:35028] CHIP:DMG:     Certification Declaration =
+          [1655374218.453483][35023:35028] CHIP:DMG:     {
+          [1655374218.455342][35023:35028] CHIP:DMG:         Format Version = 1
+          [1655374218.455398][35023:35028] CHIP:DMG:         Vendor Id = 65521
+          [1655374218.455438][35023:35028] CHIP:DMG:         Product Ids =
+          [1655374218.455474][35023:35028] CHIP:DMG:         {
+          [1655374218.455512][35023:35028] CHIP:DMG:             Product Id = 32768
+          [1655374218.455552][35023:35028] CHIP:DMG:             Product Id = 32769
+          [1655374218.455590][35023:35028] CHIP:DMG:             Product Id = 32770
+          [1655374218.455628][35023:35028] CHIP:DMG:             Product Id = 32771
+          [1655374218.455666][35023:35028] CHIP:DMG:             Product Id = 32772
+          [1655374218.455704][35023:35028] CHIP:DMG:             Product Id = 32773
+          [1655374218.455742][35023:35028] CHIP:DMG:             Product Id = 32774
+          [1655374218.455780][35023:35028] CHIP:DMG:             Product Id = 32775
+          [1655374218.455818][35023:35028] CHIP:DMG:             Product Id = 32776
+          [1655374218.455855][35023:35028] CHIP:DMG:             Product Id = 32777
+          [1655374218.455893][35023:35028] CHIP:DMG:             Product Id = 32778
+          [1655374218.455931][35023:35028] CHIP:DMG:             Product Id = 32779
+          [1655374218.455969][35023:35028] CHIP:DMG:             Product Id = 32780
+          [1655374218.456007][35023:35028] CHIP:DMG:             Product Id = 32781
+          [1655374218.456045][35023:35028] CHIP:DMG:             Product Id = 32782
+          [1655374218.456082][35023:35028] CHIP:DMG:             Product Id = 32783
+          [1655374218.456120][35023:35028] CHIP:DMG:             Product Id = 32784
+          [1655374218.456158][35023:35028] CHIP:DMG:             Product Id = 32785
+          [1655374218.456196][35023:35028] CHIP:DMG:             Product Id = 32786
+          [1655374218.456234][35023:35028] CHIP:DMG:             Product Id = 32787
+          [1655374218.456271][35023:35028] CHIP:DMG:             Product Id = 32788
+          [1655374218.456309][35023:35028] CHIP:DMG:             Product Id = 32789
+          [1655374218.456347][35023:35028] CHIP:DMG:             Product Id = 32790
+          [1655374218.456385][35023:35028] CHIP:DMG:             Product Id = 32791
+          [1655374218.456423][35023:35028] CHIP:DMG:             Product Id = 32792
+          [1655374218.456461][35023:35028] CHIP:DMG:             Product Id = 32793
+          [1655374218.456498][35023:35028] CHIP:DMG:             Product Id = 32794
+          [1655374218.456536][35023:35028] CHIP:DMG:             Product Id = 32795
+          [1655374218.456573][35023:35028] CHIP:DMG:             Product Id = 32796
+          [1655374218.456611][35023:35028] CHIP:DMG:             Product Id = 32797
+          [1655374218.456649][35023:35028] CHIP:DMG:             Product Id = 32798
+          [1655374218.456687][35023:35028] CHIP:DMG:             Product Id = 32799
+          [1655374218.456724][35023:35028] CHIP:DMG:             Product Id = 32800
+          [1655374218.456761][35023:35028] CHIP:DMG:             Product Id = 32801
+          [1655374218.456799][35023:35028] CHIP:DMG:             Product Id = 32802
+          [1655374218.456836][35023:35028] CHIP:DMG:             Product Id = 32803
+          [1655374218.456874][35023:35028] CHIP:DMG:             Product Id = 32804
+          [1655374218.456912][35023:35028] CHIP:DMG:             Product Id = 32805
+          [1655374218.456949][35023:35028] CHIP:DMG:             Product Id = 32806
+          [1655374218.456987][35023:35028] CHIP:DMG:             Product Id = 32807
+          [1655374218.457024][35023:35028] CHIP:DMG:             Product Id = 32808
+          [1655374218.457061][35023:35028] CHIP:DMG:             Product Id = 32809
+          [1655374218.457099][35023:35028] CHIP:DMG:             Product Id = 32810
+          [1655374218.457138][35023:35028] CHIP:DMG:             Product Id = 32811
+          [1655374218.457175][35023:35028] CHIP:DMG:             Product Id = 32812
+          [1655374218.457212][35023:35028] CHIP:DMG:             Product Id = 32813
+          [1655374218.457250][35023:35028] CHIP:DMG:             Product Id = 32814
+          [1655374218.457288][35023:35028] CHIP:DMG:             Product Id = 32815
+          [1655374218.457326][35023:35028] CHIP:DMG:             Product Id = 32816
+          [1655374218.457363][35023:35028] CHIP:DMG:             Product Id = 32817
+          [1655374218.457401][35023:35028] CHIP:DMG:             Product Id = 32818
+          [1655374218.457439][35023:35028] CHIP:DMG:             Product Id = 32819
+          [1655374218.457476][35023:35028] CHIP:DMG:             Product Id = 32820
+          [1655374218.457514][35023:35028] CHIP:DMG:             Product Id = 32821
+          [1655374218.457552][35023:35028] CHIP:DMG:             Product Id = 32822
+          [1655374218.457590][35023:35028] CHIP:DMG:             Product Id = 32823
+          [1655374218.457627][35023:35028] CHIP:DMG:             Product Id = 32824
+          [1655374218.457665][35023:35028] CHIP:DMG:             Product Id = 32825
+          [1655374218.457702][35023:35028] CHIP:DMG:             Product Id = 32826
+          [1655374218.457740][35023:35028] CHIP:DMG:             Product Id = 32827
+          [1655374218.457777][35023:35028] CHIP:DMG:             Product Id = 32828
+          [1655374218.457833][35023:35028] CHIP:DMG:             Product Id = 32829
+          [1655374218.457874][35023:35028] CHIP:DMG:             Product Id = 32830
+          [1655374218.457912][35023:35028] CHIP:DMG:             Product Id = 32831
+          [1655374218.457950][35023:35028] CHIP:DMG:             Product Id = 32832
+          [1655374218.457987][35023:35028] CHIP:DMG:             Product Id = 32833
+          [1655374218.458026][35023:35028] CHIP:DMG:             Product Id = 32834
+          [1655374218.458063][35023:35028] CHIP:DMG:             Product Id = 32835
+          [1655374218.458101][35023:35028] CHIP:DMG:             Product Id = 32836
+          [1655374218.458139][35023:35028] CHIP:DMG:             Product Id = 32837
+          [1655374218.458177][35023:35028] CHIP:DMG:             Product Id = 32838
+          [1655374218.458215][35023:35028] CHIP:DMG:             Product Id = 32839
+          [1655374218.458253][35023:35028] CHIP:DMG:             Product Id = 32840
+          [1655374218.458291][35023:35028] CHIP:DMG:             Product Id = 32841
+          [1655374218.458328][35023:35028] CHIP:DMG:             Product Id = 32842
+          [1655374218.458366][35023:35028] CHIP:DMG:             Product Id = 32843
+          [1655374218.458404][35023:35028] CHIP:DMG:             Product Id = 32844
+          [1655374218.458441][35023:35028] CHIP:DMG:             Product Id = 32845
+          [1655374218.458480][35023:35028] CHIP:DMG:             Product Id = 32846
+          [1655374218.458517][35023:35028] CHIP:DMG:             Product Id = 32847
+          [1655374218.458555][35023:35028] CHIP:DMG:             Product Id = 32848
+          [1655374218.458592][35023:35028] CHIP:DMG:             Product Id = 32849
+          [1655374218.458630][35023:35028] CHIP:DMG:             Product Id = 32850
+          [1655374218.458667][35023:35028] CHIP:DMG:             Product Id = 32851
+          [1655374218.458706][35023:35028] CHIP:DMG:             Product Id = 32852
+          [1655374218.458743][35023:35028] CHIP:DMG:             Product Id = 32853
+          [1655374218.458781][35023:35028] CHIP:DMG:             Product Id = 32854
+          [1655374218.458818][35023:35028] CHIP:DMG:             Product Id = 32855
+          [1655374218.458856][35023:35028] CHIP:DMG:             Product Id = 32856
+          [1655374218.458893][35023:35028] CHIP:DMG:             Product Id = 32857
+          [1655374218.458932][35023:35028] CHIP:DMG:             Product Id = 32858
+          [1655374218.458969][35023:35028] CHIP:DMG:             Product Id = 32859
+          [1655374218.459007][35023:35028] CHIP:DMG:             Product Id = 32860
+          [1655374218.459045][35023:35028] CHIP:DMG:             Product Id = 32861
+          [1655374218.459082][35023:35028] CHIP:DMG:             Product Id = 32862
+          [1655374218.459120][35023:35028] CHIP:DMG:             Product Id = 32863
+          [1655374218.459159][35023:35028] CHIP:DMG:             Product Id = 32864
+          [1655374218.459196][35023:35028] CHIP:DMG:             Product Id = 32865
+          [1655374218.459234][35023:35028] CHIP:DMG:             Product Id = 32866
+          [1655374218.459271][35023:35028] CHIP:DMG:             Product Id = 32867
+          [1655374218.459309][35023:35028] CHIP:DMG:         }
+          [1655374218.459347][35023:35028] CHIP:DMG:         Device Type Id = 22
+          [1655374218.459390][35023:35028] CHIP:DMG:         Certificate Id (19) = ZIG20142ZB330003-24
+          [1655374218.459430][35023:35028] CHIP:DMG:         Security Level = 0
+          [1655374218.459470][35023:35028] CHIP:DMG:         Security Information = 0
+          [1655374218.459508][35023:35028] CHIP:DMG:         Version Number = 9876
+          [1655374218.459546][35023:35028] CHIP:DMG:         Certification Type = 0
+          [1655374218.459584][35023:35028] CHIP:DMG:     }
+          [1655374218.459627][35023:35028] CHIP:DMG:     Attestation Nonce (32) = 762B6B9DA08F7FC63BB693E38634EC6F87CEFF28AB1554A16AD43DCEC24C2466
+          [1655374218.459664][35023:35028] CHIP:DMG:     Timestamp = 0
+          [1655374218.459699][35023:35028] CHIP:DMG: }
       disabled: true
 
     - label:
           "TH1 responds to the DUT with an invalid AttestationResponse Command
-          by setting the following error condition: Commissionee is not yet
+          by setting the following error condition: 1. Commissionee is not yet
           certified"
       verification: |
-          Verify that DUT notifies a warning stating that Commissionee is not a fully trusted device.
-          Verify that the warning contains the information about the reason for error condition.
-          If the warning message indicates that Commissioning is allowed then confirm that CSRRequest Command is sent from DUT to TH1
+
       disabled: true
 
     - label: "Factory Reset TH1 so that it is commissionable again"
       verification: |
+          "DUT side:
+          sudo rm -rf /tmp/chip_*
+          sudo ./chip-all-clusters-app --wifi
+
+          TH side:
+          ./chip-tool pairing ble-wifi 1 zigbeehome matter123 20202021 3841 --trace_decode 1
 
+          [1650455358.501816][4366:4371] CHIP:TOO: Device commissioning completed with success"
       disabled: true
 
     - label:
           "Repeat step 1 to step 7 and for step 5 set different error condition
-          as below: Commissionees PAA is not in the Commissioners trusted set.
-          Commissionee provides an invalid DAC and PAI chain as validated by TH
-          against the RFC5280 certificate Basic path validation algorithm
-          Commissionee provides DAC with validity period that is not in range of
-          PAA/PAI"
+          as below: 1. Commissionees PAA is not in the Commissioners trusted
+          set. 2. Commissionee provides an invalid DAC and PAI chain as
+          validated by TH against the RFC5280 certificate Basic path validation
+          algorithm 3. Commissionee provides DAC with validity period that is
+          not in range of PAA/PAI"
       verification: |
 
       disabled: true
 
     - label:
           "Repeat step 1 to step 7 and for step 5 set different error condition:
-          Certification Declaration has only one of the following fields
-          dac_origin_vendor_id dac_origin_product_id vendor_id field in the
+          1. Certification Declaration has only one of the following fields
+          dac_origin_vendor_id dac_origin_product_id 2. vendor_id field in the
           Certification Declaration does not match with the VendorID attribute
-          found in the Basic Information cluster The Vendor ID in the DAC does
-          not match the vendor_id field in the Certification Declaration. The
-          Product ID (PID) the DAC is not present in the product_id_array field
-          in the Certification Declaration"
+          found in the Basic Information cluster 3. The Vendor ID in the DAC
+          does not match the vendor_id field in the Certification Declaration.
+          4. The Product ID (PID) the DAC is not present in the product_id_array
+          field in the Certification Declaration"
       verification: |
 
       disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_DA_1_5.yaml b/src/app/tests/suites/certification/Test_TC_DA_1_5.yaml
index ca76c215c1055e..6556f7cd04c0a8 100644
--- a/src/app/tests/suites/certification/Test_TC_DA_1_5.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DA_1_5.yaml
@@ -13,7 +13,7 @@
 # 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: 17.1.5. [TC-DA-1.5] NOCSR Procedure Validation [DUT - Commissionee]
+name: 4.1.5. [TC-DA-1.5] NOCSR Procedure Validation [DUT - Commissionee]
 
 config:
     nodeId: 0x12344321
@@ -23,73 +23,581 @@ config:
 tests:
     - label: "TH1 Completes the Attestation procedure"
       verification: |
+          Verify in TH log:
 
+          [1655374218.114327][35023:35028] CHIP:CTL: Performing next commissioning step 'SendAttestationRequest'
+          [1655374218.114378][35023:35028] CHIP:CTL: Sending Attestation Request to the device.
+          [1655374218.114556][35023:35028] CHIP:CTL: Sending Attestation request to 0xffff74000b60 device
+          [1655374218.114675][35023:35028] CHIP:DMG: ICR moving to [AddingComm]
+          [1655374218.114746][35023:35028] CHIP:DMG: ICR moving to [AddedComma]
+          [1655374218.115227][35023:35028] CHIP:IN: Prepared secure message 0xffff7bffc958 to 0xFFFFFFFB00000000 (0)  of type 0x8 and protocolId (0, 1) on exchange 1302i with MessageCounter:20936210.
+          [1655374218.115326][35023:35028] CHIP:IN: Sending encrypted msg 0xffff7bffc958 with MessageCounter:20936210 to 0xFFFFFFFB00000000 (0) at monotonic time: 00000000004F8059 msec
+          [1655374218.115908][35023:35028] CHIP:DMG: >> to BLE | 20936210 | [Interaction Model  (1) / InvokeCommandRequest (0x08) / Session = 43668 / Exchange = 1302]
+          [1655374218.116008][35023:35028] CHIP:DMG: Header Flags =
+          [1655374218.116065][35023:35028] CHIP:DMG: {
+          [1655374218.116149][35023:35028] CHIP:DMG:     Exchange (0x01) =
+          [1655374218.116187][35023:35028] CHIP:DMG:     {
+          [1655374218.116209][35023:35028] CHIP:DMG:         Initiator = true
+          [1655374218.116233][35023:35028] CHIP:DMG:     }
+          [1655374218.116264][35023:35028] CHIP:DMG: }
+          [1655374218.116288][35023:35028] CHIP:DMG:
+          [1655374218.116381][35023:35028] CHIP:DMG: Encrypted Payload (94 bytes) =
+          [1655374218.116408][35023:35028] CHIP:DMG: {
+          [1655374218.116432][35023:35028] CHIP:DMG:     data = 0094aa0012763f01f66833cd7fd4d0b928d486cd8459db3eb0f11f7b48d3145a810b0c2e03ea68c89e4ee9cf28127369ac0eef32376c5303945a2fe8c99d13a49086721cd68804d90415fef75a0b464605f2d0245f293767a4077eb7d5eb
+          [1655374218.116458][35023:35028] CHIP:DMG:     buffer_ptr = 281472627988496
+          [1655374218.116482][35023:35028] CHIP:DMG: }
+          [1655374218.116505][35023:35028] CHIP:DMG:
+          [1655374218.116585][35023:35028] CHIP:DMG: InvokeRequestMessage =
+          [1655374218.116614][35023:35028] CHIP:DMG: {
+          [1655374218.116640][35023:35028] CHIP:DMG: 	suppressResponse = false,
+          [1655374218.116669][35023:35028] CHIP:DMG: 	timedRequest = false,
+          [1655374218.116697][35023:35028] CHIP:DMG: 	InvokeRequests =
+          [1655374218.116732][35023:35028] CHIP:DMG: 	[
+          [1655374218.116759][35023:35028] CHIP:DMG: 		CommandDataIB =
+          [1655374218.116790][35023:35028] CHIP:DMG: 		{
+          [1655374218.116818][35023:35028] CHIP:DMG: 			CommandPathIB =
+          [1655374218.116853][35023:35028] CHIP:DMG: 			{
+          [1655374218.116888][35023:35028] CHIP:DMG: 				EndpointId = 0x0,
+          [1655374218.116926][35023:35028] CHIP:DMG: 				ClusterId = 0x3e,
+          [1655374218.116966][35023:35028] CHIP:DMG: 				CommandId = 0x0,
+          [1655374218.117000][35023:35028] CHIP:DMG: 			},
+          [1655374218.117037][35023:35028] CHIP:DMG:
+          [1655374218.117068][35023:35028] CHIP:DMG: 			CommandFields =
+          [1655374218.117103][35023:35028] CHIP:DMG: 			{
+          [1655374218.117137][35023:35028] CHIP:DMG: 				0x0 = [
+          [1655374218.117184][35023:35028] CHIP:DMG: 					0x76, 0x2b, 0x6b, 0x9d, 0xa0, 0x8f, 0x7f, 0xc6, 0x3b, 0xb6, 0x93, 0xe3, 0x86, 0x34, 0xec, 0x6f, 0x87, 0xce, 0xff, 0x28, 0xab, 0x15, 0x54, 0xa1, 0x6a, 0xd4, 0x3d, 0xce, 0xc2, 0x4c, 0x24, 0x66,
+          [1655374218.117223][35023:35028] CHIP:DMG: 			]
+          [1655374218.117257][35023:35028] CHIP:DMG: 			},
+          [1655374218.117290][35023:35028] CHIP:DMG: 		},
+          [1655374218.117323][35023:35028] CHIP:DMG:
+          [1655374218.117350][35023:35028] CHIP:DMG: 	],
+          [1655374218.117384][35023:35028] CHIP:DMG:
+          [1655374218.117410][35023:35028] CHIP:DMG: 	InteractionModelRevision = 1
+          [1655374218.117436][35023:35028] CHIP:DMG: },
+          [1655374218.117462][35023:35028] CHIP:DMG:
+          [1655374218.117597][35023:35028] CHIP:DMG: ICR moving to [CommandSen]
+          [1655374218.117635][35023:35028] CHIP:CTL: Sent Attestation request, waiting for the Attestation Information
+          [1655374218.117686][35023:35028] CHIP:DMG: ICR moving to [AwaitingDe]
+          [1655374218.204040][35023:35028] CHIP:DL: HandlePlatformSpecificBLEEvent 16387
+          [1655374218.252180][35023:35026] CHIP:DL: Indication received, conn = 0xffff8003c0c0
+          [1655374218.252405][35023:35028] CHIP:DL: HandlePlatformSpecificBLEEvent 16389
+          [1655374218.352372][35023:35026] CHIP:DL: Indication received, conn = 0xffff8003c0c0
+          [1655374218.352509][35023:35028] CHIP:DL: HandlePlatformSpecificBLEEvent 16389
+          [1655374218.450622][35023:35026] CHIP:DL: Indication received, conn = 0xffff8003c0c0
+          [1655374218.450870][35023:35028] CHIP:DL: HandlePlatformSpecificBLEEvent 16389
+          [1655374218.452138][35023:35028] CHIP:DMG: << from BLE | 224958145 | [Interaction Model  (1) / InvokeCommandResponse (0x09) / Session = 19710 / Exchange = 1302]
+          [1655374218.452241][35023:35028] CHIP:DMG: Header Flags =
+          [1655374218.452300][35023:35028] CHIP:DMG: {
+          [1655374218.452395][35023:35028] CHIP:DMG: }
+          [1655374218.452449][35023:35028] CHIP:DMG:
+          [1655374218.452521][35023:35028] CHIP:DMG: Encrypted Payload (716 bytes) =
+          [1655374218.452579][35023:35028] CHIP:DMG: {
+          [1655374218.452634][35023:35028] CHIP:DMG:     data = 00fe4c00c196680d30c5e98d35a6d844102a8b0067edba80e2adf97e28751f8353657dacb7c9706c2c22add28d18adca15378d16af57f0f4092893cfc5d3e85f6e409f70e39bcb9e0bd3397947e927d20e5bf5173e3def7218d0152cf40e7cb16db615efbd282fd6e84c710bd2c7441228eb5dbbcf0dc76a3eaa0b04655f434d3c8223c7016703b8082c9984c3a91432d12271c87f4d09e90cb6e78d07c81d6359cd5a756f2bace60a7a216896949b536e5583f22db64aeae0279ba2fd279813be383e4324ab63472e3d9877f6c9fa539e577dc50fbcc5a7124a14ea78abdd6ada4ec256a3ee0a242747d636215ffab3c8b4291023eb51b3701939e153912b0f5764479b05e1cf472c350304d1ead872295c80fed3a545530f773e729b6f7bd7d5547de03076a72b8855191beb12d8194477bc9798b6177557cccf3b11b2c1f82cee31d451408359650112394dc2c1592cd2eb1e75881aa340885e65ef9a9905947842574ddcac832d68188b0a3a20fb223258d766692b13a6cde0de34d4f9047046d38ad94caf0a9cc7a786c082d5ae8c62346d69684c6ed5ae958ab68c0685922751ff04d922a838c9d2257a7af6e72af524b459a45ea6311431d30c7de32b3d79581ac119d6e7f63a877b53fda9d69256c5870f2af36f74e08b22e1217a0324b772394a4a596ff237331c623b8d7746077826088dddd2a741f19011cde09f1e897f92ac975fd9a157de0b780f6551b11a50ffe12c781f304dbda9dd75465fb3a8ec52d30f7ddb9179f1b9dfe415ae2d66a53bad67bcf27b3351b8a5cdc9e8b54095c81774007237c8a14a3e2c9cf350616cf5ebf7f6ae5a8c77207924b0e1cddc6c7e77c2a514319947c5988af1dd77325259f496293e53041941d45a1355f56b8036008ab696f7d47d17f9fc4890aa78c2811560b7b4d79a460b7dcd3d9bc3bdd5f72d27bb0060f722aa9c22e7d635895404c832bf2371321d1ababa954482c847fedd0d4676bd188365
+          [1655374218.452884][35023:35028] CHIP:DMG:     buffer_ptr = 281472627984864
+          [1655374218.452941][35023:35028] CHIP:DMG: }
+          [1655374218.452992][35023:35028] CHIP:DMG:
+          [1655374218.453303][35023:35028] CHIP:DMG: Attestation Elements (585 bytes) =
+          [1655374218.453366][35023:35028] CHIP:DMG: {
+          [1655374218.453431][35023:35028] CHIP:DMG:     Certification Declaration =
+          [1655374218.453483][35023:35028] CHIP:DMG:     {
+          [1655374218.455342][35023:35028] CHIP:DMG:         Format Version = 1
+          [1655374218.455398][35023:35028] CHIP:DMG:         Vendor Id = 65521
+          [1655374218.455438][35023:35028] CHIP:DMG:         Product Ids =
+          [1655374218.455474][35023:35028] CHIP:DMG:         {
+          [1655374218.455512][35023:35028] CHIP:DMG:             Product Id = 32768
+          [1655374218.455552][35023:35028] CHIP:DMG:             Product Id = 32769
+          [1655374218.455590][35023:35028] CHIP:DMG:             Product Id = 32770
+          [1655374218.455628][35023:35028] CHIP:DMG:             Product Id = 32771
+          [1655374218.455666][35023:35028] CHIP:DMG:             Product Id = 32772
+          [1655374218.455704][35023:35028] CHIP:DMG:             Product Id = 32773
+          [1655374218.455742][35023:35028] CHIP:DMG:             Product Id = 32774
+          [1655374218.455780][35023:35028] CHIP:DMG:             Product Id = 32775
+          [1655374218.455818][35023:35028] CHIP:DMG:             Product Id = 32776
+          [1655374218.455855][35023:35028] CHIP:DMG:             Product Id = 32777
+          [1655374218.455893][35023:35028] CHIP:DMG:             Product Id = 32778
+          [1655374218.455931][35023:35028] CHIP:DMG:             Product Id = 32779
+          [1655374218.455969][35023:35028] CHIP:DMG:             Product Id = 32780
+          [1655374218.456007][35023:35028] CHIP:DMG:             Product Id = 32781
+          [1655374218.456045][35023:35028] CHIP:DMG:             Product Id = 32782
+          [1655374218.456082][35023:35028] CHIP:DMG:             Product Id = 32783
+          [1655374218.456120][35023:35028] CHIP:DMG:             Product Id = 32784
+          [1655374218.456158][35023:35028] CHIP:DMG:             Product Id = 32785
+          [1655374218.456196][35023:35028] CHIP:DMG:             Product Id = 32786
+          [1655374218.456234][35023:35028] CHIP:DMG:             Product Id = 32787
+          [1655374218.456271][35023:35028] CHIP:DMG:             Product Id = 32788
+          [1655374218.456309][35023:35028] CHIP:DMG:             Product Id = 32789
+          [1655374218.456347][35023:35028] CHIP:DMG:             Product Id = 32790
+          [1655374218.456385][35023:35028] CHIP:DMG:             Product Id = 32791
+          [1655374218.456423][35023:35028] CHIP:DMG:             Product Id = 32792
+          [1655374218.456461][35023:35028] CHIP:DMG:             Product Id = 32793
+          [1655374218.456498][35023:35028] CHIP:DMG:             Product Id = 32794
+          [1655374218.456536][35023:35028] CHIP:DMG:             Product Id = 32795
+          [1655374218.456573][35023:35028] CHIP:DMG:             Product Id = 32796
+          [1655374218.456611][35023:35028] CHIP:DMG:             Product Id = 32797
+          [1655374218.456649][35023:35028] CHIP:DMG:             Product Id = 32798
+          [1655374218.456687][35023:35028] CHIP:DMG:             Product Id = 32799
+          [1655374218.456724][35023:35028] CHIP:DMG:             Product Id = 32800
+          [1655374218.456761][35023:35028] CHIP:DMG:             Product Id = 32801
+          [1655374218.456799][35023:35028] CHIP:DMG:             Product Id = 32802
+          [1655374218.456836][35023:35028] CHIP:DMG:             Product Id = 32803
+          [1655374218.456874][35023:35028] CHIP:DMG:             Product Id = 32804
+          [1655374218.456912][35023:35028] CHIP:DMG:             Product Id = 32805
+          [1655374218.456949][35023:35028] CHIP:DMG:             Product Id = 32806
+          [1655374218.456987][35023:35028] CHIP:DMG:             Product Id = 32807
+          [1655374218.457024][35023:35028] CHIP:DMG:             Product Id = 32808
+          [1655374218.457061][35023:35028] CHIP:DMG:             Product Id = 32809
+          [1655374218.457099][35023:35028] CHIP:DMG:             Product Id = 32810
+          [1655374218.457138][35023:35028] CHIP:DMG:             Product Id = 32811
+          [1655374218.457175][35023:35028] CHIP:DMG:             Product Id = 32812
+          [1655374218.457212][35023:35028] CHIP:DMG:             Product Id = 32813
+          [1655374218.457250][35023:35028] CHIP:DMG:             Product Id = 32814
+          [1655374218.457288][35023:35028] CHIP:DMG:             Product Id = 32815
+          [1655374218.457326][35023:35028] CHIP:DMG:             Product Id = 32816
+          [1655374218.457363][35023:35028] CHIP:DMG:             Product Id = 32817
+          [1655374218.457401][35023:35028] CHIP:DMG:             Product Id = 32818
+          [1655374218.457439][35023:35028] CHIP:DMG:             Product Id = 32819
+          [1655374218.457476][35023:35028] CHIP:DMG:             Product Id = 32820
+          [1655374218.457514][35023:35028] CHIP:DMG:             Product Id = 32821
+          [1655374218.457552][35023:35028] CHIP:DMG:             Product Id = 32822
+          [1655374218.457590][35023:35028] CHIP:DMG:             Product Id = 32823
+          [1655374218.457627][35023:35028] CHIP:DMG:             Product Id = 32824
+          [1655374218.457665][35023:35028] CHIP:DMG:             Product Id = 32825
+          [1655374218.457702][35023:35028] CHIP:DMG:             Product Id = 32826
+          [1655374218.457740][35023:35028] CHIP:DMG:             Product Id = 32827
+          [1655374218.457777][35023:35028] CHIP:DMG:             Product Id = 32828
+          [1655374218.457833][35023:35028] CHIP:DMG:             Product Id = 32829
+          [1655374218.457874][35023:35028] CHIP:DMG:             Product Id = 32830
+          [1655374218.457912][35023:35028] CHIP:DMG:             Product Id = 32831
+          [1655374218.457950][35023:35028] CHIP:DMG:             Product Id = 32832
+          [1655374218.457987][35023:35028] CHIP:DMG:             Product Id = 32833
+          [1655374218.458026][35023:35028] CHIP:DMG:             Product Id = 32834
+          [1655374218.458063][35023:35028] CHIP:DMG:             Product Id = 32835
+          [1655374218.458101][35023:35028] CHIP:DMG:             Product Id = 32836
+          [1655374218.458139][35023:35028] CHIP:DMG:             Product Id = 32837
+          [1655374218.458177][35023:35028] CHIP:DMG:             Product Id = 32838
+          [1655374218.458215][35023:35028] CHIP:DMG:             Product Id = 32839
+          [1655374218.458253][35023:35028] CHIP:DMG:             Product Id = 32840
+          [1655374218.458291][35023:35028] CHIP:DMG:             Product Id = 32841
+          [1655374218.458328][35023:35028] CHIP:DMG:             Product Id = 32842
+          [1655374218.458366][35023:35028] CHIP:DMG:             Product Id = 32843
+          [1655374218.458404][35023:35028] CHIP:DMG:             Product Id = 32844
+          [1655374218.458441][35023:35028] CHIP:DMG:             Product Id = 32845
+          [1655374218.458480][35023:35028] CHIP:DMG:             Product Id = 32846
+          [1655374218.458517][35023:35028] CHIP:DMG:             Product Id = 32847
+          [1655374218.458555][35023:35028] CHIP:DMG:             Product Id = 32848
+          [1655374218.458592][35023:35028] CHIP:DMG:             Product Id = 32849
+          [1655374218.458630][35023:35028] CHIP:DMG:             Product Id = 32850
+          [1655374218.458667][35023:35028] CHIP:DMG:             Product Id = 32851
+          [1655374218.458706][35023:35028] CHIP:DMG:             Product Id = 32852
+          [1655374218.458743][35023:35028] CHIP:DMG:             Product Id = 32853
+          [1655374218.458781][35023:35028] CHIP:DMG:             Product Id = 32854
+          [1655374218.458818][35023:35028] CHIP:DMG:             Product Id = 32855
+          [1655374218.458856][35023:35028] CHIP:DMG:             Product Id = 32856
+          [1655374218.458893][35023:35028] CHIP:DMG:             Product Id = 32857
+          [1655374218.458932][35023:35028] CHIP:DMG:             Product Id = 32858
+          [1655374218.458969][35023:35028] CHIP:DMG:             Product Id = 32859
+          [1655374218.459007][35023:35028] CHIP:DMG:             Product Id = 32860
+          [1655374218.459045][35023:35028] CHIP:DMG:             Product Id = 32861
+          [1655374218.459082][35023:35028] CHIP:DMG:             Product Id = 32862
+          [1655374218.459120][35023:35028] CHIP:DMG:             Product Id = 32863
+          [1655374218.459159][35023:35028] CHIP:DMG:             Product Id = 32864
+          [1655374218.459196][35023:35028] CHIP:DMG:             Product Id = 32865
+          [1655374218.459234][35023:35028] CHIP:DMG:             Product Id = 32866
+          [1655374218.459271][35023:35028] CHIP:DMG:             Product Id = 32867
+          [1655374218.459309][35023:35028] CHIP:DMG:         }
+          [1655374218.459347][35023:35028] CHIP:DMG:         Device Type Id = 22
+          [1655374218.459390][35023:35028] CHIP:DMG:         Certificate Id (19) = ZIG20142ZB330003-24
+          [1655374218.459430][35023:35028] CHIP:DMG:         Security Level = 0
+          [1655374218.459470][35023:35028] CHIP:DMG:         Security Information = 0
+          [1655374218.459508][35023:35028] CHIP:DMG:         Version Number = 9876
+          [1655374218.459546][35023:35028] CHIP:DMG:         Certification Type = 0
+          [1655374218.459584][35023:35028] CHIP:DMG:     }
+          [1655374218.459627][35023:35028] CHIP:DMG:     Attestation Nonce (32) = 762B6B9DA08F7FC63BB693E38634EC6F87CEFF28AB1554A16AD43DCEC24C2466
+          [1655374218.459664][35023:35028] CHIP:DMG:     Timestamp = 0
+          [1655374218.459699][35023:35028] CHIP:DMG: }
+          [1655374218.459732][35023:35028] CHIP:DMG:
+          [1655374218.459776][35023:35028] CHIP:DMG:
+          [1655374218.459846][35023:35028] CHIP:DMG: Additional Fields =
+          [1655374218.459884][35023:35028] CHIP:DMG: {
+          [1655374218.459924][35023:35028] CHIP:DMG:     peer_address = BLE
+          [1655374218.459960][35023:35028] CHIP:DMG: }
+          [1655374218.459993][35023:35028] CHIP:DMG:
+          [1655374218.460045][35023:35028] CHIP:EM: Received message of type 0x9 with protocolId (0, 1) and MessageCounter:224958145 on exchange 1302i
+          [1655374218.460090][35023:35028] CHIP:EM: Found matching exchange: 1302i, Delegate: 0xffff74005ab0
+          [1655374218.460157][35023:35028] CHIP:DMG: ICR moving to [ResponseRe]
+          [1655374218.460220][35023:35028] CHIP:DMG: InvokeResponseMessage =
+          [1655374218.460260][35023:35028] CHIP:DMG: {
+          [1655374218.460298][35023:35028] CHIP:DMG: 	suppressResponse = false,
+          [1655374218.460338][35023:35028] CHIP:DMG: 	InvokeResponseIBs =
+          [1655374218.460390][35023:35028] CHIP:DMG: 	[
+          [1655374218.460430][35023:35028] CHIP:DMG: 		InvokeResponseIB =
+          [1655374218.460487][35023:35028] CHIP:DMG: 		{
+          [1655374218.460530][35023:35028] CHIP:DMG: 			CommandDataIB =
+          [1655374218.460580][35023:35028] CHIP:DMG: 			{
+          [1655374218.460628][35023:35028] CHIP:DMG: 				CommandPathIB =
+          [1655374218.460686][35023:35028] CHIP:DMG: 				{
+          [1655374218.460745][35023:35028] CHIP:DMG: 					EndpointId = 0x0,
+          [1655374218.460802][35023:35028] CHIP:DMG: 					ClusterId = 0x3e,
+          [1655374218.460852][35023:35028] CHIP:DMG: 					CommandId = 0x1,
+          [1655374218.460906][35023:35028] CHIP:DMG: 				},
+          [1655374218.460962][35023:35028] CHIP:DMG:
+          [1655374218.461010][35023:35028] CHIP:DMG: 				CommandFields =
+          [1655374218.461068][35023:35028] CHIP:DMG: 				{
+          [1655374218.461123][35023:35028] CHIP:DMG: 					0x0 = [
+          [1655374218.461351][35023:35028] CHIP:DMG: 						0x15, 0x31, 0x1, 0x1d, 0x2, 0x30, 0x82, 0x2, 0x19, 0x6, 0x9, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0xd, 0x1, 0x7, 0x2, 0xa0, 0x82, 0x2, 0xa, 0x30, 0x82, 0x2, 0x6, 0x2, 0x1, 0x3, 0x31, 0xd, 0x30, 0xb, 0x6, 0x9, 0x60, 0x86, 0x48, 0x1, 0x65, 0x3, 0x4, 0x2, 0x1, 0x30, 0x82, 0x1, 0x71, 0x6, 0x9, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0xd, 0x1, 0x7, 0x1, 0xa0, 0x82, 0x1, 0x62, 0x4, 0x82, 0x1, 0x5e, 0x15, 0x24, 0x0, 0x1, 0x25, 0x1, 0xf1, 0xff, 0x36, 0x2, 0x5, 0x0, 0x80, 0x5, 0x1, 0x80, 0x5, 0x2, 0x80, 0x5, 0x3, 0x80, 0x5, 0x4, 0x80, 0x5, 0x5, 0x80, 0x5, 0x6, 0x80, 0x5, 0x7, 0x80, 0x5, 0x8, 0x80, 0x5, 0x9, 0x80, 0x5, 0xa, 0x80, 0x5, 0xb, 0x80, 0x5, 0xc, 0x80, 0x5, 0xd, 0x80, 0x5, 0xe, 0x80, 0x5, 0xf, 0x80, 0x5, 0x10, 0x80, 0x5, 0x11, 0x80, 0x5, 0x12, 0x80, 0x5, 0x13, 0x80, 0x5, 0x14, 0x80, 0x5, 0x15, 0x80, 0x5, 0x16, 0x80, 0x5, 0x17, 0x80, 0x5, 0x18, 0x80, 0x5, 0x19, 0x80, 0x5, 0x1a, 0x80, 0x5, 0x1b, 0x80, 0x5, 0x1c, 0x80, 0x5, 0x1d, 0x80, 0x5, 0x1e, 0x80, 0x5, 0x1f, 0x80, 0x5, 0x20, 0x80, 0x5, 0x21, 0x80, 0x5, 0x22, 0x80, 0x5, 0x23, 0x80, 0x5, 0x24, 0x80, 0x5, 0x25, 0x80, 0x5, 0x26, 0x80, 0x5, 0x27, 0x80, 0x5, 0x28, 0x80, 0x5, 0x29, 0x80, 0x5, 0x2a, 0x80, 0x5, 0x2b, 0x80, 0x5, 0x2c, 0x80, 0x5, 0x2d, 0x80, 0x5, 0x2e, 0x80, 0x5, 0x2f, 0x80, 0x5, 0x30, 0x80, 0x5, 0x31, 0x80, 0x5, 0x32, 0x80, 0x5, 0x33, 0x80, 0x5, 0x34, 0x80, 0x5, 0x35, 0x80, 0x5, 0x36, 0x80, 0x5, 0x37, 0x80, 0x5, 0x38, 0x80, 0x5, 0x39, 0x80, 0x5, 0x3a, 0x80, 0x5, 0x3b, 0x80, 0x5, 0x3c, 0x80, 0x5, 0x3d, 0x80, 0x5, 0x3e, 0x80, 0x5, 0x3f, 0x80, 0x5, 0x40, 0x80, 0x5, 0x41, 0x80, 0x5, 0x42, 0x80, 0x5, 0x43, 0x80, 0x5, 0x44, 0x80, 0x5, 0x45, 0x80, 0x5, 0x46, 0x80, 0x5, 0x47, 0x80, 0x5, 0x48, 0x80, 0x5, 0x49, 0x80, 0x5, 0x4a, 0x80, 0x5, 0x
+          [1655374218.461469][35023:35028] CHIP:DMG: 				]
+          [1655374218.461523][35023:35028] CHIP:DMG: 					0x1 = [
+          [1655374218.461611][35023:35028] CHIP:DMG: 						0xd6, 0x91, 0x3d, 0x0, 0x37, 0xd3, 0x23, 0x11, 0xa9, 0xe6, 0x23, 0xe3, 0xb0, 0x80, 0x27, 0x71, 0xc2, 0xb1, 0xdc, 0xe1, 0xb8, 0x95, 0x7c, 0x88, 0x92, 0xc6, 0x84, 0xe4, 0x21, 0xa2, 0x87, 0x22, 0x6d, 0xeb, 0x42, 0x82, 0x67, 0xe0, 0x9c, 0x17, 0xb1, 0x1c, 0x1, 0xff, 0x8b, 0xff, 0x23, 0x47, 0xc4, 0xe7, 0x6, 0x1d, 0x8f, 0x1e, 0x26, 0x8e, 0xad, 0xbd, 0xc9, 0x9e, 0x23, 0x88, 0xdb, 0xb6,
+          [1655374218.461681][35023:35028] CHIP:DMG: 				]
+          [1655374218.461733][35023:35028] CHIP:DMG: 				},
+          [1655374218.461783][35023:35028] CHIP:DMG: 			},
+          [1655374218.461855][35023:35028] CHIP:DMG:
+          [1655374218.461900][35023:35028] CHIP:DMG: 		},
+          [1655374218.461951][35023:35028] CHIP:DMG:
+          [1655374218.461990][35023:35028] CHIP:DMG: 	],
+          [1655374218.462041][35023:35028] CHIP:DMG:
+          [1655374218.462080][35023:35028] CHIP:DMG: 	InteractionModelRevision = 1
+          [1655374218.462118][35023:35028] CHIP:DMG: },
+          [1655374218.462220][35023:35028] CHIP:DMG: Received Command Response Data, Endpoint=0 Cluster=0x0000_003E Command=0x0000_0001
+          [1655374218.462275][35023:35028] CHIP:CTL: Received Attestation Information from the device
+          [1655374218.462320][35023:35028] CHIP:CTL: Successfully finished commissioning step 'SendAttestationRequest'
       disabled: true
 
     - label: "TH1 generates 32-byte CSRNonce"
       verification: |
+          Verify in TH log
 
+          [1655374218.694869][35023:35028] CHIP:DMG: NOCSR Elements =
+          [1655374218.694922][35023:35028] CHIP:DMG: {
+          [1655374218.695009][35023:35028] CHIP:DMG:     CSR (203) = 3081C83070020100300E310C300A060355040A0C034353523059301306072A8648CE3D020106082A8648CE3D03010703420004FD1662E0C1F44C5BD8A284452ED17C631CA88697CBF396EB765397315ED248729BFC7DE464404B1FA34B2DD81714E2484B8E908121BB95DFDA4493D5CDDA797AA000300A06082A8648CE3D0403020348003045022100832718B8679DB2C9A26579F08D930F7DA747F6F23EE2DD11777FBF1191909FD3022073E039F63AEA4C1BF812AE65221CB09203FF1BD382872FB37478C2C4045FD8B8
+          [1655374218.695086][35023:35028] CHIP:DMG:     CSRNonce (32) = 79964F34E68A97E41DBDFE7888583183535EDC3A185AF99941BDA4C5A65FDA39
+          [1655374218.695133][35023:35028] CHIP:DMG: }
       disabled: true
 
     - label: "TH1 sends CSRRequest Command with CSRNonce as field to the DUT."
       verification: |
-          Verify that the DUT generates the NOCSR Information using CSRResponse Command
+          Verify in TH log
+
+          [1655374218.694869][35023:35028] CHIP:DMG: NOCSR Elements =
+          [1655374218.694922][35023:35028] CHIP:DMG: {
+          [1655374218.695009][35023:35028] CHIP:DMG:     CSR (203) = 3081C83070020100300E310C300A060355040A0C034353523059301306072A8648CE3D020106082A8648CE3D03010703420004FD1662E0C1F44C5BD8A284452ED17C631CA88697CBF396EB765397315ED248729BFC7DE464404B1FA34B2DD81714E2484B8E908121BB95DFDA4493D5CDDA797AA000300A06082A8648CE3D0403020348003045022100832718B8679DB2C9A26579F08D930F7DA747F6F23EE2DD11777FBF1191909FD3022073E039F63AEA4C1BF812AE65221CB09203FF1BD382872FB37478C2C4045FD8B8
+          [1655374218.695086][35023:35028] CHIP:DMG:     CSRNonce (32) = 79964F34E68A97E41DBDFE7888583183535EDC3A185AF99941BDA4C5A65FDA39
+          [1655374218.695133][35023:35028] CHIP:DMG: }
       disabled: true
 
     - label:
           "Save following information that is sent by the DUT in the CSRResponse
           Command NOCSRElement Node Operational Key Pair as Key 1"
       verification: |
+          Verify in TH log
 
+          [1655374218.694869][35023:35028] CHIP:DMG: NOCSR Elements =
+          [1655374218.694922][35023:35028] CHIP:DMG: {
+          [1655374218.695009][35023:35028] CHIP:DMG:     CSR (203) = 3081C83070020100300E310C300A060355040A0C034353523059301306072A8648CE3D020106082A8648CE3D03010703420004FD1662E0C1F44C5BD8A284452ED17C631CA88697CBF396EB765397315ED248729BFC7DE464404B1FA34B2DD81714E2484B8E908121BB95DFDA4493D5CDDA797AA000300A06082A8648CE3D0403020348003045022100832718B8679DB2C9A26579F08D930F7DA747F6F23EE2DD11777FBF1191909FD3022073E039F63AEA4C1BF812AE65221CB09203FF1BD382872FB37478C2C4045FD8B8
+          [1655374218.695086][35023:35028] CHIP:DMG:     CSRNonce (32) = 79964F34E68A97E41DBDFE7888583183535EDC3A185AF99941BDA4C5A65FDA39
+          [1655374218.695133][35023:35028] CHIP:DMG: }
       disabled: true
 
     - label:
           "TH1 sends AddTrustedRootCertificate command to DUT to install the
           Root CA Certificate to the trust store"
       verification: |
-          Verify that AddTrustedRootCertificate Command succeeds by sending the status code as SUCCESS
+          1. ./chip-tool generalcommissioning arm-fail-safe 500 600 1 0
+
+          2. ./chip-tool operationalcredentials  add-trusted-root-certificate 1530010100240201370324140018260480228127260580254D3A37062414001824070124080130094104277CAFBA69B2C219DF198735F27E3874019F75812933BC737FF8BA660902FE97D212E925D0B53B0755C52B3CDCAC9B797C2B452ED76D9B5F348A0586043857F3370A3501290118240260300414CD47A91F241CF86E4CE627568ACD47BB3A25C106300514CD47A91F241CF86E4CE627568ACD47BB3A25C10618300B40A937FE4F3921D229051DF5F5D3EEBD52A5012405D15EBA8A7542B9F54D33D406DF0F09247529012 1 0
+
+
+
+
+          [1655374218.706390][35023:35028] CHIP:DMG:                         CommandFields =
+          [1655374218.706431][35023:35028] CHIP:DMG:                         {
+          [1655374218.706464][35023:35028] CHIP:DMG:                                 0x0 = [
+          [1655374218.706591][35023:35028] CHIP:DMG:                                         0x15, 0x30, 0x1, 0x1, 0x0, 0x24, 0x2, 0x1, 0x37, 0x3, 0x24, 0x14, 0x0, 0x18, 0x26, 0x4, 0x80, 0x22, 0x81, 0x27, 0x26, 0x5, 0x80, 0x25, 0x4d, 0x3a, 0x37, 0x6, 0x24, 0x14, 0x0, 0x18, 0x24, 0x7, 0x1, 0x24, 0x8, 0x1, 0x30, 0x9, 0x41, 0x4, 0xab, 0xae, 0x5e, 0xc6, 0x4f, 0xc4, 0x6e, 0x99, 0xc, 0x44, 0x55, 0x39, 0x2, 0x45, 0xf6, 0xe9, 0x9, 0xcb, 0xc3, 0xc3, 0xc, 0xa0, 0x8, 0xb7, 0x36, 0x96, 0x62, 0x56, 0x43, 0x56, 0xba, 0x22, 0x25, 0x38, 0x6f, 0x40, 0x50, 0xf8, 0x7b, 0xd1, 0xd7, 0xe4, 0xd6, 0x5c, 0x12, 0x30, 0x84, 0x91, 0xb3, 0x10, 0x8f, 0x6a, 0x71, 0x8, 0xe1, 0xf0, 0xc3, 0xa0, 0xd2, 0x4, 0x99, 0xe3, 0xfb, 0xf, 0x37, 0xa, 0x35, 0x1, 0x29, 0x1, 0x18, 0x24, 0x2, 0x60, 0x30, 0x4, 0x14, 0x89, 0x4f, 0x8f, 0xdd, 0xf2, 0x13, 0x8d, 0x8e, 0xe0, 0x12, 0x13, 0x72, 0xa2, 0xb4, 0x23, 0x25, 0xef, 0xd6, 0x25, 0x8c, 0x30, 0x5, 0x14, 0x89, 0x4f, 0x8f, 0xdd, 0xf2, 0x13, 0x8d, 0x8e, 0xe0, 0x12, 0x13, 0x72, 0xa2, 0xb4, 0x23, 0x25, 0xef, 0xd6, 0x25, 0x8c, 0x18, 0x30, 0xb, 0x40, 0xd3, 0x8f, 0x56, 0xa2, 0xd9, 0xb4, 0x4a, 0x3a, 0x79, 0x6d, 0xed, 0xd7, 0x1c, 0x7a, 0x3e, 0xd6, 0xb9, 0x8d, 0x80, 0xd6, 0x3d, 0xe2, 0xde, 0xa5, 0xb0, 0x3b, 0xc0, 0xce, 0x1a, 0xe9, 0x26, 0x0, 0x9d, 0x9c, 0x78, 0xe4, 0xf3, 0x78, 0x74, 0x3a, 0xd, 0xfa, 0xc8, 0x1f, 0x27, 0xaa, 0x5e, 0x9b, 0xef, 0x78, 0x48, 0x1e, 0x6a, 0x60, 0x1a, 0x71, 0xd8, 0x67, 0x9, 0x40, 0xb3, 0xe4, 0xd0, 0xc6, 0x18,
+
+          Verify we are getting success response
+          [1655371172.014771][2459:2464] CHIP:DMG: InvokeResponseMessage =
+          [1655371172.014797][2459:2464] CHIP:DMG: {
+          [1655371172.014822][2459:2464] CHIP:DMG:         suppressResponse = false,
+          [1655371172.014854][2459:2464] CHIP:DMG:         InvokeResponseIBs =
+          [1655371172.014889][2459:2464] CHIP:DMG:         [
+          [1655371172.014914][2459:2464] CHIP:DMG:                 InvokeResponseIB =
+          [1655371172.014959][2459:2464] CHIP:DMG:                 {
+          [1655371172.014989][2459:2464] CHIP:DMG:                         CommandStatusIB =
+          [1655371172.015024][2459:2464] CHIP:DMG:                         {
+          [1655371172.015055][2459:2464] CHIP:DMG:                                 CommandPathIB =
+          [1655371172.015090][2459:2464] CHIP:DMG:                                 {
+          [1655371172.015125][2459:2464] CHIP:DMG:                                         EndpointId = 0x0,
+          [1655371172.015161][2459:2464] CHIP:DMG:                                         ClusterId = 0x3e,
+          [1655371172.015196][2459:2464] CHIP:DMG:                                         CommandId = 0xb,
+          [1655371172.015229][2459:2464] CHIP:DMG:                                 },
+          [1655371172.015266][2459:2464] CHIP:DMG:
+          [1655371172.015297][2459:2464] CHIP:DMG:                                 StatusIB =
+          [1655371172.015332][2459:2464] CHIP:DMG:                                 {
+          [1655371172.015366][2459:2464] CHIP:DMG:                                         status = 0x00 (SUCCESS),
+          [1655371172.015399][2459:2464] CHIP:DMG:                                 },
+          [1655371172.015433][2459:2464] CHIP:DMG:
+          [1655371172.015464][2459:2464] CHIP:DMG:                         },
+          [1655371172.015498][2459:2464] CHIP:DMG:
+          [1655371172.015527][2459:2464] CHIP:DMG:                 },
+          [1655371172.015560][2459:2464] CHIP:DMG:
+          [1655371172.015584][2459:2464] CHIP:DMG:         ],
+          [1655371172.015614][2459:2464] CHIP:DMG:
+          [1655371172.015639][2459:2464] CHIP:DMG:         InteractionModelRevision = 1
+          [1655371172.015665][2459:2464] CHIP:DMG: },
+          [1655371172.015725][2459:2464] CHIP:DMG: Received Command Response Status for Endpoint=0 Cluster=0x0000_003E Command=0x0000_000B Status=0x0
+          [1655371172.015770][2459:2464] CHIP:DMG: ICR moving to [AwaitingDe]
       disabled: true
 
     - label: "TH1 Sends AddNOC Command to DUT"
       verification: |
-          Verify that DUT responds with NOCResponse command with status code OK
+          https://github.com/project-chip/connectedhomeip/issues/19068
       disabled: true
 
     - label: "Read the NOCs List from the DUT"
       verification: |
-          Verify that Key1 is present in the NOCs list
+          ./chip-tool operationalcredentials read nocs 1 0
+
+          [1655470923.441130][13282:13287] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_003E Attribute 0x0000_0000 DataVersion: 2667297991
+          [1655470923.441223][13282:13287] CHIP:TOO:   NOCs: 1 entries
+          [1655470923.441297][13282:13287] CHIP:TOO:     [1]: {
+          [1655470923.441352][13282:13287] CHIP:TOO:       Noc: 1530010101240201370324130118260480228127260580254D3A37062415012411011824070124080130094104D5FA104FF03F9118BDC2A072D50DB3BED32C47F138439FBF05753D02D01AEC10F350CB77EA22844A83FF0FEF6CFA764F5B1FD48E487F3EC82A201D376F56DCC8370A350128011824020136030402040118300414BD61F9405A7A15EFA38F8B6833AB9027876482E1300514B5AED0B2C2CDBB9D4D0124755B56278B081FD4AD18300B40441AA0EE6ACE43EEA2A52321821D8B260AAFFEBD394C2FD11E83008C5AD2DF5EA58FAFA14A3EF7BAFDE190591298311D7DE6A257819D98D0E9FE239A635684B418
+          [1655470923.441411][13282:13287] CHIP:TOO:       Icac: 1530010100240201370324140018260480228127260580254D3A37062413011824070124080130094104B267483D9981A2C15E7DE8C63298FEB6DC19EAA9AEA41D9D659CD3BBBD25B943B3186716C82B297091D64B1620E8FB2C6FD095F509684E074C5B479E583CE295370A3501290118240260300414B5AED0B2C2CDBB9D4D0124755B56278B081FD4AD3005146EDE812590A5E6E4463798EB06AC3BD5284DFAAE18300B404A48E0B45704A98739C0C656B0F1A4252AEED8E1EBA5FD1032C79A4B26BF8A314EFDD7C835947DEB4B3E9F6D0BF2A561CEE54B45F311773301D4B5CFFF2F76D918
+          [1655470923.441453][13282:13287] CHIP:TOO:       FabricIndex: 1
+          [1655470923.441486][13282:13287] CHIP:TOO:      }
       disabled: true
 
     - label: "Factory Reset TH1 so that it is commissionable again"
       verification: |
-
+          DUT side:
+          sudo rm -rf /tmp/chip_*
       disabled: true
 
     - label:
           "Start the commissioning process of TH1 on DUT. Device attestation
           procedure is completed"
       verification: |
+          sudo ./chip-all-clusters-app --wifi
 
+          TH side:
+          ./chip-tool pairing ble-wifi 1 zigbeehome matter123 20202021 3841 --trace_decode 1
+
+          [1650455358.501816][4366:4371] CHIP:TOO: Device commissioning completed with success"""
       disabled: true
 
     - label: "TH1 generates 32-byte CSRNonce"
       verification: |
-          Verify that the DUT generates the NOCSR Information using CSRResponse Command.
+          Verify in TH log
+
+
+          [1655968443.868940][21387:21392] CHIP:DMG: NOCSR Elements =
+          [1655968443.869000][21387:21392] CHIP:DMG: {
+          [1655968443.869077][21387:21392] CHIP:DMG:     CSR (204) = 3081C93070020100300E310C300A060355040A0C034353523059301306072A8648CE3D020106082A8648CE3D030107034200041DC0424E5FE9BC13997CE5D29A61C944BFC808923E8656D801A44D25E3DAFC093FB2B175CFF1588CF68090FE2C3172975CA6874E7CF85FBA26C8F46FF0F5F453A000300A06082A8648CE3D04030203490030460221008A1C12FCDF67D97C99ED87AFE5A0F49321DCF6EB42D05AA286359CCFD206C120022100E66C05339B4517D143ADF9D1AB65AD14BC6D2E804AF073C25FDF6569C39E393F
+          [1655968443.869145][21387:21392] CHIP:DMG:     CSRNonce (32) = 6FD841CB599C51208A19018F5C0BC970BA0A9303B07A2F2FB8ED77EF809B90A9
+          [1655968443.869265][21387:21392] CHIP:DMG: }
+          [1655968443.869316][21387:21392] CHIP:DMG:
+          [1655968443.869367][21387:21392] CHIP:DMG: CSR (204) =
+          [1655968443.869451][21387:21392] CHIP:DMG: {
+          -----BEGIN CERTIFICATE REQUEST-----
+          MIHJMHACAQAwDjEMMAoGA1UECgwDQ1NSMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcD
+          QgAEHcBCTl/pvBOZfOXSmmHJRL/ICJI+hlbYAaRNJePa/Ak/srF1z/FYjPaAkP4s
+          MXKXXKaHTnz4X7omyPRv8PX0U6AAMAoGCCqGSM49BAMCA0kAMEYCIQCKHBL832fZ
+          fJnth6/loPSTIdz260LQWqKGNZzP0gbBIAIhAOZsBTObRRfRQ6350atlrRS8bS6A
+          SvBzwl/fZWnDnjk/
+          -----END CERTIFICATE REQUEST-----
       disabled: true
 
     - label: "TH1 sends CSRRequest Command with CSRNonce as field to the DUT."
       verification: |
+          Verify in TH log
 
+          [1655968443.653325][21387:21392] CHIP:CTL: Sending CSR request to 0xffff88000b60 device
+          [1655968443.653468][21387:21392] CHIP:DMG: ICR moving to [AddingComm]
+          [1655968443.653547][21387:21392] CHIP:DMG: ICR moving to [AddedComma]
+          [1655968443.654120][21387:21392] CHIP:IN: Prepared secure message 0xffff9afdc028 to 0xFFFFFFFB00000000 (0)  of type 0x8 and protocolId (0, 1) on exchange 11675i with MessageCounter:162800415.
+          [1655968443.654238][21387:21392] CHIP:IN: Sending encrypted msg 0xffff9afdc028 with MessageCounter:162800415 to 0xFFFFFFFB00000000 (0) at monotonic time: 00000000059CF5E5 msec
+          [1655968443.654746][21387:21392] CHIP:DMG: >> to BLE | 162800415 | [Interaction Model  (1) / InvokeCommandRequest (0x08) / Session = 52324 / Exchange = 11675]
+          [1655968443.654843][21387:21392] CHIP:DMG: Header Flags =
+          [1655968443.654899][21387:21392] CHIP:DMG: {
+          [1655968443.654984][21387:21392] CHIP:DMG:     Exchange (0x01) =
+          [1655968443.655039][21387:21392] CHIP:DMG:     {
+          [1655968443.655087][21387:21392] CHIP:DMG:         Initiator = true
+          [1655968443.655139][21387:21392] CHIP:DMG:     }
+          [1655968443.655207][21387:21392] CHIP:DMG: }
+          [1655968443.655260][21387:21392] CHIP:DMG:
+          [1655968443.655328][21387:21392] CHIP:DMG: Encrypted Payload (94 bytes) =
+          [1655968443.655382][21387:21392] CHIP:DMG: {
+          [1655968443.655435][21387:21392] CHIP:DMG:     data = 0064cc001f23b4098ca07591c210364800feb2c612bb0e4d2ebab7ad8296c308a560bcbc8617bec763775fe04f8158deec052be5110c79734b9d561a9f0f50bac052c4a9a323e175e359c946b335cefd5e99f8edfdeee3234f2c73e6a3b0
+          [1655968443.655492][21387:21392] CHIP:DMG:     buffer_ptr = 281472963536976
+          [1655968443.655543][21387:21392] CHIP:DMG: }
+          [1655968443.655592][21387:21392] CHIP:DMG:
+          [1655968443.655754][21387:21392] CHIP:DMG: InvokeRequestMessage =
+          [1655968443.655821][21387:21392] CHIP:DMG: {
+          [1655968443.655878][21387:21392] CHIP:DMG: 	suppressResponse = false,
+          [1655968443.655947][21387:21392] CHIP:DMG: 	timedRequest = false,
+          [1655968443.656007][21387:21392] CHIP:DMG: 	InvokeRequests =
+          [1655968443.656082][21387:21392] CHIP:DMG: 	[
+          [1655968443.656142][21387:21392] CHIP:DMG: 		CommandDataIB =
+          [1655968443.656217][21387:21392] CHIP:DMG: 		{
+          [1655968443.656288][21387:21392] CHIP:DMG: 			CommandPathIB =
+          [1655968443.656375][21387:21392] CHIP:DMG: 			{
+          [1655968443.656458][21387:21392] CHIP:DMG: 				EndpointId = 0x0,
+          [1655968443.656549][21387:21392] CHIP:DMG: 				ClusterId = 0x3e,
+          [1655968443.656639][21387:21392] CHIP:DMG: 				CommandId = 0x4,
+          [1655968443.656725][21387:21392] CHIP:DMG: 			},
+          [1655968443.656814][21387:21392] CHIP:DMG:
+          [1655968443.656886][21387:21392] CHIP:DMG: 			CommandFields =
+          [1655968443.656971][21387:21392] CHIP:DMG: 			{
+          [1655968443.657106][21387:21392] CHIP:DMG: 				0x0 = [
+          [1655968443.657246][21387:21392] CHIP:DMG: 						0x6f, 0xd8, 0x41, 0xcb, 0x59, 0x9c, 0x51, 0x20, 0x8a, 0x19, 0x1, 0x8f, 0x5c, 0xb, 0xc9, 0x70, 0xba, 0xa, 0x93, 0x3, 0xb0, 0x7a, 0x2f, 0x2f, 0xb8, 0xed, 0x77, 0xef, 0x80, 0x9b, 0x90, 0xa9,
+          [1655968443.657364][21387:21392] CHIP:DMG: 				]
+          [1655968443.657448][21387:21392] CHIP:DMG: 			},
+          [1655968443.657528][21387:21392] CHIP:DMG: 		},
+          [1655968443.657607][21387:21392] CHIP:DMG:
+          [1655968443.657666][21387:21392] CHIP:DMG: 	],
+          [1655968443.657738][21387:21392] CHIP:DMG:
+          [1655968443.657798][21387:21392] CHIP:DMG: 	InteractionModelRevision = 1
+          [1655968443.657855][21387:21392] CHIP:DMG: },
+          [1655968443.657910][21387:21392] CHIP:DMG:
+          [1655968443.658186][21387:21392] CHIP:DMG: ICR moving to [CommandSen]
+          [1655968443.658271][21387:21392] CHIP:CTL: Sent CSR request, waiting for the CSR
+          [1655968443.658392][21387:21392] CHIP:DMG: ICR moving to [AwaitingDe]
+          [1655968443.766979][21387:21392] CHIP:DL: HandlePlatformSpecificBLEEvent 16387
+          [1655968443.770604][21387:21390] CHIP:DL: Indication received, conn = 0xffff900200d0
+          [1655968443.770857][21387:21392] CHIP:DL: HandlePlatformSpecificBLEEvent 16389
+          [1655968443.866712][21387:21390] CHIP:DL: Indication received, conn = 0xffff900200d0
+          [1655968443.866976][21387:21392] CHIP:DL: HandlePlatformSpecificBLEEvent 16389
+          [1655968443.868071][21387:21392] CHIP:DMG: << from BLE | 163275441 | [Interaction Model  (1) / InvokeCommandResponse (0x09) / Session = 42825 / Exchange = 11675]
+          [1655968443.868171][21387:21392] CHIP:DMG: Header Flags =
+          [1655968443.868227][21387:21392] CHIP:DMG: {
+          [1655968443.868322][21387:21392] CHIP:DMG: }
+          [1655968443.868377][21387:21392] CHIP:DMG:
+          [1655968443.868444][21387:21392] CHIP:DMG: Encrypted Payload (374 bytes) =
+          [1655968443.868498][21387:21392] CHIP:DMG: {
+          [1655968443.868550][21387:21392] CHIP:DMG:     data = 0049a700b162bb098738968b1939ee14f928225366b2f4bc5fff780dab81f2424266d6ec5fb570726f9c64f4c64fcc381c2808d65f9713f1b21ca51167d88d161472a02a68a9b058418ac1e9b7aa3e2d6529501ef0f2000cfe93904b1f9942e92c306ba26a6eaf89aedf134eae1c455c18f55686bac675659602c6f9a766adb495975515815f4560bcb2553bc33ecbd6024463121d7553a64cdbb016b8e39f394b05bcd5b1f067ffd7186f40e276b2bc1fa0a7b1059312d5af443b7661e31995eb71c7962899506868ff6c55ca4f2b73e98a5a55037384067795c479eed0f28f98e9863904ecb1093aea2ba2d41e39fdfa4e87c0c3b49996781a32c87d56d56086e2eb046e18837e56651a4b52544fff9a7715d5459edef0071a95ab0ce6da21846632be497f827a2808b25466c9bd0cde20b1f56341d4c28319cee5570d0937f873c7a5cae6702aae36f5046265989d37b8f14e6b3b30c2b6536e1fb80f2eb92466a8c8fe562f77bca17a57ddc8b35138f685b64a16
+          [1655968443.868623][21387:21392] CHIP:DMG:     buffer_ptr = 281472963520464
+          [1655968443.868673][21387:21392] CHIP:DMG: }
+          [1655968443.868722][21387:21392] CHIP:DMG:
+          [1655968443.868940][21387:21392] CHIP:DMG: NOCSR Elements =
+          [1655968443.869000][21387:21392] CHIP:DMG: {
+          [1655968443.869077][21387:21392] CHIP:DMG:     CSR (204) = 3081C93070020100300E310C300A060355040A0C034353523059301306072A8648CE3D020106082A8648CE3D030107034200041DC0424E5FE9BC13997CE5D29A61C944BFC808923E8656D801A44D25E3DAFC093FB2B175CFF1588CF68090FE2C3172975CA6874E7CF85FBA26C8F46FF0F5F453A000300A06082A8648CE3D04030203490030460221008A1C12FCDF67D97C99ED87AFE5A0F49321DCF6EB42D05AA286359CCFD206C120022100E66C05339B4517D143ADF9D1AB65AD14BC6D2E804AF073C25FDF6569C39E393F
+          [1655968443.869145][21387:21392] CHIP:DMG:     CSRNonce (32) = 6FD841CB599C51208A19018F5C0BC970BA0A9303B07A2F2FB8ED77EF809B90A9
+          [1655968443.869265][21387:21392] CHIP:DMG: }
+          [1655968443.869316][21387:21392] CHIP:DMG:
+          [1655968443.869367][21387:21392] CHIP:DMG: CSR (204) =
+          [1655968443.869451][21387:21392] CHIP:DMG: {
+          -----BEGIN CERTIFICATE REQUEST-----
+          MIHJMHACAQAwDjEMMAoGA1UECgwDQ1NSMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcD
+          QgAEHcBCTl/pvBOZfOXSmmHJRL/ICJI+hlbYAaRNJePa/Ak/srF1z/FYjPaAkP4s
+          MXKXXKaHTnz4X7omyPRv8PX0U6AAMAoGCCqGSM49BAMCA0kAMEYCIQCKHBL832fZ
+          fJnth6/loPSTIdz260LQWqKGNZzP0gbBIAIhAOZsBTObRRfRQ6350atlrRS8bS6A
+          SvBzwl/fZWnDnjk/
+          -----END CERTIFICATE REQUEST-----
+          [1655968443.869588][21387:21392] CHIP:DMG: }
+          [1655968443.869639][21387:21392] CHIP:DMG:
+          [1655968443.869704][21387:21392] CHIP:DMG:
+          [1655968443.869788][21387:21392] CHIP:DMG: Additional Fields =
+          [1655968443.869842][21387:21392] CHIP:DMG: {
+          [1655968443.869899][21387:21392] CHIP:DMG:     peer_address = BLE
+          [1655968443.869952][21387:21392] CHIP:DMG: }
+          [1655968443.870001][21387:21392] CHIP:DMG:
+          [1655968443.870068][21387:21392] CHIP:EM: Received message of type 0x9 with protocolId (0, 1) and MessageCounter:163275441 on exchange 11675i
+          [1655968443.870132][21387:21392] CHIP:EM: Found matching exchange: 11675i, Delegate: 0xffff90047da0
+          [1655968443.870221][21387:21392] CHIP:DMG: ICR moving to [ResponseRe]
+          [1655968443.870312][21387:21392] CHIP:DMG: InvokeResponseMessage =
+          [1655968443.870371][21387:21392] CHIP:DMG: {
+          [1655968443.870429][21387:21392] CHIP:DMG: 	suppressResponse = false,
+          [1655968443.870488][21387:21392] CHIP:DMG: 	InvokeResponseIBs =
+          [1655968443.870564][21387:21392] CHIP:DMG: 	[
+          [1655968443.870623][21387:21392] CHIP:DMG: 		InvokeResponseIB =
+          [1655968443.870703][21387:21392] CHIP:DMG: 		{
+          [1655968443.870766][21387:21392] CHIP:DMG: 			CommandDataIB =
+          [1655968443.870841][21387:21392] CHIP:DMG: 			{
+          [1655968443.870911][21387:21392] CHIP:DMG: 				CommandPathIB =
+          [1655968443.870998][21387:21392] CHIP:DMG: 				{
+          [1655968443.871081][21387:21392] CHIP:DMG: 					EndpointId = 0x0,
+          [1655968443.871165][21387:21392] CHIP:DMG: 					ClusterId = 0x3e,
+          [1655968443.871248][21387:21392] CHIP:DMG: 					CommandId = 0x5,
+          [1655968443.871334][21387:21392] CHIP:DMG: 				},
+          [1655968443.871416][21387:21392] CHIP:DMG:
+          [1655968443.871489][21387:21392] CHIP:DMG: 				CommandFields =
+          [1655968443.871568][21387:21392] CHIP:DMG: 				{
+          [1655968443.871646][21387:21392] CHIP:DMG: 					0x0 = [
+          [1655968443.871916][21387:21392] CHIP:DMG: 							0x15, 0x30, 0x1, 0xcc, 0x30, 0x81, 0xc9, 0x30, 0x70, 0x2, 0x1, 0x0, 0x30, 0xe, 0x31, 0xc, 0x30, 0xa, 0x6, 0x3, 0x55, 0x4, 0xa, 0xc, 0x3, 0x43, 0x53, 0x52, 0x30, 0x59, 0x30, 0x13, 0x6, 0x7, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x2, 0x1, 0x6, 0x8, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x3, 0x1, 0x7, 0x3, 0x42, 0x0, 0x4, 0x1d, 0xc0, 0x42, 0x4e, 0x5f, 0xe9, 0xbc, 0x13, 0x99, 0x7c, 0xe5, 0xd2, 0x9a, 0x61, 0xc9, 0x44, 0xbf, 0xc8, 0x8, 0x92, 0x3e, 0x86, 0x56, 0xd8, 0x1, 0xa4, 0x4d, 0x25, 0xe3, 0xda, 0xfc, 0x9, 0x3f, 0xb2, 0xb1, 0x75, 0xcf, 0xf1, 0x58, 0x8c, 0xf6, 0x80, 0x90, 0xfe, 0x2c, 0x31, 0x72, 0x97, 0x5c, 0xa6, 0x87, 0x4e, 0x7c, 0xf8, 0x5f, 0xba, 0x26, 0xc8, 0xf4, 0x6f, 0xf0, 0xf5, 0xf4, 0x53, 0xa0, 0x0, 0x30, 0xa, 0x6, 0x8, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x4, 0x3, 0x2, 0x3, 0x49, 0x0, 0x30, 0x46, 0x2, 0x21, 0x0, 0x8a, 0x1c, 0x12, 0xfc, 0xdf, 0x67, 0xd9, 0x7c, 0x99, 0xed, 0x87, 0xaf, 0xe5, 0xa0, 0xf4, 0x93, 0x21, 0xdc, 0xf6, 0xeb, 0x42, 0xd0, 0x5a, 0xa2, 0x86, 0x35, 0x9c, 0xcf, 0xd2, 0x6, 0xc1, 0x20, 0x2, 0x21, 0x0, 0xe6, 0x6c, 0x5, 0x33, 0x9b, 0x45, 0x17, 0xd1, 0x43, 0xad, 0xf9, 0xd1, 0xab, 0x65, 0xad, 0x14, 0xbc, 0x6d, 0x2e, 0x80, 0x4a, 0xf0, 0x73, 0xc2, 0x5f, 0xdf, 0x65, 0x69, 0xc3, 0x9e, 0x39, 0x3f, 0x30, 0x2, 0x20, 0x6f, 0xd8, 0x41, 0xcb, 0x59, 0x9c, 0x51, 0x20, 0x8a, 0x19, 0x1, 0x8f, 0x5c, 0xb, 0xc9, 0x70, 0xba, 0xa, 0x93, 0x3, 0xb0, 0x7a, 0x2f, 0x2f, 0xb8, 0xed, 0x77, 0xef, 0x80, 0x9b, 0x90, 0xa9, 0x18,
+          [1655968443.872069][21387:21392] CHIP:DMG: 					]
+          [1655968443.872144][21387:21392] CHIP:DMG: 					0x1 = [
+          [1655968443.872275][21387:21392] CHIP:DMG: 							0x16, 0xd9, 0x90, 0x89, 0xc, 0xf0, 0x56, 0xf3, 0xfe, 0xeb, 0xa1, 0xec, 0x7e, 0xc2, 0xd4, 0x55, 0x17, 0xf9, 0xf2, 0x56, 0x11, 0xdc, 0x98, 0xcb, 0xc8, 0xa2, 0xf5, 0x96, 0x70, 0x11, 0x17, 0x73, 0xe8, 0x36, 0xcf, 0xc, 0x36, 0x2a, 0x3a, 0x23, 0xef, 0xb6, 0x81, 0x3f, 0xb0, 0x81, 0xef, 0x5e, 0x7e, 0xc5, 0x7f, 0x2f, 0xbd, 0xb3, 0xc8, 0x57, 0xa9, 0x11, 0xbd, 0xd1, 0x1a, 0x69, 0x4e, 0x89,
+          [1655968443.872374][21387:21392] CHIP:DMG: 					]
+          [1655968443.872450][21387:21392] CHIP:DMG: 				},
+          [1655968443.872650][21387:21392] CHIP:DMG: 			},
+          [1655968443.872742][21387:21392] CHIP:DMG:
+          [1655968443.872810][21387:21392] CHIP:DMG: 		},
+          [1655968443.872885][21387:21392] CHIP:DMG:
+          [1655968443.872943][21387:21392] CHIP:DMG: 	],
+          [1655968443.873018][21387:21392] CHIP:DMG:
+          [1655968443.873077][21387:21392] CHIP:DMG: 	InteractionModelRevision = 1
+          [1655968443.873134][21387:21392] CHIP:DMG: },
+          [1655968443.873301][21387:21392] CHIP:DMG: Received Command Response Data, Endpoint=0 Cluster=0x0000_003E Command=0x0000_0005
+          [1655968443.873382][21387:21392] CHIP:CTL: Received certificate signing request from the device
+          [1655968443.873446][21387:21392] CHIP:CTL: Successfully finished commissioning step 'SendOpCertSigningRequest'
       disabled: true
 
     - label: "TH1 generates 32-byte CSRNonce"
       verification: |
+          Verify in TH log
+
 
+          [1655968443.868940][21387:21392] CHIP:DMG: NOCSR Elements =
+          [1655968443.869000][21387:21392] CHIP:DMG: {
+          [1655968443.869077][21387:21392] CHIP:DMG:     CSR (204) = 3081C93070020100300E310C300A060355040A0C034353523059301306072A8648CE3D020106082A8648CE3D030107034200041DC0424E5FE9BC13997CE5D29A61C944BFC808923E8656D801A44D25E3DAFC093FB2B175CFF1588CF68090FE2C3172975CA6874E7CF85FBA26C8F46FF0F5F453A000300A06082A8648CE3D04030203490030460221008A1C12FCDF67D97C99ED87AFE5A0F49321DCF6EB42D05AA286359CCFD206C120022100E66C05339B4517D143ADF9D1AB65AD14BC6D2E804AF073C25FDF6569C39E393F
+          [1655968443.869145][21387:21392] CHIP:DMG:     CSRNonce (32) = 6FD841CB599C51208A19018F5C0BC970BA0A9303B07A2F2FB8ED77EF809B90A9
+          [1655968443.869265][21387:21392] CHIP:DMG: }
+          [1655968443.869316][21387:21392] CHIP:DMG:
+          [1655968443.869367][21387:21392] CHIP:DMG: CSR (204) =
+          [1655968443.869451][21387:21392] CHIP:DMG: {
+          -----BEGIN CERTIFICATE REQUEST-----
+          MIHJMHACAQAwDjEMMAoGA1UECgwDQ1NSMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcD
+          QgAEHcBCTl/pvBOZfOXSmmHJRL/ICJI+hlbYAaRNJePa/Ak/srF1z/FYjPaAkP4s
+          MXKXXKaHTnz4X7omyPRv8PX0U6AAMAoGCCqGSM49BAMCA0kAMEYCIQCKHBL832fZ
+          fJnth6/loPSTIdz260LQWqKGNZzP0gbBIAIhAOZsBTObRRfRQ6350atlrRS8bS6A
+          SvBzwl/fZWnDnjk/
+          -----END CERTIFICATE REQUEST-----
       disabled: true
 
     - label:
           "Save Node Operational Key Pair sent by the DUT in the CSRResponse
           Command as Key 2"
       verification: |
-          Verify that Key 2 does not match any other existing Node Operational Key Pair on the device
+          Verify in TH log:
+
+          [1655968443.870429][21387:21392] CHIP:DMG:         suppressResponse = false,
+          [1655968443.870488][21387:21392] CHIP:DMG:         InvokeResponseIBs =
+          [1655968443.870564][21387:21392] CHIP:DMG:         [
+          [1655968443.870623][21387:21392] CHIP:DMG:                 InvokeResponseIB =
+          [1655968443.870703][21387:21392] CHIP:DMG:                 {
+          [1655968443.870766][21387:21392] CHIP:DMG:                         CommandDataIB =
+          [1655968443.870841][21387:21392] CHIP:DMG:                         {
+          [1655968443.870911][21387:21392] CHIP:DMG:                                 CommandPathIB =
+          [1655968443.870998][21387:21392] CHIP:DMG:                                 {
+          [1655968443.871081][21387:21392] CHIP:DMG:                                         EndpointId = 0x0,
+          [1655968443.871165][21387:21392] CHIP:DMG:                                         ClusterId = 0x3e,
+          [1655968443.871248][21387:21392] CHIP:DMG:                                         CommandId = 0x5,
+          [1655968443.871334][21387:21392] CHIP:DMG:                                 },
+          [1655968443.871416][21387:21392] CHIP:DMG:
+          [1655968443.871489][21387:21392] CHIP:DMG:                                 CommandFields =
+          [1655968443.871568][21387:21392] CHIP:DMG:                                 {
+          [1655968443.871646][21387:21392] CHIP:DMG:                                         0x0 = [
+          [1655968443.871916][21387:21392] CHIP:DMG:                                                         0x15, 0x30, 0x1, 0xcc, 0x30, 0x81, 0xc9, 0x30, 0x70, 0x2, 0x1, 0x0, 0x30, 0xe, 0x31, 0xc, 0x30, 0xa, 0x6, 0x3, 0x55, 0x4, 0xa, 0xc, 0x3, 0x43, 0x53, 0x52, 0x30, 0x59, 0x30, 0x13, 0x6, 0x7, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x2, 0x1, 0x6, 0x8, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x3, 0x1, 0x7, 0x3, 0x42, 0x0, 0x4, 0x1d, 0xc0, 0x42, 0x4e, 0x5f, 0xe9, 0xbc, 0x13, 0x99, 0x7c, 0xe5, 0xd2, 0x9a, 0x61, 0xc9, 0x44, 0xbf, 0xc8, 0x8, 0x92, 0x3e, 0x86, 0x56, 0xd8, 0x1, 0xa4, 0x4d, 0x25, 0xe3, 0xda, 0xfc, 0x9, 0x3f, 0xb2, 0xb1, 0x75, 0xcf, 0xf1, 0x58, 0x8c, 0xf6, 0x80, 0x90, 0xfe, 0x2c, 0x31, 0x72, 0x97, 0x5c, 0xa6, 0x87, 0x4e, 0x7c, 0xf8, 0x5f, 0xba, 0x26, 0xc8, 0xf4, 0x6f, 0xf0, 0xf5, 0xf4, 0x53, 0xa0, 0x0, 0x30, 0xa, 0x6, 0x8, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x4, 0x3, 0x2, 0x3, 0x49, 0x0, 0x30, 0x46, 0x2, 0x21, 0x0, 0x8a, 0x1c, 0x12, 0xfc, 0xdf, 0x67, 0xd9, 0x7c, 0x99, 0xed, 0x87, 0xaf, 0xe5, 0xa0, 0xf4, 0x93, 0x21, 0xdc, 0xf6, 0xeb, 0x42, 0xd0, 0x5a, 0xa2, 0x86, 0x35, 0x9c, 0xcf, 0xd2, 0x6, 0xc1, 0x20, 0x2, 0x21, 0x0, 0xe6, 0x6c, 0x5, 0x33, 0x9b, 0x45, 0x17, 0xd1, 0x43, 0xad, 0xf9, 0xd1, 0xab, 0x65, 0xad, 0x14, 0xbc, 0x6d, 0x2e, 0x80, 0x4a, 0xf0, 0x73, 0xc2, 0x5f, 0xdf, 0x65, 0x69, 0xc3, 0x9e, 0x39, 0x3f, 0x30, 0x2, 0x20, 0x6f, 0xd8, 0x41, 0xcb, 0x59, 0x9c, 0x51, 0x20, 0x8a, 0x19, 0x1, 0x8f, 0x5c, 0xb, 0xc9, 0x70, 0xba, 0xa, 0x93, 0x3, 0xb0, 0x7a, 0x2f, 0x2f, 0xb8, 0xed, 0x77, 0xef, 0x80, 0x9b, 0x90, 0xa9, 0x18,
+          [1655968443.872069][21387:21392] CHIP:DMG:                                         ]
+          [1655968443.872144][21387:21392] CHIP:DMG:                                         0x1 = [
+          [1655968443.872275][21387:21392] CHIP:DMG:                                                         0x16, 0xd9, 0x90, 0x89, 0xc, 0xf0, 0x56, 0xf3, 0xfe, 0xeb, 0xa1, 0xec, 0x7e, 0xc2, 0xd4, 0x55, 0x17, 0xf9, 0xf2, 0x56, 0x11, 0xdc, 0x98, 0xcb, 0xc8, 0xa2, 0xf5, 0x96, 0x70, 0x11, 0x17, 0x73, 0xe8, 0x36, 0xcf, 0xc, 0x36, 0x2a, 0x3a, 0x23, 0xef, 0xb6, 0x81, 0x3f, 0xb0, 0x81, 0xef, 0x5e, 0x7e, 0xc5, 0x7f, 0x2f, 0xbd, 0xb3, 0xc8, 0x57, 0xa9, 0x11, 0xbd, 0xd1, 0x1a, 0x69, 0x4e, 0x89,
+          [1655968443.872374][21387:21392] CHIP:DMG:                                         ]
+          [1655968443.872450][21387:21392] CHIP:DMG:                                 },
+          [1655968443.872650][21387:21392] CHIP:DMG:                         },
+          [1655968443.872742][21387:21392] CHIP:DMG:
+          [1655968443.872810][21387:21392] CHIP:DMG:                 },
+          [1655968443.872885][21387:21392] CHIP:DMG:
+          [1655968443.872943][21387:21392] CHIP:DMG:         ],
+          [1655968443.873018][21387:21392] CHIP:DMG:
+          [1655968443.873077][21387:21392] CHIP:DMG:         InteractionModelRevision = 1
+          [1655968443.873134][21387:21392] CHIP:DMG: },
       disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_DA_1_6.yaml b/src/app/tests/suites/certification/Test_TC_DA_1_6.yaml
index f46e0019d287f4..e80937b7a28ab4 100644
--- a/src/app/tests/suites/certification/Test_TC_DA_1_6.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DA_1_6.yaml
@@ -13,7 +13,7 @@
 # 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: 17.1.6. [TC-DA-1.6] NOCSR Procedure Validation [DUT - Commissioner]
+name: 18.1.6. [TC-DA-1.6] NOCSR Procedure Validation [DUT - Commissioner]
 
 config:
     nodeId: 0x12344321
@@ -23,21 +23,268 @@ config:
 tests:
     - label: "DUT completes the attestation procedure"
       verification: |
+          Verify in TH log:
 
+          [1655374218.114327][35023:35028] CHIP:CTL: Performing next commissioning step 'SendAttestationRequest'
+          [1655374218.114378][35023:35028] CHIP:CTL: Sending Attestation Request to the device.
+          [1655374218.114556][35023:35028] CHIP:CTL: Sending Attestation request to 0xffff74000b60 device
+          [1655374218.114675][35023:35028] CHIP:DMG: ICR moving to [AddingComm]
+          [1655374218.114746][35023:35028] CHIP:DMG: ICR moving to [AddedComma]
+          [1655374218.115227][35023:35028] CHIP:IN: Prepared secure message 0xffff7bffc958 to 0xFFFFFFFB00000000 (0)  of type 0x8 and protocolId (0, 1) on exchange 1302i with MessageCounter:20936210.
+          [1655374218.115326][35023:35028] CHIP:IN: Sending encrypted msg 0xffff7bffc958 with MessageCounter:20936210 to 0xFFFFFFFB00000000 (0) at monotonic time: 00000000004F8059 msec
+          [1655374218.115908][35023:35028] CHIP:DMG: >> to BLE | 20936210 | [Interaction Model  (1) / InvokeCommandRequest (0x08) / Session = 43668 / Exchange = 1302]
+          [1655374218.116008][35023:35028] CHIP:DMG: Header Flags =
+          [1655374218.116065][35023:35028] CHIP:DMG: {
+          [1655374218.116149][35023:35028] CHIP:DMG:     Exchange (0x01) =
+          [1655374218.116187][35023:35028] CHIP:DMG:     {
+          [1655374218.116209][35023:35028] CHIP:DMG:         Initiator = true
+          [1655374218.116233][35023:35028] CHIP:DMG:     }
+          [1655374218.116264][35023:35028] CHIP:DMG: }
+          [1655374218.116288][35023:35028] CHIP:DMG:
+          [1655374218.116381][35023:35028] CHIP:DMG: Encrypted Payload (94 bytes) =
+          [1655374218.116408][35023:35028] CHIP:DMG: {
+          [1655374218.116432][35023:35028] CHIP:DMG:     data = 0094aa0012763f01f66833cd7fd4d0b928d486cd8459db3eb0f11f7b48d3145a810b0c2e03ea68c89e4ee9cf28127369ac0eef32376c5303945a2fe8c99d13a49086721cd68804d90415fef75a0b464605f2d0245f293767a4077eb7d5eb
+          [1655374218.116458][35023:35028] CHIP:DMG:     buffer_ptr = 281472627988496
+          [1655374218.116482][35023:35028] CHIP:DMG: }
+          [1655374218.116505][35023:35028] CHIP:DMG:
+          [1655374218.116585][35023:35028] CHIP:DMG: InvokeRequestMessage =
+          [1655374218.116614][35023:35028] CHIP:DMG: {
+          [1655374218.116640][35023:35028] CHIP:DMG: 	suppressResponse = false,
+          [1655374218.116669][35023:35028] CHIP:DMG: 	timedRequest = false,
+          [1655374218.116697][35023:35028] CHIP:DMG: 	InvokeRequests =
+          [1655374218.116732][35023:35028] CHIP:DMG: 	[
+          [1655374218.116759][35023:35028] CHIP:DMG: 		CommandDataIB =
+          [1655374218.116790][35023:35028] CHIP:DMG: 		{
+          [1655374218.116818][35023:35028] CHIP:DMG: 			CommandPathIB =
+          [1655374218.116853][35023:35028] CHIP:DMG: 			{
+          [1655374218.116888][35023:35028] CHIP:DMG: 				EndpointId = 0x0,
+          [1655374218.116926][35023:35028] CHIP:DMG: 				ClusterId = 0x3e,
+          [1655374218.116966][35023:35028] CHIP:DMG: 				CommandId = 0x0,
+          [1655374218.117000][35023:35028] CHIP:DMG: 			},
+          [1655374218.117037][35023:35028] CHIP:DMG:
+          [1655374218.117068][35023:35028] CHIP:DMG: 			CommandFields =
+          [1655374218.117103][35023:35028] CHIP:DMG: 			{
+          [1655374218.117137][35023:35028] CHIP:DMG: 				0x0 = [
+          [1655374218.117184][35023:35028] CHIP:DMG: 					0x76, 0x2b, 0x6b, 0x9d, 0xa0, 0x8f, 0x7f, 0xc6, 0x3b, 0xb6, 0x93, 0xe3, 0x86, 0x34, 0xec, 0x6f, 0x87, 0xce, 0xff, 0x28, 0xab, 0x15, 0x54, 0xa1, 0x6a, 0xd4, 0x3d, 0xce, 0xc2, 0x4c, 0x24, 0x66,
+          [1655374218.117223][35023:35028] CHIP:DMG: 			]
+          [1655374218.117257][35023:35028] CHIP:DMG: 			},
+          [1655374218.117290][35023:35028] CHIP:DMG: 		},
+          [1655374218.117323][35023:35028] CHIP:DMG:
+          [1655374218.117350][35023:35028] CHIP:DMG: 	],
+          [1655374218.117384][35023:35028] CHIP:DMG:
+          [1655374218.117410][35023:35028] CHIP:DMG: 	InteractionModelRevision = 1
+          [1655374218.117436][35023:35028] CHIP:DMG: },
+          [1655374218.117462][35023:35028] CHIP:DMG:
+          [1655374218.117597][35023:35028] CHIP:DMG: ICR moving to [CommandSen]
+          [1655374218.117635][35023:35028] CHIP:CTL: Sent Attestation request, waiting for the Attestation Information
+          [1655374218.117686][35023:35028] CHIP:DMG: ICR moving to [AwaitingDe]
+          [1655374218.204040][35023:35028] CHIP:DL: HandlePlatformSpecificBLEEvent 16387
+          [1655374218.252180][35023:35026] CHIP:DL: Indication received, conn = 0xffff8003c0c0
+          [1655374218.252405][35023:35028] CHIP:DL: HandlePlatformSpecificBLEEvent 16389
+          [1655374218.352372][35023:35026] CHIP:DL: Indication received, conn = 0xffff8003c0c0
+          [1655374218.352509][35023:35028] CHIP:DL: HandlePlatformSpecificBLEEvent 16389
+          [1655374218.450622][35023:35026] CHIP:DL: Indication received, conn = 0xffff8003c0c0
+          [1655374218.450870][35023:35028] CHIP:DL: HandlePlatformSpecificBLEEvent 16389
+          [1655374218.452138][35023:35028] CHIP:DMG: << from BLE | 224958145 | [Interaction Model  (1) / InvokeCommandResponse (0x09) / Session = 19710 / Exchange = 1302]
+          [1655374218.452241][35023:35028] CHIP:DMG: Header Flags =
+          [1655374218.452300][35023:35028] CHIP:DMG: {
+          [1655374218.452395][35023:35028] CHIP:DMG: }
+          [1655374218.452449][35023:35028] CHIP:DMG:
+          [1655374218.452521][35023:35028] CHIP:DMG: Encrypted Payload (716 bytes) =
+          [1655374218.452579][35023:35028] CHIP:DMG: {
+          [1655374218.452634][35023:35028] CHIP:DMG:     data = 00fe4c00c196680d30c5e98d35a6d844102a8b0067edba80e2adf97e28751f8353657dacb7c9706c2c22add28d18adca15378d16af57f0f4092893cfc5d3e85f6e409f70e39bcb9e0bd3397947e927d20e5bf5173e3def7218d0152cf40e7cb16db615efbd282fd6e84c710bd2c7441228eb5dbbcf0dc76a3eaa0b04655f434d3c8223c7016703b8082c9984c3a91432d12271c87f4d09e90cb6e78d07c81d6359cd5a756f2bace60a7a216896949b536e5583f22db64aeae0279ba2fd279813be383e4324ab63472e3d9877f6c9fa539e577dc50fbcc5a7124a14ea78abdd6ada4ec256a3ee0a242747d636215ffab3c8b4291023eb51b3701939e153912b0f5764479b05e1cf472c350304d1ead872295c80fed3a545530f773e729b6f7bd7d5547de03076a72b8855191beb12d8194477bc9798b6177557cccf3b11b2c1f82cee31d451408359650112394dc2c1592cd2eb1e75881aa340885e65ef9a9905947842574ddcac832d68188b0a3a20fb223258d766692b13a6cde0de34d4f9047046d38ad94caf0a9cc7a786c082d5ae8c62346d69684c6ed5ae958ab68c0685922751ff04d922a838c9d2257a7af6e72af524b459a45ea6311431d30c7de32b3d79581ac119d6e7f63a877b53fda9d69256c5870f2af36f74e08b22e1217a0324b772394a4a596ff237331c623b8d7746077826088dddd2a741f19011cde09f1e897f92ac975fd9a157de0b780f6551b11a50ffe12c781f304dbda9dd75465fb3a8ec52d30f7ddb9179f1b9dfe415ae2d66a53bad67bcf27b3351b8a5cdc9e8b54095c81774007237c8a14a3e2c9cf350616cf5ebf7f6ae5a8c77207924b0e1cddc6c7e77c2a514319947c5988af1dd77325259f496293e53041941d45a1355f56b8036008ab696f7d47d17f9fc4890aa78c2811560b7b4d79a460b7dcd3d9bc3bdd5f72d27bb0060f722aa9c22e7d635895404c832bf2371321d1ababa954482c847fedd0d4676bd188365
+          [1655374218.452884][35023:35028] CHIP:DMG:     buffer_ptr = 281472627984864
+          [1655374218.452941][35023:35028] CHIP:DMG: }
+          [1655374218.452992][35023:35028] CHIP:DMG:
+          [1655374218.453303][35023:35028] CHIP:DMG: Attestation Elements (585 bytes) =
+          [1655374218.453366][35023:35028] CHIP:DMG: {
+          [1655374218.453431][35023:35028] CHIP:DMG:     Certification Declaration =
+          [1655374218.453483][35023:35028] CHIP:DMG:     {
+          [1655374218.455342][35023:35028] CHIP:DMG:         Format Version = 1
+          [1655374218.455398][35023:35028] CHIP:DMG:         Vendor Id = 65521
+          [1655374218.455438][35023:35028] CHIP:DMG:         Product Ids =
+          [1655374218.455474][35023:35028] CHIP:DMG:         {
+          [1655374218.455512][35023:35028] CHIP:DMG:             Product Id = 32768
+          [1655374218.455552][35023:35028] CHIP:DMG:             Product Id = 32769
+          [1655374218.455590][35023:35028] CHIP:DMG:             Product Id = 32770
+          [1655374218.455628][35023:35028] CHIP:DMG:             Product Id = 32771
+          [1655374218.455666][35023:35028] CHIP:DMG:             Product Id = 32772
+          [1655374218.455704][35023:35028] CHIP:DMG:             Product Id = 32773
+          [1655374218.455742][35023:35028] CHIP:DMG:             Product Id = 32774
+          [1655374218.455780][35023:35028] CHIP:DMG:             Product Id = 32775
+          [1655374218.455818][35023:35028] CHIP:DMG:             Product Id = 32776
+          [1655374218.455855][35023:35028] CHIP:DMG:             Product Id = 32777
+          [1655374218.455893][35023:35028] CHIP:DMG:             Product Id = 32778
+          [1655374218.455931][35023:35028] CHIP:DMG:             Product Id = 32779
+          [1655374218.455969][35023:35028] CHIP:DMG:             Product Id = 32780
+          [1655374218.456007][35023:35028] CHIP:DMG:             Product Id = 32781
+          [1655374218.456045][35023:35028] CHIP:DMG:             Product Id = 32782
+          [1655374218.456082][35023:35028] CHIP:DMG:             Product Id = 32783
+          [1655374218.456120][35023:35028] CHIP:DMG:             Product Id = 32784
+          [1655374218.456158][35023:35028] CHIP:DMG:             Product Id = 32785
+          [1655374218.456196][35023:35028] CHIP:DMG:             Product Id = 32786
+          [1655374218.456234][35023:35028] CHIP:DMG:             Product Id = 32787
+          [1655374218.456271][35023:35028] CHIP:DMG:             Product Id = 32788
+          [1655374218.456309][35023:35028] CHIP:DMG:             Product Id = 32789
+          [1655374218.456347][35023:35028] CHIP:DMG:             Product Id = 32790
+          [1655374218.456385][35023:35028] CHIP:DMG:             Product Id = 32791
+          [1655374218.456423][35023:35028] CHIP:DMG:             Product Id = 32792
+          [1655374218.456461][35023:35028] CHIP:DMG:             Product Id = 32793
+          [1655374218.456498][35023:35028] CHIP:DMG:             Product Id = 32794
+          [1655374218.456536][35023:35028] CHIP:DMG:             Product Id = 32795
+          [1655374218.456573][35023:35028] CHIP:DMG:             Product Id = 32796
+          [1655374218.456611][35023:35028] CHIP:DMG:             Product Id = 32797
+          [1655374218.456649][35023:35028] CHIP:DMG:             Product Id = 32798
+          [1655374218.456687][35023:35028] CHIP:DMG:             Product Id = 32799
+          [1655374218.456724][35023:35028] CHIP:DMG:             Product Id = 32800
+          [1655374218.456761][35023:35028] CHIP:DMG:             Product Id = 32801
+          [1655374218.456799][35023:35028] CHIP:DMG:             Product Id = 32802
+          [1655374218.456836][35023:35028] CHIP:DMG:             Product Id = 32803
+          [1655374218.456874][35023:35028] CHIP:DMG:             Product Id = 32804
+          [1655374218.456912][35023:35028] CHIP:DMG:             Product Id = 32805
+          [1655374218.456949][35023:35028] CHIP:DMG:             Product Id = 32806
+          [1655374218.456987][35023:35028] CHIP:DMG:             Product Id = 32807
+          [1655374218.457024][35023:35028] CHIP:DMG:             Product Id = 32808
+          [1655374218.457061][35023:35028] CHIP:DMG:             Product Id = 32809
+          [1655374218.457099][35023:35028] CHIP:DMG:             Product Id = 32810
+          [1655374218.457138][35023:35028] CHIP:DMG:             Product Id = 32811
+          [1655374218.457175][35023:35028] CHIP:DMG:             Product Id = 32812
+          [1655374218.457212][35023:35028] CHIP:DMG:             Product Id = 32813
+          [1655374218.457250][35023:35028] CHIP:DMG:             Product Id = 32814
+          [1655374218.457288][35023:35028] CHIP:DMG:             Product Id = 32815
+          [1655374218.457326][35023:35028] CHIP:DMG:             Product Id = 32816
+          [1655374218.457363][35023:35028] CHIP:DMG:             Product Id = 32817
+          [1655374218.457401][35023:35028] CHIP:DMG:             Product Id = 32818
+          [1655374218.457439][35023:35028] CHIP:DMG:             Product Id = 32819
+          [1655374218.457476][35023:35028] CHIP:DMG:             Product Id = 32820
+          [1655374218.457514][35023:35028] CHIP:DMG:             Product Id = 32821
+          [1655374218.457552][35023:35028] CHIP:DMG:             Product Id = 32822
+          [1655374218.457590][35023:35028] CHIP:DMG:             Product Id = 32823
+          [1655374218.457627][35023:35028] CHIP:DMG:             Product Id = 32824
+          [1655374218.457665][35023:35028] CHIP:DMG:             Product Id = 32825
+          [1655374218.457702][35023:35028] CHIP:DMG:             Product Id = 32826
+          [1655374218.457740][35023:35028] CHIP:DMG:             Product Id = 32827
+          [1655374218.457777][35023:35028] CHIP:DMG:             Product Id = 32828
+          [1655374218.457833][35023:35028] CHIP:DMG:             Product Id = 32829
+          [1655374218.457874][35023:35028] CHIP:DMG:             Product Id = 32830
+          [1655374218.457912][35023:35028] CHIP:DMG:             Product Id = 32831
+          [1655374218.457950][35023:35028] CHIP:DMG:             Product Id = 32832
+          [1655374218.457987][35023:35028] CHIP:DMG:             Product Id = 32833
+          [1655374218.458026][35023:35028] CHIP:DMG:             Product Id = 32834
+          [1655374218.458063][35023:35028] CHIP:DMG:             Product Id = 32835
+          [1655374218.458101][35023:35028] CHIP:DMG:             Product Id = 32836
+          [1655374218.458139][35023:35028] CHIP:DMG:             Product Id = 32837
+          [1655374218.458177][35023:35028] CHIP:DMG:             Product Id = 32838
+          [1655374218.458215][35023:35028] CHIP:DMG:             Product Id = 32839
+          [1655374218.458253][35023:35028] CHIP:DMG:             Product Id = 32840
+          [1655374218.458291][35023:35028] CHIP:DMG:             Product Id = 32841
+          [1655374218.458328][35023:35028] CHIP:DMG:             Product Id = 32842
+          [1655374218.458366][35023:35028] CHIP:DMG:             Product Id = 32843
+          [1655374218.458404][35023:35028] CHIP:DMG:             Product Id = 32844
+          [1655374218.458441][35023:35028] CHIP:DMG:             Product Id = 32845
+          [1655374218.458480][35023:35028] CHIP:DMG:             Product Id = 32846
+          [1655374218.458517][35023:35028] CHIP:DMG:             Product Id = 32847
+          [1655374218.458555][35023:35028] CHIP:DMG:             Product Id = 32848
+          [1655374218.458592][35023:35028] CHIP:DMG:             Product Id = 32849
+          [1655374218.458630][35023:35028] CHIP:DMG:             Product Id = 32850
+          [1655374218.458667][35023:35028] CHIP:DMG:             Product Id = 32851
+          [1655374218.458706][35023:35028] CHIP:DMG:             Product Id = 32852
+          [1655374218.458743][35023:35028] CHIP:DMG:             Product Id = 32853
+          [1655374218.458781][35023:35028] CHIP:DMG:             Product Id = 32854
+          [1655374218.458818][35023:35028] CHIP:DMG:             Product Id = 32855
+          [1655374218.458856][35023:35028] CHIP:DMG:             Product Id = 32856
+          [1655374218.458893][35023:35028] CHIP:DMG:             Product Id = 32857
+          [1655374218.458932][35023:35028] CHIP:DMG:             Product Id = 32858
+          [1655374218.458969][35023:35028] CHIP:DMG:             Product Id = 32859
+          [1655374218.459007][35023:35028] CHIP:DMG:             Product Id = 32860
+          [1655374218.459045][35023:35028] CHIP:DMG:             Product Id = 32861
+          [1655374218.459082][35023:35028] CHIP:DMG:             Product Id = 32862
+          [1655374218.459120][35023:35028] CHIP:DMG:             Product Id = 32863
+          [1655374218.459159][35023:35028] CHIP:DMG:             Product Id = 32864
+          [1655374218.459196][35023:35028] CHIP:DMG:             Product Id = 32865
+          [1655374218.459234][35023:35028] CHIP:DMG:             Product Id = 32866
+          [1655374218.459271][35023:35028] CHIP:DMG:             Product Id = 32867
+          [1655374218.459309][35023:35028] CHIP:DMG:         }
+          [1655374218.459347][35023:35028] CHIP:DMG:         Device Type Id = 22
+          [1655374218.459390][35023:35028] CHIP:DMG:         Certificate Id (19) = ZIG20142ZB330003-24
+          [1655374218.459430][35023:35028] CHIP:DMG:         Security Level = 0
+          [1655374218.459470][35023:35028] CHIP:DMG:         Security Information = 0
+          [1655374218.459508][35023:35028] CHIP:DMG:         Version Number = 9876
+          [1655374218.459546][35023:35028] CHIP:DMG:         Certification Type = 0
+          [1655374218.459584][35023:35028] CHIP:DMG:     }
+          [1655374218.459627][35023:35028] CHIP:DMG:     Attestation Nonce (32) = 762B6B9DA08F7FC63BB693E38634EC6F87CEFF28AB1554A16AD43DCEC24C2466
+          [1655374218.459664][35023:35028] CHIP:DMG:     Timestamp = 0
+          [1655374218.459699][35023:35028] CHIP:DMG: }
+          [1655374218.459732][35023:35028] CHIP:DMG:
+          [1655374218.459776][35023:35028] CHIP:DMG:
+          [1655374218.459846][35023:35028] CHIP:DMG: Additional Fields =
+          [1655374218.459884][35023:35028] CHIP:DMG: {
+          [1655374218.459924][35023:35028] CHIP:DMG:     peer_address = BLE
+          [1655374218.459960][35023:35028] CHIP:DMG: }
+          [1655374218.459993][35023:35028] CHIP:DMG:
+          [1655374218.460045][35023:35028] CHIP:EM: Received message of type 0x9 with protocolId (0, 1) and MessageCounter:224958145 on exchange 1302i
+          [1655374218.460090][35023:35028] CHIP:EM: Found matching exchange: 1302i, Delegate: 0xffff74005ab0
+          [1655374218.460157][35023:35028] CHIP:DMG: ICR moving to [ResponseRe]
+          [1655374218.460220][35023:35028] CHIP:DMG: InvokeResponseMessage =
+          [1655374218.460260][35023:35028] CHIP:DMG: {
+          [1655374218.460298][35023:35028] CHIP:DMG: 	suppressResponse = false,
+          [1655374218.460338][35023:35028] CHIP:DMG: 	InvokeResponseIBs =
+          [1655374218.460390][35023:35028] CHIP:DMG: 	[
+          [1655374218.460430][35023:35028] CHIP:DMG: 		InvokeResponseIB =
+          [1655374218.460487][35023:35028] CHIP:DMG: 		{
+          [1655374218.460530][35023:35028] CHIP:DMG: 			CommandDataIB =
+          [1655374218.460580][35023:35028] CHIP:DMG: 			{
+          [1655374218.460628][35023:35028] CHIP:DMG: 				CommandPathIB =
+          [1655374218.460686][35023:35028] CHIP:DMG: 				{
+          [1655374218.460745][35023:35028] CHIP:DMG: 					EndpointId = 0x0,
+          [1655374218.460802][35023:35028] CHIP:DMG: 					ClusterId = 0x3e,
+          [1655374218.460852][35023:35028] CHIP:DMG: 					CommandId = 0x1,
+          [1655374218.460906][35023:35028] CHIP:DMG: 				},
+          [1655374218.460962][35023:35028] CHIP:DMG:
+          [1655374218.461010][35023:35028] CHIP:DMG: 				CommandFields =
+          [1655374218.461068][35023:35028] CHIP:DMG: 				{
+          [1655374218.461123][35023:35028] CHIP:DMG: 					0x0 = [
+          [1655374218.461351][35023:35028] CHIP:DMG: 						0x15, 0x31, 0x1, 0x1d, 0x2, 0x30, 0x82, 0x2, 0x19, 0x6, 0x9, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0xd, 0x1, 0x7, 0x2, 0xa0, 0x82, 0x2, 0xa, 0x30, 0x82, 0x2, 0x6, 0x2, 0x1, 0x3, 0x31, 0xd, 0x30, 0xb, 0x6, 0x9, 0x60, 0x86, 0x48, 0x1, 0x65, 0x3, 0x4, 0x2, 0x1, 0x30, 0x82, 0x1, 0x71, 0x6, 0x9, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0xd, 0x1, 0x7, 0x1, 0xa0, 0x82, 0x1, 0x62, 0x4, 0x82, 0x1, 0x5e, 0x15, 0x24, 0x0, 0x1, 0x25, 0x1, 0xf1, 0xff, 0x36, 0x2, 0x5, 0x0, 0x80, 0x5, 0x1, 0x80, 0x5, 0x2, 0x80, 0x5, 0x3, 0x80, 0x5, 0x4, 0x80, 0x5, 0x5, 0x80, 0x5, 0x6, 0x80, 0x5, 0x7, 0x80, 0x5, 0x8, 0x80, 0x5, 0x9, 0x80, 0x5, 0xa, 0x80, 0x5, 0xb, 0x80, 0x5, 0xc, 0x80, 0x5, 0xd, 0x80, 0x5, 0xe, 0x80, 0x5, 0xf, 0x80, 0x5, 0x10, 0x80, 0x5, 0x11, 0x80, 0x5, 0x12, 0x80, 0x5, 0x13, 0x80, 0x5, 0x14, 0x80, 0x5, 0x15, 0x80, 0x5, 0x16, 0x80, 0x5, 0x17, 0x80, 0x5, 0x18, 0x80, 0x5, 0x19, 0x80, 0x5, 0x1a, 0x80, 0x5, 0x1b, 0x80, 0x5, 0x1c, 0x80, 0x5, 0x1d, 0x80, 0x5, 0x1e, 0x80, 0x5, 0x1f, 0x80, 0x5, 0x20, 0x80, 0x5, 0x21, 0x80, 0x5, 0x22, 0x80, 0x5, 0x23, 0x80, 0x5, 0x24, 0x80, 0x5, 0x25, 0x80, 0x5, 0x26, 0x80, 0x5, 0x27, 0x80, 0x5, 0x28, 0x80, 0x5, 0x29, 0x80, 0x5, 0x2a, 0x80, 0x5, 0x2b, 0x80, 0x5, 0x2c, 0x80, 0x5, 0x2d, 0x80, 0x5, 0x2e, 0x80, 0x5, 0x2f, 0x80, 0x5, 0x30, 0x80, 0x5, 0x31, 0x80, 0x5, 0x32, 0x80, 0x5, 0x33, 0x80, 0x5, 0x34, 0x80, 0x5, 0x35, 0x80, 0x5, 0x36, 0x80, 0x5, 0x37, 0x80, 0x5, 0x38, 0x80, 0x5, 0x39, 0x80, 0x5, 0x3a, 0x80, 0x5, 0x3b, 0x80, 0x5, 0x3c, 0x80, 0x5, 0x3d, 0x80, 0x5, 0x3e, 0x80, 0x5, 0x3f, 0x80, 0x5, 0x40, 0x80, 0x5, 0x41, 0x80, 0x5, 0x42, 0x80, 0x5, 0x43, 0x80, 0x5, 0x44, 0x80, 0x5, 0x45, 0x80, 0x5, 0x46, 0x80, 0x5, 0x47, 0x80, 0x5, 0x48, 0x80, 0x5, 0x49, 0x80, 0x5, 0x4a, 0x80, 0x5, 0x
+          [1655374218.461469][35023:35028] CHIP:DMG: 				]
+          [1655374218.461523][35023:35028] CHIP:DMG: 					0x1 = [
+          [1655374218.461611][35023:35028] CHIP:DMG: 						0xd6, 0x91, 0x3d, 0x0, 0x37, 0xd3, 0x23, 0x11, 0xa9, 0xe6, 0x23, 0xe3, 0xb0, 0x80, 0x27, 0x71, 0xc2, 0xb1, 0xdc, 0xe1, 0xb8, 0x95, 0x7c, 0x88, 0x92, 0xc6, 0x84, 0xe4, 0x21, 0xa2, 0x87, 0x22, 0x6d, 0xeb, 0x42, 0x82, 0x67, 0xe0, 0x9c, 0x17, 0xb1, 0x1c, 0x1, 0xff, 0x8b, 0xff, 0x23, 0x47, 0xc4, 0xe7, 0x6, 0x1d, 0x8f, 0x1e, 0x26, 0x8e, 0xad, 0xbd, 0xc9, 0x9e, 0x23, 0x88, 0xdb, 0xb6,
+          [1655374218.461681][35023:35028] CHIP:DMG: 				]
+          [1655374218.461733][35023:35028] CHIP:DMG: 				},
+          [1655374218.461783][35023:35028] CHIP:DMG: 			},
+          [1655374218.461855][35023:35028] CHIP:DMG:
+          [1655374218.461900][35023:35028] CHIP:DMG: 		},
+          [1655374218.461951][35023:35028] CHIP:DMG:
+          [1655374218.461990][35023:35028] CHIP:DMG: 	],
+          [1655374218.462041][35023:35028] CHIP:DMG:
+          [1655374218.462080][35023:35028] CHIP:DMG: 	InteractionModelRevision = 1
+          [1655374218.462118][35023:35028] CHIP:DMG: },
+          [1655374218.462220][35023:35028] CHIP:DMG: Received Command Response Data, Endpoint=0 Cluster=0x0000_003E Command=0x0000_0001
+          [1655374218.462275][35023:35028] CHIP:CTL: Received Attestation Information from the device
+          [1655374218.462320][35023:35028] CHIP:CTL: Successfully finished commissioning step 'SendAttestationRequest'
       disabled: true
 
     - label:
           "DUT generates 32-byte CSRNonce and is sent to TH1 through CSRRequest
           Command"
       verification: |
+          Verify in TH log
 
+          [1655374218.694869][35023:35028] CHIP:DMG: NOCSR Elements =
+          [1655374218.694922][35023:35028] CHIP:DMG: {
+          [1655374218.695009][35023:35028] CHIP:DMG:     CSR (203) = 3081C83070020100300E310C300A060355040A0C034353523059301306072A8648CE3D020106082A8648CE3D03010703420004FD1662E0C1F44C5BD8A284452ED17C631CA88697CBF396EB765397315ED248729BFC7DE464404B1FA34B2DD81714E2484B8E908121BB95DFDA4493D5CDDA797AA000300A06082A8648CE3D0403020348003045022100832718B8679DB2C9A26579F08D930F7DA747F6F23EE2DD11777FBF1191909FD3022073E039F63AEA4C1BF812AE65221CB09203FF1BD382872FB37478C2C4045FD8B8
+          [1655374218.695086][35023:35028] CHIP:DMG:     CSRNonce (32) = 79964F34E68A97E41DBDFE7888583183535EDC3A185AF99941BDA4C5A65FDA39
+          [1655374218.695133][35023:35028] CHIP:DMG: }
+
+
+          "./chip-tool operationalcredentials csrrequest 79964F34E68A97E41DBDFE7888583183535EDC3A185AF99941BDA4C5A65FDA39 1 0
+          "
       disabled: true
 
     - label:
           "TH1 generates Invalid NOCSR Information and sends the CSRResponse
           Command. Refer Steps 6.1 to 6.8"
       verification: |
-          Verify that DUT reports error
+
       disabled: true
 
     - label: "Factory Reset DUT so that it is commissionable again"
diff --git a/src/app/tests/suites/certification/Test_TC_DA_1_7.yaml b/src/app/tests/suites/certification/Test_TC_DA_1_7.yaml
new file mode 100644
index 00000000000000..da5b1b41bbe5b3
--- /dev/null
+++ b/src/app/tests/suites/certification/Test_TC_DA_1_7.yaml
@@ -0,0 +1,67 @@
+# 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: 18.1.7. [TC-DA-1.7] Validate CertificateChainRequest [DUT-Commissionee]
+
+config:
+    nodeId: 0x12344321
+    cluster: "Basic"
+    endpoint: 0
+
+tests:
+    - label: "Start the commissioning process of DUT1 by TH on a first Fabric"
+      verification: |
+          DUT side:
+          sudo ./chip-all-clusters-app --wifi
+
+          TH side:
+          ./chip-tool pairing ble-wifi 1 zigbeehome matter123 20202021 3841 --trace_decode 1
+
+          [1650455358.501816][4366:4371] CHIP:TOO: Device commissioning completed with success
+      disabled: true
+
+    - label:
+          "TH sends CertificateChainRequest Command to DUT1 for both PAI and DAC"
+      verification: |
+          "Verify in TH log:
+
+          [1655374217.766326][35023:35028] CHIP:DMG: DAC/PAI (463) =
+          [1655374217.766373][35023:35028] CHIP:DMG: {
+          -----BEGIN CERTIFICATE-----
+          MIIByzCCAXGgAwIBAgIIVq2CIq2UW2QwCgYIKoZIzj0EAwIwMDEYMBYGA1UEAwwP
+          TWF0dGVyIFRlc3QgUEFBMRQwEgYKKwYBBAGConwCAQwERkZGMTAgFw0yMjAyMDUw
+          MDAwMDBaGA85OTk5MTIzMTIzNTk1OVowPTElMCMGA1UEAwwcTWF0dGVyIERldiBQ
+          QUkgMHhGRkYxIG5vIFBJRDEUMBIGCisGAQQBgqJ8AgEMBEZGRjEwWTATBgcqhkjO
+          PQIBBggqhkjOPQMBBwNCAARBmpMVwhc+DIyHbQPM/JRIUmR/f+xeUIL0BZko7KiU
+          xZQVEwmsYx5MsDOSr2hLC6+35ls7gWLC9Sv5MbjneqqCo2YwZDASBgNVHRMBAf8E
+          CDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUY1QOR/ZLHDjROISk
+          YtFsGV2P+zwwHwYDVR0jBBgwFoAUav0idx9RH+y/FkGXZxDc3DGhcX4wCgYIKoZI
+          zj0EAwIDSAAwRQIhALLvJ/Sa6bUPuR7qyUxNC9u415KcbLiPrOUpNo0SBUwMAiBl
+          Xckrhr2QmIKmxiF3uCXX0F7b58Ivn+pxIg5+pwP4kQ==
+          -----END CERTIFICATE-----
+          "
+      disabled: true
+
+    - label:
+          "TH saves PAI certificates. Extract the Authority Key Identifier from
+          the PAI certificate"
+      verification: |
+
+      disabled: true
+
+    - label: "Repeat Step 1 to 4 with DUT2"
+      verification: |
+
+      disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_DLOG_1_1.yaml b/src/app/tests/suites/certification/Test_TC_DLOG_1_1.yaml
index fc2202c77cc3db..1d6640b461f04d 100644
--- a/src/app/tests/suites/certification/Test_TC_DLOG_1_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DLOG_1_1.yaml
@@ -31,11 +31,8 @@ tests:
           sudo ./chip-tool diagnosticlogs read cluster-revision 1 0
 
 
-          [1649670811.424717][3655:3660] CHIP:DMG:
-          [1649670811.424750][3655:3660] CHIP:DMG:        SuppressResponse = true,
-          [1649670811.424783][3655:3660] CHIP:DMG:        InteractionModelRevision = 1
-          [1649670811.424814][3655:3660] CHIP:DMG: }
-          [1649670811.424949][3655:3660] CHIP:TOO: Response Failure: IM Error 0x00000586: General error: 0x86 (UNSUPPORTED_ATTRIBUTE)
+          [1653983972.206171][5186:5191] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0032 Attribute 0x0000_FFFD DataVersion: 2389393200
+          [1653983972.206236][5186:5191] CHIP:TOO:   ClusterRevision: 1
       disabled: true
 
     - label: "TH reads the FeatureMap from DUT"
@@ -43,11 +40,8 @@ tests:
           sudo ./chip-tool diagnosticlogs read feature-map 1 0
 
 
-          [1649670512.997198][3591:3596] CHIP:DMG:
-          [1649670512.997231][3591:3596] CHIP:DMG:        SuppressResponse = true,
-          [1649670512.997265][3591:3596] CHIP:DMG:        InteractionModelRevision = 1
-          [1649670512.997329][3591:3596] CHIP:DMG: }
-          [1649670512.997468][3591:3596] CHIP:TOO: Response Failure: IM Error 0x00000586: General error: 0x86 (UNSUPPORTED_ATTRIBUTE)
+          [1653983676.882544][5166:5171] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0032 Attribute 0x0000_FFFC DataVersion: 2389393200
+          [1653983676.882637][5166:5171] CHIP:TOO:   FeatureMap: 0
       disabled: true
 
     - label: "TH reads AttributeList from DUT"
diff --git a/src/app/tests/suites/certification/Test_TC_DLOG_2_1.yaml b/src/app/tests/suites/certification/Test_TC_DLOG_2_1.yaml
index c7182d642fe234..ba2bddfcca7d9c 100644
--- a/src/app/tests/suites/certification/Test_TC_DLOG_2_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DLOG_2_1.yaml
@@ -48,6 +48,7 @@ tests:
       disabled: true
 
     - label: "TH Sends BDX SendAccept message"
+      PICS: DLOG.S.C01.Tx
       verification: |
           Not Verifiable
       disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_DLOG_3_1.yaml b/src/app/tests/suites/certification/Test_TC_DLOG_3_1.yaml
index b5f0d55fabc6aa..7d7912fa495181 100644
--- a/src/app/tests/suites/certification/Test_TC_DLOG_3_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DLOG_3_1.yaml
@@ -27,6 +27,7 @@ tests:
       disabled: true
 
     - label: "DUT sends RetrieveLogsRequest Command to TH"
+      PICS: DLOG.C.C00.Tx
       verification: |
           ./chip-tool diagnosticlogs retrieve-logs-request 0 0 "test.txt" 1 0
 
diff --git a/src/app/tests/suites/certification/Test_TC_LCFG_1_1.yaml b/src/app/tests/suites/certification/Test_TC_LCFG_1_1.yaml
index 4ddf845555dbc2..692fe3177e1217 100644
--- a/src/app/tests/suites/certification/Test_TC_LCFG_1_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_LCFG_1_1.yaml
@@ -13,7 +13,7 @@
 # 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: 101.1.1. [TC-LCFG-1.1] Global Attributes [DUT-Server]
+name: 99.1.1. [TC-LCFG-1.1] Global Attributes [DUT-Server]
 
 config:
     nodeId: 0x12344321
@@ -21,177 +21,77 @@ config:
     endpoint: 0
 
 tests:
-    - label: "TH reads SupportedLocales attribute from DUT"
+    - label: "Commission TH to DUT"
       verification: |
-          ubuntu@ubuntu:~/apps$ '' ./chip-tool localizationconfiguration read supported-locales 1 0
-
-          [1645772065.848431][3762:3767] CHIP:TOO:   SupportedLocales: 8 entries
-          [1645772065.850249][3762:3767] CHIP:TOO:     [1]: en-US
-          [1645772065.850298][3762:3767] CHIP:TOO:     [2]: de-DE
-          [1645772065.850333][3762:3767] CHIP:TOO:     [3]: fr-FR
-          [1645772065.850368][3762:3767] CHIP:TOO:     [4]: en-GB
-          [1645772065.850402][3762:3767] CHIP:TOO:     [5]: es-ES
-          [1645772065.850435][3762:3767] CHIP:TOO:     [6]: zh-CN
-          [1645772065.850469][3762:3767] CHIP:TOO:     [7]: it-IT
-          [1645772065.850502][3762:3767] CHIP:TOO:     [8]: ja-JP
-          [1645772065.851668][3762:3767] CHIP:EM: Sending Standalone Ack for MessageCounter:4927804 on exchange 64827i
+
       disabled: true
 
-    - label: "TH writes 'newsupportedlocales' to SupportedLocales attribute"
+    - label: "TH reads from the DUT the (0xFFFD) ClusterRevision attribute"
       verification: |
-          ubuntu@ubuntu:~/apps$ '' ./chip-tool localizationconfiguration write supported-locales newsupportedlocales 1 0
+          ./chip-tool localizationconfiguration read cluster-revision 1 0
 
-          or
 
-          '' ./chip-tool any write-by-id 0x002B 1 newsupportedlocales 3 0
+          [1649330698.587235][4440:4445] CHIP:DMG:
+          [1649330698.587269][4440:4445] CHIP:DMG:        SuppressResponse = true,
+          [1649330698.587315][4440:4445] CHIP:DMG:        InteractionModelRevision = 1
+          [1649330698.587347][4440:4445] CHIP:DMG: }
+          [1649330698.587556][4440:4445] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_002B Attribute 0x0000_FFFD DataVersion: 419421945
+          [1649330698.587643][4440:4445] CHIP:TOO:   ClusterRevision: 1
       disabled: true
 
-    - label: "TH reads SupportedLocales attribute"
+    - label: "TH reads from the DUT the (0xFFFC) FeatureMap attribute"
       verification: |
-          ubuntu@ubuntu:~/apps$ '' ./chip-tool localizationconfiguration read supported-locales 1 0
-          [1645772065.848431][3762:3767] CHIP:TOO:   SupportedLocales: 8 entries
-          [1645772065.850249][3762:3767] CHIP:TOO:     [1]: en-US
-          [1645772065.850298][3762:3767] CHIP:TOO:     [2]: de-DE
-          [1645772065.850333][3762:3767] CHIP:TOO:     [3]: fr-FR
-          [1645772065.850368][3762:3767] CHIP:TOO:     [4]: en-GB
-          [1645772065.850402][3762:3767] CHIP:TOO:     [5]: es-ES
-          [1645772065.850435][3762:3767] CHIP:TOO:     [6]: zh-CN
-          [1645772065.850469][3762:3767] CHIP:TOO:     [7]: it-IT
-          [1645772065.850502][3762:3767] CHIP:TOO:     [8]: ja-JP
-          [1645772065.851668][3762:3767] CHIP:EM: Sending Standalone Ack for MessageCounter:4927804 on exchange 64827i
+          ./chip-tool localizationconfiguration read feature-map 1 0
+
+
+          [1653462414.221894][29485:29490] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_002B Attribute 0x0000_FFFC DataVersion: 2352052086
+          [1653462414.222033][29485:29490] CHIP:TOO:   FeatureMap: 0
+          [1653462414.222207][29485:29490] CHIP:EM: Sending Standalone Ack for MessageCounter:4940181 on exchange 7821i
       disabled: true
 
-    - label: "TH reads ActiveLocale Attribute from the DUT"
+    - label: "TH reads from the DUT the (0xFFFB) AttributeList attribute"
       verification: |
-          ubuntu@ubuntu:~/apps$ '' ./chip-tool localizationconfiguration read active-locale 1 0
-
-          [1645772238.226467][3778:3783] CHIP:DMG: ReportDataMessage =
-          [1645772238.226511][3778:3783] CHIP:DMG: {
-          [1645772238.226545][3778:3783] CHIP:DMG:        AttributeReportIBs =
-          [1645772238.226596][3778:3783] CHIP:DMG:        [
-          [1645772238.226635][3778:3783] CHIP:DMG:                AttributeReportIB =
-          [1645772238.226691][3778:3783] CHIP:DMG:                {
-          [1645772238.226735][3778:3783] CHIP:DMG:                        AttributeDataIB =
-          [1645772238.226787][3778:3783] CHIP:DMG:                        {
-          [1645772238.226839][3778:3783] CHIP:DMG:                                DataVersion = 0xcf5f714e,
-          [1645772238.226895][3778:3783] CHIP:DMG:                                AttributePathIB =
-          [1645772238.226949][3778:3783] CHIP:DMG:                                {
-          [1645772238.227004][3778:3783] CHIP:DMG:                                   Endpoint = 0x0,
-          [1645772238.227065][3778:3783] CHIP:DMG:                                   Cluster = 0x2b,
-          [1645772238.227126][3778:3783] CHIP:DMG:                                   Attribute = 0x0000_0001,
-          [1645772238.227180][3778:3783] CHIP:DMG:                                }
-          [1645772238.227238][3778:3783] CHIP:DMG:
-          [1645772238.227300][3778:3783] CHIP:DMG:                                   Data = "ja-JP",
-          [1645772238.227357][3778:3783] CHIP:DMG:                        },
-          [1645772238.227413][3778:3783] CHIP:DMG:
-          [1645772238.227459][3778:3783] CHIP:DMG:                },
-          [1645772238.227513][3778:3783] CHIP:DMG:
-          [1645772238.227552][3778:3783] CHIP:DMG:        ],
-          [1645772238.227602][3778:3783] CHIP:DMG:
-          [1645772238.227642][3778:3783] CHIP:DMG:        SuppressResponse = true,
-          [1645772238.227683][3778:3783] CHIP:DMG:        InteractionModelRevision = 1
-          [1645772238.227721][3778:3783] CHIP:DMG: }
-          [1645772238.227930][3778:3783] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_002B Attribute 0x0000_0001DataVersion: 3479138638
-          [1645772238.228001][3778:3783] CHIP:TOO:   ActiveLocale: ja-JP
+          ./chip-tool localizationconfiguration read  attribute-list 1 0
+
+          [1653462309.061114][29477:29482] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_002B Attribute 0x0000_FFFB DataVersion: 2352052086
+          [1653462309.061199][29477:29482] CHIP:TOO:   AttributeList: 7 entries
+          [1653462309.061233][29477:29482] CHIP:TOO:     [1]: 0
+          [1653462309.061258][29477:29482] CHIP:TOO:     [2]: 1
+          [1653462309.061284][29477:29482] CHIP:TOO:     [3]: 65528
+          [1653462309.061308][29477:29482] CHIP:TOO:     [4]: 65529
+          [1653462309.061332][29477:29482] CHIP:TOO:     [5]: 65531
+          [1653462309.061355][29477:29482] CHIP:TOO:     [6]: 65532
+          [1653462309.061379][29477:29482] CHIP:TOO:     [7]: 65533
+          [1653462309.061492][29477:29482] CHIP:EM: Sending Standalone Ack for MessageCounter:13553423 on exchange 61180i
       disabled: true
 
-    - label:
-          "TH writes new string not present in SupportedLocale attribute to
-          ActiveLocale Attribute."
+    - label: "TH reads from the DUT the (0xFFFA) EventList attribute"
       verification: |
-          ubuntu@ubuntu:~/apps$ '' ./chip-tool localizationconfiguration write active-locale fw-GB 1 0
-
-          [1645772751.418627][3827:3832] CHIP:DMG: WriteClient moving to [ResponseRe]
-          [1645772751.418700][3827:3832] CHIP:DMG: WriteResponseMessage =
-          [1645772751.418743][3827:3832] CHIP:DMG: {
-          [1645772751.418782][3827:3832] CHIP:DMG:        AttributeStatusIBs =
-          [1645772751.418839][3827:3832] CHIP:DMG:        [
-          [1645772751.418882][3827:3832] CHIP:DMG:                AttributeStatusIB =
-          [1645772751.418931][3827:3832] CHIP:DMG:                {
-          [1645772751.418977][3827:3832] CHIP:DMG:                        AttributePathIB =
-          [1645772751.419039][3827:3832] CHIP:DMG:                        {
-          [1645772751.419096][3827:3832] CHIP:DMG:                                Endpoint = 0x0,
-          [1645772751.419157][3827:3832] CHIP:DMG:                                Cluster = 0x2b,
-          [1645772751.419217][3827:3832] CHIP:DMG:                                Attribute = 0x0000_0001,
-          [1645772751.419271][3827:3832] CHIP:DMG:                        }
-          [1645772751.419332][3827:3832] CHIP:DMG:
-          [1645772751.419392][3827:3832] CHIP:DMG:                        StatusIB =
-          [1645772751.419447][3827:3832] CHIP:DMG:                        {
-          [1645772751.419497][3827:3832] CHIP:DMG:                                status = 0x87,
-          [1645772751.419553][3827:3832] CHIP:DMG:                        },
-          [1645772751.419608][3827:3832] CHIP:DMG:
-          [1645772751.419656][3827:3832] CHIP:DMG:                },
-          [1645772751.419714][3827:3832] CHIP:DMG:
-          [1645772751.419756][3827:3832] CHIP:DMG:        ],
-          [1645772751.419809][3827:3832] CHIP:DMG:
-          [1645772751.419852][3827:3832] CHIP:DMG:        InteractionModelRevision = 1
-          [1645772751.419893][3827:3832] CHIP:DMG: }
-          [1645772751.419997][3827:3832] CHIP:TOO: Response Failure: IM Error 0x00000587: General error: 0x87
+          out 0f scope for V1.0
       disabled: true
 
-    - label:
-          "TH writes new string present in SupportedLocale attribute to
-          ActiveLocale Attribute."
+    - label: "TH reads from the DUT the (0xFFF9) AcceptedCommandList attribute"
       verification: |
-          ubuntu@ubuntu:~/apps$ '' ./chip-tool localizationconfiguration write active-locale fr-FR 1 0
-
-          [1645772570.568391][3806:3811] CHIP:DMG: WriteClient moving to [ResponseRe]
-          [1645772570.568456][3806:3811] CHIP:DMG: WriteResponseMessage =
-          [1645772570.568492][3806:3811] CHIP:DMG: {
-          [1645772570.568525][3806:3811] CHIP:DMG:        AttributeStatusIBs =
-          [1645772570.568569][3806:3811] CHIP:DMG:        [
-          [1645772570.568605][3806:3811] CHIP:DMG:                AttributeStatusIB =
-          [1645772570.568651][3806:3811] CHIP:DMG:                {
-          [1645772570.568694][3806:3811] CHIP:DMG:                        AttributePathIB =
-          [1645772570.568747][3806:3811] CHIP:DMG:                        {
-          [1645772570.568794][3806:3811] CHIP:DMG:                                Endpoint = 0x0,
-          [1645772570.568851][3806:3811] CHIP:DMG:                                Cluster = 0x2b,
-          [1645772570.568906][3806:3811] CHIP:DMG:                                Attribute = 0x0000_0001,
-          [1645772570.568958][3806:3811] CHIP:DMG:                        }
-          [1645772570.569014][3806:3811] CHIP:DMG:
-          [1645772570.569064][3806:3811] CHIP:DMG:                        StatusIB =
-          [1645772570.569104][3806:3811] CHIP:DMG:                        {
-          [1645772570.569147][3806:3811] CHIP:DMG:                                status = 0x0,
-          [1645772570.569267][3806:3811] CHIP:DMG:                        },
-          [1645772570.569311][3806:3811] CHIP:DMG:
-          [1645772570.569347][3806:3811] CHIP:DMG:                },
-          [1645772570.569387][3806:3811] CHIP:DMG:
-          [1645772570.569416][3806:3811] CHIP:DMG:        ],
-          [1645772570.569454][3806:3811] CHIP:DMG:
-          [1645772570.569484][3806:3811] CHIP:DMG:        InteractionModelRevision = 1
-          [1645772570.569513][3806:3811] CHIP:DMG: }
-          [1645772570.569589][3806:3811] CHIP:DMG: WriteClient moving to [AwaitingDe]
+          ./chip-tool localizationconfiguration read accepted-command-list 1 0
+
+
+          [1649331020.031045][4520:4525] CHIP:DMG:
+          [1649331020.031081][4520:4525] CHIP:DMG:        SuppressResponse = true,
+          [1649331020.031119][4520:4525] CHIP:DMG:        InteractionModelRevision = 1
+          [1649331020.031153][4520:4525] CHIP:DMG: }
+          [1649331020.031374][4520:4525] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_002B Attribute 0x0000_FFF9 DataVersion: 419421945
+          [1649331020.031470][4520:4525] CHIP:TOO:   AcceptedCommandList: 0 entries
       disabled: true
 
-    - label: "TH Reads ActiveLocale."
+    - label: "TH reads from the DUT the (0xFFF8) GeneratedCommandList attribute"
       verification: |
-          ubuntu@ubuntu:~/apps$ '' ./chip-tool localizationconfiguration read active-locale 1 0
-          [1645772597.251785][3816:3821] CHIP:DMG: ReportDataMessage =
-          [1645772597.251837][3816:3821] CHIP:DMG: {
-          [1645772597.251866][3816:3821] CHIP:DMG:        AttributeReportIBs =
-          [1645772597.251907][3816:3821] CHIP:DMG:        [
-          [1645772597.251953][3816:3821] CHIP:DMG:                AttributeReportIB =
-          [1645772597.252010][3816:3821] CHIP:DMG:                {
-          [1645772597.252049][3816:3821] CHIP:DMG:                        AttributeDataIB =
-          [1645772597.252105][3816:3821] CHIP:DMG:                        {
-          [1645772597.252149][3816:3821] CHIP:DMG:                                DataVersion = 0xcf5f714f,
-          [1645772597.252237][3816:3821] CHIP:DMG:                                AttributePathIB =
-          [1645772597.252294][3816:3821] CHIP:DMG:                                {
-          [1645772597.252344][3816:3821] CHIP:DMG:                                   Endpoint = 0x0,
-          [1645772597.252405][3816:3821] CHIP:DMG:                                   Cluster = 0x2b,
-          [1645772597.252461][3816:3821] CHIP:DMG:                                   Attribute = 0x0000_0001,
-          [1645772597.252505][3816:3821] CHIP:DMG:                                }
-          [1645772597.252563][3816:3821] CHIP:DMG:
-          [1645772597.252623][3816:3821] CHIP:DMG:                                   Data = "fr-FR",
-          [1645772597.252671][3816:3821] CHIP:DMG:                        },
-          [1645772597.252728][3816:3821] CHIP:DMG:
-          [1645772597.252774][3816:3821] CHIP:DMG:                },
-          [1645772597.252819][3816:3821] CHIP:DMG:
-          [1645772597.252862][3816:3821] CHIP:DMG:        ],
-          [1645772597.252904][3816:3821] CHIP:DMG:
-          [1645772597.252948][3816:3821] CHIP:DMG:        SuppressResponse = true,
-          [1645772597.252981][3816:3821] CHIP:DMG:        InteractionModelRevision = 1
-          [1645772597.253024][3816:3821] CHIP:DMG: }
-          [1645772597.253230][3816:3821] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_002B Attribute 0x0000_0001DataVersion: 3479138639
-          [1645772597.253293][3816:3821] CHIP:TOO:   ActiveLocale: fr-FR
+          ./chip-tool localizationconfiguration read  generated-command-list 1 0
+
+
+          [1649330937.798986][4508:4513] CHIP:DMG:
+          [1649330937.799022][4508:4513] CHIP:DMG:        SuppressResponse = true,
+          [1649330937.799062][4508:4513] CHIP:DMG:        InteractionModelRevision = 1
+          [1649330937.799096][4508:4513] CHIP:DMG: }
+          [1649330937.799317][4508:4513] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_002B Attribute 0x0000_FFF8 DataVersion: 419421945
+          [1649330937.799413][4508:4513] CHIP:TOO:   GeneratedCommandList: 0 entries
       disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_LCFG_2_1.yaml b/src/app/tests/suites/certification/Test_TC_LCFG_2_1.yaml
index a2f01aecea8ea0..94c05aca8a8a68 100644
--- a/src/app/tests/suites/certification/Test_TC_LCFG_2_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_LCFG_2_1.yaml
@@ -14,7 +14,7 @@
 # Auto-generated scripts for harness use only, please review before automation. The endpoints and cluster names are currently set to default
 
 name:
-    101.2.1. [TC-LCFG-2.1] Localization Configuration Cluster
+    99.2.1. [TC-LCFG-2.1] Localization Configuration Cluster
     Attributes[DUT-Server]
 
 config:
@@ -24,6 +24,7 @@ config:
 
 tests:
     - label: "TH reads SupportedLocales attribute from DUT"
+      PICS: LCFG.S.A0001
       verification: |
           ./chip-tool localizationconfiguration read supported-locales 1 0
 
@@ -39,14 +40,12 @@ tests:
           [1651129546.170697][174082:174087] CHIP:TOO:     [8]: ja-JP
       disabled: true
 
-    - label: "TH writes 'newsupportedlocales' to SupportedLocales attribute"
+    - label: 'TH writes "xx-XX" to SupportedLocales attribute'
       verification: |
-          ./chip-tool any write-by-id 0x002B 1 newsupportedlocales 1 0
-
-          [1651035119.852381][2747:2752] CHIP:DMG:        InteractionModelRevision = 1
-          [1651035119.852415][2747:2752] CHIP:DMG: }
-          [1651035119.852510][2747:2752] CHIP:TOO: Response Failure: IM Error 0x00000587: General error: 0x87 (CONSTRAINT_ERROR)
-          [1651035119.852576][2747:2752] CHIP:DMG: WriteClient moving to [AwaitingDe]
+          ./chip-tool any write-by-id 0x002B 1 xx-XX 1 0
+          [1653996674.832226][7281:7286] CHIP:DMG: WriteClient moving to [AwaitingDe]
+          [1653996674.832300][7281:7286] CHIP:TOO: Response Failure: IM Error 0x00000588: General error: 0x88 (UNSUPPORTED_WRITE)
+          [1653996674.832411][7281:7286] CHIP:EM: Sending Standalone Ack for MessageCounter:12567655 on exchange 10797i
       disabled: true
 
     - label: "TH reads SupportedLocales attribute"
@@ -65,6 +64,7 @@ tests:
       disabled: true
 
     - label: "TH reads ActiveLocale Attribute from the DUT"
+      PICS: LCFG.S.A0000
       verification: |
           ./chip-tool localizationconfiguration read active-locale 1 0
 
diff --git a/src/app/tests/suites/certification/Test_TC_LCFG_3_1.yaml b/src/app/tests/suites/certification/Test_TC_LCFG_3_1.yaml
index 0450af15046dae..32bd74b78906d3 100644
--- a/src/app/tests/suites/certification/Test_TC_LCFG_3_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_LCFG_3_1.yaml
@@ -14,7 +14,7 @@
 # Auto-generated scripts for harness use only, please review before automation. The endpoints and cluster names are currently set to default
 
 name:
-    101.3.1. [TC-LCFG-3.1] Localization Configuration Cluster
+    99.3.1. [TC-LCFG-3.1] Localization Configuration Cluster
     Attributes[DUT-Client]
 
 config:
@@ -24,6 +24,7 @@ config:
 
 tests:
     - label: "DUT reads SupportedLocales attribute from TH"
+      PICS: LCFG.C.A0001
       verification: |
           ./chip-tool localizationconfiguration read supported-locales 1 0
 
@@ -49,6 +50,7 @@ tests:
       disabled: true
 
     - label: "DUT reads ActiveLocale attribute from the TH"
+      PICS: LCFG.C.A0000
       verification: |
           ./chip-tool localizationconfiguration read active-locale 1 0
 
diff --git a/src/app/tests/suites/certification/Test_TC_OO_2_1.yaml b/src/app/tests/suites/certification/Test_TC_OO_2_1.yaml
index 2df9346e21fc88..bde14f2e703fa7 100644
--- a/src/app/tests/suites/certification/Test_TC_OO_2_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_OO_2_1.yaml
@@ -29,6 +29,7 @@ tests:
                 value: nodeId
 
     - label: "read the mandatory attribute: OnOff"
+      PICS: OO.S.A0000
       command: "readAttribute"
       attribute: "OnOff"
       response:
@@ -36,6 +37,7 @@ tests:
               type: bool
 
     - label: "read LT attribute: GlobalSceneControl"
+      PICS: OO.S.A4000
       optional: true
       command: "readAttribute"
       attribute: "GlobalSceneControl"
@@ -44,6 +46,7 @@ tests:
               type: bool
 
     - label: "read LT attribute: OnTime"
+      PICS: OO.S.A4001
       optional: true
       command: "readAttribute"
       attribute: "OnTime"
@@ -52,6 +55,7 @@ tests:
               type: uint16
 
     - label: "read LT attribute: OffWaitTime"
+      PICS: OO.S.A4002
       optional: true
       command: "readAttribute"
       attribute: "OffWaitTime"
@@ -60,6 +64,7 @@ tests:
               type: uint16
 
     - label: "read LT attribute: StartUpOnOff"
+      PICS: OO.S.A4003
       optional: true
       command: "readAttribute"
       attribute: "StartUpOnOff"
diff --git a/src/app/tests/suites/certification/Test_TC_OO_2_2.yaml b/src/app/tests/suites/certification/Test_TC_OO_2_2.yaml
index d0835ec9ccfe1e..f1084882672fe8 100644
--- a/src/app/tests/suites/certification/Test_TC_OO_2_2.yaml
+++ b/src/app/tests/suites/certification/Test_TC_OO_2_2.yaml
@@ -29,51 +29,62 @@ tests:
                 value: nodeId
 
     - label: "Send Off Command"
+      PICS: OO.S.C00.Rsp
       command: "Off"
 
     - label: "Check on/off attribute value is false after off command"
+      PICS: OO.S.A0000
       command: "readAttribute"
       attribute: "OnOff"
       response:
           value: 0
 
     - label: "Send On Command"
+      PICS: OO.S.C01.Rsp
       command: "On"
 
     - label: "Check on/off attribute value is true after on command"
+      PICS: OO.S.A0000
       command: "readAttribute"
       attribute: "OnOff"
       response:
           value: 1
 
     - label: "Send On Command"
+      PICS: OO.S.C01.Rsp
       command: "On"
 
     - label: "Check on/off attribute value is true after on command"
+      PICS: OO.S.A0000
       command: "readAttribute"
       attribute: "OnOff"
       response:
           value: 1
 
     - label: "Send Off Command"
+      PICS: OO.S.C00.Rsp
       command: "Off"
 
     - label: "Check on/off attribute value is false after off command"
+      PICS: OO.S.A0000
       command: "readAttribute"
       attribute: "OnOff"
       response:
           value: 0
 
     - label: "Send Off Command"
+      PICS: OO.S.C00.Rsp
       command: "Off"
 
     - label: "Check on/off attribute value is false after off command"
+      PICS: OO.S.A0000
       command: "readAttribute"
       attribute: "OnOff"
       response:
           value: 0
 
     - label: "Send Toggle Command"
+      PICS: OO.S.C02.Rsp
       command: "Toggle"
 
     - label: "Wait 1000ms"
@@ -85,12 +96,14 @@ tests:
                 value: 1000
 
     - label: "Check on/off attribute value is true after toggle command"
+      PICS: OO.S.A0000
       command: "readAttribute"
       attribute: "OnOff"
       response:
           value: 1
 
     - label: "Send Toggle Command"
+      PICS: OO.S.C02.Rsp
       command: "Toggle"
 
     - label: "Wait 1000ms"
@@ -102,6 +115,7 @@ tests:
                 value: 1000
 
     - label: "Check on/off attribute value is false after toggle command"
+      PICS: OO.S.A0000
       command: "readAttribute"
       attribute: "OnOff"
       response:
@@ -110,7 +124,7 @@ tests:
     - label: "Operate on device to set OnOff attribute manually to on"
       cluster: "LogCommands"
       command: "UserPrompt"
-      PICS: PICS_USER_PROMPT
+      PICS: PICS_USER_PROMPT && OO.M.ManuallyControlled
       arguments:
           values:
               - name: "message"
@@ -129,7 +143,7 @@ tests:
     - label: "Operate on device to set OnOff attribute manually to off"
       cluster: "LogCommands"
       command: "UserPrompt"
-      PICS: PICS_USER_PROMPT
+      PICS: PICS_USER_PROMPT && OO.M.ManuallyControlled
       arguments:
           values:
               - name: "message"
@@ -146,9 +160,11 @@ tests:
           value: 0
 
     - label: "Reset Off Command"
+      PICS: OO.S.C00.Rsp
       command: "Off"
 
     - label: "Check on/off attribute value is false after off command"
+      PICS: OO.S.A0000
       command: "readAttribute"
       attribute: "OnOff"
       response:
diff --git a/src/app/tests/suites/certification/Test_TC_OO_2_3.yaml b/src/app/tests/suites/certification/Test_TC_OO_2_3.yaml
index 6ba8b930095dc7..9abe1b5e2b0e88 100644
--- a/src/app/tests/suites/certification/Test_TC_OO_2_3.yaml
+++ b/src/app/tests/suites/certification/Test_TC_OO_2_3.yaml
@@ -30,8 +30,8 @@ tests:
                 value: nodeId
 
     - label: "2a: Send On Command"
+      PICS: OO.S.C01.Rsp
       command: "On"
-      PICS: CR_ON
 
     - label: "Wait 1000ms"
       cluster: "DelayCommands"
@@ -42,22 +42,22 @@ tests:
                 value: 1000
 
     - label: "2b: Reads OnOff attribute from DUT"
+      PICS: OO.S.A0000
       command: "readAttribute"
       attribute: "OnOff"
-      PICS: A_ONOFF
       response:
           value: 1
 
     - label: "2b:Reads GlobalSceneControl attribute from DUT"
       command: "readAttribute"
       attribute: "GlobalSceneControl"
-      PICS: A_GLOBALSCENECONTROL
+      PICS: OO.S.A4000
       response:
           value: 1
 
     - label: "3a:Sends OffWithEffect command to DUT"
       command: "OffWithEffect"
-      PICS: CR_OFFWITHEFFECT
+      PICS: OO.S.C40.Rsp
       arguments:
           values:
               - name: "EffectId"
@@ -76,20 +76,20 @@ tests:
     - label: "3b:Reads OnOff attribute from DUT"
       command: "readAttribute"
       attribute: "OnOff"
-      PICS: A_ONOFF
+      PICS: OO.S.A0000
       response:
           value: 0
 
     - label: "3b:Reads GlobalSceneControl attribute from DUT"
       command: "readAttribute"
       attribute: "GlobalSceneControl"
-      PICS: A_GLOBALSCENECONTROL
+      PICS: OO.S.A4000
       response:
           value: 0
 
     - label: "4a:Sends OnWithRecallGlobalScene command to DUT"
       command: "OnWithRecallGlobalScene"
-      PICS: CR_ONWITHRECALL
+      PICS: OO.S.C41.Rsp
 
     - label: "Wait 1000ms"
       cluster: "DelayCommands"
@@ -102,20 +102,20 @@ tests:
     - label: "4b:Reads OnOff attribute from DUT"
       command: "readAttribute"
       attribute: "OnOff"
-      PICS: A_ONOFF
+      PICS: OO.S.A0000
       response:
           value: 1
 
     - label: "4b:Reads GlobalSceneControl attribute from DUT"
       command: "readAttribute"
       attribute: "GlobalSceneControl"
-      PICS: A_GLOBALSCENECONTROL
+      PICS: OO.S.A4000
       response:
           value: 1
 
     - label: "5a:Sends OffWithEffect command to DUT"
       command: "OffWithEffect"
-      PICS: CR_OFFWITHEFFECT
+      PICS: OO.S.C40.Rsp
       arguments:
           values:
               - name: "EffectId"
@@ -134,20 +134,20 @@ tests:
     - label: "5b:Reads OnOff attribute from DUT"
       command: "readAttribute"
       attribute: "OnOff"
-      PICS: A_ONOFF
+      PICS: OO.S.A0000
       response:
           value: 0
 
     - label: "5b:Reads GlobalSceneControl attribute from DUT"
       command: "readAttribute"
       attribute: "GlobalSceneControl"
-      PICS: A_GLOBALSCENECONTROL
+      PICS: OO.S.A4000
       response:
           value: 0
 
     - label: "5c:Send On Command"
+      PICS: OO.S.C01.Rsp
       command: "On"
-      PICS: CR_ON
 
     - label: "Wait 1000ms"
       cluster: "DelayCommands"
@@ -160,20 +160,20 @@ tests:
     - label: "5d:Reads OnOff attribute from DUT"
       command: "readAttribute"
       attribute: "OnOff"
-      PICS: A_ONOFF
+      PICS: OO.S.A0000
       response:
           value: 1
 
     - label: "5d:Reads GlobalSceneControl attribute from DUT"
       command: "readAttribute"
       attribute: "GlobalSceneControl"
-      PICS: A_GLOBALSCENECONTROL
+      PICS: OO.S.A4000
       response:
           value: 1
 
     - label: "6a:Sends OffWithEffect command to DUT"
       command: "OffWithEffect"
-      PICS: CR_OFFWITHEFFECT
+      PICS: OO.S.C40.Rsp
       arguments:
           values:
               - name: "EffectId"
@@ -192,20 +192,20 @@ tests:
     - label: "6b:Reads OnOff attribute from DUT"
       command: "readAttribute"
       attribute: "OnOff"
-      PICS: A_ONOFF
+      PICS: OO.S.A0000
       response:
           value: 0
 
     - label: "6b:Reads GlobalSceneControl attribute from DUT"
       command: "readAttribute"
       attribute: "GlobalSceneControl"
-      PICS: A_GLOBALSCENECONTROL
+      PICS: OO.S.A4000
       response:
           value: 0
 
     - label: "7a:Send On Command"
+      PICS: OO.S.C01.Rsp
       command: "On"
-      PICS: CR_ON
 
     - label: "Wait 1000ms"
       cluster: "DelayCommands"
@@ -218,20 +218,20 @@ tests:
     - label: "7b:Reads OnOff attribute from DUT"
       command: "readAttribute"
       attribute: "OnOff"
-      PICS: A_ONOFF
+      PICS: OO.S.A0000
       response:
           value: 1
 
     - label: "7b:Reads GlobalSceneControl attribute from DUT"
       command: "readAttribute"
       attribute: "GlobalSceneControl"
-      PICS: A_GLOBALSCENECONTROL
+      PICS: OO.S.A4000
       response:
           value: 1
 
     - label: "7c:Sends OnWithRecallGlobalScene command to DUT"
       command: "OnWithRecallGlobalScene"
-      PICS: CR_ONWITHRECALL
+      PICS: OO.S.C41.Rsp
 
     - label: "Wait 1000ms"
       cluster: "DelayCommands"
@@ -244,33 +244,34 @@ tests:
     - label: "7d:Reads OnOff attribute from DUT"
       command: "readAttribute"
       attribute: "OnOff"
-      PICS: A_ONOFF
+      PICS: OO.S.A0000
       response:
           value: 1
 
     - label: "7d:Reads GlobalSceneControl attribute from DUT"
       command: "readAttribute"
       attribute: "GlobalSceneControl"
-      PICS: A_GLOBALSCENECONTROL
+      PICS: OO.S.A4000
       response:
           value: 1
 
     - label: "8:Reads OnTime attribute from DUT"
       command: "readAttribute"
       attribute: "OnTime"
-      PICS: A_ONTIME
+      PICS: OO.S.A4001
       response:
           value: 0
 
     - label: "8:Reads OffWaitTime attribute from DUT"
       command: "readAttribute"
       attribute: "OffWaitTime"
-      PICS: A_OFFWAITTIME
+      PICS: OO.S.A4002
       response:
           value: 0
 
     - label: "9a:Sends OnWithTimedOff command to DUT"
       command: "OnWithTimedOff"
+      PICS: OO.S.C42.Rsp
       arguments:
           values:
               - name: "OnOffControl"
@@ -283,7 +284,7 @@ tests:
     - label: "9b:Reads OnTime attribute from DUT"
       command: "readAttribute"
       attribute: "OnTime"
-      PICS: A_ONTIME
+      PICS: OO.S.A4001
       response:
           constraints:
               minValue: 295
@@ -292,13 +293,13 @@ tests:
     - label: "9b:Reads OffWaitTime attribute from DUT"
       command: "readAttribute"
       attribute: "OffWaitTime"
-      PICS: A_OFFWAITTIME
+      PICS: OO.S.A4002
       response:
           value: 300
 
     - label: "10a:Sends OnWithTimedOff command to DUT"
       command: "OnWithTimedOff"
-      PICS: CR_ONWITHTIMEOFF
+      PICS: OO.S.C42.Rsp
       arguments:
           values:
               - name: "OnOffControl"
@@ -318,7 +319,7 @@ tests:
 
     - label: "10b:Sends OnWithTimedOff command to DUT"
       command: "OnWithTimedOff"
-      PICS: CR_ONWITHTIMEOFF
+      PICS: OO.S.C42.Rsp
       arguments:
           values:
               - name: "OnOffControl"
@@ -338,7 +339,7 @@ tests:
 
     - label: "10c:Sends OnWithTimedOff command to DUT"
       command: "OnWithTimedOff"
-      PICS: CR_ONWITHTIMEOFF
+      PICS: OO.S.C42.Rsp
       arguments:
           values:
               - name: "OnOffControl"
@@ -358,7 +359,7 @@ tests:
 
     - label: "10d:Sends OnWithTimedOff command to DUT"
       command: "OnWithTimedOff"
-      PICS: CR_ONWITHTIMEOFF
+      PICS: OO.S.C42.Rsp
       arguments:
           values:
               - name: "OnOffControl"
@@ -371,14 +372,14 @@ tests:
     - label: "10e:Reads OnOff attribute from DUT"
       command: "readAttribute"
       attribute: "OnOff"
-      PICS: A_ONOFF
+      PICS: OO.S.A0000
       response:
           value: 1
 
     - label: "10e:Reads OnTime attribute from DUT"
       command: "readAttribute"
       attribute: "OnTime"
-      PICS: A_ONTIME
+      PICS: OO.S.A4001
       response:
           constraints:
               minValue: 295
@@ -387,7 +388,7 @@ tests:
     - label: "10e:Reads OffWaitTime attribute from DUT"
       command: "readAttribute"
       attribute: "OffWaitTime"
-      PICS: A_OFFWAITTIME
+      PICS: OO.S.A4002
       response:
           value: 300
 
@@ -401,7 +402,7 @@ tests:
 
     - label: "11a:Sends OffWithEffect command to DUT"
       command: "OffWithEffect"
-      PICS: CR_OFFWITHEFFECT
+      PICS: OO.S.C40.Rsp
       arguments:
           values:
               - name: "EffectId"
@@ -412,21 +413,21 @@ tests:
     - label: "11b:Reads OnOff attribute from DUT"
       command: "readAttribute"
       attribute: "OnOff"
-      PICS: A_ONOFF
+      PICS: OO.S.A0000
       response:
           value: 0
 
     - label: "11b:Reads OnTime attribute from DUT"
       command: "readAttribute"
       attribute: "OnTime"
-      PICS: A_ONTIME
+      PICS: OO.S.A4001
       response:
           value: 0
 
     - label: "11b:Reads OffWaitTime attribute from DUT"
       command: "readAttribute"
       attribute: "OffWaitTime"
-      PICS: A_OFFWAITTIME
+      PICS: OO.S.A4002
       response:
           constraints:
               minValue: 295
@@ -442,7 +443,7 @@ tests:
 
     - label: "12a:Sends OnWithTimedOff command to DUT"
       command: "OnWithTimedOff"
-      PICS: CR_ONWITHTIMEOFF
+      PICS: OO.S.C42.Rsp
       arguments:
           values:
               - name: "OnOffControl"
@@ -455,21 +456,21 @@ tests:
     - label: "12b:Reads OnOff attribute from DUT"
       command: "readAttribute"
       attribute: "OnOff"
-      PICS: A_ONOFF
+      PICS: OO.S.A0000
       response:
           value: 0
 
     - label: "12b:Reads OnTime attribute from DUT"
       command: "readAttribute"
       attribute: "OnTime"
-      PICS: A_ONTIME
+      PICS: OO.S.A4001
       response:
           value: 0
 
     - label: "12b:Reads OffWaitTime attribute from DUT"
       command: "readAttribute"
       attribute: "OffWaitTime"
-      PICS: A_OFFWAITTIME
+      PICS: OO.S.A4002
       response:
           constraints:
               minValue: 195
@@ -484,27 +485,27 @@ tests:
                 value: 10000
 
     - label: "13a:Send On Command"
+      PICS: OO.S.C01.Rsp
       command: "On"
-      PICS: CR_ON
 
     - label: "13b:Reads OnOff attribute from DUT"
       command: "readAttribute"
       attribute: "OnOff"
-      PICS: A_ONOFF
+      PICS: OO.S.A0000
       response:
           value: 1
 
     - label: "13b:Reads OnTime attribute from DUT"
       command: "readAttribute"
       attribute: "OnTime"
-      PICS: A_ONTIME
+      PICS: OO.S.A4001
       response:
           value: 0
 
     - label: "13b:Reads OffWaitTime attribute from DUT"
       command: "readAttribute"
       attribute: "OffWaitTime"
-      PICS: A_OFFWAITTIME
+      PICS: OO.S.A4002
       response:
           constarints:
               minValue: 0
@@ -520,7 +521,7 @@ tests:
 
     - label: "14a:Sends OnWithTimedOff command to DUT"
       command: "OnWithTimedOff"
-      PICS: CR_ONWITHTIMEOFF
+      PICS: OO.S.C42.Rsp
       arguments:
           values:
               - name: "OnOffControl"
@@ -540,26 +541,26 @@ tests:
 
     - label: "14b:Send Off Command"
       command: "Off"
-      PICS: CR_OFF
+      PICS: OO.S.C00.Rsp
 
     - label: "14c:Reads OnOff attribute from DUT"
       command: "readAttribute"
       attribute: "OnOff"
-      PICS: A_ONOFF
+      PICS: OO.S.A0000
       response:
           value: 0
 
     - label: "14c:Reads OnTime attribute from DUT"
       command: "readAttribute"
       attribute: "OnTime"
-      PICS: A_ONTIME
+      PICS: OO.S.A4001
       response:
           value: 0
 
     - label: "14c:Reads OffWaitTime attribute from DUT"
       command: "readAttribute"
       attribute: "OffWaitTime"
-      PICS: A_OFFWAITTIME
+      PICS: OO.S.A4002
       response:
           constraints:
               minValue: 295
@@ -576,21 +577,21 @@ tests:
     - label: "15:Reads OnOff attribute from DUT"
       command: "readAttribute"
       attribute: "OnOff"
-      PICS: A_ONOFF
+      PICS: OO.S.A0000
       response:
           value: 0
 
     - label: "15:Reads OnTime attribute from DUT"
       command: "readAttribute"
       attribute: "OnTime"
-      PICS: A_ONTIME
+      PICS: OO.S.A4001
       response:
           value: 0
 
     - label: "15:Reads OffWaitTime attribute from DUT"
       command: "readAttribute"
       attribute: "OffWaitTime"
-      PICS: A_OFFWAITTIME
+      PICS: OO.S.A4002
       response:
           constraints:
               minValue: 0
@@ -606,7 +607,7 @@ tests:
 
     - label: "16a:Sends OnWithTimedOff command to DUT"
       command: "OnWithTimedOff"
-      PICS: CR_ONWITHTIMEOFF
+      PICS: OO.S.C42.Rsp
       arguments:
           values:
               - name: "OnOffControl"
@@ -619,29 +620,29 @@ tests:
     - label: "16b:Reads OnOff attribute from DUT"
       command: "readAttribute"
       attribute: "OnOff"
-      PICS: A_ONOFF
+      PICS: OO.S.A0000
       response:
           value: 0
 
     - label: "16b:Reads OnTime attribute from DUT"
       command: "readAttribute"
       attribute: "OnTime"
-      PICS: A_ONTIME
+      PICS: OO.S.A4001
       response:
           value: 0
 
     - label: "16b:Reads OffWaitTime attribute from DUT"
       command: "readAttribute"
       attribute: "OffWaitTime"
-      PICS: A_OFFWAITTIME
+      PICS: OO.S.A4002
       response:
           constraints:
               minValue: 0
               maxValue: 10
 
     - label: "17a:Send On Command"
+      PICS: OO.S.C01.Rsp
       command: "On"
-      PICS: CR_ON
 
     - label: "Wait 10000ms"
       cluster: "DelayCommands"
@@ -653,7 +654,7 @@ tests:
 
     - label: "17b:Sends OnWithTimedOff command to DUT"
       command: "OnWithTimedOff"
-      PICS: CR_ONWITHTIMEOFF
+      PICS: OO.S.C42.Rsp
       arguments:
           values:
               - name: "OnOffControl"
@@ -666,21 +667,21 @@ tests:
     - label: "17c:Reads OnOff attribute from DUT"
       command: "readAttribute"
       attribute: "OnOff"
-      PICS: A_ONOFF
+      PICS: OO.S.A0000
       response:
           value: 1
 
     - label: "17c:Reads OnTime attribute from DUT"
       command: "readAttribute"
       attribute: "OnTime"
-      PICS: A_ONTIME
+      PICS: OO.S.A4001
       response:
           value: 300
 
     - label: "17c:Reads OffWaitTime attribute from DUT"
       command: "readAttribute"
       attribute: "OffWaitTime"
-      PICS: A_OFFWAITTIME
+      PICS: OO.S.A4002
       response:
           value: 300
 
@@ -695,21 +696,21 @@ tests:
     - label: "17d:Reads OnOff attribute from DUT"
       command: "readAttribute"
       attribute: "OnOff"
-      PICS: A_ONOFF
+      PICS: OO.S.A0000
       response:
           value: 0
 
     - label: "17d:Reads OnTime attribute from DUT"
       command: "readAttribute"
       attribute: "OnTime"
-      PICS: A_ONTIME
+      PICS: OO.S.A4001
       response:
           value: 0
 
     - label: "17d:Reads OffWaitTime attribute from DUT"
       command: "readAttribute"
       attribute: "OffWaitTime"
-      PICS: A_OFFWAITTIME
+      PICS: OO.S.A4002
       response:
           constraints:
               minValue: 0
@@ -725,7 +726,7 @@ tests:
 
     - label: "18a:Sends OnWithTimedOff command to DUT"
       command: "OnWithTimedOff"
-      PICS: CR_ONWITHTIMEOFF
+      PICS: OO.S.C42.Rsp
       arguments:
           values:
               - name: "OnOffControl"
@@ -739,7 +740,7 @@ tests:
     - label: "18b:Reads OnOff attribute from DUT"
       command: "readAttribute"
       attribute: "OnOff"
-      PICS: PICS_SKIP_SAMPLE_APP && A_ONOFF
+      PICS: PICS_SKIP_SAMPLE_APP && OO.S.A0000
       response:
           value: 1
 
@@ -747,7 +748,7 @@ tests:
     - label: "18b:Reads OnTime attribute from DUT"
       command: "readAttribute"
       attribute: "OnTime"
-      PICS: PICS_SKIP_SAMPLE_APP && A_ONTIME
+      PICS: PICS_SKIP_SAMPLE_APP && OO.S.A4001
       response:
           constraints:
               minValue: 295
@@ -757,13 +758,13 @@ tests:
     - label: "18b:Reads OffWaitTime attribute from DUT"
       command: "readAttribute"
       attribute: "OffWaitTime"
-      PICS: PICS_SKIP_SAMPLE_APP && A_OFFWAITTIME
+      PICS: PICS_SKIP_SAMPLE_APP && OO.S.A4002
       response:
           value: 300
 
     - label: "19a:Sends OnWithTimedOff command to DUT"
       command: "OnWithTimedOff"
-      PICS: CR_ONWITHTIMEOFF
+      PICS: OO.S.C42.Rsp
       arguments:
           values:
               - name: "OnOffControl"
@@ -783,7 +784,7 @@ tests:
 
     - label: "19b:Sends OnWithTimedOff command to DUT"
       command: "OnWithTimedOff"
-      PICS: CR_ONWITHTIMEOFF
+      PICS: OO.S.C42.Rsp
       arguments:
           values:
               - name: "OnOffControl"
@@ -804,14 +805,14 @@ tests:
     - label: "19c:Reads OnOff attribute from DUT"
       command: "readAttribute"
       attribute: "OnOff"
-      PICS: A_ONOFF
+      PICS: OO.S.A0000
       response:
           value: 1
 
     - label: "19c:Reads OnTime attribute from DUT"
       command: "readAttribute"
       attribute: "OnTime"
-      PICS: A_ONTIME
+      PICS: OO.S.A4001
       response:
           constraints:
               minValue: 195
@@ -820,40 +821,40 @@ tests:
     - label: "19c:Reads OffWaitTime attribute from DUT"
       command: "readAttribute"
       attribute: "OffWaitTime"
-      PICS: A_OFFWAITTIME
+      PICS: OO.S.A4002
       response:
           value: 300
 
     - label: "20a:Send Off Command"
       command: "Off"
-      PICS: CR_OFF
+      PICS: OO.S.C00.Rsp
 
     - label: "20b:Reads OnOff attribute from DUT"
       command: "readAttribute"
       attribute: "OnOff"
-      PICS: A_ONOFF
+      PICS: OO.S.A0000
       response:
           value: 0
 
     - label: "20b:Reads OnTime attribute from DUT"
       command: "readAttribute"
       attribute: "OnTime"
-      PICS: A_ONTIME
+      PICS: OO.S.A4001
       response:
           value: 0
 
     - label: "20b:Reads OffWaitTime attribute from DUT"
       command: "readAttribute"
       attribute: "OffWaitTime"
-      PICS: A_OFFWAITTIME
+      PICS: OO.S.A4002
       response:
           constraints:
               minValue: 295
               maxValue: 305
 
-    - label: "21a:Sends OnWithimedOff command to DUT"
+    - label: "21a:Sends OnWithTimedOff command to DUT"
       command: "OnWithTimedOff"
-      PICS: CR_ONWITHTIMEOFF
+      PICS: OO.S.C42.Rsp
       arguments:
           values:
               - name: "OnOffControl"
@@ -866,53 +867,52 @@ tests:
     - label: "21b:Reads OnOff attribute from DUT"
       command: "readAttribute"
       attribute: "OnOff"
-      PICS: A_ONOFF
+      PICS: OO.S.A0000
       response:
           value: 0
 
     - label: "21b:Reads OnTime attribute from DUT"
       command: "readAttribute"
       attribute: "OnTime"
-      PICS: A_ONTIME
+      PICS: OO.S.A4001
       response:
           value: 0
 
-    # Issue 19159 offWaitTime value mismatch: expected 200 but got 300
     - label: "21b:Reads OffWaitTime attribute from DUT"
       command: "readAttribute"
       attribute: "OffWaitTime"
-      PICS: PICS_SKIP_SAMPLE_APP
+      PICS: PICS_SKIP_SAMPLE_APP && OO.S.A4002
       response:
           constraints:
               minValue: 195
               maxValue: 205
 
     - label: "22a:Send On Command"
+      PICS: OO.S.C01.Rsp
       command: "On"
-      PICS: CR_ON
 
     - label: "22b:Reads OnOff attribute from DUT"
       command: "readAttribute"
       attribute: "OnOff"
-      PICS: A_ONOFF
+      PICS: OO.S.A0000
       response:
           value: 1
 
     - label: "22b:Reads OnTime attribute from DUT"
       command: "readAttribute"
       attribute: "OnTime"
-      PICS: A_ONTIME
+      PICS: OO.S.A4001
       response:
           value: 0
 
     - label: "22b:Reads OffWaitTime attribute from DUT"
       command: "readAttribute"
       attribute: "OffWaitTime"
-      PICS: A_OFFWAITTIME
+      PICS: OO.S.A4002
       response:
           value: 0
 
-    - label: ":Wait 10000ms"
+    - label: "Wait 10000ms"
       cluster: "DelayCommands"
       command: "WaitForMs"
       arguments:
@@ -922,7 +922,7 @@ tests:
 
     - label: "23a:Sends OnWithTimedOff command to DUT"
       command: "OnWithTimedOff"
-      PICS: CR_ONWITHTIMEOFF
+      PICS: OO.S.C42.Rsp
       arguments:
           values:
               - name: "OnOffControl"
@@ -934,26 +934,26 @@ tests:
 
     - label: "23b:Send Off Command"
       command: "Off"
-      PICS: CR_OFF
+      PICS: OO.S.C00.Rsp
 
     - label: "23c:Reads OnOff attribute from DUT"
       command: "readAttribute"
       attribute: "OnOff"
-      PICS: A_ONOFF
+      PICS: OO.S.A0000
       response:
           value: 0
 
     - label: "23c:Reads OnTime attribute from DUT"
       command: "readAttribute"
       attribute: "OnTime"
-      PICS: A_ONTIME
+      PICS: OO.S.A4001
       response:
           value: 0
 
     - label: "23c:Reads OffWaitTime attribute from DUT"
       command: "readAttribute"
       attribute: "OffWaitTime"
-      PICS: A_OFFWAITTIME
+      PICS: OO.S.A4002
       response:
           constraints:
               minValue: 295
@@ -970,21 +970,21 @@ tests:
     - label: "23d:Reads OnOff attribute from DUT"
       command: "readAttribute"
       attribute: "OnOff"
-      PICS: A_ONOFF
+      PICS: OO.S.A0000
       response:
           value: 0
 
     - label: "23d:Reads OnTime attribute from DUT"
       command: "readAttribute"
       attribute: "OnTime"
-      PICS: A_ONTIME
+      PICS: OO.S.A4001
       response:
           value: 0
 
     - label: "23d:Reads OffWaitTime attribute from DUT"
       command: "readAttribute"
       attribute: "OffWaitTime"
-      PICS: A_OFFWAITTIME
+      PICS: OO.S.A4002
       response:
           constraints:
               minValue: 0
@@ -992,7 +992,7 @@ tests:
 
     - label: "24a:Sends OnWithTimedOff command to DUT"
       command: "OnWithTimedOff"
-      PICS: CR_ONWITHTIMEOFF
+      PICS: OO.S.C42.Rsp
       arguments:
           values:
               - name: "OnOffControl"
@@ -1005,14 +1005,14 @@ tests:
     - label: "24b:Reads OnOff attribute from DUT"
       command: "readAttribute"
       attribute: "OnOff"
-      PICS: A_ONOFF
+      PICS: OO.S.A0000
       response:
           value: 1
 
     - label: "24b:Reads OnTime attribute from DUT"
       command: "readAttribute"
       attribute: "OnTime"
-      PICS: A_ONTIME
+      PICS: OO.S.A4001
       response:
           constraints:
               minValue: 295
@@ -1021,7 +1021,7 @@ tests:
     - label: "24b:Reads OffWaitTime attribute from DUT"
       command: "readAttribute"
       attribute: "OffWaitTime"
-      PICS: A_OFFWAITTIME
+      PICS: OO.S.A4002
       response:
           value: 300
 
@@ -1036,21 +1036,21 @@ tests:
     - label: "24c:Reads OnOff attribute from DUT"
       command: "readAttribute"
       attribute: "OnOff"
-      PICS: A_ONOFF
+      PICS: OO.S.A0000
       response:
           value: 0
 
     - label: "24c:Reads OnTime attribute from DUT"
       command: "readAttribute"
       attribute: "OnTime"
-      PICS: A_ONTIME
+      PICS: OO.S.A4001
       response:
           value: 0
 
     - label: "24c:Reads OffWaitTime attribute from DUT"
       command: "readAttribute"
       attribute: "OffWaitTime"
-      PICS: A_OFFWAITTIME
+      PICS: OO.S.A4002
       response:
           constraints:
               minValue: 0
@@ -1058,4 +1058,4 @@ tests:
 
     - label: "Send Off Command"
       command: "Off"
-      PICS: CR_OFF
+      PICS: OO.S.C00.Rsp
diff --git a/src/app/tests/suites/certification/Test_TC_OO_2_4.yaml b/src/app/tests/suites/certification/Test_TC_OO_2_4.yaml
index c580305f7bcd36..8195cdbd45ac61 100644
--- a/src/app/tests/suites/certification/Test_TC_OO_2_4.yaml
+++ b/src/app/tests/suites/certification/Test_TC_OO_2_4.yaml
@@ -29,9 +29,11 @@ tests:
                 value: nodeId
 
     - label: "TH sends On command to DUT"
+      PICS: OO.S.C01.Rsp
       command: "On"
 
     - label: "TH writes a value of 0 to StartUpOnOff attribute of DUT"
+      PICS: OO.S.A4003
       command: "writeAttribute"
       attribute: "StartUpOnOff"
       arguments:
@@ -65,12 +67,14 @@ tests:
                 value: nodeId
 
     - label: "TH reads the OnOff attribute from the DUT"
+      PICS: OO.S.A0000
       command: "readAttribute"
       attribute: "OnOff"
       response:
           value: 0
 
     - label: "TH writes a value of 1 to StartUpOnOff attribute of DUT"
+      PICS: OO.S.A4003
       command: "writeAttribute"
       attribute: "StartUpOnOff"
       arguments:
@@ -104,12 +108,14 @@ tests:
                 value: nodeId
 
     - label: "TH reads the OnOff attribute from the DUT"
+      PICS: OO.S.A0000
       command: "readAttribute"
       attribute: "OnOff"
       response:
           value: 1
 
     - label: "TH writes a value of 2 to StartUpOnOff attribute of DUT"
+      PICS: OO.S.A4003
       command: "writeAttribute"
       attribute: "StartUpOnOff"
       arguments:
@@ -143,6 +149,7 @@ tests:
                 value: nodeId
 
     - label: "TH reads the OnOff attribute from the DUT"
+      PICS: OO.S.A0000
       command: "readAttribute"
       attribute: "OnOff"
       response:
@@ -176,12 +183,14 @@ tests:
                 value: nodeId
 
     - label: "TH reads the OnOff attribute from the DUT"
+      PICS: OO.S.A0000
       command: "readAttribute"
       attribute: "OnOff"
       response:
           value: 1
 
     - label: "TH writes NULL to StartUpOnOff attribute of DUT"
+      PICS: OO.S.A4003
       command: "writeAttribute"
       attribute: "StartUpOnOff"
       arguments:
@@ -215,12 +224,14 @@ tests:
                 value: nodeId
 
     - label: "TH reads the OnOff attribute from the DUT"
+      PICS: OO.S.A0000
       command: "readAttribute"
       attribute: "OnOff"
       response:
           value: 1
 
     - label: "TH sends Off command to DUT"
+      PICS: OO.S.C00.Rsp
       command: "Off"
 
     - label: "Reboot target device"
@@ -251,6 +262,7 @@ tests:
                 value: nodeId
 
     - label: "TH reads the OnOff attribute from the DUT"
+      PICS: OO.S.A0000
       command: "readAttribute"
       attribute: "OnOff"
       response:
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 f8407e1cf13a2b..94da14b81684c2 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
@@ -22,213 +22,246 @@ config:
 
 tests:
     - label: "DUT issues an Off command to the Test Harness."
+      PICS: OO.C.C00.Tx
       verification: |
           On TestHarnes (all-cluster-app) a received Off command looks like this:
 
-          [1646102181.016213][33190:33190] CHIP:EM: Received message of type 0x8 with protocolId (0, 1) and MessageCounter:1364748 on exchange 16786r
-          [1646102181.016254][33190:33190] CHIP:EM: Handling via exchange: 16786r, Delegate: 0xaaaace1730c8
-          [1646102181.016620][33190:33190] CHIP:DMG: InvokeRequestMessage =
-          [1646102181.016666][33190:33190] CHIP:DMG: {
-          [1646102181.016690][33190:33190] CHIP:DMG: 	suppressResponse = false,
-          [1646102181.016716][33190:33190] CHIP:DMG: 	timedRequest = false,
-          [1646102181.016741][33190:33190] CHIP:DMG: 	InvokeRequests =
-          [1646102181.016770][33190:33190] CHIP:DMG: 	[
-          [1646102181.016794][33190:33190] CHIP:DMG: 		CommandDataIB =
-          [1646102181.016829][33190:33190] CHIP:DMG: 		{
-          [1646102181.016857][33190:33190] CHIP:DMG: 			CommandPathIB =
-          [1646102181.016891][33190:33190] CHIP:DMG: 			{
-          [1646102181.016924][33190:33190] CHIP:DMG: 				EndpointId = 0x1,
-          [1646102181.016956][33190:33190] CHIP:DMG: 				ClusterId = 0x6,
-          [1646102181.016989][33190:33190] CHIP:DMG: 				CommandId = 0x0,
-          [1646102181.017020][33190:33190] CHIP:DMG: 			},
-          [1646102181.017053][33190:33190] CHIP:DMG:
-          [1646102181.017080][33190:33190] CHIP:DMG: 			CommandData =
-          [1646102181.017113][33190:33190] CHIP:DMG: 			{
-          [1646102181.017143][33190:33190] CHIP:DMG: 			},
-          [1646102181.017171][33190:33190] CHIP:DMG: 		},
-          [1646102181.017202][33190:33190] CHIP:DMG:
-          [1646102181.017227][33190:33190] CHIP:DMG: 	],
-          [1646102181.017256][33190:33190] CHIP:DMG:
-          [1646102181.017280][33190:33190] CHIP:DMG: 	InteractionModelRevision = 1
-          [1646102181.017303][33190:33190] CHIP:DMG: },
-          [1646102181.017357][33190:33190] CHIP:DMG: AccessControl: checking f=1 a=c s=0x000000000001B669 t= c=0x0000_0006 e=1 p=o
-          [1646102181.017399][33190:33190] CHIP:DMG: Received command for Endpoint=1 Cluster=0x0000_0006 Command=0x0000_0000
+          ./chip-tool onoff off 1 1
+
+          [1650537121.464763][3678:3678] CHIP:DMG: InvokeRequestMessage =
+          [1650537121.464818][3678:3678] CHIP:DMG: {
+          [1650537121.464866][3678:3678] CHIP:DMG:         suppressResponse = false,
+          [1650537121.464922][3678:3678] CHIP:DMG:         timedRequest = false,
+          [1650537121.464974][3678:3678] CHIP:DMG:         InvokeRequests =
+          [1650537121.465078][3678:3678] CHIP:DMG:         [
+          [1650537121.465132][3678:3678] CHIP:DMG:                 CommandDataIB =
+          [1650537121.465195][3678:3678] CHIP:DMG:                 {
+          [1650537121.465250][3678:3678] CHIP:DMG:                         CommandPathIB =
+          [1650537121.465309][3678:3678] CHIP:DMG:                         {
+          [1650537121.465370][3678:3678] CHIP:DMG:                                 EndpointId = 0x1,
+          [1650537121.465440][3678:3678] CHIP:DMG:                                 ClusterId = 0x6,
+          [1650537121.465501][3678:3678] CHIP:DMG:                                 CommandId = 0x0,
+          [1650537121.465569][3678:3678] CHIP:DMG:                         },
+          [1650537121.465633][3678:3678] CHIP:DMG:
+          [1650537121.465687][3678:3678] CHIP:DMG:                         CommandData =
+          [1650537121.465744][3678:3678] CHIP:DMG:                         {
+          [1650537121.465807][3678:3678] CHIP:DMG:                         },
+          [1650537121.465868][3678:3678] CHIP:DMG:                 },
+          [1650537121.465932][3678:3678] CHIP:DMG:
+          [1650537121.465982][3678:3678] CHIP:DMG:         ],
+          [1650537121.466043][3678:3678] CHIP:DMG:
+          [1650537121.466092][3678:3678] CHIP:DMG:         InteractionModelRevision = 1
+          [1650537121.466141][3678:3678] CHIP:DMG: },
+          [1650537121.466254][3678:3678] CHIP:DMG: AccessControl: checking f=1 a=c s=0x000000000001B669 t= c=0x0000_0006 e=1 p=o
+          [1650537121.466322][3678:3678] CHIP:DMG: AccessControl: allowed
+          [1650537121.466377][3678:3678] CHIP:DMG: Received command for Endpoint=1 Cluster=0x0000_0006 Command=0x0000_0000
+          [1650537121.466434][3678:3678] CHIP:ZCL: On/Off set value: 1 0
+          [1650537121.466486][3678:3678] CHIP:ZCL: On/off already set to new value
       disabled: true
 
     - label: "DUT issues an On command to the Test Harness."
+      PICS: OO.C.C01.Tx
       verification: |
           On TestHarnes (all-cluster-app) a received On command looks like this:
 
-          [1646102270.625767][33190:33190] CHIP:EM: Received message of type 0x8 with protocolId (0, 1) and MessageCounter:15922463 on exchange 1577r
-          [1646102270.625810][33190:33190] CHIP:EM: Handling via exchange: 1577r, Delegate: 0xaaaace1730c8
-          [1646102270.626205][33190:33190] CHIP:DMG: InvokeRequestMessage =
-          [1646102270.626252][33190:33190] CHIP:DMG: {
-          [1646102270.626278][33190:33190] CHIP:DMG: 	suppressResponse = false,
-          [1646102270.626318][33190:33190] CHIP:DMG: 	timedRequest = false,
-          [1646102270.626346][33190:33190] CHIP:DMG: 	InvokeRequests =
-          [1646102270.626381][33190:33190] CHIP:DMG: 	[
-          [1646102270.626409][33190:33190] CHIP:DMG: 		CommandDataIB =
-          [1646102270.626442][33190:33190] CHIP:DMG: 		{
-          [1646102270.626470][33190:33190] CHIP:DMG: 			CommandPathIB =
-          [1646102270.626508][33190:33190] CHIP:DMG: 			{
-          [1646102270.626546][33190:33190] CHIP:DMG: 				EndpointId = 0x1,
-          [1646102270.626585][33190:33190] CHIP:DMG: 				ClusterId = 0x6,
-          [1646102270.626620][33190:33190] CHIP:DMG: 				CommandId = 0x1,
-          [1646102270.626654][33190:33190] CHIP:DMG: 			},
-          [1646102270.626695][33190:33190] CHIP:DMG:
-          [1646102270.626726][33190:33190] CHIP:DMG: 			CommandData =
-          [1646102270.626761][33190:33190] CHIP:DMG: 			{
-          [1646102270.626795][33190:33190] CHIP:DMG: 			},
-          [1646102270.626827][33190:33190] CHIP:DMG: 		},
-          [1646102270.626860][33190:33190] CHIP:DMG:
-          [1646102270.626887][33190:33190] CHIP:DMG: 	],
-          [1646102270.626920][33190:33190] CHIP:DMG:
-          [1646102270.626946][33190:33190] CHIP:DMG: 	InteractionModelRevision = 1
-          [1646102270.626972][33190:33190] CHIP:DMG: },
-          [1646102270.627032][33190:33190] CHIP:DMG: AccessControl: checking f=1 a=c s=0x000000000001B669 t= c=0x0000_0006 e=1 p=o
-          [1646102270.627078][33190:33190] CHIP:DMG: Received command for Endpoint=1 Cluster=0x0000_0006 Command=0x0000_0001
+          ./chip-tool onoff on 1 1
+
+          [1650537309.217556][3678:3678] CHIP:DMG: InvokeRequestMessage =
+          [1650537309.217647][3678:3678] CHIP:DMG: {
+          [1650537309.217706][3678:3678] CHIP:DMG:         suppressResponse = false,
+          [1650537309.217773][3678:3678] CHIP:DMG:         timedRequest = false,
+          [1650537309.217834][3678:3678] CHIP:DMG:         InvokeRequests =
+          [1650537309.217931][3678:3678] CHIP:DMG:         [
+          [1650537309.217993][3678:3678] CHIP:DMG:                 CommandDataIB =
+          [1650537309.218088][3678:3678] CHIP:DMG:                 {
+          [1650537309.218168][3678:3678] CHIP:DMG:                         CommandPathIB =
+          [1650537309.218267][3678:3678] CHIP:DMG:                         {
+          [1650537309.218374][3678:3678] CHIP:DMG:                                 EndpointId = 0x1,
+          [1650537309.218458][3678:3678] CHIP:DMG:                                 ClusterId = 0x6,
+          [1650537309.218566][3678:3678] CHIP:DMG:                                 CommandId = 0x1,
+          [1650537309.218666][3678:3678] CHIP:DMG:                         },
+          [1650537309.218747][3678:3678] CHIP:DMG:
+          [1650537309.218839][3678:3678] CHIP:DMG:                         CommandData =
+          [1650537309.218928][3678:3678] CHIP:DMG:                         {
+          [1650537309.219001][3678:3678] CHIP:DMG:                         },
+          [1650537309.219080][3678:3678] CHIP:DMG:                 },
+          [1650537309.219180][3678:3678] CHIP:DMG:
+          [1650537309.219240][3678:3678] CHIP:DMG:         ],
+          [1650537309.219334][3678:3678] CHIP:DMG:
+          [1650537309.219394][3678:3678] CHIP:DMG:         InteractionModelRevision = 1
+          [1650537309.219474][3678:3678] CHIP:DMG: },
+          [1650537309.219624][3678:3678] CHIP:DMG: AccessControl: checking f=1 a=c s=0x000000000001B669 t= c=0x0000_0006 e=1 p=o
+          [1650537309.219724][3678:3678] CHIP:DMG: AccessControl: allowed
+          [1650537309.219791][3678:3678] CHIP:DMG: Received command for Endpoint=1 Cluster=0x0000_0006 Command=0x0000_0001
+          [1650537309.219887][3678:3678] CHIP:ZCL: On/Off set value: 1 1
+          [1650537309.219951][3678:3678] CHIP:ZCL: Toggle on/off from 0 to 1
       disabled: true
 
     - label: "DUT issues an Toggle command to the Test Harness."
+      PICS: OO.C.C02.Tx
       verification: |
           On TestHarnes (all-cluster-app) a received Toggle command looks like this:
 
-          [1646102299.034377][33190:33190] CHIP:EM: Received message of type 0x8 with protocolId (0, 1) and MessageCounter:15497853 on exchange 28117r
-          [1646102299.034429][33190:33190] CHIP:EM: Handling via exchange: 28117r, Delegate: 0xaaaace1730c8
-          [1646102299.034872][33190:33190] CHIP:DMG: InvokeRequestMessage =
-          [1646102299.034923][33190:33190] CHIP:DMG: {
-          [1646102299.034955][33190:33190] CHIP:DMG: 	suppressResponse = false,
-          [1646102299.034990][33190:33190] CHIP:DMG: 	timedRequest = false,
-          [1646102299.035023][33190:33190] CHIP:DMG: 	InvokeRequests =
-          [1646102299.035062][33190:33190] CHIP:DMG: 	[
-          [1646102299.035094][33190:33190] CHIP:DMG: 		CommandDataIB =
-          [1646102299.035131][33190:33190] CHIP:DMG: 		{
-          [1646102299.035167][33190:33190] CHIP:DMG: 			CommandPathIB =
-          [1646102299.035209][33190:33190] CHIP:DMG: 			{
-          [1646102299.035305][33190:33190] CHIP:DMG: 				EndpointId = 0x1,
-          [1646102299.035346][33190:33190] CHIP:DMG: 				ClusterId = 0x6,
-          [1646102299.035381][33190:33190] CHIP:DMG: 				CommandId = 0x2,
-          [1646102299.035422][33190:33190] CHIP:DMG: 			},
-          [1646102299.035465][33190:33190] CHIP:DMG:
-          [1646102299.035502][33190:33190] CHIP:DMG: 			CommandData =
-          [1646102299.035543][33190:33190] CHIP:DMG: 			{
-          [1646102299.035585][33190:33190] CHIP:DMG: 			},
-          [1646102299.035623][33190:33190] CHIP:DMG: 		},
-          [1646102299.035665][33190:33190] CHIP:DMG:
-          [1646102299.035696][33190:33190] CHIP:DMG: 	],
-          [1646102299.035736][33190:33190] CHIP:DMG:
-          [1646102299.035768][33190:33190] CHIP:DMG: 	InteractionModelRevision = 1
-          [1646102299.035799][33190:33190] CHIP:DMG: },
-          [1646102299.035869][33190:33190] CHIP:DMG: AccessControl: checking f=1 a=c s=0x000000000001B669 t= c=0x0000_0006 e=1 p=o
-          [1646102299.035922][33190:33190] CHIP:DMG: Received command for Endpoint=1 Cluster=0x0000_0006 Command=0x0000_0002
+          ./chip-tool onoff toggle 1 1
+
+          [1650537502.260837][3678:3678] CHIP:DMG: InvokeRequestMessage =
+          [1650537502.260877][3678:3678] CHIP:DMG: {
+          [1650537502.260911][3678:3678] CHIP:DMG:         suppressResponse = false,
+          [1650537502.260952][3678:3678] CHIP:DMG:         timedRequest = false,
+          [1650537502.260988][3678:3678] CHIP:DMG:         InvokeRequests =
+          [1650537502.261053][3678:3678] CHIP:DMG:         [
+          [1650537502.261092][3678:3678] CHIP:DMG:                 CommandDataIB =
+          [1650537502.261145][3678:3678] CHIP:DMG:                 {
+          [1650537502.261184][3678:3678] CHIP:DMG:                         CommandPathIB =
+          [1650537502.261235][3678:3678] CHIP:DMG:                         {
+          [1650537502.261287][3678:3678] CHIP:DMG:                                 EndpointId = 0x1,
+          [1650537502.261341][3678:3678] CHIP:DMG:                                 ClusterId = 0x6,
+          [1650537502.261390][3678:3678] CHIP:DMG:                                 CommandId = 0x2,
+          [1650537502.261440][3678:3678] CHIP:DMG:                         },
+          [1650537502.261493][3678:3678] CHIP:DMG:
+          [1650537502.261535][3678:3678] CHIP:DMG:                         CommandData =
+          [1650537502.261585][3678:3678] CHIP:DMG:                         {
+          [1650537502.261632][3678:3678] CHIP:DMG:                         },
+          [1650537502.261674][3678:3678] CHIP:DMG:                 },
+          [1650537502.261721][3678:3678] CHIP:DMG:
+          [1650537502.261756][3678:3678] CHIP:DMG:         ],
+          [1650537502.261800][3678:3678] CHIP:DMG:
+          [1650537502.261835][3678:3678] CHIP:DMG:         InteractionModelRevision = 1
+          [1650537502.261870][3678:3678] CHIP:DMG: },
+          [1650537502.261955][3678:3678] CHIP:DMG: AccessControl: checking f=1 a=c s=0x000000000001B669 t= c=0x0000_0006 e=1 p=o
+          [1650537502.262005][3678:3678] CHIP:DMG: AccessControl: allowed
+          [1650537502.262044][3678:3678] CHIP:DMG: Received command for Endpoint=1 Cluster=0x0000_0006 Command=0x0000_0002
+          [1650537502.262086][3678:3678] CHIP:ZCL: On/Off set value: 1 2
+          [1650537502.262124][3678:3678] CHIP:ZCL: Toggle on/off from 1 to 0
+          [1650537502.262157][3678:3678] CHIP:ZCL: Off Command - OnTime :  0
       disabled: true
 
     - label: "DUT issues an OffWithEffect command to the Test Harness."
+      PICS: OO.C.C40.Tx
       verification: |
           On TestHarnes (all-cluster-app) a received OffWithEffect command with f.e. 1 for EffectIdentifier and 0 for EffectVariant  looks like this:
-
-          [1646101669.038374][33190:33190] CHIP:EM: Received message of type 0x8 with protocolId (0, 1) and MessageCounter:2036360 on exchange 5461r
-          [1646101669.038415][33190:33190] CHIP:EM: Handling via exchange: 5461r, Delegate: 0xaaaace1730c8
-          [1646101669.038772][33190:33190] CHIP:DMG: InvokeRequestMessage =
-          [1646101669.038820][33190:33190] CHIP:DMG: {
-          [1646101669.038847][33190:33190] CHIP:DMG:         suppressResponse = false,
-          [1646101669.038874][33190:33190] CHIP:DMG:         timedRequest = false,
-          [1646101669.038899][33190:33190] CHIP:DMG:         InvokeRequests =
-          [1646101669.038930][33190:33190] CHIP:DMG:         [
-          [1646101669.038954][33190:33190] CHIP:DMG:                 CommandDataIB =
-          [1646101669.038983][33190:33190] CHIP:DMG:                 {
-          [1646101669.039010][33190:33190] CHIP:DMG:                         CommandPathIB =
-          [1646101669.039041][33190:33190] CHIP:DMG:                         {
-          [1646101669.039076][33190:33190] CHIP:DMG:                                 EndpointId = 0x1,
-          [1646101669.039108][33190:33190] CHIP:DMG:                                 ClusterId = 0x6,
-          [1646101669.039138][33190:33190] CHIP:DMG:                                 CommandId = 0x40,
-          [1646101669.039167][33190:33190] CHIP:DMG:                         },
-          [1646101669.039200][33190:33190] CHIP:DMG:
-          [1646101669.039256][33190:33190] CHIP:DMG:                         CommandData =
-          [1646101669.039289][33190:33190] CHIP:DMG:                         {
-          [1646101669.039321][33190:33190] CHIP:DMG:                                 0x0 = 1,
-          [1646101669.039353][33190:33190] CHIP:DMG:                                 0x1 = 0,
-          [1646101669.039384][33190:33190] CHIP:DMG:                         },
-          [1646101669.039414][33190:33190] CHIP:DMG:                 },
-          [1646101669.039446][33190:33190] CHIP:DMG:
-          [1646101669.039470][33190:33190] CHIP:DMG:         ],
-          [1646101669.039500][33190:33190] CHIP:DMG:
-          [1646101669.039523][33190:33190] CHIP:DMG:         InteractionModelRevision = 1
-          [1646101669.039546][33190:33190] CHIP:DMG: },
-          [1646101669.039603][33190:33190] CHIP:DMG: AccessControl: checking f=1 a=c s=0x000000000001B669 t= c=0x0000_0006 e=1 p=o
-          [1646101669.039644][33190:33190] CHIP:DMG: Received command for Endpoint=1 Cluster=0x0000_0006 Command=0x0000_0040
-          [1646101669.039684][33190:33190] CHIP:ZCL: On/Off set value: 1 0
-          [1646101669.039707][33190:33190] CHIP:ZCL: On/off already set to new value
+          ./chip-tool onoff off-with-effect 1 2 1 1
+          [1650538107.639049][3678:3678] CHIP:DMG: InvokeRequestMessage =
+          [1650538107.639115][3678:3678] CHIP:DMG: {
+          [1650538107.639154][3678:3678] CHIP:DMG:         suppressResponse = false,
+          [1650538107.639198][3678:3678] CHIP:DMG:         timedRequest = false,
+          [1650538107.639257][3678:3678] CHIP:DMG:         InvokeRequests =
+          [1650538107.639310][3678:3678] CHIP:DMG:         [
+          [1650538107.639364][3678:3678] CHIP:DMG:                 CommandDataIB =
+          [1650538107.639415][3678:3678] CHIP:DMG:                 {
+          [1650538107.639471][3678:3678] CHIP:DMG:                         CommandPathIB =
+          [1650538107.639529][3678:3678] CHIP:DMG:                         {
+          [1650538107.639602][3678:3678] CHIP:DMG:                                 EndpointId = 0x1,
+          [1650538107.639675][3678:3678] CHIP:DMG:                                 ClusterId = 0x6,
+          [1650538107.639734][3678:3678] CHIP:DMG:                                 CommandId = 0x40,
+          [1650538107.639799][3678:3678] CHIP:DMG:                         },
+          [1650538107.639867][3678:3678] CHIP:DMG:
+          [1650538107.639914][3678:3678] CHIP:DMG:                         CommandData =
+          [1650538107.639984][3678:3678] CHIP:DMG:                         {
+          [1650538107.640054][3678:3678] CHIP:DMG:                                 0x0 = 1,
+          [1650538107.640113][3678:3678] CHIP:DMG:                                 0x1 = 0,
+          [1650538107.640186][3678:3678] CHIP:DMG:                         },
+          [1650538107.640247][3678:3678] CHIP:DMG:                 },
+          [1650538107.640301][3678:3678] CHIP:DMG:
+          [1650538107.640355][3678:3678] CHIP:DMG:         ],
+          [1650538107.640420][3678:3678] CHIP:DMG:
+          [1650538107.640461][3678:3678] CHIP:DMG:         InteractionModelRevision = 1
+          [1650538107.640513][3678:3678] CHIP:DMG: },
+          [1650538107.640625][3678:3678] CHIP:DMG: AccessControl: checking f=1 a=c s=0x000000000001B669 t= c=0x0000_0006 e=1 p=o
+          [1650538107.640681][3678:3678] CHIP:DMG: AccessControl: allowed
+          [1650538107.640738][3678:3678] CHIP:DMG: Received command for Endpoint=1 Cluster=0x0000_0006 Command=0x0000_0040
+          [1650538107.640853][3678:3678] CHIP:DMG: Endpoint 1, Cluster 0x0000_0005 update version to ab19f0ce
+          [1650538107.640924][3678:3678] CHIP:DMG: Endpoint 1, Cluster 0x0000_0005 update version to ab19f0cf
+          [1650538107.640983][3678:3678] CHIP:DMG: Endpoint 1, Cluster 0x0000_0005 update version to ab19f0d0
+          [1650538107.641025][3678:3678] CHIP:DMG: Endpoint 1, Cluster 0x0000_0006 update version to a5d11994
+          [1650538107.641087][3678:3678] CHIP:ZCL: On/Off set value: 1 0
+          [1650538107.641128][3678:3678] CHIP:ZCL: Toggle on/off from 1 to 0
+          [1650538107.641164][3678:3678] CHIP:ZCL: Off Command - OnTime :  0
+          [1650538107.641215][3678:3678] CHIP:DMG: Endpoint 1, Cluster 0x0000_0006 update version to a5d11995
       disabled: true
 
     - label:
           "DUT issues an OnWithRecallGlobalScene command to the Test Harness."
+      PICS: OO.C.C41.Tx
       verification: |
           On TestHarnes (all-cluster-app) a received OnWithRecallGlobalScene command looks like this:
 
-          [1646102326.055526][33190:33190] CHIP:EM: Received message of type 0x8 with protocolId (0, 1) and MessageCounter:15476331 on exchange 1832r
-          [1646102326.055565][33190:33190] CHIP:EM: Handling via exchange: 1832r, Delegate: 0xaaaace1730c8
-          [1646102326.055921][33190:33190] CHIP:DMG: InvokeRequestMessage =
-          [1646102326.055966][33190:33190] CHIP:DMG: {
-          [1646102326.055989][33190:33190] CHIP:DMG: 	suppressResponse = false,
-          [1646102326.056022][33190:33190] CHIP:DMG: 	timedRequest = false,
-          [1646102326.056046][33190:33190] CHIP:DMG: 	InvokeRequests =
-          [1646102326.056077][33190:33190] CHIP:DMG: 	[
-          [1646102326.056171][33190:33190] CHIP:DMG: 		CommandDataIB =
-          [1646102326.056205][33190:33190] CHIP:DMG: 		{
-          [1646102326.056232][33190:33190] CHIP:DMG: 			CommandPathIB =
-          [1646102326.056261][33190:33190] CHIP:DMG: 			{
-          [1646102326.056292][33190:33190] CHIP:DMG: 				EndpointId = 0x1,
-          [1646102326.056328][33190:33190] CHIP:DMG: 				ClusterId = 0x6,
-          [1646102326.056362][33190:33190] CHIP:DMG: 				CommandId = 0x41,
-          [1646102326.056389][33190:33190] CHIP:DMG: 			},
-          [1646102326.056420][33190:33190] CHIP:DMG:
-          [1646102326.056451][33190:33190] CHIP:DMG: 			CommandData =
-          [1646102326.056481][33190:33190] CHIP:DMG: 			{
-          [1646102326.056515][33190:33190] CHIP:DMG: 			},
-          [1646102326.056542][33190:33190] CHIP:DMG: 		},
-          [1646102326.056573][33190:33190] CHIP:DMG:
-          [1646102326.056596][33190:33190] CHIP:DMG: 	],
-          [1646102326.056661][33190:33190] CHIP:DMG:
-          [1646102326.056685][33190:33190] CHIP:DMG: 	InteractionModelRevision = 1
-          [1646102326.056708][33190:33190] CHIP:DMG: },
-          [1646102326.056763][33190:33190] CHIP:DMG: AccessControl: checking f=1 a=c s=0x000000000001B669 t= c=0x0000_0006 e=1 p=o
-          [1646102326.056804][33190:33190] CHIP:DMG: Received command for Endpoint=1 Cluster=0x0000_0006 Command=0x0000_0041
+          ./chip-tool onoff on-with-recall-global-scene 1 1
+
+          [1650537790.690122][3678:3678] CHIP:DMG: InvokeRequestMessage =
+          [1650537790.690188][3678:3678] CHIP:DMG: {
+          [1650537790.690244][3678:3678] CHIP:DMG:         suppressResponse = false,
+          [1650537790.690311][3678:3678] CHIP:DMG:         timedRequest = false,
+          [1650537790.690371][3678:3678] CHIP:DMG:         InvokeRequests =
+          [1650537790.690446][3678:3678] CHIP:DMG:         [
+          [1650537790.690507][3678:3678] CHIP:DMG:                 CommandDataIB =
+          [1650537790.690582][3678:3678] CHIP:DMG:                 {
+          [1650537790.690645][3678:3678] CHIP:DMG:                         CommandPathIB =
+          [1650537790.690720][3678:3678] CHIP:DMG:                         {
+          [1650537790.690805][3678:3678] CHIP:DMG:                                 EndpointId = 0x1,
+          [1650537790.690889][3678:3678] CHIP:DMG:                                 ClusterId = 0x6,
+          [1650537790.690969][3678:3678] CHIP:DMG:                                 CommandId = 0x41,
+          [1650537790.691047][3678:3678] CHIP:DMG:                         },
+          [1650537790.691127][3678:3678] CHIP:DMG:
+          [1650537790.691196][3678:3678] CHIP:DMG:                         CommandData =
+          [1650537790.691272][3678:3678] CHIP:DMG:                         {
+          [1650537790.691347][3678:3678] CHIP:DMG:                         },
+          [1650537790.691419][3678:3678] CHIP:DMG:                 },
+          [1650537790.691492][3678:3678] CHIP:DMG:
+          [1650537790.691539][3678:3678] CHIP:DMG:         ],
+          [1650537790.691583][3678:3678] CHIP:DMG:
+          [1650537790.691618][3678:3678] CHIP:DMG:         InteractionModelRevision = 1
+          [1650537790.691654][3678:3678] CHIP:DMG: },
+          [1650537790.691738][3678:3678] CHIP:DMG: AccessControl: checking f=1 a=c s=0x000000000001B669 t= c=0x0000_0006 e=1 p=o
+          [1650537790.691789][3678:3678] CHIP:DMG: AccessControl: allowed
+          [1650537790.701316][3678:3678] CHIP:ZCL: On/Off set value: 1 1
+          [1650537790.701348][3678:3678] CHIP:ZCL: Toggle on/off from 0 to 1
+          [1650537790.701382][3678:3678] CHIP:ZCL: On Command - OffWaitTime :  0
+          [1650537790.701414][3678:3678] CHIP:DMG: Endpoint 1, Cluster 0x0000_0006 update version to a5d11991
+          [1650537790.701452][3678:3678] CHIP:ZCL: On/Toggle Command - Stop Timer
+          [1650537790.701485][3678:3678] CHIP:DMG: Endpoint 1, Cluster 0x0000_0006 update version to a5d11992
       disabled: true
 
     - label: "DUT issues an OnWithTimedOff command to the Test Harness."
+      PICS: OO.C.C42.Tx
       verification: |
           On TestHarnes (all-cluster-app) a received OnWithTimedOff command with f.e. 0 for OnOffControl, 120 for OnTime and 5 for OffWaitTime  looks like this:
 
-          [1646101954.445121][33190:33190] CHIP:EM: Received message of type 0x8 with protocolId (0, 1) and MessageCounter:1056488 on exchange 1252r
-          [1646101954.445162][33190:33190] CHIP:EM: Handling via exchange: 1252r, Delegate: 0xaaaace1730c8
-          [1646101954.445536][33190:33190] CHIP:DMG: InvokeRequestMessage =
-          [1646101954.445582][33190:33190] CHIP:DMG: {
-          [1646101954.445604][33190:33190] CHIP:DMG: 	suppressResponse = false,
-          [1646101954.445630][33190:33190] CHIP:DMG: 	timedRequest = false,
-          [1646101954.445654][33190:33190] CHIP:DMG: 	InvokeRequests =
-          [1646101954.445686][33190:33190] CHIP:DMG: 	[
-          [1646101954.445709][33190:33190] CHIP:DMG: 		CommandDataIB =
-          [1646101954.445743][33190:33190] CHIP:DMG: 		{
-          [1646101954.445768][33190:33190] CHIP:DMG: 			CommandPathIB =
-          [1646101954.445798][33190:33190] CHIP:DMG: 			{
-          [1646101954.445831][33190:33190] CHIP:DMG: 				EndpointId = 0x1,
-          [1646101954.445863][33190:33190] CHIP:DMG: 				ClusterId = 0x6,
-          [1646101954.445894][33190:33190] CHIP:DMG: 				CommandId = 0x42,
-          [1646101954.445924][33190:33190] CHIP:DMG: 			},
-          [1646101954.445956][33190:33190] CHIP:DMG:
-          [1646101954.445983][33190:33190] CHIP:DMG: 			CommandData =
-          [1646101954.446016][33190:33190] CHIP:DMG: 			{
-          [1646101954.446048][33190:33190] CHIP:DMG: 				0x0 = 0,
-          [1646101954.446080][33190:33190] CHIP:DMG: 				0x1 = 120,
-          [1646101954.446115][33190:33190] CHIP:DMG: 				0x2 = 5,
-          [1646101954.446146][33190:33190] CHIP:DMG: 			},
-          [1646101954.446174][33190:33190] CHIP:DMG: 		},
-          [1646101954.446206][33190:33190] CHIP:DMG:
-          [1646101954.446229][33190:33190] CHIP:DMG: 	],
-          [1646101954.446259][33190:33190] CHIP:DMG:
-          [1646101954.446282][33190:33190] CHIP:DMG: 	InteractionModelRevision = 1
-          [1646101954.446304][33190:33190] CHIP:DMG: },
-          [1646101954.446361][33190:33190] CHIP:DMG: AccessControl: checking f=1 a=c s=0x000000000001B669 t= c=0x0000_0006 e=1 p=o
-          [1646101954.446403][33190:33190] CHIP:DMG: Received command for Endpoint=1 Cluster=0x0000_0006 Command=0x0000_0042
+          ./chip-tool onoff on-with-timed-off 0 120 5 1 1
+
+          [1650538315.673606][3678:3678] CHIP:DMG: InvokeRequestMessage =
+          [1650538315.673697][3678:3678] CHIP:DMG: {
+          [1650538315.673755][3678:3678] CHIP:DMG:         suppressResponse = false,
+          [1650538315.673821][3678:3678] CHIP:DMG:         timedRequest = false,
+          [1650538315.673882][3678:3678] CHIP:DMG:         InvokeRequests =
+          [1650538315.673983][3678:3678] CHIP:DMG:         [
+          [1650538315.674047][3678:3678] CHIP:DMG:                 CommandDataIB =
+          [1650538315.674143][3678:3678] CHIP:DMG:                 {
+          [1650538315.674210][3678:3678] CHIP:DMG:                         CommandPathIB =
+          [1650538315.674309][3678:3678] CHIP:DMG:                         {
+          [1650538315.674387][3678:3678] CHIP:DMG:                                 EndpointId = 0x1,
+          [1650538315.674491][3678:3678] CHIP:DMG:                                 ClusterId = 0x6,
+          [1650538315.674598][3678:3678] CHIP:DMG:                                 CommandId = 0x42,
+          [1650538315.674678][3678:3678] CHIP:DMG:                         },
+          [1650538315.674781][3678:3678] CHIP:DMG:
+          [1650538315.674851][3678:3678] CHIP:DMG:                         CommandData =
+          [1650538315.674941][3678:3678] CHIP:DMG:                         {
+          [1650538315.674991][3678:3678] CHIP:DMG:                                 0x0 = 0,
+          [1650538315.675034][3678:3678] CHIP:DMG:                                 0x1 = 120,
+          [1650538315.675099][3678:3678] CHIP:DMG:                                 0x2 = 5,
+          [1650538315.675159][3678:3678] CHIP:DMG:                         },
+          [1650538315.675204][3678:3678] CHIP:DMG:                 },
+          [1650538315.675246][3678:3678] CHIP:DMG:
+          [1650538315.675289][3678:3678] CHIP:DMG:         ],
+          [1650538315.675327][3678:3678] CHIP:DMG:
+          [1650538315.675368][3678:3678] CHIP:DMG:         InteractionModelRevision = 1
+          [1650538315.675398][3678:3678] CHIP:DMG: },
+          [1650538315.675497][3678:3678] CHIP:DMG: AccessControl: checking f=1 a=c s=0x000000000001B669 t= c=0x0000_0006 e=1 p=o
+          [1650538315.675541][3678:3678] CHIP:DMG: AccessControl: allowed
+          [1650538315.675584][3678:3678] CHIP:DMG: Received command for Endpoint=1 Cluster=0x0000_0006 Command=0x0000_0042
+          [1650538315.675646][3678:3678] CHIP:DMG: Endpoint 1, Cluster 0x0000_0006 update version to a5d11998
+          [1650538315.675701][3678:3678] CHIP:DMG: Endpoint 1, Cluster 0x0000_0006 update version to a5d11999
+          [1650538315.675732][3678:3678] CHIP:ZCL: On/Off set value: 1 1
+          [1650538315.675759][3678:3678] CHIP:ZCL: Toggle on/off from 0 to 1
+          [1650538315.675800][3678:3678] CHIP:DMG: Endpoint 1, Cluster 0x0000_0006 update version to a5d1199a
       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 8ea7c3cab95432..eb18fe9d4fb60f 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
@@ -27,35 +27,12 @@ tests:
       disabled: true
 
     - label: "TH reads the Sources attribute from the DUT"
+      PICS: PSCFG.S.A0000
       verification: |
           ./chip-tool powersourceconfiguration read sources 1 0
 
           The response should look like this:
 
-
-          [1650273002.440249][8875:8880] CHIP:DMG:                 AttributeReportIB =
-          [1650273002.440310][8875:8880] CHIP:DMG:                 {
-          [1650273002.440353][8875:8880] CHIP:DMG:                         AttributeDataIB =
-          [1650273002.440413][8875:8880] CHIP:DMG:                         {
-          [1650273002.440472][8875:8880] CHIP:DMG:                                 DataVersion = 0x1b83f378,
-          [1650273002.440519][8875:8880] CHIP:DMG:                                 AttributePathIB =
-          [1650273002.440578][8875:8880] CHIP:DMG:                                 {
-          [1650273002.440641][8875:8880] CHIP:DMG:                                         Endpoint = 0x0,
-          [1650273002.440694][8875:8880] CHIP:DMG:                                         Cluster = 0x2e,
-          [1650273002.440767][8875:8880] CHIP:DMG:                                         Attribute = 0x0000_0000,
-          [1650273002.440830][8875:8880] CHIP:DMG:                                         ListIndex = Null,
-          [1650273002.440897][8875:8880] CHIP:DMG:                                 }
-          [1650273002.440971][8875:8880] CHIP:DMG:
-          [1650273002.441023][8875:8880] CHIP:DMG:                                         Data = 1,
-          [1650273002.441083][8875:8880] CHIP:DMG:                         },
-          [1650273002.441144][8875:8880] CHIP:DMG:
-          [1650273002.441196][8875:8880] CHIP:DMG:                 },
-          [1650273002.441251][8875:8880] CHIP:DMG:
-          [1650273002.441295][8875:8880] CHIP:DMG:         ],
-          [1650273002.441354][8875:8880] CHIP:DMG:
-          [1650273002.441398][8875:8880] CHIP:DMG:         SuppressResponse = true,
-          [1650273002.441449][8875:8880] CHIP:DMG:         InteractionModelRevision = 1
-          [1650273002.441492][8875:8880] CHIP:DMG: }
           [1650273002.441884][8875:8880] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_002E Attribute 0x0000_0000 DataVersion: 461632376
           [1653564197.717105][36217:36222] CHIP:TOO:   Sources: 3 entries
           [1653564197.717154][36217:36222] CHIP:TOO:     [1]: 2
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 359093913a798a..34b7266e9b7707 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
@@ -13,7 +13,7 @@
 # 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: 63.2.2. [TC-PSCFG-2.2] Primary functionality with server as DUT
+name: 64.2.2. [TC-PSCFG-2.2] Primary functionality with server as DUT
 
 config:
     nodeId: 0x12344321
@@ -27,20 +27,30 @@ tests:
       disabled: true
 
     - label: "TH reads the Sources attribute from the DUT"
+      PICS: PSCFG.S.A0000
       verification: |
           ./chip-tool powersourceconfiguration read sources 1 0
 
           [...]
-          [1646157640.271321][44339:44344] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_002E Attribute 0x0000_0000DataVersion: 502821112
-          [1646157640.271401][44339:44344] CHIP:TOO:   Sources: 1 entries
-          [1646157640.271466][44339:44344] CHIP:TOO:     [1]: 1
+          CHIP:TOO: Endpoint: 0 Cluster: 0x0000_002E Attribute 0x0000_0000DataVersion: 502821112
+          CHIP:TOO:   Sources: 3 entries
+          CHIP:TOO:     [1]: 2
+          CHIP:TOO:     [2]: 1
+          CHIP:TOO:     [3]: 0
       disabled: true
 
-    - label: "./chip-tool powersource read order 1 1"
+    - label: "For each enpoint number (eNr) in this list do"
+      verification: |
+
+      disabled: true
+
+    - label:
+          "TH reads the Order attribute from Power Source Cluster at
+          Enpoint[eNr] of the DUT"
       verification: |
           ./chip-tool powersource read order 1 1
 
           [...]
-          [1646157759.345628][44355:44360] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_002F Attribute 0x0000_0001DataVersion: 1844928386
-          [1646157759.345704][44355:44360] CHIP:TOO:   Order: 0
+          [1653564242.694964][36231:36236] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_002F Attribute 0x0000_0001 DataVersion: 4212858705
+          [1653564242.695038][36231:36236] CHIP:TOO:   Order: 2
       disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_RH_2_1.yaml b/src/app/tests/suites/certification/Test_TC_RH_2_1.yaml
index ddd1e3c4b2ea8a..778b46dabb4072 100644
--- a/src/app/tests/suites/certification/Test_TC_RH_2_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_RH_2_1.yaml
@@ -29,6 +29,7 @@ tests:
                 value: nodeId
 
     - label: "Reads constraints of attribute: MeasuredValue"
+      PICS: RH.S.A0000
       command: "readAttribute"
       attribute: "measured value"
       response:
@@ -38,6 +39,7 @@ tests:
               maxValue: 10000
 
     - label: "Reads constraints of attribute: MinMeasuredValue"
+      PICS: RH.S.A0001
       command: "readAttribute"
       attribute: "min measured value"
       response:
@@ -56,6 +58,7 @@ tests:
               maxValue: 10000
 
     - label: "Reads constraints of attribute: Tolerance"
+      PICS: RH.S.A0003
       optional: true
       command: "readAttribute"
       attribute: "tolerance"
diff --git a/src/app/tests/suites/certification/Test_TC_RH_2_2.yaml b/src/app/tests/suites/certification/Test_TC_RH_2_2.yaml
index 465a6705e65bde..0e73c4587852a7 100644
--- a/src/app/tests/suites/certification/Test_TC_RH_2_2.yaml
+++ b/src/app/tests/suites/certification/Test_TC_RH_2_2.yaml
@@ -29,6 +29,7 @@ tests:
                 value: nodeId
 
     - label: "Reads constraints of attribute: MinMeasuredValue"
+      PICS: RH.S.A0001
       command: "readAttribute"
       attribute: "min measured value"
       response:
@@ -50,7 +51,7 @@ tests:
     - label: "Reads MeasuredValue attribute from DUT"
       command: "readAttribute"
       attribute: "measured value"
-      PICS: A_RELATIVEHUMIDITY
+      PICS: RH.S.A0000
       response:
           saveAs: ValueBeforeChange
           constraints:
@@ -61,7 +62,7 @@ tests:
     - label: "Operate on device to change the relative humidity significantly"
       cluster: "LogCommands"
       command: "UserPrompt"
-      PICS: PICS_USER_PROMPT
+      PICS: PICS_USER_PROMPT && RH.M.ManuallyControlled
       arguments:
           values:
               - name: "message"
@@ -72,7 +73,7 @@ tests:
     - label: "Read the mandatory attribute: MeasuredValue"
       command: "readAttribute"
       attribute: "measured value"
-      PICS: A_RELATIVEHUMIDITY
+      PICS: RH.S.A0000
       response:
           constraints:
               type: uint16
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 a512ee075ed3df..9cfc684645278e 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
@@ -13,7 +13,7 @@
 # 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: 9.3.1. [TC-RH-3.1] Attributes with client as DUT
+name: 9.3.1. [TC-RH-3.1] Attributes with Client as DUT
 
 config:
     nodeId: 0x12344321
@@ -22,53 +22,222 @@ config:
 
 tests:
     - label:
-          "DUT reads all supported mandatory attributes from TH once at a time
-          in a manufacturer specific order"
+          "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:
 
-          [1646098758.912225][33190:33190] CHIP:EM: Received message of type 0x2 with protocolId (0, 1) and MessageCounter:15745149 on exchange 3055r
-          [1646098758.912345][33190:33190] CHIP:EM: Handling via exchange: 3055r, Delegate: 0xaaaace1730c8
-          [1646098758.912702][33190:33190] CHIP:IM: Received Read request
-          [1646098758.912785][33190:33190] CHIP:DMG: ReadRequestMessage =
-          [1646098758.912821][33190:33190] CHIP:DMG: {
-          [1646098758.912847][33190:33190] CHIP:DMG: 	AttributePathIBs =
-          [1646098758.912879][33190:33190] CHIP:DMG: 	[
-          [1646098758.912909][33190:33190] CHIP:DMG: 		AttributePathIB =
-          [1646098758.912949][33190:33190] CHIP:DMG: 		{
-          [1646098758.912985][33190:33190] CHIP:DMG: 			Endpoint = 0x1,
-          [1646098758.913021][33190:33190] CHIP:DMG: 			Cluster = 0x405,
-          [1646098758.913060][33190:33190] CHIP:DMG: 			Attribute = 0x0000_0000,
-          [1646098758.913099][33190:33190] CHIP:DMG: 		}
-          [1646098758.913134][33190:33190] CHIP:DMG:
-          [1646098758.913167][33190:33190] CHIP:DMG: 	],
-          [1646098758.913201][33190:33190] CHIP:DMG:
-          [1646098758.913233][33190:33190] CHIP:DMG: 	isFabricFiltered = false,
-          [1646098758.913264][33190:33190] CHIP:DMG: 	InteractionModelRevision = 1
-          [1646098758.913292][33190:33190] CHIP:DMG: },
-          [1646098758.913367][33190:33190] CHIP:DMG: IM RH moving to [GeneratingReports]
-          [1646098758.913768][33190:33190] CHIP:DMG: <RE:Run> Cluster 405, Attribute 0 is dirty
-          [1646098758.913817][33190:33190] CHIP:DMG: Reading attribute: Cluster=0x0000_0405 Endpoint=1 AttributeId=0x0000_0000 (expanded=0)
-          [1646098758.913854][33190:33190] CHIP:DMG: AccessControl: checking f=1 a=c s=0x000000000001B669 t= c=0x0000_0405 e=1 p=v
+          ./chip-tool relativehumiditymeasurement read measured-value 1 1
+
+          [1651147639.252032][2336:2336] CHIP:IM: Received Read request
+          [1651147639.252086][2336:2336] CHIP:DMG: ReadRequestMessage =
+          [1651147639.252136][2336:2336] CHIP:DMG: {
+          [1651147639.252159][2336:2336] CHIP:DMG:         AttributePathIBs =
+          [1651147639.252185][2336:2336] CHIP:DMG:         [
+          [1651147639.252209][2336:2336] CHIP:DMG:                 AttributePathIB =
+          [1651147639.252278][2336:2336] CHIP:DMG:                 {
+          [1651147639.252313][2336:2336] CHIP:DMG:                         Endpoint = 0x1,
+          [1651147639.252346][2336:2336] CHIP:DMG:                         Cluster = 0x405,
+          [1651147639.252408][2336:2336] CHIP:DMG:                         Attribute = 0x0000_0000,
+          [1651147639.252437][2336:2336] CHIP:DMG:                 }
+          [1651147639.252494][2336:2336] CHIP:DMG:
+          [1651147639.252521][2336:2336] CHIP:DMG:         ],
+          [1651147639.252576][2336:2336] CHIP:DMG:
+          [1651147639.252602][2336:2336] CHIP:DMG:         isFabricFiltered = true,
+          [1651147639.252627][2336:2336] CHIP:DMG:         InteractionModelRevision = 1
+          [1651147639.252651][2336:2336] CHIP:DMG: },
+          [1651147639.252772][2336:2336] CHIP:DMG: IM RH moving to [GeneratingReports]
+          [1651147639.252925][2336:2336] CHIP:DMG: Building Reports for ReadHandler with LastReportGeneration = 0 DirtyGeneration = 0
+
+           ./chip-tool relativehumiditymeasurement read min-measured-value 1 1
+
+          1651147834.075387][2336:2336] CHIP:IM: Received Read request
+          [1651147834.075454][2336:2336] CHIP:DMG: ReadRequestMessage =
+          [1651147834.075481][2336:2336] CHIP:DMG: {
+          [1651147834.075502][2336:2336] CHIP:DMG:         AttributePathIBs =
+          [1651147834.075528][2336:2336] CHIP:DMG:         [
+          [1651147834.075552][2336:2336] CHIP:DMG:                 AttributePathIB =
+          [1651147834.075579][2336:2336] CHIP:DMG:                 {
+          [1651147834.075625][2336:2336] CHIP:DMG:                         Endpoint = 0x1,
+          [1651147834.075662][2336:2336] CHIP:DMG:                         Cluster = 0x405,
+          [1651147834.075694][2336:2336] CHIP:DMG:                         Attribute = 0x0000_0001,
+          [1651147834.075734][2336:2336] CHIP:DMG:                 }
+          [1651147834.075763][2336:2336] CHIP:DMG:
+          [1651147834.075796][2336:2336] CHIP:DMG:         ],
+          [1651147834.075825][2336:2336] CHIP:DMG:
+          [1651147834.075863][2336:2336] CHIP:DMG:         isFabricFiltered = true,
+          [1651147834.075888][2336:2336] CHIP:DMG:         InteractionModelRevision = 1
+          [1651147834.075920][2336:2336] CHIP:DMG: },
+          [1651147834.076001][2336:2336] CHIP:DMG: IM RH moving to [GeneratingReports]
+          [1651147834.076111][2336:2336] CHIP:DMG: Building Reports for ReadHandler with LastReportGeneration = 0 DirtyGeneration = 0
+
+          ./chip-tool relativehumiditymeasurement read max-measured-value 1 1
+
+          [1651147902.966904][2336:2336] CHIP:IM: Received Read request
+          [1651147902.966980][2336:2336] CHIP:DMG: ReadRequestMessage =
+          [1651147902.967012][2336:2336] CHIP:DMG: {
+          [1651147902.967033][2336:2336] CHIP:DMG:         AttributePathIBs =
+          [1651147902.967061][2336:2336] CHIP:DMG:         [
+          [1651147902.967088][2336:2336] CHIP:DMG:                 AttributePathIB =
+          [1651147902.967177][2336:2336] CHIP:DMG:                 {
+          [1651147902.967233][2336:2336] CHIP:DMG:                         Endpoint = 0x1,
+          [1651147902.967280][2336:2336] CHIP:DMG:                         Cluster = 0x405,
+          [1651147902.967317][2336:2336] CHIP:DMG:                         Attribute = 0x0000_0002,
+          [1651147902.967360][2336:2336] CHIP:DMG:                 }
+          [1651147902.967397][2336:2336] CHIP:DMG:
+          [1651147902.967436][2336:2336] CHIP:DMG:         ],
+          [1651147902.967479][2336:2336] CHIP:DMG:
+          [1651147902.967510][2336:2336] CHIP:DMG:         isFabricFiltered = true,
+          [1651147902.967549][2336:2336] CHIP:DMG:         InteractionModelRevision = 1
+          [1651147902.967577][2336:2336] CHIP:DMG: },
+          [1651147902.967669][2336:2336] CHIP:DMG: IM RH moving to [GeneratingReports]
+          [1651147902.967790][2336:2336] CHIP:DMG: Building Reports for ReadHandler with LastReportGeneration = 0 DirtyGeneration = 0
+          [1651147902.967823][2336:2336] CHIP:DMG: <RE:Run> Cluster 405, Attribute 2 is dirty
       disabled: true
 
     - label:
-          "DUT reads all supported optional attributes from TH once at a time in
+          "DUT reads all supported optional attributes from TH one at a time in
           a manufacturer specific order"
       verification: |
-          see above
+          ./chip-tool relativehumiditymeasurement read tolerance 1 1
+
+
+          [1651148035.585189][2336:2336] CHIP:IM: Received Read request
+          [1651148035.585247][2336:2336] CHIP:DMG: ReadRequestMessage =
+          [1651148035.585276][2336:2336] CHIP:DMG: {
+          [1651148035.585301][2336:2336] CHIP:DMG:         AttributePathIBs =
+          [1651148035.585330][2336:2336] CHIP:DMG:         [
+          [1651148035.585358][2336:2336] CHIP:DMG:                 AttributePathIB =
+          [1651148035.585396][2336:2336] CHIP:DMG:                 {
+          [1651148035.585431][2336:2336] CHIP:DMG:                         Endpoint = 0x1,
+          [1651148035.585470][2336:2336] CHIP:DMG:                         Cluster = 0x405,
+          [1651148035.585507][2336:2336] CHIP:DMG:                         Attribute = 0x0000_0003,
+          [1651148035.585541][2336:2336] CHIP:DMG:                 }
+          [1651148035.585577][2336:2336] CHIP:DMG:
+          [1651148035.585610][2336:2336] CHIP:DMG:         ],
+          [1651148035.585642][2336:2336] CHIP:DMG:
+          [1651148035.585672][2336:2336] CHIP:DMG:         isFabricFiltered = true,
+          [1651148035.585701][2336:2336] CHIP:DMG:         InteractionModelRevision = 1
+          [1651148035.585727][2336:2336] CHIP:DMG: },
+          [1651148035.585807][2336:2336] CHIP:DMG: IM RH moving to [GeneratingReports]
+          [1651148035.585899][2336:2336] CHIP:DMG: Building Reports for ReadHandler with LastReportGeneration = 0 DirtyGeneration = 0
       disabled: true
 
     - label:
           "DUT writes a suitable value to all supported mandatory attributes on
-          the TH once at a time in a manufacturer specific order"
+          the TH one at a time in a manufacturer specific order"
       verification: |
           no writable attributes
       disabled: true
 
     - label:
           "DUT writes a suitable value to all supported optional attributes on
-          the TH once at a time in a manufacturer specific order"
+          the TH one at a time in a manufacturer specific order"
+      verification: |
+          no writable attributes
+      disabled: true
+
+    - label:
+          "Configure TH such that it implements mandatory and none of the
+          optional attributes of the server-side of the cluster, and that it
+          also reflects this in global attributes such as FeatureMap and
+          AttributeList. Commission DUT to TH again"
+      verification: |
+          ./chip-tool relativehumiditymeasurement read attribute-list  1 1
+
+          [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
+
+
+          "On TestHarnes (all-cluster-app) a received read of MeasuredValue (id 0) looks like this:
+
+          ./chip-tool relativehumiditymeasurement read measured-value 1 1
+
+          [1651147639.252032][2336:2336] CHIP:IM: Received Read request
+          [1651147639.252086][2336:2336] CHIP:DMG: ReadRequestMessage =
+          [1651147639.252136][2336:2336] CHIP:DMG: {
+          [1651147639.252159][2336:2336] CHIP:DMG:         AttributePathIBs =
+          [1651147639.252185][2336:2336] CHIP:DMG:         [
+          [1651147639.252209][2336:2336] CHIP:DMG:                 AttributePathIB =
+          [1651147639.252278][2336:2336] CHIP:DMG:                 {
+          [1651147639.252313][2336:2336] CHIP:DMG:                         Endpoint = 0x1,
+          [1651147639.252346][2336:2336] CHIP:DMG:                         Cluster = 0x405,
+          [1651147639.252408][2336:2336] CHIP:DMG:                         Attribute = 0x0000_0000,
+          [1651147639.252437][2336:2336] CHIP:DMG:                 }
+          [1651147639.252494][2336:2336] CHIP:DMG:
+          [1651147639.252521][2336:2336] CHIP:DMG:         ],
+          [1651147639.252576][2336:2336] CHIP:DMG:
+          [1651147639.252602][2336:2336] CHIP:DMG:         isFabricFiltered = true,
+          [1651147639.252627][2336:2336] CHIP:DMG:         InteractionModelRevision = 1
+          [1651147639.252651][2336:2336] CHIP:DMG: },
+          [1651147639.252772][2336:2336] CHIP:DMG: IM RH moving to [GeneratingReports]
+          [1651147639.252925][2336:2336] CHIP:DMG: Building Reports for ReadHandler with LastReportGeneration = 0 DirtyGeneration = 0
+
+           ./chip-tool relativehumiditymeasurement read min-measured-value 1 1
+
+          1651147834.075387][2336:2336] CHIP:IM: Received Read request
+          [1651147834.075454][2336:2336] CHIP:DMG: ReadRequestMessage =
+          [1651147834.075481][2336:2336] CHIP:DMG: {
+          [1651147834.075502][2336:2336] CHIP:DMG:         AttributePathIBs =
+          [1651147834.075528][2336:2336] CHIP:DMG:         [
+          [1651147834.075552][2336:2336] CHIP:DMG:                 AttributePathIB =
+          [1651147834.075579][2336:2336] CHIP:DMG:                 {
+          [1651147834.075625][2336:2336] CHIP:DMG:                         Endpoint = 0x1,
+          [1651147834.075662][2336:2336] CHIP:DMG:                         Cluster = 0x405,
+          [1651147834.075694][2336:2336] CHIP:DMG:                         Attribute = 0x0000_0001,
+          [1651147834.075734][2336:2336] CHIP:DMG:                 }
+          [1651147834.075763][2336:2336] CHIP:DMG:
+          [1651147834.075796][2336:2336] CHIP:DMG:         ],
+          [1651147834.075825][2336:2336] CHIP:DMG:
+          [1651147834.075863][2336:2336] CHIP:DMG:         isFabricFiltered = true,
+          [1651147834.075888][2336:2336] CHIP:DMG:         InteractionModelRevision = 1
+          [1651147834.075920][2336:2336] CHIP:DMG: },
+          [1651147834.076001][2336:2336] CHIP:DMG: IM RH moving to [GeneratingReports]
+          [1651147834.076111][2336:2336] CHIP:DMG: Building Reports for ReadHandler with LastReportGeneration = 0 DirtyGeneration = 0
+
+          ./chip-tool relativehumiditymeasurement read max-measured-value 1 1
+
+          [1651147902.966904][2336:2336] CHIP:IM: Received Read request
+          [1651147902.966980][2336:2336] CHIP:DMG: ReadRequestMessage =
+          [1651147902.967012][2336:2336] CHIP:DMG: {
+          [1651147902.967033][2336:2336] CHIP:DMG:         AttributePathIBs =
+          [1651147902.967061][2336:2336] CHIP:DMG:         [
+          [1651147902.967088][2336:2336] CHIP:DMG:                 AttributePathIB =
+          [1651147902.967177][2336:2336] CHIP:DMG:                 {
+          [1651147902.967233][2336:2336] CHIP:DMG:                         Endpoint = 0x1,
+          [1651147902.967280][2336:2336] CHIP:DMG:                         Cluster = 0x405,
+          [1651147902.967317][2336:2336] CHIP:DMG:                         Attribute = 0x0000_0002,
+          [1651147902.967360][2336:2336] CHIP:DMG:                 }
+          [1651147902.967397][2336:2336] CHIP:DMG:
+          [1651147902.967436][2336:2336] CHIP:DMG:         ],
+          [1651147902.967479][2336:2336] CHIP:DMG:
+          [1651147902.967510][2336:2336] CHIP:DMG:         isFabricFiltered = true,
+          [1651147902.967549][2336:2336] CHIP:DMG:         InteractionModelRevision = 1
+          [1651147902.967577][2336:2336] CHIP:DMG: },
+          [1651147902.967669][2336:2336] CHIP:DMG: IM RH moving to [GeneratingReports]
+          [1651147902.967790][2336:2336] CHIP:DMG: Building Reports for ReadHandler with LastReportGeneration = 0 DirtyGeneration = 0
+          [1651147902.967823][2336:2336] CHIP:DMG: <RE:Run> Cluster 405, Attribute 2 is dirty"
+      disabled: true
+
+    - label:
+          "DUT reads all supported optional attributes from TH one at a time in
+          a manufacturer specific order"
+      verification: |
+          ./chip-tool relativehumiditymeasurement read tolerance 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: |
           no writable attributes
       disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_TM_2_1.yaml b/src/app/tests/suites/certification/Test_TC_TM_2_1.yaml
index 0505319f0e37ff..959a46e19b8c22 100644
--- a/src/app/tests/suites/certification/Test_TC_TM_2_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_TM_2_1.yaml
@@ -29,6 +29,7 @@ tests:
                 value: nodeId
 
     - label: "read the mandatory attribute: MeasuredValue"
+      PICS: TM.S.A0000
       command: "readAttribute"
       attribute: "MeasuredValue"
       response:
@@ -36,6 +37,7 @@ tests:
               type: int16
 
     - label: "read the mandatory attribute: MinMeasuredValue"
+      PICS: TM.S.A0001
       command: "readAttribute"
       attribute: "MinMeasuredValue"
       response:
@@ -45,6 +47,7 @@ tests:
               maxValue: 32766
 
     - label: "read the mandatory attribute: MaxMeasuredValue"
+      PICS: TM.S.A0002
       command: "readAttribute"
       attribute: "MaxMeasuredValue"
       response:
@@ -54,6 +57,7 @@ tests:
               maxValue: 32767
 
     - label: "read the optional attribute: Tolerance"
+      PICS: TM.S.A0003
       optional: true
       command: "readAttribute"
       attribute: "Tolerance"
diff --git a/src/app/tests/suites/certification/Test_TC_TM_2_2.yaml b/src/app/tests/suites/certification/Test_TC_TM_2_2.yaml
index 6e8aa869bd3b7d..2599501dfa862e 100644
--- a/src/app/tests/suites/certification/Test_TC_TM_2_2.yaml
+++ b/src/app/tests/suites/certification/Test_TC_TM_2_2.yaml
@@ -29,6 +29,7 @@ tests:
                 value: nodeId
 
     - label: "read the mandatory attribute: MinMeasuredValue"
+      PICS: TM.S.A0001
       command: "readAttribute"
       attribute: "MinMeasuredValue"
       response:
@@ -38,6 +39,7 @@ tests:
               maxValue: 32766
 
     - label: "read the mandatory attribute: MaxMeasuredValue"
+      PICS: TM.S.A0002
       command: "readAttribute"
       attribute: "MaxMeasuredValue"
       response:
@@ -47,9 +49,9 @@ tests:
               maxValue: 32767
 
     - label: "Reads MeasuredValue attribute from DUT"
+      PICS: TM.S.A0000
       command: "readAttribute"
       attribute: "MeasuredValue"
-      PICS: A_TEMPERATURE
       response:
           saveAs: valueBeforeChange
           constraints:
@@ -58,7 +60,7 @@ tests:
     - label: "Operate on device to change the temperature significantly"
       cluster: "LogCommands"
       command: "UserPrompt"
-      PICS: PICS_USER_PROMPT
+      PICS: PICS_USER_PROMPT && TM.M.ManuallyControlled
       arguments:
           values:
               - name: "message"
@@ -69,7 +71,7 @@ tests:
     - label: "Read the mandatory attribute: MeasuredValue"
       command: "readAttribute"
       attribute: "MeasuredValue"
-      PICS: A_TEMPERATURE
+      PICS: TM.S.A0000
       response:
           constraints:
               type: uint16
diff --git a/src/app/tests/suites/certification/Test_TC_TM_3_1.yaml b/src/app/tests/suites/certification/Test_TC_TM_3_1.yaml
index 3dfdd6426a7270..e4a359bf22b7fd 100644
--- a/src/app/tests/suites/certification/Test_TC_TM_3_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_TM_3_1.yaml
@@ -22,59 +22,192 @@ config:
 
 tests:
     - label:
-          "DUT reads all supported mandatory attributes from TH once at a time
-          in a manufacturer specific order"
+          "DUT reads all supported mandatory attributes from TH one at a time in
+          a manufacturer specific order"
       verification: |
-          chip-tool temperaturemeasurement read measured-value 12345 1
+          ./chip-tool temperaturemeasurement read measured-value 12345 1
 
           verify that you see something like this:
 
-          [1643288740.653361][12907:12912] CHIP:DMG:  }
-          [1643288740.653441][12907:12912] CHIP:DMG:
-          [1643288740.653497][12907:12912] CHIP:DMG:  Data = 2420,
-          [1643288740.653546][12907:12912] CHIP:DMG:  },
-          chip-tool temperaturemeasurement read min-measured-value 12345 1
+           ./chip-tool temperaturemeasurement read measured-value 1 1
+          1650880412.037722][15013:15013] CHIP:DMG: ReadRequestMessage =
+          [1650880412.037749][15013:15013] CHIP:DMG: {
+          [1650880412.037772][15013:15013] CHIP:DMG:         AttributePathIBs =
+          [1650880412.037799][15013:15013] CHIP:DMG:         [
+          [1650880412.037823][15013:15013] CHIP:DMG:                 AttributePathIB =
+          [1650880412.037876][15013:15013] CHIP:DMG:                 {
+          [1650880412.037908][15013:15013] CHIP:DMG:                         Endpoint = 0x1,
+          [1650880412.037938][15013:15013] CHIP:DMG:                         Cluster = 0x402,
+          [1650880412.037984][15013:15013] CHIP:DMG:                         Attribute = 0x0000_0000,
+          [1650880412.038023][15013:15013] CHIP:DMG:                 }
+          [1650880412.038055][15013:15013] CHIP:DMG:
+          [1650880412.038081][15013:15013] CHIP:DMG:         ],
+          [1650880412.038110][15013:15013] CHIP:DMG:
+          [1650880412.038137][15013:15013] CHIP:DMG:         isFabricFiltered = true,
+          [1650880412.038162][15013:15013] CHIP:DMG:         InteractionModelRevision = 1
+          [1650880412.038186][15013:15013] CHIP:DMG: },
+          [1650880412.038259][15013:15013] CHIP:DMG: IM RH moving to [Generatin
 
-          verify that you see something like this:
 
-          [1643288902.528399][12918:12923] CHIP:DMG:  }
-          [1643288902.528491][12918:12923] CHIP:DMG:
-          [1643288902.528577][12918:12923] CHIP:DMG:  Data = -4000,
-          [1643288902.528663][12918:12923] CHIP:DMG:  },
-          chip-tool temperaturemeasurement read max-measured-value 12345 1
+          ./chip-tool temperaturemeasurement read max-measured-value 1 1
+          [1650880462.518114][15013:15013] CHIP:DMG: ReadRequestMessage =
+          [1650880462.518149][15013:15013] CHIP:DMG: {
+          [1650880462.518176][15013:15013] CHIP:DMG:         AttributePathIBs =
+          [1650880462.518209][15013:15013] CHIP:DMG:         [
+          [1650880462.518239][15013:15013] CHIP:DMG:                 AttributePathIB =
+          [1650880462.518283][15013:15013] CHIP:DMG:                 {
+          [1650880462.518321][15013:15013] CHIP:DMG:                         Endpoint = 0x1,
+          [1650880462.518365][15013:15013] CHIP:DMG:                         Cluster = 0x402,
+          [1650880462.518405][15013:15013] CHIP:DMG:                         Attribute = 0x0000_0002,
+          [1650880462.518446][15013:15013] CHIP:DMG:                 }
+          [1650880462.518483][15013:15013] CHIP:DMG:
+          [1650880462.518557][15013:15013] CHIP:DMG:         ],
+          [1650880462.518596][15013:15013] CHIP:DMG:
+          [1650880462.518630][15013:15013] CHIP:DMG:         isFabricFiltered = true,
+          [1650880462.518662][15013:15013] CHIP:DMG:         InteractionModelRevision = 1
+          [1650880462.518690][15013:15013] CHIP:DMG: },
 
-          verify that you see something like this:
 
-          [1643289012.569725][12931:12936] CHIP:DMG:  }
-          [1643289012.569805][12931:12936] CHIP:DMG:
-          [1643289012.569883][12931:12936] CHIP:DMG:  Data = 8500,
-          [1643289012.569957][12931:12936] CHIP:DMG:  },
+          ./chip-tool temperaturemeasurement read min-measured-value 1 1
+
+          [1650880507.409653][15013:15013] CHIP:DMG: ReadRequestMessage =
+          [1650880507.409703][15013:15013] CHIP:DMG: {
+          [1650880507.409727][15013:15013] CHIP:DMG:         AttributePathIBs =
+          [1650880507.409753][15013:15013] CHIP:DMG:         [
+          [1650880507.409778][15013:15013] CHIP:DMG:                 AttributePathIB =
+          [1650880507.409809][15013:15013] CHIP:DMG:                 {
+          [1650880507.409839][15013:15013] CHIP:DMG:                         Endpoint = 0x1,
+          [1650880507.409874][15013:15013] CHIP:DMG:                         Cluster = 0x402,
+          [1650880507.409907][15013:15013] CHIP:DMG:                         Attribute = 0x0000_0001,
+          [1650880507.409936][15013:15013] CHIP:DMG:                 }
+          [1650880507.409966][15013:15013] CHIP:DMG:
+          [1650880507.409992][15013:15013] CHIP:DMG:         ],
+          [1650880507.410021][15013:15013] CHIP:DMG:
+          [1650880507.410048][15013:15013] CHIP:DMG:         isFabricFiltered = true,
+          [1650880507.410073][15013:15013] CHIP:DMG:         InteractionModelRevision = 1
+          [1650880507.410097][15013:15013] CHIP:DMG: },
       disabled: true
 
     - label:
-          "DUT reads all supported optional attributes from TH once at a time in
+          "DUT reads all supported optional attributes from TH one at a time in
           a manufacturer specific order"
       verification: |
-          chip-tool temperaturemeasurement read max-measured-value 12345 1
+          ./chip-tool temperaturemeasurement read tolerance  1 1
+
+          [1650880329.471153][2598:2603] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0402 Attribute 0x0000_0003 DataVersion: 2108803513
+          [1650880329.471243][2598:2603] CHIP:TOO:   Tolerance: 0
+      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: |
+          There is no writable mandatory attibute for this cluster
+      disabled: true
+
+    - label:
+          "DUT writes a suitable value to all supported optional attributes on
+          the TH one at a time in a manufacturer specific order"
+      verification: |
+          There is no writable mandatory attibute for this cluster
+      disabled: true
+
+    - label:
+          "Configure TH such that it implements mandatory and none of the
+          optional attributes of the server-side of the cluster, and that it
+          also reflects this in global attributes such as FeatureMap and
+          AttributeList. Commission DUT to TH again"
+      verification: |
+          To verify all below steps use all-clusters-minimal-app
+
+           ./chip-tool temperaturemeasurement read attribute-list  1 1
+          [1654246677976] [91729:4008220] CHIP: [TOO] Endpoint: 1 Cluster: 0x0000_0402 Attribute 0x0000_FFFB DataVersion: 1141330314
+          [1654246677977] [91729:4008220] CHIP: [TOO]   AttributeList: 8 entries
+          [1654246677977] [91729:4008220] CHIP: [TOO]     [1]: 0
+          [1654246677977] [91729:4008220] CHIP: [TOO]     [2]: 1
+          [1654246677977] [91729:4008220] CHIP: [TOO]     [3]: 2
+          [1654246677977] [91729:4008220] CHIP: [TOO]     [4]: 65528
+          [1654246677977] [91729:4008220] CHIP: [TOO]     [5]: 65529
+          [1654246677977] [91729:4008220] CHIP: [TOO]     [6]: 65531
+          [1654246677977] [91729:4008220] CHIP: [TOO]     [7]: 65532
+          [1654246677977] [91729:4008220] CHIP: [TOO]     [8]: 65533
+
+
+          "./chip-tool temperaturemeasurement read measured-value 12345 1
 
           verify that you see something like this:
 
-          [1643289012.569725][12931:12936] CHIP:DMG:  }
-          [1643289012.569805][12931:12936] CHIP:DMG:
-          [1643289012.569883][12931:12936] CHIP:DMG:  Data = 120,
-          [1643289012.569957][12931:12936] CHIP:DMG:  },
+           ./chip-tool temperaturemeasurement read measured-value 1 1
+          1650880412.037722][15013:15013] CHIP:DMG: ReadRequestMessage =
+          [1650880412.037749][15013:15013] CHIP:DMG: {
+          [1650880412.037772][15013:15013] CHIP:DMG:         AttributePathIBs =
+          [1650880412.037799][15013:15013] CHIP:DMG:         [
+          [1650880412.037823][15013:15013] CHIP:DMG:                 AttributePathIB =
+          [1650880412.037876][15013:15013] CHIP:DMG:                 {
+          [1650880412.037908][15013:15013] CHIP:DMG:                         Endpoint = 0x1,
+          [1650880412.037938][15013:15013] CHIP:DMG:                         Cluster = 0x402,
+          [1650880412.037984][15013:15013] CHIP:DMG:                         Attribute = 0x0000_0000,
+          [1650880412.038023][15013:15013] CHIP:DMG:                 }
+          [1650880412.038055][15013:15013] CHIP:DMG:
+          [1650880412.038081][15013:15013] CHIP:DMG:         ],
+          [1650880412.038110][15013:15013] CHIP:DMG:
+          [1650880412.038137][15013:15013] CHIP:DMG:         isFabricFiltered = true,
+          [1650880412.038162][15013:15013] CHIP:DMG:         InteractionModelRevision = 1
+          [1650880412.038186][15013:15013] CHIP:DMG: },
+          [1650880412.038259][15013:15013] CHIP:DMG: IM RH moving to [Generatin
+
+
+          ./chip-tool temperaturemeasurement read max-measured-value 1 1
+          [1650880462.518114][15013:15013] CHIP:DMG: ReadRequestMessage =
+          [1650880462.518149][15013:15013] CHIP:DMG: {
+          [1650880462.518176][15013:15013] CHIP:DMG:         AttributePathIBs =
+          [1650880462.518209][15013:15013] CHIP:DMG:         [
+          [1650880462.518239][15013:15013] CHIP:DMG:                 AttributePathIB =
+          [1650880462.518283][15013:15013] CHIP:DMG:                 {
+          [1650880462.518321][15013:15013] CHIP:DMG:                         Endpoint = 0x1,
+          [1650880462.518365][15013:15013] CHIP:DMG:                         Cluster = 0x402,
+          [1650880462.518405][15013:15013] CHIP:DMG:                         Attribute = 0x0000_0002,
+          [1650880462.518446][15013:15013] CHIP:DMG:                 }
+          [1650880462.518483][15013:15013] CHIP:DMG:
+          [1650880462.518557][15013:15013] CHIP:DMG:         ],
+          [1650880462.518596][15013:15013] CHIP:DMG:
+          [1650880462.518630][15013:15013] CHIP:DMG:         isFabricFiltered = true,
+          [1650880462.518662][15013:15013] CHIP:DMG:         InteractionModelRevision = 1
+          [1650880462.518690][15013:15013] CHIP:DMG: },
+
+
+          ./chip-tool temperaturemeasurement read min-measured-value 1 1
+
+          [1650880507.409653][15013:15013] CHIP:DMG: ReadRequestMessage =
+          [1650880507.409703][15013:15013] CHIP:DMG: {
+          [1650880507.409727][15013:15013] CHIP:DMG:         AttributePathIBs =
+          [1650880507.409753][15013:15013] CHIP:DMG:         [
+          [1650880507.409778][15013:15013] CHIP:DMG:                 AttributePathIB =
+          [1650880507.409809][15013:15013] CHIP:DMG:                 {
+          [1650880507.409839][15013:15013] CHIP:DMG:                         Endpoint = 0x1,
+          [1650880507.409874][15013:15013] CHIP:DMG:                         Cluster = 0x402,
+          [1650880507.409907][15013:15013] CHIP:DMG:                         Attribute = 0x0000_0001,
+          [1650880507.409936][15013:15013] CHIP:DMG:                 }
+          [1650880507.409966][15013:15013] CHIP:DMG:
+          [1650880507.409992][15013:15013] CHIP:DMG:         ],
+          [1650880507.410021][15013:15013] CHIP:DMG:
+          [1650880507.410048][15013:15013] CHIP:DMG:         isFabricFiltered = true,
+          [1650880507.410073][15013:15013] CHIP:DMG:         InteractionModelRevision = 1
+          [1650880507.410097][15013:15013] CHIP:DMG: },"
       disabled: true
 
     - label:
-          "DUT writes a suitable value to all supported mandatory attributes on
-          the TH once at a time in a manufacturer specific order"
+          "DUT reads all supported optional attributes from TH one at a time in
+          a manufacturer specific order"
       verification: |
-          no writable attributes
+          ./chip-tool temperaturemeasurement read tolerance 1 1
+
+           General error: 0x86 (UNSUPPORTED_ATTRIBUTE)
       disabled: true
 
     - label:
           "DUT writes a suitable value to all supported optional attributes on
-          the TH once at a time in a manufacturer specific order"
+          the TH one at a time in a manufacturer specific order"
       verification: |
-          no writable attributes
+          There is no writable mandatory attibute for this cluster
       disabled: true
diff --git a/src/app/tests/suites/certification/ci-pics-values b/src/app/tests/suites/certification/ci-pics-values
index 551c949375d95d..85d9a56a4fc5d5 100644
--- a/src/app/tests/suites/certification/ci-pics-values
+++ b/src/app/tests/suites/certification/ci-pics-values
@@ -12,13 +12,21 @@ MANUAL_OPERATE=1
 MANUAL_OUTOFSERVICE=1
 MANUAL_ALARM=1
 MANUAL_FAULT=1
-A_RELATIVEHUMIDITY=1
-A_RELATIVEHUMIDITY_MIN=1
-A_RELATIVEHUMIDITY_MAX=1
-A_RELATIVEHUMIDITY_TOLERANCE=1
-MANUAL_RELATIVEHUMIDITY_CHANGE=1
-A_TEMPERATURE=1
-MANUAL_TEMPERATURE_CHANGE=1
+
+# Relative Humidity cluster
+RH.S.A0000=1
+RH.S.A0001=1
+RH.S.A0002=1
+RH.S.A0003=1
+RH.M.ManuallyControlled=1
+
+# Thermostat User Configuration cluster
+TM.S.A0000=1
+TM.S.A0001=1
+TM.S.A0002=1
+TM.S.A0003=1
+TM.M.ManuallyControlled=1
+
 DGSW.S.E00=1
 DGSW.S.A0001=1
 DGSW.S.A0002=1
@@ -33,15 +41,6 @@ A_MINCOOLSETPOINTLIMIT=1
 A_MAXCOOLSETPOINTLIMIT=1
 A_CONTROLSEQUENCEOFOPERATION=1
 CR_SetpointRaiseLower=1
-A_ONOFF=1
-A_GLOBALSCENECONTROL=1
-A_ONTIME=1
-A_OFFWAITTIME=1
-CR_OFF=1
-CR_ON=1
-CR_OFFWITHEFFECT=1
-CR_ONWITHRECALL=1
-CR_ONWITHTIMEOFF=1
 VENDOR_SUBTYPE=1
 DEVTYPE_SUBTYPE=1
 CRI_COMM_DISCOVERY_KEY=1
@@ -774,3 +773,61 @@ DGWIFI.S.E00=1
 DGWIFI.S.E01=1
 DGWIFI.S.E02=1
 DGWIFI.S.C00=1
+#On/Off Cluster
+OO.S.A0000=1
+OO.S.A4000=1
+OO.S.A4001=1
+OO.S.A4002=1
+OO.S.A4003=1
+OO.S.C00.Rsp=1
+OO.S.C01.Rsp=1
+OO.S.C02.Rsp=1
+OO.S.C40.Rsp=1
+OO.S.C41.Rsp=1
+OO.S.C42.Rsp=1
+OO.M.ManuallyControlled=1
+OO.C.C00.Tx=1
+OO.C.C01.Tx=1
+OO.C.C02.Tx=1
+OO.C.C40.Tx=1
+OO.C.C41.Tx=1
+OO.C.C42.Tx=1
+
+#Actions Cluster
+ACT.S.A0000=1
+ACT.S.A0001=1
+ACT.S.A0002=1
+ACT.S.M.FillActionList=1
+ACT.S.M.FillEndpointLists=1
+ACT.C.C00.Tx=0
+ACT.C.C01.Tx=0
+ACT.C.C02.Tx=0
+ACT.C.C03.Tx=0
+ACT.C.C04.Tx=0
+ACT.C.C05.Tx=0
+ACT.C.C06.Tx=0
+ACT.C.C07.Tx=0
+ACT.C.C08.Tx=0
+ACT.C.C09.Tx=0
+ACT.C.C0a.Tx=0
+ACT.C.C0b.Tx=0
+
+#Boolean State Cluster
+BOOL.S.A0000=1
+BOOL.M.ManuallyControlled=1
+BOOL.S.E00=1
+
+#Diagnostics Logs Cluster
+DLOG.S.C00.Rsp=1
+DLOG.S.C01.Tx=1
+DLOG.C.C01.Rsp=1
+DLOG.C.C00.Tx=1
+
+#Localization Configuration Cluster
+LCFG.S.A0000=1
+LCFG.S.A0001=1
+LCFG.C.A0000=1
+LCFG.C.A0001=1
+
+#Power Source Configuration Cluster
+PSCFG.S.A0000=1
diff --git a/src/app/tests/suites/tests.js b/src/app/tests/suites/tests.js
index 43864778419602..5e7b8c085ed49c 100644
--- a/src/app/tests/suites/tests.js
+++ b/src/app/tests/suites/tests.js
@@ -99,6 +99,7 @@ function getManualTests() {
         "Test_TC_DA_1_4",
         "Test_TC_DA_1_5",
         "Test_TC_DA_1_6",
+        "Test_TC_DA_1_7",
     ];
 
     const DeviceManagement = [
@@ -393,7 +394,12 @@ function getManualTests() {
         "Test_TC_DIAG_TH_NW_3_5",
     ];
 
-    const Actions = ["Test_TC_ACT_2_1", "Test_TC_ACT_2_2", "Test_TC_ACT_3_1"];
+    const Actions = [
+        "Test_TC_ACT_2_1",
+        "Test_TC_ACT_2_2",
+        "Test_TC_ACT_3_1",
+        "Test_TC_ACT_3_2",
+    ];
 
     const TimeFormatLocalization = [
         "Test_TC_TFL_1_1",
diff --git a/zzz_generated/chip-tool/zap-generated/test/Commands.h b/zzz_generated/chip-tool/zap-generated/test/Commands.h
index 2b4e10e74d4783..b55a52630c9f1a 100644
--- a/zzz_generated/chip-tool/zap-generated/test/Commands.h
+++ b/zzz_generated/chip-tool/zap-generated/test/Commands.h
@@ -298,6 +298,7 @@ class ManualTestList : public Command
         printf("Test_TC_DA_1_4\n");
         printf("Test_TC_DA_1_5\n");
         printf("Test_TC_DA_1_6\n");
+        printf("Test_TC_DA_1_7\n");
         printf("Test_TC_BINFO_1_1\n");
         printf("Test_TC_OPCREDS_1_2\n");
         printf("Test_TC_CNET_1_3\n");
@@ -528,6 +529,7 @@ class ManualTestList : public Command
         printf("Test_TC_ACT_2_1\n");
         printf("Test_TC_ACT_2_2\n");
         printf("Test_TC_ACT_3_1\n");
+        printf("Test_TC_ACT_3_2\n");
         printf("Test_TC_TFL_1_1\n");
         printf("Test_TC_TFL_1_2\n");
         printf("Test_TC_TFL_2_1\n");
@@ -2090,6 +2092,7 @@ class Test_TC_BOOL_2_1Suite : public TestCommand
         }
         case 1: {
             LogStep(1, "Read mandatory non-global attribute: StateValue");
+            VerifyOrDo(!ShouldSkip("BOOL.S.A0000"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), BooleanState::Id, BooleanState::Attributes::StateValue::Id, true,
                                  chip::NullOptional);
         }
@@ -22192,25 +22195,30 @@ class Test_TC_OO_2_1Suite : public TestCommand
         }
         case 1: {
             LogStep(1, "read the mandatory attribute: OnOff");
+            VerifyOrDo(!ShouldSkip("OO.S.A0000"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), OnOff::Id, OnOff::Attributes::OnOff::Id, true, chip::NullOptional);
         }
         case 2: {
             LogStep(2, "read LT attribute: GlobalSceneControl");
+            VerifyOrDo(!ShouldSkip("OO.S.A4000"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), OnOff::Id, OnOff::Attributes::GlobalSceneControl::Id, true,
                                  chip::NullOptional);
         }
         case 3: {
             LogStep(3, "read LT attribute: OnTime");
+            VerifyOrDo(!ShouldSkip("OO.S.A4001"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), OnOff::Id, OnOff::Attributes::OnTime::Id, true,
                                  chip::NullOptional);
         }
         case 4: {
             LogStep(4, "read LT attribute: OffWaitTime");
+            VerifyOrDo(!ShouldSkip("OO.S.A4002"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), OnOff::Id, OnOff::Attributes::OffWaitTime::Id, true,
                                  chip::NullOptional);
         }
         case 5: {
             LogStep(5, "read LT attribute: StartUpOnOff");
+            VerifyOrDo(!ShouldSkip("OO.S.A4003"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), OnOff::Id, OnOff::Attributes::StartUpOnOff::Id, true,
                                  chip::NullOptional);
         }
@@ -22403,6 +22411,7 @@ class Test_TC_OO_2_2Suite : public TestCommand
         }
         case 1: {
             LogStep(1, "Send Off Command");
+            VerifyOrDo(!ShouldSkip("OO.S.C00.Rsp"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             chip::app::Clusters::OnOff::Commands::Off::Type value;
             return SendCommand(kIdentityAlpha, GetEndpoint(1), OnOff::Id, OnOff::Commands::Off::Id, value, chip::NullOptional
@@ -22411,10 +22420,12 @@ class Test_TC_OO_2_2Suite : public TestCommand
         }
         case 2: {
             LogStep(2, "Check on/off attribute value is false after off command");
+            VerifyOrDo(!ShouldSkip("OO.S.A0000"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), OnOff::Id, OnOff::Attributes::OnOff::Id, true, chip::NullOptional);
         }
         case 3: {
             LogStep(3, "Send On Command");
+            VerifyOrDo(!ShouldSkip("OO.S.C01.Rsp"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             chip::app::Clusters::OnOff::Commands::On::Type value;
             return SendCommand(kIdentityAlpha, GetEndpoint(1), OnOff::Id, OnOff::Commands::On::Id, value, chip::NullOptional
@@ -22423,10 +22434,12 @@ class Test_TC_OO_2_2Suite : public TestCommand
         }
         case 4: {
             LogStep(4, "Check on/off attribute value is true after on command");
+            VerifyOrDo(!ShouldSkip("OO.S.A0000"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), OnOff::Id, OnOff::Attributes::OnOff::Id, true, chip::NullOptional);
         }
         case 5: {
             LogStep(5, "Send On Command");
+            VerifyOrDo(!ShouldSkip("OO.S.C01.Rsp"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             chip::app::Clusters::OnOff::Commands::On::Type value;
             return SendCommand(kIdentityAlpha, GetEndpoint(1), OnOff::Id, OnOff::Commands::On::Id, value, chip::NullOptional
@@ -22435,10 +22448,12 @@ class Test_TC_OO_2_2Suite : public TestCommand
         }
         case 6: {
             LogStep(6, "Check on/off attribute value is true after on command");
+            VerifyOrDo(!ShouldSkip("OO.S.A0000"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), OnOff::Id, OnOff::Attributes::OnOff::Id, true, chip::NullOptional);
         }
         case 7: {
             LogStep(7, "Send Off Command");
+            VerifyOrDo(!ShouldSkip("OO.S.C00.Rsp"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             chip::app::Clusters::OnOff::Commands::Off::Type value;
             return SendCommand(kIdentityAlpha, GetEndpoint(1), OnOff::Id, OnOff::Commands::Off::Id, value, chip::NullOptional
@@ -22447,10 +22462,12 @@ class Test_TC_OO_2_2Suite : public TestCommand
         }
         case 8: {
             LogStep(8, "Check on/off attribute value is false after off command");
+            VerifyOrDo(!ShouldSkip("OO.S.A0000"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), OnOff::Id, OnOff::Attributes::OnOff::Id, true, chip::NullOptional);
         }
         case 9: {
             LogStep(9, "Send Off Command");
+            VerifyOrDo(!ShouldSkip("OO.S.C00.Rsp"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             chip::app::Clusters::OnOff::Commands::Off::Type value;
             return SendCommand(kIdentityAlpha, GetEndpoint(1), OnOff::Id, OnOff::Commands::Off::Id, value, chip::NullOptional
@@ -22459,10 +22476,12 @@ class Test_TC_OO_2_2Suite : public TestCommand
         }
         case 10: {
             LogStep(10, "Check on/off attribute value is false after off command");
+            VerifyOrDo(!ShouldSkip("OO.S.A0000"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), OnOff::Id, OnOff::Attributes::OnOff::Id, true, chip::NullOptional);
         }
         case 11: {
             LogStep(11, "Send Toggle Command");
+            VerifyOrDo(!ShouldSkip("OO.S.C02.Rsp"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             chip::app::Clusters::OnOff::Commands::Toggle::Type value;
             return SendCommand(kIdentityAlpha, GetEndpoint(1), OnOff::Id, OnOff::Commands::Toggle::Id, value, chip::NullOptional
@@ -22478,10 +22497,12 @@ class Test_TC_OO_2_2Suite : public TestCommand
         }
         case 13: {
             LogStep(13, "Check on/off attribute value is true after toggle command");
+            VerifyOrDo(!ShouldSkip("OO.S.A0000"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), OnOff::Id, OnOff::Attributes::OnOff::Id, true, chip::NullOptional);
         }
         case 14: {
             LogStep(14, "Send Toggle Command");
+            VerifyOrDo(!ShouldSkip("OO.S.C02.Rsp"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             chip::app::Clusters::OnOff::Commands::Toggle::Type value;
             return SendCommand(kIdentityAlpha, GetEndpoint(1), OnOff::Id, OnOff::Commands::Toggle::Id, value, chip::NullOptional
@@ -22497,11 +22518,12 @@ class Test_TC_OO_2_2Suite : public TestCommand
         }
         case 16: {
             LogStep(16, "Check on/off attribute value is false after toggle command");
+            VerifyOrDo(!ShouldSkip("OO.S.A0000"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), OnOff::Id, OnOff::Attributes::OnOff::Id, true, chip::NullOptional);
         }
         case 17: {
             LogStep(17, "Operate on device to set OnOff attribute manually to on");
-            VerifyOrDo(!ShouldSkip("PICS_USER_PROMPT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            VerifyOrDo(!ShouldSkip("PICS_USER_PROMPT && OO.M.ManuallyControlled"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
             value.message = chip::Span<const char>("Please enter 'y' for successgarbage: not in length on purpose", 28);
@@ -22516,7 +22538,7 @@ class Test_TC_OO_2_2Suite : public TestCommand
         }
         case 19: {
             LogStep(19, "Operate on device to set OnOff attribute manually to off");
-            VerifyOrDo(!ShouldSkip("PICS_USER_PROMPT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            VerifyOrDo(!ShouldSkip("PICS_USER_PROMPT && OO.M.ManuallyControlled"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
             value.message = chip::Span<const char>("Please enter 'y' for successgarbage: not in length on purpose", 28);
@@ -22531,6 +22553,7 @@ class Test_TC_OO_2_2Suite : public TestCommand
         }
         case 21: {
             LogStep(21, "Reset Off Command");
+            VerifyOrDo(!ShouldSkip("OO.S.C00.Rsp"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             chip::app::Clusters::OnOff::Commands::Off::Type value;
             return SendCommand(kIdentityAlpha, GetEndpoint(1), OnOff::Id, OnOff::Commands::Off::Id, value, chip::NullOptional
@@ -22539,6 +22562,7 @@ class Test_TC_OO_2_2Suite : public TestCommand
         }
         case 22: {
             LogStep(22, "Check on/off attribute value is false after off command");
+            VerifyOrDo(!ShouldSkip("OO.S.A0000"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), OnOff::Id, OnOff::Attributes::OnOff::Id, true, chip::NullOptional);
         }
         }
@@ -22748,6 +22772,7 @@ class Test_TC_OO_2_4Suite : public TestCommand
         }
         case 1: {
             LogStep(1, "TH sends On command to DUT");
+            VerifyOrDo(!ShouldSkip("OO.S.C01.Rsp"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             chip::app::Clusters::OnOff::Commands::On::Type value;
             return SendCommand(kIdentityAlpha, GetEndpoint(1), OnOff::Id, OnOff::Commands::On::Id, value, chip::NullOptional
@@ -22756,6 +22781,7 @@ class Test_TC_OO_2_4Suite : public TestCommand
         }
         case 2: {
             LogStep(2, "TH writes a value of 0 to StartUpOnOff attribute of DUT");
+            VerifyOrDo(!ShouldSkip("OO.S.A4003"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             chip::app::DataModel::Nullable<chip::app::Clusters::OnOff::OnOffStartUpOnOff> value;
             value.SetNonNull();
@@ -22790,10 +22816,12 @@ class Test_TC_OO_2_4Suite : public TestCommand
         }
         case 6: {
             LogStep(6, "TH reads the OnOff attribute from the DUT");
+            VerifyOrDo(!ShouldSkip("OO.S.A0000"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), OnOff::Id, OnOff::Attributes::OnOff::Id, true, chip::NullOptional);
         }
         case 7: {
             LogStep(7, "TH writes a value of 1 to StartUpOnOff attribute of DUT");
+            VerifyOrDo(!ShouldSkip("OO.S.A4003"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             chip::app::DataModel::Nullable<chip::app::Clusters::OnOff::OnOffStartUpOnOff> value;
             value.SetNonNull();
@@ -22828,10 +22856,12 @@ class Test_TC_OO_2_4Suite : public TestCommand
         }
         case 11: {
             LogStep(11, "TH reads the OnOff attribute from the DUT");
+            VerifyOrDo(!ShouldSkip("OO.S.A0000"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), OnOff::Id, OnOff::Attributes::OnOff::Id, true, chip::NullOptional);
         }
         case 12: {
             LogStep(12, "TH writes a value of 2 to StartUpOnOff attribute of DUT");
+            VerifyOrDo(!ShouldSkip("OO.S.A4003"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             chip::app::DataModel::Nullable<chip::app::Clusters::OnOff::OnOffStartUpOnOff> value;
             value.SetNonNull();
@@ -22866,6 +22896,7 @@ class Test_TC_OO_2_4Suite : public TestCommand
         }
         case 16: {
             LogStep(16, "TH reads the OnOff attribute from the DUT");
+            VerifyOrDo(!ShouldSkip("OO.S.A0000"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), OnOff::Id, OnOff::Attributes::OnOff::Id, true, chip::NullOptional);
         }
         case 17: {
@@ -22895,10 +22926,12 @@ class Test_TC_OO_2_4Suite : public TestCommand
         }
         case 20: {
             LogStep(20, "TH reads the OnOff attribute from the DUT");
+            VerifyOrDo(!ShouldSkip("OO.S.A0000"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), OnOff::Id, OnOff::Attributes::OnOff::Id, true, chip::NullOptional);
         }
         case 21: {
             LogStep(21, "TH writes NULL to StartUpOnOff attribute of DUT");
+            VerifyOrDo(!ShouldSkip("OO.S.A4003"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             chip::app::DataModel::Nullable<chip::app::Clusters::OnOff::OnOffStartUpOnOff> value;
             value.SetNull();
@@ -22932,10 +22965,12 @@ class Test_TC_OO_2_4Suite : public TestCommand
         }
         case 25: {
             LogStep(25, "TH reads the OnOff attribute from the DUT");
+            VerifyOrDo(!ShouldSkip("OO.S.A0000"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), OnOff::Id, OnOff::Attributes::OnOff::Id, true, chip::NullOptional);
         }
         case 26: {
             LogStep(26, "TH sends Off command to DUT");
+            VerifyOrDo(!ShouldSkip("OO.S.C00.Rsp"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             chip::app::Clusters::OnOff::Commands::Off::Type value;
             return SendCommand(kIdentityAlpha, GetEndpoint(1), OnOff::Id, OnOff::Commands::Off::Id, value, chip::NullOptional
@@ -22969,6 +23004,7 @@ class Test_TC_OO_2_4Suite : public TestCommand
         }
         case 30: {
             LogStep(30, "TH reads the OnOff attribute from the DUT");
+            VerifyOrDo(!ShouldSkip("OO.S.A0000"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), OnOff::Id, OnOff::Attributes::OnOff::Id, true, chip::NullOptional);
         }
         }
@@ -25783,11 +25819,13 @@ class Test_TC_RH_2_1Suite : public TestCommand
         }
         case 1: {
             LogStep(1, "Reads constraints of attribute: MeasuredValue");
+            VerifyOrDo(!ShouldSkip("RH.S.A0000"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), RelativeHumidityMeasurement::Id,
                                  RelativeHumidityMeasurement::Attributes::MeasuredValue::Id, true, chip::NullOptional);
         }
         case 2: {
             LogStep(2, "Reads constraints of attribute: MinMeasuredValue");
+            VerifyOrDo(!ShouldSkip("RH.S.A0001"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), RelativeHumidityMeasurement::Id,
                                  RelativeHumidityMeasurement::Attributes::MinMeasuredValue::Id, true, chip::NullOptional);
         }
@@ -25798,6 +25836,7 @@ class Test_TC_RH_2_1Suite : public TestCommand
         }
         case 4: {
             LogStep(4, "Reads constraints of attribute: Tolerance");
+            VerifyOrDo(!ShouldSkip("RH.S.A0003"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), RelativeHumidityMeasurement::Id,
                                  RelativeHumidityMeasurement::Attributes::Tolerance::Id, true, chip::NullOptional);
         }
@@ -27061,21 +27100,25 @@ class Test_TC_TM_2_1Suite : public TestCommand
         }
         case 1: {
             LogStep(1, "read the mandatory attribute: MeasuredValue");
+            VerifyOrDo(!ShouldSkip("TM.S.A0000"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TemperatureMeasurement::Id,
                                  TemperatureMeasurement::Attributes::MeasuredValue::Id, true, chip::NullOptional);
         }
         case 2: {
             LogStep(2, "read the mandatory attribute: MinMeasuredValue");
+            VerifyOrDo(!ShouldSkip("TM.S.A0001"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TemperatureMeasurement::Id,
                                  TemperatureMeasurement::Attributes::MinMeasuredValue::Id, true, chip::NullOptional);
         }
         case 3: {
             LogStep(3, "read the mandatory attribute: MaxMeasuredValue");
+            VerifyOrDo(!ShouldSkip("TM.S.A0002"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TemperatureMeasurement::Id,
                                  TemperatureMeasurement::Attributes::MaxMeasuredValue::Id, true, chip::NullOptional);
         }
         case 4: {
             LogStep(4, "read the optional attribute: Tolerance");
+            VerifyOrDo(!ShouldSkip("TM.S.A0003"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TemperatureMeasurement::Id,
                                  TemperatureMeasurement::Attributes::Tolerance::Id, true, chip::NullOptional);
         }
@@ -67307,6 +67350,62 @@ class Test_TC_DA_1_6Suite : public TestCommand
     }
 };
 
+class Test_TC_DA_1_7Suite : public TestCommand
+{
+public:
+    Test_TC_DA_1_7Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_DA_1_7", 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_DA_1_7Suite() {}
+
+    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_BINFO_1_1Suite : public TestCommand
 {
 public:
@@ -83468,7 +83567,7 @@ class Test_TC_OO_2_3Suite : public TestCommand
         }
         case 1: {
             LogStep(1, "2a: Send On Command");
-            VerifyOrDo(!ShouldSkip("CR_ON"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            VerifyOrDo(!ShouldSkip("OO.S.C01.Rsp"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             chip::app::Clusters::OnOff::Commands::On::Type value;
             return SendCommand(kIdentityAlpha, GetEndpoint(1), OnOff::Id, OnOff::Commands::On::Id, value, chip::NullOptional
@@ -83484,18 +83583,18 @@ class Test_TC_OO_2_3Suite : public TestCommand
         }
         case 3: {
             LogStep(3, "2b: Reads OnOff attribute from DUT");
-            VerifyOrDo(!ShouldSkip("A_ONOFF"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            VerifyOrDo(!ShouldSkip("OO.S.A0000"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), OnOff::Id, OnOff::Attributes::OnOff::Id, true, chip::NullOptional);
         }
         case 4: {
             LogStep(4, "2b:Reads GlobalSceneControl attribute from DUT");
-            VerifyOrDo(!ShouldSkip("A_GLOBALSCENECONTROL"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            VerifyOrDo(!ShouldSkip("OO.S.A4000"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), OnOff::Id, OnOff::Attributes::GlobalSceneControl::Id, true,
                                  chip::NullOptional);
         }
         case 5: {
             LogStep(5, "3a:Sends OffWithEffect command to DUT");
-            VerifyOrDo(!ShouldSkip("CR_OFFWITHEFFECT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            VerifyOrDo(!ShouldSkip("OO.S.C40.Rsp"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             chip::app::Clusters::OnOff::Commands::OffWithEffect::Type value;
             value.effectId      = static_cast<chip::app::Clusters::OnOff::OnOffEffectIdentifier>(0);
@@ -83514,18 +83613,18 @@ class Test_TC_OO_2_3Suite : public TestCommand
         }
         case 7: {
             LogStep(7, "3b:Reads OnOff attribute from DUT");
-            VerifyOrDo(!ShouldSkip("A_ONOFF"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            VerifyOrDo(!ShouldSkip("OO.S.A0000"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), OnOff::Id, OnOff::Attributes::OnOff::Id, true, chip::NullOptional);
         }
         case 8: {
             LogStep(8, "3b:Reads GlobalSceneControl attribute from DUT");
-            VerifyOrDo(!ShouldSkip("A_GLOBALSCENECONTROL"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            VerifyOrDo(!ShouldSkip("OO.S.A4000"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), OnOff::Id, OnOff::Attributes::GlobalSceneControl::Id, true,
                                  chip::NullOptional);
         }
         case 9: {
             LogStep(9, "4a:Sends OnWithRecallGlobalScene command to DUT");
-            VerifyOrDo(!ShouldSkip("CR_ONWITHRECALL"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            VerifyOrDo(!ShouldSkip("OO.S.C41.Rsp"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             chip::app::Clusters::OnOff::Commands::OnWithRecallGlobalScene::Type value;
             return SendCommand(kIdentityAlpha, GetEndpoint(1), OnOff::Id, OnOff::Commands::OnWithRecallGlobalScene::Id, value,
@@ -83542,18 +83641,18 @@ class Test_TC_OO_2_3Suite : public TestCommand
         }
         case 11: {
             LogStep(11, "4b:Reads OnOff attribute from DUT");
-            VerifyOrDo(!ShouldSkip("A_ONOFF"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            VerifyOrDo(!ShouldSkip("OO.S.A0000"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), OnOff::Id, OnOff::Attributes::OnOff::Id, true, chip::NullOptional);
         }
         case 12: {
             LogStep(12, "4b:Reads GlobalSceneControl attribute from DUT");
-            VerifyOrDo(!ShouldSkip("A_GLOBALSCENECONTROL"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            VerifyOrDo(!ShouldSkip("OO.S.A4000"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), OnOff::Id, OnOff::Attributes::GlobalSceneControl::Id, true,
                                  chip::NullOptional);
         }
         case 13: {
             LogStep(13, "5a:Sends OffWithEffect command to DUT");
-            VerifyOrDo(!ShouldSkip("CR_OFFWITHEFFECT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            VerifyOrDo(!ShouldSkip("OO.S.C40.Rsp"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             chip::app::Clusters::OnOff::Commands::OffWithEffect::Type value;
             value.effectId      = static_cast<chip::app::Clusters::OnOff::OnOffEffectIdentifier>(0);
@@ -83572,18 +83671,18 @@ class Test_TC_OO_2_3Suite : public TestCommand
         }
         case 15: {
             LogStep(15, "5b:Reads OnOff attribute from DUT");
-            VerifyOrDo(!ShouldSkip("A_ONOFF"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            VerifyOrDo(!ShouldSkip("OO.S.A0000"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), OnOff::Id, OnOff::Attributes::OnOff::Id, true, chip::NullOptional);
         }
         case 16: {
             LogStep(16, "5b:Reads GlobalSceneControl attribute from DUT");
-            VerifyOrDo(!ShouldSkip("A_GLOBALSCENECONTROL"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            VerifyOrDo(!ShouldSkip("OO.S.A4000"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), OnOff::Id, OnOff::Attributes::GlobalSceneControl::Id, true,
                                  chip::NullOptional);
         }
         case 17: {
             LogStep(17, "5c:Send On Command");
-            VerifyOrDo(!ShouldSkip("CR_ON"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            VerifyOrDo(!ShouldSkip("OO.S.C01.Rsp"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             chip::app::Clusters::OnOff::Commands::On::Type value;
             return SendCommand(kIdentityAlpha, GetEndpoint(1), OnOff::Id, OnOff::Commands::On::Id, value, chip::NullOptional
@@ -83599,18 +83698,18 @@ class Test_TC_OO_2_3Suite : public TestCommand
         }
         case 19: {
             LogStep(19, "5d:Reads OnOff attribute from DUT");
-            VerifyOrDo(!ShouldSkip("A_ONOFF"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            VerifyOrDo(!ShouldSkip("OO.S.A0000"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), OnOff::Id, OnOff::Attributes::OnOff::Id, true, chip::NullOptional);
         }
         case 20: {
             LogStep(20, "5d:Reads GlobalSceneControl attribute from DUT");
-            VerifyOrDo(!ShouldSkip("A_GLOBALSCENECONTROL"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            VerifyOrDo(!ShouldSkip("OO.S.A4000"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), OnOff::Id, OnOff::Attributes::GlobalSceneControl::Id, true,
                                  chip::NullOptional);
         }
         case 21: {
             LogStep(21, "6a:Sends OffWithEffect command to DUT");
-            VerifyOrDo(!ShouldSkip("CR_OFFWITHEFFECT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            VerifyOrDo(!ShouldSkip("OO.S.C40.Rsp"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             chip::app::Clusters::OnOff::Commands::OffWithEffect::Type value;
             value.effectId      = static_cast<chip::app::Clusters::OnOff::OnOffEffectIdentifier>(1);
@@ -83629,18 +83728,18 @@ class Test_TC_OO_2_3Suite : public TestCommand
         }
         case 23: {
             LogStep(23, "6b:Reads OnOff attribute from DUT");
-            VerifyOrDo(!ShouldSkip("A_ONOFF"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            VerifyOrDo(!ShouldSkip("OO.S.A0000"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), OnOff::Id, OnOff::Attributes::OnOff::Id, true, chip::NullOptional);
         }
         case 24: {
             LogStep(24, "6b:Reads GlobalSceneControl attribute from DUT");
-            VerifyOrDo(!ShouldSkip("A_GLOBALSCENECONTROL"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            VerifyOrDo(!ShouldSkip("OO.S.A4000"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), OnOff::Id, OnOff::Attributes::GlobalSceneControl::Id, true,
                                  chip::NullOptional);
         }
         case 25: {
             LogStep(25, "7a:Send On Command");
-            VerifyOrDo(!ShouldSkip("CR_ON"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            VerifyOrDo(!ShouldSkip("OO.S.C01.Rsp"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             chip::app::Clusters::OnOff::Commands::On::Type value;
             return SendCommand(kIdentityAlpha, GetEndpoint(1), OnOff::Id, OnOff::Commands::On::Id, value, chip::NullOptional
@@ -83656,18 +83755,18 @@ class Test_TC_OO_2_3Suite : public TestCommand
         }
         case 27: {
             LogStep(27, "7b:Reads OnOff attribute from DUT");
-            VerifyOrDo(!ShouldSkip("A_ONOFF"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            VerifyOrDo(!ShouldSkip("OO.S.A0000"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), OnOff::Id, OnOff::Attributes::OnOff::Id, true, chip::NullOptional);
         }
         case 28: {
             LogStep(28, "7b:Reads GlobalSceneControl attribute from DUT");
-            VerifyOrDo(!ShouldSkip("A_GLOBALSCENECONTROL"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            VerifyOrDo(!ShouldSkip("OO.S.A4000"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), OnOff::Id, OnOff::Attributes::GlobalSceneControl::Id, true,
                                  chip::NullOptional);
         }
         case 29: {
             LogStep(29, "7c:Sends OnWithRecallGlobalScene command to DUT");
-            VerifyOrDo(!ShouldSkip("CR_ONWITHRECALL"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            VerifyOrDo(!ShouldSkip("OO.S.C41.Rsp"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             chip::app::Clusters::OnOff::Commands::OnWithRecallGlobalScene::Type value;
             return SendCommand(kIdentityAlpha, GetEndpoint(1), OnOff::Id, OnOff::Commands::OnWithRecallGlobalScene::Id, value,
@@ -83684,29 +83783,30 @@ class Test_TC_OO_2_3Suite : public TestCommand
         }
         case 31: {
             LogStep(31, "7d:Reads OnOff attribute from DUT");
-            VerifyOrDo(!ShouldSkip("A_ONOFF"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            VerifyOrDo(!ShouldSkip("OO.S.A0000"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), OnOff::Id, OnOff::Attributes::OnOff::Id, true, chip::NullOptional);
         }
         case 32: {
             LogStep(32, "7d:Reads GlobalSceneControl attribute from DUT");
-            VerifyOrDo(!ShouldSkip("A_GLOBALSCENECONTROL"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            VerifyOrDo(!ShouldSkip("OO.S.A4000"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), OnOff::Id, OnOff::Attributes::GlobalSceneControl::Id, true,
                                  chip::NullOptional);
         }
         case 33: {
             LogStep(33, "8:Reads OnTime attribute from DUT");
-            VerifyOrDo(!ShouldSkip("A_ONTIME"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            VerifyOrDo(!ShouldSkip("OO.S.A4001"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), OnOff::Id, OnOff::Attributes::OnTime::Id, true,
                                  chip::NullOptional);
         }
         case 34: {
             LogStep(34, "8:Reads OffWaitTime attribute from DUT");
-            VerifyOrDo(!ShouldSkip("A_OFFWAITTIME"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            VerifyOrDo(!ShouldSkip("OO.S.A4002"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), OnOff::Id, OnOff::Attributes::OffWaitTime::Id, true,
                                  chip::NullOptional);
         }
         case 35: {
             LogStep(35, "9a:Sends OnWithTimedOff command to DUT");
+            VerifyOrDo(!ShouldSkip("OO.S.C42.Rsp"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             chip::app::Clusters::OnOff::Commands::OnWithTimedOff::Type value;
             value.onOffControl = static_cast<chip::BitMask<chip::app::Clusters::OnOff::OnOffControl>>(1U);
@@ -83719,19 +83819,19 @@ class Test_TC_OO_2_3Suite : public TestCommand
         }
         case 36: {
             LogStep(36, "9b:Reads OnTime attribute from DUT");
-            VerifyOrDo(!ShouldSkip("A_ONTIME"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            VerifyOrDo(!ShouldSkip("OO.S.A4001"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), OnOff::Id, OnOff::Attributes::OnTime::Id, true,
                                  chip::NullOptional);
         }
         case 37: {
             LogStep(37, "9b:Reads OffWaitTime attribute from DUT");
-            VerifyOrDo(!ShouldSkip("A_OFFWAITTIME"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            VerifyOrDo(!ShouldSkip("OO.S.A4002"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), OnOff::Id, OnOff::Attributes::OffWaitTime::Id, true,
                                  chip::NullOptional);
         }
         case 38: {
             LogStep(38, "10a:Sends OnWithTimedOff command to DUT");
-            VerifyOrDo(!ShouldSkip("CR_ONWITHTIMEOFF"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            VerifyOrDo(!ShouldSkip("OO.S.C42.Rsp"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             chip::app::Clusters::OnOff::Commands::OnWithTimedOff::Type value;
             value.onOffControl = static_cast<chip::BitMask<chip::app::Clusters::OnOff::OnOffControl>>(1U);
@@ -83751,7 +83851,7 @@ class Test_TC_OO_2_3Suite : public TestCommand
         }
         case 40: {
             LogStep(40, "10b:Sends OnWithTimedOff command to DUT");
-            VerifyOrDo(!ShouldSkip("CR_ONWITHTIMEOFF"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            VerifyOrDo(!ShouldSkip("OO.S.C42.Rsp"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             chip::app::Clusters::OnOff::Commands::OnWithTimedOff::Type value;
             value.onOffControl = static_cast<chip::BitMask<chip::app::Clusters::OnOff::OnOffControl>>(1U);
@@ -83771,7 +83871,7 @@ class Test_TC_OO_2_3Suite : public TestCommand
         }
         case 42: {
             LogStep(42, "10c:Sends OnWithTimedOff command to DUT");
-            VerifyOrDo(!ShouldSkip("CR_ONWITHTIMEOFF"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            VerifyOrDo(!ShouldSkip("OO.S.C42.Rsp"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             chip::app::Clusters::OnOff::Commands::OnWithTimedOff::Type value;
             value.onOffControl = static_cast<chip::BitMask<chip::app::Clusters::OnOff::OnOffControl>>(1U);
@@ -83791,7 +83891,7 @@ class Test_TC_OO_2_3Suite : public TestCommand
         }
         case 44: {
             LogStep(44, "10d:Sends OnWithTimedOff command to DUT");
-            VerifyOrDo(!ShouldSkip("CR_ONWITHTIMEOFF"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            VerifyOrDo(!ShouldSkip("OO.S.C42.Rsp"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             chip::app::Clusters::OnOff::Commands::OnWithTimedOff::Type value;
             value.onOffControl = static_cast<chip::BitMask<chip::app::Clusters::OnOff::OnOffControl>>(1U);
@@ -83804,18 +83904,18 @@ class Test_TC_OO_2_3Suite : public TestCommand
         }
         case 45: {
             LogStep(45, "10e:Reads OnOff attribute from DUT");
-            VerifyOrDo(!ShouldSkip("A_ONOFF"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            VerifyOrDo(!ShouldSkip("OO.S.A0000"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), OnOff::Id, OnOff::Attributes::OnOff::Id, true, chip::NullOptional);
         }
         case 46: {
             LogStep(46, "10e:Reads OnTime attribute from DUT");
-            VerifyOrDo(!ShouldSkip("A_ONTIME"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            VerifyOrDo(!ShouldSkip("OO.S.A4001"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), OnOff::Id, OnOff::Attributes::OnTime::Id, true,
                                  chip::NullOptional);
         }
         case 47: {
             LogStep(47, "10e:Reads OffWaitTime attribute from DUT");
-            VerifyOrDo(!ShouldSkip("A_OFFWAITTIME"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            VerifyOrDo(!ShouldSkip("OO.S.A4002"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), OnOff::Id, OnOff::Attributes::OffWaitTime::Id, true,
                                  chip::NullOptional);
         }
@@ -83828,7 +83928,7 @@ class Test_TC_OO_2_3Suite : public TestCommand
         }
         case 49: {
             LogStep(49, "11a:Sends OffWithEffect command to DUT");
-            VerifyOrDo(!ShouldSkip("CR_OFFWITHEFFECT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            VerifyOrDo(!ShouldSkip("OO.S.C40.Rsp"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             chip::app::Clusters::OnOff::Commands::OffWithEffect::Type value;
             value.effectId      = static_cast<chip::app::Clusters::OnOff::OnOffEffectIdentifier>(0);
@@ -83840,18 +83940,18 @@ class Test_TC_OO_2_3Suite : public TestCommand
         }
         case 50: {
             LogStep(50, "11b:Reads OnOff attribute from DUT");
-            VerifyOrDo(!ShouldSkip("A_ONOFF"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            VerifyOrDo(!ShouldSkip("OO.S.A0000"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), OnOff::Id, OnOff::Attributes::OnOff::Id, true, chip::NullOptional);
         }
         case 51: {
             LogStep(51, "11b:Reads OnTime attribute from DUT");
-            VerifyOrDo(!ShouldSkip("A_ONTIME"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            VerifyOrDo(!ShouldSkip("OO.S.A4001"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), OnOff::Id, OnOff::Attributes::OnTime::Id, true,
                                  chip::NullOptional);
         }
         case 52: {
             LogStep(52, "11b:Reads OffWaitTime attribute from DUT");
-            VerifyOrDo(!ShouldSkip("A_OFFWAITTIME"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            VerifyOrDo(!ShouldSkip("OO.S.A4002"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), OnOff::Id, OnOff::Attributes::OffWaitTime::Id, true,
                                  chip::NullOptional);
         }
@@ -83864,7 +83964,7 @@ class Test_TC_OO_2_3Suite : public TestCommand
         }
         case 54: {
             LogStep(54, "12a:Sends OnWithTimedOff command to DUT");
-            VerifyOrDo(!ShouldSkip("CR_ONWITHTIMEOFF"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            VerifyOrDo(!ShouldSkip("OO.S.C42.Rsp"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             chip::app::Clusters::OnOff::Commands::OnWithTimedOff::Type value;
             value.onOffControl = static_cast<chip::BitMask<chip::app::Clusters::OnOff::OnOffControl>>(1U);
@@ -83877,18 +83977,18 @@ class Test_TC_OO_2_3Suite : public TestCommand
         }
         case 55: {
             LogStep(55, "12b:Reads OnOff attribute from DUT");
-            VerifyOrDo(!ShouldSkip("A_ONOFF"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            VerifyOrDo(!ShouldSkip("OO.S.A0000"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), OnOff::Id, OnOff::Attributes::OnOff::Id, true, chip::NullOptional);
         }
         case 56: {
             LogStep(56, "12b:Reads OnTime attribute from DUT");
-            VerifyOrDo(!ShouldSkip("A_ONTIME"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            VerifyOrDo(!ShouldSkip("OO.S.A4001"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), OnOff::Id, OnOff::Attributes::OnTime::Id, true,
                                  chip::NullOptional);
         }
         case 57: {
             LogStep(57, "12b:Reads OffWaitTime attribute from DUT");
-            VerifyOrDo(!ShouldSkip("A_OFFWAITTIME"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            VerifyOrDo(!ShouldSkip("OO.S.A4002"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), OnOff::Id, OnOff::Attributes::OffWaitTime::Id, true,
                                  chip::NullOptional);
         }
@@ -83901,7 +84001,7 @@ class Test_TC_OO_2_3Suite : public TestCommand
         }
         case 59: {
             LogStep(59, "13a:Send On Command");
-            VerifyOrDo(!ShouldSkip("CR_ON"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            VerifyOrDo(!ShouldSkip("OO.S.C01.Rsp"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             chip::app::Clusters::OnOff::Commands::On::Type value;
             return SendCommand(kIdentityAlpha, GetEndpoint(1), OnOff::Id, OnOff::Commands::On::Id, value, chip::NullOptional
@@ -83910,18 +84010,18 @@ class Test_TC_OO_2_3Suite : public TestCommand
         }
         case 60: {
             LogStep(60, "13b:Reads OnOff attribute from DUT");
-            VerifyOrDo(!ShouldSkip("A_ONOFF"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            VerifyOrDo(!ShouldSkip("OO.S.A0000"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), OnOff::Id, OnOff::Attributes::OnOff::Id, true, chip::NullOptional);
         }
         case 61: {
             LogStep(61, "13b:Reads OnTime attribute from DUT");
-            VerifyOrDo(!ShouldSkip("A_ONTIME"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            VerifyOrDo(!ShouldSkip("OO.S.A4001"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), OnOff::Id, OnOff::Attributes::OnTime::Id, true,
                                  chip::NullOptional);
         }
         case 62: {
             LogStep(62, "13b:Reads OffWaitTime attribute from DUT");
-            VerifyOrDo(!ShouldSkip("A_OFFWAITTIME"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            VerifyOrDo(!ShouldSkip("OO.S.A4002"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), OnOff::Id, OnOff::Attributes::OffWaitTime::Id, true,
                                  chip::NullOptional);
         }
@@ -83934,7 +84034,7 @@ class Test_TC_OO_2_3Suite : public TestCommand
         }
         case 64: {
             LogStep(64, "14a:Sends OnWithTimedOff command to DUT");
-            VerifyOrDo(!ShouldSkip("CR_ONWITHTIMEOFF"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            VerifyOrDo(!ShouldSkip("OO.S.C42.Rsp"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             chip::app::Clusters::OnOff::Commands::OnWithTimedOff::Type value;
             value.onOffControl = static_cast<chip::BitMask<chip::app::Clusters::OnOff::OnOffControl>>(1U);
@@ -83954,7 +84054,7 @@ class Test_TC_OO_2_3Suite : public TestCommand
         }
         case 66: {
             LogStep(66, "14b:Send Off Command");
-            VerifyOrDo(!ShouldSkip("CR_OFF"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            VerifyOrDo(!ShouldSkip("OO.S.C00.Rsp"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             chip::app::Clusters::OnOff::Commands::Off::Type value;
             return SendCommand(kIdentityAlpha, GetEndpoint(1), OnOff::Id, OnOff::Commands::Off::Id, value, chip::NullOptional
@@ -83963,18 +84063,18 @@ class Test_TC_OO_2_3Suite : public TestCommand
         }
         case 67: {
             LogStep(67, "14c:Reads OnOff attribute from DUT");
-            VerifyOrDo(!ShouldSkip("A_ONOFF"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            VerifyOrDo(!ShouldSkip("OO.S.A0000"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), OnOff::Id, OnOff::Attributes::OnOff::Id, true, chip::NullOptional);
         }
         case 68: {
             LogStep(68, "14c:Reads OnTime attribute from DUT");
-            VerifyOrDo(!ShouldSkip("A_ONTIME"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            VerifyOrDo(!ShouldSkip("OO.S.A4001"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), OnOff::Id, OnOff::Attributes::OnTime::Id, true,
                                  chip::NullOptional);
         }
         case 69: {
             LogStep(69, "14c:Reads OffWaitTime attribute from DUT");
-            VerifyOrDo(!ShouldSkip("A_OFFWAITTIME"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            VerifyOrDo(!ShouldSkip("OO.S.A4002"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), OnOff::Id, OnOff::Attributes::OffWaitTime::Id, true,
                                  chip::NullOptional);
         }
@@ -83987,18 +84087,18 @@ class Test_TC_OO_2_3Suite : public TestCommand
         }
         case 71: {
             LogStep(71, "15:Reads OnOff attribute from DUT");
-            VerifyOrDo(!ShouldSkip("A_ONOFF"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            VerifyOrDo(!ShouldSkip("OO.S.A0000"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), OnOff::Id, OnOff::Attributes::OnOff::Id, true, chip::NullOptional);
         }
         case 72: {
             LogStep(72, "15:Reads OnTime attribute from DUT");
-            VerifyOrDo(!ShouldSkip("A_ONTIME"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            VerifyOrDo(!ShouldSkip("OO.S.A4001"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), OnOff::Id, OnOff::Attributes::OnTime::Id, true,
                                  chip::NullOptional);
         }
         case 73: {
             LogStep(73, "15:Reads OffWaitTime attribute from DUT");
-            VerifyOrDo(!ShouldSkip("A_OFFWAITTIME"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            VerifyOrDo(!ShouldSkip("OO.S.A4002"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), OnOff::Id, OnOff::Attributes::OffWaitTime::Id, true,
                                  chip::NullOptional);
         }
@@ -84011,7 +84111,7 @@ class Test_TC_OO_2_3Suite : public TestCommand
         }
         case 75: {
             LogStep(75, "16a:Sends OnWithTimedOff command to DUT");
-            VerifyOrDo(!ShouldSkip("CR_ONWITHTIMEOFF"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            VerifyOrDo(!ShouldSkip("OO.S.C42.Rsp"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             chip::app::Clusters::OnOff::Commands::OnWithTimedOff::Type value;
             value.onOffControl = static_cast<chip::BitMask<chip::app::Clusters::OnOff::OnOffControl>>(1U);
@@ -84024,24 +84124,24 @@ class Test_TC_OO_2_3Suite : public TestCommand
         }
         case 76: {
             LogStep(76, "16b:Reads OnOff attribute from DUT");
-            VerifyOrDo(!ShouldSkip("A_ONOFF"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            VerifyOrDo(!ShouldSkip("OO.S.A0000"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), OnOff::Id, OnOff::Attributes::OnOff::Id, true, chip::NullOptional);
         }
         case 77: {
             LogStep(77, "16b:Reads OnTime attribute from DUT");
-            VerifyOrDo(!ShouldSkip("A_ONTIME"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            VerifyOrDo(!ShouldSkip("OO.S.A4001"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), OnOff::Id, OnOff::Attributes::OnTime::Id, true,
                                  chip::NullOptional);
         }
         case 78: {
             LogStep(78, "16b:Reads OffWaitTime attribute from DUT");
-            VerifyOrDo(!ShouldSkip("A_OFFWAITTIME"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            VerifyOrDo(!ShouldSkip("OO.S.A4002"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), OnOff::Id, OnOff::Attributes::OffWaitTime::Id, true,
                                  chip::NullOptional);
         }
         case 79: {
             LogStep(79, "17a:Send On Command");
-            VerifyOrDo(!ShouldSkip("CR_ON"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            VerifyOrDo(!ShouldSkip("OO.S.C01.Rsp"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             chip::app::Clusters::OnOff::Commands::On::Type value;
             return SendCommand(kIdentityAlpha, GetEndpoint(1), OnOff::Id, OnOff::Commands::On::Id, value, chip::NullOptional
@@ -84057,7 +84157,7 @@ class Test_TC_OO_2_3Suite : public TestCommand
         }
         case 81: {
             LogStep(81, "17b:Sends OnWithTimedOff command to DUT");
-            VerifyOrDo(!ShouldSkip("CR_ONWITHTIMEOFF"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            VerifyOrDo(!ShouldSkip("OO.S.C42.Rsp"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             chip::app::Clusters::OnOff::Commands::OnWithTimedOff::Type value;
             value.onOffControl = static_cast<chip::BitMask<chip::app::Clusters::OnOff::OnOffControl>>(1U);
@@ -84070,18 +84170,18 @@ class Test_TC_OO_2_3Suite : public TestCommand
         }
         case 82: {
             LogStep(82, "17c:Reads OnOff attribute from DUT");
-            VerifyOrDo(!ShouldSkip("A_ONOFF"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            VerifyOrDo(!ShouldSkip("OO.S.A0000"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), OnOff::Id, OnOff::Attributes::OnOff::Id, true, chip::NullOptional);
         }
         case 83: {
             LogStep(83, "17c:Reads OnTime attribute from DUT");
-            VerifyOrDo(!ShouldSkip("A_ONTIME"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            VerifyOrDo(!ShouldSkip("OO.S.A4001"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), OnOff::Id, OnOff::Attributes::OnTime::Id, true,
                                  chip::NullOptional);
         }
         case 84: {
             LogStep(84, "17c:Reads OffWaitTime attribute from DUT");
-            VerifyOrDo(!ShouldSkip("A_OFFWAITTIME"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            VerifyOrDo(!ShouldSkip("OO.S.A4002"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), OnOff::Id, OnOff::Attributes::OffWaitTime::Id, true,
                                  chip::NullOptional);
         }
@@ -84094,18 +84194,18 @@ class Test_TC_OO_2_3Suite : public TestCommand
         }
         case 86: {
             LogStep(86, "17d:Reads OnOff attribute from DUT");
-            VerifyOrDo(!ShouldSkip("A_ONOFF"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            VerifyOrDo(!ShouldSkip("OO.S.A0000"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), OnOff::Id, OnOff::Attributes::OnOff::Id, true, chip::NullOptional);
         }
         case 87: {
             LogStep(87, "17d:Reads OnTime attribute from DUT");
-            VerifyOrDo(!ShouldSkip("A_ONTIME"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            VerifyOrDo(!ShouldSkip("OO.S.A4001"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), OnOff::Id, OnOff::Attributes::OnTime::Id, true,
                                  chip::NullOptional);
         }
         case 88: {
             LogStep(88, "17d:Reads OffWaitTime attribute from DUT");
-            VerifyOrDo(!ShouldSkip("A_OFFWAITTIME"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            VerifyOrDo(!ShouldSkip("OO.S.A4002"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), OnOff::Id, OnOff::Attributes::OffWaitTime::Id, true,
                                  chip::NullOptional);
         }
@@ -84118,7 +84218,7 @@ class Test_TC_OO_2_3Suite : public TestCommand
         }
         case 90: {
             LogStep(90, "18a:Sends OnWithTimedOff command to DUT");
-            VerifyOrDo(!ShouldSkip("CR_ONWITHTIMEOFF"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            VerifyOrDo(!ShouldSkip("OO.S.C42.Rsp"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             chip::app::Clusters::OnOff::Commands::OnWithTimedOff::Type value;
             value.onOffControl = static_cast<chip::BitMask<chip::app::Clusters::OnOff::OnOffControl>>(1U);
@@ -84131,24 +84231,24 @@ class Test_TC_OO_2_3Suite : public TestCommand
         }
         case 91: {
             LogStep(91, "18b:Reads OnOff attribute from DUT");
-            VerifyOrDo(!ShouldSkip("PICS_SKIP_SAMPLE_APP && A_ONOFF"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            VerifyOrDo(!ShouldSkip("PICS_SKIP_SAMPLE_APP && OO.S.A0000"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), OnOff::Id, OnOff::Attributes::OnOff::Id, true, chip::NullOptional);
         }
         case 92: {
             LogStep(92, "18b:Reads OnTime attribute from DUT");
-            VerifyOrDo(!ShouldSkip("PICS_SKIP_SAMPLE_APP && A_ONTIME"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            VerifyOrDo(!ShouldSkip("PICS_SKIP_SAMPLE_APP && OO.S.A4001"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), OnOff::Id, OnOff::Attributes::OnTime::Id, true,
                                  chip::NullOptional);
         }
         case 93: {
             LogStep(93, "18b:Reads OffWaitTime attribute from DUT");
-            VerifyOrDo(!ShouldSkip("PICS_SKIP_SAMPLE_APP && A_OFFWAITTIME"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            VerifyOrDo(!ShouldSkip("PICS_SKIP_SAMPLE_APP && OO.S.A4002"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), OnOff::Id, OnOff::Attributes::OffWaitTime::Id, true,
                                  chip::NullOptional);
         }
         case 94: {
             LogStep(94, "19a:Sends OnWithTimedOff command to DUT");
-            VerifyOrDo(!ShouldSkip("CR_ONWITHTIMEOFF"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            VerifyOrDo(!ShouldSkip("OO.S.C42.Rsp"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             chip::app::Clusters::OnOff::Commands::OnWithTimedOff::Type value;
             value.onOffControl = static_cast<chip::BitMask<chip::app::Clusters::OnOff::OnOffControl>>(0U);
@@ -84168,7 +84268,7 @@ class Test_TC_OO_2_3Suite : public TestCommand
         }
         case 96: {
             LogStep(96, "19b:Sends OnWithTimedOff command to DUT");
-            VerifyOrDo(!ShouldSkip("CR_ONWITHTIMEOFF"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            VerifyOrDo(!ShouldSkip("OO.S.C42.Rsp"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             chip::app::Clusters::OnOff::Commands::OnWithTimedOff::Type value;
             value.onOffControl = static_cast<chip::BitMask<chip::app::Clusters::OnOff::OnOffControl>>(1U);
@@ -84188,24 +84288,24 @@ class Test_TC_OO_2_3Suite : public TestCommand
         }
         case 98: {
             LogStep(98, "19c:Reads OnOff attribute from DUT");
-            VerifyOrDo(!ShouldSkip("A_ONOFF"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            VerifyOrDo(!ShouldSkip("OO.S.A0000"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), OnOff::Id, OnOff::Attributes::OnOff::Id, true, chip::NullOptional);
         }
         case 99: {
             LogStep(99, "19c:Reads OnTime attribute from DUT");
-            VerifyOrDo(!ShouldSkip("A_ONTIME"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            VerifyOrDo(!ShouldSkip("OO.S.A4001"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), OnOff::Id, OnOff::Attributes::OnTime::Id, true,
                                  chip::NullOptional);
         }
         case 100: {
             LogStep(100, "19c:Reads OffWaitTime attribute from DUT");
-            VerifyOrDo(!ShouldSkip("A_OFFWAITTIME"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            VerifyOrDo(!ShouldSkip("OO.S.A4002"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), OnOff::Id, OnOff::Attributes::OffWaitTime::Id, true,
                                  chip::NullOptional);
         }
         case 101: {
             LogStep(101, "20a:Send Off Command");
-            VerifyOrDo(!ShouldSkip("CR_OFF"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            VerifyOrDo(!ShouldSkip("OO.S.C00.Rsp"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             chip::app::Clusters::OnOff::Commands::Off::Type value;
             return SendCommand(kIdentityAlpha, GetEndpoint(1), OnOff::Id, OnOff::Commands::Off::Id, value, chip::NullOptional
@@ -84214,24 +84314,24 @@ class Test_TC_OO_2_3Suite : public TestCommand
         }
         case 102: {
             LogStep(102, "20b:Reads OnOff attribute from DUT");
-            VerifyOrDo(!ShouldSkip("A_ONOFF"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            VerifyOrDo(!ShouldSkip("OO.S.A0000"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), OnOff::Id, OnOff::Attributes::OnOff::Id, true, chip::NullOptional);
         }
         case 103: {
             LogStep(103, "20b:Reads OnTime attribute from DUT");
-            VerifyOrDo(!ShouldSkip("A_ONTIME"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            VerifyOrDo(!ShouldSkip("OO.S.A4001"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), OnOff::Id, OnOff::Attributes::OnTime::Id, true,
                                  chip::NullOptional);
         }
         case 104: {
             LogStep(104, "20b:Reads OffWaitTime attribute from DUT");
-            VerifyOrDo(!ShouldSkip("A_OFFWAITTIME"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            VerifyOrDo(!ShouldSkip("OO.S.A4002"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), OnOff::Id, OnOff::Attributes::OffWaitTime::Id, true,
                                  chip::NullOptional);
         }
         case 105: {
-            LogStep(105, "21a:Sends OnWithimedOff command to DUT");
-            VerifyOrDo(!ShouldSkip("CR_ONWITHTIMEOFF"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            LogStep(105, "21a:Sends OnWithTimedOff command to DUT");
+            VerifyOrDo(!ShouldSkip("OO.S.C42.Rsp"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             chip::app::Clusters::OnOff::Commands::OnWithTimedOff::Type value;
             value.onOffControl = static_cast<chip::BitMask<chip::app::Clusters::OnOff::OnOffControl>>(0U);
@@ -84244,24 +84344,24 @@ class Test_TC_OO_2_3Suite : public TestCommand
         }
         case 106: {
             LogStep(106, "21b:Reads OnOff attribute from DUT");
-            VerifyOrDo(!ShouldSkip("A_ONOFF"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            VerifyOrDo(!ShouldSkip("OO.S.A0000"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), OnOff::Id, OnOff::Attributes::OnOff::Id, true, chip::NullOptional);
         }
         case 107: {
             LogStep(107, "21b:Reads OnTime attribute from DUT");
-            VerifyOrDo(!ShouldSkip("A_ONTIME"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            VerifyOrDo(!ShouldSkip("OO.S.A4001"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), OnOff::Id, OnOff::Attributes::OnTime::Id, true,
                                  chip::NullOptional);
         }
         case 108: {
             LogStep(108, "21b:Reads OffWaitTime attribute from DUT");
-            VerifyOrDo(!ShouldSkip("PICS_SKIP_SAMPLE_APP"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            VerifyOrDo(!ShouldSkip("PICS_SKIP_SAMPLE_APP && OO.S.A4002"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), OnOff::Id, OnOff::Attributes::OffWaitTime::Id, true,
                                  chip::NullOptional);
         }
         case 109: {
             LogStep(109, "22a:Send On Command");
-            VerifyOrDo(!ShouldSkip("CR_ON"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            VerifyOrDo(!ShouldSkip("OO.S.C01.Rsp"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             chip::app::Clusters::OnOff::Commands::On::Type value;
             return SendCommand(kIdentityAlpha, GetEndpoint(1), OnOff::Id, OnOff::Commands::On::Id, value, chip::NullOptional
@@ -84270,23 +84370,23 @@ class Test_TC_OO_2_3Suite : public TestCommand
         }
         case 110: {
             LogStep(110, "22b:Reads OnOff attribute from DUT");
-            VerifyOrDo(!ShouldSkip("A_ONOFF"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            VerifyOrDo(!ShouldSkip("OO.S.A0000"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), OnOff::Id, OnOff::Attributes::OnOff::Id, true, chip::NullOptional);
         }
         case 111: {
             LogStep(111, "22b:Reads OnTime attribute from DUT");
-            VerifyOrDo(!ShouldSkip("A_ONTIME"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            VerifyOrDo(!ShouldSkip("OO.S.A4001"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), OnOff::Id, OnOff::Attributes::OnTime::Id, true,
                                  chip::NullOptional);
         }
         case 112: {
             LogStep(112, "22b:Reads OffWaitTime attribute from DUT");
-            VerifyOrDo(!ShouldSkip("A_OFFWAITTIME"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            VerifyOrDo(!ShouldSkip("OO.S.A4002"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), OnOff::Id, OnOff::Attributes::OffWaitTime::Id, true,
                                  chip::NullOptional);
         }
         case 113: {
-            LogStep(113, ":Wait 10000ms");
+            LogStep(113, "Wait 10000ms");
             ListFreer listFreer;
             chip::app::Clusters::DelayCommands::Commands::WaitForMs::Type value;
             value.ms = 10000UL;
@@ -84294,7 +84394,7 @@ class Test_TC_OO_2_3Suite : public TestCommand
         }
         case 114: {
             LogStep(114, "23a:Sends OnWithTimedOff command to DUT");
-            VerifyOrDo(!ShouldSkip("CR_ONWITHTIMEOFF"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            VerifyOrDo(!ShouldSkip("OO.S.C42.Rsp"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             chip::app::Clusters::OnOff::Commands::OnWithTimedOff::Type value;
             value.onOffControl = static_cast<chip::BitMask<chip::app::Clusters::OnOff::OnOffControl>>(0U);
@@ -84307,7 +84407,7 @@ class Test_TC_OO_2_3Suite : public TestCommand
         }
         case 115: {
             LogStep(115, "23b:Send Off Command");
-            VerifyOrDo(!ShouldSkip("CR_OFF"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            VerifyOrDo(!ShouldSkip("OO.S.C00.Rsp"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             chip::app::Clusters::OnOff::Commands::Off::Type value;
             return SendCommand(kIdentityAlpha, GetEndpoint(1), OnOff::Id, OnOff::Commands::Off::Id, value, chip::NullOptional
@@ -84316,18 +84416,18 @@ class Test_TC_OO_2_3Suite : public TestCommand
         }
         case 116: {
             LogStep(116, "23c:Reads OnOff attribute from DUT");
-            VerifyOrDo(!ShouldSkip("A_ONOFF"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            VerifyOrDo(!ShouldSkip("OO.S.A0000"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), OnOff::Id, OnOff::Attributes::OnOff::Id, true, chip::NullOptional);
         }
         case 117: {
             LogStep(117, "23c:Reads OnTime attribute from DUT");
-            VerifyOrDo(!ShouldSkip("A_ONTIME"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            VerifyOrDo(!ShouldSkip("OO.S.A4001"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), OnOff::Id, OnOff::Attributes::OnTime::Id, true,
                                  chip::NullOptional);
         }
         case 118: {
             LogStep(118, "23c:Reads OffWaitTime attribute from DUT");
-            VerifyOrDo(!ShouldSkip("A_OFFWAITTIME"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            VerifyOrDo(!ShouldSkip("OO.S.A4002"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), OnOff::Id, OnOff::Attributes::OffWaitTime::Id, true,
                                  chip::NullOptional);
         }
@@ -84340,24 +84440,24 @@ class Test_TC_OO_2_3Suite : public TestCommand
         }
         case 120: {
             LogStep(120, "23d:Reads OnOff attribute from DUT");
-            VerifyOrDo(!ShouldSkip("A_ONOFF"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            VerifyOrDo(!ShouldSkip("OO.S.A0000"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), OnOff::Id, OnOff::Attributes::OnOff::Id, true, chip::NullOptional);
         }
         case 121: {
             LogStep(121, "23d:Reads OnTime attribute from DUT");
-            VerifyOrDo(!ShouldSkip("A_ONTIME"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            VerifyOrDo(!ShouldSkip("OO.S.A4001"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), OnOff::Id, OnOff::Attributes::OnTime::Id, true,
                                  chip::NullOptional);
         }
         case 122: {
             LogStep(122, "23d:Reads OffWaitTime attribute from DUT");
-            VerifyOrDo(!ShouldSkip("A_OFFWAITTIME"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            VerifyOrDo(!ShouldSkip("OO.S.A4002"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), OnOff::Id, OnOff::Attributes::OffWaitTime::Id, true,
                                  chip::NullOptional);
         }
         case 123: {
             LogStep(123, "24a:Sends OnWithTimedOff command to DUT");
-            VerifyOrDo(!ShouldSkip("CR_ONWITHTIMEOFF"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            VerifyOrDo(!ShouldSkip("OO.S.C42.Rsp"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             chip::app::Clusters::OnOff::Commands::OnWithTimedOff::Type value;
             value.onOffControl = static_cast<chip::BitMask<chip::app::Clusters::OnOff::OnOffControl>>(0U);
@@ -84370,18 +84470,18 @@ class Test_TC_OO_2_3Suite : public TestCommand
         }
         case 124: {
             LogStep(124, "24b:Reads OnOff attribute from DUT");
-            VerifyOrDo(!ShouldSkip("A_ONOFF"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            VerifyOrDo(!ShouldSkip("OO.S.A0000"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), OnOff::Id, OnOff::Attributes::OnOff::Id, true, chip::NullOptional);
         }
         case 125: {
             LogStep(125, "24b:Reads OnTime attribute from DUT");
-            VerifyOrDo(!ShouldSkip("A_ONTIME"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            VerifyOrDo(!ShouldSkip("OO.S.A4001"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), OnOff::Id, OnOff::Attributes::OnTime::Id, true,
                                  chip::NullOptional);
         }
         case 126: {
             LogStep(126, "24b:Reads OffWaitTime attribute from DUT");
-            VerifyOrDo(!ShouldSkip("A_OFFWAITTIME"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            VerifyOrDo(!ShouldSkip("OO.S.A4002"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), OnOff::Id, OnOff::Attributes::OffWaitTime::Id, true,
                                  chip::NullOptional);
         }
@@ -84394,24 +84494,24 @@ class Test_TC_OO_2_3Suite : public TestCommand
         }
         case 128: {
             LogStep(128, "24c:Reads OnOff attribute from DUT");
-            VerifyOrDo(!ShouldSkip("A_ONOFF"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            VerifyOrDo(!ShouldSkip("OO.S.A0000"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), OnOff::Id, OnOff::Attributes::OnOff::Id, true, chip::NullOptional);
         }
         case 129: {
             LogStep(129, "24c:Reads OnTime attribute from DUT");
-            VerifyOrDo(!ShouldSkip("A_ONTIME"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            VerifyOrDo(!ShouldSkip("OO.S.A4001"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), OnOff::Id, OnOff::Attributes::OnTime::Id, true,
                                  chip::NullOptional);
         }
         case 130: {
             LogStep(130, "24c:Reads OffWaitTime attribute from DUT");
-            VerifyOrDo(!ShouldSkip("A_OFFWAITTIME"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            VerifyOrDo(!ShouldSkip("OO.S.A4002"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), OnOff::Id, OnOff::Attributes::OffWaitTime::Id, true,
                                  chip::NullOptional);
         }
         case 131: {
             LogStep(131, "Send Off Command");
-            VerifyOrDo(!ShouldSkip("CR_OFF"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            VerifyOrDo(!ShouldSkip("OO.S.C00.Rsp"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             chip::app::Clusters::OnOff::Commands::Off::Type value;
             return SendCommand(kIdentityAlpha, GetEndpoint(1), OnOff::Id, OnOff::Commands::Off::Id, value, chip::NullOptional
@@ -84645,6 +84745,7 @@ class Test_TC_RH_2_2Suite : public TestCommand
         }
         case 1: {
             LogStep(1, "Reads constraints of attribute: MinMeasuredValue");
+            VerifyOrDo(!ShouldSkip("RH.S.A0001"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), RelativeHumidityMeasurement::Id,
                                  RelativeHumidityMeasurement::Attributes::MinMeasuredValue::Id, true, chip::NullOptional);
         }
@@ -84656,13 +84757,13 @@ class Test_TC_RH_2_2Suite : public TestCommand
         }
         case 3: {
             LogStep(3, "Reads MeasuredValue attribute from DUT");
-            VerifyOrDo(!ShouldSkip("A_RELATIVEHUMIDITY"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            VerifyOrDo(!ShouldSkip("RH.S.A0000"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), RelativeHumidityMeasurement::Id,
                                  RelativeHumidityMeasurement::Attributes::MeasuredValue::Id, true, chip::NullOptional);
         }
         case 4: {
             LogStep(4, "Operate on device to change the relative humidity significantly");
-            VerifyOrDo(!ShouldSkip("PICS_USER_PROMPT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            VerifyOrDo(!ShouldSkip("PICS_USER_PROMPT && RH.M.ManuallyControlled"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
             value.message = chip::Span<const char>("Please enter 'y' for successgarbage: not in length on purpose", 28);
@@ -84672,7 +84773,7 @@ class Test_TC_RH_2_2Suite : public TestCommand
         }
         case 5: {
             LogStep(5, "Read the mandatory attribute: MeasuredValue");
-            VerifyOrDo(!ShouldSkip("A_RELATIVEHUMIDITY"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            VerifyOrDo(!ShouldSkip("RH.S.A0000"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), RelativeHumidityMeasurement::Id,
                                  RelativeHumidityMeasurement::Attributes::MeasuredValue::Id, true, chip::NullOptional);
         }
@@ -85069,23 +85170,25 @@ class Test_TC_TM_2_2Suite : public TestCommand
         }
         case 1: {
             LogStep(1, "read the mandatory attribute: MinMeasuredValue");
+            VerifyOrDo(!ShouldSkip("TM.S.A0001"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TemperatureMeasurement::Id,
                                  TemperatureMeasurement::Attributes::MinMeasuredValue::Id, true, chip::NullOptional);
         }
         case 2: {
             LogStep(2, "read the mandatory attribute: MaxMeasuredValue");
+            VerifyOrDo(!ShouldSkip("TM.S.A0002"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TemperatureMeasurement::Id,
                                  TemperatureMeasurement::Attributes::MaxMeasuredValue::Id, true, chip::NullOptional);
         }
         case 3: {
             LogStep(3, "Reads MeasuredValue attribute from DUT");
-            VerifyOrDo(!ShouldSkip("A_TEMPERATURE"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            VerifyOrDo(!ShouldSkip("TM.S.A0000"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TemperatureMeasurement::Id,
                                  TemperatureMeasurement::Attributes::MeasuredValue::Id, true, chip::NullOptional);
         }
         case 4: {
             LogStep(4, "Operate on device to change the temperature significantly");
-            VerifyOrDo(!ShouldSkip("PICS_USER_PROMPT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            VerifyOrDo(!ShouldSkip("PICS_USER_PROMPT && TM.M.ManuallyControlled"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
             value.message = chip::Span<const char>("Please enter 'y' for successgarbage: not in length on purpose", 28);
@@ -85095,7 +85198,7 @@ class Test_TC_TM_2_2Suite : public TestCommand
         }
         case 5: {
             LogStep(5, "Read the mandatory attribute: MeasuredValue");
-            VerifyOrDo(!ShouldSkip("A_TEMPERATURE"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            VerifyOrDo(!ShouldSkip("TM.S.A0000"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TemperatureMeasurement::Id,
                                  TemperatureMeasurement::Attributes::MeasuredValue::Id, true, chip::NullOptional);
         }
@@ -85895,6 +85998,62 @@ class Test_TC_ACT_3_1Suite : public TestCommand
     }
 };
 
+class Test_TC_ACT_3_2Suite : public TestCommand
+{
+public:
+    Test_TC_ACT_3_2Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_ACT_3_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_ACT_3_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_TFL_1_1Suite : public TestCommand
 {
 public:
@@ -87334,6 +87493,7 @@ void registerCommandsTests(Commands & commands, CredentialIssuerCommands * creds
         make_unique<Test_TC_DA_1_4Suite>(credsIssuerConfig),
         make_unique<Test_TC_DA_1_5Suite>(credsIssuerConfig),
         make_unique<Test_TC_DA_1_6Suite>(credsIssuerConfig),
+        make_unique<Test_TC_DA_1_7Suite>(credsIssuerConfig),
         make_unique<Test_TC_BINFO_1_1Suite>(credsIssuerConfig),
         make_unique<Test_TC_OPCREDS_1_2Suite>(credsIssuerConfig),
         make_unique<Test_TC_CNET_1_3Suite>(credsIssuerConfig),
@@ -87564,6 +87724,7 @@ void registerCommandsTests(Commands & commands, CredentialIssuerCommands * creds
         make_unique<Test_TC_ACT_2_1Suite>(credsIssuerConfig),
         make_unique<Test_TC_ACT_2_2Suite>(credsIssuerConfig),
         make_unique<Test_TC_ACT_3_1Suite>(credsIssuerConfig),
+        make_unique<Test_TC_ACT_3_2Suite>(credsIssuerConfig),
         make_unique<Test_TC_TFL_1_1Suite>(credsIssuerConfig),
         make_unique<Test_TC_TFL_1_2Suite>(credsIssuerConfig),
         make_unique<Test_TC_TFL_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 b2a264b17b6ebf..66a05f926187f7 100644
--- a/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h
+++ b/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h
@@ -2315,6 +2315,10 @@ class Test_TC_BOOL_2_1 : public TestCommandBridge {
             break;
         case 1:
             ChipLogProgress(chipTool, " ***** Test Step 1 : Read mandatory non-global attribute: StateValue\n");
+            if (ShouldSkip("BOOL.S.A0000")) {
+                NextTest();
+                return;
+            }
             err = TestReadMandatoryNonGlobalAttributeStateValue_1();
             break;
         }
@@ -36129,22 +36133,42 @@ class Test_TC_OO_2_1 : public TestCommandBridge {
             break;
         case 1:
             ChipLogProgress(chipTool, " ***** Test Step 1 : read the mandatory attribute: OnOff\n");
+            if (ShouldSkip("OO.S.A0000")) {
+                NextTest();
+                return;
+            }
             err = TestReadTheMandatoryAttributeOnOff_1();
             break;
         case 2:
             ChipLogProgress(chipTool, " ***** Test Step 2 : read LT attribute: GlobalSceneControl\n");
+            if (ShouldSkip("OO.S.A4000")) {
+                NextTest();
+                return;
+            }
             err = TestReadLtAttributeGlobalSceneControl_2();
             break;
         case 3:
             ChipLogProgress(chipTool, " ***** Test Step 3 : read LT attribute: OnTime\n");
+            if (ShouldSkip("OO.S.A4001")) {
+                NextTest();
+                return;
+            }
             err = TestReadLtAttributeOnTime_3();
             break;
         case 4:
             ChipLogProgress(chipTool, " ***** Test Step 4 : read LT attribute: OffWaitTime\n");
+            if (ShouldSkip("OO.S.A4002")) {
+                NextTest();
+                return;
+            }
             err = TestReadLtAttributeOffWaitTime_4();
             break;
         case 5:
             ChipLogProgress(chipTool, " ***** Test Step 5 : read LT attribute: StartUpOnOff\n");
+            if (ShouldSkip("OO.S.A4003")) {
+                NextTest();
+                return;
+            }
             err = TestReadLtAttributeStartUpOnOff_5();
             break;
         }
@@ -36362,46 +36386,90 @@ class Test_TC_OO_2_2 : public TestCommandBridge {
             break;
         case 1:
             ChipLogProgress(chipTool, " ***** Test Step 1 : Send Off Command\n");
+            if (ShouldSkip("OO.S.C00.Rsp")) {
+                NextTest();
+                return;
+            }
             err = TestSendOffCommand_1();
             break;
         case 2:
             ChipLogProgress(chipTool, " ***** Test Step 2 : Check on/off attribute value is false after off command\n");
+            if (ShouldSkip("OO.S.A0000")) {
+                NextTest();
+                return;
+            }
             err = TestCheckOnOffAttributeValueIsFalseAfterOffCommand_2();
             break;
         case 3:
             ChipLogProgress(chipTool, " ***** Test Step 3 : Send On Command\n");
+            if (ShouldSkip("OO.S.C01.Rsp")) {
+                NextTest();
+                return;
+            }
             err = TestSendOnCommand_3();
             break;
         case 4:
             ChipLogProgress(chipTool, " ***** Test Step 4 : Check on/off attribute value is true after on command\n");
+            if (ShouldSkip("OO.S.A0000")) {
+                NextTest();
+                return;
+            }
             err = TestCheckOnOffAttributeValueIsTrueAfterOnCommand_4();
             break;
         case 5:
             ChipLogProgress(chipTool, " ***** Test Step 5 : Send On Command\n");
+            if (ShouldSkip("OO.S.C01.Rsp")) {
+                NextTest();
+                return;
+            }
             err = TestSendOnCommand_5();
             break;
         case 6:
             ChipLogProgress(chipTool, " ***** Test Step 6 : Check on/off attribute value is true after on command\n");
+            if (ShouldSkip("OO.S.A0000")) {
+                NextTest();
+                return;
+            }
             err = TestCheckOnOffAttributeValueIsTrueAfterOnCommand_6();
             break;
         case 7:
             ChipLogProgress(chipTool, " ***** Test Step 7 : Send Off Command\n");
+            if (ShouldSkip("OO.S.C00.Rsp")) {
+                NextTest();
+                return;
+            }
             err = TestSendOffCommand_7();
             break;
         case 8:
             ChipLogProgress(chipTool, " ***** Test Step 8 : Check on/off attribute value is false after off command\n");
+            if (ShouldSkip("OO.S.A0000")) {
+                NextTest();
+                return;
+            }
             err = TestCheckOnOffAttributeValueIsFalseAfterOffCommand_8();
             break;
         case 9:
             ChipLogProgress(chipTool, " ***** Test Step 9 : Send Off Command\n");
+            if (ShouldSkip("OO.S.C00.Rsp")) {
+                NextTest();
+                return;
+            }
             err = TestSendOffCommand_9();
             break;
         case 10:
             ChipLogProgress(chipTool, " ***** Test Step 10 : Check on/off attribute value is false after off command\n");
+            if (ShouldSkip("OO.S.A0000")) {
+                NextTest();
+                return;
+            }
             err = TestCheckOnOffAttributeValueIsFalseAfterOffCommand_10();
             break;
         case 11:
             ChipLogProgress(chipTool, " ***** Test Step 11 : Send Toggle Command\n");
+            if (ShouldSkip("OO.S.C02.Rsp")) {
+                NextTest();
+                return;
+            }
             err = TestSendToggleCommand_11();
             break;
         case 12:
@@ -36410,10 +36478,18 @@ class Test_TC_OO_2_2 : public TestCommandBridge {
             break;
         case 13:
             ChipLogProgress(chipTool, " ***** Test Step 13 : Check on/off attribute value is true after toggle command\n");
+            if (ShouldSkip("OO.S.A0000")) {
+                NextTest();
+                return;
+            }
             err = TestCheckOnOffAttributeValueIsTrueAfterToggleCommand_13();
             break;
         case 14:
             ChipLogProgress(chipTool, " ***** Test Step 14 : Send Toggle Command\n");
+            if (ShouldSkip("OO.S.C02.Rsp")) {
+                NextTest();
+                return;
+            }
             err = TestSendToggleCommand_14();
             break;
         case 15:
@@ -36422,11 +36498,15 @@ class Test_TC_OO_2_2 : public TestCommandBridge {
             break;
         case 16:
             ChipLogProgress(chipTool, " ***** Test Step 16 : Check on/off attribute value is false after toggle command\n");
+            if (ShouldSkip("OO.S.A0000")) {
+                NextTest();
+                return;
+            }
             err = TestCheckOnOffAttributeValueIsFalseAfterToggleCommand_16();
             break;
         case 17:
             ChipLogProgress(chipTool, " ***** Test Step 17 : Operate on device to set OnOff attribute manually to on\n");
-            if (ShouldSkip("PICS_USER_PROMPT")) {
+            if (ShouldSkip("PICS_USER_PROMPT && OO.M.ManuallyControlled")) {
                 NextTest();
                 return;
             }
@@ -36442,7 +36522,7 @@ class Test_TC_OO_2_2 : public TestCommandBridge {
             break;
         case 19:
             ChipLogProgress(chipTool, " ***** Test Step 19 : Operate on device to set OnOff attribute manually to off\n");
-            if (ShouldSkip("PICS_USER_PROMPT")) {
+            if (ShouldSkip("PICS_USER_PROMPT && OO.M.ManuallyControlled")) {
                 NextTest();
                 return;
             }
@@ -36458,10 +36538,18 @@ class Test_TC_OO_2_2 : public TestCommandBridge {
             break;
         case 21:
             ChipLogProgress(chipTool, " ***** Test Step 21 : Reset Off Command\n");
+            if (ShouldSkip("OO.S.C00.Rsp")) {
+                NextTest();
+                return;
+            }
             err = TestResetOffCommand_21();
             break;
         case 22:
             ChipLogProgress(chipTool, " ***** Test Step 22 : Check on/off attribute value is false after off command\n");
+            if (ShouldSkip("OO.S.A0000")) {
+                NextTest();
+                return;
+            }
             err = TestCheckOnOffAttributeValueIsFalseAfterOffCommand_22();
             break;
         }
@@ -37004,10 +37092,18 @@ class Test_TC_OO_2_4 : public TestCommandBridge {
             break;
         case 1:
             ChipLogProgress(chipTool, " ***** Test Step 1 : TH sends On command to DUT\n");
+            if (ShouldSkip("OO.S.C01.Rsp")) {
+                NextTest();
+                return;
+            }
             err = TestThSendsOnCommandToDut_1();
             break;
         case 2:
             ChipLogProgress(chipTool, " ***** Test Step 2 : TH writes a value of 0 to StartUpOnOff attribute of DUT\n");
+            if (ShouldSkip("OO.S.A4003")) {
+                NextTest();
+                return;
+            }
             err = TestThWritesAValueOf0ToStartUpOnOffAttributeOfDut_2();
             break;
         case 3:
@@ -37032,10 +37128,18 @@ class Test_TC_OO_2_4 : public TestCommandBridge {
             break;
         case 6:
             ChipLogProgress(chipTool, " ***** Test Step 6 : TH reads the OnOff attribute from the DUT\n");
+            if (ShouldSkip("OO.S.A0000")) {
+                NextTest();
+                return;
+            }
             err = TestThReadsTheOnOffAttributeFromTheDut_6();
             break;
         case 7:
             ChipLogProgress(chipTool, " ***** Test Step 7 : TH writes a value of 1 to StartUpOnOff attribute of DUT\n");
+            if (ShouldSkip("OO.S.A4003")) {
+                NextTest();
+                return;
+            }
             err = TestThWritesAValueOf1ToStartUpOnOffAttributeOfDut_7();
             break;
         case 8:
@@ -37060,10 +37164,18 @@ class Test_TC_OO_2_4 : public TestCommandBridge {
             break;
         case 11:
             ChipLogProgress(chipTool, " ***** Test Step 11 : TH reads the OnOff attribute from the DUT\n");
+            if (ShouldSkip("OO.S.A0000")) {
+                NextTest();
+                return;
+            }
             err = TestThReadsTheOnOffAttributeFromTheDut_11();
             break;
         case 12:
             ChipLogProgress(chipTool, " ***** Test Step 12 : TH writes a value of 2 to StartUpOnOff attribute of DUT\n");
+            if (ShouldSkip("OO.S.A4003")) {
+                NextTest();
+                return;
+            }
             err = TestThWritesAValueOf2ToStartUpOnOffAttributeOfDut_12();
             break;
         case 13:
@@ -37088,6 +37200,10 @@ class Test_TC_OO_2_4 : public TestCommandBridge {
             break;
         case 16:
             ChipLogProgress(chipTool, " ***** Test Step 16 : TH reads the OnOff attribute from the DUT\n");
+            if (ShouldSkip("OO.S.A0000")) {
+                NextTest();
+                return;
+            }
             err = TestThReadsTheOnOffAttributeFromTheDut_16();
             break;
         case 17:
@@ -37112,10 +37228,18 @@ class Test_TC_OO_2_4 : public TestCommandBridge {
             break;
         case 20:
             ChipLogProgress(chipTool, " ***** Test Step 20 : TH reads the OnOff attribute from the DUT\n");
+            if (ShouldSkip("OO.S.A0000")) {
+                NextTest();
+                return;
+            }
             err = TestThReadsTheOnOffAttributeFromTheDut_20();
             break;
         case 21:
             ChipLogProgress(chipTool, " ***** Test Step 21 : TH writes NULL to StartUpOnOff attribute of DUT\n");
+            if (ShouldSkip("OO.S.A4003")) {
+                NextTest();
+                return;
+            }
             err = TestThWritesNullToStartUpOnOffAttributeOfDut_21();
             break;
         case 22:
@@ -37140,10 +37264,18 @@ class Test_TC_OO_2_4 : public TestCommandBridge {
             break;
         case 25:
             ChipLogProgress(chipTool, " ***** Test Step 25 : TH reads the OnOff attribute from the DUT\n");
+            if (ShouldSkip("OO.S.A0000")) {
+                NextTest();
+                return;
+            }
             err = TestThReadsTheOnOffAttributeFromTheDut_25();
             break;
         case 26:
             ChipLogProgress(chipTool, " ***** Test Step 26 : TH sends Off command to DUT\n");
+            if (ShouldSkip("OO.S.C00.Rsp")) {
+                NextTest();
+                return;
+            }
             err = TestThSendsOffCommandToDut_26();
             break;
         case 27:
@@ -37168,6 +37300,10 @@ class Test_TC_OO_2_4 : public TestCommandBridge {
             break;
         case 30:
             ChipLogProgress(chipTool, " ***** Test Step 30 : TH reads the OnOff attribute from the DUT\n");
+            if (ShouldSkip("OO.S.A0000")) {
+                NextTest();
+                return;
+            }
             err = TestThReadsTheOnOffAttributeFromTheDut_30();
             break;
         }
@@ -42843,10 +42979,18 @@ class Test_TC_RH_2_1 : public TestCommandBridge {
             break;
         case 1:
             ChipLogProgress(chipTool, " ***** Test Step 1 : Reads constraints of attribute: MeasuredValue\n");
+            if (ShouldSkip("RH.S.A0000")) {
+                NextTest();
+                return;
+            }
             err = TestReadsConstraintsOfAttributeMeasuredValue_1();
             break;
         case 2:
             ChipLogProgress(chipTool, " ***** Test Step 2 : Reads constraints of attribute: MinMeasuredValue\n");
+            if (ShouldSkip("RH.S.A0001")) {
+                NextTest();
+                return;
+            }
             err = TestReadsConstraintsOfAttributeMinMeasuredValue_2();
             break;
         case 3:
@@ -42855,6 +42999,10 @@ class Test_TC_RH_2_1 : public TestCommandBridge {
             break;
         case 4:
             ChipLogProgress(chipTool, " ***** Test Step 4 : Reads constraints of attribute: Tolerance\n");
+            if (ShouldSkip("RH.S.A0003")) {
+                NextTest();
+                return;
+            }
             err = TestReadsConstraintsOfAttributeTolerance_4();
             break;
         }
@@ -43514,18 +43662,34 @@ class Test_TC_TM_2_1 : public TestCommandBridge {
             break;
         case 1:
             ChipLogProgress(chipTool, " ***** Test Step 1 : read the mandatory attribute: MeasuredValue\n");
+            if (ShouldSkip("TM.S.A0000")) {
+                NextTest();
+                return;
+            }
             err = TestReadTheMandatoryAttributeMeasuredValue_1();
             break;
         case 2:
             ChipLogProgress(chipTool, " ***** Test Step 2 : read the mandatory attribute: MinMeasuredValue\n");
+            if (ShouldSkip("TM.S.A0001")) {
+                NextTest();
+                return;
+            }
             err = TestReadTheMandatoryAttributeMinMeasuredValue_2();
             break;
         case 3:
             ChipLogProgress(chipTool, " ***** Test Step 3 : read the mandatory attribute: MaxMeasuredValue\n");
+            if (ShouldSkip("TM.S.A0002")) {
+                NextTest();
+                return;
+            }
             err = TestReadTheMandatoryAttributeMaxMeasuredValue_3();
             break;
         case 4:
             ChipLogProgress(chipTool, " ***** Test Step 4 : read the optional attribute: Tolerance\n");
+            if (ShouldSkip("TM.S.A0003")) {
+                NextTest();
+                return;
+            }
             err = TestReadTheOptionalAttributeTolerance_4();
             break;
         }