diff --git a/src/app/tests/suites/OTA_SuccessfulTransfer.yaml b/src/app/tests/suites/OTA_SuccessfulTransfer.yaml
index ed31f4b232c93d..f5a0dcdf99d27b 100644
--- a/src/app/tests/suites/OTA_SuccessfulTransfer.yaml
+++ b/src/app/tests/suites/OTA_SuccessfulTransfer.yaml
@@ -147,13 +147,13 @@ tests:
       command: "AnnounceOTAProvider"
       arguments:
           values:
-              - name: "providerNodeId"
+              - name: "ProviderNodeID"
                 value: providerNodeId
-              - name: "vendorId"
+              - name: "VendorID"
                 value: 0
-              - name: "announcementReason"
+              - name: "AnnouncementReason"
                 value: 0
-              - name: "endpoint"
+              - name: "Endpoint"
                 value: endpoint
 
     - label: "Wait for transfer complete message"
diff --git a/src/app/tests/suites/TestGroupKeyManagementCluster.yaml b/src/app/tests/suites/TestGroupKeyManagementCluster.yaml
index 62fbfe4e1cb7c4..06bd25aff2bb69 100644
--- a/src/app/tests/suites/TestGroupKeyManagementCluster.yaml
+++ b/src/app/tests/suites/TestGroupKeyManagementCluster.yaml
@@ -192,13 +192,13 @@ tests:
                   {
                       FabricIndex: 1,
                       GroupId: 0x0101,
-                      endpoints: [1],
+                      Endpoints: [1],
                       GroupName: "Group #1",
                   },
                   {
                       FabricIndex: 1,
                       GroupId: 0x0102,
-                      endpoints: [1],
+                      Endpoints: [1],
                       GroupName: "Group #2",
                   },
               ]
@@ -264,7 +264,7 @@ tests:
                   {
                       FabricIndex: 1,
                       GroupId: 0x0102,
-                      endpoints: [1],
+                      Endpoints: [1],
                       GroupName: "Group #2",
                   },
               ]
diff --git a/src/app/tests/suites/TestGroupsCluster.yaml b/src/app/tests/suites/TestGroupsCluster.yaml
index f584899e9334ec..febb82c33978bb 100644
--- a/src/app/tests/suites/TestGroupsCluster.yaml
+++ b/src/app/tests/suites/TestGroupsCluster.yaml
@@ -66,7 +66,7 @@ tests:
           values:
               - name: "Status"
                 value: 0x7e
-              - name: "GroupId"
+              - name: "GroupID"
                 value: 0x0101
 
     - label: "Add KeySet"
diff --git a/src/app/tests/suites/certification/Test_TC_ALOGIN_12_1.yaml b/src/app/tests/suites/certification/Test_TC_ALOGIN_12_1.yaml
index c6b90fc870daa8..a8db9508dd8fe9 100644
--- a/src/app/tests/suites/certification/Test_TC_ALOGIN_12_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_ALOGIN_12_1.yaml
@@ -47,7 +47,7 @@ tests:
       command: "LaunchApp"
       arguments:
           values:
-              - name: "Data"
+              - name: "data"
                 value: "Hello World"
               - name: "application"
                 value:
diff --git a/src/app/tests/suites/certification/Test_TC_APPLAUNCHER_3_7.yaml b/src/app/tests/suites/certification/Test_TC_APPLAUNCHER_3_7.yaml
index 1510b9de204006..5e18ef884d3c9a 100644
--- a/src/app/tests/suites/certification/Test_TC_APPLAUNCHER_3_7.yaml
+++ b/src/app/tests/suites/certification/Test_TC_APPLAUNCHER_3_7.yaml
@@ -42,7 +42,7 @@ tests:
       command: "LaunchApp"
       arguments:
           values:
-              - name: "Data"
+              - name: "data"
                 value: "Hello World"
               - name: "application"
                 value:
diff --git a/src/app/tests/suites/certification/Test_TC_AUDIOOUTPUT_7_1.yaml b/src/app/tests/suites/certification/Test_TC_AUDIOOUTPUT_7_1.yaml
index 6d3044f51fab3a..691fd10ca024e1 100644
--- a/src/app/tests/suites/certification/Test_TC_AUDIOOUTPUT_7_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_AUDIOOUTPUT_7_1.yaml
@@ -47,7 +47,7 @@ tests:
       command: "SelectOutput"
       arguments:
           values:
-              - name: "Index"
+              - name: "index"
                 value: Index
 
     - label: "Reads the CurrentOutput attribute"
diff --git a/src/app/tests/suites/certification/Test_TC_AUDIOOUTPUT_7_2.yaml b/src/app/tests/suites/certification/Test_TC_AUDIOOUTPUT_7_2.yaml
index 9547f863dc1b23..e0f59224ecf2b9 100644
--- a/src/app/tests/suites/certification/Test_TC_AUDIOOUTPUT_7_2.yaml
+++ b/src/app/tests/suites/certification/Test_TC_AUDIOOUTPUT_7_2.yaml
@@ -48,7 +48,7 @@ tests:
       command: "RenameOutput"
       arguments:
           values:
-              - name: "Index"
+              - name: "index"
                 value: Index
               - name: "name"
                 value: "CertTest"
diff --git a/src/app/tests/suites/certification/Test_TC_CC_3_1.yaml b/src/app/tests/suites/certification/Test_TC_CC_3_1.yaml
index d4b0ace7db9465..c5ad970bce2728 100644
--- a/src/app/tests/suites/certification/Test_TC_CC_3_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CC_3_1.yaml
@@ -51,7 +51,7 @@ tests:
       command: "MoveToHue"
       arguments:
           values:
-              - name: "hue"
+              - name: "Hue"
                 value: 60
               - name: "Direction"
                 value: 0
@@ -77,7 +77,7 @@ tests:
       command: "MoveToHue"
       arguments:
           values:
-              - name: "hue"
+              - name: "Hue"
                 value: 120
               - name: "Direction"
                 value: 0
@@ -163,7 +163,7 @@ tests:
       command: "MoveToHue"
       arguments:
           values:
-              - name: "hue"
+              - name: "Hue"
                 value: 60
               - name: "Direction"
                 value: 0
@@ -189,7 +189,7 @@ tests:
       command: "MoveToHue"
       arguments:
           values:
-              - name: "hue"
+              - name: "Hue"
                 value: 135
               - name: "Direction"
                 value: 1
@@ -285,7 +285,7 @@ tests:
       command: "MoveToHue"
       arguments:
           values:
-              - name: "hue"
+              - name: "Hue"
                 value: 60
               - name: "Direction"
                 value: 0
@@ -311,7 +311,7 @@ tests:
       command: "MoveToHue"
       arguments:
           values:
-              - name: "hue"
+              - name: "Hue"
                 value: 120
               - name: "Direction"
                 value: 2
@@ -397,7 +397,7 @@ tests:
       command: "MoveToHue"
       arguments:
           values:
-              - name: "hue"
+              - name: "Hue"
                 value: 120
               - name: "Direction"
                 value: 0
@@ -423,7 +423,7 @@ tests:
       command: "MoveToHue"
       arguments:
           values:
-              - name: "hue"
+              - name: "Hue"
                 value: 60
               - name: "Direction"
                 value: 3
diff --git a/src/app/tests/suites/certification/Test_TC_CC_3_2.yaml b/src/app/tests/suites/certification/Test_TC_CC_3_2.yaml
index f9770b2d93da1c..16dd9f3d09732c 100644
--- a/src/app/tests/suites/certification/Test_TC_CC_3_2.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CC_3_2.yaml
@@ -50,7 +50,7 @@ tests:
       command: "MoveToHue"
       arguments:
           values:
-              - name: "hue"
+              - name: "Hue"
                 value: 200
               - name: "Direction"
                 value: 0
@@ -176,7 +176,7 @@ tests:
       command: "MoveToHue"
       arguments:
           values:
-              - name: "hue"
+              - name: "Hue"
                 value: 60
               - name: "Direction"
                 value: 0
