Modified YAMLs matter 1.3 (#32116)

* chore(TC-DESC-2.1): modified step 1b comments as per verification step document

* chore(TL-LTIME-3.1): updated step 9 command and log as verification step

modifications as per verfication step document issue #122

* chore(TC-CNET-4.22): modifications for steps 1, 3, 5

modifications in logs for step 1, 3, 5 as verification step document
changes issue #125

* chore(TC-DRLK-2.1): modification for step 13a PICS

modification for step 13a (From DRLK.S.F0b && DRLK.S.A0015 to
DRLK.S.F0b && DRLK.S.A0016) as per test plan changes issue #128

* chore(TC-LCFG-2.1):modifications for PICS step 1a,3

In step 1a and 3 supportedLocales attribute PICS has to be updated
LCFG.S.A0001 instead LCFG.S.A0000 as per test plan issue #129

* chore(TC-APPLAUNCHER-3.x.1): modify commands

TC-APPLAUNCHER-3.7.1, TC-APPLAUNCHER-3.8.1 and TCAPPLAUNCHER-3.9.1
was updated as per verification step document (DUT as Client) issue #139

* Updates Test_TC_LWM_1_1.yaml

* Updates Test_TC_TCCM_1_1.yaml

* Updates Test_TC_LWM_1_1.yaml

* Updates  Test_TC_DISHM_1_1.yaml

* Updates Test_TC_DISHM_3_1.yaml

* Updates Test_TC_DISHM_3_3.yaml

* chore(TC-CONTENTLAUNCHER-10.4): update command and logs

command and logs has been updated as per verification step document
for all steps

* chore(TC-CONTENTLAUNCHER-10.6):update command

command has been updated as per verification step document

* Updates Test_TC_ICDM_3_4.yaml

* chore(TC-ALOGIN-12.2): update command in precondition

command has been updated in precondition as per verification
step document

* Updates Test_TC_CNET_4_9.yaml

* Updates Test_TC_CNET_4_10.yaml

* Updates Test_TC_CNET_4_11.yaml

* Adds NetworkIndex to response in CNET TCs (4.9, 4.10, 4.11)

* Updates Test_TC_TCCM_3_1.yaml

* Updates Test_TC_TCCM_3_3.yaml

* Updates Test_TC_LWM_3_1.yaml

* Updates Test_TC_LWM_3_3.yaml

* Updates Test_TC_OTCCM_1_1.yaml

* Updates Test_TC_OTCCM_2_1.yaml

* Updates Test_TC_S_3_1.yaml

* Restores TC-LWM-1.1

* Restores TC-TCCM-1.1

* Fix yaml formatting

* Fix restyle

* Fix restyle

* Fix restyle

* Removes (DEPONOFF) from pics ref

---------

Co-authored-by: raul-marquez-csa <rmarquez@csa-iot.org>
Co-authored-by: Raul Marquez <130402456+raul-marquez-csa@users.noreply.github.com>
diff --git a/src/app/tests/suites/certification/Test_TC_ALOGIN_12_2.yaml b/src/app/tests/suites/certification/Test_TC_ALOGIN_12_2.yaml
index 614a797..5981a41 100644
--- a/src/app/tests/suites/certification/Test_TC_ALOGIN_12_2.yaml
+++ b/src/app/tests/suites/certification/Test_TC_ALOGIN_12_2.yaml
@@ -31,8 +31,8 @@
           Product maker needs to provide instructions for how to trigger the command on the DUT. For comparison, the DUT behavior for this test step can be simulated using chip-tool (when DUT is a commissioner) or tv-casting-app (when DUT is a commissionee):
 
           The following command on the example tv-app will launch a content app on endpoint 4:
-          ./chip-tool applicationlauncher launch-app '{"catalogVendorID": 123, "applicationID": "exampleid"}' 1 1
-          ./chip-tv-casting-app applicationlauncher launch-app '{"catalogVendorID": 123, "applicationID": "exampleid"}' 1 1
+          ./chip-tool applicationlauncher launch-app 1 1 --Application '{"catalogVendorID": 123, "applicationID": "exampleid"}'
+          ./chip-tv-casting-app applicationlauncher launch-app 1 1 --Application '{"catalogVendorID": 123, "applicationID": "exampleid"}'
           On TH (tv-app), Verify the launch app command is received successfully.
           1666779708.066501][24994:24994] CHIP:DMG: InvokeRequestMessage =
           [1666779708.066504][24994:24994] CHIP:DMG: {
diff --git a/src/app/tests/suites/certification/Test_TC_APPLAUNCHER_3_7_1.yaml b/src/app/tests/suites/certification/Test_TC_APPLAUNCHER_3_7_1.yaml
index 25836f5..bd59e1a 100644
--- a/src/app/tests/suites/certification/Test_TC_APPLAUNCHER_3_7_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_APPLAUNCHER_3_7_1.yaml
@@ -36,10 +36,9 @@
       verification: |
           Product maker needs to provide instructions for how to trigger the command on the DUT. For comparison, the DUT behavior for this test step can be simulated using chip-tool (when DUT is a commissioner) or tv-casting-app (when DUT is a commissionee):
 
-          ./chip-tool applicationlauncher launch-app '{"catalogVendorID": 123, "applicationID": "exampleid"}' 1 1
+          ./chip-tool applicationlauncher launch-app  1 1 --Application '{"catalogVendorID": 123, "applicationID": "exampleid"}'
 
-          ./chip-tv-casting-app applicationlauncher launch-app '{"catalogVendorID": 123, "applicationID": "exampleid"}' 1 1
-
+          ./chip-tv-casting-app applicationlauncher launch-app  1 1 --Application '{"catalogVendorID": 123, "applicationID": "exampleid"}'
 
           On TH (tv-app), Verify the launch app command is received successfully.
 
diff --git a/src/app/tests/suites/certification/Test_TC_APPLAUNCHER_3_8_1.yaml b/src/app/tests/suites/certification/Test_TC_APPLAUNCHER_3_8_1.yaml
index 1b00e21..ee4a07e 100644
--- a/src/app/tests/suites/certification/Test_TC_APPLAUNCHER_3_8_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_APPLAUNCHER_3_8_1.yaml
@@ -35,11 +35,12 @@
       verification: |
           Product maker needs to provide instructions for how to trigger the command on the DUT. For comparison, the DUT behavior for this test step can be simulated using chip-tool (when DUT is a commissioner) or tv-casting-app (when DUT is a commissionee):
 
-          ./chip-tool applicationlauncher stop-app '{"catalogVendorID": 123, "applicationID": "exampleid"}' 1 1
+          ./chip-tool applicationlauncher stop-app 1 1 --Application  '{"catalogVendorID": 123, "applicationID": "exampleid"}'
 
-          ./chip-tv-casting-app applicationlauncher stop-app'{"catalogVendorID": 123, "applicationID": "exampleid"}' 1 1
+          ./chip-tv-casting-app applicationlauncher stop-app 1 1 --Application  '{"catalogVendorID": 123, "applicationID": "exampleid"}'
 
           On TH (tv-app), Verify the stop app command is received successfully.
+
           74562683.652082][12550:12550] CHIP:DMG: InvokeRequestMessage =
           [1674562683.652085][12550:12550] CHIP:DMG: {
           [1674562683.652088][12550:12550] CHIP:DMG:         suppressResponse = false,
diff --git a/src/app/tests/suites/certification/Test_TC_APPLAUNCHER_3_9_1.yaml b/src/app/tests/suites/certification/Test_TC_APPLAUNCHER_3_9_1.yaml
index 039c9db..efa0dd3 100644
--- a/src/app/tests/suites/certification/Test_TC_APPLAUNCHER_3_9_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_APPLAUNCHER_3_9_1.yaml
@@ -35,12 +35,11 @@
       verification: |
           Product maker needs to provide instructions for how to trigger the command on the DUT. For comparison, the DUT behavior for this test step can be simulated using chip-tool (when DUT is a commissioner) or tv-casting-app (when DUT is a commissionee):
 
-          ./chip-tool applicationlauncher hide-app '{"catalogVendorID": 123, "applicationID": "exampleid"}' 1 1
+          ./chip-tool applicationlauncher hide-app  1 1 --Application '{"catalogVendorID": 123, "applicationID": "exampleid"}'
 
-          ./chip-tv-casting-app applicationlauncher hide-app '{"catalogVendorID": 123, "applicationID": "exampleid"}' 1 1
+          ./chip-tv-casting-app applicationlauncher hide-app 1 1 --Application '{"catalogVendorID": 123, "applicationID": "exampleid"}'
 
           On TH (tv-app), Verify the hide app command is received successfully.
-
           [1674562762.318820][12550:12550] CHIP:DMG: InvokeRequestMessage =
           [1674562762.318828][12550:12550] CHIP:DMG: {
           [1674562762.318834][12550:12550] CHIP:DMG:         suppressResponse = false,
diff --git a/src/app/tests/suites/certification/Test_TC_CNET_4_10.yaml b/src/app/tests/suites/certification/Test_TC_CNET_4_10.yaml
index 1320f1f..ac024c5 100644
--- a/src/app/tests/suites/certification/Test_TC_CNET_4_10.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CNET_4_10.yaml
@@ -125,6 +125,11 @@
           "Step 4: TH sends RemoveNetwork Command to the DUT with NetworkID
           field set to PIXIT.CNET.THREAD_1ST_OPERATIONALDATASET and Breadcrumb
           field set to 1"
+      verification: |
+          Verify that DUT sends NetworkConfigResponse to command with the following fields:
+          NetworkingStatus is success
+
+          NetworkIndex is 'Userwifi_netidx'
       PICS: CNET.S.C04.Rsp && CNET.S.C05.Tx
       command: "RemoveNetwork"
       arguments:
@@ -137,6 +142,8 @@
           values:
               - name: "NetworkingStatus"
                 value: 0
+              - name: "NetworkIndex"
+                value: 0
 
     - label: "Step 5: TH reads Networks attribute from the DUT"
       PICS: CNET.S.A0001
@@ -264,6 +271,11 @@
           "Step 14: TH sends RemoveNetwork Command to the DUT with NetworkID
           field set to extended PAN ID of
           PIXIT.CNET.THREAD_1ST_OPERATIONALDATASET and Breadcrumb field set to 1"
+      verification: |
+          Verify that DUT sends NetworkConfigResponse to command with the following fields:
+          NetworkingStatus is success
+
+          NetworkIndex is 'Userwifi_netidx'
       PICS: CNET.S.C04.Rsp && CNET.S.C05.Tx
       command: "RemoveNetwork"
       arguments:
@@ -276,6 +288,8 @@
           values:
               - name: "NetworkingStatus"
                 value: 0
+              - name: "NetworkIndex"
+                value: 0
 
     - label: "Step 15: TH sends the CommissioningComplete command to the DUT"
       PICS: CNET.S.C04.Rsp
diff --git a/src/app/tests/suites/certification/Test_TC_CNET_4_11.yaml b/src/app/tests/suites/certification/Test_TC_CNET_4_11.yaml
index 01981b3..6433512 100644
--- a/src/app/tests/suites/certification/Test_TC_CNET_4_11.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CNET_4_11.yaml
@@ -125,6 +125,11 @@
           "Step 4: TH sends RemoveNetwork Command to the DUT with NetworkID
           field set to PIXIT.CNET.WIFI_1ST_ACCESSPOINT_SSID and Breadcrumb field
           set to 1"
+      verification: |
+          Verify that DUT sends NetworkConfigResponse to command with the following fields:
+          NetworkingStatus is success
+
+          NetworkIndex is 'Userwifi_netidx'
       PICS: CNET.S.C04.Rsp && CNET.S.C05.Tx
       command: "RemoveNetwork"
       arguments:
@@ -137,6 +142,8 @@
           values:
               - name: "NetworkingStatus"
                 value: 0
+              - name: "NetworkIndex"
+                value: 0
 
     - label:
           "Step 5: TH sends AddOrUpdateWiFiNetwork command to the DUT with SSID
@@ -306,6 +313,11 @@
           "Step 15: TH sends RemoveNetwork Command to the DUT with NetworkID
           field set to PIXIT.CNET.WIFI_1ST_ACCESSPOINT_SSID and Breadcrumb field
           set to 1"
+      verification: |
+          Verify that DUT sends NetworkConfigResponse to command with the following fields:
+          NetworkingStatus is success
+
+          NetworkIndex is 'Userwifi_netidx'
       PICS: CNET.S.C04.Rsp && CNET.S.C05.Tx
       command: "RemoveNetwork"
       arguments:
@@ -318,6 +330,8 @@
           values:
               - name: "NetworkingStatus"
                 value: 0
+              - name: "NetworkIndex"
+                value: 0
 
     - label:
           "Step 16: TH sends AddOrUpdateWiFiNetwork command to the DUT with SSID
diff --git a/src/app/tests/suites/certification/Test_TC_CNET_4_22.yaml b/src/app/tests/suites/certification/Test_TC_CNET_4_22.yaml
index b8e82ac..b8fed5f 100644
--- a/src/app/tests/suites/certification/Test_TC_CNET_4_22.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CNET_4_22.yaml
@@ -87,15 +87,37 @@
           "Step 1: Verify each element in the ThreadScanResults list will have
           the following fields:"
       verification: |
-          Via the TH (all-clusters-app), verify:
-             -the PanId value is in the range of 0 to 65534.
-             -the ExtendedPanId value is type of uint64.
-             -the NetworkName value is type of string with a size of 1 to 16 bytes.
-             -the Channel is type of uint16 with range 0 to 65535.
-             -the version value is type of uint8(0 to 255).
-             -the ExtendedAddress is a hwaddr with a size of 8 bytes
-             -the RSSI is of type int8 with a range of -120 to 0.
-             -the LQI is type of uint8(0 to 255).
+          ./chip-tool networkcommissioning scan-networks 54 0 --Breadcrumb 1
+
+          Via the TH (chip-tool), verify:
+          -the NetworkingStatus value as 0 that mentions success.
+          -the PanId value is in the range of 0 to 65534.
+          -the ExtendedPanId value is type of uint64.
+          -the NetworkName value is type of string with a size of 1 to 16 bytes.
+          -the Channel is type of uint16 with range 0 to 65535.
+          -the version value is type of uint8(0 to 255).
+          -the ExtendedAddress is a hwaddr with a size of 8 bytes
+          -the RSSI is of type int8 with a range of -120 to 0.
+          -the LQI is type of uint8(0 to 255).
+
+          [1658297246.000815][7679:7684] CHIP:DMG: Received Command Response Data, Endpoint=0 Cluster=0x0000_0031 Command=0x0000_0001
+          [1658297246.001029][7679:7684] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Command 0x0000_0001
+          [1658297246.001190][7679:7684] CHIP:TOO:   ScanNetworksResponse: {
+          [1658297246.001270][7679:7684] CHIP:TOO:     networkingStatus: 0
+          [1658297246.001357][7679:7684] CHIP:TOO:     threadScanResults: 1 entries
+          [1658297246.001485][7679:7684] CHIP:TOO:       [1]: {
+          [1658297246.001548][7679:7684] CHIP:TOO:         PanId: 64206
+          [1658297246.001607][7679:7684] CHIP:TOO:         ExtendedPanId: 3861484836749312
+          [1658297246.001665][7679:7684] CHIP:TOO:         NetworkName: GRL
+          [1658297246.001721][7679:7684] CHIP:TOO:         Channel: 11
+          [1658297246.001777][7679:7684] CHIP:TOO:         Version: 4
+          [1658297246.001841][7679:7684] CHIP:TOO:         ExtendedAddress: 166E0A0000000001
+          [1658297246.001900][7679:7684] CHIP:TOO:         Rssi: -81
+          [1658297246.001955][7679:7684] CHIP:TOO:         Lqi: 48
+          [1658297246.002010][7679:7684] CHIP:TOO:        }
+          [1658297246.002070][7679:7684] CHIP:TOO:    }
+          [1658297246.002181][7679:7684] CHIP:DMG: ICR moving to [AwaitingDe]
+          [1658297246.002298][7679:7684] CHIP:EM: Sending Standalone Ack for MessageCounter:124278362 on exchange 24525i
       cluster: "LogCommands"
       command: "UserPrompt"
       PICS: PICS_USER_PROMPT && CNET.S.C00.Rsp && CNET.S.C01.Tx
@@ -144,15 +166,47 @@
           "Step 3: Verify each element in the ThreadScanResults list will have
           the following fields:"
       verification: |
-          Via the TH (all-clusters-app), verify:
-             -the PanId value is in the range of 0 to 65534.
-             -the ExtendedPanId value is type of uint64.
-             -the NetworkName value is type of string with a size of 1 to 16 bytes.
-             -the Channel is type of uint16 with range 0 to 65535.
-             -the version value is type of uint8(0 to 255).
-             -the ExtendedAddress is a hwaddr with a size of 8 bytes
-             -the RSSI is of type int8 with a range of -120 to 0.
-             -the LQI is type of uint8(0 to 255).
+          ./chip-tool networkcommissioning scan-networks 54 0 --Breadcrumb 2
+
+          Via the TH (chip-tool), verify:
+          -the NetworkingStatus value as 0 that mentions success.
+          -the PanId value is in the range of 0 to 65534.
+          -the ExtendedPanId value is type of uint64.
+          -the NetworkName value is type of string with a size of 1 to 16 bytes.
+          -the Channel is type of uint16 with range 0 to 65535.
+          -the version value is type of uint8(0 to 255).
+          -the ExtendedAddress is a hwaddr with a size of 8 bytes
+          -the RSSI is of type int8 with a range of -120 to 0.
+          -the LQI is type of uint8(0 to 255).
+
+          [1658297283.141075][7695:7700] CHIP:DMG: Received Command Response Data, Endpoint=0 Cluster=0x0000_0031 Command=0x0000_0001
+          [1658297283.141183][7695:7700] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Command 0x0000_0001
+          [1658297283.141356][7695:7700] CHIP:TOO:   ScanNetworksResponse: {
+          [1658297283.141438][7695:7700] CHIP:TOO:     networkingStatus: 0
+          [1658297283.141534][7695:7700] CHIP:TOO:     threadScanResults: 2 entries
+          [1658297283.141663][7695:7700] CHIP:TOO:       [1]: {
+          [1658297283.141729][7695:7700] CHIP:TOO:         PanId: 64206
+          [1658297283.141788][7695:7700] CHIP:TOO:         ExtendedPanId: 3861484836749312
+          [1658297283.141847][7695:7700] CHIP:TOO:         NetworkName: GRL
+          [1658297283.141904][7695:7700] CHIP:TOO:         Channel: 11
+          [1658297283.141961][7695:7700] CHIP:TOO:         Version: 4
+          [1658297283.142023][7695:7700] CHIP:TOO:         ExtendedAddress: 166E0A0000000001
+          [1658297283.142079][7695:7700] CHIP:TOO:         Rssi: -80
+          [1658297283.142134][7695:7700] CHIP:TOO:         Lqi: 52
+          [1658297283.142188][7695:7700] CHIP:TOO:        }
+          [1658297283.142271][7695:7700] CHIP:TOO:       [2]: {
+          [1658297283.142331][7695:7700] CHIP:TOO:         PanId: 64206
+          [1658297283.142386][7695:7700] CHIP:TOO:         ExtendedPanId: 3861484836749312
+          [1658297283.142443][7695:7700] CHIP:TOO:         NetworkName: GRL
+          [1658297283.142500][7695:7700] CHIP:TOO:         Channel: 11
+          [1658297283.142551][7695:7700] CHIP:TOO:         Version: 4
+          [1658297283.142609][7695:7700] CHIP:TOO:         ExtendedAddress: 166E0A0000000001
+          [1658297283.142665][7695:7700] CHIP:TOO:         Rssi: -83
+          [1658297283.142718][7695:7700] CHIP:TOO:         Lqi: 44
+          [1658297283.142771][7695:7700] CHIP:TOO:        }
+          [1658297283.142828][7695:7700] CHIP:TOO:    }
+          [1658297283.142958][7695:7700] CHIP:DMG: ICR moving to [AwaitingDe]
+          [1658297283.143074][7695:7700] CHIP:EM: Sending Standalone Ack for MessageCounter:115607423 on exchange 55136i
       cluster: "LogCommands"
       command: "UserPrompt"
       PICS: PICS_USER_PROMPT && CNET.S.C00.Rsp && CNET.S.C01.Tx
@@ -201,15 +255,38 @@
           "Step 5: Verify each element in the ThreadScanResults list will have
           the following fields:"
       verification: |
-          Via the TH (all-clusters-app), verify:
-             -the PanId value is in the range of 0 to 65534.
-             -the ExtendedPanId value is type of uint64.
-             -the NetworkName value is type of string with a size of 1 to 16 bytes.
-             -the Channel is type of uint16 with range 0 to 65535.
-             -the version value is type of uint8(0 to 255).
-             -the ExtendedAddress is a hwaddr with a size of 8 bytes
-             -the RSSI is of type int8 with a range of -120 to 0.
-             -the LQI is type of uint8(0 to 255).
+          ./chip-tool networkcommissioning scan-networks 54 0 --Breadcrumb 3
+
+          Via the TH (chip-tool), verify:
+          -the NetworkingStatus value should be as 0 that mentions success.
+          -the PanId value should be with in the range of 0 to 65534.
+          -the ExtendedPanId value is type of uint64.
+          -the NetworkName value is type of string with a size of 1 to 16 bytes.
+          -the Channel is type of uint16 with range 0 to 65535.
+          -the version value is type of uint8(0 to 255).
+          -the ExtendedAddress is a hwaddr with a size of 8 bytes
+          -the RSSI is of type int8 with a range of -120 to 0.
+          -the LQI is type of uint8(0 to 255).
+
+          [1658297312.201709][7708:7713] CHIP:DMG: },
+          [1658297312.201898][7708:7713] CHIP:DMG: Received Command Response Data, Endpoint=0 Cluster=0x0000_0031 Command=0x0000_0001
+          [1658297312.202021][7708:7713] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Command 0x0000_0001
+          [1658297312.202196][7708:7713] CHIP:TOO:   ScanNetworksResponse: {
+          [1658297312.202276][7708:7713] CHIP:TOO:     networkingStatus: 0
+          [1658297312.202359][7708:7713] CHIP:TOO:     threadScanResults: 1 entries
+          [1658297312.202481][7708:7713] CHIP:TOO:       [1]: {
+          [1658297312.202544][7708:7713] CHIP:TOO:         PanId: 64206
+          [1658297312.202604][7708:7713] CHIP:TOO:         ExtendedPanId: 3861484836749312
+          [1658297312.202663][7708:7713] CHIP:TOO:         NetworkName: GRL
+          [1658297312.202718][7708:7713] CHIP:TOO:         Channel: 11
+          [1658297312.202775][7708:7713] CHIP:TOO:         Version: 4
+          [1658297312.202838][7708:7713] CHIP:TOO:         ExtendedAddress: 166E0A0000000001
+          [1658297312.202897][7708:7713] CHIP:TOO:         Rssi: -78
+          [1658297312.202952][7708:7713] CHIP:TOO:         Lqi: 60
+          [1658297312.203007][7708:7713] CHIP:TOO:        }
+          [1658297312.203066][7708:7713] CHIP:TOO:    }
+          [1658297312.203176][7708:7713] CHIP:DMG: ICR moving to [AwaitingDe]
+          [1658297312.203284][7708:7713] CHIP:EM: Sending Standalone Ack for MessageCounter:217378941 on exchange 37389i
       cluster: "LogCommands"
       command: "UserPrompt"
       PICS: PICS_USER_PROMPT && CNET.S.C00.Rsp && CNET.S.C01.Tx
diff --git a/src/app/tests/suites/certification/Test_TC_CNET_4_9.yaml b/src/app/tests/suites/certification/Test_TC_CNET_4_9.yaml
index a26524e..66e3207 100644
--- a/src/app/tests/suites/certification/Test_TC_CNET_4_9.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CNET_4_9.yaml
@@ -119,6 +119,11 @@
           "Step 4: TH sends RemoveNetwork Command to the DUT with NetworkID
           field set to PIXIT.CNET.WIFI_1ST_ACCESSPOINT_SSID and Breadcrumb field
           set to 1"
+      verification: |
+          Verify that DUT sends NetworkConfigResponse to command with the following fields:
+          NetworkingStatus is success
+
+          NetworkIndex is 'Userwifi_netidx'
       PICS: CNET.S.C04.Rsp && CNET.S.C05.Tx
       command: "RemoveNetwork"
       arguments:
@@ -131,6 +136,8 @@
           values:
               - name: "NetworkingStatus"
                 value: 0
+              - name: "NetworkIndex"
+                value: 0
 
     - label: "Step 5: TH reads Networks attribute from the DUT"
       PICS: CNET.S.A0001
@@ -266,6 +273,11 @@
           "Step 14: TH sends RemoveNetwork Command to the DUT with NetworkID
           field set to PIXIT.CNET.WIFI_1ST_ACCESSPOINT_SSID and Breadcrumb field
           set to 1"
+      verification: |
+          Verify that DUT sends NetworkConfigResponse to command with the following fields:
+          NetworkingStatus is success
+
+          NetworkIndex is 'Userwifi_netidx'
       PICS: CNET.S.C04.Rsp && CNET.S.C05.Tx
       command: "RemoveNetwork"
       arguments:
@@ -278,6 +290,8 @@
           values:
               - name: "NetworkingStatus"
                 value: 0
+              - name: "NetworkIndex"
+                value: 0
 
     - label: "Step 15: TH sends the CommissioningComplete command to the DUT"
       PICS: CNET.S.C04.Rsp
diff --git a/src/app/tests/suites/certification/Test_TC_CONTENTLAUNCHER_10_6.yaml b/src/app/tests/suites/certification/Test_TC_CONTENTLAUNCHER_10_6.yaml
index bc46f1a..f3334c0 100644
--- a/src/app/tests/suites/certification/Test_TC_CONTENTLAUNCHER_10_6.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CONTENTLAUNCHER_10_6.yaml
@@ -34,8 +34,8 @@
       verification: |
           Product maker needs to provide instructions for how to trigger the command on the DUT. For comparison, the DUT behavior for this test step can be simulated using chip-tool (when DUT is a commissioner) or tv-casting-app (when DUT is a commissionee):
 
-          ./chip-tool contentlauncher launch-url 'https://www.foo.com' '{"providerName": "provider"}' 1 1
-          ./chip-tv-casting-app contentlauncher launch-url 'https://www.foo.com' '{"providerName": "provider"}' 1 1
+          ./chip-tool contentlauncher launch-url 'https://www.foo.com' 1 1 --DisplayString '{"providerName": "provider"}'
+          ./chip-tv-casting-app contentlauncher launch-url 'https://www.foo.com' 1 1 --DisplayString '{"providerName": "provider"}'
 
           On TH (tv-app), Verify the  launch url command is received successfully.
           [1658531502040] [21924:325733] CHIP: [DMG] InvokeRequestMessage =
diff --git a/src/app/tests/suites/certification/Test_TC_DESC_2_1.yaml b/src/app/tests/suites/certification/Test_TC_DESC_2_1.yaml
index 8778cc2..734282a 100644
--- a/src/app/tests/suites/certification/Test_TC_DESC_2_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DESC_2_1.yaml
@@ -79,7 +79,7 @@
           For all the Endpoint’s listed from the previous step run the following steps. The device type should correspond to the id value in the device_type.json
           Chip tool outputs all values in integer, convert to hex before comparing.
 
-          ./chip-tool descriptor read  parts-list 1 1
+          ./chip-tool descriptor read parts-list 1 1
 
           Verify  parts-list response contains 0 entries on the TH (Chip-tool) and below is the sample log provided for the raspi platform:
 
@@ -88,11 +88,10 @@
 
           ./chip-tool descriptor read device-type-list 1 1
 
-          On TH (Chip-tool) log, Verify that
-          - If PartsLists count is 0 then, DeviceTypeList count is at least one.
-          - DeviceTypeList should contains exactly one Application Device Type [In below log 256(In hex 0x100) is a   Application Device Type(On/OffLight)] or set of Application Device Types which are a subset of each other.
-          -  DeviceTypeList may contain one or more Utility Device Types, but not Root Node Device Type.[In below log DeviceType: 17(In hex 0x0011) is a Utility DeviceType ]
-          -  Revision value  is not less than 1 and it should match the Revision of the DeviceType and below is the sample log provided for the raspi platform
+          On TH (Chip-tool) log, Verify that  the DeviceTypeList count is at least one.
+            - If the DeviceTypeList contains more than one Application Device Type, verify that all the Application Device Types are part of the same superset.
+            - Verify the DeviceTypeList does not contain the Root Node Device Type.
+            - Revision value  is not less than 1 and it should match the Revision of the DeviceType and below is the sample log provided for the raspi platform
 
           [1674552599.264189][21135:21137] CHIP:DMG: }
           [1692617790.900384][31584:31586] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_001D Attribute 0x0000_0000 DataVersion: 2832593371
