From c3cc4a26121db35310f54afb4acc793bd18f80bc Mon Sep 17 00:00:00 2001
From: kowsisoundhar12 <57476670+kowsisoundhar12@users.noreply.github.com>
Date: Mon, 8 Aug 2022 22:14:30 +0530
Subject: [PATCH] Added High level PICS (#21675)

* Added high level pics

* Added Auto generated file

* Added updated file

* Added restyled scripts

* restyled scripts

* Restyled scripts

* Updating autogen files after rebase

Co-authored-by: manjunath-grl <manjunath.grl@outlook.com>
Co-authored-by: kvikrambhat <vikrambhat@outlook.com>
---
 .../suites/certification/Test_TC_ACL_1_1.yaml |    3 +
 .../suites/certification/Test_TC_ACL_2_1.yaml |    3 +
 .../suites/certification/Test_TC_ACL_2_2.yaml |    3 +
 .../suites/certification/Test_TC_ACT_1_1.yaml |    3 +
 .../suites/certification/Test_TC_ACT_3_1.yaml |    7 +
 .../suites/certification/Test_TC_ACT_3_2.yaml |    3 +
 .../certification/Test_TC_APBSC_1_10.yaml     |    3 +
 .../Test_TC_APPLAUNCHER_3_5.yaml              |    3 +
 .../Test_TC_APPLAUNCHER_3_6.yaml              |    3 +
 .../Test_TC_AUDIOOUTPUT_1_8.yaml              |    3 +
 .../suites/certification/Test_TC_BDX_1_1.yaml |    4 +
 .../suites/certification/Test_TC_BDX_1_2.yaml |    4 +
 .../suites/certification/Test_TC_BDX_1_3.yaml |    4 +
 .../suites/certification/Test_TC_BDX_1_4.yaml |    4 +
 .../suites/certification/Test_TC_BDX_1_5.yaml |    4 +
 .../suites/certification/Test_TC_BDX_1_6.yaml |    4 +
 .../suites/certification/Test_TC_BDX_2_1.yaml |    3 +
 .../suites/certification/Test_TC_BDX_2_3.yaml |    3 +
 .../suites/certification/Test_TC_BDX_2_4.yaml |    3 +
 .../suites/certification/Test_TC_BDX_2_5.yaml |    3 +
 .../certification/Test_TC_BIND_2_1.yaml       |    3 +
 .../Test_TC_BINFO_2_3_Simulated.yaml          |    3 +
 .../certification/Test_TC_BOOL_1_1.yaml       |    3 +
 .../certification/Test_TC_BOOL_2_1.yaml       |    3 +
 .../certification/Test_TC_BOOL_2_2.yaml       |    3 +
 .../certification/Test_TC_BOOL_3_1.yaml       |    7 +
 .../certification/Test_TC_CADMIN_1_10.yaml    |    3 +
 .../certification/Test_TC_CADMIN_1_12.yaml    |    3 +
 .../certification/Test_TC_CADMIN_1_13.yaml    |    3 +
 .../certification/Test_TC_CADMIN_1_2.yaml     |    3 +
 .../certification/Test_TC_CADMIN_1_23.yaml    |    3 +
 .../certification/Test_TC_CADMIN_1_24.yaml    |    3 +
 .../certification/Test_TC_CADMIN_1_3.yaml     |    3 +
 .../certification/Test_TC_CADMIN_1_4.yaml     |    3 +
 .../certification/Test_TC_CADMIN_1_5.yaml     |    3 +
 .../certification/Test_TC_CADMIN_1_6.yaml     |    3 +
 .../certification/Test_TC_CADMIN_1_7.yaml     |    3 +
 .../certification/Test_TC_CADMIN_1_8.yaml     |    3 +
 .../certification/Test_TC_CADMIN_1_9.yaml     |    3 +
 .../suites/certification/Test_TC_CC_1_1.yaml  |    3 +
 .../suites/certification/Test_TC_CC_3_2.yaml  |    3 +
 .../suites/certification/Test_TC_CC_3_3.yaml  |    3 +
 .../suites/certification/Test_TC_CC_4_1.yaml  |    3 +
 .../suites/certification/Test_TC_CC_4_2.yaml  |    3 +
 .../suites/certification/Test_TC_CC_4_3.yaml  |    3 +
 .../suites/certification/Test_TC_CC_4_4.yaml  |    3 +
 .../suites/certification/Test_TC_CC_5_1.yaml  |    3 +
 .../suites/certification/Test_TC_CC_5_2.yaml  |    3 +
 .../suites/certification/Test_TC_CC_5_3.yaml  |    3 +
 .../suites/certification/Test_TC_CC_6_1.yaml  |    3 +
 .../suites/certification/Test_TC_CC_6_2.yaml  |    3 +
 .../suites/certification/Test_TC_CC_6_3.yaml  |    3 +
 .../suites/certification/Test_TC_CC_7_1.yaml  |    3 +
 .../suites/certification/Test_TC_CC_7_2.yaml  |    3 +
 .../suites/certification/Test_TC_CC_7_3.yaml  |    3 +
 .../suites/certification/Test_TC_CC_7_4.yaml  |    3 +
 .../suites/certification/Test_TC_CC_8_1.yaml  |    3 +
 .../suites/certification/Test_TC_CC_9_1.yaml  |    3 +
 .../suites/certification/Test_TC_CC_9_2.yaml  |    3 +
 .../suites/certification/Test_TC_CC_9_3.yaml  |    3 +
 .../suites/certification/Test_TC_CC_9_4.yaml  |    3 +
 .../certification/Test_TC_CGEN_1_1.yaml       |    3 +
 .../certification/Test_TC_CGEN_2_1.yaml       |    3 +
 .../certification/Test_TC_CGEN_2_2.yaml       |    3 +
 .../certification/Test_TC_CGEN_2_4.yaml       |    3 +
 .../certification/Test_TC_CHANNEL_5_1.yaml    |    3 +
 .../Test_TC_CONTENTLAUNCHER_10_1.yaml         |    3 +
 .../Test_TC_CONTENTLAUNCHER_1_11.yaml         |    3 +
 .../suites/certification/Test_TC_DD_1_10.yaml |    4 +
 .../suites/certification/Test_TC_DD_1_12.yaml |    5 +
 .../suites/certification/Test_TC_DD_1_13.yaml |    5 +
 .../suites/certification/Test_TC_DD_1_14.yaml |    5 +
 .../suites/certification/Test_TC_DD_1_15.yaml |    3 +
 .../suites/certification/Test_TC_DD_1_5.yaml  |    4 +
 .../suites/certification/Test_TC_DD_1_6.yaml  |    4 +
 .../suites/certification/Test_TC_DD_1_7.yaml  |    4 +
 .../suites/certification/Test_TC_DD_1_8.yaml  |    4 +
 .../suites/certification/Test_TC_DD_1_9.yaml  |    4 +
 .../suites/certification/Test_TC_DD_2_1.yaml  |    3 +
 .../suites/certification/Test_TC_DD_3_10.yaml |    4 +
 .../suites/certification/Test_TC_DD_3_11.yaml |    5 +
 .../suites/certification/Test_TC_DD_3_12.yaml |    5 +
 .../suites/certification/Test_TC_DD_3_13.yaml |    5 +
 .../suites/certification/Test_TC_DD_3_14.yaml |    4 +
 .../suites/certification/Test_TC_DD_3_15.yaml |    4 +
 .../suites/certification/Test_TC_DD_3_18.yaml |    4 +
 .../suites/certification/Test_TC_DD_3_19.yaml |    4 +
 .../suites/certification/Test_TC_DD_3_20.yaml |    4 +
 .../suites/certification/Test_TC_DD_3_21.yaml |    4 +
 .../suites/certification/Test_TC_DD_3_3.yaml  |    5 +
 .../suites/certification/Test_TC_DD_3_4.yaml  |    5 +
 .../suites/certification/Test_TC_DD_3_9.yaml  |    4 +
 .../certification/Test_TC_DESC_1_1.yaml       |    3 +
 .../certification/Test_TC_DESC_2_1.yaml       |    3 +
 .../certification/Test_TC_DESC_2_2.yaml       |    3 +
 .../certification/Test_TC_DGETH_1_1.yaml      |    3 +
 .../certification/Test_TC_DGETH_2_1.yaml      |    4 +
 .../certification/Test_TC_DGETH_2_2.yaml      |    4 +
 .../certification/Test_TC_DGETH_3_1.yaml      |    3 +
 .../certification/Test_TC_DGGEN_1_1.yaml      |    3 +
 .../certification/Test_TC_DGGEN_2_1.yaml      |    4 +
 .../certification/Test_TC_DGGEN_2_2.yaml      |    4 +
 .../certification/Test_TC_DGGEN_2_3.yaml      |    4 +
 .../certification/Test_TC_DGGEN_3_1.yaml      |    3 +
 .../certification/Test_TC_DGGEN_3_2.yaml      |   51 -
 .../certification/Test_TC_DGSW_1_1.yaml       |    3 +
 .../certification/Test_TC_DGSW_2_1.yaml       |    4 +
 .../certification/Test_TC_DGSW_2_2.yaml       |    4 +
 .../certification/Test_TC_DGSW_2_3.yaml       |    4 +
 .../certification/Test_TC_DGSW_3_1.yaml       |    3 +
 .../certification/Test_TC_DGSW_3_2.yaml       |    3 +
 .../certification/Test_TC_DGTHREAD_2_1.yaml   |    3 +
 .../certification/Test_TC_DGTHREAD_2_2.yaml   |    3 +
 .../certification/Test_TC_DGTHREAD_2_3.yaml   |    3 +
 .../certification/Test_TC_DGTHREAD_2_4.yaml   |    3 +
 .../certification/Test_TC_DGTHREAD_2_5.yaml   |    3 +
 .../certification/Test_TC_DGTHREAD_3_1.yaml   |    3 +
 .../certification/Test_TC_DGTHREAD_3_2.yaml   |    3 +
 .../certification/Test_TC_DGTHREAD_3_3.yaml   |    3 +
 .../certification/Test_TC_DGTHREAD_3_4.yaml   |    3 +
 .../certification/Test_TC_DGTHREAD_3_5.yaml   |    3 +
 .../certification/Test_TC_DGWIFI_1_1.yaml     |    3 +
 .../certification/Test_TC_DGWIFI_2_1.yaml     |    4 +
 .../certification/Test_TC_DGWIFI_2_2.yaml     |    3 +
 .../certification/Test_TC_DGWIFI_2_3.yaml     |    3 +
 .../certification/Test_TC_DGWIFI_3_1.yaml     |    4 +
 .../certification/Test_TC_DGWIFI_3_2.yaml     |    3 +
 .../certification/Test_TC_DLOG_1_1.yaml       |    3 +
 .../certification/Test_TC_DLOG_2_1.yaml       |    3 +
 .../certification/Test_TC_DLOG_2_2.yaml       |    3 +
 .../certification/Test_TC_DLOG_3_1.yaml       |    3 +
 .../certification/Test_TC_DRLK_2_4.yaml       |    3 +
 .../certification/Test_TC_DRLK_2_5.yaml       |    3 +
 .../certification/Test_TC_DRLK_2_7.yaml       |    3 +
 .../certification/Test_TC_DRLK_2_9.yaml       |    3 +
 .../certification/Test_TC_FLABEL_1_1.yaml     |    3 +
 .../certification/Test_TC_FLABEL_2_1.yaml     |    3 +
 .../certification/Test_TC_FLABEL_3_1.yaml     |    3 +
 .../suites/certification/Test_TC_FLW_1_1.yaml |    3 +
 .../suites/certification/Test_TC_FLW_2_2.yaml |    3 +
 .../suites/certification/Test_TC_G_1_1.yaml   |    3 +
 .../suites/certification/Test_TC_G_3_1.yaml   |    3 +
 .../suites/certification/Test_TC_IDM_1_1.yaml |    3 +
 .../suites/certification/Test_TC_IDM_3_1.yaml |    3 +
 .../suites/certification/Test_TC_IDM_5_2.yaml |    3 +
 .../suites/certification/Test_TC_IDM_6_1.yaml |    3 +
 .../suites/certification/Test_TC_IDM_6_3.yaml |    3 +
 .../suites/certification/Test_TC_IDM_6_4.yaml |    3 +
 .../suites/certification/Test_TC_IDM_7_1.yaml |    3 +
 .../suites/certification/Test_TC_ILL_1_1.yaml |    3 +
 .../suites/certification/Test_TC_ILL_2_1.yaml |    3 +
 .../suites/certification/Test_TC_ILL_2_2.yaml |    3 +
 .../suites/certification/Test_TC_ILL_3_1.yaml |    7 +
 .../suites/certification/Test_TC_I_1_1.yaml   |    3 +
 .../suites/certification/Test_TC_I_2_1.yaml   |    3 +
 .../suites/certification/Test_TC_I_2_2.yaml   |    3 +
 .../suites/certification/Test_TC_I_2_3.yaml   |    3 +
 .../suites/certification/Test_TC_I_3_1.yaml   |    7 +
 .../suites/certification/Test_TC_I_3_2.yaml   |    3 +
 .../Test_TC_KEYPADINPUT_1_2.yaml              |    3 +
 .../Test_TC_KEYPADINPUT_3_2.yaml              |    3 +
 .../certification/Test_TC_LCFG_1_1.yaml       |    3 +
 .../certification/Test_TC_LCFG_2_1.yaml       |    3 +
 .../certification/Test_TC_LCFG_3_1.yaml       |    3 +
 .../certification/Test_TC_LOWPOWER_1_1.yaml   |    3 +
 .../certification/Test_TC_LTIME_1_1.yaml      |    3 +
 .../certification/Test_TC_LTIME_1_2.yaml      |    3 +
 .../certification/Test_TC_LTIME_2_1.yaml      |    3 +
 .../certification/Test_TC_LTIME_3_1.yaml      |    3 +
 .../certification/Test_TC_LUNIT_1_1.yaml      |    3 +
 .../certification/Test_TC_LUNIT_1_2.yaml      |    3 +
 .../certification/Test_TC_LUNIT_2_1.yaml      |    3 +
 .../certification/Test_TC_LUNIT_3_1.yaml      |    3 +
 .../suites/certification/Test_TC_LVL_1_1.yaml |    3 +
 .../suites/certification/Test_TC_LVL_2_1.yaml |    3 +
 .../suites/certification/Test_TC_LVL_2_2.yaml |    3 +
 .../suites/certification/Test_TC_LVL_2_3.yaml | 1759 +++++++++--------
 .../suites/certification/Test_TC_LVL_3_1.yaml |    3 +
 .../suites/certification/Test_TC_LVL_7_1.yaml |    4 +
 .../suites/certification/Test_TC_LVL_8_1.yaml |  601 +++---
 .../suites/certification/Test_TC_MC_11_1.yaml |    1 +
 .../certification/Test_TC_MEDIAINPUT_1_4.yaml |    3 +
 .../Test_TC_MEDIAINPUT_3_10.yaml              |    3 +
 .../Test_TC_MEDIAPLAYBACK_1_7.yaml            |    3 +
 .../Test_TC_MEDIAPLAYBACK_6_1.yaml            |    3 +
 .../Test_TC_MEDIAPLAYBACK_6_2.yaml            |    3 +
 .../Test_TC_MEDIAPLAYBACK_6_3.yaml            |    3 +
 .../suites/certification/Test_TC_MOD_1_1.yaml |    3 +
 .../suites/certification/Test_TC_MOD_1_2.yaml |    3 +
 .../suites/certification/Test_TC_MOD_1_3.yaml |    7 +
 .../suites/certification/Test_TC_MOD_2_1.yaml |    3 +
 .../suites/certification/Test_TC_MOD_2_2.yaml |    3 +
 .../suites/certification/Test_TC_MOD_3_2.yaml |    3 +
 .../suites/certification/Test_TC_MOD_3_3.yaml |    3 +
 .../suites/certification/Test_TC_OCC_1_1.yaml |    3 +
 .../suites/certification/Test_TC_OCC_2_1.yaml |    3 +
 .../suites/certification/Test_TC_OCC_2_2.yaml |    3 +
 .../suites/certification/Test_TC_OCC_2_3.yaml |    3 +
 .../suites/certification/Test_TC_OCC_2_4.yaml |    3 +
 .../suites/certification/Test_TC_OCC_3_1.yaml |    3 +
 .../suites/certification/Test_TC_OCC_3_2.yaml |    3 +
 .../suites/certification/Test_TC_OO_1_1.yaml  |    3 +
 .../suites/certification/Test_TC_OO_2_1.yaml  |    3 +
 .../suites/certification/Test_TC_OO_2_2.yaml  |    3 +
 .../suites/certification/Test_TC_OO_2_3.yaml  |    2 +-
 .../suites/certification/Test_TC_OO_2_4.yaml  |    4 +
 .../suites/certification/Test_TC_OO_3_1.yaml  |    7 +
 .../suites/certification/Test_TC_OO_3_2.yaml  |    3 +
 .../certification/Test_TC_OPCREDS_1_2.yaml    |    3 +
 .../suites/certification/Test_TC_PCC_1_1.yaml |    3 +
 .../suites/certification/Test_TC_PCC_2_1.yaml |    3 +
 .../suites/certification/Test_TC_PCC_2_2.yaml |    3 +
 .../suites/certification/Test_TC_PCC_2_3.yaml |    3 +
 .../suites/certification/Test_TC_PCC_2_4.yaml |    3 +
 .../suites/certification/Test_TC_PCC_3_1.yaml |    7 +
 .../suites/certification/Test_TC_PRS_1_1.yaml |    3 +
 .../suites/certification/Test_TC_PRS_2_1.yaml |    3 +
 .../suites/certification/Test_TC_PRS_3_1.yaml |    7 +
 .../certification/Test_TC_PSCFG_1_1.yaml      |    3 +
 .../certification/Test_TC_PSCFG_2_1.yaml      |    3 +
 .../certification/Test_TC_PSCFG_2_2.yaml      |    3 +
 .../certification/Test_TC_PSCFG_3_1.yaml      |    7 +
 .../suites/certification/Test_TC_PS_1_1.yaml  |    3 +
 .../suites/certification/Test_TC_PS_2_1.yaml  |    3 +
 .../suites/certification/Test_TC_RH_2_2.yaml  |    3 +
 .../suites/certification/Test_TC_SC_1_1.yaml  |    3 +
 .../suites/certification/Test_TC_SC_1_2.yaml  |    3 +
 .../suites/certification/Test_TC_SC_1_3.yaml  |    3 +
 .../suites/certification/Test_TC_SC_1_4.yaml  |    3 +
 .../suites/certification/Test_TC_SC_2_1.yaml  |    3 +
 .../suites/certification/Test_TC_SC_2_2.yaml  |    3 +
 .../suites/certification/Test_TC_SC_2_3.yaml  |    3 +
 .../suites/certification/Test_TC_SC_2_4.yaml  |    3 +
 .../suites/certification/Test_TC_SC_3_1.yaml  |    3 +
 .../suites/certification/Test_TC_SC_3_2.yaml  |    3 +
 .../suites/certification/Test_TC_SC_3_3.yaml  |    3 +
 .../suites/certification/Test_TC_SC_3_4.yaml  |    3 +
 .../suites/certification/Test_TC_SC_4_2.yaml  |    3 +
 .../suites/certification/Test_TC_SC_4_8.yaml  |    3 +
 .../suites/certification/Test_TC_SU_2_1.yaml  |    3 +
 .../suites/certification/Test_TC_SU_2_2.yaml  |    3 +
 .../suites/certification/Test_TC_SU_2_3.yaml  |    3 +
 .../suites/certification/Test_TC_SU_2_4.yaml  |    3 +
 .../suites/certification/Test_TC_SU_2_5.yaml  |    3 +
 .../suites/certification/Test_TC_SU_2_7.yaml  |    3 +
 .../suites/certification/Test_TC_SU_2_8.yaml  |    3 +
 .../suites/certification/Test_TC_SU_3_1.yaml  |    3 +
 .../suites/certification/Test_TC_SU_3_2.yaml  |    3 +
 .../suites/certification/Test_TC_SU_3_4.yaml  |    3 +
 .../suites/certification/Test_TC_SU_4_1.yaml  |    3 +
 .../suites/certification/Test_TC_SU_4_2.yaml  |    3 +
 .../certification/Test_TC_SWTCH_1_1.yaml      |    3 +
 .../certification/Test_TC_SWTCH_2_1.yaml      |    3 +
 .../certification/Test_TC_SWTCH_2_2.yaml      |    3 +
 .../certification/Test_TC_SWTCH_3_1.yaml      |    7 +
 .../certification/Test_TC_SWTCH_3_2.yaml      |    3 +
 .../suites/certification/Test_TC_S_1_1.yaml   |    3 +
 .../suites/certification/Test_TC_S_2_1.yaml   |    5 +
 .../suites/certification/Test_TC_S_2_2.yaml   |    3 +
 .../suites/certification/Test_TC_S_2_3.yaml   |    3 +
 .../suites/certification/Test_TC_S_3_1.yaml   |    7 +
 .../certification/Test_TC_TGTNAV_1_9.yaml     |    3 +
 .../suites/certification/Test_TC_TMP_1_1.yaml |    3 +
 .../suites/certification/Test_TC_TMP_2_1.yaml |    5 +
 .../suites/certification/Test_TC_TMP_2_2.yaml |    3 +
 .../certification/Test_TC_TSTAT_1_1.yaml      |    3 +
 .../certification/Test_TC_TSTAT_2_1.yaml      |    3 +
 .../certification/Test_TC_TSTAT_2_2.yaml      |    3 +
 .../certification/Test_TC_TSUIC_1_1.yaml      |    3 +
 .../certification/Test_TC_TSUIC_2_1.yaml      |    3 +
 .../certification/Test_TC_TSUIC_2_2.yaml      |    3 +
 .../certification/Test_TC_TSUIC_3_1.yaml      |    7 +
 .../certification/Test_TC_ULABEL_1_1.yaml     |    3 +
 .../certification/Test_TC_ULABEL_2_2.yaml     |    3 +
 .../certification/Test_TC_ULABEL_2_3.yaml     |    3 +
 .../certification/Test_TC_ULABEL_2_4.yaml     |    3 +
 .../certification/Test_TC_ULABEL_3_1.yaml     |    3 +
 .../certification/Test_TC_WNCV_2_1.yaml       |    3 +
 .../certification/Test_TC_WNCV_2_2.yaml       |    3 +
 .../certification/Test_TC_WNCV_2_3.yaml       |    3 +
 .../certification/Test_TC_WNCV_2_4.yaml       |    3 +
 .../certification/Test_TC_WNCV_2_5.yaml       |    3 +
 .../certification/Test_TC_WNCV_3_1.yaml       |    3 +
 .../certification/Test_TC_WNCV_3_2.yaml       |    3 +
 .../certification/Test_TC_WNCV_3_4.yaml       |    3 +
 .../certification/Test_TC_WNCV_3_5.yaml       |    3 +
 .../certification/Test_TC_WNCV_4_1.yaml       |    3 +
 .../certification/Test_TC_WNCV_4_3.yaml       |    3 +
 .../certification/Test_TC_WNCV_4_4.yaml       |    3 +
 .../certification/Test_TC_WNCV_4_5.yaml       |    3 +
 .../certification/Test_TC_WNCV_5_1.yaml       |    3 +
 .../certification/Test_TC_WNCV_6_1.yaml       |    3 +
 .../certification/Test_TC_WNCV_7_1.yaml       |    3 +
 src/app/tests/suites/tests.js                 |    1 -
 .../chip-tool/zap-generated/test/Commands.h   |   58 -
 295 files changed, 2151 insertions(+), 1286 deletions(-)
 delete mode 100644 src/app/tests/suites/certification/Test_TC_DGGEN_3_2.yaml

diff --git a/src/app/tests/suites/certification/Test_TC_ACL_1_1.yaml b/src/app/tests/suites/certification/Test_TC_ACL_1_1.yaml
index 2281170d49d0a4..097e43c5c3983a 100644
--- a/src/app/tests/suites/certification/Test_TC_ACL_1_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_ACL_1_1.yaml
@@ -15,6 +15,9 @@
 
 name: 132.1.1. [TC-ACL-1.1] Global attributes
 
+PICS:
+    - ACL.S
+
 config:
     nodeId: 0x12344321
     cluster: "Basic"
diff --git a/src/app/tests/suites/certification/Test_TC_ACL_2_1.yaml b/src/app/tests/suites/certification/Test_TC_ACL_2_1.yaml
index 9e605bafbabae4..82f8f9c590cb76 100644
--- a/src/app/tests/suites/certification/Test_TC_ACL_2_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_ACL_2_1.yaml
@@ -15,6 +15,9 @@
 
 name: 132.2.1. [TC-ACL-2.1] Simple attributes
 
+PICS:
+    - ACL.S
+
 config:
     nodeId: 0x12344321
     cluster: "Basic"
diff --git a/src/app/tests/suites/certification/Test_TC_ACL_2_2.yaml b/src/app/tests/suites/certification/Test_TC_ACL_2_2.yaml
index 12aeccec18cfb6..e5e0dbc4da9a83 100644
--- a/src/app/tests/suites/certification/Test_TC_ACL_2_2.yaml
+++ b/src/app/tests/suites/certification/Test_TC_ACL_2_2.yaml
@@ -15,6 +15,9 @@
 
 name: 129.2.2. [TC-ACL-2.2] Cluster endpoint
 
+PICS:
+    - ACL.S
+
 config:
     nodeId: 0x12344321
     cluster: "Basic"
diff --git a/src/app/tests/suites/certification/Test_TC_ACT_1_1.yaml b/src/app/tests/suites/certification/Test_TC_ACT_1_1.yaml
index 29d85932b5e9ce..7edc277b60fdd1 100644
--- a/src/app/tests/suites/certification/Test_TC_ACT_1_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_ACT_1_1.yaml
@@ -14,6 +14,9 @@
 
 name: 77.1.1. [TC-ACT-1.1] Global attributes with server as DUT
 
+PICS:
+    - ACT.S
+
 config:
     nodeId: 0x12344321
     cluster: "Bridged Actions"
diff --git a/src/app/tests/suites/certification/Test_TC_ACT_3_1.yaml b/src/app/tests/suites/certification/Test_TC_ACT_3_1.yaml
index 8268d4b403c9da..cd73590be43871 100644
--- a/src/app/tests/suites/certification/Test_TC_ACT_3_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_ACT_3_1.yaml
@@ -15,6 +15,13 @@
 
 name: 77.2.3. [TC-ACT-3.1] GLobal attributes with client as DUT
 
+PICS:
+    - ACT.C
+    - ACT.C.AM-READ
+    - ACT.C.AO-READ
+    - ACT.C.AM-WRITE
+    - ACT.C.AO-WRITE
+
 config:
     nodeId: 0x12344321
     cluster: "Basic"
diff --git a/src/app/tests/suites/certification/Test_TC_ACT_3_2.yaml b/src/app/tests/suites/certification/Test_TC_ACT_3_2.yaml
index ec4c5a908eda85..49f991071ddffe 100644
--- a/src/app/tests/suites/certification/Test_TC_ACT_3_2.yaml
+++ b/src/app/tests/suites/certification/Test_TC_ACT_3_2.yaml
@@ -15,6 +15,9 @@
 
 name: 3.2.4. [TC-ACT-3.2] Functionality with client as DUT
 
+PICS:
+    - ACT.C
+
 config:
     nodeId: 0x12344321
     cluster: "Basic"
diff --git a/src/app/tests/suites/certification/Test_TC_APBSC_1_10.yaml b/src/app/tests/suites/certification/Test_TC_APBSC_1_10.yaml
index e6b473d7bfe496..1c3bf523b5132b 100644
--- a/src/app/tests/suites/certification/Test_TC_APBSC_1_10.yaml
+++ b/src/app/tests/suites/certification/Test_TC_APBSC_1_10.yaml
@@ -16,6 +16,9 @@ name:
     19.1.10. [TC-APBSC-1.10] Global attributes - Application Basic Cluster (DUT
     as Server)
 
+PICS:
+    - APBSC.S
+
 config:
     nodeId: 0x12344321
     cluster: "Application Basic"
diff --git a/src/app/tests/suites/certification/Test_TC_APPLAUNCHER_3_5.yaml b/src/app/tests/suites/certification/Test_TC_APPLAUNCHER_3_5.yaml
index 8e73bb328e24db..16a9529930e745 100644
--- a/src/app/tests/suites/certification/Test_TC_APPLAUNCHER_3_5.yaml
+++ b/src/app/tests/suites/certification/Test_TC_APPLAUNCHER_3_5.yaml
@@ -14,6 +14,9 @@
 
 name: 19.4.1. [TC-APPLAUNCHER-3.5] Catalog List Verification
 
+PICS:
+    - APPLAUNCHER.S
+
 config:
     nodeId: 0x12344321
     cluster: "Application Launcher"
diff --git a/src/app/tests/suites/certification/Test_TC_APPLAUNCHER_3_6.yaml b/src/app/tests/suites/certification/Test_TC_APPLAUNCHER_3_6.yaml
index d959f984c35224..29c470099b391e 100644
--- a/src/app/tests/suites/certification/Test_TC_APPLAUNCHER_3_6.yaml
+++ b/src/app/tests/suites/certification/Test_TC_APPLAUNCHER_3_6.yaml
@@ -14,6 +14,9 @@
 
 name: 19.4.2. [TC-APPLAUNCHER-3.6] Current App Verification
 
+PICS:
+    - APPLAUNCHER.S
+
 config:
     nodeId: 0x12344321
     cluster: "Application Launcher"
diff --git a/src/app/tests/suites/certification/Test_TC_AUDIOOUTPUT_1_8.yaml b/src/app/tests/suites/certification/Test_TC_AUDIOOUTPUT_1_8.yaml
index d3fef20d04f878..a8a8ab2bcd0571 100644
--- a/src/app/tests/suites/certification/Test_TC_AUDIOOUTPUT_1_8.yaml
+++ b/src/app/tests/suites/certification/Test_TC_AUDIOOUTPUT_1_8.yaml
@@ -16,6 +16,9 @@ name:
     19.1.8. [TC-AUDIOOUTPUT-1.8] Global attributes - Audio Output Cluster(DUT as
     Server)
 
+PICS:
+    - AUDIOOUTPUT.S
+
 config:
     nodeId: 0x12344321
     cluster: "Audio Output"
diff --git a/src/app/tests/suites/certification/Test_TC_BDX_1_1.yaml b/src/app/tests/suites/certification/Test_TC_BDX_1_1.yaml
index eeeead412e6ab9..0f23c46ab9cec7 100644
--- a/src/app/tests/suites/certification/Test_TC_BDX_1_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_BDX_1_1.yaml
@@ -15,6 +15,10 @@
 
 name: 29.1.1. [TC-BDX-1.1] Sender Initiated BDX Transfer session
 
+PICS:
+    - MCORE.BDX.Sender
+    - MCORE.BDX.Initiator
+
 config:
     nodeId: 0x12344321
     cluster: "Basic"
diff --git a/src/app/tests/suites/certification/Test_TC_BDX_1_2.yaml b/src/app/tests/suites/certification/Test_TC_BDX_1_2.yaml
index d8c804463abe6a..7f0f8f54599661 100644
--- a/src/app/tests/suites/certification/Test_TC_BDX_1_2.yaml
+++ b/src/app/tests/suites/certification/Test_TC_BDX_1_2.yaml
@@ -15,6 +15,10 @@
 
 name: 28.1.2. [TC-BDX-1.2] Receiver Initiated BDX Transfer session
 
+PICS:
+    - MCORE.BDX.Receiver
+    - MCORE.BDX.Initiator
+
 config:
     nodeId: 0x12344321
     cluster: "Basic"
diff --git a/src/app/tests/suites/certification/Test_TC_BDX_1_3.yaml b/src/app/tests/suites/certification/Test_TC_BDX_1_3.yaml
index 32ada08d488252..40612c83c75b76 100644
--- a/src/app/tests/suites/certification/Test_TC_BDX_1_3.yaml
+++ b/src/app/tests/suites/certification/Test_TC_BDX_1_3.yaml
@@ -15,6 +15,10 @@
 
 name: 29.1.3. [TC-BDX-1.3] Response to Sender Initiated BDX Transfer session
 
+PICS:
+    - MCORE.BDX.Receiver
+    - MCORE.BDX.Responder
+
 config:
     nodeId: 0x12344321
     cluster: "Basic"
diff --git a/src/app/tests/suites/certification/Test_TC_BDX_1_4.yaml b/src/app/tests/suites/certification/Test_TC_BDX_1_4.yaml
index 0b75d0a45a9a49..164b89b58c0c6f 100644
--- a/src/app/tests/suites/certification/Test_TC_BDX_1_4.yaml
+++ b/src/app/tests/suites/certification/Test_TC_BDX_1_4.yaml
@@ -15,6 +15,10 @@
 
 name: 28.1.4. [TC-BDX-1.4] Response to Receiver Initiated BDX Transfer session
 
+PICS:
+    - MCORE.BDX.Sender
+    - MCORE.BDX.Responder
+
 config:
     nodeId: 0x12344321
     cluster: "Basic"
diff --git a/src/app/tests/suites/certification/Test_TC_BDX_1_5.yaml b/src/app/tests/suites/certification/Test_TC_BDX_1_5.yaml
index 6cd67f015ed1c6..b74f837b9ced88 100644
--- a/src/app/tests/suites/certification/Test_TC_BDX_1_5.yaml
+++ b/src/app/tests/suites/certification/Test_TC_BDX_1_5.yaml
@@ -17,6 +17,10 @@ name:
     29.1.5. [TC-BDX-1.5] Response to Sender Initiated BDX Transfer session -
     Negative scenario
 
+PICS:
+    - MCORE.BDX.Receiver
+    - MCORE.BDX.Responder
+
 config:
     nodeId: 0x12344321
     cluster: "Basic"
diff --git a/src/app/tests/suites/certification/Test_TC_BDX_1_6.yaml b/src/app/tests/suites/certification/Test_TC_BDX_1_6.yaml
index 01b4ac6c82fca0..2c58ce429d8cdd 100644
--- a/src/app/tests/suites/certification/Test_TC_BDX_1_6.yaml
+++ b/src/app/tests/suites/certification/Test_TC_BDX_1_6.yaml
@@ -17,6 +17,10 @@ name:
     29.1.6. [TC-BDX-1.6] Response to Receiver Initiated BDX Transfer session -
     Negative scenario
 
+PICS:
+    - MCORE.BDX.Sender
+    - MCORE.BDX.Responder
+
 config:
     nodeId: 0x12344321
     cluster: "Basic"
diff --git a/src/app/tests/suites/certification/Test_TC_BDX_2_1.yaml b/src/app/tests/suites/certification/Test_TC_BDX_2_1.yaml
index 9fcf4602e36f32..eb8cd3dede6d48 100644
--- a/src/app/tests/suites/certification/Test_TC_BDX_2_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_BDX_2_1.yaml
@@ -15,6 +15,9 @@
 
 name: 28.2.1. [TC-BDX-2.1] Synchronous file sending
 
+PICS:
+    - MCORE.BDX.SynchronousSender
+
 config:
     nodeId: 0x12344321
     cluster: "Basic"
diff --git a/src/app/tests/suites/certification/Test_TC_BDX_2_3.yaml b/src/app/tests/suites/certification/Test_TC_BDX_2_3.yaml
index 44f76ab5f08ed4..8b192ba746163b 100644
--- a/src/app/tests/suites/certification/Test_TC_BDX_2_3.yaml
+++ b/src/app/tests/suites/certification/Test_TC_BDX_2_3.yaml
@@ -15,6 +15,9 @@
 
 name: 29.2.3. [TC-BDX-2.3] Restart Synchronous file receiving
 
+PICS:
+    - MCORE.BDX.SynchronousReceiver
+
 config:
     nodeId: 0x12344321
     cluster: "Basic"
diff --git a/src/app/tests/suites/certification/Test_TC_BDX_2_4.yaml b/src/app/tests/suites/certification/Test_TC_BDX_2_4.yaml
index b16dc201103d0e..627c4ecbe2006b 100644
--- a/src/app/tests/suites/certification/Test_TC_BDX_2_4.yaml
+++ b/src/app/tests/suites/certification/Test_TC_BDX_2_4.yaml
@@ -15,6 +15,9 @@
 
 name: 29.2.4. [TC-BDX-2.4] Asynchronous file sending
 
+PICS:
+    - MCORE.BDX.AsynchronousSender
+
 config:
     nodeId: 0x12344321
     cluster: "Basic"
diff --git a/src/app/tests/suites/certification/Test_TC_BDX_2_5.yaml b/src/app/tests/suites/certification/Test_TC_BDX_2_5.yaml
index 5b0444ab9a731b..aa33eb1ad1753e 100644
--- a/src/app/tests/suites/certification/Test_TC_BDX_2_5.yaml
+++ b/src/app/tests/suites/certification/Test_TC_BDX_2_5.yaml
@@ -15,6 +15,9 @@
 
 name: 29.2.5. [TC-BDX-2.5] Asynchronous file receiving
 
+PICS:
+    - MCORE.BDX.AsynchronousReceiver
+
 config:
     nodeId: 0x12344321
     cluster: "Basic"
diff --git a/src/app/tests/suites/certification/Test_TC_BIND_2_1.yaml b/src/app/tests/suites/certification/Test_TC_BIND_2_1.yaml
index d865488d9567c8..6f5ddedb6cbbef 100644
--- a/src/app/tests/suites/certification/Test_TC_BIND_2_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_BIND_2_1.yaml
@@ -15,6 +15,9 @@
 
 name: 119.2.1. [TC-BIND-2.1] Binding Cluster Attributes-Node [DUT-Controller]
 
+PICS:
+    - BIND.C
+
 config:
     nodeId: 0x12344321
     cluster: "Basic"
diff --git a/src/app/tests/suites/certification/Test_TC_BINFO_2_3_Simulated.yaml b/src/app/tests/suites/certification/Test_TC_BINFO_2_3_Simulated.yaml
index 7609c2f6d357a2..efb10eaeb8dc8a 100644
--- a/src/app/tests/suites/certification/Test_TC_BINFO_2_3_Simulated.yaml
+++ b/src/app/tests/suites/certification/Test_TC_BINFO_2_3_Simulated.yaml
@@ -14,6 +14,9 @@
 
 name: 11.2.3. [TC-BINFO-2.3] Attributes [DUT-Client]
 
+PICS:
+    - BINFO.C
+
 config:
     nodeId: 0x12344321
     cluster: "Basic"
diff --git a/src/app/tests/suites/certification/Test_TC_BOOL_1_1.yaml b/src/app/tests/suites/certification/Test_TC_BOOL_1_1.yaml
index cb8965e96d17c1..f6ddb804653e6d 100644
--- a/src/app/tests/suites/certification/Test_TC_BOOL_1_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_BOOL_1_1.yaml
@@ -14,6 +14,9 @@
 
 name: 68.1.1. [TC-BOOL-1.1] Global attributes with server as DUT
 
+PICS:
+    - BOOL.S
+
 config:
     nodeId: 0x12344321
     cluster: "Boolean State"
diff --git a/src/app/tests/suites/certification/Test_TC_BOOL_2_1.yaml b/src/app/tests/suites/certification/Test_TC_BOOL_2_1.yaml
index 79dac0d1a3e49e..0d46df1890f925 100644
--- a/src/app/tests/suites/certification/Test_TC_BOOL_2_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_BOOL_2_1.yaml
@@ -14,6 +14,9 @@
 
 name: 68.2.1. [TC-BOOL-2.1] Attributes with server as DUT
 
+PICS:
+    - BOOL.S
+
 config:
     nodeId: 0x12344321
     cluster: "Boolean State"
diff --git a/src/app/tests/suites/certification/Test_TC_BOOL_2_2.yaml b/src/app/tests/suites/certification/Test_TC_BOOL_2_2.yaml
index 6bcfc27b3f074e..3e40847984100a 100644
--- a/src/app/tests/suites/certification/Test_TC_BOOL_2_2.yaml
+++ b/src/app/tests/suites/certification/Test_TC_BOOL_2_2.yaml
@@ -15,6 +15,9 @@
 
 name: 68.2.2. [TC-BOOL-2.2] Primary Functionality with Server as DUT
 
+PICS:
+    - BOOL.S
+
 config:
     nodeId: 0x12344321
     cluster: "Basic"
diff --git a/src/app/tests/suites/certification/Test_TC_BOOL_3_1.yaml b/src/app/tests/suites/certification/Test_TC_BOOL_3_1.yaml
index cea8b6d8e7eacb..3cf7b949af016c 100644
--- a/src/app/tests/suites/certification/Test_TC_BOOL_3_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_BOOL_3_1.yaml
@@ -15,6 +15,13 @@
 
 name: 68.3.1. [TC-BOOL-3.1] Attributes with Client as DUT
 
+PICS:
+    - BOOL.C
+    - BOOL.C.AM-READ
+    - BOOL.C.AO-READ
+    - BOOL.C.AM-WRITE
+    - BOOL.C.AO-WRITE
+
 config:
     nodeId: 0x12344321
     cluster: "Basic"
diff --git a/src/app/tests/suites/certification/Test_TC_CADMIN_1_10.yaml b/src/app/tests/suites/certification/Test_TC_CADMIN_1_10.yaml
index e0f14bd09c0120..5e4a400f939c37 100644
--- a/src/app/tests/suites/certification/Test_TC_CADMIN_1_10.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CADMIN_1_10.yaml
@@ -16,6 +16,9 @@ name:
     24.1.10. [TC-CADMIN-1.10] Device exit commissioning mode after 20 failed
     commission attempts [BCM] [DUT - Commissionee]
 
+PICS:
+    - CADMIN.S
+
 config:
     nodeId: 0x12344321
     timeout: 700
diff --git a/src/app/tests/suites/certification/Test_TC_CADMIN_1_12.yaml b/src/app/tests/suites/certification/Test_TC_CADMIN_1_12.yaml
index aa9426d9449d98..63da286de8f4cd 100644
--- a/src/app/tests/suites/certification/Test_TC_CADMIN_1_12.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CADMIN_1_12.yaml
@@ -17,6 +17,9 @@ name:
     4.1.12. [TC-CADMIN-1.12] Open commissioning window on DUT twice using ECM
     then BCM [DUT - Commissioner]
 
+PICS:
+    - CADMIN.C
+
 config:
     nodeId: 0x12344321
     cluster: "Basic"
diff --git a/src/app/tests/suites/certification/Test_TC_CADMIN_1_13.yaml b/src/app/tests/suites/certification/Test_TC_CADMIN_1_13.yaml
index cc190385b2cf10..0ec6d302626d05 100644
--- a/src/app/tests/suites/certification/Test_TC_CADMIN_1_13.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CADMIN_1_13.yaml
@@ -17,6 +17,9 @@ name:
     24.1.13. [TC-CADMIN-1.13] Open commissioning window twice on DUT using BCM
     then ECM [DUT - Commissionee]
 
+PICS:
+    - CADMIN.S
+
 config:
     nodeId: 0x12344321
     timeout: 600
diff --git a/src/app/tests/suites/certification/Test_TC_CADMIN_1_2.yaml b/src/app/tests/suites/certification/Test_TC_CADMIN_1_2.yaml
index 897a2b0a3f84b5..6220ada217989b 100644
--- a/src/app/tests/suites/certification/Test_TC_CADMIN_1_2.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CADMIN_1_2.yaml
@@ -16,6 +16,9 @@
 name:
     4.1.2. [TC-CADMIN-1.2] Administrator Behavior using BCM [DUT - Commissioner]
 
+PICS:
+    - CADMIN.C
+
 config:
     nodeId: 0x12344321
     cluster: "Basic"
diff --git a/src/app/tests/suites/certification/Test_TC_CADMIN_1_23.yaml b/src/app/tests/suites/certification/Test_TC_CADMIN_1_23.yaml
index c56a8510ab8337..dfded257848895 100644
--- a/src/app/tests/suites/certification/Test_TC_CADMIN_1_23.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CADMIN_1_23.yaml
@@ -17,6 +17,9 @@ name:
     24.1.23. [TC-CADMIN-1.23] Open commissioning window - durations max and
     max+1 [BCM] [DUT - Commissionee]
 
+PICS:
+    - CADMIN.S
+
 config:
     nodeId: 0x12344321
     timeout: 330
diff --git a/src/app/tests/suites/certification/Test_TC_CADMIN_1_24.yaml b/src/app/tests/suites/certification/Test_TC_CADMIN_1_24.yaml
index a4ae822ab055b1..2c1872a917de08 100644
--- a/src/app/tests/suites/certification/Test_TC_CADMIN_1_24.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CADMIN_1_24.yaml
@@ -17,6 +17,9 @@ name:
     24.1.24. [TC-CADMIN-1.24] Open commissioning window - durations max and
     max+1 [ECM] [DUT - Commissionee]
 
+PICS:
+    - CADMIN.S
+
 config:
     nodeId: 0x12344321
     timeout: 330
diff --git a/src/app/tests/suites/certification/Test_TC_CADMIN_1_3.yaml b/src/app/tests/suites/certification/Test_TC_CADMIN_1_3.yaml
index 0bb6f302830de6..ec7483aee424eb 100644
--- a/src/app/tests/suites/certification/Test_TC_CADMIN_1_3.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CADMIN_1_3.yaml
@@ -14,6 +14,9 @@
 
 name: 24.1.3. [TC-CADMIN-1.3] Node Behavior using ECM [DUT - Commissionee]
 
+PICS:
+    - CADMIN.S
+
 config:
     nodeId: 0x12344321
     timeout: 300
diff --git a/src/app/tests/suites/certification/Test_TC_CADMIN_1_4.yaml b/src/app/tests/suites/certification/Test_TC_CADMIN_1_4.yaml
index 196fa479025ee9..4f3d8eecf1dd84 100644
--- a/src/app/tests/suites/certification/Test_TC_CADMIN_1_4.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CADMIN_1_4.yaml
@@ -14,6 +14,9 @@
 
 name: 24.1.4. [TC-CADMIN-1.4] Node Behavior using BCM [DUT - Commissionee]
 
+PICS:
+    - CADMIN.S
+
 config:
     nodeId: 0x12344321
     timeout: 300
diff --git a/src/app/tests/suites/certification/Test_TC_CADMIN_1_5.yaml b/src/app/tests/suites/certification/Test_TC_CADMIN_1_5.yaml
index a57f99992dd501..ac1efbf6eeddcf 100644
--- a/src/app/tests/suites/certification/Test_TC_CADMIN_1_5.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CADMIN_1_5.yaml
@@ -16,6 +16,9 @@ name:
     24.1.5. [TC-CADMIN-1.5] Commissioning window handling timeout and revocation
     using ECM [DUT_CE - Commissionee]
 
+PICS:
+    - CADMIN.S
+
 config:
     nodeId: 0x12344321
     timeout: 300
diff --git a/src/app/tests/suites/certification/Test_TC_CADMIN_1_6.yaml b/src/app/tests/suites/certification/Test_TC_CADMIN_1_6.yaml
index 867f4df1a9deee..21a1cf069f94cd 100644
--- a/src/app/tests/suites/certification/Test_TC_CADMIN_1_6.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CADMIN_1_6.yaml
@@ -16,6 +16,9 @@ name:
     24.1.6. [TC-CADMIN-1.6] Commissioning window handling timeout and revocation
     using BCM [DUT - Commissionee]
 
+PICS:
+    - CADMIN.S
+
 config:
     nodeId: 0x12344321
     timeout: 300
diff --git a/src/app/tests/suites/certification/Test_TC_CADMIN_1_7.yaml b/src/app/tests/suites/certification/Test_TC_CADMIN_1_7.yaml
index 31fe104cc037ee..bbb8cf37fc6c49 100644
--- a/src/app/tests/suites/certification/Test_TC_CADMIN_1_7.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CADMIN_1_7.yaml
@@ -17,6 +17,9 @@ name:
     4.1.7. [TC-CADMIN-1.7] Commissioning window handling timeout and revocation
     using ECM [DUT - Commissioner]
 
+PICS:
+    - CADMIN.C
+
 config:
     nodeId: 0x12344321
     cluster: "Basic"
diff --git a/src/app/tests/suites/certification/Test_TC_CADMIN_1_8.yaml b/src/app/tests/suites/certification/Test_TC_CADMIN_1_8.yaml
index d4f0aedf3fc69a..1bdadd836531ab 100644
--- a/src/app/tests/suites/certification/Test_TC_CADMIN_1_8.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CADMIN_1_8.yaml
@@ -17,6 +17,9 @@ name:
     4.1.8. [TC-CADMIN-1.8] Commissioning window handling timeout and revocation
     using BCM [DUT - Commissioner]
 
+PICS:
+    - CADMIN.C
+
 config:
     nodeId: 0x12344321
     cluster: "Basic"
diff --git a/src/app/tests/suites/certification/Test_TC_CADMIN_1_9.yaml b/src/app/tests/suites/certification/Test_TC_CADMIN_1_9.yaml
index 5e0a0578b4d98b..c1406bdcfe2bd5 100644
--- a/src/app/tests/suites/certification/Test_TC_CADMIN_1_9.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CADMIN_1_9.yaml
@@ -16,6 +16,9 @@ name:
     24.1.9. [TC-CADMIN-1.9] Device exit commissioning mode after 20 failed
     commission attempts [ECM] [DUT - Commissionee]
 
+PICS:
+    - CADMIN.S
+
 config:
     nodeId: 0x12344321
     timeout: 700
diff --git a/src/app/tests/suites/certification/Test_TC_CC_1_1.yaml b/src/app/tests/suites/certification/Test_TC_CC_1_1.yaml
index e62e11283bfd57..1e46f0fa6f3e66 100644
--- a/src/app/tests/suites/certification/Test_TC_CC_1_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CC_1_1.yaml
@@ -14,6 +14,9 @@
 
 name: 27.1.1. [TC-CC-1.1] Global attributes with server as DUT
 
+PICS:
+    - CC.S
+
 config:
     nodeId: 0x12344321
     cluster: "Color Control"
diff --git a/src/app/tests/suites/certification/Test_TC_CC_3_2.yaml b/src/app/tests/suites/certification/Test_TC_CC_3_2.yaml
index 38d2e30c80efab..c221342b349ce9 100644
--- a/src/app/tests/suites/certification/Test_TC_CC_3_2.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CC_3_2.yaml
@@ -14,6 +14,9 @@
 
 name: 27.2.3. [TC-CC-3.2] Hue Move functionality with server as DUT
 
+PICS:
+    - CC.S
+
 config:
     nodeId: 0x12344321
     cluster: "Color Control"
diff --git a/src/app/tests/suites/certification/Test_TC_CC_3_3.yaml b/src/app/tests/suites/certification/Test_TC_CC_3_3.yaml
index 713536016f51fd..72c82a0d28d613 100644
--- a/src/app/tests/suites/certification/Test_TC_CC_3_3.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CC_3_3.yaml
@@ -14,6 +14,9 @@
 
 name: 27.2.4. [TC-CC-3.3] Hue Step functionality with server as DUT
 
+PICS:
+    - CC.S
+
 config:
     nodeId: 0x12344321
     cluster: "Color Control"
diff --git a/src/app/tests/suites/certification/Test_TC_CC_4_1.yaml b/src/app/tests/suites/certification/Test_TC_CC_4_1.yaml
index 0944c16a92165d..2a15655ec09676 100644
--- a/src/app/tests/suites/certification/Test_TC_CC_4_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CC_4_1.yaml
@@ -14,6 +14,9 @@
 
 name: 27.2.5. [TC-CC-4.1] Saturation MoveTo functionality with server as DUT
 
+PICS:
+    - CC.S
+
 config:
     nodeId: 0x12344321
     cluster: "Color Control"
diff --git a/src/app/tests/suites/certification/Test_TC_CC_4_2.yaml b/src/app/tests/suites/certification/Test_TC_CC_4_2.yaml
index 61d5dfebc40bc4..46f1b1c190c72d 100644
--- a/src/app/tests/suites/certification/Test_TC_CC_4_2.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CC_4_2.yaml
@@ -14,6 +14,9 @@
 
 name: 27.2.6. [TC-CC-4.2] Saturation Move functionality with server as DUT
 
+PICS:
+    - CC.S
+
 config:
     nodeId: 0x12344321
     cluster: "Color Control"
diff --git a/src/app/tests/suites/certification/Test_TC_CC_4_3.yaml b/src/app/tests/suites/certification/Test_TC_CC_4_3.yaml
index ee11c726d6b46b..73643d4f595741 100644
--- a/src/app/tests/suites/certification/Test_TC_CC_4_3.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CC_4_3.yaml
@@ -14,6 +14,9 @@
 
 name: 27.2.7. [TC-CC-4.3] Saturation Step functionality with server as DUT
 
+PICS:
+    - CC.S
+
 config:
     nodeId: 0x12344321
     cluster: "Color Control"
diff --git a/src/app/tests/suites/certification/Test_TC_CC_4_4.yaml b/src/app/tests/suites/certification/Test_TC_CC_4_4.yaml
index 88050c489c269f..c70370f33b7da6 100644
--- a/src/app/tests/suites/certification/Test_TC_CC_4_4.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CC_4_4.yaml
@@ -15,6 +15,9 @@
 name:
     27.2.8. [TC-CC-4.4] MoveToHueAndSaturation functionality with server as DUT
 
+PICS:
+    - CC.S
+
 config:
     nodeId: 0x12344321
     cluster: "Color Control"
diff --git a/src/app/tests/suites/certification/Test_TC_CC_5_1.yaml b/src/app/tests/suites/certification/Test_TC_CC_5_1.yaml
index c3b35888d24b99..5638f482cddbc2 100644
--- a/src/app/tests/suites/certification/Test_TC_CC_5_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CC_5_1.yaml
@@ -14,6 +14,9 @@
 
 name: 27.2.9. [TC-CC-5.1] Color MoveTo functionality with server as DUT
 
+PICS:
+    - CC.S
+
 config:
     nodeId: 0x12344321
     cluster: "Color Control"
diff --git a/src/app/tests/suites/certification/Test_TC_CC_5_2.yaml b/src/app/tests/suites/certification/Test_TC_CC_5_2.yaml
index fd142abf65aa1b..ddc1817ab7622f 100644
--- a/src/app/tests/suites/certification/Test_TC_CC_5_2.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CC_5_2.yaml
@@ -14,6 +14,9 @@
 
 name: 27.2.10. [TC-CC-5.2] Color Move functionality with server as DUT
 
+PICS:
+    - CC.S
+
 config:
     nodeId: 0x12344321
     cluster: "Color Control"
diff --git a/src/app/tests/suites/certification/Test_TC_CC_5_3.yaml b/src/app/tests/suites/certification/Test_TC_CC_5_3.yaml
index 01256e8a76fa79..e80c7f0cf937a4 100644
--- a/src/app/tests/suites/certification/Test_TC_CC_5_3.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CC_5_3.yaml
@@ -14,6 +14,9 @@
 
 name: 27.2.11. [TC-CC-5.3] Color Step functionality with server as DUT
 
+PICS:
+    - CC.S
+
 config:
     nodeId: 0x12344321
     cluster: "Color Control"
diff --git a/src/app/tests/suites/certification/Test_TC_CC_6_1.yaml b/src/app/tests/suites/certification/Test_TC_CC_6_1.yaml
index 46f28d645ff2cd..fe0246a8b14626 100644
--- a/src/app/tests/suites/certification/Test_TC_CC_6_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CC_6_1.yaml
@@ -16,6 +16,9 @@ name:
     27.2.12. [TC-CC-6.1] Color Temperature MoveTo functionality with server as
     DUT
 
+PICS:
+    - CC.S
+
 config:
     nodeId: 0x12344321
     cluster: "Color Control"
diff --git a/src/app/tests/suites/certification/Test_TC_CC_6_2.yaml b/src/app/tests/suites/certification/Test_TC_CC_6_2.yaml
index b97725602ceea8..255bf0002ba998 100644
--- a/src/app/tests/suites/certification/Test_TC_CC_6_2.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CC_6_2.yaml
@@ -15,6 +15,9 @@
 name:
     27.2.13. [TC-CC-6.2] Color Temperature Move functionality with server as DUT
 
+PICS:
+    - CC.S
+
 config:
     nodeId: 0x12344321
     cluster: "Color Control"
diff --git a/src/app/tests/suites/certification/Test_TC_CC_6_3.yaml b/src/app/tests/suites/certification/Test_TC_CC_6_3.yaml
index 41c91db88fdc78..172daf51049dc3 100644
--- a/src/app/tests/suites/certification/Test_TC_CC_6_3.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CC_6_3.yaml
@@ -15,6 +15,9 @@
 name:
     27.2.14. [TC-CC-6.3] Color Temperature Step functionality with server as DUT
 
+PICS:
+    - CC.S
+
 config:
     nodeId: 0x12344321
     cluster: "Color Control"
diff --git a/src/app/tests/suites/certification/Test_TC_CC_7_1.yaml b/src/app/tests/suites/certification/Test_TC_CC_7_1.yaml
index 33b0da86af04e2..6a508996999413 100644
--- a/src/app/tests/suites/certification/Test_TC_CC_7_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CC_7_1.yaml
@@ -14,6 +14,9 @@
 
 name: 27.2.15. [TC-CC-7.1] Enhanced MoveToHue functionality with server as DUT
 
+PICS:
+    - CC.S
+
 config:
     nodeId: 0x12344321
     cluster: "Color Control"
diff --git a/src/app/tests/suites/certification/Test_TC_CC_7_2.yaml b/src/app/tests/suites/certification/Test_TC_CC_7_2.yaml
index 72a718a6cf23ed..d9983803999b83 100644
--- a/src/app/tests/suites/certification/Test_TC_CC_7_2.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CC_7_2.yaml
@@ -14,6 +14,9 @@
 
 name: 27.2.16. [TC-CC-7.2] Enhanced MoveHue functionality with server as DUT
 
+PICS:
+    - CC.S
+
 config:
     nodeId: 0x12344321
     cluster: "Color Control"
diff --git a/src/app/tests/suites/certification/Test_TC_CC_7_3.yaml b/src/app/tests/suites/certification/Test_TC_CC_7_3.yaml
index 405dbfd1541277..8d6fd8136e32cb 100644
--- a/src/app/tests/suites/certification/Test_TC_CC_7_3.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CC_7_3.yaml
@@ -14,6 +14,9 @@
 
 name: 27.2.17. [TC-CC-7.3] Enhanced Step functionality with server as DUT
 
+PICS:
+    - CC.S
+
 config:
     nodeId: 0x12344321
     cluster: "Color Control"
diff --git a/src/app/tests/suites/certification/Test_TC_CC_7_4.yaml b/src/app/tests/suites/certification/Test_TC_CC_7_4.yaml
index 4c16186e677856..153c731cedd0ad 100644
--- a/src/app/tests/suites/certification/Test_TC_CC_7_4.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CC_7_4.yaml
@@ -16,6 +16,9 @@ name:
     27.2.18. [TC-CC-7.4] MoveToEnhancedHueAndSaturation functionality with
     server as DUT
 
+PICS:
+    - CC.S
+
 config:
     nodeId: 0x12344321
     cluster: "Color Control"
diff --git a/src/app/tests/suites/certification/Test_TC_CC_8_1.yaml b/src/app/tests/suites/certification/Test_TC_CC_8_1.yaml
index 0d27dc383eeeab..680dec2a3097d5 100644
--- a/src/app/tests/suites/certification/Test_TC_CC_8_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CC_8_1.yaml
@@ -14,6 +14,9 @@
 
 name: 27.2.19. [TC-CC-8.1] StopMoveStep functionality with server as DUT
 
+PICS:
+    - CC.S
+
 config:
     nodeId: 0x12344321
     cluster: "Color Control"
diff --git a/src/app/tests/suites/certification/Test_TC_CC_9_1.yaml b/src/app/tests/suites/certification/Test_TC_CC_9_1.yaml
index 96c62d56bc339f..85452a7e160a71 100644
--- a/src/app/tests/suites/certification/Test_TC_CC_9_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CC_9_1.yaml
@@ -14,6 +14,9 @@
 
 name: 27.2.20. [TC-CC-9.1] ColorLoopSet Validation
 
+PICS:
+    - CC.S
+
 config:
     nodeId: 0x12344321
     timeout: 400
diff --git a/src/app/tests/suites/certification/Test_TC_CC_9_2.yaml b/src/app/tests/suites/certification/Test_TC_CC_9_2.yaml
index 895772094ed1ba..5c486f907cf433 100644
--- a/src/app/tests/suites/certification/Test_TC_CC_9_2.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CC_9_2.yaml
@@ -15,6 +15,9 @@
 name:
     27.2.21. [TC-CC-9.2] ColorLoopSet Validation - change direction without stop
 
+PICS:
+    - CC.S
+
 config:
     nodeId: 0x12344321
     cluster: "Color Control"
diff --git a/src/app/tests/suites/certification/Test_TC_CC_9_3.yaml b/src/app/tests/suites/certification/Test_TC_CC_9_3.yaml
index 9265a6b00c6f92..8dc1fd3aa1e026 100644
--- a/src/app/tests/suites/certification/Test_TC_CC_9_3.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CC_9_3.yaml
@@ -14,6 +14,9 @@
 
 name: 27.2.22. [TC-CC-9.3] ColorLoopSet Validation - change time without stop
 
+PICS:
+    - CC.S
+
 config:
     nodeId: 0x12344321
     cluster: "Color Control"
diff --git a/src/app/tests/suites/certification/Test_TC_CC_9_4.yaml b/src/app/tests/suites/certification/Test_TC_CC_9_4.yaml
index d5a01993e3380e..cd47ce2dbc55a0 100644
--- a/src/app/tests/suites/certification/Test_TC_CC_9_4.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CC_9_4.yaml
@@ -15,6 +15,9 @@
 
 name: 3.2.27. [TC-CC-9.4] ColorLoopSet Validation with client as DUT
 
+PICS:
+    - CC.C
+
 config:
     nodeId: 0x12344321
     cluster: "Basic"
diff --git a/src/app/tests/suites/certification/Test_TC_CGEN_1_1.yaml b/src/app/tests/suites/certification/Test_TC_CGEN_1_1.yaml
index 77e61062328056..505d8e1b4bd15f 100644
--- a/src/app/tests/suites/certification/Test_TC_CGEN_1_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CGEN_1_1.yaml
@@ -14,6 +14,9 @@
 
 name: 90.1. [TC-CGEN-1.1] Global Attributes [DUT-Server]
 
+PICS:
+    - CGEN.S
+
 config:
     nodeId: 0x12344321
     cluster: "General Commissioning"
diff --git a/src/app/tests/suites/certification/Test_TC_CGEN_2_1.yaml b/src/app/tests/suites/certification/Test_TC_CGEN_2_1.yaml
index c31563daf2a7ff..f023a64101d8f4 100644
--- a/src/app/tests/suites/certification/Test_TC_CGEN_2_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CGEN_2_1.yaml
@@ -17,6 +17,9 @@ name:
     LocationCapability and SupportsConcurrentConnection attributes [DUT -
     Server]
 
+PICS:
+    - CGEN.S
+
 config:
     nodeId: 0x12344321
     cluster: "General Commissioning"
diff --git a/src/app/tests/suites/certification/Test_TC_CGEN_2_2.yaml b/src/app/tests/suites/certification/Test_TC_CGEN_2_2.yaml
index 6c8fef0de126f0..c90332eccaf89a 100644
--- a/src/app/tests/suites/certification/Test_TC_CGEN_2_2.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CGEN_2_2.yaml
@@ -15,6 +15,9 @@
 
 name: 92.2.2. [TC-CGEN-2.2] ArmFailSafe command verification [DUT - Server]
 
+PICS:
+    - CGEN.S
+
 config:
     nodeId: 0x12344321
     cluster: "Basic"
diff --git a/src/app/tests/suites/certification/Test_TC_CGEN_2_4.yaml b/src/app/tests/suites/certification/Test_TC_CGEN_2_4.yaml
index c8686853f664a9..e931db6eddacbe 100644
--- a/src/app/tests/suites/certification/Test_TC_CGEN_2_4.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CGEN_2_4.yaml
@@ -17,6 +17,9 @@ name:
     92.2.3. [TC-CGEN-2.4] Verification For CommissioningError on response
     message [DUT - Server]
 
+PICS:
+    - CGEN.S
+
 config:
     nodeId: 0x12344321
     cluster: "Basic"
diff --git a/src/app/tests/suites/certification/Test_TC_CHANNEL_5_1.yaml b/src/app/tests/suites/certification/Test_TC_CHANNEL_5_1.yaml
index 919caf00e316c3..c8492cb9b3a18a 100644
--- a/src/app/tests/suites/certification/Test_TC_CHANNEL_5_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CHANNEL_5_1.yaml
@@ -14,6 +14,9 @@
 
 name: 19.7.1. [TC-CHANNEL-5.1] List TV Channels Verification
 
+PICS:
+    - CHANNEL.S
+
 config:
     nodeId: 0x12344321
     cluster: "Channel"
diff --git a/src/app/tests/suites/certification/Test_TC_CONTENTLAUNCHER_10_1.yaml b/src/app/tests/suites/certification/Test_TC_CONTENTLAUNCHER_10_1.yaml
index f2a2d722d37d95..66078e63b68c22 100644
--- a/src/app/tests/suites/certification/Test_TC_CONTENTLAUNCHER_10_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CONTENTLAUNCHER_10_1.yaml
@@ -14,6 +14,9 @@
 
 name: 19.12.1. [TC-CONTENTLAUNCHER-10.1] Read Content Launcher Attributes
 
+PICS:
+    - CONTENTLAUNCHER.S
+
 config:
     nodeId: 0x12344321
     cluster: "Content Launcher"
diff --git a/src/app/tests/suites/certification/Test_TC_CONTENTLAUNCHER_1_11.yaml b/src/app/tests/suites/certification/Test_TC_CONTENTLAUNCHER_1_11.yaml
index 6ee6404350dc37..b1d5629027b4d6 100644
--- a/src/app/tests/suites/certification/Test_TC_CONTENTLAUNCHER_1_11.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CONTENTLAUNCHER_1_11.yaml
@@ -16,6 +16,9 @@ name:
     19.1.11. [TC-CONTENTLAUNCHER-1.11] Global attributes - Content Launcher
     Cluster (DUT as Server)
 
+PICS:
+    - CONTENTLAUNCHER.S
+
 config:
     nodeId: 0x12344321
     cluster: "Content Launcher"
diff --git a/src/app/tests/suites/certification/Test_TC_DD_1_10.yaml b/src/app/tests/suites/certification/Test_TC_DD_1_10.yaml
index fadf56f23425c4..e8db3afc37a2e6 100644
--- a/src/app/tests/suites/certification/Test_TC_DD_1_10.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DD_1_10.yaml
@@ -17,6 +17,10 @@ name:
     3.1.10. [TC-DD-1.10] NFC Onboarding Payload Verification [DUT -
     Commissioner]
 
+PICS:
+    - MCORE.ROLE.COMMISSIONER
+    - MCORE.DD.SCAN_NFC
+
 config:
     nodeId: 0x12344321
     cluster: "Basic"
diff --git a/src/app/tests/suites/certification/Test_TC_DD_1_12.yaml b/src/app/tests/suites/certification/Test_TC_DD_1_12.yaml
index 06d0cdeadecf4d..96706bc6eb27a4 100644
--- a/src/app/tests/suites/certification/Test_TC_DD_1_12.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DD_1_12.yaml
@@ -17,6 +17,11 @@ name:
     3.1.12. [TC-DD-1.12] Onboarding Payload Verification - Custom Flow = 0 [DUT
     - Commissionee]
 
+PICS:
+    - MCORE.ROLE.COMMISSIONEE
+    - MCORE.DD.QR
+    - MCORE.DD.STANDARD_COMM_FLOW
+
 config:
     nodeId: 0x12344321
     cluster: "Basic"
diff --git a/src/app/tests/suites/certification/Test_TC_DD_1_13.yaml b/src/app/tests/suites/certification/Test_TC_DD_1_13.yaml
index 072ce2a36d5163..ad93647feb9eb4 100644
--- a/src/app/tests/suites/certification/Test_TC_DD_1_13.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DD_1_13.yaml
@@ -17,6 +17,11 @@ name:
     3.1.13. [TC-DD-1.13] Onboarding Payload Verification - Custom Flow = 1 [DUT
     - Commissionee]
 
+PICS:
+    - MCORE.ROLE.COMMISSIONEE
+    - MCORE.DD.QR
+    - MCORE.DD.USER_INTENT_COMM_FLOW
+
 config:
     nodeId: 0x12344321
     cluster: "Basic"
diff --git a/src/app/tests/suites/certification/Test_TC_DD_1_14.yaml b/src/app/tests/suites/certification/Test_TC_DD_1_14.yaml
index e2e7dbe3e08623..5635299f36e5ac 100644
--- a/src/app/tests/suites/certification/Test_TC_DD_1_14.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DD_1_14.yaml
@@ -17,6 +17,11 @@ name:
     3.1.14. [TC-DD-1.14] Onboarding Payload Verification - Custom Flow = 2 [DUT
     - Commissionee]
 
+PICS:
+    - MCORE.ROLE.COMMISSIONEE
+    - MCORE.DD.QR
+    - MCORE.DD.CUSTOM_COMM_FLOW
+
 config:
     nodeId: 0x12344321
     cluster: "Basic"
diff --git a/src/app/tests/suites/certification/Test_TC_DD_1_15.yaml b/src/app/tests/suites/certification/Test_TC_DD_1_15.yaml
index eea306609892f5..7733f987ba9128 100644
--- a/src/app/tests/suites/certification/Test_TC_DD_1_15.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DD_1_15.yaml
@@ -17,6 +17,9 @@ name:
     3.1.15. [TC-DD-1.15] Onboarding Payload Verification - Unique Discriminator
     and Passcode Values    [DUT - Commissionee]
 
+PICS:
+    - MCORE.ROLE.COMMISSIONEE
+
 config:
     nodeId: 0x12344321
     cluster: "Basic"
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 aed1b7b83d150b..441cf91a49a414 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 @@ name:
     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"
diff --git a/src/app/tests/suites/certification/Test_TC_DD_1_6.yaml b/src/app/tests/suites/certification/Test_TC_DD_1_6.yaml
index 940aa0b30061ec..b1de25771fb85c 100644
--- a/src/app/tests/suites/certification/Test_TC_DD_1_6.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DD_1_6.yaml
@@ -15,6 +15,10 @@
 
 name: 3.1.6. [TC-DD-1.6] QR Code Format and Label [DUT - Commissionee]
 
+PICS:
+    - MCORE.ROLE.COMMISSIONEE
+    - MCORE.DD.QR
+
 config:
     nodeId: 0x12344321
     cluster: "Basic"
diff --git a/src/app/tests/suites/certification/Test_TC_DD_1_7.yaml b/src/app/tests/suites/certification/Test_TC_DD_1_7.yaml
index 5b628f19550f9d..6bfb9187288b34 100644
--- a/src/app/tests/suites/certification/Test_TC_DD_1_7.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DD_1_7.yaml
@@ -15,6 +15,10 @@
 
 name: 3.1.7. [TC-DD-1.7] Setup Code Format and Label [DUT - Commissionee]
 
+PICS:
+    - MCORE.ROLE.COMMISSIONEE
+    - MCORE.DD.MANUAL_PC
+
 config:
     nodeId: 0x12344321
     cluster: "Basic"
diff --git a/src/app/tests/suites/certification/Test_TC_DD_1_8.yaml b/src/app/tests/suites/certification/Test_TC_DD_1_8.yaml
index e6ed7c439793d9..f57fbb50ad0e24 100644
--- a/src/app/tests/suites/certification/Test_TC_DD_1_8.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DD_1_8.yaml
@@ -17,6 +17,10 @@ name:
     3.1.8. [TC-DD-1.8] QR Code Onboarding Payload Verification [DUT -
     Commissioner]
 
+PICS:
+    - MCORE.ROLE.COMMISSIONER
+    - MCORE.DD.QR_COMMISSIONING
+
 config:
     nodeId: 0x12344321
     cluster: "Basic"
diff --git a/src/app/tests/suites/certification/Test_TC_DD_1_9.yaml b/src/app/tests/suites/certification/Test_TC_DD_1_9.yaml
index 1db8b2bb3b4b64..9d32b1c7678dd8 100644
--- a/src/app/tests/suites/certification/Test_TC_DD_1_9.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DD_1_9.yaml
@@ -17,6 +17,10 @@ name:
     3.1.9. [TC-DD-1.9] Manual Pairing Code Payload Verification [DUT -
     Commissioner]
 
+PICS:
+    - MCORE.ROLE.COMMISSIONER
+    - MCORE.DD.MANUAL_PC_COMMISSIONING
+
 config:
     nodeId: 0x12344321
     cluster: "Basic"
diff --git a/src/app/tests/suites/certification/Test_TC_DD_2_1.yaml b/src/app/tests/suites/certification/Test_TC_DD_2_1.yaml
index bdb2cc5e4282e1..6c29605f23bcc5 100644
--- a/src/app/tests/suites/certification/Test_TC_DD_2_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DD_2_1.yaml
@@ -16,6 +16,9 @@
 name:
     3.2.1. [TC-DD-2.1] Announcement by Device Verification [DUT - Commissionee]
 
+PICS:
+    - MCORE.ROLE.COMMISSIONEE
+
 config:
     nodeId: 0x12344321
     cluster: "Basic"
diff --git a/src/app/tests/suites/certification/Test_TC_DD_3_10.yaml b/src/app/tests/suites/certification/Test_TC_DD_3_10.yaml
index a3fe2dcff25f19..ec7d56647bb814 100644
--- a/src/app/tests/suites/certification/Test_TC_DD_3_10.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DD_3_10.yaml
@@ -17,6 +17,10 @@ name:
     3.3.10. [TC-DD-3.10] Commissioning Flow - Custom Flow = 2 [DUT -
     Commissioner]
 
+PICS:
+    - MCORE.ROLE.COMMISSIONER
+    - MCORE.DD.CUSTOM_COMM_FLOW
+
 config:
     nodeId: 0x12344321
     cluster: "Basic"
diff --git a/src/app/tests/suites/certification/Test_TC_DD_3_11.yaml b/src/app/tests/suites/certification/Test_TC_DD_3_11.yaml
index 1ec75886796c60..a2f62b1675d2bf 100644
--- a/src/app/tests/suites/certification/Test_TC_DD_3_11.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DD_3_11.yaml
@@ -17,6 +17,11 @@ name:
     3.3.11. [TC-DD-3.11] Commissioning Flow = 0 (Standard Flow) - QR Code [DUT -
     Commissioner]
 
+PICS:
+    - MCORE.ROLE.COMMISSIONER
+    - MCORE.DD.QR_COMMISSIONING
+    - MCORE.DD.STANDARD_COMM_FLOW
+
 config:
     nodeId: 0x12344321
     cluster: "Basic"
diff --git a/src/app/tests/suites/certification/Test_TC_DD_3_12.yaml b/src/app/tests/suites/certification/Test_TC_DD_3_12.yaml
index 477ac2420b4d82..c4d4b2ed7e5fed 100644
--- a/src/app/tests/suites/certification/Test_TC_DD_3_12.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DD_3_12.yaml
@@ -17,6 +17,11 @@ name:
     3.3.12. [TC-DD-3.12] Commissioning Flow = 1 (User-Intent Flow) - QR Code
     [DUT - Commissioner]
 
+PICS:
+    - MCORE.ROLE.COMMISSIONER
+    - MCORE.DD.QR_COMMISSIONING
+    - MCORE.DD.USER_INTENT_COMM_FLOW
+
 config:
     nodeId: 0x12344321
     cluster: "Basic"
diff --git a/src/app/tests/suites/certification/Test_TC_DD_3_13.yaml b/src/app/tests/suites/certification/Test_TC_DD_3_13.yaml
index bc62ad209eb1b6..ce576dad278dd9 100644
--- a/src/app/tests/suites/certification/Test_TC_DD_3_13.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DD_3_13.yaml
@@ -17,6 +17,11 @@ name:
     3.3.13. [TC-DD-3.13] Commissioning Flow = 2 (Custom Flow) - QR Code [DUT -
     Commissioner]
 
+PICS:
+    - MCORE.ROLE.COMMISSIONER
+    - MCORE.DD.QR_COMMISSIONING
+    - MCORE.DD.CUSTOM_COMM_FLOW
+
 config:
     nodeId: 0x12344321
     cluster: "Basic"
diff --git a/src/app/tests/suites/certification/Test_TC_DD_3_14.yaml b/src/app/tests/suites/certification/Test_TC_DD_3_14.yaml
index e59aa453221dfa..42fa580bc34c8a 100644
--- a/src/app/tests/suites/certification/Test_TC_DD_3_14.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DD_3_14.yaml
@@ -17,6 +17,10 @@ name:
     3.3.14. [TC-DD-3.14] Commissioning Flow - QR Code - Negative Scenario [DUT -
     Commissioner]
 
+PICS:
+    - MCORE.ROLE.COMMISSIONER
+    - MCORE.DD.QR_COMMISSIONING
+
 config:
     nodeId: 0x12344321
     cluster: "Basic"
diff --git a/src/app/tests/suites/certification/Test_TC_DD_3_15.yaml b/src/app/tests/suites/certification/Test_TC_DD_3_15.yaml
index 030d6bafdc0ad0..039487b9d39579 100644
--- a/src/app/tests/suites/certification/Test_TC_DD_3_15.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DD_3_15.yaml
@@ -17,6 +17,10 @@ name:
     3.3.15. [TC-DD-3.15] Commissioning Flow - Manual Pairing Code [DUT -
     Commissioner]
 
+PICS:
+    - MCORE.ROLE.COMMISSIONER
+    - MCORE.DD.MANUAL_PC_COMMISSIONING
+
 config:
     nodeId: 0x12344321
     cluster: "Basic"
diff --git a/src/app/tests/suites/certification/Test_TC_DD_3_18.yaml b/src/app/tests/suites/certification/Test_TC_DD_3_18.yaml
index d718a64903dd74..aeee0bd664f89b 100644
--- a/src/app/tests/suites/certification/Test_TC_DD_3_18.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DD_3_18.yaml
@@ -17,6 +17,10 @@ name:
     3.3.18. [TC-DD-3.18] Commissioning Flow - Commissioning Multiple Devices
     [DUT - Commissioner]
 
+PICS:
+    - MCORE.ROLE.COMMISSIONER
+    - MCORE.DD.QR_COMMISSIONING
+
 config:
     nodeId: 0x12344321
     cluster: "Basic"
diff --git a/src/app/tests/suites/certification/Test_TC_DD_3_19.yaml b/src/app/tests/suites/certification/Test_TC_DD_3_19.yaml
index f93241d27e8f38..4920069bae4662 100644
--- a/src/app/tests/suites/certification/Test_TC_DD_3_19.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DD_3_19.yaml
@@ -17,6 +17,10 @@ name:
     3.3.19. [TC-DD-3.19] Commissioning Flow - Commission, Unpair and
     Re-commission Device [DUT - Commissionee]
 
+PICS:
+    - MCORE.ROLE.COMMISSIONEE
+    - MCORE.DD.QR
+
 config:
     nodeId: 0x12344321
     cluster: "Basic"
diff --git a/src/app/tests/suites/certification/Test_TC_DD_3_20.yaml b/src/app/tests/suites/certification/Test_TC_DD_3_20.yaml
index 45e7d0b4f927e9..e1b52070927b42 100644
--- a/src/app/tests/suites/certification/Test_TC_DD_3_20.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DD_3_20.yaml
@@ -17,6 +17,10 @@ name:
     3.3.20. [TC-DD-3.20] Commissioning Flow - Commission, Unpair and
     Re-commission Device [DUT - Commissioner]
 
+PICS:
+    - MCORE.ROLE.COMMISSIONER
+    - MCORE.DD.QR_COMMISSIONING
+
 config:
     nodeId: 0x12344321
     cluster: "Basic"
diff --git a/src/app/tests/suites/certification/Test_TC_DD_3_21.yaml b/src/app/tests/suites/certification/Test_TC_DD_3_21.yaml
index 5926d6b184b9fc..ad4ea586253bbf 100644
--- a/src/app/tests/suites/certification/Test_TC_DD_3_21.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DD_3_21.yaml
@@ -17,6 +17,10 @@ name:
     3.3.21. [TC-DD-3.21] Commissioning Flow - Commission Multiple-Endpoint
     Device [DUT - Commissioner]
 
+PICS:
+    - MCORE.ROLE.COMMISSIONER
+    - MCORE.DD.QR_COMMISSIONING
+
 config:
     nodeId: 0x12344321
     cluster: "Basic"
diff --git a/src/app/tests/suites/certification/Test_TC_DD_3_3.yaml b/src/app/tests/suites/certification/Test_TC_DD_3_3.yaml
index 16bf529e8d4e43..cb0031d272db29 100644
--- a/src/app/tests/suites/certification/Test_TC_DD_3_3.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DD_3_3.yaml
@@ -15,6 +15,11 @@
 
 name: 3.3.3. [TC-DD-3.3] User Directed Commissioning [DUT - Commissionee]
 
+PICS:
+    - MCORE.ROLE.COMMISSIONEE
+    - MCORE.DD.UI
+    - MCORE.DD.COMM_DISCOVERY
+
 config:
     nodeId: 0x12344321
     cluster: "Basic"
diff --git a/src/app/tests/suites/certification/Test_TC_DD_3_4.yaml b/src/app/tests/suites/certification/Test_TC_DD_3_4.yaml
index 46b47132c2d6f1..202705aee928d1 100644
--- a/src/app/tests/suites/certification/Test_TC_DD_3_4.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DD_3_4.yaml
@@ -15,6 +15,11 @@
 
 name: 3.3.4. [TC-DD-3.4] User Directed Commissioning [DUT - Commissioner]
 
+PICS:
+    - MCORE.ROLE.COMMISSIONER
+    - MCORE.DD.UI
+    - MCORE.DD.COMM_DISCOVERY
+
 config:
     nodeId: 0x12344321
     cluster: "Basic"
diff --git a/src/app/tests/suites/certification/Test_TC_DD_3_9.yaml b/src/app/tests/suites/certification/Test_TC_DD_3_9.yaml
index f4f0184bffffaf..98ceb571b3902a 100644
--- a/src/app/tests/suites/certification/Test_TC_DD_3_9.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DD_3_9.yaml
@@ -16,6 +16,10 @@
 name:
     3.3.9. [TC-DD-3.9] Commissioning Flow - Custom Flow = 2 [DUT - Commissionee]
 
+PICS:
+    - MCORE.ROLE.COMMISSIONEE
+    - MCORE.DD.CUSTOM_COMM_FLOW
+
 config:
     nodeId: 0x12344321
     cluster: "Basic"
diff --git a/src/app/tests/suites/certification/Test_TC_DESC_1_1.yaml b/src/app/tests/suites/certification/Test_TC_DESC_1_1.yaml
index 1b76ec8d242429..19e8a17276a515 100644
--- a/src/app/tests/suites/certification/Test_TC_DESC_1_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DESC_1_1.yaml
@@ -15,6 +15,9 @@
 
 name: 84.1.1. [TC-DESC-1.1] Descriptor Cluster Attributes with DUT as Server
 
+PICS:
+    - DESC.S
+
 config:
     nodeId: 0x12344321
     cluster: "Descriptor"
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 7c53a5056de5f0..b7975a19a1fa9d 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
@@ -15,6 +15,9 @@
 
 name: 84.2.1. [TC-DESC-2.1] Descriptor Cluster Attributes [DUT-Server]
 
+PICS:
+    - DESC.S
+
 config:
     nodeId: 0x12344321
     cluster: "Basic"
diff --git a/src/app/tests/suites/certification/Test_TC_DESC_2_2.yaml b/src/app/tests/suites/certification/Test_TC_DESC_2_2.yaml
index d8ac172d6fde78..01e05b3c0522b6 100644
--- a/src/app/tests/suites/certification/Test_TC_DESC_2_2.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DESC_2_2.yaml
@@ -15,6 +15,9 @@
 
 name: 84.2.2. [TC-DESC-2.2] Descriptor Cluster Attributes [DUT-Client]
 
+PICS:
+    - DESC.C
+
 config:
     nodeId: 0x12344321
     cluster: "Basic"
diff --git a/src/app/tests/suites/certification/Test_TC_DGETH_1_1.yaml b/src/app/tests/suites/certification/Test_TC_DGETH_1_1.yaml
index c73714103224e8..673f4f9ade8fb9 100644
--- a/src/app/tests/suites/certification/Test_TC_DGETH_1_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DGETH_1_1.yaml
@@ -15,6 +15,9 @@
 
 name: 3.1.1. [TC-DGETH-1.1] Global Attributes [{DUT_Server}]
 
+PICS:
+    - DGETH.S
+
 config:
     nodeId: 0x12344321
     cluster: "Basic"
diff --git a/src/app/tests/suites/certification/Test_TC_DGETH_2_1.yaml b/src/app/tests/suites/certification/Test_TC_DGETH_2_1.yaml
index 8b6243027a7699..e452da39418fc0 100644
--- a/src/app/tests/suites/certification/Test_TC_DGETH_2_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DGETH_2_1.yaml
@@ -14,6 +14,10 @@
 
 name: 45.2.1. [TC-DGETH-2.1] Attributes with server as DUT
 
+PICS:
+    - DGETH.S
+    - DGETH.S.A
+
 config:
     nodeId: 0x12344321
     cluster: "Ethernet Network Diagnostics"
diff --git a/src/app/tests/suites/certification/Test_TC_DGETH_2_2.yaml b/src/app/tests/suites/certification/Test_TC_DGETH_2_2.yaml
index 94dcdb1ed6e524..3af50bea415689 100644
--- a/src/app/tests/suites/certification/Test_TC_DGETH_2_2.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DGETH_2_2.yaml
@@ -14,6 +14,10 @@
 
 name: 45.2.2. [TC-DGETH-2.2] Command received functionality with server as DUT
 
+PICS:
+    - DGETH.S
+    - DGETH.S.C
+
 config:
     nodeId: 0x12344321
     cluster: "Ethernet Network Diagnostics"
diff --git a/src/app/tests/suites/certification/Test_TC_DGETH_3_1.yaml b/src/app/tests/suites/certification/Test_TC_DGETH_3_1.yaml
index cfcb0fe174388a..115201c652b066 100644
--- a/src/app/tests/suites/certification/Test_TC_DGETH_3_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DGETH_3_1.yaml
@@ -15,6 +15,9 @@
 
 name: 3.3.1. [TC-DGETH-3.1] Attributes [{DUT_Client}]
 
+PICS:
+    - DGETH.C
+
 config:
     nodeId: 0x12344321
     cluster: "Basic"
diff --git a/src/app/tests/suites/certification/Test_TC_DGGEN_1_1.yaml b/src/app/tests/suites/certification/Test_TC_DGGEN_1_1.yaml
index 290189a2deb587..07935286e44e26 100644
--- a/src/app/tests/suites/certification/Test_TC_DGGEN_1_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DGGEN_1_1.yaml
@@ -15,6 +15,9 @@
 
 name: 85.1.1. [TC-DGGEN-1.1] Global attributes with server as DUT
 
+PICS:
+    - DGGEN.S
+
 config:
     nodeId: 0x12344321
     cluster: "General Diagnostics"
diff --git a/src/app/tests/suites/certification/Test_TC_DGGEN_2_1.yaml b/src/app/tests/suites/certification/Test_TC_DGGEN_2_1.yaml
index 478959957c5b08..671b6cb71c911e 100644
--- a/src/app/tests/suites/certification/Test_TC_DGGEN_2_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DGGEN_2_1.yaml
@@ -15,6 +15,10 @@
 
 name: 85.2.1. [TC-DGGEN-2.1] Attributes with server as DUT
 
+PICS:
+    - DGGEN.S
+    - DGGEN.S.A
+
 config:
     nodeId: 0x12344321
     cluster: "General Diagnostics"
diff --git a/src/app/tests/suites/certification/Test_TC_DGGEN_2_2.yaml b/src/app/tests/suites/certification/Test_TC_DGGEN_2_2.yaml
index 0699fe4f5249d7..d0f6d2164c0d29 100644
--- a/src/app/tests/suites/certification/Test_TC_DGGEN_2_2.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DGGEN_2_2.yaml
@@ -15,6 +15,10 @@
 
 name: 3.2.2. [TC-DGGEN-2.2] Event functionality test with server as DUT
 
+PICS:
+    - DGGEN.S
+    - DGGEN.S.E
+
 config:
     nodeId: 0x12344321
     cluster: "Basic"
diff --git a/src/app/tests/suites/certification/Test_TC_DGGEN_2_3.yaml b/src/app/tests/suites/certification/Test_TC_DGGEN_2_3.yaml
index a62c3a0a2cb358..0e067df6b7cf4a 100644
--- a/src/app/tests/suites/certification/Test_TC_DGGEN_2_3.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DGGEN_2_3.yaml
@@ -15,6 +15,10 @@
 
 name: 3.2.3. [TC-DGGEN-2.3] Command received at server as DUT
 
+PICS:
+    - DGGEN.S
+    - DGGEN.S.C
+
 config:
     nodeId: 0x12344321
     cluster: "Basic"
diff --git a/src/app/tests/suites/certification/Test_TC_DGGEN_3_1.yaml b/src/app/tests/suites/certification/Test_TC_DGGEN_3_1.yaml
index 009292dfe05527..6a0b3e89ab99e6 100644
--- a/src/app/tests/suites/certification/Test_TC_DGGEN_3_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DGGEN_3_1.yaml
@@ -15,6 +15,9 @@
 
 name: 3.3.1. [TC-DGGEN-3.1] Attributes observed at client side as DUT
 
+PICS:
+    - DGGEN.C
+
 config:
     nodeId: 0x12344321
     cluster: "Basic"
diff --git a/src/app/tests/suites/certification/Test_TC_DGGEN_3_2.yaml b/src/app/tests/suites/certification/Test_TC_DGGEN_3_2.yaml
deleted file mode 100644
index a7543576171c0d..00000000000000
--- a/src/app/tests/suites/certification/Test_TC_DGGEN_3_2.yaml
+++ /dev/null
@@ -1,51 +0,0 @@
-# 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.2. [TC-DGGEN-3.2] Command generated at client as DUT
-
-config:
-    nodeId: 0x12344321
-    cluster: "Basic"
-    endpoint: 0
-
-tests:
-    - label: "Commission TH to DUT"
-      verification: |
-          verification step to be updated.
-      disabled: true
-
-    - label:
-          "Provision DUT with EnableKey with 128 bit value provided and matched
-          a value chosen by the manufacturer and configured on the TH using
-          manufacturer-specific means. EventTrigger value is configured and
-          SHALL indicate the test or test mode which DUT wants to trigger the
-          testing use by manufacturers."
-      PICS: DGGEN.C.C00.Tx
-      verification: |
-          1. Read if TestEventTriggersEnabled attribute is set to true using ./chip-tool generaldiagnostics read test-event-triggers-enabled  1 0
-
-          Spec Issue:-5265
-           ./chip-tool generaldiagnostics read   test-event-triggers-enabled  1 0
-
-          Verify in DUT as client side:
-
-          [1655188892.957794][2868:2873] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0033 Attribute 0x0000_0008 DataVersion: 3562689442
-          [1655188892.957869][2868:2873] CHIP:TOO:   TestEventTriggersEnabled: FALSE
-          [1655188892.957999][2868:2873] CHIP:EM: Sending Standalone Ack for MessageCounter:133140817 on exchange 23176i
-
-          2. when this attribute is false, do not need to verify rest of the below commands.
-          3. When this attribute is true, the Node has been configured with one or more test event triggers by virtue of the internally programmed EnableKey value by the product vendor
-          4. Use the manufacturer-provided EnableKey value and the EventTrigger value and send command using "./chip-tool generaldiagnostics test-event-trigger <EnableKey> <EventTrigger destination-id> " 1 0 and verify if the DUT generated the desired event.
-      disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_DGSW_1_1.yaml b/src/app/tests/suites/certification/Test_TC_DGSW_1_1.yaml
index 01ed4576cc767b..5c3ebef5d6dc0d 100644
--- a/src/app/tests/suites/certification/Test_TC_DGSW_1_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DGSW_1_1.yaml
@@ -15,6 +15,9 @@
 
 name: 3.1.1. [TC-DGSW-1.1] Global Attributes [{DUT_Sever}]
 
+PICS:
+    - DGSW.S
+
 config:
     nodeId: 0x12344321
     cluster: "Basic"
diff --git a/src/app/tests/suites/certification/Test_TC_DGSW_2_1.yaml b/src/app/tests/suites/certification/Test_TC_DGSW_2_1.yaml
index 6b68769f96fb79..19aedf7c6a95c8 100644
--- a/src/app/tests/suites/certification/Test_TC_DGSW_2_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DGSW_2_1.yaml
@@ -14,6 +14,10 @@
 
 name: 43.2.1. [TC-DGSW-2.1] Attributes with server as DUT
 
+PICS:
+    - DGSW.S.A
+    - DGSW.S
+
 config:
     nodeId: 0x12344321
     cluster: "Software Diagnostics"
diff --git a/src/app/tests/suites/certification/Test_TC_DGSW_2_2.yaml b/src/app/tests/suites/certification/Test_TC_DGSW_2_2.yaml
index 8d4778dbc2192b..69103872c6d0b7 100644
--- a/src/app/tests/suites/certification/Test_TC_DGSW_2_2.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DGSW_2_2.yaml
@@ -15,6 +15,10 @@
 
 name: 43.2.2. [TC-DGSW-2.2] Event functionality with server as DUT
 
+PICS:
+    - DGSW.S.E
+    - DGSW.S
+
 config:
     nodeId: 0x12344321
     cluster: "Software Diagnostics"
diff --git a/src/app/tests/suites/certification/Test_TC_DGSW_2_3.yaml b/src/app/tests/suites/certification/Test_TC_DGSW_2_3.yaml
index 0c6fb332e0f795..406d02672771c3 100644
--- a/src/app/tests/suites/certification/Test_TC_DGSW_2_3.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DGSW_2_3.yaml
@@ -14,6 +14,10 @@
 
 name: 43.2.3. [TC-DGSW-2.3] Command received functionality with server as DUT
 
+PICS:
+    - DGSW.S.C
+    - DGSW.S
+
 config:
     nodeId: 0x12344321
     cluster: "Software Diagnostics"
diff --git a/src/app/tests/suites/certification/Test_TC_DGSW_3_1.yaml b/src/app/tests/suites/certification/Test_TC_DGSW_3_1.yaml
index 55057b7b025b3f..d2a3e8b6dc798a 100644
--- a/src/app/tests/suites/certification/Test_TC_DGSW_3_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DGSW_3_1.yaml
@@ -15,6 +15,9 @@
 
 name: 3.3.1. [TC-DGSW-3.1] Attributes [{DUT_Client}]
 
+PICS:
+    - DGSW.C
+
 config:
     nodeId: 0x12344321
     cluster: "Basic"
diff --git a/src/app/tests/suites/certification/Test_TC_DGSW_3_2.yaml b/src/app/tests/suites/certification/Test_TC_DGSW_3_2.yaml
index fb219f35eca07e..569b7539191f8a 100644
--- a/src/app/tests/suites/certification/Test_TC_DGSW_3_2.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DGSW_3_2.yaml
@@ -15,6 +15,9 @@
 
 name: 3.3.2. [TC-DGSW-3.2] Commands Generated [{DUT_Client}]
 
+PICS:
+    - DGSW.C
+
 config:
     nodeId: 0x12344321
     cluster: "Basic"
diff --git a/src/app/tests/suites/certification/Test_TC_DGTHREAD_2_1.yaml b/src/app/tests/suites/certification/Test_TC_DGTHREAD_2_1.yaml
index cf675507724109..cf0c49df6441b9 100644
--- a/src/app/tests/suites/certification/Test_TC_DGTHREAD_2_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DGTHREAD_2_1.yaml
@@ -14,6 +14,9 @@
 
 name: 50.2.1. [TC-DGTHREAD-2.1] Attributes [DUT- Server]
 
+PICS:
+    - DGTHREAD.S
+
 config:
     nodeId: 0x12344321
     cluster: "Thread Network Diagnostics"
diff --git a/src/app/tests/suites/certification/Test_TC_DGTHREAD_2_2.yaml b/src/app/tests/suites/certification/Test_TC_DGTHREAD_2_2.yaml
index b2271fe4109bda..22017c2135d29f 100644
--- a/src/app/tests/suites/certification/Test_TC_DGTHREAD_2_2.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DGTHREAD_2_2.yaml
@@ -14,6 +14,9 @@
 
 name: 50.2.2. [TC-DGTHREAD-2.2] Attributes-Tx [DUT- Server]
 
+PICS:
+    - DGTHREAD.S
+
 config:
     nodeId: 0x12344321
     cluster: "Thread Network Diagnostics"
diff --git a/src/app/tests/suites/certification/Test_TC_DGTHREAD_2_3.yaml b/src/app/tests/suites/certification/Test_TC_DGTHREAD_2_3.yaml
index b0d995e9aee70b..4611a6be68be62 100644
--- a/src/app/tests/suites/certification/Test_TC_DGTHREAD_2_3.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DGTHREAD_2_3.yaml
@@ -14,6 +14,9 @@
 
 name: 50.2.3. [TC-DGTHREAD-2.3] Attributes-Rx [DUT- Server]
 
+PICS:
+    - DGTHREAD.S
+
 config:
     nodeId: 0x12344321
     cluster: "Thread Network Diagnostics"
diff --git a/src/app/tests/suites/certification/Test_TC_DGTHREAD_2_4.yaml b/src/app/tests/suites/certification/Test_TC_DGTHREAD_2_4.yaml
index c1ce6317583e6e..dd540c44d8a962 100644
--- a/src/app/tests/suites/certification/Test_TC_DGTHREAD_2_4.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DGTHREAD_2_4.yaml
@@ -14,6 +14,9 @@
 
 name: 50.2.4. [TC-DGTHREAD-2.4] ResetCounts Command[DUT- Server]
 
+PICS:
+    - DGTHREAD.S
+
 config:
     nodeId: 0x12344321
     cluster: "Thread Network Diagnostics"
diff --git a/src/app/tests/suites/certification/Test_TC_DGTHREAD_2_5.yaml b/src/app/tests/suites/certification/Test_TC_DGTHREAD_2_5.yaml
index 24db14e56b025f..e9c0a2e0079779 100644
--- a/src/app/tests/suites/certification/Test_TC_DGTHREAD_2_5.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DGTHREAD_2_5.yaml
@@ -17,6 +17,9 @@ name:
     50.2.5. [TC-DGTHREAD-2.5] Thread Network Diagnostics Cluster
     Events[DUT-Server]
 
+PICS:
+    - DGTHREAD.S
+
 config:
     nodeId: 0x12344321
     cluster: "Basic"
diff --git a/src/app/tests/suites/certification/Test_TC_DGTHREAD_3_1.yaml b/src/app/tests/suites/certification/Test_TC_DGTHREAD_3_1.yaml
index f2c66acb610862..ae4a342fe12510 100644
--- a/src/app/tests/suites/certification/Test_TC_DGTHREAD_3_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DGTHREAD_3_1.yaml
@@ -15,6 +15,9 @@
 
 name: 50.3.1. [TC-DGTHREAD-3.1] Attributes [DUT- Client]
 
+PICS:
+    - DGTHREAD.C
+
 config:
     nodeId: 0x12344321
     cluster: "Basic"
diff --git a/src/app/tests/suites/certification/Test_TC_DGTHREAD_3_2.yaml b/src/app/tests/suites/certification/Test_TC_DGTHREAD_3_2.yaml
index af0ca0fda67873..28927021cd2af8 100644
--- a/src/app/tests/suites/certification/Test_TC_DGTHREAD_3_2.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DGTHREAD_3_2.yaml
@@ -15,6 +15,9 @@
 
 name: 50.3.2. [TC-DGTHREAD-3.2] Attributes-Tx [DUT- Client]
 
+PICS:
+    - DGTHREAD.C
+
 config:
     nodeId: 0x12344321
     cluster: "Basic"
diff --git a/src/app/tests/suites/certification/Test_TC_DGTHREAD_3_3.yaml b/src/app/tests/suites/certification/Test_TC_DGTHREAD_3_3.yaml
index f8583bf15088b5..ff9d3b9afde010 100644
--- a/src/app/tests/suites/certification/Test_TC_DGTHREAD_3_3.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DGTHREAD_3_3.yaml
@@ -15,6 +15,9 @@
 
 name: 50.3.3. [TC-DGTHREAD-3.3] Attributes-Rx [DUT- Client]
 
+PICS:
+    - DGTHREAD.C
+
 config:
     nodeId: 0x12344321
     cluster: "Basic"
diff --git a/src/app/tests/suites/certification/Test_TC_DGTHREAD_3_4.yaml b/src/app/tests/suites/certification/Test_TC_DGTHREAD_3_4.yaml
index a3c9db262f9692..3c335c6f790abd 100644
--- a/src/app/tests/suites/certification/Test_TC_DGTHREAD_3_4.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DGTHREAD_3_4.yaml
@@ -15,6 +15,9 @@
 
 name: 50.3.4. [TC-DGTHREAD-3.4] ResetCounts Command[DUT-Client]
 
+PICS:
+    - DGTHREAD.C
+
 config:
     nodeId: 0x12344321
     cluster: "Basic"
diff --git a/src/app/tests/suites/certification/Test_TC_DGTHREAD_3_5.yaml b/src/app/tests/suites/certification/Test_TC_DGTHREAD_3_5.yaml
index 417c6b538c7026..db0eed1c4b50cb 100644
--- a/src/app/tests/suites/certification/Test_TC_DGTHREAD_3_5.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DGTHREAD_3_5.yaml
@@ -17,6 +17,9 @@ name:
     50.3.5. [TC-DGTHREAD-3.5] Thread Network Diagnostics Cluster Events [DUT as
     Client]
 
+PICS:
+    - DGTHREAD.C
+
 config:
     nodeId: 0x12344321
     cluster: "Basic"
diff --git a/src/app/tests/suites/certification/Test_TC_DGWIFI_1_1.yaml b/src/app/tests/suites/certification/Test_TC_DGWIFI_1_1.yaml
index 1d592107b8b3d7..72213b03180dd5 100644
--- a/src/app/tests/suites/certification/Test_TC_DGWIFI_1_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DGWIFI_1_1.yaml
@@ -15,6 +15,9 @@
 
 name: 3.1.1. [TC-DGWIFI-1.1] Global Attributes [DUT as Server]
 
+PICS:
+    - DGWIFI.S
+
 config:
     nodeId: 0x12344321
     cluster: "Basic"
diff --git a/src/app/tests/suites/certification/Test_TC_DGWIFI_2_1.yaml b/src/app/tests/suites/certification/Test_TC_DGWIFI_2_1.yaml
index f6a0ab3ad1b014..0267aa4127613f 100644
--- a/src/app/tests/suites/certification/Test_TC_DGWIFI_2_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DGWIFI_2_1.yaml
@@ -14,6 +14,10 @@
 
 name: 51.2.1. [TC-DGWIFI-2.1] Attributes with server as DUT
 
+PICS:
+    - DGWIFI.S.A
+    - DGWIFI.S
+
 config:
     nodeId: 0x12344321
     cluster: "WiFi Network Diagnostics"
diff --git a/src/app/tests/suites/certification/Test_TC_DGWIFI_2_2.yaml b/src/app/tests/suites/certification/Test_TC_DGWIFI_2_2.yaml
index 4a76bbe53a04fe..1be2db3341e8c2 100644
--- a/src/app/tests/suites/certification/Test_TC_DGWIFI_2_2.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DGWIFI_2_2.yaml
@@ -15,6 +15,9 @@
 
 name: 3.2.2. [TC-DGWIFI-2.2] Event Functionality [DUT as Server]
 
+PICS:
+    - DGWIFI.S
+
 config:
     nodeId: 0x12344321
     cluster: "Basic"
diff --git a/src/app/tests/suites/certification/Test_TC_DGWIFI_2_3.yaml b/src/app/tests/suites/certification/Test_TC_DGWIFI_2_3.yaml
index 71dc3d4f640376..9ed9faf04a1ecf 100644
--- a/src/app/tests/suites/certification/Test_TC_DGWIFI_2_3.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DGWIFI_2_3.yaml
@@ -14,6 +14,9 @@
 
 name: 51.2.3. [TC-DGWIFI-2.3] Command received functionality with server as DUT
 
+PICS:
+    - DGWIFI.S
+
 config:
     nodeId: 0x12344321
     cluster: "WiFi Network Diagnostics"
diff --git a/src/app/tests/suites/certification/Test_TC_DGWIFI_3_1.yaml b/src/app/tests/suites/certification/Test_TC_DGWIFI_3_1.yaml
index 50240d69dde7ec..c7d9cb2d3ca180 100644
--- a/src/app/tests/suites/certification/Test_TC_DGWIFI_3_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DGWIFI_3_1.yaml
@@ -15,6 +15,10 @@
 
 name: 3.3.1. [TC-DGWIFI-3.1]Attributes [DUT as Client]
 
+PICS:
+    - DGWIFI.C.A
+    - DGWIFI.C
+
 config:
     nodeId: 0x12344321
     cluster: "Basic"
diff --git a/src/app/tests/suites/certification/Test_TC_DGWIFI_3_2.yaml b/src/app/tests/suites/certification/Test_TC_DGWIFI_3_2.yaml
index cf61a14b3c8ed5..a5616758ddeda4 100644
--- a/src/app/tests/suites/certification/Test_TC_DGWIFI_3_2.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DGWIFI_3_2.yaml
@@ -15,6 +15,9 @@
 
 name: 3.2.2. [TC-DGWIFI-3.2]Command Generated [DUT as Client]
 
+PICS:
+    - DGWIFI.C
+
 config:
     nodeId: 0x12344321
     cluster: "Basic"
diff --git a/src/app/tests/suites/certification/Test_TC_DLOG_1_1.yaml b/src/app/tests/suites/certification/Test_TC_DLOG_1_1.yaml
index 0a8540ac296e40..3b8eb6eb42cf96 100644
--- a/src/app/tests/suites/certification/Test_TC_DLOG_1_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DLOG_1_1.yaml
@@ -15,6 +15,9 @@
 
 name: 56.1.1. [TC-DLOG-1.1] Global Attributes [DUT-Server]
 
+PICS:
+    - DLOG.S
+
 config:
     nodeId: 0x12344321
     cluster: "Basic"
diff --git a/src/app/tests/suites/certification/Test_TC_DLOG_2_1.yaml b/src/app/tests/suites/certification/Test_TC_DLOG_2_1.yaml
index ba2bddfcca7d9c..036ecfb06571a2 100644
--- a/src/app/tests/suites/certification/Test_TC_DLOG_2_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DLOG_2_1.yaml
@@ -17,6 +17,9 @@ name:
     55.2.1. [TC-DLOG-2.1] Diagnostic Logs Cluster Commands Checks with BDX
     [DUT-Server]
 
+PICS:
+    - DLOG.S
+
 config:
     nodeId: 0x12344321
     cluster: "Basic"
diff --git a/src/app/tests/suites/certification/Test_TC_DLOG_2_2.yaml b/src/app/tests/suites/certification/Test_TC_DLOG_2_2.yaml
index 6fd03bb8ce9b37..f96ff70989fdcc 100644
--- a/src/app/tests/suites/certification/Test_TC_DLOG_2_2.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DLOG_2_2.yaml
@@ -17,6 +17,9 @@ name:
     55.2.2. [TC-DLOG-2.2] Diagnostic Logs Cluster Commands Checks without BDX
     [DUT-Server]
 
+PICS:
+    - DLOG.S
+
 config:
     nodeId: 0x12344321
     cluster: "Basic"
diff --git a/src/app/tests/suites/certification/Test_TC_DLOG_3_1.yaml b/src/app/tests/suites/certification/Test_TC_DLOG_3_1.yaml
index 7d7912fa495181..3cec819ee8b8b5 100644
--- a/src/app/tests/suites/certification/Test_TC_DLOG_3_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DLOG_3_1.yaml
@@ -15,6 +15,9 @@
 
 name: 55.3.1. [TC-DLOG-3.1] Diagnostic Logs Cluster Commands Checks[DUT-Client]
 
+PICS:
+    - DLOG.C
+
 config:
     nodeId: 0x12344321
     cluster: "Basic"
diff --git a/src/app/tests/suites/certification/Test_TC_DRLK_2_4.yaml b/src/app/tests/suites/certification/Test_TC_DRLK_2_4.yaml
index ca9a5d0e6df86e..53b838da398f21 100644
--- a/src/app/tests/suites/certification/Test_TC_DRLK_2_4.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DRLK_2_4.yaml
@@ -16,6 +16,9 @@ name:
     111.2.4. [TC-DRLK-2.4] Verification for Unlock with Timeout command
     [DUT-Server]
 
+PICS:
+    - DRLK.S
+
 config:
     nodeId: 0x12344321
     cluster: "Door Lock"
diff --git a/src/app/tests/suites/certification/Test_TC_DRLK_2_5.yaml b/src/app/tests/suites/certification/Test_TC_DRLK_2_5.yaml
index 9a6d1b97abbdaa..7f95560794e78f 100644
--- a/src/app/tests/suites/certification/Test_TC_DRLK_2_5.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DRLK_2_5.yaml
@@ -17,6 +17,9 @@ name:
     Day Schedule, Get Week Day Schedule , Get Week Day Schedule Response, Clear
     Week Day Schedule [DUT-Server]
 
+PICS:
+    - DRLK.S
+
 config:
     nodeId: 0x12344321
     cluster: "Door Lock"
diff --git a/src/app/tests/suites/certification/Test_TC_DRLK_2_7.yaml b/src/app/tests/suites/certification/Test_TC_DRLK_2_7.yaml
index 408fc6a9f4c8a8..1a2cec9ba0f499 100644
--- a/src/app/tests/suites/certification/Test_TC_DRLK_2_7.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DRLK_2_7.yaml
@@ -17,6 +17,9 @@ name:
     Schedule, Get Year Schedule, Get Year Day Schedule Response and Clear Year
     Day Schedule[DUT-Server]
 
+PICS:
+    - DRLK.S
+
 config:
     nodeId: 0x12344321
     cluster: "Door Lock"
diff --git a/src/app/tests/suites/certification/Test_TC_DRLK_2_9.yaml b/src/app/tests/suites/certification/Test_TC_DRLK_2_9.yaml
index 8a67ee02dc01c9..3a6e494e6570ab 100644
--- a/src/app/tests/suites/certification/Test_TC_DRLK_2_9.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DRLK_2_9.yaml
@@ -17,6 +17,9 @@ name:
     Credential , Set Credential Response, Get Credential Status, Get Credential
     Status Response, Clear Credential [DUT-Server]
 
+PICS:
+    - DRLK.S
+
 config:
     nodeId: 0x12344321
     cluster: "Door Lock"
diff --git a/src/app/tests/suites/certification/Test_TC_FLABEL_1_1.yaml b/src/app/tests/suites/certification/Test_TC_FLABEL_1_1.yaml
index a1b2db18db2d90..7c3e8232dc8f96 100644
--- a/src/app/tests/suites/certification/Test_TC_FLABEL_1_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_FLABEL_1_1.yaml
@@ -15,6 +15,9 @@
 
 name: 98.1.1. [TC-FLABEL-1.1] Global Attributes [DUT-server]
 
+PICS:
+    - FLABEL.S
+
 config:
     nodeId: 0x12344321
     cluster: "Basic"
diff --git a/src/app/tests/suites/certification/Test_TC_FLABEL_2_1.yaml b/src/app/tests/suites/certification/Test_TC_FLABEL_2_1.yaml
index bdabc812b7c784..51265c5753c1c5 100644
--- a/src/app/tests/suites/certification/Test_TC_FLABEL_2_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_FLABEL_2_1.yaml
@@ -15,6 +15,9 @@
 
 name: 3.2.1. [TC-FLABEL-2.1] Fixed Label cluster [DUT-server]
 
+PICS:
+    - FLABEL.S
+
 config:
     nodeId: 0x12344321
     cluster: "Basic"
diff --git a/src/app/tests/suites/certification/Test_TC_FLABEL_3_1.yaml b/src/app/tests/suites/certification/Test_TC_FLABEL_3_1.yaml
index 750dc0580b039c..f48b659ad85474 100644
--- a/src/app/tests/suites/certification/Test_TC_FLABEL_3_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_FLABEL_3_1.yaml
@@ -15,6 +15,9 @@
 
 name: 98.3.1. [TC-FLABEL-3.1] Fixed Label cluster [DUT-client]
 
+PICS:
+    - FLABEL.C
+
 config:
     nodeId: 0x12344321
     cluster: "Basic"
diff --git a/src/app/tests/suites/certification/Test_TC_FLW_1_1.yaml b/src/app/tests/suites/certification/Test_TC_FLW_1_1.yaml
index 3bc234e80b85c3..95511ca338d906 100644
--- a/src/app/tests/suites/certification/Test_TC_FLW_1_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_FLW_1_1.yaml
@@ -14,6 +14,9 @@
 
 name: 33.1.1. [TC-FLW-1.1] Global attributes with server as DUT
 
+PICS:
+    - FLW.S
+
 config:
     nodeId: 0x12344321
     cluster: "Flow Measurement"
diff --git a/src/app/tests/suites/certification/Test_TC_FLW_2_2.yaml b/src/app/tests/suites/certification/Test_TC_FLW_2_2.yaml
index d2ca220cf4519f..ba52e97f4bf649 100644
--- a/src/app/tests/suites/certification/Test_TC_FLW_2_2.yaml
+++ b/src/app/tests/suites/certification/Test_TC_FLW_2_2.yaml
@@ -14,6 +14,9 @@
 
 name: 33.2.2. [TC-FLW-2.2] Primary functionality with server as DUT
 
+PICS:
+    - FLW.S
+
 config:
     nodeId: 0x12344321
     cluster: "Flow Measurement"
diff --git a/src/app/tests/suites/certification/Test_TC_G_1_1.yaml b/src/app/tests/suites/certification/Test_TC_G_1_1.yaml
index 24002a29efa834..163ae6bb67c404 100644
--- a/src/app/tests/suites/certification/Test_TC_G_1_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_G_1_1.yaml
@@ -15,6 +15,9 @@
 
 name: 121.1.1. [TC-G-1.1] Global Attributes [DUT-Server]
 
+PICS:
+    - G.S
+
 config:
     nodeId: 0x12344321
     cluster: "Basic"
diff --git a/src/app/tests/suites/certification/Test_TC_G_3_1.yaml b/src/app/tests/suites/certification/Test_TC_G_3_1.yaml
index 05daab12751170..5476976408f60e 100644
--- a/src/app/tests/suites/certification/Test_TC_G_3_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_G_3_1.yaml
@@ -15,6 +15,9 @@
 
 name: 121.3.1. [TC-G-3.1] Attributes [DUT-Client]
 
+PICS:
+    - G.C
+
 config:
     nodeId: 0x12344321
     cluster: "Basic"
diff --git a/src/app/tests/suites/certification/Test_TC_IDM_1_1.yaml b/src/app/tests/suites/certification/Test_TC_IDM_1_1.yaml
index 8ad6f966270767..9cd88fe7e50e0a 100644
--- a/src/app/tests/suites/certification/Test_TC_IDM_1_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_IDM_1_1.yaml
@@ -15,6 +15,9 @@
 
 name: 3.1.1. [TC-IDM-1.1] Invoke Request Action from DUT to TH - [{DUT_Client}]
 
+PICS:
+    - MCORE.IDM.C.InvokeRequest
+
 config:
     nodeId: 0x12344321
     cluster: "Basic"
diff --git a/src/app/tests/suites/certification/Test_TC_IDM_3_1.yaml b/src/app/tests/suites/certification/Test_TC_IDM_3_1.yaml
index ff0f7947a2e31a..8109e78a529115 100644
--- a/src/app/tests/suites/certification/Test_TC_IDM_3_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_IDM_3_1.yaml
@@ -15,6 +15,9 @@
 
 name: 3.3.1. [TC-IDM-3.1] Write Request Action from DUT to TH. [{DUT_Client}]
 
+PICS:
+    - MCORE.IDM.C.WriteRequest
+
 config:
     nodeId: 0x12344321
     cluster: "Basic"
diff --git a/src/app/tests/suites/certification/Test_TC_IDM_5_2.yaml b/src/app/tests/suites/certification/Test_TC_IDM_5_2.yaml
index f9f13d4e61af05..39a4fdc3847484 100644
--- a/src/app/tests/suites/certification/Test_TC_IDM_5_2.yaml
+++ b/src/app/tests/suites/certification/Test_TC_IDM_5_2.yaml
@@ -17,6 +17,9 @@ name:
     3.5.2. [TC-IDM-5.2] Status Response from DUT in response to a Timed Request
     Action from TH.
 
+PICS:
+    - MCORE.IDM.S
+
 config:
     nodeId: 0x12344321
     cluster: "Basic"
diff --git a/src/app/tests/suites/certification/Test_TC_IDM_6_1.yaml b/src/app/tests/suites/certification/Test_TC_IDM_6_1.yaml
index c5fc410b9ac5e6..a9db7139e1d3f3 100644
--- a/src/app/tests/suites/certification/Test_TC_IDM_6_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_IDM_6_1.yaml
@@ -15,6 +15,9 @@
 
 name: 3.6.1. [TC-IDM-6.1] Events Read Interaction from TH to DUT. [{DUT_Server}]
 
+PICS:
+    - MCORE.IDM.S
+
 config:
     nodeId: 0x12344321
     cluster: "Basic"
diff --git a/src/app/tests/suites/certification/Test_TC_IDM_6_3.yaml b/src/app/tests/suites/certification/Test_TC_IDM_6_3.yaml
index 44bb587c90dc6e..90fdf6018ba70a 100644
--- a/src/app/tests/suites/certification/Test_TC_IDM_6_3.yaml
+++ b/src/app/tests/suites/certification/Test_TC_IDM_6_3.yaml
@@ -15,6 +15,9 @@
 
 name: 3.6.3. [TC-IDM-6.3] Events Read Interaction from DUT to TH. [{DUT_Client}]
 
+PICS:
+    - MCORE.IDM.C.ReadRequest
+
 config:
     nodeId: 0x12344321
     cluster: "Basic"
diff --git a/src/app/tests/suites/certification/Test_TC_IDM_6_4.yaml b/src/app/tests/suites/certification/Test_TC_IDM_6_4.yaml
index b9e12087952bcf..eaaef3213ea954 100644
--- a/src/app/tests/suites/certification/Test_TC_IDM_6_4.yaml
+++ b/src/app/tests/suites/certification/Test_TC_IDM_6_4.yaml
@@ -17,6 +17,9 @@ name:
     3.6.4. [TC-IDM-6.4] Events Subscribe Interaction from DUT to TH.
     [{DUT_Client}]
 
+PICS:
+    - MCORE.IDM.C.SubscribeRequest
+
 config:
     nodeId: 0x12344321
     cluster: "Basic"
diff --git a/src/app/tests/suites/certification/Test_TC_IDM_7_1.yaml b/src/app/tests/suites/certification/Test_TC_IDM_7_1.yaml
index df77dc9aa46c5e..8e41afdb1f6071 100644
--- a/src/app/tests/suites/certification/Test_TC_IDM_7_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_IDM_7_1.yaml
@@ -15,6 +15,9 @@
 
 name: 3.6.5. [TC-IDM-7.1] Multi Fabric Subscription Test Cases. [{DUT_Server}]
 
+PICS:
+    - MCORE.IDM.S
+
 config:
     nodeId: 0x12344321
     cluster: "Basic"
diff --git a/src/app/tests/suites/certification/Test_TC_ILL_1_1.yaml b/src/app/tests/suites/certification/Test_TC_ILL_1_1.yaml
index 66e4cf05eb1f44..a50b3babacbea2 100644
--- a/src/app/tests/suites/certification/Test_TC_ILL_1_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_ILL_1_1.yaml
@@ -14,6 +14,9 @@
 
 name: 71.1.1. [TC-ILL-1.1] Global attributes with server as DUT
 
+PICS:
+    - ILL.S
+
 config:
     nodeId: 0x12344321
     cluster: "Illuminance Measurement"
diff --git a/src/app/tests/suites/certification/Test_TC_ILL_2_1.yaml b/src/app/tests/suites/certification/Test_TC_ILL_2_1.yaml
index c8539cf75acc18..926df2709aa909 100644
--- a/src/app/tests/suites/certification/Test_TC_ILL_2_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_ILL_2_1.yaml
@@ -14,6 +14,9 @@
 
 name: 69.2.1. [TC-ILL-2.1] Attributes with server as DUT
 
+PICS:
+    - ILL.S
+
 config:
     nodeId: 0x12344321
     cluster: "Illuminance Measurement"
diff --git a/src/app/tests/suites/certification/Test_TC_ILL_2_2.yaml b/src/app/tests/suites/certification/Test_TC_ILL_2_2.yaml
index 44311a371a7e0b..03df7f3e1785d1 100644
--- a/src/app/tests/suites/certification/Test_TC_ILL_2_2.yaml
+++ b/src/app/tests/suites/certification/Test_TC_ILL_2_2.yaml
@@ -15,6 +15,9 @@
 
 name: 71.2.2. [TC-ILL-2.2] Primary Functionality with Server as DUT
 
+PICS:
+    - ILL.S
+
 config:
     nodeId: 0x12344321
     cluster: "Basic"
diff --git a/src/app/tests/suites/certification/Test_TC_ILL_3_1.yaml b/src/app/tests/suites/certification/Test_TC_ILL_3_1.yaml
index 9d7345ce44f488..6ce029e9bbb2f6 100644
--- a/src/app/tests/suites/certification/Test_TC_ILL_3_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_ILL_3_1.yaml
@@ -15,6 +15,13 @@
 
 name: 71.3.1. [TC-ILL-3.1] Attributes with Client as DUT
 
+PICS:
+    - ILL.C
+    - ILL.C.AM-READ
+    - ILL.C.AO-READ
+    - ILL.C.AM-WRITE
+    - ILL.C.AO-WRITE
+
 config:
     nodeId: 0x12344321
     cluster: "Basic"
diff --git a/src/app/tests/suites/certification/Test_TC_I_1_1.yaml b/src/app/tests/suites/certification/Test_TC_I_1_1.yaml
index ba3faef871404c..386928bff11d4c 100644
--- a/src/app/tests/suites/certification/Test_TC_I_1_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_I_1_1.yaml
@@ -14,6 +14,9 @@
 
 name: 57.1.1. [TC-I-1.1] Global attributes with server as DUT
 
+PICS:
+    - I.S
+
 config:
     nodeId: 0x12344321
     cluster: "Identify"
diff --git a/src/app/tests/suites/certification/Test_TC_I_2_1.yaml b/src/app/tests/suites/certification/Test_TC_I_2_1.yaml
index 695e0ba4b057cc..db05abf1a10ac1 100644
--- a/src/app/tests/suites/certification/Test_TC_I_2_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_I_2_1.yaml
@@ -14,6 +14,9 @@
 
 name: 57.2.1. [TC-I-2.1] Attributes with server as DUT
 
+PICS:
+    - I.S
+
 config:
     nodeId: 0x12344321
     cluster: "Identify"
diff --git a/src/app/tests/suites/certification/Test_TC_I_2_2.yaml b/src/app/tests/suites/certification/Test_TC_I_2_2.yaml
index 0f9a7c4105b788..e945f23ef3a8bd 100644
--- a/src/app/tests/suites/certification/Test_TC_I_2_2.yaml
+++ b/src/app/tests/suites/certification/Test_TC_I_2_2.yaml
@@ -15,6 +15,9 @@
 
 name: 58.2.2. [TC-I-2.2] Primary functionality with server as DUT
 
+PICS:
+    - I.S
+
 config:
     nodeId: 0x12344321
     cluster: "Identify"
diff --git a/src/app/tests/suites/certification/Test_TC_I_2_3.yaml b/src/app/tests/suites/certification/Test_TC_I_2_3.yaml
index 211a0c25755ac2..7aeba8308553bd 100644
--- a/src/app/tests/suites/certification/Test_TC_I_2_3.yaml
+++ b/src/app/tests/suites/certification/Test_TC_I_2_3.yaml
@@ -14,6 +14,9 @@
 
 name: 57.2.3. [TC-I-2.3] Secondary functionality with server as DUT
 
+PICS:
+    - I.S
+
 config:
     nodeId: 0x12344321
     cluster: "Identify"
diff --git a/src/app/tests/suites/certification/Test_TC_I_3_1.yaml b/src/app/tests/suites/certification/Test_TC_I_3_1.yaml
index f9eaebb4744a10..6dca72c87013c0 100644
--- a/src/app/tests/suites/certification/Test_TC_I_3_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_I_3_1.yaml
@@ -15,6 +15,13 @@
 
 name: 59.3.1. [TC-I-3.1] Attributes with Client as DUT
 
+PICS:
+    - I.C
+    - I.C.AM-READ
+    - I.C.AO-READ
+    - I.C.AM-WRITE
+    - I.C.AO-WRITE
+
 config:
     nodeId: 0x12344321
     cluster: "Basic"
diff --git a/src/app/tests/suites/certification/Test_TC_I_3_2.yaml b/src/app/tests/suites/certification/Test_TC_I_3_2.yaml
index abd1f94b73ae6e..7cf72dd71a319c 100644
--- a/src/app/tests/suites/certification/Test_TC_I_3_2.yaml
+++ b/src/app/tests/suites/certification/Test_TC_I_3_2.yaml
@@ -15,6 +15,9 @@
 
 name: 59.3.2. [TC-I-3.2] Functionality with Client as DUT
 
+PICS:
+    - I.C
+
 config:
     nodeId: 0x12344321
     cluster: "Basic"
diff --git a/src/app/tests/suites/certification/Test_TC_KEYPADINPUT_1_2.yaml b/src/app/tests/suites/certification/Test_TC_KEYPADINPUT_1_2.yaml
index aa7df448634208..bc5228b8da4add 100644
--- a/src/app/tests/suites/certification/Test_TC_KEYPADINPUT_1_2.yaml
+++ b/src/app/tests/suites/certification/Test_TC_KEYPADINPUT_1_2.yaml
@@ -16,6 +16,9 @@ name:
     19.1.2. [TC-KEYPADINPUT-1.2] Global attributes - Keypad Input Cluster (DUT
     as Server)
 
+PICS:
+    - KEYPADINPUT.S
+
 config:
     nodeId: 0x12344321
     cluster: "Keypad Input"
diff --git a/src/app/tests/suites/certification/Test_TC_KEYPADINPUT_3_2.yaml b/src/app/tests/suites/certification/Test_TC_KEYPADINPUT_3_2.yaml
index 7b532f34c1b37e..d855b5c9536bd6 100644
--- a/src/app/tests/suites/certification/Test_TC_KEYPADINPUT_3_2.yaml
+++ b/src/app/tests/suites/certification/Test_TC_KEYPADINPUT_3_2.yaml
@@ -14,6 +14,9 @@
 
 name: 19.3.2. [TC-KEYPADINPUT-3.2] Location Keys Verification
 
+PICS:
+    - KEYPADINPUT.S.LK
+
 config:
     nodeId: 0x12344321
     cluster: "Keypad Input"
diff --git a/src/app/tests/suites/certification/Test_TC_LCFG_1_1.yaml b/src/app/tests/suites/certification/Test_TC_LCFG_1_1.yaml
index d15f832437166a..df503d73b9dcbe 100644
--- a/src/app/tests/suites/certification/Test_TC_LCFG_1_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_LCFG_1_1.yaml
@@ -15,6 +15,9 @@
 
 name: 99.1.1. [TC-LCFG-1.1] Global Attributes [DUT-Server]
 
+PICS:
+    - LCFG.S
+
 config:
     nodeId: 0x12344321
     cluster: "Basic"
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 ef4d728528e5dd..aa0050d227456c 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
@@ -17,6 +17,9 @@ name:
     99.2.1. [TC-LCFG-2.1] Localization Configuration Cluster
     Attributes[DUT-Server]
 
+PICS:
+    - LCFG.S
+
 config:
     nodeId: 0x12344321
     cluster: "Basic"
diff --git a/src/app/tests/suites/certification/Test_TC_LCFG_3_1.yaml b/src/app/tests/suites/certification/Test_TC_LCFG_3_1.yaml
index 29acab3d216cef..6f88ddccab7c1d 100644
--- a/src/app/tests/suites/certification/Test_TC_LCFG_3_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_LCFG_3_1.yaml
@@ -17,6 +17,9 @@ name:
     99.3.1. [TC-LCFG-3.1] Localization Configuration Cluster
     Attributes[DUT-Client]
 
+PICS:
+    - LCFG.C
+
 config:
     nodeId: 0x12344321
     cluster: "Basic"
diff --git a/src/app/tests/suites/certification/Test_TC_LOWPOWER_1_1.yaml b/src/app/tests/suites/certification/Test_TC_LOWPOWER_1_1.yaml
index 7232c912e86270..b737768f1a8964 100644
--- a/src/app/tests/suites/certification/Test_TC_LOWPOWER_1_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_LOWPOWER_1_1.yaml
@@ -16,6 +16,9 @@ name:
     19.1.1. [TC-LOWPOWER-1.1] Global attributes - Low Power Cluster (DUT as
     Server)
 
+PICS:
+    - LOWPOWER.S
+
 config:
     nodeId: 0x12344321
     cluster: "Low Power"
diff --git a/src/app/tests/suites/certification/Test_TC_LTIME_1_1.yaml b/src/app/tests/suites/certification/Test_TC_LTIME_1_1.yaml
index c3a95bebcb10bc..f2c118faae2b26 100644
--- a/src/app/tests/suites/certification/Test_TC_LTIME_1_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_LTIME_1_1.yaml
@@ -15,6 +15,9 @@
 
 name: 4.1.1. [TC-LTIME-1.1] Global Attributes [DUT as Client]
 
+PICS:
+    - LTIME.C
+
 config:
     nodeId: 0x12344321
     cluster: "Basic"
diff --git a/src/app/tests/suites/certification/Test_TC_LTIME_1_2.yaml b/src/app/tests/suites/certification/Test_TC_LTIME_1_2.yaml
index 1cb6d86ece63d6..b12159343db582 100644
--- a/src/app/tests/suites/certification/Test_TC_LTIME_1_2.yaml
+++ b/src/app/tests/suites/certification/Test_TC_LTIME_1_2.yaml
@@ -15,6 +15,9 @@
 
 name: 4.1.2. [TC-LTIME-1.2] Global Attributes [DUT as Server]
 
+PICS:
+    - LTIME.S
+
 config:
     nodeId: 0x12344321
     cluster: "Basic"
diff --git a/src/app/tests/suites/certification/Test_TC_LTIME_2_1.yaml b/src/app/tests/suites/certification/Test_TC_LTIME_2_1.yaml
index fe967a82802711..166be272901625 100644
--- a/src/app/tests/suites/certification/Test_TC_LTIME_2_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_LTIME_2_1.yaml
@@ -17,6 +17,9 @@ name:
     4.2.1. [TC-LTIME-2.1] Read and Write Time Format Localization Cluster
     Attributes [DUT as Client]
 
+PICS:
+    - LTIME.C
+
 config:
     nodeId: 0x12344321
     cluster: "Basic"
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 8ebd5b06a80f6e..182a4c8293a9a3 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
@@ -17,6 +17,9 @@ name:
     4.3.1. [TC-LTIME-3.1] Read and Write Time Format Localization Cluster
     Attributes [DUT as Server]
 
+PICS:
+    - LTIME.S
+
 config:
     nodeId: 0x12344321
     cluster: "Basic"
diff --git a/src/app/tests/suites/certification/Test_TC_LUNIT_1_1.yaml b/src/app/tests/suites/certification/Test_TC_LUNIT_1_1.yaml
index 9980fb12bbfd0b..48f70b5757161d 100644
--- a/src/app/tests/suites/certification/Test_TC_LUNIT_1_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_LUNIT_1_1.yaml
@@ -15,6 +15,9 @@
 
 name: 105.1.1. [TC-LUNIT-1.1] Global Attributes [DUT as Client]
 
+PICS:
+    - LUNIT.C
+
 config:
     nodeId: 0x12344321
     cluster: "Basic"
diff --git a/src/app/tests/suites/certification/Test_TC_LUNIT_1_2.yaml b/src/app/tests/suites/certification/Test_TC_LUNIT_1_2.yaml
index 527846540b10ce..1f883211ed1892 100644
--- a/src/app/tests/suites/certification/Test_TC_LUNIT_1_2.yaml
+++ b/src/app/tests/suites/certification/Test_TC_LUNIT_1_2.yaml
@@ -15,6 +15,9 @@
 
 name: 105.1.2. [TC-LUNIT-1.2] Global Attributes [DUT as Server]
 
+PICS:
+    - LUNIT.S
+
 config:
     nodeId: 0x12344321
     cluster: "Basic"
diff --git a/src/app/tests/suites/certification/Test_TC_LUNIT_2_1.yaml b/src/app/tests/suites/certification/Test_TC_LUNIT_2_1.yaml
index 89b29acacd22c5..2fe55efdad94e9 100644
--- a/src/app/tests/suites/certification/Test_TC_LUNIT_2_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_LUNIT_2_1.yaml
@@ -17,6 +17,9 @@ name:
     105.2.1. [TC-LUNIT-2.1] Read and Write Unit Localization Cluster Attributes
     [DUT as Client]
 
+PICS:
+    - LUNIT.C
+
 config:
     nodeId: 0x12344321
     cluster: "Basic"
diff --git a/src/app/tests/suites/certification/Test_TC_LUNIT_3_1.yaml b/src/app/tests/suites/certification/Test_TC_LUNIT_3_1.yaml
index 51b0774a98f30f..65cf0234b844f8 100644
--- a/src/app/tests/suites/certification/Test_TC_LUNIT_3_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_LUNIT_3_1.yaml
@@ -17,6 +17,9 @@ name:
     105.3.1. [TC-LUNIT-3.1] Read and Write Unit Localization Cluster Attributes
     [DUT as Server]
 
+PICS:
+    - LUNIT.S
+
 config:
     nodeId: 0x12344321
     cluster: "Unit Localization"
diff --git a/src/app/tests/suites/certification/Test_TC_LVL_1_1.yaml b/src/app/tests/suites/certification/Test_TC_LVL_1_1.yaml
index 599a74ca31c732..cfd000ee96ba15 100644
--- a/src/app/tests/suites/certification/Test_TC_LVL_1_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_LVL_1_1.yaml
@@ -14,6 +14,9 @@
 
 name: 18.1.1. [TC-LVL-1.1] Global attributes with server as DUT
 
+PICS:
+    - LVL.S
+
 config:
     nodeId: 0x12344321
     cluster: "Level Control"
diff --git a/src/app/tests/suites/certification/Test_TC_LVL_2_1.yaml b/src/app/tests/suites/certification/Test_TC_LVL_2_1.yaml
index 2382f4bbca275f..5b8fc5521ccc0b 100644
--- a/src/app/tests/suites/certification/Test_TC_LVL_2_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_LVL_2_1.yaml
@@ -14,6 +14,9 @@
 
 name: 24.2.1. [TC-LVL-2.1] Read cluster attributes (DUT as Server)
 
+PICS:
+    - LVL.S
+
 config:
     nodeId: 0x12344321
     cluster: "Level Control"
diff --git a/src/app/tests/suites/certification/Test_TC_LVL_2_2.yaml b/src/app/tests/suites/certification/Test_TC_LVL_2_2.yaml
index 6d450bce210140..7b6a175f132cb7 100644
--- a/src/app/tests/suites/certification/Test_TC_LVL_2_2.yaml
+++ b/src/app/tests/suites/certification/Test_TC_LVL_2_2.yaml
@@ -14,6 +14,9 @@
 
 name: 24.2.2. [TC-LVL-2.2] Write cluster attributes (DUT as Server)
 
+PICS:
+    - LVL.S
+
 config:
     nodeId: 0x12344321
     cluster: "Level Control"
diff --git a/src/app/tests/suites/certification/Test_TC_LVL_2_3.yaml b/src/app/tests/suites/certification/Test_TC_LVL_2_3.yaml
index a58ef22a068dbc..5e11664387a18b 100644
--- a/src/app/tests/suites/certification/Test_TC_LVL_2_3.yaml
+++ b/src/app/tests/suites/certification/Test_TC_LVL_2_3.yaml
@@ -1,876 +1,883 @@
-# 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: 22.2.3. [TC-LVL-2.3] Attributes with DUT as client
-
-config:
-    nodeId: 0x12344321
-    cluster: "Basic"
-    endpoint: 0
-
-tests:
-    - label:
-          "DUT reads all supported mandatory attributes from TH one at a time in
-          a manufacturer specific order"
-      verification: |
-          ./chip-tool levelcontrol read current-level 1 1
-          Verify in TH all-clusters-app
-          [1657279115.433005][4417:4417] CHIP:IM: Received Read request
-          [1657279115.433184][4417:4417] CHIP:DMG: ReadRequestMessage =
-          [1657279115.433258][4417:4417] CHIP:DMG: {
-          [1657279115.433313][4417:4417] CHIP:DMG:         AttributePathIBs =
-          [1657279115.433379][4417:4417] CHIP:DMG:         [
-          [1657279115.433438][4417:4417] CHIP:DMG:                 AttributePathIB =
-          [1657279115.433506][4417:4417] CHIP:DMG:                 {
-          [1657279115.433572][4417:4417] CHIP:DMG:                         Endpoint = 0x1,
-          [1657279115.433703][4417:4417] CHIP:DMG:                         Cluster = 0x8,
-          [1657279115.433781][4417:4417] CHIP:DMG:                         Attribute = 0x0000_0000,
-          [1657279115.433851][4417:4417] CHIP:DMG:                 }
-          [1657279115.433920][4417:4417] CHIP:DMG:                         
-          [1657279115.433980][4417:4417] CHIP:DMG:         ],
-          [1657279115.434047][4417:4417] CHIP:DMG:                 
-          [1657279115.434109][4417:4417] CHIP:DMG:         isFabricFiltered = true, 
-          [1657279115.434169][4417:4417] CHIP:DMG:         InteractionModelRevision = 1
-          [1657279115.434226][4417:4417] CHIP:DMG: },
-
-
-          ./chip-tool levelcontrol read on-level 1 1
-          Verify in TH all-clusters-app
-          [1657279142.246433][4417:4417] CHIP:IM: Received Read request
-          [1657279142.246605][4417:4417] CHIP:DMG: ReadRequestMessage =
-          [1657279142.246670][4417:4417] CHIP:DMG: {
-          [1657279142.246725][4417:4417] CHIP:DMG:         AttributePathIBs =
-          [1657279142.246788][4417:4417] CHIP:DMG:         [
-          [1657279142.246848][4417:4417] CHIP:DMG:                 AttributePathIB =
-          [1657279142.246906][4417:4417] CHIP:DMG:                 {
-          [1657279142.246965][4417:4417] CHIP:DMG:                         Endpoint = 0x1,
-          [1657279142.247028][4417:4417] CHIP:DMG:                         Cluster = 0x8,
-          [1657279142.247100][4417:4417] CHIP:DMG:                         Attribute = 0x0000_0011,
-          [1657279142.247164][4417:4417] CHIP:DMG:                 }
-          [1657279142.247245][4417:4417] CHIP:DMG:                         
-          [1657279142.247310][4417:4417] CHIP:DMG:         ],
-          [1657279142.247375][4417:4417] CHIP:DMG:                 
-          [1657279142.247439][4417:4417] CHIP:DMG:         isFabricFiltered = true, 
-          [1657279142.247500][4417:4417] CHIP:DMG:         InteractionModelRevision = 1
-          [1657279142.247552][4417:4417] CHIP:DMG: },
-
-
-          ./chip-tool levelcontrol read options 1 1
-          Verify in TH all-clusters-app
-          [1657279166.425514][4417:4417] CHIP:IM: Received Read request
-          [1657279166.425770][4417:4417] CHIP:DMG: ReadRequestMessage =
-          [1657279166.425842][4417:4417] CHIP:DMG: {
-          [1657279166.425895][4417:4417] CHIP:DMG:         AttributePathIBs =
-          [1657279166.425960][4417:4417] CHIP:DMG:         [
-          [1657279166.426018][4417:4417] CHIP:DMG:                 AttributePathIB =
-          [1657279166.426093][4417:4417] CHIP:DMG:                 {
-          [1657279166.426161][4417:4417] CHIP:DMG:                         Endpoint = 0x1,
-          [1657279166.426245][4417:4417] CHIP:DMG:                         Cluster = 0x8,
-          [1657279166.426310][4417:4417] CHIP:DMG:                         Attribute = 0x0000_000F,
-          [1657279166.426389][4417:4417] CHIP:DMG:                 }
-          [1657279166.426465][4417:4417] CHIP:DMG:                         
-          [1657279166.426528][4417:4417] CHIP:DMG:         ],
-          [1657279166.426597][4417:4417] CHIP:DMG:                 
-          [1657279166.426660][4417:4417] CHIP:DMG:         isFabricFiltered = true, 
-          [1657279166.426721][4417:4417] CHIP:DMG:         InteractionModelRevision = 1
-          [1657279166.426777][4417:4417] CHIP:DMG: },
-      disabled: true
-
-    - label:
-          "DUT reads all supported optional attributes from TH one at a time in
-          a manufacturer specific order"
-      verification: |
-          ./chip-tool levelcontrol read remaining-time 1 1
-          Verify in TH all-clusters-app
-          1657913316.919773][3126:3126] CHIP:IM: Received Read request
-          [1657913316.919880][3126:3126] CHIP:DMG: ReadRequestMessage =
-          [1657913316.919920][3126:3126] CHIP:DMG: {
-          [1657913316.919952][3126:3126] CHIP:DMG:        AttributePathIBs =
-          [1657913316.919995][3126:3126] CHIP:DMG:        [
-          [1657913316.920046][3126:3126] CHIP:DMG:                AttributePathIB =
-          [1657913316.920135][3126:3126] CHIP:DMG:                {
-          [1657913316.920176][3126:3126] CHIP:DMG:                        Endpoint = 0x1,
-          [1657913316.920341][3126:3126] CHIP:DMG:                        Cluster = 0x8,
-          [1657913316.920396][3126:3126] CHIP:DMG:                        Attribute = 0x0000_0001,
-          [1657913316.920457][3126:3126] CHIP:DMG:                }
-          [1657913316.920503][3126:3126] CHIP:DMG:
-          [1657913316.920543][3126:3126] CHIP:DMG:        ],
-          [1657913316.920584][3126:3126] CHIP:DMG:
-          [1657913316.920622][3126:3126] CHIP:DMG:        isFabricFiltered = true,
-          [1657913316.920673][3126:3126] CHIP:DMG:        InteractionModelRevision = 1
-          [1657913316.920707][3126:3126] CHIP:DMG: },
-
-
-          ./chip-tool levelcontrol read min-level 1 1
-          Verify in TH all-clusters-app
-          [1657913332.319502][3126:3126] CHIP:IM: Received Read request
-          [1657913332.319628][3126:3126] CHIP:DMG: ReadRequestMessage =
-          [1657913332.319675][3126:3126] CHIP:DMG: {
-          [1657913332.319734][3126:3126] CHIP:DMG:        AttributePathIBs =
-          [1657913332.319782][3126:3126] CHIP:DMG:        [
-          [1657913332.319826][3126:3126] CHIP:DMG:                AttributePathIB =
-          [1657913332.319898][3126:3126] CHIP:DMG:                {
-          [1657913332.319950][3126:3126] CHIP:DMG:                        Endpoint = 0x1,
-          [1657913332.320006][3126:3126] CHIP:DMG:                        Cluster = 0x8,
-          [1657913332.320127][3126:3126] CHIP:DMG:                        Attribute = 0x0000_0002,
-          [1657913332.320181][3126:3126] CHIP:DMG:                }
-          [1657913332.320239][3126:3126] CHIP:DMG:
-          [1657913332.320305][3126:3126] CHIP:DMG:        ],
-          [1657913332.320358][3126:3126] CHIP:DMG:
-          [1657913332.320405][3126:3126] CHIP:DMG:        isFabricFiltered = true,
-          [1657913332.320470][3126:3126] CHIP:DMG:        InteractionModelRevision = 1
-          [1657913332.320514][3126:3126] CHIP:DMG: },
-
-
-          ./chip-tool levelcontrol read max-level 1 1
-          Verify in TH all-clusters-app
-          [1657913350.880504][3126:3126] CHIP:IM: Received Read request
-          [1657913350.880648][3126:3126] CHIP:DMG: ReadRequestMessage =
-          [1657913350.880703][3126:3126] CHIP:DMG: {
-          [1657913350.880770][3126:3126] CHIP:DMG:        AttributePathIBs =
-          [1657913350.880838][3126:3126] CHIP:DMG:        [
-          [1657913350.880889][3126:3126] CHIP:DMG:                AttributePathIB =
-          [1657913350.880965][3126:3126] CHIP:DMG:                {
-          [1657913350.881023][3126:3126] CHIP:DMG:                        Endpoint = 0x1,
-          [1657913350.881090][3126:3126] CHIP:DMG:                        Cluster = 0x8,
-          [1657913350.881175][3126:3126] CHIP:DMG:                        Attribute = 0x0000_0003,
-          [1657913350.881243][3126:3126] CHIP:DMG:                }
-          [1657913350.881437][3126:3126] CHIP:DMG:
-          [1657913350.881496][3126:3126] CHIP:DMG:        ],
-          [1657913350.881576][3126:3126] CHIP:DMG:
-          [1657913350.881630][3126:3126] CHIP:DMG:        isFabricFiltered = true,
-          [1657913350.881705][3126:3126] CHIP:DMG:        InteractionModelRevision = 1
-          [1657913350.881756][3126:3126] CHIP:DMG: },
-
-
-          ./chip-tool levelcontrol read current-frequency 1 1
-          Verify in TH all-clusters-app
-          [1657913381.091563][3126:3126] CHIP:IM: Received Read request
-          [1657913381.091690][3126:3126] CHIP:DMG: ReadRequestMessage =
-          [1657913381.091738][3126:3126] CHIP:DMG: {
-          [1657913381.091797][3126:3126] CHIP:DMG:        AttributePathIBs =
-          [1657913381.091844][3126:3126] CHIP:DMG:        [
-          [1657913381.091889][3126:3126] CHIP:DMG:                AttributePathIB =
-          [1657913381.091958][3126:3126] CHIP:DMG:                {
-          [1657913381.092013][3126:3126] CHIP:DMG:                        Endpoint = 0x1,
-          [1657913381.092105][3126:3126] CHIP:DMG:                        Cluster = 0x8,
-          [1657913381.092178][3126:3126] CHIP:DMG:                        Attribute = 0x0000_0004,
-          [1657913381.092233][3126:3126] CHIP:DMG:                }
-          [1657913381.092284][3126:3126] CHIP:DMG:
-          [1657913381.092348][3126:3126] CHIP:DMG:        ],
-          [1657913381.092400][3126:3126] CHIP:DMG:
-          [1657913381.092448][3126:3126] CHIP:DMG:        isFabricFiltered = true,
-          [1657913381.092514][3126:3126] CHIP:DMG:        InteractionModelRevision = 1
-          [1657913381.092557][3126:3126] CHIP:DMG: },
-
-
-          ./chip-tool levelcontrol read min-frequency 1 1
-          Verify in TH all-clusters-app
-          [1657913397.410411][3126:3126] CHIP:IM: Received Read request
-          [1657913397.410539][3126:3126] CHIP:DMG: ReadRequestMessage =
-          [1657913397.410588][3126:3126] CHIP:DMG: {
-          [1657913397.410629][3126:3126] CHIP:DMG:        AttributePathIBs =
-          [1657913397.410676][3126:3126] CHIP:DMG:        [
-          [1657913397.410720][3126:3126] CHIP:DMG:                AttributePathIB =
-          [1657913397.410782][3126:3126] CHIP:DMG:                {
-          [1657913397.410834][3126:3126] CHIP:DMG:                        Endpoint = 0x1,
-          [1657913397.410891][3126:3126] CHIP:DMG:                        Cluster = 0x8,
-          [1657913397.410948][3126:3126] CHIP:DMG:                        Attribute = 0x0000_0005,
-          [1657913397.411002][3126:3126] CHIP:DMG:                }
-          [1657913397.411056][3126:3126] CHIP:DMG:
-          [1657913397.411103][3126:3126] CHIP:DMG:        ],
-          [1657913397.411161][3126:3126] CHIP:DMG:
-          [1657913397.411209][3126:3126] CHIP:DMG:        isFabricFiltered = true,
-          [1657913397.411255][3126:3126] CHIP:DMG:        InteractionModelRevision = 1
-          [1657913397.411298][3126:3126] CHIP:DMG: },
-
-
-          ./chip-tool levelcontrol read max-frequency 1 1
-          Verify in TH all-clusters-app
-          [1657913412.416960][3126:3126] CHIP:IM: Received Read request
-          [1657913412.417086][3126:3126] CHIP:DMG: ReadRequestMessage =
-          [1657913412.417134][3126:3126] CHIP:DMG: {
-          [1657913412.417175][3126:3126] CHIP:DMG:        AttributePathIBs =
-          [1657913412.417227][3126:3126] CHIP:DMG:        [
-          [1657913412.417271][3126:3126] CHIP:DMG:                AttributePathIB =
-          [1657913412.417321][3126:3126] CHIP:DMG:                {
-          [1657913412.417372][3126:3126] CHIP:DMG:                        Endpoint = 0x1,
-          [1657913412.417428][3126:3126] CHIP:DMG:                        Cluster = 0x8,
-          [1657913412.417487][3126:3126] CHIP:DMG:                        Attribute = 0x0000_0006,
-          [1657913412.417542][3126:3126] CHIP:DMG:                }
-          [1657913412.417593][3126:3126] CHIP:DMG:
-          [1657913412.417642][3126:3126] CHIP:DMG:        ],
-          [1657913412.417693][3126:3126] CHIP:DMG:
-          [1657913412.417740][3126:3126] CHIP:DMG:        isFabricFiltered = true,
-          [1657913412.417786][3126:3126] CHIP:DMG:        InteractionModelRevision = 1
-          [1657913412.417822][3126:3126] CHIP:DMG: },
-
-
-          ./chip-tool levelcontrol read on-off-transition-time 1 1
-          Verify in TH all-clusters-app
-          [1657913438.117302][3126:3126] CHIP:IM: Received Read request
-          [1657913438.117462][3126:3126] CHIP:DMG: ReadRequestMessage =
-          [1657913438.117526][3126:3126] CHIP:DMG: {
-          [1657913438.117718][3126:3126] CHIP:DMG:        AttributePathIBs =
-          [1657913438.117782][3126:3126] CHIP:DMG:        [
-          [1657913438.117841][3126:3126] CHIP:DMG:                AttributePathIB =
-          [1657913438.117907][3126:3126] CHIP:DMG:                {
-          [1657913438.117976][3126:3126] CHIP:DMG:                        Endpoint = 0x1,
-          [1657913438.118061][3126:3126] CHIP:DMG:                        Cluster = 0x8,
-          [1657913438.118137][3126:3126] CHIP:DMG:                        Attribute = 0x0000_0010,
-          [1657913438.118206][3126:3126] CHIP:DMG:                }
-          [1657913438.118279][3126:3126] CHIP:DMG:
-          [1657913438.118347][3126:3126] CHIP:DMG:        ],
-          [1657913438.118415][3126:3126] CHIP:DMG:
-          [1657913438.118474][3126:3126] CHIP:DMG:        isFabricFiltered = true,
-          [1657913438.118535][3126:3126] CHIP:DMG:        InteractionModelRevision = 1
-          [1657913438.118592][3126:3126] CHIP:DMG: },
-
-
-          ./chip-tool levelcontrol read on-transition-time 1 1
-          Verify in TH all-clusters-app
-          [1657913454.127158][3126:3126] CHIP:IM: Received Read request
-          [1657913454.127241][3126:3126] CHIP:DMG: ReadRequestMessage =
-          [1657913454.127268][3126:3126] CHIP:DMG: {
-          [1657913454.127291][3126:3126] CHIP:DMG:        AttributePathIBs =
-          [1657913454.127317][3126:3126] CHIP:DMG:        [
-          [1657913454.127341][3126:3126] CHIP:DMG:                AttributePathIB =
-          [1657913454.127368][3126:3126] CHIP:DMG:                {
-          [1657913454.127396][3126:3126] CHIP:DMG:                        Endpoint = 0x1,
-          [1657913454.127461][3126:3126] CHIP:DMG:                        Cluster = 0x8,
-          [1657913454.127497][3126:3126] CHIP:DMG:                        Attribute = 0x0000_0012,
-          [1657913454.127528][3126:3126] CHIP:DMG:                }
-          [1657913454.127556][3126:3126] CHIP:DMG:
-          [1657913454.127582][3126:3126] CHIP:DMG:        ],
-          [1657913454.127610][3126:3126] CHIP:DMG:
-          [1657913454.127636][3126:3126] CHIP:DMG:        isFabricFiltered = true,
-          [1657913454.127661][3126:3126] CHIP:DMG:        InteractionModelRevision = 1
-          [1657913454.127685][3126:3126] CHIP:DMG: },
-
-
-          ./chip-tool levelcontrol read off-transition-time 1 1
-          Verify in TH all-clusters-app
-          [1657913518.488375][3126:3126] CHIP:IM: Received Read request
-          [1657913518.488457][3126:3126] CHIP:DMG: ReadRequestMessage =
-          [1657913518.488486][3126:3126] CHIP:DMG: {
-          [1657913518.488508][3126:3126] CHIP:DMG:        AttributePathIBs =
-          [1657913518.488534][3126:3126] CHIP:DMG:        [
-          [1657913518.488558][3126:3126] CHIP:DMG:                AttributePathIB =
-          [1657913518.488585][3126:3126] CHIP:DMG:                {
-          [1657913518.488613][3126:3126] CHIP:DMG:                        Endpoint = 0x1,
-          [1657913518.488649][3126:3126] CHIP:DMG:                        Cluster = 0x8,
-          [1657913518.488678][3126:3126] CHIP:DMG:                        Attribute = 0x0000_0013,
-          [1657913518.488705][3126:3126] CHIP:DMG:                }
-          [1657913518.488733][3126:3126] CHIP:DMG:
-          [1657913518.488757][3126:3126] CHIP:DMG:        ],
-          [1657913518.488785][3126:3126] CHIP:DMG:
-          [1657913518.488812][3126:3126] CHIP:DMG:        isFabricFiltered = true,
-          [1657913518.488837][3126:3126] CHIP:DMG:        InteractionModelRevision = 1
-          [1657913518.488860][3126:3126] CHIP:DMG: },
-
-
-          ./chip-tool levelcontrol read default-move-rate 1 1
-          Verify in TH all-clusters-app
-          [1657913537.304689][3126:3126] CHIP:IM: Received Read request
-          [1657913537.304828][3126:3126] CHIP:DMG: ReadRequestMessage =
-          [1657913537.304884][3126:3126] CHIP:DMG: {
-          [1657913537.304931][3126:3126] CHIP:DMG:        AttributePathIBs =
-          [1657913537.304996][3126:3126] CHIP:DMG:        [
-          [1657913537.305047][3126:3126] CHIP:DMG:                AttributePathIB =
-          [1657913537.305108][3126:3126] CHIP:DMG:                {
-          [1657913537.305171][3126:3126] CHIP:DMG:                        Endpoint = 0x1,
-          [1657913537.305238][3126:3126] CHIP:DMG:                        Cluster = 0x8,
-          [1657913537.305304][3126:3126] CHIP:DMG:                        Attribute = 0x0000_0014,
-          [1657913537.305372][3126:3126] CHIP:DMG:                }
-          [1657913537.305434][3126:3126] CHIP:DMG:
-          [1657913537.305607][3126:3126] CHIP:DMG:        ],
-          [1657913537.305675][3126:3126] CHIP:DMG:
-          [1657913537.305729][3126:3126] CHIP:DMG:        isFabricFiltered = true,
-          [1657913537.305787][3126:3126] CHIP:DMG:        InteractionModelRevision = 1
-          [1657913537.305836][3126:3126] CHIP:DMG: },
-
-
-          ./chip-tool levelcontrol read start-up-current-level 1 1
-          Verify in TH all-clusters-app
-          [1657913554.968190][3126:3126] CHIP:IM: Received Read request
-          [1657913554.968312][3126:3126] CHIP:DMG: ReadRequestMessage =
-          [1657913554.968343][3126:3126] CHIP:DMG: {
-          [1657913554.968366][3126:3126] CHIP:DMG:        AttributePathIBs =
-          [1657913554.968393][3126:3126] CHIP:DMG:        [
-          [1657913554.968416][3126:3126] CHIP:DMG:                AttributePathIB =
-          [1657913554.968444][3126:3126] CHIP:DMG:                {
-          [1657913554.968473][3126:3126] CHIP:DMG:                        Endpoint = 0x1,
-          [1657913554.968513][3126:3126] CHIP:DMG:                        Cluster = 0x8,
-          [1657913554.968546][3126:3126] CHIP:DMG:                        Attribute = 0x0000_4000,
-          [1657913554.968569][3126:3126] CHIP:DMG:                }
-          [1657913554.968594][3126:3126] CHIP:DMG:
-          [1657913554.968617][3126:3126] CHIP:DMG:        ],
-          [1657913554.968679][3126:3126] CHIP:DMG:
-          [1657913554.968717][3126:3126] CHIP:DMG:        isFabricFiltered = true,
-          [1657913554.968743][3126:3126] CHIP:DMG:        InteractionModelRevision = 1
-          [1657913554.968766][3126:3126] CHIP:DMG: },
-      disabled: true
-
-    - label:
-          "DUT writes a suitable value to all supported mandatory attributes on
-          the TH one at a time in a manufacturer specific order"
-      verification: |
-          ./chip-tool levelcontrol write on-level 5 (replace with your value) 123123 1
-          Verify in TH all-clusters-app
-          [1657913667.893875][3126:3126] CHIP:DMG: WriteRequestMessage =
-          [1657913667.893923][3126:3126] CHIP:DMG: {
-          [1657913667.893965][3126:3126] CHIP:DMG:        suppressResponse = false,
-          [1657913667.894013][3126:3126] CHIP:DMG:        timedRequest = false,
-          [1657913667.894058][3126:3126] CHIP:DMG:        AttributeDataIBs =
-          [1657913667.894112][3126:3126] CHIP:DMG:        [
-          [1657913667.894157][3126:3126] CHIP:DMG:                AttributeDataIB =
-          [1657913667.894213][3126:3126] CHIP:DMG:                {
-          [1657913667.894264][3126:3126] CHIP:DMG:                        AttributePathIB =
-          [1657913667.894322][3126:3126] CHIP:DMG:                        {
-          [1657913667.894495][3126:3126] CHIP:DMG:                                Endpoint = 0x1,
-          [1657913667.894561][3126:3126] CHIP:DMG:                                Cluster = 0x8,
-          [1657913667.894622][3126:3126] CHIP:DMG:                                Attribute = 0x0000_0011,
-          [1657913667.894684][3126:3126] CHIP:DMG:                        }
-          [1657913667.894744][3126:3126] CHIP:DMG:
-          [1657913667.894808][3126:3126] CHIP:DMG:                        Data = 5,
-          [1657913667.894866][3126:3126] CHIP:DMG:                },
-          [1657913667.894914][3126:3126] CHIP:DMG:
-          [1657913667.894957][3126:3126] CHIP:DMG:        ],
-          [1657913667.895010][3126:3126] CHIP:DMG:
-          [1657913667.895055][3126:3126] CHIP:DMG:        moreChunkedMessages = false,
-          [1657913667.895105][3126:3126] CHIP:DMG:        InteractionModelRevision = 1
-          [1657913667.895148][3126:3126] CHIP:DMG: },
-      disabled: true
-
-    - label:
-          "DUT writes a suitable value to all supported optional attributes on
-          the TH one at a time in a manufacturer specific order"
-      verification: |
-          ./chip-tool levelcontrol write on-off-transition-time 5 (replace with your own value) 123123 1
-          Verify in TH all-clusters-app
-          [1657913716.044424][3126:3126] CHIP:DMG: WriteRequestMessage =
-          [1657913716.044478][3126:3126] CHIP:DMG: {
-          [1657913716.044527][3126:3126] CHIP:DMG:        suppressResponse = false,
-          [1657913716.044583][3126:3126] CHIP:DMG:        timedRequest = false,
-          [1657913716.044634][3126:3126] CHIP:DMG:        AttributeDataIBs =
-          [1657913716.044696][3126:3126] CHIP:DMG:        [
-          [1657913716.044748][3126:3126] CHIP:DMG:                AttributeDataIB =
-          [1657913716.044806][3126:3126] CHIP:DMG:                {
-          [1657913716.044860][3126:3126] CHIP:DMG:                        AttributePathIB =
-          [1657913716.044932][3126:3126] CHIP:DMG:                        {
-          [1657913716.044994][3126:3126] CHIP:DMG:                                Endpoint = 0x1,
-          [1657913716.045061][3126:3126] CHIP:DMG:                                Cluster = 0x8,
-          [1657913716.045137][3126:3126] CHIP:DMG:                                Attribute = 0x0000_0010,
-          [1657913716.045202][3126:3126] CHIP:DMG:                        }
-          [1657913716.045270][3126:3126] CHIP:DMG:
-          [1657913716.045344][3126:3126] CHIP:DMG:                        Data = 5,
-          [1657913716.045407][3126:3126] CHIP:DMG:                },
-          [1657913716.045468][3126:3126] CHIP:DMG:
-          [1657913716.045519][3126:3126] CHIP:DMG:        ],
-          [1657913716.045579][3126:3126] CHIP:DMG:
-          [1657913716.045630][3126:3126] CHIP:DMG:        moreChunkedMessages = false,
-          [1657913716.045683][3126:3126] CHIP:DMG:        InteractionModelRevision = 1
-          [1657913716.045732][3126:3126] CHIP:DMG: },
-
-
-          ./chip-tool levelcontrol write on-transition-time 5 (replace with your value) 1 1
-          Verify in TH all-clusters-app
-          [1657913743.728014][3126:3126] CHIP:DMG: WriteRequestMessage =
-          [1657913743.728046][3126:3126] CHIP:DMG: {
-          [1657913743.728145][3126:3126] CHIP:DMG:        suppressResponse = false,
-          [1657913743.728179][3126:3126] CHIP:DMG:        timedRequest = false,
-          [1657913743.728239][3126:3126] CHIP:DMG:        AttributeDataIBs =
-          [1657913743.728279][3126:3126] CHIP:DMG:        [
-          [1657913743.728308][3126:3126] CHIP:DMG:                AttributeDataIB =
-          [1657913743.728351][3126:3126] CHIP:DMG:                {
-          [1657913743.728383][3126:3126] CHIP:DMG:                        AttributePathIB =
-          [1657913743.728423][3126:3126] CHIP:DMG:                        {
-          [1657913743.728467][3126:3126] CHIP:DMG:                                Endpoint = 0x1,
-          [1657913743.728512][3126:3126] CHIP:DMG:                                Cluster = 0x8,
-          [1657913743.728553][3126:3126] CHIP:DMG:                                Attribute = 0x0000_0012,
-          [1657913743.728591][3126:3126] CHIP:DMG:                        }
-          [1657913743.728631][3126:3126] CHIP:DMG:
-          [1657913743.728671][3126:3126] CHIP:DMG:                        Data = 5,
-          [1657913743.728710][3126:3126] CHIP:DMG:                },
-          [1657913743.728746][3126:3126] CHIP:DMG:
-          [1657913743.728775][3126:3126] CHIP:DMG:        ],
-          [1657913743.728811][3126:3126] CHIP:DMG:
-          [1657913743.728842][3126:3126] CHIP:DMG:        moreChunkedMessages = false,
-          [1657913743.728872][3126:3126] CHIP:DMG:        InteractionModelRevision = 1
-          [1657913743.728901][3126:3126] CHIP:DMG: },
-
-
-          ./chip-tool levelcontrol write off-transition-time 5 1 1
-          Verify in TH all-clusters-app
-
-          [1657913763.836957][3126:3126] CHIP:DMG: WriteRequestMessage =
-          [1657913763.837010][3126:3126] CHIP:DMG: {
-          [1657913763.837058][3126:3126] CHIP:DMG:        suppressResponse = false,
-          [1657913763.837119][3126:3126] CHIP:DMG:        timedRequest = false,
-          [1657913763.837170][3126:3126] CHIP:DMG:        AttributeDataIBs =
-          [1657913763.837230][3126:3126] CHIP:DMG:        [
-          [1657913763.837361][3126:3126] CHIP:DMG:                AttributeDataIB =
-          [1657913763.837424][3126:3126] CHIP:DMG:                {
-          [1657913763.837478][3126:3126] CHIP:DMG:                        AttributePathIB =
-          [1657913763.837544][3126:3126] CHIP:DMG:                        {
-          [1657913763.837580][3126:3126] CHIP:DMG:                                Endpoint = 0x1,
-          [1657913763.837613][3126:3126] CHIP:DMG:                                Cluster = 0x8,
-          [1657913763.837645][3126:3126] CHIP:DMG:                                Attribute = 0x0000_0013,
-          [1657913763.837755][3126:3126] CHIP:DMG:                        }
-          [1657913763.837790][3126:3126] CHIP:DMG:
-          [1657913763.837822][3126:3126] CHIP:DMG:                        Data = 5,
-          [1657913763.837850][3126:3126] CHIP:DMG:                },
-          [1657913763.837880][3126:3126] CHIP:DMG:
-          [1657913763.837904][3126:3126] CHIP:DMG:        ],
-          [1657913763.837932][3126:3126] CHIP:DMG:
-          [1657913763.837956][3126:3126] CHIP:DMG:        moreChunkedMessages = false,
-          [1657913763.837981][3126:3126] CHIP:DMG:        InteractionModelRevision = 1
-          [1657913763.838004][3126:3126] CHIP:DMG: },
-
-
-          ./chip-tool levelcontrol write default-move-rate 5 1 1
-          Verify in TH all-clusters-app
-          [1657913781.895720][3126:3126] CHIP:DMG: WriteRequestMessage =
-          [1657913781.895799][3126:3126] CHIP:DMG: {
-          [1657913781.895824][3126:3126] CHIP:DMG:        suppressResponse = false,
-          [1657913781.895850][3126:3126] CHIP:DMG:        timedRequest = false,
-          [1657913781.895874][3126:3126] CHIP:DMG:        AttributeDataIBs =
-          [1657913781.895904][3126:3126] CHIP:DMG:        [
-          [1657913781.895929][3126:3126] CHIP:DMG:                AttributeDataIB =
-          [1657913781.895956][3126:3126] CHIP:DMG:                {
-          [1657913781.895982][3126:3126] CHIP:DMG:                        AttributePathIB =
-          [1657913781.896024][3126:3126] CHIP:DMG:                        {
-          [1657913781.896147][3126:3126] CHIP:DMG:                                Endpoint = 0x1,
-          [1657913781.896209][3126:3126] CHIP:DMG:                                Cluster = 0x8,
-          [1657913781.896247][3126:3126] CHIP:DMG:                                Attribute = 0x0000_0014,
-          [1657913781.896278][3126:3126] CHIP:DMG:                        }
-          [1657913781.896312][3126:3126] CHIP:DMG:
-          [1657913781.896345][3126:3126] CHIP:DMG:                        Data = 5,
-          [1657913781.896374][3126:3126] CHIP:DMG:                },
-          [1657913781.896403][3126:3126] CHIP:DMG:
-          [1657913781.896427][3126:3126] CHIP:DMG:        ],
-          [1657913781.896503][3126:3126] CHIP:DMG:
-          [1657913781.896531][3126:3126] CHIP:DMG:        moreChunkedMessages = false,
-          [1657913781.896558][3126:3126] CHIP:DMG:        InteractionModelRevision = 1
-          [1657913781.896581][3126:3126] CHIP:DMG: },
-
-
-          ./chip-tool levelcontrol write start-up-current-level 5 (replace with your value) 123123 1
-          Verify in TH all-clusters-app
-          [1657913811.290764][3126:3126] CHIP:DMG: WriteRequestMessage =
-          [1657913811.290809][3126:3126] CHIP:DMG: {
-          [1657913811.290850][3126:3126] CHIP:DMG:        suppressResponse = false,
-          [1657913811.290898][3126:3126] CHIP:DMG:        timedRequest = false,
-          [1657913811.290942][3126:3126] CHIP:DMG:        AttributeDataIBs =
-          [1657913811.290995][3126:3126] CHIP:DMG:        [
-          [1657913811.291039][3126:3126] CHIP:DMG:                AttributeDataIB =
-          [1657913811.291094][3126:3126] CHIP:DMG:                {
-          [1657913811.291142][3126:3126] CHIP:DMG:                        AttributePathIB =
-          [1657913811.291258][3126:3126] CHIP:DMG:                        {
-          [1657913811.291326][3126:3126] CHIP:DMG:                                Endpoint = 0x1,
-          [1657913811.291394][3126:3126] CHIP:DMG:                                Cluster = 0x8,
-          [1657913811.291455][3126:3126] CHIP:DMG:                                Attribute = 0x0000_4000,
-          [1657913811.291512][3126:3126] CHIP:DMG:                        }
-          [1657913811.291630][3126:3126] CHIP:DMG:
-          [1657913811.291694][3126:3126] CHIP:DMG:                        Data = 5,
-          [1657913811.291748][3126:3126] CHIP:DMG:                },
-          [1657913811.291805][3126:3126] CHIP:DMG:
-          [1657913811.291848][3126:3126] CHIP:DMG:        ],
-          [1657913811.291949][3126:3126] CHIP:DMG:
-          [1657913811.291992][3126:3126] CHIP:DMG:        moreChunkedMessages = false,
-          [1657913811.292017][3126:3126] CHIP:DMG:        InteractionModelRevision = 1
-          [1657913811.292039][3126:3126] CHIP:DMG: },
-      disabled: true
-
-    - label:
-          "Configure TH such that it implements mandatory and none of the
-          optional attributes of the server-side of the cluster, and that it
-          also reflects this in global attributes such as FeatureMap and
-          AttributeList. Commission DUT to TH again"
-      verification: |
-          ./chip-tool levelcontrol read current-level 1 1
-          Verify in TH all-clusters-app
-          [1657913862.815749][3126:3126] CHIP:IM: Received Read request
-          [1657913862.815884][3126:3126] CHIP:DMG: ReadRequestMessage =
-          [1657913862.815935][3126:3126] CHIP:DMG: {
-          [1657913862.815975][3126:3126] CHIP:DMG:        AttributePathIBs =
-          [1657913862.816023][3126:3126] CHIP:DMG:        [
-          [1657913862.816107][3126:3126] CHIP:DMG:                AttributePathIB =
-          [1657913862.816161][3126:3126] CHIP:DMG:                {
-          [1657913862.816212][3126:3126] CHIP:DMG:                        Endpoint = 0x1,
-          [1657913862.816268][3126:3126] CHIP:DMG:                        Cluster = 0x8,
-          [1657913862.816325][3126:3126] CHIP:DMG:                        Attribute = 0x0000_0000,
-          [1657913862.816377][3126:3126] CHIP:DMG:                }
-          [1657913862.816431][3126:3126] CHIP:DMG:
-          [1657913862.816477][3126:3126] CHIP:DMG:        ],
-          [1657913862.816527][3126:3126] CHIP:DMG:
-          [1657913862.816573][3126:3126] CHIP:DMG:        isFabricFiltered = true,
-          [1657913862.816619][3126:3126] CHIP:DMG:        InteractionModelRevision = 1
-          [1657913862.816662][3126:3126] CHIP:DMG: },
-
-
-          ./chip-tool levelcontrol read on-level 1 1
-          Verify in TH all-clusters-app
-          [1657913877.850398][3126:3126] CHIP:IM: Received Read request
-          [1657913877.850525][3126:3126] CHIP:DMG: ReadRequestMessage =
-          [1657913877.850574][3126:3126] CHIP:DMG: {
-          [1657913877.850614][3126:3126] CHIP:DMG:        AttributePathIBs =
-          [1657913877.850725][3126:3126] CHIP:DMG:        [
-          [1657913877.850771][3126:3126] CHIP:DMG:                AttributePathIB =
-          [1657913877.850821][3126:3126] CHIP:DMG:                {
-          [1657913877.850872][3126:3126] CHIP:DMG:                        Endpoint = 0x1,
-          [1657913877.850932][3126:3126] CHIP:DMG:                        Cluster = 0x8,
-          [1657913877.850989][3126:3126] CHIP:DMG:                        Attribute = 0x0000_0011,
-          [1657913877.851048][3126:3126] CHIP:DMG:                }
-          [1657913877.851103][3126:3126] CHIP:DMG:
-          [1657913877.851153][3126:3126] CHIP:DMG:        ],
-          [1657913877.851203][3126:3126] CHIP:DMG:
-          [1657913877.851251][3126:3126] CHIP:DMG:        isFabricFiltered = true,
-          [1657913877.851297][3126:3126] CHIP:DMG:        InteractionModelRevision = 1
-          [1657913877.851343][3126:3126] CHIP:DMG: },
-          [1657913877.851471][3126:3126] CHIP:DMG: IM 
-
-
-          ./chip-tool levelcontrol read options 1 1
-          Verify in TH all-clusters-app
-          [1657913895.195563][3126:3126] CHIP:IM: Received Read request
-          [1657913895.195705][3126:3126] CHIP:DMG: ReadRequestMessage =
-          [1657913895.195732][3126:3126] CHIP:DMG: {
-          [1657913895.195754][3126:3126] CHIP:DMG:        AttributePathIBs =
-          [1657913895.195780][3126:3126] CHIP:DMG:        [
-          [1657913895.195803][3126:3126] CHIP:DMG:                AttributePathIB =
-          [1657913895.195901][3126:3126] CHIP:DMG:                {
-          [1657913895.195932][3126:3126] CHIP:DMG:                        Endpoint = 0x1,
-          [1657913895.195963][3126:3126] CHIP:DMG:                        Cluster = 0x8,
-          [1657913895.195993][3126:3126] CHIP:DMG:                        Attribute = 0x0000_000F,
-          [1657913895.196022][3126:3126] CHIP:DMG:                }
-          [1657913895.196073][3126:3126] CHIP:DMG:
-          [1657913895.196101][3126:3126] CHIP:DMG:        ],
-          [1657913895.196161][3126:3126] CHIP:DMG:
-          [1657913895.196189][3126:3126] CHIP:DMG:        isFabricFiltered = true,
-          [1657913895.196214][3126:3126] CHIP:DMG:        InteractionModelRevision = 1
-          [1657913895.196236][3126:3126] CHIP:DMG: },
-
-
-          ./chip-tool levelcontrol read attribute-list 1 1
-          Verify in TH all-clusters-app
-          [1657913906.648918][3126:3126] CHIP:IM: Received Read request
-          [1657913906.649061][3126:3126] CHIP:DMG: ReadRequestMessage =
-          [1657913906.649115][3126:3126] CHIP:DMG: {
-          [1657913906.649162][3126:3126] CHIP:DMG:        AttributePathIBs =
-          [1657913906.649225][3126:3126] CHIP:DMG:        [
-          [1657913906.649273][3126:3126] CHIP:DMG:                AttributePathIB =
-          [1657913906.649330][3126:3126] CHIP:DMG:                {
-          [1657913906.649389][3126:3126] CHIP:DMG:                        Endpoint = 0x1,
-          [1657913906.649462][3126:3126] CHIP:DMG:                        Cluster = 0x8,
-          [1657913906.649529][3126:3126] CHIP:DMG:                        Attribute = 0x0000_FFFB,
-          [1657913906.649569][3126:3126] CHIP:DMG:                }
-          [1657913906.649593][3126:3126] CHIP:DMG:
-          [1657913906.649618][3126:3126] CHIP:DMG:        ],
-          [1657913906.649645][3126:3126] CHIP:DMG:
-          [1657913906.649731][3126:3126] CHIP:DMG:        isFabricFiltered = true,
-          [1657913906.649757][3126:3126] CHIP:DMG:        InteractionModelRevision = 1
-          [1657913906.649781][3126:3126] CHIP:DMG: },
-      disabled: true
-
-    - label:
-          "DUT reads all supported optional attributes from TH one at a time in
-          a manufacturer specific order"
-      verification: |
-          ./chip-tool levelcontrol read remaining-time 1 1
-          Verify in TH all-clusters-app 
-
-          [1657913955.033202][3126:3126] CHIP:IM: Received Read request
-          [1657913955.033289][3126:3126] CHIP:DMG: ReadRequestMessage =
-          [1657913955.033319][3126:3126] CHIP:DMG: {
-          [1657913955.033345][3126:3126] CHIP:DMG:        AttributePathIBs =
-          [1657913955.033377][3126:3126] CHIP:DMG:        [
-          [1657913955.033404][3126:3126] CHIP:DMG:                AttributePathIB =
-          [1657913955.033436][3126:3126] CHIP:DMG:                {
-          [1657913955.033470][3126:3126] CHIP:DMG:                        Endpoint = 0x1,
-          [1657913955.033506][3126:3126] CHIP:DMG:                        Cluster = 0x8,
-          [1657913955.033540][3126:3126] CHIP:DMG:                        Attribute = 0x0000_0001,
-          [1657913955.033577][3126:3126] CHIP:DMG:                }
-          [1657913955.033611][3126:3126] CHIP:DMG:
-          [1657913955.033642][3126:3126] CHIP:DMG:        ],
-          [1657913955.033675][3126:3126] CHIP:DMG:
-          [1657913955.033706][3126:3126] CHIP:DMG:        isFabricFiltered = true,
-          [1657913955.033737][3126:3126] CHIP:DMG:        InteractionModelRevision = 1
-          [1657913955.033764][3126:3126] CHIP:DMG: },
-
-
-           ./chip-tool levelcontrol read min-level 1 1   
-          Verify in TH all-clusters-app 
-            
-          [1657914034.938109][3245:3245] CHIP:DMG: ReadRequestMessage =
-          [1657914034.938157][3245:3245] CHIP:DMG: {
-          [1657914034.938197][3245:3245] CHIP:DMG:        AttributePathIBs =
-          [1657914034.938245][3245:3245] CHIP:DMG:        [
-          [1657914034.938351][3245:3245] CHIP:DMG:                AttributePathIB =
-          [1657914034.938417][3245:3245] CHIP:DMG:                {
-          [1657914034.938467][3245:3245] CHIP:DMG:                        Endpoint = 0x1,
-          [1657914034.938523][3245:3245] CHIP:DMG:                        Cluster = 0x8,
-          [1657914034.938582][3245:3245] CHIP:DMG:                        Attribute = 0x0000_0002,
-          [1657914034.938637][3245:3245] CHIP:DMG:                }
-          [1657914034.938741][3245:3245] CHIP:DMG:
-          [1657914034.938789][3245:3245] CHIP:DMG:        ],
-          [1657914034.938841][3245:3245] CHIP:DMG:
-          [1657914034.938889][3245:3245] CHIP:DMG:        isFabricFiltered = true,
-          [1657914034.938980][3245:3245] CHIP:DMG:        InteractionModelRevision = 1
-          [1657914034.939024][3245:3245] CHIP:DMG: },
-
-
-           ./chip-tool levelcontrol read max-level 1 1  
-          Verify in TH all-clusters-app 
-
-          [1657914049.937379][3245:3245] CHIP:IM: Received Read request
-          [1657914049.937458][3245:3245] CHIP:DMG: ReadRequestMessage =
-          [1657914049.937487][3245:3245] CHIP:DMG: {
-          [1657914049.937526][3245:3245] CHIP:DMG:        AttributePathIBs =
-          [1657914049.937555][3245:3245] CHIP:DMG:        [
-          [1657914049.937579][3245:3245] CHIP:DMG:                AttributePathIB =
-          [1657914049.937607][3245:3245] CHIP:DMG:                {
-          [1657914049.937659][3245:3245] CHIP:DMG:                        Endpoint = 0x1,
-          [1657914049.937693][3245:3245] CHIP:DMG:                        Cluster = 0x8,
-          [1657914049.937725][3245:3245] CHIP:DMG:                        Attribute = 0x0000_0003,
-          [1657914049.937758][3245:3245] CHIP:DMG:                }
-          [1657914049.937787][3245:3245] CHIP:DMG:
-          [1657914049.937809][3245:3245] CHIP:DMG:        ],
-          [1657914049.937833][3245:3245] CHIP:DMG:
-          [1657914049.937855][3245:3245] CHIP:DMG:        isFabricFiltered = true,
-          [1657914049.937891][3245:3245] CHIP:DMG:        InteractionModelRevision = 1
-          [1657914049.937916][3245:3245] CHIP:DMG: },
-
-
-          ./chip-tool levelcontrol read current-frequency 1 1
-          Verify in TH all-clusters-app 
-          [1657914066.583478][3245:3245] CHIP:DMG: ReadRequestMessage =
-          [1657914066.583530][3245:3245] CHIP:DMG: {
-          [1657914066.583568][3245:3245] CHIP:DMG:        AttributePathIBs =
-          [1657914066.583610][3245:3245] CHIP:DMG:        [
-          [1657914066.583649][3245:3245] CHIP:DMG:                AttributePathIB =
-          [1657914066.583693][3245:3245] CHIP:DMG:                {
-          [1657914066.583759][3245:3245] CHIP:DMG:                        Endpoint = 0x1,
-          [1657914066.583810][3245:3245] CHIP:DMG:                        Cluster = 0x8,
-          [1657914066.583860][3245:3245] CHIP:DMG:                        Attribute = 0x0000_0004,
-          [1657914066.583920][3245:3245] CHIP:DMG:                }
-          [1657914066.583967][3245:3245] CHIP:DMG:
-          [1657914066.584008][3245:3245] CHIP:DMG:        ],
-          [1657914066.584110][3245:3245] CHIP:DMG:
-          [1657914066.584157][3245:3245] CHIP:DMG:        isFabricFiltered = true,
-          [1657914066.584198][3245:3245] CHIP:DMG:        InteractionModelRevision = 1
-          [1657914066.584235][3245:3245] CHIP:DMG: },
-
-
-          ./chip-tool levelcontrol read min-frequency 1 1
-          Verify in TH all-clusters-app 
-          [1657914086.207991][3245:3245] CHIP:IM: Received Read request
-          [1657914086.208155][3245:3245] CHIP:DMG: ReadRequestMessage =
-          [1657914086.208207][3245:3245] CHIP:DMG: {
-          [1657914086.208264][3245:3245] CHIP:DMG:        AttributePathIBs =
-          [1657914086.208313][3245:3245] CHIP:DMG:        [
-          [1657914086.208357][3245:3245] CHIP:DMG:                AttributePathIB =
-          [1657914086.208400][3245:3245] CHIP:DMG:                {
-          [1657914086.208468][3245:3245] CHIP:DMG:                        Endpoint = 0x1,
-          [1657914086.208533][3245:3245] CHIP:DMG:                        Cluster = 0x8,
-          [1657914086.208606][3245:3245] CHIP:DMG:                        Attribute = 0x0000_0005,
-          [1657914086.208659][3245:3245] CHIP:DMG:                }
-          [1657914086.208709][3245:3245] CHIP:DMG:
-          [1657914086.208774][3245:3245] CHIP:DMG:        ],
-          [1657914086.208827][3245:3245] CHIP:DMG:
-          [1657914086.208874][3245:3245] CHIP:DMG:        isFabricFiltered = true,
-          [1657914086.208935][3245:3245] CHIP:DMG:        InteractionModelRevision = 1
-          [1657914086.208980][3245:3245] CHIP:DMG: },
-
-
-           ./chip-tool levelcontrol read max-frequency 1 1
-          Verify in TH all-clusters-app 
-          [1657914105.798625][3245:3245] CHIP:IM: Received Read request
-          [1657914105.798770][3245:3245] CHIP:DMG: ReadRequestMessage =
-          [1657914105.798846][3245:3245] CHIP:DMG: {
-          [1657914105.798896][3245:3245] CHIP:DMG:        AttributePathIBs =
-          [1657914105.798943][3245:3245] CHIP:DMG:        [
-          [1657914105.798993][3245:3245] CHIP:DMG:                AttributePathIB =
-          [1657914105.799117][3245:3245] CHIP:DMG:                {
-          [1657914105.799190][3245:3245] CHIP:DMG:                        Endpoint = 0x1,
-          [1657914105.799303][3245:3245] CHIP:DMG:                        Cluster = 0x8,
-          [1657914105.799406][3245:3245] CHIP:DMG:                        Attribute = 0x0000_0006,
-          [1657914105.799520][3245:3245] CHIP:DMG:                }
-          [1657914105.799586][3245:3245] CHIP:DMG:
-          [1657914105.799643][3245:3245] CHIP:DMG:        ],
-          [1657914105.799722][3245:3245] CHIP:DMG:
-          [1657914105.799777][3245:3245] CHIP:DMG:        isFabricFiltered = true,
-          [1657914105.799809][3245:3245] CHIP:DMG:        InteractionModelRevision = 1
-          [1657914105.799842][3245:3245] CHIP:DMG: },
-
-          ./chip-tool levelcontrol read on-off-transition-time 1 1
-          Verify in TH all-clusters-app 
-          [1657914125.515789][3245:3245] CHIP:IM: Received Read request
-          [1657914125.515917][3245:3245] CHIP:DMG: ReadRequestMessage =
-          [1657914125.515964][3245:3245] CHIP:DMG: {
-          [1657914125.516012][3245:3245] CHIP:DMG:        AttributePathIBs =
-          [1657914125.516097][3245:3245] CHIP:DMG:        [
-          [1657914125.516144][3245:3245] CHIP:DMG:                AttributePathIB =
-          [1657914125.516198][3245:3245] CHIP:DMG:                {
-          [1657914125.516248][3245:3245] CHIP:DMG:                        Endpoint = 0x1,
-          [1657914125.516307][3245:3245] CHIP:DMG:                        Cluster = 0x8,
-          [1657914125.516361][3245:3245] CHIP:DMG:                        Attribute = 0x0000_0010,
-          [1657914125.516420][3245:3245] CHIP:DMG:                }
-          [1657914125.516474][3245:3245] CHIP:DMG:
-          [1657914125.516521][3245:3245] CHIP:DMG:        ],
-          [1657914125.516572][3245:3245] CHIP:DMG:
-          [1657914125.516619][3245:3245] CHIP:DMG:        isFabricFiltered = true,
-          [1657914125.516665][3245:3245] CHIP:DMG:        InteractionModelRevision = 1
-          [1657914125.516707][3245:3245] CHIP:DMG: },
-      disabled: true
-
-    - label:
-          "DUT writes a suitable value to all supported optional attributes on
-          the TH one at a time in a manufacturer specific order"
-      verification: |
-          ./chip-tool levelcontrol write on-off-transition-time 5 1 1
-          Verify in TH all-clusters-app 
-
-          [1657914163.137445][3245:3245] CHIP:DMG: WriteRequestMessage =
-          [1657914163.137491][3245:3245] CHIP:DMG: {
-          [1657914163.137533][3245:3245] CHIP:DMG:        suppressResponse = false,
-          [1657914163.137581][3245:3245] CHIP:DMG:        timedRequest = false,
-          [1657914163.137626][3245:3245] CHIP:DMG:        AttributeDataIBs =
-          [1657914163.137679][3245:3245] CHIP:DMG:        [
-          [1657914163.137724][3245:3245] CHIP:DMG:                AttributeDataIB =
-          [1657914163.137774][3245:3245] CHIP:DMG:                {
-          [1657914163.137821][3245:3245] CHIP:DMG:                        AttributePathIB =
-          [1657914163.137883][3245:3245] CHIP:DMG:                        {
-          [1657914163.137940][3245:3245] CHIP:DMG:                                Endpoint = 0x1,
-          [1657914163.138000][3245:3245] CHIP:DMG:                                Cluster = 0x8,
-          [1657914163.138057][3245:3245] CHIP:DMG:                                Attribute = 0x0000_0010,
-          [1657914163.138115][3245:3245] CHIP:DMG:                        }
-          [1657914163.138176][3245:3245] CHIP:DMG:
-          [1657914163.138234][3245:3245] CHIP:DMG:                        Data = 5,
-          [1657914163.138291][3245:3245] CHIP:DMG:                },
-          [1657914163.138348][3245:3245] CHIP:DMG:
-          [1657914163.138391][3245:3245] CHIP:DMG:        ],
-          [1657914163.138443][3245:3245] CHIP:DMG:
-          [1657914163.138489][3245:3245] CHIP:DMG:        moreChunkedMessages = false,
-          [1657914163.138535][3245:3245] CHIP:DMG:        InteractionModelRevision = 1
-          [1657914163.138575][3245:3245] CHIP:DMG: },
-
-
-           ./chip-tool levelcontrol write on-transition-time 5 1 1
-          Verify in TH all-clusters-app 
-
-          [1657914187.402168][3245:3245] CHIP:DMG: WriteRequestMessage =
-          [1657914187.402215][3245:3245] CHIP:DMG: {
-          [1657914187.402258][3245:3245] CHIP:DMG:        suppressResponse = false,
-          [1657914187.402306][3245:3245] CHIP:DMG:        timedRequest = false,
-          [1657914187.402357][3245:3245] CHIP:DMG:        AttributeDataIBs =
-          [1657914187.402406][3245:3245] CHIP:DMG:        [
-          [1657914187.402450][3245:3245] CHIP:DMG:                AttributeDataIB =
-          [1657914187.402504][3245:3245] CHIP:DMG:                {
-          [1657914187.402552][3245:3245] CHIP:DMG:                        AttributePathIB =
-          [1657914187.402608][3245:3245] CHIP:DMG:                        {
-          [1657914187.402667][3245:3245] CHIP:DMG:                                Endpoint = 0x1,
-          [1657914187.402729][3245:3245] CHIP:DMG:                                Cluster = 0x8,
-          [1657914187.402790][3245:3245] CHIP:DMG:                                Attribute = 0x0000_0012,
-          [1657914187.402846][3245:3245] CHIP:DMG:                        }
-          [1657914187.402905][3245:3245] CHIP:DMG:
-          [1657914187.402965][3245:3245] CHIP:DMG:                        Data = 5,
-          [1657914187.403017][3245:3245] CHIP:DMG:                },
-          [1657914187.403070][3245:3245] CHIP:DMG:
-          [1657914187.403114][3245:3245] CHIP:DMG:        ],
-          [1657914187.403167][3245:3245] CHIP:DMG:
-          [1657914187.403212][3245:3245] CHIP:DMG:        moreChunkedMessages = false,
-          [1657914187.403261][3245:3245] CHIP:DMG:        InteractionModelRevision = 1
-          [1657914187.403304][3245:3245] CHIP:DMG: },
-
-
-           ./chip-tool levelcontrol write off-transition-time 5 1 1
-          [1657914206.148363][3245:3245] CHIP:DMG: WriteRequestMessage =
-          [1657914206.148411][3245:3245] CHIP:DMG: {
-          [1657914206.148452][3245:3245] CHIP:DMG:        suppressResponse = false,
-          [1657914206.148500][3245:3245] CHIP:DMG:        timedRequest = false,
-          [1657914206.148545][3245:3245] CHIP:DMG:        AttributeDataIBs =
-          [1657914206.148599][3245:3245] CHIP:DMG:        [
-          [1657914206.148643][3245:3245] CHIP:DMG:                AttributeDataIB =
-          [1657914206.148693][3245:3245] CHIP:DMG:                {
-          [1657914206.148740][3245:3245] CHIP:DMG:                        AttributePathIB =
-          [1657914206.148803][3245:3245] CHIP:DMG:                        {
-          [1657914206.148861][3245:3245] CHIP:DMG:                                Endpoint = 0x1,
-          [1657914206.148922][3245:3245] CHIP:DMG:                                Cluster = 0x8,
-          [1657914206.148983][3245:3245] CHIP:DMG:                                Attribute = 0x0000_0013,
-          [1657914206.149040][3245:3245] CHIP:DMG:                        }
-          [1657914206.149098][3245:3245] CHIP:DMG:
-          [1657914206.149156][3245:3245] CHIP:DMG:                        Data = 5,
-          [1657914206.149207][3245:3245] CHIP:DMG:                },
-          [1657914206.149260][3245:3245] CHIP:DMG:
-          [1657914206.149303][3245:3245] CHIP:DMG:        ],
-          [1657914206.149356][3245:3245] CHIP:DMG:
-          [1657914206.149400][3245:3245] CHIP:DMG:        moreChunkedMessages = false,
-          [1657914206.149447][3245:3245] CHIP:DMG:        InteractionModelRevision = 1
-          [1657914206.149489][3245:3245] CHIP:DMG: },
-
-           ./chip-tool levelcontrol write default-move-rate 5 1 1
-          Verify in TH all-clusters-app 
-
-          [1657914228.843788][3245:3245] CHIP:DMG: WriteRequestMessage =
-          [1657914228.843839][3245:3245] CHIP:DMG: {
-          [1657914228.843881][3245:3245] CHIP:DMG:        suppressResponse = false,
-          [1657914228.843929][3245:3245] CHIP:DMG:        timedRequest = false,
-          [1657914228.843974][3245:3245] CHIP:DMG:        AttributeDataIBs =
-          [1657914228.844028][3245:3245] CHIP:DMG:        [
-          [1657914228.844154][3245:3245] CHIP:DMG:                AttributeDataIB =
-          [1657914228.844215][3245:3245] CHIP:DMG:                {
-          [1657914228.844263][3245:3245] CHIP:DMG:                        AttributePathIB =
-          [1657914228.844319][3245:3245] CHIP:DMG:                        {
-          [1657914228.844383][3245:3245] CHIP:DMG:                                Endpoint = 0x1,
-          [1657914228.844446][3245:3245] CHIP:DMG:                                Cluster = 0x8,
-          [1657914228.844565][3245:3245] CHIP:DMG:                                Attribute = 0x0000_0014,
-          [1657914228.844625][3245:3245] CHIP:DMG:                        }
-          [1657914228.844686][3245:3245] CHIP:DMG:
-          [1657914228.844751][3245:3245] CHIP:DMG:                        Data = 5,
-          [1657914228.844858][3245:3245] CHIP:DMG:                },
-          [1657914228.844928][3245:3245] CHIP:DMG:
-          [1657914228.844975][3245:3245] CHIP:DMG:        ],
-          [1657914228.845028][3245:3245] CHIP:DMG:
-          [1657914228.845073][3245:3245] CHIP:DMG:        moreChunkedMessages = false,
-          [1657914228.845119][3245:3245] CHIP:DMG:        InteractionModelRevision = 1
-          [1657914228.845162][3245:3245] CHIP:DMG: },
-
-
-           ./chip-tool levelcontrol write start-up-current-level 5 1 1
-          [1657914257.054344][3245:3245] CHIP:DMG: WriteRequestMessage =
-          [1657914257.054391][3245:3245] CHIP:DMG: {
-          [1657914257.054433][3245:3245] CHIP:DMG:        suppressResponse = false,
-          [1657914257.054482][3245:3245] CHIP:DMG:        timedRequest = false,
-          [1657914257.054527][3245:3245] CHIP:DMG:        AttributeDataIBs =
-          [1657914257.054582][3245:3245] CHIP:DMG:        [
-          [1657914257.054627][3245:3245] CHIP:DMG:                AttributeDataIB =
-          [1657914257.054688][3245:3245] CHIP:DMG:                {
-          [1657914257.054736][3245:3245] CHIP:DMG:                        AttributePathIB =
-          [1657914257.054794][3245:3245] CHIP:DMG:                        {
-          [1657914257.054851][3245:3245] CHIP:DMG:                                Endpoint = 0x1,
-          [1657914257.054913][3245:3245] CHIP:DMG:                                Cluster = 0x8,
-          [1657914257.054975][3245:3245] CHIP:DMG:                                Attribute = 0x0000_4000,
-          [1657914257.055037][3245:3245] CHIP:DMG:                        }
-          [1657914257.055097][3245:3245] CHIP:DMG:
-          [1657914257.055153][3245:3245] CHIP:DMG:                        Data = 5,
-          [1657914257.055204][3245:3245] CHIP:DMG:                },
-          [1657914257.055258][3245:3245] CHIP:DMG:
-          [1657914257.055302][3245:3245] CHIP:DMG:        ],
-          [1657914257.055355][3245:3245] CHIP:DMG:
-          [1657914257.055402][3245:3245] CHIP:DMG:        moreChunkedMessages = false,
-          [1657914257.055448][3245:3245] CHIP:DMG:        InteractionModelRevision = 1
-          [1657914257.055491][3245:3245] CHIP:DMG: },
-      disabled: true
+# 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: 22.2.3. [TC-LVL-2.3] Attributes with DUT as client
+
+PICS:
+    - LVL.C
+    - LVL.C.AM-READ
+    - LVL.C.AO-READ
+    - LVL.C.AM-WRITE
+    - LVL.C.AO-WRITE
+
+config:
+    nodeId: 0x12344321
+    cluster: "Basic"
+    endpoint: 0
+
+tests:
+    - label:
+          "DUT reads all supported mandatory attributes from TH one at a time in
+          a manufacturer specific order"
+      verification: |
+          ./chip-tool levelcontrol read current-level 1 1
+          Verify in TH all-clusters-app
+          [1657279115.433005][4417:4417] CHIP:IM: Received Read request
+          [1657279115.433184][4417:4417] CHIP:DMG: ReadRequestMessage =
+          [1657279115.433258][4417:4417] CHIP:DMG: {
+          [1657279115.433313][4417:4417] CHIP:DMG:         AttributePathIBs =
+          [1657279115.433379][4417:4417] CHIP:DMG:         [
+          [1657279115.433438][4417:4417] CHIP:DMG:                 AttributePathIB =
+          [1657279115.433506][4417:4417] CHIP:DMG:                 {
+          [1657279115.433572][4417:4417] CHIP:DMG:                         Endpoint = 0x1,
+          [1657279115.433703][4417:4417] CHIP:DMG:                         Cluster = 0x8,
+          [1657279115.433781][4417:4417] CHIP:DMG:                         Attribute = 0x0000_0000,
+          [1657279115.433851][4417:4417] CHIP:DMG:                 }
+          [1657279115.433920][4417:4417] CHIP:DMG:
+          [1657279115.433980][4417:4417] CHIP:DMG:         ],
+          [1657279115.434047][4417:4417] CHIP:DMG:
+          [1657279115.434109][4417:4417] CHIP:DMG:         isFabricFiltered = true,
+          [1657279115.434169][4417:4417] CHIP:DMG:         InteractionModelRevision = 1
+          [1657279115.434226][4417:4417] CHIP:DMG: },
+
+
+          ./chip-tool levelcontrol read on-level 1 1
+          Verify in TH all-clusters-app
+          [1657279142.246433][4417:4417] CHIP:IM: Received Read request
+          [1657279142.246605][4417:4417] CHIP:DMG: ReadRequestMessage =
+          [1657279142.246670][4417:4417] CHIP:DMG: {
+          [1657279142.246725][4417:4417] CHIP:DMG:         AttributePathIBs =
+          [1657279142.246788][4417:4417] CHIP:DMG:         [
+          [1657279142.246848][4417:4417] CHIP:DMG:                 AttributePathIB =
+          [1657279142.246906][4417:4417] CHIP:DMG:                 {
+          [1657279142.246965][4417:4417] CHIP:DMG:                         Endpoint = 0x1,
+          [1657279142.247028][4417:4417] CHIP:DMG:                         Cluster = 0x8,
+          [1657279142.247100][4417:4417] CHIP:DMG:                         Attribute = 0x0000_0011,
+          [1657279142.247164][4417:4417] CHIP:DMG:                 }
+          [1657279142.247245][4417:4417] CHIP:DMG:
+          [1657279142.247310][4417:4417] CHIP:DMG:         ],
+          [1657279142.247375][4417:4417] CHIP:DMG:
+          [1657279142.247439][4417:4417] CHIP:DMG:         isFabricFiltered = true,
+          [1657279142.247500][4417:4417] CHIP:DMG:         InteractionModelRevision = 1
+          [1657279142.247552][4417:4417] CHIP:DMG: },
+
+
+          ./chip-tool levelcontrol read options 1 1
+          Verify in TH all-clusters-app
+          [1657279166.425514][4417:4417] CHIP:IM: Received Read request
+          [1657279166.425770][4417:4417] CHIP:DMG: ReadRequestMessage =
+          [1657279166.425842][4417:4417] CHIP:DMG: {
+          [1657279166.425895][4417:4417] CHIP:DMG:         AttributePathIBs =
+          [1657279166.425960][4417:4417] CHIP:DMG:         [
+          [1657279166.426018][4417:4417] CHIP:DMG:                 AttributePathIB =
+          [1657279166.426093][4417:4417] CHIP:DMG:                 {
+          [1657279166.426161][4417:4417] CHIP:DMG:                         Endpoint = 0x1,
+          [1657279166.426245][4417:4417] CHIP:DMG:                         Cluster = 0x8,
+          [1657279166.426310][4417:4417] CHIP:DMG:                         Attribute = 0x0000_000F,
+          [1657279166.426389][4417:4417] CHIP:DMG:                 }
+          [1657279166.426465][4417:4417] CHIP:DMG:
+          [1657279166.426528][4417:4417] CHIP:DMG:         ],
+          [1657279166.426597][4417:4417] CHIP:DMG:
+          [1657279166.426660][4417:4417] CHIP:DMG:         isFabricFiltered = true,
+          [1657279166.426721][4417:4417] CHIP:DMG:         InteractionModelRevision = 1
+          [1657279166.426777][4417:4417] CHIP:DMG: },
+      disabled: true
+
+    - label:
+          "DUT reads all supported optional attributes from TH one at a time in
+          a manufacturer specific order"
+      verification: |
+          ./chip-tool levelcontrol read remaining-time 1 1
+          Verify in TH all-clusters-app
+          1657913316.919773][3126:3126] CHIP:IM: Received Read request
+          [1657913316.919880][3126:3126] CHIP:DMG: ReadRequestMessage =
+          [1657913316.919920][3126:3126] CHIP:DMG: {
+          [1657913316.919952][3126:3126] CHIP:DMG:        AttributePathIBs =
+          [1657913316.919995][3126:3126] CHIP:DMG:        [
+          [1657913316.920046][3126:3126] CHIP:DMG:                AttributePathIB =
+          [1657913316.920135][3126:3126] CHIP:DMG:                {
+          [1657913316.920176][3126:3126] CHIP:DMG:                        Endpoint = 0x1,
+          [1657913316.920341][3126:3126] CHIP:DMG:                        Cluster = 0x8,
+          [1657913316.920396][3126:3126] CHIP:DMG:                        Attribute = 0x0000_0001,
+          [1657913316.920457][3126:3126] CHIP:DMG:                }
+          [1657913316.920503][3126:3126] CHIP:DMG:
+          [1657913316.920543][3126:3126] CHIP:DMG:        ],
+          [1657913316.920584][3126:3126] CHIP:DMG:
+          [1657913316.920622][3126:3126] CHIP:DMG:        isFabricFiltered = true,
+          [1657913316.920673][3126:3126] CHIP:DMG:        InteractionModelRevision = 1
+          [1657913316.920707][3126:3126] CHIP:DMG: },
+
+
+          ./chip-tool levelcontrol read min-level 1 1
+          Verify in TH all-clusters-app
+          [1657913332.319502][3126:3126] CHIP:IM: Received Read request
+          [1657913332.319628][3126:3126] CHIP:DMG: ReadRequestMessage =
+          [1657913332.319675][3126:3126] CHIP:DMG: {
+          [1657913332.319734][3126:3126] CHIP:DMG:        AttributePathIBs =
+          [1657913332.319782][3126:3126] CHIP:DMG:        [
+          [1657913332.319826][3126:3126] CHIP:DMG:                AttributePathIB =
+          [1657913332.319898][3126:3126] CHIP:DMG:                {
+          [1657913332.319950][3126:3126] CHIP:DMG:                        Endpoint = 0x1,
+          [1657913332.320006][3126:3126] CHIP:DMG:                        Cluster = 0x8,
+          [1657913332.320127][3126:3126] CHIP:DMG:                        Attribute = 0x0000_0002,
+          [1657913332.320181][3126:3126] CHIP:DMG:                }
+          [1657913332.320239][3126:3126] CHIP:DMG:
+          [1657913332.320305][3126:3126] CHIP:DMG:        ],
+          [1657913332.320358][3126:3126] CHIP:DMG:
+          [1657913332.320405][3126:3126] CHIP:DMG:        isFabricFiltered = true,
+          [1657913332.320470][3126:3126] CHIP:DMG:        InteractionModelRevision = 1
+          [1657913332.320514][3126:3126] CHIP:DMG: },
+
+
+          ./chip-tool levelcontrol read max-level 1 1
+          Verify in TH all-clusters-app
+          [1657913350.880504][3126:3126] CHIP:IM: Received Read request
+          [1657913350.880648][3126:3126] CHIP:DMG: ReadRequestMessage =
+          [1657913350.880703][3126:3126] CHIP:DMG: {
+          [1657913350.880770][3126:3126] CHIP:DMG:        AttributePathIBs =
+          [1657913350.880838][3126:3126] CHIP:DMG:        [
+          [1657913350.880889][3126:3126] CHIP:DMG:                AttributePathIB =
+          [1657913350.880965][3126:3126] CHIP:DMG:                {
+          [1657913350.881023][3126:3126] CHIP:DMG:                        Endpoint = 0x1,
+          [1657913350.881090][3126:3126] CHIP:DMG:                        Cluster = 0x8,
+          [1657913350.881175][3126:3126] CHIP:DMG:                        Attribute = 0x0000_0003,
+          [1657913350.881243][3126:3126] CHIP:DMG:                }
+          [1657913350.881437][3126:3126] CHIP:DMG:
+          [1657913350.881496][3126:3126] CHIP:DMG:        ],
+          [1657913350.881576][3126:3126] CHIP:DMG:
+          [1657913350.881630][3126:3126] CHIP:DMG:        isFabricFiltered = true,
+          [1657913350.881705][3126:3126] CHIP:DMG:        InteractionModelRevision = 1
+          [1657913350.881756][3126:3126] CHIP:DMG: },
+
+
+          ./chip-tool levelcontrol read current-frequency 1 1
+          Verify in TH all-clusters-app
+          [1657913381.091563][3126:3126] CHIP:IM: Received Read request
+          [1657913381.091690][3126:3126] CHIP:DMG: ReadRequestMessage =
+          [1657913381.091738][3126:3126] CHIP:DMG: {
+          [1657913381.091797][3126:3126] CHIP:DMG:        AttributePathIBs =
+          [1657913381.091844][3126:3126] CHIP:DMG:        [
+          [1657913381.091889][3126:3126] CHIP:DMG:                AttributePathIB =
+          [1657913381.091958][3126:3126] CHIP:DMG:                {
+          [1657913381.092013][3126:3126] CHIP:DMG:                        Endpoint = 0x1,
+          [1657913381.092105][3126:3126] CHIP:DMG:                        Cluster = 0x8,
+          [1657913381.092178][3126:3126] CHIP:DMG:                        Attribute = 0x0000_0004,
+          [1657913381.092233][3126:3126] CHIP:DMG:                }
+          [1657913381.092284][3126:3126] CHIP:DMG:
+          [1657913381.092348][3126:3126] CHIP:DMG:        ],
+          [1657913381.092400][3126:3126] CHIP:DMG:
+          [1657913381.092448][3126:3126] CHIP:DMG:        isFabricFiltered = true,
+          [1657913381.092514][3126:3126] CHIP:DMG:        InteractionModelRevision = 1
+          [1657913381.092557][3126:3126] CHIP:DMG: },
+
+
+          ./chip-tool levelcontrol read min-frequency 1 1
+          Verify in TH all-clusters-app
+          [1657913397.410411][3126:3126] CHIP:IM: Received Read request
+          [1657913397.410539][3126:3126] CHIP:DMG: ReadRequestMessage =
+          [1657913397.410588][3126:3126] CHIP:DMG: {
+          [1657913397.410629][3126:3126] CHIP:DMG:        AttributePathIBs =
+          [1657913397.410676][3126:3126] CHIP:DMG:        [
+          [1657913397.410720][3126:3126] CHIP:DMG:                AttributePathIB =
+          [1657913397.410782][3126:3126] CHIP:DMG:                {
+          [1657913397.410834][3126:3126] CHIP:DMG:                        Endpoint = 0x1,
+          [1657913397.410891][3126:3126] CHIP:DMG:                        Cluster = 0x8,
+          [1657913397.410948][3126:3126] CHIP:DMG:                        Attribute = 0x0000_0005,
+          [1657913397.411002][3126:3126] CHIP:DMG:                }
+          [1657913397.411056][3126:3126] CHIP:DMG:
+          [1657913397.411103][3126:3126] CHIP:DMG:        ],
+          [1657913397.411161][3126:3126] CHIP:DMG:
+          [1657913397.411209][3126:3126] CHIP:DMG:        isFabricFiltered = true,
+          [1657913397.411255][3126:3126] CHIP:DMG:        InteractionModelRevision = 1
+          [1657913397.411298][3126:3126] CHIP:DMG: },
+
+
+          ./chip-tool levelcontrol read max-frequency 1 1
+          Verify in TH all-clusters-app
+          [1657913412.416960][3126:3126] CHIP:IM: Received Read request
+          [1657913412.417086][3126:3126] CHIP:DMG: ReadRequestMessage =
+          [1657913412.417134][3126:3126] CHIP:DMG: {
+          [1657913412.417175][3126:3126] CHIP:DMG:        AttributePathIBs =
+          [1657913412.417227][3126:3126] CHIP:DMG:        [
+          [1657913412.417271][3126:3126] CHIP:DMG:                AttributePathIB =
+          [1657913412.417321][3126:3126] CHIP:DMG:                {
+          [1657913412.417372][3126:3126] CHIP:DMG:                        Endpoint = 0x1,
+          [1657913412.417428][3126:3126] CHIP:DMG:                        Cluster = 0x8,
+          [1657913412.417487][3126:3126] CHIP:DMG:                        Attribute = 0x0000_0006,
+          [1657913412.417542][3126:3126] CHIP:DMG:                }
+          [1657913412.417593][3126:3126] CHIP:DMG:
+          [1657913412.417642][3126:3126] CHIP:DMG:        ],
+          [1657913412.417693][3126:3126] CHIP:DMG:
+          [1657913412.417740][3126:3126] CHIP:DMG:        isFabricFiltered = true,
+          [1657913412.417786][3126:3126] CHIP:DMG:        InteractionModelRevision = 1
+          [1657913412.417822][3126:3126] CHIP:DMG: },
+
+
+          ./chip-tool levelcontrol read on-off-transition-time 1 1
+          Verify in TH all-clusters-app
+          [1657913438.117302][3126:3126] CHIP:IM: Received Read request
+          [1657913438.117462][3126:3126] CHIP:DMG: ReadRequestMessage =
+          [1657913438.117526][3126:3126] CHIP:DMG: {
+          [1657913438.117718][3126:3126] CHIP:DMG:        AttributePathIBs =
+          [1657913438.117782][3126:3126] CHIP:DMG:        [
+          [1657913438.117841][3126:3126] CHIP:DMG:                AttributePathIB =
+          [1657913438.117907][3126:3126] CHIP:DMG:                {
+          [1657913438.117976][3126:3126] CHIP:DMG:                        Endpoint = 0x1,
+          [1657913438.118061][3126:3126] CHIP:DMG:                        Cluster = 0x8,
+          [1657913438.118137][3126:3126] CHIP:DMG:                        Attribute = 0x0000_0010,
+          [1657913438.118206][3126:3126] CHIP:DMG:                }
+          [1657913438.118279][3126:3126] CHIP:DMG:
+          [1657913438.118347][3126:3126] CHIP:DMG:        ],
+          [1657913438.118415][3126:3126] CHIP:DMG:
+          [1657913438.118474][3126:3126] CHIP:DMG:        isFabricFiltered = true,
+          [1657913438.118535][3126:3126] CHIP:DMG:        InteractionModelRevision = 1
+          [1657913438.118592][3126:3126] CHIP:DMG: },
+
+
+          ./chip-tool levelcontrol read on-transition-time 1 1
+          Verify in TH all-clusters-app
+          [1657913454.127158][3126:3126] CHIP:IM: Received Read request
+          [1657913454.127241][3126:3126] CHIP:DMG: ReadRequestMessage =
+          [1657913454.127268][3126:3126] CHIP:DMG: {
+          [1657913454.127291][3126:3126] CHIP:DMG:        AttributePathIBs =
+          [1657913454.127317][3126:3126] CHIP:DMG:        [
+          [1657913454.127341][3126:3126] CHIP:DMG:                AttributePathIB =
+          [1657913454.127368][3126:3126] CHIP:DMG:                {
+          [1657913454.127396][3126:3126] CHIP:DMG:                        Endpoint = 0x1,
+          [1657913454.127461][3126:3126] CHIP:DMG:                        Cluster = 0x8,
+          [1657913454.127497][3126:3126] CHIP:DMG:                        Attribute = 0x0000_0012,
+          [1657913454.127528][3126:3126] CHIP:DMG:                }
+          [1657913454.127556][3126:3126] CHIP:DMG:
+          [1657913454.127582][3126:3126] CHIP:DMG:        ],
+          [1657913454.127610][3126:3126] CHIP:DMG:
+          [1657913454.127636][3126:3126] CHIP:DMG:        isFabricFiltered = true,
+          [1657913454.127661][3126:3126] CHIP:DMG:        InteractionModelRevision = 1
+          [1657913454.127685][3126:3126] CHIP:DMG: },
+
+
+          ./chip-tool levelcontrol read off-transition-time 1 1
+          Verify in TH all-clusters-app
+          [1657913518.488375][3126:3126] CHIP:IM: Received Read request
+          [1657913518.488457][3126:3126] CHIP:DMG: ReadRequestMessage =
+          [1657913518.488486][3126:3126] CHIP:DMG: {
+          [1657913518.488508][3126:3126] CHIP:DMG:        AttributePathIBs =
+          [1657913518.488534][3126:3126] CHIP:DMG:        [
+          [1657913518.488558][3126:3126] CHIP:DMG:                AttributePathIB =
+          [1657913518.488585][3126:3126] CHIP:DMG:                {
+          [1657913518.488613][3126:3126] CHIP:DMG:                        Endpoint = 0x1,
+          [1657913518.488649][3126:3126] CHIP:DMG:                        Cluster = 0x8,
+          [1657913518.488678][3126:3126] CHIP:DMG:                        Attribute = 0x0000_0013,
+          [1657913518.488705][3126:3126] CHIP:DMG:                }
+          [1657913518.488733][3126:3126] CHIP:DMG:
+          [1657913518.488757][3126:3126] CHIP:DMG:        ],
+          [1657913518.488785][3126:3126] CHIP:DMG:
+          [1657913518.488812][3126:3126] CHIP:DMG:        isFabricFiltered = true,
+          [1657913518.488837][3126:3126] CHIP:DMG:        InteractionModelRevision = 1
+          [1657913518.488860][3126:3126] CHIP:DMG: },
+
+
+          ./chip-tool levelcontrol read default-move-rate 1 1
+          Verify in TH all-clusters-app
+          [1657913537.304689][3126:3126] CHIP:IM: Received Read request
+          [1657913537.304828][3126:3126] CHIP:DMG: ReadRequestMessage =
+          [1657913537.304884][3126:3126] CHIP:DMG: {
+          [1657913537.304931][3126:3126] CHIP:DMG:        AttributePathIBs =
+          [1657913537.304996][3126:3126] CHIP:DMG:        [
+          [1657913537.305047][3126:3126] CHIP:DMG:                AttributePathIB =
+          [1657913537.305108][3126:3126] CHIP:DMG:                {
+          [1657913537.305171][3126:3126] CHIP:DMG:                        Endpoint = 0x1,
+          [1657913537.305238][3126:3126] CHIP:DMG:                        Cluster = 0x8,
+          [1657913537.305304][3126:3126] CHIP:DMG:                        Attribute = 0x0000_0014,
+          [1657913537.305372][3126:3126] CHIP:DMG:                }
+          [1657913537.305434][3126:3126] CHIP:DMG:
+          [1657913537.305607][3126:3126] CHIP:DMG:        ],
+          [1657913537.305675][3126:3126] CHIP:DMG:
+          [1657913537.305729][3126:3126] CHIP:DMG:        isFabricFiltered = true,
+          [1657913537.305787][3126:3126] CHIP:DMG:        InteractionModelRevision = 1
+          [1657913537.305836][3126:3126] CHIP:DMG: },
+
+
+          ./chip-tool levelcontrol read start-up-current-level 1 1
+          Verify in TH all-clusters-app
+          [1657913554.968190][3126:3126] CHIP:IM: Received Read request
+          [1657913554.968312][3126:3126] CHIP:DMG: ReadRequestMessage =
+          [1657913554.968343][3126:3126] CHIP:DMG: {
+          [1657913554.968366][3126:3126] CHIP:DMG:        AttributePathIBs =
+          [1657913554.968393][3126:3126] CHIP:DMG:        [
+          [1657913554.968416][3126:3126] CHIP:DMG:                AttributePathIB =
+          [1657913554.968444][3126:3126] CHIP:DMG:                {
+          [1657913554.968473][3126:3126] CHIP:DMG:                        Endpoint = 0x1,
+          [1657913554.968513][3126:3126] CHIP:DMG:                        Cluster = 0x8,
+          [1657913554.968546][3126:3126] CHIP:DMG:                        Attribute = 0x0000_4000,
+          [1657913554.968569][3126:3126] CHIP:DMG:                }
+          [1657913554.968594][3126:3126] CHIP:DMG:
+          [1657913554.968617][3126:3126] CHIP:DMG:        ],
+          [1657913554.968679][3126:3126] CHIP:DMG:
+          [1657913554.968717][3126:3126] CHIP:DMG:        isFabricFiltered = true,
+          [1657913554.968743][3126:3126] CHIP:DMG:        InteractionModelRevision = 1
+          [1657913554.968766][3126:3126] CHIP:DMG: },
+      disabled: true
+
+    - label:
+          "DUT writes a suitable value to all supported mandatory attributes on
+          the TH one at a time in a manufacturer specific order"
+      verification: |
+          ./chip-tool levelcontrol write on-level 5 (replace with your value) 123123 1
+          Verify in TH all-clusters-app
+          [1657913667.893875][3126:3126] CHIP:DMG: WriteRequestMessage =
+          [1657913667.893923][3126:3126] CHIP:DMG: {
+          [1657913667.893965][3126:3126] CHIP:DMG:        suppressResponse = false,
+          [1657913667.894013][3126:3126] CHIP:DMG:        timedRequest = false,
+          [1657913667.894058][3126:3126] CHIP:DMG:        AttributeDataIBs =
+          [1657913667.894112][3126:3126] CHIP:DMG:        [
+          [1657913667.894157][3126:3126] CHIP:DMG:                AttributeDataIB =
+          [1657913667.894213][3126:3126] CHIP:DMG:                {
+          [1657913667.894264][3126:3126] CHIP:DMG:                        AttributePathIB =
+          [1657913667.894322][3126:3126] CHIP:DMG:                        {
+          [1657913667.894495][3126:3126] CHIP:DMG:                                Endpoint = 0x1,
+          [1657913667.894561][3126:3126] CHIP:DMG:                                Cluster = 0x8,
+          [1657913667.894622][3126:3126] CHIP:DMG:                                Attribute = 0x0000_0011,
+          [1657913667.894684][3126:3126] CHIP:DMG:                        }
+          [1657913667.894744][3126:3126] CHIP:DMG:
+          [1657913667.894808][3126:3126] CHIP:DMG:                        Data = 5,
+          [1657913667.894866][3126:3126] CHIP:DMG:                },
+          [1657913667.894914][3126:3126] CHIP:DMG:
+          [1657913667.894957][3126:3126] CHIP:DMG:        ],
+          [1657913667.895010][3126:3126] CHIP:DMG:
+          [1657913667.895055][3126:3126] CHIP:DMG:        moreChunkedMessages = false,
+          [1657913667.895105][3126:3126] CHIP:DMG:        InteractionModelRevision = 1
+          [1657913667.895148][3126:3126] CHIP:DMG: },
+      disabled: true
+
+    - label:
+          "DUT writes a suitable value to all supported optional attributes on
+          the TH one at a time in a manufacturer specific order"
+      verification: |
+          ./chip-tool levelcontrol write on-off-transition-time 5 (replace with your own value) 123123 1
+          Verify in TH all-clusters-app
+          [1657913716.044424][3126:3126] CHIP:DMG: WriteRequestMessage =
+          [1657913716.044478][3126:3126] CHIP:DMG: {
+          [1657913716.044527][3126:3126] CHIP:DMG:        suppressResponse = false,
+          [1657913716.044583][3126:3126] CHIP:DMG:        timedRequest = false,
+          [1657913716.044634][3126:3126] CHIP:DMG:        AttributeDataIBs =
+          [1657913716.044696][3126:3126] CHIP:DMG:        [
+          [1657913716.044748][3126:3126] CHIP:DMG:                AttributeDataIB =
+          [1657913716.044806][3126:3126] CHIP:DMG:                {
+          [1657913716.044860][3126:3126] CHIP:DMG:                        AttributePathIB =
+          [1657913716.044932][3126:3126] CHIP:DMG:                        {
+          [1657913716.044994][3126:3126] CHIP:DMG:                                Endpoint = 0x1,
+          [1657913716.045061][3126:3126] CHIP:DMG:                                Cluster = 0x8,
+          [1657913716.045137][3126:3126] CHIP:DMG:                                Attribute = 0x0000_0010,
+          [1657913716.045202][3126:3126] CHIP:DMG:                        }
+          [1657913716.045270][3126:3126] CHIP:DMG:
+          [1657913716.045344][3126:3126] CHIP:DMG:                        Data = 5,
+          [1657913716.045407][3126:3126] CHIP:DMG:                },
+          [1657913716.045468][3126:3126] CHIP:DMG:
+          [1657913716.045519][3126:3126] CHIP:DMG:        ],
+          [1657913716.045579][3126:3126] CHIP:DMG:
+          [1657913716.045630][3126:3126] CHIP:DMG:        moreChunkedMessages = false,
+          [1657913716.045683][3126:3126] CHIP:DMG:        InteractionModelRevision = 1
+          [1657913716.045732][3126:3126] CHIP:DMG: },
+
+
+          ./chip-tool levelcontrol write on-transition-time 5 (replace with your value) 1 1
+          Verify in TH all-clusters-app
+          [1657913743.728014][3126:3126] CHIP:DMG: WriteRequestMessage =
+          [1657913743.728046][3126:3126] CHIP:DMG: {
+          [1657913743.728145][3126:3126] CHIP:DMG:        suppressResponse = false,
+          [1657913743.728179][3126:3126] CHIP:DMG:        timedRequest = false,
+          [1657913743.728239][3126:3126] CHIP:DMG:        AttributeDataIBs =
+          [1657913743.728279][3126:3126] CHIP:DMG:        [
+          [1657913743.728308][3126:3126] CHIP:DMG:                AttributeDataIB =
+          [1657913743.728351][3126:3126] CHIP:DMG:                {
+          [1657913743.728383][3126:3126] CHIP:DMG:                        AttributePathIB =
+          [1657913743.728423][3126:3126] CHIP:DMG:                        {
+          [1657913743.728467][3126:3126] CHIP:DMG:                                Endpoint = 0x1,
+          [1657913743.728512][3126:3126] CHIP:DMG:                                Cluster = 0x8,
+          [1657913743.728553][3126:3126] CHIP:DMG:                                Attribute = 0x0000_0012,
+          [1657913743.728591][3126:3126] CHIP:DMG:                        }
+          [1657913743.728631][3126:3126] CHIP:DMG:
+          [1657913743.728671][3126:3126] CHIP:DMG:                        Data = 5,
+          [1657913743.728710][3126:3126] CHIP:DMG:                },
+          [1657913743.728746][3126:3126] CHIP:DMG:
+          [1657913743.728775][3126:3126] CHIP:DMG:        ],
+          [1657913743.728811][3126:3126] CHIP:DMG:
+          [1657913743.728842][3126:3126] CHIP:DMG:        moreChunkedMessages = false,
+          [1657913743.728872][3126:3126] CHIP:DMG:        InteractionModelRevision = 1
+          [1657913743.728901][3126:3126] CHIP:DMG: },
+
+
+          ./chip-tool levelcontrol write off-transition-time 5 1 1
+          Verify in TH all-clusters-app
+
+          [1657913763.836957][3126:3126] CHIP:DMG: WriteRequestMessage =
+          [1657913763.837010][3126:3126] CHIP:DMG: {
+          [1657913763.837058][3126:3126] CHIP:DMG:        suppressResponse = false,
+          [1657913763.837119][3126:3126] CHIP:DMG:        timedRequest = false,
+          [1657913763.837170][3126:3126] CHIP:DMG:        AttributeDataIBs =
+          [1657913763.837230][3126:3126] CHIP:DMG:        [
+          [1657913763.837361][3126:3126] CHIP:DMG:                AttributeDataIB =
+          [1657913763.837424][3126:3126] CHIP:DMG:                {
+          [1657913763.837478][3126:3126] CHIP:DMG:                        AttributePathIB =
+          [1657913763.837544][3126:3126] CHIP:DMG:                        {
+          [1657913763.837580][3126:3126] CHIP:DMG:                                Endpoint = 0x1,
+          [1657913763.837613][3126:3126] CHIP:DMG:                                Cluster = 0x8,
+          [1657913763.837645][3126:3126] CHIP:DMG:                                Attribute = 0x0000_0013,
+          [1657913763.837755][3126:3126] CHIP:DMG:                        }
+          [1657913763.837790][3126:3126] CHIP:DMG:
+          [1657913763.837822][3126:3126] CHIP:DMG:                        Data = 5,
+          [1657913763.837850][3126:3126] CHIP:DMG:                },
+          [1657913763.837880][3126:3126] CHIP:DMG:
+          [1657913763.837904][3126:3126] CHIP:DMG:        ],
+          [1657913763.837932][3126:3126] CHIP:DMG:
+          [1657913763.837956][3126:3126] CHIP:DMG:        moreChunkedMessages = false,
+          [1657913763.837981][3126:3126] CHIP:DMG:        InteractionModelRevision = 1
+          [1657913763.838004][3126:3126] CHIP:DMG: },
+
+
+          ./chip-tool levelcontrol write default-move-rate 5 1 1
+          Verify in TH all-clusters-app
+          [1657913781.895720][3126:3126] CHIP:DMG: WriteRequestMessage =
+          [1657913781.895799][3126:3126] CHIP:DMG: {
+          [1657913781.895824][3126:3126] CHIP:DMG:        suppressResponse = false,
+          [1657913781.895850][3126:3126] CHIP:DMG:        timedRequest = false,
+          [1657913781.895874][3126:3126] CHIP:DMG:        AttributeDataIBs =
+          [1657913781.895904][3126:3126] CHIP:DMG:        [
+          [1657913781.895929][3126:3126] CHIP:DMG:                AttributeDataIB =
+          [1657913781.895956][3126:3126] CHIP:DMG:                {
+          [1657913781.895982][3126:3126] CHIP:DMG:                        AttributePathIB =
+          [1657913781.896024][3126:3126] CHIP:DMG:                        {
+          [1657913781.896147][3126:3126] CHIP:DMG:                                Endpoint = 0x1,
+          [1657913781.896209][3126:3126] CHIP:DMG:                                Cluster = 0x8,
+          [1657913781.896247][3126:3126] CHIP:DMG:                                Attribute = 0x0000_0014,
+          [1657913781.896278][3126:3126] CHIP:DMG:                        }
+          [1657913781.896312][3126:3126] CHIP:DMG:
+          [1657913781.896345][3126:3126] CHIP:DMG:                        Data = 5,
+          [1657913781.896374][3126:3126] CHIP:DMG:                },
+          [1657913781.896403][3126:3126] CHIP:DMG:
+          [1657913781.896427][3126:3126] CHIP:DMG:        ],
+          [1657913781.896503][3126:3126] CHIP:DMG:
+          [1657913781.896531][3126:3126] CHIP:DMG:        moreChunkedMessages = false,
+          [1657913781.896558][3126:3126] CHIP:DMG:        InteractionModelRevision = 1
+          [1657913781.896581][3126:3126] CHIP:DMG: },
+
+
+          ./chip-tool levelcontrol write start-up-current-level 5 (replace with your value) 123123 1
+          Verify in TH all-clusters-app
+          [1657913811.290764][3126:3126] CHIP:DMG: WriteRequestMessage =
+          [1657913811.290809][3126:3126] CHIP:DMG: {
+          [1657913811.290850][3126:3126] CHIP:DMG:        suppressResponse = false,
+          [1657913811.290898][3126:3126] CHIP:DMG:        timedRequest = false,
+          [1657913811.290942][3126:3126] CHIP:DMG:        AttributeDataIBs =
+          [1657913811.290995][3126:3126] CHIP:DMG:        [
+          [1657913811.291039][3126:3126] CHIP:DMG:                AttributeDataIB =
+          [1657913811.291094][3126:3126] CHIP:DMG:                {
+          [1657913811.291142][3126:3126] CHIP:DMG:                        AttributePathIB =
+          [1657913811.291258][3126:3126] CHIP:DMG:                        {
+          [1657913811.291326][3126:3126] CHIP:DMG:                                Endpoint = 0x1,
+          [1657913811.291394][3126:3126] CHIP:DMG:                                Cluster = 0x8,
+          [1657913811.291455][3126:3126] CHIP:DMG:                                Attribute = 0x0000_4000,
+          [1657913811.291512][3126:3126] CHIP:DMG:                        }
+          [1657913811.291630][3126:3126] CHIP:DMG:
+          [1657913811.291694][3126:3126] CHIP:DMG:                        Data = 5,
+          [1657913811.291748][3126:3126] CHIP:DMG:                },
+          [1657913811.291805][3126:3126] CHIP:DMG:
+          [1657913811.291848][3126:3126] CHIP:DMG:        ],
+          [1657913811.291949][3126:3126] CHIP:DMG:
+          [1657913811.291992][3126:3126] CHIP:DMG:        moreChunkedMessages = false,
+          [1657913811.292017][3126:3126] CHIP:DMG:        InteractionModelRevision = 1
+          [1657913811.292039][3126:3126] CHIP:DMG: },
+      disabled: true
+
+    - label:
+          "Configure TH such that it implements mandatory and none of the
+          optional attributes of the server-side of the cluster, and that it
+          also reflects this in global attributes such as FeatureMap and
+          AttributeList. Commission DUT to TH again"
+      verification: |
+          ./chip-tool levelcontrol read current-level 1 1
+          Verify in TH all-clusters-app
+          [1657913862.815749][3126:3126] CHIP:IM: Received Read request
+          [1657913862.815884][3126:3126] CHIP:DMG: ReadRequestMessage =
+          [1657913862.815935][3126:3126] CHIP:DMG: {
+          [1657913862.815975][3126:3126] CHIP:DMG:        AttributePathIBs =
+          [1657913862.816023][3126:3126] CHIP:DMG:        [
+          [1657913862.816107][3126:3126] CHIP:DMG:                AttributePathIB =
+          [1657913862.816161][3126:3126] CHIP:DMG:                {
+          [1657913862.816212][3126:3126] CHIP:DMG:                        Endpoint = 0x1,
+          [1657913862.816268][3126:3126] CHIP:DMG:                        Cluster = 0x8,
+          [1657913862.816325][3126:3126] CHIP:DMG:                        Attribute = 0x0000_0000,
+          [1657913862.816377][3126:3126] CHIP:DMG:                }
+          [1657913862.816431][3126:3126] CHIP:DMG:
+          [1657913862.816477][3126:3126] CHIP:DMG:        ],
+          [1657913862.816527][3126:3126] CHIP:DMG:
+          [1657913862.816573][3126:3126] CHIP:DMG:        isFabricFiltered = true,
+          [1657913862.816619][3126:3126] CHIP:DMG:        InteractionModelRevision = 1
+          [1657913862.816662][3126:3126] CHIP:DMG: },
+
+
+          ./chip-tool levelcontrol read on-level 1 1
+          Verify in TH all-clusters-app
+          [1657913877.850398][3126:3126] CHIP:IM: Received Read request
+          [1657913877.850525][3126:3126] CHIP:DMG: ReadRequestMessage =
+          [1657913877.850574][3126:3126] CHIP:DMG: {
+          [1657913877.850614][3126:3126] CHIP:DMG:        AttributePathIBs =
+          [1657913877.850725][3126:3126] CHIP:DMG:        [
+          [1657913877.850771][3126:3126] CHIP:DMG:                AttributePathIB =
+          [1657913877.850821][3126:3126] CHIP:DMG:                {
+          [1657913877.850872][3126:3126] CHIP:DMG:                        Endpoint = 0x1,
+          [1657913877.850932][3126:3126] CHIP:DMG:                        Cluster = 0x8,
+          [1657913877.850989][3126:3126] CHIP:DMG:                        Attribute = 0x0000_0011,
+          [1657913877.851048][3126:3126] CHIP:DMG:                }
+          [1657913877.851103][3126:3126] CHIP:DMG:
+          [1657913877.851153][3126:3126] CHIP:DMG:        ],
+          [1657913877.851203][3126:3126] CHIP:DMG:
+          [1657913877.851251][3126:3126] CHIP:DMG:        isFabricFiltered = true,
+          [1657913877.851297][3126:3126] CHIP:DMG:        InteractionModelRevision = 1
+          [1657913877.851343][3126:3126] CHIP:DMG: },
+          [1657913877.851471][3126:3126] CHIP:DMG: IM
+
+
+          ./chip-tool levelcontrol read options 1 1
+          Verify in TH all-clusters-app
+          [1657913895.195563][3126:3126] CHIP:IM: Received Read request
+          [1657913895.195705][3126:3126] CHIP:DMG: ReadRequestMessage =
+          [1657913895.195732][3126:3126] CHIP:DMG: {
+          [1657913895.195754][3126:3126] CHIP:DMG:        AttributePathIBs =
+          [1657913895.195780][3126:3126] CHIP:DMG:        [
+          [1657913895.195803][3126:3126] CHIP:DMG:                AttributePathIB =
+          [1657913895.195901][3126:3126] CHIP:DMG:                {
+          [1657913895.195932][3126:3126] CHIP:DMG:                        Endpoint = 0x1,
+          [1657913895.195963][3126:3126] CHIP:DMG:                        Cluster = 0x8,
+          [1657913895.195993][3126:3126] CHIP:DMG:                        Attribute = 0x0000_000F,
+          [1657913895.196022][3126:3126] CHIP:DMG:                }
+          [1657913895.196073][3126:3126] CHIP:DMG:
+          [1657913895.196101][3126:3126] CHIP:DMG:        ],
+          [1657913895.196161][3126:3126] CHIP:DMG:
+          [1657913895.196189][3126:3126] CHIP:DMG:        isFabricFiltered = true,
+          [1657913895.196214][3126:3126] CHIP:DMG:        InteractionModelRevision = 1
+          [1657913895.196236][3126:3126] CHIP:DMG: },
+
+
+          ./chip-tool levelcontrol read attribute-list 1 1
+          Verify in TH all-clusters-app
+          [1657913906.648918][3126:3126] CHIP:IM: Received Read request
+          [1657913906.649061][3126:3126] CHIP:DMG: ReadRequestMessage =
+          [1657913906.649115][3126:3126] CHIP:DMG: {
+          [1657913906.649162][3126:3126] CHIP:DMG:        AttributePathIBs =
+          [1657913906.649225][3126:3126] CHIP:DMG:        [
+          [1657913906.649273][3126:3126] CHIP:DMG:                AttributePathIB =
+          [1657913906.649330][3126:3126] CHIP:DMG:                {
+          [1657913906.649389][3126:3126] CHIP:DMG:                        Endpoint = 0x1,
+          [1657913906.649462][3126:3126] CHIP:DMG:                        Cluster = 0x8,
+          [1657913906.649529][3126:3126] CHIP:DMG:                        Attribute = 0x0000_FFFB,
+          [1657913906.649569][3126:3126] CHIP:DMG:                }
+          [1657913906.649593][3126:3126] CHIP:DMG:
+          [1657913906.649618][3126:3126] CHIP:DMG:        ],
+          [1657913906.649645][3126:3126] CHIP:DMG:
+          [1657913906.649731][3126:3126] CHIP:DMG:        isFabricFiltered = true,
+          [1657913906.649757][3126:3126] CHIP:DMG:        InteractionModelRevision = 1
+          [1657913906.649781][3126:3126] CHIP:DMG: },
+      disabled: true
+
+    - label:
+          "DUT reads all supported optional attributes from TH one at a time in
+          a manufacturer specific order"
+      verification: |
+          ./chip-tool levelcontrol read remaining-time 1 1
+          Verify in TH all-clusters-app
+
+          [1657913955.033202][3126:3126] CHIP:IM: Received Read request
+          [1657913955.033289][3126:3126] CHIP:DMG: ReadRequestMessage =
+          [1657913955.033319][3126:3126] CHIP:DMG: {
+          [1657913955.033345][3126:3126] CHIP:DMG:        AttributePathIBs =
+          [1657913955.033377][3126:3126] CHIP:DMG:        [
+          [1657913955.033404][3126:3126] CHIP:DMG:                AttributePathIB =
+          [1657913955.033436][3126:3126] CHIP:DMG:                {
+          [1657913955.033470][3126:3126] CHIP:DMG:                        Endpoint = 0x1,
+          [1657913955.033506][3126:3126] CHIP:DMG:                        Cluster = 0x8,
+          [1657913955.033540][3126:3126] CHIP:DMG:                        Attribute = 0x0000_0001,
+          [1657913955.033577][3126:3126] CHIP:DMG:                }
+          [1657913955.033611][3126:3126] CHIP:DMG:
+          [1657913955.033642][3126:3126] CHIP:DMG:        ],
+          [1657913955.033675][3126:3126] CHIP:DMG:
+          [1657913955.033706][3126:3126] CHIP:DMG:        isFabricFiltered = true,
+          [1657913955.033737][3126:3126] CHIP:DMG:        InteractionModelRevision = 1
+          [1657913955.033764][3126:3126] CHIP:DMG: },
+
+
+           ./chip-tool levelcontrol read min-level 1 1
+          Verify in TH all-clusters-app
+
+          [1657914034.938109][3245:3245] CHIP:DMG: ReadRequestMessage =
+          [1657914034.938157][3245:3245] CHIP:DMG: {
+          [1657914034.938197][3245:3245] CHIP:DMG:        AttributePathIBs =
+          [1657914034.938245][3245:3245] CHIP:DMG:        [
+          [1657914034.938351][3245:3245] CHIP:DMG:                AttributePathIB =
+          [1657914034.938417][3245:3245] CHIP:DMG:                {
+          [1657914034.938467][3245:3245] CHIP:DMG:                        Endpoint = 0x1,
+          [1657914034.938523][3245:3245] CHIP:DMG:                        Cluster = 0x8,
+          [1657914034.938582][3245:3245] CHIP:DMG:                        Attribute = 0x0000_0002,
+          [1657914034.938637][3245:3245] CHIP:DMG:                }
+          [1657914034.938741][3245:3245] CHIP:DMG:
+          [1657914034.938789][3245:3245] CHIP:DMG:        ],
+          [1657914034.938841][3245:3245] CHIP:DMG:
+          [1657914034.938889][3245:3245] CHIP:DMG:        isFabricFiltered = true,
+          [1657914034.938980][3245:3245] CHIP:DMG:        InteractionModelRevision = 1
+          [1657914034.939024][3245:3245] CHIP:DMG: },
+
+
+           ./chip-tool levelcontrol read max-level 1 1
+          Verify in TH all-clusters-app
+
+          [1657914049.937379][3245:3245] CHIP:IM: Received Read request
+          [1657914049.937458][3245:3245] CHIP:DMG: ReadRequestMessage =
+          [1657914049.937487][3245:3245] CHIP:DMG: {
+          [1657914049.937526][3245:3245] CHIP:DMG:        AttributePathIBs =
+          [1657914049.937555][3245:3245] CHIP:DMG:        [
+          [1657914049.937579][3245:3245] CHIP:DMG:                AttributePathIB =
+          [1657914049.937607][3245:3245] CHIP:DMG:                {
+          [1657914049.937659][3245:3245] CHIP:DMG:                        Endpoint = 0x1,
+          [1657914049.937693][3245:3245] CHIP:DMG:                        Cluster = 0x8,
+          [1657914049.937725][3245:3245] CHIP:DMG:                        Attribute = 0x0000_0003,
+          [1657914049.937758][3245:3245] CHIP:DMG:                }
+          [1657914049.937787][3245:3245] CHIP:DMG:
+          [1657914049.937809][3245:3245] CHIP:DMG:        ],
+          [1657914049.937833][3245:3245] CHIP:DMG:
+          [1657914049.937855][3245:3245] CHIP:DMG:        isFabricFiltered = true,
+          [1657914049.937891][3245:3245] CHIP:DMG:        InteractionModelRevision = 1
+          [1657914049.937916][3245:3245] CHIP:DMG: },
+
+
+          ./chip-tool levelcontrol read current-frequency 1 1
+          Verify in TH all-clusters-app
+          [1657914066.583478][3245:3245] CHIP:DMG: ReadRequestMessage =
+          [1657914066.583530][3245:3245] CHIP:DMG: {
+          [1657914066.583568][3245:3245] CHIP:DMG:        AttributePathIBs =
+          [1657914066.583610][3245:3245] CHIP:DMG:        [
+          [1657914066.583649][3245:3245] CHIP:DMG:                AttributePathIB =
+          [1657914066.583693][3245:3245] CHIP:DMG:                {
+          [1657914066.583759][3245:3245] CHIP:DMG:                        Endpoint = 0x1,
+          [1657914066.583810][3245:3245] CHIP:DMG:                        Cluster = 0x8,
+          [1657914066.583860][3245:3245] CHIP:DMG:                        Attribute = 0x0000_0004,
+          [1657914066.583920][3245:3245] CHIP:DMG:                }
+          [1657914066.583967][3245:3245] CHIP:DMG:
+          [1657914066.584008][3245:3245] CHIP:DMG:        ],
+          [1657914066.584110][3245:3245] CHIP:DMG:
+          [1657914066.584157][3245:3245] CHIP:DMG:        isFabricFiltered = true,
+          [1657914066.584198][3245:3245] CHIP:DMG:        InteractionModelRevision = 1
+          [1657914066.584235][3245:3245] CHIP:DMG: },
+
+
+          ./chip-tool levelcontrol read min-frequency 1 1
+          Verify in TH all-clusters-app
+          [1657914086.207991][3245:3245] CHIP:IM: Received Read request
+          [1657914086.208155][3245:3245] CHIP:DMG: ReadRequestMessage =
+          [1657914086.208207][3245:3245] CHIP:DMG: {
+          [1657914086.208264][3245:3245] CHIP:DMG:        AttributePathIBs =
+          [1657914086.208313][3245:3245] CHIP:DMG:        [
+          [1657914086.208357][3245:3245] CHIP:DMG:                AttributePathIB =
+          [1657914086.208400][3245:3245] CHIP:DMG:                {
+          [1657914086.208468][3245:3245] CHIP:DMG:                        Endpoint = 0x1,
+          [1657914086.208533][3245:3245] CHIP:DMG:                        Cluster = 0x8,
+          [1657914086.208606][3245:3245] CHIP:DMG:                        Attribute = 0x0000_0005,
+          [1657914086.208659][3245:3245] CHIP:DMG:                }
+          [1657914086.208709][3245:3245] CHIP:DMG:
+          [1657914086.208774][3245:3245] CHIP:DMG:        ],
+          [1657914086.208827][3245:3245] CHIP:DMG:
+          [1657914086.208874][3245:3245] CHIP:DMG:        isFabricFiltered = true,
+          [1657914086.208935][3245:3245] CHIP:DMG:        InteractionModelRevision = 1
+          [1657914086.208980][3245:3245] CHIP:DMG: },
+
+
+           ./chip-tool levelcontrol read max-frequency 1 1
+          Verify in TH all-clusters-app
+          [1657914105.798625][3245:3245] CHIP:IM: Received Read request
+          [1657914105.798770][3245:3245] CHIP:DMG: ReadRequestMessage =
+          [1657914105.798846][3245:3245] CHIP:DMG: {
+          [1657914105.798896][3245:3245] CHIP:DMG:        AttributePathIBs =
+          [1657914105.798943][3245:3245] CHIP:DMG:        [
+          [1657914105.798993][3245:3245] CHIP:DMG:                AttributePathIB =
+          [1657914105.799117][3245:3245] CHIP:DMG:                {
+          [1657914105.799190][3245:3245] CHIP:DMG:                        Endpoint = 0x1,
+          [1657914105.799303][3245:3245] CHIP:DMG:                        Cluster = 0x8,
+          [1657914105.799406][3245:3245] CHIP:DMG:                        Attribute = 0x0000_0006,
+          [1657914105.799520][3245:3245] CHIP:DMG:                }
+          [1657914105.799586][3245:3245] CHIP:DMG:
+          [1657914105.799643][3245:3245] CHIP:DMG:        ],
+          [1657914105.799722][3245:3245] CHIP:DMG:
+          [1657914105.799777][3245:3245] CHIP:DMG:        isFabricFiltered = true,
+          [1657914105.799809][3245:3245] CHIP:DMG:        InteractionModelRevision = 1
+          [1657914105.799842][3245:3245] CHIP:DMG: },
+
+          ./chip-tool levelcontrol read on-off-transition-time 1 1
+          Verify in TH all-clusters-app
+          [1657914125.515789][3245:3245] CHIP:IM: Received Read request
+          [1657914125.515917][3245:3245] CHIP:DMG: ReadRequestMessage =
+          [1657914125.515964][3245:3245] CHIP:DMG: {
+          [1657914125.516012][3245:3245] CHIP:DMG:        AttributePathIBs =
+          [1657914125.516097][3245:3245] CHIP:DMG:        [
+          [1657914125.516144][3245:3245] CHIP:DMG:                AttributePathIB =
+          [1657914125.516198][3245:3245] CHIP:DMG:                {
+          [1657914125.516248][3245:3245] CHIP:DMG:                        Endpoint = 0x1,
+          [1657914125.516307][3245:3245] CHIP:DMG:                        Cluster = 0x8,
+          [1657914125.516361][3245:3245] CHIP:DMG:                        Attribute = 0x0000_0010,
+          [1657914125.516420][3245:3245] CHIP:DMG:                }
+          [1657914125.516474][3245:3245] CHIP:DMG:
+          [1657914125.516521][3245:3245] CHIP:DMG:        ],
+          [1657914125.516572][3245:3245] CHIP:DMG:
+          [1657914125.516619][3245:3245] CHIP:DMG:        isFabricFiltered = true,
+          [1657914125.516665][3245:3245] CHIP:DMG:        InteractionModelRevision = 1
+          [1657914125.516707][3245:3245] CHIP:DMG: },
+      disabled: true
+
+    - label:
+          "DUT writes a suitable value to all supported optional attributes on
+          the TH one at a time in a manufacturer specific order"
+      verification: |
+          ./chip-tool levelcontrol write on-off-transition-time 5 1 1
+          Verify in TH all-clusters-app
+
+          [1657914163.137445][3245:3245] CHIP:DMG: WriteRequestMessage =
+          [1657914163.137491][3245:3245] CHIP:DMG: {
+          [1657914163.137533][3245:3245] CHIP:DMG:        suppressResponse = false,
+          [1657914163.137581][3245:3245] CHIP:DMG:        timedRequest = false,
+          [1657914163.137626][3245:3245] CHIP:DMG:        AttributeDataIBs =
+          [1657914163.137679][3245:3245] CHIP:DMG:        [
+          [1657914163.137724][3245:3245] CHIP:DMG:                AttributeDataIB =
+          [1657914163.137774][3245:3245] CHIP:DMG:                {
+          [1657914163.137821][3245:3245] CHIP:DMG:                        AttributePathIB =
+          [1657914163.137883][3245:3245] CHIP:DMG:                        {
+          [1657914163.137940][3245:3245] CHIP:DMG:                                Endpoint = 0x1,
+          [1657914163.138000][3245:3245] CHIP:DMG:                                Cluster = 0x8,
+          [1657914163.138057][3245:3245] CHIP:DMG:                                Attribute = 0x0000_0010,
+          [1657914163.138115][3245:3245] CHIP:DMG:                        }
+          [1657914163.138176][3245:3245] CHIP:DMG:
+          [1657914163.138234][3245:3245] CHIP:DMG:                        Data = 5,
+          [1657914163.138291][3245:3245] CHIP:DMG:                },
+          [1657914163.138348][3245:3245] CHIP:DMG:
+          [1657914163.138391][3245:3245] CHIP:DMG:        ],
+          [1657914163.138443][3245:3245] CHIP:DMG:
+          [1657914163.138489][3245:3245] CHIP:DMG:        moreChunkedMessages = false,
+          [1657914163.138535][3245:3245] CHIP:DMG:        InteractionModelRevision = 1
+          [1657914163.138575][3245:3245] CHIP:DMG: },
+
+
+           ./chip-tool levelcontrol write on-transition-time 5 1 1
+          Verify in TH all-clusters-app
+
+          [1657914187.402168][3245:3245] CHIP:DMG: WriteRequestMessage =
+          [1657914187.402215][3245:3245] CHIP:DMG: {
+          [1657914187.402258][3245:3245] CHIP:DMG:        suppressResponse = false,
+          [1657914187.402306][3245:3245] CHIP:DMG:        timedRequest = false,
+          [1657914187.402357][3245:3245] CHIP:DMG:        AttributeDataIBs =
+          [1657914187.402406][3245:3245] CHIP:DMG:        [
+          [1657914187.402450][3245:3245] CHIP:DMG:                AttributeDataIB =
+          [1657914187.402504][3245:3245] CHIP:DMG:                {
+          [1657914187.402552][3245:3245] CHIP:DMG:                        AttributePathIB =
+          [1657914187.402608][3245:3245] CHIP:DMG:                        {
+          [1657914187.402667][3245:3245] CHIP:DMG:                                Endpoint = 0x1,
+          [1657914187.402729][3245:3245] CHIP:DMG:                                Cluster = 0x8,
+          [1657914187.402790][3245:3245] CHIP:DMG:                                Attribute = 0x0000_0012,
+          [1657914187.402846][3245:3245] CHIP:DMG:                        }
+          [1657914187.402905][3245:3245] CHIP:DMG:
+          [1657914187.402965][3245:3245] CHIP:DMG:                        Data = 5,
+          [1657914187.403017][3245:3245] CHIP:DMG:                },
+          [1657914187.403070][3245:3245] CHIP:DMG:
+          [1657914187.403114][3245:3245] CHIP:DMG:        ],
+          [1657914187.403167][3245:3245] CHIP:DMG:
+          [1657914187.403212][3245:3245] CHIP:DMG:        moreChunkedMessages = false,
+          [1657914187.403261][3245:3245] CHIP:DMG:        InteractionModelRevision = 1
+          [1657914187.403304][3245:3245] CHIP:DMG: },
+
+
+           ./chip-tool levelcontrol write off-transition-time 5 1 1
+          [1657914206.148363][3245:3245] CHIP:DMG: WriteRequestMessage =
+          [1657914206.148411][3245:3245] CHIP:DMG: {
+          [1657914206.148452][3245:3245] CHIP:DMG:        suppressResponse = false,
+          [1657914206.148500][3245:3245] CHIP:DMG:        timedRequest = false,
+          [1657914206.148545][3245:3245] CHIP:DMG:        AttributeDataIBs =
+          [1657914206.148599][3245:3245] CHIP:DMG:        [
+          [1657914206.148643][3245:3245] CHIP:DMG:                AttributeDataIB =
+          [1657914206.148693][3245:3245] CHIP:DMG:                {
+          [1657914206.148740][3245:3245] CHIP:DMG:                        AttributePathIB =
+          [1657914206.148803][3245:3245] CHIP:DMG:                        {
+          [1657914206.148861][3245:3245] CHIP:DMG:                                Endpoint = 0x1,
+          [1657914206.148922][3245:3245] CHIP:DMG:                                Cluster = 0x8,
+          [1657914206.148983][3245:3245] CHIP:DMG:                                Attribute = 0x0000_0013,
+          [1657914206.149040][3245:3245] CHIP:DMG:                        }
+          [1657914206.149098][3245:3245] CHIP:DMG:
+          [1657914206.149156][3245:3245] CHIP:DMG:                        Data = 5,
+          [1657914206.149207][3245:3245] CHIP:DMG:                },
+          [1657914206.149260][3245:3245] CHIP:DMG:
+          [1657914206.149303][3245:3245] CHIP:DMG:        ],
+          [1657914206.149356][3245:3245] CHIP:DMG:
+          [1657914206.149400][3245:3245] CHIP:DMG:        moreChunkedMessages = false,
+          [1657914206.149447][3245:3245] CHIP:DMG:        InteractionModelRevision = 1
+          [1657914206.149489][3245:3245] CHIP:DMG: },
+
+           ./chip-tool levelcontrol write default-move-rate 5 1 1
+          Verify in TH all-clusters-app
+
+          [1657914228.843788][3245:3245] CHIP:DMG: WriteRequestMessage =
+          [1657914228.843839][3245:3245] CHIP:DMG: {
+          [1657914228.843881][3245:3245] CHIP:DMG:        suppressResponse = false,
+          [1657914228.843929][3245:3245] CHIP:DMG:        timedRequest = false,
+          [1657914228.843974][3245:3245] CHIP:DMG:        AttributeDataIBs =
+          [1657914228.844028][3245:3245] CHIP:DMG:        [
+          [1657914228.844154][3245:3245] CHIP:DMG:                AttributeDataIB =
+          [1657914228.844215][3245:3245] CHIP:DMG:                {
+          [1657914228.844263][3245:3245] CHIP:DMG:                        AttributePathIB =
+          [1657914228.844319][3245:3245] CHIP:DMG:                        {
+          [1657914228.844383][3245:3245] CHIP:DMG:                                Endpoint = 0x1,
+          [1657914228.844446][3245:3245] CHIP:DMG:                                Cluster = 0x8,
+          [1657914228.844565][3245:3245] CHIP:DMG:                                Attribute = 0x0000_0014,
+          [1657914228.844625][3245:3245] CHIP:DMG:                        }
+          [1657914228.844686][3245:3245] CHIP:DMG:
+          [1657914228.844751][3245:3245] CHIP:DMG:                        Data = 5,
+          [1657914228.844858][3245:3245] CHIP:DMG:                },
+          [1657914228.844928][3245:3245] CHIP:DMG:
+          [1657914228.844975][3245:3245] CHIP:DMG:        ],
+          [1657914228.845028][3245:3245] CHIP:DMG:
+          [1657914228.845073][3245:3245] CHIP:DMG:        moreChunkedMessages = false,
+          [1657914228.845119][3245:3245] CHIP:DMG:        InteractionModelRevision = 1
+          [1657914228.845162][3245:3245] CHIP:DMG: },
+
+
+           ./chip-tool levelcontrol write start-up-current-level 5 1 1
+          [1657914257.054344][3245:3245] CHIP:DMG: WriteRequestMessage =
+          [1657914257.054391][3245:3245] CHIP:DMG: {
+          [1657914257.054433][3245:3245] CHIP:DMG:        suppressResponse = false,
+          [1657914257.054482][3245:3245] CHIP:DMG:        timedRequest = false,
+          [1657914257.054527][3245:3245] CHIP:DMG:        AttributeDataIBs =
+          [1657914257.054582][3245:3245] CHIP:DMG:        [
+          [1657914257.054627][3245:3245] CHIP:DMG:                AttributeDataIB =
+          [1657914257.054688][3245:3245] CHIP:DMG:                {
+          [1657914257.054736][3245:3245] CHIP:DMG:                        AttributePathIB =
+          [1657914257.054794][3245:3245] CHIP:DMG:                        {
+          [1657914257.054851][3245:3245] CHIP:DMG:                                Endpoint = 0x1,
+          [1657914257.054913][3245:3245] CHIP:DMG:                                Cluster = 0x8,
+          [1657914257.054975][3245:3245] CHIP:DMG:                                Attribute = 0x0000_4000,
+          [1657914257.055037][3245:3245] CHIP:DMG:                        }
+          [1657914257.055097][3245:3245] CHIP:DMG:
+          [1657914257.055153][3245:3245] CHIP:DMG:                        Data = 5,
+          [1657914257.055204][3245:3245] CHIP:DMG:                },
+          [1657914257.055258][3245:3245] CHIP:DMG:
+          [1657914257.055302][3245:3245] CHIP:DMG:        ],
+          [1657914257.055355][3245:3245] CHIP:DMG:
+          [1657914257.055402][3245:3245] CHIP:DMG:        moreChunkedMessages = false,
+          [1657914257.055448][3245:3245] CHIP:DMG:        InteractionModelRevision = 1
+          [1657914257.055491][3245:3245] CHIP:DMG: },
+      disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_LVL_3_1.yaml b/src/app/tests/suites/certification/Test_TC_LVL_3_1.yaml
index 4545de8e01c1bf..23743e71284c1a 100644
--- a/src/app/tests/suites/certification/Test_TC_LVL_3_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_LVL_3_1.yaml
@@ -14,6 +14,9 @@
 
 name: 24.3.1. [TC-LVL-3.1] MoveToLevel Verification (DUT as Server)
 
+PICS:
+    - LVL.S
+
 config:
     nodeId: 0x12344321
     cluster: "Level Control"
diff --git a/src/app/tests/suites/certification/Test_TC_LVL_7_1.yaml b/src/app/tests/suites/certification/Test_TC_LVL_7_1.yaml
index 363764d9b181bb..02b907a1ead330 100644
--- a/src/app/tests/suites/certification/Test_TC_LVL_7_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_LVL_7_1.yaml
@@ -17,6 +17,10 @@ name:
     22.6.2. [TC-LVL-7.1] Verification of MoveToClosestFrequency command (DUT as
     Server)
 
+PICS:
+    - LVL.S
+    - LVL.S.F02
+
 config:
     nodeId: 0x12344321
     cluster: "Basic"
diff --git a/src/app/tests/suites/certification/Test_TC_LVL_8_1.yaml b/src/app/tests/suites/certification/Test_TC_LVL_8_1.yaml
index 18b08ce17dc65b..ccdb8256d4aefd 100644
--- a/src/app/tests/suites/certification/Test_TC_LVL_8_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_LVL_8_1.yaml
@@ -1,299 +1,302 @@
-# 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: 22.6.3. [TC-LVL-8.1] Verification of commands (DUT as Client)
-
-config:
-    nodeId: 0x12344321
-    cluster: "Basic"
-    endpoint: 0
-
-tests:
-    - label:
-          "TH prompts the operator to make the DUT send one or more supported
-          commands from the Level Control cluster"
-      verification: |
-          ./chip-tool levelcontrol move-to-level 125 10 0 0 1 1
-          Verify in TH all-clusters-app
-          [1657915209.151256][3245:3245] CHIP:DMG: InvokeRequestMessage =
-          [1657915209.151306][3245:3245] CHIP:DMG: {
-          [1657915209.151348][3245:3245] CHIP:DMG:        suppressResponse = false,
-          [1657915209.151397][3245:3245] CHIP:DMG:        timedRequest = false,
-          [1657915209.151441][3245:3245] CHIP:DMG:        InvokeRequests =
-          [1657915209.151498][3245:3245] CHIP:DMG:        [
-          [1657915209.151543][3245:3245] CHIP:DMG:                CommandDataIB =
-          [1657915209.151594][3245:3245] CHIP:DMG:                {
-          [1657915209.151642][3245:3245] CHIP:DMG:                        CommandPathIB =
-          [1657915209.151699][3245:3245] CHIP:DMG:                        {
-          [1657915209.151752][3245:3245] CHIP:DMG:                                EndpointId = 0x1,
-          [1657915209.151814][3245:3245] CHIP:DMG:                                ClusterId = 0x8,
-          [1657915209.151874][3245:3245] CHIP:DMG:                                CommandId = 0x0,
-          [1657915209.151929][3245:3245] CHIP:DMG:                        },
-          [1657915209.151993][3245:3245] CHIP:DMG:
-          [1657915209.152041][3245:3245] CHIP:DMG:                        CommandFields =
-          [1657915209.152128][3245:3245] CHIP:DMG:                        {
-          [1657915209.152190][3245:3245] CHIP:DMG:                                0x0 = 125,
-          [1657915209.152251][3245:3245] CHIP:DMG:                                0x1 = 10,
-          [1657915209.152311][3245:3245] CHIP:DMG:                                0x2 = 0,
-          [1657915209.152370][3245:3245] CHIP:DMG:                                0x3 = 0,
-          [1657915209.152424][3245:3245] CHIP:DMG:                        },
-          [1657915209.152474][3245:3245] CHIP:DMG:                },
-          [1657915209.152530][3245:3245] CHIP:DMG:
-          [1657915209.152574][3245:3245] CHIP:DMG:        ],
-          [1657915209.152630][3245:3245] CHIP:DMG:
-          [1657915209.152674][3245:3245] CHIP:DMG:        InteractionModelRevision = 1
-          [1657915209.152717][3245:3245] CHIP:DMG: },
-
-
-          ./chip-tool levelcontrol move 1 5 0 0 1 1
-          Verify in TH all-clusters-app
-          [1657915236.437571][3245:3245] CHIP:DMG: InvokeRequestMessage =
-          [1657915236.437601][3245:3245] CHIP:DMG: {
-          [1657915236.437624][3245:3245] CHIP:DMG:        suppressResponse = false,
-          [1657915236.437658][3245:3245] CHIP:DMG:        timedRequest = false,
-          [1657915236.437684][3245:3245] CHIP:DMG:        InvokeRequests =
-          [1657915236.437719][3245:3245] CHIP:DMG:        [
-          [1657915236.437747][3245:3245] CHIP:DMG:                CommandDataIB =
-          [1657915236.437779][3245:3245] CHIP:DMG:                {
-          [1657915236.437809][3245:3245] CHIP:DMG:                        CommandPathIB =
-          [1657915236.437842][3245:3245] CHIP:DMG:                        {
-          [1657915236.437876][3245:3245] CHIP:DMG:                                EndpointId = 0x1,
-          [1657915236.437909][3245:3245] CHIP:DMG:                                ClusterId = 0x8,
-          [1657915236.437942][3245:3245] CHIP:DMG:                                CommandId = 0x1,
-          [1657915236.437972][3245:3245] CHIP:DMG:                        },
-          [1657915236.438005][3245:3245] CHIP:DMG:
-          [1657915236.438035][3245:3245] CHIP:DMG:                        CommandFields =
-          [1657915236.438066][3245:3245] CHIP:DMG:                        {
-          [1657915236.438099][3245:3245] CHIP:DMG:                                0x0 = 1,
-          [1657915236.438133][3245:3245] CHIP:DMG:                                0x1 = 5,
-          [1657915236.438167][3245:3245] CHIP:DMG:                                0x2 = 0,
-          [1657915236.438199][3245:3245] CHIP:DMG:                                0x3 = 0,
-          [1657915236.438232][3245:3245] CHIP:DMG:                        },
-          [1657915236.438261][3245:3245] CHIP:DMG:                },
-          [1657915236.438295][3245:3245] CHIP:DMG:
-          [1657915236.438321][3245:3245] CHIP:DMG:        ],
-          [1657915236.438352][3245:3245] CHIP:DMG:
-          [1657915236.438376][3245:3245] CHIP:DMG:        InteractionModelRevision = 1
-          [1657915236.438402][3245:3245] CHIP:DMG: },
-
-
-          ./chip-tool levelcontrol step 1 10 0 0 1 1
-          Verify in TH all-clusters-app
-          [1657915270.774746][3245:3245] CHIP:DMG: InvokeRequestMessage =
-          [1657915270.774833][3245:3245] CHIP:DMG: {
-          [1657915270.774859][3245:3245] CHIP:DMG:        suppressResponse = false,
-          [1657915270.774916][3245:3245] CHIP:DMG:        timedRequest = false,
-          [1657915270.774947][3245:3245] CHIP:DMG:        InvokeRequests =
-          [1657915270.774979][3245:3245] CHIP:DMG:        [
-          [1657915270.775003][3245:3245] CHIP:DMG:                CommandDataIB =
-          [1657915270.775035][3245:3245] CHIP:DMG:                {
-          [1657915270.775064][3245:3245] CHIP:DMG:                        CommandPathIB =
-          [1657915270.775097][3245:3245] CHIP:DMG:                        {
-          [1657915270.775130][3245:3245] CHIP:DMG:                                EndpointId = 0x1,
-          [1657915270.775164][3245:3245] CHIP:DMG:                                ClusterId = 0x8,
-          [1657915270.775228][3245:3245] CHIP:DMG:                                CommandId = 0x2,
-          [1657915270.775266][3245:3245] CHIP:DMG:                        },
-          [1657915270.775300][3245:3245] CHIP:DMG:
-          [1657915270.775329][3245:3245] CHIP:DMG:                        CommandFields =
-          [1657915270.775360][3245:3245] CHIP:DMG:                        {
-          [1657915270.775394][3245:3245] CHIP:DMG:                                0x0 = 1,
-          [1657915270.775427][3245:3245] CHIP:DMG:                                0x1 = 10,
-          [1657915270.775461][3245:3245] CHIP:DMG:                                0x2 = 20,
-          [1657915270.775494][3245:3245] CHIP:DMG:                                0x3 = 0,
-          [1657915270.775527][3245:3245] CHIP:DMG:                                0x4 = 0,
-          [1657915270.775587][3245:3245] CHIP:DMG:                        },
-          [1657915270.775619][3245:3245] CHIP:DMG:                },
-          [1657915270.775653][3245:3245] CHIP:DMG:
-          [1657915270.775676][3245:3245] CHIP:DMG:        ],
-          [1657915270.775708][3245:3245] CHIP:DMG:
-          [1657915270.775732][3245:3245] CHIP:DMG:        InteractionModelRevision = 1
-          [1657915270.775755][3245:3245] CHIP:DMG: },
-
-
-          ./chip-tool levelcontrol stop 0 0 1 1
-          Verify in TH all-clusters-app
-
-          [1657915273.417099][3245:3245] CHIP:DMG: InvokeRequestMessage =
-          [1657915273.417157][3245:3245] CHIP:DMG: {
-          [1657915273.417205][3245:3245] CHIP:DMG:        suppressResponse = false,
-          [1657915273.417260][3245:3245] CHIP:DMG:        timedRequest = false,
-          [1657915273.417311][3245:3245] CHIP:DMG:        InvokeRequests =
-          [1657915273.417376][3245:3245] CHIP:DMG:        [
-          [1657915273.417428][3245:3245] CHIP:DMG:                CommandDataIB =
-          [1657915273.417484][3245:3245] CHIP:DMG:                {
-          [1657915273.417545][3245:3245] CHIP:DMG:                        CommandPathIB =
-          [1657915273.417605][3245:3245] CHIP:DMG:                        {
-          [1657915273.417669][3245:3245] CHIP:DMG:                                EndpointId = 0x1,
-          [1657915273.417739][3245:3245] CHIP:DMG:                                ClusterId = 0x8,
-          [1657915273.417806][3245:3245] CHIP:DMG:                                CommandId = 0x3,
-          [1657915273.417871][3245:3245] CHIP:DMG:                        },
-          [1657915273.417934][3245:3245] CHIP:DMG:
-          [1657915273.417988][3245:3245] CHIP:DMG:                        CommandFields =
-          [1657915273.418051][3245:3245] CHIP:DMG:                        {
-          [1657915273.418117][3245:3245] CHIP:DMG:                                0x0 = 0,
-          [1657915273.418185][3245:3245] CHIP:DMG:                                0x1 = 0,
-          [1657915273.418246][3245:3245] CHIP:DMG:                        },
-          [1657915273.418298][3245:3245] CHIP:DMG:                },
-          [1657915273.418327][3245:3245] CHIP:DMG:
-          [1657915273.418350][3245:3245] CHIP:DMG:        ],
-          [1657915273.418380][3245:3245] CHIP:DMG:
-          [1657915273.418458][3245:3245] CHIP:DMG:        InteractionModelRevision = 1
-          [1657915273.418483][3245:3245] CHIP:DMG: },
-
-
-          ./chip-tool levelcontrol move-to-level-with-on-off 1 0 1 1
-          Verify in TH all-clusters-app
-          [1657915305.113831][3245:3245] CHIP:DMG: InvokeRequestMessage =
-          [1657915305.113860][3245:3245] CHIP:DMG: {
-          [1657915305.113885][3245:3245] CHIP:DMG:        suppressResponse = false,
-          [1657915305.113913][3245:3245] CHIP:DMG:        timedRequest = false,
-          [1657915305.113935][3245:3245] CHIP:DMG:        InvokeRequests =
-          [1657915305.113963][3245:3245] CHIP:DMG:        [
-          [1657915305.113985][3245:3245] CHIP:DMG:                CommandDataIB =
-          [1657915305.114013][3245:3245] CHIP:DMG:                {
-          [1657915305.114038][3245:3245] CHIP:DMG:                        CommandPathIB =
-          [1657915305.114072][3245:3245] CHIP:DMG:                        {
-          [1657915305.114105][3245:3245] CHIP:DMG:                                EndpointId = 0x1,
-          [1657915305.114141][3245:3245] CHIP:DMG:                                ClusterId = 0x8,
-          [1657915305.114177][3245:3245] CHIP:DMG:                                CommandId = 0x4,
-          [1657915305.114209][3245:3245] CHIP:DMG:                        },
-          [1657915305.114241][3245:3245] CHIP:DMG:
-          [1657915305.114268][3245:3245] CHIP:DMG:                        CommandFields =
-          [1657915305.114298][3245:3245] CHIP:DMG:                        {
-          [1657915305.114331][3245:3245] CHIP:DMG:                                0x0 = 1,
-          [1657915305.114367][3245:3245] CHIP:DMG:                                0x1 = 0,
-          [1657915305.114400][3245:3245] CHIP:DMG:                        },
-          [1657915305.114429][3245:3245] CHIP:DMG:                },
-          [1657915305.114461][3245:3245] CHIP:DMG:
-          [1657915305.114484][3245:3245] CHIP:DMG:        ],
-          [1657915305.114514][3245:3245] CHIP:DMG:
-          [1657915305.114538][3245:3245] CHIP:DMG:        InteractionModelRevision = 1
-          [1657915305.114561][3245:3245] CHIP:DMG: },
-          [1657915305.114630][3245:3245] CHIP:DMG: AccessControl: checking f=1 a=c s=0x000000000001B669 t= c=0x0000_0008 e=1 p=o
-          [1657915305.114670][3245:3245] CHIP:DMG: AccessControl: allowed
-          [1657915305.114699][3245:3245] CHIP:DMG: Received command for Endpoint=1 Cluster=0x0000_0008 Command=0x0000_0004
-          [1657915305.114732][3245:3245] CHIP:ZCL: 0xaaaabbef41a0MOVE_TO_LEVEL_WITH_ON_OFF 1  0
-          [1657915305.114768][3245:3245] CHIP:ZCL: Setting on/off to 0xaaaabbef4140 due to level change
-          [1657915305.114790][3245:3245] CHIP:ZCL: On/Off set value: 1 0
-          [1657915305.114811][3245:3245] CHIP:ZCL: On/off already set to new value
-
-
-          ./chip-tool levelcontrol move-with-on-off 1 5 1 1
-          Verify in TH all-clusters-app
-
-          [1657915329.088787][3245:3245] CHIP:DMG: InvokeRequestMessage =
-          [1657915329.088824][3245:3245] CHIP:DMG: {
-          [1657915329.088854][3245:3245] CHIP:DMG:        suppressResponse = false,
-          [1657915329.088890][3245:3245] CHIP:DMG:        timedRequest = false,
-          [1657915329.088918][3245:3245] CHIP:DMG:        InvokeRequests =
-          [1657915329.088975][3245:3245] CHIP:DMG:        [
-          [1657915329.089009][3245:3245] CHIP:DMG:                CommandDataIB =
-          [1657915329.089047][3245:3245] CHIP:DMG:                {
-          [1657915329.089083][3245:3245] CHIP:DMG:                        CommandPathIB =
-          [1657915329.089127][3245:3245] CHIP:DMG:                        {
-          [1657915329.089172][3245:3245] CHIP:DMG:                                EndpointId = 0x1,
-          [1657915329.089223][3245:3245] CHIP:DMG:                                ClusterId = 0x8,
-          [1657915329.089272][3245:3245] CHIP:DMG:                                CommandId = 0x5,
-          [1657915329.089310][3245:3245] CHIP:DMG:                        },
-          [1657915329.089346][3245:3245] CHIP:DMG:
-          [1657915329.089380][3245:3245] CHIP:DMG:                        CommandFields =
-          [1657915329.089422][3245:3245] CHIP:DMG:                        {
-          [1657915329.089471][3245:3245] CHIP:DMG:                                0x0 = 1,
-          [1657915329.089521][3245:3245] CHIP:DMG:                                0x1 = 5,
-          [1657915329.089570][3245:3245] CHIP:DMG:                        },
-          [1657915329.089610][3245:3245] CHIP:DMG:                },
-          [1657915329.089653][3245:3245] CHIP:DMG:
-          [1657915329.089694][3245:3245] CHIP:DMG:        ],
-          [1657915329.089736][3245:3245] CHIP:DMG:
-          [1657915329.089769][3245:3245] CHIP:DMG:        InteractionModelRevision = 1
-          [1657915329.089800][3245:3245] CHIP:DMG: },
-          [1657915329.089888][3245:3245] CHIP:DMG: AccessControl: checking f=1 a=c s=0x000000000001B669 t= c=0x0000_0008 e=1 p=o
-          [1657915329.089937][3245:3245] CHIP:DMG: AccessControl: allowed
-          [1657915329.089975][3245:3245] CHIP:DMG: Received command for Endpoint=1 Cluster=0x0000_0008 Command=0x0000_0005
-          [1657915329.090018][3245:3245] CHIP:ZCL: 0xaaaabbef41a0MOVE_WITH_ON_OFF 1 5
-          [1657915329.090063][3245:3245] CHIP:ZCL: Setting on/off to 0xaaaabbef4140 due to level change
-          [1657915329.090104][3245:3245] CHIP:ZCL: On/Off set value: 1 0
-          [1657915329.090135][3245:3245] CHIP:ZCL: On/off already set to new value
-
-
-           ./chip-tool levelcontrol step-with-on-off 1 15 123 1 1
-          Verify in TH all-clusters-app
-          [1657915396.576207][3245:3245] CHIP:DMG: InvokeRequestMessage =
-          [1657915396.576236][3245:3245] CHIP:DMG: {
-          [1657915396.576255][3245:3245] CHIP:DMG:        suppressResponse = false,
-          [1657915396.576278][3245:3245] CHIP:DMG:        timedRequest = false,
-          [1657915396.576298][3245:3245] CHIP:DMG:        InvokeRequests =
-          [1657915396.576327][3245:3245] CHIP:DMG:        [
-          [1657915396.576347][3245:3245] CHIP:DMG:                CommandDataIB =
-          [1657915396.576371][3245:3245] CHIP:DMG:                {
-          [1657915396.576392][3245:3245] CHIP:DMG:                        CommandPathIB =
-          [1657915396.576420][3245:3245] CHIP:DMG:                        {
-          [1657915396.576451][3245:3245] CHIP:DMG:                                EndpointId = 0x1,
-          [1657915396.576488][3245:3245] CHIP:DMG:                                ClusterId = 0x8,
-          [1657915396.576522][3245:3245] CHIP:DMG:                                CommandId = 0x6,
-          [1657915396.576554][3245:3245] CHIP:DMG:                        },
-          [1657915396.576587][3245:3245] CHIP:DMG:
-          [1657915396.576617][3245:3245] CHIP:DMG:                        CommandFields =
-          [1657915396.576647][3245:3245] CHIP:DMG:                        {
-          [1657915396.576678][3245:3245] CHIP:DMG:                                0x0 = 1,
-          [1657915396.576704][3245:3245] CHIP:DMG:                                0x1 = 15,
-          [1657915396.576741][3245:3245] CHIP:DMG:                                0x2 = 123,
-          [1657915396.576774][3245:3245] CHIP:DMG:                        },
-          [1657915396.576804][3245:3245] CHIP:DMG:                },
-          [1657915396.576835][3245:3245] CHIP:DMG:
-          [1657915396.576858][3245:3245] CHIP:DMG:        ],
-          [1657915396.576889][3245:3245] CHIP:DMG:
-          [1657915396.576913][3245:3245] CHIP:DMG:        InteractionModelRevision = 1
-          [1657915396.576935][3245:3245] CHIP:DMG: },
-          [1657915396.577006][3245:3245] CHIP:DMG: AccessControl: checking f=1 a=c s=0x000000000001B669 t= c=0x0000_0008 e=1 p=o
-          [1657915396.577046][3245:3245] CHIP:DMG: AccessControl: allowed
-          [1657915396.577071][3245:3245] CHIP:DMG: Received command for Endpoint=1 Cluster=0x0000_0008 Command=0x0000_0006
-          [1657915396.577106][3245:3245] CHIP:ZCL: 0xaaaabbef41a0STEP_WITH_ON_OFF 1 f 7b
-          [1657915396.577142][3245:3245] CHIP:ZCL: Setting on/off to 0xaaaabbef4140 due to level change
-          [1657915396.577164][3245:3245] CHIP:ZCL: On/Off set value: 1 0
-          [1657915396.577186][3245:3245] CHIP:ZCL: On/off already set to new value
-
-
-          ./chip-tool levelcontrol stop-with-on-off 1 1
-          Verify in TH all-clusters-app
-          [1657915357.332886][3245:3245] CHIP:DMG: InvokeRequestMessage =
-          [1657915357.332935][3245:3245] CHIP:DMG: {
-          [1657915357.332977][3245:3245] CHIP:DMG:        suppressResponse = false,
-          [1657915357.333037][3245:3245] CHIP:DMG:        timedRequest = false,
-          [1657915357.333083][3245:3245] CHIP:DMG:        InvokeRequests =
-          [1657915357.333137][3245:3245] CHIP:DMG:        [
-          [1657915357.333181][3245:3245] CHIP:DMG:                CommandDataIB =
-          [1657915357.333230][3245:3245] CHIP:DMG:                {
-          [1657915357.333277][3245:3245] CHIP:DMG:                        CommandPathIB =
-          [1657915357.333332][3245:3245] CHIP:DMG:                        {
-          [1657915357.333391][3245:3245] CHIP:DMG:                                EndpointId = 0x1,
-          [1657915357.333452][3245:3245] CHIP:DMG:                                ClusterId = 0x8,
-          [1657915357.333512][3245:3245] CHIP:DMG:                                CommandId = 0x7,
-          [1657915357.333569][3245:3245] CHIP:DMG:                        },
-          [1657915357.333635][3245:3245] CHIP:DMG:
-          [1657915357.333686][3245:3245] CHIP:DMG:                        CommandFields =
-          [1657915357.333742][3245:3245] CHIP:DMG:                        {
-          [1657915357.333784][3245:3245] CHIP:DMG:                        },
-          [1657915357.333812][3245:3245] CHIP:DMG:                },
-          [1657915357.333840][3245:3245] CHIP:DMG:
-          [1657915357.333863][3245:3245] CHIP:DMG:        ],
-          [1657915357.333947][3245:3245] CHIP:DMG:
-          [1657915357.333972][3245:3245] CHIP:DMG:        InteractionModelRevision = 1
-          [1657915357.333995][3245:3245] CHIP:DMG: },
-          [1657915357.334059][3245:3245] CHIP:DMG: AccessControl: checking f=1 a=c s=0x000000000001B669 t= c=0x0000_0008 e=1 p=o
-          [1657915357.334094][3245:3245] CHIP:DMG: AccessControl: allowed
-          [1657915357.334121][3245:3245] CHIP:DMG: Received command for Endpoint=1 Cluster=0x0000_0008 Command=0x0000_0007
-          [1657915357.334150][3245:3245] CHIP:ZCL: 0xaaaabbef41a0STOP_WITH_ON_OFF
-      disabled: true
+# 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: 22.6.3. [TC-LVL-8.1] Verification of commands (DUT as Client)
+
+PICS:
+    - LVL.C
+
+config:
+    nodeId: 0x12344321
+    cluster: "Basic"
+    endpoint: 0
+
+tests:
+    - label:
+          "TH prompts the operator to make the DUT send one or more supported
+          commands from the Level Control cluster"
+      verification: |
+          ./chip-tool levelcontrol move-to-level 125 10 0 0 1 1
+          Verify in TH all-clusters-app
+          [1657915209.151256][3245:3245] CHIP:DMG: InvokeRequestMessage =
+          [1657915209.151306][3245:3245] CHIP:DMG: {
+          [1657915209.151348][3245:3245] CHIP:DMG:        suppressResponse = false,
+          [1657915209.151397][3245:3245] CHIP:DMG:        timedRequest = false,
+          [1657915209.151441][3245:3245] CHIP:DMG:        InvokeRequests =
+          [1657915209.151498][3245:3245] CHIP:DMG:        [
+          [1657915209.151543][3245:3245] CHIP:DMG:                CommandDataIB =
+          [1657915209.151594][3245:3245] CHIP:DMG:                {
+          [1657915209.151642][3245:3245] CHIP:DMG:                        CommandPathIB =
+          [1657915209.151699][3245:3245] CHIP:DMG:                        {
+          [1657915209.151752][3245:3245] CHIP:DMG:                                EndpointId = 0x1,
+          [1657915209.151814][3245:3245] CHIP:DMG:                                ClusterId = 0x8,
+          [1657915209.151874][3245:3245] CHIP:DMG:                                CommandId = 0x0,
+          [1657915209.151929][3245:3245] CHIP:DMG:                        },
+          [1657915209.151993][3245:3245] CHIP:DMG:
+          [1657915209.152041][3245:3245] CHIP:DMG:                        CommandFields =
+          [1657915209.152128][3245:3245] CHIP:DMG:                        {
+          [1657915209.152190][3245:3245] CHIP:DMG:                                0x0 = 125,
+          [1657915209.152251][3245:3245] CHIP:DMG:                                0x1 = 10,
+          [1657915209.152311][3245:3245] CHIP:DMG:                                0x2 = 0,
+          [1657915209.152370][3245:3245] CHIP:DMG:                                0x3 = 0,
+          [1657915209.152424][3245:3245] CHIP:DMG:                        },
+          [1657915209.152474][3245:3245] CHIP:DMG:                },
+          [1657915209.152530][3245:3245] CHIP:DMG:
+          [1657915209.152574][3245:3245] CHIP:DMG:        ],
+          [1657915209.152630][3245:3245] CHIP:DMG:
+          [1657915209.152674][3245:3245] CHIP:DMG:        InteractionModelRevision = 1
+          [1657915209.152717][3245:3245] CHIP:DMG: },
+
+
+          ./chip-tool levelcontrol move 1 5 0 0 1 1
+          Verify in TH all-clusters-app
+          [1657915236.437571][3245:3245] CHIP:DMG: InvokeRequestMessage =
+          [1657915236.437601][3245:3245] CHIP:DMG: {
+          [1657915236.437624][3245:3245] CHIP:DMG:        suppressResponse = false,
+          [1657915236.437658][3245:3245] CHIP:DMG:        timedRequest = false,
+          [1657915236.437684][3245:3245] CHIP:DMG:        InvokeRequests =
+          [1657915236.437719][3245:3245] CHIP:DMG:        [
+          [1657915236.437747][3245:3245] CHIP:DMG:                CommandDataIB =
+          [1657915236.437779][3245:3245] CHIP:DMG:                {
+          [1657915236.437809][3245:3245] CHIP:DMG:                        CommandPathIB =
+          [1657915236.437842][3245:3245] CHIP:DMG:                        {
+          [1657915236.437876][3245:3245] CHIP:DMG:                                EndpointId = 0x1,
+          [1657915236.437909][3245:3245] CHIP:DMG:                                ClusterId = 0x8,
+          [1657915236.437942][3245:3245] CHIP:DMG:                                CommandId = 0x1,
+          [1657915236.437972][3245:3245] CHIP:DMG:                        },
+          [1657915236.438005][3245:3245] CHIP:DMG:
+          [1657915236.438035][3245:3245] CHIP:DMG:                        CommandFields =
+          [1657915236.438066][3245:3245] CHIP:DMG:                        {
+          [1657915236.438099][3245:3245] CHIP:DMG:                                0x0 = 1,
+          [1657915236.438133][3245:3245] CHIP:DMG:                                0x1 = 5,
+          [1657915236.438167][3245:3245] CHIP:DMG:                                0x2 = 0,
+          [1657915236.438199][3245:3245] CHIP:DMG:                                0x3 = 0,
+          [1657915236.438232][3245:3245] CHIP:DMG:                        },
+          [1657915236.438261][3245:3245] CHIP:DMG:                },
+          [1657915236.438295][3245:3245] CHIP:DMG:
+          [1657915236.438321][3245:3245] CHIP:DMG:        ],
+          [1657915236.438352][3245:3245] CHIP:DMG:
+          [1657915236.438376][3245:3245] CHIP:DMG:        InteractionModelRevision = 1
+          [1657915236.438402][3245:3245] CHIP:DMG: },
+
+
+          ./chip-tool levelcontrol step 1 10 0 0 1 1
+          Verify in TH all-clusters-app
+          [1657915270.774746][3245:3245] CHIP:DMG: InvokeRequestMessage =
+          [1657915270.774833][3245:3245] CHIP:DMG: {
+          [1657915270.774859][3245:3245] CHIP:DMG:        suppressResponse = false,
+          [1657915270.774916][3245:3245] CHIP:DMG:        timedRequest = false,
+          [1657915270.774947][3245:3245] CHIP:DMG:        InvokeRequests =
+          [1657915270.774979][3245:3245] CHIP:DMG:        [
+          [1657915270.775003][3245:3245] CHIP:DMG:                CommandDataIB =
+          [1657915270.775035][3245:3245] CHIP:DMG:                {
+          [1657915270.775064][3245:3245] CHIP:DMG:                        CommandPathIB =
+          [1657915270.775097][3245:3245] CHIP:DMG:                        {
+          [1657915270.775130][3245:3245] CHIP:DMG:                                EndpointId = 0x1,
+          [1657915270.775164][3245:3245] CHIP:DMG:                                ClusterId = 0x8,
+          [1657915270.775228][3245:3245] CHIP:DMG:                                CommandId = 0x2,
+          [1657915270.775266][3245:3245] CHIP:DMG:                        },
+          [1657915270.775300][3245:3245] CHIP:DMG:
+          [1657915270.775329][3245:3245] CHIP:DMG:                        CommandFields =
+          [1657915270.775360][3245:3245] CHIP:DMG:                        {
+          [1657915270.775394][3245:3245] CHIP:DMG:                                0x0 = 1,
+          [1657915270.775427][3245:3245] CHIP:DMG:                                0x1 = 10,
+          [1657915270.775461][3245:3245] CHIP:DMG:                                0x2 = 20,
+          [1657915270.775494][3245:3245] CHIP:DMG:                                0x3 = 0,
+          [1657915270.775527][3245:3245] CHIP:DMG:                                0x4 = 0,
+          [1657915270.775587][3245:3245] CHIP:DMG:                        },
+          [1657915270.775619][3245:3245] CHIP:DMG:                },
+          [1657915270.775653][3245:3245] CHIP:DMG:
+          [1657915270.775676][3245:3245] CHIP:DMG:        ],
+          [1657915270.775708][3245:3245] CHIP:DMG:
+          [1657915270.775732][3245:3245] CHIP:DMG:        InteractionModelRevision = 1
+          [1657915270.775755][3245:3245] CHIP:DMG: },
+
+
+          ./chip-tool levelcontrol stop 0 0 1 1
+          Verify in TH all-clusters-app
+
+          [1657915273.417099][3245:3245] CHIP:DMG: InvokeRequestMessage =
+          [1657915273.417157][3245:3245] CHIP:DMG: {
+          [1657915273.417205][3245:3245] CHIP:DMG:        suppressResponse = false,
+          [1657915273.417260][3245:3245] CHIP:DMG:        timedRequest = false,
+          [1657915273.417311][3245:3245] CHIP:DMG:        InvokeRequests =
+          [1657915273.417376][3245:3245] CHIP:DMG:        [
+          [1657915273.417428][3245:3245] CHIP:DMG:                CommandDataIB =
+          [1657915273.417484][3245:3245] CHIP:DMG:                {
+          [1657915273.417545][3245:3245] CHIP:DMG:                        CommandPathIB =
+          [1657915273.417605][3245:3245] CHIP:DMG:                        {
+          [1657915273.417669][3245:3245] CHIP:DMG:                                EndpointId = 0x1,
+          [1657915273.417739][3245:3245] CHIP:DMG:                                ClusterId = 0x8,
+          [1657915273.417806][3245:3245] CHIP:DMG:                                CommandId = 0x3,
+          [1657915273.417871][3245:3245] CHIP:DMG:                        },
+          [1657915273.417934][3245:3245] CHIP:DMG:
+          [1657915273.417988][3245:3245] CHIP:DMG:                        CommandFields =
+          [1657915273.418051][3245:3245] CHIP:DMG:                        {
+          [1657915273.418117][3245:3245] CHIP:DMG:                                0x0 = 0,
+          [1657915273.418185][3245:3245] CHIP:DMG:                                0x1 = 0,
+          [1657915273.418246][3245:3245] CHIP:DMG:                        },
+          [1657915273.418298][3245:3245] CHIP:DMG:                },
+          [1657915273.418327][3245:3245] CHIP:DMG:
+          [1657915273.418350][3245:3245] CHIP:DMG:        ],
+          [1657915273.418380][3245:3245] CHIP:DMG:
+          [1657915273.418458][3245:3245] CHIP:DMG:        InteractionModelRevision = 1
+          [1657915273.418483][3245:3245] CHIP:DMG: },
+
+
+          ./chip-tool levelcontrol move-to-level-with-on-off 1 0 1 1
+          Verify in TH all-clusters-app
+          [1657915305.113831][3245:3245] CHIP:DMG: InvokeRequestMessage =
+          [1657915305.113860][3245:3245] CHIP:DMG: {
+          [1657915305.113885][3245:3245] CHIP:DMG:        suppressResponse = false,
+          [1657915305.113913][3245:3245] CHIP:DMG:        timedRequest = false,
+          [1657915305.113935][3245:3245] CHIP:DMG:        InvokeRequests =
+          [1657915305.113963][3245:3245] CHIP:DMG:        [
+          [1657915305.113985][3245:3245] CHIP:DMG:                CommandDataIB =
+          [1657915305.114013][3245:3245] CHIP:DMG:                {
+          [1657915305.114038][3245:3245] CHIP:DMG:                        CommandPathIB =
+          [1657915305.114072][3245:3245] CHIP:DMG:                        {
+          [1657915305.114105][3245:3245] CHIP:DMG:                                EndpointId = 0x1,
+          [1657915305.114141][3245:3245] CHIP:DMG:                                ClusterId = 0x8,
+          [1657915305.114177][3245:3245] CHIP:DMG:                                CommandId = 0x4,
+          [1657915305.114209][3245:3245] CHIP:DMG:                        },
+          [1657915305.114241][3245:3245] CHIP:DMG:
+          [1657915305.114268][3245:3245] CHIP:DMG:                        CommandFields =
+          [1657915305.114298][3245:3245] CHIP:DMG:                        {
+          [1657915305.114331][3245:3245] CHIP:DMG:                                0x0 = 1,
+          [1657915305.114367][3245:3245] CHIP:DMG:                                0x1 = 0,
+          [1657915305.114400][3245:3245] CHIP:DMG:                        },
+          [1657915305.114429][3245:3245] CHIP:DMG:                },
+          [1657915305.114461][3245:3245] CHIP:DMG:
+          [1657915305.114484][3245:3245] CHIP:DMG:        ],
+          [1657915305.114514][3245:3245] CHIP:DMG:
+          [1657915305.114538][3245:3245] CHIP:DMG:        InteractionModelRevision = 1
+          [1657915305.114561][3245:3245] CHIP:DMG: },
+          [1657915305.114630][3245:3245] CHIP:DMG: AccessControl: checking f=1 a=c s=0x000000000001B669 t= c=0x0000_0008 e=1 p=o
+          [1657915305.114670][3245:3245] CHIP:DMG: AccessControl: allowed
+          [1657915305.114699][3245:3245] CHIP:DMG: Received command for Endpoint=1 Cluster=0x0000_0008 Command=0x0000_0004
+          [1657915305.114732][3245:3245] CHIP:ZCL: 0xaaaabbef41a0MOVE_TO_LEVEL_WITH_ON_OFF 1  0
+          [1657915305.114768][3245:3245] CHIP:ZCL: Setting on/off to 0xaaaabbef4140 due to level change
+          [1657915305.114790][3245:3245] CHIP:ZCL: On/Off set value: 1 0
+          [1657915305.114811][3245:3245] CHIP:ZCL: On/off already set to new value
+
+
+          ./chip-tool levelcontrol move-with-on-off 1 5 1 1
+          Verify in TH all-clusters-app
+
+          [1657915329.088787][3245:3245] CHIP:DMG: InvokeRequestMessage =
+          [1657915329.088824][3245:3245] CHIP:DMG: {
+          [1657915329.088854][3245:3245] CHIP:DMG:        suppressResponse = false,
+          [1657915329.088890][3245:3245] CHIP:DMG:        timedRequest = false,
+          [1657915329.088918][3245:3245] CHIP:DMG:        InvokeRequests =
+          [1657915329.088975][3245:3245] CHIP:DMG:        [
+          [1657915329.089009][3245:3245] CHIP:DMG:                CommandDataIB =
+          [1657915329.089047][3245:3245] CHIP:DMG:                {
+          [1657915329.089083][3245:3245] CHIP:DMG:                        CommandPathIB =
+          [1657915329.089127][3245:3245] CHIP:DMG:                        {
+          [1657915329.089172][3245:3245] CHIP:DMG:                                EndpointId = 0x1,
+          [1657915329.089223][3245:3245] CHIP:DMG:                                ClusterId = 0x8,
+          [1657915329.089272][3245:3245] CHIP:DMG:                                CommandId = 0x5,
+          [1657915329.089310][3245:3245] CHIP:DMG:                        },
+          [1657915329.089346][3245:3245] CHIP:DMG:
+          [1657915329.089380][3245:3245] CHIP:DMG:                        CommandFields =
+          [1657915329.089422][3245:3245] CHIP:DMG:                        {
+          [1657915329.089471][3245:3245] CHIP:DMG:                                0x0 = 1,
+          [1657915329.089521][3245:3245] CHIP:DMG:                                0x1 = 5,
+          [1657915329.089570][3245:3245] CHIP:DMG:                        },
+          [1657915329.089610][3245:3245] CHIP:DMG:                },
+          [1657915329.089653][3245:3245] CHIP:DMG:
+          [1657915329.089694][3245:3245] CHIP:DMG:        ],
+          [1657915329.089736][3245:3245] CHIP:DMG:
+          [1657915329.089769][3245:3245] CHIP:DMG:        InteractionModelRevision = 1
+          [1657915329.089800][3245:3245] CHIP:DMG: },
+          [1657915329.089888][3245:3245] CHIP:DMG: AccessControl: checking f=1 a=c s=0x000000000001B669 t= c=0x0000_0008 e=1 p=o
+          [1657915329.089937][3245:3245] CHIP:DMG: AccessControl: allowed
+          [1657915329.089975][3245:3245] CHIP:DMG: Received command for Endpoint=1 Cluster=0x0000_0008 Command=0x0000_0005
+          [1657915329.090018][3245:3245] CHIP:ZCL: 0xaaaabbef41a0MOVE_WITH_ON_OFF 1 5
+          [1657915329.090063][3245:3245] CHIP:ZCL: Setting on/off to 0xaaaabbef4140 due to level change
+          [1657915329.090104][3245:3245] CHIP:ZCL: On/Off set value: 1 0
+          [1657915329.090135][3245:3245] CHIP:ZCL: On/off already set to new value
+
+
+           ./chip-tool levelcontrol step-with-on-off 1 15 123 1 1
+          Verify in TH all-clusters-app
+          [1657915396.576207][3245:3245] CHIP:DMG: InvokeRequestMessage =
+          [1657915396.576236][3245:3245] CHIP:DMG: {
+          [1657915396.576255][3245:3245] CHIP:DMG:        suppressResponse = false,
+          [1657915396.576278][3245:3245] CHIP:DMG:        timedRequest = false,
+          [1657915396.576298][3245:3245] CHIP:DMG:        InvokeRequests =
+          [1657915396.576327][3245:3245] CHIP:DMG:        [
+          [1657915396.576347][3245:3245] CHIP:DMG:                CommandDataIB =
+          [1657915396.576371][3245:3245] CHIP:DMG:                {
+          [1657915396.576392][3245:3245] CHIP:DMG:                        CommandPathIB =
+          [1657915396.576420][3245:3245] CHIP:DMG:                        {
+          [1657915396.576451][3245:3245] CHIP:DMG:                                EndpointId = 0x1,
+          [1657915396.576488][3245:3245] CHIP:DMG:                                ClusterId = 0x8,
+          [1657915396.576522][3245:3245] CHIP:DMG:                                CommandId = 0x6,
+          [1657915396.576554][3245:3245] CHIP:DMG:                        },
+          [1657915396.576587][3245:3245] CHIP:DMG:
+          [1657915396.576617][3245:3245] CHIP:DMG:                        CommandFields =
+          [1657915396.576647][3245:3245] CHIP:DMG:                        {
+          [1657915396.576678][3245:3245] CHIP:DMG:                                0x0 = 1,
+          [1657915396.576704][3245:3245] CHIP:DMG:                                0x1 = 15,
+          [1657915396.576741][3245:3245] CHIP:DMG:                                0x2 = 123,
+          [1657915396.576774][3245:3245] CHIP:DMG:                        },
+          [1657915396.576804][3245:3245] CHIP:DMG:                },
+          [1657915396.576835][3245:3245] CHIP:DMG:
+          [1657915396.576858][3245:3245] CHIP:DMG:        ],
+          [1657915396.576889][3245:3245] CHIP:DMG:
+          [1657915396.576913][3245:3245] CHIP:DMG:        InteractionModelRevision = 1
+          [1657915396.576935][3245:3245] CHIP:DMG: },
+          [1657915396.577006][3245:3245] CHIP:DMG: AccessControl: checking f=1 a=c s=0x000000000001B669 t= c=0x0000_0008 e=1 p=o
+          [1657915396.577046][3245:3245] CHIP:DMG: AccessControl: allowed
+          [1657915396.577071][3245:3245] CHIP:DMG: Received command for Endpoint=1 Cluster=0x0000_0008 Command=0x0000_0006
+          [1657915396.577106][3245:3245] CHIP:ZCL: 0xaaaabbef41a0STEP_WITH_ON_OFF 1 f 7b
+          [1657915396.577142][3245:3245] CHIP:ZCL: Setting on/off to 0xaaaabbef4140 due to level change
+          [1657915396.577164][3245:3245] CHIP:ZCL: On/Off set value: 1 0
+          [1657915396.577186][3245:3245] CHIP:ZCL: On/off already set to new value
+
+
+          ./chip-tool levelcontrol stop-with-on-off 1 1
+          Verify in TH all-clusters-app
+          [1657915357.332886][3245:3245] CHIP:DMG: InvokeRequestMessage =
+          [1657915357.332935][3245:3245] CHIP:DMG: {
+          [1657915357.332977][3245:3245] CHIP:DMG:        suppressResponse = false,
+          [1657915357.333037][3245:3245] CHIP:DMG:        timedRequest = false,
+          [1657915357.333083][3245:3245] CHIP:DMG:        InvokeRequests =
+          [1657915357.333137][3245:3245] CHIP:DMG:        [
+          [1657915357.333181][3245:3245] CHIP:DMG:                CommandDataIB =
+          [1657915357.333230][3245:3245] CHIP:DMG:                {
+          [1657915357.333277][3245:3245] CHIP:DMG:                        CommandPathIB =
+          [1657915357.333332][3245:3245] CHIP:DMG:                        {
+          [1657915357.333391][3245:3245] CHIP:DMG:                                EndpointId = 0x1,
+          [1657915357.333452][3245:3245] CHIP:DMG:                                ClusterId = 0x8,
+          [1657915357.333512][3245:3245] CHIP:DMG:                                CommandId = 0x7,
+          [1657915357.333569][3245:3245] CHIP:DMG:                        },
+          [1657915357.333635][3245:3245] CHIP:DMG:
+          [1657915357.333686][3245:3245] CHIP:DMG:                        CommandFields =
+          [1657915357.333742][3245:3245] CHIP:DMG:                        {
+          [1657915357.333784][3245:3245] CHIP:DMG:                        },
+          [1657915357.333812][3245:3245] CHIP:DMG:                },
+          [1657915357.333840][3245:3245] CHIP:DMG:
+          [1657915357.333863][3245:3245] CHIP:DMG:        ],
+          [1657915357.333947][3245:3245] CHIP:DMG:
+          [1657915357.333972][3245:3245] CHIP:DMG:        InteractionModelRevision = 1
+          [1657915357.333995][3245:3245] CHIP:DMG: },
+          [1657915357.334059][3245:3245] CHIP:DMG: AccessControl: checking f=1 a=c s=0x000000000001B669 t= c=0x0000_0008 e=1 p=o
+          [1657915357.334094][3245:3245] CHIP:DMG: AccessControl: allowed
+          [1657915357.334121][3245:3245] CHIP:DMG: Received command for Endpoint=1 Cluster=0x0000_0008 Command=0x0000_0007
+          [1657915357.334150][3245:3245] CHIP:ZCL: 0xaaaabbef41a0STOP_WITH_ON_OFF
+      disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_MC_11_1.yaml b/src/app/tests/suites/certification/Test_TC_MC_11_1.yaml
index 31de4223644ae6..0395ba61e54ab8 100644
--- a/src/app/tests/suites/certification/Test_TC_MC_11_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_MC_11_1.yaml
@@ -16,6 +16,7 @@
 name:
     19.13.1. [TC-MC-11.1] Casting Video Player via User-Directed Commissioning
     Verification (DUT as Server)
+
 PICS:
     - MC.S.UDCLOGIN
 
diff --git a/src/app/tests/suites/certification/Test_TC_MEDIAINPUT_1_4.yaml b/src/app/tests/suites/certification/Test_TC_MEDIAINPUT_1_4.yaml
index 54cab6a3183249..8a28ac1bcb8bdf 100644
--- a/src/app/tests/suites/certification/Test_TC_MEDIAINPUT_1_4.yaml
+++ b/src/app/tests/suites/certification/Test_TC_MEDIAINPUT_1_4.yaml
@@ -16,6 +16,9 @@ name:
     19.1.4. [TC-MEDIAINPUT-1.4] Global attributes - Media Input Cluster (DUT as
     Server)
 
+PICS:
+    - MEDIAINPUT.S
+
 config:
     nodeId: 0x12344321
     cluster: "Media Input"
diff --git a/src/app/tests/suites/certification/Test_TC_MEDIAINPUT_3_10.yaml b/src/app/tests/suites/certification/Test_TC_MEDIAINPUT_3_10.yaml
index 1a43dd4f1083c5..06a801aa15992d 100644
--- a/src/app/tests/suites/certification/Test_TC_MEDIAINPUT_3_10.yaml
+++ b/src/app/tests/suites/certification/Test_TC_MEDIAINPUT_3_10.yaml
@@ -14,6 +14,9 @@
 
 name: 19.5.1. [TC-MEDIAINPUT-3.10] Input List Verification
 
+PICS:
+    - MEDIAINPUT.S
+
 config:
     nodeId: 0x12344321
     cluster: "Media Input"
diff --git a/src/app/tests/suites/certification/Test_TC_MEDIAPLAYBACK_1_7.yaml b/src/app/tests/suites/certification/Test_TC_MEDIAPLAYBACK_1_7.yaml
index 1f8e0acd5f5ade..2e7a6b880a1355 100644
--- a/src/app/tests/suites/certification/Test_TC_MEDIAPLAYBACK_1_7.yaml
+++ b/src/app/tests/suites/certification/Test_TC_MEDIAPLAYBACK_1_7.yaml
@@ -16,6 +16,9 @@ name:
     19.1.7. [TC-MEDIAPLAYBACK-1.7] Global attributes - Media Playback Cluster
     (DUT as Server)
 
+PICS:
+    - MEDIAPLAYBACK.S
+
 config:
     nodeId: 0x12344321
     cluster: "Media Playback"
diff --git a/src/app/tests/suites/certification/Test_TC_MEDIAPLAYBACK_6_1.yaml b/src/app/tests/suites/certification/Test_TC_MEDIAPLAYBACK_6_1.yaml
index bd6f0f5869b4d5..f0b4856c84ea12 100644
--- a/src/app/tests/suites/certification/Test_TC_MEDIAPLAYBACK_6_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_MEDIAPLAYBACK_6_1.yaml
@@ -14,6 +14,9 @@
 
 name: 19.8.1. [TC-MEDIAPLAYBACK-6.1] Mandatory Media Playback Verification
 
+PICS:
+    - MEDIAPLAYBACK.S
+
 config:
     nodeId: 0x12344321
     cluster: "Media Playback"
diff --git a/src/app/tests/suites/certification/Test_TC_MEDIAPLAYBACK_6_2.yaml b/src/app/tests/suites/certification/Test_TC_MEDIAPLAYBACK_6_2.yaml
index 8e32a15acd3744..885b34e197567c 100644
--- a/src/app/tests/suites/certification/Test_TC_MEDIAPLAYBACK_6_2.yaml
+++ b/src/app/tests/suites/certification/Test_TC_MEDIAPLAYBACK_6_2.yaml
@@ -14,6 +14,9 @@
 
 name: 19.8.2. [TC-MEDIAPLAYBACK-6.2] Optional Media Playback Verification
 
+PICS:
+    - MEDIAPLAYBACK.S
+
 config:
     nodeId: 0x12344321
     cluster: "Media Playback"
diff --git a/src/app/tests/suites/certification/Test_TC_MEDIAPLAYBACK_6_3.yaml b/src/app/tests/suites/certification/Test_TC_MEDIAPLAYBACK_6_3.yaml
index cdf3b92190c987..3bc927d533f6cb 100644
--- a/src/app/tests/suites/certification/Test_TC_MEDIAPLAYBACK_6_3.yaml
+++ b/src/app/tests/suites/certification/Test_TC_MEDIAPLAYBACK_6_3.yaml
@@ -14,6 +14,9 @@
 
 name: 19.8.3. [TC-MEDIAPLAYBACK-6.3] Advanced Seek Media Playback Verification
 
+PICS:
+    - MEDIAPLAYBACK.S
+
 config:
     nodeId: 0x12344321
     cluster: "Media Playback"
diff --git a/src/app/tests/suites/certification/Test_TC_MOD_1_1.yaml b/src/app/tests/suites/certification/Test_TC_MOD_1_1.yaml
index f4deeee328d384..f91cf5834a55df 100644
--- a/src/app/tests/suites/certification/Test_TC_MOD_1_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_MOD_1_1.yaml
@@ -14,6 +14,9 @@
 
 name: 78.1.1. [TC-MOD-1.1] Global attributes with server as DUT
 
+PICS:
+    - MOD.S
+
 config:
     nodeId: 0x12344321
     cluster: "Mode Select"
diff --git a/src/app/tests/suites/certification/Test_TC_MOD_1_2.yaml b/src/app/tests/suites/certification/Test_TC_MOD_1_2.yaml
index d4925bee781c0b..c4726cba4c6e17 100644
--- a/src/app/tests/suites/certification/Test_TC_MOD_1_2.yaml
+++ b/src/app/tests/suites/certification/Test_TC_MOD_1_2.yaml
@@ -15,6 +15,9 @@
 
 name: 80.1.2. [TC-MOD-1.2] Cluster attributes with server as DUT
 
+PICS:
+    - MOD.S
+
 config:
     nodeId: 0x12344321
     cluster: "Basic"
diff --git a/src/app/tests/suites/certification/Test_TC_MOD_1_3.yaml b/src/app/tests/suites/certification/Test_TC_MOD_1_3.yaml
index 9571b0e15969a6..db48ccbf108784 100644
--- a/src/app/tests/suites/certification/Test_TC_MOD_1_3.yaml
+++ b/src/app/tests/suites/certification/Test_TC_MOD_1_3.yaml
@@ -15,6 +15,13 @@
 
 name: 80.1.3. [TC-MOD-1.3] Attributes with client as DUT
 
+PICS:
+    - MOD.C
+    - MOD.C.AM-READ
+    - MOD.C.AO-READ
+    - MOD.C.AM-WRITE
+    - MOD.C.AO-WRITE
+
 config:
     nodeId: 0x12344321
     cluster: "Basic"
diff --git a/src/app/tests/suites/certification/Test_TC_MOD_2_1.yaml b/src/app/tests/suites/certification/Test_TC_MOD_2_1.yaml
index 4f70a37bc67c75..57414da0d63922 100644
--- a/src/app/tests/suites/certification/Test_TC_MOD_2_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_MOD_2_1.yaml
@@ -15,6 +15,9 @@
 
 name: 80.2.1. [TC-MOD-2.1] ChangeToMode Verification (DUT as Server)
 
+PICS:
+    - MOD.S.C00.Rsp
+
 config:
     nodeId: 0x12344321
     cluster: "Basic"
diff --git a/src/app/tests/suites/certification/Test_TC_MOD_2_2.yaml b/src/app/tests/suites/certification/Test_TC_MOD_2_2.yaml
index 71c34dd4c62697..f33f8edd85be6c 100644
--- a/src/app/tests/suites/certification/Test_TC_MOD_2_2.yaml
+++ b/src/app/tests/suites/certification/Test_TC_MOD_2_2.yaml
@@ -15,6 +15,9 @@
 
 name: 80.2.2. [TC-MOD-2.2] ChangeToMode Verification (DUT as Client)
 
+PICS:
+    - MOD.C.C00.Tx
+
 config:
     nodeId: 0x12344321
     cluster: "Basic"
diff --git a/src/app/tests/suites/certification/Test_TC_MOD_3_2.yaml b/src/app/tests/suites/certification/Test_TC_MOD_3_2.yaml
index 5565f5bfa731cb..f0a19b150f34bb 100644
--- a/src/app/tests/suites/certification/Test_TC_MOD_3_2.yaml
+++ b/src/app/tests/suites/certification/Test_TC_MOD_3_2.yaml
@@ -15,6 +15,9 @@
 
 name: 80.3.2. [TC-MOD-3.2] StartUpMode Verification (DUT as Server)
 
+PICS:
+    - MOD.S.A0004
+
 config:
     nodeId: 0x12344321
     cluster: "Basic"
diff --git a/src/app/tests/suites/certification/Test_TC_MOD_3_3.yaml b/src/app/tests/suites/certification/Test_TC_MOD_3_3.yaml
index 6e288e39b73be6..f7ae56c28203e6 100644
--- a/src/app/tests/suites/certification/Test_TC_MOD_3_3.yaml
+++ b/src/app/tests/suites/certification/Test_TC_MOD_3_3.yaml
@@ -15,6 +15,9 @@
 
 name: 80.3.3. [TC-MOD-3.3] OTA Mode Verification (DUT as Server)
 
+PICS:
+    - MOD.S.A0004
+
 config:
     nodeId: 0x12344321
     cluster: "Basic"
diff --git a/src/app/tests/suites/certification/Test_TC_OCC_1_1.yaml b/src/app/tests/suites/certification/Test_TC_OCC_1_1.yaml
index f30a3b1cc381bb..8334a6494908ae 100644
--- a/src/app/tests/suites/certification/Test_TC_OCC_1_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_OCC_1_1.yaml
@@ -14,6 +14,9 @@
 
 name: 24.1.1. [TC-OCC-1.1] Global attributes with server as DUT
 
+PICS:
+    - OCC.S
+
 config:
     nodeId: 0x12344321
     cluster: "Occupancy Sensing"
diff --git a/src/app/tests/suites/certification/Test_TC_OCC_2_1.yaml b/src/app/tests/suites/certification/Test_TC_OCC_2_1.yaml
index c559eea82eb7f8..9088da1607be76 100644
--- a/src/app/tests/suites/certification/Test_TC_OCC_2_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_OCC_2_1.yaml
@@ -14,6 +14,9 @@
 
 name: 30.2.1. [TC-OCC-2.1] Attributes with server as DUT
 
+PICS:
+    - OCC.S
+
 config:
     nodeId: 0x12344321
     cluster: "Occupancy Sensing"
diff --git a/src/app/tests/suites/certification/Test_TC_OCC_2_2.yaml b/src/app/tests/suites/certification/Test_TC_OCC_2_2.yaml
index 0e60fe30587196..c86fb0a6334948 100644
--- a/src/app/tests/suites/certification/Test_TC_OCC_2_2.yaml
+++ b/src/app/tests/suites/certification/Test_TC_OCC_2_2.yaml
@@ -15,6 +15,9 @@
 
 name: 3.2.2. [TC-OCC-2.2] Attributes with client as DUT
 
+PICS:
+    - OCC.S
+
 config:
     nodeId: 0x12344321
     cluster: "Basic"
diff --git a/src/app/tests/suites/certification/Test_TC_OCC_2_3.yaml b/src/app/tests/suites/certification/Test_TC_OCC_2_3.yaml
index f89ea04f4f7756..f87b86e5ee8469 100644
--- a/src/app/tests/suites/certification/Test_TC_OCC_2_3.yaml
+++ b/src/app/tests/suites/certification/Test_TC_OCC_2_3.yaml
@@ -17,6 +17,9 @@ name:
     3.2.3. [TC-OCC-2.3] OccupancySensorTypeBitmap and OccupancySensorType
     interdependency with server  as DUT
 
+PICS:
+    - OCC.S
+
 config:
     nodeId: 0x12344321
     cluster: "Basic"
diff --git a/src/app/tests/suites/certification/Test_TC_OCC_2_4.yaml b/src/app/tests/suites/certification/Test_TC_OCC_2_4.yaml
index dcad309529bf32..53f3b285bf8ec3 100644
--- a/src/app/tests/suites/certification/Test_TC_OCC_2_4.yaml
+++ b/src/app/tests/suites/certification/Test_TC_OCC_2_4.yaml
@@ -17,6 +17,9 @@ name:
     3.2.4. [TC-OCC-2.4] OccupancySensorTypeBitmap and OccupancySensorType
     interdependency with client    as DUT
 
+PICS:
+    - OCC.S
+
 config:
     nodeId: 0x12344321
     cluster: "Basic"
diff --git a/src/app/tests/suites/certification/Test_TC_OCC_3_1.yaml b/src/app/tests/suites/certification/Test_TC_OCC_3_1.yaml
index 07710d8274d6bb..502676397656e6 100644
--- a/src/app/tests/suites/certification/Test_TC_OCC_3_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_OCC_3_1.yaml
@@ -14,6 +14,9 @@
 
 name: 27.3.3. [TC-OCC-3.1] Primary functionality with server as DUT
 
+PICS:
+    - OCC.S
+
 config:
     nodeId: 0x12344321
     cluster: "Occupancy Sensing"
diff --git a/src/app/tests/suites/certification/Test_TC_OCC_3_2.yaml b/src/app/tests/suites/certification/Test_TC_OCC_3_2.yaml
index 67f32c198fab6e..6dd4e4dc92422d 100644
--- a/src/app/tests/suites/certification/Test_TC_OCC_3_2.yaml
+++ b/src/app/tests/suites/certification/Test_TC_OCC_3_2.yaml
@@ -15,6 +15,9 @@
 
 name: 3.2.6. [TC-OCC-3.2] Primary functionality with client as DUT
 
+PICS:
+    - OCC.C
+
 config:
     nodeId: 0x12344321
     cluster: "Basic"
diff --git a/src/app/tests/suites/certification/Test_TC_OO_1_1.yaml b/src/app/tests/suites/certification/Test_TC_OO_1_1.yaml
index 6c811f34c153d2..c20a840585dd41 100644
--- a/src/app/tests/suites/certification/Test_TC_OO_1_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_OO_1_1.yaml
@@ -14,6 +14,9 @@
 
 name: 4.1.1. [TC-OO-1.1] Global attributes with server as DUT
 
+PICS:
+    - OO.S
+
 config:
     nodeId: 0x12344321
     cluster: "On/Off"
diff --git a/src/app/tests/suites/certification/Test_TC_OO_2_1.yaml b/src/app/tests/suites/certification/Test_TC_OO_2_1.yaml
index a471f39e6bce2f..ca8c6412858ac6 100644
--- a/src/app/tests/suites/certification/Test_TC_OO_2_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_OO_2_1.yaml
@@ -14,6 +14,9 @@
 
 name: 3.2.1. [TC-OO-2.1] Attributes with server as DUT
 
+PICS:
+    - OO.S
+
 config:
     nodeId: 0x12344321
     cluster: "On/Off"
diff --git a/src/app/tests/suites/certification/Test_TC_OO_2_2.yaml b/src/app/tests/suites/certification/Test_TC_OO_2_2.yaml
index f65f9f647eeb39..3f86e0d57bf8e6 100644
--- a/src/app/tests/suites/certification/Test_TC_OO_2_2.yaml
+++ b/src/app/tests/suites/certification/Test_TC_OO_2_2.yaml
@@ -14,6 +14,9 @@
 
 name: 3.2.2. [TC-OO-2.2] Primary functionality with server as DUT
 
+PICS:
+    - OO.S
+
 config:
     nodeId: 0x12344321
     cluster: "On/Off"
diff --git a/src/app/tests/suites/certification/Test_TC_OO_2_3.yaml b/src/app/tests/suites/certification/Test_TC_OO_2_3.yaml
index be07cff0910c88..006a88603b6804 100644
--- a/src/app/tests/suites/certification/Test_TC_OO_2_3.yaml
+++ b/src/app/tests/suites/certification/Test_TC_OO_2_3.yaml
@@ -16,7 +16,7 @@ name: 3.2.3. [TC-OO-2.3] Secondary functionality with server as DUT
 
 PICS:
     - OO.S
-    - OO.S.F00(LT)
+    - OO.S.F00
 
 config:
     nodeId: 0x12344321
diff --git a/src/app/tests/suites/certification/Test_TC_OO_2_4.yaml b/src/app/tests/suites/certification/Test_TC_OO_2_4.yaml
index 8195cdbd45ac61..5a79c5f526f4bc 100644
--- a/src/app/tests/suites/certification/Test_TC_OO_2_4.yaml
+++ b/src/app/tests/suites/certification/Test_TC_OO_2_4.yaml
@@ -14,6 +14,10 @@
 
 name: 3.2.4. [TC-OO-2.4] Startup functionality with server as DUT
 
+PICS:
+    - OO.S
+    - OO.S.F00
+
 config:
     nodeId: 0x12344321
     cluster: "On/Off"
diff --git a/src/app/tests/suites/certification/Test_TC_OO_3_1.yaml b/src/app/tests/suites/certification/Test_TC_OO_3_1.yaml
index 483769219a5a56..db9849cedc0db1 100644
--- a/src/app/tests/suites/certification/Test_TC_OO_3_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_OO_3_1.yaml
@@ -15,6 +15,13 @@
 
 name: 4.3.1. [TC-OO-3.1] Attributes with client as DUT
 
+PICS:
+    - OO.C
+    - OO.C.AM-READ
+    - OO.C.AO-READ
+    - OO.C.AM-WRITE
+    - OO.C.AO-WRITE
+
 config:
     nodeId: 0x12344321
     cluster: "Basic"
diff --git a/src/app/tests/suites/certification/Test_TC_OO_3_2.yaml b/src/app/tests/suites/certification/Test_TC_OO_3_2.yaml
index d541845b6e3d5e..4f04e128a5c791 100644
--- a/src/app/tests/suites/certification/Test_TC_OO_3_2.yaml
+++ b/src/app/tests/suites/certification/Test_TC_OO_3_2.yaml
@@ -15,6 +15,9 @@
 
 name: 4.3.2. [TC-OO-3.2] Functionality with client as DUT
 
+PICS:
+    - OO.C
+
 config:
     nodeId: 0x12344321
     cluster: "Basic"
diff --git a/src/app/tests/suites/certification/Test_TC_OPCREDS_1_2.yaml b/src/app/tests/suites/certification/Test_TC_OPCREDS_1_2.yaml
index b67d3846e96fdc..ae5f9b86efaeb9 100644
--- a/src/app/tests/suites/certification/Test_TC_OPCREDS_1_2.yaml
+++ b/src/app/tests/suites/certification/Test_TC_OPCREDS_1_2.yaml
@@ -17,6 +17,9 @@ name:
     11.1.2. [TC-OPCREDS-1.2] Global Attributes for Node Operational Credentials
     Cluster [DUT-Server]
 
+PICS:
+    - OPCREDS.S
+
 config:
     nodeId: 0x12344321
     cluster: "Operational Credentials"
diff --git a/src/app/tests/suites/certification/Test_TC_PCC_1_1.yaml b/src/app/tests/suites/certification/Test_TC_PCC_1_1.yaml
index a095cc771d2219..f6335beaef0431 100644
--- a/src/app/tests/suites/certification/Test_TC_PCC_1_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_PCC_1_1.yaml
@@ -14,6 +14,9 @@
 
 name: 15.1.1. [TC-PCC-1.1] Global attributes with server as DUT
 
+PICS:
+    - PCC.S
+
 config:
     nodeId: 0x12344321
     cluster: "Pump Configuration and Control"
diff --git a/src/app/tests/suites/certification/Test_TC_PCC_2_1.yaml b/src/app/tests/suites/certification/Test_TC_PCC_2_1.yaml
index d69ef7d98629e5..9753dd04c32958 100644
--- a/src/app/tests/suites/certification/Test_TC_PCC_2_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_PCC_2_1.yaml
@@ -14,6 +14,9 @@
 
 name: 15.2.1. [TC-PCC-2.1] Attributes with server as DUT
 
+PICS:
+    - PCC.S
+
 config:
     nodeId: 0x12344321
     cluster: "Pump Configuration and Control"
diff --git a/src/app/tests/suites/certification/Test_TC_PCC_2_2.yaml b/src/app/tests/suites/certification/Test_TC_PCC_2_2.yaml
index 9f716da6798c62..1019d114098154 100644
--- a/src/app/tests/suites/certification/Test_TC_PCC_2_2.yaml
+++ b/src/app/tests/suites/certification/Test_TC_PCC_2_2.yaml
@@ -14,6 +14,9 @@
 
 name: 15.2.2. [TC-PCC-2.2] Primary functionality with server as DUT
 
+PICS:
+    - PCC.S
+
 config:
     nodeId: 0x12344321
     cluster: "Pump Configuration and Control"
diff --git a/src/app/tests/suites/certification/Test_TC_PCC_2_3.yaml b/src/app/tests/suites/certification/Test_TC_PCC_2_3.yaml
index 6ea0aafa83d4cc..fbf880d3668745 100644
--- a/src/app/tests/suites/certification/Test_TC_PCC_2_3.yaml
+++ b/src/app/tests/suites/certification/Test_TC_PCC_2_3.yaml
@@ -14,6 +14,9 @@
 
 name: 15.2.3. [TC-PCC-2.3] Primary functionality with server as DUT
 
+PICS:
+    - PCC.S
+
 config:
     nodeId: 0x12344321
     cluster: "Pump Configuration and Control"
diff --git a/src/app/tests/suites/certification/Test_TC_PCC_2_4.yaml b/src/app/tests/suites/certification/Test_TC_PCC_2_4.yaml
index 178c53dc9fbeb7..091f62eb8af885 100644
--- a/src/app/tests/suites/certification/Test_TC_PCC_2_4.yaml
+++ b/src/app/tests/suites/certification/Test_TC_PCC_2_4.yaml
@@ -14,6 +14,9 @@
 
 name: 15.2.4. [TC-PCC-2.4] Primary functionality with server as DUT
 
+PICS:
+    - PCC.S
+
 config:
     nodeId: 0x12344321
     cluster: "Pump Configuration and Control"
diff --git a/src/app/tests/suites/certification/Test_TC_PCC_3_1.yaml b/src/app/tests/suites/certification/Test_TC_PCC_3_1.yaml
index 5a147663c98a11..854da1c8d1f01e 100644
--- a/src/app/tests/suites/certification/Test_TC_PCC_3_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_PCC_3_1.yaml
@@ -15,6 +15,13 @@
 
 name: 3.3.1. [TC-PCC-3.1] Attributes with client as DUT
 
+PICS:
+    - PCC.C
+    - PCC.C.AM-READ
+    - PCC.C.AO-READ
+    - PCC.C.AM-WRITE
+    - PCC.C.AO-WRITE
+
 config:
     nodeId: 0x12344321
     cluster: "Basic"
diff --git a/src/app/tests/suites/certification/Test_TC_PRS_1_1.yaml b/src/app/tests/suites/certification/Test_TC_PRS_1_1.yaml
index e7e8a142285b62..3ab9966bb312b0 100644
--- a/src/app/tests/suites/certification/Test_TC_PRS_1_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_PRS_1_1.yaml
@@ -14,6 +14,9 @@
 
 name: 36.1.1. [TC-PRS-1.1] Global attributes with server as DUT
 
+PICS:
+    - PRS.S
+
 config:
     nodeId: 0x12344321
     cluster: "Pressure Measurement"
diff --git a/src/app/tests/suites/certification/Test_TC_PRS_2_1.yaml b/src/app/tests/suites/certification/Test_TC_PRS_2_1.yaml
index cc541918a4bccc..284782be9e42a6 100644
--- a/src/app/tests/suites/certification/Test_TC_PRS_2_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_PRS_2_1.yaml
@@ -14,6 +14,9 @@
 
 name: 36.2.1. [TC-PRS-2.1] Attributes with server as DUT
 
+PICS:
+    - PRS.S
+
 config:
     nodeId: 0x12344321
     cluster: "Pressure Measurement"
diff --git a/src/app/tests/suites/certification/Test_TC_PRS_3_1.yaml b/src/app/tests/suites/certification/Test_TC_PRS_3_1.yaml
index bce7b2039dd7e5..ccb58cab89d52f 100644
--- a/src/app/tests/suites/certification/Test_TC_PRS_3_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_PRS_3_1.yaml
@@ -15,6 +15,13 @@
 
 name: 34.3.1. [TC-PRS-3.1] Attributes with Client as DUT
 
+PICS:
+    - PRS.C
+    - PRS.C.AM-READ
+    - PRS.C.AO-READ
+    - PRS.C.AM-WRITE
+    - PRS.C.AO-WRITE
+
 config:
     nodeId: 0x12344321
     cluster: "Basic"
diff --git a/src/app/tests/suites/certification/Test_TC_PSCFG_1_1.yaml b/src/app/tests/suites/certification/Test_TC_PSCFG_1_1.yaml
index 4053ea3195a19a..7a6dab90dc8e03 100644
--- a/src/app/tests/suites/certification/Test_TC_PSCFG_1_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_PSCFG_1_1.yaml
@@ -14,6 +14,9 @@
 
 name: 63.1.1. [TC-PSCFG-1.1] Global attributes with server as DUT
 
+PICS:
+    - PSCFG.S
+
 config:
     nodeId: 0x12344321
     cluster: "Power Source Configuration"
diff --git a/src/app/tests/suites/certification/Test_TC_PSCFG_2_1.yaml b/src/app/tests/suites/certification/Test_TC_PSCFG_2_1.yaml
index ae30332694eaa7..6c75857eb59f6c 100644
--- a/src/app/tests/suites/certification/Test_TC_PSCFG_2_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_PSCFG_2_1.yaml
@@ -15,6 +15,9 @@
 
 name: 65.2.1. [TC-PSCFG-2.1] Attributes with server as DUT
 
+PICS:
+    - PSCFG.S
+
 config:
     nodeId: 0x12344321
     cluster: "Basic"
diff --git a/src/app/tests/suites/certification/Test_TC_PSCFG_2_2.yaml b/src/app/tests/suites/certification/Test_TC_PSCFG_2_2.yaml
index 6c04eebf3d499c..c73c625f4d585c 100644
--- a/src/app/tests/suites/certification/Test_TC_PSCFG_2_2.yaml
+++ b/src/app/tests/suites/certification/Test_TC_PSCFG_2_2.yaml
@@ -15,6 +15,9 @@
 
 name: 65.2.2. [TC-PSCFG-2.2] Primary functionality with server as DUT
 
+PICS:
+    - PSCFG.S
+
 config:
     nodeId: 0x12344321
     cluster: "Basic"
diff --git a/src/app/tests/suites/certification/Test_TC_PSCFG_3_1.yaml b/src/app/tests/suites/certification/Test_TC_PSCFG_3_1.yaml
index ff7f41ce21f175..50e700cbee22ee 100644
--- a/src/app/tests/suites/certification/Test_TC_PSCFG_3_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_PSCFG_3_1.yaml
@@ -15,6 +15,13 @@
 
 name: 65.3.1. [TC-PSCFG-3.1] Attributes with client as DUT
 
+PICS:
+    - PSCFG.C
+    - PSCFG.C.AM-READ
+    - PSCFG.C.AO-READ
+    - PSCFG.C.AM-WRITE
+    - PSCFG.C.AO-WRITE
+
 config:
     nodeId: 0x12344321
     cluster: "Basic"
diff --git a/src/app/tests/suites/certification/Test_TC_PS_1_1.yaml b/src/app/tests/suites/certification/Test_TC_PS_1_1.yaml
index dc766658a7594c..58ba8777c67f43 100644
--- a/src/app/tests/suites/certification/Test_TC_PS_1_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_PS_1_1.yaml
@@ -14,6 +14,9 @@
 
 name: 62.1.1. [TC-PS-1.1] Global attributes with server as DUT
 
+PICS:
+    - PS.S
+
 config:
     nodeId: 0x12344321
     cluster: "Power Source"
diff --git a/src/app/tests/suites/certification/Test_TC_PS_2_1.yaml b/src/app/tests/suites/certification/Test_TC_PS_2_1.yaml
index 955c7d9bfc3002..a6d904d9782d76 100644
--- a/src/app/tests/suites/certification/Test_TC_PS_2_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_PS_2_1.yaml
@@ -14,6 +14,9 @@
 
 name: 60.2.1. [TC-PS-2.1] Attributes with server as DUT
 
+PICS:
+    - PS.S
+
 config:
     nodeId: 0x12344321
     cluster: "Power Source"
diff --git a/src/app/tests/suites/certification/Test_TC_RH_2_2.yaml b/src/app/tests/suites/certification/Test_TC_RH_2_2.yaml
index fc4a8ab535f6f1..7160009af0f075 100644
--- a/src/app/tests/suites/certification/Test_TC_RH_2_2.yaml
+++ b/src/app/tests/suites/certification/Test_TC_RH_2_2.yaml
@@ -14,6 +14,9 @@
 
 name: 9.2.2. [TC-RH-2.2] Primary functionality with server as DUT
 
+PICS:
+    - RH.S
+
 config:
     nodeId: 0x12344321
     cluster: "Relative Humidity Measurement"
diff --git a/src/app/tests/suites/certification/Test_TC_SC_1_1.yaml b/src/app/tests/suites/certification/Test_TC_SC_1_1.yaml
index 1c14682774c74b..7f6bbfca3c59a1 100644
--- a/src/app/tests/suites/certification/Test_TC_SC_1_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_SC_1_1.yaml
@@ -15,6 +15,9 @@
 
 name: 14.1.1. [TC-SC-1.1] MRP Max Message Size
 
+PICS:
+    - MCORE.ROLE.COMMISSIONEE
+
 config:
     nodeId: 0x12344321
     cluster: "Basic"
diff --git a/src/app/tests/suites/certification/Test_TC_SC_1_2.yaml b/src/app/tests/suites/certification/Test_TC_SC_1_2.yaml
index 6ee6564f1fc131..af73d7f85f1afd 100644
--- a/src/app/tests/suites/certification/Test_TC_SC_1_2.yaml
+++ b/src/app/tests/suites/certification/Test_TC_SC_1_2.yaml
@@ -15,6 +15,9 @@
 
 name: 14.1.2. [TC-SC-1.2] MRP Message Flows
 
+PICS:
+    - MCORE.ROLE.COMMISSIONEE
+
 config:
     nodeId: 0x12344321
     cluster: "Basic"
diff --git a/src/app/tests/suites/certification/Test_TC_SC_1_3.yaml b/src/app/tests/suites/certification/Test_TC_SC_1_3.yaml
index d8e36c919152b5..bcbd8ada6ade2a 100644
--- a/src/app/tests/suites/certification/Test_TC_SC_1_3.yaml
+++ b/src/app/tests/suites/certification/Test_TC_SC_1_3.yaml
@@ -15,6 +15,9 @@
 
 name: 14.1.3. [TC-SC-1.3] MRP Retransmissions
 
+PICS:
+    - MCORE.ROLE.COMMISSIONEE
+
 config:
     nodeId: 0x12344321
     cluster: "Basic"
diff --git a/src/app/tests/suites/certification/Test_TC_SC_1_4.yaml b/src/app/tests/suites/certification/Test_TC_SC_1_4.yaml
index 8f28905f7adc0b..41e14548127e68 100644
--- a/src/app/tests/suites/certification/Test_TC_SC_1_4.yaml
+++ b/src/app/tests/suites/certification/Test_TC_SC_1_4.yaml
@@ -15,6 +15,9 @@
 
 name: 14.1.4. [TC-SC-1.4] MRP message counter and duplicate messaging
 
+PICS:
+    - MCORE.ROLE.COMMISSIONEE
+
 config:
     nodeId: 0x12344321
     cluster: "Basic"
diff --git a/src/app/tests/suites/certification/Test_TC_SC_2_1.yaml b/src/app/tests/suites/certification/Test_TC_SC_2_1.yaml
index bed08a8702f8ae..eeac3a03aa8172 100644
--- a/src/app/tests/suites/certification/Test_TC_SC_2_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_SC_2_1.yaml
@@ -17,6 +17,9 @@ name:
     14.2.1. [TC-SC-2.1] Session Establishment - Passcode Authenticated Session
     Establishment (PASE)
 
+PICS:
+    - MCORE.ROLE.COMMISSIONEE
+
 config:
     nodeId: 0x12344321
     cluster: "Basic"
diff --git a/src/app/tests/suites/certification/Test_TC_SC_2_2.yaml b/src/app/tests/suites/certification/Test_TC_SC_2_2.yaml
index 8a2d405653dee3..bd51a12a310abc 100644
--- a/src/app/tests/suites/certification/Test_TC_SC_2_2.yaml
+++ b/src/app/tests/suites/certification/Test_TC_SC_2_2.yaml
@@ -17,6 +17,9 @@ name:
     14.2.2. [TC-SC-2.2] Bidirectional Communication - Passcode Authenticated
     Session Establishment (PASE)
 
+PICS:
+    - MCORE.ROLE.COMMISSIONEE
+
 config:
     nodeId: 0x12344321
     cluster: "Basic"
diff --git a/src/app/tests/suites/certification/Test_TC_SC_2_3.yaml b/src/app/tests/suites/certification/Test_TC_SC_2_3.yaml
index 0a52bec43c7266..aab3515c12f59a 100644
--- a/src/app/tests/suites/certification/Test_TC_SC_2_3.yaml
+++ b/src/app/tests/suites/certification/Test_TC_SC_2_3.yaml
@@ -15,6 +15,9 @@
 
 name: 14.2.3. [TC-SC-2.3] PASE Error Handling [DUT - Responder/Commissionee]
 
+PICS:
+    - MCORE.ROLE.COMMISSIONEE
+
 config:
     nodeId: 0x12344321
     cluster: "Basic"
diff --git a/src/app/tests/suites/certification/Test_TC_SC_2_4.yaml b/src/app/tests/suites/certification/Test_TC_SC_2_4.yaml
index 6346e8dd9ca5c5..2e39bb55547273 100644
--- a/src/app/tests/suites/certification/Test_TC_SC_2_4.yaml
+++ b/src/app/tests/suites/certification/Test_TC_SC_2_4.yaml
@@ -15,6 +15,9 @@
 
 name: 14.2.4. [TC-SC-2.4] PASE Error Handling [DUT - Initiator/Commissioner]
 
+PICS:
+    - MCORE.ROLE.COMMISSIONER
+
 config:
     nodeId: 0x12344321
     cluster: "Basic"
diff --git a/src/app/tests/suites/certification/Test_TC_SC_3_1.yaml b/src/app/tests/suites/certification/Test_TC_SC_3_1.yaml
index 2729e69ab5650d..15b64d441034f9 100644
--- a/src/app/tests/suites/certification/Test_TC_SC_3_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_SC_3_1.yaml
@@ -15,6 +15,9 @@
 
 name: 14.3.1. [TC-SC-3.1] Session Establishment
 
+PICS:
+    - MCORE.ROLE.COMMISSIONEE
+
 config:
     nodeId: 0x12344321
     cluster: "Basic"
diff --git a/src/app/tests/suites/certification/Test_TC_SC_3_2.yaml b/src/app/tests/suites/certification/Test_TC_SC_3_2.yaml
index 8d887f4ffad83e..94037e0e401b68 100644
--- a/src/app/tests/suites/certification/Test_TC_SC_3_2.yaml
+++ b/src/app/tests/suites/certification/Test_TC_SC_3_2.yaml
@@ -15,6 +15,9 @@
 
 name: 14.3.2. [TC-SC-3.2] CASE Session Resumption [DUT - Responder]
 
+PICS:
+    - MCORE.ROLE.COMMISSIONEE
+
 config:
     nodeId: 0x12344321
     cluster: "Basic"
diff --git a/src/app/tests/suites/certification/Test_TC_SC_3_3.yaml b/src/app/tests/suites/certification/Test_TC_SC_3_3.yaml
index 022cb1f3a3fe5c..c43e62d54df21f 100644
--- a/src/app/tests/suites/certification/Test_TC_SC_3_3.yaml
+++ b/src/app/tests/suites/certification/Test_TC_SC_3_3.yaml
@@ -15,6 +15,9 @@
 
 name: 14.3.3. [TC-SC-3.3] CASE Session Resumption [DUT - Initiator]
 
+PICS:
+    - MCORE.ROLE.COMMISSIONER
+
 config:
     nodeId: 0x12344321
     cluster: "Basic"
diff --git a/src/app/tests/suites/certification/Test_TC_SC_3_4.yaml b/src/app/tests/suites/certification/Test_TC_SC_3_4.yaml
index b3d51a435b449a..36525ba6ddd2dc 100644
--- a/src/app/tests/suites/certification/Test_TC_SC_3_4.yaml
+++ b/src/app/tests/suites/certification/Test_TC_SC_3_4.yaml
@@ -15,6 +15,9 @@
 
 name: 14.3.4. [TC-SC-3.4] CASE Error Handling [DUT - Responder]
 
+PICS:
+    - MCORE.ROLE.COMMISSIONEE
+
 config:
     nodeId: 0x12344321
     cluster: "Basic"
diff --git a/src/app/tests/suites/certification/Test_TC_SC_4_2.yaml b/src/app/tests/suites/certification/Test_TC_SC_4_2.yaml
index 536019ae31e03c..be5dc980cc2a93 100644
--- a/src/app/tests/suites/certification/Test_TC_SC_4_2.yaml
+++ b/src/app/tests/suites/certification/Test_TC_SC_4_2.yaml
@@ -16,6 +16,9 @@ name:
     13.4.2. [TC-SC-4.2] Commissionable Node Discovery - Commissioner Case [DUT -
     Commissioner]
 
+PICS:
+    - MCORE.ROLE.COMMISSIONER
+
 config:
     nodeId: 0x12344321
     cluster: "Secure Channel"
diff --git a/src/app/tests/suites/certification/Test_TC_SC_4_8.yaml b/src/app/tests/suites/certification/Test_TC_SC_4_8.yaml
index 590965b9a1d86a..e406d3e75d19ff 100644
--- a/src/app/tests/suites/certification/Test_TC_SC_4_8.yaml
+++ b/src/app/tests/suites/certification/Test_TC_SC_4_8.yaml
@@ -17,6 +17,9 @@ name:
     3.4.8. [TC-SC-4.8] Compressed Fabric ID remains the same for Nodes
     commissioned to the same fabric [DUT - Commissioner]
 
+PICS:
+    - MCORE.ROLE.COMMISSIONER
+
 config:
     nodeId: 0x12344321
     cluster: "Basic"
diff --git a/src/app/tests/suites/certification/Test_TC_SU_2_1.yaml b/src/app/tests/suites/certification/Test_TC_SU_2_1.yaml
index a0f00fcf8cc855..287f6ecb4aafb0 100644
--- a/src/app/tests/suites/certification/Test_TC_SU_2_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_SU_2_1.yaml
@@ -15,6 +15,9 @@
 
 name: 3.2.1. [TC-SU-2.1] QueryImage Command from DUT to OTA-P
 
+PICS:
+    - MCORE.OTA.Requestor
+
 config:
     nodeId: 0x12344321
     cluster: "Basic"
diff --git a/src/app/tests/suites/certification/Test_TC_SU_2_2.yaml b/src/app/tests/suites/certification/Test_TC_SU_2_2.yaml
index ac48909c09142d..a3f357edc21562 100644
--- a/src/app/tests/suites/certification/Test_TC_SU_2_2.yaml
+++ b/src/app/tests/suites/certification/Test_TC_SU_2_2.yaml
@@ -17,6 +17,9 @@ name:
     3.2.2. [TC-SU-2.2] Handling different QueryImageResponse scenarios on
     Requestor
 
+PICS:
+    - MCORE.OTA.Requestor
+
 config:
     nodeId: 0x12344321
     cluster: "Basic"
diff --git a/src/app/tests/suites/certification/Test_TC_SU_2_3.yaml b/src/app/tests/suites/certification/Test_TC_SU_2_3.yaml
index 75368b5f44a2aa..28266d5050f7b4 100644
--- a/src/app/tests/suites/certification/Test_TC_SU_2_3.yaml
+++ b/src/app/tests/suites/certification/Test_TC_SU_2_3.yaml
@@ -16,6 +16,9 @@
 name:
     3.3.1.[TC-SU-2.3]Transfer of Software Update images between DUT and TH/OTA-P
 
+PICS:
+    - MCORE.OTA.Requestor
+
 config:
     nodeId: 0x12344321
     cluster: "Basic"
diff --git a/src/app/tests/suites/certification/Test_TC_SU_2_4.yaml b/src/app/tests/suites/certification/Test_TC_SU_2_4.yaml
index 30880530ceed28..65ce85a62d17a6 100644
--- a/src/app/tests/suites/certification/Test_TC_SU_2_4.yaml
+++ b/src/app/tests/suites/certification/Test_TC_SU_2_4.yaml
@@ -17,6 +17,9 @@ name:
     31.5.1. [TC-SU-2.4] Tests ApplyUpdateRequest command sent by the DUT to the
     OTA-P
 
+PICS:
+    - MCORE.OTA.Requestor
+
 config:
     nodeId: 0x12344321
     cluster: "Basic"
diff --git a/src/app/tests/suites/certification/Test_TC_SU_2_5.yaml b/src/app/tests/suites/certification/Test_TC_SU_2_5.yaml
index 791ff8704278f5..b8c5eec7d68ff8 100644
--- a/src/app/tests/suites/certification/Test_TC_SU_2_5.yaml
+++ b/src/app/tests/suites/certification/Test_TC_SU_2_5.yaml
@@ -17,6 +17,9 @@ name:
     3.4.2. [TC-SU-2.5] Handling different ApplyUpdateResponse scenarios on
     Requestor
 
+PICS:
+    - MCORE.OTA.Requestor
+
 config:
     nodeId: 0x12344321
     cluster: "Basic"
diff --git a/src/app/tests/suites/certification/Test_TC_SU_2_7.yaml b/src/app/tests/suites/certification/Test_TC_SU_2_7.yaml
index 49dc1b5633a5f6..4e9233fbcad9a5 100644
--- a/src/app/tests/suites/certification/Test_TC_SU_2_7.yaml
+++ b/src/app/tests/suites/certification/Test_TC_SU_2_7.yaml
@@ -15,6 +15,9 @@
 
 name: 3.5.1. [TC-SU-2.7] Events generated by OTA-R(DUT)
 
+PICS:
+    - MCORE.OTA.Requestor
+
 config:
     nodeId: 0x12344321
     cluster: "Basic"
diff --git a/src/app/tests/suites/certification/Test_TC_SU_2_8.yaml b/src/app/tests/suites/certification/Test_TC_SU_2_8.yaml
index 429771980d2020..9579a660c82e04 100644
--- a/src/app/tests/suites/certification/Test_TC_SU_2_8.yaml
+++ b/src/app/tests/suites/certification/Test_TC_SU_2_8.yaml
@@ -15,6 +15,9 @@
 
 name: 3.6.1. [TC-SU-2.8] OTA functionality in Multi Fabric scenario
 
+PICS:
+    - MCORE.OTA.Requestor
+
 config:
     nodeId: 0x12344321
     cluster: "Basic"
diff --git a/src/app/tests/suites/certification/Test_TC_SU_3_1.yaml b/src/app/tests/suites/certification/Test_TC_SU_3_1.yaml
index 51bd35bac9fdef..09999990e8d995 100644
--- a/src/app/tests/suites/certification/Test_TC_SU_3_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_SU_3_1.yaml
@@ -15,6 +15,9 @@
 
 name: 33.7.1. [TC-SU-3.1] QueryImageResponse from DUT to OTA-R
 
+PICS:
+    - MCORE.OTA.Provider
+
 config:
     nodeId: 0x12344321
     cluster: "Basic"
diff --git a/src/app/tests/suites/certification/Test_TC_SU_3_2.yaml b/src/app/tests/suites/certification/Test_TC_SU_3_2.yaml
index e3a3c89bc897c6..0d4fe6a19ae62f 100644
--- a/src/app/tests/suites/certification/Test_TC_SU_3_2.yaml
+++ b/src/app/tests/suites/certification/Test_TC_SU_3_2.yaml
@@ -17,6 +17,9 @@ name:
     3.7.2. [TC-SU-3.2] Handling different QueryImageResponse scenarios on
     Provider
 
+PICS:
+    - MCORE.OTA.Provider
+
 config:
     nodeId: 0x12344321
     cluster: "Basic"
diff --git a/src/app/tests/suites/certification/Test_TC_SU_3_4.yaml b/src/app/tests/suites/certification/Test_TC_SU_3_4.yaml
index 5863a217efc1b7..bff4b672d96ac9 100644
--- a/src/app/tests/suites/certification/Test_TC_SU_3_4.yaml
+++ b/src/app/tests/suites/certification/Test_TC_SU_3_4.yaml
@@ -17,6 +17,9 @@ name:
     3.9.1. [TC-SU-3.4] Handling different ApplyUpdateResponse scenarios on
     Provider
 
+PICS:
+    - MCORE.OTA.Provider
+
 config:
     nodeId: 0x12344321
     cluster: "Basic"
diff --git a/src/app/tests/suites/certification/Test_TC_SU_4_1.yaml b/src/app/tests/suites/certification/Test_TC_SU_4_1.yaml
index c22a1ac55de86a..11b531192a9d63 100644
--- a/src/app/tests/suites/certification/Test_TC_SU_4_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_SU_4_1.yaml
@@ -15,6 +15,9 @@
 
 name: 3.10.1. [TC-SU-4.1] Verifying Cluster Attributes on OTA-R(DUT)
 
+PICS:
+    - MCORE.OTA.Requestor
+
 config:
     nodeId: 0x12344321
     cluster: "Basic"
diff --git a/src/app/tests/suites/certification/Test_TC_SU_4_2.yaml b/src/app/tests/suites/certification/Test_TC_SU_4_2.yaml
index 9837321c24f013..350b43a2c94826 100644
--- a/src/app/tests/suites/certification/Test_TC_SU_4_2.yaml
+++ b/src/app/tests/suites/certification/Test_TC_SU_4_2.yaml
@@ -16,6 +16,9 @@
 name:
     31.15.1. [TC-SU-4.2] Tests for verifying cluster attributes from Admin(DUT)
 
+PICS:
+    - MCORE.ACL.Administrator
+
 config:
     nodeId: 0x12344321
     cluster: "Basic"
diff --git a/src/app/tests/suites/certification/Test_TC_SWTCH_1_1.yaml b/src/app/tests/suites/certification/Test_TC_SWTCH_1_1.yaml
index 9d2b3415f11a38..664c8df9dd05d3 100644
--- a/src/app/tests/suites/certification/Test_TC_SWTCH_1_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_SWTCH_1_1.yaml
@@ -14,6 +14,9 @@
 
 name: 74.1.1. [TC-SWTCH-1.1] Global attributes with server as DUT
 
+PICS:
+    - SWTCH.S
+
 config:
     nodeId: 0x12344321
     cluster: "Switch"
diff --git a/src/app/tests/suites/certification/Test_TC_SWTCH_2_1.yaml b/src/app/tests/suites/certification/Test_TC_SWTCH_2_1.yaml
index 9ce8158a43d1b7..d8427993b96923 100644
--- a/src/app/tests/suites/certification/Test_TC_SWTCH_2_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_SWTCH_2_1.yaml
@@ -14,6 +14,9 @@
 
 name: 74.2.1. [TC-SWTCH-2.1] Attributes with server as DUT
 
+PICS:
+    - SWTCH.S
+
 config:
     nodeId: 0x12344321
     cluster: "Switch"
diff --git a/src/app/tests/suites/certification/Test_TC_SWTCH_2_2.yaml b/src/app/tests/suites/certification/Test_TC_SWTCH_2_2.yaml
index 0cc4501f85c657..a763133bd0fb89 100644
--- a/src/app/tests/suites/certification/Test_TC_SWTCH_2_2.yaml
+++ b/src/app/tests/suites/certification/Test_TC_SWTCH_2_2.yaml
@@ -15,6 +15,9 @@
 
 name: 74.2.2. [TC-SWTCH-2.2] Primary functionality with server as DUT
 
+PICS:
+    - SWTCH.S
+
 config:
     nodeId: 0x12344321
     cluster: "Basic"
diff --git a/src/app/tests/suites/certification/Test_TC_SWTCH_3_1.yaml b/src/app/tests/suites/certification/Test_TC_SWTCH_3_1.yaml
index ad8509c820ced2..9269c6463da063 100644
--- a/src/app/tests/suites/certification/Test_TC_SWTCH_3_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_SWTCH_3_1.yaml
@@ -15,6 +15,13 @@
 
 name: 74.3.1. [TC-SWTCH-3.1] Global attributes with client as DUT
 
+PICS:
+    - SWTCH.C
+    - SWTCH.C.AM-READ
+    - SWTCH.C.AO-READ
+    - SWTCH.C.AM-WRITE
+    - SWTCH.C.AO-WRITE
+
 config:
     nodeId: 0x12344321
     cluster: "Basic"
diff --git a/src/app/tests/suites/certification/Test_TC_SWTCH_3_2.yaml b/src/app/tests/suites/certification/Test_TC_SWTCH_3_2.yaml
index 8fbe3759c9657b..08087765d3f3c8 100644
--- a/src/app/tests/suites/certification/Test_TC_SWTCH_3_2.yaml
+++ b/src/app/tests/suites/certification/Test_TC_SWTCH_3_2.yaml
@@ -15,6 +15,9 @@
 
 name: 73.3.3. [TC-SWTCH-3.2] Primary functionality with client as DUT
 
+PICS:
+    - SWTCH.C
+
 config:
     nodeId: 0x12344321
     cluster: "Basic"
diff --git a/src/app/tests/suites/certification/Test_TC_S_1_1.yaml b/src/app/tests/suites/certification/Test_TC_S_1_1.yaml
index 3e7af15e9ea9ab..6cafd4e5369635 100644
--- a/src/app/tests/suites/certification/Test_TC_S_1_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_S_1_1.yaml
@@ -15,6 +15,9 @@
 
 name: 123.1.1. [TC-S-1.1] Global attributes with server as DUT
 
+PICS:
+    - S.S
+
 config:
     nodeId: 0x12344321
     cluster: "Basic"
diff --git a/src/app/tests/suites/certification/Test_TC_S_2_1.yaml b/src/app/tests/suites/certification/Test_TC_S_2_1.yaml
index af62e8cd9fae7d..d05661804b3e77 100644
--- a/src/app/tests/suites/certification/Test_TC_S_2_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_S_2_1.yaml
@@ -15,6 +15,11 @@
 
 name: 123.2.1. [TC-S-2.1] Attributes with server as DUT
 
+PICS:
+    - S.S
+    - S.S.AM
+    - S.S.AO
+
 config:
     nodeId: 0x12344321
     cluster: "Basic"
diff --git a/src/app/tests/suites/certification/Test_TC_S_2_2.yaml b/src/app/tests/suites/certification/Test_TC_S_2_2.yaml
index 6aad611db29191..5f66c76b52d9b1 100644
--- a/src/app/tests/suites/certification/Test_TC_S_2_2.yaml
+++ b/src/app/tests/suites/certification/Test_TC_S_2_2.yaml
@@ -15,6 +15,9 @@
 
 name: 123.2.2. [TC-S-2.2] Primary functionality with server as DUT
 
+PICS:
+    - S.S
+
 config:
     nodeId: 0x12344321
     cluster: "Basic"
diff --git a/src/app/tests/suites/certification/Test_TC_S_2_3.yaml b/src/app/tests/suites/certification/Test_TC_S_2_3.yaml
index 77833e7a1a0954..bc6dde05f667b2 100644
--- a/src/app/tests/suites/certification/Test_TC_S_2_3.yaml
+++ b/src/app/tests/suites/certification/Test_TC_S_2_3.yaml
@@ -15,6 +15,9 @@
 
 name: 123.2.3. [TC-S-2.3] Secondary functionality with server as DUT
 
+PICS:
+    - S.S
+
 config:
     nodeId: 0x12344321
     cluster: "Basic"
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 a2fb68f135c140..4b49684135bbf1 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
@@ -15,6 +15,13 @@
 
 name: 123.3.1. [TC-S-3.1] Functionality with client as DUT
 
+PICS:
+    - S.C
+    - S.C.AM-READ
+    - S.C.AO-READ
+    - S.C.AM-WRITE
+    - S.C.AO-WRITE
+
 config:
     nodeId: 0x12344321
     cluster: "Basic"
diff --git a/src/app/tests/suites/certification/Test_TC_TGTNAV_1_9.yaml b/src/app/tests/suites/certification/Test_TC_TGTNAV_1_9.yaml
index 8bbfe298a9748e..53d72aadbbfb5c 100644
--- a/src/app/tests/suites/certification/Test_TC_TGTNAV_1_9.yaml
+++ b/src/app/tests/suites/certification/Test_TC_TGTNAV_1_9.yaml
@@ -16,6 +16,9 @@ name:
     19.1.9. [TC-TGTNAV-1.9] Global attributes - Target Navigator Cluster (DUT as
     Server)
 
+PICS:
+    - TGTNAV.S
+
 config:
     nodeId: 0x12344321
     cluster: "Target Navigator"
diff --git a/src/app/tests/suites/certification/Test_TC_TMP_1_1.yaml b/src/app/tests/suites/certification/Test_TC_TMP_1_1.yaml
index c3e466ff57ca6c..7d70ac0e2d533e 100644
--- a/src/app/tests/suites/certification/Test_TC_TMP_1_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_TMP_1_1.yaml
@@ -14,6 +14,9 @@
 
 name: 7.1.1. [TC-TMP-1.1] Global attributes with server as DUT
 
+PICS:
+    - TMP.S
+
 config:
     nodeId: 0x12344321
     cluster: "Temperature Measurement"
diff --git a/src/app/tests/suites/certification/Test_TC_TMP_2_1.yaml b/src/app/tests/suites/certification/Test_TC_TMP_2_1.yaml
index 37baa132bb605b..38cd27cbfd46b0 100644
--- a/src/app/tests/suites/certification/Test_TC_TMP_2_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_TMP_2_1.yaml
@@ -14,6 +14,11 @@
 
 name: 7.2.1. [TC-TMP-2.1] Attributes with server as DUT
 
+PICS:
+    - TMP.S
+    - TMP.S.Am
+    - TMP.S.Ao
+
 config:
     nodeId: 0x12344321
     cluster: "Temperature Measurement"
diff --git a/src/app/tests/suites/certification/Test_TC_TMP_2_2.yaml b/src/app/tests/suites/certification/Test_TC_TMP_2_2.yaml
index 1caecd702318e1..b06481ee954457 100644
--- a/src/app/tests/suites/certification/Test_TC_TMP_2_2.yaml
+++ b/src/app/tests/suites/certification/Test_TC_TMP_2_2.yaml
@@ -14,6 +14,9 @@
 
 name: 7.2.2. [TC-TMP-2.2] Primary functionality with server as DUT
 
+PICS:
+    - TMP.S
+
 config:
     nodeId: 0x12344321
     cluster: "Temperature Measurement"
diff --git a/src/app/tests/suites/certification/Test_TC_TSTAT_1_1.yaml b/src/app/tests/suites/certification/Test_TC_TSTAT_1_1.yaml
index 1320185885c7af..73c2d4792c5380 100644
--- a/src/app/tests/suites/certification/Test_TC_TSTAT_1_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_TSTAT_1_1.yaml
@@ -14,6 +14,9 @@
 
 name: 42.1.1. [TC-TSTAT-1.1] Global attributes with server as DUT
 
+PICS:
+    - TSTAT.S
+
 config:
     nodeId: 0x12344321
     cluster: "Thermostat"
diff --git a/src/app/tests/suites/certification/Test_TC_TSTAT_2_1.yaml b/src/app/tests/suites/certification/Test_TC_TSTAT_2_1.yaml
index a0ffea63eb050f..6cf8fa3aa9051f 100644
--- a/src/app/tests/suites/certification/Test_TC_TSTAT_2_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_TSTAT_2_1.yaml
@@ -14,6 +14,9 @@
 
 name: 42.2.1. [TC-TSTAT-2.1] Attributes with server as DUT
 
+PICS:
+    - TSTAT.S
+
 config:
     nodeId: 0x12344321
     cluster: "Thermostat"
diff --git a/src/app/tests/suites/certification/Test_TC_TSTAT_2_2.yaml b/src/app/tests/suites/certification/Test_TC_TSTAT_2_2.yaml
index 4b0328d502a885..ab656491823c5b 100644
--- a/src/app/tests/suites/certification/Test_TC_TSTAT_2_2.yaml
+++ b/src/app/tests/suites/certification/Test_TC_TSTAT_2_2.yaml
@@ -14,6 +14,9 @@
 
 name: 42.2.2. [TC-TSTAT-2.2] Setpoint Test Cases with server as DUT
 
+PICS:
+    - TSTAT.S
+
 config:
     nodeId: 0x12344321
     cluster: "Thermostat"
diff --git a/src/app/tests/suites/certification/Test_TC_TSUIC_1_1.yaml b/src/app/tests/suites/certification/Test_TC_TSUIC_1_1.yaml
index 34cb80974ef93e..6d570242a522b7 100644
--- a/src/app/tests/suites/certification/Test_TC_TSUIC_1_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_TSUIC_1_1.yaml
@@ -14,6 +14,9 @@
 
 name: 12.1.1. [TC-TSUIC-1.1] Global attributes with server as DUT
 
+PICS:
+    - TSUIC.S
+
 config:
     nodeId: 0x12344321
     cluster: "Thermostat User Interface Configuration"
diff --git a/src/app/tests/suites/certification/Test_TC_TSUIC_2_1.yaml b/src/app/tests/suites/certification/Test_TC_TSUIC_2_1.yaml
index 74ca11d1c5f04a..9cb009f609291d 100644
--- a/src/app/tests/suites/certification/Test_TC_TSUIC_2_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_TSUIC_2_1.yaml
@@ -14,6 +14,9 @@
 
 name: 12.2.1. [TC-TSUIC-2.1] Attributes with server as DUT
 
+PICS:
+    - TSUIC.S
+
 config:
     nodeId: 0x12344321
     cluster: "Thermostat User Interface Configuration"
diff --git a/src/app/tests/suites/certification/Test_TC_TSUIC_2_2.yaml b/src/app/tests/suites/certification/Test_TC_TSUIC_2_2.yaml
index 720b53de9e8c8e..11180e99d155a3 100644
--- a/src/app/tests/suites/certification/Test_TC_TSUIC_2_2.yaml
+++ b/src/app/tests/suites/certification/Test_TC_TSUIC_2_2.yaml
@@ -14,6 +14,9 @@
 
 name: 12.2.2. [TC-TSUIC-2.2] Primary functionality with server as DUT
 
+PICS:
+    - TSUIC.S
+
 config:
     nodeId: 0x12344321
     cluster: "Thermostat User Interface Configuration"
diff --git a/src/app/tests/suites/certification/Test_TC_TSUIC_3_1.yaml b/src/app/tests/suites/certification/Test_TC_TSUIC_3_1.yaml
index e2baf5004b94a0..9e57f00ff352ce 100644
--- a/src/app/tests/suites/certification/Test_TC_TSUIC_3_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_TSUIC_3_1.yaml
@@ -15,6 +15,13 @@
 
 name: 13.3.1. [TC-TSUIC-3.1] Attributes with client as DUT
 
+PICS:
+    - TSUIC.C
+    - TSUIC.C.AM-READ
+    - TSUIC.C.AO-READ
+    - TSUIC.C.AM-WRITE
+    - TSUIC.C.AO-WRITE
+
 config:
     nodeId: 0x12344321
     cluster: "Basic"
diff --git a/src/app/tests/suites/certification/Test_TC_ULABEL_1_1.yaml b/src/app/tests/suites/certification/Test_TC_ULABEL_1_1.yaml
index 894da6642d1112..c77e517ae9f0f1 100644
--- a/src/app/tests/suites/certification/Test_TC_ULABEL_1_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_ULABEL_1_1.yaml
@@ -14,6 +14,9 @@
 
 name: 92.1. [TC-ULABEL-1.1] Global Attributes [DUT-server]
 
+PICS:
+    - ULABEL.S
+
 config:
     nodeId: 0x12344321
     cluster: "User Label"
diff --git a/src/app/tests/suites/certification/Test_TC_ULABEL_2_2.yaml b/src/app/tests/suites/certification/Test_TC_ULABEL_2_2.yaml
index 9de3fe935077da..ff83dd0070d021 100644
--- a/src/app/tests/suites/certification/Test_TC_ULABEL_2_2.yaml
+++ b/src/app/tests/suites/certification/Test_TC_ULABEL_2_2.yaml
@@ -14,6 +14,9 @@
 
 name: 92.3. [TC-ULABEL-2.2] User Label cluster write verification [DUT-server]
 
+PICS:
+    - ULABEL.S
+
 config:
     nodeId: 0x12344321
     cluster: "User Label"
diff --git a/src/app/tests/suites/certification/Test_TC_ULABEL_2_3.yaml b/src/app/tests/suites/certification/Test_TC_ULABEL_2_3.yaml
index 5377136bf16850..9dd1c129922e71 100644
--- a/src/app/tests/suites/certification/Test_TC_ULABEL_2_3.yaml
+++ b/src/app/tests/suites/certification/Test_TC_ULABEL_2_3.yaml
@@ -17,6 +17,9 @@ name:
     92.4. [TC-ULABEL-2.3] User Label cluster constraint_error verification
     [DUT-server]
 
+PICS:
+    - ULABEL.S
+
 config:
     nodeId: 0x12344321
     cluster: "User Label"
diff --git a/src/app/tests/suites/certification/Test_TC_ULABEL_2_4.yaml b/src/app/tests/suites/certification/Test_TC_ULABEL_2_4.yaml
index d47a05c741a128..dcfb8fb3800a4b 100644
--- a/src/app/tests/suites/certification/Test_TC_ULABEL_2_4.yaml
+++ b/src/app/tests/suites/certification/Test_TC_ULABEL_2_4.yaml
@@ -17,6 +17,9 @@ name:
     92.5. [TC-ULABEL-2.4] User Label cluster empty entry verification
     [DUT-server]
 
+PICS:
+    - ULABEL.S
+
 config:
     nodeId: 0x12344321
     cluster: "User Label"
diff --git a/src/app/tests/suites/certification/Test_TC_ULABEL_3_1.yaml b/src/app/tests/suites/certification/Test_TC_ULABEL_3_1.yaml
index 83ecfad3a4ba6d..6b988bc589cec3 100644
--- a/src/app/tests/suites/certification/Test_TC_ULABEL_3_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_ULABEL_3_1.yaml
@@ -15,6 +15,9 @@
 
 name: 3.3.1. [TC-ULABEL-3.1] User label cluster [DUT-client]
 
+PICS:
+    - ULABEL.C
+
 config:
     nodeId: 0x12344321
     cluster: "Basic"
diff --git a/src/app/tests/suites/certification/Test_TC_WNCV_2_1.yaml b/src/app/tests/suites/certification/Test_TC_WNCV_2_1.yaml
index 6b30454bb892f2..5ce1232a843df2 100644
--- a/src/app/tests/suites/certification/Test_TC_WNCV_2_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_WNCV_2_1.yaml
@@ -16,6 +16,9 @@
 
 name: Window Covering [TC-WNCV-2.1] Attributes with server as DUT
 
+PICS:
+    - WNCV.S
+
 config:
     nodeId: 0x12344321
     cluster: "Window Covering"
diff --git a/src/app/tests/suites/certification/Test_TC_WNCV_2_2.yaml b/src/app/tests/suites/certification/Test_TC_WNCV_2_2.yaml
index e763489c1e2795..89bda28d296a86 100644
--- a/src/app/tests/suites/certification/Test_TC_WNCV_2_2.yaml
+++ b/src/app/tests/suites/certification/Test_TC_WNCV_2_2.yaml
@@ -14,6 +14,9 @@
 
 name: 39.2.2. [TC-WNCV-2.2] ConfigStatus Attribute with server as DUT
 
+PICS:
+    - WNCV.S
+
 config:
     nodeId: 0x12344321
     cluster: "Window Covering"
diff --git a/src/app/tests/suites/certification/Test_TC_WNCV_2_3.yaml b/src/app/tests/suites/certification/Test_TC_WNCV_2_3.yaml
index f948f9c7c0912e..c059b67791ced9 100644
--- a/src/app/tests/suites/certification/Test_TC_WNCV_2_3.yaml
+++ b/src/app/tests/suites/certification/Test_TC_WNCV_2_3.yaml
@@ -15,6 +15,9 @@
 
 name: 36.2.3. [TC-WNCV-2.3] Mode Attribute with server as DUT
 
+PICS:
+    - WNCV.S
+
 config:
     nodeId: 0x12344321
     cluster: "Window Covering"
diff --git a/src/app/tests/suites/certification/Test_TC_WNCV_2_4.yaml b/src/app/tests/suites/certification/Test_TC_WNCV_2_4.yaml
index 3e805825b819e1..35611fe658544a 100644
--- a/src/app/tests/suites/certification/Test_TC_WNCV_2_4.yaml
+++ b/src/app/tests/suites/certification/Test_TC_WNCV_2_4.yaml
@@ -14,6 +14,9 @@
 
 name: 39.2.4. [TC-WNCV-2.4] Type Attribute with server as DUT
 
+PICS:
+    - WNCV.S
+
 config:
     nodeId: 0x12344321
     cluster: "Window Covering"
diff --git a/src/app/tests/suites/certification/Test_TC_WNCV_2_5.yaml b/src/app/tests/suites/certification/Test_TC_WNCV_2_5.yaml
index 8c04c30b54ca13..37d61ea4d86724 100644
--- a/src/app/tests/suites/certification/Test_TC_WNCV_2_5.yaml
+++ b/src/app/tests/suites/certification/Test_TC_WNCV_2_5.yaml
@@ -14,6 +14,9 @@
 
 name: 39.2.5. [TC-WNCV-2.5] EndProductType Attribute with server as DUT
 
+PICS:
+    - WNCV.S
+
 config:
     nodeId: 0x12344321
     cluster: "Window Covering"
diff --git a/src/app/tests/suites/certification/Test_TC_WNCV_3_1.yaml b/src/app/tests/suites/certification/Test_TC_WNCV_3_1.yaml
index 80cb89614f5230..07e71bd76d28b2 100644
--- a/src/app/tests/suites/certification/Test_TC_WNCV_3_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_WNCV_3_1.yaml
@@ -16,6 +16,9 @@ name:
     Window Covering [TC-WNCV-3.1] UpOrOpen Command & Report Verification with
     server as DUT
 
+PICS:
+    - WNCV.S
+
 # TC-WNCV tests featuremap conditional dependencies -> use PICS
 
 config:
diff --git a/src/app/tests/suites/certification/Test_TC_WNCV_3_2.yaml b/src/app/tests/suites/certification/Test_TC_WNCV_3_2.yaml
index de551662f251b8..15a0a663780c2b 100644
--- a/src/app/tests/suites/certification/Test_TC_WNCV_3_2.yaml
+++ b/src/app/tests/suites/certification/Test_TC_WNCV_3_2.yaml
@@ -16,6 +16,9 @@ name:
     Window Covering [TC-WNCV-3.2] DownOrClose Command & Report Verification with
     server as DUT
 
+PICS:
+    - WNCV.S
+
 # TC-WNCV tests featuremap conditional dependencies -> use PICS
 
 config:
diff --git a/src/app/tests/suites/certification/Test_TC_WNCV_3_4.yaml b/src/app/tests/suites/certification/Test_TC_WNCV_3_4.yaml
index 608d5d39a31814..112e62fe0ad7b7 100644
--- a/src/app/tests/suites/certification/Test_TC_WNCV_3_4.yaml
+++ b/src/app/tests/suites/certification/Test_TC_WNCV_3_4.yaml
@@ -16,6 +16,9 @@ name:
     Window Covering [TC-WNCV-3.4] UpOrOpen Long-Run Verification with server as
     DUT
 
+PICS:
+    - WNCV.S
+
 config:
     nodeId: 0x12344321
     cluster: "Window Covering"
diff --git a/src/app/tests/suites/certification/Test_TC_WNCV_3_5.yaml b/src/app/tests/suites/certification/Test_TC_WNCV_3_5.yaml
index 2208f81bdfb8f1..e9eeea6c438c54 100644
--- a/src/app/tests/suites/certification/Test_TC_WNCV_3_5.yaml
+++ b/src/app/tests/suites/certification/Test_TC_WNCV_3_5.yaml
@@ -16,6 +16,9 @@ name:
     Window Covering [TC-WNCV-3.5] DownOrClose Long-Run Verification with server
     as DUT
 
+PICS:
+    - WNCV.S
+
 config:
     nodeId: 0x12344321
     cluster: "Window Covering"
diff --git a/src/app/tests/suites/certification/Test_TC_WNCV_4_1.yaml b/src/app/tests/suites/certification/Test_TC_WNCV_4_1.yaml
index 85f93558ad6348..0d6cda956a57f8 100644
--- a/src/app/tests/suites/certification/Test_TC_WNCV_4_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_WNCV_4_1.yaml
@@ -16,6 +16,9 @@ name:
     Window Covering [TC-WNCV-4.1] GoToLiftPercentage Long-Run Verification with
     server as DUT
 
+PICS:
+    - WNCV.S
+
 config:
     nodeId: 0x12344321
     cluster: "Window Covering"
diff --git a/src/app/tests/suites/certification/Test_TC_WNCV_4_3.yaml b/src/app/tests/suites/certification/Test_TC_WNCV_4_3.yaml
index d73d2690f36b83..4387335830e257 100644
--- a/src/app/tests/suites/certification/Test_TC_WNCV_4_3.yaml
+++ b/src/app/tests/suites/certification/Test_TC_WNCV_4_3.yaml
@@ -16,6 +16,9 @@ name:
     Window Covering [TC-WNCV-4.3] GoToLiftPercentage Limits Verification with
     server as DUT
 
+PICS:
+    - WNCV.S
+
 config:
     nodeId: 0x12344321
     cluster: "Window Covering"
diff --git a/src/app/tests/suites/certification/Test_TC_WNCV_4_4.yaml b/src/app/tests/suites/certification/Test_TC_WNCV_4_4.yaml
index 075bb8cdd75c94..99319da678bdf6 100644
--- a/src/app/tests/suites/certification/Test_TC_WNCV_4_4.yaml
+++ b/src/app/tests/suites/certification/Test_TC_WNCV_4_4.yaml
@@ -16,6 +16,9 @@ name:
     Window Covering [TC-WNCV-4.4] GoToTiltPercentage Limits Verification with
     server as DUT
 
+PICS:
+    - WNCV.S
+
 config:
     nodeId: 0x12344321
     cluster: "Window Covering"
diff --git a/src/app/tests/suites/certification/Test_TC_WNCV_4_5.yaml b/src/app/tests/suites/certification/Test_TC_WNCV_4_5.yaml
index aca6efd08ba5cd..8ba45a052b496b 100644
--- a/src/app/tests/suites/certification/Test_TC_WNCV_4_5.yaml
+++ b/src/app/tests/suites/certification/Test_TC_WNCV_4_5.yaml
@@ -17,6 +17,9 @@ name:
     Window Covering [TC-WNCV-4.5] Positions Storage Verification with server as
     DUT
 
+PICS:
+    - WNCV.S
+
 config:
     nodeId: 0x12344321
     cluster: "Window Covering"
diff --git a/src/app/tests/suites/certification/Test_TC_WNCV_5_1.yaml b/src/app/tests/suites/certification/Test_TC_WNCV_5_1.yaml
index 79fe3498076bf6..078a8133bff1d9 100644
--- a/src/app/tests/suites/certification/Test_TC_WNCV_5_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_WNCV_5_1.yaml
@@ -15,6 +15,9 @@
 
 name: 3.4.6. [TC-WNCV-5.1] Mandatory Attributes Verification [DUT as Client]
 
+PICS:
+    - WNCV.C
+
 config:
     nodeId: 0x12344321
     cluster: "Basic"
diff --git a/src/app/tests/suites/certification/Test_TC_WNCV_6_1.yaml b/src/app/tests/suites/certification/Test_TC_WNCV_6_1.yaml
index b0071e13552d27..eec44d94365c22 100644
--- a/src/app/tests/suites/certification/Test_TC_WNCV_6_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_WNCV_6_1.yaml
@@ -15,6 +15,9 @@
 
 name: 3.4.7. [TC-WNCV-6.1] Basic Commands Verification [DUT as Client]
 
+PICS:
+    - WNCV.C
+
 config:
     nodeId: 0x12344321
     cluster: "Basic"
diff --git a/src/app/tests/suites/certification/Test_TC_WNCV_7_1.yaml b/src/app/tests/suites/certification/Test_TC_WNCV_7_1.yaml
index a78b77b30e2a84..605240a6a883e6 100644
--- a/src/app/tests/suites/certification/Test_TC_WNCV_7_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_WNCV_7_1.yaml
@@ -15,6 +15,9 @@
 
 name: 3.4.8. [TC-WNCV-7.1] GoToPercentage Commands Verification [DUT as Client]
 
+PICS:
+    - WNCV.C
+
 config:
     nodeId: 0x12344321
     cluster: "Basic"
diff --git a/src/app/tests/suites/tests.js b/src/app/tests/suites/tests.js
index 870375d6ae1ce0..be523903972b77 100644
--- a/src/app/tests/suites/tests.js
+++ b/src/app/tests/suites/tests.js
@@ -165,7 +165,6 @@ function getManualTests() {
         "Test_TC_DGGEN_2_2",
         "Test_TC_DGGEN_2_3",
         "Test_TC_DGGEN_3_1",
-        "Test_TC_DGGEN_3_2",
     ];
 
     const Identify = [
diff --git a/zzz_generated/chip-tool/zap-generated/test/Commands.h b/zzz_generated/chip-tool/zap-generated/test/Commands.h
index 2ecbe376ab51ea..681a982c55c953 100644
--- a/zzz_generated/chip-tool/zap-generated/test/Commands.h
+++ b/zzz_generated/chip-tool/zap-generated/test/Commands.h
@@ -345,7 +345,6 @@ class ManualTestList : public Command
         printf("Test_TC_DGGEN_2_2\n");
         printf("Test_TC_DGGEN_2_3\n");
         printf("Test_TC_DGGEN_3_1\n");
-        printf("Test_TC_DGGEN_3_2\n");
         printf("Test_TC_I_3_1\n");
         printf("Test_TC_I_3_2\n");
         printf("Test_TC_ILL_2_2\n");
@@ -71871,62 +71870,6 @@ class Test_TC_DGGEN_3_1Suite : public TestCommand
     }
 };
 
-class Test_TC_DGGEN_3_2Suite : public TestCommand
-{
-public:
-    Test_TC_DGGEN_3_2Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_DGGEN_3_2", 0, credsIssuerConfig)
-    {
-        AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
-        AddArgument("cluster", &mCluster);
-        AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
-        AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
-    }
-
-    ~Test_TC_DGGEN_3_2Suite() {}
-
-    chip::System::Clock::Timeout GetWaitDuration() const override
-    {
-        return chip::System::Clock::Seconds16(mTimeout.ValueOr(kTimeoutInSeconds));
-    }
-
-private:
-    chip::Optional<chip::NodeId> mNodeId;
-    chip::Optional<chip::CharSpan> mCluster;
-    chip::Optional<chip::EndpointId> mEndpoint;
-    chip::Optional<uint16_t> mTimeout;
-
-    chip::EndpointId GetEndpoint(chip::EndpointId endpoint) { return mEndpoint.HasValue() ? mEndpoint.Value() : endpoint; }
-
-    //
-    // Tests methods
-    //
-
-    void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override
-    {
-        bool shouldContinue = false;
-
-        switch (mTestIndex - 1)
-        {
-        default:
-            LogErrorOnFailure(ContinueOnChipMainThread(CHIP_ERROR_INVALID_ARGUMENT));
-        }
-
-        if (shouldContinue)
-        {
-            ContinueOnChipMainThread(CHIP_NO_ERROR);
-        }
-    }
-
-    CHIP_ERROR DoTestStep(uint16_t testIndex) override
-    {
-        using namespace chip::app::Clusters;
-        switch (testIndex)
-        {
-        }
-        return CHIP_NO_ERROR;
-    }
-};
-
 class Test_TC_I_3_1Suite : public TestCommand
 {
 public:
@@ -92272,7 +92215,6 @@ void registerCommandsTests(Commands & commands, CredentialIssuerCommands * creds
         make_unique<Test_TC_DGGEN_2_2Suite>(credsIssuerConfig),
         make_unique<Test_TC_DGGEN_2_3Suite>(credsIssuerConfig),
         make_unique<Test_TC_DGGEN_3_1Suite>(credsIssuerConfig),
-        make_unique<Test_TC_DGGEN_3_2Suite>(credsIssuerConfig),
         make_unique<Test_TC_I_3_1Suite>(credsIssuerConfig),
         make_unique<Test_TC_I_3_2Suite>(credsIssuerConfig),
         make_unique<Test_TC_ILL_2_2Suite>(credsIssuerConfig),