diff --git a/src/app/tests/suites/certification/Test_TC_CC_3_3.yaml b/src/app/tests/suites/certification/Test_TC_CC_3_3.yaml
index a406e6fc231500..74afde00e35ec6 100644
--- a/src/app/tests/suites/certification/Test_TC_CC_3_3.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CC_3_3.yaml
@@ -50,7 +50,7 @@ tests:
       command: "MoveToHue"
       arguments:
           values:
-              - name: "hue"
+              - name: "Hue"
                 value: 200
               - name: "Direction"
                 value: 0
@@ -145,7 +145,7 @@ tests:
       command: "MoveToHue"
       arguments:
           values:
-              - name: "hue"
+              - name: "Hue"
                 value: 50
               - name: "Direction"
                 value: 0
diff --git a/src/app/tests/suites/certification/Test_TC_CC_4_4.yaml b/src/app/tests/suites/certification/Test_TC_CC_4_4.yaml
index 914fa9bac08d2a..29809391ec3cf4 100644
--- a/src/app/tests/suites/certification/Test_TC_CC_4_4.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CC_4_4.yaml
@@ -51,7 +51,7 @@ tests:
       command: "MoveToHueAndSaturation"
       arguments:
           values:
-              - name: "hue"
+              - name: "Hue"
                 value: 200
               - name: "Saturation"
                 value: 50
@@ -95,7 +95,7 @@ tests:
       command: "MoveToHueAndSaturation"
       arguments:
           values:
-              - name: "hue"
+              - name: "Hue"
                 value: 160
               - name: "Saturation"
                 value: 80
diff --git a/src/app/tests/suites/certification/Test_TC_CC_5_1.yaml b/src/app/tests/suites/certification/Test_TC_CC_5_1.yaml
index 6eedce3cf67666..abc8a4508f27a9 100644
--- a/src/app/tests/suites/certification/Test_TC_CC_5_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CC_5_1.yaml
@@ -50,9 +50,9 @@ tests:
       command: "MoveToColor"
       arguments:
           values:
-              - name: "colorX"
+              - name: "ColorX"
                 value: 32768
-              - name: "colorY"
+              - name: "ColorY"
                 value: 19660
               - name: "TransitionTime"
                 value: 0
@@ -94,9 +94,9 @@ tests:
       command: "MoveToColor"
       arguments:
           values:
-              - name: "colorX"
+              - name: "ColorX"
                 value: 13107
-              - name: "colorY"
+              - name: "ColorY"
                 value: 13107
               - name: "TransitionTime"
                 value: 200
@@ -210,9 +210,9 @@ tests:
       command: "MoveToColor"
       arguments:
           values:
-              - name: "colorX"
+              - name: "ColorX"
                 value: 32768
-              - name: "colorY"
+              - name: "ColorY"
                 value: 19660
               - name: "TransitionTime"
                 value: 0
@@ -259,9 +259,9 @@ tests:
       command: "MoveToColor"
       arguments:
           values:
-              - name: "colorX"
+              - name: "ColorX"
                 value: 13107
-              - name: "colorY"
+              - name: "ColorY"
                 value: 13107
               - name: "TransitionTime"
                 value: 0
@@ -299,9 +299,9 @@ tests:
       command: "MoveToColor"
       arguments:
           values:
-              - name: "colorX"
+              - name: "ColorX"
                 value: 13107
-              - name: "colorY"
+              - name: "ColorY"
                 value: 32768
               - name: "TransitionTime"
                 value: 0
@@ -339,9 +339,9 @@ tests:
       command: "MoveToColor"
       arguments:
           values:
-              - name: "colorX"
+              - name: "ColorX"
                 value: 26214
-              - name: "colorY"
+              - name: "ColorY"
                 value: 32768
               - name: "TransitionTime"
                 value: 0
@@ -402,9 +402,9 @@ tests:
       command: "MoveToColor"
       arguments:
           values:
-              - name: "colorX"
+              - name: "ColorX"
                 value: 32768
-              - name: "colorY"
+              - name: "ColorY"
                 value: 19660
               - name: "TransitionTime"
                 value: 0
@@ -451,9 +451,9 @@ tests:
       command: "MoveToColor"
       arguments:
           values:
-              - name: "colorX"
+              - name: "ColorX"
                 value: 13107
-              - name: "colorY"
+              - name: "ColorY"
                 value: 13107
               - name: "TransitionTime"
                 value: 0
@@ -495,9 +495,9 @@ tests:
       command: "MoveToColor"
       arguments:
           values:
-              - name: "colorX"
+              - name: "ColorX"
                 value: 13107
-              - name: "colorY"
+              - name: "ColorY"
                 value: 32768
               - name: "TransitionTime"
                 value: 0
@@ -535,9 +535,9 @@ tests:
       command: "MoveToColor"
       arguments:
           values:
-              - name: "colorX"
+              - name: "ColorX"
                 value: 26214
-              - name: "colorY"
+              - name: "ColorY"
                 value: 32768
               - name: "TransitionTime"
                 value: 0
diff --git a/src/app/tests/suites/certification/Test_TC_CC_5_2.yaml b/src/app/tests/suites/certification/Test_TC_CC_5_2.yaml
index 0a63b4bbb8ad15..51b60061c71d46 100644
--- a/src/app/tests/suites/certification/Test_TC_CC_5_2.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CC_5_2.yaml
@@ -50,9 +50,9 @@ tests:
       command: "MoveToColor"
       arguments:
           values:
-              - name: "colorX"
+              - name: "ColorX"
                 value: 33000
-              - name: "colorY"
+              - name: "ColorY"
                 value: 26000
               - name: "TransitionTime"
                 value: 0
@@ -74,9 +74,9 @@ tests:
       PICS: CC.S.F03 && CC.S.C08.Rsp
       arguments:
           values:
-              - name: "rateX"
+              - name: "RateX"
                 value: -100
-              - name: "rateY"
+              - name: "RateY"
                 value: 100
               - name: "OptionsMask"
                 value: 0
diff --git a/src/app/tests/suites/certification/Test_TC_CC_5_3.yaml b/src/app/tests/suites/certification/Test_TC_CC_5_3.yaml
index 24689e34e6b867..ada4e0f55a6a1f 100644
--- a/src/app/tests/suites/certification/Test_TC_CC_5_3.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CC_5_3.yaml
@@ -50,9 +50,9 @@ tests:
       command: "MoveToColor"
       arguments:
           values:
-              - name: "colorX"
+              - name: "ColorX"
                 value: 33000
-              - name: "colorY"
+              - name: "ColorY"
                 value: 20000
               - name: "TransitionTime"
                 value: 0
@@ -76,9 +76,9 @@ tests:
       PICS: CC.S.F03 && CC.S.C09.Rsp
       arguments:
           values:
-              - name: "stepX"
+              - name: "StepX"
                 value: -20000
-              - name: "stepY"
+              - name: "StepY"
                 value: -6000
               - name: "TransitionTime"
                 value: 200
diff --git a/src/app/tests/suites/certification/Test_TC_CC_8_1.yaml b/src/app/tests/suites/certification/Test_TC_CC_8_1.yaml
index a677f82742c9be..51b3f1c6e32ef6 100644
--- a/src/app/tests/suites/certification/Test_TC_CC_8_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CC_8_1.yaml
@@ -50,7 +50,7 @@ tests:
       command: "MoveToHue"
       arguments:
           values:
-              - name: "hue"
+              - name: "Hue"
                 value: 200
               - name: "Direction"
                 value: 0
diff --git a/src/app/tests/suites/certification/Test_TC_CC_9_1.yaml b/src/app/tests/suites/certification/Test_TC_CC_9_1.yaml
index 100282fa8ca82c..0427e68a24888f 100644
--- a/src/app/tests/suites/certification/Test_TC_CC_9_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CC_9_1.yaml
@@ -51,15 +51,15 @@ tests:
       PICS: CC.S.F02 && CC.S.F01 && CC.S.C40.Rsp
       arguments:
           values:
-              - name: "enhancedHue"
+              - name: "EnhancedHue"
                 value: 16384
-              - name: "direction"
+              - name: "Direction"
                 value: 0