@@ -106,7 +105,7 @@
           [1692617790.900428][31584:31586] CHIP:TOO:       Revision: 1
           [1692617790.900430][31584:31586] CHIP:TOO:      }
 
-          ./chip-tool descriptor read  parts-list 1 2
+          ./chip-tool descriptor read parts-list 1 2
 
           Verify parts-list response contains 0 entries on the TH (Chip-tool) and below is the sample log provided for the raspi platform:
 
@@ -115,11 +114,10 @@
 
           ./chip-tool descriptor read device-type-list 1 2
 
-          On TH (Chip-tool) log, Verify that
-          - If PartsLists count is 0 then, DeviceTypeList count is at least one.
-          - DeviceTypeList should contains exactly one Application Device Type [In below log 256(In hex 0x100) is a   Application Device Type(On/OffLight)] or set of Application Device Types which are a subset of each other.
-          -  DeviceTypeList may contain one or more Utility Device Types, but not Root Node Device Type.[In below log DeviceType: 17(In hex 0x0011) is a Utility DeviceType ]
-          -  Revision value  is not less than 1 and it should match the Revision of the DeviceType and below is the sample log provided for the raspi platform
+          On TH (Chip-tool) log, Verify that  the DeviceTypeList count is at least one.
+            - If the DeviceTypeList contains more than one Application Device Type, verify that all the Application Device Types are part of the same superset.
+            - Verify the DeviceTypeList does not contain the Root Node Device Type.
+            - Revision value  is not less than 1 and it should match the Revision of the DeviceType and below is the sample log provided for the raspi platform
 
           [1692618454.794870][31669:31671] CHIP:TOO: Endpoint: 2 Cluster: 0x0000_001D Attribute 0x0000_0000 DataVersion: 1103199808
           [1692618454.794946][31669:31671] CHIP:TOO:   DeviceTypeList: 2 entries
