diff --git a/src/app/tests/suites/certification/Test_TC_APBSC_9_1.yaml b/src/app/tests/suites/certification/Test_TC_APBSC_9_1.yaml
index 20f7df8130e716..fa7f138e3a9283 100644
--- a/src/app/tests/suites/certification/Test_TC_APBSC_9_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_APBSC_9_1.yaml
@@ -62,6 +62,8 @@ tests:
       response:
           constraints:
               type: uint16
+              minValue: 0
+              maxValue: 65535
 
     - label: "Reads the Application attribute"
       PICS: APBSC.S.A0004
diff --git a/src/app/tests/suites/certification/Test_TC_CC_2_1.yaml b/src/app/tests/suites/certification/Test_TC_CC_2_1.yaml
index 91da2d93193ab1..88db602018f901 100644
--- a/src/app/tests/suites/certification/Test_TC_CC_2_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CC_2_1.yaml
@@ -35,6 +35,8 @@ tests:
       response:
           constraints:
               type: uint8
+              minValue: 0
+              maxValue: 255
 
     - label: "TH reads CurrentSaturation attribute from DUT"
       PICS: CC.S.A0001 && CC.S.F00
@@ -43,6 +45,8 @@ tests:
       response:
           constraints:
               type: uint8
+              minValue: 0
+              maxValue: 255
 
     - label: "TH reads RemainingTime attribute from DUT"
       PICS: CC.S.A0002
@@ -51,6 +55,8 @@ tests:
       response:
           constraints:
               type: uint16
+              minValue: 0
+              maxValue: 65535
 
     - label: "TH reads CurrentX attribute from DUT"
       PICS: CC.S.A0003 && CC.S.F03
@@ -128,6 +134,8 @@ tests:
       response:
           constraints:
               type: uint16
+              minValue: 0
+              maxValue: 65535
 
     - label: "TH reads EnhancedColorMode attribute from DUT"
       PICS: CC.S.F02 && CC.S.A4001
@@ -146,6 +154,8 @@ tests:
       response:
           constraints:
               type: uint8
+              minValue: 0
+              maxValue: 255
 
     - label: "TH reads ColorLoopDirection attribute from DUT"
       PICS: CC.S.A4003 && CC.S.F02
@@ -154,6 +164,8 @@ tests:
       response:
           constraints:
               type: uint8
+              minValue: 0
+              maxValue: 255
 
     - label: "TH reads ColorLoopTime attribute from DUT"
       PICS: CC.S.A4004 && CC.S.F02
@@ -162,6 +174,8 @@ tests:
       response:
           constraints:
               type: uint16
+              minValue: 0
+              maxValue: 65535
 
     - label: "TH reads ColorLoopStartEnhancedHue attribute from DUT"
       PICS: CC.S.A4005 && CC.S.F02
@@ -170,6 +184,8 @@ tests:
       response:
           constraints:
               type: uint16
+              minValue: 0
+              maxValue: 65535
 
     - label: "TH reads ColorLoopStoredEnhancedHue attribute from DUT"
       PICS: CC.S.A4006 && CC.S.F02
@@ -178,6 +194,8 @@ tests:
       response:
           constraints:
               type: uint16
+              minValue: 0
+              maxValue: 65535
 
     - label: "TH reads FeatureMap attribute from DUT"
       command: "readAttribute"
@@ -274,6 +292,8 @@ tests:
       response:
           constraints:
               type: uint8
+              minValue: 0
+              maxValue: 255
 
     - label: "TH reads Primary2X attribute from DUT"
       PICS: CC.S.A0015
@@ -302,6 +322,8 @@ tests:
       response:
           constraints:
               type: uint8
+              minValue: 0
+              maxValue: 255
 
     - label: "TH reads Primary3X attribute from DUT"
       PICS: CC.S.A0019
@@ -330,6 +352,8 @@ tests:
       response:
           constraints:
               type: uint8
+              minValue: 0
+              maxValue: 255
 
     #Additional Defined Primaries Information Attribute Set
     - label: "TH reads Primary4X attribute from DUT"
@@ -359,6 +383,8 @@ tests:
       response:
           constraints:
               type: uint8
+              minValue: 0
+              maxValue: 255
 
     - label: "TH reads Primary5X attribute from DUT"
       PICS: CC.S.A0024
@@ -387,6 +413,8 @@ tests:
       response:
           constraints:
               type: uint8
+              minValue: 0
+              maxValue: 255
 
     - label: "TH reads Primary6X attribute from DUT"
       PICS: CC.S.A0028
@@ -415,6 +443,8 @@ tests:
       response:
           constraints:
               type: uint8
+              minValue: 0
+              maxValue: 255
 
     #Defined Color Points Settings Attribute Set
     - label: "TH reads WhitePointX attribute from DUT"
@@ -464,6 +494,8 @@ tests:
       response:
           constraints:
               type: uint8
+              minValue: 0
+              maxValue: 255
 
     - label: "TH reads ColorPointGX attribute from DUT"
       PICS: CC.S.A0036
@@ -492,6 +524,8 @@ tests:
       response:
           constraints:
               type: uint8
+              minValue: 0
+              maxValue: 255
 
     - label: "TH reads ColorPointBX attribute from DUT"
       PICS: CC.S.A003a
@@ -520,3 +554,5 @@ tests:
       response:
           constraints:
               type: uint8
+              minValue: 0
+              maxValue: 255
diff --git a/src/app/tests/suites/certification/Test_TC_DGGEN_2_1.yaml b/src/app/tests/suites/certification/Test_TC_DGGEN_2_1.yaml
index 7ad5b29dc96e7f..968cccaffe22ca 100644
--- a/src/app/tests/suites/certification/Test_TC_DGGEN_2_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DGGEN_2_1.yaml
@@ -44,6 +44,8 @@ tests:
       response:
           constraints:
               type: uint16
+              minValue: 0
+              maxValue: 65535
 
     - label: "Reboot target device"
       PICS: PICS_SDK_CI_ONLY
@@ -106,6 +108,8 @@ tests:
       response:
           constraints:
               type: uint32
+              minValue: 0x0
+              maxValue: 0xFFFFFFFE
 
     - label: "Reboot target device"
       PICS: PICS_SDK_CI_ONLY
diff --git a/src/app/tests/suites/certification/Test_TC_DGSW_2_2.yaml b/src/app/tests/suites/certification/Test_TC_DGSW_2_2.yaml
index 17778fca156a42..243aad00e637fc 100644
--- a/src/app/tests/suites/certification/Test_TC_DGSW_2_2.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DGSW_2_2.yaml
@@ -21,6 +21,14 @@ config:
     endpoint: 0
 
 tests:
+    - label: "Wait for the commissioned device to be retrieved"
+      cluster: "DelayCommands"
+      command: "WaitForCommissionee"
+      arguments:
+          values:
+              - name: "nodeId"
+                value: nodeId
+
     - label:
           "Reads a list of SoftwareFault struct from DUT and data type in each
           field of the struct must match the value listed in spec"
diff --git a/src/app/tests/suites/certification/Test_TC_DGTHREAD_2_1.yaml b/src/app/tests/suites/certification/Test_TC_DGTHREAD_2_1.yaml
index 6a8459a0847924..3f8eb5a01cb48c 100644
--- a/src/app/tests/suites/certification/Test_TC_DGTHREAD_2_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DGTHREAD_2_1.yaml
@@ -35,6 +35,8 @@ tests:
       response:
           constraints:
               type: uint16
+              minValue: 0
+              maxValue: 65535
 
     - label: "TH reads RoutingRole attribute value from DUT"
       PICS: DGTHREAD.S.A0001
@@ -89,6 +91,8 @@ tests:
       response:
           constraints:
               type: uint16