-              - name: "transitionTime"
+              - name: "TransitionTime"
                 value: 0
-              - name: "optionsMask"
+              - name: "OptionsMask"
                 value: 0
-              - name: "optionsOverride"
+              - name: "OptionsOverride"
                 value: 0
 
     - label: "Wait for 1000ms"
@@ -77,19 +77,19 @@ tests:
       PICS: CC.S.F02 && CC.S.F01 && CC.S.C44.Rsp
       arguments:
           values:
-              - name: "updateFlags"
+              - name: "UpdateFlags"
                 value: 1
-              - name: "action"
+              - name: "Action"
                 value: 0
-              - name: "direction"
+              - name: "Direction"
                 value: 0
-              - name: "time"
+              - name: "Time"
                 value: 0
-              - name: "startHue"
+              - name: "StartHue"
                 value: 0
-              - name: "optionsMask"
+              - name: "OptionsMask"
                 value: 0
-              - name: "optionsOverride"
+              - name: "OptionsOverride"
                 value: 0
 
     - label: "Read ColorLoopActive attribute from DUT"
@@ -107,19 +107,19 @@ tests:
       PICS: CC.S.F02 && CC.S.F01 && CC.S.C44.Rsp
       arguments:
           values:
-              - name: "updateFlags"
+              - name: "UpdateFlags"
                 value: 2
-              - name: "action"
+              - name: "Action"
                 value: 0
-              - name: "direction"
+              - name: "Direction"
                 value: 0
-              - name: "time"
+              - name: "Time"
                 value: 0
-              - name: "startHue"
+              - name: "StartHue"
                 value: 0
-              - name: "optionsMask"
+              - name: "OptionsMask"
                 value: 0
-              - name: "optionsOverride"
+              - name: "OptionsOverride"
                 value: 0
 
     - label: "Read ColorLoopDirection attribute from DUT"
@@ -136,19 +136,19 @@ tests:
       PICS: CC.S.F02 && CC.S.F01 && CC.S.C44.Rsp
       arguments:
           values:
-              - name: "updateFlags"
+              - name: "UpdateFlags"
                 value: 4
-              - name: "action"
+              - name: "Action"
                 value: 0
-              - name: "direction"
+              - name: "Direction"
                 value: 0
-              - name: "time"
+              - name: "Time"
                 value: 30
-              - name: "startHue"
+              - name: "StartHue"
                 value: 0
-              - name: "optionsMask"
+              - name: "OptionsMask"
                 value: 0
-              - name: "optionsOverride"
+              - name: "OptionsOverride"
                 value: 0
 
     - label: "Read ColorLoopTime attribute from DUT"
@@ -165,19 +165,19 @@ tests:
       PICS: CC.S.F02 && CC.S.F01 && CC.S.C44.Rsp
       arguments:
           values:
-              - name: "updateFlags"
+              - name: "UpdateFlags"
                 value: 8
-              - name: "action"
+              - name: "Action"
                 value: 0
-              - name: "direction"
+              - name: "Direction"
                 value: 0
-              - name: "time"
+              - name: "Time"
                 value: 0
-              - name: "startHue"
+              - name: "StartHue"
                 value: 160
-              - name: "optionsMask"
+              - name: "OptionsMask"
                 value: 0
-              - name: "optionsOverride"
+              - name: "OptionsOverride"
                 value: 0
 
     - label: "Read ColorLoopStartEnhancedHue attribute from DUT"
@@ -195,19 +195,19 @@ tests:
       PICS: CC.S.F02 && CC.S.F01 && CC.S.C44.Rsp
       arguments:
           values:
-              - name: "updateFlags"
+              - name: "UpdateFlags"
                 value: 1
-              - name: "action"
+              - name: "Action"
                 value: 1
-              - name: "direction"
+              - name: "Direction"
                 value: 0
-              - name: "time"
+              - name: "Time"
                 value: 0
-              - name: "startHue"
+              - name: "StartHue"
                 value: 0
-              - name: "optionsMask"
+              - name: "OptionsMask"
                 value: 0
-              - name: "optionsOverride"
+              - name: "OptionsOverride"
                 value: 0
 
     - label: "Read ColorLoopActive attribute from DUT"
@@ -276,19 +276,19 @@ tests:
       PICS: CC.S.F02 && CC.S.F01 && CC.S.C44.Rsp
       arguments:
           values:
-              - name: "updateFlags"
+              - name: "UpdateFlags"
                 value: 1
-              - name: "action"
+              - name: "Action"
                 value: 0
-              - name: "direction"
+              - name: "Direction"
                 value: 0
-              - name: "time"
+              - name: "Time"
                 value: 0
-              - name: "startHue"
+              - name: "StartHue"
                 value: 0
-              - name: "optionsMask"
+              - name: "OptionsMask"
                 value: 0
-              - name: "optionsOverride"
+              - name: "OptionsOverride"
                 value: 0
 
     - label: "Read ColorLoopActive attribute from DUT"
@@ -322,19 +322,19 @@ tests:
       PICS: CC.S.F02 && CC.S.F01 && CC.S.C44.Rsp
       arguments:
           values:
-              - name: "updateFlags"
+              - name: "UpdateFlags"
                 value: 2
-              - name: "action"
+              - name: "Action"
                 value: 0
-              - name: "direction"
+              - name: "Direction"
                 value: 1
-              - name: "time"
+              - name: "Time"
                 value: 0
-              - name: "startHue"
+              - name: "StartHue"
                 value: 0
-              - name: "optionsMask"
+              - name: "OptionsMask"
                 value: 0
-              - name: "optionsOverride"
+              - name: "OptionsOverride"
                 value: 0
 
     - label: "Read ColorLoopDirection attribute from DUT"
@@ -352,19 +352,19 @@ tests:
       PICS: CC.S.F02 && CC.S.F01 && CC.S.C44.Rsp
       arguments:
           values:
-              - name: "updateFlags"
+              - name: "UpdateFlags"
                 value: 1
-              - name: "action"
+              - name: "Action"
                 value: 1
-              - name: "direction"
+              - name: "Direction"
                 value: 0
-              - name: "time"
+              - name: "Time"
                 value: 0
-              - name: "startHue"
+              - name: "StartHue"
                 value: 0
-              - name: "optionsMask"
+              - name: "OptionsMask"
                 value: 0
-              - name: "optionsOverride"
+              - name: "OptionsOverride"
                 value: 0
 
     - label: "Read ColorLoopActive attribute from DUT"
@@ -433,19 +433,19 @@ tests:
       PICS: CC.S.F02 && CC.S.F01 && CC.S.C44.Rsp
       arguments:
           values:
-              - name: "updateFlags"
+              - name: "UpdateFlags"
                 value: 1
-              - name: "action"
+              - name: "Action"
                 value: 0
-              - name: "direction"
+              - name: "Direction"
                 value: 0
-              - name: "time"
+              - name: "Time"
                 value: 0
-              - name: "startHue"
+              - name: "StartHue"
                 value: 0
-              - name: "optionsMask"
+              - name: "OptionsMask"
                 value: 0
-              - name: "optionsOverride"
+              - name: "OptionsOverride"
                 value: 0
 
     - label: "Read ColorLoopActive attribute from DUT"
@@ -478,15 +478,15 @@ tests:
       PICS: CC.S.F02 && CC.S.F01 && CC.S.C40.Rsp
       arguments:
           values:
-              - name: "enhancedHue"
+              - name: "EnhancedHue"
                 value: 16384
-              - name: "direction"
+              - name: "Direction"
                 value: 0
-              - name: "transitionTime"
+              - name: "TransitionTime"
                 value: 0
-              - name: "optionsMask"
+              - name: "OptionsMask"
                 value: 0
-              - name: "optionsOverride"
+              - name: "OptionsOverride"
                 value: 0
 
     - label: "Wait 1000ms"
@@ -512,19 +512,19 @@ tests:
       PICS: CC.S.F02 && CC.S.F01 && CC.S.C44.Rsp
       arguments:
           values:
-              - name: "updateFlags"
+              - name: "UpdateFlags"
                 value: 2