diff --git a/src/app/tests/suites/certification/Test_TC_DISHM_1_1.yaml b/src/app/tests/suites/certification/Test_TC_DISHM_1_1.yaml
index 24ac427..da8a092 100644
--- a/src/app/tests/suites/certification/Test_TC_DISHM_1_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DISHM_1_1.yaml
@@ -46,7 +46,7 @@
       verification: |
           ./chip-tool dishwashermode read feature-map 1 1
 
-          On the TH(Chip-tool) Log, Verify featureMap value is 1 If DISHM.S.F00(DEPONOFF) is true, Otherwise 0,  and below is the sample log provided for the raspi platform:
+          On the TH(Chip-tool) Log, Verify featureMap value is 0 and below is the sample log provided for the raspi platform:
 
           [1690365613.351850][27441:27443] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0059 Attribute 0x0000_FFFC DataVersion: 1130015440
           [1690365613.351911][27441:27443] CHIP:TOO:   FeatureMap: 1
@@ -58,8 +58,7 @@
 
           Verify the "AttributeList " should include the mandatory attributes (values 0, 1),
           - Global attributes  (value 65533, 65532, 65531, 65529 and 65528) and
-          - List may include optional attribute(value 0x0002), if DISHM.S.A0002(StartUpMode) supports,
-          - List contains feature dependent attribute (values 0x0003), if DISHM.S.F00(DEPONOFF) is true  on the TH(Chip-tool) Log and below is the sample log provided for the raspi platform:
+          - List may include optional attribute(value 0x0002), if DISHM.S.A0002(StartUpMode) supports, on the TH(Chip-tool) Log and below is the sample log provided for the raspi platform:
 
           [1696402605.599359][7921:7923] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0059 Attribute 0x0000_FFFB DataVersion: 712950283
           [1696402605.599377][7921:7923] CHIP:TOO:   AttributeList: 9 entries
