Updated Manual scripts Aug3 (#21575)

* Added Manual scripts

* Added Auto generated file

* Restyled by whitespace

* Restyled by clang-format

* Added Auto generated file

* Restyled by clang-format

Co-authored-by: Restyled.io <commits@restyled.io>
diff --git a/src/app/tests/suites/certification/PICS.yaml b/src/app/tests/suites/certification/PICS.yaml
index 2ce8bdb..52b0b8d 100644
--- a/src/app/tests/suites/certification/PICS.yaml
+++ b/src/app/tests/suites/certification/PICS.yaml
@@ -2490,6 +2490,20 @@
           its bridged devices, e.g. through a manufacturer-provided app"
       id: MCORE.BRIDGE.AllowDeviceRename
 
+    - label: "Does the DUT support to maintain a list of connected devices"
+      id: MCORE.DEVLIST.UseDevices
+
+    - label: "Does the DUT support to maintain the names of connected devices"
+      id: MCORE.DEVLIST.UseDeviceNames
+
+    - label: "Does the DUT support to maintain the state of connected devices"
+      id: MCORE.DEVLIST.UseDeviceState
+
+    - label:
+          "Does the DUT support maintaining information on battery level of
+          connected devices"
+      id: MCORE.DEVLIST.UseBatInfo
+
     #Bulk Data Exchange Protocol
     - label: "Does the DUT control the rate of the BDX transfer ?"
       id: MCORE.BDX.Driver
@@ -2846,6 +2860,15 @@
     - label: "A replaceable battery power source (requires Battery feature)"
       id: PS.S.F03
 
+    - label: "Can the DUT be brought into a Wired Fault state?"
+      id: PS.M.ManualWiredFault
+
+    - label: "Can the DUT be brought into a Battery Fault state?"
+      id: PS.M.ManualBatFault
+
+    - label: "Can the DUT be brought into a Battery Charge Fault state?"
+      id: PS.M.ManualBatChargeFault
+
     #Thermostat User Configuration Cluster
     - label: "Does the device implement the TemperatureDisplayMode attribute?"
       id: TSUIC.S.A0000
@@ -2926,6 +2949,11 @@
     - label: "Is the DUT a Controller?"
       id: MCORE.DD.CONTROLLER
 
+    - label:
+          "Does the commissioner support processing devices in the order as
+          indicated in the concatenated QR codes?"
+      id: MCORE.DD.CTRL_CONCATENATED_QR_CODE_1_INORDER
+
     - label: "Does the DUT support scanning concatenated QR codes?"
       id: MCORE.DD.CTRL_CONCATENATED_QR_CODE_1
 
@@ -2993,6 +3021,24 @@
       id: MCORE.DD.WIRELESS
 
     - label:
+          "Does the device support Wi-Fi or Thread interfaces communication ?"
+      id: MCORE.COM.WIRELESS
+
+    - label:
+          "Does the device support communication over Bluetooth Low Energy (BLE)
+          ?"
+      id: MCORE.COM.BLE
+
+    - label: "Does the device support communication over Wi-Fi ?"
+      id: MCORE.COM.WIFI
+
+    - label: "Does the device support communication over Ethernet ?"
+      id: MCORE.COM.ETH
+
+    - label: "Does the device support communication over Thread ?"
+      id: MCORE.COM.THR
+
+    - label:
           "Does the device support TXT Key 'VP' (Vendor ID / Product ID) in it’s
           DNS-SD TXT Records for Commissionable Node Discovery?"
       id: MCORE.DD.TXT_KEY_VP
@@ -3052,6 +3098,9 @@
     - label: "Does the device implement the ResetCounts command?"
       id: DGETH.S.C00.Rsp
 
+    - label: "Does the device implement the ResetCounts command?"
+      id: DGETH.C.C00.Tx
+
     - label: "Does the device implement the PHYRate attribute?"
       id: DGETH.S.A0000
 
@@ -4877,6 +4926,19 @@
           mDNS?"
       id: MCORE.SC.PI_KEY
 
+    - label:
+          "Does device support Extended Discovery for Commissionable Node
+          Discovery?"
+      id: MCORE.SC.EXTENDED_DISCOVERY
+
+    - label:
+          "Does device support Extended Discovery for Commissionable Node
+          Discovery?"
+      id: MCORE.SC.SED
+
+    - label: "Does the Controller DUT support Service Advertising?"
+      id: MCORE.SC.ADV
+
     #133.1. Bridged Device Basic Information Cluster
     - label: "Does the DUT(server) support the DataModelRevision attribute?"
       id: BRBINFO.S.A0000
@@ -5024,3 +5086,192 @@
 
     - label: "Does the DUT(Client) support the ReachableChanged event?"
       id: BRBINFO.C.E03
+
+    #Interaction Data Model
+    - label:
+          "Is the device a Client and Supports sending a Invoke Request Message"
+      id: MCORE.IDM.C.InvokeRequest
+
+    - label:
+          "Is the device a Client and Supports sending a Read Request Message"
+      id: MCORE.IDM.C.ReadRequest
+
+    - label:
+          "Is the device a Client and Supports sending a Write Request Message"
+      id: MCORE.IDM.C.WriteRequest
+
+    - label:
+          "Is the device a Client and Supports sending a Subscribe Request
+          Message"
+      id: MCORE.IDM.C.SubscribeRequest
+
+    - label: "Is the device a Server and supports an attribute of DataType Bool"
+      id: MCORE.IDM.S.Attribute.DataType_Bool
+
+    - label:
+          "Is the device a Server and supports an attribute of DataType String"
+      id: MCORE.IDM.S.Attribute.DataType_String
+
+    - label:
+          "Is the device a Server and supports an attribute of DataType Unsigned
+          Integer"
+      id: MCORE.IDM.S.Attribute.DataType_UnsignedInteger
+
+    - label:
+          "Is the device a Server and supports an attribute of DataType Signed
+          Integer"
+      id: MCORE.IDM.S.Attribute.DataType_SignedInteger
+
+    - label:
+          "Is the device a Server and supports an attribute of DataType Struct"
+      id: MCORE.IDM.S.Attribute.DataType_Struct
+
+    - label:
+          "Is the device a Server and supports an attribute of DataType Floating
+          Point"
+      id: MCORE.IDM.S.Attribute.DataType_FloatingPoint
+
+    - label: "Is the device a Server and supports an attribute of DataType List"
+      id: MCORE.IDM.S.Attribute.DataType_List
+
+    - label:
+          "Is the device a Server and supports an attribute of DataType Octet
+          String"
+      id: MCORE.IDM.S.Attribute.DataType_OctetString
+
+    - label: "Is the device a Server and supports an attribute of DataType Enum"
+      id: MCORE.IDM.S.Attribute.DataType_Enum
+
+    - label:
+          "Is the device a Server and supports an attribute of DataType Bitmap"
+      id: MCORE.IDM.S.Attribute.DataType_Bitmap
+
+    - label:
+          "Is the device a Client and supports Reading an attribute of DataType
+          Bool"
+      id: MCORE.IDM.C.ReadRequest.Attribute.DataType_Bool
+
+    - label:
+          "Is the device a Client and supports Reading an attribute of DataType
+          String"
+      id: MCORE.IDM.C.ReadRequest.Attribute.DataType_String
+
+    - label:
+          "Is the device a Client and supports Reading an attribute of DataType
+          Unsigned Integer"
+      id: MCORE.IDM.C.ReadRequest.Attribute.DataType_UnsignedInteger
+
+    - label:
+          "Is the device a Client and supports Reading an attribute of DataType
+          Signed Integer"
+      id: MCORE.IDM.C.ReadRequest.Attribute.DataType_SignedInteger
+
+    - label:
+          "Is the device a Client and supports Reading an attribute of DataType
+          Struct"
+      id: MCORE.IDM.C.ReadRequest.Attribute.DataType_Struct
+
+    - label:
+          "Is the device a Client and supports Reading an attribute of DataType
+          Floating Point"
+      id: MCORE.IDM.C.ReadRequest.Attribute.DataType_FloatingPoint
+
+    - label:
+          "Is the device a Client and supports Reading an attribute of DataType
+          List"
+      id: MCORE.IDM.C.ReadRequest.Attribute.DataType_List
+
+    - label:
+          "Is the device a Client and supports Reading an attribute of DataType
+          Octet String"
+      id: MCORE.IDM.C.ReadRequest.Attribute.DataType_OctetString
+
+    - label:
+          "Is the device a Client and supports Reading an attribute of DataType
+          Enum"
+      id: MCORE.IDM.C.ReadRequest.Attribute.DataType_Enum
+
+    - label:
+          "Is the device a Client and supports Reading an attribute of DataType
+          Bitmap"
+      id: MCORE.IDM.C.ReadRequest.Attribute.DataType_Bitmap
+
+    - label:
+          "Is the device a Server and supports a writable attribute of DataType
+          Bool"
+      id: MCORE.IDM.S.Attribute_W.DataType_Bool
+
+    - label:
+          "Is the device a Server and supports a writable attribute of DataType
+          String"
+      id: MCORE.IDM.S.Attribute_W.DataType_String
+
+    - label:
+          "Is the device a Server and supports a writable attribute of DataType
+          UnsignedInteger"
+      id: MCORE.IDM.S.Attribute_W.DataType_UnsignedInteger
+
+    - label:
+          "Is the device a Server and supports a writable attribute of DataType
+          SignedInteger"
+      id: MCORE.IDM.S.Attribute_W.DataType_SignedInteger
+
+    - label:
+          "Is the device a Server and supports a writable attribute of DataType
+          Struct"
+      id: MCORE.IDM.S.Attribute_W.DataType_Struct
+
+    - label:
+          "Is the device a Server and supports a writable attribute of DataType
+          FloatingPoint"
+      id: MCORE.IDM.S.Attribute_W.DataType_FloatingPoint
+
+    - label:
+          "Is the device a Server and supports a writable attribute of DataType
+          List"
+      id: MCORE.IDM.S.Attribute_W.DataType_List
+
+    - label:
+          "Is the device a Server and supports a writable attribute of DataType
+          OctetString"
+      id: MCORE.IDM.S.Attribute_W.DataType_OctetString
+
+    - label:
+          "Is the device a Server and supports a writable attribute of DataType
+          Enum"
+      id: MCORE.IDM.S.Attribute_W.DataType_Enum
+
+    - label:
+          "Is the device a Server and supports a writable attribute of DataType
+          Bitmap"
+      id: MCORE.IDM.S.Attribute_W.DataType_Bitmap
+
+    - label:
+          "Is the device a Client and supports subscribing to an attribute of
+          DataType Bool"
+      id: MCORE.IDM.C.SubscribeRequest.Attribute.DataType_String
+
+    - label:
+          "Is the device a Client and supports subscribing to an attribute of
+          DataType UnsignedInteger"
+      id: MCORE.IDM.C.SubscribeRequest.Attribute.DataType_UnsignedInteger
+
+    - label:
+          "Is the device a Client and supports subscribing to an attribute of
+          DataType Integer"
+      id: MCORE.IDM.C.SubscribeRequest.Attribute.DataType_Integer
+
+    - label:
+          "Is the device a Client and supports subscribing to an attribute of
+          DataType FloatingPoint"
+      id: MCORE.IDM.C.SubscribeRequest.Attribute.DataType_FloatingPoint
+
+    - label:
+          "Is the device a Client and supports subscribing to an attribute of
+          DataType List"
+      id: MCORE.IDM.C.SubscribeRequest.Attribute.DataType_List
+
+    - label:
+          "Is the device a Server and capable of generating large data which is
+          greater than 1 MTU(1280 bytes)"
+      id: MCORE.IDM.S.LargeData
diff --git a/src/app/tests/suites/certification/Test_TC_BIND_1_1.yaml b/src/app/tests/suites/certification/Test_TC_BIND_1_1.yaml
index baa4897..db1cdb1 100644
--- a/src/app/tests/suites/certification/Test_TC_BIND_1_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_BIND_1_1.yaml
@@ -13,7 +13,10 @@
 # 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: 119.1.1. [TC-BIND-1.1] Global Attributes [DUT-Controllee]
+name: 120.1.1. [TC-BIND-1.1] Global Attributes [DUT-Controllee]
+
+PICS:
+    - BIND.S
 
 config:
     nodeId: 0x12344321
@@ -87,3 +90,307 @@
           [1653560872.884952][3458:3463] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_001E Attribute 0x0000_FFF8 DataVersion: 2519252823
           [1653560872.885073][3458:3463] CHIP:TOO:   GeneratedCommandList: 0 entries
       disabled: true
+
+    - label: "Factory Reset DUT"
+      verification: |
+          Vendor specific action, for chip-tool run
+          rm -rf /tmp/chip*
+      disabled: true
+
+    - label: "Commission DUT to TH1s fabric"
+      verification: |
+          ./chip-tool pairing onnetwork 1 20202021
+      disabled: true
+
+    - label: "Commission TH2 to TH1s fabric (Node ID = 2)"
+      verification: |
+          ./chip-tool pairing ble-wifi 2 chipsetup4 matter123 20202021 3840
+      disabled: true
+
+    - label: "Commission TH3 to TH1s fabric (Node ID = 3)"
+      verification: |
+          ./chip-tool pairing ble-wifi 3 chipsetup4 matter123 20202021 3841
+      disabled: true
+
+    - label:
+          "TH1 writes Binding entries into DUT on the endpoint with the On/Off
+          client with Entry 1: Node = 2 Cluster = 0x0006(onoff) Endpoint = 1
+          Entry 2: Node = 3 Cluster = 0x0006(onoff) Endpoint = 2 Note: Node 2
+          corresponds to TH2s Node ID Node 3 corresponds to TH3s Node ID"
+      verification: |
+          ./chip-tool binding write binding "[{"node" : 2 , "cluster" : "0x0006" , "endpoint" : 1 }, { "node" : 3 , "cluster" : "0x0006" , "endpoint" : 2  }]" 1 1
+
+
+
+
+          [1657797710.456056][3796:3801] CHIP:DMG:                                 status = 0x00 (SUCCESS),
+          MG:                                 status = 0x00 (SUCCESS),
+          [1657797710.457093][3796:3801] CHIP:DMG:                         },
+          [1657797710.457171][3796:3801] CHIP:DMG:
+          [1657797710.457232][3796:3801] CHIP:DMG:                 },
+          [1657797710.457318][3796:3801] CHIP:DMG:
+          [1               StatusIB =
+          [1657797710.458209][3796:3801] CHIP:DMG:                         {
+          [1657797710.458286][3796:3801] CHIP:DMG:                                 status = 0x00 (SUCCESS),
+          [1657797710.458369][3796:3801] CHIP:DMG:                         },
+          [1657797710.458444][3796:3801] CHIP:DMG:
+              pted msg 0xffff7e7cd9d8 with MessageCounter:161235290 to 0x0000000000000001 (1) at monotonic time: 000000000071D1BB msec
+          [1657797710.459711][3796:3801] CHIP:EM: Flushed pending ack for MessageCounter:23683634 on exchange 26818i
+      disabled: true
+
+    - label: "TH1 enables DUT as Controller"
+      verification: |
+          verification step to be updated.
+      disabled: true
+
+    - label: "DUT is triggered to send On command to its binding node entries"
+      PICS: OO.C.C01.Tx
+      verification: |
+          ./chip-tool accesscontrol write acl "[{"fabricIndex": 1, "privilege": 5, "authMode": 2, "subjects": [112233], "targets": null}, {"fabricIndex": 1, "privilege": 3, "authMode": 2, "subjects": [1], "targets": [{"cluster": 6, "endpoint": 1, "deviceType": null}]}]" 2 0
+
+          [1652330385.328196][3240:3245] CHIP:DMG:                        StatusIB =
+          [1652330385.328229][3240:3245] CHIP:DMG:                        {
+          [1652330385.328264][3240:3245] CHIP:DMG:                                status = 0x00 (SUCCESS),
+          [1652330385.328298][3240:3245] CHIP:DMG:                        },
+
+
+          ./chip-tool accesscontrol write acl "[{"fabricIndex": 1, "privilege": 5, "authMode": 2, "subjects": [112233], "targets": null}, {"fabricIndex": 1, "privilege": 3, "authMode": 2, "subjects": [1], "targets": [{"cluster": 6, "endpoint": 1, "deviceType": null}]}]" 3 0
+
+          [1650610345.847274][2626:2631] CHIP:DMG:                                StatusIB =
+          [1650610345.847317][2626:2631] CHIP:DMG:                                {
+          [1650610345.847383][2626:2631] CHIP:DMG:                                        status = 0x00 (SUCCESS),
+          [1650610345.847429][2626:2631] CHIP:DMG:                                },
+
+          DUT sends on command in the shell
+
+          > switch on
+          [1658837711.917557][4764:4764] CHIP:DMG: ICR moving to [AddingComm]
+          [1658837711.917653][4764:4764] CHIP:DMG: ICR moving to [AddedComma]
+          [1658837711.917869][4764:4764] CHIP:IN: Prepared secure message 0xaaaaf8a908f8 to 0x0000000000000046 (1)  of type 0x8 and protocolId (0, 1) on exchange 5086i with MessageCounter:188042572.
+          [1658837711.917966][4764:4764] CHIP:IN: Sending encrypted msg 0xaaaaf8a908f8 with MessageCounter:188042572 to 0x0000000000000046 (1) at monotonic time: 0000000001828F3D msec
+          [1658837711.918320][4764:4764] CHIP:DMG: ICR moving to [CommandSen]
+          [1658837711.918428][4764:4764] CHIP:DMG: ICR moving to [AddingComm]
+          [1658837711.918496][4764:4764] CHIP:DMG: ICR moving to [AddedComma]
+          [1658837711.918633][4764:4764] CHIP:IN: Prepared secure message 0xaaaaf8a733a8 to 0x0000000000000258 (1)  of type 0x8 and protocolId (0, 1) on exchange 5087i with MessageCounter:70524918.
+          [1658837711.918720][4764:4764] CHIP:IN: Sending encrypted msg 0xaaaaf8a733a8 with MessageCounter:70524918 to 0x0000000000000258 (1) at monotonic time: 0000000001828F3E msec
+          [1658837711.919011][4764:4764] CHIP:DMG: ICR moving to [CommandSen]
+          Done
+          > [1658837711.920333][4764:4764] CHIP:EM: Received message of type 0x9 with protocolId (0, 1) and MessageCounter:225570715 on exchange 5086i
+          [1658837711.920409][4764:4764] CHIP:EM: Found matching exchange: 5086i, Delegate: 0xaaaaf8a90220
+          [1658837711.920490][4764:4764] CHIP:EM: Rxd Ack; Removing MessageCounter:188042572 from Retrans Table on exchange 5086i
+          [1658837711.920598][4764:4764] CHIP:EM: Removed CHIP MessageCounter:188042572 from RetransTable on exchange 5086i
+          [1658837711.920673][4764:4764] CHIP:DMG: ICR moving to [ResponseRe]
+          [1658837711.920777][4764:4764] CHIP:DMG: InvokeResponseMessage =
+          [1658837711.920837][4764:4764] CHIP:DMG: {
+          [1658837711.920894][4764:4764] CHIP:DMG:        suppressResponse = false,
+          [1658837711.920954][4764:4764] CHIP:DMG:        InvokeResponseIBs =
+          [1658837711.921030][4764:4764] CHIP:DMG:        [
+          [1658837711.921089][4764:4764] CHIP:DMG:                InvokeResponseIB =
+          [1658837711.921166][4764:4764] CHIP:DMG:                {
+          [1658837711.921229][4764:4764] CHIP:DMG:                        CommandStatusIB =
+          [1658837711.921309][4764:4764] CHIP:DMG:                        {
+          [1658837711.921380][4764:4764] CHIP:DMG:                                CommandPathIB =
+          [1658837711.921462][4764:4764] CHIP:DMG:                                {
+          [1658837711.921543][4764:4764] CHIP:DMG:                                        EndpointId = 0x1,
+          [1658837711.921630][4764:4764] CHIP:DMG:                                        ClusterId = 0x6,
+          [1658837711.921714][4764:4764] CHIP:DMG:                                        CommandId = 0x1,
+          [1658837711.921801][4764:4764] CHIP:DMG:                                },
+          [1658837711.921889][4764:4764] CHIP:DMG:
+          [1658837711.921961][4764:4764] CHIP:DMG:                                StatusIB =
+          [1658837711.922050][4764:4764] CHIP:DMG:                                {
+          [1658837711.922139][4764:4764] CHIP:DMG:                                        status = 0x00 (SUCCESS),
+          [1658837711.922222][4764:4764] CHIP:DMG:                                },
+          [1658837711.922301][4764:4764] CHIP:DMG:
+          [1658837711.922374][4764:4764] CHIP:DMG:                        },
+          [1658837711.922456][4764:4764] CHIP:DMG:
+          [1658837711.922522][4764:4764] CHIP:DMG:                },
+          [1658837711.922596][4764:4764] CHIP:DMG:
+          [1658837711.922654][4764:4764] CHIP:DMG:        ],
+          [1658837711.922726][4764:4764] CHIP:DMG:
+          [1658837711.922786][4764:4764] CHIP:DMG:        InteractionModelRevision = 1
+          [1658837711.922844][4764:4764] CHIP:DMG: },
+          [1658837711.922978][4764:4764] CHIP:DMG: Received Command Response Status for Endpoint=1 Cluster=0x0000_0006 Command=0x0000_0001 Status=0x0
+          [1658837711.923042][4764:4764] CHIP:-: OnOff command succeeds
+          [1658837711.923125][4764:4764] CHIP:DMG: ICR moving to [AwaitingDe]
+          [1658837711.923188][4764:4764] CHIP:EM: Sending Standalone Ack for MessageCounter:225570715 on exchange 5086i
+          [1658837711.923300][4764:4764] CHIP:IN: Prepared secure message 0xffffc33c53d8 to 0x0000000000000046 (1)  of type 0x10 and protocolId (0, 0) on exchange 5086i with MessageCounter:188042573.
+          [1658837711.923385][4764:4764] CHIP:IN: Sending encrypted msg 0xffffc33c53d8 with MessageCounter:188042573 to 0x0000000000000046 (1) at monotonic time: 0000000001828F42 msec
+          [1658837711.923572][4764:4764] CHIP:EM: Flushed pending ack for MessageCounter:225570715 on exchange 5086i
+          [1658837711.926330][4764:4764] CHIP:EM: Received message of type 0x9 with protocolId (0, 1) and MessageCounter:32223638 on exchange 5087i
+          [1658837711.926404][4764:4764] CHIP:EM: Found matching exchange: 5087i, Delegate: 0xaaaaf8a8bb70
+          [1658837711.926475][4764:4764] CHIP:EM: Rxd Ack; Removing MessageCounter:70524918 from Retrans Table on exchange 5087i
+          [1658837711.926534][4764:4764] CHIP:EM: Removed CHIP MessageCounter:70524918 from RetransTable on exchange 5087i
+          [1658837711.926599][4764:4764] CHIP:DMG: ICR moving to [ResponseRe]
+          [1658837711.926687][4764:4764] CHIP:DMG: InvokeResponseMessage =
+          [1658837711.926744][4764:4764] CHIP:DMG: {
+          [1658837711.926800][4764:4764] CHIP:DMG:        suppressResponse = false,
+          [1658837711.926859][4764:4764] CHIP:DMG:        InvokeResponseIBs =
+          [1658837711.926932][4764:4764] CHIP:DMG:        [
+          [1658837711.926991][4764:4764] CHIP:DMG:                InvokeResponseIB =
+          [1658837711.927066][4764:4764] CHIP:DMG:                {
+          [1658837711.927128][4764:4764] CHIP:DMG:                        CommandStatusIB =
+          [1658837711.927310][4764:4764] CHIP:DMG:                        {
+          [1658837711.927388][4764:4764] CHIP:DMG:                                CommandPathIB =
+          [1658837711.927469][4764:4764] CHIP:DMG:                                {
+          [1658837711.927551][4764:4764] CHIP:DMG:                                        EndpointId = 0x1,
+          [1658837711.927638][4764:4764] CHIP:DMG:                                        ClusterId = 0x6,
+          [1658837711.927722][4764:4764] CHIP:DMG:                                        CommandId = 0x1,
+          [1658837711.927802][4764:4764] CHIP:DMG:                                },
+          [1658837711.927897][4764:4764] CHIP:DMG:
+          [1658837711.927970][4764:4764] CHIP:DMG:                                StatusIB =
+          [1658837711.928057][4764:4764] CHIP:DMG:                                {
+          [1658837711.928145][4764:4764] CHIP:DMG:                                        status = 0x00 (SUCCESS),
+          [1658837711.928222][4764:4764] CHIP:DMG:                                },
+          [1658837711.928303][4764:4764] CHIP:DMG:
+          [1658837711.928373][4764:4764] CHIP:DMG:                        },
+          [1658837711.928453][4764:4764] CHIP:DMG:
+          [1658837711.928515][4764:4764] CHIP:DMG:                },
+          [1658837711.928625][4764:4764] CHIP:DMG:
+          [1658837711.928686][4764:4764] CHIP:DMG:        ],
+          [1658837711.928757][4764:4764] CHIP:DMG:
+          [1658837711.928816][4764:4764] CHIP:DMG:        InteractionModelRevision = 1
+          [1658837711.928873][4764:4764] CHIP:DMG: },
+          [1658837711.928983][4764:4764] CHIP:DMG: Received Command Response Status for Endpoint=1 Cluster=0x0000_0006 Command=0x0000_0001 Status=0x0
+          [1658837711.929015][4764:4764] CHIP:-: OnOff command succeeds
+          [1658837711.929055][4764:4764] CHIP:DMG: ICR moving to [AwaitingDe]
+          [1658837711.929134][4764:4764] CHIP:EM: Sending Standalone Ack for MessageCounter:32223638 on exchange 5087i
+          [1658837711.929198][4764:4764] CHIP:IN: Prepared secure message 0xffffc33c53d8 to 0x0000000000000258 (1)  of type 0x10 and protocolId (0, 0) on exchange 5087i with MessageCounter:70524919.
+          [1658837711.929241][4764:4764] CHIP:IN: Sending encrypted msg 0xffffc33c53d8 with MessageCounter:70524919 to 0x0000000000000258 (1) at monotonic time: 0000000001828F48 msec
+          [1658837711.929336][4764:4764] CHIP:EM: Flushed pending ack for MessageCounter:32223638 on exchange 5087i
+      disabled: true
+
+    - label: "TH1 reads OnOff attribute from TH2 (Endpoint 1)"
+      PICS: OO.C.C01.Tx
+      verification: |
+          ./chip-tool onoff read on-off 2 1
+
+          [1657798291.396477][3835:3841] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0006 Attribute 0x0000_0000 DataVersion: 4260513117
+          [1657798291.396514][3835:3841] CHIP:TOO:   OnOff: TRUE
+
+          ./chip-tool onoff read on-off 3 2
+
+          [1657798691.194894][3869:3874] CHIP:TOO: Endpoint: 2 Cluster: 0x0000_0006 Attribute 0x0000_0000 DataVersion: 470320746
+          [1657798691.194948][3869:3874] CHIP:TOO:   OnOff: TRUE
+      disabled: true
+
+    - label: "TH1 removes second binding entry corresponding to TH3 from DUT"
+      verification: |
+          ./chip-tool binding write binding "[{"node" : 2 , "cluster" : "0x0006" , "endpoint" : 1 }]" 1 1
+
+          [1657800844.739833][4000:4006] CHIP:EM: Removed CHIP MessageCounter:244702117 from RetransTable on exchange 12653i
+          [1657800844.739867][4000:4006] CHIP:DMG: WriteClient moving to [ResponseRe]
+          [1657800844.739922][4000:4006] CHIP:DMG: WriteResponseMessage =
+          [1657800844.739949][4000:4006] CHIP:DMG: {
+          [1657800844.739990][4000:4006] CHIP:DMG:         AttributeStatusIBs =
+          [1657800844.740021][4000:4006] CHIP:DMG:         [
+          [1657800844.740057][4000:4006] CHIP:DMG:                 AttributeStatusIB =
+          [1657800844.740111][4000:4006] CHIP:DMG:                 {
+          [1657800844.740150][4000:4006] CHIP:DMG:                         AttributePathIB =
+          [1657800844.740195][4000:4006] CHIP:DMG:                         {
+          [1657800844.740230][4000:4006] CHIP:DMG:                                 Endpoint = 0x0,
+          [1657800844.740275][4000:4006] CHIP:DMG:                                 Cluster = 0x1e,
+          [1657800844.740322][4000:4006] CHIP:DMG:                                 Attribute = 0x0000_0000,
+          [1657800844.740359][4000:4006] CHIP:DMG:                         }
+          [1657800844.740405][4000:4006] CHIP:DMG:
+          [1657800844.740444][4000:4006] CHIP:DMG:                         StatusIB =
+          [1657800844.740477][4000:4006] CHIP:DMG:                         {
+          [1657800844.740516][4000:4006] CHIP:DMG:                                 status = 0x00 (SUCCESS),
+          [1657800844.740548][4000:4006] CHIP:DMG:                         },
+          [1657800844.740584][4000:4006] CHIP:DMG:
+          [1657800844.740607][4000:4006] CHIP:DMG:                 },
+          [1657800844.740653][4000:4006] CHIP:DMG:
+          [1657800844.740687][4000:4006] CHIP:DMG:                 AttributeStatusIB =
+          [1657800844.740714][4000:4006] CHIP:DMG:                 {
+          [1657800844.740748][4000:4006] CHIP:DMG:                         AttributePathIB =
+          [1657800844.740781][4000:4006] CHIP:DMG:                         {
+          [1657800844.740820][4000:4006] CHIP:DMG:                                 Endpoint = 0x0,
+          [1657800844.740858][4000:4006] CHIP:DMG:                                 Cluster = 0x1e,
+          [1657800844.740905][4000:4006] CHIP:DMG:                                 Attribute = 0x0000_0000,
+          [1657800844.740946][4000:4006] CHIP:DMG:                                 ListIndex = Null,
+          [1657800844.740981][4000:4006] CHIP:DMG:                         }
+          [1657800844.741025][4000:4006] CHIP:DMG:
+          [1657800844.741063][4000:4006] CHIP:DMG:                         StatusIB =
+          [1657800844.741094][4000:4006] CHIP:DMG:                         {
+          [1657800844.741133][4000:4006] CHIP:DMG:                                 status = 0x00 (SUCCESS),
+          [1657800844.741168][4000:4006] CHIP:DMG:                         },
+          [1657800844.741208][4000:4006] CHIP:DMG:
+          [1657800844.741241][4000:4006] CHIP:DMG:                 },
+          [1657800844.741272][4000:4006] CHIP:DMG:
+          [1657800844.741295][4000:4006] CHIP:DMG:         ],
+          [1657800844.741336][4000:4006] CHIP:DMG:
+          [1657800844.741369][4000:4006] CHIP:DMG:         InteractionModelRevision = 1
+          [1657800844.741392][4000:4006] CHIP:DMG: }
+          [1657800844.741511][4000:4006] CHIP:DMG: WriteClient moving to [AwaitingDe]
+          [1657800844.741591][4000:4006] CHIP:EM: Sending Standalone Ack for MessageCounter:142199059 on exchange 12653i
+      disabled: true
+
+    - label: "DUT is triggered to send off command to its binding entries"
+      PICS: OO.C.C00.Tx
+      verification: |
+          DUT sends off command in the shell
+
+          > switch off
+          [1658838896.810567][4764:4764] CHIP:DMG: ICR moving to [AddingComm]
+          [1658838896.810692][4764:4764] CHIP:DMG: ICR moving to [AddedComma]
+          [1658838896.810911][4764:4764] CHIP:IN: Prepared secure message 0xaaaaf8a8c0e8 to 0x0000000000000046 (1)  of type 0x8 and protocolId (0, 1) on exchange 5088i with MessageCounter:188042574.
+          [1658838896.811035][4764:4764] CHIP:IN: Sending encrypted msg 0xaaaaf8a8c0e8 with MessageCounter:188042574 to 0x0000000000000046 (1) at monotonic time: 000000000194A3BA msec
+          [1658838896.811427][4764:4764] CHIP:DMG: ICR moving to [CommandSen]
+          Done
+          > [1658838896.817922][4764:4764] CHIP:EM: Received message of type 0x9 with protocolId (0, 1) and MessageCounter:225570716 on exchange 5088i
+          [1658838896.817984][4764:4764] CHIP:EM: Found matching exchange: 5088i, Delegate: 0xaaaaf8a90220
+          [1658838896.818042][4764:4764] CHIP:EM: Rxd Ack; Removing MessageCounter:188042574 from Retrans Table on exchange 5088i
+          [1658838896.818087][4764:4764] CHIP:EM: Removed CHIP MessageCounter:188042574 from RetransTable on exchange 5088i
+          [1658838896.818140][4764:4764] CHIP:DMG: ICR moving to [ResponseRe]
+          [1658838896.818241][4764:4764] CHIP:DMG: InvokeResponseMessage =
+          [1658838896.818287][4764:4764] CHIP:DMG: {
+          [1658838896.818344][4764:4764] CHIP:DMG:        suppressResponse = false,
+          [1658838896.818391][4764:4764] CHIP:DMG:        InvokeResponseIBs =
+          [1658838896.818463][4764:4764] CHIP:DMG:        [
+          [1658838896.818508][4764:4764] CHIP:DMG:                InvokeResponseIB =
+          [1658838896.818581][4764:4764] CHIP:DMG:                {
+          [1658838896.818629][4764:4764] CHIP:DMG:                        CommandStatusIB =
+          [1658838896.818699][4764:4764] CHIP:DMG:                        {
+          [1658838896.818759][4764:4764] CHIP:DMG:                                CommandPathIB =
+          [1658838896.818836][4764:4764] CHIP:DMG:                                {
+          [1658838896.818915][4764:4764] CHIP:DMG:                                        EndpointId = 0x1,
+          [1658838896.819001][4764:4764] CHIP:DMG:                                        ClusterId = 0x6,
+          [1658838896.819068][4764:4764] CHIP:DMG:                                        CommandId = 0x0,
+          [1658838896.819144][4764:4764] CHIP:DMG:                                },
+          [1658838896.819227][4764:4764] CHIP:DMG:
+          [1658838896.819285][4764:4764] CHIP:DMG:                                StatusIB =
+          [1658838896.819347][4764:4764] CHIP:DMG:                                {
+          [1658838896.819408][4764:4764] CHIP:DMG:                                        status = 0x00 (SUCCESS),
+          [1658838896.819474][4764:4764] CHIP:DMG:                                },
+          [1658838896.819535][4764:4764] CHIP:DMG:
+          [1658838896.819588][4764:4764] CHIP:DMG:                        },
+          [1658838896.819650][4764:4764] CHIP:DMG:
+          [1658838896.819700][4764:4764] CHIP:DMG:                },
+          [1658838896.819759][4764:4764] CHIP:DMG:
+          [1658838896.819803][4764:4764] CHIP:DMG:        ],
+          [1658838896.819856][4764:4764] CHIP:DMG:
+          [1658838896.819900][4764:4764] CHIP:DMG:        InteractionModelRevision = 1
+          [1658838896.819943][4764:4764] CHIP:DMG: },
+          [1658838896.820047][4764:4764] CHIP:DMG: Received Command Response Status for Endpoint=1 Cluster=0x0000_0006 Command=0x0000_0000 Status=0x0
+          [1658838896.820095][4764:4764] CHIP:-: OnOff command succeeds
+      disabled: true
+
+    - label: "TH1 reads OnOff attribute from TH2 (Endpoint 1)"
+      PICS: OO.C.C00.Tx
+      verification: |
+          ./chip-tool onoff read on-off  2 1
+
+
+          [1657803168.769564][4272:4277] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0006 Attribute 0x0000_0000 DataVersion: 1968648540
+
+          [1657803168.769598][4272:4277] CHIP:TOO:   OnOff: FALSE
+      disabled: true
+
+    - label: "TH1 reads OnOff attribute from TH3 (Endpoint 2)"
+      PICS: OO.C.C01.Tx
+      verification: |
+          ./chip-tool onoff read on-off 3 2
+
+          [1657803609.731464][4333:4339] CHIP:TOO: Endpoint: 2 Cluster: 0x0000_0006 Attribute 0x0000_0000 DataVersion: 3914456390
+
+          [1657803609.731521][4333:4339] CHIP:TOO:   OnOff: TRUE
+      disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_BIND_2_2.yaml b/src/app/tests/suites/certification/Test_TC_BIND_2_2.yaml
index 5c28b64..c401817 100644
--- a/src/app/tests/suites/certification/Test_TC_BIND_2_2.yaml
+++ b/src/app/tests/suites/certification/Test_TC_BIND_2_2.yaml
@@ -14,9 +14,12 @@
 # Auto-generated scripts for harness use only, please review before automation. The endpoints and cluster names are currently set to default
 
 name:
-    119.2.2. [TC-BIND-2.2] Binding Cluster Attributes-DUT handles its Groups
+    120.2.2. [TC-BIND-2.2] Binding Cluster Attributes-DUT handles its Groups
     settings [DUT-Controller]
 
+PICS:
+    - BIND.C
+
 config:
     nodeId: 0x12344321
     cluster: "Basic"
@@ -31,7 +34,7 @@
 
     - label: "Commission DUT to TH1s fabric"
       verification: |
-          ./chip-tool pairing onnetwork 1 20202021
+          ./chip-tool pairing ble-thread 73 hex:0e080000000000010000000300000f35060004001fffe0020810101191022022920708fd6587bfe9821353051000112237945966880899aabbccddeeff030f7070656e5468726561644465696f6c010212340410f23d85dd55d9748cc6a1fd5fccbb1da20c0402a0fff8 20202021 3840
       disabled: true
 
     - label: "TH1 enables DUT as Controller"
@@ -41,7 +44,12 @@
 
     - label: "Commission TH2 to TH1s fabric (Node ID = 2)"
       verification: |
-          ./chip-tool pairing ble-wifi 2 chipsetup4 matter123 20202021 3840
+          ./chip-tool pairing onnetwork 1 20202021
+
+          [1659104612.592373][62366:62371] CHIP:DMG: 	SuppressResponse = true,
+          [1659104612.592399][62366:62371] CHIP:DMG: 	InteractionModelRevision = 1
+          [1659104612.592432][62366:62371] CHIP:DMG: }
+          [1659104612.593187][62366:62371] CHIP:CTL: Successfully finished commissioning step "ReadCommissioningInfo"
       disabled: true
 
     - label:
@@ -101,7 +109,7 @@
     - label:
           "DUT binds GroupId with GroupKeySetID in the GroupKeyMap attribute
           list on GroupKeyManagement cluster to TH2 on Endpoint 0"
-      PICS: G.C.C00.Tx
+      PICS: GRPKEY.C.A0000
       verification: |
           ./chip-tool groupkeymanagement write group-key-map "[{"groupId": 1, "groupKeySetID": 42, "fabricIndex": 1}]" 2 0
 
@@ -147,7 +155,7 @@
           "TH1 writes Binding entry into DUT with Entry 1: Group = The Group ID
           in the AddGroup command sent from DUT to TH2"
       verification: |
-          ./chip-tool binding write binding "[{"group" : "0x0001"}]" 1 1
+          ./chip-tool binding write binding "[{"group" : "0x0001"}]" 73 1
 
 
           [1657717436.184899][4353:4358] CHIP:DMG:                         StatusIB =
@@ -162,10 +170,7 @@
           entries"
       PICS: OO.C.C01.Tx
       verification: |
-          ./chip-tool onoff on 0xffffffffffff0001 1
-
-          1657717627.565673][3417:3422] CHIP:TOO: Sending command to group 0x1
-          [1657717627.565718][3417:3422] CHIP:TOO: Sending cluster (0x00000006) command (0x00000001) on Group 1
+          Press button no.2 on thread board
       disabled: true
 
     - label: "TH1 reads OnOff attribute from TH2 (Endpoint 1)"
@@ -179,124 +184,13 @@
 
     - label: "TH1 removes all the binding entries from DUT"
       verification: |
-          ./chip-tool groupsettings unbind-keyset  0x0001 0x0042
+          ./chip-tool binding write binding "[]" 73 1
 
 
-          [1657804100.222346][1483:1483] CHIP:DL: ChipLinuxStorage::Init: Using KVS config file: /tmp/chip_kvs
-          [1657804100.222880][1483:1483] CHIP:DL: ChipLinuxStorage::Init: Using KVS config file: /tmp/chip_factory.ini
-          [1657804100.223041][1483:1483] CHIP:DL: ChipLinuxStorage::Init: Using KVS config file: /tmp/chip_config.ini
-          [1657804100.223149][1483:1483] CHIP:DL: ChipLinuxStorage::Init: Using KVS config file: /tmp/chip_counters.ini
-          [1657804100.223500][1483:1483] CHIP:DL: writing settings to file (/tmp/chip_counters.ini-mlceY7)
-          [1657804100.224151][1483:1483] CHIP:DL: renamed tmp file to file (/tmp/chip_counters.ini)
-          [1657804100.224208][1483:1483] CHIP:DL: NVS set: chip-counters/reboot-count = 16 (0x10)
-          [1657804100.224925][1483:1483] CHIP:DL: Got Ethernet interface: eth0
-          [1657804100.225323][1483:1483] CHIP:DL: Found the primary Ethernet interface:eth0
-          [1657804100.225720][1483:1483] CHIP:DL: Got WiFi interface: wlan0
-          [1657804100.225791][1483:1483] CHIP:DL: Failed to reset WiFi statistic counts
-          [1657804100.225873][1483:1483] CHIP:IN: UDP::Init bind&listen port=0
-          [1657804100.226005][1483:1483] CHIP:IN: UDP::Init bound to port=43367
-          [1657804100.226030][1483:1483] CHIP:IN: BLEBase::Init - setting/overriding transport
-          [1657804100.226052][1483:1483] CHIP:IN: TransportMgr initialized
-          [1657804100.226085][1483:1483] CHIP:FP: Initializing FabricTable from persistent storage
-          [1657804100.226331][1483:1483] CHIP:TS: Last Known Good Time: 2022-07-13T12:47:52
-          [1657804100.226953][1483:1483] CHIP:FP: Fabric index 0x1 was retrieved from storage. Compressed FabricId 0xAF5C7831F3704268, FabricId 0x0000000000000001, NodeId 0x000000000001B669, VendorId 0xFFF1
-          [1657804100.227380][1483:1483] CHIP:FP: Fabric index 0x2 was retrieved from storage. Compressed FabricId 0x756CE95FCDF96118, FabricId 0x0000000000000002, NodeId 0x000000000001B669, VendorId 0xFFF1
-          [1657804100.227789][1483:1483] CHIP:FP: Fabric index 0x3 was retrieved from storage. Compressed FabricId 0xCCD838643BEE9065, FabricId 0x0000000000000003, NodeId 0x000000000001B669, VendorId 0xFFF1
-          [1657804100.230946][1483:1483] CHIP:ZCL: Using ZAP configuration...
-          [1657804100.235033][1483:1483] CHIP:DL: Avahi client registered
-          [1657804100.236263][1483:1483] CHIP:CTL: System State Initialized...
-          [1657804100.236328][1483:1483] CHIP:CTL: Stopping commissioning discovery over DNS-SD
-          [1657804100.236364][1483:1483] CHIP:CTL: Setting attestation nonce to random value
-          [1657804100.236412][1483:1483] CHIP:CTL: Setting CSR nonce to random value
-          [1657804100.236485][1483:1483] CHIP:IN: UDP::Init bind&listen port=5550
-          [1657804100.236621][1483:1483] CHIP:IN: UDP::Init bound to port=5550
-          [1657804100.236646][1483:1483] CHIP:IN: TransportMgr initialized
-          [1657804100.236733][1483:1483] CHIP:CTL: Stopping commissioning discovery over DNS-SD
-          [1657804100.236763][1483:1483] CHIP:CTL: Setting attestation nonce to random value
-          [1657804100.236811][1483:1483] CHIP:CTL: Setting CSR nonce to random value
-          [1657804100.239619][1483:1483] CHIP:CTL: Generating NOC
-          [1657804100.240796][1483:1483] CHIP:FP: Validating NOC chain
-          [1657804100.242766][1483:1483] CHIP:FP: NOC chain validation successful
-          [1657804100.242960][1483:1483] CHIP:FP: Updated fabric at index: 0x1, Node ID: 0x000000000001B669
-          [1657804100.243000][1483:1483] CHIP:TS: Last Known Good Time: 2022-07-13T12:47:52
-          [1657804100.243029][1483:1483] CHIP:TS: New proposed Last Known Good Time: 2021-01-01T00:00:00
-          [1657804100.243055][1483:1483] CHIP:TS: Retaining current Last Known Good Time
-          [1657804100.246677][1483:1483] CHIP:FP: Metadata for Fabric 0x1 persisted to storage.
-          [1657804100.250025][1483:1483] CHIP:TS: Committing Last Known Good Time to storage: 2022-07-13T12:47:52
-          [1657804100.253538][1483:1483] CHIP:CTL: Joined the fabric at index 1. Compressed fabric ID is: 0x0000000000000000
-          [1657804100.253600][1483:1483] CHIP:IN: UDP::Init bind&listen port=5550
-          [1657804100.253724][1483:1483] CHIP:IN: UDP::Init bound to port=5550
-          [1657804100.253751][1483:1483] CHIP:IN: TransportMgr initialized
-          [1657804100.253834][1483:1483] CHIP:CTL: Stopping commissioning discovery over DNS-SD
-          [1657804100.253872][1483:1483] CHIP:CTL: Setting attestation nonce to random value
-          [1657804100.253934][1483:1483] CHIP:CTL: Setting CSR nonce to random value
-          [1657804100.254935][1483:1483] CHIP:CTL: Generating NOC
-          [1657804100.256071][1483:1483] CHIP:FP: Validating NOC chain
-          [1657804100.257762][1483:1483] CHIP:FP: NOC chain validation successful
-          [1657804100.257921][1483:1483] CHIP:FP: Updated fabric at index: 0x2, Node ID: 0x000000000001B669
-          [1657804100.257955][1483:1483] CHIP:TS: Last Known Good Time: 2022-07-13T12:47:52
-          [1657804100.257978][1483:1483] CHIP:TS: New proposed Last Known Good Time: 2021-01-01T00:00:00
-          [1657804100.257998][1483:1483] CHIP:TS: Retaining current Last Known Good Time
-          [1657804100.260948][1483:1483] CHIP:FP: Metadata for Fabric 0x2 persisted to storage.
-          [1657804100.263784][1483:1483] CHIP:TS: Committing Last Known Good Time to storage: 2022-07-13T12:47:52
-          [1657804100.266433][1483:1483] CHIP:CTL: Joined the fabric at index 2. Compressed fabric ID is: 0x0000000000000000
-          [1657804100.266491][1483:1483] CHIP:IN: UDP::Init bind&listen port=5550
-          [1657804100.266615][1483:1483] CHIP:IN: UDP::Init bound to port=5550
-          [1657804100.266641][1483:1483] CHIP:IN: TransportMgr initialized
-          [1657804100.266727][1483:1483] CHIP:CTL: Stopping commissioning discovery over DNS-SD
-          [1657804100.266766][1483:1483] CHIP:CTL: Setting attestation nonce to random value
-          [1657804100.266828][1483:1483] CHIP:CTL: Setting CSR nonce to random value
-          [1657804100.267811][1483:1483] CHIP:CTL: Generating NOC
-          [1657804100.268914][1483:1483] CHIP:FP: Validating NOC chain
-          [1657804100.270701][1483:1483] CHIP:FP: NOC chain validation successful
-          [1657804100.270859][1483:1483] CHIP:FP: Updated fabric at index: 0x3, Node ID: 0x000000000001B669
-          [1657804100.270892][1483:1483] CHIP:TS: Last Known Good Time: 2022-07-13T12:47:52
-          [1657804100.270914][1483:1483] CHIP:TS: New proposed Last Known Good Time: 2021-01-01T00:00:00
-          [1657804100.270935][1483:1483] CHIP:TS: Retaining current Last Known Good Time
-          [1657804100.273854][1483:1483] CHIP:FP: Metadata for Fabric 0x3 persisted to storage.
-          [1657804100.276610][1483:1483] CHIP:TS: Committing Last Known Good Time to storage: 2022-07-13T12:47:52
-          [1657804100.279350][1483:1483] CHIP:CTL: Joined the fabric at index 3. Compressed fabric ID is: 0x0000000000000000
-          [1657804100.279411][1483:1483] CHIP:IN: UDP::Init bind&listen port=5550
-          [1657804100.279535][1483:1483] CHIP:IN: UDP::Init bound to port=5550
-          [1657804100.279560][1483:1483] CHIP:IN: TransportMgr initialized
-          [1657804100.315695][1483:1488] CHIP:DL: CHIP task running
-          [1657804100.315921][1483:1488] CHIP:DL: HandlePlatformSpecificBLEEvent 32784
-          [1657804100.321174][1483:1483] CHIP:CTL: Shutting down the commissioner
-          [1657804100.321268][1483:1483] CHIP:CTL: Shutting down the controller
-          [1657804100.321299][1483:1483] CHIP:CTL: Shutting down the commissioner
-          [1657804100.321348][1483:1483] CHIP:CTL: Shutting down the controller
-          [1657804100.321373][1483:1483] CHIP:IN: Expiring all sessions for fabric 0x1!!
-          [1657804100.321396][1483:1483] CHIP:FP: Forgetting fabric 0x1
-          [1657804100.321429][1483:1483] CHIP:TS: Pending Last Known Good Time: 2022-07-13T12:47:52
-          [1657804100.321597][1483:1483] CHIP:TS: Previous Last Known Good Time: 2022-07-13T12:47:52
-          [1657804100.321622][1483:1483] CHIP:TS: Reverted Last Known Good Time to previous value
-          [1657804100.321661][1483:1483] CHIP:CTL: Shutting down the commissioner
-          [1657804100.321718][1483:1483] CHIP:CTL: Shutting down the controller
-          [1657804100.321819][1483:1483] CHIP:IN: Expiring all sessions for fabric 0x2!!
-          [1657804100.321849][1483:1483] CHIP:FP: Forgetting fabric 0x2
-          [1657804100.321875][1483:1483] CHIP:TS: Pending Last Known Good Time: 2022-07-13T12:47:52
-          [1657804100.321998][1483:1483] CHIP:TS: Previous Last Known Good Time: 2022-07-13T12:47:52
-          [1657804100.322022][1483:1483] CHIP:TS: Reverted Last Known Good Time to previous value
-          [1657804100.322056][1483:1483] CHIP:CTL: Shutting down the commissioner
-          [1657804100.322113][1483:1483] CHIP:CTL: Shutting down the controller
-          [1657804100.322136][1483:1483] CHIP:IN: Expiring all sessions for fabric 0x3!!
-          [1657804100.322156][1483:1483] CHIP:FP: Forgetting fabric 0x3
-          [1657804100.322179][1483:1483] CHIP:TS: Pending Last Known Good Time: 2022-07-13T12:47:52
-          [1657804100.322314][1483:1483] CHIP:TS: Previous Last Known Good Time: 2022-07-13T12:47:52
-          [1657804100.322339][1483:1483] CHIP:TS: Reverted Last Known Good Time to previous value
-          [1657804100.322367][1483:1483] CHIP:CTL: Shutting down the System State, this will teardown the CHIP Stack
-          [1657804100.323278][1483:1483] CHIP:DMG: IM WH moving to [Uninitialized]
-          [1657804100.323318][1483:1483] CHIP:DMG: IM WH moving to [Uninitialized]
-          [1657804100.323341][1483:1483] CHIP:DMG: IM WH moving to [Uninitialized]
-          [1657804100.323362][1483:1483] CHIP:DMG: IM WH moving to [Uninitialized]
-          [1657804100.323384][1483:1483] CHIP:DMG: All ReadHandler-s are clean, clear GlobalDirtySet
-          [1657804100.323455][1483:1483] CHIP:BLE: BleConnectionDelegate::CancelConnection is not implemented.
-          [1657804100.323744][1483:1483] CHIP:DL: writing settings to file (/tmp/chip_counters.ini-wsLxnz)
-          [1657804100.324436][1483:1483] CHIP:DL: renamed tmp file to file (/tmp/chip_counters.ini)
-          [1657804100.324498][1483:1483] CHIP:DL: NVS set: chip-counters/total-operational-hours = 0 (0x0)
-          [1657804100.324524][1483:1483] CHIP:DL: Inet Layer shutdown
-          [1657804100.324547][1483:1483] CHIP:DL: BLE shutdown
-          [1657804100.324569][1483:1483] CHIP:DL: System Layer shutdown
+          [1659362827.431927][2469:2475] CHIP:DMG: 			StatusIB =
+          [1659362827.431996][2469:2475] CHIP:DMG: 			{
+          [1659362827.432070][2469:2475] CHIP:DMG: 				status = 0x00 (SUCCESS),
+          [1659362827.432154][2469:2475] CHIP:DMG: 			},
       disabled: true
 
     - label:
@@ -304,11 +198,7 @@
           entries"
       PICS: OO.C.C00.Tx
       verification: |
-          ./chip-tool onoff off 0xffffffffffff0001 1
-
-          [1657718018.006875][3467:3472] CHIP:TOO: Sending command to group 0x1
-          [1657718018.006899][3467:3472] CHIP:TOO: Sending cluster (0x00000006) command (0x00000000) on Group 1
-          [1657718018.006949][3467:3472] CHIP:DMG: ICR moving to [AddingComm]
+          Press button no.2 on thread board
       disabled: true
 
     - label: "TH1 reads OnOff attribute from TH2 (Endpoint 1)"
diff --git a/src/app/tests/suites/certification/Test_TC_BIND_2_3.yaml b/src/app/tests/suites/certification/Test_TC_BIND_2_3.yaml
index 72e98a0..f2c5152 100644
--- a/src/app/tests/suites/certification/Test_TC_BIND_2_3.yaml
+++ b/src/app/tests/suites/certification/Test_TC_BIND_2_3.yaml
@@ -14,9 +14,12 @@
 # Auto-generated scripts for harness use only, please review before automation. The endpoints and cluster names are currently set to default
 
 name:
-    119.2.3. [TC-BIND-2.3] Binding Cluster Attributes-TH1 enables DUT to handle
+    120.2.3. [TC-BIND-2.3] Binding Cluster Attributes-TH1 enables DUT to handle
     its Group settings [DUT-Controller]
 
+PICS:
+    - BIND.C
+
 config:
     nodeId: 0x12344321
     cluster: "Basic"
@@ -31,46 +34,22 @@
 
     - label: "Commission DUT to TH1s fabric"
       verification: |
-          ./chip-tool pairing ble-wifi 1 chipsetup4 matter123 20202021 3840
+          ./chip-tool pairing ble-thread 74 hex:0e080000000000010000000300000f35060004001fffe0020810101191022022920708fd6587bfe9821353051000112237945966880899aabbccddeeff030f7070656e5468726561644465696f6c010212340410f23d85dd55d9748cc6a1fd5fccbb1da20c0402a0fff8 20202021 3840
       disabled: true
 
     - label: "TH1 enables DUT as Controller"
       verification: |
-          ./chip-tool pairing open-commissioning-window 1 1 400 1000 3840
-
-
-          [1657716927.940140][4326:4331] CHIP:DMG:
-          [1657716927.940201][4326:4331] CHIP:DMG:                                 StatusIB =
-          [1657716927.940275][4326:4331] CHIP:DMG:                                 {
-          [1657716927.940344][4326:4331] CHIP:DMG:                                         status = 0x00 (SUCCESS),
-          [1657716927.940411][4326:4331] CHIP:DMG:                                 },
-          [1657716927.940478][4326:4331] CHIP:DMG:
-          [1657716927.940537][4326:4331] CHIP:DMG:                         },
-          [1657716927.940605][4326:4331] CHIP:DMG:
-          [1657716927.940658][4326:4331] CHIP:DMG:                 },
-          [1657716927.940721][4326:4331] CHIP:DMG:
-          [1657716927.940771][4326:4331] CHIP:DMG:         ],
-          [1657716927.940832][4326:4331] CHIP:DMG:
-          [1657716927.940882][4326:4331] CHIP:DMG:         InteractionModelRevision = 1
-          [1657716927.940931][4326:4331] CHIP:DMG: },
-          [1657716927.941044][4326:4331] CHIP:DMG: Received Command Response Status for Endpoint=0 Cluster=0x0000_003C Command=0x0000_0000 Status=0x0
-          [1657716927.941099][4326:4331] CHIP:CTL: Successfully opened pairing window on the device
-          [1657716927.941205][4326:4331] CHIP:CTL: Manual pairing code: [36299144405]
-          [1657716927.941270][4326:4331] CHIP:CTL: SetupQRCode: [MT:-24J0IRV01-85F3GK10]
-          [1657716927.941345][4326:4331] CHIP:DMG: ICR moving to [AwaitingDe]
-          [1657716927.941403][4326:4331] CHIP:EM: Sending Standalone Ack for MessageCount
+          verification step to be updated.
       disabled: true
 
     - label: "Commission TH2 to TH1s fabric (Node ID = 2)"
       verification: |
-          ./chip-tool pairing code 2 36299144405
+          ./chip-tool pairing onnetwork 1 20202021
 
-          [1657716992.250570][3330:3336] CHIP:CTL: Received CommissioningComplete response, errorCode=0
-          [1657716992.250614][3330:3336] CHIP:CTL: Successfully finished commissioning step "SendComplete"
-          [1657716992.250650][3330:3336] CHIP:CTL: Commissioning stage next step: "SendComplete" -> "Cleanup"
-          [1657716992.250690][3330:3336] CHIP:CTL: Performing next commissioning step "Cleanup"
-          [1657716992.250769][3330:3336] CHIP:CTL: Successfully finished commissioning step "Cleanup"
-          [1657716992.250812][3330:3336] CHIP:TOO: Device commissioning completed with success
+          [1659104612.592373][62366:62371] CHIP:DMG: 	SuppressResponse = true,
+          [1659104612.592399][62366:62371] CHIP:DMG: 	InteractionModelRevision = 1
+          [1659104612.592432][62366:62371] CHIP:DMG: }
+          [1659104612.593187][62366:62371] CHIP:CTL: Successfully finished commissioning step "ReadCommissioningInfo"
       disabled: true
 
     - label:
@@ -88,7 +67,7 @@
           "groupKeySecurityPolicy": 0, "epochKey0":
           "d0d1d2d3d4d5d6d7d8d9dadbdcdddedf", "epochStartTime0": 2220000,"epochKey1":
           "d1d1d2d3d4d5d6d7d8d9dadbdcdddedf", "epochStartTime1": 2220001,"epochKey2":
-          "d2d1d2d3d4d5d6d7d8d9dadbdcdddedf", "epochStartTime2": 2220002 }" 1 0
+          "d2d1d2d3d4d5d6d7d8d9dadbdcdddedf", "epochStartTime2": 2220002 }" 74 0
 
           [1657719041.075123][4541:4546] CHIP:DMG: ICR moving to [ResponseRe]
           [1657719041.075174][4541:4546] CHIP:DMG: InvokeResponseMessage =
@@ -119,6 +98,14 @@
           [1657719041.075959][4541:4546] CHIP:DMG:         ],
           [1657719041.075988][4541:4546] CHIP:DMG:
           [1657719041.076012][4541:4546] CHIP:DMG:         InteractionModelRevision = 1
+
+
+
+          ./chip-tool groupkeymanagement key-set-write "{"groupKeySetID": 42,
+          "groupKeySecurityPolicy": 0, "epochKey0":
+          "d0d1d2d3d4d5d6d7d8d9dadbdcdddedf", "epochStartTime0": 2220000,"epochKey1":
+          "d1d1d2d3d4d5d6d7d8d9dadbdcdddedf", "epochStartTime1": 2220001,"epochKey2":
+          "d2d1d2d3d4d5d6d7d8d9dadbdcdddedf", "epochStartTime2": 2220002 }" 1 0
           [1657719041.076036][4541:4546] CHIP:DMG: },
       disabled: true
 
@@ -126,20 +113,23 @@
           "TH1 binds GroupId with GroupKeySetID in the GroupKeyMap attribute
           list on GroupKeyManagement cluster to TH2 on Endpoint 0"
       verification: |
-          ./chip-tool groupkeymanagement write group-key-map "[{"groupId": 1, "groupKeySetID": 42, "fabricIndex": 1}]" 1 0
+          ./chip-tool groupkeymanagement write group-key-map "[{"groupId": 1, "groupKeySetID": 42, "fabricIndex": 1}]" 74 0
 
           [1657719130.464175][4557:4562] CHIP:DMG:                         StatusIB =
           [1657719130.464214][4557:4562] CHIP:DMG:                         {
           [1657719130.464256][4557:4562] CHIP:DMG:                                 status = 0x00 (SUCCESS),
           [1657719130.464298][4557:4562] CHIP:DMG:                         },
           [1657719130.464342][4557:4562] CHIP:DMG:
+
+
+          ./chip-tool groupkeymanagement write group-key-map "[{"groupId": 1, "groupKeySetID": 42, "fabricIndex": 1}]" 1 0
       disabled: true
 
     - label:
           "TH1 sends AddGroup( Group Name and Group-ID) Command to TH2 on
           Endpoint 1."
       verification: |
-          ./chip-tool groups add-group 0x0001 grp1 1 1
+          ./chip-tool groups add-group 0x0001 grp1 74 1
 
           [1657719097.788236][4548:4554] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0004 Command 0x0000_0000
           [1657719097.788325][4548:4554] CHIP:TOO:   AddGroupResponse: {
@@ -147,6 +137,18 @@
           [1657719097.788393][4548:4554] CHIP:TOO:     groupId: 1
           [1657719097.788418][4548:4554] CHIP:TOO:    }
 
+
+
+          ./chip-tool groups add-group 0x0001 grp1 1 1
+
+
+          [1657719097.788236][4548:4554] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0004 Command 0x0000_0000
+          [1657719097.788325][4548:4554] CHIP:TOO:   AddGroupResponse: {
+          [1657719097.788366][4548:4554] CHIP:TOO:     status: 0
+          [1657719097.788393][4548:4554] CHIP:TOO:     groupId: 1
+          [1657719097.788418][4548:4554] CHIP:TOO:    }
+
+
           ./chip-tool groupsettings add-group grp1 0x0001
 
           ./chip-tool groupsettings add-keysets 0x0042 0 0x000000000021dfe0 hex:d0d1d2d3d4d5d6d7d8d9dadbdcdddedf
@@ -169,7 +171,7 @@
           "TH1 writes Binding entry into DUT with Entry 1: Group = The Group ID
           in the AddGroup command sent from TH1 to TH2"
       verification: |
-          ./chip-tool binding write binding "[{"group" : "0x0001"}]" 1 1
+          ./chip-tool binding write binding "[{"group" : "0x0001"}]" 74 1
 
           [1657719251.763323][4597:4602] CHIP:DMG:                         StatusIB =
           [1657719251.763360][4597:4602] CHIP:DMG:                         {
@@ -187,11 +189,7 @@
           entries"
       PICS: OO.C.C01.Tx
       verification: |
-          ./chip-tool onoff on 0xffffffffffff0001 1
-
-
-          [1657719341.187186][3608:3613] CHIP:TOO: Sending command to group 0x1
-          [1657719341.187212][3608:3613] CHIP:TOO: Sending cluster (0x00000006) command (0x00000001) on Group 1
+          Press button no.2 on thread board
       disabled: true
 
     - label: "TH1 reads OnOff attribute from TH2 (Endpoint 1)"
@@ -205,124 +203,13 @@
 
     - label: "TH1 removes all the binding entries from DUT"
       verification: |
-          ./chip-tool groupsettings unbind-keyset 0x0001 0x0042
+          ./chip-tool binding write binding "[]" 74 1
 
 
-          [1657804100.222346][1483:1483] CHIP:DL: ChipLinuxStorage::Init: Using KVS config file: /tmp/chip_kvs
-          [1657804100.222880][1483:1483] CHIP:DL: ChipLinuxStorage::Init: Using KVS config file: /tmp/chip_factory.ini
-          [1657804100.223041][1483:1483] CHIP:DL: ChipLinuxStorage::Init: Using KVS config file: /tmp/chip_config.ini
-          [1657804100.223149][1483:1483] CHIP:DL: ChipLinuxStorage::Init: Using KVS config file: /tmp/chip_counters.ini
-          [1657804100.223500][1483:1483] CHIP:DL: writing settings to file (/tmp/chip_counters.ini-mlceY7)
-          [1657804100.224151][1483:1483] CHIP:DL: renamed tmp file to file (/tmp/chip_counters.ini)
-          [1657804100.224208][1483:1483] CHIP:DL: NVS set: chip-counters/reboot-count = 16 (0x10)
-          [1657804100.224925][1483:1483] CHIP:DL: Got Ethernet interface: eth0
-          [1657804100.225323][1483:1483] CHIP:DL: Found the primary Ethernet interface:eth0
-          [1657804100.225720][1483:1483] CHIP:DL: Got WiFi interface: wlan0
-          [1657804100.225791][1483:1483] CHIP:DL: Failed to reset WiFi statistic counts
-          [1657804100.225873][1483:1483] CHIP:IN: UDP::Init bind&listen port=0
-          [1657804100.226005][1483:1483] CHIP:IN: UDP::Init bound to port=43367
-          [1657804100.226030][1483:1483] CHIP:IN: BLEBase::Init - setting/overriding transport
-          [1657804100.226052][1483:1483] CHIP:IN: TransportMgr initialized
-          [1657804100.226085][1483:1483] CHIP:FP: Initializing FabricTable from persistent storage
-          [1657804100.226331][1483:1483] CHIP:TS: Last Known Good Time: 2022-07-13T12:47:52
-          [1657804100.226953][1483:1483] CHIP:FP: Fabric index 0x1 was retrieved from storage. Compressed FabricId 0xAF5C7831F3704268, FabricId 0x0000000000000001, NodeId 0x000000000001B669, VendorId 0xFFF1
-          [1657804100.227380][1483:1483] CHIP:FP: Fabric index 0x2 was retrieved from storage. Compressed FabricId 0x756CE95FCDF96118, FabricId 0x0000000000000002, NodeId 0x000000000001B669, VendorId 0xFFF1
-          [1657804100.227789][1483:1483] CHIP:FP: Fabric index 0x3 was retrieved from storage. Compressed FabricId 0xCCD838643BEE9065, FabricId 0x0000000000000003, NodeId 0x000000000001B669, VendorId 0xFFF1
-          [1657804100.230946][1483:1483] CHIP:ZCL: Using ZAP configuration...
-          [1657804100.235033][1483:1483] CHIP:DL: Avahi client registered
-          [1657804100.236263][1483:1483] CHIP:CTL: System State Initialized...
-          [1657804100.236328][1483:1483] CHIP:CTL: Stopping commissioning discovery over DNS-SD
-          [1657804100.236364][1483:1483] CHIP:CTL: Setting attestation nonce to random value
-          [1657804100.236412][1483:1483] CHIP:CTL: Setting CSR nonce to random value
-          [1657804100.236485][1483:1483] CHIP:IN: UDP::Init bind&listen port=5550
-          [1657804100.236621][1483:1483] CHIP:IN: UDP::Init bound to port=5550
-          [1657804100.236646][1483:1483] CHIP:IN: TransportMgr initialized
-          [1657804100.236733][1483:1483] CHIP:CTL: Stopping commissioning discovery over DNS-SD
-          [1657804100.236763][1483:1483] CHIP:CTL: Setting attestation nonce to random value
-          [1657804100.236811][1483:1483] CHIP:CTL: Setting CSR nonce to random value
-          [1657804100.239619][1483:1483] CHIP:CTL: Generating NOC
-          [1657804100.240796][1483:1483] CHIP:FP: Validating NOC chain
-          [1657804100.242766][1483:1483] CHIP:FP: NOC chain validation successful
-          [1657804100.242960][1483:1483] CHIP:FP: Updated fabric at index: 0x1, Node ID: 0x000000000001B669
-          [1657804100.243000][1483:1483] CHIP:TS: Last Known Good Time: 2022-07-13T12:47:52
-          [1657804100.243029][1483:1483] CHIP:TS: New proposed Last Known Good Time: 2021-01-01T00:00:00
-          [1657804100.243055][1483:1483] CHIP:TS: Retaining current Last Known Good Time
-          [1657804100.246677][1483:1483] CHIP:FP: Metadata for Fabric 0x1 persisted to storage.
-          [1657804100.250025][1483:1483] CHIP:TS: Committing Last Known Good Time to storage: 2022-07-13T12:47:52
-          [1657804100.253538][1483:1483] CHIP:CTL: Joined the fabric at index 1. Compressed fabric ID is: 0x0000000000000000
-          [1657804100.253600][1483:1483] CHIP:IN: UDP::Init bind&listen port=5550
-          [1657804100.253724][1483:1483] CHIP:IN: UDP::Init bound to port=5550
-          [1657804100.253751][1483:1483] CHIP:IN: TransportMgr initialized
-          [1657804100.253834][1483:1483] CHIP:CTL: Stopping commissioning discovery over DNS-SD
-          [1657804100.253872][1483:1483] CHIP:CTL: Setting attestation nonce to random value
-          [1657804100.253934][1483:1483] CHIP:CTL: Setting CSR nonce to random value
-          [1657804100.254935][1483:1483] CHIP:CTL: Generating NOC
-          [1657804100.256071][1483:1483] CHIP:FP: Validating NOC chain
-          [1657804100.257762][1483:1483] CHIP:FP: NOC chain validation successful
-          [1657804100.257921][1483:1483] CHIP:FP: Updated fabric at index: 0x2, Node ID: 0x000000000001B669
-          [1657804100.257955][1483:1483] CHIP:TS: Last Known Good Time: 2022-07-13T12:47:52
-          [1657804100.257978][1483:1483] CHIP:TS: New proposed Last Known Good Time: 2021-01-01T00:00:00
-          [1657804100.257998][1483:1483] CHIP:TS: Retaining current Last Known Good Time
-          [1657804100.260948][1483:1483] CHIP:FP: Metadata for Fabric 0x2 persisted to storage.
-          [1657804100.263784][1483:1483] CHIP:TS: Committing Last Known Good Time to storage: 2022-07-13T12:47:52
-          [1657804100.266433][1483:1483] CHIP:CTL: Joined the fabric at index 2. Compressed fabric ID is: 0x0000000000000000
-          [1657804100.266491][1483:1483] CHIP:IN: UDP::Init bind&listen port=5550
-          [1657804100.266615][1483:1483] CHIP:IN: UDP::Init bound to port=5550
-          [1657804100.266641][1483:1483] CHIP:IN: TransportMgr initialized
-          [1657804100.266727][1483:1483] CHIP:CTL: Stopping commissioning discovery over DNS-SD
-          [1657804100.266766][1483:1483] CHIP:CTL: Setting attestation nonce to random value
-          [1657804100.266828][1483:1483] CHIP:CTL: Setting CSR nonce to random value
-          [1657804100.267811][1483:1483] CHIP:CTL: Generating NOC
-          [1657804100.268914][1483:1483] CHIP:FP: Validating NOC chain
-          [1657804100.270701][1483:1483] CHIP:FP: NOC chain validation successful
-          [1657804100.270859][1483:1483] CHIP:FP: Updated fabric at index: 0x3, Node ID: 0x000000000001B669
-          [1657804100.270892][1483:1483] CHIP:TS: Last Known Good Time: 2022-07-13T12:47:52
-          [1657804100.270914][1483:1483] CHIP:TS: New proposed Last Known Good Time: 2021-01-01T00:00:00
-          [1657804100.270935][1483:1483] CHIP:TS: Retaining current Last Known Good Time
-          [1657804100.273854][1483:1483] CHIP:FP: Metadata for Fabric 0x3 persisted to storage.
-          [1657804100.276610][1483:1483] CHIP:TS: Committing Last Known Good Time to storage: 2022-07-13T12:47:52
-          [1657804100.279350][1483:1483] CHIP:CTL: Joined the fabric at index 3. Compressed fabric ID is: 0x0000000000000000
-          [1657804100.279411][1483:1483] CHIP:IN: UDP::Init bind&listen port=5550
-          [1657804100.279535][1483:1483] CHIP:IN: UDP::Init bound to port=5550
-          [1657804100.279560][1483:1483] CHIP:IN: TransportMgr initialized
-          [1657804100.315695][1483:1488] CHIP:DL: CHIP task running
-          [1657804100.315921][1483:1488] CHIP:DL: HandlePlatformSpecificBLEEvent 32784
-          [1657804100.321174][1483:1483] CHIP:CTL: Shutting down the commissioner
-          [1657804100.321268][1483:1483] CHIP:CTL: Shutting down the controller
-          [1657804100.321299][1483:1483] CHIP:CTL: Shutting down the commissioner
-          [1657804100.321348][1483:1483] CHIP:CTL: Shutting down the controller
-          [1657804100.321373][1483:1483] CHIP:IN: Expiring all sessions for fabric 0x1!!
-          [1657804100.321396][1483:1483] CHIP:FP: Forgetting fabric 0x1
-          [1657804100.321429][1483:1483] CHIP:TS: Pending Last Known Good Time: 2022-07-13T12:47:52
-          [1657804100.321597][1483:1483] CHIP:TS: Previous Last Known Good Time: 2022-07-13T12:47:52
-          [1657804100.321622][1483:1483] CHIP:TS: Reverted Last Known Good Time to previous value
-          [1657804100.321661][1483:1483] CHIP:CTL: Shutting down the commissioner
-          [1657804100.321718][1483:1483] CHIP:CTL: Shutting down the controller
-          [1657804100.321819][1483:1483] CHIP:IN: Expiring all sessions for fabric 0x2!!
-          [1657804100.321849][1483:1483] CHIP:FP: Forgetting fabric 0x2
-          [1657804100.321875][1483:1483] CHIP:TS: Pending Last Known Good Time: 2022-07-13T12:47:52
-          [1657804100.321998][1483:1483] CHIP:TS: Previous Last Known Good Time: 2022-07-13T12:47:52
-          [1657804100.322022][1483:1483] CHIP:TS: Reverted Last Known Good Time to previous value
-          [1657804100.322056][1483:1483] CHIP:CTL: Shutting down the commissioner
-          [1657804100.322113][1483:1483] CHIP:CTL: Shutting down the controller
-          [1657804100.322136][1483:1483] CHIP:IN: Expiring all sessions for fabric 0x3!!
-          [1657804100.322156][1483:1483] CHIP:FP: Forgetting fabric 0x3
-          [1657804100.322179][1483:1483] CHIP:TS: Pending Last Known Good Time: 2022-07-13T12:47:52
-          [1657804100.322314][1483:1483] CHIP:TS: Previous Last Known Good Time: 2022-07-13T12:47:52
-          [1657804100.322339][1483:1483] CHIP:TS: Reverted Last Known Good Time to previous value
-          [1657804100.322367][1483:1483] CHIP:CTL: Shutting down the System State, this will teardown the CHIP Stack
-          [1657804100.323278][1483:1483] CHIP:DMG: IM WH moving to [Uninitialized]
-          [1657804100.323318][1483:1483] CHIP:DMG: IM WH moving to [Uninitialized]
-          [1657804100.323341][1483:1483] CHIP:DMG: IM WH moving to [Uninitialized]
-          [1657804100.323362][1483:1483] CHIP:DMG: IM WH moving to [Uninitialized]
-          [1657804100.323384][1483:1483] CHIP:DMG: All ReadHandler-s are clean, clear GlobalDirtySet
-          [1657804100.323455][1483:1483] CHIP:BLE: BleConnectionDelegate::CancelConnection is not implemented.
-          [1657804100.323744][1483:1483] CHIP:DL: writing settings to file (/tmp/chip_counters.ini-wsLxnz)
-          [1657804100.324436][1483:1483] CHIP:DL: renamed tmp file to file (/tmp/chip_counters.ini)
-          [1657804100.324498][1483:1483] CHIP:DL: NVS set: chip-counters/total-operational-hours = 0 (0x0)
-          [1657804100.324524][1483:1483] CHIP:DL: Inet Layer shutdown
-          [1657804100.324547][1483:1483] CHIP:DL: BLE shutdown
-          [1657804100.324569][1483:1483] CHIP:DL: System Layer shutdown
+          [1659362827.431927][2469:2475] CHIP:DMG:                         StatusIB =
+          [1659362827.431996][2469:2475] CHIP:DMG:                         {
+          [1659362827.432070][2469:2475] CHIP:DMG:                                 status = 0x00 (SUCCESS),
+          [1659362827.432154][2469:2475] CHIP:DMG:                         },
       disabled: true
 
     - label:
@@ -330,129 +217,7 @@
           entries"
       PICS: OO.C.C00.Tx
       verification: |
-          ./chip-tool onoff off 0xffffffffffff0001 1
-
-
-          [1657739317.292483][6861:6861] CHIP:DL: ChipLinuxStorage::Init: Using KVS config file: /tmp/chip_kvs
-          [1657739317.293022][6861:6861] CHIP:DL: ChipLinuxStorage::Init: Using KVS config file: /tmp/chip_factory.ini
-          [1657739317.293191][6861:6861] CHIP:DL: ChipLinuxStorage::Init: Using KVS config file: /tmp/chip_config.ini
-          [1657739317.293302][6861:6861] CHIP:DL: ChipLinuxStorage::Init: Using KVS config file: /tmp/chip_counters.ini
-          [1657739317.293673][6861:6861] CHIP:DL: writing settings to file (/tmp/chip_counters.ini-UkoNx7)
-          [1657739317.294307][6861:6861] CHIP:DL: renamed tmp file to file (/tmp/chip_counters.ini)
-          [1657739317.294361][6861:6861] CHIP:DL: NVS set: chip-counters/reboot-count = 25 (0x19)
-          [1657739317.295264][6861:6861] CHIP:DL: Got Ethernet interface: eth0
-          [1657739317.295842][6861:6861] CHIP:DL: Found the primary Ethernet interface:eth0
-          [1657739317.296467][6861:6861] CHIP:DL: Got WiFi interface: wlan0
-          [1657739317.298602][6861:6861] CHIP:DL: Found the primary WiFi interface:wlan0
-          [1657739317.298722][6861:6861] CHIP:IN: UDP::Init bind&listen port=0
-          [1657739317.298865][6861:6861] CHIP:IN: UDP::Init bound to port=42057
-          [1657739317.298900][6861:6861] CHIP:IN: BLEBase::Init - setting/overriding transport
-          [1657739317.298922][6861:6861] CHIP:IN: TransportMgr initialized
-          [1657739317.298956][6861:6861] CHIP:FP: Initializing FabricTable from persistent storage
-          [1657739317.299178][6861:6861] CHIP:TS: Last Known Good Time: 2022-07-13T10:35:47
-          [1657739317.299800][6861:6861] CHIP:FP: Fabric index 0x1 was retrieved from storage. Compressed FabricId 0x44F31DDB31482396, FabricId 0x0000000000000001, NodeId 0x000000000001B669, VendorId 0xFFF1
-          [1657739317.300326][6861:6861] CHIP:FP: Fabric index 0x2 was retrieved from storage. Compressed FabricId 0x9C5001245B9C6783, FabricId 0x0000000000000002, NodeId 0x000000000001B669, VendorId 0xFFF1
-          [1657739317.300874][6861:6861] CHIP:FP: Fabric index 0x3 was retrieved from storage. Compressed FabricId 0x432BBBD1DDD12A2D, FabricId 0x0000000000000003, NodeId 0x000000000001B669, VendorId 0xFFF1
-          [1657739317.304752][6861:6861] CHIP:ZCL: Using ZAP configuration...
-          [1657739317.310329][6861:6861] CHIP:DL: Avahi client registered
-          [1657739317.311785][6861:6861] CHIP:CTL: System State Initialized...
-          [1657739317.311916][6861:6861] CHIP:CTL: Stopping commissioning discovery over DNS-SD
-          [1657739317.311958][6861:6861] CHIP:CTL: Setting attestation nonce to random value
-          [1657739317.312013][6861:6861] CHIP:CTL: Setting CSR nonce to random value
-          [1657739317.312124][6861:6861] CHIP:IN: UDP::Init bind&listen port=5550
-          [1657739317.312276][6861:6861] CHIP:IN: UDP::Init bound to port=5550
-          [1657739317.312304][6861:6861] CHIP:IN: TransportMgr initialized
-          [1657739317.312381][6861:6861] CHIP:CTL: Stopping commissioning discovery over DNS-SD
-          [1657739317.312413][6861:6861] CHIP:CTL: Setting attestation nonce to random value
-          [1657739317.312468][6861:6861] CHIP:CTL: Setting CSR nonce to random value
-          [1657739317.315708][6861:6861] CHIP:CTL: Generating NOC
-          [1657739317.317118][6861:6861] CHIP:FP: Validating NOC chain
-          [1657739317.319143][6861:6861] CHIP:FP: NOC chain validation successful
-          [1657739317.319368][6861:6861] CHIP:FP: Updated fabric at index: 0x1, Node ID: 0x000000000001B669
-          [1657739317.319406][6861:6861] CHIP:TS: Last Known Good Time: 2022-07-13T10:35:47
-          [1657739317.319433][6861:6861] CHIP:TS: New proposed Last Known Good Time: 2021-01-01T00:00:00
-          [1657739317.319458][6861:6861] CHIP:TS: Retaining current Last Known Good Time
-          [1657739317.322759][6861:6861] CHIP:FP: Metadata for Fabric 0x1 persisted to storage.
-          [1657739317.325707][6861:6861] CHIP:TS: Committing Last Known Good Time to storage: 2022-07-13T10:35:47
-          [1657739317.328626][6861:6861] CHIP:CTL: Joined the fabric at index 1. Compressed fabric ID is: 0x0000000000000000
-          [1657739317.328691][6861:6861] CHIP:IN: UDP::Init bind&listen port=5550
-          [1657739317.328824][6861:6861] CHIP:IN: UDP::Init bound to port=5550
-          [1657739317.328852][6861:6861] CHIP:IN: TransportMgr initialized
-          [1657739317.328943][6861:6861] CHIP:CTL: Stopping commissioning discovery over DNS-SD
-          [1657739317.328985][6861:6861] CHIP:CTL: Setting attestation nonce to random value
-          [1657739317.329053][6861:6861] CHIP:CTL: Setting CSR nonce to random value
-          [1657739317.330018][6861:6861] CHIP:CTL: Generating NOC
-          [1657739317.331537][6861:6861] CHIP:FP: Validating NOC chain
-          [1657739317.333367][6861:6861] CHIP:FP: NOC chain validation successful
-          [1657739317.333529][6861:6861] CHIP:FP: Updated fabric at index: 0x2, Node ID: 0x000000000001B669
-          [1657739317.333562][6861:6861] CHIP:TS: Last Known Good Time: 2022-07-13T10:35:47
-          [1657739317.333585][6861:6861] CHIP:TS: New proposed Last Known Good Time: 2021-01-01T00:00:00
-          [1657739317.333607][6861:6861] CHIP:TS: Retaining current Last Known Good Time
-          [1657739317.336974][6861:6861] CHIP:FP: Metadata for Fabric 0x2 persisted to storage.
-          [1657739317.340429][6861:6861] CHIP:TS: Committing Last Known Good Time to storage: 2022-07-13T10:35:47
-          [1657739317.346545][6861:6861] CHIP:CTL: Joined the fabric at index 2. Compressed fabric ID is: 0x0000000000000000
-          [1657739317.346610][6861:6861] CHIP:IN: UDP::Init bind&listen port=5550
-          [1657739317.346740][6861:6861] CHIP:IN: UDP::Init bound to port=5550
-          [1657739317.346784][6861:6861] CHIP:IN: TransportMgr initialized
-          [1657739317.346890][6861:6861] CHIP:CTL: Stopping commissioning discovery over DNS-SD
-          [1657739317.346930][6861:6861] CHIP:CTL: Setting attestation nonce to random value
-          [1657739317.346993][6861:6861] CHIP:CTL: Setting CSR nonce to random value
-          [1657739317.347952][6861:6861] CHIP:CTL: Generating NOC
-          [1657739317.349141][6861:6861] CHIP:FP: Validating NOC chain
-          [1657739317.351073][6861:6861] CHIP:FP: NOC chain validation successful
-          [1657739317.351260][6861:6861] CHIP:FP: Updated fabric at index: 0x3, Node ID: 0x000000000001B669
-          [1657739317.351297][6861:6861] CHIP:TS: Last Known Good Time: 2022-07-13T10:35:47
-          [1657739317.351322][6861:6861] CHIP:TS: New proposed Last Known Good Time: 2021-01-01T00:00:00
-          [1657739317.351344][6861:6861] CHIP:TS: Retaining current Last Known Good Time
-          [1657739317.354771][6861:6861] CHIP:FP: Metadata for Fabric 0x3 persisted to storage.
-          [1657739317.357885][6861:6861] CHIP:TS: Committing Last Known Good Time to storage: 2022-07-13T10:35:47
-          [1657739317.360916][6861:6861] CHIP:CTL: Joined the fabric at index 3. Compressed fabric ID is: 0x0000000000000000
-          [1657739317.360982][6861:6861] CHIP:IN: UDP::Init bind&listen port=5550
-          [1657739317.361127][6861:6861] CHIP:IN: UDP::Init bound to port=5550
-          [1657739317.361176][6861:6861] CHIP:IN: TransportMgr initialized
-          [1657739317.404098][6861:6866] CHIP:DL: CHIP task running
-          [1657739317.404355][6861:6866] CHIP:DL: HandlePlatformSpecificBLEEvent 32784
-          [1657739317.404400][6861:6866] CHIP:TOO: Sending command to group 0x1
-          [1657739317.404425][6861:6866] CHIP:TOO: Sending cluster (0x00000006) command (0x00000000) on Group 1
-          [1657739317.404474][6861:6866] CHIP:DMG: ICR moving to [AddingComm]
-          [1657739317.404580][6861:6866] CHIP:DMG: ICR moving to [AddedComma]
-          [1657739317.405348][6861:6861] CHIP:CTL: Shutting down the commissioner
-          [1657739317.405445][6861:6861] CHIP:CTL: Shutting down the controller
-          [1657739317.405477][6861:6861] CHIP:CTL: Shutting down the commissioner
-          [1657739317.405530][6861:6861] CHIP:CTL: Shutting down the controller
-          [1657739317.405569][6861:6861] CHIP:IN: Expiring all sessions for fabric 0x1!!
-          [1657739317.405593][6861:6861] CHIP:FP: Forgetting fabric 0x1
-          [1657739317.405637][6861:6861] CHIP:TS: Pending Last Known Good Time: 2022-07-13T10:35:47
-          [1657739317.405823][6861:6861] CHIP:TS: Previous Last Known Good Time: 2022-07-13T10:35:47
-          [1657739317.405849][6861:6861] CHIP:TS: Reverted Last Known Good Time to previous value
-          [1657739317.405890][6861:6861] CHIP:CTL: Shutting down the commissioner
-          [1657739317.405950][6861:6861] CHIP:CTL: Shutting down the controller
-          [1657739317.405978][6861:6861] CHIP:IN: Expiring all sessions for fabric 0x2!!
-          [1657739317.406015][6861:6861] CHIP:FP: Forgetting fabric 0x2
-          [1657739317.406046][6861:6861] CHIP:TS: Pending Last Known Good Time: 2022-07-13T10:35:47
-          [1657739317.406231][6861:6861] CHIP:TS: Previous Last Known Good Time: 2022-07-13T10:35:47
-          [1657739317.406261][6861:6861] CHIP:TS: Reverted Last Known Good Time to previous value
-          [1657739317.406299][6861:6861] CHIP:CTL: Shutting down the commissioner
-          [1657739317.406364][6861:6861] CHIP:CTL: Shutting down the controller
-          [1657739317.406407][6861:6861] CHIP:IN: Expiring all sessions for fabric 0x3!!
-          [1657739317.406469][6861:6861] CHIP:FP: Forgetting fabric 0x3
-          [1657739317.406500][6861:6861] CHIP:TS: Pending Last Known Good Time: 2022-07-13T10:35:47
-          [1657739317.406684][6861:6861] CHIP:TS: Previous Last Known Good Time: 2022-07-13T10:35:47
-          [1657739317.406715][6861:6861] CHIP:TS: Reverted Last Known Good Time to previous value
-          [1657739317.406751][6861:6861] CHIP:CTL: Shutting down the System State, this will teardown the CHIP Stack
-          [1657739317.407843][6861:6861] CHIP:DMG: IM WH moving to [Uninitialized]
-          [1657739317.407889][6861:6861] CHIP:DMG: IM WH moving to [Uninitialized]
-          [1657739317.407914][6861:6861] CHIP:DMG: IM WH moving to [Uninitialized]
-          [1657739317.407938][6861:6861] CHIP:DMG: IM WH moving to [Uninitialized]
-          [1657739317.407965][6861:6861] CHIP:DMG: All ReadHandler-s are clean, clear GlobalDirtySet
-          [1657739317.408046][6861:6861] CHIP:BLE: BleConnectionDelegate::CancelConnection is not implemented.
-          [1657739317.408378][6861:6861] CHIP:DL: writing settings to file (/tmp/chip_counters.ini-c0r3tm)
-          [1657739317.409155][6861:6861] CHIP:DL: renamed tmp file to file (/tmp/chip_counters.ini)
-          [1657739317.409228][6861:6861] CHIP:DL: NVS set: chip-counters/total-operational-hours = 0 (0x0)
-          [1657739317.409260][6861:6861] CHIP:DL: Inet Layer shutdown
-          [1657739317.409286][6861:6861] CHIP:DL: BLE shutdown
-          [1657739317.409313][6861:6861] CHIP:DL: System Layer shutdown
-          [1657739317.409437][6861:6861] CHIP:TOO: Run command failure: ../../third_party/connectedhomeip/src/transport/SessionManager.cpp:176: CHIP Error 0x000000AC: Internal error
+          Press button no.2 on thread board
       disabled: true
 
     - label: "TH1 reads OnOff attribute from TH2 (Endpoint 1)"
diff --git a/src/app/tests/suites/certification/Test_TC_BR_1.yaml b/src/app/tests/suites/certification/Test_TC_BR_1.yaml
index 77f95a8..f2f97f1 100644
--- a/src/app/tests/suites/certification/Test_TC_BR_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_BR_1.yaml
@@ -15,6 +15,9 @@
 
 name: 3.1.1. [TC-BR-1] Basics of Bridging
 
+PICS:
+    - MCORE.BRIDGE
+
 config:
     nodeId: 0x12344321
     cluster: "Basic"
@@ -97,16 +100,17 @@
 
           Verify in TH Log
 
-          [1657002348.693948][3989:3994] CHIP:TOO: Endpoint: 4 Cluster: 0x0000_001D Attribute 0x0000_0000 DataVersion: 1398882309
-          [1657002348.694013][3989:3994] CHIP:TOO:   device list: 2 entries
-          [1657002348.694063][3989:3994] CHIP:TOO:     [1]: {
-          [1657002348.694100][3989:3994] CHIP:TOO:       Type: 259
-          [1657002348.694125][3989:3994] CHIP:TOO:       Revision: 1
-          [1657002348.694149][3989:3994] CHIP:TOO:      }
-          [1657002348.694176][3989:3994] CHIP:TOO:     [2]: {
-          [1657002348.694199][3989:3994] CHIP:TOO:       Type: 19
-          [1657002348.694221][3989:3994] CHIP:TOO:       Revision: 1
-          [1657002348.694242][3989:3994] CHIP:TOO:      }
+          [1659351082.975711][12107:12112] CHIP:TOO: Endpoint: 4 Cluster: 0x0000_001D Attribute 0x0000_0000 DataVersion: 3999956962
+          [1659351082.975821][12107:12112] CHIP:TOO:   device list: 2 entries
+          [1659351082.975883][12107:12112] CHIP:TOO:     [1]: {
+          [1659351082.975929][12107:12112] CHIP:TOO:       Type: 770
+          [1659351082.975973][12107:12112] CHIP:TOO:       Revision: 1
+          [1659351082.976015][12107:12112] CHIP:TOO:      }
+          [1659351082.976066][12107:12112] CHIP:TOO:     [2]: {
+          [1659351082.976109][12107:12112] CHIP:TOO:       Type: 19
+          [1659351082.976150][12107:12112] CHIP:TOO:       Revision: 1
+          [1659351082.976191][12107:12112] CHIP:TOO:      }
+
 
 
 
@@ -114,16 +118,16 @@
 
           Verify in TH Log
 
-          [1657002369.589492][3996:4001] CHIP:TOO: Endpoint: 5 Cluster: 0x0000_001D Attribute 0x0000_0000 DataVersion: 130458766
-          [1657002369.589556][3996:4001] CHIP:TOO:   device list: 2 entries
-          [1657002369.589610][3996:4001] CHIP:TOO:     [1]: {
-          [1657002369.589653][3996:4001] CHIP:TOO:       Type: 259
-          [1657002369.589682][3996:4001] CHIP:TOO:       Revision: 1
-          [1657002369.589710][3996:4001] CHIP:TOO:      }
-          [1657002369.589742][3996:4001] CHIP:TOO:     [2]: {
-          [1657002369.589768][3996:4001] CHIP:TOO:       Type: 19
-          [1657002369.589794][3996:4001] CHIP:TOO:       Revision: 1
-          [1657002369.589819][3996:4001] CHIP:TOO:      }
+          [1659351100.369601][12113:12118] CHIP:TOO: Endpoint: 5 Cluster: 0x0000_001D Attribute 0x0000_0000 DataVersion: 3187411685
+          [1659351100.369695][12113:12118] CHIP:TOO:   device list: 2 entries
+          [1659351100.369746][12113:12118] CHIP:TOO:     [1]: {
+          [1659351100.369781][12113:12118] CHIP:TOO:       Type: 770
+          [1659351100.369816][12113:12118] CHIP:TOO:       Revision: 1
+          [1659351100.369849][12113:12118] CHIP:TOO:      }
+          [1659351100.369889][12113:12118] CHIP:TOO:     [2]: {
+          [1659351100.369923][12113:12118] CHIP:TOO:       Type: 19
+          [1659351100.369955][12113:12118] CHIP:TOO:       Revision: 1
+          [1659351100.369988][12113:12118] CHIP:TOO:      }
 
 
 
@@ -132,12 +136,14 @@
           Verify in TH Log
 
 
-          [1657002386.484093][4002:4007] CHIP:TOO: Endpoint: 6 Cluster: 0x0000_001D Attribute 0x0000_0000 DataVersion: 295450100
-          [1657002386.484155][4002:4007] CHIP:TOO:   device list: 1 entries
-          [1657002386.484255][4002:4007] CHIP:TOO:     [1]: {
-          [1657002386.484302][4002:4007] CHIP:TOO:       Type: 19
-          [1657002386.484332][4002:4007] CHIP:TOO:       Revision: 1
-          [1657002386.484361][4002:4007] CHIP:TOO:      }
+          [1659351102.837218][12119:12124] CHIP:TOO: Endpoint: 6 Cluster: 0x0000_001D Attribute 0x0000_0000 DataVersion: 1173571869
+          [1659351102.837357][12119:12124] CHIP:TOO:   device list: 1 entries
+          [1659351102.837437][12119:12124] CHIP:TOO:     [1]: {
+          [1659351102.837496][12119:12124] CHIP:TOO:       Type: 19
+          [1659351102.837554][12119:12124] CHIP:TOO:       Revision: 1
+          [1659351102.837610][12119:12124] CHIP:TOO:      }
+          [1659351102.837789][12119:12124] CHIP:EM: Sending Standalone Ack for MessageCounter:92381172 on exchange 45312i
+
 
 
 
@@ -145,12 +151,14 @@
 
           Verify in TH Log
 
-          [1657002413.721927][4015:4020] CHIP:TOO: Endpoint: 7 Cluster: 0x0000_001D Attribute 0x0000_0000 DataVersion: 2117104859
-          [1657002413.721981][4015:4020] CHIP:TOO:   device list: 1 entries
-          [1657002413.722028][4015:4020] CHIP:TOO:     [1]: {
-          [1657002413.722065][4015:4020] CHIP:TOO:       Type: 259
-          [1657002413.722090][4015:4020] CHIP:TOO:       Revision: 1
-          [1657002413.722113][4015:4020] CHIP:TOO:      }
+          [1659351105.133982][12125:12130] CHIP:TOO: Endpoint: 7 Cluster: 0x0000_001D Attribute 0x0000_0000 DataVersion: 1309892739
+          [1659351105.134087][12125:12130] CHIP:TOO:   device list: 1 entries
+          [1659351105.134148][12125:12130] CHIP:TOO:     [1]: {
+          [1659351105.134192][12125:12130] CHIP:TOO:       Type: 770
+          [1659351105.134236][12125:12130] CHIP:TOO:       Revision: 1
+          [1659351105.134277][12125:12130] CHIP:TOO:      }
+          [1659351105.134419][12125:12130] CHIP:EM: Sending Standalone Ack for MessageCounter:88821004 on exchange 41639i
+
 
 
 
@@ -158,12 +166,14 @@
 
           Verify in TH Log
 
-          [1657002436.415904][4034:4039] CHIP:TOO: Endpoint: 8 Cluster: 0x0000_001D Attribute 0x0000_0000 DataVersion: 2026786918
-          [1657002436.415972][4034:4039] CHIP:TOO:   device list: 1 entries
-          [1657002436.416033][4034:4039] CHIP:TOO:     [1]: {
-          [1657002436.416081][4034:4039] CHIP:TOO:       Type: 259
-          [1657002436.416115][4034:4039] CHIP:TOO:       Revision: 1
-          [1657002436.416146][4034:4039] CHIP:TOO:      }
+          [1659351107.202771][12131:12136] CHIP:TOO: Endpoint: 8 Cluster: 0x0000_001D Attribute 0x0000_0000 DataVersion: 929721508
+          [1659351107.202850][12131:12136] CHIP:TOO:   device list: 1 entries
+          [1659351107.202887][12131:12136] CHIP:TOO:     [1]: {
+          [1659351107.202912][12131:12136] CHIP:TOO:       Type: 770
+          [1659351107.202937][12131:12136] CHIP:TOO:       Revision: 1
+          [1659351107.202961][12131:12136] CHIP:TOO:      }
+          [1659351107.203062][12131:12136] CHIP:EM: Sending Standalone Ack for MessageCounter:193017490 on exchange 10260i
+
 
 
 
@@ -298,135 +308,160 @@
 
           Verify in TH Log
 
-          [1657002927.992247][4143:4148] CHIP:TOO: Endpoint: 4 Cluster: 0x0000_001D Attribute 0x0000_0000 DataVersion: 1398882309
-          [1657002927.992309][4143:4148] CHIP:TOO:   device list: 2 entries
-          [1657002927.992362][4143:4148] CHIP:TOO:     [1]: {
-          [1657002927.992405][4143:4148] CHIP:TOO:       Type: 259
-          [1657002927.992434][4143:4148] CHIP:TOO:       Revision: 1
-          [1657002927.992459][4143:4148] CHIP:TOO:      }
-          [1657002927.992490][4143:4148] CHIP:TOO:     [2]: {
-          [1657002927.992516][4143:4148] CHIP:TOO:       Type: 19
-          [1657002927.992542][4143:4148] CHIP:TOO:       Revision: 1
-          [1657002927.992567][4143:4148] CHIP:TOO:      }
+          [1659351082.975711][12107:12112] CHIP:TOO: Endpoint: 4 Cluster: 0x0000_001D Attribute 0x0000_0000 DataVersion: 3999956962
+          [1659351082.975821][12107:12112] CHIP:TOO:   device list: 2 entries
+          [1659351082.975883][12107:12112] CHIP:TOO:     [1]: {
+          [1659351082.975929][12107:12112] CHIP:TOO:       Type: 770
+          [1659351082.975973][12107:12112] CHIP:TOO:       Revision: 1
+          [1659351082.976015][12107:12112] CHIP:TOO:      }
+          [1659351082.976066][12107:12112] CHIP:TOO:     [2]: {
+          [1659351082.976109][12107:12112] CHIP:TOO:       Type: 19
+          [1659351082.976150][12107:12112] CHIP:TOO:       Revision: 1
+          [1659351082.976191][12107:12112] CHIP:TOO:      }
 
-           ./chip-tool  descriptor read device-list 1 5
+
+
+
+          ./chip-tool  descriptor read device-list 1 5
 
           Verify in TH Log
 
-          [1657002949.332151][4156:4161] CHIP:TOO: Endpoint: 5 Cluster: 0x0000_001D Attribute 0x0000_0000 DataVersion: 130458766
-          [1657002949.332245][4156:4161] CHIP:TOO:   device list: 2 entries
-          [1657002949.332294][4156:4161] CHIP:TOO:     [1]: {
-          [1657002949.332332][4156:4161] CHIP:TOO:       Type: 259
-          [1657002949.332356][4156:4161] CHIP:TOO:       Revision: 1
-          [1657002949.332379][4156:4161] CHIP:TOO:      }
-          [1657002949.332405][4156:4161] CHIP:TOO:     [2]: {
-          [1657002949.332427][4156:4161] CHIP:TOO:       Type: 19
-          [1657002949.332449][4156:4161] CHIP:TOO:       Revision: 1
-          [1657002949.332470][4156:4161] CHIP:TOO:      }
+          [1659351100.369601][12113:12118] CHIP:TOO: Endpoint: 5 Cluster: 0x0000_001D Attribute 0x0000_0000 DataVersion: 3187411685
+          [1659351100.369695][12113:12118] CHIP:TOO:   device list: 2 entries
+          [1659351100.369746][12113:12118] CHIP:TOO:     [1]: {
+          [1659351100.369781][12113:12118] CHIP:TOO:       Type: 770
+          [1659351100.369816][12113:12118] CHIP:TOO:       Revision: 1
+          [1659351100.369849][12113:12118] CHIP:TOO:      }
+          [1659351100.369889][12113:12118] CHIP:TOO:     [2]: {
+          [1659351100.369923][12113:12118] CHIP:TOO:       Type: 19
+          [1659351100.369955][12113:12118] CHIP:TOO:       Revision: 1
+          [1659351100.369988][12113:12118] CHIP:TOO:      }
 
-           ./chip-tool  descriptor read device-list 1 6
+
+
+          ./chip-tool  descriptor read device-list 1 6
 
           Verify in TH Log
 
 
-          [1657002965.947096][4163:4168] CHIP:TOO: Endpoint: 6 Cluster: 0x0000_001D Attribute 0x0000_0000 DataVersion: 295450100
-          [1657002965.947150][4163:4168] CHIP:TOO:   device list: 1 entries
-          [1657002965.947196][4163:4168] CHIP:TOO:     [1]: {
-          [1657002965.947231][4163:4168] CHIP:TOO:       Type: 19
-          [1657002965.947256][4163:4168] CHIP:TOO:       Revision: 1
-          [1657002965.947278][4163:4168] CHIP:TOO:      }
+          [1659351102.837218][12119:12124] CHIP:TOO: Endpoint: 6 Cluster: 0x0000_001D Attribute 0x0000_0000 DataVersion: 1173571869
+          [1659351102.837357][12119:12124] CHIP:TOO:   device list: 1 entries
+          [1659351102.837437][12119:12124] CHIP:TOO:     [1]: {
+          [1659351102.837496][12119:12124] CHIP:TOO:       Type: 19
+          [1659351102.837554][12119:12124] CHIP:TOO:       Revision: 1
+          [1659351102.837610][12119:12124] CHIP:TOO:      }
+          [1659351102.837789][12119:12124] CHIP:EM: Sending Standalone Ack for MessageCounter:92381172 on exchange 45312i
 
-           ./chip-tool  descriptor read device-list 1 7
 
-          Verify in TH Log
-          [1657002981.963307][4176:4181] CHIP:TOO: Endpoint: 7 Cluster: 0x0000_001D Attribute 0x0000_0000 DataVersion: 2117104859
-          [1657002981.963371][4176:4181] CHIP:TOO:   device list: 1 entries
-          [1657002981.963429][4176:4181] CHIP:TOO:     [1]: {
-          [1657002981.963474][4176:4181] CHIP:TOO:       Type: 259
-          [1657002981.963505][4176:4181] CHIP:TOO:       Revision: 1
-          [1657002981.963533][4176:4181] CHIP:TOO:      }
 
-           ./chip-tool  descriptor read device-list 1 8
+
+          ./chip-tool  descriptor read device-list 1 7
 
           Verify in TH Log
 
-          [1657003007.476575][4183:4188] CHIP:TOO: Endpoint: 8 Cluster: 0x0000_001D Attribute 0x0000_0000 DataVersion: 2026786918
-          [1657003007.476635][4183:4188] CHIP:TOO:   device list: 1 entries
-          [1657003007.476689][4183:4188] CHIP:TOO:     [1]: {
-          [1657003007.476731][4183:4188] CHIP:TOO:       Type: 259
-          [1657003007.476760][4183:4188] CHIP:TOO:       Revision: 1
-          [1657003007.476786][4183:4188] CHIP:TOO:      }
+          [1659351105.133982][12125:12130] CHIP:TOO: Endpoint: 7 Cluster: 0x0000_001D Attribute 0x0000_0000 DataVersion: 1309892739
+          [1659351105.134087][12125:12130] CHIP:TOO:   device list: 1 entries
+          [1659351105.134148][12125:12130] CHIP:TOO:     [1]: {
+          [1659351105.134192][12125:12130] CHIP:TOO:       Type: 770
+          [1659351105.134236][12125:12130] CHIP:TOO:       Revision: 1
+          [1659351105.134277][12125:12130] CHIP:TOO:      }
+          [1659351105.134419][12125:12130] CHIP:EM: Sending Standalone Ack for MessageCounter:88821004 on exchange 41639i
 
-           ./chip-tool  descriptor read device-list 1 9
+
+
+
+          ./chip-tool  descriptor read device-list 1 8
 
           Verify in TH Log
 
-          [1657003023.263333][4191:4196] CHIP:TOO: Endpoint: 9 Cluster: 0x0000_001D Attribute 0x0000_0000 DataVersion: 913116116
-          [1657003023.263391][4191:4196] CHIP:TOO:   device list: 1 entries
-          [1657003023.263443][4191:4196] CHIP:TOO:     [1]: {
-          [1657003023.263484][4191:4196] CHIP:TOO:       Type: 17
-          [1657003023.263512][4191:4196] CHIP:TOO:       Revision: 1
-          [1657003023.263538][4191:4196] CHIP:TOO:      }
+          [1659351107.202771][12131:12136] CHIP:TOO: Endpoint: 8 Cluster: 0x0000_001D Attribute 0x0000_0000 DataVersion: 929721508
+          [1659351107.202850][12131:12136] CHIP:TOO:   device list: 1 entries
+          [1659351107.202887][12131:12136] CHIP:TOO:     [1]: {
+          [1659351107.202912][12131:12136] CHIP:TOO:       Type: 770
+          [1659351107.202937][12131:12136] CHIP:TOO:       Revision: 1
+          [1659351107.202961][12131:12136] CHIP:TOO:      }
+          [1659351107.203062][12131:12136] CHIP:EM: Sending Standalone Ack for MessageCounter:193017490 on exchange 10260i
 
-           ./chip-tool  descriptor read device-list 1 10
+
+
+
+          ./chip-tool  descriptor read device-list 1 9
 
           Verify in TH Log
 
-          [1657003044.071972][4204:4209] CHIP:TOO: Endpoint: 10 Cluster: 0x0000_001D Attribute 0x0000_0000 DataVersion: 259205426
-          [1657003044.072037][4204:4209] CHIP:TOO:   device list: 2 entries
-          [1657003044.072085][4204:4209] CHIP:TOO:     [1]: {
-          [1657003044.072123][4204:4209] CHIP:TOO:       Type: 256
-          [1657003044.072149][4204:4209] CHIP:TOO:       Revision: 1
-          [1657003044.072195][4204:4209] CHIP:TOO:      }
-          [1657003044.072227][4204:4209] CHIP:TOO:     [2]: {
-          [1657003044.072250][4204:4209] CHIP:TOO:       Type: 19
-          [1657003044.072272][4204:4209] CHIP:TOO:       Revision: 1
-          [1657003044.072295][4204:4209] CHIP:TOO:      }
+          [1657002455.445818][4040:4045] CHIP:TOO: Endpoint: 9 Cluster: 0x0000_001D Attribute 0x0000_0000 DataVersion: 913116116
+          [1657002455.445883][4040:4045] CHIP:TOO:   device list: 1 entries
+          [1657002455.445944][4040:4045] CHIP:TOO:     [1]: {
+          [1657002455.445991][4040:4045] CHIP:TOO:       Type: 17
+          [1657002455.446025][4040:4045] CHIP:TOO:       Revision: 1
+          [1657002455.446056][4040:4045] CHIP:TOO:      }
 
-           ./chip-tool  descriptor read device-list 1 11
+
+
+          ./chip-tool  descriptor read device-list 1 10
 
           Verify in TH Log
 
-          [1657003082.358311][4217:4222] CHIP:TOO: Endpoint: 11 Cluster: 0x0000_001D Attribute 0x0000_0000 DataVersion: 4248421677
-          [1657003082.358379][4217:4222] CHIP:TOO:   device list: 2 entries
-          [1657003082.358432][4217:4222] CHIP:TOO:     [1]: {
-          [1657003082.358471][4217:4222] CHIP:TOO:       Type: 256
-          [1657003082.358501][4217:4222] CHIP:TOO:       Revision: 1
-          [1657003082.358529][4217:4222] CHIP:TOO:      }
-          [1657003082.358563][4217:4222] CHIP:TOO:     [2]: {
-          [1657003082.358591][4217:4222] CHIP:TOO:       Type: 19
-          [1657003082.358619][4217:4222] CHIP:TOO:       Revision: 1
-          [1657003082.358646][4217:4222] CHIP:TOO:      }
+          [1657002473.100910][4047:4052] CHIP:TOO: Endpoint: 10 Cluster: 0x0000_001D Attribute 0x0000_0000 DataVersion: 259205426
+          [1657002473.100967][4047:4052] CHIP:TOO:   device list: 2 entries
+          [1657002473.101013][4047:4052] CHIP:TOO:     [1]: {
+          [1657002473.101051][4047:4052] CHIP:TOO:       Type: 256
+          [1657002473.101076][4047:4052] CHIP:TOO:       Revision: 1
+          [1657002473.101098][4047:4052] CHIP:TOO:      }
+          [1657002473.101126][4047:4052] CHIP:TOO:     [2]: {
+          [1657002473.101148][4047:4052] CHIP:TOO:       Type: 19
+          [1657002473.101170][4047:4052] CHIP:TOO:       Revision: 1
+          [1657002473.101192][4047:4052] CHIP:TOO:      }
 
-           ./chip-tool  descriptor read device-list 1 12
+
+          ./chip-tool  descriptor read device-list 1 11
 
           Verify in TH Log
 
-          [1657003103.954911][4248:4253] CHIP:TOO: Endpoint: 12 Cluster: 0x0000_001D Attribute 0x0000_0000 DataVersion: 2731599835
-          [1657003103.954986][4248:4253] CHIP:TOO:   device list: 2 entries
-          [1657003103.955050][4248:4253] CHIP:TOO:     [1]: {
-          [1657003103.955095][4248:4253] CHIP:TOO:       Type: 256
-          [1657003103.955125][4248:4253] CHIP:TOO:       Revision: 1
-          [1657003103.955153][4248:4253] CHIP:TOO:      }
-          [1657003103.955186][4248:4253] CHIP:TOO:     [2]: {
-          [1657003103.955214][4248:4253] CHIP:TOO:       Type: 19
-          [1657003103.955242][4248:4253] CHIP:TOO:       Revision: 1
-          [1657003103.955269][4248:4253] CHIP:TOO:      }
+          [1657002495.856770][4061:4066] CHIP:TOO: Endpoint: 11 Cluster: 0x0000_001D Attribute 0x0000_0000 DataVersion: 4248421677
+          [1657002495.856836][4061:4066] CHIP:TOO:   device list: 2 entries
+          [1657002495.856893][4061:4066] CHIP:TOO:     [1]: {
+          [1657002495.856938][4061:4066] CHIP:TOO:       Type: 256
+          [1657002495.856968][4061:4066] CHIP:TOO:       Revision: 1
+          [1657002495.856996][4061:4066] CHIP:TOO:      }
+          [1657002495.857030][4061:4066] CHIP:TOO:     [2]: {
+          [1657002495.857058][4061:4066] CHIP:TOO:       Type: 19
+          [1657002495.857085][4061:4066] CHIP:TOO:       Revision: 1
+          [1657002495.857112][4061:4066] CHIP:TOO:      }
 
-           ./chip-tool  descriptor read device-list 1 13
+
+
+          ./chip-tool  descriptor read device-list 1 12
 
           Verify in TH Log
 
-          [1657003125.905572][4261:4266] CHIP:TOO: Endpoint: 13 Cluster: 0x0000_001D Attribute 0x0000_0000 DataVersion: 3449178249
-          [1657003125.905638][4261:4266] CHIP:TOO:   device list: 2 entries
-          [1657003125.905687][4261:4266] CHIP:TOO:     [1]: {
-          [1657003125.905723][4261:4266] CHIP:TOO:       Type: 256
-          [1657003125.905750][4261:4266] CHIP:TOO:       Revision: 1
-          [1657003125.905773][4261:4266] CHIP:TOO:      }
-          [1657003125.905800][4261:4266] CHIP:TOO:     [2]: {
-          [1657003125.905823][4261:4266] CHIP:TOO:       Type: 19
-          [1657003125.905845][4261:4266] CHIP:TOO:       Revision: 1
-          [1657003125.905867][4261:4266] CHIP:TOO:      }
+          [1657002515.862187][4073:4078] CHIP:TOO: Endpoint: 12 Cluster: 0x0000_001D Attribute 0x0000_0000 DataVersion: 2731599835
+          [1657002515.862249][4073:4078] CHIP:TOO:   device list: 2 entries
+          [1657002515.862302][4073:4078] CHIP:TOO:     [1]: {
+          [1657002515.862343][4073:4078] CHIP:TOO:       Type: 256
+          [1657002515.862372][4073:4078] CHIP:TOO:       Revision: 1
+          [1657002515.862398][4073:4078] CHIP:TOO:      }
+          [1657002515.862429][4073:4078] CHIP:TOO:     [2]: {
+          [1657002515.862455][4073:4078] CHIP:TOO:       Type: 19
+          [1657002515.862480][4073:4078] CHIP:TOO:       Revision: 1
+          [1657002515.862504][4073:4078] CHIP:TOO:      }
+
+
+
+          ./chip-tool  descriptor read device-list 1 13
+
+          Verify in TH Log
+
+          [1657002538.134605][4097:4102] CHIP:TOO: Endpoint: 13 Cluster: 0x0000_001D Attribute 0x0000_0000 DataVersion: 3449178249
+          [1657002538.134700][4097:4102] CHIP:TOO:   device list: 2 entries
+          [1657002538.134784][4097:4102] CHIP:TOO:     [1]: {
+          [1657002538.134869][4097:4102] CHIP:TOO:       Type: 256
+          [1657002538.134916][4097:4102] CHIP:TOO:       Revision: 1
+          [1657002538.134973][4097:4102] CHIP:TOO:      }
+          [1657002538.135025][4097:4102] CHIP:TOO:     [2]: {
+          [1657002538.135083][4097:4102] CHIP:TOO:       Type: 19
+          [1657002538.135126][4097:4102] CHIP:TOO:       Revision: 1
+          [1657002538.135166][4097:4102] CHIP:TOO:      }
       disabled: true
 
     - label:
@@ -470,7 +505,7 @@
           type(s) of the bridged device"
       PICS: MCORE.BRIDGE
       verification: |
-          Verify thedevice-list attribute has devicetype application 1.e, 0x0100 = 256(actuator), 0x0103=259(sensor)
+          Verify thedevice-list attribute has devicetype application 1.e, 0x0100 = 256(actuator),0x0302=770( temperature sensor)
 
 
           ./chip-tool descriptor read device-list 1 3
@@ -494,44 +529,48 @@
 
           Verify in TH Log
 
-          [1657004014.927308][4678:4683] CHIP:TOO: Endpoint: 4 Cluster: 0x0000_001D Attribute 0x0000_0000 DataVersion: 1398882309
-          [1657004014.927387][4678:4683] CHIP:TOO:   device list: 2 entries
-          [1657004014.927460][4678:4683] CHIP:TOO:     [1]: {
-          [1657004014.927514][4678:4683] CHIP:TOO:       Type: 259
-          [1657004014.927551][4678:4683] CHIP:TOO:       Revision: 1
-          [1657004014.927585][4678:4683] CHIP:TOO:      }
-          [1657004014.927622][4678:4683] CHIP:TOO:     [2]: {
-          [1657004014.927650][4678:4683] CHIP:TOO:       Type: 19
-          [1657004014.927678][4678:4683] CHIP:TOO:       Revision: 1
-          [1657004014.927705][4678:4683] CHIP:TOO:      }
+          [1659350396.878528][11929:11934] CHIP:TOO: Endpoint: 4 Cluster: 0x0000_001D Attribute 0x0000_0000 DataVersion: 3398096270
+          [1659350396.878598][11929:11934] CHIP:TOO:   device list: 2 entries
+          [1659350396.878635][11929:11934] CHIP:TOO:     [1]: {
+          [1659350396.878661][11929:11934] CHIP:TOO:       Type: 770
+          [1659350396.878688][11929:11934] CHIP:TOO:       Revision: 1
+          [1659350396.878712][11929:11934] CHIP:TOO:      }
+          [1659350396.878741][11929:11934] CHIP:TOO:     [2]: {
+          [1659350396.878765][11929:11934] CHIP:TOO:       Type: 19
+          [1659350396.878789][11929:11934] CHIP:TOO:       Revision: 1
+          [1659350396.878812][11929:11934] CHIP:TOO:      }
+
 
 
           ./chip-tool descriptor read device-list 1 5
 
           Verify in TH Log
 
-          [1657004035.789404][4690:4695] CHIP:TOO: Endpoint: 5 Cluster: 0x0000_001D Attribute 0x0000_0000 DataVersion: 130458766
-          [1657004035.789470][4690:4695] CHIP:TOO:   device list: 2 entries
-          [1657004035.789526][4690:4695] CHIP:TOO:     [1]: {
-          [1657004035.789571][4690:4695] CHIP:TOO:       Type: 259
-          [1657004035.789601][4690:4695] CHIP:TOO:       Revision: 1
-          [1657004035.789629][4690:4695] CHIP:TOO:      }
-          [1657004035.789663][4690:4695] CHIP:TOO:     [2]: {
-          [1657004035.789691][4690:4695] CHIP:TOO:       Type: 19
-          [1657004035.789717][4690:4695] CHIP:TOO:       Revision: 1
-          [1657004035.789744][4690:4695] CHIP:TOO:      }
+          [1659350678.671359][11991:11996] CHIP:TOO: Endpoint: 5 Cluster: 0x0000_001D Attribute 0x0000_0000 DataVersion: 3750503881
+          [1659350678.671437][11991:11996] CHIP:TOO:   device list: 2 entries
+          [1659350678.671475][11991:11996] CHIP:TOO:     [1]: {
+          [1659350678.671500][11991:11996] CHIP:TOO:       Type: 770
+          [1659350678.671525][11991:11996] CHIP:TOO:       Revision: 1
+          [1659350678.671548][11991:11996] CHIP:TOO:      }
+          [1659350678.671577][11991:11996] CHIP:TOO:     [2]: {
+          [1659350678.671601][11991:11996] CHIP:TOO:       Type: 19
+          [1659350678.671624][11991:11996] CHIP:TOO:       Revision: 1
+          [1659350678.671647][11991:11996] CHIP:TOO:      }
+
 
 
           ./chip-tool descriptor read device-list 1 6
 
           Verify in TH Log
 
-          [1657004053.597061][4698:4703] CHIP:TOO: Endpoint: 6 Cluster: 0x0000_001D Attribute 0x0000_0000 DataVersion: 295450100
-          [1657004053.597116][4698:4703] CHIP:TOO:   device list: 1 entries
-          [1657004053.597164][4698:4703] CHIP:TOO:     [1]: {
-          [1657004053.597200][4698:4703] CHIP:TOO:       Type: 19
-          [1657004053.597225][4698:4703] CHIP:TOO:       Revision: 1
-          [1657004053.597248][4698:4703] CHIP:TOO:      }
+          [1659350682.392346][11997:12002] CHIP:TOO: Endpoint: 6 Cluster: 0x0000_001D Attribute 0x0000_0000 DataVersion: 2160703024
+          [1659350682.392416][11997:12002] CHIP:TOO:   device list: 1 entries
+          [1659350682.392455][11997:12002] CHIP:TOO:     [1]: {
+          [1659350682.392481][11997:12002] CHIP:TOO:       Type: 19
+          [1659350682.392507][11997:12002] CHIP:TOO:       Revision: 1
+          [1659350682.392532][11997:12002] CHIP:TOO:      }
+          [1659350682.392626][11997:12002] CHIP:EM: Sending Standalone Ack for MessageCounter:39744651 on exchange 45824i
+
 
 
           ./chip-tool descriptor read device-list 1 10
@@ -691,18 +730,34 @@
           "Read the state of this bridged device (through Matter), e.g.
           occupancy status, contact status, current temperature"
       verification: |
-          use chip-tool to read sensor state (e.g. current temperature)
+          ./chip-tool temperaturemeasurement read measured-value 1 4
+
+          [1659351487.005743][12201:12207] CHIP:TOO: Endpoint: 4 Cluster: 0x0000_0402 Attribute 0x0000_0000 DataVersion: 2406690152
+          [1659351487.005831][12201:12207] CHIP:TOO:   MeasuredValue: 100
+          [1659351487.005924][12201:12207] CHIP:EM: Sending Standalone Ack for MessageCounter:236763897 on exchange 8128i
       disabled: true
 
     - label:
           "Change the state of this sensor (e.g. cover the occupancy sensor,
           open the contact sensor, heat the temperature sensor)"
       verification: |
-          Press a key (which one TBD) on bridge-app to change the simulated temperature
+          Press a key "tbd" on bridge-app to change the simulated temperature
+
+          [1659351537.115828][14237:14242] CHIP:DL: TempSensorDevice[TempSensor 1]: New measurement="200"
+          [1659351537.115987][14237:14242] CHIP:DL: TempSensorDevice[TempSensor 2]: New measurement="200"
+          [1659351537.116097][14237:14242] CHIP:DL: TempSensorDevice[Composed TempSensor 1]: New measurement="200"
+          [1659351537.116158][14237:14237] CHIP:DMG: Endpoint 4, Cluster 0x0000_0402 update version to 8f732d69
+          [1659351537.116300][14237:14237] CHIP:DMG: Endpoint 5, Cluster 0x0000_0402 update version to 36be37c5
+          [1659351537.116393][14237:14237] CHIP:DMG: Endpoint 7, Cluster 0x0000_0402 update version to 2cf2064d
+          [1659351537.116179][14237:14242] CHIP:DL: TempSensorDevice[Composed TempSensor 2]: New measurement="200"
       disabled: true
 
     - label: "Read the state of this bridged device again, as in 7b"
       verification: |
-          use chip-tool to read sensor state (e.g. current temperature)
+          ./chip-tool temperaturemeasurement read measured-value 1 4
+
           expect to get a different value than step 7b
+          [1659351542.393349][12212:12217] CHIP:TOO: Endpoint: 4 Cluster: 0x0000_0402 Attribute 0x0000_0000 DataVersion: 2406690153
+          [1659351542.393429][12212:12217] CHIP:TOO:   MeasuredValue: 200
+          [1659351542.393552][12212:12217] CHIP:EM: Sending Standalone Ack for MessageCounter:120981971 on exchange 25924i
       disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_BR_2.yaml b/src/app/tests/suites/certification/Test_TC_BR_2.yaml
index 67eacb6..c4ac703 100644
--- a/src/app/tests/suites/certification/Test_TC_BR_2.yaml
+++ b/src/app/tests/suites/certification/Test_TC_BR_2.yaml
@@ -15,6 +15,9 @@
 
 name: 3.1.2. [TC-BR-2] Changing the set of Bridged Devices
 
+PICS:
+    - MCORE.BRIDGE
+
 config:
     nodeId: 0x12344321
     cluster: "Basic"
@@ -836,6 +839,85 @@
       PICS: MCORE.BRIDGE
       verification: |
           Verify step 6 and 7 of TC-BR-1 for bridged device added in step 2 of TC-BR-2
+
+          For actuator follow below steps:
+          1) Choose on-off cluster as the bridged devices which is an actuator
+          2) ./chip-tool onoff read on-off 1 3
+          Verify the actual state of the bridged device in TH Log
+          [1657004454.213279][4792:4798] CHIP:TOO: Endpoint: 3 Cluster: 0x0000_0006 Attribute 0x0000_0000 DataVersion: 3808303315
+          [1657004454.213319][4792:4798] CHIP:TOO:   OnOff: FALSE
+
+          3) ./chip-tool onoff toggle 1 3
+          Verify On bridge-app
+          [1657522278.538831][18140:18140] CHIP:DMG: Received command for Endpoint=3 Cluster=0x0000_0006 Command=0x0000_0002
+          [1657522278.538861][18140:18140] CHIP:ZCL: On/Off set value: 3 2
+          [1657522278.538887][18140:18140] CHIP:DL: HandleReadOnOffAttribute: attrId=0, maxReadLength=1
+          [1657522278.538910][18140:18140] CHIP:ZCL: Toggle on/off from 0 to 1
+          [1657522278.538936][18140:18140] CHIP:DL: HandleWriteOnOffAttribute: attrId=0
+          [1657522278.538957][18140:18140] CHIP:DL: Device[Light 1]: ON
+
+          Verify actual state of the bridged device changes accordingly in TH Log
+          [1657522278.539407][16698:16703] CHIP:DMG: {
+          [1657522278.539447][16698:16703] CHIP:DMG:         suppressResponse = false,
+          [1657522278.539495][16698:16703] CHIP:DMG:         InvokeResponseIBs =
+          [1657522278.539545][16698:16703] CHIP:DMG:         [
+          [1657522278.539585][16698:16703] CHIP:DMG:                 InvokeResponseIB =
+          [1657522278.539641][16698:16703] CHIP:DMG:                 {
+          [1657522278.539688][16698:16703] CHIP:DMG:                         CommandStatusIB =
+          [1657522278.539746][16698:16703] CHIP:DMG:                         {
+          [1657522278.539795][16698:16703] CHIP:DMG:                                 CommandPathIB =
+          [1657522278.539856][16698:16703] CHIP:DMG:                                 {
+          [1657522278.539912][16698:16703] CHIP:DMG:                                         EndpointId = 0x3,
+          [1657522278.539977][16698:16703] CHIP:DMG:                                         ClusterId = 0x6,
+          [1657522278.540039][16698:16703] CHIP:DMG:                                         CommandId = 0x2,
+          [1657522278.540097][16698:16703] CHIP:DMG:                                 },
+          [1657522278.540162][16698:16703] CHIP:DMG:
+          [1657522278.540214][16698:16703] CHIP:DMG:                                 StatusIB =
+          [1657522278.540276][16698:16703] CHIP:DMG:                                 {
+          [1657522278.540332][16698:16703] CHIP:DMG:                                         status = 0x00 (SUCCESS),
+          [1657522278.540386][16698:16703] CHIP:DMG:                                 },
+          [1657522278.540446][16698:16703] CHIP:DMG:
+          [1657522278.540499][16698:16703] CHIP:DMG:                         },
+          [1657522278.540560][16698:16703] CHIP:DMG:
+          [1657522278.540605][16698:16703] CHIP:DMG:                 },
+          [1657522278.540658][16698:16703] CHIP:DMG:
+          [1657522278.540696][16698:16703] CHIP:DMG:         ],
+          [1657522278.540744][16698:16703] CHIP:DMG:
+          [1657522278.540783][16698:16703] CHIP:DMG:         InteractionModelRevision = 1
+          [1657522278.540825][16698:16703] CHIP:DMG: },
+          [1657522278.540916][16698:16703] CHIP:DMG: Received Command Response Status for Endpoint=3 Cluster=0x0000_0006 Command=0x0000_0002 Status=0x0
+          [1657522278.540981][16698:16703] CHIP:DMG: ICR moving to [AwaitingDe]
+
+          4)./chip-tool onoff read on-off 1 3
+          Verify the value of onoff matches the value of onoff in step 6c in TH Log
+          [1657004565.254591][4804:4809] CHIP:TOO: Endpoint: 3 Cluster: 0x0000_0006 Attribute 0x0000_0000 DataVersion: 3808303316
+          [1657004565.254635][4804:4809] CHIP:TOO:   OnOff: TRUE
+
+
+
+
+
+
+          For sensor follow below steps:
+          1) Choose a sensor device (e.g. temperature sensor, being added to bridge-app)
+          2) ./chip-tool temperaturemeasurement read measured-value 1 4
+          [1659351487.005743][12201:12207] CHIP:TOO: Endpoint: 4 Cluster: 0x0000_0402 Attribute 0x0000_0000 DataVersion: 2406690152
+          [1659351487.005831][12201:12207] CHIP:TOO:   MeasuredValue: 100
+          [1659351487.005924][12201:12207] CHIP:EM: Sending Standalone Ack for MessageCounter:236763897 on exchange 8128i
+
+          3) Press a key "tbd" on bridge-app to change the simulated temperature
+          [1659351537.115828][14237:14242] CHIP:DL: TempSensorDevice[TempSensor 1]: New measurement=""200""
+          [1659351537.115987][14237:14242] CHIP:DL: TempSensorDevice[TempSensor 2]: New measurement=""200""
+          [1659351537.116097][14237:14242] CHIP:DL: TempSensorDevice[Composed TempSensor 1]: New measurement=""200""
+          [1659351537.116158][14237:14237] CHIP:DMG: Endpoint 4, Cluster 0x0000_0402 update version to 8f732d69
+          [1659351537.116300][14237:14237] CHIP:DMG: Endpoint 5, Cluster 0x0000_0402 update version to 36be37c5
+          [1659351537.116393][14237:14237] CHIP:DMG: Endpoint 7, Cluster 0x0000_0402 update version to 2cf2064d
+          [1659351537.116179][14237:14242] CHIP:DL: TempSensorDevice[Composed TempSensor 2]: New measurement=""200""
+
+          4)./chip-tool temperaturemeasurement read measured-value 1 4
+          [1659351542.393349][12212:12217] CHIP:TOO: Endpoint: 4 Cluster: 0x0000_0402 Attribute 0x0000_0000 DataVersion: 2406690153
+          [1659351542.393429][12212:12217] CHIP:TOO:   MeasuredValue: 200
+          [1659351542.393552][12212:12217] CHIP:EM: Sending Standalone Ack for MessageCounter:120981971 on exchange 25924i
       disabled: true
 
     - label:
diff --git a/src/app/tests/suites/certification/Test_TC_BR_3.yaml b/src/app/tests/suites/certification/Test_TC_BR_3.yaml
index be3b103..53cc770 100644
--- a/src/app/tests/suites/certification/Test_TC_BR_3.yaml
+++ b/src/app/tests/suites/certification/Test_TC_BR_3.yaml
@@ -15,6 +15,9 @@
 
 name: 3.1.3. [TC-BR-3] Changing name and state of a bridged device
 
+PICS:
+    - MCORE.BRIDGE
+
 config:
     nodeId: 0x12344321
     cluster: "Basic"
diff --git a/src/app/tests/suites/certification/Test_TC_BR_4.yaml b/src/app/tests/suites/certification/Test_TC_BR_4.yaml
new file mode 100644
index 0000000..6fdf3aa
--- /dev/null
+++ b/src/app/tests/suites/certification/Test_TC_BR_4.yaml
@@ -0,0 +1,554 @@
+# 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.1.4. [TC-BR-4] DUT client handling of bridges (DUT client)
+
+PICS:
+    - MCORE.BRIDGECLIENT
+
+config:
+    nodeId: 0x12344321
+    cluster: "Basic"
+    endpoint: 0
+
+tests:
+    - label:
+          "Start bridge-app on TH. Commission TH to DUT. Monitor traffic between
+          DUT and TH."
+      verification: |
+          On TH server side:
+          sudo ./chip-bridge-app
+
+          On DUT as client side:
+          ./chip-tool pairing ethernet 1 20202021 3840 fe80::e65f:1ff:fe0f:2753  5540
+
+          Verify DeviceTypeList for available EP
+
+          ./chip-tool  descriptor read device-list 1 1
+
+          On DUT as client side:
+          [1657002313.871608][3977:3982] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_001D Attribute 0x0000_0000 DataVersion: 3021853414
+          [1657002313.871680][3977:3982] CHIP:TOO:   device list: 1 entries
+          [1657002313.871740][3977:3982] CHIP:TOO:     [1]: {
+          [1657002313.871788][3977:3982] CHIP:TOO:       Type: 14
+          [1657002313.871821][3977:3982] CHIP:TOO:       Revision: 1
+          [1657002313.871852][3977:3982] :TOOCHIP:      }
+
+          ./chip-tool  descriptor read device-list 1 3
+
+          On DUT as client side:
+          [1657002329.438065][3983:3988] CHIP:TOO: Endpoint: 3 Cluster: 0x0000_001D Attribute 0x0000_0000 DataVersion: 2452512872
+          [1657002329.438135][3983:3988] CHIP:TOO:   device list: 2 entries
+          [1657002329.438193][3983:3988] CHIP:TOO:     [1]: {
+          [1657002329.438238][3983:3988] CHIP:TOO:       Type: 256
+          [1657002329.438269][3983:3988] CHIP:TOO:       Revision: 1
+          [1657002329.438298][3983:3988] CHIP:TOO:      }
+          [1657002329.438332][3983:3988] CHIP:TOO:     [2]: {
+          [1657002329.438360][3983:3988] CHIP:TOO:       Type: 19
+          [1657002329.438389][3983:3988] CHIP:TOO:       Revision: 1
+          [1657002329.438416][3983:3988] CHIP:TOO:      }
+
+
+          ./chip-tool  descriptor read device-list 1 4
+
+          On DUT as client side:
+          [1657002348.693948][3989:3994] CHIP:TOO: Endpoint: 4 Cluster: 0x0000_001D Attribute 0x0000_0000 DataVersion: 1398882309
+          [1657002348.694013][3989:3994] CHIP:TOO:   device list: 2 entries
+          [1657002348.694063][3989:3994] CHIP:TOO:     [1]: {
+          [1657002348.694100][3989:3994] CHIP:TOO:       Type: 259
+          [1657002348.694125][3989:3994] CHIP:TOO:       Revision: 1
+          [1657002348.694149][3989:3994] CHIP:TOO:      }
+          [1657002348.694176][3989:3994] CHIP:TOO:     [2]: {
+          [1657002348.694199][3989:3994] CHIP:TOO:       Type: 19
+          [1657002348.694221][3989:3994] CHIP:TOO:       Revision: 1
+          [1657002348.694242][3989:3994] CHIP:TOO:      }
+
+
+
+          ./chip-tool  descriptor read device-list 1 5
+
+          On DUT as client side:
+          [1657002369.589492][3996:4001] CHIP:TOO: Endpoint: 5 Cluster: 0x0000_001D Attribute 0x0000_0000 DataVersion: 130458766
+          [1657002369.589556][3996:4001] CHIP:TOO:   device list: 2 entries
+          [1657002369.589610][3996:4001] CHIP:TOO:     [1]: {
+          [1657002369.589653][3996:4001] CHIP:TOO:       Type: 259
+          [1657002369.589682][3996:4001] CHIP:TOO:       Revision: 1
+          [1657002369.589710][3996:4001] CHIP:TOO:      }
+          [1657002369.589742][3996:4001] CHIP:TOO:     [2]: {
+          [1657002369.589768][3996:4001] CHIP:TOO:       Type: 19
+          [1657002369.589794][3996:4001] CHIP:TOO:       Revision: 1
+          [1657002369.589819][3996:4001] CHIP:TOO:      }
+
+
+
+          ./chip-tool  descriptor read device-list 1 6
+
+          On DUT as client side:
+          [1657002386.484093][4002:4007] CHIP:TOO: Endpoint: 6 Cluster: 0x0000_001D Attribute 0x0000_0000 DataVersion: 295450100
+          [1657002386.484155][4002:4007] CHIP:TOO:   device list: 1 entries
+          [1657002386.484255][4002:4007] CHIP:TOO:     [1]: {
+          [1657002386.484302][4002:4007] CHIP:TOO:       Type: 19
+          [1657002386.484332][4002:4007] CHIP:TOO:       Revision: 1
+          [1657002386.484361][4002:4007] CHIP:TOO:      }
+
+
+
+          ./chip-tool  descriptor read device-list 1 7
+
+          On DUT as client side:
+          [1657002413.721927][4015:4020] CHIP:TOO: Endpoint: 7 Cluster: 0x0000_001D Attribute 0x0000_0000 DataVersion: 2117104859
+          [1657002413.721981][4015:4020] CHIP:TOO:   device list: 1 entries
+          [1657002413.722028][4015:4020] CHIP:TOO:     [1]: {
+          [1657002413.722065][4015:4020] CHIP:TOO:       Type: 259
+          [1657002413.722090][4015:4020] CHIP:TOO:       Revision: 1
+          [1657002413.722113][4015:4020] CHIP:TOO:      }
+
+
+
+          ./chip-tool  descriptor read device-list 1 8
+
+          On DUT as client side:
+          [1657002436.415904][4034:4039] CHIP:TOO: Endpoint: 8 Cluster: 0x0000_001D Attribute 0x0000_0000 DataVersion: 2026786918
+          [1657002436.415972][4034:4039] CHIP:TOO:   device list: 1 entries
+          [1657002436.416033][4034:4039] CHIP:TOO:     [1]: {
+          [1657002436.416081][4034:4039] CHIP:TOO:       Type: 259
+          [1657002436.416115][4034:4039] CHIP:TOO:       Revision: 1
+          [1657002436.416146][4034:4039] CHIP:TOO:      }
+
+
+
+          ./chip-tool  descriptor read device-list 1 9
+
+          On DUT as client side:
+          [1657002455.445818][4040:4045] CHIP:TOO: Endpoint: 9 Cluster: 0x0000_001D Attribute 0x0000_0000 DataVersion: 913116116
+          [1657002455.445883][4040:4045] CHIP:TOO:   device list: 1 entries
+          [1657002455.445944][4040:4045] CHIP:TOO:     [1]: {
+          [1657002455.445991][4040:4045] CHIP:TOO:       Type: 17
+          [1657002455.446025][4040:4045] CHIP:TOO:       Revision: 1
+          [1657002455.446056][4040:4045] CHIP:TOO:      }
+
+
+
+          ./chip-tool  descriptor read device-list 1 10
+
+          On DUT as client side:
+          [1657002473.100910][4047:4052] CHIP:TOO: Endpoint: 10 Cluster: 0x0000_001D Attribute 0x0000_0000 DataVersion: 259205426
+          [1657002473.100967][4047:4052] CHIP:TOO:   device list: 2 entries
+          [1657002473.101013][4047:4052] CHIP:TOO:     [1]: {
+          [1657002473.101051][4047:4052] CHIP:TOO:       Type: 256
+          [1657002473.101076][4047:4052] CHIP:TOO:       Revision: 1
+          [1657002473.101098][4047:4052] CHIP:TOO:      }
+          [1657002473.101126][4047:4052] CHIP:TOO:     [2]: {
+          [1657002473.101148][4047:4052] CHIP:TOO:       Type: 19
+          [1657002473.101170][4047:4052] CHIP:TOO:       Revision: 1
+          [1657002473.101192][4047:4052] CHIP:TOO:      }
+
+
+          ./chip-tool  descriptor read device-list 1 11
+
+          On DUT as client side:
+          [1657002495.856770][4061:4066] CHIP:TOO: Endpoint: 11 Cluster: 0x0000_001D Attribute 0x0000_0000 DataVersion: 4248421677
+          [1657002495.856836][4061:4066] CHIP:TOO:   device list: 2 entries
+          [1657002495.856893][4061:4066] CHIP:TOO:     [1]: {
+          [1657002495.856938][4061:4066] CHIP:TOO:       Type: 256
+          [1657002495.856968][4061:4066] CHIP:TOO:       Revision: 1
+          [1657002495.856996][4061:4066] CHIP:TOO:      }
+          [1657002495.857030][4061:4066] CHIP:TOO:     [2]: {
+          [1657002495.857058][4061:4066] CHIP:TOO:       Type: 19
+          [1657002495.857085][4061:4066] CHIP:TOO:       Revision: 1
+          [1657002495.857112][4061:4066] CHIP:TOO:      }
+
+
+
+          ./chip-tool  descriptor read device-list 1 12
+
+          On DUT as client side:
+          [1657002515.862187][4073:4078] CHIP:TOO: Endpoint: 12 Cluster: 0x0000_001D Attribute 0x0000_0000 DataVersion: 2731599835
+          [1657002515.862249][4073:4078] CHIP:TOO:   device list: 2 entries
+          [1657002515.862302][4073:4078] CHIP:TOO:     [1]: {
+          [1657002515.862343][4073:4078] CHIP:TOO:       Type: 256
+          [1657002515.862372][4073:4078] CHIP:TOO:       Revision: 1
+          [1657002515.862398][4073:4078] CHIP:TOO:      }
+          [1657002515.862429][4073:4078] CHIP:TOO:     [2]: {
+          [1657002515.862455][4073:4078] CHIP:TOO:       Type: 19
+          [1657002515.862480][4073:4078] CHIP:TOO:       Revision: 1
+          [1657002515.862504][4073:4078] CHIP:TOO:      }
+
+
+
+          ./chip-tool  descriptor read device-list 1 13
+
+          On DUT as client side:
+          [1657002538.134605][4097:4102] CHIP:TOO: Endpoint: 13 Cluster: 0x0000_001D Attribute 0x0000_0000 DataVersion: 3449178249
+          [1657002538.134700][4097:4102] CHIP:TOO:   device list: 2 entries
+          [1657002538.134784][4097:4102] CHIP:TOO:     [1]: {
+          [1657002538.134869][4097:4102] CHIP:TOO:       Type: 256
+          [1657002538.134916][4097:4102] CHIP:TOO:       Revision: 1
+          [1657002538.134973][4097:4102] CHIP:TOO:      }
+          [1657002538.135025][4097:4102] CHIP:TOO:     [2]: {
+          [1657002538.135083][4097:4102] CHIP:TOO:       Type: 19
+          [1657002538.135126][4097:4102] CHIP:TOO:       Revision: 1
+          [1657002538.135166][4097:4102] CHIP:TOO:      }
+
+
+
+          Verify PartsList  for available EP
+
+          ./chip-tool  descriptor read parts-list 1 0
+
+          [1657002201.045720][3893:3899] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_001D Attribute 0x0000_0003 DataVersion: 3573910940
+          [1657002201.045841][3893:3899] CHIP:TOO:   parts list: 12 entries
+          [1657002201.045887][3893:3899] CHIP:TOO:     [1]: 1
+          [1657002201.045925][3893:3899] CHIP:TOO:     [2]: 3
+          [1657002201.045963][3893:3899] CHIP:TOO:     [3]: 4
+          [1657002201.046000][3893:3899] CHIP:TOO:     [4]: 5
+          [1657002201.046037][3893:3899] CHIP:TOO:     [5]: 6
+          [1657002201.046073][3893:3899] CHIP:TOO:     [6]: 7
+          [1657002201.046110][3893:3899] CHIP:TOO:     [7]: 8
+          [1657002201.046147][3893:3899] CHIP:TOO:     [8]: 9
+          [1657002201.046184][3893:3899] CHIP:TOO:     [9]: 10
+          [1657002201.046221][3893:3899] CHIP:TOO:     [10]: 11
+          [1657002201.046259][3893:3899] CHIP:TOO:     [11]: 12
+          [1657002201.046296][3893:3899] CHIP:TOO:     [12]: 13
+
+
+          ./chip-tool  descriptor read device-list 1 3
+
+          On DUT as client side:
+          [1657002843.395988][4135:4140] CHIP:TOO: Endpoint: 3 Cluster: 0x0000_001D Attribute 0x0000_0000 DataVersion: 2452512872
+          [1657002843.396058][4135:4140] CHIP:TOO:   device list: 2 entries
+          [1657002843.396112][4135:4140] CHIP:TOO:     [1]: {
+          [1657002843.396154][4135:4140] CHIP:TOO:       Type: 256
+          [1657002843.396204][4135:4140] CHIP:TOO:       Revision: 1
+          [1657002843.396232][4135:4140] CHIP:TOO:      }
+          [1657002843.396265][4135:4140] CHIP:TOO:     [2]: {
+          [1657002843.396291][4135:4140] CHIP:TOO:       Type: 19
+          [1657002843.396317][4135:4140] CHIP:TOO:       Revision: 1
+          [1657002843.396342][4135:4140] CHIP:TOO:      }
+
+          ./chip-tool  descriptor read device-list 1 4
+
+          On DUT as client side:
+          [1657002927.992247][4143:4148] CHIP:TOO: Endpoint: 4 Cluster: 0x0000_001D Attribute 0x0000_0000 DataVersion: 1398882309
+          [1657002927.992309][4143:4148] CHIP:TOO:   device list: 2 entries
+          [1657002927.992362][4143:4148] CHIP:TOO:     [1]: {
+          [1657002927.992405][4143:4148] CHIP:TOO:       Type: 259
+          [1657002927.992434][4143:4148] CHIP:TOO:       Revision: 1
+          [1657002927.992459][4143:4148] CHIP:TOO:      }
+          [1657002927.992490][4143:4148] CHIP:TOO:     [2]: {
+          [1657002927.992516][4143:4148] CHIP:TOO:       Type: 19
+          [1657002927.992542][4143:4148] CHIP:TOO:       Revision: 1
+          [1657002927.992567][4143:4148] CHIP:TOO:      }
+
+           ./chip-tool  descriptor read device-list 1 5
+
+          On DUT as client side:
+          [1657002949.332151][4156:4161] CHIP:TOO: Endpoint: 5 Cluster: 0x0000_001D Attribute 0x0000_0000 DataVersion: 130458766
+          [1657002949.332245][4156:4161] CHIP:TOO:   device list: 2 entries
+          [1657002949.332294][4156:4161] CHIP:TOO:     [1]: {
+          [1657002949.332332][4156:4161] CHIP:TOO:       Type: 259
+          [1657002949.332356][4156:4161] CHIP:TOO:       Revision: 1
+          [1657002949.332379][4156:4161] CHIP:TOO:      }
+          [1657002949.332405][4156:4161] CHIP:TOO:     [2]: {
+          [1657002949.332427][4156:4161] CHIP:TOO:       Type: 19
+          [1657002949.332449][4156:4161] CHIP:TOO:       Revision: 1
+          [1657002949.332470][4156:4161] CHIP:TOO:      }
+
+           ./chip-tool  descriptor read device-list 1 6
+
+          On DUT as client side:
+          [1657002965.947096][4163:4168] CHIP:TOO: Endpoint: 6 Cluster: 0x0000_001D Attribute 0x0000_0000 DataVersion: 295450100
+          [1657002965.947150][4163:4168] CHIP:TOO:   device list: 1 entries
+          [1657002965.947196][4163:4168] CHIP:TOO:     [1]: {
+          [1657002965.947231][4163:4168] CHIP:TOO:       Type: 19
+          [1657002965.947256][4163:4168] CHIP:TOO:       Revision: 1
+          [1657002965.947278][4163:4168] CHIP:TOO:      }
+
+           ./chip-tool  descriptor read device-list 1 7
+
+          On DUT as client side:
+          [1657002981.963307][4176:4181] CHIP:TOO: Endpoint: 7 Cluster: 0x0000_001D Attribute 0x0000_0000 DataVersion: 2117104859
+          [1657002981.963371][4176:4181] CHIP:TOO:   device list: 1 entries
+          [1657002981.963429][4176:4181] CHIP:TOO:     [1]: {
+          [1657002981.963474][4176:4181] CHIP:TOO:       Type: 259
+          [1657002981.963505][4176:4181] CHIP:TOO:       Revision: 1
+          [1657002981.963533][4176:4181] CHIP:TOO:      }
+
+           ./chip-tool  descriptor read device-list 1 8
+
+          On DUT as client side:
+          [1657003007.476575][4183:4188] CHIP:TOO: Endpoint: 8 Cluster: 0x0000_001D Attribute 0x0000_0000 DataVersion: 2026786918
+          [1657003007.476635][4183:4188] CHIP:TOO:   device list: 1 entries
+          [1657003007.476689][4183:4188] CHIP:TOO:     [1]: {
+          [1657003007.476731][4183:4188] CHIP:TOO:       Type: 259
+          [1657003007.476760][4183:4188] CHIP:TOO:       Revision: 1
+          [1657003007.476786][4183:4188] CHIP:TOO:      }
+
+           ./chip-tool  descriptor read device-list 1 9
+
+          On DUT as client side:
+          [1657003023.263333][4191:4196] CHIP:TOO: Endpoint: 9 Cluster: 0x0000_001D Attribute 0x0000_0000 DataVersion: 913116116
+          [1657003023.263391][4191:4196] CHIP:TOO:   device list: 1 entries
+          [1657003023.263443][4191:4196] CHIP:TOO:     [1]: {
+          [1657003023.263484][4191:4196] CHIP:TOO:       Type: 17
+          [1657003023.263512][4191:4196] CHIP:TOO:       Revision: 1
+          [1657003023.263538][4191:4196] CHIP:TOO:      }
+
+           ./chip-tool  descriptor read device-list 1 10
+
+          On DUT as client side:
+          [1657003044.071972][4204:4209] CHIP:TOO: Endpoint: 10 Cluster: 0x0000_001D Attribute 0x0000_0000 DataVersion: 259205426
+          [1657003044.072037][4204:4209] CHIP:TOO:   device list: 2 entries
+          [1657003044.072085][4204:4209] CHIP:TOO:     [1]: {
+          [1657003044.072123][4204:4209] CHIP:TOO:       Type: 256
+          [1657003044.072149][4204:4209] CHIP:TOO:       Revision: 1
+          [1657003044.072195][4204:4209] CHIP:TOO:      }
+          [1657003044.072227][4204:4209] CHIP:TOO:     [2]: {
+          [1657003044.072250][4204:4209] CHIP:TOO:       Type: 19
+          [1657003044.072272][4204:4209] CHIP:TOO:       Revision: 1
+          [1657003044.072295][4204:4209] CHIP:TOO:      }
+
+           ./chip-tool  descriptor read device-list 1 11
+
+          On DUT as client side:
+          [1657003082.358311][4217:4222] CHIP:TOO: Endpoint: 11 Cluster: 0x0000_001D Attribute 0x0000_0000 DataVersion: 4248421677
+          [1657003082.358379][4217:4222] CHIP:TOO:   device list: 2 entries
+          [1657003082.358432][4217:4222] CHIP:TOO:     [1]: {
+          [1657003082.358471][4217:4222] CHIP:TOO:       Type: 256
+          [1657003082.358501][4217:4222] CHIP:TOO:       Revision: 1
+          [1657003082.358529][4217:4222] CHIP:TOO:      }
+          [1657003082.358563][4217:4222] CHIP:TOO:     [2]: {
+          [1657003082.358591][4217:4222] CHIP:TOO:       Type: 19
+          [1657003082.358619][4217:4222] CHIP:TOO:       Revision: 1
+          [1657003082.358646][4217:4222] CHIP:TOO:      }
+
+           ./chip-tool  descriptor read device-list 1 12
+
+          On DUT as client side:
+          [1657003103.954911][4248:4253] CHIP:TOO: Endpoint: 12 Cluster: 0x0000_001D Attribute 0x0000_0000 DataVersion: 2731599835
+          [1657003103.954986][4248:4253] CHIP:TOO:   device list: 2 entries
+          [1657003103.955050][4248:4253] CHIP:TOO:     [1]: {
+          [1657003103.955095][4248:4253] CHIP:TOO:       Type: 256
+          [1657003103.955125][4248:4253] CHIP:TOO:       Revision: 1
+          [1657003103.955153][4248:4253] CHIP:TOO:      }
+          [1657003103.955186][4248:4253] CHIP:TOO:     [2]: {
+          [1657003103.955214][4248:4253] CHIP:TOO:       Type: 19
+          [1657003103.955242][4248:4253] CHIP:TOO:       Revision: 1
+          [1657003103.955269][4248:4253] CHIP:TOO:      }
+
+          ./chip-tool  descriptor read device-list 1 13
+
+          On DUT as client side:
+          [1657003125.905572][4261:4266] CHIP:TOO: Endpoint: 13 Cluster: 0x0000_001D Attribute 0x0000_0000 DataVersion: 3449178249
+          [1657003125.905638][4261:4266] CHIP:TOO:   device list: 2 entries
+          [1657003125.905687][4261:4266] CHIP:TOO:     [1]: {
+          [1657003125.905723][4261:4266] CHIP:TOO:       Type: 256
+          [1657003125.905750][4261:4266] CHIP:TOO:       Revision: 1
+          [1657003125.905773][4261:4266] CHIP:TOO:      }
+          [1657003125.905800][4261:4266] CHIP:TOO:     [2]: {
+          [1657003125.905823][4261:4266] CHIP:TOO:       Type: 19
+          [1657003125.905845][4261:4266] CHIP:TOO:       Revision: 1
+          [1657003125.905867][4261:4266] CHIP:TOO:      }
+      disabled: true
+
+    - label:
+          "Use TH/bridge-app to change the on/off state of one or more of the
+          bridged On/Off lights (use key c in the console to bridge-app)"
+      PICS: MCORE.DEVLIST.UseDeviceState
+      verification: |
+          Verify in TH as server side
+          c
+          [1659089560.774328][12236:12241] CHIP:DL: Device[Light 1b]: ON
+          [1659089560.774681][12236:12236] CHIP:DMG: Endpoint 3, Cluster 0x0000_0006 update version to 83dcb371
+
+
+          Verify in DUT as client side
+          ./chip-tool onoff read on-off 1 3
+
+          [1659089585.162599][8769:8774] CHIP:TOO: Endpoint: 3 Cluster: 0x0000_0006 Attribute 0x0000_0000 DataVersion: 2212279153
+          [1659089585.162714][8769:8774] CHIP:TOO:   OnOff: TRUE
+      disabled: true
+
+    - label:
+          "Use TH/bridge-app to change the simulated temperature level of the
+          simulated temperature sensors (use key <tbd> in the console to
+          bridge-app)"
+      PICS: MCORE.DEVLIST.UseDeviceState
+      verification: |
+          Press a key "tbd" on bridge-app to change the simulated temperature
+
+          [1659351537.115828][14237:14242] CHIP:DL: TempSensorDevice[TempSensor 1]: New measurement=""200""
+          [1659351537.115987][14237:14242] CHIP:DL: TempSensorDevice[TempSensor 2]: New measurement=""200""
+          [1659351537.116097][14237:14242] CHIP:DL: TempSensorDevice[Composed TempSensor 1]: New measurement=""200""
+          [1659351537.116158][14237:14237] CHIP:DMG: Endpoint 4, Cluster 0x0000_0402 update version to 8f732d69
+          [1659351537.116300][14237:14237] CHIP:DMG: Endpoint 5, Cluster 0x0000_0402 update version to 36be37c5
+          [1659351537.116393][14237:14237] CHIP:DMG: Endpoint 7, Cluster 0x0000_0402 update version to 2cf2064d
+          [1659351537.116179][14237:14242] CHIP:DL: TempSensorDevice[Composed TempSensor 2]: New measurement=""200""
+          "
+          "./chip-tool temperaturemeasurement read measured-value 1 4
+
+          expect to get a different value than step 7b
+          [1659351542.393349][12212:12217] CHIP:TOO: Endpoint: 4 Cluster: 0x0000_0402 Attribute 0x0000_0000 DataVersion: 2406690153
+          [1659351542.393429][12212:12217] CHIP:TOO:   MeasuredValue: 200
+          [1659351542.393552][12212:12217] CHIP:EM: Sending Standalone Ack for MessageCounter:120981971 on exchange 25924i
+      disabled: true
+
+    - label:
+          "Use the DUT to change the on/off state of one or more of the bridged
+          On/Off lights"
+      verification: |
+          ./chip-tool onoff on 1 3
+
+          [1658501274.507714][14425:14425] CHIP:DMG: AccessControl: checking f=1 a=c s=0x000000000001B669 t= c=0x0000_0006 e=3 p=o
+          [1658501274.507760][14425:14425] CHIP:DMG: AccessControl: allowed
+          [1658501274.507789][14425:14425] CHIP:DMG: Received command for Endpoint=3 Cluster=0x0000_0006 Command=0x0000_0001
+          [1658501274.507829][14425:14425] CHIP:ZCL: On/Off set value: 3 1
+          [1658501274.507854][14425:14425] CHIP:DL: HandleReadOnOffAttribute: attrId=0, maxReadLength=1
+          [1658501274.507886][14425:14425] CHIP:ZCL: On/off already set to new value
+
+
+          ./chip-tool onoff read on-off 1 3
+
+          [1658501339.773125][35583:35588] CHIP:TOO: Endpoint: 3 Cluster: 0x0000_0006 Attribute 0x0000_0000 DataVersion: 3868039507
+          [1658501339.773139][35583:35588] CHIP:TOO:   OnOff: TRUE
+      disabled: true
+
+    - label:
+          "Use TH/bridge-app to rename a bridged light (use key b in the console
+          to bridge-app to rename Light 1 to Light 1b)"
+      PICS: MCORE.DEVLIST.UseDeviceNames
+      verification: |
+          ./chip-tool bridgeddevicebasic  read node-label 1 3
+
+          [1659089932.160005][8810:8815] CHIP:TOO: Endpoint: 3 Cluster: 0x0000_0039 Attribute 0x0000_0005 DataVersion: 3178625724
+          [1659089932.160111][8810:8815] CHIP:TOO:   NodeLabel: Light 1
+
+          "b
+          [1659089470.077297][12236:12241] CHIP:DL: Device[Light 1]: New Name=""Light 1b""
+
+          ./chip-tool bridgeddevicebasic  read node-label 1 3
+
+          [1659352004.560327][12241:12246] CHIP:TOO: Endpoint: 3 Cluster: 0x0000_0039 Attribute 0x0000_0005 DataVersion: 2321959095
+          [1659352004.560365][12241:12246] CHIP:TOO:   NodeLabel: Light 1b
+      disabled: true
+
+    - label:
+          "Use TH/bridge-app to add a bridged light (use key 2 in the console to
+          bridge-app to add Light 2)"
+      verification: |
+          2
+          [1659352274.915018][14237:14242] CHIP:DMG: Endpoint 1, Cluster 0x0000_001D update version to 7e918bae
+          [1659352274.915107][14237:14242] CHIP:DMG: Endpoint 0, Cluster 0x0000_001D update version to 7561f371
+          [1659352274.915166][14237:14242] CHIP:DL: Added device Light 2 to dynamic endpoint 14 (index=11)
+
+
+          ./chip-tool  descriptor read parts-list 1 0
+
+          Verify the endpoints listed in TH Log
+
+          [1659352284.821350][12264:12269] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_001D Attribute 0x0000_0003 DataVersion: 1969353585
+          [1659352284.821433][12264:12269] CHIP:TOO:   parts list: 13 entries
+          [1659352284.821470][12264:12269] CHIP:TOO:     [1]: 1
+          [1659352284.821500][12264:12269] CHIP:TOO:     [2]: 3
+          [1659352284.821529][12264:12269] CHIP:TOO:     [3]: 4
+          [1659352284.821557][12264:12269] CHIP:TOO:     [4]: 5
+          [1659352284.821586][12264:12269] CHIP:TOO:     [5]: 6
+          [1659352284.821614][12264:12269] CHIP:TOO:     [6]: 7
+          [1659352284.821642][12264:12269] CHIP:TOO:     [7]: 8
+          [1659352284.821670][12264:12269] CHIP:TOO:     [8]: 9
+          [1659352284.821698][12264:12269] CHIP:TOO:     [9]: 10
+          [1659352284.821726][12264:12269] CHIP:TOO:     [10]: 11
+          [1659352284.821755][12264:12269] CHIP:TOO:     [11]: 12
+          [1659352284.821784][12264:12269] CHIP:TOO:     [12]: 13
+          [1659352284.821812][12264:12269] CHIP:TOO:     [13]: 14
+
+          "
+
+          Verify the list contains 11 entries in TH Log
+
+          [1659352298.310126][12270:12275] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_001D Attribute 0x0000_0003 DataVersion: 2123467694
+          [1659352298.310213][12270:12275] CHIP:TOO:   parts list: 12 entries
+          [1659352298.310248][12270:12275] CHIP:TOO:     [1]: 3
+          [1659352298.310277][12270:12275] CHIP:TOO:     [2]: 4
+          [1659352298.310304][12270:12275] CHIP:TOO:     [3]: 5
+          [1659352298.310330][12270:12275] CHIP:TOO:     [4]: 6
+          [1659352298.310356][12270:12275] CHIP:TOO:     [5]: 7
+          [1659352298.310381][12270:12275] CHIP:TOO:     [6]: 8
+          [1659352298.310407][12270:12275] CHIP:TOO:     [7]: 9
+          [1659352298.310433][12270:12275] CHIP:TOO:     [8]: 10
+          [1659352298.310459][12270:12275] CHIP:TOO:     [9]: 11
+          [1659352298.310485][12270:12275] CHIP:TOO:     [10]: 12
+          [1659352298.310512][12270:12275] CHIP:TOO:     [11]: 13
+          [1659352298.310538][12270:12275] CHIP:TOO:     [12]: 14
+          [1659352298.310687][12270:12275] CHIP:EM: Sending Standalone Ack for MessageCounter:4449538 on exchange 4393i
+
+          ./chip-tool  descriptor read parts-list 1 14
+
+          [1659352316.442844][12276:12281] CHIP:TOO: Endpoint: 14 Cluster: 0x0000_001D Attribute 0x0000_0003 DataVersion: 3417142897
+          [1659352316.442927][12276:12281] CHIP:TOO:   parts list: 0 entries
+          [1659352316.443042][12276:12281] CHIP:EM: Sending Standalone Ack for MessageCounter:85433161 on exchange 30040i
+
+          ./chip-tool  descriptor read device-list 1 14
+
+          [1659352346.719522][12283:12288] CHIP:TOO: Endpoint: 14 Cluster: 0x0000_001D Attribute 0x0000_0000 DataVersion: 3417142897
+          [1659352346.719601][12283:12288] CHIP:TOO:   device list: 2 entries
+          [1659352346.719645][12283:12288] CHIP:TOO:     [1]: {
+          [1659352346.719675][12283:12288] CHIP:TOO:       Type: 256
+          [1659352346.719704][12283:12288] CHIP:TOO:       Revision: 1
+          [1659352346.719732][12283:12288] CHIP:TOO:      }
+          [1659352346.719766][12283:12288] CHIP:TOO:     [2]: {
+          [1659352346.719794][12283:12288] CHIP:TOO:       Type: 19
+          [1659352346.719822][12283:12288] CHIP:TOO:       Revision: 1
+          [1659352346.719849][12283:12288] CHIP:TOO:      }
+          [1659352346.719958][12283:12288] CHIP:EM: Sending Standalone Ack fo
+      disabled: true
+
+    - label:
+          "Use TH/bridge-app to remove a bridged light (use key 4 in the console
+          to bridge-app to remove Light 1b)"
+      verification: |
+          ./chip-tool  descriptor read parts-list 1 0
+
+          [1659352461.553715][12295:12300] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_001D Attribute 0x0000_0003 DataVersion: 1969353586
+          [1659352461.553848][12295:12300] CHIP:TOO:   parts list: 12 entries
+          [1659352461.553882][12295:12300] CHIP:TOO:     [1]: 1
+          [1659352461.553910][12295:12300] CHIP:TOO:     [2]: 4
+          [1659352461.553936][12295:12300] CHIP:TOO:     [3]: 5
+          [1659352461.553961][12295:12300] CHIP:TOO:     [4]: 6
+          [1659352461.553987][12295:12300] CHIP:TOO:     [5]: 7
+          [1659352461.554013][12295:12300] CHIP:TOO:     [6]: 8
+          [1659352461.554038][12295:12300] CHIP:TOO:     [7]: 9
+          [1659352461.554064][12295:12300] CHIP:TOO:     [8]: 10
+          [1659352461.554090][12295:12300] CHIP:TOO:     [9]: 11
+          [1659352461.554116][12295:12300] CHIP:TOO:     [10]: 12
+          [1659352461.554142][12295:12300] CHIP:TOO:     [11]: 13
+          [1659352461.554168][12295:12300] CHIP:TOO:     [12]: 14
+
+          ./chip-tool  descriptor read parts-list 1 1
+
+          [1659352492.227696][12302:12307] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_001D Attribute 0x0000_0003 DataVersion: 2123467695
+          [1659352492.227770][12302:12307] CHIP:TOO:   parts list: 11 entries
+          [1659352492.227804][12302:12307] CHIP:TOO:     [1]: 4
+          [1659352492.227831][12302:12307] CHIP:TOO:     [2]: 5
+          [1659352492.227857][12302:12307] CHIP:TOO:     [3]: 6
+          [1659352492.227883][12302:12307] CHIP:TOO:     [4]: 7
+          [1659352492.227909][12302:12307] CHIP:TOO:     [5]: 8
+          [1659352492.227934][12302:12307] CHIP:TOO:     [6]: 9
+          [1659352492.227960][12302:12307] CHIP:TOO:     [7]: 10
+          [1659352492.227986][12302:12307] CHIP:TOO:     [8]: 11
+          [1659352492.228012][12302:12307] CHIP:TOO:     [9]: 12
+          [1659352492.228038][12302:12307] CHIP:TOO:     [10]: 13
+          [1659352492.228063][12302:12307] CHIP:TOO:     [11]: 14
+      disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_CADMIN_1_1.yaml b/src/app/tests/suites/certification/Test_TC_CADMIN_1_1.yaml
index 94f6fdc..6abbdd4 100644
--- a/src/app/tests/suites/certification/Test_TC_CADMIN_1_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CADMIN_1_1.yaml
@@ -14,7 +14,10 @@
 # Auto-generated scripts for harness use only, please review before automation. The endpoints and cluster names are currently set to default
 
 name:
-    3.1.1. [TC-CADMIN-1.1] Administrator Behavior using ECM [DUT - Commissioner]
+    4.1.1. [TC-CADMIN-1.1] Administrator Behavior using ECM [DUT - Commissioner]
+
+PICS:
+    - CADMIN.C
 
 config:
     nodeId: 0x12344321
@@ -32,7 +35,7 @@
     - label:
           "TH_CR1 sends command to TH_CE to open a commissioning window with a
           commissioning timeout of PIXIT.CADMIN.CwDuration seconds using ECM
-          (Enhanced Commissioning Method)"
+          (Enhanced Commissioning Method)."
       PICS: CADMIN.C.C00.Tx
       verification: |
           On 1st controller using chip tool, open commissioning window using ECM
@@ -57,7 +60,7 @@
           [1635687658.683427][3792:3792] CHIP:DIS: Start dns-sd server - no current nodeId
           [1635687658.683456][3792:3792] CHIP:DL: MAC is not known, using a default.
           [1635687658.683522][3792:3792] CHIP:DIS: Advertise commission parameter vendorID=9050 productID=65279 discriminator=3840/00
-          [1635687658.683597][3792:3792] CHIP:DIS: CHIP minimal mDNS configured as 'Commissionable node device'.
+          [1635687658.683597][3792:3792] CHIP:DIS: CHIP minimal mDNS configured as "Commissionable node device".
           [1635687658.684345][3792:3792] CHIP:DIS: Broadcasting mDns reply for query from 192.168.0.225
           [1635687658.687201][3792:3792] CHIP:DIS: Broadcasting mDns reply for query from 192.168.0.225
       disabled: true
@@ -69,7 +72,7 @@
 
           ./chip-tool operationalcredentials read fabrics 1 0 --fabric-filtered 0
 
-          Verify in DUT as client side log
+
            CHIP:TOO: Endpoint: 0 Cluster: 0x0000_003E Attribute 0x0000_0001 DataVersion: 3621507058
           [1649245801.244173][10091:10096] CHIP:TOO:   Fabrics: 1 entries
           [1649245801.244305][10091:10096] CHIP:TOO:     [1]: {
@@ -119,7 +122,7 @@
           Information Clusters NodeLabel mandatory attribute"
       PICS: BINFO.C.A0005
       verification: |
-          Using your DUT controller, write attribute and read attribute to and from TH_CE
+          On 2nd controller using chip tool write and read node-label
 
           Below is the example when using chip tool as controller
           ./chip-tool basic write node-label te5new 2 0
@@ -192,7 +195,8 @@
     - label: "DUT_CR2 sends command to TH_CE to read the list of Fabrics"
       PICS: OPCREDS.C.A0001
       verification: |
-          On your DUT controller read fabricList
+          On 2nd controller using chip tool read fabricList
+
 
           Below is the example using chip tool as controller
 
@@ -224,7 +228,7 @@
           Clusters NodeLabel mandatory attribute"
       PICS: BINFO.C.A0005
       verification: |
-          On 1st controller using chip tool, write attribute and read attribute
+          On TH1 using chip tool, write attribute and read attribute
 
           ./chip-tool basic write node-label te8 1 0
 
@@ -269,17 +273,10 @@
           Information Clusters NodeLabel mandatory attribute"
       PICS: BINFO.C.A0005
       verification: |
-          Using your DUT controller, read, write attribute and then read attribute to and from TH_CE
+          On TH2 using chip-tool read, write attribute and then read attribute to and from TH_CE
 
           Below is an example of using chip tool as controller
 
-          ./chip-tool basic read node-label 2 0
-
-          CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0028 Attribute 0x0000_0005 DataVersion: 3061847068
-          [1649245950.006849][10116:10121] CHIP:TOO:   NodeLabel: te8
-          [1649245950.007024][10116:10121] CHIP:EM: Sending Standalone Ack for MessageCounter:12495101 on exchange 24816i
-
-
           ./chip-tool basic write node-label te5new 2 0
 
           CHIP:DMG: WriteResponseMessage =
@@ -328,7 +325,7 @@
           (Enhanced Commissioning Method)"
       PICS: CADMIN.C.C00.Tx
       verification: |
-          1. Using your DUT controller open commissioning window using ECM
+          On TH2 open commissioning window using ECM
 
           Below is an example when using chip tool as controller
           ./chip-tool pairing open-commissionig-window 2 1 300 1000 3841
@@ -348,7 +345,7 @@
           using the Revoke Commissioning command"
       PICS: CADMIN.C.C02.Tx
       verification: |
-          On your DUT controller, run revoke command
+          On TH2, run revoke command
 
           Below is an example when using chip tool as controller
 
@@ -392,7 +389,8 @@
           with TH_CE"
       PICS: CADMIN.C
       verification: |
-          On 3rd controller using chip-tool connect using manual code generated from 1st controller. This attempt should fail, i.e
+          On TH3 using chip-tool connect using manual code generated from 1st controller. This attempt should fail, i.e
+
           ./chip-tool pairing code 1  34995354639
 
           verify you got the following message in the TH log
@@ -406,7 +404,7 @@
           Information Clusters NodeLabel mandatory attribute"
       PICS: BINFO.C.A0005
       verification: |
-          Using your DUT controller, write attribute and read attribute to and from TH_CE
+          On TH2 , write attribute and read attribute to and from TH_CE
 
           Below is the example using chip tool as controller
 
@@ -452,7 +450,7 @@
           ECM"
       PICS: CADMIN.C.C00.Tx
       verification: |
-          1. Using your DUT controller open commissioning window using ECM
+          On TH2 open commissioning window using ECM
 
           Below is an example when using chip tool as controller
           ./chip-tool pairing open-commissioning-window 2 1 180 1000 3840
@@ -478,7 +476,7 @@
           ECM"
       PICS: CADMIN.C.C00.Tx
       verification: |
-          1. Using your DUT controller open commissioning window using ECM
+          On TH2 open commissioning window using ECM
 
           Below is an example when using chip tool as controller
           ./chip-tool pairing open-commissionig-window 2 1 300 1000 3840
@@ -498,14 +496,15 @@
           from step 15"
       PICS: CADMIN.C
       verification: |
-          On 1st controller, using chip-tool connect using manual code.
+          On TH1, using chip-tool connect using manual code.
+
           Below is the example when using chip tool as controller (considering 34995354639 as the manual code generated by DUT)
           ./chip-tool pairing code 2 34995354639
 
           [1651786200275] [36301:315544] CHIP: [DMG] Received Command Response Data, Endpoint=0 Cluster=0x0000_003E Command=0x0000_0008
           [1651786200275] [36301:315544] CHIP: [CTL] Device returned status 9 on receiving the NOC
           [1651786200275] [36301:315544] CHIP: [CTL] Add NOC failed with error ../../src/controller/CHIPDeviceController.cpp:1187: CHIP Error 0x0000007E: Trying to add a NOC for a fabric that already exists
-          [1651786200275] [36301:315544] CHIP: [CTL] Error on commissioning step 'SendNOC': '../../src/controller/CHIPDeviceController.cpp:1187: CHIP Error 0x0000007E: Trying to add a NOC for a fabric that already exists'
+          [1651786200275] [36301:315544] CHIP: [CTL] Error on commissioning step "SendNOC": "../../src/controller/CHIPDeviceController.cpp:1187: CHIP Error 0x0000007E: Trying to add a NOC for a fabric that already exists"
 
           Verify that the commissioning process fails as TH_CE was already commissioned by TH_CR1 in step 1
       disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_CADMIN_1_11.yaml b/src/app/tests/suites/certification/Test_TC_CADMIN_1_11.yaml
index eb0e711..257469c 100644
--- a/src/app/tests/suites/certification/Test_TC_CADMIN_1_11.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CADMIN_1_11.yaml
@@ -14,9 +14,12 @@
 # Auto-generated scripts for harness use only, please review before automation. The endpoints and cluster names are currently set to default
 
 name:
-    3.1.11. [TC-CADMIN-1.11] Open commissioning window on DUT twice using ECM
+    4.1.11. [TC-CADMIN-1.11] Open commissioning window on DUT twice using ECM
     then BCM [DUT - Commissionee]
 
+PICS:
+    - CADMIN.S
+
 config:
     nodeId: 0x12344321
     cluster: "Basic"
@@ -35,7 +38,7 @@
           timeout of PIXIT.CADMIN.CwDuration seconds using ECM"
       PICS: CADMIN.S.C00.Rsp
       verification: |
-          On the 1st controller using chip tool, open commissioning window using ECM
+          On the TH1 using chip tool, open commissioning window using ECM
 
 
           ./chip-tool pairing open-commissioning-window 1 1 180 1000 3840
@@ -73,7 +76,7 @@
     - label: "TH_CR3 Commissions with DUT_CE"
       PICS: CADMIN.S
       verification: |
-          1. On 3rd controller using chip tool connect using manual code
+          On TH3 using chip tool connect using manual code
 
           ./chip-tool pairing code 3 35484132896
 
@@ -87,7 +90,7 @@
           Commissions with DUT_CE"
       PICS: CADMIN.S.C00.Rsp
       verification: |
-          On the 1st controller using chip tool, open commissioning window using ECM
+          On the TH1 using chip tool, open commissioning window using ECM
 
 
           ./chip-tool pairing open-commissioning-window 1 1 180 1000 3840
@@ -104,7 +107,7 @@
           [1635874557.417577][4549:4554] CHIP:CTL: SetupQRCode: [MT:00000CQM00AT-F5A510]
 
 
-          1. On 2nd controller using chip tool connect using manual code
+          On TH2 using chip tool connect using manual code
 
           ./chip-tool pairing code 1 35484132896
 
@@ -117,7 +120,7 @@
           timeout of PIXIT.CADMIN.CwDuration seconds using ECM"
       PICS: CADMIN.S.C00.Rsp
       verification: |
-          On the 1st controller using chip tool, open commissioning window using ECM
+          On the TH1 using chip tool, open commissioning window using ECM
 
 
           ./chip-tool pairing open-commissioning-window 1 1 180 1000 3840
@@ -140,7 +143,7 @@
           a commissioning timeout of PIXIT.CADMIN.CwDuration seconds using ECM"
       PICS: CADMIN.S.C00.Rsp
       verification: |
-          Before the timer expiry, on the 1st controller using chip tool, open commissioning window using ECM. Verify the General code return error 1
+          Before the timer expiry, on the TH1 using chip tool, open commissioning window using ECM. Verify the General code return error 1
 
 
           ./chip-tool pairing open-commissioning-window 1 1 180 1000 3840
@@ -182,7 +185,7 @@
     - label: "TH_CR1 reads the list of Fabrics on DUT_CE"
       PICS: OPCREDS.S.A0001
       verification: |
-          On 1st controller using chip tool, read fabrics list
+          On TH1 using chip tool, read fabrics list
 
           ./chip-tool operationalcredentials read fabrics 1 0 --fabric-filtered 0
 
@@ -226,7 +229,7 @@
           commissioning timeout of PIXIT.CADMIN.CwDuration seconds using BCM"
       PICS: CADMIN.S.C01.Rsp
       verification: |
-          On the 1st controller using chip tool, open commissioning window using BCM
+          On the TH1 using chip tool, open commissioning window using BCM
 
           ./chip-tool administratorcommissioning open-basic-commissioning-window 500 1 0 --timedInteractionTimeoutMs 1000
 
@@ -281,7 +284,7 @@
           commissioning timeout of PIXIT.CADMIN.CwDuration seconds using BCM"
       PICS: CADMIN.S.C01.Rsp
       verification: |
-          On the 3rd controller using chip tool, open commissioning window using BCM before the timer expiry of the above step
+          On the TH3 using chip tool, open commissioning window using BCM before the timer expiry of the above step
 
           ./chip-tool administratorcommissioning open-basic-commissioning-window 500 3 0 --timedInteractionTimeoutMs 1000
 
@@ -329,7 +332,7 @@
     - label: "TH_CR1 reads the list of Fabrics on DUT_CE"
       PICS: OPCREDS.S.A0001
       verification: |
-          On 1st controller using chip tool, read fabrics list
+          On TH1 using chip tool, read fabrics list
 
           ./chip-tool operationalcredentials read fabrics 1 0 --fabric-filtered 0
 
@@ -366,10 +369,10 @@
           timeout of PIXIT.CADMIN.CwDuration seconds using BCM"
       PICS: CADMIN.S.C01.Rsp
       verification: |
-          On the 1st controller using chip tool, open commissioning window using BCM
+          On the TH1 using chip tool, open commissioning window using BCM
 
 
-          ./chip-tool administratorcommissioning open-basic-commissioning-window 500 2 0 --timedInteractionTimeoutMs 1000
+          ./chip-tool administratorcommissioning open-basic-commissioning-window 500 1 0 --timedInteractionTimeoutMs 1000
 
 
           CHIP:DMG: InvokeResponseMessage =
@@ -411,7 +414,7 @@
           a commissioning timeout of PIXIT.CADMIN.CwDuration seconds using BCM"
       PICS: CADMIN.S.C01.Rsp
       verification: |
-          On the 2nd controller using chip tool, open commissioning window using BCM before timer expiry from above step
+          On the TH2 using chip tool, open commissioning window using BCM before timer expiry from above step
 
           ./chip-tool administratorcommissioning open-basic-commissioning-window 500 2 0 --timedInteractionTimeoutMs 1000
 
diff --git a/src/app/tests/suites/certification/Test_TC_CADMIN_1_14.yaml b/src/app/tests/suites/certification/Test_TC_CADMIN_1_14.yaml
index 031649d..155a751 100644
--- a/src/app/tests/suites/certification/Test_TC_CADMIN_1_14.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CADMIN_1_14.yaml
@@ -17,28 +17,36 @@
     4.1.14. [TC-CADMIN-1.14] Open commissioning window twice on DUT using BCM
     then ECM [DUT - Commissioner]
 
+PICS:
+    - CADMIN.C
+
 config:
     nodeId: 0x12344321
     cluster: "Basic"
     endpoint: 0
 
 tests:
-    - label: "Reset DUT_CE to factory defaults"
+    - label: "DUT_CR1 starts a commissioning process with TH_CE"
+      PICS: CADMIN.C
       verification: |
           verification step to be updated.
       disabled: true
 
-    - label: "TH_CR1 starts a commissioning process with DUT_CE"
-      PICS: CADMIN.S
+    - label:
+          "DUT_CR1 sends command to TH_CE to open a commissioning window with a
+          commissioning timeout of PIXIT.CADMIN.CwDuration seconds using BCM and
+          TH_CR3 Commissions with TH_CE"
+      PICS: CADMIN.C.C01.Tx
       verification: |
           "1. Provision the device using your DUT controller (use above instructions) ,
           "
       disabled: true
 
     - label:
-          "TH_CR1 opens a commissioning window on DUT_CE using a commissioning
-          timeout of PIXIT.CADMIN.CwDuration seconds using ECM"
-      PICS: CADMIN.S.C00.Rsp
+          "DUT_CR1 sends command to TH_CE to open a commissioning window with a
+          commissioning timeout of PIXIT.CADMIN.CwDuration seconds using BCM and
+          TH_CR2 Commissions with TH_CE"
+      PICS: CADMIN.C.C01.Tx
       verification: |
           On your DUT controller, open commissioning window using ECM
 
@@ -57,8 +65,10 @@
           [1635874557.417577][4549:4554] CHIP:CTL: SetupQRCode: [MT:00000CQM00AT-F5A510]
       disabled: true
 
-    - label: "TH_CR2 starts a commissioning process with DUT_CE"
-      PICS: CADMIN.S
+    - label:
+          "DUT_CR1 sends command to TH_CE to open a commissioning window with a
+          commissioning timeout of PIXIT.CADMIN.CwDuration seconds using BCM"
+      PICS: CADMIN.C.C01.Tx
       verification: |
           On 2nd controller using chip tool connect using manual code
           ./chip-tool pairing code 1 35484132896
@@ -68,9 +78,10 @@
       disabled: true
 
     - label:
-          "TH_CR1 opens a commissioning window on DUT_CE using a commissioning
-          timeout of PIXIT.CADMIN.CwDuration seconds using ECM"
-      PICS: CADMIN.S.C00.Rsp
+          "Before the expiration of PIXIT.CADMIN.CwDuration seconds that is set
+          in step 4, DUT_CR1 sends command to TH_CE to read WindowStatus
+          attribute"
+      PICS: CADMIN.C.A0000
       verification: |
           On your DUT controller, open commissioning window using ECM
 
@@ -89,8 +100,12 @@
           [1635874557.417577][4549:4554] CHIP:CTL: SetupQRCode: [MT:00000CQM00AT-F5A510]
       disabled: true
 
-    - label: "TH_CR3 starts a commissioning process with DUT_CE"
-      PICS: CADMIN.S
+    - label:
+          "Before the expiration of PIXIT.CADMIN.CwDuration seconds that is set
+          in step 4, DUT_CR1 sends command to TH_CE to open a 2nd commissioning
+          window with a commissioning timeout of PIXIT.CADMIN.CwDuration seconds
+          using ECM"
+      PICS: CADMIN.C.C00.Tx
       verification: |
           On 3rd controller using chip tool connect using manual code
           ./chip-tool pairing code 3 35484132896
@@ -99,8 +114,9 @@
           Device commissioning completed with success
       disabled: true
 
-    - label: "TH_CR2 reads the list of Fabrics on DUT_CE"
-      PICS: OPCREDS.S.A0001
+    - label:
+          "Wait for the expiration of PIXIT.CADMIN.CwDuration seconds that is
+          set in step 4"
       verification: |
           On 1st controller using chip tool, read fabrics list
 
@@ -134,8 +150,11 @@
           [1650527361.428335][15792:15797] CHIP:TOO:      }
       disabled: true
 
-    - label: "TH_CR2 sends RemoveFabric with FabricIndex = 2 command to DUT_CE"
-      PICS: OPCREDS.S.C0a.Rsp
+    - label:
+          "DUT_CR1 sends command to TH_CE to re-opens a commissioning window
+          with a commissioning timeout of PIXIT.CADMIN.CwDuration seconds using
+          ECM"
+      PICS: CADMIN.C.C00.Tx
       verification: |
           on 2nd controller using chip tool, remove fabric with FabricIndex=2
 
@@ -151,9 +170,10 @@
       disabled: true
 
     - label:
-          "TH_CR2 writes and reads the Basic Information Clusters NodeLabel
-          mandatory attribute of DUT_CE"
-      PICS: BINFO.S.A0005
+          "Before the expiration of PIXIT.CADMIN.CwDuration seconds that is set
+          in step 8, DUT_CR1 sends command to TH_CE to read WindowStatus
+          attribute"
+      PICS: CADMIN.C.A0000
       verification: |
           Using your 2nd controller, write attribute and read attribute to and from TH_CE
 
@@ -171,8 +191,12 @@
           [1651819620.929700][4359:4364] CHIP:-: ../../third_party/connectedhomeip/src/protocols/secure_channel/CASESession.cpp:1551: CHIP Error 0x00000054: Invalid CASE parameter at ../../commands/clusters/ModelCommand.cpp:53
       disabled: true
 
-    - label: "TH_CR1 reads the list of Fabrics on DUT_CE"
-      PICS: OPCREDS.S.A0001
+    - label:
+          "Before the expiration of PIXIT.CADMIN.CwDuration seconds that is set
+          in step 8, TH_CR3 sends command to TH_CE to open a 2nd commissioning
+          window with a commissioning timeout of PIXIT.CADMIN.CwDuration seconds
+          using ECM"
+      PICS: CADMIN.C.C00.Tx
       verification: |
           On 1st controller using chip tool, read fabrics list
 
@@ -202,9 +226,29 @@
       disabled: true
 
     - label:
-          "TH_CR1 opens a commissioning window on DUT_CE using a commissioning
-          timeout of PIXIT.CADMIN.CwDuration seconds using ECM"
-      PICS: CADMIN.S.C00.Rsp
+          "Wait for the expiration of PIXIT.CADMIN.CwDuration seconds that is
+          set in step 8"
+      verification: |
+          grl@grl-ThinkPad-L480:~/may16_cntrl03/connectedhomeip/examples/chip-tool/out/debug$ avahi-browse -rt _matter._tcp
+          + wlp5s0 IPv6 8E50A59FAF52A809-0000000000000001             _matter._tcp         local
+          + wlp5s0 IPv6 03E707466A904C7E-0000000000000003             _matter._tcp         local
+          = wlp5s0 IPv6 8E50A59FAF52A809-0000000000000001             _matter._tcp         local
+             hostname = [E45F010F27530000.local]
+             address = [fe80::e65f:1ff:fe0f:2753]
+             port = [5540]
+             txt = ["T=1" "SAI=300" "SII=5000"]
+          = wlp5s0 IPv6 03E707466A904C7E-0000000000000003             _matter._tcp         local
+             hostname = [E45F010F27530000.local]
+             address = [fe80::e65f:1ff:fe0f:2753]
+             port = [5540]
+             txt = ["T=1" "SAI=300" "SII=5000"]
+          grl@grl-ThinkPad-L480:~/may16_cntrl03/connectedhomeip/examples/chip-tool/out/debug$
+      disabled: true
+
+    - label:
+          "DUT_CR1 sends command to TH_CE to open a commissioning window with a
+          commissioning timeout of PIXIT.CADMIN.CwDuration seconds using ECM"
+      PICS: CADMIN.C.C00.Tx
       verification: |
           On 1st controller chip tool, open commissioning window
 
@@ -223,8 +267,12 @@
           [1635925713.973178][9695:9700] CHIP:EM: Sending Standalone Ack for MessageCounter:1964916542 on exchange 31055i
       disabled: true
 
-    - label: "TH_CR2 starts a commissioning process with DUT_CE"
-      PICS: CADMIN.S
+    - label:
+          "Before the expiration of PIXIT.CADMIN.CwDuration seconds that is set
+          in step 12, TH_CR2 sends command to TH_CE to open a second
+          commissioning window with a commissioning timeout of
+          PIXIT.CADMIN.CwDuration seconds using ECM"
+      PICS: CADMIN.C.C00.Tx
       verification: |
           On 2nd controller using chip tool connect to the accessory
 
@@ -235,8 +283,9 @@
           Device commissioning completed with success
       disabled: true
 
-    - label: "TH_CR1 reads the list of Fabrics on DUT_CE"
-      PICS: OPCREDS.S.A0001
+    - label:
+          "Wait for the expiration of PIXIT.CADMIN.CwDuration seconds that is
+          set in step 12"
       verification: |
           On 1st controller, read fabrics list
 
@@ -272,3 +321,41 @@
           [1647863342.982512][9309:9314] CHIP:TOO:      }
           [1647863342.982738][9309:9314] CHIP:EM: Sending Standalone Ack for MessageCounter:5772016 on exchange 3310i
       disabled: true
+
+    - label: "DUT_CR1 sends command to TH_CE to read WindowStatus attribute"
+      PICS: CADMIN.C.A0000
+      verification: |
+          Verify DUT successfully reads window status
+
+
+          ./chip-tool administratorcommissioning read window-status 1 0
+
+          CHIP:TOO: Endpoint: 0 Cluster: 0x0000_003C Attribute 0x0000_0000 DataVersion: 2849200592
+          [1651137648.760469][14047:14052] CHIP:TOO:   WindowStatus: 0
+          [1651137648.760534][14047:14052] CHIP:EM: Sending Standalone Ack for MessageCounter:5527412 on exchange 14590i"
+      disabled: true
+
+    - label: "DUT_CR1 sends command to TH_CE to read AdminFabricIndex attribute"
+      PICS: CADMIN.C.A0001
+      verification: |
+          Verifu DUT successfully reads AdminFabricIndex
+
+          ./chip-tool administratorcommissioning read admin-fabric-index  1 0
+
+          [1659097193.389295][11728:11733] CHIP:DMG: }
+          [1659097193.389588][11728:11733] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_003C Attribute 0x0000_0001 DataVersion: 1299585105
+          [1659097193.389731][11728:11733] CHIP:TOO:   AdminFabricIndex: 0
+          [1659097193.389913][11728:11733] CHIP:EM: Sending Standalone Ack for MessageCounter:195671426 on exchange 34244i
+      disabled: true
+
+    - label: "DUT_CR1 sends command to TH_CE to read AdminVendorId attribute"
+      PICS: CADMIN.C.A0002
+      verification: |
+          Verify DUT successfully reads AdminVendoeId
+
+          ./chip-tool administratorcommissioning read admin-vendor-id 1 0
+
+          [1658838521.588942][9317:9322] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_003C Attribute 0x0000_0002 DataVersion: 2423106591
+          [1658838521.589005][9317:9322] CHIP:TOO:   AdminVendorId: 0
+          [1658838521.589079][9317:9322] CHIP:EM: Sending Standalone Ack for MessageCounter:217165763 on exchange 55683i
+      disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_CADMIN_1_15.yaml b/src/app/tests/suites/certification/Test_TC_CADMIN_1_15.yaml
index d7e9d93..8933123 100644
--- a/src/app/tests/suites/certification/Test_TC_CADMIN_1_15.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CADMIN_1_15.yaml
@@ -14,8 +14,11 @@
 # Auto-generated scripts for harness use only, please review before automation. The endpoints and cluster names are currently set to default
 
 name:
-    24.1.15. [TC-CADMIN-1.15] Removing Fabrics from DUT and Fabric index
-    enumeration using ECM [DUT - Commissionee]
+    4.1.15. [TC-CADMIN-1.15] Removing Fabrics from DUT and Fabric index
+    enumeration using ECM [DUT -    Commissionee]
+
+PICS:
+    - CADMIN.S
 
 config:
     nodeId: 0x12344321
@@ -25,11 +28,11 @@
 tests:
     - label: "Reset DUT_CE to factory defaults"
       verification: |
-
+          verification step to be updated.
       disabled: true
 
     - label: "TH_CR1 starts a commissioning process with DUT_CE"
-      PICS: CADMIN.C
+      PICS: CADMIN.S
       verification: |
           "1. Provision the device using 1st controller chip tool(use above instructions) ,
           "
@@ -207,22 +210,23 @@
           [1647863260.287515][9294:9299] CHIP:EM: Sending Standalone Ack for MessageCounter:11301761 on exchange 13180i"
       disabled: true
 
-    - label: "TH_CR1 reads the list of Fabrics on DUT_CE"
+    - label:
+          "Verify DUT_CE is now discoverable over DNS-SD with 2 Operational
+          service records (_matter._tcp SRV records)."
       verification: |
-          On 1st controller using chip tool, read fabrics list
           grl@grl-ThinkPad-L480:~/may16_cntrl03/connectedhomeip/examples/chip-tool/out/debug$ avahi-browse -rt _matter._tcp
           + wlp5s0 IPv6 8E50A59FAF52A809-0000000000000001             _matter._tcp         local
           + wlp5s0 IPv6 03E707466A904C7E-0000000000000003             _matter._tcp         local
           = wlp5s0 IPv6 8E50A59FAF52A809-0000000000000001             _matter._tcp         local
-          hostname = [E45F010F27530000.local]
-          address = [fe80::e65f:1ff:fe0f:2753]
-          port = [5540]
-          txt = ["T=1" "SAI=300" "SII=5000"]
+             hostname = [E45F010F27530000.local]
+             address = [fe80::e65f:1ff:fe0f:2753]
+             port = [5540]
+             txt = ["T=1" "SAI=300" "SII=5000"]
           = wlp5s0 IPv6 03E707466A904C7E-0000000000000003             _matter._tcp         local
-          hostname = [E45F010F27530000.local]
-          address = [fe80::e65f:1ff:fe0f:2753]
-          port = [5540]
-          txt = ["T=1" "SAI=300" "SII=5000"]
+             hostname = [E45F010F27530000.local]
+             address = [fe80::e65f:1ff:fe0f:2753]
+             port = [5540]
+             txt = ["T=1" "SAI=300" "SII=5000"]
           grl@grl-ThinkPad-L480:~/may16_cntrl03/connectedhomeip/examples/chip-tool/out/debug$
       disabled: true
 
diff --git a/src/app/tests/suites/certification/Test_TC_CADMIN_1_16.yaml b/src/app/tests/suites/certification/Test_TC_CADMIN_1_16.yaml
index 26d00ca..53669ad 100644
--- a/src/app/tests/suites/certification/Test_TC_CADMIN_1_16.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CADMIN_1_16.yaml
@@ -14,8 +14,11 @@
 # Auto-generated scripts for harness use only, please review before automation. The endpoints and cluster names are currently set to default
 
 name:
-    3.1.16. [TC-CADMIN-1.16] Removing Fabrics from DUT and Fabric index
-    enumeration using BCM [DUT - Commissionee]
+    4.1.16. [TC-CADMIN-1.16] Removing Fabrics from DUT and Fabric index
+    enumeration using BCM [DUT -    Commissionee]
+
+PICS:
+    - CADMIN.S
 
 config:
     nodeId: 0x12344321
@@ -25,7 +28,7 @@
 tests:
     - label: "Reset DUT_CE to factory defaults"
       verification: |
-
+          verification step to be updated.
       disabled: true
 
     - label: "TH_CR1 starts a commissioning process with DUT_CE"
@@ -247,6 +250,26 @@
       disabled: true
 
     - label:
+          "Verify DUT_CE is now discoverable over DNS-SD with 2 Operational
+          service records (_matter._tcp SRV records)."
+      verification: |
+          grl@grl-ThinkPad-L480:~/may16_cntrl03/connectedhomeip/examples/chip-tool/out/debug$ avahi-browse -rt _matter._tcp
+          + wlp5s0 IPv6 8E50A59FAF52A809-0000000000000001             _matter._tcp         local
+          + wlp5s0 IPv6 03E707466A904C7E-0000000000000003             _matter._tcp         local
+          = wlp5s0 IPv6 8E50A59FAF52A809-0000000000000001             _matter._tcp         local
+             hostname = [E45F010F27530000.local]
+             address = [fe80::e65f:1ff:fe0f:2753]
+             port = [5540]
+             txt = ["T=1" "SAI=300" "SII=5000"]
+          = wlp5s0 IPv6 03E707466A904C7E-0000000000000003             _matter._tcp         local
+             hostname = [E45F010F27530000.local]
+             address = [fe80::e65f:1ff:fe0f:2753]
+             port = [5540]
+             txt = ["T=1" "SAI=300" "SII=5000"]
+          grl@grl-ThinkPad-L480:~/may16_cntrl03/connectedhomeip/examples/chip-tool/out/debug$
+      disabled: true
+
+    - label:
           "TH_CR1 opens a commissioning window on DUT_CE using a commissioning
           timeout of PIXIT.CADMIN.CwDuration seconds using BCM"
       PICS: CADMIN.S.C01.Rsp
diff --git a/src/app/tests/suites/certification/Test_TC_CADMIN_1_17.yaml b/src/app/tests/suites/certification/Test_TC_CADMIN_1_17.yaml
index 1b12649..ec94c4c 100644
--- a/src/app/tests/suites/certification/Test_TC_CADMIN_1_17.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CADMIN_1_17.yaml
@@ -17,6 +17,9 @@
     4.1.17. [TC-CADMIN-1.17] Removing Fabrics from DUT and Fabric index
     enumeration using ECM [DUT -    Commissioner]
 
+PICS:
+    - CADMIN.C
+
 config:
     nodeId: 0x12344321
     cluster: "Basic"
@@ -242,6 +245,26 @@
       disabled: true
 
     - label:
+          "Verify TH_CE is now discoverable over DNS-SD with 2 Operational
+          service records (_matter._tcp SRV records)."
+      verification: |
+          grl@grl-ThinkPad-L480:~/may16_cntrl03/connectedhomeip/examples/chip-tool/out/debug$ avahi-browse -rt _matter._tcp
+          + wlp5s0 IPv6 8E50A59FAF52A809-0000000000000001             _matter._tcp         local
+          + wlp5s0 IPv6 03E707466A904C7E-0000000000000003             _matter._tcp         local
+          = wlp5s0 IPv6 8E50A59FAF52A809-0000000000000001             _matter._tcp         local
+             hostname = [E45F010F27530000.local]
+             address = [fe80::e65f:1ff:fe0f:2753]
+             port = [5540]
+             txt = ["T=1" "SAI=300" "SII=5000"]
+          = wlp5s0 IPv6 03E707466A904C7E-0000000000000003             _matter._tcp         local
+             hostname = [E45F010F27530000.local]
+             address = [fe80::e65f:1ff:fe0f:2753]
+             port = [5540]
+             txt = ["T=1" "SAI=300" "SII=5000"]
+          grl@grl-ThinkPad-L480:~/may16_cntrl03/connectedhomeip/examples/chip-tool/out/debug$
+      disabled: true
+
+    - label:
           "DUT_CR1 sends command to TH_CE to open a commissioning window with a
           commissioning timeout of PIXIT.CADMIN.CwDuration seconds using ECM"
       PICS: CADMIN.C.C00.Tx
diff --git a/src/app/tests/suites/certification/Test_TC_CADMIN_1_18.yaml b/src/app/tests/suites/certification/Test_TC_CADMIN_1_18.yaml
index 593ebec..70df68e 100644
--- a/src/app/tests/suites/certification/Test_TC_CADMIN_1_18.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CADMIN_1_18.yaml
@@ -17,6 +17,9 @@
     4.1.18. [TC-CADMIN-1.18] Removing Fabrics from DUT and Fabric index
     enumeration using BCM [DUT -    Commissioner]
 
+PICS:
+    - CADMIN.C
+
 config:
     nodeId: 0x12344321
     cluster: "Basic"
@@ -253,6 +256,27 @@
       disabled: true
 
     - label:
+          "Verify TH_CE is now discoverable over DNS-SD with 2 Operational
+          service records (_matter._tcp SRV records)."
+      verification: |
+          1. Verify if the DUT is broadcasting using
+          grl@grl-ThinkPad-L480:~/may16_cntrl03/connectedhomeip/examples/chip-tool/out/debug$ avahi-browse -rt _matter._tcp
+          + wlp5s0 IPv6 8E50A59FAF52A809-0000000000000001             _matter._tcp         local
+          + wlp5s0 IPv6 03E707466A904C7E-0000000000000003             _matter._tcp         local
+          = wlp5s0 IPv6 8E50A59FAF52A809-0000000000000001             _matter._tcp         local
+             hostname = [E45F010F27530000.local]
+             address = [fe80::e65f:1ff:fe0f:2753]
+             port = [5540]
+             txt = ["T=1" "SAI=300" "SII=5000"]
+          = wlp5s0 IPv6 03E707466A904C7E-0000000000000003             _matter._tcp         local
+             hostname = [E45F010F27530000.local]
+             address = [fe80::e65f:1ff:fe0f:2753]
+             port = [5540]
+             txt = ["T=1" "SAI=300" "SII=5000"]
+          grl@grl-ThinkPad-L480:~/may16_cntrl03/connectedhomeip/examples/chip-tool/out/debug$
+      disabled: true
+
+    - label:
           "DUT_CR1 sends command to TH_CE to open a commissioning window with a
           commissioning timeout of PIXIT.CADMIN.CwDuration seconds using BCM"
       PICS: CADMIN.C.C01.Tx
diff --git a/src/app/tests/suites/certification/Test_TC_CADMIN_1_19.yaml b/src/app/tests/suites/certification/Test_TC_CADMIN_1_19.yaml
index 14a7686..3fae0f0 100644
--- a/src/app/tests/suites/certification/Test_TC_CADMIN_1_19.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CADMIN_1_19.yaml
@@ -14,8 +14,11 @@
 # Auto-generated scripts for harness use only, please review before automation. The endpoints and cluster names are currently set to default
 
 name:
-    24.1.19. [TC-CADMIN-1.19] max number of Commissioned Fabrics and
-    SupportedFabrics rollover using ECM [DUT - Commissionee]
+    4.1.19. [TC-CADMIN-1.19] max number of Commissioned Fabrics and
+    SupportedFabrics rollover using    ECM [DUT - Commissionee]
+
+PICS:
+    - CADMIN.S
 
 config:
     nodeId: 0x12344321
@@ -23,227 +26,24 @@
     endpoint: 0
 
 tests:
-    - label: "Reset DUT_CR1 to factory defaults"
+    - label: "Reset DUT_CE to factory defaults"
       verification: |
-
+          verification step to be updated.
       disabled: true
 
-    - label: "DUT_CR1 starts a commissioning process with TH_CE"
+    - label: "TH_CR1 starts a commissioning process with DUT_CE"
+      PICS: CADMIN.S
       verification: |
-          "1. Provision the device using DUT controller chip tool(use above instructions) ,
+          "1. Provision the device using 1st controller chip tool(use above instructions) ,
           "
       disabled: true
 
     - label:
-          "DUT_CR1 sends command to TH_CE to open a commissioning window with a
-          commissioning timeout of PIXIT.CADMIN.CwDuration seconds using ECM"
+          "TH_CR1 opens a commissioning window on DUT_CE using a commissioning
+          timeout of PIXIT.CADMIN.CwDuration seconds using ECM"
       PICS: CADMIN.S.C00.Rsp
       verification: |
-          On your DUT controller chip tool, open commissioning window
-
-          Below is the example when using chip tool as controller
-
-
-          ./chip-tool pairing open-commissioning-window 1 1 300 1000 3840
-
-          [1635925713.966786][9695:9700] CHIP:SC: Success status report received. Session was established
-          [1635925713.966839][9695:9700] CHIP:IN: New secure session created for device 0x0000000000000001, key 33!!
-          [1635925713.966938][9695:9700] CHIP:CTL: OpenCommissioningWindow for device ID 1
-          [1635925713.972601][9695:9700] CHIP:DMG: ICR moving to [AddingComm]
-          [1635925713.972705][9695:9700] CHIP:DMG: ICR moving to [AddedComma]
-          [1635925713.972815][9695:9700] CHIP:IN: Prepared encrypted message 0xaaaad9b57d10 to 0x0000000000000001 of type 0x8 and protocolId (0, 1) on exchange 31056i with MessageCounter:0.
-          [1635925713.972876][9695:9700] CHIP:IN: Sending encrypted msg 0xaaaad9b57d10 with MessageCounter:0 to 0x0000000000000001 at monotonic time: 13449459 msec
-          [1635925713.973006][9695:9700] CHIP:DMG: ICR moving to [CommandSen]
-          [1635925713.973061][9695:9700] CHIP:CTL: Manual pairing code: [35484132896]
-          [1635925713.973120][9695:9700] CHIP:CTL: SetupQRCode: [MT:00000CQM00A7F87ZT10]
-          [1635925713.973178][9695:9700] CHIP:EM: Sending Standalone Ack for MessageCounter:1964916542 on exchange 31055i
-
-
-
-
-          ./chip-tool payload parse-setup-payload 35484132896
-
-          CHIP:SPL: Parsing decimalRepresentation: 35484132896
-          [1635692029.655951][3830:3830] CHIP:SPL: CommissioningFlow: 0
-          [1635692029.655974][3830:3830] CHIP:SPL: VendorID: 0
-          [1635692029.655994][3830:3830] CHIP:SPL: Version: 0
-          [1635692029.656013][3830:3830] CHIP:SPL: ProductID: 0
-          [1635692029.656032][3830:3830] CHIP:SPL: Discriminator: 3840
-          [1635692029.656051][3830:3830] CHIP:SPL: SetUpPINCode: 68539195
-          [1635692029.656070][3830:3830] CHIP:SPL: RendezvousInformation: 0
-      disabled: true
-
-    - label: "TH_CR2 starts a commissioning process with TH_CE"
-      verification: |
-          On 2nd controller using chip tool connect to the accessory
-
-
-          ./chip-tool pairing code 1 35484132896
-
-          Verify you got below message
-          Device commissioning completed with success
-      disabled: true
-
-    - label:
-          "DUT_CR1 sends command to TH_CE to open a commissioning window with a
-          commissioning timeout of PIXIT.CADMIN.CwDuration seconds using ECM"
-      PICS: CADMIN.S.C00.Rsp
-      verification: |
-          On your DUT controller chip tool, open commissioning window
-
-          Below is the example when using chip tool as controller
-
-
-          ./chip-tool pairing open-commissioning-window 1 1 300 1000 3840
-
-          [1635925713.966786][9695:9700] CHIP:SC: Success status report received. Session was established
-          [1635925713.966839][9695:9700] CHIP:IN: New secure session created for device 0x0000000000000001, key 33!!
-          [1635925713.966938][9695:9700] CHIP:CTL: OpenCommissioningWindow for device ID 1
-          [1635925713.972601][9695:9700] CHIP:DMG: ICR moving to [AddingComm]
-          [1635925713.972705][9695:9700] CHIP:DMG: ICR moving to [AddedComma]
-          [1635925713.972815][9695:9700] CHIP:IN: Prepared encrypted message 0xaaaad9b57d10 to 0x0000000000000001 of type 0x8 and protocolId (0, 1) on exchange 31056i with MessageCounter:0.
-          [1635925713.972876][9695:9700] CHIP:IN: Sending encrypted msg 0xaaaad9b57d10 with MessageCounter:0 to 0x0000000000000001 at monotonic time: 13449459 msec
-          [1635925713.973006][9695:9700] CHIP:DMG: ICR moving to [CommandSen]
-          [1635925713.973061][9695:9700] CHIP:CTL: Manual pairing code: [35484132896]
-          [1635925713.973120][9695:9700] CHIP:CTL: SetupQRCode: [MT:00000CQM00A7F87ZT10]
-          [1635925713.973178][9695:9700] CHIP:EM: Sending Standalone Ack for MessageCounter:1964916542 on exchange 31055i
-
-
-
-
-          ./chip-tool payload parse-setup-payload 35484132896
-
-          CHIP:SPL: Parsing decimalRepresentation: 35484132896
-          [1635692029.655951][3830:3830] CHIP:SPL: CommissioningFlow: 0
-          [1635692029.655974][3830:3830] CHIP:SPL: VendorID: 0
-          [1635692029.655994][3830:3830] CHIP:SPL: Version: 0
-          [1635692029.656013][3830:3830] CHIP:SPL: ProductID: 0
-          [1635692029.656032][3830:3830] CHIP:SPL: Discriminator: 3840
-          [1635692029.656051][3830:3830] CHIP:SPL: SetUpPINCode: 68539195
-          [1635692029.656070][3830:3830] CHIP:SPL: RendezvousInformation: 0
-      disabled: true
-
-    - label: "TH_CR3 starts a commissioning process with TH_CE"
-      verification: |
-          On 3rd controller using chip tool connect to the accessory
-
-
-          ./chip-tool pairing code 1 35484132896
-
-          Verify you got below message
-          Device commissioning completed with success
-      disabled: true
-
-    - label: "TH_CR2 sends command to TH_CE to read the list of Fabrics"
-      PICS: OPCREDS.C.A0001
-      verification: |
-          On 2nd controller using chip tool, read fabrics list
-
-          ./chip-tool operationalcredentials read fabrics 1234 0 --fabric-filtered 0
-
-          CHIP:TOO: Endpoint: 0 Cluster: 0x0000_003E Attribute 0x0000_0001 DataVersion: 2455995193
-          CHIP:TOO:   Fabrics: 3 entries
-          CHIP:TOO:     [1]: {
-          CHIP:TOO:       RootPublicKey: 04656F56DBDB677DC957028DFC0ED76709C72753C9194B117A483BDC07386BFD9529B68EB4448FBBA3964EFF37A56A8F461D348B0DAF3B56A75F3B94BF8209D36F
-          CHIP:TOO:       VendorId: 65521
-          CHIP:TOO:       FabricId: 1
-          CHIP:TOO:       NodeId: 1
-          CHIP:TOO:       Label:
-          CHIP:TOO:       FabricIndex: 1
-          CHIP:TOO:      }
-          CHIP:TOO:     [2]: {
-          CHIP:TOO:       RootPublicKey: 04F8F28D5D70A4510E0F72FBBA31369796C4206FF95D97B77C1BDFD0438A3BE43510631A1B915BE189323F4CC0E015480192654D8170F8F230C7713898962958B7
-          CHIP:TOO:       VendorId: 65521
-          CHIP:TOO:       FabricId: 1
-          CHIP:TOO:       NodeId: 2
-          CHIP:TOO:       Label:
-          CHIP:TOO:       FabricIndex: 2
-          CHIP:TOO:      }
-          CHIP:TOO:     [3]: {
-          CHIP:TOO:       RootPublicKey: 04F8F28D5D70A4510E0F72FBBA31369796C4206FF95D97B77C1BDFD0438A3BE43510631A1B915BE189323F4CC0E015480192654D8170F8F230C7713898962958B7
-          CHIP:TOO:       VendorId: 65521
-          CHIP:TOO:       FabricId: 1
-          CHIP:TOO:       NodeId: 3
-          CHIP:TOO:       Label:
-          CHIP:TOO:       FabricIndex: 3
-          CHIP:TOO:      }
-          CHIP:EM: Sending Standalone Ack for MessageCounter:9143157 on exchange 1147i
-      disabled: true
-
-    - label: "TH_CR2 sends RemoveFabric with FabricIndex = 2command to TH_CE"
-      PICS: OPCREDS.C.C0a.Tx
-      verification: |
-          on 2nd controller using chip tool, remove fabric with FabricIndex=2
-
-          ./chip-tool operationalcredentials remove-fabric 2 1 0
-
-          CHIP:DMG: Received Command Response Data, Endpoint=0 Cluster=0x0000_003E Command=0x0000_0008
-          CHIP:TOO: Endpoint: 0 Cluster: 0x0000_003E Command 0x0000_0008
-          CHIP:TOO:   NOCResponse: {
-          CHIP:TOO:     statusCode: 0
-          CHIP:TOO:     fabricIndex: 2
-          CHIP:TOO:    }
-          CHIP:DMG: ICR moving to [AwaitingDe]
-      disabled: true
-
-    - label:
-          "TH_CR2 sends command to TH_CE to write and read the Basic Information
-          Clusters NodeLabel mandatory attribute"
-      PICS: BINFO.C.A0005
-      verification: |
-          Using your 2nd controller, write attribute and read attribute to and from TH_CE
-
-          Below is the example while using chip tool on second controller,
-          ./chip-tool basic write node-label te5new 2 0
-
-           Received error (protocol code 2) during pairing process. ../../third_party/connectedhomeip/src/protocols/secure_channel/CASESession.cpp:1551: CHIP Error 0x00000054: Invalid CASE parameter
-          [1651819620.929567][4359:4364] CHIP:CTL: OperationalDeviceProxy[B8070CD13C99D367:0000000000000002]: State change 3 --> 2
-          [1651819620.929700][4359:4364] CHIP:-: ../../third_party/connectedhomeip/src/protocols/secure_channel/CASESession.cpp:1551: CHIP Error 0x00000054: Invalid CASE parameter at ../../commands/clusters/ModelCommand.cpp:53
-
-          ./chip-tool basic read node-label 2 0
-
-           Received error (protocol code 2) during pairing process. ../../third_party/connectedhomeip/src/protocols/secure_channel/CASESession.cpp:1551: CHIP Error 0x00000054: Invalid CASE parameter
-          [1651819620.929567][4359:4364] CHIP:CTL: OperationalDeviceProxy[B8070CD13C99D367:0000000000000002]: State change 3 --> 2
-          [1651819620.929700][4359:4364] CHIP:-: ../../third_party/connectedhomeip/src/protocols/secure_channel/CASESession.cpp:1551: CHIP Error 0x00000054: Invalid CASE parameter at ../../commands/clusters/ModelCommand.cpp:53
-      disabled: true
-
-    - label:
-          "DUT_CR1 sends command to TH_CE to read the list of Fabrics on TH_CE"
-      PICS: OPCREDS.C.A0001
-      verification: |
-          On DUT controller, read fabrics list
-
-          Below is the command using chip tool controller
-
-          ./chip-tool operationalcredentials read fabrics 1234 0 --fabric-filtered 0
-
-          CHIP:TOO: Endpoint: 0 Cluster: 0x0000_003E Attribute 0x0000_0001 DataVersion: 2455995219
-          [1647863260.286772][9294:9299] CHIP:TOO:   Fabrics: 2 entries
-          [1647863260.286908][9294:9299] CHIP:TOO:     [1]: {
-          [1647863260.286947][9294:9299] CHIP:TOO:       RootPublicKey: 04656F56DBDB677DC957028DFC0ED76709C72753C9194B117A483BDC07386BFD9529B68EB4448FBBA3964EFF37A56A8F461D348B0DAF3B56A75F3B94BF8209D36F
-          [1647863260.286995][9294:9299] CHIP:TOO:       VendorId: 65521
-          [1647863260.287026][9294:9299] CHIP:TOO:       FabricId: 1
-          [1647863260.287055][9294:9299] CHIP:TOO:       NodeId: 1
-          [1647863260.287084][9294:9299] CHIP:TOO:       Label:
-          [1647863260.287113][9294:9299] CHIP:TOO:       FabricIndex: 1
-          [1647863260.287144][9294:9299] CHIP:TOO:      }
-          [1647863260.287185][9294:9299] CHIP:TOO:     [2]: {
-          [1647863260.287221][9294:9299] CHIP:TOO:       RootPublicKey: 04F8F28D5D70A4510E0F72FBBA31369796C4206FF95D97B77C1BDFD0438A3BE43510631A1B915BE189323F4CC0E015480192654D8170F8F230C7713898962958B7
-          [1647863260.287253][9294:9299] CHIP:TOO:       VendorId: 65521
-          [1647863260.287282][9294:9299] CHIP:TOO:       FabricId: 1
-          [1647863260.287310][9294:9299] CHIP:TOO:       NodeId: 3
-          [1647863260.287339][9294:9299] CHIP:TOO:       Label:
-          [1647863260.287368][9294:9299] CHIP:TOO:       FabricIndex: 3
-          [1647863260.287396][9294:9299] CHIP:TOO:      }
-          [1647863260.287515][9294:9299] CHIP:EM: Sending Standalone Ack for MessageCounter:11301761 on exchange 13180i
-      disabled: true
-
-    - label:
-          "DUT_CR1 sends command to TH_CE to open a commissioning window with a
-          commissioning timeout of PIXIT.CADMIN.CwDuration seconds using ECM"
-      PICS: CADMIN.S.C00.Rsp
-      verification: |
-          On DUT controller chip tool, open commissioning window
+          On 1st controller chip tool, open commissioning window
 
           Below is the example when using chip tool as controller
 
@@ -262,9 +62,10 @@
           [1635925713.973178][9695:9700] CHIP:EM: Sending Standalone Ack for MessageCounter:1964916542 on exchange 31055i
       disabled: true
 
-    - label: "TH_CR2 starts a commissioning process with TH_CE"
+    - label: "THn starts a commissioning process with DUT_CE"
+      PICS: CADMIN.S
       verification: |
-          On 2nd controller using chip tool connect to the accessory
+          On nth controller using chip tool connect to the accessory
 
 
           ./chip-tool pairing code 1 36217551633
@@ -274,40 +75,33 @@
       disabled: true
 
     - label:
-          "DUT_CR1 sends command to TH_CE to read the list of Fabrics on TH_CE"
-      PICS: OPCREDS.C.A0001
+          "Repeat Step 3 and Step 4 an additional (SupportedFabrics - 2) times
+          to reach an index value of SupportedFabrics on DUT_CE"
+      PICS: CADMIN.S.C00.Rsp
       verification: |
-          On DUT controller, read fabrics list
+          Repeat step 3 until  CommissionedFabrics=SupportedFabrics
+      disabled: true
 
-          Below is the command using chip tool controller
+    - label:
+          "THn starts a commissioning process and opens a commissioning window
+          with DUT_CE"
+      PICS: CADMIN.S
+      verification: |
+          On nth controller using chip tool connect to the accessory
 
-          ./chip-tool operationalcredentials read fabrics 1234 0 --fabric-filtered 0
 
-          CHIP:TOO: Endpoint: 0 Cluster: 0x0000_003E Attribute 0x0000_0001 DataVersion: 2455995246
-          [1647863342.980899][9309:9314] CHIP:TOO:   Fabrics: 3 entries
-          [1647863342.981158][9309:9314] CHIP:TOO:     [1]: {
-          [1647863342.981231][9309:9314] CHIP:TOO:       RootPublicKey: 04656F56DBDB677DC957028DFC0ED76709C72753C9194B117A483BDC07386BFD9529B68EB4448FBBA3964EFF37A56A8F461D348B0DAF3B56A75F3B94BF8209D36F
-          [1647863342.981322][9309:9314] CHIP:TOO:       VendorId: 65521
-          [1647863342.981380][9309:9314] CHIP:TOO:       FabricId: 1
-          [1647863342.981434][9309:9314] CHIP:TOO:       NodeId: 1
-          [1647863342.981486][9309:9314] CHIP:TOO:       Label:
-          [1647863342.981539][9309:9314] CHIP:TOO:       FabricIndex: 1
-          [1647863342.981594][9309:9314] CHIP:TOO:      }
-          [1647863342.981671][9309:9314] CHIP:TOO:     [2]: {
-          [1647863342.981737][9309:9314] CHIP:TOO:       RootPublicKey: 04F8F28D5D70A4510E0F72FBBA31369796C4206FF95D97B77C1BDFD0438A3BE43510631A1B915BE189323F4CC0E015480192654D8170F8F230C7713898962958B7
-          [1647863342.981796][9309:9314] CHIP:TOO:       VendorId: 65521
-          [1647863342.981849][9309:9314] CHIP:TOO:       FabricId: 1
-          [1647863342.981901][9309:9314] CHIP:TOO:       NodeId: 3
-          [1647863342.981952][9309:9314] CHIP:TOO:       Label:
-          [1647863342.982005][9309:9314] CHIP:TOO:       FabricIndex: 3
-          [1647863342.982057][9309:9314] CHIP:TOO:      }
-          [1647863342.982131][9309:9314] CHIP:TOO:     [3]: {
-          [1647863342.982195][9309:9314] CHIP:TOO:       RootPublicKey: 04F8F28D5D70A4510E0F72FBBA31369796C4206FF95D97B77C1BDFD0438A3BE43510631A1B915BE189323F4CC0E015480192654D8170F8F230C7713898962958B7
-          [1647863342.982252][9309:9314] CHIP:TOO:       VendorId: 65521
-          [1647863342.982305][9309:9314] CHIP:TOO:       FabricId: 1
-          [1647863342.982357][9309:9314] CHIP:TOO:       NodeId: 2
-          [1647863342.982409][9309:9314] CHIP:TOO:       Label:
-          [1647863342.982460][9309:9314] CHIP:TOO:       FabricIndex: 4
-          [1647863342.982512][9309:9314] CHIP:TOO:      }
-          [1647863342.982738][9309:9314] CHIP:EM: Sending Standalone Ack for MessageCounter:5772016 on exchange 3310i
+          ./chip-tool pairing code 1 36217551633
+
+          CHIP:DMG: Received Command Response Data, Endpoint=0 Cluster=0x0000_003E Command=0x0000_0008
+          [1649756670.402192][10794:10799] CHIP:CTL: Device returned status 5 on receiving the NOC
+          [1649756670.402221][10794:10799] CHIP:CTL: Add NOC failed with error ../../third_party/connectedhomeip/src/controller/CHIPDeviceController.cpp:1110: CHIP Error 0x0000000B: No memory
+          [1649756670.402241][10794:10799] CHIP:CTL: Failed to perform commissioning step 12
+      disabled: true
+
+    - label: "TH_CR1 removes FabricIndex1"
+      PICS: OPCREDS.S.C0a.Rsp
+      verification: |
+          on 1st controller using chip tool, remove fabric with FabricIndex=1
+
+          ./chip-tool operationalcredentials remove-fabric 1 1 0
       disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_CADMIN_1_20.yaml b/src/app/tests/suites/certification/Test_TC_CADMIN_1_20.yaml
index 2893f62..cd70fef 100644
--- a/src/app/tests/suites/certification/Test_TC_CADMIN_1_20.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CADMIN_1_20.yaml
@@ -14,8 +14,11 @@
 # Auto-generated scripts for harness use only, please review before automation. The endpoints and cluster names are currently set to default
 
 name:
-    24.1.20. [TC-CADMIN-1.20] max number of Commissioned Fabrics and
-    SupportedFabrics rollover using BCM [DUT - Commissionee]
+    4.1.20. [TC-CADMIN-1.20] max number of Commissioned Fabrics and
+    SupportedFabrics rollover using    BCM [DUT - Commissionee]
+
+PICS:
+    - CADMIN.S
 
 config:
     nodeId: 0x12344321
@@ -23,280 +26,66 @@
     endpoint: 0
 
 tests:
-    - label: "Reset DUT_CR1 to factory defaults"
+    - label: "Reset DUT_CE to factory defaults"
       verification: |
-
+          verification step to be updated.
       disabled: true
 
-    - label: "DUT_CR1 starts a commissioning process with TH_CE"
+    - label: "TH_CR1 starts a commissioning process with DUT_CE"
+      PICS: CADMIN.S
       verification: |
-          "1. Provision the device using DUT controller chip tool(use above instructions) ,
+          "1. Provision the device using 1st controller chip tool(use above instructions) ,
           "
       disabled: true
 
     - label:
-          "DUT_CR1 sends command to TH_CE to open a commissioning window with a
-          commissioning timeout of PIXIT.CADMIN.CwDuration seconds using BCM"
-      PICS: CADMIN.C.C01.Tx
+          "TH_CR1 opens a commissioning window on DUT_CE using a commissioning
+          timeout of PIXIT.CADMIN.CwDuration seconds using BCM"
+      PICS: CADMIN.S.C01.Rsp
       verification: |
-          On your DUT controller chip tool, open commissioning window
-
-          Below is the example when using chip tool as controller
-          ./chip-tool administratorcommissioning open-basic-commissioning-window 500 2 0 --timedInteractionTimeoutMs 1000
-
-
-          CHIP: [DMG] InvokeResponseMessage =
-          [1648116114630] [6871:3898916] CHIP: [DMG] {
-          [1648116114630] [6871:3898916] CHIP: [DMG]         suppressResponse = false,
-          [1648116114630] [6871:3898916] CHIP: [DMG]         InvokeResponseIBs =
-          [1648116114630] [6871:3898916] CHIP: [DMG]         [
-          [1648116114630] [6871:3898916] CHIP: [DMG]                 InvokeResponseIB =
-          [1648116114630] [6871:3898916] CHIP: [DMG]                 {
-          [1648116114630] [6871:3898916] CHIP: [DMG]                         CommandStatusIB =
-          [1648116114630] [6871:3898916] CHIP: [DMG]                         {
-          [1648116114630] [6871:3898916] CHIP: [DMG]                                 CommandPathIB =
-          [1648116114630] [6871:3898916] CHIP: [DMG]                                 {
-          [1648116114630] [6871:3898916] CHIP: [DMG]                                         EndpointId = 0x0,
-          [1648116114630] [6871:3898916] CHIP: [DMG]                                         ClusterId = 0x3c,
-          [1648116114630] [6871:3898916] CHIP: [DMG]                                         CommandId = 0x1,
-          [1648116114630] [6871:3898916] CHIP: [DMG]                                 },
-          [1648116114630] [6871:3898916] CHIP: [DMG]
-          [1648116114630] [6871:3898916] CHIP: [DMG]                                 StatusIB =
-          [1648116114631] [6871:3898916] CHIP: [DMG]                                 {
-          [1648116114631] [6871:3898916] CHIP: [DMG]                                         status = 0x0,
-          [1648116114631] [6871:3898916] CHIP: [DMG]                                 },
-          [1648116114631] [6871:3898916] CHIP: [DMG]
-          [1648116114631] [6871:3898916] CHIP: [DMG]                         },
-          [1648116114631] [6871:3898916] CHIP: [DMG]
-          [1648116114631] [6871:3898916] CHIP: [DMG]                 },
-          [1648116114631] [6871:3898916] CHIP: [DMG]
-          [1648116114631] [6871:3898916] CHIP: [DMG]         ],
-          [1648116114631] [6871:3898916] CHIP: [DMG]
-          [1648116114631] [6871:3898916] CHIP: [DMG]         InteractionModelRevision = 1
-          [1648116114631] [6871:3898916] CHIP: [DMG] },
-          [1648116114631] [6871:3898916] CHIP: [DMG] Received Command Response Status for Endpoint=0 Cluster=0x0000_003C Command=0x0000_0001 Status=0x0
-      disabled: true
-
-    - label: "TH_CR2 starts a commissioning process with TH_CE"
-      verification: |
-          On 2nd controller using chip tool connect to the accessory
-
-
-          ./chip-tool pairing onnetwork 1 20202021
-
-          Verify you got below message
-          Device commissioning completed with success
-      disabled: true
-
-    - label:
-          "DUT_CR1 sends command to TH_CE to open a commissioning window with a
-          commissioning timeout of PIXIT.CADMIN.CwDuration seconds using BCM"
-      PICS: CADMIN.C.C01.Tx
-      verification: |
-          On your DUT controller chip tool, open commissioning window
-
-          Below is the example when using chip tool as controller
-          ./chip-tool administratorcommissioning open-basic-commissioning-window 500 2 0 --timedInteractionTimeoutMs 1000
-
-
-          CHIP: [DMG] InvokeResponseMessage =
-          [1648116114630] [6871:3898916] CHIP: [DMG] {
-          [1648116114630] [6871:3898916] CHIP: [DMG]         suppressResponse = false,
-          [1648116114630] [6871:3898916] CHIP: [DMG]         InvokeResponseIBs =
-          [1648116114630] [6871:3898916] CHIP: [DMG]         [
-          [1648116114630] [6871:3898916] CHIP: [DMG]                 InvokeResponseIB =
-          [1648116114630] [6871:3898916] CHIP: [DMG]                 {
-          [1648116114630] [6871:3898916] CHIP: [DMG]                         CommandStatusIB =
-          [1648116114630] [6871:3898916] CHIP: [DMG]                         {
-          [1648116114630] [6871:3898916] CHIP: [DMG]                                 CommandPathIB =
-          [1648116114630] [6871:3898916] CHIP: [DMG]                                 {
-          [1648116114630] [6871:3898916] CHIP: [DMG]                                         EndpointId = 0x0,
-          [1648116114630] [6871:3898916] CHIP: [DMG]                                         ClusterId = 0x3c,
-          [1648116114630] [6871:3898916] CHIP: [DMG]                                         CommandId = 0x1,
-          [1648116114630] [6871:3898916] CHIP: [DMG]                                 },
-          [1648116114630] [6871:3898916] CHIP: [DMG]
-          [1648116114630] [6871:3898916] CHIP: [DMG]                                 StatusIB =
-          [1648116114631] [6871:3898916] CHIP: [DMG]                                 {
-          [1648116114631] [6871:3898916] CHIP: [DMG]                                         status = 0x0,
-          [1648116114631] [6871:3898916] CHIP: [DMG]                                 },
-          [1648116114631] [6871:3898916] CHIP: [DMG]
-          [1648116114631] [6871:3898916] CHIP: [DMG]                         },
-          [1648116114631] [6871:3898916] CHIP: [DMG]
-          [1648116114631] [6871:3898916] CHIP: [DMG]                 },
-          [1648116114631] [6871:3898916] CHIP: [DMG]
-          [1648116114631] [6871:3898916] CHIP: [DMG]         ],
-          [1648116114631] [6871:3898916] CHIP: [DMG]
-          [1648116114631] [6871:3898916] CHIP: [DMG]         InteractionModelRevision = 1
-          [1648116114631] [6871:3898916] CHIP: [DMG] },
-          [1648116114631] [6871:3898916] CHIP: [DMG] Received Command Response Status for Endpoint=0 Cluster=0x0000_003C Command=0x0000_0001 Status=0x0
-      disabled: true
-
-    - label: "TH_CR3 starts a commissioning process with TH_CE"
-      verification: |
-          On 3rd controller using chip tool connect to the accessory
-
-
-          ./chip-tool pairing onnetwork 1 20202021
-
-          Verify you got below message
-          Device commissioning completed with success
-      disabled: true
-
-    - label:
-          "TH_CR2 sends command to TH_CE to read the list of Fabrics on TH_CE"
-      PICS: OPCREDS.C.A0001
-      verification: |
-          On 2nd controller, read fabrics list
-
-          ./chip-tool operationalcredentials read fabrics 1234 0 --fabric-filtered 0
-
-
-
-          CHIP:TOO: Endpoint: 0 Cluster: 0x0000_003E Attribute 0x0000_0001 DataVersion: 2455995193
-          CHIP:TOO:   Fabrics: 3 entries
-          CHIP:TOO:     [1]: {
-          CHIP:TOO:       RootPublicKey: 04656F56DBDB677DC957028DFC0ED76709C72753C9194B117A483BDC07386BFD9529B68EB4448FBBA3964EFF37A56A8F461D348B0DAF3B56A75F3B94BF8209D36F
-          CHIP:TOO:       VendorId: 65521
-          CHIP:TOO:       FabricId: 1
-          CHIP:TOO:       NodeId: 1
-          CHIP:TOO:       Label:
-          CHIP:TOO:       FabricIndex: 1
-          CHIP:TOO:      }
-          CHIP:TOO:     [2]: {
-          CHIP:TOO:       RootPublicKey: 04F8F28D5D70A4510E0F72FBBA31369796C4206FF95D97B77C1BDFD0438A3BE43510631A1B915BE189323F4CC0E015480192654D8170F8F230C7713898962958B7
-          CHIP:TOO:       VendorId: 65521
-          CHIP:TOO:       FabricId: 1
-          CHIP:TOO:       NodeId: 2
-          CHIP:TOO:       Label:
-          CHIP:TOO:       FabricIndex: 2
-          CHIP:TOO:      }
-          CHIP:TOO:     [3]: {
-          CHIP:TOO:       RootPublicKey: 04F8F28D5D70A4510E0F72FBBA31369796C4206FF95D97B77C1BDFD0438A3BE43510631A1B915BE189323F4CC0E015480192654D8170F8F230C7713898962958B7
-          CHIP:TOO:       VendorId: 65521
-          CHIP:TOO:       FabricId: 1
-          CHIP:TOO:       NodeId: 3
-          CHIP:TOO:       Label:
-          CHIP:TOO:       FabricIndex: 3
-          CHIP:TOO:      }
-          CHIP:EM: Sending Standalone Ack for MessageCounter:9143157 on exchange 1147i
-          "
-      disabled: true
-
-    - label: "TH_CR2 sends RemoveFabric with FabricIndex = 2command to TH_CE"
-      PICS: OPCREDS.C.C0a.Tx
-      verification: |
-          on 2nd controller using chip tool, remove fabric with FabricIndex=2
-
-          ./chip-tool operationalcredentials remove-fabric 2 1 0
-
-          CHIP:DMG: Received Command Response Data, Endpoint=0 Cluster=0x0000_003E Command=0x0000_0008
-          CHIP:TOO: Endpoint: 0 Cluster: 0x0000_003E Command 0x0000_0008
-          CHIP:TOO:   NOCResponse: {
-          CHIP:TOO:     statusCode: 0
-          CHIP:TOO:     fabricIndex: 2
-          CHIP:TOO:    }
-          CHIP:DMG: ICR moving to [AwaitingDe]
-      disabled: true
-
-    - label:
-          "TH_CR2 sends command to TH_CE to write and read the Basic Information
-          Clusters NodeLabel mandatory attribute"
-      PICS: BINFO.C.A0005
-      verification: |
-          Using your 2nd controller, write attribute and read attribute to and from TH_CE
-
-          Below is the example while using chip tool on second controller,
-          ./chip-tool basic write node-label te5new 2 0
-
-           Received error (protocol code 2) during pairing process. ../../third_party/connectedhomeip/src/protocols/secure_channel/CASESession.cpp:1551: CHIP Error 0x00000054: Invalid CASE parameter
-          [1651819620.929567][4359:4364] CHIP:CTL: OperationalDeviceProxy[B8070CD13C99D367:0000000000000002]: State change 3 --> 2
-          [1651819620.929700][4359:4364] CHIP:-: ../../third_party/connectedhomeip/src/protocols/secure_channel/CASESession.cpp:1551: CHIP Error 0x00000054: Invalid CASE parameter at ../../commands/clusters/ModelCommand.cpp:53
-
-          ./chip-tool basic read node-label 2 0
-
-           Received error (protocol code 2) during pairing process. ../../third_party/connectedhomeip/src/protocols/secure_channel/CASESession.cpp:1551: CHIP Error 0x00000054: Invalid CASE parameter
-          [1651819620.929567][4359:4364] CHIP:CTL: OperationalDeviceProxy[B8070CD13C99D367:0000000000000002]: State change 3 --> 2
-          [1651819620.929700][4359:4364] CHIP:-: ../../third_party/connectedhomeip/src/protocols/secure_channel/CASESession.cpp:1551: CHIP Error 0x00000054: Invalid CASE parameter at ../../commands/clusters/ModelCommand.cpp:53
-      disabled: true
-
-    - label: "DUT_CR1 sends command to TH_CE to read the list of Fabrics"
-      PICS: OPCREDS.C.A0001
-      verification: |
-          On DUT controller, read fabrics list
-
-          Below is the command using chip tool controller
-
-          ./chip-tool operationalcredentials read fabrics 1234 0 --fabric-filtered 0
-
-          CHIP:TOO: Endpoint: 0 Cluster: 0x0000_003E Attribute 0x0000_0001 DataVersion: 2455995219
-          [1647863260.286772][9294:9299] CHIP:TOO:   Fabrics: 2 entries
-          [1647863260.286908][9294:9299] CHIP:TOO:     [1]: {
-          [1647863260.286947][9294:9299] CHIP:TOO:       RootPublicKey: 04656F56DBDB677DC957028DFC0ED76709C72753C9194B117A483BDC07386BFD9529B68EB4448FBBA3964EFF37A56A8F461D348B0DAF3B56A75F3B94BF8209D36F
-          [1647863260.286995][9294:9299] CHIP:TOO:       VendorId: 65521
-          [1647863260.287026][9294:9299] CHIP:TOO:       FabricId: 1
-          [1647863260.287055][9294:9299] CHIP:TOO:       NodeId: 1
-          [1647863260.287084][9294:9299] CHIP:TOO:       Label:
-          [1647863260.287113][9294:9299] CHIP:TOO:       FabricIndex: 1
-          [1647863260.287144][9294:9299] CHIP:TOO:      }
-          [1647863260.287185][9294:9299] CHIP:TOO:     [2]: {
-          [1647863260.287221][9294:9299] CHIP:TOO:       RootPublicKey: 04F8F28D5D70A4510E0F72FBBA31369796C4206FF95D97B77C1BDFD0438A3BE43510631A1B915BE189323F4CC0E015480192654D8170F8F230C7713898962958B7
-          [1647863260.287253][9294:9299] CHIP:TOO:       VendorId: 65521
-          [1647863260.287282][9294:9299] CHIP:TOO:       FabricId: 1
-          [1647863260.287310][9294:9299] CHIP:TOO:       NodeId: 3
-          [1647863260.287339][9294:9299] CHIP:TOO:       Label:
-          [1647863260.287368][9294:9299] CHIP:TOO:       FabricIndex: 3
-          [1647863260.287396][9294:9299] CHIP:TOO:      }
-          [1647863260.287515][9294:9299] CHIP:EM: Sending Standalone Ack for MessageCounter:11301761 on exchange 13180i
-      disabled: true
-
-    - label:
-          "DUT_CR1 sends command to TH_CE to open a commissioning window with a
-          commissioning timeout of PIXIT.CADMIN.CwDuration seconds using BCM"
-      PICS: CADMIN.C.C01.Tx
-      verification: |
-          On DUT controller chip tool, open commissioning window
+          On 1st controller chip tool, open commissioning window
 
           Below is the example when using chip tool as controller
 
-          For BCM,
-          ./chip-tool administratorcommissioning open-basic-commissioning-window 500 2 0 --timedInteractionTimeoutMs 1000
+          ./chip-tool administratorcommissioning open-basic-commissioning-window 500 1 0  --timedInteractionTimeoutMs 1000
 
           CHIP:DMG: InvokeResponseMessage =
-          [1650278416.248379][11064:11069] CHIP:DMG: {
-          [1650278416.248436][11064:11069] CHIP:DMG:         suppressResponse = false,
-          [1650278416.248495][11064:11069] CHIP:DMG:         InvokeResponseIBs =
-          [1650278416.248570][11064:11069] CHIP:DMG:         [
-          [1650278416.248630][11064:11069] CHIP:DMG:                 InvokeResponseIB =
-          [1650278416.248718][11064:11069] CHIP:DMG:                 {
-          [1650278416.248783][11064:11069] CHIP:DMG:                         CommandStatusIB =
-          [1650278416.248860][11064:11069] CHIP:DMG:                         {
-          [1650278416.248931][11064:11069] CHIP:DMG:                                 CommandPathIB =
-          [1650278416.249011][11064:11069] CHIP:DMG:                                 {
-          [1650278416.249100][11064:11069] CHIP:DMG:                                         EndpointId = 0x0,
-          [1650278416.249186][11064:11069] CHIP:DMG:                                         ClusterId = 0x3c,
-          [1650278416.249268][11064:11069] CHIP:DMG:                                         CommandId = 0x1,
-          [1650278416.249347][11064:11069] CHIP:DMG:                                 },
-          [1650278416.249430][11064:11069] CHIP:DMG:
-          [1650278416.249501][11064:11069] CHIP:DMG:                                 StatusIB =
-          [1650278416.249581][11064:11069] CHIP:DMG:                                 {
-          [1650278416.249664][11064:11069] CHIP:DMG:                                         status = 0x00 (SUCCESS),
-          [1650278416.249738][11064:11069] CHIP:DMG:                                 },
-          [1650278416.249823][11064:11069] CHIP:DMG:
-          [1650278416.249889][11064:11069] CHIP:DMG:                         },
-          [1650278416.249969][11064:11069] CHIP:DMG:
-          [1650278416.250035][11064:11069] CHIP:DMG:                 },
-          [1650278416.250113][11064:11069] CHIP:DMG:
-          [1650278416.250169][11064:11069] CHIP:DMG:         ],
-          [1650278416.250241][11064:11069] CHIP:DMG:
-          [1650278416.250298][11064:11069] CHIP:DMG:         InteractionModelRevision = 1
-          [1650278416.250355][11064:11069] CHIP:DMG: },
-          [1650278416.250535][11064:11069] CHIP:DMG: Received Command Response Status for Endpoint=0 Cluster=0x0000_003C Command=0x0000_0001 Status=0x0
-          [1650278416.250634][11064:11069] CHIP:DMG: ICR moving to [AwaitingDe]
+          [1649756654.928453][3385:3390] CHIP:DMG: {
+          [1649756654.928511][3385:3390] CHIP:DMG:         suppressResponse = false,
+          [1649756654.928571][3385:3390] CHIP:DMG:         InvokeResponseIBs =
+          [1649756654.928647][3385:3390] CHIP:DMG:         [
+          [1649756654.928708][3385:3390] CHIP:DMG:                 InvokeResponseIB =
+          [1649756654.928794][3385:3390] CHIP:DMG:                 {
+          [1649756654.928864][3385:3390] CHIP:DMG:                         CommandStatusIB =
+          [1649756654.928948][3385:3390] CHIP:DMG:                         {
+          [1649756654.929021][3385:3390] CHIP:DMG:                                 CommandPathIB =
+          [1649756654.929109][3385:3390] CHIP:DMG:                                 {
+          [1649756654.929191][3385:3390] CHIP:DMG:                                         EndpointId = 0x0,
+          [1649756654.929284][3385:3390] CHIP:DMG:                                         ClusterId = 0x3c,
+          [1649756654.929376][3385:3390] CHIP:DMG:                                         CommandId = 0x1,
+          [1649756654.929459][3385:3390] CHIP:DMG:                                 },
+          [1649756654.929551][3385:3390] CHIP:DMG:
+          [1649756654.929632][3385:3390] CHIP:DMG:                                 StatusIB =
+          [1649756654.929720][3385:3390] CHIP:DMG:                                 {
+          [1649756654.929804][3385:3390] CHIP:DMG:                                         status = 0x00 (SUCCESS),
+          [1649756654.929878][3385:3390] CHIP:DMG:                                 },
+          [1649756654.929946][3385:3390] CHIP:DMG:
+          [1649756654.930017][3385:3390] CHIP:DMG:                         },
+          [1649756654.930109][3385:3390] CHIP:DMG:
+          [1649756654.930176][3385:3390] CHIP:DMG:                 },
+          [1649756654.930256][3385:3390] CHIP:DMG:
+          [1649756654.930314][3385:3390] CHIP:DMG:         ],
+          [1649756654.930389][3385:3390] CHIP:DMG:
+          [1649756654.930448][3385:3390] CHIP:DMG:         InteractionModelRevision = 1
+          [1649756654.930555][3385:3390] CHIP:DMG: },
+          [1649756654.930703][3385:3390] CHIP:DMG: Received Command Response Status for Endpoint=0 Cluster=0x0000_003C Command=0x0000_0001 Status=0x0
+          [1649756654.930801][3385:3390] CHIP:DMG: ICR moving to [AwaitingDe]
       disabled: true
 
-    - label: "TH_CR2 starts a commissioning process with TH_CE"
+    - label: "THn starts a commissioning process with DUT_CE"
+      PICS: CADMIN.S
       verification: |
-          On 2nd controller using chip tool connect to the accessory
+          On nth controller using chip tool connect to the accessory
 
 
           ./chip-tool pairing onnetwork 1 20202021
@@ -305,40 +94,34 @@
           Device commissioning completed with success
       disabled: true
 
-    - label: "DUT_CR1 sends command to TH_CE to read the list of Fabrics"
-      PICS: OPCREDS.C.A0001
+    - label:
+          "Repeat Step 3 and Step 4 an additional (SupportedFabrics - 2) times
+          to reach an index value of SupportedFabrics on DUT_CE"
+      PICS: CADMIN.S.C01.Rsp
       verification: |
-          On DUT controller, read fabrics list
+          Repeat step 3 until  CommissionedFabrics=SupportedFabrics
+      disabled: true
 
-          Below is the command using chip tool controller
+    - label:
+          "THn starts a commissioning process and opens a commissioning window
+          with DUT_CE"
+      PICS: CADMIN.S.C01.Rsp
+      verification: |
+          On nth controller using chip tool connect to the accessory
 
-          ./chip-tool operationalcredentials read fabrics 1234 0 --fabric-filtered 0
 
-          CHIP:TOO: Endpoint: 0 Cluster: 0x0000_003E Attribute 0x0000_0001 DataVersion: 2455995246
-          [1647863342.980899][9309:9314] CHIP:TOO:   Fabrics: 3 entries
-          [1647863342.981158][9309:9314] CHIP:TOO:     [1]: {
-          [1647863342.981231][9309:9314] CHIP:TOO:       RootPublicKey: 04656F56DBDB677DC957028DFC0ED76709C72753C9194B117A483BDC07386BFD9529B68EB4448FBBA3964EFF37A56A8F461D348B0DAF3B56A75F3B94BF8209D36F
-          [1647863342.981322][9309:9314] CHIP:TOO:       VendorId: 65521
-          [1647863342.981380][9309:9314] CHIP:TOO:       FabricId: 1
-          [1647863342.981434][9309:9314] CHIP:TOO:       NodeId: 1
-          [1647863342.981486][9309:9314] CHIP:TOO:       Label:
-          [1647863342.981539][9309:9314] CHIP:TOO:       FabricIndex: 1
-          [1647863342.981594][9309:9314] CHIP:TOO:      }
-          [1647863342.981671][9309:9314] CHIP:TOO:     [2]: {
-          [1647863342.981737][9309:9314] CHIP:TOO:       RootPublicKey: 04F8F28D5D70A4510E0F72FBBA31369796C4206FF95D97B77C1BDFD0438A3BE43510631A1B915BE189323F4CC0E015480192654D8170F8F230C7713898962958B7
-          [1647863342.981796][9309:9314] CHIP:TOO:       VendorId: 65521
-          [1647863342.981849][9309:9314] CHIP:TOO:       FabricId: 1
-          [1647863342.981901][9309:9314] CHIP:TOO:       NodeId: 3
-          [1647863342.981952][9309:9314] CHIP:TOO:       Label:
-          [1647863342.982005][9309:9314] CHIP:TOO:       FabricIndex: 3
-          [1647863342.982057][9309:9314] CHIP:TOO:      }
-          [1647863342.982131][9309:9314] CHIP:TOO:     [3]: {
-          [1647863342.982195][9309:9314] CHIP:TOO:       RootPublicKey: 04F8F28D5D70A4510E0F72FBBA31369796C4206FF95D97B77C1BDFD0438A3BE43510631A1B915BE189323F4CC0E015480192654D8170F8F230C7713898962958B7
-          [1647863342.982252][9309:9314] CHIP:TOO:       VendorId: 65521
-          [1647863342.982305][9309:9314] CHIP:TOO:       FabricId: 1
-          [1647863342.982357][9309:9314] CHIP:TOO:       NodeId: 2
-          [1647863342.982409][9309:9314] CHIP:TOO:       Label:
-          [1647863342.982460][9309:9314] CHIP:TOO:       FabricIndex: 4
-          [1647863342.982512][9309:9314] CHIP:TOO:      }
-          [1647863342.982738][9309:9314] CHIP:EM: Sending Standalone Ack for MessageCounter:5772016 on exchange 3310i
+          ./chip-tool pairing onnetwork 1 20202021
+
+          CHIP:DMG: Received Command Response Data, Endpoint=0 Cluster=0x0000_003E Command=0x0000_0008
+          [1649756670.402192][10794:10799] CHIP:CTL: Device returned status 5 on receiving the NOC
+          [1649756670.402221][10794:10799] CHIP:CTL: Add NOC failed with error ../../third_party/connectedhomeip/src/controller/CHIPDeviceController.cpp:1110: CHIP Error 0x0000000B: No memory
+          [1649756670.402241][10794:10799] CHIP:CTL: Failed to perform commissioning step 12
+      disabled: true
+
+    - label: "TH_CR1 removes FabricIndex1"
+      PICS: OPCREDS.S.C0a.Rsp
+      verification: |
+          on 1st controller using chip tool, remove fabric with FabricIndex=1
+
+          ./chip-tool operationalcredentials remove-fabric 1 1 0
       disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_CADMIN_1_21.yaml b/src/app/tests/suites/certification/Test_TC_CADMIN_1_21.yaml
index 7d141f3..27996db 100644
--- a/src/app/tests/suites/certification/Test_TC_CADMIN_1_21.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CADMIN_1_21.yaml
@@ -14,8 +14,11 @@
 # Auto-generated scripts for harness use only, please review before automation. The endpoints and cluster names are currently set to default
 
 name:
-    24.1.21. [TC-CADMIN-1.21] max number of Commissioned Fabrics and
-    SupportedFabrics rollover using ECM [DUT - Commissioner]
+    4.1.21. [TC-CADMIN-1.21] Open commissioning window - durations max and max+1
+    [BCM] [DUT - Commissionee]
+
+PICS:
+    - CADMIN.S
 
 config:
     nodeId: 0x12344321
@@ -25,77 +28,103 @@
 tests:
     - label: "Reset DUT_CE to factory defaults"
       verification: |
-
+          verification step to be updated.
       disabled: true
 
-    - label: "TH_CR1 starts a commissioning process with DUT_CE"
+    - label: "TH_CR1 starts a commissioning process with DUT_CE using BCM"
+      PICS: CADMIN.S.C01.Rsp
       verification: |
           "1. Provision the device using 1st controller chip tool(use above instructions) ,
           "
       disabled: true
 
     - label:
-          "TH_CR1 opens a commissioning window on DUT_CE using a commissioning
-          timeout of PIXIT.CADMIN.CwDuration seconds using ECM"
-      PICS: CADMIN.S.C00.Rsp
+          "TH_CR1 opens a commissioning window on DUT_CE with a value of 900
+          seconds"
+      PICS: CADMIN.S.C01.Rsp
       verification: |
           On 1st controller chip tool, open commissioning window
 
-          Below is the example when using chip tool as controller
+          For BCM,
 
-          ./chip-tool pairing open-commissioning-window 1 1 300 1000 3840
 
-          [1635925713.966786][9695:9700] CHIP:SC: Success status report received. Session was established
-          [1635925713.966839][9695:9700] CHIP:IN: New secure session created for device 0x0000000000000001, key 33!!
-          [1635925713.966938][9695:9700] CHIP:CTL: OpenCommissioningWindow for device ID 1
-          [1635925713.972601][9695:9700] CHIP:DMG: ICR moving to [AddingComm]
-          [1635925713.972705][9695:9700] CHIP:DMG: ICR moving to [AddedComma]
-          [1635925713.972815][9695:9700] CHIP:IN: Prepared encrypted message 0xaaaad9b57d10 to 0x0000000000000001 of type 0x8 and protocolId (0, 1) on exchange 31056i with MessageCounter:0.
-          [1635925713.972876][9695:9700] CHIP:IN: Sending encrypted msg 0xaaaad9b57d10 with MessageCounter:0 to 0x0000000000000001 at monotonic time: 13449459 msec
-          [1635925713.973006][9695:9700] CHIP:DMG: ICR moving to [CommandSen]
-          [1635925713.973061][9695:9700] CHIP:CTL: Manual pairing code: [36217551633]
-          [1635925713.973120][9695:9700] CHIP:CTL: SetupQRCode: [MT:00000CQM00A7F87ZT10]
-          [1635925713.973178][9695:9700] CHIP:EM: Sending Standalone Ack for MessageCounter:1964916542 on exchange 31055i
+          ./chip-tool administratorcommissioning open-basic-commissioning-window 900 2 0 --timedInteractionTimeoutMs 1000
+
+
+          CHIP:DMG: InvokeResponseMessage =
+          [1650278416.248379][11064:11069] CHIP:DMG: {
+          [1650278416.248436][11064:11069] CHIP:DMG:         suppressResponse = false,
+          [1650278416.248495][11064:11069] CHIP:DMG:         InvokeResponseIBs =
+          [1650278416.248570][11064:11069] CHIP:DMG:         [
+          [1650278416.248630][11064:11069] CHIP:DMG:                 InvokeResponseIB =
+          [1650278416.248718][11064:11069] CHIP:DMG:                 {
+          [1650278416.248783][11064:11069] CHIP:DMG:                         CommandStatusIB =
+          [1650278416.248860][11064:11069] CHIP:DMG:                         {
+          [1650278416.248931][11064:11069] CHIP:DMG:                                 CommandPathIB =
+          [1650278416.249011][11064:11069] CHIP:DMG:                                 {
+          [1650278416.249100][11064:11069] CHIP:DMG:                                         EndpointId = 0x0,
+          [1650278416.249186][11064:11069] CHIP:DMG:                                         ClusterId = 0x3c,
+          [1650278416.249268][11064:11069] CHIP:DMG:                                         CommandId = 0x1,
+          [1650278416.249347][11064:11069] CHIP:DMG:                                 },
+          [1650278416.249430][11064:11069] CHIP:DMG:
+          [1650278416.249501][11064:11069] CHIP:DMG:                                 StatusIB =
+          [1650278416.249581][11064:11069] CHIP:DMG:                                 {
+          [1650278416.249664][11064:11069] CHIP:DMG:                                         status = 0x00 (SUCCESS),
+          [1650278416.249738][11064:11069] CHIP:DMG:                                 },
+          [1650278416.249823][11064:11069] CHIP:DMG:
+          [1650278416.249889][11064:11069] CHIP:DMG:                         },
+          [1650278416.249969][11064:11069] CHIP:DMG:
+          [1650278416.250035][11064:11069] CHIP:DMG:                 },
+          [1650278416.250113][11064:11069] CHIP:DMG:
+          [1650278416.250169][11064:11069] CHIP:DMG:         ],
+          [1650278416.250241][11064:11069] CHIP:DMG:
+          [1650278416.250298][11064:11069] CHIP:DMG:         InteractionModelRevision = 1
+          [1650278416.250355][11064:11069] CHIP:DMG: },
+          [1650278416.250535][11064:11069] CHIP:DMG: Received Command Response Status for Endpoint=0 Cluster=0x0000_003C Command=0x0000_0001 Status=0x0
+          [1650278416.250634][11064:11069] CHIP:DMG: ICR moving to [AwaitingDe]
       disabled: true
 
-    - label: "THn starts a commissioning process with DUT_CE"
+    - label: "Wait for commissioning Window to 901 seconds"
       verification: |
-          On nth controller using chip tool connect to the accessory
-
-
-          ./chip-tool pairing code 1 36217551633
-
-          Verify you got below message
-          Device commissioning completed with success
+          Wait for commissioning Window to Timeout
       disabled: true
 
     - label:
-          "Repeat Step 3 and Step 4 an additional (SupportedFabrics - 2) times
-          to reach an index value of SupportedFabrics on DUT_CE"
-      PICS: CADMIN.S.C00.Rsp
+          "TH_CR1 reads the window status to verify the DUT_CE window is closed"
+      PICS: CADMIN.S.A0000
       verification: |
-          Repeat step 3 until  CommissionedFabrics=SupportedFabrics
+          ./chip-tool administratorcommissioning read window-status 1 0
+
+          CHIP:TOO: Endpoint: 0 Cluster: 0x0000_003C Attribute 0x0000_0000 DataVersion: 2849200592
+          [1651137648.760469][14047:14052] CHIP:TOO:   WindowStatus: 0
+          [1651137648.760534][14047:14052] CHIP:EM: Sending Standalone Ack for MessageCounter:5527412 on exchange 14590i
       disabled: true
 
     - label:
-          "THn starts a commissioning process and opens a commissioning window
-          with DUT_CE"
+          "TH_CR1 opens a commissioning window on DUT_CE with a value of 901
+          seconds"
+      PICS: CADMIN.S.C01.Rsp
       verification: |
-          On nth controller using chip tool connect to the accessory
+          On 1st controller chip tool, open commissioning window
 
+          For BCM,
+          ./chip-tool administratorcommissioning open-basic-commissioning-window 901 2 0 --timedInteractionTimeoutMs 1000
 
-          ./chip-tool pairing code 1 36217551633
-
-          CHIP:DMG: Received Command Response Data, Endpoint=0 Cluster=0x0000_003E Command=0x0000_0008
-          [1649756670.402192][10794:10799] CHIP:CTL: Device returned status 5 on receiving the NOC
-          [1649756670.402221][10794:10799] CHIP:CTL: Add NOC failed with error ../../third_party/connectedhomeip/src/controller/CHIPDeviceController.cpp:1110: CHIP Error 0x0000000B: No memory
-          [1649756670.402241][10794:10799] CHIP:CTL: Failed to perform commissioning step 12
+          CHIP:DMG: Received Command Response Status for Endpoint=0 Cluster=0x0000_003C Command=0x0000_0001 Status=0x85
+          [1652860801.225084][9512:9517] CHIP:TOO: Error: IM Error 0x00000585: General error: 0x85 (INVALID_COMMAND)
+          [1652860801.225173][9512:9517] CHIP:DMG: ICR moving to [AwaitingDe]
+          [1652860801.225294][9512:9517] CHIP:EM: Sending Standalone Ack for MessageCounter:4191961 on exchange 37827i
       disabled: true
 
-    - label: "TH_CR1 removes FabricIndex1"
-      PICS: OPCREDS.S.C0a.Rsp
+    - label:
+          "TH_CR1 reads the window status to verify the DUT_CE window is closed"
+      PICS: CADMIN.S.A0000
       verification: |
-          on 1st controller using chip tool, remove fabric with FabricIndex=1
+          On  1st controller read  window status
 
-          ./chip-tool operationalcredentials remove-fabric 1 1 0
+          ./chip-tool administratorcommissioning read window-status 1 0
+
+          CHIP:TOO: Endpoint: 0 Cluster: 0x0000_003C Attribute 0x0000_0000 DataVersion: 2849200592
+          [1651137648.760469][14047:14052] CHIP:TOO:   WindowStatus: 0
+          [1651137648.760534][14047:14052] CHIP:EM: Sending Standalone Ack for MessageCounter:5527412 on exchange 14590i
       disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_CADMIN_1_22.yaml b/src/app/tests/suites/certification/Test_TC_CADMIN_1_22.yaml
index de4341f..fdd103a 100644
--- a/src/app/tests/suites/certification/Test_TC_CADMIN_1_22.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CADMIN_1_22.yaml
@@ -14,8 +14,11 @@
 # Auto-generated scripts for harness use only, please review before automation. The endpoints and cluster names are currently set to default
 
 name:
-    24.1.22. [TC-CADMIN-1.22] max number of Commissioned Fabrics and
-    SupportedFabrics rollover using BCM [DUT - Commissioner]
+    4.1.22. [TC-CADMIN-1.22] Open commissioning window - durations max and max+1
+    [ECM] [DUT - Commissionee]
+
+PICS:
+    - CADMIN.S
 
 config:
     nodeId: 0x12344321
@@ -25,98 +28,88 @@
 tests:
     - label: "Reset DUT_CE to factory defaults"
       verification: |
-
+          verification step to be updated.
       disabled: true
 
-    - label: "TH_CR1 starts a commissioning process with DUT_CE"
+    - label: "TH_CR1 starts a commissioning process with DUT_CE using ECM"
+      PICS: CADMIN.S.C00.Rsp
       verification: |
           "1. Provision the device using 1st controller chip tool(use above instructions) ,
           "
       disabled: true
 
     - label:
-          "TH_CR1 opens a commissioning window on DUT_CE using a commissioning
-          timeout of PIXIT.CADMIN.CwDuration seconds using BCM"
+          "TH_CR1 opens a commissioning window on DUT_CE with a value of 900
+          seconds"
       PICS: CADMIN.S.C00.Rsp
       verification: |
           On 1st controller chip tool, open commissioning window
 
           Below is the example when using chip tool as controller
 
-          ./chip-tool administratorcommissioning open-basic-commissioning-window 500 1 0  --timedInteractionTimeoutMs 1000
 
-          CHIP:DMG: InvokeResponseMessage =
-          [1649756654.928453][3385:3390] CHIP:DMG: {
-          [1649756654.928511][3385:3390] CHIP:DMG:         suppressResponse = false,
-          [1649756654.928571][3385:3390] CHIP:DMG:         InvokeResponseIBs =
-          [1649756654.928647][3385:3390] CHIP:DMG:         [
-          [1649756654.928708][3385:3390] CHIP:DMG:                 InvokeResponseIB =
-          [1649756654.928794][3385:3390] CHIP:DMG:                 {
-          [1649756654.928864][3385:3390] CHIP:DMG:                         CommandStatusIB =
-          [1649756654.928948][3385:3390] CHIP:DMG:                         {
-          [1649756654.929021][3385:3390] CHIP:DMG:                                 CommandPathIB =
-          [1649756654.929109][3385:3390] CHIP:DMG:                                 {
-          [1649756654.929191][3385:3390] CHIP:DMG:                                         EndpointId = 0x0,
-          [1649756654.929284][3385:3390] CHIP:DMG:                                         ClusterId = 0x3c,
-          [1649756654.929376][3385:3390] CHIP:DMG:                                         CommandId = 0x1,
-          [1649756654.929459][3385:3390] CHIP:DMG:                                 },
-          [1649756654.929551][3385:3390] CHIP:DMG:
-          [1649756654.929632][3385:3390] CHIP:DMG:                                 StatusIB =
-          [1649756654.929720][3385:3390] CHIP:DMG:                                 {
-          [1649756654.929804][3385:3390] CHIP:DMG:                                         status = 0x00 (SUCCESS),
-          [1649756654.929878][3385:3390] CHIP:DMG:                                 },
-          [1649756654.929946][3385:3390] CHIP:DMG:
-          [1649756654.930017][3385:3390] CHIP:DMG:                         },
-          [1649756654.930109][3385:3390] CHIP:DMG:
-          [1649756654.930176][3385:3390] CHIP:DMG:                 },
-          [1649756654.930256][3385:3390] CHIP:DMG:
-          [1649756654.930314][3385:3390] CHIP:DMG:         ],
-          [1649756654.930389][3385:3390] CHIP:DMG:
-          [1649756654.930448][3385:3390] CHIP:DMG:         InteractionModelRevision = 1
-          [1649756654.930555][3385:3390] CHIP:DMG: },
-          [1649756654.930703][3385:3390] CHIP:DMG: Received Command Response Status for Endpoint=0 Cluster=0x0000_003C Command=0x0000_0001 Status=0x0
-          [1649756654.930801][3385:3390] CHIP:DMG: ICR moving to [AwaitingDe]
+          For ECM,
+          ./chip-tool pairing open-commissioning-window 1 1 900 1000 3840
+
+          [1635925713.966786][9695:9700] CHIP:SC: Success status report received. Session was established
+          [1635925713.966839][9695:9700] CHIP:IN: New secure session created for device 0x0000000000000001, key 33!!
+          [1635925713.966938][9695:9700] CHIP:CTL: OpenCommissioningWindow for device ID 1
+          [1635925713.972601][9695:9700] CHIP:DMG: ICR moving to [AddingComm]
+          [1635925713.972705][9695:9700] CHIP:DMG: ICR moving to [AddedComma]
+          [1635925713.972815][9695:9700] CHIP:IN: Prepared encrypted message 0xaaaad9b57d10 to 0x0000000000000001 of type 0x8 and protocolId (0, 1) on exchange 31056i with MessageCounter:0.
+          [1635925713.972876][9695:9700] CHIP:IN: Sending encrypted msg 0xaaaad9b57d10 with MessageCounter:0 to 0x0000000000000001 at monotonic time: 13449459 msec
+          [1635925713.973006][9695:9700] CHIP:DMG: ICR moving to [CommandSen]
+          [1635925713.973061][9695:9700] CHIP:CTL: Manual pairing code: [35484132896]
+          [1635925713.973120][9695:9700] CHIP:CTL: SetupQRCode: [MT:00000CQM00A7F87ZT10]
+          [1635925713.973178][9695:9700] CHIP:EM: Sending Standalone Ack for MessageCounter:1964916542 on exchange 31055i
       disabled: true
 
-    - label: "THn starts a commissioning process with DUT_CE"
+    - label: "Wait for commissioning Window to 901 seconds"
       verification: |
-          On nth controller using chip tool connect to the accessory
-
-
-          ./chip-tool pairing onnetwork 1 20202021
-
-          Verify you got below message
-          Device commissioning completed with success
+          Wait for commissioning Window to Timeout
       disabled: true
 
     - label:
-          "Repeat Step 3 and Step 4 an additional (SupportedFabrics - 2) times
-          to reach an index value of SupportedFabrics on DUT_CE"
-      PICS: CADMIN.S.C00.Rsp
+          "TH_CR1 reads the window status to verify the DUT_CE window is closed"
+      PICS: CADMIN.S.A0000
       verification: |
-          Repeat step 3 until  CommissionedFabrics=SupportedFabrics
+          On 1st controller read window status
+
+          ./chip-tool administratorcommissioning read window-status 1 0
+
+          CHIP:TOO: Endpoint: 0 Cluster: 0x0000_003C Attribute 0x0000_0000 DataVersion: 2849200592
+          [1651137648.760469][14047:14052] CHIP:TOO:   WindowStatus: 0
+          [1651137648.760534][14047:14052] CHIP:EM: Sending Standalone Ack for MessageCounter:5527412 on exchange 14590i
       disabled: true
 
     - label:
-          "THn starts a commissioning process and opens a commissioning window
-          with DUT_CE"
+          "TH_CR1 opens a commissioning window on DUT_CE with a value of 901
+          seconds"
       PICS: CADMIN.S.C00.Rsp
       verification: |
-          On nth controller using chip tool connect to the accessory
+          On 1st controller chip tool, open commissioning window
+
+          Below is the example when using chip tool as controller
 
 
-          ./chip-tool pairing onnetwork 1 20202021
+          For ECM,
+          ./chip-tool pairing open-commissioning-window 1 1 901 1000 3840
 
-          CHIP:DMG: Received Command Response Data, Endpoint=0 Cluster=0x0000_003E Command=0x0000_0008
-          [1649756670.402192][10794:10799] CHIP:CTL: Device returned status 5 on receiving the NOC
-          [1649756670.402221][10794:10799] CHIP:CTL: Add NOC failed with error ../../third_party/connectedhomeip/src/controller/CHIPDeviceController.cpp:1110: CHIP Error 0x0000000B: No memory
-          [1649756670.402241][10794:10799] CHIP:CTL: Failed to perform commissioning step 12
+          CHIP:DMG: Received Command Response Status for Endpoint=0 Cluster=0x0000_003C Command=0x0000_0001 Status=0x85
+          [1652860801.225084][9512:9517] CHIP:TOO: Error: IM Error 0x00000585: General error: 0x85 (INVALID_COMMAND)
+          [1652860801.225173][9512:9517] CHIP:DMG: ICR moving to [AwaitingDe]
+          [1652860801.225294][9512:9517] CHIP:EM: Sending Standalone Ack for MessageCounter:4191961 on exchange 37827i
       disabled: true
 
-    - label: "TH_CR1 removes FabricIndex1"
-      PICS: OPCREDS.S.C0a.Rsp
+    - label:
+          "TH_CR1 reads the window status to verify the DUT_CE window is closed"
+      PICS: CADMIN.S.A0000
       verification: |
-          on 1st controller using chip tool, remove fabric with FabricIndex=1
+          On TH1 controller read window status
 
-          ./chip-tool operationalcredentials remove-fabric 1 1 0
+          ./chip-tool administratorcommissioning read window-status 1 0
+
+          CHIP:TOO: Endpoint: 0 Cluster: 0x0000_003C Attribute 0x0000_0000 DataVersion: 2849200592
+          [1651137648.760469][14047:14052] CHIP:TOO:   WindowStatus: 0
+          [1651137648.760534][14047:14052] CHIP:EM: Sending Standalone Ack for MessageCounter:5527412 on exchange 14590i
       disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_DD_1_11.yaml b/src/app/tests/suites/certification/Test_TC_DD_1_11.yaml
index 0a3fd6d..6d20dad 100644
--- a/src/app/tests/suites/certification/Test_TC_DD_1_11.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DD_1_11.yaml
@@ -17,6 +17,9 @@
     3.1.11. [TC-DD-1.11] Concatenation - QR Code Onboarding Payload Verification
     [DUT - Commissioner]
 
+PICS:
+    - MCORE.ROLE.COMMISSIONER
+
 config:
     nodeId: 0x12344321
     cluster: "Basic"
@@ -24,8 +27,8 @@
 
 tests:
     - label:
-          "Scan larger QR code that will support the commissioning of all the TH
-          devices"
+          "Scan QR code using concatenation (which supports the commissioning of
+          all the TH devices)"
       PICS: MCORE.DD.CTRL_CONCATENATED_QR_CODE_1
       verification: |
           Out of Scope for V1.0 as Concatenated QR codes are not supported yet
@@ -54,3 +57,39 @@
           [1653306603.741049][13293:13293] CHIP:SVR: https://dhrishi.github.io/connectedhomeip/qrcode.html?data=MT%3A-24J0YXE00KA0648G00
           [1653306603.741081][13293:13293] CHIP:SVR: Manual pairing code: [749701123365521327694]
       disabled: true
+
+    - label:
+          "Verify the DUT follows the correct order of onboarding the TH devices
+          which must be from first to last starting from left to right."
+      PICS: MCORE.DD.CTRL_CONCATENATED_QR_CODE_1_INORDER
+      verification: |
+          Out of Scope for V1.0 as Concatenated QR codes are not supported yet
+          https://github.com/project-chip/connectedhomeip/issues/5331
+          Vendor specific field testcase
+      disabled: true
+
+    - label:
+          "Verify the DUT follows the correct order of onboarding the TH devices
+          which must be from first to last starting from left to right."
+      PICS:
+          "!(MCORE.DD.CTRL_CONCATENATED_QR_CODE_1) &&
+          MCORE.DD.CTRL_CONCATENATED_QR_CODE_2"
+      verification: |
+          Out of Scope for V1.0 as Concatenated QR codes are not supported yet
+          https://github.com/project-chip/connectedhomeip/issues/5331
+          Vendor specific field testcase
+      disabled: true
+
+    - label:
+          "Verify the DUT does NOT indicate to the user the need to commission
+          TH devices one by one by scanning their individual QR codes, but
+          instead warns the user (in a way described by the provider of the DUT)
+          that the QR code cannot be processed."
+      PICS:
+          "!(MCORE.DD.CTRL_CONCATENATED_QR_CODE_1) &&
+          !(MCORE.DD.CTRL_CONCATENATED_QR_CODE_2)"
+      verification: |
+          Out of Scope for V1.0 as Concatenated QR codes are not supported yet
+          https://github.com/project-chip/connectedhomeip/issues/5331
+          Vendor specific field testcase
+      disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_DD_1_5.yaml b/src/app/tests/suites/certification/Test_TC_DD_1_5.yaml
index aed1b7b..f2b6606 100644
--- a/src/app/tests/suites/certification/Test_TC_DD_1_5.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DD_1_5.yaml
@@ -17,6 +17,10 @@
     3.1.5. [TC-DD-1.5] NFC Rules of Advertisement and Onboarding [DUT -
     Commissionee]
 
+PICS:
+    - MCORE.ROLE.COMMISSIONEE
+    - MCORE.DD.NFC
+
 config:
     nodeId: 0x12344321
     cluster: "Basic"
@@ -26,7 +30,6 @@
     - label:
           "Keep the DUT in packaging and bring in TH NFC scanner close to the
           DUT packaging."
-      PICS: MCORE.DD.SCAN_NFC
       verification: |
           Vendor specific field verification
       disabled: true
@@ -35,7 +38,6 @@
           "Unpack DUT from its packaging, make sure DUT is not powered on and do
           not put the DUT in pairing mode. Bring in TH NFC scanner close to the
           DUTs NFC tag"
-      PICS: MCORE.DD.SCAN_NFC
       verification: |
           Vendor specific field verification
       disabled: true
@@ -43,7 +45,7 @@
     - label:
           "Power on DUT and do not put the DUT in pairing mode. Bring in TH NFC
           scanner close to the DUTs NFC tag"
-      PICS: MCORE.DD.PHYSICAL_TAMPERING && MCORE.DD.SCAN_NFC
+      PICS: MCORE.DD.PHYSICAL_TAMPERING
       verification: |
           Vendor specific field verification
       disabled: true
@@ -57,13 +59,13 @@
     - label:
           "Power on DUT and put the DUT in pairing mode. Bring in TH NFC scanner
           close to NFC tag"
-      PICS: MCORE.DD.PHYSICAL_TAMPERING && MCORE.DD.SCAN_NFC
+      PICS: MCORE.DD.PHYSICAL_TAMPERING
       verification: |
           Vendor specific field verification
       disabled: true
 
     - label: "Power on DUT. Bring in NFC scanner close to NFC tag"
-      PICS: MCORE.DD.PHYSICAL_TAMPERING && MCORE.DD.SCAN_NFC
+      PICS: MCORE.DD.PHYSICAL_TAMPERING
       verification: |
           Vendor specific field verification
       disabled: true
@@ -93,7 +95,6 @@
       disabled: true
 
     - label: "Using TH NFC scanner - read NFC tag Reader type"
-      PICS: MCORE.DD.SCAN_NFC
       verification: |
           Vendor specific field verification
       disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_DD_2_2.yaml b/src/app/tests/suites/certification/Test_TC_DD_2_2.yaml
index f6a5582..f81a32a 100644
--- a/src/app/tests/suites/certification/Test_TC_DD_2_2.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DD_2_2.yaml
@@ -17,6 +17,9 @@
     3.2.2. [TC-DD-2.2] Discovery by Commissioner Verification [DUT -
     Commissioner]
 
+PICS:
+    - MCORE.ROLE.COMMISSIONER
+
 config:
     nodeId: 0x12344321
     cluster: "Basic"
@@ -24,7 +27,7 @@
 
 tests:
     - label: "TH starts matter announcement procedure using BLE transport"
-      PICS: MCORE.DD.BLE
+      PICS: MCORE.DD.DISCOVERY_BLE
       verification: |
           $ ./out/ble/chip-all-clusters-app --ble-device 1 --discriminator 3841
 
@@ -49,7 +52,7 @@
     - label:
           "DUT starts BLE scan across all three advertising channels with a
           sufficient dwell time, interval, and overall duration of scan"
-      PICS: MCORE.DD.BLE
+      PICS: MCORE.DD.DISCOVERY_BLE
       verification: |
           1. Discover commissionables over BLE using DUT=chip-tool pairing
 
@@ -107,7 +110,7 @@
       disabled: true
 
     - label: "DUT starts scan in background using BLE transport"
-      PICS: MCORE.DD.BLE
+      PICS: MCORE.DD.DISCOVERY_BLE
       verification: |
           1. Discover commissionables over BLE using DUT=chip-tool pairing command
 
@@ -165,7 +168,7 @@
       disabled: true
 
     - label: "TH starts matter announcement using BLE transport"
-      PICS: MCORE.DD.BLE
+      PICS: MCORE.DD.DISCOVERY_BLE
       verification: |
           $ ./out/all-clusters-app/chip-all-clusters-app --wifi --discriminator 3841
 
@@ -187,6 +190,64 @@
           [1653087913.254268][8083:8083] CHIP:DMG: Endpoint 0, Cluster 0x0000_001D update version to 29f72814
       disabled: true
 
+    - label: "DUT must find TH and provide onboarding data for validation."
+      PICS: MCORE.DD.DISCOVERY_BLE
+      verification: |
+          1. Discover commissionables over BLE using DUT=chip-tool pairing command
+
+          Verify in TH as server side
+          $  ./chip-tool pairing ble-wifi 1 zigbeehome matter123 20202021 3841
+          [1651743342.299897][3461:3464] CHIP:BLE: New device scanned: E4:5F:01:0F:1A:02
+          [1651743342.299951][3461:3464] CHIP:BLE: Device discriminator match. Attempting to connect.
+          [1651743342.303783][3461:3464] CHIP:BLE: Scan complete notification without an active scan.
+          [1651743346.244175][3461:3464] CHIP:DL: ConnectDevice complete
+
+          Verify in DUT as client side
+          [1651743346.152716][5072:5075] CHIP:DL: Device E4:5F:01:0F:3B:B1 (Path: /org/bluez/hci0/dev_E4_5F_01_0F_3B_B1) Connected
+          [1651743347.908807][5072:5075] CHIP:DL: BluezCharacteristicAcquireWrite is called, conn: 0xffffa0043700
+          [1651743347.911151][5072:5075] CHIP:DL: c1 BluezCharacteristicWriteFD mtu, 517
+          [1651743347.911349][5072:5075] CHIP:BLE: Write request received debug 0xffffa0043700
+          [1651743347.911754][5072:5072] CHIP:BLE: local and remote recv window sizes = 6
+          [1651743347.911829][5072:5072] CHIP:BLE: selected BTP version 4
+          [1651743347.911877][5072:5072] CHIP:BLE: using BTP fragment sizes rx 244 / tx 244.
+          [1651743348.006770][5072:5075] CHIP:DL: CHIPoBLE subscribe received
+          [1651743348.007026][5072:5072] CHIP:IN: BLE EndPoint 0xaaaab7bb3c20 Connection Complete
+          [1651743348.007132][5072:5072] CHIP:DL: HandlePlatformSpecificBLEEvent 32778
+          [1651743348.007196][5072:5072] CHIP:DL: Receive kCHIPoBLEConnectionEstablished
+          [1651743348.150980][5072:5075] CHIP:BLE: Indication confirmation, 0xffffa0043700
+          [1651743348.199997][5072:5075] CHIP:DL: c1 BluezCharacteristicWriteFD mtu, 517
+          [1651743348.200614][5072:5075] CHIP:BLE: Write request received debug 0xffffa0043700
+          [1651743348.201013][5072:5072] CHIP:EM: Received message of type 0x20 with protocolId (0, 0) and MessageCounter:3306320356 on exchange 29381r
+          [1651743348.201117][5072:5072] CHIP:EM: Handling via exchange: 29381r, Delegate: 0xaaaab7bb2a90
+          [1651743348.201191][5072:5072] CHIP:SC: Received PBKDF param request
+          [1651743348.201280][5072:5072] CHIP:SC: Peer assigned session ID 14881
+          [1651743348.201349][5072:5072] CHIP:SC: Found MRP parameters in the message
+          [1651743348.201520][5072:5072] CHIP:SC: Including MRP parameters in PBKDF param response
+          [1651743348.201884][5072:5072] CHIP:IN: Prepared unauthenticated message 0xffffdcf2ef78 to 0x0000000000000000 (0)  of type 0x21 and protocolId (0, 0) on exchange 29381r with MessageCounter:2627159088.
+          [1651743348.201989][5072:5072] CHIP:IN: Sending unauthenticated msg 0xffffdcf2ef78 with MessageCounter:2627159088 to 0x0000000000000000 at monotonic time: 0000000000FF6731 msec
+          [1651743348.202196][5072:5072] CHIP:SC: Sent PBKDF param response
+          [1651743348.298384][5072:5075] CHIP:BLE: Indication confirmation, 0xffffa0043700
+          [1651743348.299274][5072:5075] CHIP:DL: c1 BluezCharacteristicWriteFD mtu, 517
+          [1651743348.300132][5072:5075] CHIP:BLE: Write request received debug 0xffffa0043700
+          [1651743348.300571][5072:5072] CHIP:EM: Received message of type 0x22 with protocolId (0, 0) and MessageCounter:3306320357 on exchange 29381r
+          [1651743348.300655][5072:5072] CHIP:EM: Found matching exchange: 29381r, Delegate: 0xaaaab7bb2a90
+          [1651743348.300741][5072:5072] CHIP:SC: Received spake2p msg1
+          [1651743348.304696][5072:5072] CHIP:IN: Prepared unauthenticated message 0xffffdcf2ee58 to 0x0000000000000000 (0)  of type 0x23 and protocolId (0, 0) on exchange 29381r with MessageCounter:2627159089.
+          [1651743348.304817][5072:5072] CHIP:IN: Sending unauthenticated msg 0xffffdcf2ee58 with MessageCounter:2627159089 to 0x0000000000000000 at monotonic time: 0000000000FF6798 msec
+          [1651743348.305007][5072:5072] CHIP:SC: Sent spake2p msg2
+          [1651743348.444144][5072:5075] CHIP:BLE: Indication confirmation, 0xffffa0043700
+          [1651743348.444992][5072:5075] CHIP:DL: c1 BluezCharacteristicWriteFD mtu, 517
+          [1651743348.445608][5072:5075] CHIP:BLE: Write request received debug 0xffffa0043700
+          [1651743348.445888][5072:5072] CHIP:EM: Received message of type 0x24 with protocolId (0, 0) and MessageCounter:3306320358 on exchange 29381r
+          [1651743348.445943][5072:5072] CHIP:EM: Found matching exchange: 29381r, Delegate: 0xaaaab7bb2a90
+          [1651743348.446001][5072:5072] CHIP:SC: Received spake2p msg3
+          [1651743348.446130][5072:5072] CHIP:SC: Sending status report. Protocol code 0, exchange 29381
+          [1651743348.446202][5072:5072] CHIP:IN: Prepared unauthenticated message 0xffffdcf2eea8 to 0x0000000000000000 (0)  of type 0x40 and protocolId (0, 0) on exchange 29381r with MessageCounter:2627159090.
+          [1651743348.446262][5072:5072] CHIP:IN: Sending unauthenticated msg 0xffffdcf2eea8 with MessageCounter:2627159090 to 0x0000000000000000 at monotonic time: 0000000000FF6825 msec
+          [1651743348.446452][5072:5072] CHIP:IN: New secure session created for device <FFFFFFFB00000000, 0>, LSID:2138 PSID:14881!
+          [1651743348.446962][5072:5072] CHIP:SVR: Commissioning completed session establishment step
+      disabled: true
+
     - label: "TH starts SoftAP and begin matter announcement procedure"
       PICS: MCORE.DD.DISCOVERY_SOFTAP
       verification: |
@@ -218,6 +279,15 @@
       disabled: true
 
     - label:
+          "DUT must find TH and provide onboarding data for validation, Pass
+          Criteria: DUT is able to report the Onboarding payload as set on TH"
+      PICS: MCORE.DD.DISCOVERY_SOFTAP
+      verification: |
+          Out of Scope V1.0
+          SoftAP commissioning not currently supported on TH=all-clusters-app
+      disabled: true
+
+    - label:
           "With DUT and TH connected to the same network over IP, DUT performs
           service discovery using DNS-SD"
       verification: |
diff --git a/src/app/tests/suites/certification/Test_TC_DD_3_1.yaml b/src/app/tests/suites/certification/Test_TC_DD_3_1.yaml
index 8ad675e..7d21c82 100644
--- a/src/app/tests/suites/certification/Test_TC_DD_3_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DD_3_1.yaml
@@ -15,6 +15,9 @@
 
 name: 3.3.1. [TC-DD-3.1] Commissioning Flow - Concurrent [DUT - Commissionee]
 
+PICS:
+    - MCORE.ROLE.COMMISSIONEE
+
 config:
     nodeId: 0x12344321
     cluster: "Basic"
@@ -240,7 +243,7 @@
     - label:
           "Commissioner SHALL configure regulatory information in the
           Commissionee."
-      PICS: MCORE.DD.WIRELESS
+      PICS: MCORE.COM.WIRELESS
       verification: |
           Verify in DUT as client side
 
@@ -270,7 +273,6 @@
     - label:
           "Commissioner configures operational credentials on DUT if not
           previously installed"
-      PICS: ""
       verification: |
           Verify in TH as server side
 
@@ -290,7 +292,6 @@
     - label:
           "Commissioner configures itself as administrator in ACL on DUT if
           needed"
-      PICS: ""
       verification: |
           Verify in DUT as client side after commissioning
 
diff --git a/src/app/tests/suites/certification/Test_TC_DD_3_16.yaml b/src/app/tests/suites/certification/Test_TC_DD_3_16.yaml
index 6c62373..3b34bd3 100644
--- a/src/app/tests/suites/certification/Test_TC_DD_3_16.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DD_3_16.yaml
@@ -17,6 +17,10 @@
     3.3.16. [TC-DD-3.16] Commissioning Flow - 11-digit Manual Pairing Code -
     Negative Scenario [DUT    - Commissioner]
 
+PICS:
+    - MCORE.ROLE.COMMISSIONER
+    - MCORE.DD.11_MANUAL_PC
+
 config:
     nodeId: 0x12344321
     cluster: "Basic"
@@ -26,7 +30,6 @@
     - label:
           "Provide the 11-digit Manual Pairing Code from the Commissionee to the
           DUT in any format supported by DUT"
-      PICS: MCORE.DD.11_MANUAL_PC
       verification: |
           Verify in TH as server side
           $ ./out/all-clusters-app/chip-all-clusters-app --version 0 --vendor-id 0xFFF1 --product-id 0x8001 --custom-flow 0 --capabilities 4 --discriminator 3840 --passcode 20202021
@@ -51,7 +54,6 @@
           "VERSION: Using the manual code from Step 1, generate a new manual
           code but substituting out the current VERSION with an invalid VERSION:
           2"
-      PICS: MCORE.DD.11_MANUAL_PC
       verification: |
           1. Use chip-tool"s "payload verhoeff-generate" command to help generate the new, invalid Manual code
 
@@ -66,7 +68,6 @@
     - label:
           "Provide the Manual Pairing Code, generated in the previous step, to
           the DUT in any format supported by the DUT"
-      PICS: MCORE.DD.11_MANUAL_PC
       verification: |
           $  ./chip-tool pairing code 1 84970112331
 
@@ -79,7 +80,6 @@
           "VID_PID_PRESENT: Using the manual code from Step 1, generate a new
           manual code but substituting out the current VID_PID_PRESENT with an
           invalid VID_PID_PRESENT set to 1"
-      PICS: MCORE.DD.11_MANUAL_PC
       verification: |
           $ ./chip-tool payload generate-manualcode --discriminator 0xF00 --setup-pin-code 20202021 --version 0 --vendor-id 0xFFF1 --product-id 0x8001 --commissioning-mode 2 --force-short-code 1
 
@@ -90,7 +90,6 @@
     - label:
           "Provide the Manual Pairing Code, generated in the previous step, to
           the DUT in any format supported by the DUT"
-      PICS: MCORE.DD.11_MANUAL_PC
       verification: |
           $  ./chip-tool pairing code 1 74970112334
 
@@ -108,7 +107,6 @@
           that changes any of the 4 most-significant bits of Step 1s 12-bit
           discriminator value and adheres to rules of section 5.1.1.5.
           Discriminator value)"
-      PICS: MCORE.DD.11_MANUAL_PC
       verification: |
           1. Use chip-tool"s "payload generate-manualcode" command to help generate the new, invalid Manual code
 
@@ -122,7 +120,6 @@
     - label:
           "Provide the Manual Pairing Code, generated in the previous step, to
           the DUT in any format supported by the DUT"
-      PICS: MCORE.DD.11_MANUAL_PC
       verification: |
           On DUT=chip-tool:
           $  ./chip-tool pairing code 1 33331712336
@@ -140,7 +137,6 @@
           code using all the same Onboarding Payload components and one Passcode
           from the list: 00000000, 11111111, 22222222, 33333333, 44444444,
           55555555, 66666666, 77777777, 88888888, 99999999, 12345678, 87654321"
-      PICS: MCORE.DD.11_MANUAL_PC
       verification: |
           1. Use these as examples of how to generate manual codes with invalid passcodes
 
@@ -198,7 +194,6 @@
     - label:
           "Provide each of the Manual Pairing Codes, generated in the previous
           step, to the DUT in any format supported by the DUT"
-      PICS: MCORE.DD.11_MANUAL_PC
       verification: |
           Verify in DUT as client side
 
@@ -257,7 +252,6 @@
           CHECK_DIGIT (i.e. Any different CHECK_DIGIT than the commissionees
           CHECK_DIGIT while following Table 38. Encoding Method without Vendor
           and Product IDs (VID_PID_Present == 0))"
-      PICS: MCORE.DD.11_MANUAL_PC
       verification: |
           1. Change the last digit of the manual pairing code to a different digit
 
@@ -267,7 +261,6 @@
     - label:
           "Provide the Manual Pairing Code, generated in the previous step, to
           the DUT in any format supported by the DUT"
-      PICS: MCORE.DD.11_MANUAL_PC
       verification: |
           On DUT=chip-tool:
           $ ./chip-tool pairing code 1 34970112331
diff --git a/src/app/tests/suites/certification/Test_TC_DD_3_17.yaml b/src/app/tests/suites/certification/Test_TC_DD_3_17.yaml
index a0f6773..09c3b4a 100644
--- a/src/app/tests/suites/certification/Test_TC_DD_3_17.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DD_3_17.yaml
@@ -17,6 +17,10 @@
     3.3.17. [TC-DD-3.17] Commissioning Flow - 21-digit Manual Pairing Code -
     Negative Scenario [DUT    - Commissioner]
 
+PICS:
+    - MCORE.ROLE.COMMISSIONER
+    - MCORE.DD.21_MANUAL_PC
+
 config:
     nodeId: 0x12344321
     cluster: "Basic"
@@ -26,7 +30,6 @@
     - label:
           "Provide the 21-digit Manual Pairing Code from the Commissionee to the
           DUT in any format supported by DUT"
-      PICS: MCORE.DD.21_MANUAL_PC
       verification: |
           Verify in TH as server side
           $ ./out/all-clusters-app/chip-all-clusters-app
@@ -56,7 +59,6 @@
           "VERSION: Using the manual code from Step 1, generate a new manual
           code but substituting out the current VERSION with an invalid VERSION:
           2"
-      PICS: MCORE.DD.21_MANUAL_PC
       verification: |
           1. Use chip-tool"s "payload verhoeff-generate" command to help generate the new, invalid Manual code
 
@@ -72,7 +74,6 @@
     - label:
           "Provide the Manual Pairing Code, generated in the previous step, to
           the DUT in any format supported by the DUT"
-      PICS: MCORE.DD.21_MANUAL_PC
       verification: |
           $  ./chip-tool pairing code 1 849701123365521327693
 
@@ -84,7 +85,6 @@
           "VID_PID_PRESENT: Using the manual code from Step 1, generate a new
           manual code but substituting out the current VID_PID_PRESENT with an
           invalid VID_PID_PRESENT set to 0"
-      PICS: MCORE.DD.21_MANUAL_PC
       verification: |
           1. Use chip-tool"s "payload verhoeff-generate" command to help generate the new, invalid Manual code
           $ ./chip-tool payload verhoeff-generate 34970112336552132769
@@ -99,7 +99,6 @@
     - label:
           "Provide the Manual Pairing Code, generated in the previous step, to
           the DUT in any format supported by the DUT"
-      PICS: MCORE.DD.21_MANUAL_PC
       verification: |
           $  ./chip-tool pairing code 1 349701123365521327696
 
@@ -117,7 +116,6 @@
           that changes any of the 4 most-significant bits of Step 1s 12-bit
           discriminator value and adheres to rules of section 5.1.1.5.
           Discriminator value)"
-      PICS: MCORE.DD.21_MANUAL_PC
       verification: |
           1. Use chip-tool"s "payload generate-manualcode" command to help generate the new, invalid Manual code
 
@@ -129,7 +127,6 @@
     - label:
           "Provide the Manual Pairing Code, generated in the previous step, to
           the DUT in any format supported by the DUT"
-      PICS: MCORE.DD.21_MANUAL_PC
       verification: |
           $  ./chip-tool pairing code 1 733317123365521327692
 
@@ -149,7 +146,6 @@
           code using all the same Onboarding Payload components and one Passcode
           from the list: 00000000, 11111111, 22222222, 33333333, 44444444,
           55555555, 66666666, 77777777, 88888888, 99999999, 12345678, 87654321"
-      PICS: MCORE.DD.21_MANUAL_PC
       verification: |
           1. Use this as an example of how to generate a manual code with an invalid passcode. In this example the invalid passcode=00000000
 
@@ -163,7 +159,6 @@
     - label:
           "Provide each of the Manual Pairing Codes, generated in the previous
           step, to the DUT in any format supported by the DUT"
-      PICS: MCORE.DD.21_MANUAL_PC
       verification: |
           Verify in DUT as client side
 
@@ -233,7 +228,6 @@
           component to one of the invalid Test VENDOR_IDs and generate a new
           manual code using all the same Onboarding Payload components and one
           Test VENDOR_ID from the list: 0xFFF1, 0xFFF2, 0xFFF3, 0xFFF4"
-      PICS: MCORE.DD.21_MANUAL_PC
       verification: |
           1. Use this as an example of how to generate a manual code with an invalid vendor IDs
 
@@ -245,7 +239,6 @@
     - label:
           "Provide each of the Manual Pairing Codes, generated in the previous
           step, to the DUT in any format supported by the DUT"
-      PICS: MCORE.DD.21_MANUAL_PC
       verification: |
           (0xFFF1)
            $  ./chip-tool pairing code 1 749701123365521327694
@@ -267,7 +260,6 @@
           code but substituting out the current PRODUCT_ID with an invalid
           PRODUCT_ID of 0x0000(i.e. While following section 2.5.3. Product
           Identifier)"
-      PICS: MCORE.DD.21_MANUAL_PC
       verification: |
           1. Use chip-tool"s "payload generate-manualcode" command to help generate the new, invalid Manual code
 
@@ -279,7 +271,6 @@
     - label:
           "Provide the Manual Pairing Code, generated in the previous step, to
           the DUT in any format supported by the DUT"
-      PICS: MCORE.DD.21_MANUAL_PC
       verification: |
           Verify in DUT as client side
           $  ./chip-tool pairing code 1 749701123365521000006
@@ -293,7 +284,6 @@
           CHECK_DIGIT (i.e. Any different CHECK_DIGIT than the commissionees
           CHECK_DIGIT while following Table 39. Encoding Method with Vendor and
           Product IDs included (VID_PID_Present == 1))"
-      PICS: MCORE.DD.21_MANUAL_PC
       verification: |
           1. Use chip-tool"s "payload verhoeff-verify" command to help verify that the check-digit is invalid
 
@@ -307,7 +297,6 @@
     - label:
           "Provide the Manual Pairing Code, generated in the previous step, to
           the DUT in any format supported by the DUT"
-      PICS: MCORE.DD.21_MANUAL_PC
       verification: |
           $  ./chip-tool pairing code 1 749701123365521327693
 
diff --git a/src/app/tests/suites/certification/Test_TC_DD_3_2.yaml b/src/app/tests/suites/certification/Test_TC_DD_3_2.yaml
index f78127e..33a3be7 100644
--- a/src/app/tests/suites/certification/Test_TC_DD_3_2.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DD_3_2.yaml
@@ -16,6 +16,9 @@
 name:
     3.3.2. [TC-DD-3.2] Commissioning Flow - Non-concurrent [DUT - Commissionee]
 
+PICS:
+    - MCORE.ROLE.COMMISSIONEE
+
 config:
     nodeId: 0x12344321
     cluster: "Basic"
@@ -55,7 +58,7 @@
     - label:
           "Commissioner SHALL configure regulatory information in the
           Commissionee."
-      PICS: MCORE.DD.WIRELESS
+      PICS: MCORE.COM.WIRELESS
       verification: |
           Verify in DUT as client side
 
diff --git a/src/app/tests/suites/certification/Test_TC_DD_3_5.yaml b/src/app/tests/suites/certification/Test_TC_DD_3_5.yaml
index f86a429..92c0210 100644
--- a/src/app/tests/suites/certification/Test_TC_DD_3_5.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DD_3_5.yaml
@@ -15,6 +15,9 @@
 
 name: 3.3.5. [TC-DD-3.5] Commissioning Flow - Concurrent [DUT - Commissioner]
 
+PICS:
+    - MCORE.ROLE.COMMISSIONER
+
 config:
     nodeId: 0x12344321
     cluster: "Basic"
@@ -137,7 +140,7 @@
     - label:
           "Commissioner SHALL configure regulatory information in the
           Commissionee."
-      PICS: MCORE.DD.WIRELESS
+      PICS: MCORE.COM.WIRELESS
       verification: |
           Verify in DUT as client side
           Performing next commissioning step "ConfigRegulatory"
diff --git a/src/app/tests/suites/certification/Test_TC_DD_3_6.yaml b/src/app/tests/suites/certification/Test_TC_DD_3_6.yaml
index e0eb07b..dbd0be9 100644
--- a/src/app/tests/suites/certification/Test_TC_DD_3_6.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DD_3_6.yaml
@@ -16,6 +16,9 @@
 name:
     3.3.6. [TC-DD-3.6] Commissioning Flow - Non-concurrent [DUT - Commissioner]
 
+PICS:
+    - MCORE.ROLE.COMMISSIONER
+
 config:
     nodeId: 0x12344321
     cluster: "Basic"
@@ -61,7 +64,7 @@
     - label:
           "Commissioner SHALL configure regulatory information in the
           Commissionee."
-      PICS: MCORE.DD.WIRELESS
+      PICS: MCORE.COM.WIRELESS
       verification: |
           Verify in DUT as client side
 
diff --git a/src/app/tests/suites/certification/Test_TC_DD_3_7.yaml b/src/app/tests/suites/certification/Test_TC_DD_3_7.yaml
index 879ebd4..cbf22f8 100644
--- a/src/app/tests/suites/certification/Test_TC_DD_3_7.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DD_3_7.yaml
@@ -17,6 +17,9 @@
     3.3.7. [TC-DD-3.7] Commissioning Flow - Concurrent - Negative Scenario [DUT
     - Commissioner]
 
+PICS:
+    - MCORE.ROLE.COMMISSIONER
+
 config:
     nodeId: 0x12344321
     cluster: "Basic"
@@ -294,7 +297,7 @@
     - label:
           "Commissioner SHALL configure regulatory information in the
           Commissionee."
-      PICS: MCORE.DD.WIRELESS
+      PICS: MCORE.COM.WIRELESS
       verification: |
           Verify in DUT as client side
 
diff --git a/src/app/tests/suites/certification/Test_TC_DD_3_8.yaml b/src/app/tests/suites/certification/Test_TC_DD_3_8.yaml
index d7d7363..18bea24 100644
--- a/src/app/tests/suites/certification/Test_TC_DD_3_8.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DD_3_8.yaml
@@ -17,6 +17,9 @@
     3.3.8. [TC-DD-3.8] Commissioning Flow - Non-concurrent - Negative Scenario
     [DUT - Commissioner]
 
+PICS:
+    - MCORE.ROLE.COMMISSIONER
+
 config:
     nodeId: 0x12344321
     cluster: "Basic"
@@ -62,7 +65,7 @@
     - label:
           "Commissioner SHALL configure regulatory information in the
           Commissionee."
-      PICS: MCORE.DD.WIRELESS
+      PICS: MCORE.COM.WIRELESS
       verification: |
           Verify in DUT as client side
 
@@ -392,7 +395,7 @@
     - label:
           "Commissioner SHALL configure regulatory information in the
           Commissionee."
-      PICS: MCORE.DD.WIRELESS
+      PICS: MCORE.COM.WIRELESS
       verification: |
           Verify in DUT as client side
 
diff --git a/src/app/tests/suites/certification/Test_TC_DGETH_3_2.yaml b/src/app/tests/suites/certification/Test_TC_DGETH_3_2.yaml
index 4f9cbde..ae5029c 100644
--- a/src/app/tests/suites/certification/Test_TC_DGETH_3_2.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DGETH_3_2.yaml
@@ -15,6 +15,9 @@
 
 name: 3.3.2. [TC-DGETH-3.2] Command Generated {DUT_Client}]
 
+PICS:
+    - DGETH.C
+
 config:
     nodeId: 0x12344321
     cluster: "Basic"
@@ -27,7 +30,7 @@
       disabled: true
 
     - label: "DUT sends ResetCounts to TH."
-      PICS: DGETH.S.C00.Rsp
+      PICS: DGETH.C.C00.Tx
       verification: |
           Verify Command data recieved from running the below command is a success
 
diff --git a/src/app/tests/suites/certification/Test_TC_FLW_3_1.yaml b/src/app/tests/suites/certification/Test_TC_FLW_3_1.yaml
index 6a85502..39aeca6 100644
--- a/src/app/tests/suites/certification/Test_TC_FLW_3_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_FLW_3_1.yaml
@@ -13,7 +13,14 @@
 # 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: 31.3.1. [TC-FLW-3.1] Attributes with Client as DUT
+name: 3.3.1. [TC-FLW-3.1] Attributes with client as DUT
+
+PICS:
+    - FLW.C
+    - FLW.C.AM-READ
+    - FLW.C.AO-READ
+    - FLW.C.AM-WRITE
+    - FLW.C.AO-WRITE
 
 config:
     nodeId: 0x12344321
@@ -26,30 +33,86 @@
           a manufacturer specific order"
       verification: |
           ./chip-tool flowmeasurement read measured-value 1 1
-          Verify TH all-clusters-app Log
-          Verify the measured-value should be in range of uint16
 
-          CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0404 Attribute 0x0000_0000 DataVersion: 1049406897
-          [1649660205.780337][7845:7850] CHIP:TOO:   MeasuredValue: 0
+          Verify read command is received in DUT as client side log
+
+          [1658853801.750840][29347:29347] CHIP:IM: Received Read request
+          [1658853801.750918][29347:29347] CHIP:DMG: ReadRequestMessage =
+          [1658853801.750945][29347:29347] CHIP:DMG: {
+          [1658853801.750968][29347:29347] CHIP:DMG:         AttributePathIBs =
+          [1658853801.750993][29347:29347] CHIP:DMG:         [
+          [1658853801.751017][29347:29347] CHIP:DMG:                 AttributePathIB =
+          [1658853801.751044][29347:29347] CHIP:DMG:                 {
+          [1658853801.751072][29347:29347] CHIP:DMG:                         Endpoint = 0x1,
+          [1658853801.751105][29347:29347] CHIP:DMG:                         Cluster = 0x404,
+          [1658853801.751137][29347:29347] CHIP:DMG:                         Attribute = 0x0000_0000,
+          [1658853801.751167][29347:29347] CHIP:DMG:                 }
+          [1658853801.751195][29347:29347] CHIP:DMG:
+          [1658853801.751220][29347:29347] CHIP:DMG:         ],
+          [1658853801.751248][29347:29347] CHIP:DMG:
+          [1658853801.751275][29347:29347] CHIP:DMG:         isFabricFiltered = true,
+          [1658853801.751300][29347:29347] CHIP:DMG:         InteractionModelRevision = 1
+          [1658853801.751323][29347:29347] CHIP:DMG: },
+          [1658853801.751396][29347:29347] CHIP:DMG: IM RH moving to [GeneratingReports]
+          [1658853801.751480][29347:29347] CHIP:DMG: Building Reports for ReadHandler with LastReportGeneration = 0 DirtyGeneration = 0
+          [1658853801.751510][29347:29347] CHIP:DMG: <RE:Run> Cluster 404, Attribute 0 is dirty
+          [1658853801.751532][29347:29347] CHIP:DMG: Reading attribute: Cluster=0x0000_0404 Endpoint=1 AttributeId=0x0000_0000 (expanded=0)
+
 
 
 
 
           "./chip-tool flowmeasurement read min-measured-value 1 1
-          Verify TH all-clusters-app Log
-          Verify the min-measured-value should be in range of uint16
 
-          CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0404 Attribute 0x0000_0001 DataVersion: 1049406897
-          [1649660217.629973][7852:7857] CHIP:TOO:   MinMeasuredValue: 0"
+          Verify read command is received in DUT as client side log
+
+          [1658853849.969073][29347:29347] CHIP:IM: Received Read request
+          [1658853849.969151][29347:29347] CHIP:DMG: ReadRequestMessage =
+          [1658853849.969192][29347:29347] CHIP:DMG: {
+          [1658853849.969214][29347:29347] CHIP:DMG:         AttributePathIBs =
+          [1658853849.969240][29347:29347] CHIP:DMG:         [
+          [1658853849.969272][29347:29347] CHIP:DMG:                 AttributePathIB =
+          [1658853849.969301][29347:29347] CHIP:DMG:                 {
+          [1658853849.969337][29347:29347] CHIP:DMG:                         Endpoint = 0x1,
+          [1658853849.969369][29347:29347] CHIP:DMG:                         Cluster = 0x404,
+          [1658853849.969410][29347:29347] CHIP:DMG:                         Attribute = 0x0000_0001,
+          [1658853849.969447][29347:29347] CHIP:DMG:                 }
+          [1658853849.969476][29347:29347] CHIP:DMG:
+          [1658853849.969511][29347:29347] CHIP:DMG:         ],
+          [1658853849.969539][29347:29347] CHIP:DMG:
+          [1658853849.969574][29347:29347] CHIP:DMG:         isFabricFiltered = true,
+          [1658853849.969600][29347:29347] CHIP:DMG:         InteractionModelRevision = 1
+          [1658853849.969628][29347:29347] CHIP:DMG: },
+          [1658853849.969697][29347:29347] CHIP:DMG: IM RH moving to [GeneratingReports]
+          [1658853849.969791][29347:29347] CHIP:DMG: Building Reports for ReadHandler with LastReportGeneration = 0 DirtyGeneration = 0
+          [1658853849.969831][29347:29347] CHIP:DMG: <RE:Run> Cluster 404, Attribute 1 is dirty
 
 
 
           "./chip-tool flowmeasurement read max-measured-value 1 1
-          Verify TH all-clusters-app Log
-          Verify the min-measured-value should be in range of uint16
 
-           CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0404 Attribute 0x0000_0002 DataVersion: 1049406897
-          [1649660223.190482][7858:7863] CHIP:TOO:   MaxMeasuredValue: 0"
+          Verify read command is received in DUT as client side log
+
+          [1658853898.416395][29347:29347] CHIP:IM: Received Read request
+          [1658853898.416472][29347:29347] CHIP:DMG: ReadRequestMessage =
+          [1658853898.416513][29347:29347] CHIP:DMG: {
+          [1658853898.416536][29347:29347] CHIP:DMG:         AttributePathIBs =
+          [1658853898.416571][29347:29347] CHIP:DMG:         [
+          [1658853898.416596][29347:29347] CHIP:DMG:                 AttributePathIB =
+          [1658853898.416633][29347:29347] CHIP:DMG:                 {
+          [1658853898.416662][29347:29347] CHIP:DMG:                         Endpoint = 0x1,
+          [1658853898.416703][29347:29347] CHIP:DMG:                         Cluster = 0x404,
+          [1658853898.416746][29347:29347] CHIP:DMG:                         Attribute = 0x0000_0002,
+          [1658853898.416776][29347:29347] CHIP:DMG:                 }
+          [1658853898.416813][29347:29347] CHIP:DMG:
+          [1658853898.416839][29347:29347] CHIP:DMG:         ],
+          [1658853898.416876][29347:29347] CHIP:DMG:
+          [1658853898.416903][29347:29347] CHIP:DMG:         isFabricFiltered = true,
+          [1658853898.416937][29347:29347] CHIP:DMG:         InteractionModelRevision = 1
+          [1658853898.416960][29347:29347] CHIP:DMG: },
+          [1658853898.417051][29347:29347] CHIP:DMG: IM RH moving to [GeneratingReports]
+          [1658853898.417141][29347:29347] CHIP:DMG: Building Reports for ReadHandler with LastReportGeneration = 0 DirtyGeneration = 0
+          [1658853898.417179][29347:29347] CHIP:DMG: <RE:Run> Cluster 404, Attribute 2 is dirty
       disabled: true
 
     - label:
@@ -57,25 +120,43 @@
           a manufacturer specific order"
       verification: |
           chip-tool flowmeasurement read tolerance 1 1
-          Verify TH all-clusters-app Log
-          Verify the measured-value should be in range 0 to 2048
 
-          CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0404 Attribute 0x0000_0003 DataVersion: 1049406897
-          [1649660232.522084][7865:7870] CHIP:TOO:   Tolerance: 0
+          Verify in DUT as client side log
+
+          [1658853991.266232][29347:29347] CHIP:IM: Received Read request
+          [1658853991.266328][29347:29347] CHIP:DMG: ReadRequestMessage =
+          [1658853991.266382][29347:29347] CHIP:DMG: {
+          [1658853991.266413][29347:29347] CHIP:DMG:         AttributePathIBs =
+          [1658853991.266461][29347:29347] CHIP:DMG:         [
+          [1658853991.266494][29347:29347] CHIP:DMG:                 AttributePathIB =
+          [1658853991.266545][29347:29347] CHIP:DMG:                 {
+          [1658853991.266584][29347:29347] CHIP:DMG:                         Endpoint = 0x1,
+          [1658853991.266640][29347:29347] CHIP:DMG:                         Cluster = 0x404,
+          [1658853991.266694][29347:29347] CHIP:DMG:                         Attribute = 0x0000_0003,
+          [1658853991.266736][29347:29347] CHIP:DMG:                 }
+          [1658853991.266785][29347:29347] CHIP:DMG:
+          [1658853991.266820][29347:29347] CHIP:DMG:         ],
+          [1658853991.266869][29347:29347] CHIP:DMG:
+          [1658853991.266905][29347:29347] CHIP:DMG:         isFabricFiltered = true,
+          [1658853991.266952][29347:29347] CHIP:DMG:         InteractionModelRevision = 1
+          [1658853991.266984][29347:29347] CHIP:DMG: },
+          [1658853991.267091][29347:29347] CHIP:DMG: IM RH moving to [GeneratingReports]
+          [1658853991.267218][29347:29347] CHIP:DMG: Building Reports for ReadHandler with LastReportGeneration = 0 DirtyGeneration = 0
+          [1658853991.267257][29347:29347] CHIP:DMG: <RE:Run> Cluster 404, Attribute 3 is dirty
       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: |
-          This cluster doesn't have any writable attributes
+          This cluster doesn"t have any writable attributes
       disabled: true
 
     - label:
           "DUT writes a suitable value to all supported optional attributes on
           the TH one at a time in a manufacturer specific order"
       verification: |
-          This cluster doesn't have any writable attributes
+          This cluster doesn"t have any writable attributes
       disabled: true
 
     - label:
@@ -84,10 +165,10 @@
           also reflects this in global attributes such as FeatureMap and
           AttributeList. Commission DUT to TH again"
       verification: |
-          verify on Reference app receives the right response for the data sent in the above commands
-
           ./chip-tool flowmeasurement read attribute-list 1 1
 
+          Verify a list of supported attributes which contains mandatory in DUT as client side log
+
           [1656478164937] [49517:5732586] CHIP: [TOO] Endpoint: 1 Cluster: 0x0000_0404 Attribute 0x0000_FFFB DataVersion: 3423686907
           [1656478164937] [49517:5732586] CHIP: [TOO]   AttributeList: 8 entries
           [1656478164937] [49517:5732586] CHIP: [TOO]     [1]: 0
@@ -101,45 +182,104 @@
 
           ./chip-tool flowmeasurement read feature-map 1 1
 
+          Verify featuremap value is 0 in DUT as client side log
+
           [1656478242820] [49526:5733040] CHIP: [TOO] Endpoint: 1 Cluster: 0x0000_0404 Attribute 0x0000_FFFC DataVersion: 3423686907
           [1656478242820] [49526:5733040] CHIP: [TOO]   FeatureMap: 0
 
 
+          "./chip-tool flowmeasurement read measured-value 1 1
 
-          ./chip-tool flowmeasurement read measured-value 1 1
-          Verify TH all-clusters-app Log
-          Verify the measured-value should be in range of uint16
+          Verify read command is received in DUT as client side log
 
-          CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0404 Attribute 0x0000_0000 DataVersion: 1049406897
-          [1649660205.780337][7845:7850] CHIP:TOO:   MeasuredValue: 0
+          [1658853801.750840][29347:29347] CHIP:IM: Received Read request
+          [1658853801.750918][29347:29347] CHIP:DMG: ReadRequestMessage =
+          [1658853801.750945][29347:29347] CHIP:DMG: {
+          [1658853801.750968][29347:29347] CHIP:DMG:         AttributePathIBs =
+          [1658853801.750993][29347:29347] CHIP:DMG:         [
+          [1658853801.751017][29347:29347] CHIP:DMG:                 AttributePathIB =
+          [1658853801.751044][29347:29347] CHIP:DMG:                 {
+          [1658853801.751072][29347:29347] CHIP:DMG:                         Endpoint = 0x1,
+          [1658853801.751105][29347:29347] CHIP:DMG:                         Cluster = 0x404,
+          [1658853801.751137][29347:29347] CHIP:DMG:                         Attribute = 0x0000_0000,
+          [1658853801.751167][29347:29347] CHIP:DMG:                 }
+          [1658853801.751195][29347:29347] CHIP:DMG:
+          [1658853801.751220][29347:29347] CHIP:DMG:         ],
+          [1658853801.751248][29347:29347] CHIP:DMG:
+          [1658853801.751275][29347:29347] CHIP:DMG:         isFabricFiltered = true,
+          [1658853801.751300][29347:29347] CHIP:DMG:         InteractionModelRevision = 1
+          [1658853801.751323][29347:29347] CHIP:DMG: },
+          [1658853801.751396][29347:29347] CHIP:DMG: IM RH moving to [GeneratingReports]
+          [1658853801.751480][29347:29347] CHIP:DMG: Building Reports for ReadHandler with LastReportGeneration = 0 DirtyGeneration = 0
+          [1658853801.751510][29347:29347] CHIP:DMG: <RE:Run> Cluster 404, Attribute 0 is dirty
+          [1658853801.751532][29347:29347] CHIP:DMG: Reading attribute: Cluster=0x0000_0404 Endpoint=1 AttributeId=0x0000_0000 (expanded=0)
 
 
 
 
-          "./chip-tool flowmeasurement read min-measured-value 1 1
-          Verify TH all-clusters-app Log
-          Verify the min-measured-value should be in range of uint16
 
-          CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0404 Attribute 0x0000_0001 DataVersion: 1049406897
-          [1649660217.629973][7852:7857] CHIP:TOO:   MinMeasuredValue: 0"
+          ""./chip-tool flowmeasurement read min-measured-value 1 1
+
+          Verify read command is received in DUT as client side log
+
+          [1658853849.969073][29347:29347] CHIP:IM: Received Read request
+          [1658853849.969151][29347:29347] CHIP:DMG: ReadRequestMessage =
+          [1658853849.969192][29347:29347] CHIP:DMG: {
+          [1658853849.969214][29347:29347] CHIP:DMG:         AttributePathIBs =
+          [1658853849.969240][29347:29347] CHIP:DMG:         [
+          [1658853849.969272][29347:29347] CHIP:DMG:                 AttributePathIB =
+          [1658853849.969301][29347:29347] CHIP:DMG:                 {
+          [1658853849.969337][29347:29347] CHIP:DMG:                         Endpoint = 0x1,
+          [1658853849.969369][29347:29347] CHIP:DMG:                         Cluster = 0x404,
+          [1658853849.969410][29347:29347] CHIP:DMG:                         Attribute = 0x0000_0001,
+          [1658853849.969447][29347:29347] CHIP:DMG:                 }
+          [1658853849.969476][29347:29347] CHIP:DMG:
+          [1658853849.969511][29347:29347] CHIP:DMG:         ],
+          [1658853849.969539][29347:29347] CHIP:DMG:
+          [1658853849.969574][29347:29347] CHIP:DMG:         isFabricFiltered = true,
+          [1658853849.969600][29347:29347] CHIP:DMG:         InteractionModelRevision = 1
+          [1658853849.969628][29347:29347] CHIP:DMG: },
+          [1658853849.969697][29347:29347] CHIP:DMG: IM RH moving to [GeneratingReports]
+          [1658853849.969791][29347:29347] CHIP:DMG: Building Reports for ReadHandler with LastReportGeneration = 0 DirtyGeneration = 0
+          [1658853849.969831][29347:29347] CHIP:DMG: <RE:Run> Cluster 404, Attribute 1 is dirty
 
 
 
-          "./chip-tool flowmeasurement read max-measured-value 1 1
-          Verify TH all-clusters-app Log
-          Verify the min-measured-value should be in range of uint16
+          ""./chip-tool flowmeasurement read max-measured-value 1 1
 
-           CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0404 Attribute 0x0000_0002 DataVersion: 1049406897
-          [1649660223.190482][7858:7863] CHIP:TOO:   MaxMeasuredValue: 0"
+          Verify read command is received in DUT as client side log
+
+          [1658853898.416395][29347:29347] CHIP:IM: Received Read request
+          [1658853898.416472][29347:29347] CHIP:DMG: ReadRequestMessage =
+          [1658853898.416513][29347:29347] CHIP:DMG: {
+          [1658853898.416536][29347:29347] CHIP:DMG:         AttributePathIBs =
+          [1658853898.416571][29347:29347] CHIP:DMG:         [
+          [1658853898.416596][29347:29347] CHIP:DMG:                 AttributePathIB =
+          [1658853898.416633][29347:29347] CHIP:DMG:                 {
+          [1658853898.416662][29347:29347] CHIP:DMG:                         Endpoint = 0x1,
+          [1658853898.416703][29347:29347] CHIP:DMG:                         Cluster = 0x404,
+          [1658853898.416746][29347:29347] CHIP:DMG:                         Attribute = 0x0000_0002,
+          [1658853898.416776][29347:29347] CHIP:DMG:                 }
+          [1658853898.416813][29347:29347] CHIP:DMG:
+          [1658853898.416839][29347:29347] CHIP:DMG:         ],
+          [1658853898.416876][29347:29347] CHIP:DMG:
+          [1658853898.416903][29347:29347] CHIP:DMG:         isFabricFiltered = true,
+          [1658853898.416937][29347:29347] CHIP:DMG:         InteractionModelRevision = 1
+          [1658853898.416960][29347:29347] CHIP:DMG: },
+          [1658853898.417051][29347:29347] CHIP:DMG: IM RH moving to [GeneratingReports]
+          [1658853898.417141][29347:29347] CHIP:DMG: Building Reports for ReadHandler with LastReportGeneration = 0 DirtyGeneration = 0
+          [1658853898.417179][29347:29347] CHIP:DMG: <RE:Run> Cluster 404, 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: |
-          Verify TH all-clusters-app Log
+          Verify in DUT as client side log
 
           ./chip-tool flowmeasurement read tolerance 1 1
+
            General error: 0x86 (UNSUPPORTED_ATTRIBUTE)
       disabled: true
 
@@ -147,5 +287,5 @@
           "DUT writes a suitable value to all supported optional attributes on
           the TH one at a time in a manufacturer specific order"
       verification: |
-          This cluster doesn't have any writable attributes
+          This cluster doesn"t have any writable attributes
       disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_IDM_1_2.yaml b/src/app/tests/suites/certification/Test_TC_IDM_1_2.yaml
index d5e5157..842f223 100644
--- a/src/app/tests/suites/certification/Test_TC_IDM_1_2.yaml
+++ b/src/app/tests/suites/certification/Test_TC_IDM_1_2.yaml
@@ -15,6 +15,9 @@
 
 name: 3.1.2. [TC-IDM-1.2] Invoke Response Action from DUT to TH - [{DUT_Server}]
 
+PICS:
+    - MCORE.IDM.S
+
 config:
     nodeId: 0x12344321
     cluster: "Basic"
@@ -75,20 +78,65 @@
 
 
           To Setup the TH such that it should not have the privilege for the cluster in the path. , 1st we need to send below mentioned ACL command
-          Here by sending below mentioned ACL command giving only access for identify cluster(3), So except identify cluster command if try to send any other command will get status as unsupported access.
+          Here by sending below mentioned ACL command giving only access for ACL cluster(31), So except identify cluster command if try to send any other command will get status as unsupported access.
 
-           ./chip-tool accesscontrol write acl '[{"fabricIndex": 1, "privilege": 5, "authMode": 2, "subjects": [112233], "targets":[{ "cluster": 3, "endpoint": 1, "deviceType": null }]}]' 1 0
+          ./chip-tool accesscontrol write acl "[{"fabricIndex": 1, "privilege": 5, "authMode": 2, "subjects":[1,112233], "targets": [{ "cluster":31, "endpoint":0, "deviceType":null }]}]" 1 0
+          [1659419722.669629][1915:1920] CHIP:DMG: WriteResponseMessage =
+          [1659419722.669657][1915:1920] CHIP:DMG: {
+          [1659419722.669687][1915:1920] CHIP:DMG:         AttributeStatusIBs =
+          [1659419722.669727][1915:1920] CHIP:DMG:         [
+          [1659419722.669758][1915:1920] CHIP:DMG:                 AttributeStatusIB =
+          [1659419722.669796][1915:1920] CHIP:DMG:                 {
+          [1659419722.669833][1915:1920] CHIP:DMG:                         AttributePathIB =
+          [1659419722.669871][1915:1920] CHIP:DMG:                         {
+          [1659419722.669912][1915:1920] CHIP:DMG:                                 Endpoint = 0x0,
+          [1659419722.669953][1915:1920] CHIP:DMG:                                 Cluster = 0x1f,
+          [1659419722.669993][1915:1920] CHIP:DMG:                                 Attribute = 0x0000_0000,
+          [1659419722.670034][1915:1920] CHIP:DMG:                         }
+          [1659419722.670077][1915:1920] CHIP:DMG:
+          [1659419722.670114][1915:1920] CHIP:DMG:                         StatusIB =
+          [1659419722.670153][1915:1920] CHIP:DMG:                         {
+          [1659419722.670191][1915:1920] CHIP:DMG:                                 status = 0x00 (SUCCESS),
+          [1659419722.670229][1915:1920] CHIP:DMG:                         },
+          [1659419722.670266][1915:1920] CHIP:DMG:
+          [1659419722.670300][1915:1920] CHIP:DMG:                 },
+          [1659419722.670343][1915:1920] CHIP:DMG:
+          [1659419722.670373][1915:1920] CHIP:DMG:                 AttributeStatusIB =
+          [1659419722.670405][1915:1920] CHIP:DMG:                 {
+          [1659419722.670436][1915:1920] CHIP:DMG:                         AttributePathIB =
+          [1659419722.670471][1915:1920] CHIP:DMG:                         {
+          [1659419722.670510][1915:1920] CHIP:DMG:                                 Endpoint = 0x0,
+          [1659419722.670550][1915:1920] CHIP:DMG:                                 Cluster = 0x1f,
+          [1659419722.670590][1915:1920] CHIP:DMG:                                 Attribute = 0x0000_0000,
+          [1659419722.670661][1915:1920] CHIP:DMG:                                 ListIndex = Null,
+          [1659419722.670700][1915:1920] CHIP:DMG:                         }
+          [1659419722.670740][1915:1920] CHIP:DMG:
+          [1659419722.670776][1915:1920] CHIP:DMG:                         StatusIB =
+          [1659419722.670813][1915:1920] CHIP:DMG:                         {
+          [1659419722.670851][1915:1920] CHIP:DMG:                                 status = 0x00 (SUCCESS),
+          [1659419722.670888][1915:1920] CHIP:DMG:                         },
+          [1659419722.670925][1915:1920] CHIP:DMG:
+          [1659419722.670958][1915:1920] CHIP:DMG:                 },
+          [1659419722.670994][1915:1920] CHIP:DMG:
+          [1659419722.671022][1915:1920] CHIP:DMG:         ],
+          [1659419722.671062][1915:1920] CHIP:DMG:
+          [1659419722.671092][1915:1920] CHIP:DMG:         InteractionModelRevision = 1
+          [1659419722.671120][1915:1920] CHIP:DMG: }
+          [1659419722.671244][1915:1920] CHIP:DMG: WriteClient moving to [AwaitingDe]
+          [1659419722.671314][1915:1920] CHIP:EM: Sending Standalone Ack for MessageCounter:153124628 on
+
 
 
           ./chip-tool onoff on 1 1
-
           On TH, verify DUT  responsds as UNSUPPORTED_ACCESS  for the data sent in the above command
           [1657869005.834700][2816:2821] CHIP:DMG: },
           [1657869005.834790][2816:2821] CHIP:DMG: Received Command Response Status for Endpoint=1 Cluster=0x0000_0006 Command=0x0000_0001 Status=0x7e
           [1657869005.834841][2816:2821] CHIP:TOO: Error: IM Error 0x0000057E: General error: 0x7e (UNSUPPORTED_ACCESS)
           [1657869005.834899][2816:2821] CHIP:DMG: ICR moving to [AwaitingDe]
 
-          With the above command, we are overwriting the default privilege that chip-tool has as an admin. After this test step you need to factory reset the DUT and reprovision the DUT again, Otherwise the below steps can not be executed.
+          With the above command, we are overwriting the default privilege that chip-tool has as an admin. After this test step you need to  send below mentioned command to Grant access to all clusters again.
+
+          ./chip-tool accesscontrol write acl "[{"fabricIndex": 1, "privilege": 5, "authMode":2, "subjects":[112233], "targets":null}]" 1 0
       disabled: true
 
     - label:
@@ -96,24 +144,70 @@
           Invoke Request Message to the DUT with a valid and fabric-scoped
           CommandDataIB"
       verification: |
-          To Setup the TH such that there is no accessing fabric, 1st we need to send below mentioned ACL command
+          The cluster used in the below command is an example, User can use any supported chip cluster.
+
 
           To Setup the TH such that it should not have the privilege for the cluster in the path. , 1st we need to send below mentioned ACL command
-          Here by sending below mentioned ACL command giving only access for identify cluster(3), So except identify cluster command if try to send any other command will get status as unsupported access.
+          Here by sending below mentioned ACL command giving only access for ACL cluster(31), So except identify cluster command if try to send any other command will get status as unsupported access.
 
-           ./chip-tool accesscontrol write acl '[{"fabricIndex": 1, "privilege": 5, "authMode": 2, "subjects": [112233], "targets":[{ "cluster": 3, "endpoint": 1, "deviceType": null }]}]' 1 0
+          ./chip-tool accesscontrol write acl "[{"fabricIndex": 1, "privilege": 5, "authMode": 2, "subjects":[1,112233], "targets": [{ "cluster":31, "endpoint":0, "deviceType":null }]}]" 1 0
+          [1659419722.669629][1915:1920] CHIP:DMG: WriteResponseMessage =
+          [1659419722.669657][1915:1920] CHIP:DMG: {
+          [1659419722.669687][1915:1920] CHIP:DMG:         AttributeStatusIBs =
+          [1659419722.669727][1915:1920] CHIP:DMG:         [
+          [1659419722.669758][1915:1920] CHIP:DMG:                 AttributeStatusIB =
+          [1659419722.669796][1915:1920] CHIP:DMG:                 {
+          [1659419722.669833][1915:1920] CHIP:DMG:                         AttributePathIB =
+          [1659419722.669871][1915:1920] CHIP:DMG:                         {
+          [1659419722.669912][1915:1920] CHIP:DMG:                                 Endpoint = 0x0,
+          [1659419722.669953][1915:1920] CHIP:DMG:                                 Cluster = 0x1f,
+          [1659419722.669993][1915:1920] CHIP:DMG:                                 Attribute = 0x0000_0000,
+          [1659419722.670034][1915:1920] CHIP:DMG:                         }
+          [1659419722.670077][1915:1920] CHIP:DMG:
+          [1659419722.670114][1915:1920] CHIP:DMG:                         StatusIB =
+          [1659419722.670153][1915:1920] CHIP:DMG:                         {
+          [1659419722.670191][1915:1920] CHIP:DMG:                                 status = 0x00 (SUCCESS),
+          [1659419722.670229][1915:1920] CHIP:DMG:                         },
+          [1659419722.670266][1915:1920] CHIP:DMG:
+          [1659419722.670300][1915:1920] CHIP:DMG:                 },
+          [1659419722.670343][1915:1920] CHIP:DMG:
+          [1659419722.670373][1915:1920] CHIP:DMG:                 AttributeStatusIB =
+          [1659419722.670405][1915:1920] CHIP:DMG:                 {
+          [1659419722.670436][1915:1920] CHIP:DMG:                         AttributePathIB =
+          [1659419722.670471][1915:1920] CHIP:DMG:                         {
+          [1659419722.670510][1915:1920] CHIP:DMG:                                 Endpoint = 0x0,
+          [1659419722.670550][1915:1920] CHIP:DMG:                                 Cluster = 0x1f,
+          [1659419722.670590][1915:1920] CHIP:DMG:                                 Attribute = 0x0000_0000,
+          [1659419722.670661][1915:1920] CHIP:DMG:                                 ListIndex = Null,
+          [1659419722.670700][1915:1920] CHIP:DMG:                         }
+          [1659419722.670740][1915:1920] CHIP:DMG:
+          [1659419722.670776][1915:1920] CHIP:DMG:                         StatusIB =
+          [1659419722.670813][1915:1920] CHIP:DMG:                         {
+          [1659419722.670851][1915:1920] CHIP:DMG:                                 status = 0x00 (SUCCESS),
+          [1659419722.670888][1915:1920] CHIP:DMG:                         },
+          [1659419722.670925][1915:1920] CHIP:DMG:
+          [1659419722.670958][1915:1920] CHIP:DMG:                 },
+          [1659419722.670994][1915:1920] CHIP:DMG:
+          [1659419722.671022][1915:1920] CHIP:DMG:         ],
+          [1659419722.671062][1915:1920] CHIP:DMG:
+          [1659419722.671092][1915:1920] CHIP:DMG:         InteractionModelRevision = 1
+          [1659419722.671120][1915:1920] CHIP:DMG: }
+          [1659419722.671244][1915:1920] CHIP:DMG: WriteClient moving to [AwaitingDe]
+          [1659419722.671314][1915:1920] CHIP:EM: Sending Standalone Ack for MessageCounter:153124628 on
 
 
-          The cluster used in the below command is an example, User can use any supported chip cluster.
-          ./chip-tool  generalcommissioning commissioning-complete  1 0
+           ./chip-tool  generalcommissioning commissioning-complete  1 0
+          On TH, verify DUT  responsds as UNSUPPORTED_ACCESS  for the data sent in the above command
+          [1659420197.313287][1960:1965] CHIP:DMG: },
+          [1659420197.313357][1960:1965] CHIP:DMG: Received Command Response Status for Endpoint=0 Cluster=0x0000_0030 Command=0x0000_0004 Status=0x7e
+          [1659420197.313397][1960:1965] CHIP:TOO: Error: IM Error 0x0000057E: General error: 0x7e (UNSUPPORTED_ACCESS)
+          [1659420197.313441][1960:1965] CHIP:DMG: ICR moving to [AwaitingDe]
+          [1659420197.313505][1960:1965] CHIP:EM: Sending Standalone Ack for MessageCounter:66191391 on exchange 52639i
 
-          On TH, verify DUT responsds as UNSUPPORTED_ACCESS  for the data sent in the above command
 
-          [1654079608.667986][14525:14530] CHIP:DMG: Received Command Response Status for Endpoint=0 Cluster=0x0000_0030 Command=0x0000_0004 Status=0x7e
-          [1654079608.668000][14525:14530] CHIP:TOO: Error: IM Error 0x0000057E: General error: 0x7e (UNSUPPORTED_ACCESS)
-          [1654079608.668011][14525:14530] CHIP:DMG: ICR moving to [AwaitingDe]
+          With the above command, we are overwriting the default privilege that chip-tool has as an admin. After this test step you need to  send below mentioned command to Grant access to all clusters again.
 
-          With the above command, we are overwriting the default privilege that chip-tool has as an admin. After this test step you need to factory reset the DUT and reprovision the DUT again, Otherwise the below steps can not be executed.
+          ./chip-tool accesscontrol write acl "[{"fabricIndex": 1, "privilege": 5, "authMode":2, "subjects":[112233], "targets":null}]" 1 0
       disabled: true
 
     - label:
@@ -179,22 +273,71 @@
       verification: |
           The cluster used in the below command is an example, User can use any supported chip cluster.
 
+
           To Setup the TH such that it should not have the privilege for the cluster in the path. , 1st we need to send below mentioned ACL command
           Here by sending below mentioned ACL command giving only access for identify cluster(3), So except identify cluster command if try to send any other command will get status as unsupported access.
 
-           ./chip-tool accesscontrol write acl '[{"fabricIndex": 1, "privilege": 5, "authMode": 2, "subjects": [112233], "targets":[{ "cluster": 3, "endpoint": 1, "deviceType": null }]}]' 1 0
+          ./chip-tool accesscontrol write acl "[{"fabricIndex": 1, "privilege": 5, "authMode": 2, "subjects":[1,112233], "targets": [{ "cluster":31, "endpoint":0, "deviceType":null }]}]" 1 0
+          [1659419722.669629][1915:1920] CHIP:DMG: WriteResponseMessage =
+          [1659419722.669657][1915:1920] CHIP:DMG: {
+          [1659419722.669687][1915:1920] CHIP:DMG:         AttributeStatusIBs =
+          [1659419722.669727][1915:1920] CHIP:DMG:         [
+          [1659419722.669758][1915:1920] CHIP:DMG:                 AttributeStatusIB =
+          [1659419722.669796][1915:1920] CHIP:DMG:                 {
+          [1659419722.669833][1915:1920] CHIP:DMG:                         AttributePathIB =
+          [1659419722.669871][1915:1920] CHIP:DMG:                         {
+          [1659419722.669912][1915:1920] CHIP:DMG:                                 Endpoint = 0x0,
+          [1659419722.669953][1915:1920] CHIP:DMG:                                 Cluster = 0x1f,
+          [1659419722.669993][1915:1920] CHIP:DMG:                                 Attribute = 0x0000_0000,
+          [1659419722.670034][1915:1920] CHIP:DMG:                         }
+          [1659419722.670077][1915:1920] CHIP:DMG:
+          [1659419722.670114][1915:1920] CHIP:DMG:                         StatusIB =
+          [1659419722.670153][1915:1920] CHIP:DMG:                         {
+          [1659419722.670191][1915:1920] CHIP:DMG:                                 status = 0x00 (SUCCESS),
+          [1659419722.670229][1915:1920] CHIP:DMG:                         },
+          [1659419722.670266][1915:1920] CHIP:DMG:
+          [1659419722.670300][1915:1920] CHIP:DMG:                 },
+          [1659419722.670343][1915:1920] CHIP:DMG:
+          [1659419722.670373][1915:1920] CHIP:DMG:                 AttributeStatusIB =
+          [1659419722.670405][1915:1920] CHIP:DMG:                 {
+          [1659419722.670436][1915:1920] CHIP:DMG:                         AttributePathIB =
+          [1659419722.670471][1915:1920] CHIP:DMG:                         {
+          [1659419722.670510][1915:1920] CHIP:DMG:                                 Endpoint = 0x0,
+          [1659419722.670550][1915:1920] CHIP:DMG:                                 Cluster = 0x1f,
+          [1659419722.670590][1915:1920] CHIP:DMG:                                 Attribute = 0x0000_0000,
+          [1659419722.670661][1915:1920] CHIP:DMG:                                 ListIndex = Null,
+          [1659419722.670700][1915:1920] CHIP:DMG:                         }
+          [1659419722.670740][1915:1920] CHIP:DMG:
+          [1659419722.670776][1915:1920] CHIP:DMG:                         StatusIB =
+          [1659419722.670813][1915:1920] CHIP:DMG:                         {
+          [1659419722.670851][1915:1920] CHIP:DMG:                                 status = 0x00 (SUCCESS),
+          [1659419722.670888][1915:1920] CHIP:DMG:                         },
+          [1659419722.670925][1915:1920] CHIP:DMG:
+          [1659419722.670958][1915:1920] CHIP:DMG:                 },
+          [1659419722.670994][1915:1920] CHIP:DMG:
+          [1659419722.671022][1915:1920] CHIP:DMG:         ],
+          [1659419722.671062][1915:1920] CHIP:DMG:
+          [1659419722.671092][1915:1920] CHIP:DMG:         InteractionModelRevision = 1
+          [1659419722.671120][1915:1920] CHIP:DMG: }
+          [1659419722.671244][1915:1920] CHIP:DMG: WriteClient moving to [AwaitingDe]
+          [1659419722.671314][1915:1920] CHIP:EM: Sending Standalone Ack for MessageCounter:153124628 on
 
 
-          ./chip-tool onoff on 1 1 --timedInteractionTimeoutMs 100
+           ./chip-tool onoff on 1 1 --timedInteractionTimeoutMs 100
+          On TH, verify DUT  responsds as UNSUPPORTED_ACCESS  for the data sent in the above command
+          [1659422136.353455][2014:2019] CHIP:DMG:
+          [1659422136.353482][2014:2019] CHIP:DMG: 	InteractionModelRevision = 1
+          [1659422136.353510][2014:2019] CHIP:DMG: },
+          [1659422136.353575][2014:2019] CHIP:DMG: Received Command Response Status for Endpoint=1 Cluster=0x0000_0006 Command=0x0000_0001 Status=0x7e
+          [1659422136.353612][2014:2019] CHIP:TOO: Error: IM Error 0x0000057E: General error: 0x7e (UNSUPPORTED_ACCESS)
+          [1659422136.353653][2014:2019] CHIP:DMG: ICR moving to [AwaitingDe]
+          [1659422136.353715][2014:2019] CHIP:EM: Sending Standalone Ack for MessageCounter:11493125 on exchange 55447i
 
-          On TH,  verify DUT responsds as UNSUPPORTED_ACCESS  for the data sent in the above command
 
-          [1657613026.975474][10484:10489] CHIP:DMG: Received Command Response Status for Endpoint=1 Cluster=0x0000_0006 Command=0x0000_0001 Status=0x7e
-          [1657613026.975513][10484:10489] CHIP:TOO: Error: IM Error 0x0000057E: General error: 0x7e (UNSUPPORTED_ACCESS)
-          [1657613026.975556][10484:10489] CHIP:DMG: ICR moving to [AwaitingDe]
-          [1657613026.975622][10484:10489] CHIP:EM: Sending Standalone Ack for MessageCounter:99688132 on exchange 24183i
 
-          With the above command, we are overwriting the default privilege that chip-tool has as an admin. After this test step you need to factory reset the DUT and reprovision the DUT again, Otherwise the below steps can not be executed.
+          With the above command, we are overwriting the default privilege that chip-tool has as an admin. After this test step you need to  send below mentioned command to Grant access to all clusters again.
+
+          ./chip-tool accesscontrol write acl "[{"fabricIndex": 1, "privilege": 5, "authMode":2, "subjects":[112233], "targets":null}]" 1 0
       disabled: true
 
     - label:
diff --git a/src/app/tests/suites/certification/Test_TC_IDM_2_1.yaml b/src/app/tests/suites/certification/Test_TC_IDM_2_1.yaml
index 2ba56f2..720bd06 100644
--- a/src/app/tests/suites/certification/Test_TC_IDM_2_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_IDM_2_1.yaml
@@ -15,6 +15,9 @@
 
 name: 3.2.1. [TC-IDM-2.1] Read Request Action from DUT to TH. [{DUT_Client}]
 
+PICS:
+    - MCORE.IDM.C.ReadRequest
+
 config:
     nodeId: 0x12344321
     cluster: "Basic"
@@ -415,8 +418,9 @@
       disabled: true
 
     - label:
-          "[Optional] DUT sends the Read Request Message to the TH to read an
-          attribute of data type bool."
+          "DUT sends the Read Request Message to the TH to read an attribute of
+          data type bool."
+      PICS: MCORE.IDM.C.ReadRequest.Attribute.DataType_Bool
       verification: |
           In case of chip tool, here is an example command to use
 
@@ -453,8 +457,9 @@
       disabled: true
 
     - label:
-          "[Optional] DUT sends the Read Request Message to the TH to read an
-          attribute of data type string."
+          "DUT sends the Read Request Message to the TH to read an attribute of
+          data type string."
+      PICS: MCORE.IDM.C.ReadRequest.Attribute.DataType_String
       verification: |
           In case of chip tool, here is an example command to use
 
@@ -490,8 +495,9 @@
       disabled: true
 
     - label:
-          "[Optional] DUT sends the Read Request Message to the TH to read an
-          attribute of data type unsigned integer."
+          "DUT sends the Read Request Message to the TH to read an attribute of
+          data type unsigned integer."
+      PICS: MCORE.IDM.C.ReadRequest.Attribute.DataType_UnsignedInteger
       verification: |
           In case of chip tool, here is an example command to use
 
@@ -528,8 +534,9 @@
       disabled: true
 
     - label:
-          "[Optional] DUT sends the Read Request Message to the TH to read an
-          attribute of data type signed integer."
+          "DUT sends the Read Request Message to the TH to read an attribute of
+          data type signed integer."
+      PICS: MCORE.IDM.C.ReadRequest.Attribute.DataType_SignedInteger
       verification: |
           In case of chip tool, here is an example command to use
 
@@ -566,15 +573,17 @@
       disabled: true
 
     - label:
-          "[Optional] DUT sends the Read Request Message to the TH to read an
-          attribute of data type floating point."
+          "DUT sends the Read Request Message to the TH to read an attribute of
+          data type floating point."
+      PICS: MCORE.IDM.C.ReadRequest.Attribute.DataType_FloatingPoint
       verification: |
           DUT implementation required to verify read an attribute of data type Float
       disabled: true
 
     - label:
-          "[Optional] DUT sends the Read Request Message to the TH to read an
-          attribute of data type Octet String."
+          "DUT sends the Read Request Message to the TH to read an attribute of
+          data type Octet String."
+      PICS: MCORE.IDM.C.ReadRequest.Attribute.DataType_OctetString
       verification: |
           In case of chip tool, here is an example command to use
 
@@ -612,8 +621,9 @@
       disabled: true
 
     - label:
-          "[Optional] DUT sends the Read Request Message to the TH to read an
-          attribute of data type Struct."
+          "DUT sends the Read Request Message to the TH to read an attribute of
+          data type Struct."
+      PICS: MCORE.IDM.C.ReadRequest.Attribute.DataType_Struct
       verification: |
           In case of chip tool, here is an example command to use
 
@@ -654,8 +664,9 @@
       disabled: true
 
     - label:
-          "[Optional] DUT sends the Read Request Message to the TH to read an
-          attribute of data type List."
+          "DUT sends the Read Request Message to the TH to read an attribute of
+          data type List."
+      PICS: MCORE.IDM.C.ReadRequest.Attribute.DataType_List
       verification: |
           In case of chip tool, here is an example command to use
 
@@ -720,8 +731,9 @@
       disabled: true
 
     - label:
-          "[Optional] DUT sends the Read Request Message to the TH to read an
-          attribute of data type enum."
+          "DUT sends the Read Request Message to the TH to read an attribute of
+          data type enum."
+      PICS: MCORE.IDM.C.ReadRequest.Attribute.DataType_Enum
       verification: |
           In case of chip tool, here is an example command to use
 
@@ -756,8 +768,9 @@
       disabled: true
 
     - label:
-          "[Optional] DUT sends the Read Request Message to the TH to read an
-          attribute of data type bitmap."
+          "DUT sends the Read Request Message to the TH to read an attribute of
+          data type bitmap."
+      PICS: MCORE.IDM.C.ReadRequest.Attribute.DataType_Bitmap
       verification: |
           In case of chip tool, here is an example command to use
 
@@ -845,7 +858,7 @@
       verification: |
           DUT implementation required to verify read an attribute which is is larger than 1 MTU(1280 bytes)
           Below sample wildcard read command will read all the attributes from the all-clusters-app and generates 1 MTU size of data.
-          If the dut doesn't support generating the large chunk data, then this test step can be skipped.
+          If the dut doesn"t support generating the large chunk data, then this test step can be skipped.
           Verify the last chunked data is having Suppress response True & TH will not send the Ack message.
 
           ./chip-tool any read-by-id 0xFFFFFFFF 0xFFFFFFFF 1 0xFFFF
@@ -870,3 +883,14 @@
           [1658396687.402119][3726:3731] CHIP:DMG: }
           [1658396687.402400][3726:3731] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0201 Attribute 0x0000_FFFB DataVersion: 3456275847
       disabled: true
+
+    - label:
+          "DUT sends the Read Request Message to the TH with Manufacturer
+          specific clusters and attributes to read all attributes in all
+          clusters and all endpoints Path = [[ ]]. On receipt of this message,
+          TH should send a report data action with the attribute values to the
+          DUT."
+      verification: |
+          sudo ./chip-tool any read-by-id 0xFFFFFFFF 0xFFFFFFFF 1 0xFFFF --timeout 40
+          On TH verify that Read Request Message received from DUT
+      disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_IDM_2_2.yaml b/src/app/tests/suites/certification/Test_TC_IDM_2_2.yaml
index 6036888..b2ce2fd 100644
--- a/src/app/tests/suites/certification/Test_TC_IDM_2_2.yaml
+++ b/src/app/tests/suites/certification/Test_TC_IDM_2_2.yaml
@@ -15,6 +15,9 @@
 
 name: 3.2.2. [TC-IDM-2.2] Report Data Action from DUT to TH. [{DUT_Server}]
 
+PICS:
+    - MCORE.IDM.S
+
 config:
     nodeId: 0x12344321
     cluster: "Basic"
@@ -343,9 +346,10 @@
       disabled: true
 
     - label:
-          "[Optional] TH sends the Read Request Message to the DUT to read an
-          attribute of data type bool. DUT responds with the report data action
-          with the right attribute value."
+          "TH sends the Read Request Message to the DUT to read an attribute of
+          data type bool. DUT responds with the report data action with the
+          right attribute value."
+      PICS: MCORE.IDM.S.Attribute.DataType_Bool
       verification: |
           The cluster used in the below command is an example, User can use any supported chip cluster.
 
@@ -358,9 +362,10 @@
       disabled: true
 
     - label:
-          "[Optional] TH sends the Read Request Message to the DUT to read an
-          attribute of data type string. DUT responds with the report data
-          action with the right attribute value."
+          "TH sends the Read Request Message to the DUT to read an attribute of
+          data type string. DUT responds with the report data action with the
+          right attribute value."
+      PICS: MCORE.IDM.S.Attribute.DataType_String
       verification: |
           The cluster used in the below command is an example, User can use any supported chip cluster.
 
@@ -374,9 +379,10 @@
       disabled: true
 
     - label:
-          "[Optional] TH sends the Read Request Message to the DUT to read an
-          attribute of data type unsigned integer. DUT responds with the report
-          data action with the right attribute value."
+          "TH sends the Read Request Message to the DUT to read an attribute of
+          data type unsigned integer. DUT responds with the report data action
+          with the right attribute value."
+      PICS: MCORE.IDM.S.Attribute.DataType_UnsignedInteger
       verification: |
           The cluster used in the below command is an example, User can use any supported chip cluster.
 
@@ -389,9 +395,10 @@
       disabled: true
 
     - label:
-          "[Optional] TH sends the Read Request Message to the DUT to read an
-          attribute of data type signed integer. DUT responds with the report
-          data action with the right attribute value."
+          "TH sends the Read Request Message to the DUT to read an attribute of
+          data type signed integer. DUT responds with the report data action
+          with the right attribute value."
+      PICS: MCORE.IDM.S.Attribute.DataType_SignedInteger
       verification: |
           The cluster used in the below command is an example, User can use any supported chip cluster.
 
@@ -405,17 +412,19 @@
       disabled: true
 
     - label:
-          "[Optional] TH sends the Read Request Message to the DUT to read an
-          attribute of data type floating point. DUT responds with the report
-          data action with the right attribute value."
+          "TH sends the Read Request Message to the DUT to read an attribute of
+          data type floating point. DUT responds with the report data action
+          with the right attribute value."
+      PICS: MCORE.IDM.S.Attribute.DataType_FloatingPoint
       verification: |
           DUT implementation required to verify read an attribute of data type Float
       disabled: true
 
     - label:
-          "[Optional] TH sends the Read Request Message to the DUT to read an
-          attribute of data type Octet String. DUT responds with the report data
-          action with the right attribute value."
+          "TH sends the Read Request Message to the DUT to read an attribute of
+          data type Octet String. DUT responds with the report data action with
+          the right attribute value."
+      PICS: MCORE.IDM.S.Attribute.DataType_OctetString
       verification: |
           The cluster used in the below command is an example, User can use any supported chip cluster.
 
@@ -431,9 +440,10 @@
       disabled: true
 
     - label:
-          "[Optional] TH sends the Read Request Message to the DUT to read an
-          attribute of data type Struct. DUT responds with the report data
-          action with the right attribute value."
+          "TH sends the Read Request Message to the DUT to read an attribute of
+          data type Struct. DUT responds with the report data action with the
+          right attribute value."
+      PICS: MCORE.IDM.S.Attribute.DataType_Struct
       verification: |
           The cluster used in the below command is an example, User can use any supported chip cluster.
 
@@ -447,9 +457,10 @@
       disabled: true
 
     - label:
-          "[Optional] TH sends the Read Request Message to the DUT to read an
-          attribute of data type List. DUT responds with the report data action
-          with the right attribute value."
+          "TH sends the Read Request Message to the DUT to read an attribute of
+          data type List. DUT responds with the report data action with the
+          right attribute value."
+      PICS: MCORE.IDM.S.Attribute.DataType_List
       verification: |
           The cluster used in the below command is an example, User can use any supported chip cluster.
 
@@ -474,9 +485,10 @@
       disabled: true
 
     - label:
-          "[Optional] TH sends the Read Request Message to the DUT to read an
-          attribute of data type enum. DUT responds with the report data action
-          with the right attribute value."
+          "TH sends the Read Request Message to the DUT to read an attribute of
+          data type enum. DUT responds with the report data action with the
+          right attribute value."
+      PICS: MCORE.IDM.S.Attribute.DataType_Enum
       verification: |
           The cluster used in the below command is an example, User can use any supported chip cluster.
 
@@ -489,9 +501,10 @@
       disabled: true
 
     - label:
-          "[Optional] TH sends the Read Request Message to the DUT to read an
-          attribute of data type bitmap. DUT responds with the report data
-          action with the right attribute value."
+          "TH sends the Read Request Message to the DUT to read an attribute of
+          data type bitmap. DUT responds with the report data action with the
+          right attribute value."
+      PICS: MCORE.IDM.S.Attribute.DataType_Bitmap
       verification: |
           The cluster used in the below command is an example, User can use any supported chip cluster.
 
@@ -573,28 +586,72 @@
           the path that requires a privilege that is not granted for the cluster
           in the path. DUT responds with the report data action."
       verification: |
-          To Setup the TH such that it should not have the privilege for the cluster in the path. , 1st we need to send below mentioned ACL command
-          Here by sending below mentioned ACL command giving only access for identify cluster(3), So except identify cluster command if try to send any other command will get status as unsupported access.
-
-           ./chip-tool accesscontrol write acl '[{"fabricIndex": 1, "privilege": 5, "authMode": 2, "subjects": [112233], "targets":[{ "cluster": 3, "endpoint": 1, "deviceType": null }]}]' 1 0
-
-
-          ./chip-tool accesscontrol write acl '[{"fabricIndex": 1, "privilege": 5, "authMode": 2, "subjects": [1234], "targets": null}]' 1 0
-
-
           The cluster used in the below command is an example, User can use any supported chip cluster.
-          ./chip-tool operationalcredentials read trusted-root-certificates 1 0
-
-           Verify on TH , DUT is responds  status code UNSUPPORTED_ACCESS(0x7E) for above command
-
-          [1652964769.384639][39268:39273] CHIP:DMG:
-          [1652964769.384652][39268:39273] CHIP:DMG:         SuppressResponse = true,
-          [1652964769.384668][39268:39273] CHIP:DMG:         InteractionModelRevision = 1
-          [1652964769.384682][39268:39273] CHIP:DMG: }
-          [1652964769.384788][39268:39273] CHIP:TOO: Response Failure: IM Error 0x0000057E: General error: 0x7e (UNSUPPORTED_ACCESS)
 
 
-          With the above command, we are overwriting the default privilege that chip-tool has as an admin. After this test step you need to factory reset the DUT and reprovision the DUT again, Otherwise the below steps can not be executed.
+          To Setup the TH such that it should not have the privilege for the cluster in the path. , 1st we need to send below mentioned ACL command
+          Here by sending below mentioned ACL command giving only access for ACL cluster(31), So except identify cluster command if try to send any other command will get status as unsupported access.
+
+          ./chip-tool accesscontrol write acl "[{"fabricIndex": 1, "privilege": 5, "authMode": 2, "subjects":[1,112233], "targets": [{ "cluster":31, "endpoint":0, "deviceType":null }]}]" 1 0
+          [1659419722.669629][1915:1920] CHIP:DMG: WriteResponseMessage =
+          [1659419722.669657][1915:1920] CHIP:DMG: {
+          [1659419722.669687][1915:1920] CHIP:DMG:         AttributeStatusIBs =
+          [1659419722.669727][1915:1920] CHIP:DMG:         [
+          [1659419722.669758][1915:1920] CHIP:DMG:                 AttributeStatusIB =
+          [1659419722.669796][1915:1920] CHIP:DMG:                 {
+          [1659419722.669833][1915:1920] CHIP:DMG:                         AttributePathIB =
+          [1659419722.669871][1915:1920] CHIP:DMG:                         {
+          [1659419722.669912][1915:1920] CHIP:DMG:                                 Endpoint = 0x0,
+          [1659419722.669953][1915:1920] CHIP:DMG:                                 Cluster = 0x1f,
+          [1659419722.669993][1915:1920] CHIP:DMG:                                 Attribute = 0x0000_0000,
+          [1659419722.670034][1915:1920] CHIP:DMG:                         }
+          [1659419722.670077][1915:1920] CHIP:DMG:
+          [1659419722.670114][1915:1920] CHIP:DMG:                         StatusIB =
+          [1659419722.670153][1915:1920] CHIP:DMG:                         {
+          [1659419722.670191][1915:1920] CHIP:DMG:                                 status = 0x00 (SUCCESS),
+          [1659419722.670229][1915:1920] CHIP:DMG:                         },
+          [1659419722.670266][1915:1920] CHIP:DMG:
+          [1659419722.670300][1915:1920] CHIP:DMG:                 },
+          [1659419722.670343][1915:1920] CHIP:DMG:
+          [1659419722.670373][1915:1920] CHIP:DMG:                 AttributeStatusIB =
+          [1659419722.670405][1915:1920] CHIP:DMG:                 {
+          [1659419722.670436][1915:1920] CHIP:DMG:                         AttributePathIB =
+          [1659419722.670471][1915:1920] CHIP:DMG:                         {
+          [1659419722.670510][1915:1920] CHIP:DMG:                                 Endpoint = 0x0,
+          [1659419722.670550][1915:1920] CHIP:DMG:                                 Cluster = 0x1f,
+          [1659419722.670590][1915:1920] CHIP:DMG:                                 Attribute = 0x0000_0000,
+          [1659419722.670661][1915:1920] CHIP:DMG:                                 ListIndex = Null,
+          [1659419722.670700][1915:1920] CHIP:DMG:                         }
+          [1659419722.670740][1915:1920] CHIP:DMG:
+          [1659419722.670776][1915:1920] CHIP:DMG:                         StatusIB =
+          [1659419722.670813][1915:1920] CHIP:DMG:                         {
+          [1659419722.670851][1915:1920] CHIP:DMG:                                 status = 0x00 (SUCCESS),
+          [1659419722.670888][1915:1920] CHIP:DMG:                         },
+          [1659419722.670925][1915:1920] CHIP:DMG:
+          [1659419722.670958][1915:1920] CHIP:DMG:                 },
+          [1659419722.670994][1915:1920] CHIP:DMG:
+          [1659419722.671022][1915:1920] CHIP:DMG:         ],
+          [1659419722.671062][1915:1920] CHIP:DMG:
+          [1659419722.671092][1915:1920] CHIP:DMG:         InteractionModelRevision = 1
+          [1659419722.671120][1915:1920] CHIP:DMG: }
+          [1659419722.671244][1915:1920] CHIP:DMG: WriteClient moving to [AwaitingDe]
+          [1659419722.671314][1915:1920] CHIP:EM: Sending Standalone Ack for MessageCounter:153124628 on
+
+
+
+           ./chip-tool operationalcredentials read trusted-root-certificates 1 0
+          On TH, verify DUT  responsds as UNSUPPORTED_ACCESS  for the data sent in the above command
+          [1659422202.429460][2021:2027] CHIP:DMG:
+          [1659422202.429488][2021:2027] CHIP:DMG:         SuppressResponse = true,
+          [1659422202.429516][2021:2027] CHIP:DMG:         InteractionModelRevision = 1
+          [1659422202.429544][2021:2027] CHIP:DMG: }
+          [1659422202.429658][2021:2027] CHIP:TOO: Response Failure: IM Error 0x0000057E: General error: 0x7e (UNSUPPORTED_ACCESS)
+          [1659422202.429750][2021:2027] CHIP:EM: Sending Standalone Ack for MessageCounter:188462
+
+
+          With the above command, we are overwriting the default privilege that chip-tool has as an admin. After this test step you need to  send below mentioned command to Grant access to all clusters again.
+
+          ./chip-tool accesscontrol write acl "[{"fabricIndex": 1, "privilege": 5, "authMode":2, "subjects":[112233], "targets":null}]" 1 0
       disabled: true
 
     - label:
@@ -973,7 +1030,8 @@
     - label:
           "TH sends a Read Request Message to the DUT to read
           something(Attribute) which is larger than 1 MTU(1280 bytes) and per
-          spec can be chunked"
+          spec can be chunked +"
+      PICS: MCORE.IDM.S.LargeData
       verification: |
           DUT implementation required to verify read an attribute which is is larger than 1 MTU(1280 bytes)
       disabled: true
@@ -1029,47 +1087,109 @@
           The cluster used in the below command is an example, User can use any supported chip cluster.
 
 
-
           To Setup the TH such that it should not have the privilege for the cluster in the path. , 1st we need to send below mentioned ACL command
-          Here by sending below mentioned ACL command giving only access for identify cluster(3), So except identify cluster command if try to send any other command will get status as unsupported access.
+          Here by sending below mentioned ACL command giving only access for ACL cluster(31), So except identify cluster command if try to send any other command will get status as unsupported access.
+
+          ./chip-tool accesscontrol write acl "[{"fabricIndex": 1, "privilege": 5, "authMode": 2, "subjects":[1,112233], "targets": [{ "cluster":31, "endpoint":0, "deviceType":null }]}]" 1 0
+          [1659419722.669629][1915:1920] CHIP:DMG: WriteResponseMessage =
+          [1659419722.669657][1915:1920] CHIP:DMG: {
+          [1659419722.669687][1915:1920] CHIP:DMG:         AttributeStatusIBs =
+          [1659419722.669727][1915:1920] CHIP:DMG:         [
+          [1659419722.669758][1915:1920] CHIP:DMG:                 AttributeStatusIB =
+          [1659419722.669796][1915:1920] CHIP:DMG:                 {
+          [1659419722.669833][1915:1920] CHIP:DMG:                         AttributePathIB =
+          [1659419722.669871][1915:1920] CHIP:DMG:                         {
+          [1659419722.669912][1915:1920] CHIP:DMG:                                 Endpoint = 0x0,
+          [1659419722.669953][1915:1920] CHIP:DMG:                                 Cluster = 0x1f,
+          [1659419722.669993][1915:1920] CHIP:DMG:                                 Attribute = 0x0000_0000,
+          [1659419722.670034][1915:1920] CHIP:DMG:                         }
+          [1659419722.670077][1915:1920] CHIP:DMG:
+          [1659419722.670114][1915:1920] CHIP:DMG:                         StatusIB =
+          [1659419722.670153][1915:1920] CHIP:DMG:                         {
+          [1659419722.670191][1915:1920] CHIP:DMG:                                 status = 0x00 (SUCCESS),
+          [1659419722.670229][1915:1920] CHIP:DMG:                         },
+          [1659419722.670266][1915:1920] CHIP:DMG:
+          [1659419722.670300][1915:1920] CHIP:DMG:                 },
+          [1659419722.670343][1915:1920] CHIP:DMG:
+          [1659419722.670373][1915:1920] CHIP:DMG:                 AttributeStatusIB =
+          [1659419722.670405][1915:1920] CHIP:DMG:                 {
+          [1659419722.670436][1915:1920] CHIP:DMG:                         AttributePathIB =
+          [1659419722.670471][1915:1920] CHIP:DMG:                         {
+          [1659419722.670510][1915:1920] CHIP:DMG:                                 Endpoint = 0x0,
+          [1659419722.670550][1915:1920] CHIP:DMG:                                 Cluster = 0x1f,
+          [1659419722.670590][1915:1920] CHIP:DMG:                                 Attribute = 0x0000_0000,
+          [1659419722.670661][1915:1920] CHIP:DMG:                                 ListIndex = Null,
+          [1659419722.670700][1915:1920] CHIP:DMG:                         }
+          [1659419722.670740][1915:1920] CHIP:DMG:
+          [1659419722.670776][1915:1920] CHIP:DMG:                         StatusIB =
+          [1659419722.670813][1915:1920] CHIP:DMG:                         {
+          [1659419722.670851][1915:1920] CHIP:DMG:                                 status = 0x00 (SUCCESS),
+          [1659419722.670888][1915:1920] CHIP:DMG:                         },
+          [1659419722.670925][1915:1920] CHIP:DMG:
+          [1659419722.670958][1915:1920] CHIP:DMG:                 },
+          [1659419722.670994][1915:1920] CHIP:DMG:
+          [1659419722.671022][1915:1920] CHIP:DMG:         ],
+          [1659419722.671062][1915:1920] CHIP:DMG:
+          [1659419722.671092][1915:1920] CHIP:DMG:         InteractionModelRevision = 1
+          [1659419722.671120][1915:1920] CHIP:DMG: }
+          [1659419722.671244][1915:1920] CHIP:DMG: WriteClient moving to [AwaitingDe]
+          [1659419722.671314][1915:1920] CHIP:EM: Sending Standalone Ack for MessageCounter:153124628 on
 
 
-          ./chip-tool accesscontrol write acl '[{"fabricIndex": 1, "privilege": 5, "authMode": 2, "subjects": [112233], "targets":[{ "cluster": 3, "endpoint": 1, "deviceType": null }]}]' 1 0
+          ./chip-tool any read-by-id 0xFFFFFFFF 0xFFFFFFFF 1 0
+          On TH, verify DUT  responsds as UNSUPPORTED_ACCESS  for the data sent in the above command
+          [1659422360.478947][2049:2054] CHIP:DMG: }
+          [1659422360.479556][2049:2054] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_001F Attribute 0x0000_0000 DataVersion: 3949809681
+          [1659422360.479619][2049:2054] CHIP:TOO:   ACL: 1 entries
+          [1659422360.479679][2049:2054] CHIP:TOO:     [1]: {
+          [1659422360.479706][2049:2054] CHIP:TOO:       Privilege: 5
+          [1659422360.479729][2049:2054] CHIP:TOO:       AuthMode: 2
+          [1659422360.479768][2049:2054] CHIP:TOO:       Subjects: 2 entries
+          [1659422360.479819][2049:2054] CHIP:TOO:         [1]: 1
+          [1659422360.479847][2049:2054] CHIP:TOO:         [2]: 112233
+          [1659422360.479876][2049:2054] CHIP:TOO:       Targets: 1 entries
+          [1659422360.479925][2049:2054] CHIP:TOO:         [1]: {
+          [1659422360.479969][2049:2054] CHIP:TOO:           Cluster: 31
+          [1659422360.479993][2049:2054] CHIP:TOO:           Endpoint: 0
+          [1659422360.480016][2049:2054] CHIP:TOO:           DeviceType: null
+          [1659422360.480038][2049:2054] CHIP:TOO:          }
+          [1659422360.480062][2049:2054] CHIP:TOO:       FabricIndex: 1
+          [1659422360.480085][2049:2054] CHIP:TOO:      }
+          [1659422360.480165][2049:2054] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_001F Attribute 0x0000_0001 DataVersion: 3949809681
+          [1659422360.480197][2049:2054] CHIP:TOO:   Extension: 0 entries
+          [1659422360.480225][2049:2054] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_001F Attribute 0x0000_0002 DataVersion: 3949809681
+          [1659422360.480251][2049:2054] CHIP:TOO:   SubjectsPerAccessControlEntry: 4
+          [1659422360.480311][2049:2054] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_001F Attribute 0x0000_0003 DataVersion: 3949809681
+          [1659422360.480337][2049:2054] CHIP:TOO:   TargetsPerAccessControlEntry: 3
+          [1659422360.480395][2049:2054] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_001F Attribute 0x0000_0004 DataVersion: 3949809681
+          [1659422360.480421][2049:2054] CHIP:TOO:   AccessControlEntriesPerFabric: 3
+          [1659422360.480479][2049:2054] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_001F Attribute 0x0000_FFFC DataVersion: 3949809681
+          [1659422360.480505][2049:2054] CHIP:TOO:   FeatureMap: 0
+          [1659422360.480563][2049:2054] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_001F Attribute 0x0000_FFFD DataVersion: 3949809681
+          [1659422360.480588][2049:2054] CHIP:TOO:   ClusterRevision: 1
+          [1659422360.480690][2049:2054] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_001F Attribute 0x0000_FFF8 DataVersion: 3949809681
+          [1659422360.480721][2049:2054] CHIP:TOO:   GeneratedCommandList: 0 entries
+          [1659422360.480789][2049:2054] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_001F Attribute 0x0000_FFF9 DataVersion: 3949809681
+          [1659422360.480818][2049:2054] CHIP:TOO:   AcceptedCommandList: 0 entries
+          [1659422360.481269][2049:2054] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_001F Attribute 0x0000_FFFB DataVersion: 3949809681
+          [1659422360.481307][2049:2054] CHIP:TOO:   AttributeList: 10 entries
+          [1659422360.481334][2049:2054] CHIP:TOO:     [1]: 0
+          [1659422360.481359][2049:2054] CHIP:TOO:     [2]: 1
+          [1659422360.481383][2049:2054] CHIP:TOO:     [3]: 2
+          [1659422360.481408][2049:2054] CHIP:TOO:     [4]: 3
+          [1659422360.481432][2049:2054] CHIP:TOO:     [5]: 4
+          [1659422360.481457][2049:2054] CHIP:TOO:     [6]: 65528
+          [1659422360.481482][2049:2054] CHIP:TOO:     [7]: 65529
+          [1659422360.481506][2049:2054] CHIP:TOO:     [8]: 65531
+          [1659422360.481531][2049:2054] CHIP:TOO:     [9]: 65532
+          [1659422360.481556][2049:2054] CHIP:TOO:     [10]: 65533
+          [1659422360.481706][2049:2054] CHIP:EM: Sending Standalone Ack for MessageCounter:183166533 on exchange 17693i
 
 
-           ./chip-tool any read-by-id 0xFFFFFFFF 0xFFFFFFFF 1 1
 
-          Verify on TH ,  DUT sends back data of all attributes only from that one cluster to which it has access.
-           Verify that there are no errors sent back for attributes the TH has no access to
+          With the above command, we are overwriting the default privilege that chip-tool has as an admin. After this test step you need to  send below mentioned command to Grant access to all clusters again.
 
-          [1657537120.031164][9438:9443] CHIP:DMG: }
-          [1657537120.032270][9438:9443] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0003 Attribute 0x0000_0000 DataVersion: 3463755250
-          [1657537120.032381][9438:9443] CHIP:TOO:   identify time: 0
-          [1657537120.032536][9438:9443] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0003 Attribute 0x0000_0001 DataVersion: 3463755250
-          [1657537120.032608][9438:9443] CHIP:TOO:   identify type: 2
-          [1657537120.032753][9438:9443] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0003 Attribute 0x0000_FFFC DataVersion: 3463755250
-          [1657537120.032827][9438:9443] CHIP:TOO:   FeatureMap: 0
-          [1657537120.032965][9438:9443] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0003 Attribute 0x0000_FFFD DataVersion: 3463755250
-          [1657537120.033022][9438:9443] CHIP:TOO:   ClusterRevision: 4
-          [1657537120.033268][9438:9443] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0003 Attribute 0x0000_FFF8 DataVersion: 3463755250
-          [1657537120.033393][9438:9443] CHIP:TOO:   GeneratedCommandList: 0 entries
-          [1657537120.033808][9438:9443] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0003 Attribute 0x0000_FFF9 DataVersion: 3463755250
-          [1657537120.033900][9438:9443] CHIP:TOO:   AcceptedCommandList: 2 entries
-          [1657537120.033971][9438:9443] CHIP:TOO:     [1]: 0
-          [1657537120.034041][9438:9443] CHIP:TOO:     [2]: 64
-          [1657537120.034853][9438:9443] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0003 Attribute 0x0000_FFFB DataVersion: 3463755250
-          [1657537120.034950][9438:9443] CHIP:TOO:   AttributeList: 7 entries
-          [1657537120.035018][9438:9443] CHIP:TOO:     [1]: 0
-          [1657537120.035083][9438:9443] CHIP:TOO:     [2]: 1
-          [1657537120.035146][9438:9443] CHIP:TOO:     [3]: 65528
-          [1657537120.035211][9438:9443] CHIP:TOO:     [4]: 65529
-          [1657537120.035275][9438:9443] CHIP:TOO:     [5]: 65531
-          [1657537120.035342][9438:9443] CHIP:TOO:     [6]: 65532
-          [1657537120.035405][9438:9443] CHIP:TOO:     [7]: 65533
-          [1657537120.035801][9438:9443] CHIP:EM: Sending Standalone Ack for MessageCounter:64174919 on exchange 48017i
-
-
-          With the above command, we are overwriting the default privilege that chip-tool has as an admin. After this test step you need to factory reset the DUT and reprovision the DUT again, Otherwise the below steps can not be executed.
+          ./chip-tool accesscontrol write acl "[{"fabricIndex": 1, "privilege": 5, "authMode":2, "subjects":[112233], "targets":null}]" 1 0
       disabled: true
 
     - label:
diff --git a/src/app/tests/suites/certification/Test_TC_IDM_3_2.yaml b/src/app/tests/suites/certification/Test_TC_IDM_3_2.yaml
index 4ab23bc..2bdadf3 100644
--- a/src/app/tests/suites/certification/Test_TC_IDM_3_2.yaml
+++ b/src/app/tests/suites/certification/Test_TC_IDM_3_2.yaml
@@ -15,6 +15,9 @@
 
 name: 3.3.2. [TC-IDM-3.2] Write Response Action from DUT to TH. [{DUT_Server}]
 
+PICS:
+    - MCORE.IDM.S
+
 config:
     nodeId: 0x12344321
     cluster: "Basic"
@@ -75,8 +78,9 @@
       disabled: true
 
     - label:
-          "[Optional] TH sends the WriteRequestMessage to the DUT to write an
-          attribute of data type bool."
+          "TH sends the WriteRequestMessage to the DUT to write an attribute of
+          data type bool. +"
+      PICS: MCORE.IDM.S.Attribute_W.DataType_Bool
       verification: |
           The cluster used in the below command is an example, User can use any supported chip cluster.
 
@@ -119,8 +123,9 @@
       disabled: true
 
     - label:
-          "[Optional] TH sends the WriteRequestMessage to the DUT to write an
-          attribute of data type string."
+          "TH sends the WriteRequestMessage to the DUT to write an attribute of
+          data type string. +"
+      PICS: MCORE.IDM.S.Attribute_W.DataType_String
       verification: |
           The cluster used in the below command is an example, User can use any supported chip cluster.
 
@@ -163,8 +168,9 @@
       disabled: true
 
     - label:
-          "[Optional] TH sends the WriteRequestMessage to the DUT to write an
-          attribute of data type unsigned integer."
+          "TH sends the WriteRequestMessage to the DUT to write an attribute of
+          data type unsigned integer. +"
+      PICS: MCORE.IDM.S.Attribute_W.DataType_UnsignedInteger
       verification: |
           The cluster used in the below command is an example, User can use any supported chip cluster.
 
@@ -207,43 +213,49 @@
       disabled: true
 
     - label:
-          "[Optional] TH sends the WriteRequestMessage to the DUT to write an
-          attribute of data type signed integer."
+          "TH sends the WriteRequestMessage to the DUT to write an attribute of
+          data type signed integer. +"
+      PICS: MCORE.IDM.S.Attribute_W.DataType_SignedInteger
       verification: |
           DUT implementation required to verify write an attribute of data type signed integer.
       disabled: true
 
     - label:
-          "[Optional] TH sends the WriteRequestMessage to the DUT to write an
-          attribute of data type floating point."
+          "TH sends the WriteRequestMessage to the DUT to write an attribute of
+          data type floating point. +"
+      PICS: MCORE.IDM.S.Attribute_W.DataType_FloatingPoint
       verification: |
           DUT implementation required to verify write an attribute of data type float
       disabled: true
 
     - label:
-          "[Optional] TH sends the WriteRequestMessage to the DUT to write an
-          attribute of data type Octet String."
+          "TH sends the WriteRequestMessage to the DUT to write an attribute of
+          data type Octet String. +"
+      PICS: MCORE.IDM.S.Attribute_W.DataType_OctetString
       verification: |
           DUT implementation required to verify write an attribute of data type Octet String
       disabled: true
 
     - label:
-          "[Optional] TH sends the WriteRequestMessage to the DUT to write an
-          attribute of data type Struct."
+          "TH sends the WriteRequestMessage to the DUT to write an attribute of
+          data type Struct. +"
+      PICS: MCORE.IDM.S.Attribute_W.DataType_Struct
       verification: |
           DUT implementation required to verify write an attribute ofdata type Struct
       disabled: true
 
     - label:
-          "[Optional] TH sends the WriteRequestMessage to the DUT to write an
-          attribute of data type List."
+          "TH sends the WriteRequestMessage to the DUT to write an attribute of
+          data type List. +"
+      PICS: MCORE.IDM.S.Attribute_W.DataType_List
       verification: |
           DUT implementation required to verify write an attribute of  data type List
       disabled: true
 
     - label:
-          "[Optional] TH sends the WriteRequestMessage to the DUT to write an
-          attribute of data type enum."
+          "TH sends the WriteRequestMessage to the DUT to write an attribute of
+          data type enum. +"
+      PICS: MCORE.IDM.S.Attribute_W.DataType_Enum
       verification: |
           The cluster used in the below command is an example, User can use any supported chip cluster.
 
@@ -286,8 +298,9 @@
       disabled: true
 
     - label:
-          "[Optional] TH sends the WriteRequestMessage to the DUT to write an
-          attribute of data type bitmap."
+          "TH sends the WriteRequestMessage to the DUT to write an attribute of
+          data type bitmap. +"
+      PICS: MCORE.IDM.S.Attribute_W.DataType_Bitmap
       verification: |
           The cluster used in the below command is an example, User can use any supported chip cluster.
 
@@ -496,43 +509,68 @@
       verification: |
           The cluster used in the below command is an example, User can use any supported chip cluster.
 
+
           To Setup the TH such that it should not have the privilege for the cluster in the path. , 1st we need to send below mentioned ACL command
-          Here by sending below mentioned ACL command giving only access for identify cluster(3), So except identify cluster command if try to send any other command will get status as unsupported access.
+          Here by sending below mentioned ACL command giving only access for ACL cluster(31), So except identify cluster command if try to send any other command will get status as unsupported access.
 
-           ./chip-tool accesscontrol write acl '[{"fabricIndex": 1, "privilege": 5, "authMode": 2, "subjects": [112233], "targets":[{ "cluster": 3, "endpoint": 1, "deviceType": null }]}]' 1 0
+          ./chip-tool accesscontrol write acl "[{"fabricIndex": 1, "privilege": 5, "authMode": 2, "subjects":[1,112233], "targets": [{ "cluster":31, "endpoint":0, "deviceType":null }]}]" 1 0
+          [1659419722.669629][1915:1920] CHIP:DMG: WriteResponseMessage =
+          [1659419722.669657][1915:1920] CHIP:DMG: {
+          [1659419722.669687][1915:1920] CHIP:DMG:         AttributeStatusIBs =
+          [1659419722.669727][1915:1920] CHIP:DMG:         [
+          [1659419722.669758][1915:1920] CHIP:DMG:                 AttributeStatusIB =
+          [1659419722.669796][1915:1920] CHIP:DMG:                 {
+          [1659419722.669833][1915:1920] CHIP:DMG:                         AttributePathIB =
+          [1659419722.669871][1915:1920] CHIP:DMG:                         {
+          [1659419722.669912][1915:1920] CHIP:DMG:                                 Endpoint = 0x0,
+          [1659419722.669953][1915:1920] CHIP:DMG:                                 Cluster = 0x1f,
+          [1659419722.669993][1915:1920] CHIP:DMG:                                 Attribute = 0x0000_0000,
+          [1659419722.670034][1915:1920] CHIP:DMG:                         }
+          [1659419722.670077][1915:1920] CHIP:DMG:
+          [1659419722.670114][1915:1920] CHIP:DMG:                         StatusIB =
+          [1659419722.670153][1915:1920] CHIP:DMG:                         {
+          [1659419722.670191][1915:1920] CHIP:DMG:                                 status = 0x00 (SUCCESS),
+          [1659419722.670229][1915:1920] CHIP:DMG:                         },
+          [1659419722.670266][1915:1920] CHIP:DMG:
+          [1659419722.670300][1915:1920] CHIP:DMG:                 },
+          [1659419722.670343][1915:1920] CHIP:DMG:
+          [1659419722.670373][1915:1920] CHIP:DMG:                 AttributeStatusIB =
+          [1659419722.670405][1915:1920] CHIP:DMG:                 {
+          [1659419722.670436][1915:1920] CHIP:DMG:                         AttributePathIB =
+          [1659419722.670471][1915:1920] CHIP:DMG:                         {
+          [1659419722.670510][1915:1920] CHIP:DMG:                                 Endpoint = 0x0,
+          [1659419722.670550][1915:1920] CHIP:DMG:                                 Cluster = 0x1f,
+          [1659419722.670590][1915:1920] CHIP:DMG:                                 Attribute = 0x0000_0000,
+          [1659419722.670661][1915:1920] CHIP:DMG:                                 ListIndex = Null,
+          [1659419722.670700][1915:1920] CHIP:DMG:                         }
+          [1659419722.670740][1915:1920] CHIP:DMG:
+          [1659419722.670776][1915:1920] CHIP:DMG:                         StatusIB =
+          [1659419722.670813][1915:1920] CHIP:DMG:                         {
+          [1659419722.670851][1915:1920] CHIP:DMG:                                 status = 0x00 (SUCCESS),
+          [1659419722.670888][1915:1920] CHIP:DMG:                         },
+          [1659419722.670925][1915:1920] CHIP:DMG:
+          [1659419722.670958][1915:1920] CHIP:DMG:                 },
+          [1659419722.670994][1915:1920] CHIP:DMG:
+          [1659419722.671022][1915:1920] CHIP:DMG:         ],
+          [1659419722.671062][1915:1920] CHIP:DMG:
+          [1659419722.671092][1915:1920] CHIP:DMG:         InteractionModelRevision = 1
+          [1659419722.671120][1915:1920] CHIP:DMG: }
+          [1659419722.671244][1915:1920] CHIP:DMG: WriteClient moving to [AwaitingDe]
+          [1659419722.671314][1915:1920] CHIP:EM: Sending Standalone Ack for MessageCounter:153124628 on
 
-          sudo ./chip-tool thermostatuserinterfaceconfiguration write temperature-display-mode 2 1 1
 
-          verify DUT is responsds with UNSUPPORTED_ACCESS  for the data sent in the above command
 
-          [1650552778.852950][17227:17232] CHIP:DMG: WriteResponseMessage =
-          [1650552778.852981][17227:17232] CHIP:DMG: {
-          [1650552778.853009][17227:17232] CHIP:DMG:         AttributeStatusIBs =
-          [1650552778.853058][17227:17232] CHIP:DMG:         [
-          [1650552778.853089][17227:17232] CHIP:DMG:                 AttributeStatusIB =
-          [1650552778.853127][17227:17232] CHIP:DMG:                 {
-          [1650552778.853162][17227:17232] CHIP:DMG:                         AttributePathIB =
-          [1650552778.853203][17227:17232] CHIP:DMG:                         {
-          [1650552778.853241][17227:17232] CHIP:DMG:                                 Endpoint = 0x1,
-          [1650552778.853282][17227:17232] CHIP:DMG:                                 Cluster = 0x204,
-          [1650552778.853324][17227:17232] CHIP:DMG:                                 Attribute = 0x0000_0000,
-          [1650552778.853366][17227:17232] CHIP:DMG:                         }
-          [1650552778.853413][17227:17232] CHIP:DMG:
-          [1650552778.853454][17227:17232] CHIP:DMG:                         StatusIB =
-          [1650552778.853490][17227:17232] CHIP:DMG:                         {
-          [1650552778.853531][17227:17232] CHIP:DMG:                                 status = 0x7e (UNSUPPORTED_ACCESS),
-          [1650552778.853566][17227:17232] CHIP:DMG:                         },
-          [1650552778.853608][17227:17232] CHIP:DMG:
-          [1650552778.853642][17227:17232] CHIP:DMG:                 },
-          [1650552778.853680][17227:17232] CHIP:DMG:
-          [1650552778.853712][17227:17232] CHIP:DMG:         ],
-          [1650552778.853751][17227:17232] CHIP:DMG:
-          [1650552778.853780][17227:17232] CHIP:DMG:         InteractionModelRevision = 1
-          [1650552778.853813][17227:17232] CHIP:DMG: }
-          [1650552778.853890][17227:17232] CHIP:TOO: Response Failure: IM Error 0x0000057E: General error: 0x7e (UNSUPPORTED_ACCESS)
-          [1650552778.853935][17227:17232] CHIP:DMG: WriteClient moving to [AwaitingDe]
+          ./chip-tool thermostatuserinterfaceconfiguration write temperature-display-mode 2 1 1
+          On TH, verify DUT  responsds as UNSUPPORTED_ACCESS  for the data sent in the above command
+          [1659422521.638063][2076:2081] CHIP:DMG: }
+          [1659422521.638147][2076:2081] CHIP:DMG: WriteClient moving to [AwaitingDe]
+          [1659422521.638185][2076:2081] CHIP:TOO: Response Failure: IM Error 0x0000057E: General error: 0x7e (UNSUPPORTED_ACCESS)
+          [1659422521.638246][2076:2081] CHIP:EM: Sending Standalone Ack for MessageCounter:223304501 on exchange 20701i
 
-          With the above command, we are overwriting the default privilege that chip-tool has as an admin. After this test step you need to factory reset the DUT and reprovision the DUT again, Otherwise the below steps can not be executed.
+
+          With the above command, we are overwriting the default privilege that chip-tool has as an admin. After this test step you need to  send below mentioned command to Grant access to all clusters again.
+
+          ./chip-tool accesscontrol write acl "[{"fabricIndex": 1, "privilege": 5, "authMode":2, "subjects":[112233], "targets":null}]" 1 0
       disabled: true
 
     - label:
@@ -612,28 +650,28 @@
 
     - label:
           "TH sends the WriteRequestMessage to the DUT to modify the value of
-          one attribute on a given cluster and endpoint to null."
+          one attribute on a given cluster and endpoint to null. +"
       verification: |
           Out of Scope for V1.0
       disabled: true
 
     - label:
           "TH sends the WriteRequestMessage to the DUT to append an attribute
-          value"
+          value +"
       verification: |
           Out of Scope for V1.0
       disabled: true
 
     - label:
           "TH sends the WriteRequestMessage to the DUT to delete an attribute
-          value"
+          value +"
       verification: |
           Out of Scope for V1.0
       disabled: true
 
     - label:
           "TH sends the WriteRequestMessage to the DUT to modify the value of
-          one attribute and Set SuppressResponse to True."
+          one attribute and Set SuppressResponse to True. +"
       verification: |
           Out of Scope for V1.0
       disabled: true
@@ -643,7 +681,8 @@
           any cluster. DUT returns with a report data action with the attribute
           values and the dataversion of the cluster. TH sends a
           WriteRequestMessage to the DUT to modify the value of one attribute
-          with the DataVersion field set to the one received in the prior step."
+          with the DataVersion field set to the one received in the prior step.
+          +"
       verification: |
           The cluster used in the below command is an example, User can use any supported chip cluster.
 
diff --git a/src/app/tests/suites/certification/Test_TC_IDM_4_1.yaml b/src/app/tests/suites/certification/Test_TC_IDM_4_1.yaml
index 025efaa..f22a140 100644
--- a/src/app/tests/suites/certification/Test_TC_IDM_4_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_IDM_4_1.yaml
@@ -17,6 +17,9 @@
     3.4.1. [TC-IDM-4.1] SubscriptionRequestMessage from DUT test cases.
     [{DUT_Client}]
 
+PICS:
+    - MCORE.IDM.C.SubscribeRequest
+
 config:
     nodeId: 0x12344321
     cluster: "Basic"
@@ -455,6 +458,15 @@
       disabled: true
 
     - label:
+          "[OPTIONAL] Activate the subscription between the DUT and the TH for
+          an attribute of data type list. Modify that attribute on the TH. TH
+          should send the modified data to the DUT. Modify the attribute
+          multiple times (3 times)"
+      verification: |
+          DUT implementation required to verify subscribe and list an attribute of data type list
+      disabled: true
+
+    - label:
           "Activate the subscription between the DUT and the TH for an
           attribute. Force the TH to not send any report data for the duration
           of the maximum interval. After the maximum interval, TH sends a report
@@ -551,145 +563,3 @@
           [1657884990.170169][2938:2943] CHIP:DMG: }
           [1657884990.170223][2938:2943] CHIP:DMG: Subscription established with SubscriptionID = 0x496bb4cf MinInterval = 10s MaxInterval = 100s Peer = 01:0000000000000001
       disabled: true
-
-    - label:
-          "[OPTIONAL] Activate the subscription between the DUT and the TH for
-          an attribute of data type list. Modify that attribute on the TH. TH
-          should send the modified data to the DUT. Modify the attribute
-          multiple times (3 times)"
-      verification: |
-          DUT implementation required to verify subscribe and list an attribute of data type floating point
-      disabled: true
-
-    - label:
-          "DUT sends a subscription request action for an attribute with an
-          empty DataVersionFilters field.+ TH sends a report data action with
-          the data of the attribute along with the data version. Tear down the
-          subscription for that attribute. Start another subscription with the
-          DataVersionFilter field set to the data version received above."
-      verification: |
-          In the case of chip tool as a client, here is an example command the client can subscribe to the TH
-
-           onoff  subscribe on-off   10 80  1 1
-
-           On TH(Reference app) verify the report data action with the data of the attribute along with the data version
-          [1657885412.662766][2748:2748] CHIP:DMG: SubscribeRequestMessage =
-          [1657885412.662793][2748:2748] CHIP:DMG: {
-          [1657885412.662816][2748:2748] CHIP:DMG:         KeepSubscriptions = false,
-          [1657885412.662842][2748:2748] CHIP:DMG:         MinIntervalFloorSeconds = 0xa,
-          [1657885412.662868][2748:2748] CHIP:DMG:         MaxIntervalCeilingSeconds = 0x50,
-          [1657885412.662892][2748:2748] CHIP:DMG:         AttributePathIBs =
-          [1657885412.662917][2748:2748] CHIP:DMG:         [
-          [1657885412.662941][2748:2748] CHIP:DMG:                 AttributePathIB =
-          [1657885412.662967][2748:2748] CHIP:DMG:                 {
-          [1657885412.662995][2748:2748] CHIP:DMG:                         Endpoint = 0x1,
-          [1657885412.663030][2748:2748] CHIP:DMG:                         Cluster = 0x6,
-          [1657885412.663061][2748:2748] CHIP:DMG:                         Attribute = 0x0000_0000,
-          [1657885412.663089][2748:2748] CHIP:DMG:                 }
-          [1657885412.663119][2748:2748] CHIP:DMG:
-          [1657885412.663145][2748:2748] CHIP:DMG:         ],
-          [1657885412.663172][2748:2748] CHIP:DMG:
-          [1657885412.663199][2748:2748] CHIP:DMG:         isFabricFiltered = true,
-          [1657885412.663223][2748:2748] CHIP:DMG:         InteractionModelRevision = 1
-          [1657885412.663245][2748:2748] CHIP:DMG: },
-          [1657885412.663314][2748:2748] CHIP:DMG: Final negotiated min/max parameters: Min = 10s, Max = 80s
-
-
-          On DUT as a client side, verify that TH all-clusters-app sent Subscription report with unic subscriptionID
-          [1657885412.620231][2979:2984] CHIP:DMG: ReportDataMessage =
-          [1657885412.620274][2979:2984] CHIP:DMG: {
-          [1657885412.620300][2979:2984] CHIP:DMG:         SubscriptionId = 0x5ccc5161,
-          [1657885412.620326][2979:2984] CHIP:DMG:         AttributeReportIBs =
-          [1657885412.620368][2979:2984] CHIP:DMG:         [
-          [1657885412.620393][2979:2984] CHIP:DMG:                 AttributeReportIB =
-          [1657885412.620442][2979:2984] CHIP:DMG:                 {
-          [1657885412.620480][2979:2984] CHIP:DMG:                         AttributeDataIB =
-          [1657885412.620510][2979:2984] CHIP:DMG:                         {
-          [1657885412.620551][2979:2984] CHIP:DMG:                                 DataVersion = 0x42da0cab,
-          [1657885412.620581][2979:2984] CHIP:DMG:                                 AttributePathIB =
-          [1657885412.620622][2979:2984] CHIP:DMG:                                 {
-          [1657885412.620655][2979:2984] CHIP:DMG:                                         Endpoint = 0x1,
-          [1657885412.620699][2979:2984] CHIP:DMG:                                         Cluster = 0x6,
-          [1657885412.620742][2979:2984] CHIP:DMG:                                         Attribute = 0x0000_0000,
-          [1657885412.620773][2979:2984] CHIP:DMG:                                 }
-          [1657885412.620816][2979:2984] CHIP:DMG:
-          [1657885412.620859][2979:2984] CHIP:DMG:                                 Data = false,
-          [1657885412.620889][2979:2984] CHIP:DMG:                         },
-          [1657885412.620929][2979:2984] CHIP:DMG:
-          [1657885412.620955][2979:2984] CHIP:DMG:                 },
-          [1657885412.620996][2979:2984] CHIP:DMG:
-          [1657885412.621021][2979:2984] CHIP:DMG:         ],
-          [1657885412.621063][2979:2984] CHIP:DMG:
-          [1657885412.621087][2979:2984] CHIP:DMG:         InteractionModelRevision = 1
-          [1657885412.621120][2979:2984] CHIP:DMG: }
-          [1657885412.621284][2979:2984] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0006 Attribute 0x0000_0000 DataVersion: 1121586347
-          [1657885412.621346][2979:2984] CHIP:TOO:   OnOff: FALSE
-          [1657885412.621399][2979:2984] CHIP:DMG: MoveToState ReadClient[0xffffa40091f0]: Moving to [AwaitingSu]
-
-
-           On TH(Reference app) verify  Attribute data is not sent for the second subscription,  when Start another subscription with the DataVersionFilter field set to the data version received above
-
-          onoff  subscribe on-off   10 50  1 1 --data-version 0x42da0cab
-
-
-          On TH (On the reference app) Verify if DUT is responding with the below status response for the above command
-          [1657885449.497461][2748:2748] CHIP:DMG: SubscribeRequestMessage =
-          [1657885449.497490][2748:2748] CHIP:DMG: {
-          [1657885449.497514][2748:2748] CHIP:DMG:         KeepSubscriptions = false,
-          [1657885449.497540][2748:2748] CHIP:DMG:         MinIntervalFloorSeconds = 0xa,
-          [1657885449.497567][2748:2748] CHIP:DMG:         MaxIntervalCeilingSeconds = 0x32,
-          [1657885449.497592][2748:2748] CHIP:DMG:         AttributePathIBs =
-          [1657885449.497617][2748:2748] CHIP:DMG:         [
-          [1657885449.497641][2748:2748] CHIP:DMG:                 AttributePathIB =
-          [1657885449.497668][2748:2748] CHIP:DMG:                 {
-          [1657885449.497696][2748:2748] CHIP:DMG:                         Endpoint = 0x1,
-          [1657885449.497742][2748:2748] CHIP:DMG:                         Cluster = 0x6,
-          [1657885449.497772][2748:2748] CHIP:DMG:                         Attribute = 0x0000_0000,
-          [1657885449.497799][2748:2748] CHIP:DMG:                 }
-          [1657885449.497827][2748:2748] CHIP:DMG:
-          [1657885449.497853][2748:2748] CHIP:DMG:         ],
-          [1657885449.497880][2748:2748] CHIP:DMG:
-          [1657885449.497906][2748:2748] CHIP:DMG:         isFabricFiltered = true,
-          [1657885449.497930][2748:2748] CHIP:DMG:         DataVersionFilterIBs =
-          [1657885449.497960][2748:2748] CHIP:DMG:         [
-          [1657885449.497984][2748:2748] CHIP:DMG:                 DataVersionFilterIB =
-          [1657885449.498011][2748:2748] CHIP:DMG:                 {
-          [1657885449.498036][2748:2748] CHIP:DMG:                         ClusterPathIB =
-          [1657885449.498064][2748:2748] CHIP:DMG:                         {
-          [1657885449.498093][2748:2748] CHIP:DMG:                                 Endpoint = 0x1,
-          [1657885449.498122][2748:2748] CHIP:DMG:                                 Cluster = 0x6,
-          [1657885449.498150][2748:2748] CHIP:DMG:                         }
-          [1657885449.498180][2748:2748] CHIP:DMG:
-          [1657885449.498209][2748:2748] CHIP:DMG:                         DataVersion = 0x42da0cab,
-          [1657885449.498236][2748:2748] CHIP:DMG:                 },
-          [1657885449.498263][2748:2748] CHIP:DMG:
-          [1657885449.498287][2748:2748] CHIP:DMG:         ],
-          [1657885449.498315][2748:2748] CHIP:DMG:
-          [1657885449.498339][2748:2748] CHIP:DMG:         InteractionModelRevision = 1
-          [1657885449.498362][2748:2748] CHIP:DMG: },
-          [1657885449.498459][2748:2748] CHIP:DMG: Final negotiated min/max parameters: Min = 10s, Max = 50s
-
-
-          On DUT as a client side, verify that TH all-clusters-app sent Subscription report with unic subscriptionID
-          [1657885449.455150][2979:2984] CHIP:EM: Removed CHIP MessageCounter:157900434 from RetransTable on exchange 50588i
-          [1657885449.455222][2979:2984] CHIP:DMG: ReportDataMessage =
-          [1657885449.455284][2979:2984] CHIP:DMG: {
-          [1657885449.455321][2979:2984] CHIP:DMG:         SubscriptionId = 0xd9b77c33,
-          [1657885449.455375][2979:2984] CHIP:DMG:         InteractionModelRevision = 1
-          [1657885449.455410][2979:2984] CHIP:DMG: }
-          [1657885449.455480][2979:2984] CHIP:DMG: MoveToState ReadClient[0xffffa40092e0]: Moving to [AwaitingSu]
-          [1657885449.455561][2979:2984] CHIP:EM: Piggybacking Ack for MessageCounter:260146719 on exchange: 50588i
-          [1657885449.455651][2979:2984] CHIP:IN: Prepared secure message 0xffffa4000d48 to 0x0000000000000001 (1)  of type 0x1 and protocolId (0, 1) on exchange 50588i with MessageCounter:157900435.
-          [1657885449.455704][2979:2984] CHIP:IN: Sending encrypted msg 0xffffa4000d48 with MessageCounter:157900435 to 0x0000000000000001 (1) at monotonic time: 00000000007C69C7 msec
-          [1657885449.456845][2979:2984] CHIP:EM: Received message of type 0x4 with protocolId (0, 1) and MessageCounter:260146720 on exchange 50588i
-          [1657885449.456892][2979:2984] CHIP:EM: Found matching exchange: 50588i, Delegate: 0xffffa40092e0
-          [1657885449.456937][2979:2984] CHIP:EM: Rxd Ack; Removing MessageCounter:157900435 from Retrans Table on exchange 50588i
-          [1657885449.456973][2979:2984] CHIP:EM: Removed CHIP MessageCounter:157900435 from RetransTable on exchange 50588i
-          [1657885449.457029][2979:2984] CHIP:DMG: SubscribeResponseMessage =
-          [1657885449.457068][2979:2984] CHIP:DMG: {
-          [1657885449.457106][2979:2984] CHIP:DMG:         SubscriptionId = 0xd9b77c33,
-          [1657885449.457148][2979:2984] CHIP:DMG:         MaxInterval = 0x32,
-          [1657885449.457186][2979:2984] CHIP:DMG:         InteractionModelRevision = 1
-          [1657885449.457221][2979:2984] CHIP:DMG: }
-          [1657885449.457260][2979:2984] CHIP:DMG: Subscription established with SubscriptionID = 0xd9b77c33 MinInterval = 10s MaxInterval = 50s Peer = 01:0000000000000001
-      disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_IDM_4_2.yaml b/src/app/tests/suites/certification/Test_TC_IDM_4_2.yaml
index c7cfe9d..64ef2bc 100644
--- a/src/app/tests/suites/certification/Test_TC_IDM_4_2.yaml
+++ b/src/app/tests/suites/certification/Test_TC_IDM_4_2.yaml
@@ -17,6 +17,9 @@
     3.4.2. [TC-IDM-4.2] Subscription Response Messages from DUT Test Cases.
     [{DUT_Server}]
 
+PICS:
+    - MCORE.IDM.S
+
 config:
     nodeId: 0x12344321
     cluster: "Basic"
@@ -144,52 +147,7 @@
           subscribe to all attributes for which it does not have access.
           AttributePath = [[Cluster = ClusterID, Endpoint = EndpointID ]]."
       verification: |
-          The cluster used in the below command is an example, User can use any supported chip cluster.
-
-          To Setup the TH such that it should not have the privilege for the cluster in the path. , 1st we need to send below mentioned ACL command
-          Here by sending below mentioned ACL command giving only access for identify cluster(3), So except identify cluster command if try to send any other command will get status as unsupported access.
-
-          accesscontrol write acl '[{"fabricIndex": 1, "privilege": 5, "authMode": 2, "subjects": [112233], "targets":[{ "cluster": 3, "endpoint": 1, "deviceType": null }]}]' 1 0
-
-
-          any subscribe-by-id 0006 0 10 100 2 1
-
-          verify DUT is responsds with UNSUPPORTED_ACCESS  for the data sent in the above command
-          [1657450420.472568][8713:8718] CHIP:DMG: ReportDataMessage =
-          [1657450420.472633][8713:8718] CHIP:DMG: {
-          [1657450420.472694][8713:8718] CHIP:DMG:        SubscriptionId = 0xa70693c2,
-          [1657450420.472756][8713:8718] CHIP:DMG:        AttributeReportIBs =
-          [1657450420.472830][8713:8718] CHIP:DMG:        [
-          [1657450420.472889][8713:8718] CHIP:DMG:                AttributeReportIB =
-          [1657450420.472972][8713:8718] CHIP:DMG:                {
-          [1657450420.473036][8713:8718] CHIP:DMG:                        AttributeStatusIB =
-          [1657450420.473110][8713:8718] CHIP:DMG:                        {
-          [1657450420.473185][8713:8718] CHIP:DMG:                                AttributePathIB =
-          [1657450420.473267][8713:8718] CHIP:DMG:                                {
-          [1657450420.473350][8713:8718] CHIP:DMG:                                        Endpoint = 0x1,
-          [1657450420.473437][8713:8718] CHIP:DMG:                                        Cluster = 0x6,
-          [1657450420.473522][8713:8718] CHIP:DMG:                                        Attribute = 0x0000_0000,
-          [1657450420.473603][8713:8718] CHIP:DMG:                                }
-          [1657450420.473658][8713:8718] CHIP:DMG:
-          [1657450420.473694][8713:8718] CHIP:DMG:                                StatusIB =
-          [1657450420.473785][8713:8718] CHIP:DMG:                                {
-          [1657450420.473823][8713:8718] CHIP:DMG:                                        status = 0x7e (UNSUPPORTED_ACCESS),
-          [1657450420.473857][8713:8718] CHIP:DMG:                                },
-          [1657450420.473895][8713:8718] CHIP:DMG:
-          [1657450420.473927][8713:8718] CHIP:DMG:                        },
-          [1657450420.473962][8713:8718] CHIP:DMG:
-          [1657450420.473991][8713:8718] CHIP:DMG:                },
-          [1657450420.474022][8713:8718] CHIP:DMG:
-          [1657450420.474046][8713:8718] CHIP:DMG:        ],
-          [1657450420.474078][8713:8718] CHIP:DMG:
-          [1657450420.474103][8713:8718] CHIP:DMG:        InteractionModelRevision = 1
-          [1657450420.474128][8713:8718] CHIP:DMG: }
-          [1657450420.474229][8713:8718] CHIP:TOO: Response Failure: IM Error 0x0000057E: General error: 0x7e (UNSUPPORTED_ACCESS)
-          [1657450420.474271][8713:8718] CHIP:DMG: MoveToState ReadClient[0xffffa4008e40]: Moving to [AwaitingSu]
-
-
-
-          With the above command, we are overwriting the default privilege that chip-tool has as an admin. After this test step you need to factory reset the DUT and reprovision the DUT again, Otherwise the below steps can not be executed.
+          https://github.com/CHIP-Specifications/chip-test-plans/issues/1700
       disabled: true
 
     - label:
@@ -200,10 +158,10 @@
       verification: |
           The cluster used in the below command is an example, User can use any supported chip cluster.
 
-          To Setup the TH such that it should not have the privilege for the cluster in the path. , 1st we need to send below mentioned ACL command
+          To Setup the TH2 such that it should not have the privilege for the cluster in the path. , 1st we need to send below mentioned ACL command
           Here by sending below mentioned ACL command giving only access for identify cluster(3), So except identify cluster command if try to send any other command will get status as unsupported access.
 
-           accesscontrol write acl '[{"fabricIndex": 1, "privilege": 5, "authMode": 2, "subjects": [112233], "targets":[{ "cluster": 3, "endpoint": 1, "deviceType": null }]}]' 1 0
+           accesscontrol write acl "[{"fabricIndex": 1, "privilege": 5, "authMode": 2, "subjects": [112233], "targets":[{ "cluster": 3, "endpoint": 1, "deviceType": null }]}]" 1 0
 
           thermostatuserinterfaceconfiguration subscribe temperature-display-mode 100 1000 1 1
 
@@ -251,7 +209,7 @@
           all endpoints on a Node for which it does not have access.
           AttributePath = [[ ]]."
       verification: |
-          Out of Scope for V1.0
+          https://github.com/CHIP-Specifications/chip-test-plans/issues/1700
       disabled: true
 
     - label:
@@ -368,7 +326,7 @@
 
     - label:
           "TH sends a subscription request action for an attribute and set the
-          MinIntervalFloor value to be greater than MaxIntervalCeiling."
+          MinIntervalFloor value to be greater than MaxIntervalCeiling. +"
       verification: |
           The cluster used in the below command is an example, User can use any supported chip cluster.
 
@@ -388,7 +346,7 @@
     - label:
           "TH sends a subscription request to subscribe to a specific global
           attribute from all clusters on all endpoints. AttributePath =
-          [[Attribute = Global Attribute]]."
+          [[Attribute = Global Attribute]]. +"
       verification: |
           The cluster used in the below command is an example, User can use any supported chip cluster.
 
@@ -400,7 +358,7 @@
     - label:
           "TH sends a subscription request to subscribe to a global attribute on
           an endpoint on all clusters. AttributePath = [[Attribute = Global
-          Attribute, Endpoint = EndpointID ]]."
+          Attribute, Endpoint = EndpointID ]]. +"
       verification: |
           The cluster used in the below command is an example, User can use any supported chip cluster.
 
diff --git a/src/app/tests/suites/certification/Test_TC_IDM_4_3.yaml b/src/app/tests/suites/certification/Test_TC_IDM_4_3.yaml
index b906bce..4afd862 100644
--- a/src/app/tests/suites/certification/Test_TC_IDM_4_3.yaml
+++ b/src/app/tests/suites/certification/Test_TC_IDM_4_3.yaml
@@ -17,6 +17,9 @@
     3.4.3. [TC-IDM-4.3] Report Data Messages post Subscription Activation from
     DUT Test Cases. [{DUT_Server}]
 
+PICS:
+    - MCORE.IDM.S
+
 config:
     nodeId: 0x12344321
     cluster: "Basic"
@@ -35,7 +38,7 @@
     - label:
           "DUT and TH activate the subscription. Change the value of the
           attribute which has been subscribed on the DUT by sending an IMWrite
-          or Invoke message to the DUT from the TH."
+          or Invoke message to the DUT from the TH. +"
       verification: |
           The cluster used in the below command is an example, User can use any supported chip cluster.
 
@@ -160,20 +163,21 @@
       disabled: true
 
     - label:
-          'DUT and TH activate the subscription. Change the value of the
+          "DUT and TH activate the subscription. Change the value of the
           attribute which has been subscribed on the DUT. TH force sends a
-          status response with an "inactive subscription". Change the value of
-          the attribute which has been subscribed on the DUT.'
+          status response with an inactive subscription. Change the value of the
+          attribute which has been subscribed on the DUT."
       verification: |
-          This tester needs to be tested by changing the controls available in the DUT and then read the value.  And can't be tested with RPI& has dependency of Vendor specific DUT support.
+          This tester needs to be tested by changing the controls available in the DUT and then read the value.  And can"t be tested with RPI& has dependency of Vendor specific DUT support.
       disabled: true
 
     - label:
-          "[OPTIONAL] Activate the subscription between the DUT and the TH for
-          an attribute of data type bool. Modify that attribute on the DUT. DUT
-          should send the report data with the modified attribute value. Modify
-          the attribute multiple times (3 times) before the max interval time
+          "Activate the subscription between the DUT and the TH for an attribute
+          of data type bool. Modify that attribute on the DUT. DUT should send
+          the report data with the modified attribute value. Modify the
+          attribute multiple times (3 times) before the max interval time
           specified during the subscription activation."
+      PICS: MCORE.IDM.S.Attribute.DataType_Bool
       verification: |
           The cluster used in the below command is an example, User can use any supported chip cluster.
 
@@ -254,11 +258,12 @@
       disabled: true
 
     - label:
-          "[OPTIONAL] Activate the subscription between the DUT and the TH for
-          an attribute of data type string. Modify that attribute on the DUT.
-          DUT should send the report data with the modified attribute value
-          Modify the attribute multiple times (3 times) before the max interval
-          time specified during the subscription activation."
+          "Activate the subscription between the DUT and the TH for an attribute
+          of data type string. Modify that attribute on the DUT. DUT should send
+          the report data with the modified attribute value Modify the attribute
+          multiple times (3 times) before the max interval time specified during
+          the subscription activation."
+      PICS: MCORE.IDM.S.Attribute.DataType_String
       verification: |
           The cluster used in the below command is an example, User can use any supported chip cluster.
 
@@ -298,7 +303,7 @@
           [1657452002.282628][11635:11640] CHIP:TOO:   NodeLabel: new
           [1657452002.282717][11635:11640] CHIP:DMG: MoveToState ReadClient[0xffff940092b0]: Moving to [AwaitingSu]
 
-
+          here is an example command the TH can write an attribute in the basic cluster in the DUT to change the value that the TH subscribed in the above command.
            basic write node-label sve 1 0
           [1657452091.179574][11635:11640] CHIP:EM: Handling via exchange: 8527r, Delegate: 0xaaaacf201a78
           [1657452091.179661][11635:11640] CHIP:DMG: ReportDataMessage =
@@ -337,11 +342,12 @@
       disabled: true
 
     - label:
-          '[OPTIONAL] Activate the subscription between the DUT and the TH for
-          an attribute of data type "unsigned integer". Modify that attribute on
-          the DUT. DUT should send the report data with the modified attribute
-          value. Modify the attribute multiple times (3 times) before the max
-          interval time specified during the subscription activation.'
+          "Activate the subscription between the DUT and the TH for an attribute
+          of data type unsigned integer. Modify that attribute on the DUT. DUT
+          should send the report data with the modified attribute value. Modify
+          the attribute multiple times (3 times) before the max interval time
+          specified during the subscription activation."
+      PICS: MCORE.IDM.S.Attribute.DataType_UnsignedInteger
       verification: |
           The cluster used in the below command is an example, User can use any supported chip cluster.
 
@@ -380,6 +386,7 @@
           [1657452196.620215][11635:11640] CHIP:TOO:   on off transition time: 1
           [1657452196.620308][11635:11640] CHIP:DMG: MoveToState ReadClient[0xffff94005b60]: Moving to [AwaitingSu]
 
+          here is an example command the TH can write an attribute in the levelcontrol cluster in the DUT to change the value that the TH subscribed in the above command.
           any write-by-id  0x0008 0x0010 1 1 1
           [1657452254.600544][11635:11640] CHIP:EM: Handling via exchange: 8529r, Delegate: 0xaaaacf201a78
           [1657452254.600720][11635:11640] CHIP:DMG: ReportDataMessage =
@@ -419,31 +426,34 @@
       disabled: true
 
     - label:
-          '[OPTIONAL] Activate the subscription between the DUT and the TH for
-          an attribute of data type "signed integer". Modify that attribute on
-          the DUT. DUT should send the report data with the modified attribute
-          value. Modify the attribute multiple times (3 times)before the max
-          interval time specified during the subscription activation.'
+          "Activate the subscription between the DUT and the TH for an attribute
+          of data type signed integer. Modify that attribute on the DUT. DUT
+          should send the report data with the modified attribute value. Modify
+          the attribute multiple times (3 times)before the max interval time
+          specified during the subscription activation."
+      PICS: MCORE.IDM.S.Attribute.DataType_SignedInteger
       verification: |
           Subscribe to an attribute of type signed integer to the Harness
       disabled: true
 
     - label:
-          '[OPTIONAL] Activate the subscription between the DUT and the TH for
-          an attribute of data type "floating point". Modify that attribute on
-          the DUT. DUT should send the report data with the modified attribute
-          value. Modify the attribute multiple times (3 times) before the max
-          interval time specified during the subscription activation.'
+          "Activate the subscription between the DUT and the TH for an attribute
+          of data type floating point. Modify that attribute on the DUT. DUT
+          should send the report data with the modified attribute value. Modify
+          the attribute multiple times (3 times) before the max interval time
+          specified during the subscription activation."
+      PICS: MCORE.IDM.S.Attribute.DataType_FloatingPoint
       verification: |
           Subscribe to an attribute of type floating point to the Harness
       disabled: true
 
     - label:
-          "[OPTIONAL] Activate the subscription between the DUT and the TH for
-          an attribute of data type list. Modify that attribute on the DUT. DUT
-          should send the report data with the modified attribute value. Modify
-          the attribute multiple times (3 times) before the max interval time
+          "Activate the subscription between the DUT and the TH for an attribute
+          of data type list. Modify that attribute on the DUT. DUT should send
+          the report data with the modified attribute value. Modify the
+          attribute multiple times (3 times) before the max interval time
           specified during the subscription activation."
+      PICS: MCORE.IDM.S.Attribute.DataType_List
       verification: |
           The cluster used in the below command is an example, User can use any supported chip cluster.
 
@@ -455,8 +465,8 @@
           [1655896309.160795][1885:1890] CHIP:TOO:   label list: 0 entries
           [1655896309.160851][1885:1890] CHIP:DMG: MoveToState ReadClient[0xffffa0005710]: Moving to [AwaitingSu]
 
-
-           userlabel write label-list '[{"label":"room", "value":"bedroom 1"}, {"label":"orientation", "value":"east"}]' 1 0
+          here is an example command the TH can write an attribute in the userlabel cluster in the DUT to change the value that the TH subscribed in the above command.
+           userlabel write label-list "[{"label":"room", "value":"bedroom 1"}, {"label":"orientation", "value":"east"}]" 1 0
 
           ./chip-tool userlabel subscribe label-list 100 500 1 0
           [1655896422.936972][1899:1904] CHIP:DMG: }
@@ -632,7 +642,7 @@
           [1657453503.540798][11635:11640] CHIP:DMG: MoveToState ReadClient[0xffff94005b60]: Moving to [AwaitingSu]
 
 
-
+          here is an example command the TH can write an attribute in the levelcontrol cluster in the DUT to change the value that the TH subscribed in the above command.
           levelcontrol write   on-level 1 1 1
           [1657453616.542219][11635:11640] CHIP:EM: Handling via exchange: 8542r, Delegate: 0xaaaacf201a78
           [1657453616.542386][11635:11640] CHIP:DMG: ReportDataMessage =
@@ -705,7 +715,7 @@
           [1657453718.439173][11635:11640] CHIP:TOO:   OnTime: 0
           [1657453718.439260][11635:11640] CHIP:DMG: MoveToState ReadClient[0xffff94005970]: Moving to [AwaitingSu]
 
-           If you try to change attribute value by sending
+          here is an example command the TH can write an attribute in the onoff cluster in the DUT to change the value that the TH subscribed in the above command.
             onoff write on-time 1  1 1
           There are no attribute value changes before MaxInterval elapses
       disabled: true
@@ -722,7 +732,7 @@
           >>>  onoff subscribe off-wait-time 10 500 1 1 --keepSubscriptions 1
 
 
-          On TH verify that DUT is responds right attribute value for below command and then send write command to change the attribute value, verify the attribute value is modified or not for both attributes
+          On TH verify that DUT is responds right attribute value for above command and then send write command to change the attribute value, verify the attribute value is modified or not for both attributes
 
 
           [1657454078.091825][11635:11640] CHIP:DMG: ReportDataMessage =
@@ -786,6 +796,8 @@
           [1657454092.664339][11635:11640] CHIP:TOO:   OnTime: 1
           [1657454092.664427][11635:11640] CHIP:DMG: MoveToState ReadClient[0xffff94005b60]: Moving to [AwaitingSu]
 
+
+          here is an example command the TH can write an attribute in the onoff cluster in the DUT to change the value that the TH subscribed in the above command.
           onoff write off-wait-time 3 1 1
           [1657454115.799139][11635:11640] CHIP:DMG: ReportDataMessage =
           [1657454115.799209][11635:11640] CHIP:DMG: {
@@ -817,6 +829,8 @@
           [1657454115.801027][11635:11640] CHIP:TOO:   OffWaitTime: 3
           [1657454115.801076][11635:11640] CHIP:DMG: Refresh LivenessCheckTime for 525000 milliseconds with SubscriptionId = 0x732d29f8 Peer = 01:0000000000000001
 
+
+          here is an example command the TH can write an attribute in the onoff cluster in the DUT to change the value that the TH subscribed in the above command.
            onoff write on-time 2 1 1
           [1657454129.447088][11635:11640] CHIP:DMG: ReportDataMessage =
           [1657454129.447157][11635:11640] CHIP:DMG: {
@@ -861,9 +875,7 @@
 
           onoff subscribe on-time 10 100 1 1 --keepSubscriptions 1
 
-          On TH verify that DUT is responds right attribute value for below command and then send write command to change the attribute value, verify the attribute value is modified or not for both attributes. Verify that the first subscription is terminated after the MaxInterval of the first subscription is reached.
-
-
+          After sending above command verify that the subscription is activated between DUT and TH
           1657454443.310644][11635:11640] CHIP:DMG: ReportDataMessage =
           [1657454443.310712][11635:11640] CHIP:DMG: {
           [1657454443.310773][11635:11640] CHIP:DMG:      SubscriptionId = 0xae2db075,
@@ -912,6 +924,7 @@
 
 
           onoff subscribe off-wait-time 100 1000 1 1 --keepSubscriptions 0
+          After sending above command verify that the subscription is activated between DUT and TH. here keepSubscription field set false to terminate existing subscriptions from initiator
           [1657454614.583250][11635:11640] CHIP:EM: Removed CHIP MessageCounter:190733186 from RetransTable on exchange 33672i
           [1657454614.583348][11635:11640] CHIP:DMG: ReportDataMessage =
           [1657454614.583440][11635:11640] CHIP:DMG: {
@@ -943,7 +956,11 @@
           [1657454614.585029][11635:11640] CHIP:TOO:   OffWaitTime: 3
           [1657454614.585094][11635:11640] CHIP:DMG: MoveToState ReadClient[0xffff940092b0]: Moving to [AwaitingSu]
 
+          here is an example command the TH can write an attribute in the onoff cluster in the DUT to change the value that the TH subscribed in the above command.
+
+
           onoff write on-time 1 1 1
+           on TH Verify that  subscription is terminated after the MaxInterval of the first subscription is reached.
           [1657455187.367198][11635:11640] CHIP:DMG: ReportDataMessage =
           [1657455187.367281][11635:11640] CHIP:DMG: {
           [1657455187.367324][11635:11640] CHIP:DMG:      SubscriptionId = 0x50a6822b,
@@ -960,21 +977,18 @@
           [1657455187.367875][11635:11640] CHIP:DMG:                                      Cluster = 0x6,
           [1657455187.367934][11635:11640] CHIP:DMG:                                      Attribute = 0x0000_4001,
           [1657455187.367985][11635:11640] CHIP:DMG:                              }
-          [1657455187.368042][11635:11640] CHIP:DMG:
-          [1657455187.368094][11635:11640] CHIP:DMG:                              Data = 1,
-          [1657455187.368137][11635:11640] CHIP:DMG:                      },
-          [1657455187.368187][11635:11640] CHIP:DMG:
-          [1657455187.368226][11635:11640] CHIP:DMG:              },
-          [1657455187.368270][11635:11640] CHIP:DMG:
-          [1657455187.368306][11635:11640] CHIP:DMG:      ],
-          [1657455187.368351][11635:11640] CHIP:DMG:
-          [1657455187.368389][11635:11640] CHIP:DMG:      InteractionModelRevision = 1
-          [1657455187.368425][11635:11640] CHIP:DMG: }
-          [1657455187.368558][11635:11640] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0006 Attribute 0x0000_4001 DataVersion: 26713157
-          [1657455187.368613][11635:11640] CHIP:TOO:   OnTime: 1
-          [1657455187.368680][11635:11640] CHIP:DMG: Refresh LivenessCheckTime for 125000 milliseconds with SubscriptionId = 0x50a6822b Peer = 01:0000000000000001
+          [1657455187.788687][11635:11640] CHIP:DMG:                        StatusIB =
+          [1657455187.788687][11635:11640] CHIP:DMG:                         {
+          [1657455253.788687][11635:11640] CHIP:DMG:                                 status = 0x00 (SUCCESS),
+          [1657455187.788687][11635:11640] CHIP:DMG:                         },
+          [1657455187.788687][11635:11640] CHIP:DMG:
+          [1657455187.788687][11635:11640] CHIP:DMG:               },
 
-          sudo ./chip-tool onoff write off-wait-time 1 1 1
+          here is an example command the TH can write an attribute in the onoff cluster in the DUT to change the value that the TH subscribed in the above command.
+           onoff write off-wait-time 1 1 1
+
+          On TH verify that, TH  received a report data from DUT
+
           [1657455253.788543][11635:11640] CHIP:EM: Handling via exchange: 8557r, Delegate: 0xaaaacf201a78
           [1657455253.788629][11635:11640] CHIP:DMG: ReportDataMessage =
           [1657455253.788660][11635:11640] CHIP:DMG: {
@@ -1013,28 +1027,28 @@
       disabled: true
 
     - label:
-          'TH sends a subscription request action for an attribute and all
-          events. Set the MinIntervalFloor to some value say "N"(seconds).
-          Change the value of the attribute and trigger an action on the DUT to
-          trigger any event.'
+          "TH sends a subscription request action for an attribute and all
+          events. Set the MinIntervalFloor to some value say N(seconds). Change
+          the value of the attribute and trigger an action on the DUT to trigger
+          any event."
       verification: |
           https://github.com/project-chip/connectedhomeip/issues/20479
       disabled: true
 
     - label:
-          'TH sends a subscription request action for attribute wildcard -
+          "TH sends a subscription request action for attribute wildcard -
           AttributePath = [[Endpoint = EndpointID, Cluster = ClusterID]]. Set
-          the MinIntervalFloor to some value say "N"(seconds). Change all or few
-          of the attributes on the DUT'
+          the MinIntervalFloor to some value say N(seconds). Change all or few
+          of the attributes on the DUT"
       verification: |
           Out of Scope for V1.0
       disabled: true
 
     - label:
-          'TH sends a subscription request to subscribe to an attribute on a
+          "TH sends a subscription request to subscribe to an attribute on a
           specific cluster from all endpoints AttributePath = [[Attribute =
           Attribute, Cluster = ClusterID ]]. Set the MinIntervalFloor to some
-          value say "N"(seconds). Change the attribute on the DUT'
+          value say N(seconds). Change the attribute on the DUT"
       verification: |
           onoff subscribe-by-id 0x4001 200 700  1 0xFFFF
            on TH, verify that DUT is responds right attribute value for  command and then send write command to change the attribute value,
@@ -1122,28 +1136,28 @@
       disabled: true
 
     - label:
-          'TH sends a subscription request to subscribe to all attributes from
+          "TH sends a subscription request to subscribe to all attributes from
           all clusters from all endpoints. AttributePath = [[]]. Set the
-          MinIntervalFloor to some value say "N"(seconds). Change all or few of
-          the attributes on the DUT'
+          MinIntervalFloor to some value say N(seconds). Change all or few of
+          the attributes on the DUT"
       verification: |
           Out of Scope for V1.0
       disabled: true
 
     - label:
-          'TH sends a subscription request to subscribe to all attributes from
+          "TH sends a subscription request to subscribe to all attributes from
           all clusters on an endpoint. AttributePath = [[Endpoint =
-          EndpointID]]. Set the MinIntervalFloor to some value say "N"(seconds).
-          Change all or few of the attributes on the DUT'
+          EndpointID]]. Set the MinIntervalFloor to some value say N(seconds).
+          Change all or few of the attributes on the DUT"
       verification: |
           Out of Scope for V1.0
       disabled: true
 
     - label:
-          'TH sends a subscription request to subscribe to all attributes from a
+          "TH sends a subscription request to subscribe to all attributes from a
           specific cluster on all endpoints. AttributePath = [[Cluster =
-          ClusterID]]. Set the MinIntervalFloor to some value say "N"(seconds).
-          Change all or few of the attributes on the DUT'
+          ClusterID]]. Set the MinIntervalFloor to some value say N(seconds).
+          Change all or few of the attributes on the DUT"
       verification: |
           Out of Scope for V1.0
       disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_IDM_5_1.yaml b/src/app/tests/suites/certification/Test_TC_IDM_5_1.yaml
index c389ba6..3f5a286 100644
--- a/src/app/tests/suites/certification/Test_TC_IDM_5_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_IDM_5_1.yaml
@@ -15,6 +15,9 @@
 
 name: 3.5.1. [TC-IDM-5.1] Timed Request Action from DUT to TH. [{DUT_Client}]
 
+PICS:
+    - MCORE.IDM.C
+
 config:
     nodeId: 0x12344321
     cluster: "Basic"
@@ -26,6 +29,7 @@
           Request Message to the TH after receiving the status response message
           from the TH. The Timed Request Message should contain a timeout value
           in milliseconds. (Example - 200 milliseconds)"
+      PICS: MCORE.IDM.C.InvokeRequest
       verification: |
           In the case of chip tool as a client, here is an example command the client can send invoke request  to the TH
           ./chip-tool onoff on 1 1 --timedInteractionTimeoutMs 200
@@ -115,6 +119,7 @@
           WriteRequestMessage to the TH after receiving the status response
           message from the TH. The Timed Request Message should contain a
           timeout value in milliseconds. (Example - 200 milliseconds)"
+      PICS: MCORE.IDM.C.WriteRequest
       verification: |
           Chip-tool as controller , here is the example command you can use
            ./chip-tool onoff write  on-time 2 1 1 --timedInteractionTimeoutMs 200
@@ -203,6 +208,7 @@
           should contain a timeout value in milliseconds. (Example - 200
           milliseconds) Force the TH to not send a response back to the DUT for
           the received timed request."
+      PICS: MCORE.IDM.C.WriteRequest || MCORE.IDM.C.InvokeRequest
       verification: |
           This is not testable in normal scenario, and needs to be tested as part of Unit test.
           https://github.com/CHIP-Specifications/chip-test-plans/issues/1885
diff --git a/src/app/tests/suites/certification/Test_TC_IDM_6_2.yaml b/src/app/tests/suites/certification/Test_TC_IDM_6_2.yaml
index 66eb73a..c0040bd 100644
--- a/src/app/tests/suites/certification/Test_TC_IDM_6_2.yaml
+++ b/src/app/tests/suites/certification/Test_TC_IDM_6_2.yaml
@@ -17,6 +17,9 @@
     3.6.2. [TC-IDM-6.2] Events Subscribe Interaction from TH to DUT.
     [{DUT_Server}]
 
+PICS:
+    - MCORE.IDM.S
+
 config:
     nodeId: 0x12344321
     cluster: "Basic"
@@ -575,15 +578,6 @@
       disabled: true
 
     - label:
-          "TH sends Subscribe Request Message to DUT with EventRequests set to
-          all events from all clusters on all endpoints on a specific node that
-          is, [Node = Specific, Endpoint = Wildcard, Cluster = Wildcard, Event =
-          Wildcard]."
-      verification: |
-          test step repeated, needs to be removed from test plan, https://github.com/CHIP-Specifications/chip-test-plans/issues/1888
-      disabled: true
-
-    - label:
           "Activate Event subscription from TH to DUT and trigger the subscribed
           event on the DUT before minimum interval."
       verification: |
@@ -638,8 +632,8 @@
 
     - label:
           "Activate Event subscription from TH to DUT and and trigger the
-          subscribed event on the DUT before minimum interval. 'IsUrgent' flag
-          is set to True for a particular event path in the EventPathIB in the
+          subscribed event on the DUT before minimum interval. IsUrgent flag is
+          set to True for a particular event path in the EventPathIB in the
           SubscribeRequestMessage."
       verification: |
           The cluster used in the below command is an example, User can use any supported chip cluster.
@@ -885,7 +879,7 @@
           To Setup the TH such that it should not have the privilege for the cluster in the path. , 1st we need to send below mentioned ACL command
           Here by sending below mentioned ACL command giving only access for identify cluster(3), So except identify cluster command if try to send any other command will get status as unsupported access.
 
-           accesscontrol write acl '[{"fabricIndex": 1, "privilege": 5, "authMode": 2, "subjects": [112233], "targets":[{ "cluster": 3, "endpoint": 1, "deviceType": null }]}]' 1 0
+           accesscontrol write acl "[{"fabricIndex": 1, "privilege": 5, "authMode": 2, "subjects": [112233], "targets":[{ "cluster": 3, "endpoint": 1, "deviceType": null }]}]" 1 0
 
 
           basic subscribe-event-by-id 0x000 100 1000 1 0
@@ -938,7 +932,7 @@
 
           To  Setup the TH such that there is no accessing fabric, 1st we need to send below mentioned ACL command
 
-          accesscontrol write acl '[{"fabricIndex": 1, "privilege": 5, "authMode": 2, "subjects": [1234], "targets": null}]' 1 0
+          accesscontrol write acl "[{"fabricIndex": 1, "privilege": 5, "authMode": 2, "subjects": [1234], "targets": null}]" 1 0
 
           any subscribe-event-by-id 0xFFFFFFFF 0xFFFFFFFF 100 1000 1 0xFFFF
 
@@ -1190,8 +1184,8 @@
       disabled: true
 
     - label:
-          "With an active Event subscription from TH to DUT, change attribute
-          values on DUT to create events multiple times."
+          "With an active Event subscription from TH to DUT, trigger events on
+          DUT multiple times."
       verification: |
           The cluster used in the below command is an example, User can use any supported chip cluster.
 
@@ -1222,7 +1216,7 @@
 
           By sending the command mentioned below, change attribute values on DUT to create events multiple times.
 
-          accesscontrol write acl '[{"fabricIndex": 1, "privilege": 5, "authMode": 2, "subjects": [112233], "targets": null}, {"fabricIndex": 1, "privilege": 1, "authMode": 3, "subjects": [111,222,333,444], "targets": [{"cluster":11 , "endpoint":22, "deviceType": null}]}, {"fabricIndex": 1, "privilege": 3, "authMode": 3, "subjects": [555,666,777,888], "targets": [{"cluster": 55, "endpoint": 66, "deviceType":null }]}]' 1 0
+          accesscontrol write acl "[{"fabricIndex": 1, "privilege": 5, "authMode": 2, "subjects": [112233], "targets": null}, {"fabricIndex": 1, "privilege": 1, "authMode": 3, "subjects": [111,222,333,444], "targets": [{"cluster":11 , "endpoint":22, "deviceType": null}]}, {"fabricIndex": 1, "privilege": 3, "authMode": 3, "subjects": [555,666,777,888], "targets": [{"cluster": 55, "endpoint": 66, "deviceType":null }]}]" 1 0
 
           On TH Verify that each event record is assigned a number that is exactly 1 greater than the last created event record on that Node.
 
@@ -1355,7 +1349,7 @@
 
           By sending the command mentioned below, change attribute values on DUT to create events multiple times.
 
-          accesscontrol write acl '[{"fabricIndex": 1, "privilege": 5, "authMode": 2, "subjects": [112233], "targets": null}, {"fabricIndex": 1, "privilege": 1, "authMode": 3, "subjects": [111,222,333,444], "targets": [{"cluster":11 , "endpoint":22, "deviceType": null}]}, {"fabricIndex": 1, "privilege": 3, "authMode": 3, "subjects": [555,666,777,888], "targets": [{"cluster": 55, "endpoint": 66, "deviceType":null }]}]' 1 0
+          accesscontrol write acl "[{"fabricIndex": 1, "privilege": 5, "authMode": 2, "subjects": [112233], "targets": null}, {"fabricIndex": 1, "privilege": 1, "authMode": 3, "subjects": [111,222,333,444], "targets": [{"cluster":11 , "endpoint":22, "deviceType": null}]}, {"fabricIndex": 1, "privilege": 3, "authMode": 3, "subjects": [555,666,777,888], "targets": [{"cluster": 55, "endpoint": 66, "deviceType":null }]}]" 1 0
 
           On TH Verify that each event record is assigned a number that is exactly 1 greater than the last created event record on that Node.
 
diff --git a/src/app/tests/suites/certification/Test_TC_IDM_8_1.yaml b/src/app/tests/suites/certification/Test_TC_IDM_8_1.yaml
index 47465af..b9f16c3 100644
--- a/src/app/tests/suites/certification/Test_TC_IDM_8_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_IDM_8_1.yaml
@@ -15,6 +15,9 @@
 
 name: 3.6.6. [TC-IDM-8.1] Fabric scoped Test Cases. [{DUT_Server}]
 
+PICS:
+    - MCORE.IDM.S
+
 config:
     nodeId: 0x12344321
     cluster: "Basic"
@@ -119,7 +122,7 @@
 
           From RC1 send a Write Request message to the DUT to write to an entry in the fabric scoped list associated with its own fabric.
 
-          ./chip-tool accesscontrol write acl '[{"fabricIndex": 1, "privilege": 5, "authMode": 2, "subjects": [112233], "targets":[{ "cluster": 3, "endpoint": 1, "deviceType": null }]}]' 1 0 --commissioner-name beta
+          ./chip-tool accesscontrol write acl "[{"fabricIndex": 1, "privilege": 5, "authMode": 2, "subjects": [112233], "targets":[{ "cluster": 3, "endpoint": 1, "deviceType": null }]}]" 1 0 --commissioner-name beta
 
           On RC1, Verify that DUT responds as success
 
@@ -203,17 +206,17 @@
       disabled: true
 
     - label:
-          'Send a Read Request Message to the DUT from RC1 and RC2 to read the
-          fabric scoped list "Fabrics" from OperationalCredentialsCluster.
-          Fabric filtered should be set to false. RC1 sends an Invoke
+          "Send a Read Request Message to the DUT from RC1 and RC2 to read the
+          fabric scoped list Fabrics from OperationalCredentialsCluster. Fabric
+          filtered should be set to false. RC1 sends an Invoke
           command(UpdateFabricLabel) to update the label of its fabric. Send a
           non-filtered Read Request Message from RC1 and RC2 to read the fabric
-          scoped list from the DUT.'
+          scoped list from the DUT."
       verification: |
           Send a Read Request Message to the DUT from RC1 and RC2 to read the fabric scoped list "Fabrics" from OperationalCredentialsCluster. Fabric filtered should be set to false.
 
           ./chip-tool operationalcredentials read fabrics 1 0 --fabric-filtered 0  --commissioner-name beta
-
+          On RC1 verify the Fabrics entries
           [1657780124.975404][2664:2669] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_003E Attribute 0x0000_0001 DataVersion: 1307873919
           [1657780124.975642][2664:2669] CHIP:TOO:   Fabrics: 2 entries
           [1657780124.975710][2664:2669] CHIP:TOO:     [1]: {
@@ -235,6 +238,7 @@
           [1657780124.976356][2664:2669] CHIP:EM: Sending Standalone Ack for MessageCounter:266273154 on exchange 62310i
 
           ./chip-tool operationalcredentials read fabrics 2 0 --fabric-filtered 0  --commissioner-name gamma
+          On RC2 verify the Fabrics entries
           [1657780154.150519][2728:2733] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_003E Attribute 0x0000_0001 DataVersion: 1307873919
           [1657780154.150627][2728:2733] CHIP:TOO:   Fabrics: 2 entries
           [1657780154.150694][2728:2733] CHIP:TOO:     [1]: {
@@ -257,7 +261,7 @@
 
 
 
-
+           RC1 sends an Invoke command(UpdateFabricLabel) to update the label of its fabric.
 
           ./chip-tool operationalcredentials update-fabric-label 1 1 0 --commissioner-name beta
           [1657780486.902409][2687:2692] CHIP:DMG: Received Command Response Data, Endpoint=0 Cluster=0x0000_003E Command=0x0000_0008
@@ -270,18 +274,7 @@
           [1657780486.902804][2687:2692] CHIP:EM: Sending Standalone Ack for MessageCounter:243850872 on exchange 45753i
 
 
-          ./chip-tool operationalcredentials update-fabric-label 2 2 0 --commissioner-name beta
-          [1657780486.902409][2687:2692] CHIP:DMG: Received Command Response Data, Endpoint=0 Cluster=0x0000_003E Command=0x0000_0008
-          [1657780486.902474][2687:2692] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_003E Command 0x0000_0008
-          [1657780486.902544][2687:2692] CHIP:TOO:   NOCResponse: {
-          [1657780486.902612][2687:2692] CHIP:TOO:     statusCode: 0
-          [1657780486.902649][2687:2692] CHIP:TOO:     fabricIndex: 2
-          [1657780486.902684][2687:2692] CHIP:TOO:    }
-          [1657780486.902736][2687:2692] CHIP:DMG: ICR moving to [AwaitingDe]
-          [1657780486.902804][2687:2692] CHIP:EM: Sending Standalone Ack for MessageCounter:243850872 on exchange 45753i
-
-
-
+          Send a non-filtered Read Request Message from RC1  to read the fabric scoped list from the DUT.
           ./chip-tool operationalcredentials read fabrics 1 0 --fabric-filtered 0  --commissioner-name beta
           [1657780552.471227][2696:2701] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_003E Attribute 0x0000_0001 DataVersion: 1307873920
           [1657780552.471361][2696:2701] CHIP:TOO:   Fabrics: 2 entries
@@ -290,7 +283,7 @@
           [1657780552.471566][2696:2701] CHIP:TOO:       VendorId: 65521
           [1657780552.471605][2696:2701] CHIP:TOO:       FabricId: 2
           [1657780552.471642][2696:2701] CHIP:TOO:       NodeId: 1
-          [1657780552.471679][2696:2701] CHIP:TOO:       Label: 2
+          [1657780552.471679][2696:2701] CHIP:TOO:       Label: 1
           [1657780552.471715][2696:2701] CHIP:TOO:       FabricIndex: 1
           [1657780552.471752][2696:2701] CHIP:TOO:      }
           [1657780552.471805][2696:2701] CHIP:TOO:     [2]: {
@@ -304,18 +297,7 @@
           [1657780552.472199][2696:2701] CHIP:EM: Sending Standalone Ack for MessageCounter:2814032 on exchange 31449i
 
 
-            ./chip-tool operationalcredentials update-fabric-label 1 2 0 --commissioner-name gamma
-          [1657780809.365523][2771:2776] CHIP:DMG: },
-          [1657780809.365603][2771:2776] CHIP:DMG: Received Command Response Data, Endpoint=0 Cluster=0x0000_003E Command=0x0000_0008
-          [1657780809.365661][2771:2776] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_003E Command 0x0000_0008
-          [1657780809.365727][2771:2776] CHIP:TOO:   NOCResponse: {
-          [1657780809.365787][2771:2776] CHIP:TOO:     statusCode: 0
-          [1657780809.365822][2771:2776] CHIP:TOO:     fabricIndex: 2
-          [1657780809.365853][2771:2776] CHIP:TOO:    }
-          [1657780809.365902][2771:2776] CHIP:DMG: ICR moving to [AwaitingDe]
-          [1657780809.365966][2771:2776] CHIP:EM: Sending Standalone Ack for MessageCounter:102825987 on exchange 28163i
-
-
+          Send a non-filtered Read Request Message from RC2 to read the fabric scoped list from the DUT.
           ./chip-tool operationalcredentials read fabrics 2 0 --fabric-filtered 0  --commissioner-name gamma
           [1657780904.261593][2741:2746] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_003E Attribute 0x0000_0001 DataVersion: 1307873922
           [1657780904.261701][2741:2746] CHIP:TOO:   Fabrics: 2 entries
@@ -324,7 +306,7 @@
           [1657780904.261840][2741:2746] CHIP:TOO:       VendorId: 65521
           [1657780904.261865][2741:2746] CHIP:TOO:       FabricId: 2
           [1657780904.261889][2741:2746] CHIP:TOO:       NodeId: 1
-          [1657780904.261913][2741:2746] CHIP:TOO:       Label: 2
+          [1657780904.261913][2741:2746] CHIP:TOO:       Label:
           [1657780904.261937][2741:2746] CHIP:TOO:       FabricIndex: 1
           [1657780904.261960][2741:2746] CHIP:TOO:      }
           [1657780904.261994][2741:2746] CHIP:TOO:     [2]: {
@@ -348,6 +330,8 @@
           Please  run this test in chip tool interactive mode ./chip-tool interactive start
 
 
+          Activate the subscription between RC1 and DUT for an attribute1 whose value is a list of structs which contain some fabric-sensitive data
+
           operationalcredentials subscribe nocs 10 100 1 0
 
           [1657802879.008816][4548:4553] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_003E Attribute 0x0000_0000 DataVersion: 567747175
@@ -359,6 +343,7 @@
           [1657802879.009329][4548:4553] CHIP:TOO:      }
           [1657802879.009426][4548:4553] CHIP:DMG: MoveToState ReadClient[0xffff7c008e40]: Moving to [AwaitingSu]
 
+           Activate the subscription between RC2 and DUT for the same attribute1 whose value is a list of structs which contain some fabric-sensitive data.
           operationalcredentials subscribe nocs 10 100 2 0 --commissioner-name beta
           [1657803363.013803][5522:5527] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_003E Attribute 0x0000_0000 DataVersion: 567747179
           [1657803363.013897][5522:5527] CHIP:TOO:   NOCs: 1 entries
@@ -407,6 +392,7 @@
           [1657887424.933717][3496:3501] CHIP:EM: Piggybacking Ack for MessageCounter:100554100 on exchange: 44633i
 
 
+          Activate the subscription between RC2 and DUT for an Event1 which is fabric sensitive
           accesscontrol subscribe-event access-control-entry-changed  20 700 2 0 --commissioner-name beta
           [1657887441.417553][2862:2867] CHIP:DMG: }
           [1657887441.417766][2862:2867] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_001F Event 0x0000_0000
@@ -431,7 +417,8 @@
           [1657887441.418591][2862:2867] CHIP:EM: Piggybacking Ack for MessageCounter:217452290 on exchange: 44658i
 
 
-          accesscontrol write acl '[{"fabricIndex": 1, "privilege": 5, "authMode": 2, "subjects": [112233], "targets":[{ "cluster": 3, "endpoint": 1, "deviceType": null }]}]' 1 0
+          From RC1 send a Write Request message to the DUT to write to an entry in the fabric scoped list associated with its own fabric.
+          accesscontrol write acl "[{"fabricIndex": 1, "privilege": 5, "authMode": 2, "subjects": [112233], "targets":[{ "cluster": 3, "endpoint": 1, "deviceType": null }]}]" 1 0
           [1658231022.614323][2305:2310] CHIP:DMG: }
           [1658231022.614489][2305:2310] CHIP:TOO: Response Failure: IM Error 0x0000057E: General error: 0x7e (UNSUPPORTED_ACCESS)
           [1658231022.614598][2305:2310] CHIP:TOO: Response Failure: IM Error 0x0000057E: General error: 0x7e (UNSUPPORTED_ACCESS)
@@ -452,7 +439,7 @@
           [1658231022.617297][2305:2310] CHIP:DMG: }
           [1658231022.617340][2305:2310] CHIP:DMG: Subscription established with SubscriptionID = 0x1cf72de7 MinInterval = 20s MaxInterval = 500s Peer = 01:0000000000000001
 
-
+          ON RC1 Verify that the DUT sends a response
           [1658231053.511709][10291:10296] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_001F Event 0x0000_0000
           [1658231053.511772][10291:10296] CHIP:TOO:          Event number: 3
           [1658231053.511828][10291:10296] CHIP:TOO:          Priority: Info
@@ -493,7 +480,125 @@
           path where an event in the path is fabric-sensitive and the associated
           fabric does not match the accessing fabric."
       verification: |
+          Please  run this test in chip tool interactive mode ./chip-tool interactive start
 
+
+          Activate the subscription between RC1 and DUT for an Event1 which is fabric sensitive
+          accesscontrol subscribe-event access-control-entry-changed 1 20 1 0
+          [1659010068.961559][7928:7933] CHIP:DMG: }
+          [1659010068.961735][7928:7933] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_001F Event 0x0000_0000
+          [1659010068.961767][7928:7933] CHIP:TOO:          Event number: 2
+          [1659010068.961795][7928:7933] CHIP:TOO:          Priority: Info
+          [1659010068.961822][7928:7933] CHIP:TOO:          Timestamp: 12513658
+          [1659010068.961889][7928:7933] CHIP:TOO:   AccessControlEntryChanged: {
+          [1659010068.961923][7928:7933] CHIP:TOO:     AdminNodeID: null
+          [1659010068.961955][7928:7933] CHIP:TOO:     AdminPasscodeID: 0
+          [1659010068.961985][7928:7933] CHIP:TOO:     ChangeType: 1
+          [1659010068.962014][7928:7933] CHIP:TOO:     LatestValue: {
+          [1659010068.962042][7928:7933] CHIP:TOO:       Privilege: 5
+          [1659010068.962071][7928:7933] CHIP:TOO:       AuthMode: 2
+          [1659010068.962106][7928:7933] CHIP:TOO:       Subjects: 1 entries
+          [1659010068.962142][7928:7933] CHIP:TOO:         [1]: 112233
+          [1659010068.962174][7928:7933] CHIP:TOO:       Targets: null
+          [1659010068.962203][7928:7933] CHIP:TOO:       FabricIndex: 1
+          [1659010068.962231][7928:7933] CHIP:TOO:      }
+          [1659010068.962260][7928:7933] CHIP:TOO:     AdminFabricIndex: 1
+          [1659010068.962288][7928:7933] CHIP:TOO:    }
+          [1659010068.962363][7928:7933] CHIP:DMG: MoveToState ReadClient[0xffffa0009e00]: Moving to [AwaitingSu]
+          [1659010068.962424][7928:7933] CHIP:EM: Piggybacking Ack for MessageCounter:119024590 on exchange: 58655i
+
+          Activate the subscription between RC2 and DUT for an Event1 which is fabric sensitive
+          accesscontrol subscribe-event access-control-entry-changed 1 20 2 0
+          [1659009987.167510][5306:5311] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_001F Event 0x0000_0000
+          [1659009987.167555][5306:5311] CHIP:TOO:          Event number: 3
+          [1659009987.167583][5306:5311] CHIP:TOO:          Priority: Info
+          [1659009987.167612][5306:5311] CHIP:TOO:          Timestamp: 12804805
+          [1659009987.167767][5306:5311] CHIP:TOO:   AccessControlEntryChanged: {
+          [1659009987.168574][5306:5311] CHIP:TOO:     AdminNodeID: null
+          [1659009987.168622][5306:5311] CHIP:TOO:     AdminPasscodeID: 0
+          [1659009987.168653][5306:5311] CHIP:TOO:     ChangeType: 1
+          [1659009987.168683][5306:5311] CHIP:TOO:     LatestValue: {
+          [1659009987.168755][5306:5311] CHIP:TOO:       Privilege: 5
+          [1659009987.168786][5306:5311] CHIP:TOO:       AuthMode: 2
+          [1659009987.168824][5306:5311] CHIP:TOO:       Subjects: 1 entries
+          [1659009987.168861][5306:5311] CHIP:TOO:         [1]: 112233
+          [1659009987.168892][5306:5311] CHIP:TOO:       Targets: null
+          [1659009987.168921][5306:5311] CHIP:TOO:       FabricIndex: 2
+          [1659009987.168949][5306:5311] CHIP:TOO:      }
+          [1659009987.168978][5306:5311] CHIP:TOO:     AdminFabricIndex: 2
+          [1659009987.169006][5306:5311] CHIP:TOO:    }
+          [1659009987.169089][5306:5311] CHIP:DMG: MoveToState ReadClient[0xffff98009f00]: Moving to [AwaitingSu]
+          [1659009987.169168][5306:5311] CHIP:EM: Piggybacking Ack for MessageCounter:217147877 on exchange: 52695i
+
+
+          From RC2 send a Write Request message to the DUT to write to an entry in the fabric scoped list associated with its own fabric.
+           accesscontrol write acl "[{"fabricIndex": 1, "privilege": 5, "authMode": 2, "subjects": [112233,1111], "targets":null},{"fabricIndex": 1, "privilege": 3, "authMode": 3, "subjects": [3333], "targets":null}]" 2 0
+          [1659010027.191655][5306:5311] CHIP:DMG: }
+          [1659010027.191874][5306:5311] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_001F Event 0x0000_0000
+          [1659010027.191902][5306:5311] CHIP:TOO:          Event number: 4
+          [1659010027.191925][5306:5311] CHIP:TOO:          Priority: Info
+          [1659010027.191947][5306:5311] CHIP:TOO:          Timestamp: 14468055
+          [1659010027.192010][5306:5311] CHIP:TOO:   AccessControlEntryChanged: {
+          [1659010027.192077][5306:5311] CHIP:TOO:     AdminNodeID: 112233
+          [1659010027.192102][5306:5311] CHIP:TOO:     AdminPasscodeID: null
+          [1659010027.192127][5306:5311] CHIP:TOO:     ChangeType: 2
+          [1659010027.192150][5306:5311] CHIP:TOO:     LatestValue: {
+          [1659010027.192173][5306:5311] CHIP:TOO:       Privilege: 5
+          [1659010027.192197][5306:5311] CHIP:TOO:       AuthMode: 2
+          [1659010027.192225][5306:5311] CHIP:TOO:       Subjects: 1 entries
+          [1659010027.192254][5306:5311] CHIP:TOO:         [1]: 112233
+          [1659010027.192280][5306:5311] CHIP:TOO:       Targets: null
+          [1659010027.192303][5306:5311] CHIP:TOO:       FabricIndex: 2
+          [1659010027.192326][5306:5311] CHIP:TOO:      }
+          [1659010027.192349][5306:5311] CHIP:TOO:     AdminFabricIndex: 2
+          [1659010027.192372][5306:5311] CHIP:TOO:    }
+          [1659010027.192489][5306:5311] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_001F Event 0x0000_0000
+          [1659010027.192513][5306:5311] CHIP:TOO:          Event number: 5
+          [1659010027.192535][5306:5311] CHIP:TOO:          Priority: Info
+          [1659010027.192557][5306:5311] CHIP:TOO:          Timestamp: 14468057
+          [1659010027.192597][5306:5311] CHIP:TOO:   AccessControlEntryChanged: {
+          [1659010027.192623][5306:5311] CHIP:TOO:     AdminNodeID: 112233
+          [1659010027.192646][5306:5311] CHIP:TOO:     AdminPasscodeID: null
+          [1659010027.192669][5306:5311] CHIP:TOO:     ChangeType: 1
+          [1659010027.192692][5306:5311] CHIP:TOO:     LatestValue: {
+          [1659010027.192715][5306:5311] CHIP:TOO:       Privilege: 5
+          [1659010027.192737][5306:5311] CHIP:TOO:       AuthMode: 2
+          [1659010027.192764][5306:5311] CHIP:TOO:       Subjects: 2 entries
+          [1659010027.192791][5306:5311] CHIP:TOO:         [1]: 112233
+          [1659010027.192816][5306:5311] CHIP:TOO:         [2]: 1111
+          [1659010027.192841][5306:5311] CHIP:TOO:       Targets: null
+          [1659010027.192864][5306:5311] CHIP:TOO:       FabricIndex: 2
+          [1659010027.192886][5306:5311] CHIP:TOO:      }
+          [1659010027.192909][5306:5311] CHIP:TOO:     AdminFabricIndex: 2
+          [1659010027.192931][5306:5311] CHIP:TOO:    }
+          [1659010027.193044][5306:5311] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_001F Event 0x0000_0000
+          [1659010027.193068][5306:5311] CHIP:TOO:          Event number: 6
+          [1659010027.193090][5306:5311] CHIP:TOO:          Priority: Info
+          [1659010027.193112][5306:5311] CHIP:TOO:          Timestamp: 14468058
+          [1659010027.193151][5306:5311] CHIP:TOO:   AccessControlEntryChanged: {
+          [1659010027.193176][5306:5311] CHIP:TOO:     AdminNodeID: 112233
+          [1659010027.193199][5306:5311] CHIP:TOO:     AdminPasscodeID: null
+          [1659010027.193222][5306:5311] CHIP:TOO:     ChangeType: 1
+          [1659010027.193245][5306:5311] CHIP:TOO:     LatestValue: {
+          [1659010027.193267][5306:5311] CHIP:TOO:       Privilege: 3
+          [1659010027.193290][5306:5311] CHIP:TOO:       AuthMode: 3
+          [1659010027.193372][5306:5311] CHIP:TOO:       Subjects: 1 entries
+          [1659010027.193401][5306:5311] CHIP:TOO:         [1]: 3333
+          [1659010027.193426][5306:5311] CHIP:TOO:       Targets: null
+          [1659010027.193450][5306:5311] CHIP:TOO:       FabricIndex: 2
+          [1659010027.193472][5306:5311] CHIP:TOO:      }
+          [1659010027.193495][5306:5311] CHIP:TOO:     AdminFabricIndex: 2
+          [1659010027.193518][5306:5311] CHIP:TOO:    }
+          [1659010027.193624][5306:5311] CHIP:DMG: Refresh LivenessCheckTime for 45000 milliseconds with SubscriptionId = 0xa89e20c1 Peer = 01:0000000000000002
+          [1659010027.193682][5306:5311] CHIP:EM: Piggybacking Ack for MessageCounter:217147882 on exchange: 27524r
+
+          On RC1 verify that DUT sends a Report Data Message with no entry for that event in EventReports list.
+          [1659011129.062422][7928:7933] CHIP:DMG: ReportDataMessage =
+          [1659011129.062495][7928:7933] CHIP:DMG: {
+          [1659011129.062558][7928:7933] CHIP:DMG:         SubscriptionId = 0x3af80a9c,
+          [1659011129.062625][7928:7933] CHIP:DMG:         InteractionModelRevision = 1
+          [1659011129.062687][7928:7933] CHIP:DMG: }
+          [1659011129.062823][7928:7933] CHIP:DMG: Refresh LivenessCheckTime for 45000 milliseconds with SubscriptionId = 0x3af80a9c Peer = 01:0000000000000001
       disabled: true
 
     - label:
@@ -501,5 +606,5 @@
           where an event in the path is fabric-sensitive and the associated
           fabric does not match the accessing fabric."
       verification: |
-
+          Waiting for test-plan author input
       disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_MOD_3_1.yaml b/src/app/tests/suites/certification/Test_TC_MOD_3_1.yaml
index 6e93086..a1b67ea 100644
--- a/src/app/tests/suites/certification/Test_TC_MOD_3_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_MOD_3_1.yaml
@@ -15,6 +15,9 @@
 
 name: 80.3.1. [TC-MOD-3.1] OnMode Verification (DUT as Server)
 
+PICS:
+    - MOD.S.A0005
+
 config:
     nodeId: 0x12344321
     cluster: "Basic"
@@ -94,8 +97,8 @@
 
     - label:
           "Select a value from the list in step 2c with a different value than
-          the StartUpMode value read in step 1. TH sends a ChangeToMode command
-          to the TH with the selected value."
+          the onMode value read in step 1. TH sends a ChangeToMode command to
+          the TH with the selected value."
       PICS: MOD.S.A0002 && MOD.S.C00.Rsp && MOD.S.F00
       verification: |
           ./chip-tool modeselect change-to-mode 7 1 1
@@ -106,7 +109,7 @@
       disabled: true
 
     - label: "TH reads sends an Off command to the DUT"
-      PICS: OO.S.C01.Rsp && MOD.S.F00
+      PICS: OO.S.C00.Rsp && MOD.S.F00
       verification: |
           ./chip-tool onoff off 1 1
 
diff --git a/src/app/tests/suites/certification/Test_TC_MOD_3_4.yaml b/src/app/tests/suites/certification/Test_TC_MOD_3_4.yaml
index 813f96a..b6c5134 100644
--- a/src/app/tests/suites/certification/Test_TC_MOD_3_4.yaml
+++ b/src/app/tests/suites/certification/Test_TC_MOD_3_4.yaml
@@ -15,6 +15,11 @@
 
 name: 80.3.4. [TC-MOD-3.4] OnMode Overwriting StartUpMode (DUT as Server)
 
+PICS:
+    - MOD.S.A0004
+    - MOD.S.A0005
+    - OO.S.A4003
+
 config:
     nodeId: 0x12344321
     cluster: "Basic"
@@ -55,7 +60,7 @@
           If the StartUpMode and OnMode attributes have the same value, proceed to step 2c,  Otherwise proceed to step 3.
       disabled: true
 
-    - label: "TH reads the _SupportedModes attribute_ from the DUT"
+    - label: "TH reads the SupportedModes attribute from the DUT"
       PICS: MOD.S.A0002
       verification: |
           ./chip-tool modeselect read supported-modes 1 1
@@ -95,8 +100,8 @@
 
     - label:
           "Select a value from the list in step 2c with a different value than
-          the _StartUpMode_ value read in step 1. TH sends a write command for
-          _OnMode_ to the DUT with the selected value."
+          the StartUpMode value read in step 1. TH sends a write command for
+          OnMode to the DUT with the selected value."
       PICS: MOD.S.A0002 && MOD.S.C00.Rsp
       verification: |
           ./chip-tool modeselect write on-mode 7 1 1
@@ -129,7 +134,7 @@
           [1651099941887] [84269:7567211] CHIP: [DMG] }
       disabled: true
 
-    - label: "TH reads the _OnMode attribute_ from the DUT"
+    - label: "TH reads the OnMode attribute from the DUT"
       PICS: MOD.S.F00 && MOD.S.A0005
       verification: |
           ./chip-tool modeselect read on-mode 1 1
@@ -141,8 +146,7 @@
       disabled: true
 
     - label:
-          "TH writes 1 to _StartUpOnOff attribute_ of the OnOff Cluster of the
-          DUT"
+          "TH writes 1 to StartUpOnOff attribute of the OnOff Cluster of the DUT"
       PICS: OO.S.A4003
       verification: |
           ./chip-tool onoff write start-up-on-off 1 1 1
diff --git a/src/app/tests/suites/certification/Test_TC_PRS_2_2.yaml b/src/app/tests/suites/certification/Test_TC_PRS_2_2.yaml
index bd31326..6e1416a 100644
--- a/src/app/tests/suites/certification/Test_TC_PRS_2_2.yaml
+++ b/src/app/tests/suites/certification/Test_TC_PRS_2_2.yaml
@@ -15,24 +15,29 @@
 
 name: 3.2.2. [TC-PRS-2.2] Primary functionality with server as DUT
 
+PICS:
+    - PRS.S
+
 config:
     nodeId: 0x12344321
     cluster: "Basic"
     endpoint: 0
 
 tests:
-    - label: "Commission DUT to TH"
+    - label:
+          "Commission DUT to TH (can be skipped if done in a preceding test)."
       verification: |
-
+          verification step to be updated.
       disabled: true
 
     - label: "TH reads from the DUT the MeasuredValue attribute"
       PICS: PRS.S.A0000
       verification: |
-          Verify on the TH Log:
-
           ./chip-tool pressuremeasurement read measured-value 1 1
 
+
+          On TH, verify that DUT  responds value  read is successful and note down the value read
+
           CHIP:TOO:   MeasuredValue: 0
       disabled: true
 
diff --git a/src/app/tests/suites/certification/Test_TC_PS_2_2.yaml b/src/app/tests/suites/certification/Test_TC_PS_2_2.yaml
index 9f673a7..2e9129a 100644
--- a/src/app/tests/suites/certification/Test_TC_PS_2_2.yaml
+++ b/src/app/tests/suites/certification/Test_TC_PS_2_2.yaml
@@ -13,7 +13,10 @@
 # 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: 62.2.1. [TC-PS-2.1] Attributes with server as DUT
+name: 62.2.2. [TC-PS-2.2] Event reporting with server as DUT
+
+PICS:
+    - PS.S
 
 config:
     nodeId: 0x12344321
@@ -23,13 +26,13 @@
 tests:
     - label: "Commission DUT to TH"
       verification: |
-
+          verification step to be updated.
       disabled: true
 
     - label: "Bring the DUT into a state without any wired faults."
       PICS: PS.S.A000a
       verification: |
-
+          verification step to be updated.
       disabled: true
 
     - label: "TH reads the ActiveWiredFaults attribute from the DUT"
@@ -43,7 +46,7 @@
       disabled: true
 
     - label: "Set up subscription to WiredFaultChange event"
-      PICS: PS.S.E00
+      PICS: PS.S.E00 && PS.M.ManualWiredFault
       verification: |
           ./chip-tool interactive start
 
@@ -79,7 +82,7 @@
       disabled: true
 
     - label: "TH reads the ActiveWiredFaults attribute from the DUT"
-      PICS: PS.S.A000a
+      PICS: PS.S.A000a && PS.M.ManualWiredFault
       verification: |
           Optional attribute so its not compulsory to get the expected outcome
 
@@ -91,7 +94,7 @@
       disabled: true
 
     - label: "Bring the DUT back into a clean state."
-      PICS: PS.S.E00
+      PICS: PS.S.E00 && PS.M.ManualWiredFault
       verification: |
           DUT ACTION REQUIRED
       disabled: true
@@ -99,7 +102,7 @@
     - label: "Bring the DUT into a state without any battery faults."
       PICS: PS.S.A0012
       verification: |
-
+          verification step to be updated.
       disabled: true
 
     - label: "TH reads the ActiveBatFaults attribute from the DUT"
@@ -114,7 +117,7 @@
       disabled: true
 
     - label: "Set up subscription to BatFaultChange event"
-      PICS: PS.S.E01
+      PICS: PS.S.E01 && PS.M.ManualBatFault
       verification: |
           ./chip-tool interactive start
            powersource subscribe-event-by-id  0 100 1  1
@@ -149,7 +152,7 @@
       disabled: true
 
     - label: "TH reads the ActiveBatFaults attribute from the DUT"
-      PICS: PS.S.A0012
+      PICS: PS.S.A0012 && PS.M.ManualBatFault
       verification: |
           Optional attribute so its not compulsory to get the expected outcome
 
@@ -160,7 +163,7 @@
       disabled: true
 
     - label: "Bring the DUT back into a clean state."
-      PICS: PS.S.E01
+      PICS: PS.S.E01 && PS.M.ManualWiredFault
       verification: |
           DUT ACTION REQUIRED
       disabled: true
@@ -168,7 +171,7 @@
     - label: "Bring the DUT into a state without any charge faults."
       PICS: PS.S.A001e
       verification: |
-
+          verification step to be updated.
       disabled: true
 
     - label: "TH reads the ActiveBatChargeFaults attribute from the DUT"
@@ -182,7 +185,7 @@
       disabled: true
 
     - label: "Set up subscription to BatChargeFaultChange event"
-      PICS: PS.S.E02
+      PICS: PS.S.E02 && PS.M.ManualBatChargeFault
       verification: |
           ./chip-tool interactive start
 
@@ -218,7 +221,7 @@
       disabled: true
 
     - label: "TH reads the ActiveBatChargeFaults attribute from the DUT"
-      PICS: PS.S.A001e
+      PICS: PS.S.A001e && PS.M.ManualBatChargeFault
       verification: |
           Optional attribute so its not compulsory to get the expected outcome
           ./chip-tool powersource read active-battery-charge-faults 1 1
@@ -228,7 +231,7 @@
       disabled: true
 
     - label: "Bring the DUT back into a clean state."
-      PICS: PS.S.E02
+      PICS: PS.S.E02 && PS.M.ManualBatChargeFault
       verification: |
           DUT ACTION REQUIRED
       disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_PS_3_1.yaml b/src/app/tests/suites/certification/Test_TC_PS_3_1.yaml
index 2199704..080d581 100644
--- a/src/app/tests/suites/certification/Test_TC_PS_3_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_PS_3_1.yaml
@@ -15,6 +15,13 @@
 
 name: 62.3.1. [TC-PS-3.1] Attributes with client as DUT
 
+PICS:
+    - PS.C
+    - PS.C.AM-READ
+    - PS.C.AO-READ
+    - PS.C.AM-WRITE
+    - PS.C.AO-WRITE
+
 config:
     nodeId: 0x12344321
     cluster: "Basic"
@@ -25,11 +32,9 @@
           "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 Staus attribute (id 0) looks like this:
-
           ./chip-tool powersource read status 1 1
 
-          Verify in TH all-clusters-app log
+          Verify,On TestHarnes (all-cluster-app) a received read of Staus attribute looks like this:
 
 
           [1646155382.977445][33190:33190] CHIP:EM: Received message of type 0x2 with protocolId (0, 1) and MessageCounter:685127 on exchange 16568r
@@ -59,7 +64,7 @@
 
           ./chip-tool powersource read order 1 1
 
-          Verify in TH all-clusters-app log
+          On TestHarnes (all-cluster-app) a received read of order attribute looks like this:
 
           [1653395573.862606][19412:19412] CHIP:IM: Received Read request
           [1653395573.862690][19412:19412] CHIP:DMG: ReadRequestMessage =
@@ -83,7 +88,7 @@
 
           ./chip-tool powersource read description 1 1
 
-          Verify in TH all-clusters-app log
+          Verify,On TestHarnes (all-cluster-app) a received read of description attribute looks like this:
 
           CHIP:IM: Received Read request
           [1653395620.020314][19412:19412] CHIP:DMG: ReadRequestMessage =
@@ -109,21 +114,21 @@
           "DUT reads all supported optional attributes from TH one at a time in
           a manufacturer specific order"
       verification: |
-          This cluster doesn't have any  optional attribute
+          This cluster doesn"t have any  optional attribute
       disabled: true
 
     - label:
           "DUT writes a suitable value to all supported mandatory attributes on
           the TH one at a time in a manufacturer specific order"
       verification: |
-          This cluster doesn't have any writable attributes
+          This cluster doesn"t have any writable attributes
       disabled: true
 
     - label:
           "DUT writes a suitable value to all supported optional attributes on
           the TH one at a time in a manufacturer specific order"
       verification: |
-          This cluster doesn't have any writable attributes
+          This cluster doesn"t have any writable attributes
       disabled: true
 
     - label:
@@ -132,10 +137,26 @@
           also reflects this in global attributes such as FeatureMap and
           AttributeList. Commission DUT to TH again"
       verification: |
-          "On TestHarnes (all-cluster-app) a received read of Staus attribute (id 0) looks like this:
+          ./chip-tool powersource read attribute-list 1 0
+
+          Verify the attribute-list contains list of mandatory attribute in TH all-clusters-app log
+
+          [1658911139.284282][13908:13913] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_002F Attribute 0x0000_FFFB DataVersion: 2172946531
+          [1658911139.284369][13908:13913] CHIP:TOO:   AttributeList: 8 entries
+          [1658911139.284417][13908:13913] CHIP:TOO:     [1]: 0
+          [1658911139.284446][13908:13913] CHIP:TOO:     [2]: 1
+          [1658911139.284474][13908:13913] CHIP:TOO:     [3]: 2
+          [1658911139.284501][13908:13913] CHIP:TOO:     [4]: 65528
+          [1658911139.284528][13908:13913] CHIP:TOO:     [5]: 65529
+          [1658911139.284554][13908:13913] CHIP:TOO:     [6]: 65531
+          [1658911139.284581][13908:13913] CHIP:TOO:     [7]: 65532
+          [1658911139.284608][13908:13913] CHIP:TOO:     [8]: 65533
+
+
+
           ./chip-tool powersource read status 1 1
 
-          Verify in TH all-clusters-app log
+          Verify, On TestHarnes (all-cluster-app) a received read of Staus attribute looks like this:
 
           [1646155382.977445][33190:33190] CHIP:EM: Received message of type 0x2 with protocolId (0, 1) and MessageCounter:685127 on exchange 16568r
           [1646155382.977534][33190:33190] CHIP:EM: Handling via exchange: 16568r, Delegate: 0xaaaace1730c8
@@ -164,7 +185,7 @@
 
           ./chip-tool powersource read order 1 1
 
-          Verify in TH all-clusters-app log
+          Verify, On TestHarnes (all-cluster-app)  received read of order attribute looks like this:
 
           [1653395573.862606][19412:19412] CHIP:IM: Received Read request
           [1653395573.862690][19412:19412] CHIP:DMG: ReadRequestMessage =
@@ -188,7 +209,7 @@
 
           ./chip-tool powersource read description 1 1
 
-          Verify in TH all-clusters-app log
+          verify , On TestHarnes (all-cluster-app) a received read of description attribute looks like this:
 
           CHIP:IM: Received Read request
           [1653395620.020314][19412:19412] CHIP:DMG: ReadRequestMessage =
@@ -214,12 +235,12 @@
           "DUT reads all supported optional attributes from TH one at a time in
           a manufacturer specific order"
       verification: |
-          This cluster doesn't have any  optional attribute
+          This cluster doesn"t have any  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: |
-          This cluster doesn't have any writable attributes
+          This cluster doesn"t have any writable attributes
       disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_RH_3_1.yaml b/src/app/tests/suites/certification/Test_TC_RH_3_1.yaml
index 2715a09..912a2d7 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,14 @@
 # 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: 10.3.1. [TC-RH-3.1] Attributes with Client as DUT
+
+PICS:
+    - RH.C
+    - RH.C.AM-READ
+    - RH.C.AO-READ
+    - RH.C.AM-WRITE
+    - RH.C.AO-WRITE
 
 config:
     nodeId: 0x12344321
@@ -30,7 +37,7 @@
 
 
           ./chip-tool relativehumiditymeasurement read measured-value 1 1
-          Verify in TH all-clusters-app log
+          Verify in DUT as client side Log
           [1651147639.252032][2336:2336] CHIP:IM: Received Read request
           [1651147639.252086][2336:2336] CHIP:DMG: ReadRequestMessage =
           [1651147639.252136][2336:2336] CHIP:DMG: {
@@ -52,7 +59,7 @@
           [1651147639.252925][2336:2336] CHIP:DMG: Building Reports for ReadHandler with LastReportGeneration = 0 DirtyGeneration = 0
 
            ./chip-tool relativehumiditymeasurement read min-measured-value 1 1
-          Verify in TH all-clusters-app log
+          Verify in DUT as client side Log
           1651147834.075387][2336:2336] CHIP:IM: Received Read request
           [1651147834.075454][2336:2336] CHIP:DMG: ReadRequestMessage =
           [1651147834.075481][2336:2336] CHIP:DMG: {
@@ -74,7 +81,7 @@
           [1651147834.076111][2336:2336] CHIP:DMG: Building Reports for ReadHandler with LastReportGeneration = 0 DirtyGeneration = 0
 
           ./chip-tool relativehumiditymeasurement read max-measured-value 1 1
-          Verify in TH all-clusters-app log
+          Verify in DUT as client side Log
           [1651147902.966904][2336:2336] CHIP:IM: Received Read request
           [1651147902.966980][2336:2336] CHIP:DMG: ReadRequestMessage =
           [1651147902.967012][2336:2336] CHIP:DMG: {
@@ -104,7 +111,7 @@
           ./chip-tool relativehumiditymeasurement read tolerance 1 1
 
 
-          Verify in TH all-clusters-app log
+          Verify in DUT as client side Log
           [1651148035.585189][2336:2336] CHIP:IM: Received Read request
           [1651148035.585247][2336:2336] CHIP:DMG: ReadRequestMessage =
           [1651148035.585276][2336:2336] CHIP:DMG: {
@@ -130,14 +137,14 @@
           "DUT writes a suitable value to all supported mandatory attributes on
           the TH one at a time in a manufacturer specific order"
       verification: |
-          This cluster doesn't have any writable attributes
+          This cluster doesn"t have any writable attributes
       disabled: true
 
     - label:
           "DUT writes a suitable value to all supported optional attributes on
           the TH one at a time in a manufacturer specific order"
       verification: |
-          This cluster doesn't have any writable attributes
+          This cluster doesn"t have any writable attributes
       disabled: true
 
     - label:
@@ -147,7 +154,10 @@
           AttributeList. Commission DUT to TH again"
       verification: |
           ./chip-tool relativehumiditymeasurement read attribute-list  1 1
-          Verify in TH all-clusters-app log
+
+
+          Verify in DUT as client side Log
+
           [1654247077216] [91776:4010112] CHIP: [TOO] Endpoint: 1 Cluster: 0x0000_0405 Attribute 0x0000_FFFB DataVersion: 1294674518
           [1654247077217] [91776:4010112] CHIP: [TOO]   AttributeList: 8 entries
           [1654247077217] [91776:4010112] CHIP: [TOO]     [1]: 0
@@ -163,9 +173,11 @@
           "On TestHarnes (all-cluster-app) a received read of MeasuredValue (id 0) looks like this:
 
           ./chip-tool relativehumiditymeasurement read measured-value 1 1
-          Verify in TH all-clusters-app log
+
+          Verify in DUT as client side Log
 
           [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 =
@@ -186,9 +198,10 @@
           [1651147639.252925][2336:2336] CHIP:DMG: Building Reports for ReadHandler with LastReportGeneration = 0 DirtyGeneration = 0
 
            ./chip-tool relativehumiditymeasurement read min-measured-value 1 1
-          Verify in TH all-clusters-app log
+          Verify in DUT as client side Log
 
           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 =
@@ -209,7 +222,7 @@
           [1651147834.076111][2336:2336] CHIP:DMG: Building Reports for ReadHandler with LastReportGeneration = 0 DirtyGeneration = 0
 
           ./chip-tool relativehumiditymeasurement read max-measured-value 1 1
-          Verify in TH all-clusters-app log
+          Verify in DUT as client side Log
 
           [1651147902.966904][2336:2336] CHIP:IM: Received Read request
           [1651147902.966980][2336:2336] CHIP:DMG: ReadRequestMessage =
@@ -247,5 +260,5 @@
           "DUT writes a suitable value to all supported optional attributes on
           the TH one at a time in a manufacturer specific order"
       verification: |
-          This cluster doesn't have any writable attributes
+          This cluster doesn"t have any writable attributes
       disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_SC_3_6.yaml b/src/app/tests/suites/certification/Test_TC_SC_3_6.yaml
new file mode 100644
index 0000000..5a978d9
--- /dev/null
+++ b/src/app/tests/suites/certification/Test_TC_SC_3_6.yaml
@@ -0,0 +1,313 @@
+# Copyright (c) 2021 Project CHIP Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# Auto-generated scripts for harness use only, please review before automation. The endpoints and cluster names are currently set to default
+
+name: 3.3.6. [TC-SC-3.6] CASE Resource validation
+
+PICS:
+    - MCORE.ROLE.COMMISSIONEE
+
+config:
+    nodeId: 0x12344321
+    cluster: "Basic"
+    endpoint: 0
+
+tests:
+    - label:
+          "RD1X, RD2X, RD3X, RD4X, RD5X each send 1 Subscribe Request Messages
+          to DUT.(Total - 15 active subscriptions) They can subscribe to any
+          attribute. Once all subscriptions are active, change the value of the
+          attribute that has been subscribed to"
+      verification: |
+          Send 1 Subscriptionrequest message from each Reference Device(Eg. RD1...) to DUT and verify all the subscription requests are succes, and change the value of all the attributes by sending write command, after sending write commanfd verify on each of these Reference Devices that the appropriate attribute value has been received. Example commands given below are using 4 reference device (User can use 15 reference device and send the below command in from each reference device)
+
+
+          on the first reference device enter:
+
+           onoff  subscribe on-time  10 100  1 1
+          [1657715218.149357][5956:5961] CHIP:DMG: ReportDataMessage =
+          [1657715218.149399][5956:5961] CHIP:DMG: {
+          [1657715218.149432][5956:5961] CHIP:DMG:         SubscriptionId = 0xea8e5b3b,
+          [1657715218.149465][5956:5961] CHIP:DMG:         AttributeReportIBs =
+          [1657715218.149504][5956:5961] CHIP:DMG:         [
+          [1657715218.149535][5956:5961] CHIP:DMG:                 AttributeReportIB =
+          [1657715218.149581][5956:5961] CHIP:DMG:                 {
+          [1657715218.149619][5956:5961] CHIP:DMG:                         AttributeDataIB =
+          [1657715218.149663][5956:5961] CHIP:DMG:                         {
+          [1657715218.149711][5956:5961] CHIP:DMG:                                 DataVersion = 0x734a2d83,
+          [1657715218.149755][5956:5961] CHIP:DMG:                                 AttributePathIB =
+          [1657715218.149802][5956:5961] CHIP:DMG:                                 {
+          [1657715218.149849][5956:5961] CHIP:DMG:                                         Endpoint = 0x1,
+          [1657715218.149895][5956:5961] CHIP:DMG:                                         Cluster = 0x6,
+          [1657715218.149942][5956:5961] CHIP:DMG:                                         Attribute = 0x0000_4001,
+          [1657715218.149983][5956:5961] CHIP:DMG:                                 }
+          [1657715218.150027][5956:5961] CHIP:DMG:
+          [1657715218.150075][5956:5961] CHIP:DMG:                                 Data = 0,
+          [1657715218.150118][5956:5961] CHIP:DMG:                         },
+          [1657715218.150165][5956:5961] CHIP:DMG:
+          [1657715218.150201][5956:5961] CHIP:DMG:                 },
+          [1657715218.150245][5956:5961] CHIP:DMG:
+          [1657715218.150275][5956:5961] CHIP:DMG:         ],
+          [1657715218.150313][5956:5961] CHIP:DMG:
+          [1657715218.150343][5956:5961] CHIP:DMG:         InteractionModelRevision = 1
+          [1657715218.150372][5956:5961] CHIP:DMG: }
+          [1657715218.150529][5956:5961] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0006 Attribute 0x0000_4001 DataVersion: 1934241155
+          [1657715218.150599][5956:5961] CHIP:TOO:   OnTime: 0
+          [1657715218.150646][5956:5961] CHIP:DMG: MoveToState ReadClient[0xffff94008e40]: Moving to
+
+
+          On the 2nd reference device
+
+           levelcontrol  subscribe  on-level 100 1000  1 1
+          [1657715273.668717][5956:5961] CHIP:DMG: ReportDataMessage =
+          [1657715273.668784][5956:5961] CHIP:DMG: {
+          [1657715273.668846][5956:5961] CHIP:DMG:         SubscriptionId = 0xb6497be6,
+          [1657715273.668908][5956:5961] CHIP:DMG:         AttributeReportIBs =
+          [1657715273.668984][5956:5961] CHIP:DMG:         [
+          [1657715273.669046][5956:5961] CHIP:DMG:                 AttributeReportIB =
+          [1657715273.669126][5956:5961] CHIP:DMG:                 {
+          [1657715273.669190][5956:5961] CHIP:DMG:                         AttributeDataIB =
+          [1657715273.669261][5956:5961] CHIP:DMG:                         {
+          [1657715273.669378][5956:5961] CHIP:DMG:                                 DataVersion = 0x319eeda7,
+          [1657715273.669460][5956:5961] CHIP:DMG:                                 AttributePathIB =
+          [1657715273.669540][5956:5961] CHIP:DMG:                                 {
+          [1657715273.669620][5956:5961] CHIP:DMG:                                         Endpoint = 0x1,
+          [1657715273.669706][5956:5961] CHIP:DMG:                                         Cluster = 0x8,
+          [1657715273.669792][5956:5961] CHIP:DMG:                                         Attribute = 0x0000_0011,
+          [1657715273.669875][5956:5961] CHIP:DMG:                                 }
+          [1657715273.669961][5956:5961] CHIP:DMG:
+          [1657715273.670043][5956:5961] CHIP:DMG:                                 Data = NULL
+          [1657715273.670119][5956:5961] CHIP:DMG:                         },
+          [1657715273.670199][5956:5961] CHIP:DMG:
+          [1657715273.670267][5956:5961] CHIP:DMG:                 },
+          [1657715273.670341][5956:5961] CHIP:DMG:
+          [1657715273.670400][5956:5961] CHIP:DMG:         ],
+          [1657715273.670474][5956:5961] CHIP:DMG:
+          [1657715273.670533][5956:5961] CHIP:DMG:         InteractionModelRevision = 1
+          [1657715273.670591][5956:5961] CHIP:DMG: }
+          [1657715273.670803][5956:5961] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0008 Attribute 0x0000_0011 DataVersion: 832499111
+          [1657715273.670879][5956:5961] CHIP:TOO:   on level: null
+          [1657715273.670967][5956:5961] CHIP:DMG: MoveToState ReadClient[0xffff94008f30]: Moving to [AwaitingSu]
+
+          on 3rd reference device
+
+          onoff subscribe start-up-on-off   100 1000 1 1
+          [1657715343.924200][5956:5961] CHIP:DMG: ReportDataMessage =
+          [1657715343.924269][5956:5961] CHIP:DMG: {
+          [1657715343.924330][5956:5961] CHIP:DMG:         SubscriptionId = 0x9fce63ae,
+          [1657715343.924392][5956:5961] CHIP:DMG:         AttributeReportIBs =
+          [1657715343.924470][5956:5961] CHIP:DMG:         [
+          [1657715343.924532][5956:5961] CHIP:DMG:                 AttributeReportIB =
+          [1657715343.924612][5956:5961] CHIP:DMG:                 {
+          [1657715343.924678][5956:5961] CHIP:DMG:                         AttributeDataIB =
+          [1657715343.924750][5956:5961] CHIP:DMG:                         {
+          [1657715343.924833][5956:5961] CHIP:DMG:                                 DataVersion = 0x734a2d84,
+          [1657715343.924909][5956:5961] CHIP:DMG:                                 AttributePathIB =
+          [1657715343.924992][5956:5961] CHIP:DMG:                                 {
+          [1657715343.925074][5956:5961] CHIP:DMG:                                         Endpoint = 0x1,
+          [1657715343.925159][5956:5961] CHIP:DMG:                                         Cluster = 0x6,
+          [1657715343.925245][5956:5961] CHIP:DMG:                                         Attribute = 0x0000_4003,
+          [1657715343.925382][5956:5961] CHIP:DMG:                                 }
+          [1657715343.925470][5956:5961] CHIP:DMG:
+          [1657715343.925561][5956:5961] CHIP:DMG:                                 Data = NULL
+          [1657715343.925631][5956:5961] CHIP:DMG:                         },
+          [1657715343.925713][5956:5961] CHIP:DMG:
+          [1657715343.925776][5956:5961] CHIP:DMG:                 },
+          [1657715343.925851][5956:5961] CHIP:DMG:
+          [1657715343.925910][5956:5961] CHIP:DMG:         ],
+          [1657715343.925985][5956:5961] CHIP:DMG:
+          [1657715343.926046][5956:5961] CHIP:DMG:         InteractionModelRevision = 1
+          [1657715343.926104][5956:5961] CHIP:DMG: }
+          [1657715343.926315][5956:5961] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0006 Attribute 0x0000_4003 DataVersion: 1934241156
+          [1657715343.926395][5956:5961] CHIP:TOO:   StartUpOnOff: null
+          [1657715343.926485][5956:5961] CHIP:DMG: MoveToState ReadClient[0xffff94008c80]: Moving to [AwaitingSu]
+
+          on the 4th reference device
+
+          basic subscribe node-label 10 100  1 0
+          [1657715505.138806][5956:5961] CHIP:DMG: ReportDataMessage =
+          [1657715505.138881][5956:5961] CHIP:DMG: {
+          [1657715505.138943][5956:5961] CHIP:DMG:         SubscriptionId = 0xd002abb6,
+          [1657715505.139045][5956:5961] CHIP:DMG:         AttributeReportIBs =
+          [1657715505.139128][5956:5961] CHIP:DMG:         [
+          [1657715505.139190][5956:5961] CHIP:DMG:                 AttributeReportIB =
+          [1657715505.139498][5956:5961] CHIP:DMG:                 {
+          [1657715505.139600][5956:5961] CHIP:DMG:                         AttributeDataIB =
+          [1657715505.139713][5956:5961] CHIP:DMG:                         {
+          [1657715505.139824][5956:5961] CHIP:DMG:                                 DataVersion = 0x1b93dc30,
+          [1657715505.139932][5956:5961] CHIP:DMG:                                 AttributePathIB =
+          [1657715505.140020][5956:5961] CHIP:DMG:                                 {
+          [1657715505.140112][5956:5961] CHIP:DMG:                                         Endpoint = 0x0,
+          [1657715505.140202][5956:5961] CHIP:DMG:                                         Cluster = 0x28,
+          [1657715505.140289][5956:5961] CHIP:DMG:                                         Attribute = 0x0000_0005,
+          [1657715505.140370][5956:5961] CHIP:DMG:                                 }
+          [1657715505.140560][5956:5961] CHIP:DMG:
+          [1657715505.140657][5956:5961] CHIP:DMG:                                 Data = "",
+          [1657715505.140741][5956:5961] CHIP:DMG:                         },
+          [1657715505.140825][5956:5961] CHIP:DMG:
+          [1657715505.140893][5956:5961] CHIP:DMG:                 },
+          [1657715505.140972][5956:5961] CHIP:DMG:
+          [1657715505.141031][5956:5961] CHIP:DMG:         ],
+          [1657715505.141105][5956:5961] CHIP:DMG:
+          [1657715505.141165][5956:5961] CHIP:DMG:         InteractionModelRevision = 1
+          [1657715505.141223][5956:5961] CHIP:DMG: }
+          [1657715505.141471][5956:5961] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0028 Attribute 0x0000_0005 DataVersion: 462674992
+          [1657715505.141554][5956:5961] CHIP:TOO:   NodeLabel:
+          [1657715505.141643][5956:5961] CHIP:DMG: MoveToState ReadClient[0xffff94008c80]: Moving to [AwaitingSu]
+
+
+
+          on the first reference device enter below mentioned commands to change the attribute values
+
+          onoff  write on-time 1 1 1
+          [1657715232.758666][5956:5961] CHIP:DMG: ReportDataMessage =
+          [1657715232.758698][5956:5961] CHIP:DMG: {
+          [1657715232.758724][5956:5961] CHIP:DMG:         SubscriptionId = 0xea8e5b3b,
+          [1657715232.758753][5956:5961] CHIP:DMG:         AttributeReportIBs =
+          [1657715232.758782][5956:5961] CHIP:DMG:         [
+          [1657715232.758803][5956:5961] CHIP:DMG:                 AttributeReportIB =
+          [1657715232.758832][5956:5961] CHIP:DMG:                 {
+          [1657715232.758854][5956:5961] CHIP:DMG:                         AttributeDataIB =
+          [1657715232.758880][5956:5961] CHIP:DMG:                         {
+          [1657715232.758911][5956:5961] CHIP:DMG:                                 DataVersion = 0x734a2d84,
+          [1657715232.758936][5956:5961] CHIP:DMG:                                 AttributePathIB =
+          [1657715232.758962][5956:5961] CHIP:DMG:                                 {
+          [1657715232.758989][5956:5961] CHIP:DMG:                                         Endpoint = 0x1,
+          [1657715232.759030][5956:5961] CHIP:DMG:                                         Cluster = 0x6,
+          [1657715232.759071][5956:5961] CHIP:DMG:                                         Attribute = 0x0000_4001,
+          [1657715232.759104][5956:5961] CHIP:DMG:                                 }
+          [1657715232.759140][5956:5961] CHIP:DMG:
+          [1657715232.759174][5956:5961] CHIP:DMG:                                 Data = 1,
+          [1657715232.759203][5956:5961] CHIP:DMG:                         },
+          [1657715232.759235][5956:5961] CHIP:DMG:
+          [1657715232.759261][5956:5961] CHIP:DMG:                 },
+          [1657715232.759292][5956:5961] CHIP:DMG:
+          [1657715232.759317][5956:5961] CHIP:DMG:         ],
+          [1657715232.759348][5956:5961] CHIP:DMG:
+          [1657715232.759373][5956:5961] CHIP:DMG:         InteractionModelRevision = 1
+          [1657715232.759398][5956:5961] CHIP:DMG: }
+          [1657715232.759493][5956:5961] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0006 Attribute 0x0000_4001 DataVersion: 1934241156
+          [1657715232.759530][5956:5961] CHIP:TOO:   OnTime: 1
+          [1657715232.759576][5956:5961] CHIP:DMG: Refresh LivenessCheckTime for 125000 milliseconds with SubscriptionId = 0xea8e5b3b
+
+
+
+          on the 2nd reference device enter below mentioned commands to change the attribute values
+
+           levelcontrol  write  on-level  1  1 1
+          [1657715287.200431][5956:5961] CHIP:DMG: ReportDataMessage =
+          [1657715287.200491][5956:5961] CHIP:DMG: {
+          [1657715287.200557][5956:5961] CHIP:DMG:         SubscriptionId = 0xb6497be6,
+          [1657715287.200622][5956:5961] CHIP:DMG:         AttributeReportIBs =
+          [1657715287.200701][5956:5961] CHIP:DMG:         [
+          [1657715287.200765][5956:5961] CHIP:DMG:                 AttributeReportIB =
+          [1657715287.200848][5956:5961] CHIP:DMG:                 {
+          [1657715287.200921][5956:5961] CHIP:DMG:                         AttributeDataIB =
+          [1657715287.201012][5956:5961] CHIP:DMG:                         {
+          [1657715287.201094][5956:5961] CHIP:DMG:                                 DataVersion = 0x319eeda8,
+          [1657715287.201180][5956:5961] CHIP:DMG:                                 AttributePathIB =
+          [1657715287.201263][5956:5961] CHIP:DMG:                                 {
+          [1657715287.201403][5956:5961] CHIP:DMG:                                         Endpoint = 0x1,
+          [1657715287.201501][5956:5961] CHIP:DMG:                                         Cluster = 0x8,
+          [1657715287.201596][5956:5961] CHIP:DMG:                                         Attribute = 0x0000_0011,
+          [1657715287.201686][5956:5961] CHIP:DMG:                                 }
+          [1657715287.201889][5956:5961] CHIP:DMG:
+          [1657715287.201987][5956:5961] CHIP:DMG:                                 Data = 1,
+          [1657715287.202074][5956:5961] CHIP:DMG:                         },
+          [1657715287.202157][5956:5961] CHIP:DMG:
+          [1657715287.202221][5956:5961] CHIP:DMG:                 },
+          [1657715287.202296][5956:5961] CHIP:DMG:
+          [1657715287.202354][5956:5961] CHIP:DMG:         ],
+          [1657715287.202429][5956:5961] CHIP:DMG:
+          [1657715287.202488][5956:5961] CHIP:DMG:         InteractionModelRevision = 1
+          [1657715287.202546][5956:5961] CHIP:DMG: }
+          [1657715287.202754][5956:5961] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0008 Attribute 0x0000_0011 DataVersion: 832499112
+          [1657715287.202838][5956:5961] CHIP:TOO:   on level: 1
+          [1657715287.202937][5956:5961] CHIP:DMG: Refresh LivenessCheckTime for 125000 milliseconds with SubscriptionId = 0xb6497be6 Peer = 01:0000000000000001
+
+
+
+
+          on the 3rd reference device enter below mentioned commands to change the attribute values
+
+          onoff write start-up-on-off  1 1 1
+          [1657715357.628508][5956:5961] CHIP:DMG: ReportDataMessage =
+          [1657715357.628536][5956:5961] CHIP:DMG: {
+          [1657715357.628561][5956:5961] CHIP:DMG:         SubscriptionId = 0x9fce63ae,
+          [1657715357.628586][5956:5961] CHIP:DMG:         AttributeReportIBs =
+          [1657715357.628618][5956:5961] CHIP:DMG:         [
+          [1657715357.628643][5956:5961] CHIP:DMG:                 AttributeReportIB =
+          [1657715357.628676][5956:5961] CHIP:DMG:                 {
+          [1657715357.628702][5956:5961] CHIP:DMG:                         AttributeDataIB =
+          [1657715357.628735][5956:5961] CHIP:DMG:                         {
+          [1657715357.628763][5956:5961] CHIP:DMG:                                 DataVersion = 0x734a2d85,
+          [1657715357.628791][5956:5961] CHIP:DMG:                                 AttributePathIB =
+          [1657715357.628822][5956:5961] CHIP:DMG:                                 {
+          [1657715357.628853][5956:5961] CHIP:DMG:                                         Endpoint = 0x1,
+          [1657715357.628882][5956:5961] CHIP:DMG:                                         Cluster = 0x6,
+          [1657715357.628914][5956:5961] CHIP:DMG:                                         Attribute = 0x0000_4003,
+          [1657715357.628944][5956:5961] CHIP:DMG:                                 }
+          [1657715357.628977][5956:5961] CHIP:DMG:
+          [1657715357.629009][5956:5961] CHIP:DMG:                                 Data = 1,
+          [1657715357.629037][5956:5961] CHIP:DMG:                         },
+          [1657715357.629068][5956:5961] CHIP:DMG:
+          [1657715357.629093][5956:5961] CHIP:DMG:                 },
+          [1657715357.629123][5956:5961] CHIP:DMG:
+          [1657715357.629147][5956:5961] CHIP:DMG:         ],
+          [1657715357.629177][5956:5961] CHIP:DMG:
+          [1657715357.629201][5956:5961] CHIP:DMG:         InteractionModelRevision = 1
+          [1657715357.629225][5956:5961] CHIP:DMG: }
+          [1657715357.629340][5956:5961] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0006 Attribute 0x0000_4003 DataVersion: 1934241157
+          [1657715357.629432][5956:5961] CHIP:TOO:   StartUpOnOff: 1
+          [1657715357.629480][5956:5961] CHIP:DMG: Refresh LivenessCheckTime for 125000 milliseconds with SubscriptionId = 0x9fce63ae Peer = 01:0000000000000001
+
+
+
+
+
+
+          on the 4th reference device enter below mentioned commands to change the attribute values
+
+
+           basic write node-label  1  1 0
+          [1657715530.832949][5956:5961] CHIP:DMG: ReportDataMessage =
+          [1657715530.832977][5956:5961] CHIP:DMG: {
+          [1657715530.833000][5956:5961] CHIP:DMG:         SubscriptionId = 0xfd355fe5,
+          [1657715530.833024][5956:5961] CHIP:DMG:         AttributeReportIBs =
+          [1657715530.833063][5956:5961] CHIP:DMG:         [
+          [1657715530.833091][5956:5961] CHIP:DMG:                 AttributeReportIB =
+          [1657715530.833133][5956:5961] CHIP:DMG:                 {
+          [1657715530.833165][5956:5961] CHIP:DMG:                         AttributeDataIB =
+          [1657715530.833205][5956:5961] CHIP:DMG:                         {
+          [1657715530.833243][5956:5961] CHIP:DMG:                                 DataVersion = 0x1b93dc31,
+          [1657715530.833279][5956:5961] CHIP:DMG:                                 AttributePathIB =
+          [1657715530.833342][5956:5961] CHIP:DMG:                                 {
+          [1657715530.833382][5956:5961] CHIP:DMG:                                         Endpoint = 0x0,
+          [1657715530.833422][5956:5961] CHIP:DMG:                                         Cluster = 0x28,
+          [1657715530.833466][5956:5961] CHIP:DMG:                                         Attribute = 0x0000_0005,
+          [1657715530.833505][5956:5961] CHIP:DMG:                                 }
+          [1657715530.833546][5956:5961] CHIP:DMG:
+          [1657715530.833587][5956:5961] CHIP:DMG:                                 Data = "1",
+          [1657715530.833623][5956:5961] CHIP:DMG:                         },
+          [1657715530.833662][5956:5961] CHIP:DMG:
+          [1657715530.833693][5956:5961] CHIP:DMG:                 },
+          [1657715530.833730][5956:5961] CHIP:DMG:
+          [1657715530.833760][5956:5961] CHIP:DMG:         ],
+          [1657715530.833794][5956:5961] CHIP:DMG:
+          [1657715530.833822][5956:5961] CHIP:DMG:         InteractionModelRevision = 1
+          [1657715530.833851][5956:5961] CHIP:DMG: }
+          [1657715530.833959][5956:5961] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0028 Attribute 0x0000_0005 DataVersion: 462674993
+          [1657715530.833999][5956:5961] CHIP:TOO:   NodeLabel: 1
+          [1657715530.834171][5956:5961] CHIP:DMG: Refresh LivenessCheckTime for 125000 milliseconds with SubscriptionId = 0xfd355fe5 Peer = 01:0000000000000001
+      disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_SC_4_1.yaml b/src/app/tests/suites/certification/Test_TC_SC_4_1.yaml
index 152f803..cd0535e 100644
--- a/src/app/tests/suites/certification/Test_TC_SC_4_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_SC_4_1.yaml
@@ -13,7 +13,10 @@
 # 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: 14.4.1. [TC-SC-4.1] Commissionable Node Discovery - Commissionee Case
+name: 15.4.1. [TC-SC-4.1] Commissionable Node Discovery [DUT as Commissionee]
+
+PICS:
+    - MCORE.ROLE.COMMISSIONEE
 
 config:
     nodeId: 0x12344321
@@ -66,12 +69,20 @@
       disabled: true
 
     - label: "Check DNS-SD subtypes used by DUT"
+      PICS:
+          MCORE.COM.WIFI && MCORE.COM.ETH && MCORE.COM.THR &&
+          MCORE.SC.VENDOR_SUBTYPE && MCORE.SC.DEVTYPE_SUBTYPE && MCORE.SC.VP_KEY
+          && MCORE.SC.SII_OP_DISCOVERY_KEY && MCORE.SC.SAI_OP_DISCOVERY_KEY &&
+          MCORE.SC.DT_KEY&& MCORE.SC.DN_KEY && MCORE.SC.RI_KEY &&
+          MCORE.SC.PH_KEY && MCORE.SC.PI_KEY
       verification: |
           avahi-browse -rt _matterc._udp
 
 
           ubuntu@ubuntu:~$   avahi-browse -rt _matterc._udp
 
+          Verify on the DUT Log:
+
           + vethd8d0eac IPv6 279142392CEB80C3                              _matterc._udp        local
           + vethbbadff8 IPv6 279142392CEB80C3                              _matterc._udp        local
           + veth15cb450 IPv6 279142392CEB80C3                              _matterc._udp        local
@@ -144,7 +155,7 @@
 
           ./chip-tool administratorcommissioning open-basic-commissioning-window 200 1 0 --timedInteractionTimeoutMs 1000
 
-          verify on chip-tool logs:
+          verify on TH logs:
 
           [1652341174.803430][2893:2898] CHIP:DMG: InvokeResponseMessage =
           [1652341174.803488][2893:2898] CHIP:DMG: {
@@ -181,9 +192,17 @@
       disabled: true
 
     - label: "Check DNS-SD subtypes used by DUT"
+      PICS:
+          MCORE.COM.WIFI && MCORE.COM.ETH && MCORE.COM.THR &&
+          MCORE.SC.VENDOR_SUBTYPE && MCORE.SC.DEVTYPE_SUBTYPE && MCORE.SC.VP_KEY
+          && MCORE.SC.SII_OP_DISCOVERY_KEY && MCORE.SC.SAI_OP_DISCOVERY_KEY &&
+          MCORE.SC.DT_KEY && MCORE.SC.DN_KEY && MCORE.SC.RI_KEY &&
+          MCORE.SC.PH_KEY && MCORE.SC.PI_KEY
       verification: |
           avahi-browse -rt _matterc._udp
 
+          Verify on the DUT Log:
+
           + veth721e1d9 IPv6 19DDF06C3B5DD0C8                              _matterc._udp        local
           + veth961779b IPv6 19DDF06C3B5DD0C8                              _matterc._udp        local
           + veth6995c44 IPv6 19DDF06C3B5DD0C8                              _matterc._udp        local
@@ -255,7 +274,7 @@
 
           ./chip-tool pairing open-commissioning-window 1 1 200 2000 3840
 
-          verify on chip-tool logs:
+          Verify on the TH Log:
 
           [1652341411.383669][2929:2934] CHIP:DMG: InvokeResponseMessage =
           [1652341411.383720][2929:2934] CHIP:DMG: {
@@ -291,12 +310,20 @@
       disabled: true
 
     - label: "Check DNS-SD subtypes used by DUT"
+      PICS:
+          MCORE.COM.WIFI && MCORE.COM.ETH && MCORE.COM.THR &&
+          MCORE.SC.VENDOR_SUBTYPE && MCORE.SC.DEVTYPE_SUBTYPE && MCORE.SC.VP_KEY
+          && MCORE.SC.SII_OP_DISCOVERY_KEY && MCORE.SC.SAI_OP_DISCOVERY_KEY &&
+          MCORE.SC.DT_KEY && MCORE.SC.DN_KEY && MCORE.SC.RI_KEY &&
+          MCORE.SC.PH_KEY && MCORE.SC.PI_KEY
       verification: |
           Same verification steps as Step 3, Except Verify CM flag to be 2
 
 
           ubuntu@ubuntu:~$ avahi-browse -rt _matterc._udp
 
+          Verify on the DUT Log:
+
           + veth721e1d9 IPv6 9BFF1DCA106E337B                              _matterc._udp        local
           + veth721e1d9 IPv6 19DDF06C3B5DD0C8                              _matterc._udp        local
           + veth961779b IPv6 9BFF1DCA106E337B                              _matterc._udp        local
@@ -351,14 +378,21 @@
       disabled: true
 
     - label: "If (MCORE.SC.EXTENDED_DISCOVERY ) enable Extended Discovery"
+      PICS: MCORE.SC.EXTENDED_DISCOVERY
       verification: |
           If the device supports Discovery for extended period of time, Device should continue to advertise that duration
 
 
-          Raspberrypi device is not supporting extended discovery.I
+          Raspberrypi device is not supporting extended discovery.
       disabled: true
 
     - label: "If (PICS_EXTENDED_DISCOVERY) check DNS-SD subtypes used by DUT"
+      PICS:
+          MCORE.SC.EXTENDED_DISCOVERY && MCORE.COM.WIFI && MCORE.COM.ETH &&
+          MCORE.COM.THR && MCORE.SC.VENDOR_SUBTYPE && MCORE.SC.DEVTYPE_SUBTYPE
+          && MCORE.SC.VP_KEY && MCORE.SC.SII_OP_DISCOVERY_KEY &&
+          MCORE.SC.SAI_OP_DISCOVERY_KEY && MCORE.SC.DT_KEY && MCORE.SC.DN_KEY &&
+          MCORE.SC.RI_KEY && MCORE.SC.PH_KEY && MCORE.SC.PI_KEY
       verification: |
           avahi-browse -rt _matterc._udp
           +   eth0 IPv6 DD200C20D25AE5F7                              _matterc._udp        local
diff --git a/src/app/tests/suites/certification/Test_TC_SC_4_10.yaml b/src/app/tests/suites/certification/Test_TC_SC_4_10.yaml
index 7eb550f..abb4e9c 100644
--- a/src/app/tests/suites/certification/Test_TC_SC_4_10.yaml
+++ b/src/app/tests/suites/certification/Test_TC_SC_4_10.yaml
@@ -13,7 +13,12 @@
 # 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: 14.4.10. [TC-SC-4.10] Operational Discovery - Sleepy Node
+name:
+    15.4.10. [TC-SC-4.10] Operational Discovery - Sleepy Node [DUT as
+    Commissionee]
+
+PICS:
+    - MCORE.ROLE.COMMISSIONEE
 
 config:
     nodeId: 0x12344321
@@ -23,7 +28,7 @@
 tests:
     - label: "DUT is instructed to advertise its service"
       verification: |
-
+          verification step to be updated.
       disabled: true
 
     - label: "TH scans for DNS-SD advertising"
diff --git a/src/app/tests/suites/certification/Test_TC_SC_4_3.yaml b/src/app/tests/suites/certification/Test_TC_SC_4_3.yaml
index 371b74d..42bbfa1 100644
--- a/src/app/tests/suites/certification/Test_TC_SC_4_3.yaml
+++ b/src/app/tests/suites/certification/Test_TC_SC_4_3.yaml
@@ -15,6 +15,9 @@
 
 name: 3.4.3. [TC-SC-4.3] Operational Discovery - Node
 
+PICS:
+    - MCORE.ROLE.COMMISSIONEE
+
 config:
     nodeId: 0x12344321
     cluster: "Basic"
@@ -23,13 +26,19 @@
 tests:
     - label: "TH is instructed to start advertising a service using DNS-SD"
       verification: |
-
+          verification step to be updated.
       disabled: true
 
     - label: "Scan for DNS-SD advertising"
+      PICS:
+          MCORE.COM.WIFI && MCORE.COM.ETH && MCORE.COM.THR &&
+          MCORE.SC.SII_OP_DISCOVERY_KEY && MCORE.SC.SAI_OP_DISCOVERY_KEY &&
+          MCORE.SC.T_KEY
       verification: |
           ubuntu@ubuntu:~$ avahi-browse -rt _matter._tcp
 
+          Verify on the TH Log:
+
           + veth721e1d9 IPv6 433B62F8F07F4327-0000000000000001             _matter._tcp         local
           = veth721e1d9 IPv6 433B62F8F07F4327-0000000000000001             _matter._tcp         local
              hostname = [E45F0149AE290000.local]
@@ -39,11 +48,14 @@
       disabled: true
 
     - label:
-          "TH is instructed to start advertising a service using DNS-SD and
-          using only the TXT records defined in section of the matter spec"
+          "TH is instructed to start advertising an operational service using
+          DNS-SD with non-standard TXT record keys"
       verification: |
           ubuntu@ubuntu:~$ avahi-browse -rt _matter._tcp
 
+
+          Verify on the TH Log:
+
           ++ veth34b1077 IPv6 4B475AAEB62F42A1-0000000000000001             _matter._tcp         local
           = veth34b1077 IPv6 4B475AAEB62F42A1-0000000000000001             _matter._tcp         local
              hostname = [E45F0149AE290000.local]
@@ -53,19 +65,79 @@
       disabled: true
 
     - label:
-          "TH is instructed to start advertising a service using DNS-SD with
-          non-standard TXT record keys"
+          "DUT is rebooted and Commissioned again, then put in Commissioning
+          Mode using Open Basic Commissioning Window command, DUT is instructed
+          to advertise its service with the modified TXT record."
       verification: |
-          avahi-publish-service --subtype=_S3._sub._matterc._tcp --subtype=_L840._sub._matterc._tcp DD200C20D25AE5F7 --subtype=_CM._sub._matterc._tcp _matterc._tcp 11111 D=840 CM=2  INVALID_TEST=40
+          avahi-publish-service --subtype=_S3._sub._matter._tcp --subtype=_L840._sub._matter._tcp DD200C20D25AE5F7 --subtype=_CM._sub._matter._tcp _matter._tcp 11111 D=840 CM=2  INVALID_TEST=40
 
 
+          Verify on the TH Log:
+
           ubuntu@ubuntu:~$ avahi-browse -rt _matter._tcp
 
 
-          + veth721e1d9 IPv6 433B62F8F07F4327-0000000000000001             _matter._tcp         local
-          = veth721e1d9 IPv6 433B62F8F07F4327-0000000000000001             _matter._tcp         local
-             hostname = [E45F0149AE290000.local]
-             address = [fe80::28e0:95ff:fed9:3085]
+          + br-21ec3c459020 IPv4 DD200C20D25AE5F7                              _matter._tcp         local
+          + docker0 IPv4 DD200C20D25AE5F7                              _matter._tcp         local
+          + br-50884ced4bd8 IPv4 DD200C20D25AE5F7                              _matter._tcp         local
+          +   eth0 IPv6 DD200C20D25AE5F7                              _matter._tcp         local
+          +   eth0 IPv4 DD200C20D25AE5F7                              _matter._tcp         local
+          +     lo IPv4 DD200C20D25AE5F7                              _matter._tcp         local
+          = br-21ec3c459020 IPv4 DD200C20D25AE5F7                              _matter._tcp         local
+             hostname = [ubuntu-2.local]
+             address = [172.18.0.1]
+             port = [11111]
+             txt = ["INVALID_TEST=40" "CM=2" "D=840"]
+          = docker0 IPv4 DD200C20D25AE5F7                              _matter._tcp         local
+             hostname = [ubuntu-2.local]
+             address = [172.17.0.1]
+             port = [11111]
+             txt = ["INVALID_TEST=40" "CM=2" "D=840"]
+          = br-50884ced4bd8 IPv4 DD200C20D25AE5F7                              _matter._tcp         local
+             hostname = [ubuntu-2.local]
+             address = [172.19.0.1]
+             port = [11111]
+             txt = ["INVALID_TEST=40" "CM=2" "D=840"]
+          =   eth0 IPv6 DD200C20D25AE5F7                              _matter._tcp         local
+             hostname = [ubuntu-2.local]
+             address = [fd00::ef]
+             port = [11111]
+             txt = ["INVALID_TEST=40" "CM=2" "D=840"]
+          =   eth0 IPv4 DD200C20D25AE5F7                              _matter._tcp         local
+             hostname = [ubuntu-2.local]
+             address = [192.168.1.70]
+             port = [11111]
+             txt = ["INVALID_TEST=40" "CM=2" "D=840"]
+          =     lo IPv4 DD200C20D25AE5F7                              _matter._tcp         local
+             hostname = [ubuntu-2.local]
+             address = [127.0.0.1]
+             port = [11111]
+             txt = ["INVALID_TEST=40" "CM=2" "D=840"]
+          +   eth0 IPv6 21F41C9933CAAF62-000000000000003C             _matter._tcp         local
+          +   eth0 IPv6 5DA80B8DD9E64426-0000000000000046             _matter._tcp         local
+          +   eth0 IPv6 B1605B84E886EDCF-0000000000000258             _matter._tcp         local
+          =   eth0 IPv6 21F41C9933CAAF62-000000000000003C             _matter._tcp         local
+             hostname = [E45F010EBE440000.local]
+             address = [fe80::e65f:1ff:fe0e:be44]
              port = [5540]
              txt = ["T=1" "SAI=300" "SII=5000"]
+          =   eth0 IPv6 5DA80B8DD9E64426-0000000000000046             _matter._tcp         local
+             hostname = [E45F010EBE440000.local]
+             address = [fe80::e65f:1ff:fe0e:be44]
+             port = [5540]
+             txt = ["T=1" "SAI=300" "SII=5000"]
+          =   eth0 IPv6 B1605B84E886EDCF-0000000000000258             _matter._tcp         local
+             hostname = [E45F010EBE440000.local]
+             address = [fe80::e65f:1ff:fe0e:be44]
+             port = [5540]
+             txt = ["T=1" "SAI=300" "SII=5000"]
+      disabled: true
+
+    - label: "Scan for DNS-SD advertising"
+      PICS:
+          MCORE.COM.WIFI && MCORE.COM.ETH && MCORE.COM.THR &&
+          MCORE.SC.SII_OP_DISCOVERY_KEY && MCORE.SC.SAI_OP_DISCOVERY_KEY &&
+          MCORE.SC.T_KEY
+      verification: |
+          verification step to be updated.
       disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_SC_4_4.yaml b/src/app/tests/suites/certification/Test_TC_SC_4_4.yaml
index 4761315..dfd0fd3 100644
--- a/src/app/tests/suites/certification/Test_TC_SC_4_4.yaml
+++ b/src/app/tests/suites/certification/Test_TC_SC_4_4.yaml
@@ -15,6 +15,9 @@
 
 name: 3.4.4. [TC-SC-4.4] Operational Discovery - Controller [DUT - Controller]
 
+PICS:
+    - PICS_MCORE_ROLE_CONTROLLER
+
 config:
     nodeId: 0x12344321
     cluster: "Basic"
@@ -23,13 +26,19 @@
 tests:
     - label: "TH is instructed to start advertising a service using DNS-SD"
       verification: |
-
+          verification step to be updated.
       disabled: true
 
     - label: "Scan for DNS-SD advertising"
+      PICS:
+          MCORE.COM.WIFI && MCORE.COM.ETH && MCORE.COM.THR &&
+          MCORE.SC.SII_OP_DISCOVERY_KEY && MCORE.SC.SAI_OP_DISCOVERY_KEY &&
+          MCORE.SC.T_KEY
       verification: |
           ubuntu@ubuntu:~$ avahi-browse _matter._tcp -r
 
+          Verify on the TH Log:
+
           + veth721e1d9 IPv6 433B62F8F07F4327-0000000000000001             _matter._tcp         local
           +   eth0 IPv6 433B62F8F07F4327-0000000000000001             _matter._tcp         local
           = veth721e1d9 IPv6 433B62F8F07F4327-0000000000000001             _matter._tcp         local
@@ -45,13 +54,21 @@
       disabled: true
 
     - label: "DUT is instructed to advertise its service"
+      PICS: MCORE.SC.ADV
       verification: |
-
+          verification step to be updated.
       disabled: true
 
     - label: "Scan for DNS-SD advertising"
+      PICS:
+          MCORE.COM.WIFI && MCORE.COM.ETH && MCORE.COM.THR &&
+          MCORE.SC.SII_OP_DISCOVERY_KEY && MCORE.SC.SAI_OP_DISCOVERY_KEY &&
+          MCORE.SC.T_KEY && MCORE.SC.ADV
       verification: |
           avahi-browse _matter._tcp -r
+
+          Verify on the TH Log:
+
           + veth721e1d9 IPv6 433B62F8F07F4327-0000000000000001             _matter._tcp         local
           +   eth0 IPv6 433B62F8F07F4327-0000000000000001             _matter._tcp         local
           = veth721e1d9 IPv6 433B62F8F07F4327-0000000000000001             _matter._tcp         local
@@ -68,21 +85,24 @@
 
     - label: "DUT is instructed to query the TH for its services"
       verification: |
-
+          verification step to be updated.
       disabled: true
 
     - label: "Change its IP address by any means"
       verification: |
-          change the IP address
-          1.we have to take two routers
-          2.execute the above steps using the 1st router
-          3.switch the connection to 2nd router and execute the below steps and check the ipaddress of the routers.
+          1. Take two routers connected to the same ISP as input.
+          2. Execute step 1 to step 5 using Router1 Configuration.
+          3. Once step 1 to step 5 are executed in Router1 switch TH and DUT to Router2.
+          4. Execute step 1 to step 5 using Router2 Configuration.
+          5. Check the IP so that the Routers(Router1 and Router2) will have different IPs to Raspi.
       disabled: true
 
     - label: "DUT is instructed to query the TH for its services"
       verification: |
           ubuntu@ubuntu:~$ avahi-browse _matter._tcp -r
 
+          Verify on the TH Log:
+
           + veth721e1d9 IPv6 433B62F8F07F4327-0000000000000001             _matter._tcp         local
           = veth721e1d9 IPv6 433B62F8F07F4327-0000000000000001             _matter._tcp         local
              hostname = [E45F0149AE290000.local]
diff --git a/src/app/tests/suites/certification/Test_TC_SC_4_5.yaml b/src/app/tests/suites/certification/Test_TC_SC_4_5.yaml
index ac4478d..8692896 100644
--- a/src/app/tests/suites/certification/Test_TC_SC_4_5.yaml
+++ b/src/app/tests/suites/certification/Test_TC_SC_4_5.yaml
@@ -13,7 +13,10 @@
 # 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: 14.4.5. [TC-SC-4.5] Operational Discovery - Thread Node
+name: 15.4.5. [TC-SC-4.5] Discovery [DUT as Commissionee][Thread]
+
+PICS:
+    - MCORE.ROLE.COMMISSIONEE
 
 config:
     nodeId: 0x12344321
diff --git a/src/app/tests/suites/certification/Test_TC_SC_4_6.yaml b/src/app/tests/suites/certification/Test_TC_SC_4_6.yaml
index 7e60d98..a4fd533 100644
--- a/src/app/tests/suites/certification/Test_TC_SC_4_6.yaml
+++ b/src/app/tests/suites/certification/Test_TC_SC_4_6.yaml
@@ -17,6 +17,9 @@
     3.4.6. [TC-SC-4.6] Commissioner Discovery - Commissioner [DUT -
     Commissioner]
 
+PICS:
+    - MCORE.ROLE.COMMISSIONER
+
 config:
     nodeId: 0x12344321
     cluster: "Basic"
@@ -27,7 +30,7 @@
           "DUT is instructed to start advertising its presence as a commissioner
           in the network"
       verification: |
-
+          verification step to be updated.
       disabled: true
 
     - label: "Check DNS-SD subtypes used by DUT"
diff --git a/src/app/tests/suites/certification/Test_TC_SC_4_7.yaml b/src/app/tests/suites/certification/Test_TC_SC_4_7.yaml
index cd406d8..fff47a1 100644
--- a/src/app/tests/suites/certification/Test_TC_SC_4_7.yaml
+++ b/src/app/tests/suites/certification/Test_TC_SC_4_7.yaml
@@ -15,6 +15,9 @@
 
 name: 3.4.7. [TC-SC-4.7] Commissioner Discovery - Commissionee
 
+PICS:
+    - MCORE.ROLE.COMMISSIONEE
+
 config:
     nodeId: 0x12344321
     cluster: "Basic"
@@ -29,12 +32,19 @@
       disabled: true
 
     - label: "Scan for DNS-SD commissioner advertisements from TH"
+      PICS:
+          MCORE.SC.DEVTYPE_SUBTYPE && MCORE.SC.VP_KEY && MCORE.SC.DT_KEY &&
+          MCORE.SC.DN_KEY &&
       verification: |
           if DUT supports discovering UDC, DUT should be able to scan the TV-app
 
-          Execute teh below command on TH terminal.
+          Execute the below command on TH terminal.
 
-          ~$ avahi-browse -rt _matterc._udp
+
+
+          ~$ avahi-browse -rt _matterd._udp
+
+          Verify on the TH Log:
 
           =+ wlp3s0 IPv4 DD200C20D25AE5F7                              _matterd._udp        local
           + enp2s0 IPv6 DD200C20D25AE5F7                              _matterd._udp        local
@@ -66,15 +76,18 @@
           "By any means, TH adds an unknown key/value pair in the advertised
           data(e.g. AB=12345)"
       verification: |
-          avahi-publish-service --subtype=_S3._sub._matterc._udp --subtype=_L840._sub._matterc._udp DD200C20D25AE5F7 --subtype=_CM._sub._matterc._udp _matterc._udp 11111 D=840 CM=2  INVALID_TEST=40
+          avahi-publish-service --subtype=_V123._sub._matterd._udp DD200C20D25AE5F7 _matterd._udp 33333 VP=123+456 DT=35 DN="Living Room TV" INVALID_TEST=40
       disabled: true
 
     - label: "Scan for DNS-SD commissioner advertisements from TH"
       verification: |
-          ubuntu@ubuntu:~$ avahi-browse -rt _matterc._udp
-          +   eth0 IPv6 DD200C20D25AE5F7                              _matterc._udp        local
-          +   eth0 IPv4 DD200C20D25AE5F7                              _matterc._udp        local
-          =   eth0 IPv6 DD200C20D25AE5F7                              _matterc._udp        local
+          ubuntu@ubuntu:~$ avahi-browse -rt _matterd._udp
+
+          Verify on the TH Log:
+
+          +   eth0 IPv6 DD200C20D25AE5F7                              _matterd._udp        local
+          +   eth0 IPv4 DD200C20D25AE5F7                              _matterd._udp        local
+          =   eth0 IPv6 DD200C20D25AE5F7                              _matterd._udp        local
              hostname = [ubuntu-4.local]
              address = [fd00::9e]
              port = [11111]
diff --git a/src/app/tests/suites/certification/Test_TC_SC_4_9.yaml b/src/app/tests/suites/certification/Test_TC_SC_4_9.yaml
index f256b0c..584362f 100644
--- a/src/app/tests/suites/certification/Test_TC_SC_4_9.yaml
+++ b/src/app/tests/suites/certification/Test_TC_SC_4_9.yaml
@@ -13,7 +13,12 @@
 # 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: 14.4.9. [TC-SC-4.9] Operational Discovery - RIO support
+name:
+    15.4.9. [TC-SC-4.9] Operational Discovery - RIO support [DUT as
+    Commissionee]
+
+PICS:
+    - MCORE.ROLE.COMMISSIONEE
 
 config:
     nodeId: 0x12344321
@@ -26,9 +31,9 @@
           control list entry on DUT_CE that gives Operate Privilege to TH_CR2
           against every endpoint of DUT_CE"
       verification: |
-          ./chip-tool accesscontrol write acl '[{"fabricIndex": 1, "privilege": 5, "authMode": 2, "subjects": [112233], "targets": [{"cluster": null, "endpoint": 0, "deviceType": null}]}, {"fabricIndex": 1, "privilege": 3, "authMode": 3, "subjects": null, "targets": [{"cluster": null, "endpoint": 1, "deviceType": null}]}]' 77 0
+          ./chip-tool accesscontrol write acl "[{"fabricIndex": 1, "privilege": 5, "authMode": 2, "subjects": [112233], "targets": [{"cluster": null, "endpoint": 0, "deviceType": null}]}, {"fabricIndex": 1, "privilege": 3, "authMode": 3, "subjects": null, "targets": [{"cluster": null, "endpoint": 1, "deviceType": null}]}]" 77 0
 
-          Verify on the TH Log:
+          Verify SUCCESS on the TH Log:
 
           [1652330385.328196][3240:3245] CHIP:DMG:                        StatusIB =
           [1652330385.328229][3240:3245] CHIP:DMG:                        {
@@ -42,18 +47,18 @@
       verification: |
           ./chip-tool basic read node-label 77 0
 
-          Verify on the TH Log:
+          Verify NodeLabel on the TH Log:
 
           [1652420234.342201][2403:2408] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0028 Attribute 0x0000_0005 DataVersion: 2144347768
           [1652420234.342277][2403:2408] CHIP:TOO:   NodeLabel:
           [1652420234.342452][2403:2408] CHIP:EM: Sending Standalone Ack for MessageCounter:123718 on exchange 57159i
       disabled: true
 
-    - label: 'Writes "TestRIO" to the NodeLabel attribute'
+    - label: "Writes TestRIO to the NodeLabel attribute"
       verification: |
           ./chip-tool basic write node-label testrio 77 0
 
-          Verify on the TH Log:
+          Verify SUCCESS on the TH Log:
 
           StatusIB =
           [1652421063.833937][2454:2459] CHIP:DMG:                         {
@@ -65,18 +70,18 @@
       verification: |
           ./chip-tool basic read node-label 77 0
 
-          Verify on the TH Log:
+          Verify NodeLabel on the TH Log:
 
           [1652421068.143200][2460:2465] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0028 Attribute 0x0000_0005 DataVersion: 2144347769
           [1652421068.143276][2460:2465] CHIP:TOO:   NodeLabel: testrio
           [1652421068.143457][2460:2465] CHIP:EM: Sending Standalone Ack for MessageCounter:2274062 on exchange 46531i
       disabled: true
 
-    - label: 'Writes "TestRIO2" to the NodeLabel attribute'
+    - label: "Writes TestRIO2 to the NodeLabel attribute"
       verification: |
           ./chip-tool basic write node-label testrio2 77 0
 
-          Verify on the TH Log:
+          Verify SUCCESS on the TH Log:
 
           StatusIB =
           [1652421082.185625][2467:2473] CHIP:DMG:                         {
@@ -88,9 +93,24 @@
       verification: |
           ./chip-tool basic read node-label 77 0
 
-          Verify on the TH Log:
+          Verify NodeLabel on the TH Log:
 
           [1652421088.232903][2474:2479] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0028 Attribute 0x0000_0005 DataVersion: 2144347770
           [1652421088.232983][2474:2479] CHIP:TOO:   NodeLabel: testrio2
           [1652421088.233169][2474:2479] CHIP:EM: Sending Standalone Ack for MessageCounter:4743745 on exchange 61019i
       disabled: true
+
+    - label: "Bring the TH_CR2 onto the thread network"
+      verification: |
+          verification step to be updated.
+      disabled: true
+
+    - label:
+          "Using TH_CR2, using ICMPv6 echo to ping with a payload >= 32 bytes to
+          the the DUT_CE that is already commissioned to the Matter network. IP
+          address is determined by operational discovery of the DNS-SD
+          operational service record (_matter._tcp service instance) of DUT_CE
+          done by TH_CR2."
+      verification: |
+          verification step to be updated.
+      disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_TMP_3_1.yaml b/src/app/tests/suites/certification/Test_TC_TMP_3_1.yaml
index c7f6dfc..787e939 100644
--- a/src/app/tests/suites/certification/Test_TC_TMP_3_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_TMP_3_1.yaml
@@ -15,6 +15,13 @@
 
 name: 3.3.1. [TC-TMP-3.1] Attributes with client as DUT
 
+PICS:
+    - TMP.C
+    - TMP.C.AM-READ
+    - TMP.C.AO-READ
+    - TMP.C.AM-WRITE
+    - TMP.C.AO-WRITE
+
 config:
     nodeId: 0x12344321
     cluster: "Basic"
@@ -25,9 +32,10 @@
           "DUT reads all supported mandatory attributes from TH one at a time in
           a manufacturer specific order"
       verification: |
-          On Reference app  verify TH receives the read command and knows this attribute for this cluster and provides a plausable value
+          ./chip-tool temperaturemeasurement read measured-value 1 1
 
-           ./chip-tool temperaturemeasurement read measured-value 1 1
+          on TH(all-cluster-app) verify the ReadRequestMessage
+
           1650880412.037722][15013:15013] CHIP:DMG: ReadRequestMessage =
           [1650880412.037749][15013:15013] CHIP:DMG: {
           [1650880412.037772][15013:15013] CHIP:DMG:         AttributePathIBs =
@@ -48,6 +56,9 @@
 
 
           ./chip-tool temperaturemeasurement read max-measured-value 1 1
+
+          on TH(all-cluster-app) verify the ReadRequestMessage
+
           [1650880462.518114][15013:15013] CHIP:DMG: ReadRequestMessage =
           [1650880462.518149][15013:15013] CHIP:DMG: {
           [1650880462.518176][15013:15013] CHIP:DMG:         AttributePathIBs =
@@ -68,6 +79,8 @@
 
           ./chip-tool temperaturemeasurement read min-measured-value 1 1
 
+          on TH(all-cluster-app) verify the ReadRequestMessage
+
           [1650880507.409653][15013:15013] CHIP:DMG: ReadRequestMessage =
           [1650880507.409703][15013:15013] CHIP:DMG: {
           [1650880507.409727][15013:15013] CHIP:DMG:         AttributePathIBs =
@@ -91,10 +104,30 @@
           a manufacturer specific order"
       verification: |
           On Reference app  verify TH receives the read command and knows this attribute for this cluster and provides a plausable value
+
           ./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
+          on TH(all-cluster-app) verify the ReadRequestMessage
+
+          [1658141616.808771][13946:13946] CHIP:IM: Received Read request
+          [1658141616.808855][13946:13946] CHIP:DMG: ReadRequestMessage =
+          [1658141616.808885][13946:13946] CHIP:DMG: {
+          [1658141616.808909][13946:13946] CHIP:DMG:         AttributePathIBs =
+          [1658141616.808942][13946:13946] CHIP:DMG:         [
+          [1658141616.808969][13946:13946] CHIP:DMG:                 AttributePathIB =
+          [1658141616.809001][13946:13946] CHIP:DMG:                 {
+          [1658141616.809032][13946:13946] CHIP:DMG:                         Endpoint = 0x1,
+          [1658141616.809068][13946:13946] CHIP:DMG:                         Cluster = 0x402,
+          [1658141616.809104][13946:13946] CHIP:DMG:                         Attribute = 0x0000_0003,
+          [1658141616.809138][13946:13946] CHIP:DMG:                 }
+          [1658141616.809170][13946:13946] CHIP:DMG:
+          [1658141616.809198][13946:13946] CHIP:DMG:         ],
+          [1658141616.809230][13946:13946] CHIP:DMG:
+          [1658141616.809259][13946:13946] CHIP:DMG:         isFabricFiltered = true,
+          [1658141616.809288][13946:13946] CHIP:DMG:         InteractionModelRevision = 1
+          [1658141616.809314][13946:13946] CHIP:DMG: },
+          [1658141616.809417][13946:13946] CHIP:DMG: IM RH moving to [GeneratingReports]
+          [1658141616.809511][13946:13946] CHIP:DMG: Building Reports for ReadHandler with LastReportGeneration = 0 DirtyGeneration = 0
       disabled: true
 
     - label:
@@ -108,7 +141,7 @@
           "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
+          There is no writable Optional attibute for this cluster
       disabled: true
 
     - label:
@@ -119,26 +152,8 @@
       verification: |
           To verify all below steps use all-clusters-minimal-app
 
-           ./chip-tool temperaturemeasurement read attribute-list  1 1
-          Verify in TH all-clusters-minimal-app Log:
-          [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:
-
            ./chip-tool temperaturemeasurement read measured-value 1 1
-          Verify in TH all-clusters-minimal-app Log:
+          on TH(all-clusters-minimal-app) verify the ReadRequestMessage
           1650880412.037722][15013:15013] CHIP:DMG: ReadRequestMessage =
           [1650880412.037749][15013:15013] CHIP:DMG: {
           [1650880412.037772][15013:15013] CHIP:DMG:         AttributePathIBs =
@@ -159,7 +174,7 @@
 
 
           ./chip-tool temperaturemeasurement read max-measured-value 1 1
-          Verify in TH all-clusters-minimal-app Log:
+          on TH(all-clusters-minimal-app) verify the ReadRequestMessage
           [1650880462.518114][15013:15013] CHIP:DMG: ReadRequestMessage =
           [1650880462.518149][15013:15013] CHIP:DMG: {
           [1650880462.518176][15013:15013] CHIP:DMG:         AttributePathIBs =
@@ -179,7 +194,7 @@
 
 
           ./chip-tool temperaturemeasurement read min-measured-value 1 1
-          Verify in TH all-clusters-minimal-app Log:
+          on TH(all-clusters-minimal-app) verify the ReadRequestMessage
           [1650880507.409653][15013:15013] CHIP:DMG: ReadRequestMessage =
           [1650880507.409703][15013:15013] CHIP:DMG: {
           [1650880507.409727][15013:15013] CHIP:DMG:         AttributePathIBs =
@@ -204,6 +219,7 @@
       verification: |
           ./chip-tool temperaturemeasurement read tolerance 1 1
 
+          On DUT as a client side, verify that TH all-clusters-minimal-app sent  UNSUPPORTED_ATTRIBUTE response
            General error: 0x86 (UNSUPPORTED_ATTRIBUTE)
       disabled: true
 
diff --git a/src/app/tests/suites/certification/Test_TC_TSTAT_3_1.yaml b/src/app/tests/suites/certification/Test_TC_TSTAT_3_1.yaml
index 4b40cb7..f2597b2 100644
--- a/src/app/tests/suites/certification/Test_TC_TSTAT_3_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_TSTAT_3_1.yaml
@@ -15,6 +15,13 @@
 
 name: 41.3.1. [TC-TSTAT-3.1] Attributes with client as DUT
 
+PICS:
+    - TSTAT.C
+    - TSTAT.C.AM-READ
+    - TSTAT.C.AO-READ
+    - TSTAT.C.AM-WRITE
+    - TSTAT.C.AO-WRITE
+
 config:
     nodeId: 0x12344321
     cluster: "Basic"
@@ -26,8 +33,7 @@
           a manufacturer specific order"
       verification: |
           ./chip-tool thermostat read  local-temperature  1 1
-
-          Verify in TH all-clusters-app Log:
+          On TH(thermostat app), verify the read request
 
           [1652264555.303895][7099:7099] CHIP:IM: Received Read request
           [1652264555.303980][7099:7099] CHIP:DMG: ReadRequestMessage =
@@ -50,7 +56,7 @@
 
           ./chip-tool thermostat read  control-sequence-of-operation 1 1
 
-          Verify in TH all-clusters-app Log:
+          On TH(thermostat app), verify the read request
 
           [1652265275.022068][7099:7099] CHIP:DMG: ReadRequestMessage =
           [1652265275.022110][7099:7099] CHIP:DMG: {
@@ -70,7 +76,8 @@
           [1652265275.022756][7099:7099] CHIP:DMG: },
 
           ./chip-tool thermostat read   system-mode    1 1
-          Verify in TH all-clusters-app Log:
+
+          On TH(thermostat app), verify the read request
           [1652265332.311723][7099:7099] CHIP:DMG: ReadRequestMessage =
           [1652265332.311772][7099:7099] CHIP:DMG: {
           [1652265332.311812][7099:7099] CHIP:DMG:         AttributePathIBs =
@@ -107,7 +114,7 @@
 
 
           ./chip-tool thermostat write system-mode 2 1 1
-          Verify in TH all-clusters-app Log:
+          On TH(thermostat app), verify the write request
           [1652265582.913625][7099:7099] CHIP:IM: Received Write request
           [1652265582.913672][7099:7099] CHIP:DMG: IM WH moving to [Initialized]
           [1652265582.913768][7099:7099] CHIP:DMG: WriteRequestMessage =
@@ -137,7 +144,7 @@
 
 
            ./chip-tool thermostat write  control-sequence-of-operation 1 1 1
-          Verify in TH all-clusters-app Log:
+          On TH(thermostat app), verify the write request
           [1652265678.578137][7099:7099] CHIP:IM: Received Write request
           [1652265678.578192][7099:7099] CHIP:DMG: IM WH moving to [Initialized]
           [1652265678.578284][7099:7099] CHIP:DMG: WriteRequestMessage =
@@ -184,7 +191,7 @@
           verify on Reference app receives the right Read Request Message for the data sent in the below commands
 
           ./chip-tool thermostat read attribute-list 1 1
-          Verify in TH all-clusters-app Log:
+          On  TH(all-clusters-minimal-app) verify the read request
           [1657179340.726622][2249:2249] CHIP:IM: Received Read request
           [1657179340.726762][2249:2249] CHIP:DMG: ReadRequestMessage =
           [1657179340.726817][2249:2249] CHIP:DMG: {
@@ -208,7 +215,7 @@
 
 
           ./chip-tool thermostat read  local-temperature  1 1
-          Verify in TH all-clusters-app Log:
+          On  TH(all-clusters-minimal-app) verify the read request
           [1652264555.303895][7099:7099] CHIP:IM: Received Read request
           [1652264555.303980][7099:7099] CHIP:DMG: ReadRequestMessage =
           [1652264555.304045][7099:7099] CHIP:DMG: {
@@ -229,7 +236,7 @@
 
 
           ./chip-tool thermostat read  control-sequence-of-operation 1 1
-          Verify in TH all-clusters-app Log:
+          On  TH(all-clusters-minimal-app) verify the read request
           [1652265275.022068][7099:7099] CHIP:DMG: ReadRequestMessage =
           [1652265275.022110][7099:7099] CHIP:DMG: {
           [1652265275.022145][7099:7099] CHIP:DMG:         AttributePathIBs =
@@ -248,7 +255,7 @@
           [1652265275.022756][7099:7099] CHIP:DMG: },
 
           ./chip-tool thermostat read   system-mode    1 1
-          Verify in TH all-clusters-app Log:
+          On  TH(all-clusters-minimal-app) verify the read request
           [1652265332.311723][7099:7099] CHIP:DMG: ReadRequestMessage =
           [1652265332.311772][7099:7099] CHIP:DMG: {
           [1652265332.311812][7099:7099] CHIP:DMG:         AttributePathIBs =
diff --git a/src/app/tests/suites/certification/Test_TC_TSTAT_3_2.yaml b/src/app/tests/suites/certification/Test_TC_TSTAT_3_2.yaml
index 6bf7ff9..2f606a8 100644
--- a/src/app/tests/suites/certification/Test_TC_TSTAT_3_2.yaml
+++ b/src/app/tests/suites/certification/Test_TC_TSTAT_3_2.yaml
@@ -15,6 +15,9 @@
 
 name: 41.3.2. [TC-TSTAT-3.2] Functionality with client as DUT
 
+PICS:
+    - TSTAT.C
+
 config:
     nodeId: 0x12344321
     cluster: "Basic"
@@ -31,7 +34,7 @@
 
           ./chip-tool thermostat setpoint-raise-lower 0 10 1 1
 
-          Verify in TH all-clusters-app Log:
+          Verify in DUT as client side:Verify that Test Harness(Thermostat app) receives the SetpointRaiseLower command from the DUT
 
           [1646064221.719107][33190:33190] CHIP:EM: Received message of type 0x8 with protocolId (0, 1) and MessageCounter:4540287 on exchange 31012r
           [1646064221.719148][33190:33190] CHIP:EM: Handling via exchange: 31012r, Delegate: 0xaaaace1730c8
@@ -73,7 +76,7 @@
       verification: |
           ./chip-tool thermostat setpoint-raise-lower 0 -10 1 1
 
-          Verify in TH all-clusters-app Log:
+          Verify in DUT as client side: verify that, Test Harness(thermostat-app) receives the SetpointRaiseLower command from the DUT
 
           [1646064525.675075][33190:33190] CHIP:EM: Received message of type 0x8 with protocolId (0, 1) and MessageCounter:16717414 on exchange 9698r
           [1646064525.675116][33190:33190] CHIP:EM: Handling via exchange: 9698r, Delegate: 0xaaaace1730c8
@@ -110,38 +113,5 @@
     - label: "DUT sends a GetRelayStatusLog command to the Test Harness."
       PICS: TSTAT.C.C04.Tx
       verification: |
-          verify on Reference app receives the right Read Request Message for the data sent in the below commands
-
-          ./chip-tool thermostat  get-relay-status-log  1 1
-
-          Verify in TH all-clusters-app Log:
-
-          [1646064788.912273][33190:33190] CHIP:EM: Received message of type 0x8 with protocolId (0, 1) and MessageCounter:15642355 on exchange 58465r
-          [1646064788.912319][33190:33190] CHIP:EM: Handling via exchange: 58465r, Delegate: 0xaaaace1730c8
-          [1646064788.912604][33190:33190] CHIP:DMG: InvokeRequestMessage =
-          [1646064788.912647][33190:33190] CHIP:DMG: {
-          [1646064788.912673][33190:33190] CHIP:DMG:         suppressResponse = false,
-          [1646064788.912704][33190:33190] CHIP:DMG:         timedRequest = false,
-          [1646064788.912732][33190:33190] CHIP:DMG:         InvokeRequests =
-          [1646064788.912767][33190:33190] CHIP:DMG:         [
-          [1646064788.912794][33190:33190] CHIP:DMG:                 CommandDataIB =
-          [1646064788.912833][33190:33190] CHIP:DMG:                 {
-          [1646064788.912861][33190:33190] CHIP:DMG:                         CommandPathIB =
-          [1646064788.912896][33190:33190] CHIP:DMG:                         {
-          [1646064788.912936][33190:33190] CHIP:DMG:                                 EndpointId = 0x1,
-          [1646064788.912977][33190:33190] CHIP:DMG:                                 ClusterId = 0x201,
-          [1646064788.913010][33190:33190] CHIP:DMG:                                 CommandId = 0x4,
-          [1646064788.913048][33190:33190] CHIP:DMG:                         },
-          [1646064788.913085][33190:33190] CHIP:DMG:
-          [1646064788.913116][33190:33190] CHIP:DMG:                         CommandData =
-          [1646064788.913151][33190:33190] CHIP:DMG:                         {
-          [1646064788.913186][33190:33190] CHIP:DMG:                         },
-          [1646064788.913218][33190:33190] CHIP:DMG:                 },
-          [1646064788.913253][33190:33190] CHIP:DMG:
-          [1646064788.913280][33190:33190] CHIP:DMG:         ],
-          [1646064788.913313][33190:33190] CHIP:DMG:
-          [1646064788.913340][33190:33190] CHIP:DMG:         InteractionModelRevision = 1
-          [1646064788.913366][33190:33190] CHIP:DMG: },
-          [1646064788.913428][33190:33190] CHIP:DMG: AccessControl: checking f=1 a=c s=0x000000000001B669 t= c=0x0000_0201 e=1 p=o
-          [1646064788.913476][33190:33190] CHIP:DMG: Received command for Endpoint=1 Cluster=0x0000_0201 Command=0x0000_0004
+          The GetRelayStatusLogResponse command may not supported in Matter 1.0.
       disabled: true
diff --git a/src/app/tests/suites/certification/ci-pics-values b/src/app/tests/suites/certification/ci-pics-values
index f62e532..ae8d5b2 100644
--- a/src/app/tests/suites/certification/ci-pics-values
+++ b/src/app/tests/suites/certification/ci-pics-values
@@ -645,6 +645,10 @@
 MCORE.BRIDGE.BatInfo=1
 MCORE.BRIDGE.OtherControl=1
 MCORE.BRIDGE.AllowDeviceRename=1
+MCORE.DEVLIST.UseDevices=1
+MCORE.DEVLIST.UseDeviceState=1
+MCORE.DEVLIST.UseDeviceNames=1
+MCORE.DEVLIST.UseBatInfo=1
 
 #Bulk Data Exchange Protocol
 MCORE.BDX.Driver=1
@@ -758,6 +762,9 @@
 PS.S.F01=0
 PS.S.F02=0
 PS.S.F03=0
+PS.M.ManualWiredFault=1
+PS.M.ManualBatFault=1
+PS.M.ManualBatChargeFault=1
 
 #Thermostat User Configuration Cluster
 TSUIC.S.A0000=1
@@ -788,6 +795,7 @@
 MCORE.DD.UI=1
 MCORE.DD.COMM_DISCOVERY=1
 MCORE.DD.CONTROLLER=1
+MCORE.DD.CTRL_CONCATENATED_QR_CODE_1_INORDER=1
 MCORE.DD.CTRL_CONCATENATED_QR_CODE_1=1
 MCORE.DD.CTRL_CONCATENATED_QR_CODE_2=1
 MCORE.DD.COMMISSIONER=1
@@ -805,6 +813,11 @@
 MCORE.DD.SCAN_QR_CODE=1
 MCORE.DD.THREAD=1
 MCORE.DD.WIRELESS=1
+MCORE.COM.WIRELESS=1
+MCORE.COM.BLE=1
+MCORE.COM.WIFI=1
+MCORE.COM.ETH=1
+MCORE.COM.THR=1
 MCORE.DD.TXT_KEY_VP=1
 MCORE.DD.TXT_KEY_DT=1
 MCORE.DD.DISCOVERY_BLE=1
@@ -821,6 +834,7 @@
 
 #Ethernet Network Diagnostics Cluster
 DGETH.S.C00.Rsp=1
+DGETH.C.C00.Tx=1
 DGETH.S.A0000=1
 DGETH.S.A0001=1
 DGETH.S.A0002=1
@@ -1499,6 +1513,9 @@
 MCORE.SC.RI_KEY=1
 MCORE.SC.PH_KEY=1
 MCORE.SC.PI_KEY=1
+MCORE.SC.EXTENDED_DISCOVERY=1
+MCORE.SC.SED=1
+MCORE.SC.ADV=1
 
 #Bridged Device Basic Information
 #server
@@ -1556,3 +1573,45 @@
 BRBINFO.C.E01=1
 BRBINFO.C.E02=1
 BRBINFO.C.E03=1
+
+#Interaction Data Model
+MCORE.IDM.C.InvokeRequest=1
+MCORE.IDM.C.ReadRequest=1
+MCORE.IDM.C.WriteRequest=1
+MCORE.IDM.C.SubscribeRequest=1
+MCORE.IDM.S.Attribute.DataType_Bool=1
+MCORE.IDM.S.Attribute.DataType_String=1
+MCORE.IDM.S.Attribute.DataType_UnsignedInteger=1
+MCORE.IDM.S.Attribute.DataType_SignedInteger=1
+MCORE.IDM.S.Attribute.DataType_Struct=1
+MCORE.IDM.S.Attribute.DataType_FloatingPoint=1
+MCORE.IDM.S.Attribute.DataType_List=1
+MCORE.IDM.S.Attribute.DataType_OctetString=1
+MCORE.IDM.S.Attribute.DataType_Enum=1
+MCORE.IDM.S.Attribute.DataType_Bitmap=1
+MCORE.IDM.C.ReadRequest.Attribute.DataType_Bool=1
+MCORE.IDM.C.ReadRequest.Attribute.DataType_String=1
+MCORE.IDM.C.ReadRequest.Attribute.DataType_UnsignedInteger=1
+MCORE.IDM.C.ReadRequest.Attribute.DataType_SignedInteger=1
+MCORE.IDM.C.ReadRequest.Attribute.DataType_Struct=1
+MCORE.IDM.C.ReadRequest.Attribute.DataType_FloatingPoint=1
+MCORE.IDM.C.ReadRequest.Attribute.DataType_List=1
+MCORE.IDM.C.ReadRequest.Attribute.DataType_OctetString=1
+MCORE.IDM.C.ReadRequest.Attribute.DataType_Enum=1
+MCORE.IDM.C.ReadRequest.Attribute.DataType_Bitmap=1
+MCORE.IDM.S.Attribute_W.DataType_Bool=1
+MCORE.IDM.S.Attribute_W.DataType_String=1
+MCORE.IDM.S.Attribute_W.DataType_UnsignedInteger=1
+MCORE.IDM.S.Attribute_W.DataType_SignedInteger=1
+MCORE.IDM.S.Attribute_W.DataType_Struct=1
+MCORE.IDM.S.Attribute_W.DataType_FloatingPoint=1
+MCORE.IDM.S.Attribute_W.DataType_List=1
+MCORE.IDM.S.Attribute_W.DataType_OctetString=1
+MCORE.IDM.S.Attribute_W.DataType_Enum=1
+MCORE.IDM.S.Attribute_W.DataType_Bitmap=1
+MCORE.IDM.C.SubscribeRequest.Attribute.DataType_String=1
+MCORE.IDM.C.SubscribeRequest.Attribute.DataType_UnsignedInteger=1
+MCORE.IDM.C.SubscribeRequest.Attribute.DataType_Integer=1
+MCORE.IDM.C.SubscribeRequest.Attribute.DataType_FloatingPoint=1
+MCORE.IDM.C.SubscribeRequest.Attribute.DataType_List=1
+MCORE.IDM.S.LargeData=1
\ No newline at end of file
diff --git a/src/app/tests/suites/tests.js b/src/app/tests/suites/tests.js
index c9dbb88..790fb24 100644
--- a/src/app/tests/suites/tests.js
+++ b/src/app/tests/suites/tests.js
@@ -95,6 +95,7 @@
         "Test_TC_BR_1",
         "Test_TC_BR_2",
         "Test_TC_BR_3",
+        "Test_TC_BR_4",
     ];
 
     const DeviceAttestation = [
@@ -302,6 +303,7 @@
         "Test_TC_SC_3_2",
         "Test_TC_SC_3_3",
         "Test_TC_SC_3_4",
+        "Test_TC_SC_3_6",
         "Test_TC_SC_4_1",
         "Test_TC_SC_4_3",
         "Test_TC_SC_4_4",
diff --git a/zzz_generated/chip-tool/zap-generated/test/Commands.h b/zzz_generated/chip-tool/zap-generated/test/Commands.h
index 4f073cd..0837376 100644
--- a/zzz_generated/chip-tool/zap-generated/test/Commands.h
+++ b/zzz_generated/chip-tool/zap-generated/test/Commands.h
@@ -293,6 +293,7 @@
         printf("Test_TC_BR_1\n");
         printf("Test_TC_BR_2\n");
         printf("Test_TC_BR_3\n");
+        printf("Test_TC_BR_4\n");
         printf("Test_TC_DA_1_1\n");
         printf("Test_TC_DA_1_2\n");
         printf("Test_TC_DA_1_3\n");
@@ -451,6 +452,7 @@
         printf("Test_TC_SC_3_2\n");
         printf("Test_TC_SC_3_3\n");
         printf("Test_TC_SC_3_4\n");
+        printf("Test_TC_SC_3_6\n");
         printf("Test_TC_SC_4_1\n");
         printf("Test_TC_SC_4_3\n");
         printf("Test_TC_SC_4_4\n");
@@ -68160,6 +68162,62 @@
     }
 };
 
+class Test_TC_BR_4Suite : public TestCommand
+{
+public:
+    Test_TC_BR_4Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_BR_4", 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_BR_4Suite() {}
+
+    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_DA_1_1Suite : public TestCommand
 {
 public:
@@ -79222,6 +79280,62 @@
     }
 };
 
+class Test_TC_SC_3_6Suite : public TestCommand
+{
+public:
+    Test_TC_SC_3_6Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_SC_3_6", 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_SC_3_6Suite() {}
+
+    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_SC_4_1Suite : public TestCommand
 {
 public:
@@ -91379,6 +91493,7 @@
         make_unique<Test_TC_BR_1Suite>(credsIssuerConfig),
         make_unique<Test_TC_BR_2Suite>(credsIssuerConfig),
         make_unique<Test_TC_BR_3Suite>(credsIssuerConfig),
+        make_unique<Test_TC_BR_4Suite>(credsIssuerConfig),
         make_unique<Test_TC_DA_1_1Suite>(credsIssuerConfig),
         make_unique<Test_TC_DA_1_2Suite>(credsIssuerConfig),
         make_unique<Test_TC_DA_1_3Suite>(credsIssuerConfig),
@@ -91537,6 +91652,7 @@
         make_unique<Test_TC_SC_3_2Suite>(credsIssuerConfig),
         make_unique<Test_TC_SC_3_3Suite>(credsIssuerConfig),
         make_unique<Test_TC_SC_3_4Suite>(credsIssuerConfig),
+        make_unique<Test_TC_SC_3_6Suite>(credsIssuerConfig),
         make_unique<Test_TC_SC_4_1Suite>(credsIssuerConfig),
         make_unique<Test_TC_SC_4_3Suite>(credsIssuerConfig),
         make_unique<Test_TC_SC_4_4Suite>(credsIssuerConfig),