-              - name: "action"
+              - name: "Action"
                 value: 0
-              - name: "direction"
+              - name: "Direction"
                 value: 0
-              - name: "time"
+              - name: "Time"
                 value: 0
-              - name: "startHue"
+              - name: "StartHue"
                 value: 0
-              - name: "optionsMask"
+              - name: "OptionsMask"
                 value: 0
-              - name: "optionsOverride"
+              - name: "OptionsOverride"
                 value: 0
 
     - label: "Read ColorLoopDirection attribute from DUT"
@@ -542,19 +542,19 @@ tests:
       PICS: CC.S.F02 && CC.S.F01 && CC.S.C44.Rsp
       arguments:
           values:
-              - name: "updateFlags"
+              - name: "UpdateFlags"
                 value: 1
-              - name: "action"
+              - name: "Action"
                 value: 2
-              - name: "direction"
+              - name: "Direction"
                 value: 0
-              - name: "time"
+              - name: "Time"
                 value: 0
-              - name: "startHue"
+              - name: "StartHue"
                 value: 0
-              - name: "optionsMask"
+              - name: "OptionsMask"
                 value: 0
-              - name: "optionsOverride"
+              - name: "OptionsOverride"
                 value: 0
 
     - label: "Read ColorLoopActive attribute from DUT"
@@ -623,19 +623,19 @@ tests:
       PICS: CC.S.F02 && CC.S.F01 && CC.S.C44.Rsp
       arguments:
           values:
-              - name: "updateFlags"
+              - name: "UpdateFlags"
                 value: 1
-              - name: "action"
+              - name: "Action"
                 value: 0
-              - name: "direction"
+              - name: "Direction"
                 value: 0
-              - name: "time"
+              - name: "Time"
                 value: 0
-              - name: "startHue"
+              - name: "StartHue"
                 value: 0
-              - name: "optionsMask"
+              - name: "OptionsMask"
                 value: 0
-              - name: "optionsOverride"
+              - name: "OptionsOverride"
                 value: 0
 
     - label: "Read ColorLoopActive attribute from DUT"
@@ -669,19 +669,19 @@ tests:
       PICS: CC.S.F02 && CC.S.F01 && CC.S.C44.Rsp
       arguments:
           values:
-              - name: "updateFlags"
+              - name: "UpdateFlags"
                 value: 2
-              - name: "action"
+              - name: "Action"
                 value: 0
-              - name: "direction"
+              - name: "Direction"
                 value: 1
-              - name: "time"
+              - name: "Time"
                 value: 0
-              - name: "startHue"
+              - name: "StartHue"
                 value: 0
-              - name: "optionsMask"
+              - name: "OptionsMask"
                 value: 0
-              - name: "optionsOverride"
+              - name: "OptionsOverride"
                 value: 0
 
     - label: "Read ColorLoopDirection attribute from DUT"
@@ -699,19 +699,19 @@ tests:
       PICS: CC.S.F02 && CC.S.F01 && CC.S.C44.Rsp
       arguments:
           values:
-              - name: "updateFlags"
+              - name: "UpdateFlags"
                 value: 1
-              - name: "action"
+              - name: "Action"
                 value: 2
-              - name: "direction"
+              - name: "Direction"
                 value: 0
-              - name: "time"
+              - name: "Time"
                 value: 0
-              - name: "startHue"
+              - name: "StartHue"
                 value: 0
-              - name: "optionsMask"
+              - name: "OptionsMask"
                 value: 0
-              - name: "optionsOverride"
+              - name: "OptionsOverride"
                 value: 0
 
     - label: "Read ColorLoopActive attribute from DUT"
@@ -780,19 +780,19 @@ tests:
       PICS: CC.S.F02 && CC.S.F01 && CC.S.C44.Rsp
       arguments:
           values:
-              - name: "updateFlags"
+              - name: "UpdateFlags"
                 value: 1
-              - name: "action"
+              - name: "Action"
                 value: 0
-              - name: "direction"
+              - name: "Direction"
                 value: 0
-              - name: "time"
+              - name: "Time"
                 value: 0
-              - name: "startHue"
+              - name: "StartHue"
                 value: 0
-              - name: "optionsMask"
+              - name: "OptionsMask"
                 value: 0
-              - name: "optionsOverride"
+              - name: "OptionsOverride"
                 value: 0
 
     - label: "Read ColorLoopActive attribute from DUT"
diff --git a/src/app/tests/suites/certification/Test_TC_CC_9_2.yaml b/src/app/tests/suites/certification/Test_TC_CC_9_2.yaml
index d1888a163da632..1614c98baee0cd 100644
--- a/src/app/tests/suites/certification/Test_TC_CC_9_2.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CC_9_2.yaml
@@ -52,15 +52,15 @@ tests:
       PICS: CC.S.F01 && CC.S.F02 && CC.S.C40.Rsp
       arguments:
           values:
-              - name: "enhancedHue"
+              - name: "EnhancedHue"
                 value: 16384
-              - name: "direction"
+              - name: "Direction"
                 value: 0
-              - name: "transitionTime"
+              - name: "TransitionTime"
                 value: 0
-              - name: "optionsMask"
+              - name: "OptionsMask"
                 value: 0
-              - name: "optionsOverride"
+              - name: "OptionsOverride"
                 value: 0
 
     - label: "Wait for 1000ms"
@@ -80,19 +80,19 @@ tests:
       PICS: CC.S.F01 && CC.S.F02 && CC.S.C44.Rsp
       arguments:
           values:
-              - name: "updateFlags"
+              - name: "UpdateFlags"
                 value: 15
-              - name: "action"
+              - name: "Action"
                 value: 0
-              - name: "direction"
+              - name: "Direction"
                 value: 0
-              - name: "time"
+              - name: "Time"
                 value: 30
-              - name: "startHue"
+              - name: "StartHue"
                 value: 160
-              - name: "optionsMask"
+              - name: "OptionsMask"
                 value: 0
-              - name: "optionsOverride"
+              - name: "OptionsOverride"
                 value: 0
 
     - label: "Read ColorLoopActive attribute from DUT"
@@ -131,19 +131,19 @@ tests:
       PICS: CC.S.F01 && CC.S.F02 && CC.S.C44.Rsp
       arguments:
           values:
-              - name: "updateFlags"
+              - name: "UpdateFlags"
                 value: 1
-              - name: "action"
+              - name: "Action"
                 value: 1
-              - name: "direction"
+              - name: "Direction"
                 value: 0
-              - name: "time"
+              - name: "Time"
                 value: 0
-              - name: "startHue"
+              - name: "StartHue"
                 value: 0
-              - name: "optionsMask"
+              - name: "OptionsMask"
                 value: 0
-              - name: "optionsOverride"
+              - name: "OptionsOverride"
                 value: 0
 
     - label: "Read ColorLoopActive attribute from DUT."
@@ -213,19 +213,19 @@ tests:
       PICS: CC.S.F01 && CC.S.F02 && CC.S.C44.Rsp
       arguments:
           values:
-              - name: "updateFlags"
+              - name: "UpdateFlags"
                 value: 2
-              - name: "action"
+              - name: "Action"
                 value: 0
-              - name: "direction"
+              - name: "Direction"
                 value: 1
-              - name: "time"
+              - name: "Time"
                 value: 0
-              - name: "startHue"
+              - name: "StartHue"
                 value: 0
-              - name: "optionsMask"
+              - name: "OptionsMask"
                 value: 0
-              - name: "optionsOverride"
+              - name: "OptionsOverride"
                 value: 0
 
     - label: "Read ColorLoopDirection attribute from DUT."
@@ -287,19 +287,19 @@ tests:
       PICS: CC.S.F01 && CC.S.F02 && CC.S.C44.Rsp
       arguments:
           values:
-              - name: "updateFlags"
+              - name: "UpdateFlags"
                 value: 1
-              - name: "action"
+              - name: "Action"
                 value: 0
-              - name: "direction"
+              - name: "Direction"
                 value: 0
-              - name: "time"
+              - name: "Time"
                 value: 0
-              - name: "startHue"
+              - name: "StartHue"
                 value: 0