diff --git a/src/app/tests/suites/certification/Test_TC_DISHM_3_2.yaml b/src/app/tests/suites/certification/Test_TC_DISHM_3_2.yaml
index 9043b8f..c53124e 100644
--- a/src/app/tests/suites/certification/Test_TC_DISHM_3_2.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DISHM_3_2.yaml
@@ -26,7 +26,7 @@
 tests:
     - label: "Preconditions"
       verification: |
-          !DISHM.S.F00(DEPONOFF) | OnOff cluster’s StartUpOnOff attribute is NULL | StartUpOnOff is 0 | OnMode is NULL
+          !DISHM.S.F00 | OnOff cluster’s StartUpOnOff attribute is NULL | StartUpOnOff is 0 | OnMode is NULL
       disabled: true
 
     - label: "Note"
diff --git a/src/app/tests/suites/certification/Test_TC_DRLK_2_1.yaml b/src/app/tests/suites/certification/Test_TC_DRLK_2_1.yaml
index a1a9ac1..e84b1eb 100755
--- a/src/app/tests/suites/certification/Test_TC_DRLK_2_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DRLK_2_1.yaml
@@ -607,7 +607,7 @@
     - label:
           "Step 13a: TH reads NumberOfHoliDay SchedulesSupported attribute from
           DUT"
