diff --git a/src/app/tests/suites/certification/Test_TC_ACL_2_3.yaml b/src/app/tests/suites/certification/Test_TC_ACL_2_3.yaml
index c5bb53c..7716b52 100644
--- a/src/app/tests/suites/certification/Test_TC_ACL_2_3.yaml
+++ b/src/app/tests/suites/certification/Test_TC_ACL_2_3.yaml
@@ -47,7 +47,7 @@
       verification: |
           ./chip-tool accesscontrol read extension 1 0
 
-          On TH(Chiptool) , Verify the to extension attribute value as an empty list
+          On TH(Chiptool) , Verify the extension attribute contains an empty list
 
           [1657116435.352869][2667:2672] CHIP:DMG:        SuppressResponse = true,
           [1657116435.352904][2667:2672] CHIP:DMG:        InteractionModelRevision = 1
@@ -65,7 +65,7 @@
       verification: |
           ./chip-tool accesscontrol write extension "[{"data":"1718"}]" 1 0
 
-          On TH(Chiptool) , Verify  AccessControl cluster Extension attribute, value is list of AccessControlExtensionStruct containing 1 element
+          On TH(Chiptool) , Verify  AccessControl cluster Extension attribute, contains the list of AccessControlExtensionStruct containing 1 element
 
           [1656416335.284463][3747:3752] CHIP:DMG: WriteResponseMessage =
           [1656416335.284498][3747:3752] CHIP:DMG: {
@@ -162,7 +162,7 @@
       verification: |
           ./chip-tool accesscontrol write extension "[{"data":"17D00000F1FF01003D48656C6C6F20576F726C642E205468697320697320612073696E676C6520656C656D656E74206C6976696E6720617320612063686172737472696E670018"}]" 1 0
 
-          On TH(Chiptool) , Verify  AccessControl cluster Extension attribute, value is list of AccessControlExtensionStruct containing 1 element  .
+          On TH(Chiptool) , Verify  AccessControl cluster Extension attribute, contains the list of AccessControlExtensionStruct containing 1 element  .
 
 
           [1656416899.781899][3814:3819] CHIP:DMG: WriteResponseMessage =
@@ -217,7 +217,7 @@
       verification: |
           ./chip-tool accesscontrol read extension 1 0
 
-          On TH(Chiptool) , Verify value is list of AccessControlExtensionStructcontaining 1 element                                                              1.struct
+          On TH(Chiptool) , Verify the AccessControlExtensionStruct containing 1 element                                                              1.struct
           Data field: D_OK_SINGLE :"17D00000F1FF01003D48656C6C6F20576F726C642E205468697320697320612073696E676C6520656C656D656E74206C6976696E6720617320612063686172737472696E670018"
 
           [1657278788.400832][9048:9053] CHIP:DMG: ReportDataMessage =
@@ -291,7 +291,7 @@
       verification: |
           ./chip-tool accesscontrol write extension "[{"data":"17D00000F1FF01003D48656C6C6F20576F726C642E205468697320697320612073696E676C6520656C656D656E74206C6976696E6720617320612063686172737472696E6700D00000F1FF02003148656C6C6F20576F726C642E205468697320697320612073696E676C6520656C656D656E7420616761696E2E2E2E2E2E0018"}]" 1 0
 
-          On TH(Chiptool) , Verify  AccessControl cluster Extension attribute, value is list of AccessControlExtensionStruct containing 1 element
+          On TH(Chiptool) , Verify  AccessControl cluster Extension attribute, contains the list of AccessControlExtensionStruct containing 1 element
           [1656417544.279572][3888:3893] CHIP:DMG: WriteResponseMessage =
           [1656417544.279598][3888:3893] CHIP:DMG: {
           [1656417544.279620][3888:3893] CHIP:DMG:        AttributeStatusIBs =
@@ -334,7 +334,7 @@
       PICS: ACL.S.A0001
       verification: |
           ./chip-tool accesscontrol read extension 1 0
-          On TH(Chiptool) , Verify value is list of AccessControlExtensionStructcontaining 1 element                                                                     1.struct
+          On TH(Chiptool) , Verify AccessControlExtensionStructcontaining 1 element                                                                     1.struct
           Data field:
           D_OK_FULL  :"17D00000F1FF01003D48656C6C6F20576F726C642E205468697320697320612073696E676C6520656C656D656E74206C6976696E6720617320612063686172737472696E6700D00000F1FF02003148656C6C6F20576F726C642E205468697320697320612073696E676C6520656C656D656E7420616761696E2E2E2E2E2E0018"
 
@@ -408,7 +408,7 @@
       PICS: ACL.S.A0001
       verification: |
           ./chip-tool accesscontrol write extension "[{"data":"17D00000F1FF01003D48656C6C6F20576F726C642E205468697320697320612073696E676C6520656C656D656E74206C6976696E6720617320612063686172737472696E6700D00000F1FF02003248656C6C6F20576F726C642E205468697320697320612073696E676C6520656C656D656E7420616761696E2E2E2E2E2E2E0018"}]" 1 0
-          On TH(Chiptool) , Verify  AccessControl cluster Extension attribute, value is list of AccessControlExtensionStruct containing 1 element  Returns  CONSTRAINT_ERROR (0x87)
+          On TH(Chiptool) , Verify  AccessControl cluster Extension attribute, contains the list of AccessControlExtensionStruct containing 1 element  which Returns  CONSTRAINT_ERROR (0x87)
           1657279033.590101][9081:9086] CHIP:DMG: WriteResponseMessage =
           [1657279033.590134][9081:9086] CHIP:DMG: {
           [1657279033.590167][9081:9086] CHIP:DMG:        AttributeStatusIBs =
@@ -466,7 +466,7 @@
       verification: |
           ./chip-tool accesscontrol write extension "[{"data":"1518"}]" 1 0
 
-          On TH(Chiptool) , Verify  AccessControl cluster Extension attribute, value is list of AccessControlExtensionStruct containing 1 element  Returns  CONSTRAINT_ERROR (0x87)
+          On TH(Chiptool) , Verify  AccessControl cluster Extension attribute, contains the list of AccessControlExtensionStruct containing 1 element  which Returns  CONSTRAINT_ERROR (0x87)
 
           [1657609094.514337][8195:8200] CHIP:DMG: WriteResponseMessage =
           [1657609094.514410][8195:8200] CHIP:DMG: {
@@ -522,7 +522,7 @@
       verification: |
           ./chip-tool accesscontrol write extension "[{"data":"3701D00000F1FF01003D48656C6C6F20576F726C642E205468697320697320612073696E676C6520656C656D656E74206C6976696E6720617320612063686172737472696E670018"}]" 1 0
 
-          On TH(Chiptool) , Verify  AccessControl cluster Extension attribute, value is list of AccessControlExtensionStruct containing 1 element  Returns  CONSTRAINT_ERROR (0x87)
+          On TH(Chiptool) , Verify  AccessControl cluster Extension attribute, value is list of AccessControlExtensionStruct containing 1 element which Returns  CONSTRAINT_ERROR (0x87)
 
           [1657609434.913859][8206:8211] CHIP:DMG: WriteResponseMessage =
           [1657609434.913892][8206:8211] CHIP:DMG: {
@@ -580,35 +580,7 @@
 
           On TH(Chiptool) , Verify  AccessControl cluster Extension attribute, value is list of AccessControlExtensionStruct containing 1 element  Returns  CONSTRAINT_ERROR (0x87)
 
-          [1657609579.493445][8215:8220] CHIP:DMG: WriteResponseMessage =
-          [1657609579.493480][8215:8220] CHIP:DMG: {
-          [1657609579.493509][8215:8220] CHIP:DMG:        AttributeStatusIBs =
-          [1657609579.493548][8215:8220] CHIP:DMG:        [
-          [1657609579.493579][8215:8220] CHIP:DMG:                AttributeStatusIB =
-          [1657609579.493618][8215:8220] CHIP:DMG:                {
-          [1657609579.493652][8215:8220] CHIP:DMG:                        AttributePathIB =
-          [1657609579.493692][8215:8220] CHIP:DMG:                        {
-          [1657609579.493732][8215:8220] CHIP:DMG:                                Endpoint = 0x0,
-          [1657609579.493774][8215:8220] CHIP:DMG:                                Cluster = 0x1f,
-          [1657609579.493815][8215:8220] CHIP:DMG:                                Attribute = 0x0000_0001,
-          [1657609579.493853][8215:8220] CHIP:DMG:                        }
-          [1657609579.493896][8215:8220] CHIP:DMG:
-          [1657609579.493936][8215:8220] CHIP:DMG:                        StatusIB =
-          [1657609579.493976][8215:8220] CHIP:DMG:                        {
-          [1657609579.494014][8215:8220] CHIP:DMG:                                status = 0x00 (SUCCESS),
-          [1657609579.494052][8215:8220] CHIP:DMG:                        },
-          [1657609579.494091][8215:8220] CHIP:DMG:
-          [1657609579.494124][8215:8220] CHIP:DMG:                },
-          [1657609579.494168][8215:8220] CHIP:DMG:
-          [1657609579.494198][8215:8220] CHIP:DMG:                AttributeStatusIB =
-          [1657609579.494232][8215:8220] CHIP:DMG:                {
-          [1657609579.494267][8215:8220] CHIP:DMG:                        AttributePathIB =
-          [1657609579.494304][8215:8220] CHIP:DMG:                        {
-          [1657609579.494343][8215:8220] CHIP:DMG:                                Endpoint = 0x0,
-          [1657609579.494414][8215:8220] CHIP:DMG:                                Cluster = 0x1f,
-          [1657609579.494457][8215:8220] CHIP:DMG:                                Attribute = 0x0000_0001,
-          [1657609579.494497][8215:8220] CHIP:DMG:                                ListIndex = Null,
-          [1657609579.494534][8215:8220] CHIP:DMG:                        }
+
           [1657609579.494576][8215:8220] CHIP:DMG:
           [1657609579.494615][8215:8220] CHIP:DMG:                        StatusIB =
           [1657609579.494656][8215:8220] CHIP:DMG:                        {
@@ -635,35 +607,7 @@
           ./chip-tool accesscontrol write extension "[{"data":"17D00000F1FF01003D48656C6C6F20576F726C642E205468697320697320612073696E676C6520656C656D656E74206C6976696E6720617320612063686172737472696E670018FF"}]" 1 0
 
           On TH(Chiptool) , Verify  AccessControl cluster Extension attribute, value is list of AccessControlExtensionStruct containing 1 element  Returns  CONSTRAINT_ERROR (0x87)
-          [1657609625.258101][8223:8228] CHIP:DMG: WriteResponseMessage =
-          [1657609625.258129][8223:8228] CHIP:DMG: {
-          [1657609625.258152][8223:8228] CHIP:DMG:        AttributeStatusIBs =
-          [1657609625.258183][8223:8228] CHIP:DMG:        [
-          [1657609625.258209][8223:8228] CHIP:DMG:                AttributeStatusIB =
-          [1657609625.258238][8223:8228] CHIP:DMG:                {
-          [1657609625.258265][8223:8228] CHIP:DMG:                        AttributePathIB =
-          [1657609625.258300][8223:8228] CHIP:DMG:                        {
-          [1657609625.258335][8223:8228] CHIP:DMG:                                Endpoint = 0x0,
-          [1657609625.258396][8223:8228] CHIP:DMG:                                Cluster = 0x1f,
-          [1657609625.258433][8223:8228] CHIP:DMG:                                Attribute = 0x0000_0001,
-          [1657609625.258469][8223:8228] CHIP:DMG:                        }
-          [1657609625.258506][8223:8228] CHIP:DMG:
-          [1657609625.258538][8223:8228] CHIP:DMG:                        StatusIB =
-          [1657609625.258571][8223:8228] CHIP:DMG:                        {
-          [1657609625.258604][8223:8228] CHIP:DMG:                                status = 0x00 (SUCCESS),
-          [1657609625.258640][8223:8228] CHIP:DMG:                        },
-          [1657609625.258673][8223:8228] CHIP:DMG:
-          [1657609625.258702][8223:8228] CHIP:DMG:                },
-          [1657609625.258741][8223:8228] CHIP:DMG:
-          [1657609625.258766][8223:8228] CHIP:DMG:                AttributeStatusIB =
-          [1657609625.258795][8223:8228] CHIP:DMG:                {
-          [1657609625.258825][8223:8228] CHIP:DMG:                        AttributePathIB =
-          [1657609625.258856][8223:8228] CHIP:DMG:                        {
-          [1657609625.258889][8223:8228] CHIP:DMG:                                Endpoint = 0x0,
-          [1657609625.258924][8223:8228] CHIP:DMG:                                Cluster = 0x1f,
-          [1657609625.258959][8223:8228] CHIP:DMG:                                Attribute = 0x0000_0001,
-          [1657609625.258994][8223:8228] CHIP:DMG:                                ListIndex = Null,
-          [1657609625.259098][8223:8228] CHIP:DMG:                        }
+
           [1657609625.259137][8223:8228] CHIP:DMG:
           [1657609625.259168][8223:8228] CHIP:DMG:                        StatusIB =
           [1657609625.259200][8223:8228] CHIP:DMG:                        {
@@ -691,25 +635,6 @@
 
           On TH(Chiptool) , Verify    AccessControl cluster Extension attribute, value is list of AccessControlExtensionStruct containing 1 element,  Returns  CONSTRAINT_ERROR (0x87)
 
-          [1657609654.298297][8229:8234] CHIP:DMG: WriteResponseMessage =
-          [1657609654.298338][8229:8234] CHIP:DMG: {
-          [1657609654.298400][8229:8234] CHIP:DMG:        AttributeStatusIBs =
-          [1657609654.298447][8229:8234] CHIP:DMG:        [
-          [1657609654.298483][8229:8234] CHIP:DMG:                AttributeStatusIB =
-          [1657609654.298527][8229:8234] CHIP:DMG:                {
-          [1657609654.298565][8229:8234] CHIP:DMG:                        AttributePathIB =
-          [1657609654.298612][8229:8234] CHIP:DMG:                        {
-          [1657609654.298664][8229:8234] CHIP:DMG:                                Endpoint = 0x0,
-          [1657609654.298713][8229:8234] CHIP:DMG:                                Cluster = 0x1f,
-          [1657609654.298764][8229:8234] CHIP:DMG:                                Attribute = 0x0000_0001,
-          [1657609654.298810][8229:8234] CHIP:DMG:                        }
-          [1657609654.298860][8229:8234] CHIP:DMG:
-          [1657609654.298908][8229:8234] CHIP:DMG:                        StatusIB =
-          [1657609654.298955][8229:8234] CHIP:DMG:                        {
-          [1657609654.299001][8229:8234] CHIP:DMG:                                status = 0x00 (SUCCESS),
-          [1657609654.299046][8229:8234] CHIP:DMG:                        },
-          [1657609654.299092][8229:8234] CHIP:DMG:
-          [1657609654.299131][8229:8234] CHIP:DMG:                },
           [1657609654.299183][8229:8234] CHIP:DMG:
           [1657609654.299220][8229:8234] CHIP:DMG:                AttributeStatusIB =
           [1657609654.299259][8229:8234] CHIP:DMG:                {
@@ -746,35 +671,7 @@
 
           On TH(Chiptool) , Verify    AccessControl cluster Extension attribute, value is list of AccessControlExtensionStruct containing 1 element,  Returns  CONSTRAINT_ERROR (0x87)
 
-          [1657609694.044950][8236:8241] CHIP:DMG: WriteResponseMessage =
-          [1657609694.044980][8236:8241] CHIP:DMG: {
-          [1657609694.045008][8236:8241] CHIP:DMG:        AttributeStatusIBs =
-          [1657609694.045049][8236:8241] CHIP:DMG:        [
-          [1657609694.045080][8236:8241] CHIP:DMG:                AttributeStatusIB =
-          [1657609694.045117][8236:8241] CHIP:DMG:                {
-          [1657609694.045149][8236:8241] CHIP:DMG:                        AttributePathIB =
-          [1657609694.045187][8236:8241] CHIP:DMG:                        {
-          [1657609694.045232][8236:8241] CHIP:DMG:                                Endpoint = 0x0,
-          [1657609694.045277][8236:8241] CHIP:DMG:                                Cluster = 0x1f,
-          [1657609694.045318][8236:8241] CHIP:DMG:                                Attribute = 0x0000_0001,
-          [1657609694.045355][8236:8241] CHIP:DMG:                        }
-          [1657609694.045397][8236:8241] CHIP:DMG:
-          [1657609694.045434][8236:8241] CHIP:DMG:                        StatusIB =
-          [1657609694.045472][8236:8241] CHIP:DMG:                        {
-          [1657609694.045513][8236:8241] CHIP:DMG:                                status = 0x00 (SUCCESS),
-          [1657609694.045552][8236:8241] CHIP:DMG:                        },
-          [1657609694.045594][8236:8241] CHIP:DMG:
-          [1657609694.045627][8236:8241] CHIP:DMG:                },
-          [1657609694.045670][8236:8241] CHIP:DMG:
-          [1657609694.045701][8236:8241] CHIP:DMG:                AttributeStatusIB =
-          [1657609694.045733][8236:8241] CHIP:DMG:                {
-          [1657609694.045765][8236:8241] CHIP:DMG:                        AttributePathIB =
-          [1657609694.045801][8236:8241] CHIP:DMG:                        {
-          [1657609694.045840][8236:8241] CHIP:DMG:                                Endpoint = 0x0,
-          [1657609694.045880][8236:8241] CHIP:DMG:                                Cluster = 0x1f,
-          [1657609694.045922][8236:8241] CHIP:DMG:                                Attribute = 0x0000_0001,
-          [1657609694.045962][8236:8241] CHIP:DMG:                                ListIndex = Null,
-          [1657609694.046000][8236:8241] CHIP:DMG:                        }
+
           [1657609694.046042][8236:8241] CHIP:DMG:
           [1657609694.046078][8236:8241] CHIP:DMG:                        StatusIB =
           [1657609694.046115][8236:8241] CHIP:DMG:                        {
@@ -803,52 +700,7 @@
           ./chip-tool accesscontrol write extension "[{"data":"1718"},{"data":"17D00000F1FF01003D48656C6C6F20576F726C642E205468697320697320612073696E676C6520656C656D656E74206C6976696E6720617320612063686172737472696E670018"}]" 1 0
 
           On TH(Chiptool) , Verify  Successfully AccessControl cluster Extension attribute, value is list of AccessControlExtensionStruct containing 2 elements and  CONSTRAINT_ERROR (0x87) for second element path
-          1657279798.807750][9208:9213] CHIP:DMG: WriteResponseMessage =
-          [1657279798.807783][9208:9213] CHIP:DMG: {
-          [1657279798.807812][9208:9213] CHIP:DMG:        AttributeStatusIBs =
-          [1657279798.807854][9208:9213] CHIP:DMG:        [
-          [1657279798.807979][9208:9213] CHIP:DMG:                AttributeStatusIB =
-          [1657279798.808028][9208:9213] CHIP:DMG:                {
-          [1657279798.808062][9208:9213] CHIP:DMG:                        AttributePathIB =
-          [1657279798.808098][9208:9213] CHIP:DMG:                        {
-          [1657279798.808138][9208:9213] CHIP:DMG:                                Endpoint = 0x0,
-          [1657279798.808179][9208:9213] CHIP:DMG:                                Cluster = 0x1f,
-          [1657279798.808220][9208:9213] CHIP:DMG:                                Attribute = 0x0000_0001,
-          [1657279798.808290][9208:9213] CHIP:DMG:                        }
-          [1657279798.808334][9208:9213] CHIP:DMG:
-          [1657279798.808371][9208:9213] CHIP:DMG:                        StatusIB =
-          [1657279798.808410][9208:9213] CHIP:DMG:                        {
-          [1657279798.808448][9208:9213] CHIP:DMG:                                status = 0x00 (SUCCESS),
-          [1657279798.808486][9208:9213] CHIP:DMG:                        },
-          [1657279798.808524][9208:9213] CHIP:DMG:
-          [1657279798.808557][9208:9213] CHIP:DMG:                },
-          [1657279798.808599][9208:9213] CHIP:DMG:
-          [1657279798.808629][9208:9213] CHIP:DMG:                AttributeStatusIB =
-          [1657279798.808662][9208:9213] CHIP:DMG:                {
-          [1657279798.808693][9208:9213] CHIP:DMG:                        AttributePathIB =
-          [1657279798.808728][9208:9213] CHIP:DMG:                        {
-          [1657279798.808767][9208:9213] CHIP:DMG:                                Endpoint = 0x0,
-          [1657279798.808808][9208:9213] CHIP:DMG:                                Cluster = 0x1f,
-          [1657279798.808848][9208:9213] CHIP:DMG:                                Attribute = 0x0000_0001,
-          [1657279798.808888][9208:9213] CHIP:DMG:                                ListIndex = Null,
-          [1657279798.808930][9208:9213] CHIP:DMG:                        }
-          [1657279798.808969][9208:9213] CHIP:DMG:
-          [1657279798.809004][9208:9213] CHIP:DMG:                        StatusIB =
-          [1657279798.809041][9208:9213] CHIP:DMG:                        {
-          [1657279798.809077][9208:9213] CHIP:DMG:                                status = 0x00 (SUCCESS),
-          [1657279798.809115][9208:9213] CHIP:DMG:                        },
-          [1657279798.809152][9208:9213] CHIP:DMG:
-          [1657279798.809184][9208:9213] CHIP:DMG:                },
-          [1657279798.809227][9208:9213] CHIP:DMG:
-          [1657279798.809256][9208:9213] CHIP:DMG:                AttributeStatusIB =
-          [1657279798.809288][9208:9213] CHIP:DMG:                {
-          [1657279798.809319][9208:9213] CHIP:DMG:                        AttributePathIB =
-          [1657279798.809354][9208:9213] CHIP:DMG:                        {
-          [1657279798.809393][9208:9213] CHIP:DMG:                                Endpoint = 0x0,
-          [1657279798.809433][9208:9213] CHIP:DMG:                                Cluster = 0x1f,
-          [1657279798.809473][9208:9213] CHIP:DMG:                                Attribute = 0x0000_0001,
-          [1657279798.809511][9208:9213] CHIP:DMG:                                ListIndex = Null,
-          [1657279798.809549][9208:9213] CHIP:DMG:                        }
+
           [1657279798.809590][9208:9213] CHIP:DMG:
           [1657279798.809629][9208:9213] CHIP:DMG:                        StatusIB =
           [1657279798.809666][9208:9213] CHIP:DMG:                        {
@@ -872,7 +724,7 @@
       verification: |
           ./chip-tool accesscontrol read extension 1 0
 
-          On TH(Chiptool) , Verify Successfully the value is list of AccessControlExtensionStruct containing 1 element.
+          On TH(Chiptool) , Verify Successfully the list of AccessControlExtensionStruct containing 1 element.
 
 
           1657279968.695899][9221:9226] CHIP:DMG: ReportDataMessage =
@@ -979,63 +831,6 @@
 
           On TH(Chiptool) , Verify AccessControl cluster Extension attribute, value is an empty list
 
-          1657280113.650757][9255:9260] CHIP:DMG: ReportDataMessage =
-          [1657280113.650786][9255:9260] CHIP:DMG: {
-          [1657280113.650809][9255:9260] CHIP:DMG:        AttributeReportIBs =
-          [1657280113.650842][9255:9260] CHIP:DMG:        [
-          [1657280113.650869][9255:9260] CHIP:DMG:                AttributeReportIB =
-          [1657280113.650906][9255:9260] CHIP:DMG:                {
-          [1657280113.650934][9255:9260] CHIP:DMG:                        AttributeDataIB =
-          [1657280113.650971][9255:9260] CHIP:DMG:                        {
-          [1657280113.651010][9255:9260] CHIP:DMG:                                DataVersion = 0x1f506622,
-          [1657280113.651047][9255:9260] CHIP:DMG:                                AttributePathIB =
-          [1657280113.651086][9255:9260] CHIP:DMG:                                {
-          [1657280113.651114][9255:9260] CHIP:DMG:                                        Endpoint = 0x0,
-          [1657280113.651148][9255:9260] CHIP:DMG:                                        Cluster = 0x1f,
-          [1657280113.651188][9255:9260] CHIP:DMG:                                        Attribute = 0x0000_0001,
-          [1657280113.651219][9255:9260] CHIP:DMG:                                }
-          [1657280113.651259][9255:9260] CHIP:DMG:
-          [1657280113.651291][9255:9260] CHIP:DMG:                                Data = [
-          [1657280113.651324][9255:9260] CHIP:DMG:
-          [1657280113.651356][9255:9260] CHIP:DMG:                                ],
-          [1657280113.651391][9255:9260] CHIP:DMG:                        },
-          [1657280113.651426][9255:9260] CHIP:DMG:
-          [1657280113.651454][9255:9260] CHIP:DMG:                },
-          [1657280113.651499][9255:9260] CHIP:DMG:
-          [1657280113.651524][9255:9260] CHIP:DMG:                AttributeReportIB =
-          [1657280113.651560][9255:9260] CHIP:DMG:                {
-          [1657280113.651586][9255:9260] CHIP:DMG:                        AttributeDataIB =
-          [1657280113.651618][9255:9260] CHIP:DMG:                        {
-          [1657280113.651651][9255:9260] CHIP:DMG:                                DataVersion = 0x1f506622,
-          [1657280113.651687][9255:9260] CHIP:DMG:                                AttributePathIB =
-          [1657280113.651724][9255:9260] CHIP:DMG:                                {
-          [1657280113.651754][9255:9260] CHIP:DMG:                                        Endpoint = 0x0,
-          [1657280113.651792][9255:9260] CHIP:DMG:                                        Cluster = 0x1f,
-          [1657280113.651830][9255:9260] CHIP:DMG:                                        Attribute = 0x0000_0001,
-          [1657280113.651868][9255:9260] CHIP:DMG:                                        ListIndex = Null,
-          [1657280113.651904][9255:9260] CHIP:DMG:                                }
-          [1657280113.651942][9255:9260] CHIP:DMG:
-          [1657280113.651974][9255:9260] CHIP:DMG:                                Data =
-          [1657280113.652006][9255:9260] CHIP:DMG:                                {
-          [1657280113.652070][9255:9260] CHIP:DMG:                                        0x1 = [
-          [1657280113.652107][9255:9260] CHIP:DMG:
-          [1657280113.652147][9255:9260] CHIP:DMG:                                        ]
-          [1657280113.652187][9255:9260] CHIP:DMG:                                        0xfe = 1,
-          [1657280113.652250][9255:9260] CHIP:DMG:                                },
-          [1657280113.652282][9255:9260] CHIP:DMG:                        },
-          [1657280113.652331][9255:9260] CHIP:DMG:
-          [1657280113.652358][9255:9260] CHIP:DMG:                },
-          [1657280113.652390][9255:9260] CHIP:DMG:
-          [1657280113.652413][9255:9260] CHIP:DMG:        ],
-          [1657280113.652449][9255:9260] CHIP:DMG:
-          [1657280113.652474][9255:9260] CHIP:DMG:        SuppressResponse = true,
-          [1657280113.652498][9255:9260] CHIP:DMG:        InteractionModelRevision = 1
-          [1657280113.652522][9255:9260] CHIP:DMG: }
-          [1657280113.652770][9255:9260] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_001F Attribute 0x0000_0001 DataVersion: 525362722
-          [1657280113.652829][9255:9260] CHIP:TOO:   Extension: 1 entries
-          [1657280113.652879][9255:9260] CHIP:TOO:     [1]: {
-          [1657280113.652906][9255:9260] CHIP:TOO:       Data:
-          [1657280113.652943][9255:9260] CHIP:TOO:       FabricIndex: 1
-          [1657280113.652969][9255:9260] CHIP:TOO:      }
-          [1657280113.653047][9255:9260] CHIP:EM: Sending Standalone Ack for MessageCounter:29028542 on exchange 52303i
+          [1660223145.427219][80697:80702] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_001F Attribute 0x0000_0001 DataVersion: 2385810240
+          [1660223145.427227][80697:80702] CHIP:TOO:   Extension: 0 entries
       disabled: true
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 0497fca..988b4cc 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
@@ -71,7 +71,7 @@
 
           Subscribe the event using below command in Interactive mode. Once the event occurs, TH(chip-tool) get the subscription message.
 
-           booleanstate subscribe-event-by-id 0x0 1 100 2 1
+          booleanstate subscribe-by-id 0x0 1 100 2 1
       disabled: true
 
     - label: "Bring the DUT into a state so StateValue is FALSE"
diff --git a/src/app/tests/suites/certification/Test_TC_BRBINFO_2_3.yaml b/src/app/tests/suites/certification/Test_TC_BRBINFO_2_3.yaml
index 502e566..ac004b6 100644
--- a/src/app/tests/suites/certification/Test_TC_BRBINFO_2_3.yaml
+++ b/src/app/tests/suites/certification/Test_TC_BRBINFO_2_3.yaml
@@ -23,169 +23,561 @@
 tests:
     - label: "Note"
       verification: |
+          Note: : For DUT as client test cases, Chip-tool command used below are an example to verify the functionality. For certification test, we expect DUT should have a capability or way to run the equivalent command.
+      disabled: true
+
+    - label: "Note"
+      verification: |
           For DUT as client test cases, Chip-tool command used below are an example to verify the functionality. For certification test, we expect DUT should have a capability or way to run the equivalent command.
       disabled: true
 
     - label: "DUT reads VendorName from the TH"
       PICS: BRBINFO.C.A0001
       verification: |
-          ./chip-tool bridgeddevicebasic read vendor-name  1 3
+          ./chip-tool bridgeddevicebasic read vendor-name 1 0
 
-          Verify that DUT reads VendorName from the TH successfully on TH(all-clusters-app) Log
+          Optional Attribute - If it is supported, then in TH(all-clusters-app) log it will results in displaying the ReportDataMessage , else it will display UNSUPPORTED_ATTRIBUTE
 
-          [1656495199.434300][2158:2163] CHIP:TOO:   VendorName: TEST_VENDOR
+          Example Log:
+          [1659966264.659547][3334:3334] CHIP:DMG: ReadRequestMessage =
+          [1659966264.659591][3334:3334] CHIP:DMG: {
+          [1659966264.659616][3334:3334] CHIP:DMG:         AttributePathIBs =
+          [1659966264.659647][3334:3334] CHIP:DMG:         [
+          [1659966264.659684][3334:3334] CHIP:DMG:                 AttributePathIB =
+          [1659966264.659716][3334:3334] CHIP:DMG:                 {
+          [1659966264.659759][3334:3334] CHIP:DMG:                         Endpoint = 0x0,
+          [1659966264.659809][3334:3334] CHIP:DMG:                         Cluster = 0x28,
+          [1659966264.659845][3334:3334] CHIP:DMG:                         Attribute = 0x0000_0001,
+          [1659966264.659892][3334:3334] CHIP:DMG:                 }
+          [1659966264.659925][3334:3334] CHIP:DMG:
+          [1659966264.659963][3334:3334] CHIP:DMG:         ],
+          [1659966264.659996][3334:3334] CHIP:DMG:
+          [1659966264.660036][3334:3334] CHIP:DMG:         isFabricFiltered = true,
+          [1659966264.660074][3334:3334] CHIP:DMG:         InteractionModelRevision = 1
+          [1659966264.660101][3334:3334] CHIP:DMG: },
+          [1659966264.660194][3334:3334] CHIP:DMG: IM RH moving to [GeneratingReports]
+          [1659966264.660306][3334:3334] CHIP:DMG: Building Reports for ReadHandler with LastReportGeneration = 0 DirtyGeneration = 0
+          [1659966264.660339][3334:3334] CHIP:DMG: <RE:Run> Cluster 28, Attribute 1 is dirty
+          [1659966264.660374][3334:3334] CHIP:DMG: Reading attribute: Cluster=0x0000_0028 Endpoint=0 AttributeId=0x0000_0001 (expanded=0)
+          [1659966264.660408][3334:3334] CHIP:DMG: AccessControl: checking f=1 a=c s=0x000000000001B669 t= c=0x0000_0028 e=0 p=v
+          [1659966264.660445][3334:3334] CHIP:DMG: AccessControl: allowed
       disabled: true
 
     - label: "DUT reads VendorID from the TH"
       PICS: BRBINFO.C.A0002
       verification: |
-          ./chip-tool bridgeddevicebasic read vendor-id  1 3
+          ./chip-tool bridgeddevicebasic read vendor-id 1 0
 
-          Verify that DUT reads VendorID from the TH successfully on TH(all-clusters-app) Log
+          Optional Attribute - If it is supported, then in TH(all-clusters-app) log it will results in displaying the ReportDataMessage , else it will display UNSUPPORTED_ATTRIBUTE
 
-          [1656495322.252171][2177:2182] CHIP:TOO:   VendorID: 65521
+          Example Log:
+          [1659966317.983464][3334:3334] CHIP:DMG: ReadRequestMessage =
+          [1659966317.983491][3334:3334] CHIP:DMG: {
+          [1659966317.983513][3334:3334] CHIP:DMG:         AttributePathIBs =
+          [1659966317.983539][3334:3334] CHIP:DMG:         [
+          [1659966317.983563][3334:3334] CHIP:DMG:                 AttributePathIB =
+          [1659966317.983590][3334:3334] CHIP:DMG:                 {
+          [1659966317.983618][3334:3334] CHIP:DMG:                         Endpoint = 0x0,
+          [1659966317.983655][3334:3334] CHIP:DMG:                         Cluster = 0x28,
+          [1659966317.983687][3334:3334] CHIP:DMG:                         Attribute = 0x0000_0002,
+          [1659966317.983716][3334:3334] CHIP:DMG:                 }
+          [1659966317.983744][3334:3334] CHIP:DMG:
+          [1659966317.983770][3334:3334] CHIP:DMG:         ],
+          [1659966317.983798][3334:3334] CHIP:DMG:
+          [1659966317.983825][3334:3334] CHIP:DMG:         isFabricFiltered = true,
+          [1659966317.983851][3334:3334] CHIP:DMG:         InteractionModelRevision = 1
+          [1659966317.983874][3334:3334] CHIP:DMG: },
+          [1659966317.983949][3334:3334] CHIP:DMG: IM RH moving to [GeneratingReports]
+          [1659966317.984045][3334:3334] CHIP:DMG: Building Reports for ReadHandler with LastReportGeneration = 0 DirtyGeneration = 0
+          [1659966317.984077][3334:3334] CHIP:DMG: <RE:Run> Cluster 28, Attribute 2 is dirty
+          [1659966317.984099][3334:3334] CHIP:DMG: Reading attribute: Cluster=0x0000_0028 Endpoint=0 AttributeId=0x0000_0002 (expanded=0)
+          [1659966317.984128][3334:3334] CHIP:DMG: AccessControl: checking f=1 a=c s=0x000000000001B669 t= c=0x0000_0028 e=0 p=v
+          [1659966317.984161][3334:3334] CHIP:DMG: AccessControl: allowed
+          [1659966317.983464][3334:3334] CHIP:DMG: ReadRequestMessage =
+          [1659966317.983491][3334:3334] CHIP:DMG: {
+          [1659966317.983513][3334:3334] CHIP:DMG:         AttributePathIBs =
+          [1659966317.983539][3334:3334] CHIP:DMG:         [
+          [1659966317.983563][3334:3334] CHIP:DMG:                 AttributePathIB =
+          [1659966317.983590][3334:3334] CHIP:DMG:                 {
+          [1659966317.983618][3334:3334] CHIP:DMG:                         Endpoint = 0x0,
+          [1659966317.983655][3334:3334] CHIP:DMG:                         Cluster = 0x28,
+          [1659966317.983687][3334:3334] CHIP:DMG:                         Attribute = 0x0000_0002,
+          [1659966317.983716][3334:3334] CHIP:DMG:                 }
+          [1659966317.983744][3334:3334] CHIP:DMG:
+          [1659966317.983770][3334:3334] CHIP:DMG:         ],
+          [1659966317.983798][3334:3334] CHIP:DMG:
+          [1659966317.983825][3334:3334] CHIP:DMG:         isFabricFiltered = true,
+          [1659966317.983851][3334:3334] CHIP:DMG:         InteractionModelRevision = 1
+          [1659966317.983874][3334:3334] CHIP:DMG: },
+          [1659966317.983949][3334:3334] CHIP:DMG: IM RH moving to [GeneratingReports]
+          [1659966317.984045][3334:3334] CHIP:DMG: Building Reports for ReadHandler with LastReportGeneration = 0 DirtyGeneration = 0
+          [1659966317.984077][3334:3334] CHIP:DMG: <RE:Run> Cluster 28, Attribute 2 is dirty
+          [1659966317.984099][3334:3334] CHIP:DMG: Reading attribute: Cluster=0x0000_0028 Endpoint=0 AttributeId=0x0000_0002 (expanded=0)
+          [1659966317.984128][3334:3334] CHIP:DMG: AccessControl: checking f=1 a=c s=0x000000000001B669 t= c=0x0000_0028 e=0 p=v
+          [1659966317.984161][3334:3334] CHIP:DMG: AccessControl: allowed
       disabled: true
 
     - label: "DUT reads ProductName from the TH"
       PICS: BRBINFO.C.A0003
       verification: |
-          ./chip-tool bridgeddevicebasic read product-name  1 3
+          ./chip-tool bridgeddevicebasic read product-name 1 0
 
-          Verify that DUT reads ProductName from the TH successfully on TH(clusters-app)
+          Optional Attribute - If it is supported, then in TH(all-clusters-app) log it will results in displaying the ReportDataMessage , else it will display UNSUPPORTED_ATTRIBUTE
 
-          [1656495708.412745][2200:2205] CHIP:TOO:   ProductName: TEST_PRODUCT
+          Example Log:
+          [1659966351.620979][3334:3334] CHIP:IM: Received Read request
+          [1659966351.621076][3334:3334] CHIP:DMG: ReadRequestMessage =
+          [1659966351.621104][3334:3334] CHIP:DMG: {
+          [1659966351.621128][3334:3334] CHIP:DMG:         AttributePathIBs =
+          [1659966351.621154][3334:3334] CHIP:DMG:         [
+          [1659966351.621178][3334:3334] CHIP:DMG:                 AttributePathIB =
+          [1659966351.621206][3334:3334] CHIP:DMG:                 {
+          [1659966351.621234][3334:3334] CHIP:DMG:                         Endpoint = 0x0,
+          [1659966351.621265][3334:3334] CHIP:DMG:                         Cluster = 0x28,
+          [1659966351.621297][3334:3334] CHIP:DMG:                         Attribute = 0x0000_0003,
+          [1659966351.621323][3334:3334] CHIP:DMG:                 }
+          [1659966351.621350][3334:3334] CHIP:DMG:
+          [1659966351.621375][3334:3334] CHIP:DMG:         ],
+          [1659966351.621403][3334:3334] CHIP:DMG:
+          [1659966351.621429][3334:3334] CHIP:DMG:         isFabricFiltered = true,
+          [1659966351.621454][3334:3334] CHIP:DMG:         InteractionModelRevision = 1
+          [1659966351.621476][3334:3334] CHIP:DMG: },
+          [1659966351.621549][3334:3334] CHIP:DMG: IM RH moving to [GeneratingReports]
+          [1659966351.621633][3334:3334] CHIP:DMG: Building Reports for ReadHandler with LastReportGeneration = 0 DirtyGeneration = 0
+          [1659966351.621662][3334:3334] CHIP:DMG: <RE:Run> Cluster 28, Attribute 3 is dirty
       disabled: true
 
     - label: "DUT reads NodeLabel from the TH"
       PICS: BRBINFO.C.A0005
       verification: |
-          Nodelabel is an optional Attribute -
+          ./chip-tool bridgeddevicebasic read node-label 1 0
 
-          ./chip-tool bridgeddevicebasic read node-label 1 3
+          Optional Attribute - If it is supported, then in TH(all-clusters-app) log it will results in displaying the ReportDataMessage , else it will display UNSUPPORTED_ATTRIBUTE
 
-          Verify Node-label is read sucessfully on TH(all-clusters-app)
-
-          [1657696463.081741][15476:15481] CHIP:TOO: Endpoint: 3 Cluster: 0x0000_0039 Attribute 0x0000_0005 DataVersion: 2577979325
-          [1657696463.081791][15476:15481] CHIP:TOO:   NodeLabel: Light 1
+          Example Log:
+          [1659966481.748125][3334:3334] CHIP:IM: Received Read request
+          [1659966481.748209][3334:3334] CHIP:DMG: ReadRequestMessage =
+          [1659966481.748236][3334:3334] CHIP:DMG: {
+          [1659966481.748258][3334:3334] CHIP:DMG:         AttributePathIBs =
+          [1659966481.748283][3334:3334] CHIP:DMG:         [
+          [1659966481.748307][3334:3334] CHIP:DMG:                 AttributePathIB =
+          [1659966481.748334][3334:3334] CHIP:DMG:                 {
+          [1659966481.748362][3334:3334] CHIP:DMG:                         Endpoint = 0x0,
+          [1659966481.748397][3334:3334] CHIP:DMG:                         Cluster = 0x28,
+          [1659966481.748429][3334:3334] CHIP:DMG:                         Attribute = 0x0000_0005,
+          [1659966481.748458][3334:3334] CHIP:DMG:                 }
+          [1659966481.748486][3334:3334] CHIP:DMG:
+          [1659966481.748511][3334:3334] CHIP:DMG:         ],
+          [1659966481.748539][3334:3334] CHIP:DMG:
+          [1659966481.748566][3334:3334] CHIP:DMG:         isFabricFiltered = true,
+          [1659966481.748590][3334:3334] CHIP:DMG:         InteractionModelRevision = 1
+          [1659966481.748614][3334:3334] CHIP:DMG: },
+          [1659966481.748689][3334:3334] CHIP:DMG: IM RH moving to [GeneratingReports]
+          [1659966481.748787][3334:3334] CHIP:DMG: Building Reports for ReadHandler with LastReportGeneration = 0 DirtyGeneration = 0
+          [1659966481.748818][3334:3334] CHIP:DMG: <RE:Run> Cluster 28, Attribute 5 is dirty
+          [1659966481.748839][3334:3334] CHIP:DMG: Reading attribute: Cluster=0x0000_0028 Endpoint=0 AttributeId=0x0000_0005 (expanded=0)
+          [1659966481.748868][3334:3334] CHIP:DMG: AccessControl: checking f=1 a=c s=0x000000000001B669 t= c=0x0000_0028 e=0 p=v
+          [1659966481.748901][3334:3334] CHIP:DMG: AccessControl: allowed
       disabled: true
 
     - label: "DUT reads Location from the TH"
       PICS: BRBINFO.C.A0006
       verification: |
-          ./chip-tool bridgeddevicebasic read location 1 3
+          ./chip-tool bridgeddevicebasic read location 1 0
 
-          Verify that DUT reads Location from the TH successfully on TH(all-clusters-app) Log
+          Optional Attribute - If it is supported, then in TH(all-clusters-app) log it will results in displaying the ReportDataMessage , else it will display UNSUPPORTED_ATTRIBUTE
 
-          Note: The Location attribute is optional so no example log can be provided.
+          Example Log:
+          [1659966523.437542][3334:3334] CHIP:IM: Received Read request
+          [1659966523.437648][3334:3334] CHIP:DMG: ReadRequestMessage =
+          [1659966523.437686][3334:3334] CHIP:DMG: {
+          [1659966523.437719][3334:3334] CHIP:DMG:         AttributePathIBs =
+          [1659966523.437757][3334:3334] CHIP:DMG:         [
+          [1659966523.437792][3334:3334] CHIP:DMG:                 AttributePathIB =
+          [1659966523.437838][3334:3334] CHIP:DMG:                 {
+          [1659966523.437879][3334:3334] CHIP:DMG:                         Endpoint = 0x0,
+          [1659966523.437924][3334:3334] CHIP:DMG:                         Cluster = 0x28,
+          [1659966523.437972][3334:3334] CHIP:DMG:                         Attribute = 0x0000_0006,
+          [1659966523.438013][3334:3334] CHIP:DMG:                 }
+          [1659966523.438054][3334:3334] CHIP:DMG:
+          [1659966523.438092][3334:3334] CHIP:DMG:         ],
+          [1659966523.438133][3334:3334] CHIP:DMG:
+          [1659966523.438171][3334:3334] CHIP:DMG:         isFabricFiltered = true,
+          [1659966523.438208][3334:3334] CHIP:DMG:         InteractionModelRevision = 1
+          [1659966523.438243][3334:3334] CHIP:DMG: },
+          [1659966523.438346][3334:3334] CHIP:DMG: IM RH moving to [GeneratingReports]
+          [1659966523.438456][3334:3334] CHIP:DMG: Building Reports for ReadHandler with LastReportGeneration = 0 DirtyGeneration = 0
+          [1659966523.438499][3334:3334] CHIP:DMG: <RE:Run> Cluster 28, Attribute 6 is dirty
+          [1659966523.438529][3334:3334] CHIP:DMG: Reading attribute: Cluster=0x0000_0028 Endpoint=0 AttributeId=0x0000_0006 (expanded=0)
+          [1659966523.438563][3334:3334] CHIP:DMG: AccessControl: checking f=1 a=c s=0x000000000001B669 t= c=0x0000_0028 e=0 p=v
+          [1659966523.438603][3334:3334] CHIP:DMG: AccessControl: allowed
       disabled: true
 
     - label: "DUT reads HardwareVersion from the TH"
       PICS: BRBINFO.C.A0007
       verification: |
-          ./chip-tool bridgeddevicebasic read hardware-version  1 3
+          ./chip-tool bridgeddevicebasic read  hardware-version-string 1 0
 
-          Verify that DUT reads HardwareVersion from the TH successfully on TH(all-clusters-app) Log
+          Optional Attribute - If it is supported, then in TH(all-clusters-app) log it will results in displaying the ReportDataMessage , else it will display UNSUPPORTED_ATTRIBUTE
 
-          [1656496175.564718][2302:2307] CHIP:TOO:   HardwareVersion: 0
+          Example Log:
+          [1659966609.655514][3334:3334] CHIP:IM: Received Read request
+          [1659966609.655592][3334:3334] CHIP:DMG: ReadRequestMessage =
+          [1659966609.655618][3334:3334] CHIP:DMG: {
+          [1659966609.655640][3334:3334] CHIP:DMG:         AttributePathIBs =
+          [1659966609.655666][3334:3334] CHIP:DMG:         [
+          [1659966609.655689][3334:3334] CHIP:DMG:                 AttributePathIB =
+          [1659966609.655719][3334:3334] CHIP:DMG:                 {
+          [1659966609.655748][3334:3334] CHIP:DMG:                         Endpoint = 0x0,
+          [1659966609.655778][3334:3334] CHIP:DMG:                         Cluster = 0x28,
+          [1659966609.655810][3334:3334] CHIP:DMG:                         Attribute = 0x0000_0008,
+          [1659966609.655841][3334:3334] CHIP:DMG:                 }
+          [1659966609.655871][3334:3334] CHIP:DMG:
+          [1659966609.655898][3334:3334] CHIP:DMG:         ],
+          [1659966609.655925][3334:3334] CHIP:DMG:
+          [1659966609.655951][3334:3334] CHIP:DMG:         isFabricFiltered = true,
+          [1659966609.655979][3334:3334] CHIP:DMG:         InteractionModelRevision = 1
+          [1659966609.656001][3334:3334] CHIP:DMG: },
+          [1659966609.656073][3334:3334] CHIP:DMG: IM RH moving to [GeneratingReports]
+          [1659966609.656154][3334:3334] CHIP:DMG: Building Reports for ReadHandler with LastReportGeneration = 0 DirtyGeneration = 0
+          [1659966609.656183][3334:3334] CHIP:DMG: <RE:Run> Cluster 28, Attribute 8 is dirty
+          [1659966609.656204][3334:3334] CHIP:DMG: Reading attribute: Cluster=0x0000_0028 Endpoint=0 AttributeId=0x0000_0008 (expanded=0)
+          [1659966609.656233][3334:3334] CHIP:DMG: AccessControl: checking f=1 a=c s=0x000000000001B669 t= c=0x0000_0028 e=0 p=v
+          [1659966609.656266][3334:3334] CHIP:DMG: AccessControl: allowed
       disabled: true
 
     - label: "DUT reads HardwareVersionString from the TH"
       PICS: BRBINFO.C.A0008
       verification: |
-          ./chip-tool bridgeddevicebasic read hardware-version-string  1 3
+          ./chip-tool bridgeddevicebasic read  hardware-version-string 1 0
 
-          Verify that DUT reads HardwareVersionString from the TH successfully on TH(all-clusters-app) Log
+          Optional Attribute - If it is supported, then in TH(all-clusters-app) log it will results in displaying the ReportDataMessage , else it will display UNSUPPORTED_ATTRIBUTE
 
-          [1656496257.298675][2315:2320] CHIP:TOO:   HardwareVersionString: TEST_VERSION
+          Example Log:
+
+          [1659966639.857534][3334:3334] CHIP:IM: Received Read request
+          [1659966639.857613][3334:3334] CHIP:DMG: ReadRequestMessage =
+          [1659966639.857640][3334:3334] CHIP:DMG: {
+          [1659966639.857661][3334:3334] CHIP:DMG:         AttributePathIBs =
+          [1659966639.857687][3334:3334] CHIP:DMG:         [
+          [1659966639.857711][3334:3334] CHIP:DMG:                 AttributePathIB =
+          [1659966639.857739][3334:3334] CHIP:DMG:                 {
+          [1659966639.857766][3334:3334] CHIP:DMG:                         Endpoint = 0x0,
+          [1659966639.857798][3334:3334] CHIP:DMG:                         Cluster = 0x28,
+          [1659966639.857828][3334:3334] CHIP:DMG:                         Attribute = 0x0000_0008,
+          [1659966639.857856][3334:3334] CHIP:DMG:                 }
+          [1659966639.857884][3334:3334] CHIP:DMG:
+          [1659966639.857909][3334:3334] CHIP:DMG:         ],
+          [1659966639.857936][3334:3334] CHIP:DMG:
+          [1659966639.857962][3334:3334] CHIP:DMG:         isFabricFiltered = true,
+          [1659966639.857987][3334:3334] CHIP:DMG:         InteractionModelRevision = 1
+          [1659966639.858010][3334:3334] CHIP:DMG: },
+          [1659966639.858080][3334:3334] CHIP:DMG: IM RH moving to [GeneratingReports]
+          [1659966639.858163][3334:3334] CHIP:DMG: Building Reports for ReadHandler with LastReportGeneration = 0 DirtyGeneration = 0
+          [1659966639.858192][3334:3334] CHIP:DMG: <RE:Run> Cluster 28, Attribute 8 is dirty
+          [1659966639.858213][3334:3334] CHIP:DMG: Reading attribute: Cluster=0x0000_0028 Endpoint=0 AttributeId=0x0000_0008 (expanded=0)
+          [1659966639.858243][3334:3334] CHIP:DMG: AccessControl: checking f=1 a=c s=0x000000000001B669 t= c=0x0000_0028 e=0 p=v
+          [1659966639.858275][3334:3334] CHIP:DMG: AccessControl: allowed
       disabled: true
 
     - label: "DUT reads SoftwareVersion from the TH"
       PICS: BRBINFO.C.A0009
       verification: |
-          ./chip-tool bridgeddevicebasic read software-version 1 3
+          ./chip-tool bridgeddevicebasic read software-version 1 0
 
-          Verify that DUT reads SoftwareVersion from the TH successfully
+          Optional Attribute - If it is supported, then in TH(all-clusters-app) log it will results in displaying the ReportDataMessage , else it will display UNSUPPORTED_ATTRIBUTE
 
-          [1656496411.609866][2348:2353] CHIP:TOO:   SoftwareVersion: 1
+          Example Log:
+
+          [1659966672.320763][3334:3334] CHIP:IM: Received Read request
+          [1659966672.320848][3334:3334] CHIP:DMG: ReadRequestMessage =
+          [1659966672.320876][3334:3334] CHIP:DMG: {
+          [1659966672.320898][3334:3334] CHIP:DMG:         AttributePathIBs =
+          [1659966672.320987][3334:3334] CHIP:DMG:         [
+          [1659966672.321033][3334:3334] CHIP:DMG:                 AttributePathIB =
+          [1659966672.321066][3334:3334] CHIP:DMG:                 {
+          [1659966672.321095][3334:3334] CHIP:DMG:                         Endpoint = 0x0,
+          [1659966672.321128][3334:3334] CHIP:DMG:                         Cluster = 0x28,
+          [1659966672.321161][3334:3334] CHIP:DMG:                         Attribute = 0x0000_0009,
+          [1659966672.321191][3334:3334] CHIP:DMG:                 }
+          [1659966672.321220][3334:3334] CHIP:DMG:
+          [1659966672.321244][3334:3334] CHIP:DMG:         ],
+          [1659966672.321273][3334:3334] CHIP:DMG:
+          [1659966672.321299][3334:3334] CHIP:DMG:         isFabricFiltered = true,
+          [1659966672.321324][3334:3334] CHIP:DMG:         InteractionModelRevision = 1
+          [1659966672.321347][3334:3334] CHIP:DMG: },
+          [1659966672.321427][3334:3334] CHIP:DMG: IM RH moving to [GeneratingReports]
+          [1659966672.321529][3334:3334] CHIP:DMG: Building Reports for ReadHandler with LastReportGeneration = 0 DirtyGeneration = 0
+          [1659966672.321561][3334:3334] CHIP:DMG: <RE:Run> Cluster 28, Attribute 9 is dirty
+          [1659966672.321583][3334:3334] CHIP:DMG: Reading attribute: Cluster=0x0000_0028 Endpoint=0 AttributeId=0x0000_0009 (expanded=0)
+          [1659966672.321612][3334:3334] CHIP:DMG: AccessControl: checking f=1 a=c s=0x000000000001B669 t= c=0x0000_0028 e=0 p=v
+          [1659966672.321646][3334:3334] CHIP:DMG: AccessControl: allowed
       disabled: true
 
     - label: "DUT reads SoftwareVersionString from the TH"
       PICS: BRBINFO.C.A000a
       verification: |
-          ./chip-tool bridgeddevicebasic read software-version-string  1 3
+          ./chip-tool bridgeddevicebasic read software-version-string 1 0
 
-          Verify that DUT reads SoftwareVersionString from the TH successfully on TH(all-clusters-app) Log
+          Optional Attribute - If it is supported, then in TH(all-clusters-app) log it will results in displaying the ReportDataMessage , else it will display UNSUPPORTED_ATTRIBUTE
 
-          [1656496498.568951][2362:2367] CHIP:TOO:   SoftwareVersionString: 1.0
+          Example Log:
+
+          [1659966701.890819][3334:3334] CHIP:IM: Received Read request
+          [1659966701.890896][3334:3334] CHIP:DMG: ReadRequestMessage =
+          [1659966701.890922][3334:3334] CHIP:DMG: {
+          [1659966701.890944][3334:3334] CHIP:DMG:         AttributePathIBs =
+          [1659966701.890973][3334:3334] CHIP:DMG:         [
+          [1659966701.890997][3334:3334] CHIP:DMG:                 AttributePathIB =
+          [1659966701.891024][3334:3334] CHIP:DMG:                 {
+          [1659966701.891052][3334:3334] CHIP:DMG:                         Endpoint = 0x0,
+          [1659966701.891083][3334:3334] CHIP:DMG:                         Cluster = 0x28,
+          [1659966701.891116][3334:3334] CHIP:DMG:                         Attribute = 0x0000_000A,
+          [1659966701.891148][3334:3334] CHIP:DMG:                 }
+          [1659966701.891178][3334:3334] CHIP:DMG:
+          [1659966701.891203][3334:3334] CHIP:DMG:         ],
+          [1659966701.891230][3334:3334] CHIP:DMG:
+          [1659966701.891256][3334:3334] CHIP:DMG:         isFabricFiltered = true,
+          [1659966701.891281][3334:3334] CHIP:DMG:         InteractionModelRevision = 1
+          [1659966701.891304][3334:3334] CHIP:DMG: },
+          [1659966701.891376][3334:3334] CHIP:DMG: IM RH moving to [GeneratingReports]
+          [1659966701.891456][3334:3334] CHIP:DMG: Building Reports for ReadHandler with LastReportGeneration = 0 DirtyGeneration = 0
+          [1659966701.891485][3334:3334] CHIP:DMG: <RE:Run> Cluster 28, Attribute a is dirty
+          [1659966701.891507][3334:3334] CHIP:DMG: Reading attribute: Cluster=0x0000_0028 Endpoint=0 AttributeId=0x0000_000A (expanded=0)
+          [1659966701.891536][3334:3334] CHIP:DMG: AccessControl: checking f=1 a=c s=0x000000000001B669 t= c=0x0000_0028 e=0 p=v
+          [1659966701.891568][3334:3334] CHIP:DMG: AccessControl: allowed
       disabled: true
 
     - label: "DUT reads ManufacturingDate from the TH"
       PICS: BRBINFO.C.A000b
       verification: |
-          ./chip-tool bridgeddevicebasic read manufacturing-date  1 3
+          ./chip-tool bridgeddevicebasic read manufacturing-date  1 0
 
-          Verify that DUT reads ManufacturingDate from the TH successfully on TH(all-clusters-app) Log
+          Optional Attribute - If it is supported, then in TH(all-clusters-app) log it will results in displaying the ReportDataMessage , else it will display UNSUPPORTED_ATTRIBUTE
 
-          [1656496661.777852][2388:2393] CHIP:TOO:   ManufacturingDate: 20200101
+          Example Log:
+
+          [1659966734.117679][3334:3334] CHIP:IM: Received Read request
+          [1659966734.117757][3334:3334] CHIP:DMG: ReadRequestMessage =
+          [1659966734.117784][3334:3334] CHIP:DMG: {
+          [1659966734.117806][3334:3334] CHIP:DMG:         AttributePathIBs =
+          [1659966734.117832][3334:3334] CHIP:DMG:         [
+          [1659966734.117856][3334:3334] CHIP:DMG:                 AttributePathIB =
+          [1659966734.117892][3334:3334] CHIP:DMG:                 {
+          [1659966734.117920][3334:3334] CHIP:DMG:                         Endpoint = 0x0,
+          [1659966734.117952][3334:3334] CHIP:DMG:                         Cluster = 0x28,
+          [1659966734.117987][3334:3334] CHIP:DMG:                         Attribute = 0x0000_000B,
+          [1659966734.118016][3334:3334] CHIP:DMG:                 }
+          [1659966734.118046][3334:3334] CHIP:DMG:
+          [1659966734.118073][3334:3334] CHIP:DMG:         ],
+          [1659966734.118100][3334:3334] CHIP:DMG:
+          [1659966734.118126][3334:3334] CHIP:DMG:         isFabricFiltered = true,
+          [1659966734.118151][3334:3334] CHIP:DMG:         InteractionModelRevision = 1
+          [1659966734.118175][3334:3334] CHIP:DMG: },
+          [1659966734.118248][3334:3334] CHIP:DMG: IM RH moving to [GeneratingReports]
+          [1659966734.118331][3334:3334] CHIP:DMG: Building Reports for ReadHandler with LastReportGeneration = 0 DirtyGeneration = 0
+          [1659966734.118360][3334:3334] CHIP:DMG: <RE:Run> Cluster 28, Attribute b is dirty
+          [1659966734.118382][3334:3334] CHIP:DMG: Reading attribute: Cluster=0x0000_0028 Endpoint=0 AttributeId=0x0000_000B (expanded=0)
+          [1659966734.118411][3334:3334] CHIP:DMG: AccessControl: checking f=1 a=c s=0x000000000001B669 t= c=0x0000_0028 e=0 p=v
+          [1659966734.118444][3334:3334] CHIP:DMG: AccessControl: allowed
       disabled: true
 
     - label: "DUT reads PartNumber from the TH"
       PICS: BRBINFO.C.A000c
       verification: |
-          ./chip-tool bridgeddevicebasic read part-number  1 3
+          ./chip-tool bridgeddevicebasic read part-number  1 0
 
-          Verify that DUT reads PartNumber from the TH successfully on TH(all-clusters-app) Log
+          Optional Attribute - If it is supported, then in TH(all-clusters-app) log it will results in displaying the ReportDataMessage , else it will display UNSUPPORTED_ATTRIBUTE
 
-          [1656496800.941788][2405:2410] CHIP:TOO:   PartNumber: 1234
+          Example Log:
+
+          [1659966759.882885][3334:3334] CHIP:IM: Received Read request
+          [1659966759.882962][3334:3334] CHIP:DMG: ReadRequestMessage =
+          [1659966759.882989][3334:3334] CHIP:DMG: {
+          [1659966759.883011][3334:3334] CHIP:DMG:         AttributePathIBs =
+          [1659966759.883037][3334:3334] CHIP:DMG:         [
+          [1659966759.883061][3334:3334] CHIP:DMG:                 AttributePathIB =
+          [1659966759.883089][3334:3334] CHIP:DMG:                 {
+          [1659966759.883117][3334:3334] CHIP:DMG:                         Endpoint = 0x0,
+          [1659966759.883153][3334:3334] CHIP:DMG:                         Cluster = 0x28,
+          [1659966759.883182][3334:3334] CHIP:DMG:                         Attribute = 0x0000_000C,
+          [1659966759.883215][3334:3334] CHIP:DMG:                 }
+          [1659966759.883243][3334:3334] CHIP:DMG:
+          [1659966759.883268][3334:3334] CHIP:DMG:         ],
+          [1659966759.883296][3334:3334] CHIP:DMG:
+          [1659966759.883322][3334:3334] CHIP:DMG:         isFabricFiltered = true,
+          [1659966759.883347][3334:3334] CHIP:DMG:         InteractionModelRevision = 1
+          [1659966759.883370][3334:3334] CHIP:DMG: },
+          [1659966759.883444][3334:3334] CHIP:DMG: IM RH moving to [GeneratingReports]
+          [1659966759.883528][3334:3334] CHIP:DMG: Building Reports for ReadHandler with LastReportGeneration = 0 DirtyGeneration = 0
+          [1659966759.883557][3334:3334] CHIP:DMG: <RE:Run> Cluster 28, Attribute c is dirty
+          [1659966759.883579][3334:3334] CHIP:DMG: Reading attribute: Cluster=0x0000_0028 Endpoint=0 AttributeId=0x0000_000C (expanded=0)
+          [1659966759.883608][3334:3334] CHIP:DMG: AccessControl: checking f=1 a=c s=0x000000000001B669 t= c=0x0000_0028 e=0 p=v
+          [1659966759.883642][3334:3334] CHIP:DMG: AccessControl: allowed
       disabled: true
 
     - label: "DUT reads ProductURL from the TH"
       PICS: BRBINFO.C.A000d
       verification: |
-          ./chip-tool bridgeddevicebasic read product-url  1 3
+          ./chip-tool bridgeddevicebasic read product-url  1 0
 
-          Verify that DUT reads ProductURL from the TH successfully on TH(all-clusters-app) Log
+          Optional Attribute - If it is supported, then in TH(all-clusters-app) log it will results in displaying the ReportDataMessage , else it will display UNSUPPORTED_ATTRIBUTE
 
-          [1656497181.118653][2436:2441] CHIP:TOO:   ProductURL: https://example.com/myproduct
+          Example Log:
+
+          [1659966801.953254][3334:3334] CHIP:IM: Received Read request
+          [1659966801.953352][3334:3334] CHIP:DMG: ReadRequestMessage =
+          [1659966801.953388][3334:3334] CHIP:DMG: {
+          [1659966801.953417][3334:3334] CHIP:DMG:         AttributePathIBs =
+          [1659966801.953452][3334:3334] CHIP:DMG:         [
+          [1659966801.953484][3334:3334] CHIP:DMG:                 AttributePathIB =
+          [1659966801.953531][3334:3334] CHIP:DMG:                 {
+          [1659966801.953569][3334:3334] CHIP:DMG:                         Endpoint = 0x0,
+          [1659966801.953611][3334:3334] CHIP:DMG:                         Cluster = 0x28,
+          [1659966801.953653][3334:3334] CHIP:DMG:                         Attribute = 0x0000_000D,
+          [1659966801.953693][3334:3334] CHIP:DMG:                 }
+          [1659966801.953731][3334:3334] CHIP:DMG:
+          [1659966801.953765][3334:3334] CHIP:DMG:         ],
+          [1659966801.953802][3334:3334] CHIP:DMG:
+          [1659966801.953837][3334:3334] CHIP:DMG:         isFabricFiltered = true,
+          [1659966801.953871][3334:3334] CHIP:DMG:         InteractionModelRevision = 1
+          [1659966801.953903][3334:3334] CHIP:DMG: },
+          [1659966801.953996][3334:3334] CHIP:DMG: IM RH moving to [GeneratingReports]
+          [1659966801.954102][3334:3334] CHIP:DMG: Building Reports for ReadHandler with LastReportGeneration = 0 DirtyGeneration = 0
+          [1659966801.954177][3334:3334] CHIP:DMG: <RE:Run> Cluster 28, Attribute d is dirty
+          [1659966801.954208][3334:3334] CHIP:DMG: Reading attribute: Cluster=0x0000_0028 Endpoint=0 AttributeId=0x0000_000D (expanded=0)
+          [1659966801.954246][3334:3334] CHIP:DMG: AccessControl: checking f=1 a=c s=0x000000000001B669 t= c=0x0000_0028 e=0 p=v
+          [1659966801.954288][3334:3334] CHIP:DMG: AccessControl: allowed
       disabled: true
 
     - label: "DUT reads ProductLabel from the TH"
       PICS: BRBINFO.C.A000e
       verification: |
-          ./chip-tool bridgeddevicebasic read product-label  1 3
+          ./chip-tool bridgeddevicebasic read product-label  1 0
 
-          Verify that DUT reads ProductLabel from the TH successfully on TH(all-clusters-app) Log
+          Optional Attribute - If it is supported, then in TH(all-clusters-app) log it will results in displaying the ReportDataMessage , else it will display UNSUPPORTED_ATTRIBUTE
 
-          [1656501313.811305][2602:2607] CHIP:TOO:   ProductLabel: ABCD
+          Example Log:
+
+          [1659966838.501579][3334:3334] CHIP:IM: Received Read request
+          [1659966838.501708][3334:3334] CHIP:DMG: ReadRequestMessage =
+          [1659966838.501758][3334:3334] CHIP:DMG: {
+          [1659966838.501799][3334:3334] CHIP:DMG:         AttributePathIBs =
+          [1659966838.501846][3334:3334] CHIP:DMG:         [
+          [1659966838.501892][3334:3334] CHIP:DMG:                 AttributePathIB =
+          [1659966838.501942][3334:3334] CHIP:DMG:                 {
+          [1659966838.501994][3334:3334] CHIP:DMG:                         Endpoint = 0x0,
+          [1659966838.502081][3334:3334] CHIP:DMG:                         Cluster = 0x28,
+          [1659966838.502146][3334:3334] CHIP:DMG:                         Attribute = 0x0000_000E,
+          [1659966838.502202][3334:3334] CHIP:DMG:                 }
+          [1659966838.502254][3334:3334] CHIP:DMG:
+          [1659966838.502301][3334:3334] CHIP:DMG:         ],
+          [1659966838.502352][3334:3334] CHIP:DMG:
+          [1659966838.502401][3334:3334] CHIP:DMG:         isFabricFiltered = true,
+          [1659966838.502448][3334:3334] CHIP:DMG:         InteractionModelRevision = 1
+          [1659966838.502492][3334:3334] CHIP:DMG: },
+          [1659966838.502613][3334:3334] CHIP:DMG: IM RH moving to [GeneratingReports]
+          [1659966838.502731][3334:3334] CHIP:DMG: Building Reports for ReadHandler with LastReportGeneration = 0 DirtyGeneration = 0
+          [1659966838.502768][3334:3334] CHIP:DMG: <RE:Run> Cluster 28, Attribute e is dirty
+          [1659966838.502793][3334:3334] CHIP:DMG: Reading attribute: Cluster=0x0000_0028 Endpoint=0 AttributeId=0x0000_000E (expanded=0)
+          [1659966838.502827][3334:3334] CHIP:DMG: AccessControl: checking f=1 a=c s=0x000000000001B669 t= c=0x0000_0028 e=0 p=v
+          [1659966838.502864][3334:3334] CHIP:DMG: AccessControl: allowed
       disabled: true
 
     - label: "DUT reads SerialNumber from the TH"
       PICS: BRBINFO.C.A000f
       verification: |
-          ./chip-tool bridgeddevicebasic read serial-number  1 3
+          ./chip-tool bridgeddevicebasic read serial-number  1 0
 
-          Verify that DUT reads SerialNumber from the TH successfully on TH(all-clusters-app) Log
+          Optional Attribute - If it is supported, then in TH(all-clusters-app) log it will results in displaying the ReportDataMessage , else it will display UNSUPPORTED_ATTRIBUTE
 
-          [1656501452.183890][2624:2630] CHIP:TOO:   SerialNumber: 5678
+          Example Log:
+
+          [1659966910.846054][3334:3334] CHIP:IM: Received Read request
+          [1659966910.846136][3334:3334] CHIP:DMG: ReadRequestMessage =
+          [1659966910.846163][3334:3334] CHIP:DMG: {
+          [1659966910.846185][3334:3334] CHIP:DMG:         AttributePathIBs =
+          [1659966910.846218][3334:3334] CHIP:DMG:         [
+          [1659966910.846243][3334:3334] CHIP:DMG:                 AttributePathIB =
+          [1659966910.846275][3334:3334] CHIP:DMG:                 {
+          [1659966910.846307][3334:3334] CHIP:DMG:                         Endpoint = 0x0,
+          [1659966910.846344][3334:3334] CHIP:DMG:                         Cluster = 0x28,
+          [1659966910.846381][3334:3334] CHIP:DMG:                         Attribute = 0x0000_000F,
+          [1659966910.846414][3334:3334] CHIP:DMG:                 }
+          [1659966910.846445][3334:3334] CHIP:DMG:
+          [1659966910.846473][3334:3334] CHIP:DMG:         ],
+          [1659966910.846501][3334:3334] CHIP:DMG:
+          [1659966910.846527][3334:3334] CHIP:DMG:         isFabricFiltered = true,
+          [1659966910.846552][3334:3334] CHIP:DMG:         InteractionModelRevision = 1
+          [1659966910.846578][3334:3334] CHIP:DMG: },
+          [1659966910.846653][3334:3334] CHIP:DMG: IM RH moving to [GeneratingReports]
+          [1659966910.846749][3334:3334] CHIP:DMG: Building Reports for ReadHandler with LastReportGeneration = 0 DirtyGeneration = 0
+          [1659966910.846780][3334:3334] CHIP:DMG: <RE:Run> Cluster 28, Attribute f is dirty
+          [1659966910.846801][3334:3334] CHIP:DMG: Reading attribute: Cluster=0x0000_0028 Endpoint=0 AttributeId=0x0000_000F (expanded=0)
+          [1659966910.846831][3334:3334] CHIP:DMG: AccessControl: checking f=1 a=c s=0x000000000001B669 t= c=0x0000_0028 e=0 p=v
+          [1659966910.846865][3334:3334] CHIP:DMG: AccessControl: allowed
       disabled: true
 
     - label: "DUT reads Reachable from the TH"
       PICS: BRBINFO.C.A0011
       verification: |
-          ./chip-tool bridgeddevicebasic read reachable 1 3
+          ./chip-tool bridgeddevicebasic read reachable 1 0
 
-          Verify in reachable attribute is read successfully in DUT as client side log
-
-          [1657696571.056869][15499:15504] CHIP:TOO: Endpoint: 3 Cluster: 0x0000_0039 Attribute 0x0000_0011 DataVersion: 2577979325
-          [1657696571.056932][15499:15504] CHIP:TOO:   Reachable: TRUE
+          Verify ReadRequestMessage is displayed on TH(all-clusters-app) Log
+          [1659966974.431316][3334:3334] CHIP:IM: Received Read request
+          [1659966974.431423][3334:3334] CHIP:DMG: ReadRequestMessage =
+          [1659966974.431461][3334:3334] CHIP:DMG: {
+          [1659966974.431493][3334:3334] CHIP:DMG:         AttributePathIBs =
+          [1659966974.431531][3334:3334] CHIP:DMG:         [
+          [1659966974.431567][3334:3334] CHIP:DMG:                 AttributePathIB =
+          [1659966974.431607][3334:3334] CHIP:DMG:                 {
+          [1659966974.431649][3334:3334] CHIP:DMG:                         Endpoint = 0x0,
+          [1659966974.431696][3334:3334] CHIP:DMG:                         Cluster = 0x28,
+          [1659966974.431740][3334:3334] CHIP:DMG:                         Attribute = 0x0000_0011,
+          [1659966974.431784][3334:3334] CHIP:DMG:                 }
+          [1659966974.431825][3334:3334] CHIP:DMG:
+          [1659966974.431862][3334:3334] CHIP:DMG:         ],
+          [1659966974.431903][3334:3334] CHIP:DMG:
+          [1659966974.431941][3334:3334] CHIP:DMG:         isFabricFiltered = true,
+          [1659966974.431979][3334:3334] CHIP:DMG:         InteractionModelRevision = 1
+          [1659966974.432014][3334:3334] CHIP:DMG: },
+          [1659966974.432116][3334:3334] CHIP:DMG: IM RH moving to [GeneratingReports]
+          [1659966974.432230][3334:3334] CHIP:DMG: Building Reports for ReadHandler with LastReportGeneration = 0 DirtyGeneration = 0
+          [1659966974.432272][3334:3334] CHIP:DMG: <RE:Run> Cluster 28, Attribute 11 is dirty
+          [1659966974.432304][3334:3334] CHIP:DMG: Reading attribute: Cluster=0x0000_0028 Endpoint=0 AttributeId=0x0000_0011 (expanded=0)
+          [1659966974.432345][3334:3334] CHIP:DMG: AccessControl: checking f=1 a=c s=0x000000000001B669 t= c=0x0000_0028 e=0 p=v
+          [1659966974.432391][3334:3334] CHIP:DMG: AccessControl: allowed
       disabled: true
 
     - label: "DUT reads UniqueID from the TH"
       PICS: BRBINFO.C.A0012
       verification: |
-          ./chip-tool bridgeddevicebasic read unique-id 1 3
+          ./chip-tool bridgeddevicebasic read unique-id 1 0
 
-          Verify that DUT reads UniqueID from the TH successfully on TH(all-clusters-app) Log
+          Optional Attribute - If it is supported, then in TH(all-clusters-app) log it will results in displaying the ReportDataMessage , else it will display UNSUPPORTED_ATTRIBUTE
 
-          [1656501734.253827][2673:2679] CHIP:TOO:   UniqueID: 30789FE4FCF832C9
+          Example Log:
+          [1659967013.796500][3334:3334] CHIP:IM: Received Read request
+          [1659967013.796577][3334:3334] CHIP:DMG: ReadRequestMessage =
+          [1659967013.796604][3334:3334] CHIP:DMG: {
+          [1659967013.796625][3334:3334] CHIP:DMG:         AttributePathIBs =
+          [1659967013.796651][3334:3334] CHIP:DMG:         [
+          [1659967013.796675][3334:3334] CHIP:DMG:                 AttributePathIB =
+          [1659967013.796702][3334:3334] CHIP:DMG:                 {
+          [1659967013.796730][3334:3334] CHIP:DMG:                         Endpoint = 0x0,
+          [1659967013.796821][3334:3334] CHIP:DMG:                         Cluster = 0x28,
+          [1659967013.796854][3334:3334] CHIP:DMG:                         Attribute = 0x0000_0012,
+          [1659967013.796883][3334:3334] CHIP:DMG:                 }
+          [1659967013.796911][3334:3334] CHIP:DMG:
+          [1659967013.796935][3334:3334] CHIP:DMG:         ],
+          [1659967013.796963][3334:3334] CHIP:DMG:
+          [1659967013.796989][3334:3334] CHIP:DMG:         isFabricFiltered = true,
+          [1659967013.797014][3334:3334] CHIP:DMG:         InteractionModelRevision = 1
+          [1659967013.797074][3334:3334] CHIP:DMG: },
+          [1659967013.797147][3334:3334] CHIP:DMG: IM RH moving to [GeneratingReports]
+          [1659967013.797234][3334:3334] CHIP:DMG: Building Reports for ReadHandler with LastReportGeneration = 0 DirtyGeneration = 0
+          [1659967013.797263][3334:3334] CHIP:DMG: <RE:Run> Cluster 28, Attribute 12 is dirty
+          [1659967013.797285][3334:3334] CHIP:DMG: Reading attribute: Cluster=0x0000_0028 Endpoint=0 AttributeId=0x0000_0012 (expanded=0)
+          [1659967013.797315][3334:3334] CHIP:DMG: AccessControl: checking f=1 a=c s=0x000000000001B669 t= c=0x0000_0028 e=0 p=v
+          [1659967013.797348][3334:3334] CHIP:DMG: AccessControl: allowed
       disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_CADMIN_1_1.yaml b/src/app/tests/suites/certification/Test_TC_CADMIN_1_1.yaml
index 17d28c1..6967174 100644
--- a/src/app/tests/suites/certification/Test_TC_CADMIN_1_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CADMIN_1_1.yaml
@@ -25,9 +25,14 @@
     endpoint: 0
 
 tests:
-    - label: "Precondition: Reset DUT_CE to factory defaults"
+    - label: "Note"
       verification: |
-          verification step to be updated.
+          For DUT as comissioner  test cases, Chip-tool command used below are an example to verify the functionality. For certification test, we expect DUT should have a capability or way to run the equivalent command.
+      disabled: true
+
+    - label: "Precondition"
+      verification: |
+          Reset Devices to factory defaults
       disabled: true
 
     - label: "TH_CR1 starts a commissioning process with TH_CE"
@@ -233,7 +238,7 @@
           Clusters NodeLabel mandatory attribute"
       PICS: BINFO.C.A0005
       verification: |
-          On TH1 using chip tool, write attribute and read attribute
+          On first controller using chip tool, write attribute and read attribute
 
           ./chip-tool basic write node-label te8 1 0
 
@@ -278,7 +283,7 @@
           Information Clusters NodeLabel mandatory attribute"
       PICS: BINFO.C.A0005
       verification: |
-          On TH2 using chip-tool read, write attribute and then read attribute to and from TH_CE
+          On 2nd controller using chip-tool read, write attribute and then read attribute to and from TH_CE
 
           Below is an example of using chip tool as controller
 
@@ -330,7 +335,7 @@
           (Enhanced Commissioning Method)"
       PICS: CADMIN.C.C00.Tx
       verification: |
-          On TH2 open commissioning window using ECM
+          On 2nd controller open commissioning window using ECM
 
           Below is an example when using chip tool as controller
           ./chip-tool pairing open-commissionig-window 2 1 300 1000 3841
@@ -350,7 +355,7 @@
           using the Revoke Commissioning command"
       PICS: CADMIN.C.C02.Tx
       verification: |
-          On TH2, run revoke command
+          On 2nd controller, run revoke command
 
           Below is an example when using chip tool as controller
 
@@ -394,7 +399,7 @@
           with TH_CE"
       PICS: CADMIN.C
       verification: |
-          On TH3 using chip-tool connect using manual code generated from 1st controller. This attempt should fail, i.e
+          On 3rd controller using chip-tool connect using manual code generated from 1st controller. This attempt should fail, i.e
 
           ./chip-tool pairing code 1  34995354639
 
@@ -410,7 +415,7 @@
           Information Clusters NodeLabel mandatory attribute"
       PICS: BINFO.C.A0005
       verification: |
-          On TH2 , write attribute and read attribute to and from TH_CE
+          On 2nd controller , write attribute and read attribute to and from TH_CE
 
           Below is the example using chip tool as controller
 
@@ -456,7 +461,7 @@
           ECM"
       PICS: CADMIN.C.C00.Tx
       verification: |
-          On TH2 open commissioning window using ECM
+          On 2nd controller open commissioning window using ECM
 
           Below is an example when using chip tool as controller
           ./chip-tool pairing open-commissioning-window 2 1 180 1000 3840
@@ -482,7 +487,7 @@
           ECM"
       PICS: CADMIN.C.C00.Tx
       verification: |
-          On TH2 open commissioning window using ECM
+          On 2nd controller open commissioning window using ECM
 
           Below is an example when using chip tool as controller
           ./chip-tool pairing open-commissionig-window 2 1 300 1000 3840
@@ -502,7 +507,7 @@
           from step 15"
       PICS: CADMIN.C
       verification: |
-          On TH1, using chip-tool connect using manual code.
+          On 1st controller, using chip-tool connect using manual code.
 
           Below is the example when using chip tool as controller (considering 34995354639 as the manual code generated by DUT)
           ./chip-tool pairing code 2 34995354639
diff --git a/src/app/tests/suites/certification/Test_TC_CADMIN_1_11.yaml b/src/app/tests/suites/certification/Test_TC_CADMIN_1_11.yaml
index 61d435c..a87bb4d 100644
--- a/src/app/tests/suites/certification/Test_TC_CADMIN_1_11.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CADMIN_1_11.yaml
@@ -26,9 +26,9 @@
     endpoint: 0
 
 tests:
-    - label: "Precondition: Reset DUT_CE to factory defaults"
+    - label: "Precondition"
       verification: |
-          verification step to be updated.
+          Reset Devices to factory defaults
       disabled: true
 
     - label: "TH_CR1 starts a commissioning process with DUT_CE"
@@ -43,7 +43,7 @@
           timeout of PIXIT.CADMIN.CwDuration seconds using ECM"
       PICS: CADMIN.S.C00.Rsp
       verification: |
-          On the TH1 using chip tool, open commissioning window using ECM
+          On the 1st controller using chip tool, open commissioning window using ECM
 
 
           ./chip-tool pairing open-commissioning-window 1 1 180 1000 3840
@@ -81,7 +81,7 @@
     - label: "TH_CR3 Commissions with DUT_CE"
       PICS: CADMIN.S
       verification: |
-          On TH3 using chip tool connect using manual code
+          On 3rd controller using chip tool connect using manual code
 
           ./chip-tool pairing code 3 35484132896
 
@@ -95,7 +95,7 @@
           Commissions with DUT_CE"
       PICS: CADMIN.S.C00.Rsp
       verification: |
-          On the TH1 using chip tool, open commissioning window using ECM
+          On 1st controller using chip tool, open commissioning window using ECM
 
 
           ./chip-tool pairing open-commissioning-window 1 1 180 1000 3840
@@ -112,7 +112,7 @@
           [1635874557.417577][4549:4554] CHIP:CTL: SetupQRCode: [MT:00000CQM00AT-F5A510]
 
 
-          On TH2 using chip tool connect using manual code
+          On 2nd controller using chip tool connect using manual code
 
           ./chip-tool pairing code 1 35484132896
 
@@ -125,7 +125,7 @@
           timeout of PIXIT.CADMIN.CwDuration seconds using ECM"
       PICS: CADMIN.S.C00.Rsp
       verification: |
-          On the TH1 using chip tool, open commissioning window using ECM
+          On 1st controller using chip tool, open commissioning window using ECM
 
 
           ./chip-tool pairing open-commissioning-window 1 1 180 1000 3840
@@ -148,7 +148,7 @@
           a commissioning timeout of PIXIT.CADMIN.CwDuration seconds using ECM"
       PICS: CADMIN.S.C00.Rsp
       verification: |
-          Before the timer expiry, on the TH1 using chip tool, open commissioning window using ECM. Verify the General code return error 1
+          Before the timer expiry, on the 1st controller using chip tool, open commissioning window using ECM. Verify the General code return error 1
 
 
           ./chip-tool pairing open-commissioning-window 1 1 180 1000 3840
@@ -190,7 +190,7 @@
     - label: "TH_CR1 reads the list of Fabrics on DUT_CE"
       PICS: OPCREDS.S.A0001
       verification: |
-          On TH1 using chip tool, read fabrics list
+          On 1st controller using chip tool, read fabrics list
 
           ./chip-tool operationalcredentials read fabrics 1 0 --fabric-filtered 0
 
@@ -226,7 +226,7 @@
           "Wait for the expiration of PIXIT.CADMIN.CwDuration seconds that was
           set in step 6"
       verification: |
-          Wait for the expiration of PIXIT_COMM_WIN seconds
+          verification step to be updated.
       disabled: true
 
     - label:
@@ -234,7 +234,7 @@
           commissioning timeout of PIXIT.CADMIN.CwDuration seconds using BCM"
       PICS: CADMIN.S.C01.Rsp
       verification: |
-          On the TH1 using chip tool, open commissioning window using BCM
+          On the 1st controller using chip tool, open commissioning window using BCM
 
           ./chip-tool administratorcommissioning open-basic-commissioning-window 500 1 0 --timedInteractionTimeoutMs 1000
 
@@ -289,7 +289,7 @@
           commissioning timeout of PIXIT.CADMIN.CwDuration seconds using BCM"
       PICS: CADMIN.S.C01.Rsp
       verification: |
-          On the TH3 using chip tool, open commissioning window using BCM before the timer expiry of the above step
+          On the 3rd controller using chip tool, open commissioning window using BCM before the timer expiry of the above step
 
           ./chip-tool administratorcommissioning open-basic-commissioning-window 500 3 0 --timedInteractionTimeoutMs 1000
 
@@ -331,13 +331,13 @@
           "Wait for the expiration of PIXIT.CADMIN.CwDuration seconds that was
           set in step 11"
       verification: |
-          Wait for the expiration of PIXIT_COMM_WIN seconds
+          verification step to be updated.
       disabled: true
 
     - label: "TH_CR1 reads the list of Fabrics on DUT_CE"
       PICS: OPCREDS.S.A0001
       verification: |
-          On TH1 using chip tool, read fabrics list
+          On 1st controller using chip tool, read fabrics list
 
           ./chip-tool operationalcredentials read fabrics 1 0 --fabric-filtered 0
 
@@ -374,7 +374,7 @@
           timeout of PIXIT.CADMIN.CwDuration seconds using BCM"
       PICS: CADMIN.S.C01.Rsp
       verification: |
-          On the TH1 using chip tool, open commissioning window using BCM
+          On 1st controller using chip tool, open commissioning window using BCM
 
 
           ./chip-tool administratorcommissioning open-basic-commissioning-window 500 1 0 --timedInteractionTimeoutMs 1000
@@ -419,7 +419,7 @@
           a commissioning timeout of PIXIT.CADMIN.CwDuration seconds using BCM"
       PICS: CADMIN.S.C01.Rsp
       verification: |
-          On the TH2 using chip tool, open commissioning window using BCM before timer expiry from above step
+          On 2nd controller using chip tool, open commissioning window using BCM before timer expiry from above step
 
           ./chip-tool administratorcommissioning open-basic-commissioning-window 500 2 0 --timedInteractionTimeoutMs 1000
 
diff --git a/src/app/tests/suites/certification/Test_TC_CADMIN_1_12.yaml b/src/app/tests/suites/certification/Test_TC_CADMIN_1_12.yaml
index 5b1a16c..bd41c7b 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
@@ -26,9 +26,14 @@
     endpoint: 0
 
 tests:
-    - label: "Precondition: Reset DUT_CE to factory defaults"
+    - label: "Note"
       verification: |
-          verification step to be updated.
+          For DUT as comissioner  test cases, Chip-tool command used below are an example to verify the functionality. For certification test, we expect DUT should have a capability or way to run the equivalent command.
+      disabled: true
+
+    - label: "Precondition:"
+      verification: |
+          Reset Devices to factory defaults
       disabled: true
 
     - label: "DUT_CR1 starts a commissioning process with TH_CE"
@@ -215,7 +220,7 @@
           "Wait for the expiration of PIXIT.CADMIN.CwDuration seconds that was
           set in step 4"
       verification: |
-          Wait for the expiration of PIXIT_COMM_WIN seconds
+          verification step to be updated.
       disabled: true
 
     - label:
@@ -354,7 +359,7 @@
           "Wait for the expiration of PIXIT.CADMIN.CwDuration seconds that was
           set in step 8"
       verification: |
-          Wait for the expiration of PIXIT_COMM_WIN seconds
+          verification step to be updated.
       disabled: true
 
     - label:
diff --git a/src/app/tests/suites/certification/Test_TC_CADMIN_1_14.yaml b/src/app/tests/suites/certification/Test_TC_CADMIN_1_14.yaml
index 7054156..c2526b9 100644
--- a/src/app/tests/suites/certification/Test_TC_CADMIN_1_14.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CADMIN_1_14.yaml
@@ -26,23 +26,19 @@
     endpoint: 0
 
 tests:
-    - label: "Precondition: Reset DUT_CE to factory defaults"
+    - label: "Note"
       verification: |
-          verification step to be updated.
+          For DUT as comissioner  test cases, Chip-tool command used below are an example to verify the functionality. For certification test, we expect DUT should have a capability or way to run the equivalent command.
+      disabled: true
+
+    - label: "Precondition"
+      verification: |
+          Reset Devices to factory defaults
       disabled: true
 
     - label: "DUT_CR1 starts a commissioning process with TH_CE"
       PICS: CADMIN.C
       verification: |
-          verification step to be updated.
-      disabled: true
-
-    - label:
-          "DUT_CR1 sends command to TH_CE to open a commissioning window with a
-          commissioning timeout of PIXIT.CADMIN.CwDuration seconds using BCM and
-          TH_CR3 Commissions with TH_CE"
-      PICS: CADMIN.C.C01.Tx
-      verification: |
           "1. Provision the device using your DUT controller (use above instructions) ,
           "
       disabled: true
@@ -50,24 +46,103 @@
     - label:
           "DUT_CR1 sends command to TH_CE to open a commissioning window with a
           commissioning timeout of PIXIT.CADMIN.CwDuration seconds using BCM and
+          TH_CR3 Commissions with TH_CE"
+      PICS: CADMIN.C.C01.Tx
+      verification: |
+          On first controller, open commissioning window using BCM
+          ./chip-tool administratorcommissioning open-basic-commissioning-window 500 1 0 --timedInteractionTimeoutMs 1000
+
+
+          CHIP:DMG: InvokeResponseMessage =
+          [1650278416.248379][11064:11069] CHIP:DMG: {
+          [1650278416.248436][11064:11069] CHIP:DMG:         suppressResponse = false,
+          [1650278416.248495][11064:11069] CHIP:DMG:         InvokeResponseIBs =
+          [1650278416.248570][11064:11069] CHIP:DMG:         [
+          [1650278416.248630][11064:11069] CHIP:DMG:                 InvokeResponseIB =
+          [1650278416.248718][11064:11069] CHIP:DMG:                 {
+          [1650278416.248783][11064:11069] CHIP:DMG:                         CommandStatusIB =
+          [1650278416.248860][11064:11069] CHIP:DMG:                         {
+          [1650278416.248931][11064:11069] CHIP:DMG:                                 CommandPathIB =
+          [1650278416.249011][11064:11069] CHIP:DMG:                                 {
+          [1650278416.249100][11064:11069] CHIP:DMG:                                         EndpointId = 0x0,
+          [1650278416.249186][11064:11069] CHIP:DMG:                                         ClusterId = 0x3c,
+          [1650278416.249268][11064:11069] CHIP:DMG:                                         CommandId = 0x1,
+          [1650278416.249347][11064:11069] CHIP:DMG:                                 },
+          [1650278416.249430][11064:11069] CHIP:DMG:
+          [1650278416.249501][11064:11069] CHIP:DMG:                                 StatusIB =
+          [1650278416.249581][11064:11069] CHIP:DMG:                                 {
+          [1650278416.249664][11064:11069] CHIP:DMG:                                         status = 0x00 (SUCCESS),
+          [1650278416.249738][11064:11069] CHIP:DMG:                                 },
+          [1650278416.249823][11064:11069] CHIP:DMG:
+          [1650278416.249889][11064:11069] CHIP:DMG:                         },
+          [1650278416.249969][11064:11069] CHIP:DMG:
+          [1650278416.250035][11064:11069] CHIP:DMG:                 },
+          [1650278416.250113][11064:11069] CHIP:DMG:
+          [1650278416.250169][11064:11069] CHIP:DMG:         ],
+          [1650278416.250241][11064:11069] CHIP:DMG:
+          [1650278416.250298][11064:11069] CHIP:DMG:         InteractionModelRevision = 1
+          [1650278416.250355][11064:11069] CHIP:DMG: },
+          [1650278416.250535][11064:11069] CHIP:DMG: Received Command Response Status for Endpoint=0 Cluster=0x0000_003C Command=0x0000_0001 Status=0x0
+          [1650278416.250634][11064:11069] CHIP:DMG: ICR moving to [AwaitingDe]
+
+
+
+          On 3rd controller, using chip tool connect to the accessory
+          ./chip-tool pairing onnetwork 1 20202021
+
+          Verify you got below message
+          Device commissioning completed with success
+      disabled: true
+
+    - label:
+          "DUT_CR1 sends command to TH_CE to open a commissioning window with a
+          commissioning timeout of PIXIT.CADMIN.CwDuration seconds using BCM and
           TH_CR2 Commissions with TH_CE"
       PICS: CADMIN.C.C01.Tx
       verification: |
-          On your DUT controller, open commissioning window using ECM
+          On first controller, open commissioning window using BCM
+          ./chip-tool administratorcommissioning open-basic-commissioning-window 500 1 0 --timedInteractionTimeoutMs 1000
 
-          Below is the example while using chip tool as controller
-          ./chip-tool pairing open-commissioning-window 1 1 300 1000 3840
 
-          [1635874557.409509][4549:4554] CHIP:SC: Success status report received. Session was established
-          [1635874557.409553][4549:4554] CHIP:IN: New secure session created for device 0x0000000000000001, key 76!!
-          [1635874557.409649][4549:4554] CHIP:CTL: OpenCommissioningWindow for device ID 1
-          [1635874557.416929][4549:4554] CHIP:DMG: ICR moving to [AddingComm]
-          [1635874557.417092][4549:4554] CHIP:DMG: ICR moving to [AddedComma]
-          [1635874557.417215][4549:4554] CHIP:IN: Prepared encrypted message 0xaaaac5947d10 to 0x0000000000000001 of type 0x8 and protocolId (0, 1) on exchange 5541i with MessageCounter:0.
-          [1635874557.417271][4549:4554] CHIP:IN: Sending encrypted msg 0xaaaac5947d10 with MessageCounter:0 to 0x0000000000000001 at monotonic time: 16129075 msec
-          [1635874557.417449][4549:4554] CHIP:DMG: ICR moving to [CommandSen]
-          [1635874557.417505][4549:4554] CHIP:CTL: Manual pairing code: [35484132896]
-          [1635874557.417577][4549:4554] CHIP:CTL: SetupQRCode: [MT:00000CQM00AT-F5A510]
+          CHIP:DMG: InvokeResponseMessage =
+          [1650278416.248379][11064:11069] CHIP:DMG: {
+          [1650278416.248436][11064:11069] CHIP:DMG:         suppressResponse = false,
+          [1650278416.248495][11064:11069] CHIP:DMG:         InvokeResponseIBs =
+          [1650278416.248570][11064:11069] CHIP:DMG:         [
+          [1650278416.248630][11064:11069] CHIP:DMG:                 InvokeResponseIB =
+          [1650278416.248718][11064:11069] CHIP:DMG:                 {
+          [1650278416.248783][11064:11069] CHIP:DMG:                         CommandStatusIB =
+          [1650278416.248860][11064:11069] CHIP:DMG:                         {
+          [1650278416.248931][11064:11069] CHIP:DMG:                                 CommandPathIB =
+          [1650278416.249011][11064:11069] CHIP:DMG:                                 {
+          [1650278416.249100][11064:11069] CHIP:DMG:                                         EndpointId = 0x0,
+          [1650278416.249186][11064:11069] CHIP:DMG:                                         ClusterId = 0x3c,
+          [1650278416.249268][11064:11069] CHIP:DMG:                                         CommandId = 0x1,
+          [1650278416.249347][11064:11069] CHIP:DMG:                                 },
+          [1650278416.249430][11064:11069] CHIP:DMG:
+          [1650278416.249501][11064:11069] CHIP:DMG:                                 StatusIB =
+          [1650278416.249581][11064:11069] CHIP:DMG:                                 {
+          [1650278416.249664][11064:11069] CHIP:DMG:                                         status = 0x00 (SUCCESS),
+          [1650278416.249738][11064:11069] CHIP:DMG:                                 },
+          [1650278416.249823][11064:11069] CHIP:DMG:
+          [1650278416.249889][11064:11069] CHIP:DMG:                         },
+          [1650278416.249969][11064:11069] CHIP:DMG:
+          [1650278416.250035][11064:11069] CHIP:DMG:                 },
+          [1650278416.250113][11064:11069] CHIP:DMG:
+          [1650278416.250169][11064:11069] CHIP:DMG:         ],
+          [1650278416.250241][11064:11069] CHIP:DMG:
+          [1650278416.250298][11064:11069] CHIP:DMG:         InteractionModelRevision = 1
+          [1650278416.250355][11064:11069] CHIP:DMG: },
+          [1650278416.250535][11064:11069] CHIP:DMG: Received Command Response Status for Endpoint=0 Cluster=0x0000_003C Command=0x0000_0001 Status=0x0
+          [1650278416.250634][11064:11069] CHIP:DMG: ICR moving to [AwaitingDe]
+
+
+
+          On 2nd controller, using chip tool connect to the accessory
+          ./chip-tool pairing onnetwork 1 20202021
+
+          Verify you got below message
+          Device commissioning completed with success
       disabled: true
 
     - label:
@@ -75,11 +150,41 @@
           commissioning timeout of PIXIT.CADMIN.CwDuration seconds using BCM"
       PICS: CADMIN.C.C01.Tx
       verification: |
-          On 2nd controller using chip tool connect using manual code
-          ./chip-tool pairing code 1 35484132896
+          On first controller, open commissioning window using BCM
+          ./chip-tool administratorcommissioning open-basic-commissioning-window 500 1 0 --timedInteractionTimeoutMs 1000
 
-          Verify you got below message
-          Device commissioning completed with success
+
+          CHIP:DMG: InvokeResponseMessage =
+          [1650278416.248379][11064:11069] CHIP:DMG: {
+          [1650278416.248436][11064:11069] CHIP:DMG:         suppressResponse = false,
+          [1650278416.248495][11064:11069] CHIP:DMG:         InvokeResponseIBs =
+          [1650278416.248570][11064:11069] CHIP:DMG:         [
+          [1650278416.248630][11064:11069] CHIP:DMG:                 InvokeResponseIB =
+          [1650278416.248718][11064:11069] CHIP:DMG:                 {
+          [1650278416.248783][11064:11069] CHIP:DMG:                         CommandStatusIB =
+          [1650278416.248860][11064:11069] CHIP:DMG:                         {
+          [1650278416.248931][11064:11069] CHIP:DMG:                                 CommandPathIB =
+          [1650278416.249011][11064:11069] CHIP:DMG:                                 {
+          [1650278416.249100][11064:11069] CHIP:DMG:                                         EndpointId = 0x0,
+          [1650278416.249186][11064:11069] CHIP:DMG:                                         ClusterId = 0x3c,
+          [1650278416.249268][11064:11069] CHIP:DMG:                                         CommandId = 0x1,
+          [1650278416.249347][11064:11069] CHIP:DMG:                                 },
+          [1650278416.249430][11064:11069] CHIP:DMG:
+          [1650278416.249501][11064:11069] CHIP:DMG:                                 StatusIB =
+          [1650278416.249581][11064:11069] CHIP:DMG:                                 {
+          [1650278416.249664][11064:11069] CHIP:DMG:                                         status = 0x00 (SUCCESS),
+          [1650278416.249738][11064:11069] CHIP:DMG:                                 },
+          [1650278416.249823][11064:11069] CHIP:DMG:
+          [1650278416.249889][11064:11069] CHIP:DMG:                         },
+          [1650278416.249969][11064:11069] CHIP:DMG:
+          [1650278416.250035][11064:11069] CHIP:DMG:                 },
+          [1650278416.250113][11064:11069] CHIP:DMG:
+          [1650278416.250169][11064:11069] CHIP:DMG:         ],
+          [1650278416.250241][11064:11069] CHIP:DMG:
+          [1650278416.250298][11064:11069] CHIP:DMG:         InteractionModelRevision = 1
+          [1650278416.250355][11064:11069] CHIP:DMG: },
+          [1650278416.250535][11064:11069] CHIP:DMG: Received Command Response Status for Endpoint=0 Cluster=0x0000_003C Command=0x0000_0001 Status=0x0
+          [1650278416.250634][11064:11069] CHIP:DMG: ICR moving to [AwaitingDe]
       disabled: true
 
     - label:
@@ -88,21 +193,10 @@
           attribute"
       PICS: CADMIN.C.A0000
       verification: |
-          On your DUT controller, open commissioning window using ECM
+          On first controller, read WindowStatus
 
-          Below is the example while using chip tool as controller
-          ./chip-tool pairing open-commissioning-window 1 1 300 1000 3840
 
-          [1635874557.409509][4549:4554] CHIP:SC: Success status report received. Session was established
-          [1635874557.409553][4549:4554] CHIP:IN: New secure session created for device 0x0000000000000001, key 76!!
-          [1635874557.409649][4549:4554] CHIP:CTL: OpenCommissioningWindow for device ID 1
-          [1635874557.416929][4549:4554] CHIP:DMG: ICR moving to [AddingComm]
-          [1635874557.417092][4549:4554] CHIP:DMG: ICR moving to [AddedComma]
-          [1635874557.417215][4549:4554] CHIP:IN: Prepared encrypted message 0xaaaac5947d10 to 0x0000000000000001 of type 0x8 and protocolId (0, 1) on exchange 5541i with MessageCounter:0.
-          [1635874557.417271][4549:4554] CHIP:IN: Sending encrypted msg 0xaaaac5947d10 with MessageCounter:0 to 0x0000000000000001 at monotonic time: 16129075 msec
-          [1635874557.417449][4549:4554] CHIP:DMG: ICR moving to [CommandSen]
-          [1635874557.417505][4549:4554] CHIP:CTL: Manual pairing code: [35484132896]
-          [1635874557.417577][4549:4554] CHIP:CTL: SetupQRCode: [MT:00000CQM00AT-F5A510]
+          ./chip-tool administratorcommissioning read window-status 1 0
       disabled: true
 
     - label:
@@ -112,47 +206,16 @@
           using ECM"
       PICS: CADMIN.C.C00.Tx
       verification: |
-          On 3rd controller using chip tool connect using manual code
-          ./chip-tool pairing code 3 35484132896
+          On 1st controller chip tool, open commissioning window using ECM
 
-          Verify you got below message
-          Device commissioning completed with success
+          ./chip-tool pairing open-commissioning-window 1 1 180 1000 3840
       disabled: true
 
     - label:
           "Wait for the expiration of PIXIT.CADMIN.CwDuration seconds that is
           set in step 4"
       verification: |
-          On 1st controller using chip tool, read fabrics list
-
-          ./chip-tool operationalcredentials read fabrics 1234 0 --fabric-filtered 0
-
-          CHIP:TOO: Endpoint: 0 Cluster: 0x0000_003E Attribute 0x0000_0001 DataVersion: 268962768
-          [1650527361.425870][15792:15797] CHIP:TOO:   Fabrics: 3 entries
-          [1650527361.426777][15792:15797] CHIP:TOO:     [1]: {
-          [1650527361.426859][15792:15797] CHIP:TOO:       RootPublicKey: 0429A71383F336D80918C9EC655112513E428C073AF7FB44820EC793535302C6E3825C56EE6DD1A683EAA7B59E3F261B46FFA24A6D911E8D88839F4C1B3C84BA01
-          [1650527361.426923][15792:15797] CHIP:TOO:       VendorId: 65521
-          [1650527361.426979][15792:15797] CHIP:TOO:       FabricId: 1
-          [1650527361.427033][15792:15797] CHIP:TOO:       NodeId: 1
-          [1650527361.427088][15792:15797] CHIP:TOO:       Label:
-          [1650527361.427166][15792:15797] CHIP:TOO:       FabricIndex: 1
-          [1650527361.427376][15792:15797] CHIP:TOO:      }
-          [1650527361.427464][15792:15797] CHIP:TOO:     [2]: {
-          [1650527361.427532][15792:15797] CHIP:TOO:       RootPublicKey: 04781BCEE70118049ED61DD5B4E401CF1A09D2F78AE7F5770BE5506AD24238E5E0777277DABAFD062659651C95CC2CA7DEAACE40DB579A946CC07CADB141BE05D7
-          [1650527361.427595][15792:15797] CHIP:TOO:       VendorId: 65521
-          [1650527361.427649][15792:15797] CHIP:TOO:       FabricId: 1
-          [1650527361.427703][15792:15797] CHIP:TOO:       NodeId: 3
-          [1650527361.427756][15792:15797] CHIP:TOO:       Label:
-          [1650527361.427811][15792:15797] CHIP:TOO:       FabricIndex: 2
-          [1650527361.427868][15792:15797] CHIP:TOO:      }
-          [1650527361.427943][15792:15797] CHIP:TOO:     [3]: {
-          [1650527361.428008][15792:15797] CHIP:TOO:       RootPublicKey: 0403EDB5B461030A34EF7EA2F9DB0D46A36185E4755C365AF9344C4959F049EF21D55EAB903A2C7FBFC305EEFA42989250D7517A73E6156062390A60C0D4C41EBD
-          [1650527361.428067][15792:15797] CHIP:TOO:       VendorId: 65521
-          [1650527361.428122][15792:15797] CHIP:TOO:       FabricId: 1
-          [1650527361.428176][15792:15797] CHIP:TOO:       NodeId: 2
-          [1650527361.428229][15792:15797] CHIP:TOO:       Label:
-          [1650527361.428282][15792:15797] CHIP:TOO:       FabricIndex: 3
-          [1650527361.428335][15792:15797] CHIP:TOO:      }
+          verification step to be updated.
       disabled: true
 
     - label:
@@ -161,17 +224,21 @@
           ECM"
       PICS: CADMIN.C.C00.Tx
       verification: |
-          on 2nd controller using chip tool, remove fabric with FabricIndex=2
+          On 1st controller chip tool, open commissioning window using ECM
 
-          ./chip-tool operationalcredentials remove-fabric 2 1 0
+          ./chip-tool pairing open-commissioning-window 1 1 180 1000 3840
 
-          CHIP:DMG: Received Command Response Data, Endpoint=0 Cluster=0x0000_003E Command=0x0000_0008
-          CHIP:TOO: Endpoint: 0 Cluster: 0x0000_003E Command 0x0000_0008
-          CHIP:TOO:   NOCResponse: {
-          CHIP:TOO:     statusCode: 0
-          CHIP:TOO:     fabricIndex: 2
-          CHIP:TOO:    }
-          CHIP:DMG: ICR moving to [AwaitingDe]
+          [1635925713.966786][9695:9700] CHIP:SC: Success status report received. Session was established
+          [1635925713.966839][9695:9700] CHIP:IN: New secure session created for device 0x0000000000000001, key 33!!
+          [1635925713.966938][9695:9700] CHIP:CTL: OpenCommissioningWindow for device ID 1
+          [1635925713.972601][9695:9700] CHIP:DMG: ICR moving to [AddingComm]
+          [1635925713.972705][9695:9700] CHIP:DMG: ICR moving to [AddedComma]
+          [1635925713.972815][9695:9700] CHIP:IN: Prepared encrypted message 0xaaaad9b57d10 to 0x0000000000000001 of type 0x8 and protocolId (0, 1) on exchange 31056i with MessageCounter:0.
+          [1635925713.972876][9695:9700] CHIP:IN: Sending encrypted msg 0xaaaad9b57d10 with MessageCounter:0 to 0x0000000000000001 at monotonic time: 13449459 msec
+          [1635925713.973006][9695:9700] CHIP:DMG: ICR moving to [CommandSen]
+          [1635925713.973061][9695:9700] CHIP:CTL: Manual pairing code: [36217551633]
+          [1635925713.973120][9695:9700] CHIP:CTL: SetupQRCode: [MT:00000CQM00A7F87ZT10]
+          [1635925713.973178][9695:9700] CHIP:EM: Sending Standalone Ack for MessageCounter:1964916542 on exchange 31055i
       disabled: true
 
     - label:
@@ -180,20 +247,10 @@
           attribute"
       PICS: CADMIN.C.A0000
       verification: |
-          Using your 2nd controller, write attribute and read attribute to and from TH_CE
+          On first controller, read WindowStatus
 
-          Below is the example while using chip tool on second controller,
-          ./chip-tool basic write node-label te5new 2 0
 
-           Received error (protocol code 2) during pairing process. ../../third_party/connectedhomeip/src/protocols/secure_channel/CASESession.cpp:1551: CHIP Error 0x00000054: Invalid CASE parameter
-          [1651819620.929567][4359:4364] CHIP:CTL: OperationalDeviceProxy[B8070CD13C99D367:0000000000000002]: State change 3 --> 2
-          [1651819620.929700][4359:4364] CHIP:-: ../../third_party/connectedhomeip/src/protocols/secure_channel/CASESession.cpp:1551: CHIP Error 0x00000054: Invalid CASE parameter at ../../commands/clusters/ModelCommand.cpp:53
-
-          ./chip-tool basic read node-label 2 0
-
-           Received error (protocol code 2) during pairing process. ../../third_party/connectedhomeip/src/protocols/secure_channel/CASESession.cpp:1551: CHIP Error 0x00000054: Invalid CASE parameter
-          [1651819620.929567][4359:4364] CHIP:CTL: OperationalDeviceProxy[B8070CD13C99D367:0000000000000002]: State change 3 --> 2
-          [1651819620.929700][4359:4364] CHIP:-: ../../third_party/connectedhomeip/src/protocols/secure_channel/CASESession.cpp:1551: CHIP Error 0x00000054: Invalid CASE parameter at ../../commands/clusters/ModelCommand.cpp:53
+          ./chip-tool administratorcommissioning read window-status 1 0
       disabled: true
 
     - label:
@@ -203,51 +260,28 @@
           using ECM"
       PICS: CADMIN.C.C00.Tx
       verification: |
-          On 1st controller using chip tool, read fabrics list
+          On 3rd controller chip tool, open commissioning window using ECM
 
-          Below is the command using chip tool controller
+          ./chip-tool pairing open-commissioning-window 1 1 180 1000 3840
 
-          ./chip-tool operationalcredentials read fabrics 1 0 --fabric-filtered 0
-
-          CHIP:TOO: Endpoint: 0 Cluster: 0x0000_003E Attribute 0x0000_0001 DataVersion: 2455995219
-          [1647863260.286772][9294:9299] CHIP:TOO:   Fabrics: 2 entries
-          [1647863260.286908][9294:9299] CHIP:TOO:     [1]: {
-          [1647863260.286947][9294:9299] CHIP:TOO:       RootPublicKey: 04656F56DBDB677DC957028DFC0ED76709C72753C9194B117A483BDC07386BFD9529B68EB4448FBBA3964EFF37A56A8F461D348B0DAF3B56A75F3B94BF8209D36F
-          [1647863260.286995][9294:9299] CHIP:TOO:       VendorId: 65521
-          [1647863260.287026][9294:9299] CHIP:TOO:       FabricId: 1
-          [1647863260.287055][9294:9299] CHIP:TOO:       NodeId: 1
-          [1647863260.287084][9294:9299] CHIP:TOO:       Label:
-          [1647863260.287113][9294:9299] CHIP:TOO:       FabricIndex: 1
-          [1647863260.287144][9294:9299] CHIP:TOO:      }
-          [1647863260.287185][9294:9299] CHIP:TOO:     [2]: {
-          [1647863260.287221][9294:9299] CHIP:TOO:       RootPublicKey: 04F8F28D5D70A4510E0F72FBBA31369796C4206FF95D97B77C1BDFD0438A3BE43510631A1B915BE189323F4CC0E015480192654D8170F8F230C7713898962958B7
-          [1647863260.287253][9294:9299] CHIP:TOO:       VendorId: 65521
-          [1647863260.287282][9294:9299] CHIP:TOO:       FabricId: 1
-          [1647863260.287310][9294:9299] CHIP:TOO:       NodeId: 3
-          [1647863260.287339][9294:9299] CHIP:TOO:       Label:
-          [1647863260.287368][9294:9299] CHIP:TOO:       FabricIndex: 3
-          [1647863260.287396][9294:9299] CHIP:TOO:      }
-          [1647863260.287515][9294:9299] CHIP:EM: Sending Standalone Ack for MessageCounter:11301761 on exchange 13180i"
+          [1635925713.966786][9695:9700] CHIP:SC: Success status report received. Session was established
+          [1635925713.966839][9695:9700] CHIP:IN: New secure session created for device 0x0000000000000001, key 33!!
+          [1635925713.966938][9695:9700] CHIP:CTL: OpenCommissioningWindow for device ID 1
+          [1635925713.972601][9695:9700] CHIP:DMG: ICR moving to [AddingComm]
+          [1635925713.972705][9695:9700] CHIP:DMG: ICR moving to [AddedComma]
+          [1635925713.972815][9695:9700] CHIP:IN: Prepared encrypted message 0xaaaad9b57d10 to 0x0000000000000001 of type 0x8 and protocolId (0, 1) on exchange 31056i with MessageCounter:0.
+          [1635925713.972876][9695:9700] CHIP:IN: Sending encrypted msg 0xaaaad9b57d10 with MessageCounter:0 to 0x0000000000000001 at monotonic time: 13449459 msec
+          [1635925713.973006][9695:9700] CHIP:DMG: ICR moving to [CommandSen]
+          [1635925713.973061][9695:9700] CHIP:CTL: Manual pairing code: [36217551633]
+          [1635925713.973120][9695:9700] CHIP:CTL: SetupQRCode: [MT:00000CQM00A7F87ZT10]
+          [1635925713.973178][9695:9700] CHIP:EM: Sending Standalone Ack for MessageCounter:1964916542 on exchange 31055i
       disabled: true
 
     - label:
           "Wait for the expiration of PIXIT.CADMIN.CwDuration seconds that is
           set in step 8"
       verification: |
-          grl@grl-ThinkPad-L480:~/may16_cntrl03/connectedhomeip/examples/chip-tool/out/debug$ avahi-browse -rt _matter._tcp
-          + wlp5s0 IPv6 8E50A59FAF52A809-0000000000000001             _matter._tcp         local
-          + wlp5s0 IPv6 03E707466A904C7E-0000000000000003             _matter._tcp         local
-          = wlp5s0 IPv6 8E50A59FAF52A809-0000000000000001             _matter._tcp         local
-             hostname = [E45F010F27530000.local]
-             address = [fe80::e65f:1ff:fe0f:2753]
-             port = [5540]
-             txt = ["T=1" "SAI=300" "SII=5000"]
-          = wlp5s0 IPv6 03E707466A904C7E-0000000000000003             _matter._tcp         local
-             hostname = [E45F010F27530000.local]
-             address = [fe80::e65f:1ff:fe0f:2753]
-             port = [5540]
-             txt = ["T=1" "SAI=300" "SII=5000"]
-          grl@grl-ThinkPad-L480:~/may16_cntrl03/connectedhomeip/examples/chip-tool/out/debug$
+          verification step to be updated.
       disabled: true
 
     - label:
@@ -255,7 +289,7 @@
           commissioning timeout of PIXIT.CADMIN.CwDuration seconds using ECM"
       PICS: CADMIN.C.C00.Tx
       verification: |
-          On 1st controller chip tool, open commissioning window
+          On 1st controller chip tool, open commissioning window using ECM
 
           ./chip-tool pairing open-commissioning-window 1 1 180 1000 3840
 
@@ -279,58 +313,23 @@
           PIXIT.CADMIN.CwDuration seconds using ECM"
       PICS: CADMIN.C.C00.Tx
       verification: |
-          On 2nd controller using chip tool connect to the accessory
+          On 2nd controller using chip tool connect to the accessory using ECM
 
 
-          ./chip-tool pairing code 1 36217551633
-
-          Verify you got below message
-          Device commissioning completed with success
+          ./chip-tool pairing open-commissioning-window 1 1 180 1000 3840
       disabled: true
 
     - label:
           "Wait for the expiration of PIXIT.CADMIN.CwDuration seconds that is
           set in step 12"
       verification: |
-          On 1st controller, read fabrics list
-
-          Below is the command using chip tool controller
-
-          ./chip-tool operationalcredentials read fabrics 1 0 --fabric-filtered 0
-
-          CHIP:TOO: Endpoint: 0 Cluster: 0x0000_003E Attribute 0x0000_0001 DataVersion: 2455995246
-          [1647863342.980899][9309:9314] CHIP:TOO:   Fabrics: 3 entries
-          [1647863342.981158][9309:9314] CHIP:TOO:     [1]: {
-          [1647863342.981231][9309:9314] CHIP:TOO:       RootPublicKey: 04656F56DBDB677DC957028DFC0ED76709C72753C9194B117A483BDC07386BFD9529B68EB4448FBBA3964EFF37A56A8F461D348B0DAF3B56A75F3B94BF8209D36F
-          [1647863342.981322][9309:9314] CHIP:TOO:       VendorId: 65521
-          [1647863342.981380][9309:9314] CHIP:TOO:       FabricId: 1
-          [1647863342.981434][9309:9314] CHIP:TOO:       NodeId: 1
-          [1647863342.981486][9309:9314] CHIP:TOO:       Label:
-          [1647863342.981539][9309:9314] CHIP:TOO:       FabricIndex: 1
-          [1647863342.981594][9309:9314] CHIP:TOO:      }
-          [1647863342.981671][9309:9314] CHIP:TOO:     [2]: {
-          [1647863342.981737][9309:9314] CHIP:TOO:       RootPublicKey: 04F8F28D5D70A4510E0F72FBBA31369796C4206FF95D97B77C1BDFD0438A3BE43510631A1B915BE189323F4CC0E015480192654D8170F8F230C7713898962958B7
-          [1647863342.981796][9309:9314] CHIP:TOO:       VendorId: 65521
-          [1647863342.981849][9309:9314] CHIP:TOO:       FabricId: 1
-          [1647863342.981901][9309:9314] CHIP:TOO:       NodeId: 3
-          [1647863342.981952][9309:9314] CHIP:TOO:       Label:
-          [1647863342.982005][9309:9314] CHIP:TOO:       FabricIndex: 3
-          [1647863342.982057][9309:9314] CHIP:TOO:      }
-          [1647863342.982131][9309:9314] CHIP:TOO:     [3]: {
-          [1647863342.982195][9309:9314] CHIP:TOO:       RootPublicKey: 04F8F28D5D70A4510E0F72FBBA31369796C4206FF95D97B77C1BDFD0438A3BE43510631A1B915BE189323F4CC0E015480192654D8170F8F230C7713898962958B7
-          [1647863342.982252][9309:9314] CHIP:TOO:       VendorId: 65521
-          [1647863342.982305][9309:9314] CHIP:TOO:       FabricId: 1
-          [1647863342.982357][9309:9314] CHIP:TOO:       NodeId: 2
-          [1647863342.982409][9309:9314] CHIP:TOO:       Label:
-          [1647863342.982460][9309:9314] CHIP:TOO:       FabricIndex: 4
-          [1647863342.982512][9309:9314] CHIP:TOO:      }
-          [1647863342.982738][9309:9314] CHIP:EM: Sending Standalone Ack for MessageCounter:5772016 on exchange 3310i
+          verification step to be updated.
       disabled: true
 
     - label: "DUT_CR1 sends command to TH_CE to read WindowStatus attribute"
       PICS: CADMIN.C.A0000
       verification: |
-          Verify DUT successfully reads window status
+          On first controller, read WindowStatus
 
 
           ./chip-tool administratorcommissioning read window-status 1 0
@@ -343,7 +342,7 @@
     - label: "DUT_CR1 sends command to TH_CE to read AdminFabricIndex attribute"
       PICS: CADMIN.C.A0001
       verification: |
-          Verifu DUT successfully reads AdminFabricIndex
+          On first controller, read AdminFabricIndex
 
           ./chip-tool administratorcommissioning read admin-fabric-index  1 0
 
@@ -356,7 +355,7 @@
     - label: "DUT_CR1 sends command to TH_CE to read AdminVendorId attribute"
       PICS: CADMIN.C.A0002
       verification: |
-          Verify DUT successfully reads AdminVendoeId
+          On first controller, read AdminVendorId
 
           ./chip-tool administratorcommissioning read admin-vendor-id 1 0
 
diff --git a/src/app/tests/suites/certification/Test_TC_CADMIN_1_15.yaml b/src/app/tests/suites/certification/Test_TC_CADMIN_1_15.yaml
index 6bbc924..e8b060d 100644
--- a/src/app/tests/suites/certification/Test_TC_CADMIN_1_15.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CADMIN_1_15.yaml
@@ -26,9 +26,9 @@
     endpoint: 0
 
 tests:
-    - label: "Precondition: Reset DUT_CE to factory defaults"
+    - label: "Precondition"
       verification: |
-          verification step to be updated.
+          Reset Devices to factory defaults
       disabled: true
 
     - label: "TH_CR1 starts a commissioning process with DUT_CE"
@@ -43,7 +43,7 @@
           timeout of PIXIT.CADMIN.CwDuration seconds using ECM"
       PICS: CADMIN.S.C00.Rsp
       verification: |
-          On 1st controller chip tool, open commissioning window
+          On 1st controller chip tool, open commissioning window using ECM
 
           ./chip-tool pairing open-commissioning-window 1 1 180 1000 3840
 
@@ -66,7 +66,7 @@
           On 2nd controller using chip tool connect to the accessory
 
 
-          ./chip-tool pairing code 1 36217551633
+          ./chip-tool pairing code 2 36217551633
 
           Verify you got below message
           Device commissioning completed with success
@@ -77,7 +77,7 @@
           timeout of PIXIT.CADMIN.CwDuration seconds using ECM"
       PICS: CADMIN.S.C00.Rsp
       verification: |
-          On 1st controller chip tool, open commissioning window
+          On 1st controller chip tool, open commissioning window using ECM
 
           ./chip-tool pairing open-commissioning-window 1 1 300 1000 3840
 
@@ -101,7 +101,7 @@
 
 
 
-          ./chip-tool pairing code 1 36217551633
+          ./chip-tool pairing code 3 36217551633
 
           Verify you got below message
           Device commissioning completed with success
@@ -164,7 +164,7 @@
           mandatory attribute of DUT_CE"
       PICS: BINFO.S.A0005
       verification: |
-          Using your 2nd controller, write attribute and read attribute to and from TH_CE
+          Using your 2nd controller, write attribute and read attribute
 
           Below is the example while using chip tool on second controller,
           ./chip-tool basic write node-label te5new 2 0
@@ -211,11 +211,31 @@
       disabled: true
 
     - label:
+          "Verify DUT_CE is now discoverable over DNS-SD with 2 Operational
+          service records (_matter._tcp SRV records)"
+      verification: |
+          grl@grl-ThinkPad-L480:~/may16_cntrl03/connectedhomeip/examples/chip-tool/out/debug$ avahi-browse -rt _matter._tcp
+          + wlp5s0 IPv6 8E50A59FAF52A809-0000000000000001             _matter._tcp         local
+          + wlp5s0 IPv6 03E707466A904C7E-0000000000000003             _matter._tcp         local
+          = wlp5s0 IPv6 8E50A59FAF52A809-0000000000000001             _matter._tcp         local
+             hostname = [E45F010F27530000.local]
+             address = [fe80::e65f:1ff:fe0f:2753]
+             port = [5540]
+             txt = ["T=1" "SAI=300" "SII=5000"]
+          = wlp5s0 IPv6 03E707466A904C7E-0000000000000003             _matter._tcp         local
+             hostname = [E45F010F27530000.local]
+             address = [fe80::e65f:1ff:fe0f:2753]
+             port = [5540]
+             txt = ["T=1" "SAI=300" "SII=5000"]
+          grl@grl-ThinkPad-L480:~/may16_cntrl03/connectedhomeip/examples/chip-tool/out/debug$
+      disabled: true
+
+    - label:
           "TH_CR1 opens a commissioning window on DUT_CE using a commissioning
           timeout of PIXIT.CADMIN.CwDuration seconds using ECM"
       PICS: CADMIN.S.C00.Rsp
       verification: |
-          On 1st controller chip tool, open commissioning window
+          On 1st controller chip tool, open commissioning window using ECM
 
           ./chip-tool pairing open-commissioning-window 1 1 180 1000 3840
 
@@ -238,7 +258,7 @@
           On 2nd controller using chip tool connect to the accessory
 
 
-          ./chip-tool pairing code 1 36217551633
+          ./chip-tool pairing code 2 36217551633
 
           Verify you got below message
           Device commissioning completed with success
diff --git a/src/app/tests/suites/certification/Test_TC_CADMIN_1_16.yaml b/src/app/tests/suites/certification/Test_TC_CADMIN_1_16.yaml
index 46e79b3..623466e 100644
--- a/src/app/tests/suites/certification/Test_TC_CADMIN_1_16.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CADMIN_1_16.yaml
@@ -26,9 +26,9 @@
     endpoint: 0
 
 tests:
-    - label: "Precondition: Reset DUT_CE to factory defaults"
+    - label: "Precondition"
       verification: |
-          verification step to be updated.
+          Reset Devices to factory defaults
       disabled: true
 
     - label: "TH_CR1 starts a commissioning process with DUT_CE"
@@ -43,7 +43,7 @@
           timeout of PIXIT.CADMIN.CwDuration seconds using BCM"
       PICS: CADMIN.S.C01.Rsp
       verification: |
-          On 1st controller chip tool, open commissioning window
+          On 1st controller chip tool, open commissioning window using BCM
           ./chip-tool administratorcommissioning open-basic-commissioning-window 500 1 0 --timedInteractionTimeoutMs 1000
 
           CHIP:DMG: InvokeResponseMessage =
@@ -96,8 +96,8 @@
           timeout of PIXIT.CADMIN.CwDuration seconds using BCM"
       PICS: CADMIN.S.C01.Rsp
       verification: |
-          On 1st controller chip tool, open commissioning window
-          ./chip-tool administratorcommissioning open-basic-commissioning-window 500 2 0 --timedInteractionTimeoutMs 1000
+          On 1st controller chip tool, open commissioning window using BCM
+          ./chip-tool administratorcommissioning open-basic-commissioning-window 500 1 0 --timedInteractionTimeoutMs 1000
 
           CHIP:DMG: InvokeResponseMessage =
           [1650278416.248379][11064:11069] CHIP:DMG: {
@@ -139,7 +139,7 @@
 
 
 
-          ./chip-tool pairing onnetwork 1 20202021
+          ./chip-tool pairing onnetwork 3 20202021
 
           Verify you got below message
           Device commissioning completed with success
@@ -202,7 +202,7 @@
           mandatory attribute of DUT_CE"
       PICS: BINFO.S.A0005
       verification: |
-          Using your 2nd controller, write attribute and read attribute to and from TH_CE
+          Using your 2nd controller, write attribute and read attribute
 
           Below is the example while using chip tool on second controller,
           ./chip-tool basic write node-label te5new 2 0
@@ -274,9 +274,9 @@
           timeout of PIXIT.CADMIN.CwDuration seconds using BCM"
       PICS: CADMIN.S.C01.Rsp
       verification: |
-          On 1st controller chip tool, open commissioning window
+          On 1st controller chip tool, open commissioning window using BCM
 
-          ./chip-tool administratorcommissioning open-basic-commissioning-window 500 2 0 --timedInteractionTimeoutMs 1000
+          ./chip-tool administratorcommissioning open-basic-commissioning-window 500 1 0 --timedInteractionTimeoutMs 1000
 
 
           CHIP:DMG: InvokeResponseMessage =
@@ -318,7 +318,7 @@
           On 2nd controller using chip tool connect to the accessory
 
 
-          ./chip-tool pairing onnetwork 1 20202021
+          ./chip-tool pairing onnetwork 2 20202021
 
           Verify you got below message
           Device commissioning completed with success
@@ -331,7 +331,7 @@
 
           Below is the command using chip tool controller
 
-          ./chip-tool operationalcredentials read fabrics 1234 0 --fabric-filtered 0
+          ./chip-tool operationalcredentials read fabrics 1 0 --fabric-filtered 0
 
           CHIP:TOO: Endpoint: 0 Cluster: 0x0000_003E Attribute 0x0000_0001 DataVersion: 2455995246
           [1647863342.980899][9309:9314] CHIP:TOO:   Fabrics: 3 entries
diff --git a/src/app/tests/suites/certification/Test_TC_CADMIN_1_17.yaml b/src/app/tests/suites/certification/Test_TC_CADMIN_1_17.yaml
index adc6fdc..fd2367e 100644
--- a/src/app/tests/suites/certification/Test_TC_CADMIN_1_17.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CADMIN_1_17.yaml
@@ -26,9 +26,14 @@
     endpoint: 0
 
 tests:
-    - label: "Precondition: Reset DUT_CE to factory defaults"
+    - label: "Note"
       verification: |
-          verification step to be updated.
+          For DUT as comissioner  test cases, Chip-tool command used below are an example to verify the functionality. For certification test, we expect DUT should have a capability or way to run the equivalent command.
+      disabled: true
+
+    - label: "Precondition"
+      verification: |
+          Reset Devices to factory defaults
       disabled: true
 
     - label: "DUT_CR1 starts a commissioning process with TH_CE"
@@ -43,7 +48,7 @@
           commissioning timeout of PIXIT.CADMIN.CwDuration seconds using ECM"
       PICS: CADMIN.C.C00.Tx
       verification: |
-          On your DUT controller chip tool, open commissioning window
+          On your first controller, open commissioning window using ECM
 
           Below is the example when using chip tool as controller
 
@@ -94,7 +99,7 @@
           commissioning timeout of PIXIT.CADMIN.CwDuration seconds using ECM"
       PICS: CADMIN.C.C00.Tx
       verification: |
-          On your first controller chip tool, open commissioning window
+          On your first controller chip tool, open commissioning window using ECM
 
           Below is the example when using chip tool as controller
 
@@ -269,7 +274,7 @@
           commissioning timeout of PIXIT.CADMIN.CwDuration seconds using ECM"
       PICS: CADMIN.C.C00.Tx
       verification: |
-          On first controller chip tool, open commissioning window
+          On first controller chip tool, open commissioning window using ECM
 
           Below is the example when using chip tool as controller
 
diff --git a/src/app/tests/suites/certification/Test_TC_CADMIN_1_18.yaml b/src/app/tests/suites/certification/Test_TC_CADMIN_1_18.yaml
index c77b298..12cfd95 100644
--- a/src/app/tests/suites/certification/Test_TC_CADMIN_1_18.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CADMIN_1_18.yaml
@@ -26,9 +26,14 @@
     endpoint: 0
 
 tests:
-    - label: "Precondition: Reset DUT_CE to factory defaults"
+    - label: "Note"
       verification: |
-          verification step to be updated.
+          For DUT as comissioner  test cases, Chip-tool command used below are an example to verify the functionality. For certification test, we expect DUT should have a capability or way to run the equivalent command.
+      disabled: true
+
+    - label: "Precondition"
+      verification: |
+          Reset Devices to factory defaults
       disabled: true
 
     - label: "DUT_CR1 starts a commissioning process with TH_CE"
@@ -43,7 +48,7 @@
           commissioning timeout of PIXIT.CADMIN.CwDuration seconds using BCM"
       PICS: CADMIN.C.C01.Tx
       verification: |
-          On your first controller chip tool, open commissioning window
+          On your first controller chip tool, open commissioning window using BCM
 
           Below is the example when using chip tool as controller
           ./chip-tool administratorcommissioning open-basic-commissioning-window 500 2 0 --timedInteractionTimeoutMs 1000
@@ -98,7 +103,7 @@
           commissioning timeout of PIXIT.CADMIN.CwDuration seconds using BCM"
       PICS: CADMIN.C.C01.Tx
       verification: |
-          On your first controller chip tool, open commissioning window
+          On your first controller chip tool, open commissioning window using BCM
 
           Below is the example when using chip tool as controller
           ./chip-tool administratorcommissioning open-basic-commissioning-window 500 2 0 --timedInteractionTimeoutMs 1000
@@ -281,7 +286,7 @@
           commissioning timeout of PIXIT.CADMIN.CwDuration seconds using BCM"
       PICS: CADMIN.C.C01.Tx
       verification: |
-          On first controller chip tool, open commissioning window
+          On first controller chip tool, open commissioning window using BCM
 
           Below is the example when using chip tool as controller
 
@@ -370,9 +375,3 @@
           [1647863342.982512][9309:9314] CHIP:TOO:      }
           [1647863342.982738][9309:9314] CHIP:EM: Sending Standalone Ack for MessageCounter:5772016 on exchange 3310i
       disabled: true
-
-    - label: "TH_CR2 sends command to TH_CE to read the list of Fabrics"
-      PICS: OPCREDS.C.A0001
-      verification: |
-          verification step to be updated.
-      disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_CADMIN_1_19.yaml b/src/app/tests/suites/certification/Test_TC_CADMIN_1_19.yaml
index 0539f54..269f9e6 100644
--- a/src/app/tests/suites/certification/Test_TC_CADMIN_1_19.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CADMIN_1_19.yaml
@@ -26,9 +26,9 @@
     endpoint: 0
 
 tests:
-    - label: "Precondition: Reset DUT_CE to factory defaults"
+    - label: "Precondition"
       verification: |
-          verification step to be updated.
+          Reset Devices to factory defaults
       disabled: true
 
     - label: "TH_CR1 starts a commissioning process with DUT_CE"
@@ -43,7 +43,7 @@
           timeout of PIXIT.CADMIN.CwDuration seconds using ECM"
       PICS: CADMIN.S.C00.Rsp
       verification: |
-          On 1st controller chip tool, open commissioning window
+          On 1st controller chip tool, open commissioning window using ECM
 
           Below is the example when using chip tool as controller
 
@@ -68,7 +68,7 @@
           On nth controller using chip tool connect to the accessory
 
 
-          ./chip-tool pairing code 1 36217551633
+          ./chip-tool pairing code 2 36217551633
 
           Verify you got below message
           Device commissioning completed with success
@@ -90,7 +90,7 @@
           On nth controller using chip tool connect to the accessory
 
 
-          ./chip-tool pairing code 1 36217551633
+          ./chip-tool pairing code 6 36217551633
 
           CHIP:DMG: Received Command Response Data, Endpoint=0 Cluster=0x0000_003E Command=0x0000_0008
           [1649756670.402192][10794:10799] CHIP:CTL: Device returned status 5 on receiving the NOC
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 2c9ea05..ee32a4c 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
@@ -25,9 +25,14 @@
     endpoint: 0
 
 tests:
-    - label: "Precondition: Reset DUT_CE to factory defaults"
+    - label: "Note"
       verification: |
-          verification step to be updated.
+          For DUT as comissioner  test cases, Chip-tool command used below are an example to verify the functionality. For certification test, we expect DUT should have a capability or way to run the equivalent command.
+      disabled: true
+
+    - label: "Precondition"
+      verification: |
+          Reset Devices to factory defaults
       disabled: true
 
     - label: "TH_CR1 starts a commissioning process with TH_CE"
@@ -108,7 +113,7 @@
           On second Controller connect to the accessory.
 
           Below is the example when using chip tool as controller
-          ./chip-tool pairing onnetwork 1 20202021
+          ./chip-tool pairing onnetwork 2 20202021
 
           Verify you got below message
           Device commissioning completed with success
@@ -398,6 +403,7 @@
           ./chip-tool pairing onnetwork 3 20202021
 
           verify you got the following message in the TH log
+
           CHIP:SC: PASESession timed out while waiting for a response from the peer. Expected message type was 33
           CHIP:TOO: Secure Pairing Failed
           CHIP:TOO: Pairing Failure: ../../third_party/connectedhomeip/src/protocols/secure_channel/PASESession.cpp:324: CHIP Error 0x00000032: Timeout
diff --git a/src/app/tests/suites/certification/Test_TC_CADMIN_1_20.yaml b/src/app/tests/suites/certification/Test_TC_CADMIN_1_20.yaml
index ef16e4b..ebe9ef8 100644
--- a/src/app/tests/suites/certification/Test_TC_CADMIN_1_20.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CADMIN_1_20.yaml
@@ -26,9 +26,9 @@
     endpoint: 0
 
 tests:
-    - label: "Precondition: Reset DUT_CE to factory defaults"
+    - label: "Precondition"
       verification: |
-          verification step to be updated.
+          Reset Devices to factory defaults
       disabled: true
 
     - label: "TH_CR1 starts a commissioning process with DUT_CE"
@@ -43,7 +43,7 @@
           timeout of PIXIT.CADMIN.CwDuration seconds using BCM"
       PICS: CADMIN.S.C01.Rsp
       verification: |
-          On 1st controller chip tool, open commissioning window
+          On 1st controller chip tool, open commissioning window using BCM
 
           Below is the example when using chip tool as controller
 
@@ -88,7 +88,7 @@
           On nth controller using chip tool connect to the accessory
 
 
-          ./chip-tool pairing onnetwork 1 20202021
+          ./chip-tool pairing onnetwork 2 20202021
 
           Verify you got below message
           Device commissioning completed with success
@@ -110,7 +110,7 @@
           On nth controller using chip tool connect to the accessory
 
 
-          ./chip-tool pairing onnetwork 1 20202021
+          ./chip-tool pairing onnetwork 6 20202021
 
           CHIP:DMG: Received Command Response Data, Endpoint=0 Cluster=0x0000_003E Command=0x0000_0008
           [1649756670.402192][10794:10799] CHIP:CTL: Device returned status 5 on receiving the NOC
diff --git a/src/app/tests/suites/certification/Test_TC_CADMIN_1_21.yaml b/src/app/tests/suites/certification/Test_TC_CADMIN_1_21.yaml
index a56a834..5097d62 100644
--- a/src/app/tests/suites/certification/Test_TC_CADMIN_1_21.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CADMIN_1_21.yaml
@@ -26,9 +26,9 @@
     endpoint: 0
 
 tests:
-    - label: "Precondition: Reset DUT_CE to factory defaults"
+    - label: "Precondition"
       verification: |
-          verification step to be updated.
+          Reset Devices to factory defaults
       disabled: true
 
     - label: "TH_CR1 starts a commissioning process with DUT_CE using BCM"
diff --git a/src/app/tests/suites/certification/Test_TC_CADMIN_1_22.yaml b/src/app/tests/suites/certification/Test_TC_CADMIN_1_22.yaml
index 4529cc6..261b804 100644
--- a/src/app/tests/suites/certification/Test_TC_CADMIN_1_22.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CADMIN_1_22.yaml
@@ -26,9 +26,9 @@
     endpoint: 0
 
 tests:
-    - label: "Precondition: Reset DUT_CE to factory defaults"
+    - label: "Precondition"
       verification: |
-          verification step to be updated.
+          Reset Devices to factory defaults
       disabled: true
 
     - label: "TH_CR1 starts a commissioning process with DUT_CE using ECM"
@@ -123,7 +123,7 @@
           "TH_CR1 reads the window status to verify the DUT_CE window is closed"
       PICS: CADMIN.S.A0000
       verification: |
-          On TH1 controller read window status
+          On first controller, read window status
 
           ./chip-tool administratorcommissioning read window-status 1 0
 
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 6a64acc..d935c80 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
@@ -26,9 +26,14 @@
     endpoint: 0
 
 tests:
-    - label: "Precondition: Reset DUT_CE to factory defaults"
+    - label: "Note"
       verification: |
-          verification step to be updated.
+          For DUT as comissioner  test cases, Chip-tool command used below are an example to verify the functionality. For certification test, we expect DUT should have a capability or way to run the equivalent command.
+      disabled: true
+
+    - label: "Precondition"
+      verification: |
+          Reset Devices to factory defaults
       disabled: true
 
     - label: "DUT_CR1 starts a commissioning process with TH_CE"
@@ -42,7 +47,7 @@
           commissioning timeout of PIXIT.CADMIN.CwDuration seconds using ECM"
       PICS: CADMIN.C.C00.Tx
       verification: |
-          On your DUT controller open commissioning widow using ECM.
+          On 1st controller open commissioning widow using ECM.
 
           Below is the example while using chip tool as controller,
 
@@ -92,7 +97,7 @@
 
 
           Below is the example when using chip tool as controller (considering 36366524220 as the manual code generated by DUT controller)
-          ./chip-tool pairing code 1 36366524220
+          ./chip-tool pairing code 2 36366524220
 
           verify you got the following message in the TH log
           CHIP:SC: PASESession timed out while waiting for a response from the peer. Expected message type was 33
@@ -110,7 +115,7 @@
 
           Below is the example while using chip tool as controller,
 
-          ./chip-tool pairing open-commissioning-window 1 1 300 1000 3840
+          ./chip-tool pairing open-commissioning-window 2 1 300 1000 3840
 
           [1635871058.908790][4273:4278] CHIP:SC: Success status report received. Session was established
           [1635871058.908827][4273:4278] CHIP:IN: New secure session created for device 0x0000000000000001, key 47!!
@@ -174,7 +179,7 @@
 
 
           Below is the example when using chip tool as controller (considering 34921141778 as the manual code generated by DUT controller)
-          ./chip-tool pairing code 1 34921141778
+          ./chip-tool pairing code 2 34921141778
 
           verify you got the following message in the TH log
           CHIP:SC: PASESession timed out while waiting for a response from the peer. Expected message type was 33
@@ -189,7 +194,7 @@
 
           Below is the example while using chip tool as controller,
 
-          /chip-tool administratorcommissioning revoke-commissioning 2 0 --timedInteractionTimeoutMs 1000
+          /chip-tool administratorcommissioning revoke-commissioning 1 0 --timedInteractionTimeoutMs 1000
 
           CHIP:DMG: InvokeResponseMessage =
           [1650524034.111241][15422:15427] CHIP:DMG: {
@@ -300,7 +305,7 @@
 
 
           Below is the example when using chip tool as controller (considering 35256543344 as the manual code generated by DUT controller)
-          ./chip-tool pairing code 1 35256543344
+          ./chip-tool pairing code 2 35256543344
 
           Verify you got below message
           Device commissioning completed with success
@@ -313,7 +318,7 @@
 
 
           Below is the example when using chip tool as controller (considering 35256543344 as the manual code generated by DUT controller)
-          ./chip-tool pairing code 1 35256543344
+          ./chip-tool pairing code 3 35256543344
 
           verify you got the following message in the TH log
           CHIP:SC: PASESession timed out while waiting for a response from the peer. Expected message type was 33
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 d382c99..6ee77b6 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
@@ -26,9 +26,14 @@
     endpoint: 0
 
 tests:
-    - label: "Precondition: Reset DUT_CE to factory defaults"
+    - label: "Note"
       verification: |
-          verification step to be updated.
+          For DUT as comissioner  test cases, Chip-tool command used below are an example to verify the functionality. For certification test, we expect DUT should have a capability or way to run the equivalent command.
+      disabled: true
+
+    - label: "Precondition"
+      verification: |
+          Reset Devices to factory defaults
       disabled: true
 
     - label: "DUT_CR1 starts a commissioning process with TH_CE"
@@ -42,7 +47,7 @@
           commissioning timeout of PIXIT.CADMIN.CwDuration seconds using BCM"
       PICS: CADMIN.C.C01.Tx
       verification: |
-          On your DUT controller open commissioning widow using BCM.
+          On your 1st controller open commissioning widow using BCM.
 
           Below is the example while using chip tool as controller,
 
@@ -110,7 +115,7 @@
       verification: |
           On the 2nd controller using chip-tool , connect to the accessory
 
-          ./chip-tool pairing onnetwork 1 20202021
+          ./chip-tool pairing onnetwork 2 20202021
 
           verify you got the following message in the TH log
           CHIP:SC: PASESession timed out while waiting for a response from the peer. Expected message type was 33
@@ -210,7 +215,7 @@
       verification: |
           On the 2nd controller using chip-tool , connect to the accessory
 
-          ./chip-tool pairing onnetwork 1 20202021
+          ./chip-tool pairing onnetwork 2 20202021
 
           verify you got the following message in the TH log
           CHIP:SC: PASESession timed out while waiting for a response from the peer. Expected message type was 33
@@ -221,11 +226,11 @@
     - label: "DUT_CR1 sends command to TH_CE to revoke the commissioning window"
       PICS: CADMIN.C.C02.Tx
       verification: |
-          On your DUT controller revoke commissioning
+          On your 1st controller revoke commissioning
 
           Below is the example while using chip tool as controller,
 
-          /chip-tool administratorcommissioning revoke-commissioning 2 0 --timedInteractionTimeoutMs 1000
+          /chip-tool administratorcommissioning revoke-commissioning 1 0 --timedInteractionTimeoutMs 1000
 
           CHIP:DMG: InvokeResponseMessage =
           [1650524034.111241][15422:15427] CHIP:DMG: {
@@ -266,7 +271,7 @@
           Information Clusters NodeLabel mandatory attribute"
       PICS: BINFO.C.A0005
       verification: |
-          Using your DUT controller, write attribute and read attribute to and from TH_CE
+          Using 1st controller, write attribute and read attribute to and from TH_CE
 
           Below is the example while using chip tool on second controller,
           ./chip-tool basic write node-label te5new 2 0
@@ -310,7 +315,7 @@
           BCM"
       PICS: CADMIN.C.C01.Tx
       verification: |
-          On your DUT controller open commissioning widow using BCM.
+          On 1st controller open commissioning widow using BCM.
 
           Below is the example while using chip tool as controller,
 
@@ -356,7 +361,7 @@
       verification: |
           On the 2nd controller using chip-tool , connect to the accessory
 
-          ./chip-tool pairing onnetwork 1 20202021
+          ./chip-tool pairing onnetwork 2 20202021
 
           Verify you got below message
           Device commissioning completed with success
@@ -367,7 +372,7 @@
       verification: |
           On the 3rd controller using chip-tool , connect to the accessory
 
-          ./chip-tool pairing onnetwork 1 20202021
+          ./chip-tool pairing onnetwork 3 20202021
 
           verify you got the following message in the TH log
           CHIP:SC: PASESession timed out while waiting for a response from the peer. Expected message type was 33
diff --git a/src/app/tests/suites/certification/Test_TC_CNET_1_3.yaml b/src/app/tests/suites/certification/Test_TC_CNET_1_3.yaml
index 0362a31..e53ddab 100644
--- a/src/app/tests/suites/certification/Test_TC_CNET_1_3.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CNET_1_3.yaml
@@ -28,7 +28,7 @@
 tests:
     - label: "Commission TH and DUT over BLE to setup the Wi-Fi"
       verification: |
-          verification step to be updated.
+
       disabled: true
 
     - label: "TH reads the ClusterRevision from DUT"
@@ -50,6 +50,13 @@
 
           [1651215443.195852][3285:3290] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Attribute 0x0000_FFFC DataVersion: 2584224280
           [1651215443.195939][3285:3290] CHIP:TOO:   FeatureMap: 4
+
+          ./chip-tool networkcommissioning read feature-map 1 0
+
+          Verify "FeatureMap" on the TH(Chip-tool)  Log:
+
+          [1660315515.081759][32315:32320] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Attribute 0x0000_FFFC DataVersion: 4034679103
+          [1660315515.081895][32315:32320] CHIP:TOO:   FeatureMap: 4
       disabled: true
 
     - label: "TH reads AttributeList from DUT"
@@ -73,6 +80,27 @@
           [1651215479.539517][3293:3298] CHIP:TOO:     [11]: 65531
           [1651215479.539541][3293:3298] CHIP:TOO:     [12]: 65532
           [1651215479.539564][3293:3298] CHIP:TOO:     [13]: 65533
+
+
+          Ethernet:
+
+          ./chip-tool networkcommissioning read attribute-list 1 0
+
+          [1660315522.163640][32321:32326] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Attribute 0x0000_FFFB DataVersion: 4034679103
+          [1660315522.163797][32321:32326] CHIP:TOO:   AttributeList: 13 entries
+          [1660315522.163880][32321:32326] CHIP:TOO:     [1]: 0
+          [1660315522.163945][32321:32326] CHIP:TOO:     [2]: 1
+          [1660315522.164009][32321:32326] CHIP:TOO:     [3]: 2
+          [1660315522.164106][32321:32326] CHIP:TOO:     [4]: 3
+          [1660315522.164174][32321:32326] CHIP:TOO:     [5]: 4
+          [1660315522.164260][32321:32326] CHIP:TOO:     [6]: 5
+          [1660315522.164328][32321:32326] CHIP:TOO:     [7]: 6
+          [1660315522.164393][32321:32326] CHIP:TOO:     [8]: 7
+          [1660315522.164482][32321:32326] CHIP:TOO:     [9]: 65528
+          [1660315522.164549][32321:32326] CHIP:TOO:     [10]: 65529
+          [1660315522.164636][32321:32326] CHIP:TOO:     [11]: 65531
+          [1660315522.164708][32321:32326] CHIP:TOO:     [12]: 65532
+          [1660315522.164778][32321:32326] CHIP:TOO:     [13]: 65533
       disabled: true
 
     - label: "TH reads EventList from the DUT"
@@ -82,6 +110,7 @@
 
     - label: "TH reads AcceptedCommandList from DUT"
       verification: |
+          (WiFi)
           ./chip-tool networkcommissioning read accepted-command-list 1 0
 
           Verify "AcceptedCommandList" on the TH(Chip-tool)  Log:
@@ -94,11 +123,21 @@
           [1653909914.973289][3424:3429] CHIP:TOO:     [4]: 6
           [1653909914.973350][3424:3429] CHIP:TOO:     [5]: 8
           [1653909914.973574][3424:3429] CHIP:EM: Sending Standalone Ack for MessageCounter:4589161 on exchange 55554i
+
+
+          (Ethernet)
+          ./chip-tool networkcommissioning read accepted-command-list 1 0
+
+          Verify "AcceptedCommandList" on the TH(Chip-tool)  Log:
+
+          [1660315536.068512][32327:32332] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Attribute 0x0000_FFF9 DataVersion: 4034679103
+          [1660315536.068654][32327:32332] CHIP:TOO:   AcceptedCommandList: 0 entries
       disabled: true
 
     - label: "TH reads GeneratedCommandList from DUT"
       verification: |
-          ( WiFi) ./chip-tool networkcommissioning read generated-command-list 1 0
+          ( WiFi)
+          ./chip-tool networkcommissioning read generated-command-list 1 0
 
 
           Verify "GeneratedCommandList" on the TH(Chip-tool)  Log:
@@ -110,7 +149,8 @@
           [1650370123.418013][42418:42423] CHIP:TOO:     [3]: 7
           [1650370123.418143][42418:42423] CHIP:EM: Sending Standalone Ack for MessageCounter:759910 on exchange 25409i
 
-           ( Thread ) ./chip-tool networkcommissioning read generated-command-list 51 0
+           ( Thread )
+          ./chip-tool networkcommissioning read generated-command-list 51 0
 
 
           Verify "GeneratedCommandList" on the TH(Chip-tool)  Log:
@@ -121,6 +161,15 @@
           [1650370123.417977][42418:42423] CHIP:TOO:     [2]: 5
           [1650370123.418013][42418:42423] CHIP:TOO:     [3]: 7
           [1650370342.693995][7450:7455] CHIP:EM: Sending Standalone Ack for MessageCounter:2345375 on exchange 25146i
+
+
+          (Ethernet)
+          ./chip-tool networkcommissioning read generated-command-list 1 0
+
+          Verify "GeneratedCommandList" on the TH(Chip-tool)  Log:
+
+          [1660315548.937195][32333:32338] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0031 Attribute 0x0000_FFF8 DataVersion: 4034679103
+          [1660315548.937327][32333:32338] CHIP:TOO:   GeneratedCommandList: 0 entries
       disabled: true
 
     - label:
diff --git a/src/app/tests/suites/certification/Test_TC_DRLK_2_10.yaml b/src/app/tests/suites/certification/Test_TC_DRLK_2_10.yaml
index ac5748b..86a6beb 100644
--- a/src/app/tests/suites/certification/Test_TC_DRLK_2_10.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DRLK_2_10.yaml
@@ -25,6 +25,20 @@
     endpoint: 0
 
 tests:
+    - label: "Precondition"
+      verification: |
+          NOTE: https://github.com/project-chip/connectedhomeip/tree/master/examples/lock-app/linux#readme
+          Events to be executed as following
+          1. Compile app using below command in connectedhomeip folder
+          a. ./scripts/run_in_build_env.sh ./scripts/build/build_examples.py --target linux-arm64-all-clusters-no-ble-asan-clang build
+          b. ./scripts/run_in_build_env.sh ./scripts/build/build_examples.py --target linux-arm64-all-clusters-no-ble-asan-libfuzzer-clang build
+          2. Build respective app (lock-app)
+          3. Commission DUT to TH
+          4. Open 2nd terminal of DUT and provide the below command to obtain PID of DUT
+          ps  -aef|grep lock-app
+          5. Follow the Verification step below to generate the event in 2nd terminal of DUT
+      disabled: true
+
     - label:
           "Trigger the DUT to generate DoorLockAlarm Event (by LockJammed
           scenario)"
@@ -77,7 +91,20 @@
     - label: "TH reads the DoorStateChange event from DUT"
       PICS: DRLK.S.F05 && DRLK.S.E01
       verification: |
-          verification step to be updated.
+          To trigger the event give below command in another terminal of DUT
+          echo "{"Cmd": "SetDoorState", "Params": { "EndpointId": 1, "DoorState": 1 } }" > /tmp/chip_lock_app_fifo-4055    (4055 - value changes)
+
+          ./chip-tool doorlock read-event door-state-change 1 1
+
+          Verify "TH recieve the DoorLockAlaram event and DoorState set to DoorClosed " on the TH(Chip-tool) Log:
+
+          [1659521576.156075][4109:4114] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0101 Event 0x0000_0001
+          [1659521576.156118][4109:4114] CHIP:TOO:   Event number: 1
+          [1659521576.156150][4109:4114] CHIP:TOO:   Priority: Critical
+          [1659521576.156181][4109:4114] CHIP:TOO:   Timestamp: 23466089
+          [1659521576.156277][4109:4114] CHIP:TOO:   DoorStateChange: {
+          [1659521576.156331][4109:4114] CHIP:TOO:     DoorState: 1
+          [1659521576.156368][4109:4114] CHIP:TOO:    }
       disabled: true
 
     - label:
@@ -220,7 +247,7 @@
     - label:
           "TH sends the Lock Door command( using Remote) to the DUT with invalid
           PINCode"
-      PICS: DRLK.S.C01.Rsp
+      PICS: DRLK.S.C00.Rsp
       verification: |
           ./chip-tool doorlock lock-door 1 1 --timedInteractionTimeoutMs 1000 --PinCode 12345678
 
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 72cb314..c1e47b6 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
@@ -37,14 +37,20 @@
       response:
           saveAs: FeatureMapValue
 
-    - label:
-          "Read the FeatureMap value and verify LS is set to 1; MS, MSR, MSL,
-          MSM are all set to 0"
-      PICS: SWTCH.S.F00
-      command: "readAttribute"
-      attribute: "FeatureMap"
-      response:
-          value: FeatureMapValue
+    #bitwise check is not implemented in yaml framework
+    - label: "Check values of flags in this FeatureMap"
+      verification: |
+          LS is set to 1; MS, MSR, MSL,
+          MSM are all set to 0
+      cluster: "LogCommands"
+      command: "UserPrompt"
+      PICS: PICS_USER_PROMPT && SWTCH.S.F00
+      arguments:
+          values:
+              - name: "message"
+                value: "Please enter 'y' for success"
+              - name: "expectedValue"
+                value: "y"
 
     - label: "Check values of flags in this FeatureMap"
       verification: |
diff --git a/zzz_generated/chip-tool/zap-generated/test/Commands.h b/zzz_generated/chip-tool/zap-generated/test/Commands.h
index 28810d5..c76e7d2 100644
--- a/zzz_generated/chip-tool/zap-generated/test/Commands.h
+++ b/zzz_generated/chip-tool/zap-generated/test/Commands.h
@@ -30098,11 +30098,7 @@
             break;
         case 2:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            {
-                uint32_t value;
-                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
-                VerifyOrReturn(CheckValue("featureMap", value, FeatureMapValue));
-            }
+            shouldContinue = true;
             break;
         case 3:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
@@ -30207,10 +30203,14 @@
                                  chip::NullOptional);
         }
         case 2: {
-            LogStep(2, "Read the FeatureMap value and verify LS is set to 1; MS, MSR, MSL, MSM are all set to 0");
-            VerifyOrDo(!ShouldSkip("SWTCH.S.F00"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
-            return ReadAttribute(kIdentityAlpha, GetEndpoint(1), Switch::Id, Switch::Attributes::FeatureMap::Id, true,
-                                 chip::NullOptional);
+            LogStep(2, "Check values of flags in this FeatureMap");
+            VerifyOrDo(!ShouldSkip("PICS_USER_PROMPT && SWTCH.S.F00"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            ListFreer listFreer;
+            chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
+            value.message = chip::Span<const char>("Please enter 'y' for successgarbage: not in length on purpose", 28);
+            value.expectedValue.Emplace();
+            value.expectedValue.Value() = chip::Span<const char>("ygarbage: not in length on purpose", 1);
+            return UserPrompt(kIdentityAlpha, value);
         }
         case 3: {
             LogStep(3, "Check values of flags in this FeatureMap");
diff --git a/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h b/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h
index 9d64018..e24e40d 100644
--- a/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h
+++ b/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h
@@ -48991,13 +48991,12 @@
             err = TestReadTheGlobalAttributeFeatureMap_1();
             break;
         case 2:
-            ChipLogProgress(chipTool,
-                " ***** Test Step 2 : Read the FeatureMap value and verify LS is set to 1; MS, MSR, MSL, MSM are all set to 0\n");
-            if (ShouldSkip("SWTCH.S.F00")) {
+            ChipLogProgress(chipTool, " ***** Test Step 2 : Check values of flags in this FeatureMap\n");
+            if (ShouldSkip("PICS_USER_PROMPT && SWTCH.S.F00")) {
                 NextTest();
                 return;
             }
-            err = TestReadTheFeatureMapValueAndVerifyLsIsSetTo1MsMsrMslMsmAreAllSetTo0_2();
+            err = TestCheckValuesOfFlagsInThisFeatureMap_2();
             break;
         case 3:
             ChipLogProgress(chipTool, " ***** Test Step 3 : Check values of flags in this FeatureMap\n");
@@ -49155,26 +49154,13 @@
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadTheFeatureMapValueAndVerifyLsIsSetTo1MsMsrMslMsmAreAllSetTo0_2()
+    CHIP_ERROR TestCheckValuesOfFlagsInThisFeatureMap_2()
     {
-        MTRBaseDevice * device = GetDevice("alpha");
-        MTRBaseClusterSwitch * cluster = [[MTRBaseClusterSwitch alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster readAttributeFeatureMapWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read the FeatureMap value and verify LS is set to 1; MS, MSR, MSL, MSM are all set to 0 Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            {
-                id actualValue = value;
-                VerifyOrReturn(CheckValue("FeatureMap", actualValue, FeatureMapValue));
-            }
-
-            NextTest();
-        }];
-
-        return CHIP_NO_ERROR;
+        chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
+        value.message = chip::Span<const char>("Please enter 'y' for successgarbage: not in length on purpose", 28);
+        value.expectedValue.Emplace();
+        value.expectedValue.Value() = chip::Span<const char>("ygarbage: not in length on purpose", 1);
+        return UserPrompt("alpha", value);
     }
 
     CHIP_ERROR TestCheckValuesOfFlagsInThisFeatureMap_3()