-              - name: "optionsMask"
+              - name: "OptionsMask"
                 value: 0
-              - name: "optionsOverride"
+              - name: "OptionsOverride"
                 value: 0
 
     - label: "Read ColorLoopActive attribute from DUT"
diff --git a/src/app/tests/suites/certification/Test_TC_CC_9_3.yaml b/src/app/tests/suites/certification/Test_TC_CC_9_3.yaml
index 94ce6ce1962e50..9a28cd2b3b60f8 100644
--- a/src/app/tests/suites/certification/Test_TC_CC_9_3.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CC_9_3.yaml
@@ -51,15 +51,15 @@ tests:
       PICS: CC.S.F01 && CC.S.F02 && CC.S.C40.Rsp
       arguments:
           values:
-              - name: "enhancedHue"
+              - name: "EnhancedHue"
                 value: 16384
-              - name: "direction"
+              - name: "Direction"
                 value: 0
-              - name: "transitionTime"
+              - name: "TransitionTime"
                 value: 0
-              - name: "optionsMask"
+              - name: "OptionsMask"
                 value: 0
-              - name: "optionsOverride"
+              - name: "OptionsOverride"
                 value: 0
 
     - label: "Wait for 1000ms"
@@ -79,19 +79,19 @@ tests:
       PICS: CC.S.F01 && CC.S.F02 && CC.S.C44.Rsp
       arguments:
           values:
-              - name: "updateFlags"
+              - name: "UpdateFlags"
                 value: 15
-              - name: "action"
+              - name: "Action"
                 value: 0
-              - name: "direction"
+              - name: "Direction"
                 value: 0
-              - name: "time"
+              - name: "Time"
                 value: 30
-              - name: "startHue"
+              - name: "StartHue"
                 value: 160
-              - name: "optionsMask"
+              - name: "OptionsMask"
                 value: 0
-              - name: "optionsOverride"
+              - name: "OptionsOverride"
                 value: 0
 
     - label: "Read ColorLoopActive attribute from DUT"
@@ -130,19 +130,19 @@ tests:
       PICS: CC.S.F01 && CC.S.F02 && CC.S.C44.Rsp
       arguments:
           values:
-              - name: "updateFlags"
+              - name: "UpdateFlags"
                 value: 1
-              - name: "action"
+              - name: "Action"
                 value: 1
-              - name: "direction"
+              - name: "Direction"
                 value: 0
-              - name: "time"
+              - name: "Time"
                 value: 0
-              - name: "startHue"
+              - name: "StartHue"
                 value: 0
-              - name: "optionsMask"
+              - name: "OptionsMask"
                 value: 0
-              - name: "optionsOverride"
+              - name: "OptionsOverride"
                 value: 0
 
     - label: "Read ColorLoopActive attribute from DUT."
@@ -211,19 +211,19 @@ tests:
       PICS: CC.S.F01 && CC.S.F02 && CC.S.C44.Rsp
       arguments:
           values:
-              - name: "updateFlags"
+              - name: "UpdateFlags"
                 value: 4
-              - name: "action"
+              - name: "Action"
                 value: 0
-              - name: "direction"
+              - name: "Direction"
                 value: 0
-              - name: "time"
+              - name: "Time"
                 value: 60
-              - name: "startHue"
+              - name: "StartHue"
                 value: 0
-              - name: "optionsMask"
+              - name: "OptionsMask"
                 value: 0
-              - name: "optionsOverride"
+              - name: "OptionsOverride"
                 value: 0
 
     - label: "Read ColorLoopTime attribute from DUT."
@@ -276,19 +276,19 @@ tests:
       PICS: CC.S.F01 && CC.S.F02 && CC.S.C44.Rsp
       arguments:
           values:
-              - name: "updateFlags"
+              - name: "UpdateFlags"
                 value: 1
-              - name: "action"
+              - name: "Action"
                 value: 0
-              - name: "direction"
+              - name: "Direction"
                 value: 0
-              - name: "time"
+              - name: "Time"
                 value: 0
-              - name: "startHue"
+              - name: "StartHue"
                 value: 0
-              - name: "optionsMask"
+              - name: "OptionsMask"
                 value: 0
-              - name: "optionsOverride"
+              - name: "OptionsOverride"
                 value: 0
 
     - label: "Read ColorLoopActive attribute from DUT"
diff --git a/src/app/tests/suites/certification/Test_TC_CHANNEL_5_3.yaml b/src/app/tests/suites/certification/Test_TC_CHANNEL_5_3.yaml
index 72638ed2ae2112..dacacde2c201a4 100644
--- a/src/app/tests/suites/certification/Test_TC_CHANNEL_5_3.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CHANNEL_5_3.yaml
@@ -66,7 +66,7 @@ tests:
       command: "SkipChannel"
       arguments:
           values:
-              - name: "Count"
+              - name: "count"
                 value: 1
 
     - label: "Verify that the channel has changed on the device"
diff --git a/src/app/tests/suites/certification/Test_TC_DRLK_2_2.yaml b/src/app/tests/suites/certification/Test_TC_DRLK_2_2.yaml
index c59b668ce7a216..cac3d69b4898b8 100644
--- a/src/app/tests/suites/certification/Test_TC_DRLK_2_2.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DRLK_2_2.yaml
@@ -227,9 +227,10 @@ tests:
       PICS: DRLK.S.A0030
       command: "readAttribute"
       attribute: "WrongCodeEntryLimit"
-      constraints:
-          minValue: 1
-          maxValue: 255
+      response:
+          constraints:
+              minValue: 1
+              maxValue: 255
 
     #currently for loop is not implemented in yaml framework so converted this step as user prompt
     - label:
@@ -370,9 +371,10 @@ tests:
       PICS: DRLK.S.A0031
       command: "readAttribute"
       attribute: "UserCodeTemporaryDisableTime"
-      constraints:
-          minValue: 1
-          maxValue: 255
+      response:
+          constraints:
+              minValue: 1
+              maxValue: 255
 
     - label:
           "TH writes UserCodeTemporaryDisableTime attribute value as between 1
diff --git a/src/app/tests/suites/certification/Test_TC_DRLK_2_3.yaml b/src/app/tests/suites/certification/Test_TC_DRLK_2_3.yaml
index 5a0c4e3546e357..0073ab9afecac8 100644
--- a/src/app/tests/suites/certification/Test_TC_DRLK_2_3.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DRLK_2_3.yaml
@@ -166,7 +166,7 @@ tests:
       timedInteractionTimeoutMs: 1000
       arguments:
           values:
-              - name: "PINCode"
+              - name: "pinCode"
                 value: "123456"
 
     - label:
@@ -202,7 +202,7 @@ tests:
       timedInteractionTimeoutMs: 1000
       arguments:
           values:
-              - name: "PINCode"
+              - name: "pinCode"
                 value: "123456"
 
     - label: "TH sends the unlock Door command to the DUT with invalid PINCode"
@@ -211,7 +211,7 @@ tests:
       timedInteractionTimeoutMs: 1000
       arguments:
           values:
-              - name: "PINCode"
+              - name: "pinCode"
                 value: "1234568"
       response:
           error: FAILURE
@@ -269,7 +269,7 @@ tests:
       timedInteractionTimeoutMs: 1000
       arguments:
           values:
-              - name: "PINCode"
+              - name: "pinCode"
                 value: "1234568"
       response:
           error: FAILURE
@@ -280,7 +280,7 @@ tests:
       timedInteractionTimeoutMs: 1000
       arguments:
           values:
-              - name: "PINCode"
+              - name: "pinCode"
                 value: "1234568"
       response:
           error: FAILURE
@@ -291,7 +291,7 @@ tests:
       timedInteractionTimeoutMs: 1000
       arguments:
           values:
-              - name: "PINCode"
+              - name: "pinCode"
                 value: "1234568"
       response:
           error: FAILURE
@@ -302,7 +302,7 @@ tests:
       timedInteractionTimeoutMs: 1000
       arguments:
           values:
-              - name: "PINCode"
+              - name: "pinCode"
                 value: "1234568"
       response:
           error: FAILURE