-      PICS: DRLK.S.F0b && DRLK.S.A0015
+      PICS: DRLK.S.F0b && DRLK.S.A0016
       command: "readAttribute"
       attribute: "NumberOfHolidaySchedulesSupported"
       response:
diff --git a/src/app/tests/suites/certification/Test_TC_LCFG_2_1.yaml b/src/app/tests/suites/certification/Test_TC_LCFG_2_1.yaml
index 2dae158..48af6aa 100644
--- a/src/app/tests/suites/certification/Test_TC_LCFG_2_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_LCFG_2_1.yaml
@@ -48,7 +48,7 @@
                 value: nodeId
 
     - label: "Step 1a: TH reads SupportedLocales attribute from DUT"
-      PICS: LCFG.S.A0000
+      PICS: LCFG.S.A0001
       command: "readAttribute"
       attribute: "SupportedLocales"
       response:
@@ -81,7 +81,7 @@
           error: UNSUPPORTED_WRITE
 
     - label: "Step 3: TH reads SupportedLocales attribute from DUT"
-      PICS: LCFG.S.A0000
+      PICS: LCFG.S.A0001
       command: "readAttribute"
       attribute: "SupportedLocales"
       response:
diff --git a/src/app/tests/suites/certification/Test_TC_LTIME_3_1.yaml b/src/app/tests/suites/certification/Test_TC_LTIME_3_1.yaml
index 7e365a9..ead4e9b 100644
--- a/src/app/tests/suites/certification/Test_TC_LTIME_3_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_LTIME_3_1.yaml
@@ -146,6 +146,22 @@
       verification: |
           Repeat the test step 8 for below mentioned values 1, 2,3, 4, 5, 6,7, 8, 9,10 and 11 and verify that TH receives the write command and updates the respective value. Verify that TH reads ActiveCalendarType attribute value and it is the same as the value that was set before
 