+              minValue: 0
+              maxValue: 65535
 
     - label:
           "Read PanId attribute from DUT and verify response value, If value is
@@ -276,6 +280,8 @@ tests:
       response:
           constraints:
               type: uint8
+              minValue: 0
+              maxValue: 255
 
     - label: "TH reads DataVersion attribute value from DUT"
       PICS: DGTHREAD.S.A000b
@@ -284,6 +290,8 @@ tests:
       response:
           constraints:
               type: uint8
+              minValue: 0
+              maxValue: 255
 
     - label: "TH reads StableDataVersion attribute value from DUT"
       PICS: DGTHREAD.S.A000c
@@ -292,6 +300,8 @@ tests:
       response:
           constraints:
               type: uint8
+              minValue: 0
+              maxValue: 255
 
     - label: "TH reads LeaderRouterId attribute value from DUT"
       PICS: DGTHREAD.S.A000d
@@ -300,6 +310,8 @@ tests:
       response:
           constraints:
               type: uint8
+              minValue: 0
+              maxValue: 255
 
     - label: "TH reads DetachedRoleCount attribute value from DUT"
       PICS: DGTHREAD.S.A000e
@@ -308,6 +320,8 @@ tests:
       response:
           constraints:
               type: uint16
+              minValue: 0
+              maxValue: 65535
 
     - label: "TH reads ChildRoleCount attribute value from DUT"
       PICS: DGTHREAD.S.A001f
@@ -316,6 +330,8 @@ tests:
       response:
           constraints:
               type: uint16
+              minValue: 0
+              maxValue: 65535
 
     - label: "TH reads RouterRoleCount attribute value from DUT"
       PICS: DGTHREAD.S.A0010
@@ -324,6 +340,8 @@ tests:
       response:
           constraints:
               type: uint16
+              minValue: 0
+              maxValue: 65535
 
     - label: "TH reads LeaderRoleCount attribute value from DUT"
       PICS: DGTHREAD.S.A0011
@@ -332,6 +350,8 @@ tests:
       response:
           constraints:
               type: uint16
+              minValue: 0
+              maxValue: 65535
 
     - label: "TH reads AttachAttemptCount attribute value from DUT"
       PICS: DGTHREAD.S.A0012
@@ -340,6 +360,8 @@ tests:
       response:
           constraints:
               type: uint16
+              minValue: 0
+              maxValue: 65535
 
     - label: "TH reads PartitionIdChangeCount attribute value from DUT"
       PICS: DGTHREAD.S.A0013
@@ -348,6 +370,8 @@ tests:
       response:
           constraints:
               type: uint16
+              minValue: 0
+              maxValue: 65535
 
     - label:
           "TH reads BetterPartitionAttachAttemptCount attribute value from DUT"
@@ -357,6 +381,8 @@ tests:
       response:
           constraints:
               type: uint16
+              minValue: 0
+              maxValue: 65535
 
     - label: "TH reads ParentChangeCount attribute value from DUT"
       PICS: DGTHREAD.S.A0015
@@ -365,6 +391,8 @@ tests:
       response:
           constraints:
               type: uint16
+              minValue: 0
+              maxValue: 65535
 
     - label: "TH reads ActiveTimestamp attribute value from DUT"
       PICS: DGTHREAD.S.A0038
diff --git a/src/app/tests/suites/certification/Test_TC_DGTHREAD_2_2.yaml b/src/app/tests/suites/certification/Test_TC_DGTHREAD_2_2.yaml
index 2a268d21486c61..6e2836a4a23a69 100644
--- a/src/app/tests/suites/certification/Test_TC_DGTHREAD_2_2.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DGTHREAD_2_2.yaml
@@ -35,6 +35,8 @@ tests:
       response:
           constraints:
               type: uint32
+              minValue: 0x0
+              maxValue: 0xFFFFFFFF
 
     - label: "TH reads TxUnicastCount attribute value from DUT"
       PICS: DGTHREAD.S.A0017
@@ -43,6 +45,8 @@ tests:
       response:
           constraints:
               type: uint32
+              minValue: 0x0
+              maxValue: 0xFFFFFFFF
 
     - label: "TH reads TxBroadcastCount attribute value from DUT"
       PICS: DGTHREAD.S.A0018
@@ -51,6 +55,8 @@ tests:
       response:
           constraints:
               type: uint32
+              minValue: 0x0
+              maxValue: 0xFFFFFFFF
 
     - label: "TH reads TxAckRequestedCount attribute value from DUT"
       PICS: DGTHREAD.S.A0019
@@ -59,6 +65,8 @@ tests:
       response:
           constraints:
               type: uint32
+              minValue: 0x0
+              maxValue: 0xFFFFFFFF
 
     - label: "TH reads TxAckedCount attribute value from DUT"
       PICS: DGTHREAD.S.A001a
@@ -67,6 +75,8 @@ tests:
       response:
           constraints:
               type: uint32
+              minValue: 0x0
+              maxValue: 0xFFFFFFFF
 
     - label: "TH reads TxNoAckRequestedCount attribute value from DUT"
       PICS: DGTHREAD.S.A001b
@@ -75,6 +85,8 @@ tests:
       response:
           constraints:
               type: uint32
+              minValue: 0x0
+              maxValue: 0xFFFFFFFF
 
     - label: "TH reads TxDataCount attribute value from DUT"
       PICS: DGTHREAD.S.A001c
@@ -83,6 +95,8 @@ tests:
       response:
           constraints:
               type: uint32
+              minValue: 0x0
+              maxValue: 0xFFFFFFFF
 
     - label: "TH reads TxDataPollCount attribute value from DUT"
       PICS: DGTHREAD.S.A001d
@@ -91,6 +105,8 @@ tests:
       response:
           constraints:
               type: uint32
+              minValue: 0x0
+              maxValue: 0xFFFFFFFF
 
     - label: "TH reads TxBeaconCount attribute value from DUT"
       PICS: DGTHREAD.S.A001e
@@ -99,6 +115,8 @@ tests:
       response:
           constraints:
               type: uint32
+              minValue: 0x0
+              maxValue: 0xFFFFFFFF
 
     - label: "TH reads TxBeaconRequestCount attribute value from DUT"
       PICS: DGTHREAD.S.A002f
@@ -107,6 +125,8 @@ tests:
       response:
           constraints:
               type: uint32
+              minValue: 0x0
+              maxValue: 0xFFFFFFFF
 
     - label: "TH reads TxOtherCount attribute value from DUT"
       PICS: DGTHREAD.S.A0020
@@ -115,6 +135,8 @@ tests:
       response:
           constraints:
               type: uint32
+              minValue: 0x0
+              maxValue: 0xFFFFFFFF
 
     - label: "TH reads TxRetryCount attribute value from DUT"
       PICS: DGTHREAD.S.A0021
@@ -123,6 +145,8 @@ tests:
       response:
           constraints:
               type: uint32
+              minValue: 0x0
+              maxValue: 0xFFFFFFFF
 
     - label: "TH reads TxDirectMaxRetryExpiryCount attribute value from DUT"
       PICS: DGTHREAD.S.A0022
@@ -131,6 +155,8 @@ tests:
       response:
           constraints:
               type: uint32
+              minValue: 0x0
+              maxValue: 0xFFFFFFFF
 
     - label: "TH reads TxIndirectMaxRetryExpiryCount attribute value from DUT"
       PICS: DGTHREAD.S.A0023
@@ -139,6 +165,8 @@ tests:
       response:
           constraints:
               type: uint32
+              minValue: 0x0
+              maxValue: 0xFFFFFFFF
 
     - label: "TH reads TxErrCcaCount attribute value from DUT"
       PICS: DGTHREAD.S.A0024
@@ -147,6 +175,8 @@ tests:
       response:
           constraints:
               type: uint32