@@ -322,7 +322,7 @@ tests:
       timedInteractionTimeoutMs: 1000
       arguments:
           values:
-              - name: "PINCode"
+              - name: "pinCode"
                 value: "123456"
       response:
           error: FAILURE
diff --git a/src/app/tests/suites/certification/Test_TC_DRLK_2_4.yaml b/src/app/tests/suites/certification/Test_TC_DRLK_2_4.yaml
index 30018a13b37fc9..a82baf96777ec5 100644
--- a/src/app/tests/suites/certification/Test_TC_DRLK_2_4.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DRLK_2_4.yaml
@@ -149,9 +149,9 @@ tests:
       timedInteractionTimeoutMs: 1000
       arguments:
           values:
-              - name: "Timeout"
+              - name: "timeout"
                 value: 60
-              - name: "PINCode"
+              - name: "pinCode"
                 value: "123456"
 
     - label: "Wait 60s"
diff --git a/src/app/tests/suites/certification/Test_TC_DRLK_2_7.yaml b/src/app/tests/suites/certification/Test_TC_DRLK_2_7.yaml
index 827250803f92b4..90f5032b05eafb 100644
--- a/src/app/tests/suites/certification/Test_TC_DRLK_2_7.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DRLK_2_7.yaml
@@ -108,13 +108,13 @@ tests:
       command: "SetYearDaySchedule"
       arguments:
           values:
-              - name: "YearDayIndex"
+              - name: "yearDayIndex"
                 value: 1
               - name: "userIndex"
                 value: 1
-              - name: "LocalStartTime"
+              - name: "localStartTime"
                 value: 960
-              - name: "LocalEndTime"
+              - name: "localEndTime"
                 value: 1980
 
     #issue #18591
@@ -123,21 +123,21 @@ tests:
       command: "GetYearDaySchedule"
       arguments:
           values:
-              - name: "YearDayIndex"
+              - name: "yearDayIndex"
                 value: 1
               - name: "userIndex"
                 value: 1
       response:
           values:
-              - name: "YearDayIndex"
+              - name: "yearDayIndex"
                 value: 1
               - name: "userIndex"
                 value: 1
               - name: "status"
                 value: 0x0
-              - name: "LocalStartTime"
+              - name: "localStartTime"
                 value: 960
-              - name: "LocalEndTime"
+              - name: "localEndTime"
                 value: 1980
                 constraints:
                     minValue: 961
@@ -147,13 +147,13 @@ tests:
       command: "SetYearDaySchedule"
       arguments:
           values:
-              - name: "YearDayIndex"
+              - name: "yearDayIndex"
                 value: 0
               - name: "userIndex"
                 value: 15
-              - name: "LocalStartTime"
+              - name: "localStartTime"
                 value: 1020
-              - name: "LocalEndTime"
+              - name: "localEndTime"
                 value: 2040
       response:
           error: INVALID_COMMAND
@@ -163,22 +163,22 @@ tests:
       command: "GetYearDaySchedule"
       arguments:
           values:
-              - name: "YearDayIndex"
+              - name: "yearDayIndex"
                 value: 0
               - name: "userIndex"
                 value: 15
       response:
           values:
-              - name: "YearDayIndex"
+              - name: "yearDayIndex"
                 value: 0
               - name: "userIndex"
                 value: 15
               - name: "status"
                 value: 0x85
-              - name: "LocalStartTime"
+              - name: "localStartTime"
                 constraints:
                     hasValue: false
-              - name: "LocalEndTime"
+              - name: "localEndTime"
                 constraints:
                     hasValue: false
 
@@ -207,22 +207,22 @@ tests:
       command: "GetYearDaySchedule"
       arguments:
           values:
-              - name: "YearDayIndex"
+              - name: "yearDayIndex"
                 value: NumberOfYearDaySchedulesSupportedPerUser
               - name: "userIndex"
                 value: 5
       response:
           values:
-              - name: "YearDayIndex"
+              - name: "yearDayIndex"
                 value: NumberOfYearDaySchedulesSupportedPerUser
               - name: "userIndex"
                 value: 5
               - name: "status"
                 value: 0x8B
-              - name: "LocalStartTime"
+              - name: "localStartTime"
                 constraints:
                     hasValue: false
-              - name: "LocalEndTime"
+              - name: "localEndTime"
                 constraints:
                     hasValue: false
 
@@ -241,22 +241,22 @@ tests:
       command: "GetYearDaySchedule"
       arguments:
           values:
-              - name: "YearDayIndex"
+              - name: "yearDayIndex"
                 value: 1
               - name: "userIndex"
                 value: 1
       response:
           values:
-              - name: "YearDayIndex"
+              - name: "yearDayIndex"
                 value: 1
               - name: "userIndex"
                 value: 1
               - name: "status"
                 value: 0x8B
-              - name: "LocalStartTime"
+              - name: "localStartTime"
                 constraints:
                     hasValue: false
-              - name: "LocalEndTime"
+              - name: "localEndTime"
                 constraints:
                     hasValue: false
 
@@ -265,13 +265,13 @@ tests:
       command: "SetYearDaySchedule"
       arguments:
           values:
-              - name: "YearDayIndex"
+              - name: "yearDayIndex"
                 value: 1
               - name: "userIndex"
                 value: 1
-              - name: "LocalStartTime"
+              - name: "localStartTime"
                 value: 1080
-              - name: "LocalEndTime"
+              - name: "localEndTime"
                 value: 2100
 
     - label: "TH sends Get Year Day Schedule Command to DUT"
@@ -279,21 +279,21 @@ tests:
       command: "GetYearDaySchedule"
       arguments:
           values:
-              - name: "YearDayIndex"
+              - name: "yearDayIndex"
                 value: 1
               - name: "userIndex"
                 value: 1
       response:
           values:
-              - name: "YearDayIndex"
+              - name: "yearDayIndex"
                 value: 1
               - name: "userIndex"
                 value: 1
               - name: "status"
                 value: 0x00
-              - name: "LocalStartTime"
+              - name: "localStartTime"
                 value: 1080
-              - name: "LocalEndTime"
+              - name: "localEndTime"
                 value: 2100
                 constraints:
                     minValue: 1081
diff --git a/src/app/tests/suites/certification/Test_TC_MEDIAPLAYBACK_6_2.yaml b/src/app/tests/suites/certification/Test_TC_MEDIAPLAYBACK_6_2.yaml
index 885b34e197567c..2243b7a6a1fcdf 100644
--- a/src/app/tests/suites/certification/Test_TC_MEDIAPLAYBACK_6_2.yaml
+++ b/src/app/tests/suites/certification/Test_TC_MEDIAPLAYBACK_6_2.yaml
@@ -139,7 +139,7 @@ tests:
       command: "SkipForward"
       arguments:
           values:
-              - name: "DeltaPositionMilliseconds"
+              - name: "deltaPositionMilliseconds"
                 value: 10000
       response:
           values:
@@ -170,7 +170,7 @@ tests:
       command: "SkipBackward"
       arguments:
           values:
-              - name: "DeltaPositionMilliseconds"
+              - name: "deltaPositionMilliseconds"
                 value: 10000
       response:
           values:
diff --git a/src/app/tests/suites/certification/Test_TC_MEDIAPLAYBACK_6_3.yaml b/src/app/tests/suites/certification/Test_TC_MEDIAPLAYBACK_6_3.yaml
index 59c9aa6d93ea1a..6969b4fc0aed8e 100644
--- a/src/app/tests/suites/certification/Test_TC_MEDIAPLAYBACK_6_3.yaml
+++ b/src/app/tests/suites/certification/Test_TC_MEDIAPLAYBACK_6_3.yaml
@@ -49,7 +49,7 @@ tests:
       command: "Seek"
       arguments:
           values:
-              - name: "Position"
+              - name: "position"
                 value: 10000
       response:
           values:
diff --git a/src/app/tests/suites/certification/Test_TC_TGTNAV_8_1.yaml b/src/app/tests/suites/certification/Test_TC_TGTNAV_8_1.yaml
index d28d8404bf0a1d..10dc1906bf0825 100644
--- a/src/app/tests/suites/certification/Test_TC_TGTNAV_8_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_TGTNAV_8_1.yaml
@@ -58,7 +58,7 @@ tests:
       command: "NavigateTarget"
       arguments:
           values:
-              - name: "Target"
+              - name: "target"
                 value: targetvalue
 
     - label: "Reads the CurrentTarget attribute"
diff --git a/src/app/tests/suites/certification/Test_TC_WNCV_4_1.yaml b/src/app/tests/suites/certification/Test_TC_WNCV_4_1.yaml
index 0d6cda956a57f8..a0adc263bfa5bf 100644
--- a/src/app/tests/suites/certification/Test_TC_WNCV_4_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_WNCV_4_1.yaml
@@ -74,8 +74,6 @@ tests:
           values:
               - name: "liftPercent100thsValue"
                 value: 2500
-              - name: "liftPercentageValue"
-                value: 25
 
     ### Depends on a sleep/wait command how to do this with a real device for CI keep at 100ms
     - label: "2b: DUT updates its attributes"
@@ -143,8 +141,6 @@ tests:
           values:
               - name: "liftPercent100thsValue"
                 value: 7520
-              - name: "liftPercentageValue"
-                value: 75
 
     ### Depends on a sleep/wait command how to do this with a real device for CI keep at 100ms
     - label: "4b: DUT updates its attributes"
diff --git a/src/app/tests/suites/certification/Test_TC_WNCV_4_2.yaml b/src/app/tests/suites/certification/Test_TC_WNCV_4_2.yaml
index 359be2185e8713..c3d99ad58fc2df 100644
--- a/src/app/tests/suites/certification/Test_TC_WNCV_4_2.yaml
+++ b/src/app/tests/suites/certification/Test_TC_WNCV_4_2.yaml
@@ -74,8 +74,6 @@ tests:
           values:
               - name: "tiltPercent100thsValue"
                 value: 3000
-              - name: "tiltPercentageValue"
-                value: 30
 
     ### Depends on a sleep/wait command how to do this with a real device for CI keep at 100ms
     - label: "2b: DUT updates its attributes"
@@ -143,8 +141,6 @@ tests:
           values:
               - name: "tiltPercent100thsValue"
                 value: 6005
-              - name: "tiltPercentageValue"
-                value: 60
 
     ### Depends on a sleep/wait command how to do this with a real device for CI keep at 100ms
     - label: "4b: DUT updates its attributes"
diff --git a/src/app/tests/suites/certification/Test_TC_WNCV_4_3.yaml b/src/app/tests/suites/certification/Test_TC_WNCV_4_3.yaml
index 4387335830e257..949f5d8b85de11 100644
--- a/src/app/tests/suites/certification/Test_TC_WNCV_4_3.yaml
+++ b/src/app/tests/suites/certification/Test_TC_WNCV_4_3.yaml
@@ -74,10 +74,8 @@ tests:
       PICS: WNCV.S.F00 && WNCV.S.F02 || WNCV.S.F00 && WNCV.S.C05.Rsp
       arguments:
           values:
-              - name: "LiftPercent100thsValue"
+              - name: "liftPercent100thsValue"
                 value: 0x3000
-              - name: "LiftPercentageValue"
-                value: 0x3F
       response:
           error: CONSTRAINT_ERROR
 
@@ -88,10 +86,8 @@ tests:
       PICS: WNCV.S.F00 && WNCV.S.F02 || WNCV.S.F00 && WNCV.S.C05.Rsp
       arguments:
           values:
-              - name: "LiftPercent100thsValue"
+              - name: "liftPercent100thsValue"
                 value: 10001
-              - name: "LiftPercentageValue"
-                value: 100
       response:
           error: CONSTRAINT_ERROR
 
@@ -102,9 +98,7 @@ tests:
       PICS: WNCV.S.F00 && WNCV.S.F02 || WNCV.S.F00 && WNCV.S.C05.Rsp
       arguments:
           values:
-              - name: "LiftPercent100thsValue"
+              - name: "liftPercent100thsValue"
                 value: 0xFFFF
-              - name: "LiftPercentageValue"
-                value: 0xFF
       response:
           error: CONSTRAINT_ERROR
diff --git a/src/app/tests/suites/certification/Test_TC_WNCV_4_4.yaml b/src/app/tests/suites/certification/Test_TC_WNCV_4_4.yaml
index 99319da678bdf6..599753afe3628e 100644
--- a/src/app/tests/suites/certification/Test_TC_WNCV_4_4.yaml
+++ b/src/app/tests/suites/certification/Test_TC_WNCV_4_4.yaml
@@ -74,10 +74,8 @@ tests:
       PICS: WNCV.S.F01 && WNCV.S.F04 || WNCV.S.F01 && WNCV.S.C08.Rsp
       arguments:
           values:
-              - name: "TiltPercent100thsValue"
+              - name: "tiltPercent100thsValue"
                 value: 0x3000
-              - name: "TiltPercentageValue"
-                value: 0x3F
       response:
           error: CONSTRAINT_ERROR
 
@@ -88,10 +86,8 @@ tests:
       PICS: WNCV.S.F01 && WNCV.S.F04 || WNCV.S.F01 && WNCV.S.C08.Rsp
       arguments:
           values:
-              - name: "TiltPercent100thsValue"
+              - name: "tiltPercent100thsValue"
                 value: 10001
-              - name: "TiltPercentageValue"
-                value: 100
       response:
           error: CONSTRAINT_ERROR
 
@@ -102,9 +98,7 @@ tests:
       PICS: WNCV.S.F01 && WNCV.S.F04 || WNCV.S.F01 && WNCV.S.C08.Rsp
       arguments:
           values:
-              - name: "TiltPercent100thsValue"
+              - name: "tiltPercent100thsValue"
                 value: 0xFFFF
-              - name: "TiltPercentageValue"
-                value: 0xFF
       response:
           error: CONSTRAINT_ERROR
diff --git a/src/app/tests/suites/certification/Test_TC_WNCV_4_5.yaml b/src/app/tests/suites/certification/Test_TC_WNCV_4_5.yaml
index 8ba45a052b496b..33281f79b55af6 100644
--- a/src/app/tests/suites/certification/Test_TC_WNCV_4_5.yaml
+++ b/src/app/tests/suites/certification/Test_TC_WNCV_4_5.yaml
@@ -48,10 +48,8 @@ tests:
       PICS: WNCV.S.F00 && WNCV.S.F02 && WNCV.S.C05.Rsp
       arguments:
           values:
-              - name: "LiftPercent100thsValue"
+              - name: "liftPercent100thsValue"
                 value: 9000
-              - name: "LiftPercentageValue"
-                value: 90
 
     #
     # TODO: For some reason, the window-covering server impl arms a 5s timer before it actually
@@ -86,10 +84,8 @@ tests:
       PICS: WNCV.S.F01 && WNCV.S.F04 && WNCV.S.C08.Rsp
       arguments:
           values:
-              - name: "TiltPercent100thsValue"
+              - name: "tiltPercent100thsValue"
                 value: 9000
-              - name: "TiltPercentageValue"
-                value: 90
 
     #
     # TODO: For some reason, the window-covering server impl arms a 5s timer before it actually
diff --git a/zzz_generated/chip-tool/zap-generated/test/Commands.h b/zzz_generated/chip-tool/zap-generated/test/Commands.h
index 4c97b05a8bb4cf..a898df02de63f3 100644
--- a/zzz_generated/chip-tool/zap-generated/test/Commands.h
+++ b/zzz_generated/chip-tool/zap-generated/test/Commands.h
@@ -81051,6 +81051,8 @@ class Test_TC_DRLK_2_2Suite : public TestCommand
             {
                 uint8_t value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
+                VerifyOrReturn(CheckConstraintMinValue("value", value, 1U));
+                VerifyOrReturn(CheckConstraintMaxValue("value", value, 255U));
             }
             break;
         case 17:
@@ -81076,6 +81078,8 @@ class Test_TC_DRLK_2_2Suite : public TestCommand
             {
                 uint8_t value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
+                VerifyOrReturn(CheckConstraintMinValue("value", value, 1U));
+                VerifyOrReturn(CheckConstraintMaxValue("value", value, 255U));
             }
             break;
         case 23:
@@ -85515,12 +85519,28 @@ class TestGroupKeyManagementClusterSuite : public TestCommand
                     auto iter_0 = value.begin();
                     VerifyOrReturn(CheckNextListItemDecodes<decltype(value)>("groupTable", iter_0, 0));
                     VerifyOrReturn(CheckValue("groupTable[0].groupId", iter_0.GetValue().groupId, 257U));
+                    {
+                        auto iter_2 = iter_0.GetValue().endpoints.begin();
+                        VerifyOrReturn(
+                            CheckNextListItemDecodes<decltype(iter_0.GetValue().endpoints)>("groupTable[0].endpoints", iter_2, 0));
+                        VerifyOrReturn(CheckValue("groupTable[0].endpoints[0]", iter_2.GetValue(), 1U));
+                        VerifyOrReturn(
+                            CheckNoMoreListItems<decltype(iter_0.GetValue().endpoints)>("groupTable[0].endpoints", iter_2, 1));
+                    }
                     VerifyOrReturn(CheckValuePresent("groupTable[0].groupName", iter_0.GetValue().groupName));
                     VerifyOrReturn(CheckValueAsString("groupTable[0].groupName.Value()", iter_0.GetValue().groupName.Value(),
                                                       chip::CharSpan("Group #1", 8)));
                     VerifyOrReturn(CheckValue("groupTable[0].fabricIndex", iter_0.GetValue().fabricIndex, 1U));
                     VerifyOrReturn(CheckNextListItemDecodes<decltype(value)>("groupTable", iter_0, 1));
                     VerifyOrReturn(CheckValue("groupTable[1].groupId", iter_0.GetValue().groupId, 258U));
+                    {
+                        auto iter_2 = iter_0.GetValue().endpoints.begin();
+                        VerifyOrReturn(
+                            CheckNextListItemDecodes<decltype(iter_0.GetValue().endpoints)>("groupTable[1].endpoints", iter_2, 0));
+                        VerifyOrReturn(CheckValue("groupTable[1].endpoints[0]", iter_2.GetValue(), 1U));
+                        VerifyOrReturn(
+                            CheckNoMoreListItems<decltype(iter_0.GetValue().endpoints)>("groupTable[1].endpoints", iter_2, 1));
+                    }
                     VerifyOrReturn(CheckValuePresent("groupTable[1].groupName", iter_0.GetValue().groupName));
                     VerifyOrReturn(CheckValueAsString("groupTable[1].groupName.Value()", iter_0.GetValue().groupName.Value(),
                                                       chip::CharSpan("Group #2", 8)));
@@ -85576,6 +85596,14 @@ class TestGroupKeyManagementClusterSuite : public TestCommand
                     auto iter_0 = value.begin();
                     VerifyOrReturn(CheckNextListItemDecodes<decltype(value)>("groupTable", iter_0, 0));
                     VerifyOrReturn(CheckValue("groupTable[0].groupId", iter_0.GetValue().groupId, 258U));
+                    {
+                        auto iter_2 = iter_0.GetValue().endpoints.begin();
+                        VerifyOrReturn(
+                            CheckNextListItemDecodes<decltype(iter_0.GetValue().endpoints)>("groupTable[0].endpoints", iter_2, 0));
+                        VerifyOrReturn(CheckValue("groupTable[0].endpoints[0]", iter_2.GetValue(), 1U));
+                        VerifyOrReturn(
+                            CheckNoMoreListItems<decltype(iter_0.GetValue().endpoints)>("groupTable[0].endpoints", iter_2, 1));
+                    }
                     VerifyOrReturn(CheckValuePresent("groupTable[0].groupName", iter_0.GetValue().groupName));
                     VerifyOrReturn(CheckValueAsString("groupTable[0].groupName.Value()", iter_0.GetValue().groupName.Value(),
                                                       chip::CharSpan("Group #2", 8)));
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 8e6f470a6d79dc..198e2d05b1d2e6 100644
--- a/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h
+++ b/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h
@@ -125712,6 +125712,9 @@ class Test_TC_DRLK_2_2 : public TestCommandBridge {
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
+            VerifyOrReturn(CheckConstraintMinValue<uint8_t>("wrongCodeEntryLimit", [value unsignedCharValue], 1U));
+            VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("wrongCodeEntryLimit", [value unsignedCharValue], 255U));
+
             NextTest();
         }];
 
@@ -125815,6 +125818,9 @@ class Test_TC_DRLK_2_2 : public TestCommandBridge {
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
+            VerifyOrReturn(CheckConstraintMinValue<uint8_t>("userCodeTemporaryDisableTime", [value unsignedCharValue], 1U));
+            VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("userCodeTemporaryDisableTime", [value unsignedCharValue], 255U));
+
             NextTest();
         }];
 
@@ -132822,6 +132828,13 @@ class TestGroupKeyManagementCluster : public TestCommandBridge {
                                            VerifyOrReturn(CheckValue("GroupTable", [actualValue count], static_cast<uint32_t>(2)));
                                            VerifyOrReturn(CheckValue("GroupId",
                                                ((MTRGroupKeyManagementClusterGroupInfoMapStruct *) actualValue[0]).groupId, 257U));
+                                           VerifyOrReturn(CheckValue("Endpoints",
+                                               [((MTRGroupKeyManagementClusterGroupInfoMapStruct *)
+                                                       actualValue[0]).endpoints count],
+                                               static_cast<uint32_t>(1)));
+                                           VerifyOrReturn(CheckValue("",
+                                               ((MTRGroupKeyManagementClusterGroupInfoMapStruct *) actualValue[0]).endpoints[0],
+                                               1U));
                                            VerifyOrReturn(CheckValueAsString("GroupName",
                                                ((MTRGroupKeyManagementClusterGroupInfoMapStruct *) actualValue[0]).groupName,
                                                @"Group #1"));
@@ -132830,6 +132843,13 @@ class TestGroupKeyManagementCluster : public TestCommandBridge {
                                                1U));
                                            VerifyOrReturn(CheckValue("GroupId",
                                                ((MTRGroupKeyManagementClusterGroupInfoMapStruct *) actualValue[1]).groupId, 258U));
+                                           VerifyOrReturn(CheckValue("Endpoints",
+                                               [((MTRGroupKeyManagementClusterGroupInfoMapStruct *)
+                                                       actualValue[1]).endpoints count],
+                                               static_cast<uint32_t>(1)));
+                                           VerifyOrReturn(CheckValue("",
+                                               ((MTRGroupKeyManagementClusterGroupInfoMapStruct *) actualValue[1]).endpoints[0],
+                                               1U));
                                            VerifyOrReturn(CheckValueAsString("GroupName",
                                                ((MTRGroupKeyManagementClusterGroupInfoMapStruct *) actualValue[1]).groupName,
                                                @"Group #2"));
@@ -133004,6 +133024,13 @@ class TestGroupKeyManagementCluster : public TestCommandBridge {
                                            VerifyOrReturn(CheckValue("GroupTable", [actualValue count], static_cast<uint32_t>(1)));
                                            VerifyOrReturn(CheckValue("GroupId",
                                                ((MTRGroupKeyManagementClusterGroupInfoMapStruct *) actualValue[0]).groupId, 258U));
+                                           VerifyOrReturn(CheckValue("Endpoints",
+                                               [((MTRGroupKeyManagementClusterGroupInfoMapStruct *)
+                                                       actualValue[0]).endpoints count],
+                                               static_cast<uint32_t>(1)));
+                                           VerifyOrReturn(CheckValue("",
+                                               ((MTRGroupKeyManagementClusterGroupInfoMapStruct *) actualValue[0]).endpoints[0],
+                                               1U));
                                            VerifyOrReturn(CheckValueAsString("GroupName",
                                                ((MTRGroupKeyManagementClusterGroupInfoMapStruct *) actualValue[0]).groupName,
                                                @"Group #2"));