+          ./chip-tool timeformatlocalization write active-calendar-type 1 1 0
+
+          Verify that write request is successful on the TH(chip-tool) Log and and below is the sample log provided for raspi platform:
+
+          [1685530839.323951][17790:17790] CHIP:DMG:                         StatusIB =
+          [1685530839.323956][17790:17790] CHIP:DMG:                         {
+          [1685530839.323961][17790:17790] CHIP:DMG:                                 status = 0x00 (SUCCESS),
+          [1685530839.323965][17790:17790] CHIP:DMG:                         },
+
+          ./chip-tool timeformatlocalization read active-calendar-type 1 0
+
+          Verify  ActiveCalendarType attribute value is 1 on the TH(chip-tool) Log and and below is the sample log provided for raspi platform:
+
+          [1685530893.728748][17790:17790] CHIP:DMG:
+          [1685530893.728752][17790:17790] CHIP:DMG:                                 Data = 1,
+          [1685530893.728755][17790:17790] CHIP:DMG:                         },
 
           ./chip-tool timeformatlocalization write active-calendar-type 2 1 0
 
diff --git a/src/app/tests/suites/certification/Test_TC_LWM_1_1.yaml b/src/app/tests/suites/certification/Test_TC_LWM_1_1.yaml
index c10fb1c..0b8b51f 100644
--- a/src/app/tests/suites/certification/Test_TC_LWM_1_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_LWM_1_1.yaml
@@ -44,7 +44,7 @@
     #Issue https://github.com/project-chip/connectedhomeip/issues/31551
     - label:
           "Step 3:TH reads from the DUT the FeatureMap attribute., bit 0: SHALL
-          be 1 if and only if LWM.S.F00(DEPONOFF)"
+          be 1 if and only if LWM.S.F00"
       command: "readAttribute"
       attribute: "FeatureMap"
       PICS: LWM.S.F00
@@ -93,8 +93,7 @@
 
     #Issue https://github.com/project-chip/connectedhomeip/issues/31551
     - label:
-          "Step 4c: TH reads the Feature dependent attribute(DEPONOFF) in
-          AttributeList"
+          "Step 4c: TH reads the Feature dependent attribute in AttributeList"
       PICS: LWM.S.F00
       command: "readAttribute"
       attribute: "AttributeList"
diff --git a/src/app/tests/suites/certification/Test_TC_LWM_3_1.yaml b/src/app/tests/suites/certification/Test_TC_LWM_3_1.yaml
index 0b9a36e..2bafddf 100644
--- a/src/app/tests/suites/certification/Test_TC_LWM_3_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_LWM_3_1.yaml
@@ -16,7 +16,7 @@
 
 PICS:
     - LWM.S.A0003