+              minValue: 0x0
+              maxValue: 0xFFFFFFFF
 
     - label: "TH reads TxErrAbortCount attribute value from DUT"
       PICS: DGTHREAD.S.A0025
@@ -155,6 +185,8 @@ tests:
       response:
           constraints:
               type: uint32
+              minValue: 0x0
+              maxValue: 0xFFFFFFFF
 
     - label: "TH reads TxErrBusyChannelCount attribute value from DUT"
       PICS: DGTHREAD.S.A0026
@@ -163,3 +195,5 @@ tests:
       response:
           constraints:
               type: uint32
+              minValue: 0x0
+              maxValue: 0xFFFFFFFF
diff --git a/src/app/tests/suites/certification/Test_TC_DGTHREAD_2_3.yaml b/src/app/tests/suites/certification/Test_TC_DGTHREAD_2_3.yaml
index ca377d9fd6885d..670d8413c70862 100644
--- a/src/app/tests/suites/certification/Test_TC_DGTHREAD_2_3.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DGTHREAD_2_3.yaml
@@ -35,6 +35,8 @@ tests:
       response:
           constraints:
               type: uint32
+              minValue: 0x0
+              maxValue: 0xFFFFFFFF
 
     - label: "TH reads RxUnicastCount attribute value from DUT"
       PICS: DGTHREAD.S.A0028
@@ -43,6 +45,8 @@ tests:
       response:
           constraints:
               type: uint32
+              minValue: 0x0
+              maxValue: 0xFFFFFFFF
 
     - label: "TH reads RxBroadcastCount attribute value from DUT"
       PICS: DGTHREAD.S.A0029
@@ -51,6 +55,8 @@ tests:
       response:
           constraints:
               type: uint32
+              minValue: 0x0
+              maxValue: 0xFFFFFFFF
 
     - label: "TH reads RxDataCount attribute value from DUT"
       PICS: DGTHREAD.S.A002a
@@ -59,6 +65,8 @@ tests:
       response:
           constraints:
               type: uint32
+              minValue: 0x0
+              maxValue: 0xFFFFFFFF
 
     - label: "TH reads RxDataPollCount attribute value from DUT"
       PICS: DGTHREAD.S.A002b
@@ -67,6 +75,8 @@ tests:
       response:
           constraints:
               type: uint32
+              minValue: 0x0
+              maxValue: 0xFFFFFFFF
 
     - label: "TH reads RxBeaconCount attribute value from DUT"
       PICS: DGTHREAD.S.A002c
@@ -75,6 +85,8 @@ tests:
       response:
           constraints:
               type: uint32
+              minValue: 0x0
+              maxValue: 0xFFFFFFFF
 
     - label: "TH reads RxBeaconRequestCount attribute value from DUT"
       PICS: DGTHREAD.S.A002d
@@ -83,6 +95,8 @@ tests:
       response:
           constraints:
               type: uint32
+              minValue: 0x0
+              maxValue: 0xFFFFFFFF
 
     - label: "TH reads RxOtherCount attribute value from DUT"
       PICS: DGTHREAD.S.A002e
@@ -91,6 +105,8 @@ tests:
       response:
           constraints:
               type: uint32
+              minValue: 0x0
+              maxValue: 0xFFFFFFFF
 
     - label: "TH reads RxAddressFilteredCount attribute value from DUT"
       PICS: DGTHREAD.S.A002f
@@ -99,6 +115,8 @@ tests:
       response:
           constraints:
               type: uint32
+              minValue: 0x0
+              maxValue: 0xFFFFFFFF
 
     - label: "TH reads RxDestAddrFilteredCount attribute value from DUT"
       PICS: DGTHREAD.S.A0030
@@ -107,6 +125,8 @@ tests:
       response:
           constraints:
               type: uint32
+              minValue: 0x0
+              maxValue: 0xFFFFFFFF
 
     - label: "TH reads RxDuplicatedCount attribute value from DUT"
       PICS: DGTHREAD.S.A0031
@@ -115,6 +135,8 @@ tests:
       response:
           constraints:
               type: uint32
+              minValue: 0x0
+              maxValue: 0xFFFFFFFF
 
     - label: "TH reads RxErrNoFrameCount attribute value from DUT"
       PICS: DGTHREAD.S.A0032
@@ -123,6 +145,8 @@ tests:
       response:
           constraints:
               type: uint32
+              minValue: 0x0
+              maxValue: 0xFFFFFFFF
 
     - label: "TH reads RxErrUnknownNeighborCount attribute value from DUT"
       PICS: DGTHREAD.S.A0033
@@ -131,6 +155,8 @@ tests:
       response:
           constraints:
               type: uint32
+              minValue: 0x0
+              maxValue: 0xFFFFFFFF
 
     #Issue #18335
     - label:
@@ -161,6 +187,8 @@ tests:
       response:
           constraints:
               type: uint32
+              minValue: 0x0
+              maxValue: 0xFFFFFFFF
 
     - label: "TH reads RxErrFcsCount attribute value from DUT"
       PICS: DGTHREAD.S.A0036
@@ -169,6 +197,8 @@ tests:
       response:
           constraints:
               type: uint32
+              minValue: 0x0
+              maxValue: 0xFFFFFFFF
 
     - label: "TH reads RxErrOtherCount attribute value from DUT"
       PICS: DGTHREAD.S.A0037
@@ -177,3 +207,5 @@ tests:
       response:
           constraints:
               type: uint32
+              minValue: 0x0
+              maxValue: 0xFFFFFFFF
diff --git a/src/app/tests/suites/certification/Test_TC_DGWIFI_2_1.yaml b/src/app/tests/suites/certification/Test_TC_DGWIFI_2_1.yaml
index 83a25223f7525d..b395fbb0fc5202 100644
--- a/src/app/tests/suites/certification/Test_TC_DGWIFI_2_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DGWIFI_2_1.yaml
@@ -63,6 +63,8 @@ tests:
       response:
           constraints:
               type: uint16
+              minValue: 0
+              maxValue: 65535
 
     - label: "Reads RSSI attribute constraints"
       PICS: DGWIFI.S.A0004
@@ -81,6 +83,8 @@ tests:
       response:
           constraints:
               type: uint32
+              minValue: 0x0
+              maxValue: 0xFFFFFFFF
 
     - label: "Reads BeaconRxCount attribute constraints"
       PICS: DGWIFI.S.A0006
@@ -89,6 +93,8 @@ tests:
       response:
           constraints:
               type: uint32
+              minValue: 0x0
+              maxValue: 0xFFFFFFFF
 
     - label: "Reads PacketMulticastRxCount attribute constraints"
       PICS: PICS_SKIP_SAMPLE_APP && DGWIFI.S.A0007
@@ -97,6 +103,8 @@ tests:
       response:
           constraints:
               type: uint32
+              minValue: 0x0
+              maxValue: 0xFFFFFFFF
 
     - label: "Reads PacketMulticastTxCount attribute constraints"
       PICS: PICS_SKIP_SAMPLE_APP && DGWIFI.S.A0008
@@ -105,6 +113,8 @@ tests:
       response:
           constraints:
               type: uint32
+              minValue: 0x0
+              maxValue: 0xFFFFFFFF
 
     - label: "Reads PacketUnicastRxCount attribute constraints"
       PICS: PICS_SKIP_SAMPLE_APP && DGWIFI.S.A0009
@@ -113,6 +123,8 @@ tests:
       response:
           constraints:
               type: uint32
+              minValue: 0x0
+              maxValue: 0xFFFFFFFF
 
     - label: "Reads PacketUnicastTxCount attribute constraints"
       PICS: PICS_SKIP_SAMPLE_APP && DGWIFI.S.A000a
@@ -121,6 +133,8 @@ tests:
       response:
           constraints:
               type: uint32
+              minValue: 0x0
+              maxValue: 0xFFFFFFFF
 
     - label: "Reads CurrentMaxRate attribute constraints"
       PICS: PICS_SKIP_SAMPLE_APP && DGWIFI.S.A000b
diff --git a/src/app/tests/suites/certification/Test_TC_FLW_2_1.yaml b/src/app/tests/suites/certification/Test_TC_FLW_2_1.yaml
index 1c7db189c2defe..63013e0ee27d8e 100644
--- a/src/app/tests/suites/certification/Test_TC_FLW_2_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_FLW_2_1.yaml
@@ -35,6 +35,8 @@ tests:
       response:
           constraints:
               type: uint16
+              minValue: 0
+              maxValue: 65535
 
     - label: "Read the mandatory attribute: MinMeasuredValue"
       PICS: FLW.S.A0001
@@ -43,6 +45,8 @@ tests:
       response:
           constraints:
               type: uint16
+              minValue: 0
+              maxValue: 65535
 
     - label: "Read the mandatory attribute: MaxMeasuredValue"
       PICS: FLW.S.A0002
@@ -51,6 +55,8 @@ tests:
       response:
           constraints:
               type: uint16
+              minValue: 0
+              maxValue: 65535
 
     - label: "read the optional attribute: Tolerance"
       PICS: FLW.S.A0003
diff --git a/src/app/tests/suites/certification/Test_TC_FLW_2_2.yaml b/src/app/tests/suites/certification/Test_TC_FLW_2_2.yaml
index b2b97cdbf31f5b..0ad7b2405f308a 100644
--- a/src/app/tests/suites/certification/Test_TC_FLW_2_2.yaml
+++ b/src/app/tests/suites/certification/Test_TC_FLW_2_2.yaml
@@ -36,6 +36,8 @@ tests:
           saveAs: ValueBeforeChange
           constraints:
               type: uint16
+              minValue: 0
+              maxValue: 65535
 
     - label: "operate on DUT to change the flow significantly"
       cluster: "LogCommands"
@@ -55,4 +57,6 @@ tests:
       response:
           constraints:
               type: uint16
+              minValue: 0
+              maxValue: 65535
               notValue: ValueBeforeChange
diff --git a/src/app/tests/suites/certification/Test_TC_I_2_1.yaml b/src/app/tests/suites/certification/Test_TC_I_2_1.yaml
index 9350a120f56952..d34a86313d7fdf 100644
--- a/src/app/tests/suites/certification/Test_TC_I_2_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_I_2_1.yaml
@@ -34,6 +34,8 @@ tests:
       response:
           constraints:
               type: uint16
+              minValue: 0
+              maxValue: 65535
 
     - label: "TH reads the IdentifyType attribute from the DUT"
       command: "readAttribute"
diff --git a/src/app/tests/suites/certification/Test_TC_I_2_3.yaml b/src/app/tests/suites/certification/Test_TC_I_2_3.yaml
index 7fad95095a80c4..211a0c25755ac2 100644
--- a/src/app/tests/suites/certification/Test_TC_I_2_3.yaml
+++ b/src/app/tests/suites/certification/Test_TC_I_2_3.yaml
@@ -44,7 +44,7 @@ tests:
     - label: "DUT executes a blink effect"
       cluster: "LogCommands"
       command: "UserPrompt"
-      PICS: PICS_USER_PROMPT
+      PICS: PICS_USER_PROMPT && I.S.C40.Rsp
       arguments:
           values:
               - name: "message"
@@ -68,7 +68,7 @@ tests:
     - label: "DUT executes a breathe effect"
       cluster: "LogCommands"
       command: "UserPrompt"
-      PICS: PICS_USER_PROMPT
+      PICS: PICS_USER_PROMPT && I.S.C40.Rsp
       arguments:
           values:
               - name: "message"
@@ -92,7 +92,7 @@ tests:
     - label: "DUT executes an okay effect"
       cluster: "LogCommands"
       command: "UserPrompt"
-      PICS: PICS_USER_PROMPT
+      PICS: PICS_USER_PROMPT && I.S.C40.Rsp
       arguments:
           values:
               - name: "message"
@@ -116,7 +116,7 @@ tests:
     - label: "DUT executes a channel change effect"
       cluster: "LogCommands"
       command: "UserPrompt"
-      PICS: PICS_USER_PROMPT
+      PICS: PICS_USER_PROMPT && I.S.C40.Rsp
       arguments:
           values:
               - name: "message"
@@ -140,7 +140,7 @@ tests:
     - label: "DUT executes a breathe effect"
       cluster: "LogCommands"
       command: "UserPrompt"
-      PICS: PICS_USER_PROMPT
+      PICS: PICS_USER_PROMPT && I.S.C40.Rsp
       arguments:
           values:
               - name: "message"
@@ -164,7 +164,7 @@ tests:
     - label: "DUT stops the breathe effect after the current effect sequence"
       cluster: "LogCommands"
       command: "UserPrompt"
-      PICS: PICS_USER_PROMPT
+      PICS: PICS_USER_PROMPT && I.S.C40.Rsp
       arguments:
           values:
               - name: "message"
@@ -188,7 +188,7 @@ tests:
     - label: "DUT executes a breathe effect"
       cluster: "LogCommands"
       command: "UserPrompt"
-      PICS: PICS_USER_PROMPT
+      PICS: PICS_USER_PROMPT && I.S.C40.Rsp
       arguments:
           values:
               - name: "message"
@@ -212,7 +212,7 @@ tests:
     - label: "DUT stops the breathe effect as soon as possible."
       cluster: "LogCommands"
       command: "UserPrompt"
-      PICS: PICS_USER_PROMPT
+      PICS: PICS_USER_PROMPT && I.S.C40.Rsp
       arguments:
           values:
               - name: "message"
@@ -236,7 +236,7 @@ tests:
     - label: "Check DUT executes a blink effect."
       cluster: "LogCommands"
       command: "UserPrompt"
-      PICS: PICS_USER_PROMPT
+      PICS: PICS_USER_PROMPT && I.S.C40.Rsp
       arguments:
           values:
               - name: "message"
@@ -261,7 +261,7 @@ tests:
           "DUT stops any effect that may be still running as soon as possible"
       cluster: "LogCommands"
       command: "UserPrompt"
-      PICS: PICS_USER_PROMPT
+      PICS: PICS_USER_PROMPT && I.S.C40.Rsp
       arguments:
           values:
               - name: "message"
diff --git a/src/app/tests/suites/certification/Test_TC_KEYPADINPUT_3_2.yaml b/src/app/tests/suites/certification/Test_TC_KEYPADINPUT_3_2.yaml
index b4d0518c5a4bab..34634381342c21 100644
--- a/src/app/tests/suites/certification/Test_TC_KEYPADINPUT_3_2.yaml
+++ b/src/app/tests/suites/certification/Test_TC_KEYPADINPUT_3_2.yaml
@@ -35,6 +35,10 @@ tests:
           values:
               - name: "keyCode"
                 value: 0x0A
+      response:
+          values:
+              - name: "status"
+                value: 0
 
     - label: "TH sends CEC Home Keys(0x09) to DUT"
       PICS: KEYPADINPUT.S.LK
@@ -43,3 +47,7 @@ tests:
           values:
               - name: "keyCode"
                 value: 0x09
+      response:
+          values:
+              - name: "status"
+                value: 0
diff --git a/src/app/tests/suites/certification/Test_TC_KEYPADINPUT_3_3.yaml b/src/app/tests/suites/certification/Test_TC_KEYPADINPUT_3_3.yaml
index a6cfbf7d663510..68bb952d00732f 100644
--- a/src/app/tests/suites/certification/Test_TC_KEYPADINPUT_3_3.yaml
+++ b/src/app/tests/suites/certification/Test_TC_KEYPADINPUT_3_3.yaml
@@ -35,6 +35,10 @@ tests:
           values:
               - name: "keyCode"
                 value: 0x21
+      response:
+          values:
+              - name: "status"
+                value: 0
 
     - label: "Send Numbers2"
       PICS: KEYPADINPUT.S.NK
@@ -43,6 +47,10 @@ tests:
           values:
               - name: "keyCode"
                 value: 0x22
+      response:
+          values:
+              - name: "status"
+                value: 0
 
     - label: "Send Numbers3"
       PICS: KEYPADINPUT.S.NK
@@ -51,6 +59,10 @@ tests:
           values:
               - name: "keyCode"
                 value: 0x23
+      response:
+          values:
+              - name: "status"
+                value: 0
 
     - label: "Send Numbers4"
       PICS: KEYPADINPUT.S.NK
@@ -59,6 +71,10 @@ tests:
           values:
               - name: "keyCode"
                 value: 0x24
+      response:
+          values:
+              - name: "status"
+                value: 0
 
     - label: "Send Numbers5"
       PICS: KEYPADINPUT.S.NK
@@ -67,6 +83,10 @@ tests:
           values:
               - name: "keyCode"
                 value: 0x25
+      response:
+          values:
+              - name: "status"
+                value: 0
 
     - label: "Send Numbers6"
       PICS: KEYPADINPUT.S.NK
@@ -75,6 +95,10 @@ tests:
           values:
               - name: "keyCode"
                 value: 0x26
+      response:
+          values:
+              - name: "status"
+                value: 0
 
     - label: "Send Numbers7"
       PICS: KEYPADINPUT.S.NK
@@ -83,6 +107,10 @@ tests:
           values:
               - name: "keyCode"
                 value: 0x27
+      response:
+          values:
+              - name: "status"
+                value: 0
 
     - label: "Send Numbers8"
       PICS: KEYPADINPUT.S.NK
@@ -91,6 +119,10 @@ tests:
           values:
               - name: "keyCode"
                 value: 0x28
+      response:
+          values:
+              - name: "status"
+                value: 0
 
     - label: "Send Numbers9"
       PICS: KEYPADINPUT.S.NK
@@ -99,3 +131,7 @@ tests:
           values:
               - name: "keyCode"
                 value: 0x29
+      response:
+          values:
+              - name: "status"
+                value: 0
diff --git a/src/app/tests/suites/certification/Test_TC_LVL_2_1.yaml b/src/app/tests/suites/certification/Test_TC_LVL_2_1.yaml
index 36de61c59972af..b6f4088fd15da6 100644
--- a/src/app/tests/suites/certification/Test_TC_LVL_2_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_LVL_2_1.yaml
@@ -67,6 +67,8 @@ tests:
           saveAs: CurrentLevelValue
           constraints:
               type: uint8
+              minValue: 0
+              maxValue: 255
 
     - label: "Reads the RemainingTime attribute"
       PICS: LVL.S.A0001
@@ -75,6 +77,8 @@ tests:
       response:
           constraints:
               type: uint16
+              minValue: 0
+              maxValue: 65535
 
     - label: "Reads the MinLevel attribute"
       PICS: LVL.S.A0002 && LVL.S.F01
@@ -95,7 +99,7 @@ tests:
           constraints:
               type: uint8
               minValue: 0
-              maxValue: 1
+              maxValue: 255
 
     - label: "Reads the MaxLevel attribute"
       PICS: LVL.S.A0003 && LVL.S.F01
@@ -146,6 +150,8 @@ tests:
       response:
           constraints:
               type: uint16
+              minValue: 0
+              maxValue: 65535
 
     - label: "Reads the MinFrequency attribute"
       PICS: LVL.S.A0005
@@ -155,6 +161,8 @@ tests:
           saveAs: MinFrequencyValue
           constraints:
               type: uint16
+              minValue: 0
+              maxValue: 65535
 
     - label: "Reads the MaxFrequency attribute"
       PICS: LVL.S.A0006
@@ -164,6 +172,8 @@ tests:
           saveAs: MaxFrequencyValue
           constraints:
               type: uint16
+              minValue: 0
+              maxValue: 65535
 
     - label: "Step 7b & 7C Reads the CurrentFrequency attribute"
       PICS: LVL.S.A0004 && LVL.S.A0005 && LVL.S.A0006
@@ -182,6 +192,8 @@ tests:
       response:
           constraints:
               type: uint16
+              minValue: 0
+              maxValue: 65535
 
     - label: "Reads the OnLevel attribute "
       PICS: LVL.S.F01 && LVL.S.A0011
@@ -210,6 +222,8 @@ tests:
       response:
           constraints:
               type: uint16
+              minValue: 0
+              maxValue: 65535
 
     - label: "Reads the OffTransitionTime attribute "
       PICS: LVL.S.A0013
@@ -218,6 +232,8 @@ tests:
       response:
           constraints:
               type: uint16
+              minValue: 0
+              maxValue: 65535
 
     - label: "Reads the DefaultMoveRate attribute "
       PICS: LVL.S.A0014
@@ -226,6 +242,8 @@ tests:
       response:
           constraints:
               type: uint8
+              minValue: 0
+              maxValue: 255
 
     - label: "Reads the Options attribute "
       PICS: LVL.S.A000f
@@ -243,3 +261,5 @@ tests:
       response:
           constraints:
               type: uint8
+              minValue: 0
+              maxValue: 255
diff --git a/src/app/tests/suites/certification/Test_TC_LVL_2_2.yaml b/src/app/tests/suites/certification/Test_TC_LVL_2_2.yaml
index 681e8be2b7ba6c..791618634c6cbe 100644
--- a/src/app/tests/suites/certification/Test_TC_LVL_2_2.yaml
+++ b/src/app/tests/suites/certification/Test_TC_LVL_2_2.yaml
@@ -54,6 +54,8 @@ tests:
           saveAs: OnOffTransitionTimeValue
           constraints:
               type: uint16
+              minValue: 0
+              maxValue: 65535
 
     - label: "writes the OnOffTransitionTime attribute on the DUT"
       PICS: LVL.S.A0010
@@ -80,6 +82,8 @@ tests:
           saveAs: OnLevelValue
           constraints:
               type: uint8
+              minValue: 0
+              maxValue: 255
 
     - label: "writes the OnLevel attribute on the DUT"
       PICS: LVL.S.A0011
@@ -106,6 +110,8 @@ tests:
           saveAs: OnTransitionTimeValue
           constraints:
               type: uint16
+              minValue: 0
+              maxValue: 65535
 
     - label: "Writes the OnTransitionTime attribute on the DUT"
       PICS: LVL.S.A0012
@@ -132,6 +138,8 @@ tests:
           saveAs: OffTransitionTimeValue
           constraints:
               type: uint16
+              minValue: 0
+              maxValue: 65535
 
     - label: "Writes the OffTransitionTime attribute on the DUT"
       PICS: LVL.S.A0013
@@ -158,6 +166,8 @@ tests:
           saveAs: DefaultMoveRatevalue
           constraints:
               type: uint8
+              minValue: 0
+              maxValue: 255
 
     - label: "Writes the DefaultMoveRate attribute on the DUT"
       PICS: LVL.S.A0014
@@ -184,6 +194,8 @@ tests:
           saveAs: StartUpCurrentLevelValue
           constraints:
               type: uint8
+              minValue: 0
+              maxValue: 255
 
     - label: "writes the StartUpCurrentLevel attribute on the DUT"
       PICS: LVL.S.A4000
diff --git a/src/app/tests/suites/certification/Test_TC_LVL_3_1.yaml b/src/app/tests/suites/certification/Test_TC_LVL_3_1.yaml
index b53201bb1eb4d1..df5043401010d4 100644
--- a/src/app/tests/suites/certification/Test_TC_LVL_3_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_LVL_3_1.yaml
@@ -48,6 +48,8 @@ tests:
       response:
           constraints:
               type: uint8
+              minValue: 0
+              maxValue: 255
 
     - label: "Reads the MaxLevel attribute"
       PICS: LVL.S.A0003
@@ -56,6 +58,8 @@ tests:
       response:
           constraints:
               type: uint8
+              minValue: 0
+              maxValue: 255
 
     - label: "sends a MoveToLevelWithOnOff command"
       PICS: LVL.S.C00.Rsp
@@ -151,6 +155,8 @@ tests:
       response:
           constraints:
               type: uint16
+              minValue: 0
+              maxValue: 65535
 
     # Null is not supported here 0xFFFF is considerd as Null
     - label: "sends a Move to level command"
diff --git a/src/app/tests/suites/certification/Test_TC_LVL_4_1.yaml b/src/app/tests/suites/certification/Test_TC_LVL_4_1.yaml
index d239e53e6e3f5e..f9dadfe58fbc15 100644
--- a/src/app/tests/suites/certification/Test_TC_LVL_4_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_LVL_4_1.yaml
@@ -49,6 +49,8 @@ tests:
           saveAs: MinlevelValue
           constraints:
               type: uint8
+              minValue: 0
+              maxValue: 255
 
     - label: "sends a MoveToLevelWithOnOff command"
       PICS: LVL.S.C00.Rsp
@@ -72,6 +74,8 @@ tests:
           saveAs: MaxlevelValue
           constraints:
               type: uint8
+              minValue: 0
+              maxValue: 255
 
     - label: "sends a Move up command"
       PICS: LVL.S.C01.Rsp
@@ -161,7 +165,7 @@ tests:
           value: MinlevelValue
           constraints:
               minValue: 0
-              maxValue: 1
+              maxValue: 255
 
     - label: "reads default move rate attribute from DUT"
       PICS: LVL.S.A0014
@@ -171,6 +175,8 @@ tests:
           saveAs: DefaultMoveRateValue
           constraints:
               type: uint8
+              minValue: 0
+              maxValue: 255
 
     - label: "sends a Move up command at default move rate"
       PICS: LVL.S.C05.Rsp && LVL.S.A0014
diff --git a/src/app/tests/suites/certification/Test_TC_LVL_5_1.yaml b/src/app/tests/suites/certification/Test_TC_LVL_5_1.yaml
index 8fd113b81c67cc..abcf91204efe42 100644
--- a/src/app/tests/suites/certification/Test_TC_LVL_5_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_LVL_5_1.yaml
@@ -49,6 +49,8 @@ tests:
           saveAs: MinlevelValue
           constraints:
               type: uint8
+              minValue: 0
+              maxValue: 255
 
     - label: "Sends MoveToLevelWithOnOff command to DUT"
       PICS: LVL.S.C04.Rsp
@@ -73,6 +75,8 @@ tests:
           saveAs: CurrentlevelValue
           constraints:
               type: uint8
+              minValue: 0
+              maxValue: 255
 
     - label: "Sends step up command to DUT"
       PICS: LVL.S.C02.Rsp && LVL.S.M.VarRate
diff --git a/src/app/tests/suites/certification/Test_TC_LVL_6_1.yaml b/src/app/tests/suites/certification/Test_TC_LVL_6_1.yaml
index 6502c3af9fc350..9058552ff93319 100644
--- a/src/app/tests/suites/certification/Test_TC_LVL_6_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_LVL_6_1.yaml
@@ -49,6 +49,8 @@ tests:
           saveAs: MinlevelValue
           constraints:
               type: uint8
+              minValue: 0
+              maxValue: 255
 
     - label: "Sends MoveToLevelWithOnOff command to DUT"
       PICS: LVL.S.C04.Rsp
@@ -72,7 +74,7 @@ tests:
           saveAs: CurrentLevelValue
           constraints:
               minValue: 0
-              maxValue: 1
+              maxValue: 255
 
     - label: "Sends a move up command to DUT"
       PICS: LVL.S.C01.Rsp
diff --git a/src/app/tests/suites/certification/Test_TC_OCC_2_1.yaml b/src/app/tests/suites/certification/Test_TC_OCC_2_1.yaml
index ce4861270de5c3..228b64c7dbbb78 100644
--- a/src/app/tests/suites/certification/Test_TC_OCC_2_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_OCC_2_1.yaml
@@ -66,6 +66,8 @@ tests:
           value: 0
           constraints:
               type: uint16
+              minValue: 0
+              maxValue: 65535
 
     - label: "Reads optional attribute constrains: PIRUnoccupiedToOccupiedDelay"
       PICS: OCC.S.A0011
@@ -75,6 +77,8 @@ tests:
           value: 0
           constraints:
               type: uint16
+              minValue: 0
+              maxValue: 65535
 
     - label:
           "Reads optional attribute constrains: PIRUnoccupiedToOccupiedThreshold"
@@ -96,6 +100,8 @@ tests:
           value: 0
           constraints:
               type: uint16
+              minValue: 0
+              maxValue: 65535
 
     - label: "Read attribute: UltrasonicUnoccupiedToOccupiedDelay"
       PICS: OCC.S.A0021
@@ -105,6 +111,8 @@ tests:
           value: 0
           constraints:
               type: uint16
+              minValue: 0
+              maxValue: 65535
 
     - label: "Read attribute: UltrasonicUnoccupiedToOccupiedThreshold"
       PICS: OCC.S.A0022
@@ -127,6 +135,8 @@ tests:
           value: 0
           constraints:
               type: uint16
+              minValue: 0
+              maxValue: 65535
 
     - label:
           "Reads optional attribute constrains:
@@ -138,6 +148,8 @@ tests:
           value: 0
           constraints:
               type: uint16
+              minValue: 0
+              maxValue: 65535
 
     - label:
           "Reads optional attribute constrains:
diff --git a/src/app/tests/suites/certification/Test_TC_OCC_3_1.yaml b/src/app/tests/suites/certification/Test_TC_OCC_3_1.yaml
index 8078b515f5b4d1..648e8d4a7f2422 100644
--- a/src/app/tests/suites/certification/Test_TC_OCC_3_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_OCC_3_1.yaml
@@ -37,13 +37,15 @@ tests:
           saveAs: OccupancyValue
 
     - label: "Operate on DUT to change the occupancy status"
-      PICS: OCC.M.OccupancyChange
       cluster: "LogCommands"
       command: "UserPrompt"
+      PICS: PICS_USER_PROMPT && OCC.M.OccupancyChange
       arguments:
           values:
               - name: "message"
-                value: "Operate on DUT to change the occupancy status"
+                value: "Please enter 'y' for success"
+              - name: "expectedValue"
+                value: "y"
 
     - label: "Reads back Occupancy attribute from DUT after few seconds"
       PICS: OCC.S.A0000
diff --git a/src/app/tests/suites/certification/Test_TC_OO_2_1.yaml b/src/app/tests/suites/certification/Test_TC_OO_2_1.yaml
index a8189e5a156ab3..2580de9ddd88f8 100644
--- a/src/app/tests/suites/certification/Test_TC_OO_2_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_OO_2_1.yaml
@@ -51,6 +51,8 @@ tests:
       response:
           constraints:
               type: uint16
+              minValue: 0
+              maxValue: 65535
 
     - label: "read LT attribute: OffWaitTime"
       PICS: OO.S.A4002
@@ -59,6 +61,8 @@ tests:
       response:
           constraints:
               type: uint16
+              minValue: 0
+              maxValue: 65535
 
     - label: "read LT attribute: StartUpOnOff"
       PICS: OO.S.A4003
diff --git a/src/app/tests/suites/certification/Test_TC_OO_2_2.yaml b/src/app/tests/suites/certification/Test_TC_OO_2_2.yaml
index f1084882672fe8..8181dba46b76da 100644
--- a/src/app/tests/suites/certification/Test_TC_OO_2_2.yaml
+++ b/src/app/tests/suites/certification/Test_TC_OO_2_2.yaml
@@ -134,7 +134,7 @@ tests:
 
     # Skipped this step because the above test need manual input
     - label: "Check on/off attribute value is true after on command"
-      PICS: PICS_SKIP_SAMPLE_APP
+      PICS: PICS_SKIP_SAMPLE_APP && OO.S.A0000
       command: "readAttribute"
       attribute: "OnOff"
       response:
@@ -153,7 +153,7 @@ tests:
 
     # Skipped the step because the above test need manual input
     - label: "Check on/off attribute value is false after off command"
-      PICS: PICS_SKIP_SAMPLE_APP
+      PICS: PICS_SKIP_SAMPLE_APP && OO.S.A0000
       command: "readAttribute"
       attribute: "OnOff"
       response:
diff --git a/src/app/tests/suites/certification/Test_TC_PS_2_1.yaml b/src/app/tests/suites/certification/Test_TC_PS_2_1.yaml
index d407c33dd02441..ba8ecaa297abb9 100644
--- a/src/app/tests/suites/certification/Test_TC_PS_2_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_PS_2_1.yaml
@@ -45,6 +45,8 @@ tests:
       response:
           constraints:
               type: uint8
+              minValue: 0
+              maxValue: 255
 
     - label: "Test Harness Client reads Description attribute from Server DUT"
       PICS: PS.S.A0002
@@ -63,6 +65,8 @@ tests:
       response:
           constraints:
               type: uint32
+              minValue: 0x0
+              maxValue: 0xFFFFFFFF
 
     - label:
           "Test Harness Client reads WiredAssessedInputFrequency attribute from
@@ -73,6 +77,8 @@ tests:
       response:
           constraints:
               type: uint16
+              minValue: 0
+              maxValue: 65535
 
     - label:
           "Test Harness Client reads WiredCurrentType attribute from Server DUT"
@@ -94,6 +100,8 @@ tests:
       response:
           constraints:
               type: uint32
+              minValue: 0x0
+              maxValue: 0xFFFFFFFF
 
     - label: "Test Harness Client reads WiredNominalVoltage from Server DUT"
       PICS: PICS_SKIP_SAMPLE_APP && PS.S.A0007
@@ -102,6 +110,8 @@ tests:
       response:
           constraints:
               type: uint32
+              minValue: 0x0
+              maxValue: 0xFFFFFFFF
 
     - label: "Test Harness Client reads WiredMaximumCurrent from Server DUT"
       PICS: PICS_SKIP_SAMPLE_APP && PS.S.A0008
@@ -110,6 +120,8 @@ tests:
       response:
           constraints:
               type: uint32
+              minValue: 0x0
+              maxValue: 0xFFFFFFFF
 
     - label: "Test Harness Client reads WiredPresent from Server DUT"
       PICS: PICS_SKIP_SAMPLE_APP && PS.S.A0009
@@ -135,6 +147,8 @@ tests:
       response:
           constraints:
               type: uint32
+              minValue: 0x0
+              maxValue: 0xFFFFFFFF
 
     - label: "Test Harness Client reads BatPercentRemaining from Server DUT"
       PICS: PICS_SKIP_SAMPLE_APP && PS.S.A000c
@@ -153,6 +167,8 @@ tests:
       response:
           constraints:
               type: uint32
+              minValue: 0x0
+              maxValue: 0xFFFFFFFF
 
     - label: "Test Harness Client reads BatChargeLevel from Server DUT"
       PICS: PS.S.A000e
@@ -254,6 +270,8 @@ tests:
       response:
           constraints:
               type: uint32
+              minValue: 0x0
+              maxValue: 0xFFFFFFFF
 
     - label: "Test Harness Client reads BatQuantity from Server DUT"
       PICS: PICS_SKIP_SAMPLE_APP && PS.S.A0019
@@ -262,6 +280,8 @@ tests:
       response:
           constraints:
               type: uint8
+              minValue: 0
+              maxValue: 255
 
     - label: "Test Harness Client reads BatChargeState from Server DUT"
       PICS: PICS_SKIP_SAMPLE_APP && PS.S.A001a
@@ -280,6 +300,8 @@ tests:
       response:
           constraints:
               type: uint32
+              minValue: 0x0
+              maxValue: 0xFFFFFFFF
 
     - label:
           "Test Harness Client reads BatFunctionalWhileCharging from Server DUT"
@@ -297,6 +319,8 @@ tests:
       response:
           constraints:
               type: uint32
+              minValue: 0x0
+              maxValue: 0xFFFFFFFF
 
     - label: "Test Harness Client reads ActiveBatChargeFaults from Server DUT"
       PICS: PICS_SKIP_SAMPLE_APP && PS.S.A001e
diff --git a/src/app/tests/suites/certification/Test_TC_SWTCH_2_1.yaml b/src/app/tests/suites/certification/Test_TC_SWTCH_2_1.yaml
index ed0384b4bffa88..5f0653034876bf 100644
--- a/src/app/tests/suites/certification/Test_TC_SWTCH_2_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_SWTCH_2_1.yaml
@@ -45,6 +45,7 @@ tests:
           constraints:
               type: uint8
               minValue: 0
+              maxValue: 255
 
     - label: "Read MultiPressMax attribute"
       PICS: SWTCH.S.F04
@@ -55,3 +56,4 @@ tests:
           constraints:
               type: uint8
               minValue: 2
+              maxValue: 255
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 3b5c550a1a67fe..a58b42e1735c7d 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
@@ -41,6 +41,8 @@ tests:
       response:
           constraints:
               type: uint8
+              minValue: 0
+              maxValue: 255
 
     - label: "Reads the TargetList attribute"
       PICS: TGTNAV.S.A0000
diff --git a/src/app/tests/suites/certification/Test_TC_TMP_2_1.yaml b/src/app/tests/suites/certification/Test_TC_TMP_2_1.yaml
index b7f6cccbb72407..4b0018e94e38df 100644
--- a/src/app/tests/suites/certification/Test_TC_TMP_2_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_TMP_2_1.yaml
@@ -35,6 +35,8 @@ tests:
       response:
           constraints:
               type: int16
+              minValue: -27315
+              maxValue: 32767
 
     - label: "read the mandatory attribute: MinMeasuredValue"
       PICS: TMP.S.A0001
@@ -44,7 +46,7 @@ tests:
           constraints:
               type: int16
               minValue: -27315
-              maxValue: 32766
+              maxValue: 32767
 
     - label: "read the mandatory attribute: MaxMeasuredValue"
       PICS: TMP.S.A0002
@@ -58,7 +60,6 @@ tests:
 
     - label: "read the optional attribute: Tolerance"
       PICS: TMP.S.A0003
-      optional: true
       command: "readAttribute"
       attribute: "Tolerance"
       response:
diff --git a/src/app/tests/suites/certification/Test_TC_TMP_2_2.yaml b/src/app/tests/suites/certification/Test_TC_TMP_2_2.yaml
index 63f75f05f0dc4e..c0ee0370643242 100644
--- a/src/app/tests/suites/certification/Test_TC_TMP_2_2.yaml
+++ b/src/app/tests/suites/certification/Test_TC_TMP_2_2.yaml
@@ -56,6 +56,8 @@ tests:
           saveAs: valueBeforeChange
           constraints:
               type: uint16
+              minValue: 0
+              maxValue: 65535
 
     - label: "Operate on device to change the temperature significantly"
       cluster: "LogCommands"
@@ -75,4 +77,6 @@ tests:
       response:
           constraints:
               type: uint16
+              minValue: 0
+              maxValue: 65535
               notValue: valueBeforeChange
diff --git a/src/app/tests/suites/certification/Test_TC_TSTAT_2_1.yaml b/src/app/tests/suites/certification/Test_TC_TSTAT_2_1.yaml
index 52a27e40c3a941..31f03c229dd4b6 100644
--- a/src/app/tests/suites/certification/Test_TC_TSTAT_2_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_TSTAT_2_1.yaml
@@ -35,6 +35,8 @@ tests:
       response:
           constraints:
               type: int16
+              minValue: -27315
+              maxValue: 32767
 
     - label: "Read OutdoorTemperature attribute from the DUT"
       PICS: TSTAT.S.A0001
@@ -43,6 +45,8 @@ tests:
       response:
           constraints:
               type: int16
+              minValue: -27315
+              maxValue: 32767
 
     - label: "Read Occupancy attribute from the DUT"
       PICS: TSTAT.S.A0002
@@ -61,8 +65,8 @@ tests:
       response:
           constraints:
               type: int16
-              minValue: 700
-              maxValue: 3000
+              minValue: -27315
+              maxValue: 32767
 
     - label: "Reads mandatory attributes from DUT: AbsMaxHeatSetpointLimit"
       PICS: TSTAT.S.A0004
@@ -71,8 +75,8 @@ tests:
       response:
           constraints:
               type: int16
-              minValue: 700
-              maxValue: 3000
+              minValue: -27315
+              maxValue: 32767
 
     - label: "Reads optional attributes from DUT: AbsMinCoolSetpointLimit"
       PICS: TSTAT.S.A0005
@@ -81,8 +85,8 @@ tests:
       response:
           constraints:
               type: int16
-              minValue: 1600
-              maxValue: 3200
+              minValue: -27315
+              maxValue: 32767
 
     - label: "Reads optional attributes from DUT: AbsMaxCoolSetpointLimit"
       PICS: TSTAT.S.A0006
@@ -91,8 +95,8 @@ tests:
       response:
           constraints:
               type: int16
-              minValue: 1600
-              maxValue: 3200
+              minValue: -27315
+              maxValue: 32767
 
     - label: "Read PICoolingDemand attribute from the DUT"
       PICS: TSTAT.S.A0007
@@ -141,8 +145,8 @@ tests:
       response:
           constraints:
               type: int16
-              minValue: 1600
-              maxValue: 2600
+              minValue: -27315
+              maxValue: 32767
 
     - label: "Reads mandatory attributes from DUT: OccupiedHeatingSetpoint"
       PICS: TSTAT.S.A0012
@@ -151,8 +155,8 @@ tests:
       response:
           constraints:
               type: int16
-              minValue: 700
-              maxValue: 2600
+              minValue: -27315
+              maxValue: 32767
 
     - label: "Read UnoccupiedCoolingSetpoint attribute from the DUT"
       PICS: TSTAT.S.A0013
@@ -161,6 +165,8 @@ tests:
       response:
           constraints:
               type: int16
+              minValue: -27315
+              maxValue: 32767
 
     - label: "Read UnoccupiedHeatingSetpoint attribute from the DUT"
       PICS: TSTAT.S.A0014
@@ -169,6 +175,8 @@ tests:
       response:
           constraints:
               type: int16
+              minValue: -27315
+              maxValue: 32767
 
     - label: "Reads mandatory attributes from DUT: MinHeatSetpointLimit"
       PICS: TSTAT.S.A0015
@@ -177,6 +185,8 @@ tests:
       response:
           constraints:
               type: int16
+              minValue: -27315
+              maxValue: 32767
 
     - label: "Reads mandatory attributes from DUT: MaxHeatSetpointLimit"
       PICS: TSTAT.S.A0016
@@ -185,8 +195,8 @@ tests:
       response:
           constraints:
               type: int16
-              minValue: 700
-              maxValue: 3000
+              minValue: -27315
+              maxValue: 32767
 
     - label: "Reads optional attributes from DUT: MinCoolSetpointLimit"
       PICS: TSTAT.S.A0017
@@ -195,8 +205,8 @@ tests:
       response:
           constraints:
               type: int16
-              minValue: 1600
-              maxValue: 3200
+              minValue: -27315
+              maxValue: 32767
 
     - label: "Reads optional attributes from DUT: MaxCoolSetpointLimit"
       PICS: TSTAT.S.A0018
@@ -205,8 +215,8 @@ tests:
       response:
           constraints:
               type: int16
-              minValue: 1600
-              maxValue: 3200
+              minValue: -27315
+              maxValue: 32767
 
     - label: "Reads optional attributes from DUT: MinSetpointDeadBand"
       PICS: TSTAT.S.A0019
@@ -321,6 +331,8 @@ tests:
       response:
           constraints:
               type: uint8
+              minValue: 0
+              maxValue: 255
 
     - label: "Reads optional attributes from DUT: NumberOfDailyTransitions"
       PICS: TSTAT.S.A0022
@@ -329,6 +341,8 @@ tests:
       response:
           constraints:
               type: uint8
+              minValue: 0
+              maxValue: 255
 
     - label: "Read TemperatureSetpointHold attribute from the DUT"
       PICS: TSTAT.S.A0023
@@ -387,6 +401,8 @@ tests:
       response:
           constraints:
               type: int16
+              minValue: -27315
+              maxValue: 32767
 
     - label: "Read SetpointChangeSourceTimestamp attribute from the DUT"
       PICS: TSTAT.S.A0032
@@ -403,6 +419,8 @@ tests:
       response:
           constraints:
               type: uint8
+              minValue: 0
+              maxValue: 255
 
     - label: "Read OccupiedSetbackMin attribute from the DUT"
       PICS: TSTAT.S.A0035
@@ -411,6 +429,8 @@ tests:
       response:
           constraints:
               type: uint8
+              minValue: 0
+              maxValue: 255
 
     - label: "Read OccupiedSetbackMax attribute from the DUT"
       PICS: TSTAT.S.A0036
@@ -419,6 +439,8 @@ tests:
       response:
           constraints:
               type: uint8
+              minValue: 0
+              maxValue: 255
 
     - label: "Read UnoccupiedSetback attribute from the DUT"
       PICS: TSTAT.S.A0037
@@ -427,6 +449,8 @@ tests:
       response:
           constraints:
               type: uint8
+              minValue: 0
+              maxValue: 255
 
     - label: "Read UnoccupiedSetbackMin attribute from the DUT"
       PICS: TSTAT.S.A0038
@@ -435,6 +459,8 @@ tests:
       response:
           constraints:
               type: uint8
+              minValue: 0
+              maxValue: 255
 
     - label: "Read UnoccupiedSetbackMax attribute from the DUT"
       PICS: TSTAT.S.A0039
@@ -443,6 +469,8 @@ tests:
       response:
           constraints:
               type: uint8
+              minValue: 0
+              maxValue: 255
 
     - label: "Read EmergencyHeatDelta attribute from the DUT"
       PICS: TSTAT.S.A003a
@@ -451,6 +479,8 @@ tests:
       response:
           constraints:
               type: uint8
+              minValue: 0
+              maxValue: 255
 
     - label: "Read ACType attribute from the DUT"
       PICS: TSTAT.S.A0040
@@ -469,6 +499,8 @@ tests:
       response:
           constraints:
               type: uint16
+              minValue: 0
+              maxValue: 65535
 
     - label: "Read ACRefrigerantType attribute from the DUT"
       PICS: TSTAT.S.A0042
@@ -515,6 +547,8 @@ tests:
       response:
           constraints:
               type: int16
+              minValue: -27315
+              maxValue: 32767
 
     - label: "Read ACCapacityFormat attribute from the DUT"
       PICS: TSTAT.S.A0047