-    - LWM.S.F00
+    - MOD.S.F00
     - OO.S.C00.Rsp
     - OO.S.C01.Rsp
 
@@ -47,14 +47,14 @@
           "Precondition: TH writes from the DUT the OnMode attribute.NOTE: To
           execute this test case set onmode to any integer value because as
           default it value has null."
-      PICS: LWM.S.A0003 && LWM.S.F00
+      PICS: LWM.S.A0003 && MOD.S.F00
       command: "writeAttribute"
       attribute: "OnMode"
       arguments:
           value: ConfigureOnMode
 
     - label: "Step 2: TH reads from the DUT the OnMode attribute."
-      PICS: LWM.S.A0003 && LWM.S.F00
+      PICS: LWM.S.A0003 && MOD.S.F00
       command: "readAttribute"
       attribute: "OnMode"
       response:
@@ -65,7 +65,7 @@
               maxValue: 254
 
     - label: "Step 3: TH reads from the DUT the CurrentMode attribute."
-      PICS: LWM.S.A0001 && LWM.S.F00
+      PICS: LWM.S.A0001 && MOD.S.F00
       command: "readAttribute"
       attribute: "CurrentMode"
       response:
@@ -93,7 +93,7 @@
 
     - label: "Step 4: TH reads from the DUT the SupportedModes attribute."
       runIf: IsExpectedValue
-      PICS: LWM.S.A0000 && LWM.S.F00
+      PICS: LWM.S.A0000 && MOD.S.F00
       command: "readAttribute"
       attribute: "SupportedModes"
       response:
@@ -105,7 +105,7 @@
           "Step 5: TH sends a ChangeToMode command to the DUT with NewMode set
           to new_mode_th"
       runIf: IsExpectedValue
-      PICS: LWM.S.C00.Rsp && LWM.S.F00
+      PICS: LWM.S.C00.Rsp && MOD.S.F00
       command: "ChangeToMode"
       arguments:
           values:
@@ -117,17 +117,17 @@
                 value: 0x00
 
     - label: "Step 6:TH sends a Off command to the DUT"
-      PICS: OO.S.C00.Rsp && LWM.S.F00
+      PICS: OO.S.C00.Rsp && MOD.S.F00
       cluster: "On/Off"
       command: "Off"
 
     - label: "Step 7:TH sends a On command to the DUT"
-      PICS: OO.S.C01.Rsp && LWM.S.F00
+      PICS: OO.S.C01.Rsp && MOD.S.F00
       cluster: "On/Off"
       command: "On"
 
     - label: "Step 8: TH reads from the DUT the CurrentMode attribute."
-      PICS: LWM.S.A0001 && LWM.S.F00
+      PICS: LWM.S.A0001 && MOD.S.F00
       command: "readAttribute"
       attribute: "CurrentMode"
       response:
diff --git a/src/app/tests/suites/certification/Test_TC_LWM_3_3.yaml b/src/app/tests/suites/certification/Test_TC_LWM_3_3.yaml
index 8250418..bf97f17 100644
--- a/src/app/tests/suites/certification/Test_TC_LWM_3_3.yaml
+++ b/src/app/tests/suites/certification/Test_TC_LWM_3_3.yaml
@@ -19,7 +19,7 @@
 PICS:
     - LWM.S.A0002
     - LWM.S.A0003
-    - LWM.S.F00
+    - MOD.S.F00
     - OO.S.A4003
 
 config:
@@ -136,7 +136,7 @@
           value: new_mode_th
 
     - label: "Step 8: TH reads from the DUT the OnMode attribute."
-      PICS: LWM.S.A0003 && LWM.S.F00
+      PICS: LWM.S.A0003 && MOD.S.F00
       command: "readAttribute"
       attribute: "OnMode"
       response:
diff --git a/src/app/tests/suites/certification/Test_TC_OTCCM_1_1.yaml b/src/app/tests/suites/certification/Test_TC_OTCCM_1_1.yaml
index 560eb4c..008c608 100644
--- a/src/app/tests/suites/certification/Test_TC_OTCCM_1_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_OTCCM_1_1.yaml
@@ -39,21 +39,9 @@
           constraints:
               type: int16u
 
-    - label:
-          "Step 3: TH reads from the DUT the FeatureMap attribute, bit 0: SHALL
-          be 1 if and only if OTCCM.S.F00(DEPONOFF)"
-      command: "readAttribute"
-      attribute: "FeatureMap"
-      PICS: OTCCM.S.F00
-      response:
-          constraints:
-              type: bitmap32
-              hasMasksSet: [0x1]
-
     - label: "Step 3: TH reads from the DUT the FeatureMap attribute."
       command: "readAttribute"
       attribute: "FeatureMap"
-      PICS: "!OTCCM.S.F00"
       response:
           value: 0
           constraints:
@@ -87,17 +75,6 @@
               type: list
               contains: [2]
 
-    - label:
-          "Step 4c: Read the Feature dependent attribute(DEPONOFF) in
-          AttributeList"
-      PICS: OTCCM.S.F00
-      command: "readAttribute"
-      attribute: "AttributeList"
-      response:
-          constraints:
-              type: list
-              contains: [3]
-
     - label: "Step 5: TH reads from the DUT the EventList attribute."
       PICS: PICS_EVENT_LIST_ENABLED
       command: "readAttribute"
diff --git a/src/app/tests/suites/certification/Test_TC_OTCCM_2_1.yaml b/src/app/tests/suites/certification/Test_TC_OTCCM_2_1.yaml
index 00f08a5..6f0ef16 100644
--- a/src/app/tests/suites/certification/Test_TC_OTCCM_2_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_OTCCM_2_1.yaml
@@ -141,7 +141,7 @@
       command: "readAttribute"
       attribute: "CurrentMode"
       response:
-          value: Step6_current_mode_dut
+          value: old_current_mode_dut
           constraints:
               type: int16u
 
diff --git a/src/app/tests/suites/certification/Test_TC_S_3_1.yaml b/src/app/tests/suites/certification/Test_TC_S_3_1.yaml
index b968868..6691200 100644
--- a/src/app/tests/suites/certification/Test_TC_S_3_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_S_3_1.yaml
@@ -257,6 +257,7 @@
           [1706722915.344408][5404:5404] CHIP:DMG:
           [1706722915.344422][5404:5404] CHIP:DMG:         InteractionModelRevision = 11
           [1706722915.344436][5404:5404] CHIP:DMG: },
+
       disabled: true
 
     - label: "Step 2: DUT issues a C_VIEW_SCENE command to the Test Harness."
@@ -291,9 +292,6 @@
           [1706722945.926141][5404:5404] CHIP:DMG:                 },
           [1706722945.926165][5404:5404] CHIP:DMG:
           [1706722945.926176][5404:5404] CHIP:DMG:         ],
-          [1706722945.926197][5404:5404] CHIP:DMG:
-          [1706722945.926208][5404:5404] CHIP:DMG:         InteractionModelRevision = 11
-          [1706722945.926218][5404:5404] CHIP:DMG: },
       disabled: true
 
     - label: "Step 3: DUT issues a C_REMOVE_SCENE command to the Test Harness."
diff --git a/src/app/tests/suites/certification/Test_TC_TCCM_1_1.yaml b/src/app/tests/suites/certification/Test_TC_TCCM_1_1.yaml
index 4a7a44a..4ee0ba3 100644
--- a/src/app/tests/suites/certification/Test_TC_TCCM_1_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_TCCM_1_1.yaml
@@ -53,7 +53,7 @@
 
     - label:
           "Step 3: TH reads from the DUT the FeatureMap attribute, bit 0: SHALL
-          be 1 if and only if TCCM.S.F00(DEPONOFF)"
+          be 1 if and only if TCCM.S.F00"
       command: "readAttribute"
       attribute: "FeatureMap"
       PICS: TCCM.S.F00
@@ -94,7 +94,7 @@
     #Issue https://github.com/project-chip/connectedhomeip/issues/31551
     - label:
           "Step 4c: TH reads from the DUT the AttributeList attribute. 0x0003
-          SHALL be included if and only if TCCM.S.F00(DEPONOFF)"
+          SHALL be included if and only if TCCM.S.F00"
       PICS: TCCM.S.F00
       command: "readAttribute"
       attribute: "AttributeList"
diff --git a/src/app/tests/suites/certification/Test_TC_TCCM_3_1.yaml b/src/app/tests/suites/certification/Test_TC_TCCM_3_1.yaml
index d491fe6..1783570 100644
--- a/src/app/tests/suites/certification/Test_TC_TCCM_3_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_TCCM_3_1.yaml
@@ -16,7 +16,7 @@
 
 PICS:
     - TCCM.S.A0003
-    - TCCM.S.F00
+    - MOD.S.F00
     - OO.S.C00.Rsp
     - OO.S.C01.Rsp
 
@@ -46,21 +46,21 @@
     - label:
           "Preconditions: The OnMode attribute is set to a non-NULL value from
           the mode values indicated by the SupportedModes attribute."
-      PICS: TCCM.S.A0003 && TCCM.S.F00
+      PICS: TCCM.S.A0003 && MOD.S.F00
       command: "writeAttribute"
       attribute: "OnMode"
       arguments:
           value: nonNull_OnMode_value
 
     - label: "Step 2: TH reads from the DUT the OnMode attribute."
-      PICS: TCCM.S.A0003 && TCCM.S.F00
+      PICS: TCCM.S.A0003 && MOD.S.F00
       command: "readAttribute"
       attribute: "OnMode"
       response:
           saveAs: on_mode_dut
 
     - label: "Step 3a: TH reads from the DUT the CurrentMode attribute."
-      PICS: TCCM.S.A0001 && TCCM.S.F00
+      PICS: TCCM.S.A0001 && MOD.S.F00
       command: "readAttribute"
       attribute: "CurrentMode"
       response:
@@ -69,7 +69,7 @@
     - label:
           "Step 3b: If the OnMode and CurrentMode attributes have the same
           value, proceed to step 4, Otherwise proceed to step 6"
-      PICS: TCCM.S.A0003 && TCCM.S.A0001 && TCCM.S.F00
+      PICS: TCCM.S.A0003 && TCCM.S.A0001 && MOD.S.F00
       cluster: "EqualityCommands"
       command: "UnsignedNumberEquals"
       arguments:
@@ -85,7 +85,7 @@
 
     - label: "Step 4:TH reads the SupportedModes attribute from the DUT"
       runIf: IsExpectedValue
-      PICS: TCCM.S.A0000 && TCCM.S.F00
+      PICS: TCCM.S.A0000 && MOD.S.F00
       command: "readAttribute"
       attribute: "SupportedModes"
       response:
@@ -98,7 +98,7 @@
           on_mode_dut. Save the value as new_mode_th. TH sends a ChangeToMode
           command to the DUT with NewMode set to new_mode_th"
       runIf: IsExpectedValue
-      PICS: TCCM.S.C00.Rsp && TCCM.S.F00
+      PICS: TCCM.S.C00.Rsp && MOD.S.F00
       command: "ChangeToMode"
       arguments:
           values:
@@ -110,17 +110,17 @@
                 value: 0x00
 
     - label: "Step 6: TH sends an Off command to the DUT"
-      PICS: OO.S.C00.Rsp && TCCM.S.F00
+      PICS: OO.S.C00.Rsp && MOD.S.F00
       cluster: "On/Off"
       command: "Off"
 
     - label: "Step 7: TH sends an On command to the DUT"
-      PICS: OO.S.C01.Rsp && TCCM.S.F00
+      PICS: OO.S.C01.Rsp && MOD.S.F00
       cluster: "On/Off"
       command: "On"
 
     - label: "Step 8: TH reads the CurrentMode attribute from the DUT"
-      PICS: TCCM.S.A0001 && TCCM.S.F00
+      PICS: TCCM.S.A0001 && MOD.S.F00
       command: "readAttribute"
       attribute: "CurrentMode"
       response:
diff --git a/src/app/tests/suites/certification/Test_TC_TCCM_3_3.yaml b/src/app/tests/suites/certification/Test_TC_TCCM_3_3.yaml
index ae92d17..64d8b3f 100644
--- a/src/app/tests/suites/certification/Test_TC_TCCM_3_3.yaml
+++ b/src/app/tests/suites/certification/Test_TC_TCCM_3_3.yaml
@@ -19,7 +19,7 @@
 PICS:
     - TCCM.S.A0002
     - TCCM.S.A0003
-    - TCCM.S.F00
+    - MOD.S.F00
     - OO.S.A4003
 
 config:
@@ -140,7 +140,7 @@
           value: new_mode_th
 
     - label: "Step 8: TH reads from the DUT the OnMode attribute."
-      PICS: TCCM.S.A0003 && TCCM.S.F00
+      PICS: TCCM.S.A0003 && MOD.S.F00
       command: "readAttribute"
       attribute: "OnMode"
       response: