diff --git a/.gitignore b/.gitignore
index a53e0ca21a4fd8..5baec0fd0ed020 100644
--- a/.gitignore
+++ b/.gitignore
@@ -63,4 +63,5 @@ compile_commands.json
 *~
 
 # log files
-*.log
\ No newline at end of file
+*.log
+examples/thermostat/ameba/build
diff --git a/src/app/tests/suites/certification/PICS.yaml b/src/app/tests/suites/certification/PICS.yaml
index 4d8b397123af95..fd98cdb94a8322 100644
--- a/src/app/tests/suites/certification/PICS.yaml
+++ b/src/app/tests/suites/certification/PICS.yaml
@@ -602,11 +602,17 @@ PICS:
       id: DGSW.S.C00
 
       # Thermostat cluster
-    - label: "Does the device implement the OccupiedCoolingSetpoint attribute"
-      id: A_OCCUPIEDCOOLINGSETPOINT
+    - label: "Does the device implement the Heating feature"
+      id: TSTAT.S.F00
 
-    - label: "Does the device implement the OccupiedHeatingSetpoint attribute"
-      id: A_OCCUPIEDHEATINGSETPOINT
+    - label: "Does the device implement the Cooling feature"
+      id: TSTAT.S.F01
+
+    - label: "Does the device implement the Occupancy feature"
+      id: TSTAT.S.F02
+
+    - label: "Does the device implement the Auto feature"
+      id: TSTAT.S.F05
 
     - label: "Does the device implement the MinHeatSetpointLimit attribute"
       id: A_MINHEATSETPOINTLIMIT
@@ -620,24 +626,8 @@ PICS:
     - label: "Does the device implement the MaxCoolSetpointLimit attribute"
       id: A_MAXCOOLSETPOINTLIMIT
 
-    - label:
-          "Does the device implement the ControlSequenceOfOperation attribute"
-      id: A_CONTROLSEQUENCEOFOPERATION
-
-    - label:
-          "Does the device implement receiving the SetpointRaiseLower command?"
-      id: CR_SetpointRaiseLower
-
-    - label:
-          "Does the device implement the UnoccupiedCoolingSetpoint attribute?"
-      id: A_UNOCCUPIEDCOOLINGSETPOINT
-
-    - label:
-          "Does the device implement the UnoccupiedHeatingSetpoint attribute?"
-      id: A_UNOCCUPIEDHEATINGSETPOINT
-
-    - label: "Does the device implement the MinSetpointDeadBand attribute?"
-      id: A_MINSETPOINTDEADBAND
+    - label: "Does the device implement the Tolerance attribute?"
+      id: A_TEMPERATURE_TOLERANCE
 
     - label: "Does the device implement the Tolerance attribute?"
       id: A_TEMPERATURE_TOLERANCE
diff --git a/src/app/tests/suites/certification/Test_TC_TSTAT_1_1.yaml b/src/app/tests/suites/certification/Test_TC_TSTAT_1_1.yaml
index 8fbcb156eb24d1..1b4a2ce115e2af 100644
--- a/src/app/tests/suites/certification/Test_TC_TSTAT_1_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_TSTAT_1_1.yaml
@@ -37,9 +37,6 @@ tests:
               type: uint16
 
     - label: "Read the optional global attribute constraints: FeatureMap"
-      PICS:
-          ( TSTAT_HEAT || TSTAT_COOL || TSTAT_OCC || TSTAT_SCH || TSTAT_SB ||
-          TSTAT_AUTO )
       command: "readAttribute"
       attribute: "FeatureMap"
       response:
diff --git a/src/app/tests/suites/certification/Test_TC_TSTAT_2_2.yaml b/src/app/tests/suites/certification/Test_TC_TSTAT_2_2.yaml
index 752468f829e576..6dadfb58e7005e 100644
--- a/src/app/tests/suites/certification/Test_TC_TSTAT_2_2.yaml
+++ b/src/app/tests/suites/certification/Test_TC_TSTAT_2_2.yaml
@@ -31,44 +31,39 @@ tests:
     - label:
           "Reads OccupiedCoolingSetpoint attribute from Server DUT and verifies
           that the value is within range"
-      optional: true
       command: "readAttribute"
       attribute: "OccupiedCoolingSetpoint"
-      PICS: A_OCCUPIEDCOOLINGSETPOINT
+      PICS: TSTAT.S.F01
       response:
-          value: 2600
           constraints:
               type: int16
               minValue: 1600
-              maxValue: 2600
+              maxValue: 3200
 
     - label:
           "Writes a value back that is different but valid for
           OccupiedCoolingSetpoint attribute"
-      optional: true
       command: "writeAttribute"
       attribute: "OccupiedCoolingSetpoint"
-      PICS: A_OCCUPIEDCOOLINGSETPOINT
+      PICS: TSTAT.S.F01
       arguments:
-          value: 2250
+          value: 2500
 
     - label:
           "Reads it back again to confirm the successful write of
           OccupiedCoolingSetpoint attribute"
-      optional: true
       command: "readAttribute"
       attribute: "OccupiedCoolingSetpoint"
-      PICS: A_OCCUPIEDCOOLINGSETPOINT
+      PICS: TSTAT.S.F01
       response:
-          value: 2250
+          value: 2500
 
     - label:
           "Writes OccupiedCoolingSetpoint to value below the
-          MinCoolSetpointLimit"
-      optional: true
+          ABSMinCoolSetpointLimit"
       command: "writeAttribute"
       attribute: "OccupiedCoolingSetpoint"
-      PICS: A_OCCUPIEDCOOLINGSETPOINT
+      PICS: TSTAT.S.F01
       arguments:
           value: 30
       response:
@@ -77,48 +72,50 @@ tests:
     - label:
           "Writes OccupiedCoolingSetpoint to value above the
           MaxCoolSetpointLimit"
-      optional: true
       command: "writeAttribute"
       attribute: "OccupiedCoolingSetpoint"
-      PICS: A_OCCUPIEDCOOLINGSETPOINT
+      PICS: TSTAT.S.F01
       arguments:
           value: 4000
       response:
           error: CONSTRAINT_ERROR
 
-    # Disabled: This test makes no sense: It's setting OccupiedCoolingSetpoint
-    # to below OccupiedHeatingSetpoint.
-    # See https://github.com/CHIP-Specifications/chip-test-plans/issues/1379
     - label:
           "Writes the limit of MinCoolSetpointLimit to OccupiedCoolingSetpoint
           attribute"
-      disabled: true
-      optional: true
       command: "writeAttribute"
       attribute: "OccupiedCoolingSetpoint"
-      PICS: A_OCCUPIEDCOOLINGSETPOINT
+      PICS: TSTAT.S.F01 && !TSTAT.S.F05
       arguments:
           value: 1600
 
+    - label:
+          "Writes the CoolingSetpoint below the HeatingSetpoint when auto is
+          enabled"
+      command: "writeAttribute"
+      attribute: "OccupiedCoolingSetpoint"
+      PICS: TSTAT.S.F05
+      arguments:
+          value: 1600
+      response:
+          error: CONSTRAINT_ERROR
+
     - label:
           "Writes the limit of MaxCoolSetpointLimit to OccupiedCoolingSetpoint
           attribute"
-      optional: true
       command: "writeAttribute"
       attribute: "OccupiedCoolingSetpoint"
-      PICS: A_OCCUPIEDCOOLINGSETPOINT
+      PICS: TSTAT.S.F01
       arguments:
-          value: 2600
+          value: 3200
 
     - label:
           "Reads OccupiedHeatingSetpoint attribute from Server DUT and verifies
           that the value is within range"
-      optional: true
       command: "readAttribute"
       attribute: "OccupiedHeatingSetpoint"
-      PICS: A_OCCUPIEDHEATINGSETPOINT
+      PICS: TSTAT.S.F00
       response:
-          value: 2000
           constraints:
               type: int16
               minValue: 700
@@ -127,30 +124,27 @@ tests:
     - label:
           "Writes a value back that is different but valid for
           OccupiedHeatingSetpoint attribute"
-      optional: true
       command: "writeAttribute"
       attribute: "OccupiedHeatingSetpoint"
-      PICS: A_OCCUPIEDHEATINGSETPOINT
+      PICS: TSTAT.S.F00
       arguments:
           value: 2100
 
     - label:
           "Reads it back again to confirm the successful write of
           OccupiedHeatingSetpoint attribute"
-      optional: true
       command: "readAttribute"
       attribute: "OccupiedHeatingSetpoint"
-      PICS: A_OCCUPIEDHEATINGSETPOINT
+      PICS: TSTAT.S.F00
       response:
           value: 2100
 
     - label:
           "Writes OccupiedHeatingSetpoint to value below the
           MinHeatSetpointLimit"
-      optional: true
       command: "writeAttribute"
       attribute: "OccupiedHeatingSetpoint"
-      PICS: A_OCCUPIEDHEATINGSETPOINT
+      PICS: TSTAT.S.F00
       arguments:
           value: 600
       response:
@@ -159,10 +153,9 @@ tests:
     - label:
           "Writes OccupiedHeatingSetpoint to value above the
           MaxHeatSetpointLimit"
-      optional: true
       command: "writeAttribute"
       attribute: "OccupiedHeatingSetpoint"
-      PICS: A_OCCUPIEDHEATINGSETPOINT
+      PICS: TSTAT.S.F00
       arguments:
           value: 4010
       response:
@@ -171,34 +164,47 @@ tests:
     - label:
           "Writes the limit of MinHeatSetpointLimit to OccupiedHeatingSetpoint
           attribute"
-      optional: true
       command: "writeAttribute"
       attribute: "OccupiedHeatingSetpoint"
-      PICS: A_OCCUPIEDHEATINGSETPOINT
+      PICS: TSTAT.S.F00
       arguments:
           value: 700
 
-    # Disabled: This test makes no sense: It's setting OccupiedHeatingSetpoint
-    # to above OccupiedCoolingSetpoint.
-    # See https://github.com/CHIP-Specifications/chip-test-plans/issues/1379
+    - label:
+          "Reads it back again to confirm the successful write of
+          OccupiedHeatingSetpoint attribute"
+      command: "readAttribute"
+      attribute: "OccupiedHeatingSetpoint"
+      PICS: TSTAT.S.F00
+      response:
+          value: 700
+
+    - label:
+          "Writes the limit of MaxHeatSetpointLimit to OccupiedHeatingSetpoint
+          attribute"
+      command: "writeAttribute"
+      attribute: "OccupiedHeatingSetpoint"
+      PICS: TSTAT.S.F00 && !TSTAT.S.F05
+      arguments:
+          value: 3000
+
     - label:
           "Writes the limit of MaxHeatSetpointLimit to OccupiedHeatingSetpoint
           attribute"
-      disabled: true
-      optional: true
       command: "writeAttribute"
       attribute: "OccupiedHeatingSetpoint"
-      PICS: A_OCCUPIEDHEATINGSETPOINT
+      PICS: TSTAT.S.F05
       arguments:
           value: 3000
+      response:
+          error: CONSTRAINT_ERROR
 
     - label:
           "Reads UnoccupiedCoolingSetpoint attribute from Server DUT and
           verifies that the value is within range"
-      optional: true
       command: "readAttribute"
       attribute: "UnoccupiedCoolingSetpoint"
-      PICS: A_UNOCCUPIEDCOOLINGSETPOINT
+      PICS: TSTAT.S.F02 && TSTAT.S.F01
       response:
           value: 2600
           constraints:
@@ -209,30 +215,27 @@ tests:
     - label:
           "Writes a value back that is different but valid for
           UnoccupiedCoolingSetpoint attribute"
-      optional: true
       command: "writeAttribute"
       attribute: "UnoccupiedCoolingSetpoint"
-      PICS: A_UNOCCUPIEDCOOLINGSETPOINT
+      PICS: TSTAT.S.F02 && TSTAT.S.F01
       arguments:
           value: 2500
 
     - label:
           "Reads it back again to confirm the successful write of
           UnoccupiedCoolingSetpoint attribute"
-      optional: true
       command: "readAttribute"
       attribute: "UnoccupiedCoolingSetpoint"
-      PICS: A_UNOCCUPIEDCOOLINGSETPOINT
+      PICS: TSTAT.S.F02 && TSTAT.S.F01
       response:
           value: 2500
 
     - label:
           "Writes UnoccupiedCoolingSetpoint to value below the
-          MinHeatSetpointLimit"
-      optional: true
+          MinCoolSetpointLimit"
       command: "writeAttribute"
       attribute: "UnoccupiedCoolingSetpoint"
-      PICS: A_UNOCCUPIEDCOOLINGSETPOINT
+      PICS: TSTAT.S.F02 && TSTAT.S.F01
       arguments:
           value: 1002
       response:
@@ -240,11 +243,10 @@ tests:
 
     - label:
           "Writes UnoccupiedCoolingSetpoint to value above the
-          MaxHeatSetpointLimit"
-      optional: true
+          MaxCoolSetpointLimit"
       command: "writeAttribute"
       attribute: "UnoccupiedCoolingSetpoint"
-      PICS: A_UNOCCUPIEDCOOLINGSETPOINT
+      PICS: TSTAT.S.F02 && TSTAT.S.F01
       arguments:
           value: 4010
       response:
@@ -253,30 +255,27 @@ tests:
     - label:
           "Writes the limit of MinCoolSetpointLimit to UnoccupiedCoolingSetpoint
           attribute"
-      optional: true
       command: "writeAttribute"
       attribute: "UnoccupiedCoolingSetpoint"
-      PICS: A_UNOCCUPIEDCOOLINGSETPOINT
+      PICS: TSTAT.S.F02 && TSTAT.S.F01
       arguments:
           value: 1800
 
     - label:
           "Writes the limit of MaxCoolSetpointLimit to UnoccupiedCoolingSetpoint
           attribute"
-      optional: true
       command: "writeAttribute"
       attribute: "UnoccupiedCoolingSetpoint"
-      PICS: A_UNOCCUPIEDCOOLINGSETPOINT
+      PICS: TSTAT.S.F02 && TSTAT.S.F01
       arguments:
           value: 3000
 
     - label:
           "Reads UnoccupiedHeatingSetpoint attribute from Server DUT and
           verifies that the value is within range"
-      optional: true
       command: "readAttribute"
       attribute: "UnoccupiedHeatingSetpoint"
-      PICS: A_UNOCCUPIEDHEATINGSETPOINT
+      PICS: TSTAT.S.F02 && TSTAT.S.F00
       response:
           value: 2000
           constraints:
@@ -287,30 +286,28 @@ tests:
     - label:
           "Writes a value back that is different but valid for
           UnoccupiedHeatingSetpoint attribute"
-      optional: true
+
       command: "writeAttribute"
       attribute: "UnoccupiedHeatingSetpoint"
-      PICS: A_UNOCCUPIEDHEATINGSETPOINT
+      PICS: TSTAT.S.F02 && TSTAT.S.F00
       arguments:
           value: 2500
 
     - label:
           "Reads it back again to confirm the successful write of
           UnoccupiedHeatingSetpoint attribute"
-      optional: true
       command: "readAttribute"
       attribute: "UnoccupiedHeatingSetpoint"
-      PICS: A_UNOCCUPIEDHEATINGSETPOINT
+      PICS: TSTAT.S.F02 && TSTAT.S.F00
       response:
           value: 2500
 
     - label:
           "Writes UnoccupiedHeatingSetpoint to value below the
           MinHeatSetpointLimit"
-      optional: true
       command: "writeAttribute"
       attribute: "UnoccupiedHeatingSetpoint"
-      PICS: A_UNOCCUPIEDHEATINGSETPOINT
+      PICS: TSTAT.S.F02 && TSTAT.S.F00
       arguments:
           value: 500
       response:
@@ -319,10 +316,9 @@ tests:
     - label:
           "Writes UnoccupiedHeatingSetpoint to value above the
           MaxHeatSetpointLimit"
-      optional: true
       command: "writeAttribute"
       attribute: "UnoccupiedHeatingSetpoint"
-      PICS: A_UNOCCUPIEDHEATINGSETPOINT
+      PICS: TSTAT.S.F02 && TSTAT.S.F00
       arguments:
           value: 4010
       response:
@@ -331,30 +327,27 @@ tests:
     - label:
           "Writes the limit of MinHeatSetpointLimit to UnoccupiedHeatingSetpoint
           attribute"
-      optional: true
       command: "writeAttribute"
       attribute: "UnoccupiedHeatingSetpoint"
-      PICS: A_UNOCCUPIEDHEATINGSETPOINT
+      PICS: TSTAT.S.F02 && TSTAT.S.F00
       arguments:
           value: 1800
 
     - label:
           "Writes the limit of MaxHeatSetpointLimit to UnoccupiedHeatingSetpoint
           attribute"
-      optional: true
       command: "writeAttribute"
       attribute: "UnoccupiedHeatingSetpoint"
-      PICS: A_UNOCCUPIEDHEATINGSETPOINT
+      PICS: TSTAT.S.F02 && TSTAT.S.F00
       arguments:
           value: 3000
 
     - label:
           "Reads MinHeatSetpointLimit attribute from Server DUT and verifies
           that the value is within range"
-      optional: true
       command: "readAttribute"
       attribute: "MinHeatSetpointLimit"
-      PICS: A_MINHEATSETPOINTLIMIT
+      PICS: TSTAT.S.F00 && A_MINHEATSETPOINTLIMIT
       response:
           value: 700
           constraints:
@@ -362,41 +355,39 @@ tests:
               minValue: 700
               maxValue: 3000
 
-    # Disabled: This test makes no sense: It's setting MinHeatSetpointLimit
-    # to above MinCoolSetpointLimit when AUTO is supported, which is not
-    # allowed.
-    # See https://github.com/CHIP-Specifications/chip-test-plans/issues/1379
     - label:
           "Writes a value back that is different but valid for
           MinHeatSetpointLimit attribute"
-      disabled: true
-      optional: true
       command: "writeAttribute"
       attribute: "MinHeatSetpointLimit"
-      PICS: A_MINHEATSETPOINTLIMIT
+      PICS: TSTAT.S.F00 && A_MINHEATSETPOINTLIMIT
       arguments:
-          value: 2000
+          value: 800
 
-    # Disabled: Because the previous set is disabled.
-    # See https://github.com/CHIP-Specifications/chip-test-plans/issues/1379
     - label:
           "Reads it back again to confirm the successful write of
           MinHeatSetpointLimit attribute"
-      disabled: true
-      optional: true
       command: "readAttribute"
       attribute: "MinHeatSetpointLimit"
-      PICS: A_MINHEATSETPOINTLIMIT
+      PICS: TSTAT.S.F00  && A_MINHEATSETPOINTLIMIT
       response:
+          value: 800
+
+    - label: "Writes a value back that is different but violates the deadband"
+      command: "writeAttribute"
+      attribute: "MinHeatSetpointLimit"
+      PICS: A_MINHEATSETPOINTLIMIT && TSTAT.S.F05
+      arguments:
           value: 2000
+      response:
+          error: CONSTRAINT_ERROR
 
     - label:
           "Writes MinHeatSetpointLimit to value below the
           AbsMinHeatSetpointLimit "
-      optional: true
       command: "writeAttribute"
       attribute: "MinHeatSetpointLimit"
-      PICS: A_MINHEATSETPOINTLIMIT
+      PICS: TSTAT.S.F00 && A_MINHEATSETPOINTLIMIT
       arguments:
           value: 650
       response:
@@ -405,10 +396,9 @@ tests:
     - label:
           "Writes MinHeatSetpointLimit to value above the
           AbsMaxHeatSetpointLimit "
-      optional: true
       command: "writeAttribute"
       attribute: "MinHeatSetpointLimit"
-      PICS: A_MINHEATSETPOINTLIMIT
+      PICS: TSTAT.S.F00  && A_MINHEATSETPOINTLIMIT
       arguments:
           value: 4050
       response:
@@ -417,36 +407,27 @@ tests:
     - label:
           "Writes the limit of AbsMinHeatSetpointLimit to MinHeatSetpointLimit
           attribute"
-      optional: true
       command: "writeAttribute"
       attribute: "MinHeatSetpointLimit"
-      PICS: A_MINHEATSETPOINTLIMIT
+      PICS: TSTAT.S.F00  && A_MINHEATSETPOINTLIMIT
       arguments:
           value: 700
 
-    # Disabled: This test makes no sense: It's setting MinHeatSetpointLimit
-    # to higher than what we have various cooling limits set to.
-    # See https://github.com/CHIP-Specifications/chip-test-plans/issues/1379
     - label:
           "Writes the limit of AbsMaxHeatSetpointLimit to MinHeatSetpointLimit
           attribute"
-      disabled: true
-      optional: true
       command: "writeAttribute"
       attribute: "MinHeatSetpointLimit"
-      PICS: A_MINHEATSETPOINTLIMIT
+      PICS: TSTAT.S.F00  && A_MINHEATSETPOINTLIMIT && !TSTAT.S.F05
       arguments:
           value: 3000
 
-    # Disabled: Because the preceding write is disabled.
     - label:
           "Reads MaxHeatSetpointLimit attribute from Server DUT and verifies
           that the value is within range"
-      disabled: true
-      optional: true
       command: "readAttribute"
       attribute: "MaxHeatSetpointLimit"
-      PICS: A_MAXHEATSETPOINTLIMIT
+      PICS: TSTAT.S.F00  && A_MAXHEATSETPOINTLIMIT && !TSTAT.S.F05
       response:
           value: 3000
           constraints:
@@ -454,33 +435,50 @@ tests:
               minValue: 700
               maxValue: 3000
 
+    - label:
+          "Writes the limit of AbsMinHeatSetpointLimit to MinHeatSetpointLimit
+          attribute"
+      command: "writeAttribute"
+      attribute: "MinHeatSetpointLimit"
+      PICS: TSTAT.S.F00  && A_MINHEATSETPOINTLIMIT
+      arguments:
+          value: 700
+
+    - label:
+          "Writes the limit of AbsMaxHeatSetpointLimit to MinHeatSetpointLimit
+          attribute"
+      command: "writeAttribute"
+      attribute: "MinHeatSetpointLimit"
+      PICS: A_MINHEATSETPOINTLIMIT && TSTAT.S.F05
+      arguments:
+          value: 3000
+      response:
+          error: CONSTRAINT_ERROR
+
     - label:
           "Writes a value back that is different but valid for
           MaxHeatSetpointLimit attribute"
-      optional: true
       command: "writeAttribute"
       attribute: "MaxHeatSetpointLimit"
-      PICS: A_MAXHEATSETPOINTLIMIT
+      PICS: TSTAT.S.F00 && A_MAXHEATSETPOINTLIMIT && !TSTAT.S.F05
       arguments:
-          value: 2000
+          value: 2900
 
     - label:
           "Reads it back again to confirm the successful write of
           MaxHeatSetpointLimit attribute"
-      optional: true
       command: "readAttribute"
       attribute: "MaxHeatSetpointLimit"
-      PICS: A_MAXHEATSETPOINTLIMIT
+      PICS: TSTAT.S.F00 && A_MAXHEATSETPOINTLIMIT && !TSTAT.S.F05
       response:
-          value: 2000
+          value: 2900
 
     - label:
           "Writes MaxHeatSetpointLimit to value below the
           AbsMinHeatSetpointLimit "
-      optional: true
       command: "writeAttribute"
       attribute: "MaxHeatSetpointLimit"
-      PICS: A_MAXHEATSETPOINTLIMIT
+      PICS: TSTAT.S.F00  && A_MAXHEATSETPOINTLIMIT
       arguments:
           value: 500
       response:
@@ -489,10 +487,9 @@ tests:
     - label:
           "Writes MaxHeatSetpointLimit to value above the
           AbsMaxHeatSetpointLimit "
-      optional: true
       command: "writeAttribute"
       attribute: "MaxHeatSetpointLimit"
-      PICS: A_MAXHEATSETPOINTLIMIT
+      PICS: TSTAT.S.F00  && A_MAXHEATSETPOINTLIMIT
       arguments:
           value: 4000
       response:
@@ -501,34 +498,27 @@ tests:
     - label:
           "Writes the limit of AbsMinHeatSetpointLimit to MaxHeatSetpointLimit
           attribute"
-      optional: true
       command: "writeAttribute"
       attribute: "MaxHeatSetpointLimit"
-      PICS: A_MAXHEATSETPOINTLIMIT
+      PICS: TSTAT.S.F00  && A_MAXHEATSETPOINTLIMIT
       arguments:
           value: 700
 
-    # Disabled: This test makes no sense: It's setting MaxHeatSetpointLimit to
-    # a value too close to MaxCoolSetpointLimit, ignoring deadband.
-    # See https://github.com/CHIP-Specifications/chip-test-plans/issues/1379
     - label:
           "Writes the limit of AbsMaxHeatSetpointLimit to MaxHeatSetpointLimit
           attribute"
-      disabled: true
-      optional: true
       command: "writeAttribute"
       attribute: "MaxHeatSetpointLimit"
-      PICS: A_MAXHEATSETPOINTLIMIT
+      PICS: TSTAT.S.F00  && A_MAXHEATSETPOINTLIMIT && !TSTAT.S.F05
       arguments:
           value: 3000
 
     - label:
           "Reads MinCoolSetpointLimit attribute from Server DUT and verifies
           that the value is within range"
-      optional: true
       command: "readAttribute"
       attribute: "MinCoolSetpointLimit"
-      PICS: A_MINCOOLSETPOINTLIMIT
+      PICS: TSTAT.S.F01 && A_MINCOOLSETPOINTLIMIT
       response:
           value: 1600
           constraints:
@@ -539,30 +529,27 @@ tests:
     - label:
           "Writes a value back that is different but valid for
           MinCoolSetpointLimit attribute"
-      optional: true
       command: "writeAttribute"
       attribute: "MinCoolSetpointLimit"
-      PICS: A_MINCOOLSETPOINTLIMIT
+      PICS: TSTAT.S.F01 && A_MINCOOLSETPOINTLIMIT
       arguments:
           value: 2000
 
     - label:
           "Reads it back again to confirm the successful write of
           MinCoolSetpointLimit attribute"
-      optional: true
       command: "readAttribute"
       attribute: "MinCoolSetpointLimit"
-      PICS: A_MINCOOLSETPOINTLIMIT
+      PICS: TSTAT.S.F01 && A_MINCOOLSETPOINTLIMIT
       response:
           value: 2000
 
     - label:
           "Writes MinCoolSetpointLimit to value below the
           AbsMinCoolSetpointLimit "
-      optional: true
       command: "writeAttribute"
       attribute: "MinCoolSetpointLimit"
-      PICS: A_MINCOOLSETPOINTLIMIT
+      PICS: TSTAT.S.F01 && A_MINCOOLSETPOINTLIMIT
       arguments:
           value: 1000
       response:
@@ -570,10 +557,9 @@ tests:
 
     - label:
           "Writes MinCoolSetpointLimit to value above the MaxCoolSetpointLimit "
-      optional: true
       command: "writeAttribute"
       attribute: "MinCoolSetpointLimit"
-      PICS: A_MINCOOLSETPOINTLIMIT
+      PICS: TSTAT.S.F01 && A_MINCOOLSETPOINTLIMIT
       arguments:
           value: 4000
       response:
@@ -582,30 +568,36 @@ tests:
     - label:
           "Writes the limit of AbsMinCoolSetpointLimit to MinCoolSetpointLimit
           attribute"
-      optional: true
       command: "writeAttribute"
       attribute: "MinCoolSetpointLimit"
-      PICS: A_MINCOOLSETPOINTLIMIT
+      PICS: TSTAT.S.F01 && A_MINCOOLSETPOINTLIMIT
       arguments:
           value: 1600
 
     - label:
           "Writes the limit of MaxCoolSetpointLimit to MinCoolSetpointLimit
           attribute"
-      optional: true
       command: "writeAttribute"
       attribute: "MinCoolSetpointLimit"
-      PICS: A_MINCOOLSETPOINTLIMIT
+      PICS: TSTAT.S.F01 && A_MINCOOLSETPOINTLIMIT
       arguments:
           value: 3200
 
+    - label:
+          "Writes the limit of AbsMinCoolSetpointLimit to MinCoolSetpointLimit
+          attribute"
+      command: "writeAttribute"
+      attribute: "MinCoolSetpointLimit"
+      PICS: TSTAT.S.F01 && A_MINCOOLSETPOINTLIMIT
+      arguments:
+          value: 1600
+
     - label:
           "Reads MaxCoolSetpointLimit attribute from Server DUT and verifies
           that the value is within range"
-      optional: true
       command: "readAttribute"
       attribute: "MaxCoolSetpointLimit"
-      PICS: A_MAXCOOLSETPOINTLIMIT
+      PICS: TSTAT.S.F01 && A_MAXCOOLSETPOINTLIMIT
       response:
           value: 3200
           constraints:
@@ -613,40 +605,30 @@ tests:
               minValue: 1600
               maxValue: 3200
 
-    # Disabled: This test makes no sense: It's setting MaxCoolSetpointLimit to
-    # below what we just set MinCoolSetpointLimit to.
-    # See https://github.com/CHIP-Specifications/chip-test-plans/issues/1379
     - label:
           "Writes a value back that is different but valid for
           MaxCoolSetpointLimit attribute"
-      disabled: true
-      optional: true
       command: "writeAttribute"
       attribute: "MaxCoolSetpointLimit"
-      PICS: A_MAXCOOLSETPOINTLIMIT
+      PICS: TSTAT.S.F01 && A_MAXCOOLSETPOINTLIMIT && !TSTAT.S.F05
       arguments:
           value: 2000
 
-    # Disabled: Because the previous set is disabled.
-    # See https://github.com/CHIP-Specifications/chip-test-plans/issues/1379
     - label:
           "Reads it back again to confirm the successful write of
           MaxCoolSetpointLimit attribute"
-      disabled: true
-      optional: true
       command: "readAttribute"
       attribute: "MaxCoolSetpointLimit"
-      PICS: A_MAXCOOLSETPOINTLIMIT
+      PICS: TSTAT.S.F01 && A_MAXCOOLSETPOINTLIMIT && !TSTAT.S.F05
       response:
           value: 2000
 
     - label:
           "Writes MaxCoolSetpointLimit to value below the
           AbsMinCoolSetpointLimit "
-      optional: true
       command: "writeAttribute"
       attribute: "MaxCoolSetpointLimit"
-      PICS: A_MAXCOOLSETPOINTLIMIT
+      PICS: TSTAT.S.F01 && A_MAXCOOLSETPOINTLIMIT
       arguments:
           value: 1000
       response:
@@ -654,82 +636,73 @@ tests:
 
     - label:
           "Writes MaxCoolSetpointLimit to value above the MaxCoolSetpointLimit "
-      optional: true
       command: "writeAttribute"
       attribute: "MaxCoolSetpointLimit"
-      PICS: A_MAXCOOLSETPOINTLIMIT
+      PICS: TSTAT.S.F01 && A_MAXCOOLSETPOINTLIMIT
       arguments:
           value: 4000
       response:
           error: CONSTRAINT_ERROR
 
-    # Disabled: This test makes no sense: It's setting MaxCoolSetpointLimit
-    # to below various heating setpoints.
-    # See https://github.com/CHIP-Specifications/chip-test-plans/issues/1379
     - label:
           "Writes the limit of AbsMinCoolSetpointLimit to MaxCoolSetpointLimit
           attribute"
-      disabled: true
-      optional: true
       command: "writeAttribute"
       attribute: "MaxCoolSetpointLimit"
-      PICS: A_MAXCOOLSETPOINTLIMIT
+      PICS: TSTAT.S.F01 && A_MAXCOOLSETPOINTLIMIT
       arguments:
           value: 1600
 
     - label:
           "Writes the limit of MaxCoolSetpointLimit to MaxCoolSetpointLimit
           attribute"
-      optional: true
       command: "writeAttribute"
       attribute: "MaxCoolSetpointLimit"
-      PICS: A_MAXCOOLSETPOINTLIMIT
+      PICS: TSTAT.S.F01 && A_MAXCOOLSETPOINTLIMIT
       arguments:
           value: 3200
 
     - label: "Writes (sets back) default value of MinHeatSetpointLimit"
-      optional: true
       command: "writeAttribute"
       attribute: "MinHeatSetpointLimit"
-      PICS: A_MINHEATSETPOINTLIMIT
+      PICS: TSTAT.S.F01 && A_MINHEATSETPOINTLIMIT
       arguments:
           value: 700
 
-    # Disabled: This test makes no sense: It's setting MaxHeatSetpointLimit to
-    # a value too close to MaxCoolSetpointLimit, ignoring deadband.
-    # See https://github.com/CHIP-Specifications/chip-test-plans/issues/1379
     - label: "Writes (sets back)default value of MaxHeatSetpointLimit"
-      disabled: true
-      optional: true
       command: "writeAttribute"
       attribute: "MaxHeatSetpointLimit"
-      PICS: A_MINHEATSETPOINTLIMIT
+      PICS: TSTAT.S.F01 && A_MAXHEATSETPOINTLIMIT &&!TSTAT.S.F05
       arguments:
           value: 3000
 
+    - label: "Writes MaxHeatSetpointLimit That meets the deadband of 2.5C"
+      command: "writeAttribute"
+      attribute: "MaxHeatSetpointLimit"
+      PICS: TSTAT.S.F01 && A_MAXHEATSETPOINTLIMIT &&!TSTAT.S.F05
+      arguments:
+          value: 2950
+
     - label: "Writes (sets back) default value of MinCoolSetpointLimit"
-      optional: true
       command: "writeAttribute"
       attribute: "MinCoolSetpointLimit"
-      PICS: A_MINCOOLSETPOINTLIMIT
+      PICS: TSTAT.S.F01 && A_MINCOOLSETPOINTLIMIT
       arguments:
           value: 1600
 
     - label: "Writes (sets back) default value of MaxCoolSetpointLimit"
-      optional: true
       command: "writeAttribute"
       attribute: "MaxCoolSetpointLimit"
-      PICS: A_MAXCOOLSETPOINTLIMIT
+      PICS: TSTAT.S.F01 && A_MAXCOOLSETPOINTLIMIT
       arguments:
           value: 3200
 
     - label:
           "Reads MinSetpointDeadBand attribute from Server DUT and verifies that
           the value is within range"
-      optional: true
       command: "readAttribute"
       attribute: "MinSetpointDeadBand"
-      PICS: A_MINSETPOINTDEADBAND
+      PICS: TSTAT.S.F05
       response:
           value: 25
           constraints:
@@ -740,56 +713,50 @@ tests:
     - label:
           "Writes a value back that is different but valid for
           MinSetpointDeadBand attribute"
-      optional: true
       command: "writeAttribute"
       attribute: "MinSetpointDeadBand"
-      PICS: A_MINSETPOINTDEADBAND
+      PICS: TSTAT.S.F05
       arguments:
           value: 5
 
     - label:
           "Reads it back again to confirm the successful write of
           MinSetpointDeadBand attribute"
-      optional: true
       command: "readAttribute"
       attribute: "MinSetpointDeadBand"
-      PICS: A_MINSETPOINTDEADBAND
+      PICS: TSTAT.S.F05
       response:
           value: 5
 
     - label: "Writes the value below MinSetpointDeadBand"
-      optional: true
       command: "writeAttribute"
       attribute: "MinSetpointDeadBand"
-      PICS: A_MINSETPOINTDEADBAND
+      PICS: TSTAT.S.F05
       arguments:
           value: -1
       response:
           error: CONSTRAINT_ERROR
 
     - label: "Writes the value above MinSetpointDeadBand "
-      optional: true
       command: "writeAttribute"
       attribute: "MinSetpointDeadBand"
-      PICS: A_MINSETPOINTDEADBAND
+      PICS: TSTAT.S.F05
       arguments:
           value: 30
       response:
           error: CONSTRAINT_ERROR
 
     - label: "Writes the min limit of MinSetpointDeadBand"
-      optional: true
       command: "writeAttribute"
       attribute: "MinSetpointDeadBand"
-      PICS: A_MINSETPOINTDEADBAND
+      PICS: TSTAT.S.F05
       arguments:
           value: 0
 
     - label: "Writes the max limit of MinSetpointDeadBand"
-      optional: true
       command: "writeAttribute"
       attribute: "MinSetpointDeadBand"
-      PICS: A_MINSETPOINTDEADBAND
+      PICS: TSTAT.S.F05
       arguments:
           value: 25
 
@@ -798,7 +765,7 @@ tests:
           the value is valid"
       command: "readAttribute"
       attribute: "ControlSequenceOfOperation"
-      PICS: A_CONTROLSEQUENCEOFOPERATION
+      PICS: TSTAT.S.F00 || TSTAT.S.F01
       response:
           value: 4
           constraints:
@@ -811,31 +778,42 @@ tests:
           valid value"
       command: "writeAttribute"
       attribute: "ControlSequenceOfOperation"
-      PICS: A_CONTROLSEQUENCEOFOPERATION
+      PICS: TSTAT.S.F00 || TSTAT.S.F01
       arguments:
           value: 2
 
     - label: "Read it back again to confirm the successful write"
       command: "readAttribute"
       attribute: "ControlSequenceOfOperation"
-      PICS: A_CONTROLSEQUENCEOFOPERATION
+      PICS: TSTAT.S.F00 || TSTAT.S.F01
       response:
           value: 2
 
-    # Disabled: This test can't work because our setpoint limits are all messed up.
-    # See https://github.com/CHIP-Specifications/chip-test-plans/issues/1379
+    - label:
+          "Writes MaxHeatSetpointLimit attribute to default value of 2950 to
+          meet deadband constraint"
+      command: "writeAttribute"
+      attribute: "MaxHeatSetpointLimit"
+      PICS: TSTAT.S.F00 && A_MINHEATSETPOINTLIMIT && TSTAT.S.F05
+      arguments:
+          value: 2950
+
+    - label: "Sets OccupiedCoolingSetpoint to default value"
+      command: "writeAttribute"
+      attribute: "OccupiedCoolingSetpoint"
+      PICS: TSTAT.S.F01
+      arguments:
+          value: 2600
+
     - label: "Sets OccupiedHeatingSetpoint to default value"
-      optional: true
-      disabled: true
       command: "writeAttribute"
       attribute: "OccupiedHeatingSetpoint"
-      PICS: A_OCCUPIEDHEATINGSETPOINT
+      PICS: TSTAT.S.F00
       arguments:
           value: 2000
 
-    #issue #18545 SetpointRaise command is failing
-    - label: "Sends SetpointRaise Command"
-      PICS: PICS_SKIP_SAMPLE_APP && CR_SetpointRaiseLower
+    - label: "Sends SetpointRaise Command Heat Only"
+      PICS: TSTAT.S.F00
       command: "SetpointRaiseLower"
       arguments:
           values:
@@ -847,27 +825,21 @@ tests:
     - label:
           "Reads back OccupiedHeatingSetpoint to confirm the success of the
           write"
-      optional: true
       command: "readAttribute"
       attribute: "OccupiedHeatingSetpoint"
-      PICS: PICS_SKIP_SAMPLE_APP && A_OCCUPIEDHEATINGSETPOINT
+      PICS: TSTAT.S.F00
       response:
-          value: -30
+          value: 1700
 
-    # Disabled: This test can't work because our setpoint limits are all messed up.
-    # See https://github.com/CHIP-Specifications/chip-test-plans/issues/1379
     - label: "Sets OccupiedHeatingSetpoint to default value"
-      optional: true
-      disabled: true
       command: "writeAttribute"
       attribute: "OccupiedHeatingSetpoint"
-      PICS: A_OCCUPIEDHEATINGSETPOINT
+      PICS: TSTAT.S.F00
       arguments:
           value: 2000
 
-    #issue #18545 SetpointRaise command is failing
-    - label: "Sends SetpointRaise Command"
-      PICS: PICS_SKIP_SAMPLE_APP && CR_SetpointRaiseLower
+    - label: "Sends SetpointRaise Command Heat Only"
+      PICS: TSTAT.S.F00
       command: "SetpointRaiseLower"
       arguments:
           values:
@@ -879,24 +851,14 @@ tests:
     - label:
           "Reads back OccupiedHeatingSetpoint to confirm the success of the
           write"
-      optional: true
       command: "readAttribute"
       attribute: "OccupiedHeatingSetpoint"
-      PICS: PICS_SKIP_SAMPLE_APP && A_OCCUPIEDCOOLINGSETPOINT
+      PICS: TSTAT.S.F00
       response:
-          value: 30
-
-    - label: "Sets OccupiedCoolingSetpoint to default value"
-      optional: true
-      command: "writeAttribute"
-      attribute: "OccupiedCoolingSetpoint"
-      PICS: A_OCCUPIEDCOOLINGSETPOINT
-      arguments:
-          value: 2600
+          value: 2300
 
-    #issue #18545 SetpointRaise command is failing
-    - label: "Sends SetpointRaise Command"
-      PICS: PICS_SKIP_SAMPLE_APP && CR_SetpointRaiseLower
+    - label: "Sends SetpointRaise Command Cool Only"
+      PICS: TSTAT.S.F01
       command: "SetpointRaiseLower"
       arguments:
           values:
@@ -908,24 +870,21 @@ tests:
     - label:
           "Reads back OccupiedCoolingSetpoint to confirm the success of the
           write"
-      optional: true
       command: "readAttribute"
       attribute: "OccupiedCoolingSetpoint"
-      PICS: PICS_SKIP_SAMPLE_APP && A_OCCUPIEDCOOLINGSETPOINT
+      PICS: TSTAT.S.F01
       response:
-          value: -30
+          value: 2300
 
     - label: "Sets OccupiedCoolingSetpoint to default value"
-      optional: true
       command: "writeAttribute"
       attribute: "OccupiedCoolingSetpoint"
-      PICS: A_OCCUPIEDCOOLINGSETPOINT
+      PICS: TSTAT.S.F01
       arguments:
           value: 2600
 
-    #issue #18545 SetpointRaise command is failing
-    - label: "Sends SetpointRaise Command"
-      PICS: PICS_SKIP_SAMPLE_APP && CR_SetpointRaiseLower
+    - label: "Sends SetpointRaise Command Cool Only"
+      PICS: TSTAT.S.F01
       command: "SetpointRaiseLower"
       arguments:
           values:
@@ -937,35 +896,28 @@ tests:
     - label:
           "Reads back OccupiedCoolingSetpoint to confirm the success of the
           write"
-      optional: true
       command: "readAttribute"
       attribute: "OccupiedCoolingSetpoint"
-      PICS: PICS_SKIP_SAMPLE_APP && A_OCCUPIEDCOOLINGSETPOINT
+      PICS: TSTAT.S.F01
       response:
-          value: 30
+          value: 2900
 
     - label: "Sets OccupiedCoolingSetpoint to default value"
-      optional: true
       command: "writeAttribute"
       attribute: "OccupiedCoolingSetpoint"
-      PICS: A_OCCUPIEDCOOLINGSETPOINT
+      PICS: TSTAT.S.F01
       arguments:
           value: 2600
 
-    # Disabled: This test can't work because our setpoint limits are all messed up.
-    # See https://github.com/CHIP-Specifications/chip-test-plans/issues/1379
     - label: "Sets OccupiedHeatingSetpoint to default value"
-      disabled: true
-      optional: true
       command: "writeAttribute"
       attribute: "OccupiedHeatingSetpoint"
-      PICS: A_OCCUPIEDHEATINGSETPOINT
+      PICS: TSTAT.S.F00
       arguments:
           value: 2000
 
-    #issue #18545 SetpointRaise command is failing
-    - label: "Sends SetpointRaise Command"
-      PICS: PICS_SKIP_SAMPLE_APP && CR_SetpointRaiseLower
+    - label: "Sends SetpointRaise Command Heat & Cool"
+      PICS: TSTAT.S.F00 || TSTAT.S.F01
       command: "SetpointRaiseLower"
       arguments:
           values:
@@ -977,45 +929,37 @@ tests:
     - label:
           "Reads back OccupiedCoolingSetpoint to confirm the success of the
           write"
-      optional: true
       command: "readAttribute"
       attribute: "OccupiedCoolingSetpoint"
-      PICS: PICS_SKIP_SAMPLE_APP
+      PICS: TSTAT.S.F01
       response:
-          value: -30
+          value: 2300
 
     - label:
           "Reads back OccupiedHeatingSetpoint to confirm the success of the
           write"
-      optional: true
       command: "readAttribute"
       attribute: "OccupiedHeatingSetpoint"
-      PICS: PICS_SKIP_SAMPLE_APP && A_OCCUPIEDHEATINGSETPOINT
+      PICS: TSTAT.S.F00
       response:
-          value: -30
+          value: 1700
 
     - label: "Sets OccupiedCoolingSetpoint to default value"
-      optional: true
       command: "writeAttribute"
       attribute: "OccupiedCoolingSetpoint"
-      PICS: A_OCCUPIEDCOOLINGSETPOINT
+      PICS: TSTAT.S.F01
       arguments:
           value: 2600
 
-    # Disabled: This test can't work because our setpoint limits are all messed up.
-    # See https://github.com/CHIP-Specifications/chip-test-plans/issues/1379
     - label: "Sets OccupiedHeatingSetpoint to default value"
-      optional: true
-      disabled: true
       command: "writeAttribute"
       attribute: "OccupiedHeatingSetpoint"
-      PICS: A_OCCUPIEDHEATINGSETPOINT
+      PICS: TSTAT.S.F00
       arguments:
           value: 2000
 
-    #issue #18545 SetpointRaise command is failing
-    - label: "Sends SetpointRaise Command"
-      PICS: PICS_SKIP_SAMPLE_APP && CR_SetpointRaiseLower
+    - label: "Sends SetpointRaise Command Heat & Cool"
+      PICS: TSTAT.S.F00 || TSTAT.S.F01
       command: "SetpointRaiseLower"
       arguments:
           values:
@@ -1027,19 +971,17 @@ tests:
     - label:
           "Reads back OccupiedCoolingSetpoint to confirm the success of the
           write"
-      optional: true
       command: "readAttribute"
       attribute: "OccupiedCoolingSetpoint"
-      PICS: PICS_SKIP_SAMPLE_APP && A_OCCUPIEDCOOLINGSETPOINT
+      PICS: TSTAT.S.F01
       response:
-          value: 30
+          value: 2900
 
     - label:
           "Reads back OccupiedHeatingSetpoint to confirm the success of the
           write"
-      optional: true
       command: "readAttribute"
       attribute: "OccupiedHeatingSetpoint"
-      PICS: PICS_SKIP_SAMPLE_APP && A_OCCUPIEDHEATINGSETPOINT
+      PICS: TSTAT.S.F00
       response:
-          value: 30
+          value: 2300
diff --git a/src/app/tests/suites/certification/ci-pics-values b/src/app/tests/suites/certification/ci-pics-values
index 0048f6cc0ad4ca..24d292e2af4c4a 100644
--- a/src/app/tests/suites/certification/ci-pics-values
+++ b/src/app/tests/suites/certification/ci-pics-values
@@ -33,14 +33,12 @@ DGSW.S.A0002=1
 DGSW.S.A0003=1
 DGSW.S.A0004=1
 DGSW.S.C00=1
-A_OCCUPIEDCOOLINGSETPOINT=1
-A_OCCUPIEDHEATINGSETPOINT=1
+
 A_MINHEATSETPOINTLIMIT=1
 A_MAXHEATSETPOINTLIMIT=1
 A_MINCOOLSETPOINTLIMIT=1
 A_MAXCOOLSETPOINTLIMIT=1
-A_CONTROLSEQUENCEOFOPERATION=1
-CR_SetpointRaiseLower=1
+
 VENDOR_SUBTYPE=1
 DEVTYPE_SUBTYPE=1
 CRI_COMM_DISCOVERY_KEY=1
@@ -55,11 +53,20 @@ PICS_USER_PROMPT=0
 PICS_SKIP_SAMPLE_APP=0
 PICS_SDK_CI_ONLY=1
 OO_LT=1
-A_UNOCCUPIEDCOOLINGSETPOINT=0
-A_UNOCCUPIEDHEATINGSETPOINT=0
-A_MINSETPOINTDEADBAND=1
 MANUAL_FLOW_CHANGE=1
 
+#Thermostat Server
+TSTAT.S.F00=1
+TSTAT.S.F01=1
+TSTAT.S.F02=0
+TSTAT.S.F03=0
+TSTAT.S.F04=0
+TSTAT.S.F05=1
+A_MINHEATSETPOINTLIMIT=1
+A_MAXHEATSETPOINTLIMIT=1
+A_MINCOOLSETPOINTLIMIT=1
+A_MAXCOOLSETPOINTLIMIT=1
+
 # WindowCovering aka WNCV
 WNCV.S.F00=1
 WNCV.S.F02=1
@@ -1294,4 +1301,62 @@ OPCREDS.C.C07.Tx=1
 OPCREDS.C.C08.Rsp=1
 OPCREDS.C.C09.Tx=1
 OPCREDS.C.C0a.Tx=1
-OPCREDS.C.C0b.Tx=1
\ No newline at end of file
+OPCREDS.C.C0b.Tx=1
+
+#Thermostat
+TSTAT.S.A0000=1
+TSTAT.S.A0001=0
+TSTAT.S.A0002=0
+TSTAT.S.A0003=1
+TSTAT.S.A0004=1
+TSTAT.S.A0005=1
+TSTAT.S.A0006=1
+TSTAT.S.A0007=0
+TSTAT.S.A0008=0
+TSTAT.S.A0009=0
+TSTAT.S.A0010=0
+TSTAT.S.A0011=1
+TSTAT.S.A0012=1
+TSTAT.S.A0013=0
+TSTAT.S.A0014=0
+TSTAT.S.A0015=1
+TSTAT.S.A0016=1
+TSTAT.S.A0017=1
+TSTAT.S.A0018=1
+TSTAT.S.A0019=1
+TSTAT.S.A001a=0
+TSTAT.S.A001b=1
+TSTAT.S.A001c=1
+TSTAT.S.A001d=0
+TSTAT.S.A001e=0
+TSTAT.S.A0020=0
+TSTAT.S.A0021=0
+TSTAT.S.A0022=0
+TSTAT.S.A0023=0
+TSTAT.S.A0024=0
+TSTAT.S.A0025=0
+TSTAT.S.A0029=0
+TSTAT.S.A0030=0
+TSTAT.S.A0031=0
+TSTAT.S.A0032=0
+TSTAT.S.A0034=0
+TSTAT.S.A0035=0
+TSTAT.S.A0036=0
+TSTAT.S.A0037=0
+TSTAT.S.A0038=0
+TSTAT.S.A0039=0
+TSTAT.S.A003a=0
+TSTAT.S.A0040=0
+TSTAT.S.A0041=0
+TSTAT.S.A0042=0
+TSTAT.S.A0043=0
+TSTAT.S.A0044=0
+TSTAT.S.A0045=0
+TSTAT.S.A0046=0
+TSTAT.S.A0047=0
+#commands
+TSTAT.S.C00.Rsp=1
+TSTAT.S.C01.Rsp=1
+TSTAT.S.C02.Rsp=1
+TSTAT.S.C03.Rsp=1
+TSTAT.S.C04.Rsp=1
diff --git a/zzz_generated/chip-tool/zap-generated/test/Commands.h b/zzz_generated/chip-tool/zap-generated/test/Commands.h
index f6933dbc368450..4d12e65fb77ed4 100644
--- a/zzz_generated/chip-tool/zap-generated/test/Commands.h
+++ b/zzz_generated/chip-tool/zap-generated/test/Commands.h
@@ -27190,8 +27190,6 @@ class Test_TC_TSTAT_1_1Suite : public TestCommand
         }
         case 2: {
             LogStep(2, "Read the optional global attribute constraints: FeatureMap");
-            VerifyOrDo(!ShouldSkip("( TSTAT_HEAT || TSTAT_COOL || TSTAT_OCC || TSTAT_SCH || TSTAT_SB || TSTAT_AUTO )"),
-                       return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), Thermostat::Id, Thermostat::Attributes::FeatureMap::Id, true,
                                  chip::NullOptional);
         }
@@ -28088,7 +28086,7 @@ class Test_TC_TSTAT_2_1Suite : public TestCommand
 class Test_TC_TSTAT_2_2Suite : public TestCommand
 {
 public:
-    Test_TC_TSTAT_2_2Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_TSTAT_2_2", 78, credsIssuerConfig)
+    Test_TC_TSTAT_2_2Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_TSTAT_2_2", 102, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -28126,37 +28124,24 @@ class Test_TC_TSTAT_2_2Suite : public TestCommand
             shouldContinue = true;
             break;
         case 1:
-            if (IsUnsupported(status.mStatus))
-            {
-                return;
-            }
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 int16_t value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
-                VerifyOrReturn(CheckValue("occupiedCoolingSetpoint", value, 2600));
                 VerifyOrReturn(CheckConstraintType("value", "", "int16"));
                 VerifyOrReturn(CheckConstraintMinValue("value", value, 1600));
-                VerifyOrReturn(CheckConstraintMaxValue("value", value, 2600));
+                VerifyOrReturn(CheckConstraintMaxValue("value", value, 3200));
             }
             break;
         case 2:
-            if (IsUnsupported(status.mStatus))
-            {
-                return;
-            }
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 3:
-            if (IsUnsupported(status.mStatus))
-            {
-                return;
-            }
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 int16_t value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
-                VerifyOrReturn(CheckValue("occupiedCoolingSetpoint", value, 2250));
+                VerifyOrReturn(CheckValue("occupiedCoolingSetpoint", value, 2500));
             }
             break;
         case 4:
@@ -28166,39 +28151,28 @@ class Test_TC_TSTAT_2_2Suite : public TestCommand
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             break;
         case 6:
-            if (IsUnsupported(status.mStatus))
-            {
-                return;
-            }
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 7:
-            if (IsUnsupported(status.mStatus))
-            {
-                return;
-            }
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
+            break;
+        case 8:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 9:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 int16_t value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
-                VerifyOrReturn(CheckValue("occupiedHeatingSetpoint", value, 2000));
                 VerifyOrReturn(CheckConstraintType("value", "", "int16"));
                 VerifyOrReturn(CheckConstraintMinValue("value", value, 700));
                 VerifyOrReturn(CheckConstraintMaxValue("value", value, 3000));
             }
             break;
-        case 8:
-            if (IsUnsupported(status.mStatus))
-            {
-                return;
-            }
+        case 10:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 9:
-            if (IsUnsupported(status.mStatus))
-            {
-                return;
-            }
+        case 11:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 int16_t value;
@@ -28206,24 +28180,30 @@ class Test_TC_TSTAT_2_2Suite : public TestCommand
                 VerifyOrReturn(CheckValue("occupiedHeatingSetpoint", value, 2100));
             }
             break;
-        case 10:
+        case 12:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             break;
-        case 11:
+        case 13:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             break;
-        case 12:
-            if (IsUnsupported(status.mStatus))
-            {
-                return;
-            }
+        case 14:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 13:
-            if (IsUnsupported(status.mStatus))
+        case 15:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
-                return;
+                int16_t value;
+                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
+                VerifyOrReturn(CheckValue("occupiedHeatingSetpoint", value, 700));
             }
+            break;
+        case 16:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 17:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
+            break;
+        case 18:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 int16_t value;
@@ -28234,18 +28214,10 @@ class Test_TC_TSTAT_2_2Suite : public TestCommand
                 VerifyOrReturn(CheckConstraintMaxValue("value", value, 3200));
             }
             break;
-        case 14:
-            if (IsUnsupported(status.mStatus))
-            {
-                return;
-            }
+        case 19:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 15:
-            if (IsUnsupported(status.mStatus))
-            {
-                return;
-            }
+        case 20:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 int16_t value;
@@ -28253,31 +28225,19 @@ class Test_TC_TSTAT_2_2Suite : public TestCommand
                 VerifyOrReturn(CheckValue("unoccupiedCoolingSetpoint", value, 2500));
             }
             break;
-        case 16:
+        case 21:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             break;
-        case 17:
+        case 22:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             break;
-        case 18:
-            if (IsUnsupported(status.mStatus))
-            {
-                return;
-            }
+        case 23:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 19:
-            if (IsUnsupported(status.mStatus))
-            {
-                return;
-            }
+        case 24:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 20:
-            if (IsUnsupported(status.mStatus))
-            {
-                return;
-            }
+        case 25:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 int16_t value;
@@ -28288,18 +28248,10 @@ class Test_TC_TSTAT_2_2Suite : public TestCommand
                 VerifyOrReturn(CheckConstraintMaxValue("value", value, 3000));
             }
             break;
-        case 21:
-            if (IsUnsupported(status.mStatus))
-            {
-                return;
-            }
+        case 26:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 22:
-            if (IsUnsupported(status.mStatus))
-            {
-                return;
-            }
+        case 27:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 int16_t value;
@@ -28307,31 +28259,19 @@ class Test_TC_TSTAT_2_2Suite : public TestCommand
                 VerifyOrReturn(CheckValue("unoccupiedHeatingSetpoint", value, 2500));
             }
             break;
-        case 23:
+        case 28:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             break;
-        case 24:
+        case 29:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             break;
-        case 25:
-            if (IsUnsupported(status.mStatus))
-            {
-                return;
-            }
+        case 30:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 26:
-            if (IsUnsupported(status.mStatus))
-            {
-                return;
-            }
+        case 31:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 27:
-            if (IsUnsupported(status.mStatus))
-            {
-                return;
-            }
+        case 32:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 int16_t value;
@@ -28342,56 +28282,73 @@ class Test_TC_TSTAT_2_2Suite : public TestCommand
                 VerifyOrReturn(CheckConstraintMaxValue("value", value, 3000));
             }
             break;
-        case 28:
+        case 33:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 34:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            {
+                int16_t value;
+                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
+                VerifyOrReturn(CheckValue("minHeatSetpointLimit", value, 800));
+            }
+            break;
+        case 35:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             break;
-        case 29:
+        case 36:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             break;
-        case 30:
-            if (IsUnsupported(status.mStatus))
-            {
-                return;
-            }
+        case 37:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
+            break;
+        case 38:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 31:
-            if (IsUnsupported(status.mStatus))
-            {
-                return;
-            }
+        case 39:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 32:
-            if (IsUnsupported(status.mStatus))
+        case 40:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
-                return;
+                int16_t value;
+                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
+                VerifyOrReturn(CheckValue("maxHeatSetpointLimit", value, 3000));
+                VerifyOrReturn(CheckConstraintType("value", "", "int16"));
+                VerifyOrReturn(CheckConstraintMinValue("value", value, 700));
+                VerifyOrReturn(CheckConstraintMaxValue("value", value, 3000));
             }
+            break;
+        case 41:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 42:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
+            break;
+        case 43:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 44:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 int16_t value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
-                VerifyOrReturn(CheckValue("maxHeatSetpointLimit", value, 2000));
+                VerifyOrReturn(CheckValue("maxHeatSetpointLimit", value, 2900));
             }
             break;
-        case 33:
+        case 45:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             break;
-        case 34:
+        case 46:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             break;
-        case 35:
-            if (IsUnsupported(status.mStatus))
-            {
-                return;
-            }
+        case 47:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 36:
-            if (IsUnsupported(status.mStatus))
-            {
-                return;
-            }
+        case 48:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 49:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 int16_t value;
@@ -28402,18 +28359,10 @@ class Test_TC_TSTAT_2_2Suite : public TestCommand
                 VerifyOrReturn(CheckConstraintMaxValue("value", value, 3200));
             }
             break;
-        case 37:
-            if (IsUnsupported(status.mStatus))
-            {
-                return;
-            }
+        case 50:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 38:
-            if (IsUnsupported(status.mStatus))
-            {
-                return;
-            }
+        case 51:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 int16_t value;
@@ -28421,31 +28370,22 @@ class Test_TC_TSTAT_2_2Suite : public TestCommand
                 VerifyOrReturn(CheckValue("minCoolSetpointLimit", value, 2000));
             }
             break;
-        case 39:
+        case 52:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             break;
-        case 40:
+        case 53:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             break;
-        case 41:
-            if (IsUnsupported(status.mStatus))
-            {
-                return;
-            }
+        case 54:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 42:
-            if (IsUnsupported(status.mStatus))
-            {
-                return;
-            }
+        case 55:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 43:
-            if (IsUnsupported(status.mStatus))
-            {
-                return;
-            }
+        case 56:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 57:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 int16_t value;
@@ -28456,45 +28396,45 @@ class Test_TC_TSTAT_2_2Suite : public TestCommand
                 VerifyOrReturn(CheckConstraintMaxValue("value", value, 3200));
             }
             break;
-        case 44:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
-            break;
-        case 45:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
+        case 58:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 46:
-            if (IsUnsupported(status.mStatus))
+        case 59:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
-                return;
+                int16_t value;
+                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
+                VerifyOrReturn(CheckValue("maxCoolSetpointLimit", value, 2000));
             }
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 47:
-            if (IsUnsupported(status.mStatus))
-            {
-                return;
-            }
+        case 60:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
+            break;
+        case 61:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
+            break;
+        case 62:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 48:
-            if (IsUnsupported(status.mStatus))
-            {
-                return;
-            }
+        case 63:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 49:
-            if (IsUnsupported(status.mStatus))
-            {
-                return;
-            }
+        case 64:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 50:
-            if (IsUnsupported(status.mStatus))
-            {
-                return;
-            }
+        case 65:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 66:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 67:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 68:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 69:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 int8_t value;
@@ -28505,18 +28445,10 @@ class Test_TC_TSTAT_2_2Suite : public TestCommand
                 VerifyOrReturn(CheckConstraintMaxValue("value", value, 25));
             }
             break;
-        case 51:
-            if (IsUnsupported(status.mStatus))
-            {
-                return;
-            }
+        case 70:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 52:
-            if (IsUnsupported(status.mStatus))
-            {
-                return;
-            }
+        case 71:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 int8_t value;
@@ -28524,27 +28456,19 @@ class Test_TC_TSTAT_2_2Suite : public TestCommand
                 VerifyOrReturn(CheckValue("minSetpointDeadBand", value, 5));
             }
             break;
-        case 53:
+        case 72:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             break;
-        case 54:
+        case 73:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             break;
-        case 55:
-            if (IsUnsupported(status.mStatus))
-            {
-                return;
-            }
+        case 74:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 56:
-            if (IsUnsupported(status.mStatus))
-            {
-                return;
-            }
+        case 75:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 57:
+        case 76:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::Clusters::Thermostat::ThermostatControlSequence value;
@@ -28555,10 +28479,10 @@ class Test_TC_TSTAT_2_2Suite : public TestCommand
                 VerifyOrReturn(CheckConstraintMaxValue("value", value, 5U));
             }
             break;
-        case 58:
+        case 77:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 59:
+        case 78:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::Clusters::Thermostat::ThermostatControlSequence value;
@@ -28566,146 +28490,113 @@ class Test_TC_TSTAT_2_2Suite : public TestCommand
                 VerifyOrReturn(CheckValue("controlSequenceOfOperation", value, 2U));
             }
             break;
-        case 60:
+        case 79:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 61:
-            if (IsUnsupported(status.mStatus))
-            {
-                return;
-            }
+        case 80:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            {
-                int16_t value;
-                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
-                VerifyOrReturn(CheckValue("occupiedHeatingSetpoint", value, -30));
-            }
             break;
-        case 62:
+        case 81:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 63:
-            if (IsUnsupported(status.mStatus))
-            {
-                return;
-            }
+        case 82:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 83:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 int16_t value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
-                VerifyOrReturn(CheckValue("occupiedHeatingSetpoint", value, 30));
+                VerifyOrReturn(CheckValue("occupiedHeatingSetpoint", value, 1700));
             }
             break;
-        case 64:
-            if (IsUnsupported(status.mStatus))
-            {
-                return;
-            }
+        case 84:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 65:
+        case 85:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 66:
-            if (IsUnsupported(status.mStatus))
-            {
-                return;
-            }
+        case 86:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 int16_t value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
-                VerifyOrReturn(CheckValue("occupiedCoolingSetpoint", value, -30));
+                VerifyOrReturn(CheckValue("occupiedHeatingSetpoint", value, 2300));
             }
             break;
-        case 67:
-            if (IsUnsupported(status.mStatus))
+        case 87:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 88:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
-                return;
+                int16_t value;
+                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
+                VerifyOrReturn(CheckValue("occupiedCoolingSetpoint", value, 2300));
             }
+            break;
+        case 89:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 68:
+        case 90:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 69:
-            if (IsUnsupported(status.mStatus))
-            {
-                return;
-            }
+        case 91:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 int16_t value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
-                VerifyOrReturn(CheckValue("occupiedCoolingSetpoint", value, 30));
+                VerifyOrReturn(CheckValue("occupiedCoolingSetpoint", value, 2900));
             }
             break;
-        case 70:
-            if (IsUnsupported(status.mStatus))
-            {
-                return;
-            }
+        case 92:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 71:
+        case 93:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 72:
-            if (IsUnsupported(status.mStatus))
-            {
-                return;
-            }
+        case 94:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 95:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 int16_t value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
-                VerifyOrReturn(CheckValue("occupiedCoolingSetpoint", value, -30));
+                VerifyOrReturn(CheckValue("occupiedCoolingSetpoint", value, 2300));
             }
             break;
-        case 73:
-            if (IsUnsupported(status.mStatus))
-            {
-                return;
-            }
+        case 96:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 int16_t value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
-                VerifyOrReturn(CheckValue("occupiedHeatingSetpoint", value, -30));
+                VerifyOrReturn(CheckValue("occupiedHeatingSetpoint", value, 1700));
             }
             break;
-        case 74:
-            if (IsUnsupported(status.mStatus))
-            {
-                return;
-            }
+        case 97:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 75:
+        case 98:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 76:
-            if (IsUnsupported(status.mStatus))
-            {
-                return;
-            }
+        case 99:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 100:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 int16_t value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
-                VerifyOrReturn(CheckValue("occupiedCoolingSetpoint", value, 30));
+                VerifyOrReturn(CheckValue("occupiedCoolingSetpoint", value, 2900));
             }
             break;
-        case 77:
-            if (IsUnsupported(status.mStatus))
-            {
-                return;
-            }
+        case 101:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 int16_t value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
-                VerifyOrReturn(CheckValue("occupiedHeatingSetpoint", value, 30));
+                VerifyOrReturn(CheckValue("occupiedHeatingSetpoint", value, 2300));
             }
             break;
         default:
@@ -28732,29 +28623,29 @@ class Test_TC_TSTAT_2_2Suite : public TestCommand
         }
         case 1: {
             LogStep(1, "Reads OccupiedCoolingSetpoint attribute from Server DUT and verifies that the value is within range");
-            VerifyOrDo(!ShouldSkip("A_OCCUPIEDCOOLINGSETPOINT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            VerifyOrDo(!ShouldSkip("TSTAT.S.F01"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), Thermostat::Id,
                                  Thermostat::Attributes::OccupiedCoolingSetpoint::Id, true, chip::NullOptional);
         }
         case 2: {
             LogStep(2, "Writes a value back that is different but valid for OccupiedCoolingSetpoint attribute");
-            VerifyOrDo(!ShouldSkip("A_OCCUPIEDCOOLINGSETPOINT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            VerifyOrDo(!ShouldSkip("TSTAT.S.F01"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             int16_t value;
-            value = 2250;
+            value = 2500;
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), Thermostat::Id,
                                   Thermostat::Attributes::OccupiedCoolingSetpoint::Id, value, chip::NullOptional,
                                   chip::NullOptional);
         }
         case 3: {
             LogStep(3, "Reads it back again to confirm the successful write of OccupiedCoolingSetpoint attribute");
-            VerifyOrDo(!ShouldSkip("A_OCCUPIEDCOOLINGSETPOINT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            VerifyOrDo(!ShouldSkip("TSTAT.S.F01"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), Thermostat::Id,
                                  Thermostat::Attributes::OccupiedCoolingSetpoint::Id, true, chip::NullOptional);
         }
         case 4: {
-            LogStep(4, "Writes OccupiedCoolingSetpoint to value below the MinCoolSetpointLimit");
-            VerifyOrDo(!ShouldSkip("A_OCCUPIEDCOOLINGSETPOINT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            LogStep(4, "Writes OccupiedCoolingSetpoint to value below the ABSMinCoolSetpointLimit");
+            VerifyOrDo(!ShouldSkip("TSTAT.S.F01"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             int16_t value;
             value = 30;
@@ -28764,7 +28655,7 @@ class Test_TC_TSTAT_2_2Suite : public TestCommand
         }
         case 5: {
             LogStep(5, "Writes OccupiedCoolingSetpoint to value above the MaxCoolSetpointLimit");
-            VerifyOrDo(!ShouldSkip("A_OCCUPIEDCOOLINGSETPOINT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            VerifyOrDo(!ShouldSkip("TSTAT.S.F01"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             int16_t value;
             value = 4000;
@@ -28773,24 +28664,44 @@ class Test_TC_TSTAT_2_2Suite : public TestCommand
                                   chip::NullOptional);
         }
         case 6: {
-            LogStep(6, "Writes the limit of MaxCoolSetpointLimit to OccupiedCoolingSetpoint attribute");
-            VerifyOrDo(!ShouldSkip("A_OCCUPIEDCOOLINGSETPOINT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            LogStep(6, "Writes the limit of MinCoolSetpointLimit to OccupiedCoolingSetpoint attribute");
+            VerifyOrDo(!ShouldSkip("TSTAT.S.F01 && !TSTAT.S.F05"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             int16_t value;
-            value = 2600;
+            value = 1600;
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), Thermostat::Id,
                                   Thermostat::Attributes::OccupiedCoolingSetpoint::Id, value, chip::NullOptional,
                                   chip::NullOptional);
         }
         case 7: {
-            LogStep(7, "Reads OccupiedHeatingSetpoint attribute from Server DUT and verifies that the value is within range");
-            VerifyOrDo(!ShouldSkip("A_OCCUPIEDHEATINGSETPOINT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            LogStep(7, "Writes the CoolingSetpoint below the HeatingSetpoint when auto is enabled");
+            VerifyOrDo(!ShouldSkip("TSTAT.S.F05"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            ListFreer listFreer;
+            int16_t value;
+            value = 1600;
+            return WriteAttribute(kIdentityAlpha, GetEndpoint(1), Thermostat::Id,
+                                  Thermostat::Attributes::OccupiedCoolingSetpoint::Id, value, chip::NullOptional,
+                                  chip::NullOptional);
+        }
+        case 8: {
+            LogStep(8, "Writes the limit of MaxCoolSetpointLimit to OccupiedCoolingSetpoint attribute");
+            VerifyOrDo(!ShouldSkip("TSTAT.S.F01"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            ListFreer listFreer;
+            int16_t value;
+            value = 3200;
+            return WriteAttribute(kIdentityAlpha, GetEndpoint(1), Thermostat::Id,
+                                  Thermostat::Attributes::OccupiedCoolingSetpoint::Id, value, chip::NullOptional,
+                                  chip::NullOptional);
+        }
+        case 9: {
+            LogStep(9, "Reads OccupiedHeatingSetpoint attribute from Server DUT and verifies that the value is within range");
+            VerifyOrDo(!ShouldSkip("TSTAT.S.F00"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), Thermostat::Id,
                                  Thermostat::Attributes::OccupiedHeatingSetpoint::Id, true, chip::NullOptional);
         }
-        case 8: {
-            LogStep(8, "Writes a value back that is different but valid for OccupiedHeatingSetpoint attribute");
-            VerifyOrDo(!ShouldSkip("A_OCCUPIEDHEATINGSETPOINT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+        case 10: {
+            LogStep(10, "Writes a value back that is different but valid for OccupiedHeatingSetpoint attribute");
+            VerifyOrDo(!ShouldSkip("TSTAT.S.F00"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             int16_t value;
             value = 2100;
@@ -28798,15 +28709,15 @@ class Test_TC_TSTAT_2_2Suite : public TestCommand
                                   Thermostat::Attributes::OccupiedHeatingSetpoint::Id, value, chip::NullOptional,
                                   chip::NullOptional);
         }
-        case 9: {
-            LogStep(9, "Reads it back again to confirm the successful write of OccupiedHeatingSetpoint attribute");
-            VerifyOrDo(!ShouldSkip("A_OCCUPIEDHEATINGSETPOINT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+        case 11: {
+            LogStep(11, "Reads it back again to confirm the successful write of OccupiedHeatingSetpoint attribute");
+            VerifyOrDo(!ShouldSkip("TSTAT.S.F00"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), Thermostat::Id,
                                  Thermostat::Attributes::OccupiedHeatingSetpoint::Id, true, chip::NullOptional);
         }
-        case 10: {
-            LogStep(10, "Writes OccupiedHeatingSetpoint to value below the MinHeatSetpointLimit");
-            VerifyOrDo(!ShouldSkip("A_OCCUPIEDHEATINGSETPOINT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+        case 12: {
+            LogStep(12, "Writes OccupiedHeatingSetpoint to value below the MinHeatSetpointLimit");
+            VerifyOrDo(!ShouldSkip("TSTAT.S.F00"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             int16_t value;
             value = 600;
@@ -28814,9 +28725,9 @@ class Test_TC_TSTAT_2_2Suite : public TestCommand
                                   Thermostat::Attributes::OccupiedHeatingSetpoint::Id, value, chip::NullOptional,
                                   chip::NullOptional);
         }
-        case 11: {
-            LogStep(11, "Writes OccupiedHeatingSetpoint to value above the MaxHeatSetpointLimit");
-            VerifyOrDo(!ShouldSkip("A_OCCUPIEDHEATINGSETPOINT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+        case 13: {
+            LogStep(13, "Writes OccupiedHeatingSetpoint to value above the MaxHeatSetpointLimit");
+            VerifyOrDo(!ShouldSkip("TSTAT.S.F00"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             int16_t value;
             value = 4010;
@@ -28824,9 +28735,9 @@ class Test_TC_TSTAT_2_2Suite : public TestCommand
                                   Thermostat::Attributes::OccupiedHeatingSetpoint::Id, value, chip::NullOptional,
                                   chip::NullOptional);
         }
-        case 12: {
-            LogStep(12, "Writes the limit of MinHeatSetpointLimit to OccupiedHeatingSetpoint attribute");
-            VerifyOrDo(!ShouldSkip("A_OCCUPIEDHEATINGSETPOINT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+        case 14: {
+            LogStep(14, "Writes the limit of MinHeatSetpointLimit to OccupiedHeatingSetpoint attribute");
+            VerifyOrDo(!ShouldSkip("TSTAT.S.F00"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             int16_t value;
             value = 700;
@@ -28834,15 +28745,41 @@ class Test_TC_TSTAT_2_2Suite : public TestCommand
                                   Thermostat::Attributes::OccupiedHeatingSetpoint::Id, value, chip::NullOptional,
                                   chip::NullOptional);
         }
-        case 13: {
-            LogStep(13, "Reads UnoccupiedCoolingSetpoint attribute from Server DUT and verifies that the value is within range");
-            VerifyOrDo(!ShouldSkip("A_UNOCCUPIEDCOOLINGSETPOINT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+        case 15: {
+            LogStep(15, "Reads it back again to confirm the successful write of OccupiedHeatingSetpoint attribute");
+            VerifyOrDo(!ShouldSkip("TSTAT.S.F00"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            return ReadAttribute(kIdentityAlpha, GetEndpoint(1), Thermostat::Id,
+                                 Thermostat::Attributes::OccupiedHeatingSetpoint::Id, true, chip::NullOptional);
+        }
+        case 16: {
+            LogStep(16, "Writes the limit of MaxHeatSetpointLimit to OccupiedHeatingSetpoint attribute");
+            VerifyOrDo(!ShouldSkip("TSTAT.S.F00 && !TSTAT.S.F05"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            ListFreer listFreer;
+            int16_t value;
+            value = 3000;
+            return WriteAttribute(kIdentityAlpha, GetEndpoint(1), Thermostat::Id,
+                                  Thermostat::Attributes::OccupiedHeatingSetpoint::Id, value, chip::NullOptional,
+                                  chip::NullOptional);
+        }
+        case 17: {
+            LogStep(17, "Writes the limit of MaxHeatSetpointLimit to OccupiedHeatingSetpoint attribute");
+            VerifyOrDo(!ShouldSkip("TSTAT.S.F05"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            ListFreer listFreer;
+            int16_t value;
+            value = 3000;
+            return WriteAttribute(kIdentityAlpha, GetEndpoint(1), Thermostat::Id,
+                                  Thermostat::Attributes::OccupiedHeatingSetpoint::Id, value, chip::NullOptional,
+                                  chip::NullOptional);
+        }
+        case 18: {
+            LogStep(18, "Reads UnoccupiedCoolingSetpoint attribute from Server DUT and verifies that the value is within range");
+            VerifyOrDo(!ShouldSkip("TSTAT.S.F02 && TSTAT.S.F01"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), Thermostat::Id,
                                  Thermostat::Attributes::UnoccupiedCoolingSetpoint::Id, true, chip::NullOptional);
         }
-        case 14: {
-            LogStep(14, "Writes a value back that is different but valid for UnoccupiedCoolingSetpoint attribute");
-            VerifyOrDo(!ShouldSkip("A_UNOCCUPIEDCOOLINGSETPOINT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+        case 19: {
+            LogStep(19, "Writes a value back that is different but valid for UnoccupiedCoolingSetpoint attribute");
+            VerifyOrDo(!ShouldSkip("TSTAT.S.F02 && TSTAT.S.F01"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             int16_t value;
             value = 2500;
@@ -28850,15 +28787,15 @@ class Test_TC_TSTAT_2_2Suite : public TestCommand
                                   Thermostat::Attributes::UnoccupiedCoolingSetpoint::Id, value, chip::NullOptional,
                                   chip::NullOptional);
         }
-        case 15: {
-            LogStep(15, "Reads it back again to confirm the successful write of UnoccupiedCoolingSetpoint attribute");
-            VerifyOrDo(!ShouldSkip("A_UNOCCUPIEDCOOLINGSETPOINT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+        case 20: {
+            LogStep(20, "Reads it back again to confirm the successful write of UnoccupiedCoolingSetpoint attribute");
+            VerifyOrDo(!ShouldSkip("TSTAT.S.F02 && TSTAT.S.F01"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), Thermostat::Id,
                                  Thermostat::Attributes::UnoccupiedCoolingSetpoint::Id, true, chip::NullOptional);
         }
-        case 16: {
-            LogStep(16, "Writes UnoccupiedCoolingSetpoint to value below the MinHeatSetpointLimit");
-            VerifyOrDo(!ShouldSkip("A_UNOCCUPIEDCOOLINGSETPOINT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+        case 21: {
+            LogStep(21, "Writes UnoccupiedCoolingSetpoint to value below the MinCoolSetpointLimit");
+            VerifyOrDo(!ShouldSkip("TSTAT.S.F02 && TSTAT.S.F01"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             int16_t value;
             value = 1002;
@@ -28866,9 +28803,9 @@ class Test_TC_TSTAT_2_2Suite : public TestCommand
                                   Thermostat::Attributes::UnoccupiedCoolingSetpoint::Id, value, chip::NullOptional,
                                   chip::NullOptional);
         }
-        case 17: {
-            LogStep(17, "Writes UnoccupiedCoolingSetpoint to value above the MaxHeatSetpointLimit");
-            VerifyOrDo(!ShouldSkip("A_UNOCCUPIEDCOOLINGSETPOINT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+        case 22: {
+            LogStep(22, "Writes UnoccupiedCoolingSetpoint to value above the MaxCoolSetpointLimit");
+            VerifyOrDo(!ShouldSkip("TSTAT.S.F02 && TSTAT.S.F01"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             int16_t value;
             value = 4010;
@@ -28876,9 +28813,9 @@ class Test_TC_TSTAT_2_2Suite : public TestCommand
                                   Thermostat::Attributes::UnoccupiedCoolingSetpoint::Id, value, chip::NullOptional,
                                   chip::NullOptional);
         }
-        case 18: {
-            LogStep(18, "Writes the limit of MinCoolSetpointLimit to UnoccupiedCoolingSetpoint attribute");
-            VerifyOrDo(!ShouldSkip("A_UNOCCUPIEDCOOLINGSETPOINT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+        case 23: {
+            LogStep(23, "Writes the limit of MinCoolSetpointLimit to UnoccupiedCoolingSetpoint attribute");
+            VerifyOrDo(!ShouldSkip("TSTAT.S.F02 && TSTAT.S.F01"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             int16_t value;
             value = 1800;
@@ -28886,9 +28823,9 @@ class Test_TC_TSTAT_2_2Suite : public TestCommand
                                   Thermostat::Attributes::UnoccupiedCoolingSetpoint::Id, value, chip::NullOptional,
                                   chip::NullOptional);
         }
-        case 19: {
-            LogStep(19, "Writes the limit of MaxCoolSetpointLimit to UnoccupiedCoolingSetpoint attribute");
-            VerifyOrDo(!ShouldSkip("A_UNOCCUPIEDCOOLINGSETPOINT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+        case 24: {
+            LogStep(24, "Writes the limit of MaxCoolSetpointLimit to UnoccupiedCoolingSetpoint attribute");
+            VerifyOrDo(!ShouldSkip("TSTAT.S.F02 && TSTAT.S.F01"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             int16_t value;
             value = 3000;
@@ -28896,15 +28833,15 @@ class Test_TC_TSTAT_2_2Suite : public TestCommand
                                   Thermostat::Attributes::UnoccupiedCoolingSetpoint::Id, value, chip::NullOptional,
                                   chip::NullOptional);
         }
-        case 20: {
-            LogStep(20, "Reads UnoccupiedHeatingSetpoint attribute from Server DUT and verifies that the value is within range");
-            VerifyOrDo(!ShouldSkip("A_UNOCCUPIEDHEATINGSETPOINT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+        case 25: {
+            LogStep(25, "Reads UnoccupiedHeatingSetpoint attribute from Server DUT and verifies that the value is within range");
+            VerifyOrDo(!ShouldSkip("TSTAT.S.F02 && TSTAT.S.F00"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), Thermostat::Id,
                                  Thermostat::Attributes::UnoccupiedHeatingSetpoint::Id, true, chip::NullOptional);
         }
-        case 21: {
-            LogStep(21, "Writes a value back that is different but valid for UnoccupiedHeatingSetpoint attribute");
-            VerifyOrDo(!ShouldSkip("A_UNOCCUPIEDHEATINGSETPOINT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+        case 26: {
+            LogStep(26, "Writes a value back that is different but valid for UnoccupiedHeatingSetpoint attribute");
+            VerifyOrDo(!ShouldSkip("TSTAT.S.F02 && TSTAT.S.F00"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             int16_t value;
             value = 2500;
@@ -28912,15 +28849,15 @@ class Test_TC_TSTAT_2_2Suite : public TestCommand
                                   Thermostat::Attributes::UnoccupiedHeatingSetpoint::Id, value, chip::NullOptional,
                                   chip::NullOptional);
         }
-        case 22: {
-            LogStep(22, "Reads it back again to confirm the successful write of UnoccupiedHeatingSetpoint attribute");
-            VerifyOrDo(!ShouldSkip("A_UNOCCUPIEDHEATINGSETPOINT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+        case 27: {
+            LogStep(27, "Reads it back again to confirm the successful write of UnoccupiedHeatingSetpoint attribute");
+            VerifyOrDo(!ShouldSkip("TSTAT.S.F02 && TSTAT.S.F00"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), Thermostat::Id,
                                  Thermostat::Attributes::UnoccupiedHeatingSetpoint::Id, true, chip::NullOptional);
         }
-        case 23: {
-            LogStep(23, "Writes UnoccupiedHeatingSetpoint to value below the MinHeatSetpointLimit");
-            VerifyOrDo(!ShouldSkip("A_UNOCCUPIEDHEATINGSETPOINT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+        case 28: {
+            LogStep(28, "Writes UnoccupiedHeatingSetpoint to value below the MinHeatSetpointLimit");
+            VerifyOrDo(!ShouldSkip("TSTAT.S.F02 && TSTAT.S.F00"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             int16_t value;
             value = 500;
@@ -28928,9 +28865,9 @@ class Test_TC_TSTAT_2_2Suite : public TestCommand
                                   Thermostat::Attributes::UnoccupiedHeatingSetpoint::Id, value, chip::NullOptional,
                                   chip::NullOptional);
         }
-        case 24: {
-            LogStep(24, "Writes UnoccupiedHeatingSetpoint to value above the MaxHeatSetpointLimit");
-            VerifyOrDo(!ShouldSkip("A_UNOCCUPIEDHEATINGSETPOINT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+        case 29: {
+            LogStep(29, "Writes UnoccupiedHeatingSetpoint to value above the MaxHeatSetpointLimit");
+            VerifyOrDo(!ShouldSkip("TSTAT.S.F02 && TSTAT.S.F00"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             int16_t value;
             value = 4010;
@@ -28938,9 +28875,9 @@ class Test_TC_TSTAT_2_2Suite : public TestCommand
                                   Thermostat::Attributes::UnoccupiedHeatingSetpoint::Id, value, chip::NullOptional,
                                   chip::NullOptional);
         }
-        case 25: {
-            LogStep(25, "Writes the limit of MinHeatSetpointLimit to UnoccupiedHeatingSetpoint attribute");
-            VerifyOrDo(!ShouldSkip("A_UNOCCUPIEDHEATINGSETPOINT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+        case 30: {
+            LogStep(30, "Writes the limit of MinHeatSetpointLimit to UnoccupiedHeatingSetpoint attribute");
+            VerifyOrDo(!ShouldSkip("TSTAT.S.F02 && TSTAT.S.F00"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             int16_t value;
             value = 1800;
@@ -28948,9 +28885,9 @@ class Test_TC_TSTAT_2_2Suite : public TestCommand
                                   Thermostat::Attributes::UnoccupiedHeatingSetpoint::Id, value, chip::NullOptional,
                                   chip::NullOptional);
         }
-        case 26: {
-            LogStep(26, "Writes the limit of MaxHeatSetpointLimit to UnoccupiedHeatingSetpoint attribute");
-            VerifyOrDo(!ShouldSkip("A_UNOCCUPIEDHEATINGSETPOINT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+        case 31: {
+            LogStep(31, "Writes the limit of MaxHeatSetpointLimit to UnoccupiedHeatingSetpoint attribute");
+            VerifyOrDo(!ShouldSkip("TSTAT.S.F02 && TSTAT.S.F00"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             int16_t value;
             value = 3000;
@@ -28958,264 +28895,390 @@ class Test_TC_TSTAT_2_2Suite : public TestCommand
                                   Thermostat::Attributes::UnoccupiedHeatingSetpoint::Id, value, chip::NullOptional,
                                   chip::NullOptional);
         }
-        case 27: {
-            LogStep(27, "Reads MinHeatSetpointLimit attribute from Server DUT and verifies that the value is within range");
-            VerifyOrDo(!ShouldSkip("A_MINHEATSETPOINTLIMIT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+        case 32: {
+            LogStep(32, "Reads MinHeatSetpointLimit attribute from Server DUT and verifies that the value is within range");
+            VerifyOrDo(!ShouldSkip("TSTAT.S.F00 && A_MINHEATSETPOINTLIMIT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), Thermostat::Id, Thermostat::Attributes::MinHeatSetpointLimit::Id,
                                  true, chip::NullOptional);
         }
-        case 28: {
-            LogStep(28, "Writes MinHeatSetpointLimit to value below the AbsMinHeatSetpointLimit ");
-            VerifyOrDo(!ShouldSkip("A_MINHEATSETPOINTLIMIT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+        case 33: {
+            LogStep(33, "Writes a value back that is different but valid for MinHeatSetpointLimit attribute");
+            VerifyOrDo(!ShouldSkip("TSTAT.S.F00 && A_MINHEATSETPOINTLIMIT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            ListFreer listFreer;
+            int16_t value;
+            value = 800;
+            return WriteAttribute(kIdentityAlpha, GetEndpoint(1), Thermostat::Id, Thermostat::Attributes::MinHeatSetpointLimit::Id,
+                                  value, chip::NullOptional, chip::NullOptional);
+        }
+        case 34: {
+            LogStep(34, "Reads it back again to confirm the successful write of MinHeatSetpointLimit attribute");
+            VerifyOrDo(!ShouldSkip("TSTAT.S.F00  && A_MINHEATSETPOINTLIMIT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            return ReadAttribute(kIdentityAlpha, GetEndpoint(1), Thermostat::Id, Thermostat::Attributes::MinHeatSetpointLimit::Id,
+                                 true, chip::NullOptional);
+        }
+        case 35: {
+            LogStep(35, "Writes a value back that is different but violates the deadband");
+            VerifyOrDo(!ShouldSkip("A_MINHEATSETPOINTLIMIT && TSTAT.S.F05"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            ListFreer listFreer;
+            int16_t value;
+            value = 2000;
+            return WriteAttribute(kIdentityAlpha, GetEndpoint(1), Thermostat::Id, Thermostat::Attributes::MinHeatSetpointLimit::Id,
+                                  value, chip::NullOptional, chip::NullOptional);
+        }
+        case 36: {
+            LogStep(36, "Writes MinHeatSetpointLimit to value below the AbsMinHeatSetpointLimit ");
+            VerifyOrDo(!ShouldSkip("TSTAT.S.F00 && A_MINHEATSETPOINTLIMIT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             int16_t value;
             value = 650;
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), Thermostat::Id, Thermostat::Attributes::MinHeatSetpointLimit::Id,
                                   value, chip::NullOptional, chip::NullOptional);
         }
-        case 29: {
-            LogStep(29, "Writes MinHeatSetpointLimit to value above the AbsMaxHeatSetpointLimit ");
-            VerifyOrDo(!ShouldSkip("A_MINHEATSETPOINTLIMIT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+        case 37: {
+            LogStep(37, "Writes MinHeatSetpointLimit to value above the AbsMaxHeatSetpointLimit ");
+            VerifyOrDo(!ShouldSkip("TSTAT.S.F00  && A_MINHEATSETPOINTLIMIT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             int16_t value;
             value = 4050;
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), Thermostat::Id, Thermostat::Attributes::MinHeatSetpointLimit::Id,
                                   value, chip::NullOptional, chip::NullOptional);
         }
-        case 30: {
-            LogStep(30, "Writes the limit of AbsMinHeatSetpointLimit to MinHeatSetpointLimit attribute");
-            VerifyOrDo(!ShouldSkip("A_MINHEATSETPOINTLIMIT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+        case 38: {
+            LogStep(38, "Writes the limit of AbsMinHeatSetpointLimit to MinHeatSetpointLimit attribute");
+            VerifyOrDo(!ShouldSkip("TSTAT.S.F00  && A_MINHEATSETPOINTLIMIT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             int16_t value;
             value = 700;
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), Thermostat::Id, Thermostat::Attributes::MinHeatSetpointLimit::Id,
                                   value, chip::NullOptional, chip::NullOptional);
         }
-        case 31: {
-            LogStep(31, "Writes a value back that is different but valid for MaxHeatSetpointLimit attribute");
-            VerifyOrDo(!ShouldSkip("A_MAXHEATSETPOINTLIMIT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+        case 39: {
+            LogStep(39, "Writes the limit of AbsMaxHeatSetpointLimit to MinHeatSetpointLimit attribute");
+            VerifyOrDo(!ShouldSkip("TSTAT.S.F00  && A_MINHEATSETPOINTLIMIT && !TSTAT.S.F05"),
+                       return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             int16_t value;
-            value = 2000;
+            value = 3000;
+            return WriteAttribute(kIdentityAlpha, GetEndpoint(1), Thermostat::Id, Thermostat::Attributes::MinHeatSetpointLimit::Id,
+                                  value, chip::NullOptional, chip::NullOptional);
+        }
+        case 40: {
+            LogStep(40, "Reads MaxHeatSetpointLimit attribute from Server DUT and verifies that the value is within range");
+            VerifyOrDo(!ShouldSkip("TSTAT.S.F00  && A_MAXHEATSETPOINTLIMIT && !TSTAT.S.F05"),
+                       return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            return ReadAttribute(kIdentityAlpha, GetEndpoint(1), Thermostat::Id, Thermostat::Attributes::MaxHeatSetpointLimit::Id,
+                                 true, chip::NullOptional);
+        }
+        case 41: {
+            LogStep(41, "Writes the limit of AbsMinHeatSetpointLimit to MinHeatSetpointLimit attribute");
+            VerifyOrDo(!ShouldSkip("TSTAT.S.F00  && A_MINHEATSETPOINTLIMIT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            ListFreer listFreer;
+            int16_t value;
+            value = 700;
+            return WriteAttribute(kIdentityAlpha, GetEndpoint(1), Thermostat::Id, Thermostat::Attributes::MinHeatSetpointLimit::Id,
+                                  value, chip::NullOptional, chip::NullOptional);
+        }
+        case 42: {
+            LogStep(42, "Writes the limit of AbsMaxHeatSetpointLimit to MinHeatSetpointLimit attribute");
+            VerifyOrDo(!ShouldSkip("A_MINHEATSETPOINTLIMIT && TSTAT.S.F05"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            ListFreer listFreer;
+            int16_t value;
+            value = 3000;
+            return WriteAttribute(kIdentityAlpha, GetEndpoint(1), Thermostat::Id, Thermostat::Attributes::MinHeatSetpointLimit::Id,
+                                  value, chip::NullOptional, chip::NullOptional);
+        }
+        case 43: {
+            LogStep(43, "Writes a value back that is different but valid for MaxHeatSetpointLimit attribute");
+            VerifyOrDo(!ShouldSkip("TSTAT.S.F00 && A_MAXHEATSETPOINTLIMIT && !TSTAT.S.F05"),
+                       return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            ListFreer listFreer;
+            int16_t value;
+            value = 2900;
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), Thermostat::Id, Thermostat::Attributes::MaxHeatSetpointLimit::Id,
                                   value, chip::NullOptional, chip::NullOptional);
         }
-        case 32: {
-            LogStep(32, "Reads it back again to confirm the successful write of MaxHeatSetpointLimit attribute");
-            VerifyOrDo(!ShouldSkip("A_MAXHEATSETPOINTLIMIT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+        case 44: {
+            LogStep(44, "Reads it back again to confirm the successful write of MaxHeatSetpointLimit attribute");
+            VerifyOrDo(!ShouldSkip("TSTAT.S.F00 && A_MAXHEATSETPOINTLIMIT && !TSTAT.S.F05"),
+                       return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), Thermostat::Id, Thermostat::Attributes::MaxHeatSetpointLimit::Id,
                                  true, chip::NullOptional);
         }
-        case 33: {
-            LogStep(33, "Writes MaxHeatSetpointLimit to value below the AbsMinHeatSetpointLimit ");
-            VerifyOrDo(!ShouldSkip("A_MAXHEATSETPOINTLIMIT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+        case 45: {
+            LogStep(45, "Writes MaxHeatSetpointLimit to value below the AbsMinHeatSetpointLimit ");
+            VerifyOrDo(!ShouldSkip("TSTAT.S.F00  && A_MAXHEATSETPOINTLIMIT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             int16_t value;
             value = 500;
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), Thermostat::Id, Thermostat::Attributes::MaxHeatSetpointLimit::Id,
                                   value, chip::NullOptional, chip::NullOptional);
         }
-        case 34: {
-            LogStep(34, "Writes MaxHeatSetpointLimit to value above the AbsMaxHeatSetpointLimit ");
-            VerifyOrDo(!ShouldSkip("A_MAXHEATSETPOINTLIMIT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+        case 46: {
+            LogStep(46, "Writes MaxHeatSetpointLimit to value above the AbsMaxHeatSetpointLimit ");
+            VerifyOrDo(!ShouldSkip("TSTAT.S.F00  && A_MAXHEATSETPOINTLIMIT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             int16_t value;
             value = 4000;
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), Thermostat::Id, Thermostat::Attributes::MaxHeatSetpointLimit::Id,
                                   value, chip::NullOptional, chip::NullOptional);
         }
-        case 35: {
-            LogStep(35, "Writes the limit of AbsMinHeatSetpointLimit to MaxHeatSetpointLimit attribute");
-            VerifyOrDo(!ShouldSkip("A_MAXHEATSETPOINTLIMIT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+        case 47: {
+            LogStep(47, "Writes the limit of AbsMinHeatSetpointLimit to MaxHeatSetpointLimit attribute");
+            VerifyOrDo(!ShouldSkip("TSTAT.S.F00  && A_MAXHEATSETPOINTLIMIT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             int16_t value;
             value = 700;
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), Thermostat::Id, Thermostat::Attributes::MaxHeatSetpointLimit::Id,
                                   value, chip::NullOptional, chip::NullOptional);
         }
-        case 36: {
-            LogStep(36, "Reads MinCoolSetpointLimit attribute from Server DUT and verifies that the value is within range");
-            VerifyOrDo(!ShouldSkip("A_MINCOOLSETPOINTLIMIT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+        case 48: {
+            LogStep(48, "Writes the limit of AbsMaxHeatSetpointLimit to MaxHeatSetpointLimit attribute");
+            VerifyOrDo(!ShouldSkip("TSTAT.S.F00  && A_MAXHEATSETPOINTLIMIT && !TSTAT.S.F05"),
+                       return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            ListFreer listFreer;
+            int16_t value;
+            value = 3000;
+            return WriteAttribute(kIdentityAlpha, GetEndpoint(1), Thermostat::Id, Thermostat::Attributes::MaxHeatSetpointLimit::Id,
+                                  value, chip::NullOptional, chip::NullOptional);
+        }
+        case 49: {
+            LogStep(49, "Reads MinCoolSetpointLimit attribute from Server DUT and verifies that the value is within range");
+            VerifyOrDo(!ShouldSkip("TSTAT.S.F01 && A_MINCOOLSETPOINTLIMIT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), Thermostat::Id, Thermostat::Attributes::MinCoolSetpointLimit::Id,
                                  true, chip::NullOptional);
         }
-        case 37: {
-            LogStep(37, "Writes a value back that is different but valid for MinCoolSetpointLimit attribute");
-            VerifyOrDo(!ShouldSkip("A_MINCOOLSETPOINTLIMIT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+        case 50: {
+            LogStep(50, "Writes a value back that is different but valid for MinCoolSetpointLimit attribute");
+            VerifyOrDo(!ShouldSkip("TSTAT.S.F01 && A_MINCOOLSETPOINTLIMIT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             int16_t value;
             value = 2000;
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), Thermostat::Id, Thermostat::Attributes::MinCoolSetpointLimit::Id,
                                   value, chip::NullOptional, chip::NullOptional);
         }
-        case 38: {
-            LogStep(38, "Reads it back again to confirm the successful write of MinCoolSetpointLimit attribute");
-            VerifyOrDo(!ShouldSkip("A_MINCOOLSETPOINTLIMIT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+        case 51: {
+            LogStep(51, "Reads it back again to confirm the successful write of MinCoolSetpointLimit attribute");
+            VerifyOrDo(!ShouldSkip("TSTAT.S.F01 && A_MINCOOLSETPOINTLIMIT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), Thermostat::Id, Thermostat::Attributes::MinCoolSetpointLimit::Id,
                                  true, chip::NullOptional);
         }
-        case 39: {
-            LogStep(39, "Writes MinCoolSetpointLimit to value below the AbsMinCoolSetpointLimit ");
-            VerifyOrDo(!ShouldSkip("A_MINCOOLSETPOINTLIMIT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+        case 52: {
+            LogStep(52, "Writes MinCoolSetpointLimit to value below the AbsMinCoolSetpointLimit ");
+            VerifyOrDo(!ShouldSkip("TSTAT.S.F01 && A_MINCOOLSETPOINTLIMIT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             int16_t value;
             value = 1000;
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), Thermostat::Id, Thermostat::Attributes::MinCoolSetpointLimit::Id,
                                   value, chip::NullOptional, chip::NullOptional);
         }
-        case 40: {
-            LogStep(40, "Writes MinCoolSetpointLimit to value above the MaxCoolSetpointLimit ");
-            VerifyOrDo(!ShouldSkip("A_MINCOOLSETPOINTLIMIT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+        case 53: {
+            LogStep(53, "Writes MinCoolSetpointLimit to value above the MaxCoolSetpointLimit ");
+            VerifyOrDo(!ShouldSkip("TSTAT.S.F01 && A_MINCOOLSETPOINTLIMIT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             int16_t value;
             value = 4000;
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), Thermostat::Id, Thermostat::Attributes::MinCoolSetpointLimit::Id,
                                   value, chip::NullOptional, chip::NullOptional);
         }
-        case 41: {
-            LogStep(41, "Writes the limit of AbsMinCoolSetpointLimit to MinCoolSetpointLimit attribute");
-            VerifyOrDo(!ShouldSkip("A_MINCOOLSETPOINTLIMIT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+        case 54: {
+            LogStep(54, "Writes the limit of AbsMinCoolSetpointLimit to MinCoolSetpointLimit attribute");
+            VerifyOrDo(!ShouldSkip("TSTAT.S.F01 && A_MINCOOLSETPOINTLIMIT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             int16_t value;
             value = 1600;
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), Thermostat::Id, Thermostat::Attributes::MinCoolSetpointLimit::Id,
                                   value, chip::NullOptional, chip::NullOptional);
         }
-        case 42: {
-            LogStep(42, "Writes the limit of MaxCoolSetpointLimit to MinCoolSetpointLimit attribute");
-            VerifyOrDo(!ShouldSkip("A_MINCOOLSETPOINTLIMIT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+        case 55: {
+            LogStep(55, "Writes the limit of MaxCoolSetpointLimit to MinCoolSetpointLimit attribute");
+            VerifyOrDo(!ShouldSkip("TSTAT.S.F01 && A_MINCOOLSETPOINTLIMIT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             int16_t value;
             value = 3200;
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), Thermostat::Id, Thermostat::Attributes::MinCoolSetpointLimit::Id,
                                   value, chip::NullOptional, chip::NullOptional);
         }
-        case 43: {
-            LogStep(43, "Reads MaxCoolSetpointLimit attribute from Server DUT and verifies that the value is within range");
-            VerifyOrDo(!ShouldSkip("A_MAXCOOLSETPOINTLIMIT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+        case 56: {
+            LogStep(56, "Writes the limit of AbsMinCoolSetpointLimit to MinCoolSetpointLimit attribute");
+            VerifyOrDo(!ShouldSkip("TSTAT.S.F01 && A_MINCOOLSETPOINTLIMIT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            ListFreer listFreer;
+            int16_t value;
+            value = 1600;
+            return WriteAttribute(kIdentityAlpha, GetEndpoint(1), Thermostat::Id, Thermostat::Attributes::MinCoolSetpointLimit::Id,
+                                  value, chip::NullOptional, chip::NullOptional);
+        }
+        case 57: {
+            LogStep(57, "Reads MaxCoolSetpointLimit attribute from Server DUT and verifies that the value is within range");
+            VerifyOrDo(!ShouldSkip("TSTAT.S.F01 && A_MAXCOOLSETPOINTLIMIT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), Thermostat::Id, Thermostat::Attributes::MaxCoolSetpointLimit::Id,
                                  true, chip::NullOptional);
         }
-        case 44: {
-            LogStep(44, "Writes MaxCoolSetpointLimit to value below the AbsMinCoolSetpointLimit ");
-            VerifyOrDo(!ShouldSkip("A_MAXCOOLSETPOINTLIMIT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+        case 58: {
+            LogStep(58, "Writes a value back that is different but valid for MaxCoolSetpointLimit attribute");
+            VerifyOrDo(!ShouldSkip("TSTAT.S.F01 && A_MAXCOOLSETPOINTLIMIT && !TSTAT.S.F05"),
+                       return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            ListFreer listFreer;
+            int16_t value;
+            value = 2000;
+            return WriteAttribute(kIdentityAlpha, GetEndpoint(1), Thermostat::Id, Thermostat::Attributes::MaxCoolSetpointLimit::Id,
+                                  value, chip::NullOptional, chip::NullOptional);
+        }
+        case 59: {
+            LogStep(59, "Reads it back again to confirm the successful write of MaxCoolSetpointLimit attribute");
+            VerifyOrDo(!ShouldSkip("TSTAT.S.F01 && A_MAXCOOLSETPOINTLIMIT && !TSTAT.S.F05"),
+                       return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            return ReadAttribute(kIdentityAlpha, GetEndpoint(1), Thermostat::Id, Thermostat::Attributes::MaxCoolSetpointLimit::Id,
+                                 true, chip::NullOptional);
+        }
+        case 60: {
+            LogStep(60, "Writes MaxCoolSetpointLimit to value below the AbsMinCoolSetpointLimit ");
+            VerifyOrDo(!ShouldSkip("TSTAT.S.F01 && A_MAXCOOLSETPOINTLIMIT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             int16_t value;
             value = 1000;
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), Thermostat::Id, Thermostat::Attributes::MaxCoolSetpointLimit::Id,
                                   value, chip::NullOptional, chip::NullOptional);
         }
-        case 45: {
-            LogStep(45, "Writes MaxCoolSetpointLimit to value above the MaxCoolSetpointLimit ");
-            VerifyOrDo(!ShouldSkip("A_MAXCOOLSETPOINTLIMIT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+        case 61: {
+            LogStep(61, "Writes MaxCoolSetpointLimit to value above the MaxCoolSetpointLimit ");
+            VerifyOrDo(!ShouldSkip("TSTAT.S.F01 && A_MAXCOOLSETPOINTLIMIT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             int16_t value;
             value = 4000;
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), Thermostat::Id, Thermostat::Attributes::MaxCoolSetpointLimit::Id,
                                   value, chip::NullOptional, chip::NullOptional);
         }
-        case 46: {
-            LogStep(46, "Writes the limit of MaxCoolSetpointLimit to MaxCoolSetpointLimit attribute");
-            VerifyOrDo(!ShouldSkip("A_MAXCOOLSETPOINTLIMIT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+        case 62: {
+            LogStep(62, "Writes the limit of AbsMinCoolSetpointLimit to MaxCoolSetpointLimit attribute");
+            VerifyOrDo(!ShouldSkip("TSTAT.S.F01 && A_MAXCOOLSETPOINTLIMIT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            ListFreer listFreer;
+            int16_t value;
+            value = 1600;
+            return WriteAttribute(kIdentityAlpha, GetEndpoint(1), Thermostat::Id, Thermostat::Attributes::MaxCoolSetpointLimit::Id,
+                                  value, chip::NullOptional, chip::NullOptional);
+        }
+        case 63: {
+            LogStep(63, "Writes the limit of MaxCoolSetpointLimit to MaxCoolSetpointLimit attribute");
+            VerifyOrDo(!ShouldSkip("TSTAT.S.F01 && A_MAXCOOLSETPOINTLIMIT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             int16_t value;
             value = 3200;
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), Thermostat::Id, Thermostat::Attributes::MaxCoolSetpointLimit::Id,
                                   value, chip::NullOptional, chip::NullOptional);
         }
-        case 47: {
-            LogStep(47, "Writes (sets back) default value of MinHeatSetpointLimit");
-            VerifyOrDo(!ShouldSkip("A_MINHEATSETPOINTLIMIT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+        case 64: {
+            LogStep(64, "Writes (sets back) default value of MinHeatSetpointLimit");
+            VerifyOrDo(!ShouldSkip("TSTAT.S.F01 && A_MINHEATSETPOINTLIMIT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             int16_t value;
             value = 700;
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), Thermostat::Id, Thermostat::Attributes::MinHeatSetpointLimit::Id,
                                   value, chip::NullOptional, chip::NullOptional);
         }
-        case 48: {
-            LogStep(48, "Writes (sets back) default value of MinCoolSetpointLimit");
-            VerifyOrDo(!ShouldSkip("A_MINCOOLSETPOINTLIMIT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+        case 65: {
+            LogStep(65, "Writes (sets back)default value of MaxHeatSetpointLimit");
+            VerifyOrDo(!ShouldSkip("TSTAT.S.F01 && A_MAXHEATSETPOINTLIMIT &&!TSTAT.S.F05"),
+                       return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            ListFreer listFreer;
+            int16_t value;
+            value = 3000;
+            return WriteAttribute(kIdentityAlpha, GetEndpoint(1), Thermostat::Id, Thermostat::Attributes::MaxHeatSetpointLimit::Id,
+                                  value, chip::NullOptional, chip::NullOptional);
+        }
+        case 66: {
+            LogStep(66, "Writes MaxHeatSetpointLimit That meets the deadband of 2.5C");
+            VerifyOrDo(!ShouldSkip("TSTAT.S.F01 && A_MAXHEATSETPOINTLIMIT &&!TSTAT.S.F05"),
+                       return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            ListFreer listFreer;
+            int16_t value;
+            value = 2950;
+            return WriteAttribute(kIdentityAlpha, GetEndpoint(1), Thermostat::Id, Thermostat::Attributes::MaxHeatSetpointLimit::Id,
+                                  value, chip::NullOptional, chip::NullOptional);
+        }
+        case 67: {
+            LogStep(67, "Writes (sets back) default value of MinCoolSetpointLimit");
+            VerifyOrDo(!ShouldSkip("TSTAT.S.F01 && A_MINCOOLSETPOINTLIMIT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             int16_t value;
             value = 1600;
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), Thermostat::Id, Thermostat::Attributes::MinCoolSetpointLimit::Id,
                                   value, chip::NullOptional, chip::NullOptional);
         }
-        case 49: {
-            LogStep(49, "Writes (sets back) default value of MaxCoolSetpointLimit");
-            VerifyOrDo(!ShouldSkip("A_MAXCOOLSETPOINTLIMIT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+        case 68: {
+            LogStep(68, "Writes (sets back) default value of MaxCoolSetpointLimit");
+            VerifyOrDo(!ShouldSkip("TSTAT.S.F01 && A_MAXCOOLSETPOINTLIMIT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             int16_t value;
             value = 3200;
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), Thermostat::Id, Thermostat::Attributes::MaxCoolSetpointLimit::Id,
                                   value, chip::NullOptional, chip::NullOptional);
         }
-        case 50: {
-            LogStep(50, "Reads MinSetpointDeadBand attribute from Server DUT and verifies that the value is within range");
-            VerifyOrDo(!ShouldSkip("A_MINSETPOINTDEADBAND"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+        case 69: {
+            LogStep(69, "Reads MinSetpointDeadBand attribute from Server DUT and verifies that the value is within range");
+            VerifyOrDo(!ShouldSkip("TSTAT.S.F05"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), Thermostat::Id, Thermostat::Attributes::MinSetpointDeadBand::Id,
                                  true, chip::NullOptional);
         }
-        case 51: {
-            LogStep(51, "Writes a value back that is different but valid for MinSetpointDeadBand attribute");
-            VerifyOrDo(!ShouldSkip("A_MINSETPOINTDEADBAND"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+        case 70: {
+            LogStep(70, "Writes a value back that is different but valid for MinSetpointDeadBand attribute");
+            VerifyOrDo(!ShouldSkip("TSTAT.S.F05"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             int8_t value;
             value = 5;
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), Thermostat::Id, Thermostat::Attributes::MinSetpointDeadBand::Id,
                                   value, chip::NullOptional, chip::NullOptional);
         }
-        case 52: {
-            LogStep(52, "Reads it back again to confirm the successful write of MinSetpointDeadBand attribute");
-            VerifyOrDo(!ShouldSkip("A_MINSETPOINTDEADBAND"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+        case 71: {
+            LogStep(71, "Reads it back again to confirm the successful write of MinSetpointDeadBand attribute");
+            VerifyOrDo(!ShouldSkip("TSTAT.S.F05"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), Thermostat::Id, Thermostat::Attributes::MinSetpointDeadBand::Id,
                                  true, chip::NullOptional);
         }
-        case 53: {
-            LogStep(53, "Writes the value below MinSetpointDeadBand");
-            VerifyOrDo(!ShouldSkip("A_MINSETPOINTDEADBAND"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+        case 72: {
+            LogStep(72, "Writes the value below MinSetpointDeadBand");
+            VerifyOrDo(!ShouldSkip("TSTAT.S.F05"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             int8_t value;
             value = -1;
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), Thermostat::Id, Thermostat::Attributes::MinSetpointDeadBand::Id,
                                   value, chip::NullOptional, chip::NullOptional);
         }
-        case 54: {
-            LogStep(54, "Writes the value above MinSetpointDeadBand ");
-            VerifyOrDo(!ShouldSkip("A_MINSETPOINTDEADBAND"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+        case 73: {
+            LogStep(73, "Writes the value above MinSetpointDeadBand ");
+            VerifyOrDo(!ShouldSkip("TSTAT.S.F05"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             int8_t value;
             value = 30;
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), Thermostat::Id, Thermostat::Attributes::MinSetpointDeadBand::Id,
                                   value, chip::NullOptional, chip::NullOptional);
         }
-        case 55: {
-            LogStep(55, "Writes the min limit of MinSetpointDeadBand");
-            VerifyOrDo(!ShouldSkip("A_MINSETPOINTDEADBAND"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+        case 74: {
+            LogStep(74, "Writes the min limit of MinSetpointDeadBand");
+            VerifyOrDo(!ShouldSkip("TSTAT.S.F05"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             int8_t value;
             value = 0;
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), Thermostat::Id, Thermostat::Attributes::MinSetpointDeadBand::Id,
                                   value, chip::NullOptional, chip::NullOptional);
         }
-        case 56: {
-            LogStep(56, "Writes the max limit of MinSetpointDeadBand");
-            VerifyOrDo(!ShouldSkip("A_MINSETPOINTDEADBAND"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+        case 75: {
+            LogStep(75, "Writes the max limit of MinSetpointDeadBand");
+            VerifyOrDo(!ShouldSkip("TSTAT.S.F05"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             int8_t value;
             value = 25;
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), Thermostat::Id, Thermostat::Attributes::MinSetpointDeadBand::Id,
                                   value, chip::NullOptional, chip::NullOptional);
         }
-        case 57: {
-            LogStep(57, "Reads ControlSequenceOfOperation from Server DUT and verifies that the value is valid");
-            VerifyOrDo(!ShouldSkip("A_CONTROLSEQUENCEOFOPERATION"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+        case 76: {
+            LogStep(76, "Reads ControlSequenceOfOperation from Server DUT and verifies that the value is valid");
+            VerifyOrDo(!ShouldSkip("TSTAT.S.F00 || TSTAT.S.F01"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), Thermostat::Id,
                                  Thermostat::Attributes::ControlSequenceOfOperation::Id, true, chip::NullOptional);
         }
-        case 58: {
-            LogStep(58, "Write Attribute command for ControlSequenceOfOperation with a new valid value");
-            VerifyOrDo(!ShouldSkip("A_CONTROLSEQUENCEOFOPERATION"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+        case 77: {
+            LogStep(77, "Write Attribute command for ControlSequenceOfOperation with a new valid value");
+            VerifyOrDo(!ShouldSkip("TSTAT.S.F00 || TSTAT.S.F01"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             chip::app::Clusters::Thermostat::ThermostatControlSequence value;
             value = static_cast<chip::app::Clusters::Thermostat::ThermostatControlSequence>(2);
@@ -29223,17 +29286,46 @@ class Test_TC_TSTAT_2_2Suite : public TestCommand
                                   Thermostat::Attributes::ControlSequenceOfOperation::Id, value, chip::NullOptional,
                                   chip::NullOptional);
         }
-        case 59: {
-            LogStep(59, "Read it back again to confirm the successful write");
-            VerifyOrDo(!ShouldSkip("A_CONTROLSEQUENCEOFOPERATION"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+        case 78: {
+            LogStep(78, "Read it back again to confirm the successful write");
+            VerifyOrDo(!ShouldSkip("TSTAT.S.F00 || TSTAT.S.F01"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), Thermostat::Id,
                                  Thermostat::Attributes::ControlSequenceOfOperation::Id, true, chip::NullOptional);
         }
-        case 60: {
-            LogStep(60, "Sends SetpointRaise Command");
-            VerifyOrDo(!ShouldSkip("PICS_SKIP_SAMPLE_APP && CR_SetpointRaiseLower"),
+        case 79: {
+            LogStep(79, "Writes MaxHeatSetpointLimit attribute to default value of 2950 to meet deadband constraint");
+            VerifyOrDo(!ShouldSkip("TSTAT.S.F00 && A_MINHEATSETPOINTLIMIT && TSTAT.S.F05"),
                        return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
+            int16_t value;
+            value = 2950;
+            return WriteAttribute(kIdentityAlpha, GetEndpoint(1), Thermostat::Id, Thermostat::Attributes::MaxHeatSetpointLimit::Id,
+                                  value, chip::NullOptional, chip::NullOptional);
+        }
+        case 80: {
+            LogStep(80, "Sets OccupiedCoolingSetpoint to default value");
+            VerifyOrDo(!ShouldSkip("TSTAT.S.F01"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            ListFreer listFreer;
+            int16_t value;
+            value = 2600;
+            return WriteAttribute(kIdentityAlpha, GetEndpoint(1), Thermostat::Id,
+                                  Thermostat::Attributes::OccupiedCoolingSetpoint::Id, value, chip::NullOptional,
+                                  chip::NullOptional);
+        }
+        case 81: {
+            LogStep(81, "Sets OccupiedHeatingSetpoint to default value");
+            VerifyOrDo(!ShouldSkip("TSTAT.S.F00"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            ListFreer listFreer;
+            int16_t value;
+            value = 2000;
+            return WriteAttribute(kIdentityAlpha, GetEndpoint(1), Thermostat::Id,
+                                  Thermostat::Attributes::OccupiedHeatingSetpoint::Id, value, chip::NullOptional,
+                                  chip::NullOptional);
+        }
+        case 82: {
+            LogStep(82, "Sends SetpointRaise Command Heat Only");
+            VerifyOrDo(!ShouldSkip("TSTAT.S.F00"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            ListFreer listFreer;
             chip::app::Clusters::Thermostat::Commands::SetpointRaiseLower::Type value;
             value.mode   = static_cast<chip::app::Clusters::Thermostat::SetpointAdjustMode>(0);
             value.amount = -30;
@@ -29242,17 +29334,25 @@ class Test_TC_TSTAT_2_2Suite : public TestCommand
 
             );
         }
-        case 61: {
-            LogStep(61, "Reads back OccupiedHeatingSetpoint to confirm the success of the write");
-            VerifyOrDo(!ShouldSkip("PICS_SKIP_SAMPLE_APP && A_OCCUPIEDHEATINGSETPOINT"),
-                       return ContinueOnChipMainThread(CHIP_NO_ERROR));
+        case 83: {
+            LogStep(83, "Reads back OccupiedHeatingSetpoint to confirm the success of the write");
+            VerifyOrDo(!ShouldSkip("TSTAT.S.F00"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), Thermostat::Id,
                                  Thermostat::Attributes::OccupiedHeatingSetpoint::Id, true, chip::NullOptional);
         }
-        case 62: {
-            LogStep(62, "Sends SetpointRaise Command");
-            VerifyOrDo(!ShouldSkip("PICS_SKIP_SAMPLE_APP && CR_SetpointRaiseLower"),
-                       return ContinueOnChipMainThread(CHIP_NO_ERROR));
+        case 84: {
+            LogStep(84, "Sets OccupiedHeatingSetpoint to default value");
+            VerifyOrDo(!ShouldSkip("TSTAT.S.F00"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            ListFreer listFreer;
+            int16_t value;
+            value = 2000;
+            return WriteAttribute(kIdentityAlpha, GetEndpoint(1), Thermostat::Id,
+                                  Thermostat::Attributes::OccupiedHeatingSetpoint::Id, value, chip::NullOptional,
+                                  chip::NullOptional);
+        }
+        case 85: {
+            LogStep(85, "Sends SetpointRaise Command Heat Only");
+            VerifyOrDo(!ShouldSkip("TSTAT.S.F00"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             chip::app::Clusters::Thermostat::Commands::SetpointRaiseLower::Type value;
             value.mode   = static_cast<chip::app::Clusters::Thermostat::SetpointAdjustMode>(0);
@@ -29262,27 +29362,15 @@ class Test_TC_TSTAT_2_2Suite : public TestCommand
 
             );
         }
-        case 63: {
-            LogStep(63, "Reads back OccupiedHeatingSetpoint to confirm the success of the write");
-            VerifyOrDo(!ShouldSkip("PICS_SKIP_SAMPLE_APP && A_OCCUPIEDCOOLINGSETPOINT"),
-                       return ContinueOnChipMainThread(CHIP_NO_ERROR));
+        case 86: {
+            LogStep(86, "Reads back OccupiedHeatingSetpoint to confirm the success of the write");
+            VerifyOrDo(!ShouldSkip("TSTAT.S.F00"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), Thermostat::Id,
                                  Thermostat::Attributes::OccupiedHeatingSetpoint::Id, true, chip::NullOptional);
         }
-        case 64: {
-            LogStep(64, "Sets OccupiedCoolingSetpoint to default value");
-            VerifyOrDo(!ShouldSkip("A_OCCUPIEDCOOLINGSETPOINT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
-            ListFreer listFreer;
-            int16_t value;
-            value = 2600;
-            return WriteAttribute(kIdentityAlpha, GetEndpoint(1), Thermostat::Id,
-                                  Thermostat::Attributes::OccupiedCoolingSetpoint::Id, value, chip::NullOptional,
-                                  chip::NullOptional);
-        }
-        case 65: {
-            LogStep(65, "Sends SetpointRaise Command");
-            VerifyOrDo(!ShouldSkip("PICS_SKIP_SAMPLE_APP && CR_SetpointRaiseLower"),
-                       return ContinueOnChipMainThread(CHIP_NO_ERROR));
+        case 87: {
+            LogStep(87, "Sends SetpointRaise Command Cool Only");
+            VerifyOrDo(!ShouldSkip("TSTAT.S.F01"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             chip::app::Clusters::Thermostat::Commands::SetpointRaiseLower::Type value;
             value.mode   = static_cast<chip::app::Clusters::Thermostat::SetpointAdjustMode>(1);
@@ -29292,16 +29380,15 @@ class Test_TC_TSTAT_2_2Suite : public TestCommand
 
             );
         }
-        case 66: {
-            LogStep(66, "Reads back OccupiedCoolingSetpoint to confirm the success of the write");
-            VerifyOrDo(!ShouldSkip("PICS_SKIP_SAMPLE_APP && A_OCCUPIEDCOOLINGSETPOINT"),
-                       return ContinueOnChipMainThread(CHIP_NO_ERROR));
+        case 88: {
+            LogStep(88, "Reads back OccupiedCoolingSetpoint to confirm the success of the write");
+            VerifyOrDo(!ShouldSkip("TSTAT.S.F01"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), Thermostat::Id,
                                  Thermostat::Attributes::OccupiedCoolingSetpoint::Id, true, chip::NullOptional);
         }
-        case 67: {
-            LogStep(67, "Sets OccupiedCoolingSetpoint to default value");
-            VerifyOrDo(!ShouldSkip("A_OCCUPIEDCOOLINGSETPOINT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+        case 89: {
+            LogStep(89, "Sets OccupiedCoolingSetpoint to default value");
+            VerifyOrDo(!ShouldSkip("TSTAT.S.F01"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             int16_t value;
             value = 2600;
@@ -29309,10 +29396,9 @@ class Test_TC_TSTAT_2_2Suite : public TestCommand
                                   Thermostat::Attributes::OccupiedCoolingSetpoint::Id, value, chip::NullOptional,
                                   chip::NullOptional);
         }
-        case 68: {
-            LogStep(68, "Sends SetpointRaise Command");
-            VerifyOrDo(!ShouldSkip("PICS_SKIP_SAMPLE_APP && CR_SetpointRaiseLower"),
-                       return ContinueOnChipMainThread(CHIP_NO_ERROR));
+        case 90: {
+            LogStep(90, "Sends SetpointRaise Command Cool Only");
+            VerifyOrDo(!ShouldSkip("TSTAT.S.F01"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             chip::app::Clusters::Thermostat::Commands::SetpointRaiseLower::Type value;
             value.mode   = static_cast<chip::app::Clusters::Thermostat::SetpointAdjustMode>(1);
@@ -29322,16 +29408,15 @@ class Test_TC_TSTAT_2_2Suite : public TestCommand
 
             );
         }
-        case 69: {
-            LogStep(69, "Reads back OccupiedCoolingSetpoint to confirm the success of the write");
-            VerifyOrDo(!ShouldSkip("PICS_SKIP_SAMPLE_APP && A_OCCUPIEDCOOLINGSETPOINT"),
-                       return ContinueOnChipMainThread(CHIP_NO_ERROR));
+        case 91: {
+            LogStep(91, "Reads back OccupiedCoolingSetpoint to confirm the success of the write");
+            VerifyOrDo(!ShouldSkip("TSTAT.S.F01"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), Thermostat::Id,
                                  Thermostat::Attributes::OccupiedCoolingSetpoint::Id, true, chip::NullOptional);
         }
-        case 70: {
-            LogStep(70, "Sets OccupiedCoolingSetpoint to default value");
-            VerifyOrDo(!ShouldSkip("A_OCCUPIEDCOOLINGSETPOINT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+        case 92: {
+            LogStep(92, "Sets OccupiedCoolingSetpoint to default value");
+            VerifyOrDo(!ShouldSkip("TSTAT.S.F01"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             int16_t value;
             value = 2600;
@@ -29339,10 +29424,19 @@ class Test_TC_TSTAT_2_2Suite : public TestCommand
                                   Thermostat::Attributes::OccupiedCoolingSetpoint::Id, value, chip::NullOptional,
                                   chip::NullOptional);
         }
-        case 71: {
-            LogStep(71, "Sends SetpointRaise Command");
-            VerifyOrDo(!ShouldSkip("PICS_SKIP_SAMPLE_APP && CR_SetpointRaiseLower"),
-                       return ContinueOnChipMainThread(CHIP_NO_ERROR));
+        case 93: {
+            LogStep(93, "Sets OccupiedHeatingSetpoint to default value");
+            VerifyOrDo(!ShouldSkip("TSTAT.S.F00"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            ListFreer listFreer;
+            int16_t value;
+            value = 2000;
+            return WriteAttribute(kIdentityAlpha, GetEndpoint(1), Thermostat::Id,
+                                  Thermostat::Attributes::OccupiedHeatingSetpoint::Id, value, chip::NullOptional,
+                                  chip::NullOptional);
+        }
+        case 94: {
+            LogStep(94, "Sends SetpointRaise Command Heat & Cool");
+            VerifyOrDo(!ShouldSkip("TSTAT.S.F00 || TSTAT.S.F01"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             chip::app::Clusters::Thermostat::Commands::SetpointRaiseLower::Type value;
             value.mode   = static_cast<chip::app::Clusters::Thermostat::SetpointAdjustMode>(2);
@@ -29352,22 +29446,21 @@ class Test_TC_TSTAT_2_2Suite : public TestCommand
 
             );
         }
-        case 72: {
-            LogStep(72, "Reads back OccupiedCoolingSetpoint to confirm the success of the write");
-            VerifyOrDo(!ShouldSkip("PICS_SKIP_SAMPLE_APP"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+        case 95: {
+            LogStep(95, "Reads back OccupiedCoolingSetpoint to confirm the success of the write");
+            VerifyOrDo(!ShouldSkip("TSTAT.S.F01"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), Thermostat::Id,
                                  Thermostat::Attributes::OccupiedCoolingSetpoint::Id, true, chip::NullOptional);
         }
-        case 73: {
-            LogStep(73, "Reads back OccupiedHeatingSetpoint to confirm the success of the write");
-            VerifyOrDo(!ShouldSkip("PICS_SKIP_SAMPLE_APP && A_OCCUPIEDHEATINGSETPOINT"),
-                       return ContinueOnChipMainThread(CHIP_NO_ERROR));
+        case 96: {
+            LogStep(96, "Reads back OccupiedHeatingSetpoint to confirm the success of the write");
+            VerifyOrDo(!ShouldSkip("TSTAT.S.F00"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), Thermostat::Id,
                                  Thermostat::Attributes::OccupiedHeatingSetpoint::Id, true, chip::NullOptional);
         }
-        case 74: {
-            LogStep(74, "Sets OccupiedCoolingSetpoint to default value");
-            VerifyOrDo(!ShouldSkip("A_OCCUPIEDCOOLINGSETPOINT"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+        case 97: {
+            LogStep(97, "Sets OccupiedCoolingSetpoint to default value");
+            VerifyOrDo(!ShouldSkip("TSTAT.S.F01"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             int16_t value;
             value = 2600;
@@ -29375,10 +29468,19 @@ class Test_TC_TSTAT_2_2Suite : public TestCommand
                                   Thermostat::Attributes::OccupiedCoolingSetpoint::Id, value, chip::NullOptional,
                                   chip::NullOptional);
         }
-        case 75: {
-            LogStep(75, "Sends SetpointRaise Command");
-            VerifyOrDo(!ShouldSkip("PICS_SKIP_SAMPLE_APP && CR_SetpointRaiseLower"),
-                       return ContinueOnChipMainThread(CHIP_NO_ERROR));
+        case 98: {
+            LogStep(98, "Sets OccupiedHeatingSetpoint to default value");
+            VerifyOrDo(!ShouldSkip("TSTAT.S.F00"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            ListFreer listFreer;
+            int16_t value;
+            value = 2000;
+            return WriteAttribute(kIdentityAlpha, GetEndpoint(1), Thermostat::Id,
+                                  Thermostat::Attributes::OccupiedHeatingSetpoint::Id, value, chip::NullOptional,
+                                  chip::NullOptional);
+        }
+        case 99: {
+            LogStep(99, "Sends SetpointRaise Command Heat & Cool");
+            VerifyOrDo(!ShouldSkip("TSTAT.S.F00 || TSTAT.S.F01"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             chip::app::Clusters::Thermostat::Commands::SetpointRaiseLower::Type value;
             value.mode   = static_cast<chip::app::Clusters::Thermostat::SetpointAdjustMode>(2);
@@ -29388,17 +29490,15 @@ class Test_TC_TSTAT_2_2Suite : public TestCommand
 
             );
         }
-        case 76: {
-            LogStep(76, "Reads back OccupiedCoolingSetpoint to confirm the success of the write");
-            VerifyOrDo(!ShouldSkip("PICS_SKIP_SAMPLE_APP && A_OCCUPIEDCOOLINGSETPOINT"),
-                       return ContinueOnChipMainThread(CHIP_NO_ERROR));
+        case 100: {
+            LogStep(100, "Reads back OccupiedCoolingSetpoint to confirm the success of the write");
+            VerifyOrDo(!ShouldSkip("TSTAT.S.F01"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), Thermostat::Id,
                                  Thermostat::Attributes::OccupiedCoolingSetpoint::Id, true, chip::NullOptional);
         }
-        case 77: {
-            LogStep(77, "Reads back OccupiedHeatingSetpoint to confirm the success of the write");
-            VerifyOrDo(!ShouldSkip("PICS_SKIP_SAMPLE_APP && A_OCCUPIEDHEATINGSETPOINT"),
-                       return ContinueOnChipMainThread(CHIP_NO_ERROR));
+        case 101: {
+            LogStep(101, "Reads back OccupiedHeatingSetpoint to confirm the success of the write");
+            VerifyOrDo(!ShouldSkip("TSTAT.S.F00"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), Thermostat::Id,
                                  Thermostat::Attributes::OccupiedHeatingSetpoint::Id, true, chip::NullOptional);
         }
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 5c56a47503678d..96c85b297b58bc 100644
--- a/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h
+++ b/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h
@@ -44946,10 +44946,6 @@ class Test_TC_TSTAT_1_1 : public TestCommandBridge {
             break;
         case 2:
             ChipLogProgress(chipTool, " ***** Test Step 2 : Read the optional global attribute constraints: FeatureMap\n");
-            if (ShouldSkip("( TSTAT_HEAT || TSTAT_COOL || TSTAT_OCC || TSTAT_SCH || TSTAT_SB || TSTAT_AUTO )")) {
-                NextTest();
-                return;
-            }
             err = TestReadTheOptionalGlobalAttributeConstraintsFeatureMap_2();
             break;
         case 3:
@@ -46594,7 +46590,7 @@ class Test_TC_TSTAT_2_2 : public TestCommandBridge {
             ChipLogProgress(chipTool,
                 " ***** Test Step 1 : Reads OccupiedCoolingSetpoint attribute from Server DUT and verifies that the value is "
                 "within range\n");
-            if (ShouldSkip("A_OCCUPIEDCOOLINGSETPOINT")) {
+            if (ShouldSkip("TSTAT.S.F01")) {
                 NextTest();
                 return;
             }
@@ -46603,7 +46599,7 @@ class Test_TC_TSTAT_2_2 : public TestCommandBridge {
         case 2:
             ChipLogProgress(chipTool,
                 " ***** Test Step 2 : Writes a value back that is different but valid for OccupiedCoolingSetpoint attribute\n");
-            if (ShouldSkip("A_OCCUPIEDCOOLINGSETPOINT")) {
+            if (ShouldSkip("TSTAT.S.F01")) {
                 NextTest();
                 return;
             }
@@ -46612,7 +46608,7 @@ class Test_TC_TSTAT_2_2 : public TestCommandBridge {
         case 3:
             ChipLogProgress(chipTool,
                 " ***** Test Step 3 : Reads it back again to confirm the successful write of OccupiedCoolingSetpoint attribute\n");
-            if (ShouldSkip("A_OCCUPIEDCOOLINGSETPOINT")) {
+            if (ShouldSkip("TSTAT.S.F01")) {
                 NextTest();
                 return;
             }
@@ -46620,17 +46616,17 @@ class Test_TC_TSTAT_2_2 : public TestCommandBridge {
             break;
         case 4:
             ChipLogProgress(
-                chipTool, " ***** Test Step 4 : Writes OccupiedCoolingSetpoint to value below the MinCoolSetpointLimit\n");
-            if (ShouldSkip("A_OCCUPIEDCOOLINGSETPOINT")) {
+                chipTool, " ***** Test Step 4 : Writes OccupiedCoolingSetpoint to value below the ABSMinCoolSetpointLimit\n");
+            if (ShouldSkip("TSTAT.S.F01")) {
                 NextTest();
                 return;
             }
-            err = TestWritesOccupiedCoolingSetpointToValueBelowTheMinCoolSetpointLimit_4();
+            err = TestWritesOccupiedCoolingSetpointToValueBelowTheABSMinCoolSetpointLimit_4();
             break;
         case 5:
             ChipLogProgress(
                 chipTool, " ***** Test Step 5 : Writes OccupiedCoolingSetpoint to value above the MaxCoolSetpointLimit\n");
-            if (ShouldSkip("A_OCCUPIEDCOOLINGSETPOINT")) {
+            if (ShouldSkip("TSTAT.S.F01")) {
                 NextTest();
                 return;
             }
@@ -46638,642 +46634,853 @@ class Test_TC_TSTAT_2_2 : public TestCommandBridge {
             break;
         case 6:
             ChipLogProgress(
-                chipTool, " ***** Test Step 6 : Writes the limit of MaxCoolSetpointLimit to OccupiedCoolingSetpoint attribute\n");
-            if (ShouldSkip("A_OCCUPIEDCOOLINGSETPOINT")) {
+                chipTool, " ***** Test Step 6 : Writes the limit of MinCoolSetpointLimit to OccupiedCoolingSetpoint attribute\n");
+            if (ShouldSkip("TSTAT.S.F01 && !TSTAT.S.F05")) {
                 NextTest();
                 return;
             }
-            err = TestWritesTheLimitOfMaxCoolSetpointLimitToOccupiedCoolingSetpointAttribute_6();
+            err = TestWritesTheLimitOfMinCoolSetpointLimitToOccupiedCoolingSetpointAttribute_6();
             break;
         case 7:
-            ChipLogProgress(chipTool,
-                " ***** Test Step 7 : Reads OccupiedHeatingSetpoint attribute from Server DUT and verifies that the value is "
-                "within range\n");
-            if (ShouldSkip("A_OCCUPIEDHEATINGSETPOINT")) {
+            ChipLogProgress(
+                chipTool, " ***** Test Step 7 : Writes the CoolingSetpoint below the HeatingSetpoint when auto is enabled\n");
+            if (ShouldSkip("TSTAT.S.F05")) {
                 NextTest();
                 return;
             }
-            err = TestReadsOccupiedHeatingSetpointAttributeFromServerDutAndVerifiesThatTheValueIsWithinRange_7();
+            err = TestWritesTheCoolingSetpointBelowTheHeatingSetpointWhenAutoIsEnabled_7();
             break;
         case 8:
-            ChipLogProgress(chipTool,
-                " ***** Test Step 8 : Writes a value back that is different but valid for OccupiedHeatingSetpoint attribute\n");
-            if (ShouldSkip("A_OCCUPIEDHEATINGSETPOINT")) {
+            ChipLogProgress(
+                chipTool, " ***** Test Step 8 : Writes the limit of MaxCoolSetpointLimit to OccupiedCoolingSetpoint attribute\n");
+            if (ShouldSkip("TSTAT.S.F01")) {
                 NextTest();
                 return;
             }
-            err = TestWritesAValueBackThatIsDifferentButValidForOccupiedHeatingSetpointAttribute_8();
+            err = TestWritesTheLimitOfMaxCoolSetpointLimitToOccupiedCoolingSetpointAttribute_8();
             break;
         case 9:
             ChipLogProgress(chipTool,
-                " ***** Test Step 9 : Reads it back again to confirm the successful write of OccupiedHeatingSetpoint attribute\n");
-            if (ShouldSkip("A_OCCUPIEDHEATINGSETPOINT")) {
+                " ***** Test Step 9 : Reads OccupiedHeatingSetpoint attribute from Server DUT and verifies that the value is "
+                "within range\n");
+            if (ShouldSkip("TSTAT.S.F00")) {
                 NextTest();
                 return;
             }
-            err = TestReadsItBackAgainToConfirmTheSuccessfulWriteOfOccupiedHeatingSetpointAttribute_9();
+            err = TestReadsOccupiedHeatingSetpointAttributeFromServerDutAndVerifiesThatTheValueIsWithinRange_9();
             break;
         case 10:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 10 : Writes OccupiedHeatingSetpoint to value below the MinHeatSetpointLimit\n");
-            if (ShouldSkip("A_OCCUPIEDHEATINGSETPOINT")) {
+            ChipLogProgress(chipTool,
+                " ***** Test Step 10 : Writes a value back that is different but valid for OccupiedHeatingSetpoint attribute\n");
+            if (ShouldSkip("TSTAT.S.F00")) {
                 NextTest();
                 return;
             }
-            err = TestWritesOccupiedHeatingSetpointToValueBelowTheMinHeatSetpointLimit_10();
+            err = TestWritesAValueBackThatIsDifferentButValidForOccupiedHeatingSetpointAttribute_10();
             break;
         case 11:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 11 : Writes OccupiedHeatingSetpoint to value above the MaxHeatSetpointLimit\n");
-            if (ShouldSkip("A_OCCUPIEDHEATINGSETPOINT")) {
+            ChipLogProgress(chipTool,
+                " ***** Test Step 11 : Reads it back again to confirm the successful write of OccupiedHeatingSetpoint attribute\n");
+            if (ShouldSkip("TSTAT.S.F00")) {
                 NextTest();
                 return;
             }
-            err = TestWritesOccupiedHeatingSetpointToValueAboveTheMaxHeatSetpointLimit_11();
+            err = TestReadsItBackAgainToConfirmTheSuccessfulWriteOfOccupiedHeatingSetpointAttribute_11();
             break;
         case 12:
             ChipLogProgress(
-                chipTool, " ***** Test Step 12 : Writes the limit of MinHeatSetpointLimit to OccupiedHeatingSetpoint attribute\n");
-            if (ShouldSkip("A_OCCUPIEDHEATINGSETPOINT")) {
+                chipTool, " ***** Test Step 12 : Writes OccupiedHeatingSetpoint to value below the MinHeatSetpointLimit\n");
+            if (ShouldSkip("TSTAT.S.F00")) {
                 NextTest();
                 return;
             }
-            err = TestWritesTheLimitOfMinHeatSetpointLimitToOccupiedHeatingSetpointAttribute_12();
+            err = TestWritesOccupiedHeatingSetpointToValueBelowTheMinHeatSetpointLimit_12();
             break;
         case 13:
-            ChipLogProgress(chipTool,
-                " ***** Test Step 13 : Reads UnoccupiedCoolingSetpoint attribute from Server DUT and verifies that the value is "
-                "within range\n");
-            if (ShouldSkip("A_UNOCCUPIEDCOOLINGSETPOINT")) {
+            ChipLogProgress(
+                chipTool, " ***** Test Step 13 : Writes OccupiedHeatingSetpoint to value above the MaxHeatSetpointLimit\n");
+            if (ShouldSkip("TSTAT.S.F00")) {
                 NextTest();
                 return;
             }
-            err = TestReadsUnoccupiedCoolingSetpointAttributeFromServerDutAndVerifiesThatTheValueIsWithinRange_13();
+            err = TestWritesOccupiedHeatingSetpointToValueAboveTheMaxHeatSetpointLimit_13();
             break;
         case 14:
-            ChipLogProgress(chipTool,
-                " ***** Test Step 14 : Writes a value back that is different but valid for UnoccupiedCoolingSetpoint attribute\n");
-            if (ShouldSkip("A_UNOCCUPIEDCOOLINGSETPOINT")) {
+            ChipLogProgress(
+                chipTool, " ***** Test Step 14 : Writes the limit of MinHeatSetpointLimit to OccupiedHeatingSetpoint attribute\n");
+            if (ShouldSkip("TSTAT.S.F00")) {
                 NextTest();
                 return;
             }
-            err = TestWritesAValueBackThatIsDifferentButValidForUnoccupiedCoolingSetpointAttribute_14();
+            err = TestWritesTheLimitOfMinHeatSetpointLimitToOccupiedHeatingSetpointAttribute_14();
             break;
         case 15:
             ChipLogProgress(chipTool,
-                " ***** Test Step 15 : Reads it back again to confirm the successful write of UnoccupiedCoolingSetpoint "
-                "attribute\n");
-            if (ShouldSkip("A_UNOCCUPIEDCOOLINGSETPOINT")) {
+                " ***** Test Step 15 : Reads it back again to confirm the successful write of OccupiedHeatingSetpoint attribute\n");
+            if (ShouldSkip("TSTAT.S.F00")) {
                 NextTest();
                 return;
             }
-            err = TestReadsItBackAgainToConfirmTheSuccessfulWriteOfUnoccupiedCoolingSetpointAttribute_15();
+            err = TestReadsItBackAgainToConfirmTheSuccessfulWriteOfOccupiedHeatingSetpointAttribute_15();
             break;
         case 16:
             ChipLogProgress(
-                chipTool, " ***** Test Step 16 : Writes UnoccupiedCoolingSetpoint to value below the MinHeatSetpointLimit\n");
-            if (ShouldSkip("A_UNOCCUPIEDCOOLINGSETPOINT")) {
+                chipTool, " ***** Test Step 16 : Writes the limit of MaxHeatSetpointLimit to OccupiedHeatingSetpoint attribute\n");
+            if (ShouldSkip("TSTAT.S.F00 && !TSTAT.S.F05")) {
                 NextTest();
                 return;
             }
-            err = TestWritesUnoccupiedCoolingSetpointToValueBelowTheMinHeatSetpointLimit_16();
+            err = TestWritesTheLimitOfMaxHeatSetpointLimitToOccupiedHeatingSetpointAttribute_16();
             break;
         case 17:
             ChipLogProgress(
-                chipTool, " ***** Test Step 17 : Writes UnoccupiedCoolingSetpoint to value above the MaxHeatSetpointLimit\n");
-            if (ShouldSkip("A_UNOCCUPIEDCOOLINGSETPOINT")) {
+                chipTool, " ***** Test Step 17 : Writes the limit of MaxHeatSetpointLimit to OccupiedHeatingSetpoint attribute\n");
+            if (ShouldSkip("TSTAT.S.F05")) {
                 NextTest();
                 return;
             }
-            err = TestWritesUnoccupiedCoolingSetpointToValueAboveTheMaxHeatSetpointLimit_17();
+            err = TestWritesTheLimitOfMaxHeatSetpointLimitToOccupiedHeatingSetpointAttribute_17();
             break;
         case 18:
             ChipLogProgress(chipTool,
-                " ***** Test Step 18 : Writes the limit of MinCoolSetpointLimit to UnoccupiedCoolingSetpoint attribute\n");
-            if (ShouldSkip("A_UNOCCUPIEDCOOLINGSETPOINT")) {
+                " ***** Test Step 18 : Reads UnoccupiedCoolingSetpoint attribute from Server DUT and verifies that the value is "
+                "within range\n");
+            if (ShouldSkip("TSTAT.S.F02 && TSTAT.S.F01")) {
                 NextTest();
                 return;
             }
-            err = TestWritesTheLimitOfMinCoolSetpointLimitToUnoccupiedCoolingSetpointAttribute_18();
+            err = TestReadsUnoccupiedCoolingSetpointAttributeFromServerDutAndVerifiesThatTheValueIsWithinRange_18();
             break;
         case 19:
             ChipLogProgress(chipTool,
-                " ***** Test Step 19 : Writes the limit of MaxCoolSetpointLimit to UnoccupiedCoolingSetpoint attribute\n");
-            if (ShouldSkip("A_UNOCCUPIEDCOOLINGSETPOINT")) {
+                " ***** Test Step 19 : Writes a value back that is different but valid for UnoccupiedCoolingSetpoint attribute\n");
+            if (ShouldSkip("TSTAT.S.F02 && TSTAT.S.F01")) {
                 NextTest();
                 return;
             }
-            err = TestWritesTheLimitOfMaxCoolSetpointLimitToUnoccupiedCoolingSetpointAttribute_19();
+            err = TestWritesAValueBackThatIsDifferentButValidForUnoccupiedCoolingSetpointAttribute_19();
             break;
         case 20:
             ChipLogProgress(chipTool,
-                " ***** Test Step 20 : Reads UnoccupiedHeatingSetpoint attribute from Server DUT and verifies that the value is "
-                "within range\n");
-            if (ShouldSkip("A_UNOCCUPIEDHEATINGSETPOINT")) {
+                " ***** Test Step 20 : Reads it back again to confirm the successful write of UnoccupiedCoolingSetpoint "
+                "attribute\n");
+            if (ShouldSkip("TSTAT.S.F02 && TSTAT.S.F01")) {
                 NextTest();
                 return;
             }
-            err = TestReadsUnoccupiedHeatingSetpointAttributeFromServerDutAndVerifiesThatTheValueIsWithinRange_20();
+            err = TestReadsItBackAgainToConfirmTheSuccessfulWriteOfUnoccupiedCoolingSetpointAttribute_20();
             break;
         case 21:
-            ChipLogProgress(chipTool,
-                " ***** Test Step 21 : Writes a value back that is different but valid for UnoccupiedHeatingSetpoint attribute\n");
-            if (ShouldSkip("A_UNOCCUPIEDHEATINGSETPOINT")) {
+            ChipLogProgress(
+                chipTool, " ***** Test Step 21 : Writes UnoccupiedCoolingSetpoint to value below the MinCoolSetpointLimit\n");
+            if (ShouldSkip("TSTAT.S.F02 && TSTAT.S.F01")) {
                 NextTest();
                 return;
             }
-            err = TestWritesAValueBackThatIsDifferentButValidForUnoccupiedHeatingSetpointAttribute_21();
+            err = TestWritesUnoccupiedCoolingSetpointToValueBelowTheMinCoolSetpointLimit_21();
             break;
         case 22:
-            ChipLogProgress(chipTool,
-                " ***** Test Step 22 : Reads it back again to confirm the successful write of UnoccupiedHeatingSetpoint "
-                "attribute\n");
-            if (ShouldSkip("A_UNOCCUPIEDHEATINGSETPOINT")) {
+            ChipLogProgress(
+                chipTool, " ***** Test Step 22 : Writes UnoccupiedCoolingSetpoint to value above the MaxCoolSetpointLimit\n");
+            if (ShouldSkip("TSTAT.S.F02 && TSTAT.S.F01")) {
                 NextTest();
                 return;
             }
-            err = TestReadsItBackAgainToConfirmTheSuccessfulWriteOfUnoccupiedHeatingSetpointAttribute_22();
+            err = TestWritesUnoccupiedCoolingSetpointToValueAboveTheMaxCoolSetpointLimit_22();
             break;
         case 23:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 23 : Writes UnoccupiedHeatingSetpoint to value below the MinHeatSetpointLimit\n");
-            if (ShouldSkip("A_UNOCCUPIEDHEATINGSETPOINT")) {
+            ChipLogProgress(chipTool,
+                " ***** Test Step 23 : Writes the limit of MinCoolSetpointLimit to UnoccupiedCoolingSetpoint attribute\n");
+            if (ShouldSkip("TSTAT.S.F02 && TSTAT.S.F01")) {
                 NextTest();
                 return;
             }
-            err = TestWritesUnoccupiedHeatingSetpointToValueBelowTheMinHeatSetpointLimit_23();
+            err = TestWritesTheLimitOfMinCoolSetpointLimitToUnoccupiedCoolingSetpointAttribute_23();
             break;
         case 24:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 24 : Writes UnoccupiedHeatingSetpoint to value above the MaxHeatSetpointLimit\n");
-            if (ShouldSkip("A_UNOCCUPIEDHEATINGSETPOINT")) {
+            ChipLogProgress(chipTool,
+                " ***** Test Step 24 : Writes the limit of MaxCoolSetpointLimit to UnoccupiedCoolingSetpoint attribute\n");
+            if (ShouldSkip("TSTAT.S.F02 && TSTAT.S.F01")) {
                 NextTest();
                 return;
             }
-            err = TestWritesUnoccupiedHeatingSetpointToValueAboveTheMaxHeatSetpointLimit_24();
+            err = TestWritesTheLimitOfMaxCoolSetpointLimitToUnoccupiedCoolingSetpointAttribute_24();
             break;
         case 25:
             ChipLogProgress(chipTool,
-                " ***** Test Step 25 : Writes the limit of MinHeatSetpointLimit to UnoccupiedHeatingSetpoint attribute\n");
-            if (ShouldSkip("A_UNOCCUPIEDHEATINGSETPOINT")) {
+                " ***** Test Step 25 : Reads UnoccupiedHeatingSetpoint attribute from Server DUT and verifies that the value is "
+                "within range\n");
+            if (ShouldSkip("TSTAT.S.F02 && TSTAT.S.F00")) {
                 NextTest();
                 return;
             }
-            err = TestWritesTheLimitOfMinHeatSetpointLimitToUnoccupiedHeatingSetpointAttribute_25();
+            err = TestReadsUnoccupiedHeatingSetpointAttributeFromServerDutAndVerifiesThatTheValueIsWithinRange_25();
             break;
         case 26:
             ChipLogProgress(chipTool,
-                " ***** Test Step 26 : Writes the limit of MaxHeatSetpointLimit to UnoccupiedHeatingSetpoint attribute\n");
-            if (ShouldSkip("A_UNOCCUPIEDHEATINGSETPOINT")) {
+                " ***** Test Step 26 : Writes a value back that is different but valid for UnoccupiedHeatingSetpoint attribute\n");
+            if (ShouldSkip("TSTAT.S.F02 && TSTAT.S.F00")) {
                 NextTest();
                 return;
             }
-            err = TestWritesTheLimitOfMaxHeatSetpointLimitToUnoccupiedHeatingSetpointAttribute_26();
+            err = TestWritesAValueBackThatIsDifferentButValidForUnoccupiedHeatingSetpointAttribute_26();
             break;
         case 27:
             ChipLogProgress(chipTool,
-                " ***** Test Step 27 : Reads MinHeatSetpointLimit attribute from Server DUT and verifies that the value is within "
-                "range\n");
-            if (ShouldSkip("A_MINHEATSETPOINTLIMIT")) {
+                " ***** Test Step 27 : Reads it back again to confirm the successful write of UnoccupiedHeatingSetpoint "
+                "attribute\n");
+            if (ShouldSkip("TSTAT.S.F02 && TSTAT.S.F00")) {
                 NextTest();
                 return;
             }
-            err = TestReadsMinHeatSetpointLimitAttributeFromServerDutAndVerifiesThatTheValueIsWithinRange_27();
+            err = TestReadsItBackAgainToConfirmTheSuccessfulWriteOfUnoccupiedHeatingSetpointAttribute_27();
             break;
         case 28:
             ChipLogProgress(
-                chipTool, " ***** Test Step 28 : Writes MinHeatSetpointLimit to value below the AbsMinHeatSetpointLimit \n");
-            if (ShouldSkip("A_MINHEATSETPOINTLIMIT")) {
+                chipTool, " ***** Test Step 28 : Writes UnoccupiedHeatingSetpoint to value below the MinHeatSetpointLimit\n");
+            if (ShouldSkip("TSTAT.S.F02 && TSTAT.S.F00")) {
                 NextTest();
                 return;
             }
-            err = TestWritesMinHeatSetpointLimitToValueBelowTheAbsMinHeatSetpointLimit_28();
+            err = TestWritesUnoccupiedHeatingSetpointToValueBelowTheMinHeatSetpointLimit_28();
             break;
         case 29:
             ChipLogProgress(
-                chipTool, " ***** Test Step 29 : Writes MinHeatSetpointLimit to value above the AbsMaxHeatSetpointLimit \n");
-            if (ShouldSkip("A_MINHEATSETPOINTLIMIT")) {
+                chipTool, " ***** Test Step 29 : Writes UnoccupiedHeatingSetpoint to value above the MaxHeatSetpointLimit\n");
+            if (ShouldSkip("TSTAT.S.F02 && TSTAT.S.F00")) {
                 NextTest();
                 return;
             }
-            err = TestWritesMinHeatSetpointLimitToValueAboveTheAbsMaxHeatSetpointLimit_29();
+            err = TestWritesUnoccupiedHeatingSetpointToValueAboveTheMaxHeatSetpointLimit_29();
             break;
         case 30:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 30 : Writes the limit of AbsMinHeatSetpointLimit to MinHeatSetpointLimit attribute\n");
-            if (ShouldSkip("A_MINHEATSETPOINTLIMIT")) {
+            ChipLogProgress(chipTool,
+                " ***** Test Step 30 : Writes the limit of MinHeatSetpointLimit to UnoccupiedHeatingSetpoint attribute\n");
+            if (ShouldSkip("TSTAT.S.F02 && TSTAT.S.F00")) {
                 NextTest();
                 return;
             }
-            err = TestWritesTheLimitOfAbsMinHeatSetpointLimitToMinHeatSetpointLimitAttribute_30();
+            err = TestWritesTheLimitOfMinHeatSetpointLimitToUnoccupiedHeatingSetpointAttribute_30();
             break;
         case 31:
             ChipLogProgress(chipTool,
-                " ***** Test Step 31 : Writes a value back that is different but valid for MaxHeatSetpointLimit attribute\n");
-            if (ShouldSkip("A_MAXHEATSETPOINTLIMIT")) {
+                " ***** Test Step 31 : Writes the limit of MaxHeatSetpointLimit to UnoccupiedHeatingSetpoint attribute\n");
+            if (ShouldSkip("TSTAT.S.F02 && TSTAT.S.F00")) {
                 NextTest();
                 return;
             }
-            err = TestWritesAValueBackThatIsDifferentButValidForMaxHeatSetpointLimitAttribute_31();
+            err = TestWritesTheLimitOfMaxHeatSetpointLimitToUnoccupiedHeatingSetpointAttribute_31();
             break;
         case 32:
             ChipLogProgress(chipTool,
-                " ***** Test Step 32 : Reads it back again to confirm the successful write of MaxHeatSetpointLimit attribute\n");
-            if (ShouldSkip("A_MAXHEATSETPOINTLIMIT")) {
+                " ***** Test Step 32 : Reads MinHeatSetpointLimit attribute from Server DUT and verifies that the value is within "
+                "range\n");
+            if (ShouldSkip("TSTAT.S.F00 && A_MINHEATSETPOINTLIMIT")) {
                 NextTest();
                 return;
             }
-            err = TestReadsItBackAgainToConfirmTheSuccessfulWriteOfMaxHeatSetpointLimitAttribute_32();
+            err = TestReadsMinHeatSetpointLimitAttributeFromServerDutAndVerifiesThatTheValueIsWithinRange_32();
             break;
         case 33:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 33 : Writes MaxHeatSetpointLimit to value below the AbsMinHeatSetpointLimit \n");
-            if (ShouldSkip("A_MAXHEATSETPOINTLIMIT")) {
+            ChipLogProgress(chipTool,
+                " ***** Test Step 33 : Writes a value back that is different but valid for MinHeatSetpointLimit attribute\n");
+            if (ShouldSkip("TSTAT.S.F00 && A_MINHEATSETPOINTLIMIT")) {
                 NextTest();
                 return;
             }
-            err = TestWritesMaxHeatSetpointLimitToValueBelowTheAbsMinHeatSetpointLimit_33();
+            err = TestWritesAValueBackThatIsDifferentButValidForMinHeatSetpointLimitAttribute_33();
             break;
         case 34:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 34 : Writes MaxHeatSetpointLimit to value above the AbsMaxHeatSetpointLimit \n");
-            if (ShouldSkip("A_MAXHEATSETPOINTLIMIT")) {
+            ChipLogProgress(chipTool,
+                " ***** Test Step 34 : Reads it back again to confirm the successful write of MinHeatSetpointLimit attribute\n");
+            if (ShouldSkip("TSTAT.S.F00  && A_MINHEATSETPOINTLIMIT")) {
                 NextTest();
                 return;
             }
-            err = TestWritesMaxHeatSetpointLimitToValueAboveTheAbsMaxHeatSetpointLimit_34();
+            err = TestReadsItBackAgainToConfirmTheSuccessfulWriteOfMinHeatSetpointLimitAttribute_34();
             break;
         case 35:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 35 : Writes the limit of AbsMinHeatSetpointLimit to MaxHeatSetpointLimit attribute\n");
-            if (ShouldSkip("A_MAXHEATSETPOINTLIMIT")) {
+            ChipLogProgress(chipTool, " ***** Test Step 35 : Writes a value back that is different but violates the deadband\n");
+            if (ShouldSkip("A_MINHEATSETPOINTLIMIT && TSTAT.S.F05")) {
                 NextTest();
                 return;
             }
-            err = TestWritesTheLimitOfAbsMinHeatSetpointLimitToMaxHeatSetpointLimitAttribute_35();
+            err = TestWritesAValueBackThatIsDifferentButViolatesTheDeadband_35();
             break;
         case 36:
-            ChipLogProgress(chipTool,
-                " ***** Test Step 36 : Reads MinCoolSetpointLimit attribute from Server DUT and verifies that the value is within "
-                "range\n");
-            if (ShouldSkip("A_MINCOOLSETPOINTLIMIT")) {
+            ChipLogProgress(
+                chipTool, " ***** Test Step 36 : Writes MinHeatSetpointLimit to value below the AbsMinHeatSetpointLimit \n");
+            if (ShouldSkip("TSTAT.S.F00 && A_MINHEATSETPOINTLIMIT")) {
                 NextTest();
                 return;
             }
-            err = TestReadsMinCoolSetpointLimitAttributeFromServerDutAndVerifiesThatTheValueIsWithinRange_36();
+            err = TestWritesMinHeatSetpointLimitToValueBelowTheAbsMinHeatSetpointLimit_36();
             break;
         case 37:
-            ChipLogProgress(chipTool,
-                " ***** Test Step 37 : Writes a value back that is different but valid for MinCoolSetpointLimit attribute\n");
-            if (ShouldSkip("A_MINCOOLSETPOINTLIMIT")) {
+            ChipLogProgress(
+                chipTool, " ***** Test Step 37 : Writes MinHeatSetpointLimit to value above the AbsMaxHeatSetpointLimit \n");
+            if (ShouldSkip("TSTAT.S.F00  && A_MINHEATSETPOINTLIMIT")) {
                 NextTest();
                 return;
             }
-            err = TestWritesAValueBackThatIsDifferentButValidForMinCoolSetpointLimitAttribute_37();
+            err = TestWritesMinHeatSetpointLimitToValueAboveTheAbsMaxHeatSetpointLimit_37();
             break;
         case 38:
-            ChipLogProgress(chipTool,
-                " ***** Test Step 38 : Reads it back again to confirm the successful write of MinCoolSetpointLimit attribute\n");
-            if (ShouldSkip("A_MINCOOLSETPOINTLIMIT")) {
+            ChipLogProgress(
+                chipTool, " ***** Test Step 38 : Writes the limit of AbsMinHeatSetpointLimit to MinHeatSetpointLimit attribute\n");
+            if (ShouldSkip("TSTAT.S.F00  && A_MINHEATSETPOINTLIMIT")) {
                 NextTest();
                 return;
             }
-            err = TestReadsItBackAgainToConfirmTheSuccessfulWriteOfMinCoolSetpointLimitAttribute_38();
+            err = TestWritesTheLimitOfAbsMinHeatSetpointLimitToMinHeatSetpointLimitAttribute_38();
             break;
         case 39:
             ChipLogProgress(
-                chipTool, " ***** Test Step 39 : Writes MinCoolSetpointLimit to value below the AbsMinCoolSetpointLimit \n");
-            if (ShouldSkip("A_MINCOOLSETPOINTLIMIT")) {
+                chipTool, " ***** Test Step 39 : Writes the limit of AbsMaxHeatSetpointLimit to MinHeatSetpointLimit attribute\n");
+            if (ShouldSkip("TSTAT.S.F00  && A_MINHEATSETPOINTLIMIT && !TSTAT.S.F05")) {
                 NextTest();
                 return;
             }
-            err = TestWritesMinCoolSetpointLimitToValueBelowTheAbsMinCoolSetpointLimit_39();
+            err = TestWritesTheLimitOfAbsMaxHeatSetpointLimitToMinHeatSetpointLimitAttribute_39();
             break;
         case 40:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 40 : Writes MinCoolSetpointLimit to value above the MaxCoolSetpointLimit \n");
-            if (ShouldSkip("A_MINCOOLSETPOINTLIMIT")) {
+            ChipLogProgress(chipTool,
+                " ***** Test Step 40 : Reads MaxHeatSetpointLimit attribute from Server DUT and verifies that the value is within "
+                "range\n");
+            if (ShouldSkip("TSTAT.S.F00  && A_MAXHEATSETPOINTLIMIT && !TSTAT.S.F05")) {
                 NextTest();
                 return;
             }
-            err = TestWritesMinCoolSetpointLimitToValueAboveTheMaxCoolSetpointLimit_40();
+            err = TestReadsMaxHeatSetpointLimitAttributeFromServerDutAndVerifiesThatTheValueIsWithinRange_40();
             break;
         case 41:
             ChipLogProgress(
-                chipTool, " ***** Test Step 41 : Writes the limit of AbsMinCoolSetpointLimit to MinCoolSetpointLimit attribute\n");
-            if (ShouldSkip("A_MINCOOLSETPOINTLIMIT")) {
+                chipTool, " ***** Test Step 41 : Writes the limit of AbsMinHeatSetpointLimit to MinHeatSetpointLimit attribute\n");
+            if (ShouldSkip("TSTAT.S.F00  && A_MINHEATSETPOINTLIMIT")) {
                 NextTest();
                 return;
             }
-            err = TestWritesTheLimitOfAbsMinCoolSetpointLimitToMinCoolSetpointLimitAttribute_41();
+            err = TestWritesTheLimitOfAbsMinHeatSetpointLimitToMinHeatSetpointLimitAttribute_41();
             break;
         case 42:
             ChipLogProgress(
-                chipTool, " ***** Test Step 42 : Writes the limit of MaxCoolSetpointLimit to MinCoolSetpointLimit attribute\n");
-            if (ShouldSkip("A_MINCOOLSETPOINTLIMIT")) {
+                chipTool, " ***** Test Step 42 : Writes the limit of AbsMaxHeatSetpointLimit to MinHeatSetpointLimit attribute\n");
+            if (ShouldSkip("A_MINHEATSETPOINTLIMIT && TSTAT.S.F05")) {
                 NextTest();
                 return;
             }
-            err = TestWritesTheLimitOfMaxCoolSetpointLimitToMinCoolSetpointLimitAttribute_42();
+            err = TestWritesTheLimitOfAbsMaxHeatSetpointLimitToMinHeatSetpointLimitAttribute_42();
             break;
         case 43:
             ChipLogProgress(chipTool,
-                " ***** Test Step 43 : Reads MaxCoolSetpointLimit attribute from Server DUT and verifies that the value is within "
-                "range\n");
-            if (ShouldSkip("A_MAXCOOLSETPOINTLIMIT")) {
+                " ***** Test Step 43 : Writes a value back that is different but valid for MaxHeatSetpointLimit attribute\n");
+            if (ShouldSkip("TSTAT.S.F00 && A_MAXHEATSETPOINTLIMIT && !TSTAT.S.F05")) {
                 NextTest();
                 return;
             }
-            err = TestReadsMaxCoolSetpointLimitAttributeFromServerDutAndVerifiesThatTheValueIsWithinRange_43();
+            err = TestWritesAValueBackThatIsDifferentButValidForMaxHeatSetpointLimitAttribute_43();
             break;
         case 44:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 44 : Writes MaxCoolSetpointLimit to value below the AbsMinCoolSetpointLimit \n");
-            if (ShouldSkip("A_MAXCOOLSETPOINTLIMIT")) {
+            ChipLogProgress(chipTool,
+                " ***** Test Step 44 : Reads it back again to confirm the successful write of MaxHeatSetpointLimit attribute\n");
+            if (ShouldSkip("TSTAT.S.F00 && A_MAXHEATSETPOINTLIMIT && !TSTAT.S.F05")) {
                 NextTest();
                 return;
             }
-            err = TestWritesMaxCoolSetpointLimitToValueBelowTheAbsMinCoolSetpointLimit_44();
+            err = TestReadsItBackAgainToConfirmTheSuccessfulWriteOfMaxHeatSetpointLimitAttribute_44();
             break;
         case 45:
             ChipLogProgress(
-                chipTool, " ***** Test Step 45 : Writes MaxCoolSetpointLimit to value above the MaxCoolSetpointLimit \n");
-            if (ShouldSkip("A_MAXCOOLSETPOINTLIMIT")) {
+                chipTool, " ***** Test Step 45 : Writes MaxHeatSetpointLimit to value below the AbsMinHeatSetpointLimit \n");
+            if (ShouldSkip("TSTAT.S.F00  && A_MAXHEATSETPOINTLIMIT")) {
                 NextTest();
                 return;
             }
-            err = TestWritesMaxCoolSetpointLimitToValueAboveTheMaxCoolSetpointLimit_45();
+            err = TestWritesMaxHeatSetpointLimitToValueBelowTheAbsMinHeatSetpointLimit_45();
             break;
         case 46:
             ChipLogProgress(
-                chipTool, " ***** Test Step 46 : Writes the limit of MaxCoolSetpointLimit to MaxCoolSetpointLimit attribute\n");
-            if (ShouldSkip("A_MAXCOOLSETPOINTLIMIT")) {
+                chipTool, " ***** Test Step 46 : Writes MaxHeatSetpointLimit to value above the AbsMaxHeatSetpointLimit \n");
+            if (ShouldSkip("TSTAT.S.F00  && A_MAXHEATSETPOINTLIMIT")) {
                 NextTest();
                 return;
             }
-            err = TestWritesTheLimitOfMaxCoolSetpointLimitToMaxCoolSetpointLimitAttribute_46();
+            err = TestWritesMaxHeatSetpointLimitToValueAboveTheAbsMaxHeatSetpointLimit_46();
             break;
         case 47:
-            ChipLogProgress(chipTool, " ***** Test Step 47 : Writes (sets back) default value of MinHeatSetpointLimit\n");
-            if (ShouldSkip("A_MINHEATSETPOINTLIMIT")) {
+            ChipLogProgress(
+                chipTool, " ***** Test Step 47 : Writes the limit of AbsMinHeatSetpointLimit to MaxHeatSetpointLimit attribute\n");
+            if (ShouldSkip("TSTAT.S.F00  && A_MAXHEATSETPOINTLIMIT")) {
                 NextTest();
                 return;
             }
-            err = TestWritesSetsBackDefaultValueOfMinHeatSetpointLimit_47();
+            err = TestWritesTheLimitOfAbsMinHeatSetpointLimitToMaxHeatSetpointLimitAttribute_47();
             break;
         case 48:
-            ChipLogProgress(chipTool, " ***** Test Step 48 : Writes (sets back) default value of MinCoolSetpointLimit\n");
-            if (ShouldSkip("A_MINCOOLSETPOINTLIMIT")) {
+            ChipLogProgress(
+                chipTool, " ***** Test Step 48 : Writes the limit of AbsMaxHeatSetpointLimit to MaxHeatSetpointLimit attribute\n");
+            if (ShouldSkip("TSTAT.S.F00  && A_MAXHEATSETPOINTLIMIT && !TSTAT.S.F05")) {
                 NextTest();
                 return;
             }
-            err = TestWritesSetsBackDefaultValueOfMinCoolSetpointLimit_48();
+            err = TestWritesTheLimitOfAbsMaxHeatSetpointLimitToMaxHeatSetpointLimitAttribute_48();
             break;
         case 49:
-            ChipLogProgress(chipTool, " ***** Test Step 49 : Writes (sets back) default value of MaxCoolSetpointLimit\n");
-            if (ShouldSkip("A_MAXCOOLSETPOINTLIMIT")) {
+            ChipLogProgress(chipTool,
+                " ***** Test Step 49 : Reads MinCoolSetpointLimit attribute from Server DUT and verifies that the value is within "
+                "range\n");
+            if (ShouldSkip("TSTAT.S.F01 && A_MINCOOLSETPOINTLIMIT")) {
                 NextTest();
                 return;
             }
-            err = TestWritesSetsBackDefaultValueOfMaxCoolSetpointLimit_49();
+            err = TestReadsMinCoolSetpointLimitAttributeFromServerDutAndVerifiesThatTheValueIsWithinRange_49();
             break;
         case 50:
             ChipLogProgress(chipTool,
-                " ***** Test Step 50 : Reads MinSetpointDeadBand attribute from Server DUT and verifies that the value is within "
-                "range\n");
-            if (ShouldSkip("A_MINSETPOINTDEADBAND")) {
+                " ***** Test Step 50 : Writes a value back that is different but valid for MinCoolSetpointLimit attribute\n");
+            if (ShouldSkip("TSTAT.S.F01 && A_MINCOOLSETPOINTLIMIT")) {
                 NextTest();
                 return;
             }
-            err = TestReadsMinSetpointDeadBandAttributeFromServerDutAndVerifiesThatTheValueIsWithinRange_50();
+            err = TestWritesAValueBackThatIsDifferentButValidForMinCoolSetpointLimitAttribute_50();
             break;
         case 51:
             ChipLogProgress(chipTool,
-                " ***** Test Step 51 : Writes a value back that is different but valid for MinSetpointDeadBand attribute\n");
-            if (ShouldSkip("A_MINSETPOINTDEADBAND")) {
+                " ***** Test Step 51 : Reads it back again to confirm the successful write of MinCoolSetpointLimit attribute\n");
+            if (ShouldSkip("TSTAT.S.F01 && A_MINCOOLSETPOINTLIMIT")) {
                 NextTest();
                 return;
             }
-            err = TestWritesAValueBackThatIsDifferentButValidForMinSetpointDeadBandAttribute_51();
+            err = TestReadsItBackAgainToConfirmTheSuccessfulWriteOfMinCoolSetpointLimitAttribute_51();
             break;
         case 52:
-            ChipLogProgress(chipTool,
-                " ***** Test Step 52 : Reads it back again to confirm the successful write of MinSetpointDeadBand attribute\n");
-            if (ShouldSkip("A_MINSETPOINTDEADBAND")) {
+            ChipLogProgress(
+                chipTool, " ***** Test Step 52 : Writes MinCoolSetpointLimit to value below the AbsMinCoolSetpointLimit \n");
+            if (ShouldSkip("TSTAT.S.F01 && A_MINCOOLSETPOINTLIMIT")) {
                 NextTest();
                 return;
             }
-            err = TestReadsItBackAgainToConfirmTheSuccessfulWriteOfMinSetpointDeadBandAttribute_52();
+            err = TestWritesMinCoolSetpointLimitToValueBelowTheAbsMinCoolSetpointLimit_52();
             break;
         case 53:
-            ChipLogProgress(chipTool, " ***** Test Step 53 : Writes the value below MinSetpointDeadBand\n");
-            if (ShouldSkip("A_MINSETPOINTDEADBAND")) {
+            ChipLogProgress(
+                chipTool, " ***** Test Step 53 : Writes MinCoolSetpointLimit to value above the MaxCoolSetpointLimit \n");
+            if (ShouldSkip("TSTAT.S.F01 && A_MINCOOLSETPOINTLIMIT")) {
                 NextTest();
                 return;
             }
-            err = TestWritesTheValueBelowMinSetpointDeadBand_53();
+            err = TestWritesMinCoolSetpointLimitToValueAboveTheMaxCoolSetpointLimit_53();
             break;
         case 54:
-            ChipLogProgress(chipTool, " ***** Test Step 54 : Writes the value above MinSetpointDeadBand \n");
-            if (ShouldSkip("A_MINSETPOINTDEADBAND")) {
+            ChipLogProgress(
+                chipTool, " ***** Test Step 54 : Writes the limit of AbsMinCoolSetpointLimit to MinCoolSetpointLimit attribute\n");
+            if (ShouldSkip("TSTAT.S.F01 && A_MINCOOLSETPOINTLIMIT")) {
                 NextTest();
                 return;
             }
-            err = TestWritesTheValueAboveMinSetpointDeadBand_54();
+            err = TestWritesTheLimitOfAbsMinCoolSetpointLimitToMinCoolSetpointLimitAttribute_54();
             break;
         case 55:
-            ChipLogProgress(chipTool, " ***** Test Step 55 : Writes the min limit of MinSetpointDeadBand\n");
-            if (ShouldSkip("A_MINSETPOINTDEADBAND")) {
+            ChipLogProgress(
+                chipTool, " ***** Test Step 55 : Writes the limit of MaxCoolSetpointLimit to MinCoolSetpointLimit attribute\n");
+            if (ShouldSkip("TSTAT.S.F01 && A_MINCOOLSETPOINTLIMIT")) {
                 NextTest();
                 return;
             }
-            err = TestWritesTheMinLimitOfMinSetpointDeadBand_55();
+            err = TestWritesTheLimitOfMaxCoolSetpointLimitToMinCoolSetpointLimitAttribute_55();
             break;
         case 56:
-            ChipLogProgress(chipTool, " ***** Test Step 56 : Writes the max limit of MinSetpointDeadBand\n");
-            if (ShouldSkip("A_MINSETPOINTDEADBAND")) {
+            ChipLogProgress(
+                chipTool, " ***** Test Step 56 : Writes the limit of AbsMinCoolSetpointLimit to MinCoolSetpointLimit attribute\n");
+            if (ShouldSkip("TSTAT.S.F01 && A_MINCOOLSETPOINTLIMIT")) {
                 NextTest();
                 return;
             }
-            err = TestWritesTheMaxLimitOfMinSetpointDeadBand_56();
+            err = TestWritesTheLimitOfAbsMinCoolSetpointLimitToMinCoolSetpointLimitAttribute_56();
             break;
         case 57:
             ChipLogProgress(chipTool,
-                " ***** Test Step 57 : Reads ControlSequenceOfOperation from Server DUT and verifies that the value is valid\n");
-            if (ShouldSkip("A_CONTROLSEQUENCEOFOPERATION")) {
+                " ***** Test Step 57 : Reads MaxCoolSetpointLimit attribute from Server DUT and verifies that the value is within "
+                "range\n");
+            if (ShouldSkip("TSTAT.S.F01 && A_MAXCOOLSETPOINTLIMIT")) {
                 NextTest();
                 return;
             }
-            err = TestReadsControlSequenceOfOperationFromServerDutAndVerifiesThatTheValueIsValid_57();
+            err = TestReadsMaxCoolSetpointLimitAttributeFromServerDutAndVerifiesThatTheValueIsWithinRange_57();
             break;
         case 58:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 58 : Write Attribute command for ControlSequenceOfOperation with a new valid value\n");
-            if (ShouldSkip("A_CONTROLSEQUENCEOFOPERATION")) {
+            ChipLogProgress(chipTool,
+                " ***** Test Step 58 : Writes a value back that is different but valid for MaxCoolSetpointLimit attribute\n");
+            if (ShouldSkip("TSTAT.S.F01 && A_MAXCOOLSETPOINTLIMIT && !TSTAT.S.F05")) {
                 NextTest();
                 return;
             }
-            err = TestWriteAttributeCommandForControlSequenceOfOperationWithANewValidValue_58();
+            err = TestWritesAValueBackThatIsDifferentButValidForMaxCoolSetpointLimitAttribute_58();
             break;
         case 59:
-            ChipLogProgress(chipTool, " ***** Test Step 59 : Read it back again to confirm the successful write\n");
-            if (ShouldSkip("A_CONTROLSEQUENCEOFOPERATION")) {
+            ChipLogProgress(chipTool,
+                " ***** Test Step 59 : Reads it back again to confirm the successful write of MaxCoolSetpointLimit attribute\n");
+            if (ShouldSkip("TSTAT.S.F01 && A_MAXCOOLSETPOINTLIMIT && !TSTAT.S.F05")) {
                 NextTest();
                 return;
             }
-            err = TestReadItBackAgainToConfirmTheSuccessfulWrite_59();
+            err = TestReadsItBackAgainToConfirmTheSuccessfulWriteOfMaxCoolSetpointLimitAttribute_59();
             break;
         case 60:
-            ChipLogProgress(chipTool, " ***** Test Step 60 : Sends SetpointRaise Command\n");
-            if (ShouldSkip("PICS_SKIP_SAMPLE_APP && CR_SetpointRaiseLower")) {
+            ChipLogProgress(
+                chipTool, " ***** Test Step 60 : Writes MaxCoolSetpointLimit to value below the AbsMinCoolSetpointLimit \n");
+            if (ShouldSkip("TSTAT.S.F01 && A_MAXCOOLSETPOINTLIMIT")) {
                 NextTest();
                 return;
             }
-            err = TestSendsSetpointRaiseCommand_60();
+            err = TestWritesMaxCoolSetpointLimitToValueBelowTheAbsMinCoolSetpointLimit_60();
             break;
         case 61:
             ChipLogProgress(
-                chipTool, " ***** Test Step 61 : Reads back OccupiedHeatingSetpoint to confirm the success of the write\n");
-            if (ShouldSkip("PICS_SKIP_SAMPLE_APP && A_OCCUPIEDHEATINGSETPOINT")) {
+                chipTool, " ***** Test Step 61 : Writes MaxCoolSetpointLimit to value above the MaxCoolSetpointLimit \n");
+            if (ShouldSkip("TSTAT.S.F01 && A_MAXCOOLSETPOINTLIMIT")) {
                 NextTest();
                 return;
             }
-            err = TestReadsBackOccupiedHeatingSetpointToConfirmTheSuccessOfTheWrite_61();
+            err = TestWritesMaxCoolSetpointLimitToValueAboveTheMaxCoolSetpointLimit_61();
             break;
         case 62:
-            ChipLogProgress(chipTool, " ***** Test Step 62 : Sends SetpointRaise Command\n");
-            if (ShouldSkip("PICS_SKIP_SAMPLE_APP && CR_SetpointRaiseLower")) {
+            ChipLogProgress(
+                chipTool, " ***** Test Step 62 : Writes the limit of AbsMinCoolSetpointLimit to MaxCoolSetpointLimit attribute\n");
+            if (ShouldSkip("TSTAT.S.F01 && A_MAXCOOLSETPOINTLIMIT")) {
                 NextTest();
                 return;
             }
-            err = TestSendsSetpointRaiseCommand_62();
+            err = TestWritesTheLimitOfAbsMinCoolSetpointLimitToMaxCoolSetpointLimitAttribute_62();
             break;
         case 63:
             ChipLogProgress(
-                chipTool, " ***** Test Step 63 : Reads back OccupiedHeatingSetpoint to confirm the success of the write\n");
-            if (ShouldSkip("PICS_SKIP_SAMPLE_APP && A_OCCUPIEDCOOLINGSETPOINT")) {
+                chipTool, " ***** Test Step 63 : Writes the limit of MaxCoolSetpointLimit to MaxCoolSetpointLimit attribute\n");
+            if (ShouldSkip("TSTAT.S.F01 && A_MAXCOOLSETPOINTLIMIT")) {
                 NextTest();
                 return;
             }
-            err = TestReadsBackOccupiedHeatingSetpointToConfirmTheSuccessOfTheWrite_63();
+            err = TestWritesTheLimitOfMaxCoolSetpointLimitToMaxCoolSetpointLimitAttribute_63();
             break;
         case 64:
-            ChipLogProgress(chipTool, " ***** Test Step 64 : Sets OccupiedCoolingSetpoint to default value\n");
-            if (ShouldSkip("A_OCCUPIEDCOOLINGSETPOINT")) {
+            ChipLogProgress(chipTool, " ***** Test Step 64 : Writes (sets back) default value of MinHeatSetpointLimit\n");
+            if (ShouldSkip("TSTAT.S.F01 && A_MINHEATSETPOINTLIMIT")) {
                 NextTest();
                 return;
             }
-            err = TestSetsOccupiedCoolingSetpointToDefaultValue_64();
+            err = TestWritesSetsBackDefaultValueOfMinHeatSetpointLimit_64();
             break;
         case 65:
-            ChipLogProgress(chipTool, " ***** Test Step 65 : Sends SetpointRaise Command\n");
-            if (ShouldSkip("PICS_SKIP_SAMPLE_APP && CR_SetpointRaiseLower")) {
+            ChipLogProgress(chipTool, " ***** Test Step 65 : Writes (sets back)default value of MaxHeatSetpointLimit\n");
+            if (ShouldSkip("TSTAT.S.F01 && A_MAXHEATSETPOINTLIMIT &&!TSTAT.S.F05")) {
                 NextTest();
                 return;
             }
-            err = TestSendsSetpointRaiseCommand_65();
+            err = TestWritesSetsBackdefaultValueOfMaxHeatSetpointLimit_65();
             break;
         case 66:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 66 : Reads back OccupiedCoolingSetpoint to confirm the success of the write\n");
-            if (ShouldSkip("PICS_SKIP_SAMPLE_APP && A_OCCUPIEDCOOLINGSETPOINT")) {
+            ChipLogProgress(chipTool, " ***** Test Step 66 : Writes MaxHeatSetpointLimit That meets the deadband of 2.5C\n");
+            if (ShouldSkip("TSTAT.S.F01 && A_MAXHEATSETPOINTLIMIT &&!TSTAT.S.F05")) {
                 NextTest();
                 return;
             }
-            err = TestReadsBackOccupiedCoolingSetpointToConfirmTheSuccessOfTheWrite_66();
+            err = TestWritesMaxHeatSetpointLimitThatMeetsTheDeadbandOf25c_66();
             break;
         case 67:
-            ChipLogProgress(chipTool, " ***** Test Step 67 : Sets OccupiedCoolingSetpoint to default value\n");
-            if (ShouldSkip("A_OCCUPIEDCOOLINGSETPOINT")) {
+            ChipLogProgress(chipTool, " ***** Test Step 67 : Writes (sets back) default value of MinCoolSetpointLimit\n");
+            if (ShouldSkip("TSTAT.S.F01 && A_MINCOOLSETPOINTLIMIT")) {
                 NextTest();
                 return;
             }
-            err = TestSetsOccupiedCoolingSetpointToDefaultValue_67();
+            err = TestWritesSetsBackDefaultValueOfMinCoolSetpointLimit_67();
             break;
         case 68:
-            ChipLogProgress(chipTool, " ***** Test Step 68 : Sends SetpointRaise Command\n");
-            if (ShouldSkip("PICS_SKIP_SAMPLE_APP && CR_SetpointRaiseLower")) {
+            ChipLogProgress(chipTool, " ***** Test Step 68 : Writes (sets back) default value of MaxCoolSetpointLimit\n");
+            if (ShouldSkip("TSTAT.S.F01 && A_MAXCOOLSETPOINTLIMIT")) {
                 NextTest();
                 return;
             }
-            err = TestSendsSetpointRaiseCommand_68();
+            err = TestWritesSetsBackDefaultValueOfMaxCoolSetpointLimit_68();
             break;
         case 69:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 69 : Reads back OccupiedCoolingSetpoint to confirm the success of the write\n");
-            if (ShouldSkip("PICS_SKIP_SAMPLE_APP && A_OCCUPIEDCOOLINGSETPOINT")) {
+            ChipLogProgress(chipTool,
+                " ***** Test Step 69 : Reads MinSetpointDeadBand attribute from Server DUT and verifies that the value is within "
+                "range\n");
+            if (ShouldSkip("TSTAT.S.F05")) {
                 NextTest();
                 return;
             }
-            err = TestReadsBackOccupiedCoolingSetpointToConfirmTheSuccessOfTheWrite_69();
+            err = TestReadsMinSetpointDeadBandAttributeFromServerDutAndVerifiesThatTheValueIsWithinRange_69();
             break;
         case 70:
-            ChipLogProgress(chipTool, " ***** Test Step 70 : Sets OccupiedCoolingSetpoint to default value\n");
-            if (ShouldSkip("A_OCCUPIEDCOOLINGSETPOINT")) {
+            ChipLogProgress(chipTool,
+                " ***** Test Step 70 : Writes a value back that is different but valid for MinSetpointDeadBand attribute\n");
+            if (ShouldSkip("TSTAT.S.F05")) {
                 NextTest();
                 return;
             }
-            err = TestSetsOccupiedCoolingSetpointToDefaultValue_70();
+            err = TestWritesAValueBackThatIsDifferentButValidForMinSetpointDeadBandAttribute_70();
             break;
         case 71:
-            ChipLogProgress(chipTool, " ***** Test Step 71 : Sends SetpointRaise Command\n");
-            if (ShouldSkip("PICS_SKIP_SAMPLE_APP && CR_SetpointRaiseLower")) {
+            ChipLogProgress(chipTool,
+                " ***** Test Step 71 : Reads it back again to confirm the successful write of MinSetpointDeadBand attribute\n");
+            if (ShouldSkip("TSTAT.S.F05")) {
                 NextTest();
                 return;
             }
-            err = TestSendsSetpointRaiseCommand_71();
+            err = TestReadsItBackAgainToConfirmTheSuccessfulWriteOfMinSetpointDeadBandAttribute_71();
             break;
         case 72:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 72 : Reads back OccupiedCoolingSetpoint to confirm the success of the write\n");
-            if (ShouldSkip("PICS_SKIP_SAMPLE_APP")) {
+            ChipLogProgress(chipTool, " ***** Test Step 72 : Writes the value below MinSetpointDeadBand\n");
+            if (ShouldSkip("TSTAT.S.F05")) {
                 NextTest();
                 return;
             }
-            err = TestReadsBackOccupiedCoolingSetpointToConfirmTheSuccessOfTheWrite_72();
+            err = TestWritesTheValueBelowMinSetpointDeadBand_72();
             break;
         case 73:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 73 : Reads back OccupiedHeatingSetpoint to confirm the success of the write\n");
-            if (ShouldSkip("PICS_SKIP_SAMPLE_APP && A_OCCUPIEDHEATINGSETPOINT")) {
+            ChipLogProgress(chipTool, " ***** Test Step 73 : Writes the value above MinSetpointDeadBand \n");
+            if (ShouldSkip("TSTAT.S.F05")) {
                 NextTest();
                 return;
             }
-            err = TestReadsBackOccupiedHeatingSetpointToConfirmTheSuccessOfTheWrite_73();
+            err = TestWritesTheValueAboveMinSetpointDeadBand_73();
             break;
         case 74:
-            ChipLogProgress(chipTool, " ***** Test Step 74 : Sets OccupiedCoolingSetpoint to default value\n");
-            if (ShouldSkip("A_OCCUPIEDCOOLINGSETPOINT")) {
+            ChipLogProgress(chipTool, " ***** Test Step 74 : Writes the min limit of MinSetpointDeadBand\n");
+            if (ShouldSkip("TSTAT.S.F05")) {
                 NextTest();
                 return;
             }
-            err = TestSetsOccupiedCoolingSetpointToDefaultValue_74();
+            err = TestWritesTheMinLimitOfMinSetpointDeadBand_74();
             break;
         case 75:
-            ChipLogProgress(chipTool, " ***** Test Step 75 : Sends SetpointRaise Command\n");
-            if (ShouldSkip("PICS_SKIP_SAMPLE_APP && CR_SetpointRaiseLower")) {
+            ChipLogProgress(chipTool, " ***** Test Step 75 : Writes the max limit of MinSetpointDeadBand\n");
+            if (ShouldSkip("TSTAT.S.F05")) {
                 NextTest();
                 return;
             }
-            err = TestSendsSetpointRaiseCommand_75();
+            err = TestWritesTheMaxLimitOfMinSetpointDeadBand_75();
             break;
         case 76:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 76 : Reads back OccupiedCoolingSetpoint to confirm the success of the write\n");
-            if (ShouldSkip("PICS_SKIP_SAMPLE_APP && A_OCCUPIEDCOOLINGSETPOINT")) {
+            ChipLogProgress(chipTool,
+                " ***** Test Step 76 : Reads ControlSequenceOfOperation from Server DUT and verifies that the value is valid\n");
+            if (ShouldSkip("TSTAT.S.F00 || TSTAT.S.F01")) {
                 NextTest();
                 return;
             }
-            err = TestReadsBackOccupiedCoolingSetpointToConfirmTheSuccessOfTheWrite_76();
+            err = TestReadsControlSequenceOfOperationFromServerDutAndVerifiesThatTheValueIsValid_76();
             break;
         case 77:
             ChipLogProgress(
-                chipTool, " ***** Test Step 77 : Reads back OccupiedHeatingSetpoint to confirm the success of the write\n");
-            if (ShouldSkip("PICS_SKIP_SAMPLE_APP && A_OCCUPIEDHEATINGSETPOINT")) {
+                chipTool, " ***** Test Step 77 : Write Attribute command for ControlSequenceOfOperation with a new valid value\n");
+            if (ShouldSkip("TSTAT.S.F00 || TSTAT.S.F01")) {
+                NextTest();
+                return;
+            }
+            err = TestWriteAttributeCommandForControlSequenceOfOperationWithANewValidValue_77();
+            break;
+        case 78:
+            ChipLogProgress(chipTool, " ***** Test Step 78 : Read it back again to confirm the successful write\n");
+            if (ShouldSkip("TSTAT.S.F00 || TSTAT.S.F01")) {
+                NextTest();
+                return;
+            }
+            err = TestReadItBackAgainToConfirmTheSuccessfulWrite_78();
+            break;
+        case 79:
+            ChipLogProgress(chipTool,
+                " ***** Test Step 79 : Writes MaxHeatSetpointLimit attribute to default value of 2950 to meet deadband "
+                "constraint\n");
+            if (ShouldSkip("TSTAT.S.F00 && A_MINHEATSETPOINTLIMIT && TSTAT.S.F05")) {
+                NextTest();
+                return;
+            }
+            err = TestWritesMaxHeatSetpointLimitAttributeToDefaultValueOf2950ToMeetDeadbandConstraint_79();
+            break;
+        case 80:
+            ChipLogProgress(chipTool, " ***** Test Step 80 : Sets OccupiedCoolingSetpoint to default value\n");
+            if (ShouldSkip("TSTAT.S.F01")) {
+                NextTest();
+                return;
+            }
+            err = TestSetsOccupiedCoolingSetpointToDefaultValue_80();
+            break;
+        case 81:
+            ChipLogProgress(chipTool, " ***** Test Step 81 : Sets OccupiedHeatingSetpoint to default value\n");
+            if (ShouldSkip("TSTAT.S.F00")) {
+                NextTest();
+                return;
+            }
+            err = TestSetsOccupiedHeatingSetpointToDefaultValue_81();
+            break;
+        case 82:
+            ChipLogProgress(chipTool, " ***** Test Step 82 : Sends SetpointRaise Command Heat Only\n");
+            if (ShouldSkip("TSTAT.S.F00")) {
+                NextTest();
+                return;
+            }
+            err = TestSendsSetpointRaiseCommandHeatOnly_82();
+            break;
+        case 83:
+            ChipLogProgress(
+                chipTool, " ***** Test Step 83 : Reads back OccupiedHeatingSetpoint to confirm the success of the write\n");
+            if (ShouldSkip("TSTAT.S.F00")) {
+                NextTest();
+                return;
+            }
+            err = TestReadsBackOccupiedHeatingSetpointToConfirmTheSuccessOfTheWrite_83();
+            break;
+        case 84:
+            ChipLogProgress(chipTool, " ***** Test Step 84 : Sets OccupiedHeatingSetpoint to default value\n");
+            if (ShouldSkip("TSTAT.S.F00")) {
+                NextTest();
+                return;
+            }
+            err = TestSetsOccupiedHeatingSetpointToDefaultValue_84();
+            break;
+        case 85:
+            ChipLogProgress(chipTool, " ***** Test Step 85 : Sends SetpointRaise Command Heat Only\n");
+            if (ShouldSkip("TSTAT.S.F00")) {
+                NextTest();
+                return;
+            }
+            err = TestSendsSetpointRaiseCommandHeatOnly_85();
+            break;
+        case 86:
+            ChipLogProgress(
+                chipTool, " ***** Test Step 86 : Reads back OccupiedHeatingSetpoint to confirm the success of the write\n");
+            if (ShouldSkip("TSTAT.S.F00")) {
+                NextTest();
+                return;
+            }
+            err = TestReadsBackOccupiedHeatingSetpointToConfirmTheSuccessOfTheWrite_86();
+            break;
+        case 87:
+            ChipLogProgress(chipTool, " ***** Test Step 87 : Sends SetpointRaise Command Cool Only\n");
+            if (ShouldSkip("TSTAT.S.F01")) {
+                NextTest();
+                return;
+            }
+            err = TestSendsSetpointRaiseCommandCoolOnly_87();
+            break;
+        case 88:
+            ChipLogProgress(
+                chipTool, " ***** Test Step 88 : Reads back OccupiedCoolingSetpoint to confirm the success of the write\n");
+            if (ShouldSkip("TSTAT.S.F01")) {
+                NextTest();
+                return;
+            }
+            err = TestReadsBackOccupiedCoolingSetpointToConfirmTheSuccessOfTheWrite_88();
+            break;
+        case 89:
+            ChipLogProgress(chipTool, " ***** Test Step 89 : Sets OccupiedCoolingSetpoint to default value\n");
+            if (ShouldSkip("TSTAT.S.F01")) {
+                NextTest();
+                return;
+            }
+            err = TestSetsOccupiedCoolingSetpointToDefaultValue_89();
+            break;
+        case 90:
+            ChipLogProgress(chipTool, " ***** Test Step 90 : Sends SetpointRaise Command Cool Only\n");
+            if (ShouldSkip("TSTAT.S.F01")) {
+                NextTest();
+                return;
+            }
+            err = TestSendsSetpointRaiseCommandCoolOnly_90();
+            break;
+        case 91:
+            ChipLogProgress(
+                chipTool, " ***** Test Step 91 : Reads back OccupiedCoolingSetpoint to confirm the success of the write\n");
+            if (ShouldSkip("TSTAT.S.F01")) {
+                NextTest();
+                return;
+            }
+            err = TestReadsBackOccupiedCoolingSetpointToConfirmTheSuccessOfTheWrite_91();
+            break;
+        case 92:
+            ChipLogProgress(chipTool, " ***** Test Step 92 : Sets OccupiedCoolingSetpoint to default value\n");
+            if (ShouldSkip("TSTAT.S.F01")) {
+                NextTest();
+                return;
+            }
+            err = TestSetsOccupiedCoolingSetpointToDefaultValue_92();
+            break;
+        case 93:
+            ChipLogProgress(chipTool, " ***** Test Step 93 : Sets OccupiedHeatingSetpoint to default value\n");
+            if (ShouldSkip("TSTAT.S.F00")) {
+                NextTest();
+                return;
+            }
+            err = TestSetsOccupiedHeatingSetpointToDefaultValue_93();
+            break;
+        case 94:
+            ChipLogProgress(chipTool, " ***** Test Step 94 : Sends SetpointRaise Command Heat & Cool\n");
+            if (ShouldSkip("TSTAT.S.F00 || TSTAT.S.F01")) {
+                NextTest();
+                return;
+            }
+            err = TestSendsSetpointRaiseCommandHeatCool_94();
+            break;
+        case 95:
+            ChipLogProgress(
+                chipTool, " ***** Test Step 95 : Reads back OccupiedCoolingSetpoint to confirm the success of the write\n");
+            if (ShouldSkip("TSTAT.S.F01")) {
+                NextTest();
+                return;
+            }
+            err = TestReadsBackOccupiedCoolingSetpointToConfirmTheSuccessOfTheWrite_95();
+            break;
+        case 96:
+            ChipLogProgress(
+                chipTool, " ***** Test Step 96 : Reads back OccupiedHeatingSetpoint to confirm the success of the write\n");
+            if (ShouldSkip("TSTAT.S.F00")) {
+                NextTest();
+                return;
+            }
+            err = TestReadsBackOccupiedHeatingSetpointToConfirmTheSuccessOfTheWrite_96();
+            break;
+        case 97:
+            ChipLogProgress(chipTool, " ***** Test Step 97 : Sets OccupiedCoolingSetpoint to default value\n");
+            if (ShouldSkip("TSTAT.S.F01")) {
+                NextTest();
+                return;
+            }
+            err = TestSetsOccupiedCoolingSetpointToDefaultValue_97();
+            break;
+        case 98:
+            ChipLogProgress(chipTool, " ***** Test Step 98 : Sets OccupiedHeatingSetpoint to default value\n");
+            if (ShouldSkip("TSTAT.S.F00")) {
+                NextTest();
+                return;
+            }
+            err = TestSetsOccupiedHeatingSetpointToDefaultValue_98();
+            break;
+        case 99:
+            ChipLogProgress(chipTool, " ***** Test Step 99 : Sends SetpointRaise Command Heat & Cool\n");
+            if (ShouldSkip("TSTAT.S.F00 || TSTAT.S.F01")) {
+                NextTest();
+                return;
+            }
+            err = TestSendsSetpointRaiseCommandHeatCool_99();
+            break;
+        case 100:
+            ChipLogProgress(
+                chipTool, " ***** Test Step 100 : Reads back OccupiedCoolingSetpoint to confirm the success of the write\n");
+            if (ShouldSkip("TSTAT.S.F01")) {
+                NextTest();
+                return;
+            }
+            err = TestReadsBackOccupiedCoolingSetpointToConfirmTheSuccessOfTheWrite_100();
+            break;
+        case 101:
+            ChipLogProgress(
+                chipTool, " ***** Test Step 101 : Reads back OccupiedHeatingSetpoint to confirm the success of the write\n");
+            if (ShouldSkip("TSTAT.S.F00")) {
                 NextTest();
                 return;
             }
-            err = TestReadsBackOccupiedHeatingSetpointToConfirmTheSuccessOfTheWrite_77();
+            err = TestReadsBackOccupiedHeatingSetpointToConfirmTheSuccessOfTheWrite_101();
             break;
         }
 
@@ -47308,7 +47515,7 @@ class Test_TC_TSTAT_2_2 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 7:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             break;
         case 8:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
@@ -47317,16 +47524,16 @@ class Test_TC_TSTAT_2_2 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 10:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 11:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 12:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             break;
         case 13:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             break;
         case 14:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
@@ -47335,7 +47542,7 @@ class Test_TC_TSTAT_2_2 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 16:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 17:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
@@ -47350,16 +47557,16 @@ class Test_TC_TSTAT_2_2 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 21:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             break;
         case 22:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             break;
         case 23:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 24:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 25:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
@@ -47386,46 +47593,46 @@ class Test_TC_TSTAT_2_2 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 33:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 34:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 35:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             break;
         case 36:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             break;
         case 37:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             break;
         case 38:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 39:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 40:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 41:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 42:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             break;
         case 43:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 44:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 45:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             break;
         case 46:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             break;
         case 47:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
@@ -47443,13 +47650,13 @@ class Test_TC_TSTAT_2_2 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 52:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             break;
         case 53:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             break;
         case 54:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 55:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
@@ -47467,10 +47674,10 @@ class Test_TC_TSTAT_2_2 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 60:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             break;
         case 61:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             break;
         case 62:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
@@ -47503,10 +47710,10 @@ class Test_TC_TSTAT_2_2 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 72:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             break;
         case 73:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             break;
         case 74:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
@@ -47520,6 +47727,78 @@ class Test_TC_TSTAT_2_2 : public TestCommandBridge {
         case 77:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
+        case 78:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 79:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 80:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 81:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 82:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 83:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 84:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 85:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 86:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 87:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 88:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 89:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 90:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 91:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 92:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 93:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 94:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 95:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 96:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 97:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 98:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 99:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 100:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 101:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
         }
 
         // Go on to the next test.
@@ -47533,7 +47812,7 @@ class Test_TC_TSTAT_2_2 : public TestCommandBridge {
 
 private:
     std::atomic_uint16_t mTestIndex;
-    const uint16_t mTestCount = 78;
+    const uint16_t mTestCount = 102;
 
     chip::Optional<chip::NodeId> mNodeId;
     chip::Optional<chip::CharSpan> mCluster;
@@ -47559,21 +47838,11 @@ class Test_TC_TSTAT_2_2 : public TestCommandBridge {
             NSLog(@"Reads OccupiedCoolingSetpoint attribute from Server DUT and verifies that the value is within range Error: %@",
                 err);
 
-            if (err.code == MTRInteractionErrorCodeUnsupportedAttribute) {
-                NextTest();
-                return;
-            }
-
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            {
-                id actualValue = value;
-                VerifyOrReturn(CheckValue("OccupiedCoolingSetpoint", actualValue, 2600));
-            }
-
             VerifyOrReturn(CheckConstraintType("occupiedCoolingSetpoint", "", "int16"));
             VerifyOrReturn(CheckConstraintMinValue<int16_t>("occupiedCoolingSetpoint", [value shortValue], 1600));
-            VerifyOrReturn(CheckConstraintMaxValue<int16_t>("occupiedCoolingSetpoint", [value shortValue], 2600));
+            VerifyOrReturn(CheckConstraintMaxValue<int16_t>("occupiedCoolingSetpoint", [value shortValue], 3200));
 
             NextTest();
         }];
@@ -47590,18 +47859,13 @@ class Test_TC_TSTAT_2_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         id occupiedCoolingSetpointArgument;
-        occupiedCoolingSetpointArgument = [NSNumber numberWithShort:2250];
+        occupiedCoolingSetpointArgument = [NSNumber numberWithShort:2500];
         [cluster writeAttributeOccupiedCoolingSetpointWithValue:occupiedCoolingSetpointArgument
                                               completionHandler:^(NSError * _Nullable err) {
                                                   NSLog(@"Writes a value back that is different but valid for "
                                                         @"OccupiedCoolingSetpoint attribute Error: %@",
                                                       err);
 
-                                                  if (err.code == MTRInteractionErrorCodeUnsupportedAttribute) {
-                                                      NextTest();
-                                                      return;
-                                                  }
-
                                                   VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
                                                   NextTest();
@@ -47621,16 +47885,11 @@ class Test_TC_TSTAT_2_2 : public TestCommandBridge {
         [cluster readAttributeOccupiedCoolingSetpointWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
             NSLog(@"Reads it back again to confirm the successful write of OccupiedCoolingSetpoint attribute Error: %@", err);
 
-            if (err.code == MTRInteractionErrorCodeUnsupportedAttribute) {
-                NextTest();
-                return;
-            }
-
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             {
                 id actualValue = value;
-                VerifyOrReturn(CheckValue("OccupiedCoolingSetpoint", actualValue, 2250));
+                VerifyOrReturn(CheckValue("OccupiedCoolingSetpoint", actualValue, 2500));
             }
 
             NextTest();
@@ -47639,7 +47898,7 @@ class Test_TC_TSTAT_2_2 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWritesOccupiedCoolingSetpointToValueBelowTheMinCoolSetpointLimit_4()
+    CHIP_ERROR TestWritesOccupiedCoolingSetpointToValueBelowTheABSMinCoolSetpointLimit_4()
     {
         MTRBaseDevice * device = GetDevice("alpha");
         MTRBaseClusterThermostat * cluster = [[MTRBaseClusterThermostat alloc] initWithDevice:device
@@ -47651,15 +47910,10 @@ class Test_TC_TSTAT_2_2 : public TestCommandBridge {
         occupiedCoolingSetpointArgument = [NSNumber numberWithShort:30];
         [cluster writeAttributeOccupiedCoolingSetpointWithValue:occupiedCoolingSetpointArgument
                                               completionHandler:^(NSError * _Nullable err) {
-                                                  NSLog(@"Writes OccupiedCoolingSetpoint to value below the MinCoolSetpointLimit "
-                                                        @"Error: %@",
+                                                  NSLog(@"Writes OccupiedCoolingSetpoint to value below the "
+                                                        @"ABSMinCoolSetpointLimit Error: %@",
                                                       err);
 
-                                                  if (err.code == MTRInteractionErrorCodeUnsupportedAttribute) {
-                                                      NextTest();
-                                                      return;
-                                                  }
-
                                                   VerifyOrReturn(
                                                       CheckValue("status", err ? err.code : 0, EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
                                                   NextTest();
@@ -47684,10 +47938,53 @@ class Test_TC_TSTAT_2_2 : public TestCommandBridge {
                                                         @"Error: %@",
                                                       err);
 
-                                                  if (err.code == MTRInteractionErrorCodeUnsupportedAttribute) {
-                                                      NextTest();
-                                                      return;
-                                                  }
+                                                  VerifyOrReturn(
+                                                      CheckValue("status", err ? err.code : 0, EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
+                                                  NextTest();
+                                              }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestWritesTheLimitOfMinCoolSetpointLimitToOccupiedCoolingSetpointAttribute_6()
+    {
+        MTRBaseDevice * device = GetDevice("alpha");
+        MTRBaseClusterThermostat * cluster = [[MTRBaseClusterThermostat alloc] initWithDevice:device
+                                                                                     endpoint:1
+                                                                                        queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        id occupiedCoolingSetpointArgument;
+        occupiedCoolingSetpointArgument = [NSNumber numberWithShort:1600];
+        [cluster writeAttributeOccupiedCoolingSetpointWithValue:occupiedCoolingSetpointArgument
+                                              completionHandler:^(NSError * _Nullable err) {
+                                                  NSLog(@"Writes the limit of MinCoolSetpointLimit to OccupiedCoolingSetpoint "
+                                                        @"attribute Error: %@",
+                                                      err);
+
+                                                  VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+                                                  NextTest();
+                                              }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestWritesTheCoolingSetpointBelowTheHeatingSetpointWhenAutoIsEnabled_7()
+    {
+        MTRBaseDevice * device = GetDevice("alpha");
+        MTRBaseClusterThermostat * cluster = [[MTRBaseClusterThermostat alloc] initWithDevice:device
+                                                                                     endpoint:1
+                                                                                        queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        id occupiedCoolingSetpointArgument;
+        occupiedCoolingSetpointArgument = [NSNumber numberWithShort:1600];
+        [cluster writeAttributeOccupiedCoolingSetpointWithValue:occupiedCoolingSetpointArgument
+                                              completionHandler:^(NSError * _Nullable err) {
+                                                  NSLog(@"Writes the CoolingSetpoint below the HeatingSetpoint when auto is "
+                                                        @"enabled Error: %@",
+                                                      err);
 
                                                   VerifyOrReturn(
                                                       CheckValue("status", err ? err.code : 0, EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
@@ -47697,7 +47994,7 @@ class Test_TC_TSTAT_2_2 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWritesTheLimitOfMaxCoolSetpointLimitToOccupiedCoolingSetpointAttribute_6()
+    CHIP_ERROR TestWritesTheLimitOfMaxCoolSetpointLimitToOccupiedCoolingSetpointAttribute_8()
     {
         MTRBaseDevice * device = GetDevice("alpha");
         MTRBaseClusterThermostat * cluster = [[MTRBaseClusterThermostat alloc] initWithDevice:device
@@ -47706,18 +48003,13 @@ class Test_TC_TSTAT_2_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         id occupiedCoolingSetpointArgument;
-        occupiedCoolingSetpointArgument = [NSNumber numberWithShort:2600];
+        occupiedCoolingSetpointArgument = [NSNumber numberWithShort:3200];
         [cluster writeAttributeOccupiedCoolingSetpointWithValue:occupiedCoolingSetpointArgument
                                               completionHandler:^(NSError * _Nullable err) {
                                                   NSLog(@"Writes the limit of MaxCoolSetpointLimit to OccupiedCoolingSetpoint "
                                                         @"attribute Error: %@",
                                                       err);
 
-                                                  if (err.code == MTRInteractionErrorCodeUnsupportedAttribute) {
-                                                      NextTest();
-                                                      return;
-                                                  }
-
                                                   VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
                                                   NextTest();
@@ -47726,7 +48018,7 @@ class Test_TC_TSTAT_2_2 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadsOccupiedHeatingSetpointAttributeFromServerDutAndVerifiesThatTheValueIsWithinRange_7()
+    CHIP_ERROR TestReadsOccupiedHeatingSetpointAttributeFromServerDutAndVerifiesThatTheValueIsWithinRange_9()
     {
         MTRBaseDevice * device = GetDevice("alpha");
         MTRBaseClusterThermostat * cluster = [[MTRBaseClusterThermostat alloc] initWithDevice:device
@@ -47738,18 +48030,8 @@ class Test_TC_TSTAT_2_2 : public TestCommandBridge {
             NSLog(@"Reads OccupiedHeatingSetpoint attribute from Server DUT and verifies that the value is within range Error: %@",
                 err);
 
-            if (err.code == MTRInteractionErrorCodeUnsupportedAttribute) {
-                NextTest();
-                return;
-            }
-
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            {
-                id actualValue = value;
-                VerifyOrReturn(CheckValue("OccupiedHeatingSetpoint", actualValue, 2000));
-            }
-
             VerifyOrReturn(CheckConstraintType("occupiedHeatingSetpoint", "", "int16"));
             VerifyOrReturn(CheckConstraintMinValue<int16_t>("occupiedHeatingSetpoint", [value shortValue], 700));
             VerifyOrReturn(CheckConstraintMaxValue<int16_t>("occupiedHeatingSetpoint", [value shortValue], 3000));
@@ -47760,7 +48042,7 @@ class Test_TC_TSTAT_2_2 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWritesAValueBackThatIsDifferentButValidForOccupiedHeatingSetpointAttribute_8()
+    CHIP_ERROR TestWritesAValueBackThatIsDifferentButValidForOccupiedHeatingSetpointAttribute_10()
     {
         MTRBaseDevice * device = GetDevice("alpha");
         MTRBaseClusterThermostat * cluster = [[MTRBaseClusterThermostat alloc] initWithDevice:device
@@ -47776,11 +48058,6 @@ class Test_TC_TSTAT_2_2 : public TestCommandBridge {
                                                         @"OccupiedHeatingSetpoint attribute Error: %@",
                                                       err);
 
-                                                  if (err.code == MTRInteractionErrorCodeUnsupportedAttribute) {
-                                                      NextTest();
-                                                      return;
-                                                  }
-
                                                   VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
                                                   NextTest();
@@ -47789,7 +48066,7 @@ class Test_TC_TSTAT_2_2 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadsItBackAgainToConfirmTheSuccessfulWriteOfOccupiedHeatingSetpointAttribute_9()
+    CHIP_ERROR TestReadsItBackAgainToConfirmTheSuccessfulWriteOfOccupiedHeatingSetpointAttribute_11()
     {
         MTRBaseDevice * device = GetDevice("alpha");
         MTRBaseClusterThermostat * cluster = [[MTRBaseClusterThermostat alloc] initWithDevice:device
@@ -47800,11 +48077,6 @@ class Test_TC_TSTAT_2_2 : public TestCommandBridge {
         [cluster readAttributeOccupiedHeatingSetpointWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
             NSLog(@"Reads it back again to confirm the successful write of OccupiedHeatingSetpoint attribute Error: %@", err);
 
-            if (err.code == MTRInteractionErrorCodeUnsupportedAttribute) {
-                NextTest();
-                return;
-            }
-
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             {
@@ -47818,7 +48090,7 @@ class Test_TC_TSTAT_2_2 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWritesOccupiedHeatingSetpointToValueBelowTheMinHeatSetpointLimit_10()
+    CHIP_ERROR TestWritesOccupiedHeatingSetpointToValueBelowTheMinHeatSetpointLimit_12()
     {
         MTRBaseDevice * device = GetDevice("alpha");
         MTRBaseClusterThermostat * cluster = [[MTRBaseClusterThermostat alloc] initWithDevice:device
@@ -47834,11 +48106,6 @@ class Test_TC_TSTAT_2_2 : public TestCommandBridge {
                                                         @"Error: %@",
                                                       err);
 
-                                                  if (err.code == MTRInteractionErrorCodeUnsupportedAttribute) {
-                                                      NextTest();
-                                                      return;
-                                                  }
-
                                                   VerifyOrReturn(
                                                       CheckValue("status", err ? err.code : 0, EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
                                                   NextTest();
@@ -47847,7 +48114,7 @@ class Test_TC_TSTAT_2_2 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWritesOccupiedHeatingSetpointToValueAboveTheMaxHeatSetpointLimit_11()
+    CHIP_ERROR TestWritesOccupiedHeatingSetpointToValueAboveTheMaxHeatSetpointLimit_13()
     {
         MTRBaseDevice * device = GetDevice("alpha");
         MTRBaseClusterThermostat * cluster = [[MTRBaseClusterThermostat alloc] initWithDevice:device
@@ -47863,11 +48130,6 @@ class Test_TC_TSTAT_2_2 : public TestCommandBridge {
                                                         @"Error: %@",
                                                       err);
 
-                                                  if (err.code == MTRInteractionErrorCodeUnsupportedAttribute) {
-                                                      NextTest();
-                                                      return;
-                                                  }
-
                                                   VerifyOrReturn(
                                                       CheckValue("status", err ? err.code : 0, EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
                                                   NextTest();
@@ -47876,7 +48138,7 @@ class Test_TC_TSTAT_2_2 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWritesTheLimitOfMinHeatSetpointLimitToOccupiedHeatingSetpointAttribute_12()
+    CHIP_ERROR TestWritesTheLimitOfMinHeatSetpointLimitToOccupiedHeatingSetpointAttribute_14()
     {
         MTRBaseDevice * device = GetDevice("alpha");
         MTRBaseClusterThermostat * cluster = [[MTRBaseClusterThermostat alloc] initWithDevice:device
@@ -47892,10 +48154,53 @@ class Test_TC_TSTAT_2_2 : public TestCommandBridge {
                                                         @"attribute Error: %@",
                                                       err);
 
-                                                  if (err.code == MTRInteractionErrorCodeUnsupportedAttribute) {
-                                                      NextTest();
-                                                      return;
-                                                  }
+                                                  VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+                                                  NextTest();
+                                              }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestReadsItBackAgainToConfirmTheSuccessfulWriteOfOccupiedHeatingSetpointAttribute_15()
+    {
+        MTRBaseDevice * device = GetDevice("alpha");
+        MTRBaseClusterThermostat * cluster = [[MTRBaseClusterThermostat alloc] initWithDevice:device
+                                                                                     endpoint:1
+                                                                                        queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        [cluster readAttributeOccupiedHeatingSetpointWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Reads it back again to confirm the successful write of OccupiedHeatingSetpoint attribute Error: %@", err);
+
+            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+            {
+                id actualValue = value;
+                VerifyOrReturn(CheckValue("OccupiedHeatingSetpoint", actualValue, 700));
+            }
+
+            NextTest();
+        }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestWritesTheLimitOfMaxHeatSetpointLimitToOccupiedHeatingSetpointAttribute_16()
+    {
+        MTRBaseDevice * device = GetDevice("alpha");
+        MTRBaseClusterThermostat * cluster = [[MTRBaseClusterThermostat alloc] initWithDevice:device
+                                                                                     endpoint:1
+                                                                                        queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        id occupiedHeatingSetpointArgument;
+        occupiedHeatingSetpointArgument = [NSNumber numberWithShort:3000];
+        [cluster writeAttributeOccupiedHeatingSetpointWithValue:occupiedHeatingSetpointArgument
+                                              completionHandler:^(NSError * _Nullable err) {
+                                                  NSLog(@"Writes the limit of MaxHeatSetpointLimit to OccupiedHeatingSetpoint "
+                                                        @"attribute Error: %@",
+                                                      err);
 
                                                   VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -47905,7 +48210,31 @@ class Test_TC_TSTAT_2_2 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadsUnoccupiedCoolingSetpointAttributeFromServerDutAndVerifiesThatTheValueIsWithinRange_13()
+    CHIP_ERROR TestWritesTheLimitOfMaxHeatSetpointLimitToOccupiedHeatingSetpointAttribute_17()
+    {
+        MTRBaseDevice * device = GetDevice("alpha");
+        MTRBaseClusterThermostat * cluster = [[MTRBaseClusterThermostat alloc] initWithDevice:device
+                                                                                     endpoint:1
+                                                                                        queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        id occupiedHeatingSetpointArgument;
+        occupiedHeatingSetpointArgument = [NSNumber numberWithShort:3000];
+        [cluster writeAttributeOccupiedHeatingSetpointWithValue:occupiedHeatingSetpointArgument
+                                              completionHandler:^(NSError * _Nullable err) {
+                                                  NSLog(@"Writes the limit of MaxHeatSetpointLimit to OccupiedHeatingSetpoint "
+                                                        @"attribute Error: %@",
+                                                      err);
+
+                                                  VerifyOrReturn(
+                                                      CheckValue("status", err ? err.code : 0, EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
+                                                  NextTest();
+                                              }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestReadsUnoccupiedCoolingSetpointAttributeFromServerDutAndVerifiesThatTheValueIsWithinRange_18()
     {
         MTRBaseDevice * device = GetDevice("alpha");
         MTRBaseClusterThermostat * cluster = [[MTRBaseClusterThermostat alloc] initWithDevice:device
@@ -47919,11 +48248,6 @@ class Test_TC_TSTAT_2_2 : public TestCommandBridge {
                 @"Reads UnoccupiedCoolingSetpoint attribute from Server DUT and verifies that the value is within range Error: %@",
                 err);
 
-            if (err.code == MTRInteractionErrorCodeUnsupportedAttribute) {
-                NextTest();
-                return;
-            }
-
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             {
@@ -47941,7 +48265,7 @@ class Test_TC_TSTAT_2_2 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWritesAValueBackThatIsDifferentButValidForUnoccupiedCoolingSetpointAttribute_14()
+    CHIP_ERROR TestWritesAValueBackThatIsDifferentButValidForUnoccupiedCoolingSetpointAttribute_19()
     {
         MTRBaseDevice * device = GetDevice("alpha");
         MTRBaseClusterThermostat * cluster = [[MTRBaseClusterThermostat alloc] initWithDevice:device
@@ -47957,11 +48281,6 @@ class Test_TC_TSTAT_2_2 : public TestCommandBridge {
                                                           @"UnoccupiedCoolingSetpoint attribute Error: %@",
                                                         err);
 
-                                                    if (err.code == MTRInteractionErrorCodeUnsupportedAttribute) {
-                                                        NextTest();
-                                                        return;
-                                                    }
-
                                                     VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
                                                     NextTest();
@@ -47970,7 +48289,7 @@ class Test_TC_TSTAT_2_2 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadsItBackAgainToConfirmTheSuccessfulWriteOfUnoccupiedCoolingSetpointAttribute_15()
+    CHIP_ERROR TestReadsItBackAgainToConfirmTheSuccessfulWriteOfUnoccupiedCoolingSetpointAttribute_20()
     {
         MTRBaseDevice * device = GetDevice("alpha");
         MTRBaseClusterThermostat * cluster = [[MTRBaseClusterThermostat alloc] initWithDevice:device
@@ -47982,11 +48301,6 @@ class Test_TC_TSTAT_2_2 : public TestCommandBridge {
             readAttributeUnoccupiedCoolingSetpointWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
                 NSLog(@"Reads it back again to confirm the successful write of UnoccupiedCoolingSetpoint attribute Error: %@", err);
 
-                if (err.code == MTRInteractionErrorCodeUnsupportedAttribute) {
-                    NextTest();
-                    return;
-                }
-
                 VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
                 {
@@ -48000,7 +48314,7 @@ class Test_TC_TSTAT_2_2 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWritesUnoccupiedCoolingSetpointToValueBelowTheMinHeatSetpointLimit_16()
+    CHIP_ERROR TestWritesUnoccupiedCoolingSetpointToValueBelowTheMinCoolSetpointLimit_21()
     {
         MTRBaseDevice * device = GetDevice("alpha");
         MTRBaseClusterThermostat * cluster = [[MTRBaseClusterThermostat alloc] initWithDevice:device
@@ -48013,14 +48327,9 @@ class Test_TC_TSTAT_2_2 : public TestCommandBridge {
         [cluster writeAttributeUnoccupiedCoolingSetpointWithValue:unoccupiedCoolingSetpointArgument
                                                 completionHandler:^(NSError * _Nullable err) {
                                                     NSLog(@"Writes UnoccupiedCoolingSetpoint to value below the "
-                                                          @"MinHeatSetpointLimit Error: %@",
+                                                          @"MinCoolSetpointLimit Error: %@",
                                                         err);
 
-                                                    if (err.code == MTRInteractionErrorCodeUnsupportedAttribute) {
-                                                        NextTest();
-                                                        return;
-                                                    }
-
                                                     VerifyOrReturn(CheckValue(
                                                         "status", err ? err.code : 0, EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
                                                     NextTest();
@@ -48029,7 +48338,7 @@ class Test_TC_TSTAT_2_2 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWritesUnoccupiedCoolingSetpointToValueAboveTheMaxHeatSetpointLimit_17()
+    CHIP_ERROR TestWritesUnoccupiedCoolingSetpointToValueAboveTheMaxCoolSetpointLimit_22()
     {
         MTRBaseDevice * device = GetDevice("alpha");
         MTRBaseClusterThermostat * cluster = [[MTRBaseClusterThermostat alloc] initWithDevice:device
@@ -48042,14 +48351,9 @@ class Test_TC_TSTAT_2_2 : public TestCommandBridge {
         [cluster writeAttributeUnoccupiedCoolingSetpointWithValue:unoccupiedCoolingSetpointArgument
                                                 completionHandler:^(NSError * _Nullable err) {
                                                     NSLog(@"Writes UnoccupiedCoolingSetpoint to value above the "
-                                                          @"MaxHeatSetpointLimit Error: %@",
+                                                          @"MaxCoolSetpointLimit Error: %@",
                                                         err);
 
-                                                    if (err.code == MTRInteractionErrorCodeUnsupportedAttribute) {
-                                                        NextTest();
-                                                        return;
-                                                    }
-
                                                     VerifyOrReturn(CheckValue(
                                                         "status", err ? err.code : 0, EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
                                                     NextTest();
@@ -48058,7 +48362,7 @@ class Test_TC_TSTAT_2_2 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWritesTheLimitOfMinCoolSetpointLimitToUnoccupiedCoolingSetpointAttribute_18()
+    CHIP_ERROR TestWritesTheLimitOfMinCoolSetpointLimitToUnoccupiedCoolingSetpointAttribute_23()
     {
         MTRBaseDevice * device = GetDevice("alpha");
         MTRBaseClusterThermostat * cluster = [[MTRBaseClusterThermostat alloc] initWithDevice:device
@@ -48074,11 +48378,6 @@ class Test_TC_TSTAT_2_2 : public TestCommandBridge {
                                                           @"attribute Error: %@",
                                                         err);
 
-                                                    if (err.code == MTRInteractionErrorCodeUnsupportedAttribute) {
-                                                        NextTest();
-                                                        return;
-                                                    }
-
                                                     VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
                                                     NextTest();
@@ -48087,7 +48386,7 @@ class Test_TC_TSTAT_2_2 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWritesTheLimitOfMaxCoolSetpointLimitToUnoccupiedCoolingSetpointAttribute_19()
+    CHIP_ERROR TestWritesTheLimitOfMaxCoolSetpointLimitToUnoccupiedCoolingSetpointAttribute_24()
     {
         MTRBaseDevice * device = GetDevice("alpha");
         MTRBaseClusterThermostat * cluster = [[MTRBaseClusterThermostat alloc] initWithDevice:device
@@ -48103,11 +48402,6 @@ class Test_TC_TSTAT_2_2 : public TestCommandBridge {
                                                           @"attribute Error: %@",
                                                         err);
 
-                                                    if (err.code == MTRInteractionErrorCodeUnsupportedAttribute) {
-                                                        NextTest();
-                                                        return;
-                                                    }
-
                                                     VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
                                                     NextTest();
@@ -48116,7 +48410,7 @@ class Test_TC_TSTAT_2_2 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadsUnoccupiedHeatingSetpointAttributeFromServerDutAndVerifiesThatTheValueIsWithinRange_20()
+    CHIP_ERROR TestReadsUnoccupiedHeatingSetpointAttributeFromServerDutAndVerifiesThatTheValueIsWithinRange_25()
     {
         MTRBaseDevice * device = GetDevice("alpha");
         MTRBaseClusterThermostat * cluster = [[MTRBaseClusterThermostat alloc] initWithDevice:device
@@ -48130,11 +48424,6 @@ class Test_TC_TSTAT_2_2 : public TestCommandBridge {
                 @"Reads UnoccupiedHeatingSetpoint attribute from Server DUT and verifies that the value is within range Error: %@",
                 err);
 
-            if (err.code == MTRInteractionErrorCodeUnsupportedAttribute) {
-                NextTest();
-                return;
-            }
-
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             {
@@ -48152,7 +48441,7 @@ class Test_TC_TSTAT_2_2 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWritesAValueBackThatIsDifferentButValidForUnoccupiedHeatingSetpointAttribute_21()
+    CHIP_ERROR TestWritesAValueBackThatIsDifferentButValidForUnoccupiedHeatingSetpointAttribute_26()
     {
         MTRBaseDevice * device = GetDevice("alpha");
         MTRBaseClusterThermostat * cluster = [[MTRBaseClusterThermostat alloc] initWithDevice:device
@@ -48168,11 +48457,6 @@ class Test_TC_TSTAT_2_2 : public TestCommandBridge {
                                                           @"UnoccupiedHeatingSetpoint attribute Error: %@",
                                                         err);
 
-                                                    if (err.code == MTRInteractionErrorCodeUnsupportedAttribute) {
-                                                        NextTest();
-                                                        return;
-                                                    }
-
                                                     VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
                                                     NextTest();
@@ -48181,7 +48465,7 @@ class Test_TC_TSTAT_2_2 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadsItBackAgainToConfirmTheSuccessfulWriteOfUnoccupiedHeatingSetpointAttribute_22()
+    CHIP_ERROR TestReadsItBackAgainToConfirmTheSuccessfulWriteOfUnoccupiedHeatingSetpointAttribute_27()
     {
         MTRBaseDevice * device = GetDevice("alpha");
         MTRBaseClusterThermostat * cluster = [[MTRBaseClusterThermostat alloc] initWithDevice:device
@@ -48193,11 +48477,6 @@ class Test_TC_TSTAT_2_2 : public TestCommandBridge {
             readAttributeUnoccupiedHeatingSetpointWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
                 NSLog(@"Reads it back again to confirm the successful write of UnoccupiedHeatingSetpoint attribute Error: %@", err);
 
-                if (err.code == MTRInteractionErrorCodeUnsupportedAttribute) {
-                    NextTest();
-                    return;
-                }
-
                 VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
                 {
@@ -48211,7 +48490,7 @@ class Test_TC_TSTAT_2_2 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWritesUnoccupiedHeatingSetpointToValueBelowTheMinHeatSetpointLimit_23()
+    CHIP_ERROR TestWritesUnoccupiedHeatingSetpointToValueBelowTheMinHeatSetpointLimit_28()
     {
         MTRBaseDevice * device = GetDevice("alpha");
         MTRBaseClusterThermostat * cluster = [[MTRBaseClusterThermostat alloc] initWithDevice:device
@@ -48227,11 +48506,6 @@ class Test_TC_TSTAT_2_2 : public TestCommandBridge {
                                                           @"MinHeatSetpointLimit Error: %@",
                                                         err);
 
-                                                    if (err.code == MTRInteractionErrorCodeUnsupportedAttribute) {
-                                                        NextTest();
-                                                        return;
-                                                    }
-
                                                     VerifyOrReturn(CheckValue(
                                                         "status", err ? err.code : 0, EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
                                                     NextTest();
@@ -48240,7 +48514,7 @@ class Test_TC_TSTAT_2_2 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWritesUnoccupiedHeatingSetpointToValueAboveTheMaxHeatSetpointLimit_24()
+    CHIP_ERROR TestWritesUnoccupiedHeatingSetpointToValueAboveTheMaxHeatSetpointLimit_29()
     {
         MTRBaseDevice * device = GetDevice("alpha");
         MTRBaseClusterThermostat * cluster = [[MTRBaseClusterThermostat alloc] initWithDevice:device
@@ -48256,11 +48530,6 @@ class Test_TC_TSTAT_2_2 : public TestCommandBridge {
                                                           @"MaxHeatSetpointLimit Error: %@",
                                                         err);
 
-                                                    if (err.code == MTRInteractionErrorCodeUnsupportedAttribute) {
-                                                        NextTest();
-                                                        return;
-                                                    }
-
                                                     VerifyOrReturn(CheckValue(
                                                         "status", err ? err.code : 0, EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
                                                     NextTest();
@@ -48269,7 +48538,7 @@ class Test_TC_TSTAT_2_2 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWritesTheLimitOfMinHeatSetpointLimitToUnoccupiedHeatingSetpointAttribute_25()
+    CHIP_ERROR TestWritesTheLimitOfMinHeatSetpointLimitToUnoccupiedHeatingSetpointAttribute_30()
     {
         MTRBaseDevice * device = GetDevice("alpha");
         MTRBaseClusterThermostat * cluster = [[MTRBaseClusterThermostat alloc] initWithDevice:device
@@ -48285,11 +48554,6 @@ class Test_TC_TSTAT_2_2 : public TestCommandBridge {
                                                           @"attribute Error: %@",
                                                         err);
 
-                                                    if (err.code == MTRInteractionErrorCodeUnsupportedAttribute) {
-                                                        NextTest();
-                                                        return;
-                                                    }
-
                                                     VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
                                                     NextTest();
@@ -48298,7 +48562,7 @@ class Test_TC_TSTAT_2_2 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWritesTheLimitOfMaxHeatSetpointLimitToUnoccupiedHeatingSetpointAttribute_26()
+    CHIP_ERROR TestWritesTheLimitOfMaxHeatSetpointLimitToUnoccupiedHeatingSetpointAttribute_31()
     {
         MTRBaseDevice * device = GetDevice("alpha");
         MTRBaseClusterThermostat * cluster = [[MTRBaseClusterThermostat alloc] initWithDevice:device
@@ -48314,11 +48578,6 @@ class Test_TC_TSTAT_2_2 : public TestCommandBridge {
                                                           @"attribute Error: %@",
                                                         err);
 
-                                                    if (err.code == MTRInteractionErrorCodeUnsupportedAttribute) {
-                                                        NextTest();
-                                                        return;
-                                                    }
-
                                                     VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
                                                     NextTest();
@@ -48327,7 +48586,7 @@ class Test_TC_TSTAT_2_2 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadsMinHeatSetpointLimitAttributeFromServerDutAndVerifiesThatTheValueIsWithinRange_27()
+    CHIP_ERROR TestReadsMinHeatSetpointLimitAttributeFromServerDutAndVerifiesThatTheValueIsWithinRange_32()
     {
         MTRBaseDevice * device = GetDevice("alpha");
         MTRBaseClusterThermostat * cluster = [[MTRBaseClusterThermostat alloc] initWithDevice:device
@@ -48339,11 +48598,6 @@ class Test_TC_TSTAT_2_2 : public TestCommandBridge {
             NSLog(
                 @"Reads MinHeatSetpointLimit attribute from Server DUT and verifies that the value is within range Error: %@", err);
 
-            if (err.code == MTRInteractionErrorCodeUnsupportedAttribute) {
-                NextTest();
-                return;
-            }
-
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             {
@@ -48361,7 +48615,78 @@ class Test_TC_TSTAT_2_2 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWritesMinHeatSetpointLimitToValueBelowTheAbsMinHeatSetpointLimit_28()
+    CHIP_ERROR TestWritesAValueBackThatIsDifferentButValidForMinHeatSetpointLimitAttribute_33()
+    {
+        MTRBaseDevice * device = GetDevice("alpha");
+        MTRBaseClusterThermostat * cluster = [[MTRBaseClusterThermostat alloc] initWithDevice:device
+                                                                                     endpoint:1
+                                                                                        queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        id minHeatSetpointLimitArgument;
+        minHeatSetpointLimitArgument = [NSNumber numberWithShort:800];
+        [cluster writeAttributeMinHeatSetpointLimitWithValue:minHeatSetpointLimitArgument
+                                           completionHandler:^(NSError * _Nullable err) {
+                                               NSLog(@"Writes a value back that is different but valid for MinHeatSetpointLimit "
+                                                     @"attribute Error: %@",
+                                                   err);
+
+                                               VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+                                               NextTest();
+                                           }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestReadsItBackAgainToConfirmTheSuccessfulWriteOfMinHeatSetpointLimitAttribute_34()
+    {
+        MTRBaseDevice * device = GetDevice("alpha");
+        MTRBaseClusterThermostat * cluster = [[MTRBaseClusterThermostat alloc] initWithDevice:device
+                                                                                     endpoint:1
+                                                                                        queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        [cluster readAttributeMinHeatSetpointLimitWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Reads it back again to confirm the successful write of MinHeatSetpointLimit attribute Error: %@", err);
+
+            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+            {
+                id actualValue = value;
+                VerifyOrReturn(CheckValue("MinHeatSetpointLimit", actualValue, 800));
+            }
+
+            NextTest();
+        }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestWritesAValueBackThatIsDifferentButViolatesTheDeadband_35()
+    {
+        MTRBaseDevice * device = GetDevice("alpha");
+        MTRBaseClusterThermostat * cluster = [[MTRBaseClusterThermostat alloc] initWithDevice:device
+                                                                                     endpoint:1
+                                                                                        queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        id minHeatSetpointLimitArgument;
+        minHeatSetpointLimitArgument = [NSNumber numberWithShort:2000];
+        [cluster
+            writeAttributeMinHeatSetpointLimitWithValue:minHeatSetpointLimitArgument
+                                      completionHandler:^(NSError * _Nullable err) {
+                                          NSLog(@"Writes a value back that is different but violates the deadband Error: %@", err);
+
+                                          VerifyOrReturn(
+                                              CheckValue("status", err ? err.code : 0, EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
+                                          NextTest();
+                                      }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestWritesMinHeatSetpointLimitToValueBelowTheAbsMinHeatSetpointLimit_36()
     {
         MTRBaseDevice * device = GetDevice("alpha");
         MTRBaseClusterThermostat * cluster = [[MTRBaseClusterThermostat alloc] initWithDevice:device
@@ -48378,11 +48703,6 @@ class Test_TC_TSTAT_2_2 : public TestCommandBridge {
                                               @"Writes MinHeatSetpointLimit to value below the AbsMinHeatSetpointLimit  Error: %@",
                                               err);
 
-                                          if (err.code == MTRInteractionErrorCodeUnsupportedAttribute) {
-                                              NextTest();
-                                              return;
-                                          }
-
                                           VerifyOrReturn(
                                               CheckValue("status", err ? err.code : 0, EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
                                           NextTest();
@@ -48391,7 +48711,7 @@ class Test_TC_TSTAT_2_2 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWritesMinHeatSetpointLimitToValueAboveTheAbsMaxHeatSetpointLimit_29()
+    CHIP_ERROR TestWritesMinHeatSetpointLimitToValueAboveTheAbsMaxHeatSetpointLimit_37()
     {
         MTRBaseDevice * device = GetDevice("alpha");
         MTRBaseClusterThermostat * cluster = [[MTRBaseClusterThermostat alloc] initWithDevice:device
@@ -48408,11 +48728,6 @@ class Test_TC_TSTAT_2_2 : public TestCommandBridge {
                                               @"Writes MinHeatSetpointLimit to value above the AbsMaxHeatSetpointLimit  Error: %@",
                                               err);
 
-                                          if (err.code == MTRInteractionErrorCodeUnsupportedAttribute) {
-                                              NextTest();
-                                              return;
-                                          }
-
                                           VerifyOrReturn(
                                               CheckValue("status", err ? err.code : 0, EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
                                           NextTest();
@@ -48421,7 +48736,7 @@ class Test_TC_TSTAT_2_2 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWritesTheLimitOfAbsMinHeatSetpointLimitToMinHeatSetpointLimitAttribute_30()
+    CHIP_ERROR TestWritesTheLimitOfAbsMinHeatSetpointLimitToMinHeatSetpointLimitAttribute_38()
     {
         MTRBaseDevice * device = GetDevice("alpha");
         MTRBaseClusterThermostat * cluster = [[MTRBaseClusterThermostat alloc] initWithDevice:device
@@ -48437,10 +48752,82 @@ class Test_TC_TSTAT_2_2 : public TestCommandBridge {
                                                      @"attribute Error: %@",
                                                    err);
 
-                                               if (err.code == MTRInteractionErrorCodeUnsupportedAttribute) {
-                                                   NextTest();
-                                                   return;
-                                               }
+                                               VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+                                               NextTest();
+                                           }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestWritesTheLimitOfAbsMaxHeatSetpointLimitToMinHeatSetpointLimitAttribute_39()
+    {
+        MTRBaseDevice * device = GetDevice("alpha");
+        MTRBaseClusterThermostat * cluster = [[MTRBaseClusterThermostat alloc] initWithDevice:device
+                                                                                     endpoint:1
+                                                                                        queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        id minHeatSetpointLimitArgument;
+        minHeatSetpointLimitArgument = [NSNumber numberWithShort:3000];
+        [cluster writeAttributeMinHeatSetpointLimitWithValue:minHeatSetpointLimitArgument
+                                           completionHandler:^(NSError * _Nullable err) {
+                                               NSLog(@"Writes the limit of AbsMaxHeatSetpointLimit to MinHeatSetpointLimit "
+                                                     @"attribute Error: %@",
+                                                   err);
+
+                                               VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+                                               NextTest();
+                                           }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestReadsMaxHeatSetpointLimitAttributeFromServerDutAndVerifiesThatTheValueIsWithinRange_40()
+    {
+        MTRBaseDevice * device = GetDevice("alpha");
+        MTRBaseClusterThermostat * cluster = [[MTRBaseClusterThermostat alloc] initWithDevice:device
+                                                                                     endpoint:1
+                                                                                        queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        [cluster readAttributeMaxHeatSetpointLimitWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(
+                @"Reads MaxHeatSetpointLimit attribute from Server DUT and verifies that the value is within range Error: %@", err);
+
+            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+            {
+                id actualValue = value;
+                VerifyOrReturn(CheckValue("MaxHeatSetpointLimit", actualValue, 3000));
+            }
+
+            VerifyOrReturn(CheckConstraintType("maxHeatSetpointLimit", "", "int16"));
+            VerifyOrReturn(CheckConstraintMinValue<int16_t>("maxHeatSetpointLimit", [value shortValue], 700));
+            VerifyOrReturn(CheckConstraintMaxValue<int16_t>("maxHeatSetpointLimit", [value shortValue], 3000));
+
+            NextTest();
+        }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestWritesTheLimitOfAbsMinHeatSetpointLimitToMinHeatSetpointLimitAttribute_41()
+    {
+        MTRBaseDevice * device = GetDevice("alpha");
+        MTRBaseClusterThermostat * cluster = [[MTRBaseClusterThermostat alloc] initWithDevice:device
+                                                                                     endpoint:1
+                                                                                        queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        id minHeatSetpointLimitArgument;
+        minHeatSetpointLimitArgument = [NSNumber numberWithShort:700];
+        [cluster writeAttributeMinHeatSetpointLimitWithValue:minHeatSetpointLimitArgument
+                                           completionHandler:^(NSError * _Nullable err) {
+                                               NSLog(@"Writes the limit of AbsMinHeatSetpointLimit to MinHeatSetpointLimit "
+                                                     @"attribute Error: %@",
+                                                   err);
 
                                                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -48450,7 +48837,31 @@ class Test_TC_TSTAT_2_2 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWritesAValueBackThatIsDifferentButValidForMaxHeatSetpointLimitAttribute_31()
+    CHIP_ERROR TestWritesTheLimitOfAbsMaxHeatSetpointLimitToMinHeatSetpointLimitAttribute_42()
+    {
+        MTRBaseDevice * device = GetDevice("alpha");
+        MTRBaseClusterThermostat * cluster = [[MTRBaseClusterThermostat alloc] initWithDevice:device
+                                                                                     endpoint:1
+                                                                                        queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        id minHeatSetpointLimitArgument;
+        minHeatSetpointLimitArgument = [NSNumber numberWithShort:3000];
+        [cluster writeAttributeMinHeatSetpointLimitWithValue:minHeatSetpointLimitArgument
+                                           completionHandler:^(NSError * _Nullable err) {
+                                               NSLog(@"Writes the limit of AbsMaxHeatSetpointLimit to MinHeatSetpointLimit "
+                                                     @"attribute Error: %@",
+                                                   err);
+
+                                               VerifyOrReturn(
+                                                   CheckValue("status", err ? err.code : 0, EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
+                                               NextTest();
+                                           }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestWritesAValueBackThatIsDifferentButValidForMaxHeatSetpointLimitAttribute_43()
     {
         MTRBaseDevice * device = GetDevice("alpha");
         MTRBaseClusterThermostat * cluster = [[MTRBaseClusterThermostat alloc] initWithDevice:device
@@ -48459,18 +48870,13 @@ class Test_TC_TSTAT_2_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         id maxHeatSetpointLimitArgument;
-        maxHeatSetpointLimitArgument = [NSNumber numberWithShort:2000];
+        maxHeatSetpointLimitArgument = [NSNumber numberWithShort:2900];
         [cluster writeAttributeMaxHeatSetpointLimitWithValue:maxHeatSetpointLimitArgument
                                            completionHandler:^(NSError * _Nullable err) {
                                                NSLog(@"Writes a value back that is different but valid for MaxHeatSetpointLimit "
                                                      @"attribute Error: %@",
                                                    err);
 
-                                               if (err.code == MTRInteractionErrorCodeUnsupportedAttribute) {
-                                                   NextTest();
-                                                   return;
-                                               }
-
                                                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
                                                NextTest();
@@ -48479,7 +48885,7 @@ class Test_TC_TSTAT_2_2 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadsItBackAgainToConfirmTheSuccessfulWriteOfMaxHeatSetpointLimitAttribute_32()
+    CHIP_ERROR TestReadsItBackAgainToConfirmTheSuccessfulWriteOfMaxHeatSetpointLimitAttribute_44()
     {
         MTRBaseDevice * device = GetDevice("alpha");
         MTRBaseClusterThermostat * cluster = [[MTRBaseClusterThermostat alloc] initWithDevice:device
@@ -48490,16 +48896,11 @@ class Test_TC_TSTAT_2_2 : public TestCommandBridge {
         [cluster readAttributeMaxHeatSetpointLimitWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
             NSLog(@"Reads it back again to confirm the successful write of MaxHeatSetpointLimit attribute Error: %@", err);
 
-            if (err.code == MTRInteractionErrorCodeUnsupportedAttribute) {
-                NextTest();
-                return;
-            }
-
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             {
                 id actualValue = value;
-                VerifyOrReturn(CheckValue("MaxHeatSetpointLimit", actualValue, 2000));
+                VerifyOrReturn(CheckValue("MaxHeatSetpointLimit", actualValue, 2900));
             }
 
             NextTest();
@@ -48508,7 +48909,7 @@ class Test_TC_TSTAT_2_2 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWritesMaxHeatSetpointLimitToValueBelowTheAbsMinHeatSetpointLimit_33()
+    CHIP_ERROR TestWritesMaxHeatSetpointLimitToValueBelowTheAbsMinHeatSetpointLimit_45()
     {
         MTRBaseDevice * device = GetDevice("alpha");
         MTRBaseClusterThermostat * cluster = [[MTRBaseClusterThermostat alloc] initWithDevice:device
@@ -48525,11 +48926,6 @@ class Test_TC_TSTAT_2_2 : public TestCommandBridge {
                                               @"Writes MaxHeatSetpointLimit to value below the AbsMinHeatSetpointLimit  Error: %@",
                                               err);
 
-                                          if (err.code == MTRInteractionErrorCodeUnsupportedAttribute) {
-                                              NextTest();
-                                              return;
-                                          }
-
                                           VerifyOrReturn(
                                               CheckValue("status", err ? err.code : 0, EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
                                           NextTest();
@@ -48538,7 +48934,7 @@ class Test_TC_TSTAT_2_2 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWritesMaxHeatSetpointLimitToValueAboveTheAbsMaxHeatSetpointLimit_34()
+    CHIP_ERROR TestWritesMaxHeatSetpointLimitToValueAboveTheAbsMaxHeatSetpointLimit_46()
     {
         MTRBaseDevice * device = GetDevice("alpha");
         MTRBaseClusterThermostat * cluster = [[MTRBaseClusterThermostat alloc] initWithDevice:device
@@ -48555,11 +48951,6 @@ class Test_TC_TSTAT_2_2 : public TestCommandBridge {
                                               @"Writes MaxHeatSetpointLimit to value above the AbsMaxHeatSetpointLimit  Error: %@",
                                               err);
 
-                                          if (err.code == MTRInteractionErrorCodeUnsupportedAttribute) {
-                                              NextTest();
-                                              return;
-                                          }
-
                                           VerifyOrReturn(
                                               CheckValue("status", err ? err.code : 0, EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
                                           NextTest();
@@ -48568,7 +48959,7 @@ class Test_TC_TSTAT_2_2 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWritesTheLimitOfAbsMinHeatSetpointLimitToMaxHeatSetpointLimitAttribute_35()
+    CHIP_ERROR TestWritesTheLimitOfAbsMinHeatSetpointLimitToMaxHeatSetpointLimitAttribute_47()
     {
         MTRBaseDevice * device = GetDevice("alpha");
         MTRBaseClusterThermostat * cluster = [[MTRBaseClusterThermostat alloc] initWithDevice:device
@@ -48584,10 +48975,29 @@ class Test_TC_TSTAT_2_2 : public TestCommandBridge {
                                                      @"attribute Error: %@",
                                                    err);
 
-                                               if (err.code == MTRInteractionErrorCodeUnsupportedAttribute) {
-                                                   NextTest();
-                                                   return;
-                                               }
+                                               VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+                                               NextTest();
+                                           }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestWritesTheLimitOfAbsMaxHeatSetpointLimitToMaxHeatSetpointLimitAttribute_48()
+    {
+        MTRBaseDevice * device = GetDevice("alpha");
+        MTRBaseClusterThermostat * cluster = [[MTRBaseClusterThermostat alloc] initWithDevice:device
+                                                                                     endpoint:1
+                                                                                        queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        id maxHeatSetpointLimitArgument;
+        maxHeatSetpointLimitArgument = [NSNumber numberWithShort:3000];
+        [cluster writeAttributeMaxHeatSetpointLimitWithValue:maxHeatSetpointLimitArgument
+                                           completionHandler:^(NSError * _Nullable err) {
+                                               NSLog(@"Writes the limit of AbsMaxHeatSetpointLimit to MaxHeatSetpointLimit "
+                                                     @"attribute Error: %@",
+                                                   err);
 
                                                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -48597,7 +49007,7 @@ class Test_TC_TSTAT_2_2 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadsMinCoolSetpointLimitAttributeFromServerDutAndVerifiesThatTheValueIsWithinRange_36()
+    CHIP_ERROR TestReadsMinCoolSetpointLimitAttributeFromServerDutAndVerifiesThatTheValueIsWithinRange_49()
     {
         MTRBaseDevice * device = GetDevice("alpha");
         MTRBaseClusterThermostat * cluster = [[MTRBaseClusterThermostat alloc] initWithDevice:device
@@ -48609,11 +49019,6 @@ class Test_TC_TSTAT_2_2 : public TestCommandBridge {
             NSLog(
                 @"Reads MinCoolSetpointLimit attribute from Server DUT and verifies that the value is within range Error: %@", err);
 
-            if (err.code == MTRInteractionErrorCodeUnsupportedAttribute) {
-                NextTest();
-                return;
-            }
-
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             {
@@ -48631,7 +49036,7 @@ class Test_TC_TSTAT_2_2 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWritesAValueBackThatIsDifferentButValidForMinCoolSetpointLimitAttribute_37()
+    CHIP_ERROR TestWritesAValueBackThatIsDifferentButValidForMinCoolSetpointLimitAttribute_50()
     {
         MTRBaseDevice * device = GetDevice("alpha");
         MTRBaseClusterThermostat * cluster = [[MTRBaseClusterThermostat alloc] initWithDevice:device
@@ -48647,11 +49052,6 @@ class Test_TC_TSTAT_2_2 : public TestCommandBridge {
                                                      @"attribute Error: %@",
                                                    err);
 
-                                               if (err.code == MTRInteractionErrorCodeUnsupportedAttribute) {
-                                                   NextTest();
-                                                   return;
-                                               }
-
                                                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
                                                NextTest();
@@ -48660,7 +49060,7 @@ class Test_TC_TSTAT_2_2 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadsItBackAgainToConfirmTheSuccessfulWriteOfMinCoolSetpointLimitAttribute_38()
+    CHIP_ERROR TestReadsItBackAgainToConfirmTheSuccessfulWriteOfMinCoolSetpointLimitAttribute_51()
     {
         MTRBaseDevice * device = GetDevice("alpha");
         MTRBaseClusterThermostat * cluster = [[MTRBaseClusterThermostat alloc] initWithDevice:device
@@ -48671,11 +49071,6 @@ class Test_TC_TSTAT_2_2 : public TestCommandBridge {
         [cluster readAttributeMinCoolSetpointLimitWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
             NSLog(@"Reads it back again to confirm the successful write of MinCoolSetpointLimit attribute Error: %@", err);
 
-            if (err.code == MTRInteractionErrorCodeUnsupportedAttribute) {
-                NextTest();
-                return;
-            }
-
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             {
@@ -48689,7 +49084,7 @@ class Test_TC_TSTAT_2_2 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWritesMinCoolSetpointLimitToValueBelowTheAbsMinCoolSetpointLimit_39()
+    CHIP_ERROR TestWritesMinCoolSetpointLimitToValueBelowTheAbsMinCoolSetpointLimit_52()
     {
         MTRBaseDevice * device = GetDevice("alpha");
         MTRBaseClusterThermostat * cluster = [[MTRBaseClusterThermostat alloc] initWithDevice:device
@@ -48706,11 +49101,6 @@ class Test_TC_TSTAT_2_2 : public TestCommandBridge {
                                               @"Writes MinCoolSetpointLimit to value below the AbsMinCoolSetpointLimit  Error: %@",
                                               err);
 
-                                          if (err.code == MTRInteractionErrorCodeUnsupportedAttribute) {
-                                              NextTest();
-                                              return;
-                                          }
-
                                           VerifyOrReturn(
                                               CheckValue("status", err ? err.code : 0, EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
                                           NextTest();
@@ -48719,7 +49109,7 @@ class Test_TC_TSTAT_2_2 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWritesMinCoolSetpointLimitToValueAboveTheMaxCoolSetpointLimit_40()
+    CHIP_ERROR TestWritesMinCoolSetpointLimitToValueAboveTheMaxCoolSetpointLimit_53()
     {
         MTRBaseDevice * device = GetDevice("alpha");
         MTRBaseClusterThermostat * cluster = [[MTRBaseClusterThermostat alloc] initWithDevice:device
@@ -48735,11 +49125,6 @@ class Test_TC_TSTAT_2_2 : public TestCommandBridge {
                                           NSLog(@"Writes MinCoolSetpointLimit to value above the MaxCoolSetpointLimit  Error: %@",
                                               err);
 
-                                          if (err.code == MTRInteractionErrorCodeUnsupportedAttribute) {
-                                              NextTest();
-                                              return;
-                                          }
-
                                           VerifyOrReturn(
                                               CheckValue("status", err ? err.code : 0, EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
                                           NextTest();
@@ -48748,7 +49133,7 @@ class Test_TC_TSTAT_2_2 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWritesTheLimitOfAbsMinCoolSetpointLimitToMinCoolSetpointLimitAttribute_41()
+    CHIP_ERROR TestWritesTheLimitOfAbsMinCoolSetpointLimitToMinCoolSetpointLimitAttribute_54()
     {
         MTRBaseDevice * device = GetDevice("alpha");
         MTRBaseClusterThermostat * cluster = [[MTRBaseClusterThermostat alloc] initWithDevice:device
@@ -48764,11 +49149,6 @@ class Test_TC_TSTAT_2_2 : public TestCommandBridge {
                                                      @"attribute Error: %@",
                                                    err);
 
-                                               if (err.code == MTRInteractionErrorCodeUnsupportedAttribute) {
-                                                   NextTest();
-                                                   return;
-                                               }
-
                                                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
                                                NextTest();
@@ -48777,7 +49157,7 @@ class Test_TC_TSTAT_2_2 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWritesTheLimitOfMaxCoolSetpointLimitToMinCoolSetpointLimitAttribute_42()
+    CHIP_ERROR TestWritesTheLimitOfMaxCoolSetpointLimitToMinCoolSetpointLimitAttribute_55()
     {
         MTRBaseDevice * device = GetDevice("alpha");
         MTRBaseClusterThermostat * cluster = [[MTRBaseClusterThermostat alloc] initWithDevice:device
@@ -48793,10 +49173,29 @@ class Test_TC_TSTAT_2_2 : public TestCommandBridge {
                                                      @"Error: %@",
                                                    err);
 
-                                               if (err.code == MTRInteractionErrorCodeUnsupportedAttribute) {
-                                                   NextTest();
-                                                   return;
-                                               }
+                                               VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+                                               NextTest();
+                                           }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestWritesTheLimitOfAbsMinCoolSetpointLimitToMinCoolSetpointLimitAttribute_56()
+    {
+        MTRBaseDevice * device = GetDevice("alpha");
+        MTRBaseClusterThermostat * cluster = [[MTRBaseClusterThermostat alloc] initWithDevice:device
+                                                                                     endpoint:1
+                                                                                        queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        id minCoolSetpointLimitArgument;
+        minCoolSetpointLimitArgument = [NSNumber numberWithShort:1600];
+        [cluster writeAttributeMinCoolSetpointLimitWithValue:minCoolSetpointLimitArgument
+                                           completionHandler:^(NSError * _Nullable err) {
+                                               NSLog(@"Writes the limit of AbsMinCoolSetpointLimit to MinCoolSetpointLimit "
+                                                     @"attribute Error: %@",
+                                                   err);
 
                                                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -48806,7 +49205,7 @@ class Test_TC_TSTAT_2_2 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadsMaxCoolSetpointLimitAttributeFromServerDutAndVerifiesThatTheValueIsWithinRange_43()
+    CHIP_ERROR TestReadsMaxCoolSetpointLimitAttributeFromServerDutAndVerifiesThatTheValueIsWithinRange_57()
     {
         MTRBaseDevice * device = GetDevice("alpha");
         MTRBaseClusterThermostat * cluster = [[MTRBaseClusterThermostat alloc] initWithDevice:device
@@ -48818,11 +49217,6 @@ class Test_TC_TSTAT_2_2 : public TestCommandBridge {
             NSLog(
                 @"Reads MaxCoolSetpointLimit attribute from Server DUT and verifies that the value is within range Error: %@", err);
 
-            if (err.code == MTRInteractionErrorCodeUnsupportedAttribute) {
-                NextTest();
-                return;
-            }
-
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             {
@@ -48840,7 +49234,55 @@ class Test_TC_TSTAT_2_2 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWritesMaxCoolSetpointLimitToValueBelowTheAbsMinCoolSetpointLimit_44()
+    CHIP_ERROR TestWritesAValueBackThatIsDifferentButValidForMaxCoolSetpointLimitAttribute_58()
+    {
+        MTRBaseDevice * device = GetDevice("alpha");
+        MTRBaseClusterThermostat * cluster = [[MTRBaseClusterThermostat alloc] initWithDevice:device
+                                                                                     endpoint:1
+                                                                                        queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        id maxCoolSetpointLimitArgument;
+        maxCoolSetpointLimitArgument = [NSNumber numberWithShort:2000];
+        [cluster writeAttributeMaxCoolSetpointLimitWithValue:maxCoolSetpointLimitArgument
+                                           completionHandler:^(NSError * _Nullable err) {
+                                               NSLog(@"Writes a value back that is different but valid for MaxCoolSetpointLimit "
+                                                     @"attribute Error: %@",
+                                                   err);
+
+                                               VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+                                               NextTest();
+                                           }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestReadsItBackAgainToConfirmTheSuccessfulWriteOfMaxCoolSetpointLimitAttribute_59()
+    {
+        MTRBaseDevice * device = GetDevice("alpha");
+        MTRBaseClusterThermostat * cluster = [[MTRBaseClusterThermostat alloc] initWithDevice:device
+                                                                                     endpoint:1
+                                                                                        queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        [cluster readAttributeMaxCoolSetpointLimitWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Reads it back again to confirm the successful write of MaxCoolSetpointLimit attribute Error: %@", err);
+
+            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+            {
+                id actualValue = value;
+                VerifyOrReturn(CheckValue("MaxCoolSetpointLimit", actualValue, 2000));
+            }
+
+            NextTest();
+        }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestWritesMaxCoolSetpointLimitToValueBelowTheAbsMinCoolSetpointLimit_60()
     {
         MTRBaseDevice * device = GetDevice("alpha");
         MTRBaseClusterThermostat * cluster = [[MTRBaseClusterThermostat alloc] initWithDevice:device
@@ -48857,10 +49299,29 @@ class Test_TC_TSTAT_2_2 : public TestCommandBridge {
                                               @"Writes MaxCoolSetpointLimit to value below the AbsMinCoolSetpointLimit  Error: %@",
                                               err);
 
-                                          if (err.code == MTRInteractionErrorCodeUnsupportedAttribute) {
-                                              NextTest();
-                                              return;
-                                          }
+                                          VerifyOrReturn(
+                                              CheckValue("status", err ? err.code : 0, EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
+                                          NextTest();
+                                      }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestWritesMaxCoolSetpointLimitToValueAboveTheMaxCoolSetpointLimit_61()
+    {
+        MTRBaseDevice * device = GetDevice("alpha");
+        MTRBaseClusterThermostat * cluster = [[MTRBaseClusterThermostat alloc] initWithDevice:device
+                                                                                     endpoint:1
+                                                                                        queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        id maxCoolSetpointLimitArgument;
+        maxCoolSetpointLimitArgument = [NSNumber numberWithShort:4000];
+        [cluster
+            writeAttributeMaxCoolSetpointLimitWithValue:maxCoolSetpointLimitArgument
+                                      completionHandler:^(NSError * _Nullable err) {
+                                          NSLog(@"Writes MaxCoolSetpointLimit to value above the MaxCoolSetpointLimit  Error: %@",
+                                              err);
 
                                           VerifyOrReturn(
                                               CheckValue("status", err ? err.code : 0, EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
@@ -48870,7 +49331,7 @@ class Test_TC_TSTAT_2_2 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWritesMaxCoolSetpointLimitToValueAboveTheMaxCoolSetpointLimit_45()
+    CHIP_ERROR TestWritesTheLimitOfAbsMinCoolSetpointLimitToMaxCoolSetpointLimitAttribute_62()
     {
         MTRBaseDevice * device = GetDevice("alpha");
         MTRBaseClusterThermostat * cluster = [[MTRBaseClusterThermostat alloc] initWithDevice:device
@@ -48879,27 +49340,22 @@ class Test_TC_TSTAT_2_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         id maxCoolSetpointLimitArgument;
-        maxCoolSetpointLimitArgument = [NSNumber numberWithShort:4000];
-        [cluster
-            writeAttributeMaxCoolSetpointLimitWithValue:maxCoolSetpointLimitArgument
-                                      completionHandler:^(NSError * _Nullable err) {
-                                          NSLog(@"Writes MaxCoolSetpointLimit to value above the MaxCoolSetpointLimit  Error: %@",
-                                              err);
+        maxCoolSetpointLimitArgument = [NSNumber numberWithShort:1600];
+        [cluster writeAttributeMaxCoolSetpointLimitWithValue:maxCoolSetpointLimitArgument
+                                           completionHandler:^(NSError * _Nullable err) {
+                                               NSLog(@"Writes the limit of AbsMinCoolSetpointLimit to MaxCoolSetpointLimit "
+                                                     @"attribute Error: %@",
+                                                   err);
 
-                                          if (err.code == MTRInteractionErrorCodeUnsupportedAttribute) {
-                                              NextTest();
-                                              return;
-                                          }
+                                               VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-                                          VerifyOrReturn(
-                                              CheckValue("status", err ? err.code : 0, EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
-                                          NextTest();
-                                      }];
+                                               NextTest();
+                                           }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWritesTheLimitOfMaxCoolSetpointLimitToMaxCoolSetpointLimitAttribute_46()
+    CHIP_ERROR TestWritesTheLimitOfMaxCoolSetpointLimitToMaxCoolSetpointLimitAttribute_63()
     {
         MTRBaseDevice * device = GetDevice("alpha");
         MTRBaseClusterThermostat * cluster = [[MTRBaseClusterThermostat alloc] initWithDevice:device
@@ -48915,11 +49371,6 @@ class Test_TC_TSTAT_2_2 : public TestCommandBridge {
                                                      @"Error: %@",
                                                    err);
 
-                                               if (err.code == MTRInteractionErrorCodeUnsupportedAttribute) {
-                                                   NextTest();
-                                                   return;
-                                               }
-
                                                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
                                                NextTest();
@@ -48928,7 +49379,7 @@ class Test_TC_TSTAT_2_2 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWritesSetsBackDefaultValueOfMinHeatSetpointLimit_47()
+    CHIP_ERROR TestWritesSetsBackDefaultValueOfMinHeatSetpointLimit_64()
     {
         MTRBaseDevice * device = GetDevice("alpha");
         MTRBaseClusterThermostat * cluster = [[MTRBaseClusterThermostat alloc] initWithDevice:device
@@ -48942,10 +49393,49 @@ class Test_TC_TSTAT_2_2 : public TestCommandBridge {
                                            completionHandler:^(NSError * _Nullable err) {
                                                NSLog(@"Writes (sets back) default value of MinHeatSetpointLimit Error: %@", err);
 
-                                               if (err.code == MTRInteractionErrorCodeUnsupportedAttribute) {
-                                                   NextTest();
-                                                   return;
-                                               }
+                                               VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+                                               NextTest();
+                                           }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestWritesSetsBackdefaultValueOfMaxHeatSetpointLimit_65()
+    {
+        MTRBaseDevice * device = GetDevice("alpha");
+        MTRBaseClusterThermostat * cluster = [[MTRBaseClusterThermostat alloc] initWithDevice:device
+                                                                                     endpoint:1
+                                                                                        queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        id maxHeatSetpointLimitArgument;
+        maxHeatSetpointLimitArgument = [NSNumber numberWithShort:3000];
+        [cluster writeAttributeMaxHeatSetpointLimitWithValue:maxHeatSetpointLimitArgument
+                                           completionHandler:^(NSError * _Nullable err) {
+                                               NSLog(@"Writes (sets back)default value of MaxHeatSetpointLimit Error: %@", err);
+
+                                               VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+                                               NextTest();
+                                           }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestWritesMaxHeatSetpointLimitThatMeetsTheDeadbandOf25c_66()
+    {
+        MTRBaseDevice * device = GetDevice("alpha");
+        MTRBaseClusterThermostat * cluster = [[MTRBaseClusterThermostat alloc] initWithDevice:device
+                                                                                     endpoint:1
+                                                                                        queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        id maxHeatSetpointLimitArgument;
+        maxHeatSetpointLimitArgument = [NSNumber numberWithShort:2950];
+        [cluster writeAttributeMaxHeatSetpointLimitWithValue:maxHeatSetpointLimitArgument
+                                           completionHandler:^(NSError * _Nullable err) {
+                                               NSLog(@"Writes MaxHeatSetpointLimit That meets the deadband of 2.5C Error: %@", err);
 
                                                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -48955,7 +49445,7 @@ class Test_TC_TSTAT_2_2 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWritesSetsBackDefaultValueOfMinCoolSetpointLimit_48()
+    CHIP_ERROR TestWritesSetsBackDefaultValueOfMinCoolSetpointLimit_67()
     {
         MTRBaseDevice * device = GetDevice("alpha");
         MTRBaseClusterThermostat * cluster = [[MTRBaseClusterThermostat alloc] initWithDevice:device
@@ -48969,11 +49459,6 @@ class Test_TC_TSTAT_2_2 : public TestCommandBridge {
                                            completionHandler:^(NSError * _Nullable err) {
                                                NSLog(@"Writes (sets back) default value of MinCoolSetpointLimit Error: %@", err);
 
-                                               if (err.code == MTRInteractionErrorCodeUnsupportedAttribute) {
-                                                   NextTest();
-                                                   return;
-                                               }
-
                                                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
                                                NextTest();
@@ -48982,7 +49467,7 @@ class Test_TC_TSTAT_2_2 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWritesSetsBackDefaultValueOfMaxCoolSetpointLimit_49()
+    CHIP_ERROR TestWritesSetsBackDefaultValueOfMaxCoolSetpointLimit_68()
     {
         MTRBaseDevice * device = GetDevice("alpha");
         MTRBaseClusterThermostat * cluster = [[MTRBaseClusterThermostat alloc] initWithDevice:device
@@ -48996,11 +49481,6 @@ class Test_TC_TSTAT_2_2 : public TestCommandBridge {
                                            completionHandler:^(NSError * _Nullable err) {
                                                NSLog(@"Writes (sets back) default value of MaxCoolSetpointLimit Error: %@", err);
 
-                                               if (err.code == MTRInteractionErrorCodeUnsupportedAttribute) {
-                                                   NextTest();
-                                                   return;
-                                               }
-
                                                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
                                                NextTest();
@@ -49009,7 +49489,7 @@ class Test_TC_TSTAT_2_2 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadsMinSetpointDeadBandAttributeFromServerDutAndVerifiesThatTheValueIsWithinRange_50()
+    CHIP_ERROR TestReadsMinSetpointDeadBandAttributeFromServerDutAndVerifiesThatTheValueIsWithinRange_69()
     {
         MTRBaseDevice * device = GetDevice("alpha");
         MTRBaseClusterThermostat * cluster = [[MTRBaseClusterThermostat alloc] initWithDevice:device
@@ -49021,11 +49501,6 @@ class Test_TC_TSTAT_2_2 : public TestCommandBridge {
             NSLog(
                 @"Reads MinSetpointDeadBand attribute from Server DUT and verifies that the value is within range Error: %@", err);
 
-            if (err.code == MTRInteractionErrorCodeUnsupportedAttribute) {
-                NextTest();
-                return;
-            }
-
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             {
@@ -49043,7 +49518,7 @@ class Test_TC_TSTAT_2_2 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWritesAValueBackThatIsDifferentButValidForMinSetpointDeadBandAttribute_51()
+    CHIP_ERROR TestWritesAValueBackThatIsDifferentButValidForMinSetpointDeadBandAttribute_70()
     {
         MTRBaseDevice * device = GetDevice("alpha");
         MTRBaseClusterThermostat * cluster = [[MTRBaseClusterThermostat alloc] initWithDevice:device
@@ -49059,11 +49534,6 @@ class Test_TC_TSTAT_2_2 : public TestCommandBridge {
                                                     @"attribute Error: %@",
                                                   err);
 
-                                              if (err.code == MTRInteractionErrorCodeUnsupportedAttribute) {
-                                                  NextTest();
-                                                  return;
-                                              }
-
                                               VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
                                               NextTest();
@@ -49072,7 +49542,7 @@ class Test_TC_TSTAT_2_2 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadsItBackAgainToConfirmTheSuccessfulWriteOfMinSetpointDeadBandAttribute_52()
+    CHIP_ERROR TestReadsItBackAgainToConfirmTheSuccessfulWriteOfMinSetpointDeadBandAttribute_71()
     {
         MTRBaseDevice * device = GetDevice("alpha");
         MTRBaseClusterThermostat * cluster = [[MTRBaseClusterThermostat alloc] initWithDevice:device
@@ -49083,11 +49553,6 @@ class Test_TC_TSTAT_2_2 : public TestCommandBridge {
         [cluster readAttributeMinSetpointDeadBandWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
             NSLog(@"Reads it back again to confirm the successful write of MinSetpointDeadBand attribute Error: %@", err);
 
-            if (err.code == MTRInteractionErrorCodeUnsupportedAttribute) {
-                NextTest();
-                return;
-            }
-
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             {
@@ -49101,7 +49566,7 @@ class Test_TC_TSTAT_2_2 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWritesTheValueBelowMinSetpointDeadBand_53()
+    CHIP_ERROR TestWritesTheValueBelowMinSetpointDeadBand_72()
     {
         MTRBaseDevice * device = GetDevice("alpha");
         MTRBaseClusterThermostat * cluster = [[MTRBaseClusterThermostat alloc] initWithDevice:device
@@ -49115,11 +49580,6 @@ class Test_TC_TSTAT_2_2 : public TestCommandBridge {
                                           completionHandler:^(NSError * _Nullable err) {
                                               NSLog(@"Writes the value below MinSetpointDeadBand Error: %@", err);
 
-                                              if (err.code == MTRInteractionErrorCodeUnsupportedAttribute) {
-                                                  NextTest();
-                                                  return;
-                                              }
-
                                               VerifyOrReturn(
                                                   CheckValue("status", err ? err.code : 0, EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
                                               NextTest();
@@ -49128,7 +49588,7 @@ class Test_TC_TSTAT_2_2 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWritesTheValueAboveMinSetpointDeadBand_54()
+    CHIP_ERROR TestWritesTheValueAboveMinSetpointDeadBand_73()
     {
         MTRBaseDevice * device = GetDevice("alpha");
         MTRBaseClusterThermostat * cluster = [[MTRBaseClusterThermostat alloc] initWithDevice:device
@@ -49142,11 +49602,6 @@ class Test_TC_TSTAT_2_2 : public TestCommandBridge {
                                           completionHandler:^(NSError * _Nullable err) {
                                               NSLog(@"Writes the value above MinSetpointDeadBand  Error: %@", err);
 
-                                              if (err.code == MTRInteractionErrorCodeUnsupportedAttribute) {
-                                                  NextTest();
-                                                  return;
-                                              }
-
                                               VerifyOrReturn(
                                                   CheckValue("status", err ? err.code : 0, EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
                                               NextTest();
@@ -49155,7 +49610,7 @@ class Test_TC_TSTAT_2_2 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWritesTheMinLimitOfMinSetpointDeadBand_55()
+    CHIP_ERROR TestWritesTheMinLimitOfMinSetpointDeadBand_74()
     {
         MTRBaseDevice * device = GetDevice("alpha");
         MTRBaseClusterThermostat * cluster = [[MTRBaseClusterThermostat alloc] initWithDevice:device
@@ -49169,11 +49624,6 @@ class Test_TC_TSTAT_2_2 : public TestCommandBridge {
                                           completionHandler:^(NSError * _Nullable err) {
                                               NSLog(@"Writes the min limit of MinSetpointDeadBand Error: %@", err);
 
-                                              if (err.code == MTRInteractionErrorCodeUnsupportedAttribute) {
-                                                  NextTest();
-                                                  return;
-                                              }
-
                                               VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
                                               NextTest();
@@ -49182,7 +49632,7 @@ class Test_TC_TSTAT_2_2 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWritesTheMaxLimitOfMinSetpointDeadBand_56()
+    CHIP_ERROR TestWritesTheMaxLimitOfMinSetpointDeadBand_75()
     {
         MTRBaseDevice * device = GetDevice("alpha");
         MTRBaseClusterThermostat * cluster = [[MTRBaseClusterThermostat alloc] initWithDevice:device
@@ -49196,11 +49646,6 @@ class Test_TC_TSTAT_2_2 : public TestCommandBridge {
                                           completionHandler:^(NSError * _Nullable err) {
                                               NSLog(@"Writes the max limit of MinSetpointDeadBand Error: %@", err);
 
-                                              if (err.code == MTRInteractionErrorCodeUnsupportedAttribute) {
-                                                  NextTest();
-                                                  return;
-                                              }
-
                                               VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
                                               NextTest();
@@ -49209,7 +49654,7 @@ class Test_TC_TSTAT_2_2 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadsControlSequenceOfOperationFromServerDutAndVerifiesThatTheValueIsValid_57()
+    CHIP_ERROR TestReadsControlSequenceOfOperationFromServerDutAndVerifiesThatTheValueIsValid_76()
     {
         MTRBaseDevice * device = GetDevice("alpha");
         MTRBaseClusterThermostat * cluster = [[MTRBaseClusterThermostat alloc] initWithDevice:device
@@ -49238,7 +49683,7 @@ class Test_TC_TSTAT_2_2 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteAttributeCommandForControlSequenceOfOperationWithANewValidValue_58()
+    CHIP_ERROR TestWriteAttributeCommandForControlSequenceOfOperationWithANewValidValue_77()
     {
         MTRBaseDevice * device = GetDevice("alpha");
         MTRBaseClusterThermostat * cluster = [[MTRBaseClusterThermostat alloc] initWithDevice:device
@@ -49262,7 +49707,7 @@ class Test_TC_TSTAT_2_2 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadItBackAgainToConfirmTheSuccessfulWrite_59()
+    CHIP_ERROR TestReadItBackAgainToConfirmTheSuccessfulWrite_78()
     {
         MTRBaseDevice * device = GetDevice("alpha");
         MTRBaseClusterThermostat * cluster = [[MTRBaseClusterThermostat alloc] initWithDevice:device
@@ -49287,7 +49732,7 @@ class Test_TC_TSTAT_2_2 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestSendsSetpointRaiseCommand_60()
+    CHIP_ERROR TestWritesMaxHeatSetpointLimitAttributeToDefaultValueOf2950ToMeetDeadbandConstraint_79()
     {
         MTRBaseDevice * device = GetDevice("alpha");
         MTRBaseClusterThermostat * cluster = [[MTRBaseClusterThermostat alloc] initWithDevice:device
@@ -49295,22 +49740,23 @@ class Test_TC_TSTAT_2_2 : public TestCommandBridge {
                                                                                         queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        __auto_type * params = [[MTRThermostatClusterSetpointRaiseLowerParams alloc] init];
-        params.mode = [NSNumber numberWithUnsignedChar:0U];
-        params.amount = [NSNumber numberWithChar:-30];
-        [cluster setpointRaiseLowerWithParams:params
-                            completionHandler:^(NSError * _Nullable err) {
-                                NSLog(@"Sends SetpointRaise Command Error: %@", err);
+        id maxHeatSetpointLimitArgument;
+        maxHeatSetpointLimitArgument = [NSNumber numberWithShort:2950];
+        [cluster writeAttributeMaxHeatSetpointLimitWithValue:maxHeatSetpointLimitArgument
+                                           completionHandler:^(NSError * _Nullable err) {
+                                               NSLog(@"Writes MaxHeatSetpointLimit attribute to default value of 2950 to meet "
+                                                     @"deadband constraint Error: %@",
+                                                   err);
 
-                                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+                                               VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-                                NextTest();
-                            }];
+                                               NextTest();
+                                           }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadsBackOccupiedHeatingSetpointToConfirmTheSuccessOfTheWrite_61()
+    CHIP_ERROR TestSetsOccupiedCoolingSetpointToDefaultValue_80()
     {
         MTRBaseDevice * device = GetDevice("alpha");
         MTRBaseClusterThermostat * cluster = [[MTRBaseClusterThermostat alloc] initWithDevice:device
@@ -49318,28 +49764,43 @@ class Test_TC_TSTAT_2_2 : public TestCommandBridge {
                                                                                         queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        [cluster readAttributeOccupiedHeatingSetpointWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Reads back OccupiedHeatingSetpoint to confirm the success of the write Error: %@", err);
+        id occupiedCoolingSetpointArgument;
+        occupiedCoolingSetpointArgument = [NSNumber numberWithShort:2600];
+        [cluster writeAttributeOccupiedCoolingSetpointWithValue:occupiedCoolingSetpointArgument
+                                              completionHandler:^(NSError * _Nullable err) {
+                                                  NSLog(@"Sets OccupiedCoolingSetpoint to default value Error: %@", err);
 
-            if (err.code == MTRInteractionErrorCodeUnsupportedAttribute) {
-                NextTest();
-                return;
-            }
+                                                  VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+                                                  NextTest();
+                                              }];
 
-            {
-                id actualValue = value;
-                VerifyOrReturn(CheckValue("OccupiedHeatingSetpoint", actualValue, -30));
-            }
+        return CHIP_NO_ERROR;
+    }
 
-            NextTest();
-        }];
+    CHIP_ERROR TestSetsOccupiedHeatingSetpointToDefaultValue_81()
+    {
+        MTRBaseDevice * device = GetDevice("alpha");
+        MTRBaseClusterThermostat * cluster = [[MTRBaseClusterThermostat alloc] initWithDevice:device
+                                                                                     endpoint:1
+                                                                                        queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        id occupiedHeatingSetpointArgument;
+        occupiedHeatingSetpointArgument = [NSNumber numberWithShort:2000];
+        [cluster writeAttributeOccupiedHeatingSetpointWithValue:occupiedHeatingSetpointArgument
+                                              completionHandler:^(NSError * _Nullable err) {
+                                                  NSLog(@"Sets OccupiedHeatingSetpoint to default value Error: %@", err);
+
+                                                  VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+                                                  NextTest();
+                                              }];
 
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestSendsSetpointRaiseCommand_62()
+    CHIP_ERROR TestSendsSetpointRaiseCommandHeatOnly_82()
     {
         MTRBaseDevice * device = GetDevice("alpha");
         MTRBaseClusterThermostat * cluster = [[MTRBaseClusterThermostat alloc] initWithDevice:device
@@ -49349,10 +49810,10 @@ class Test_TC_TSTAT_2_2 : public TestCommandBridge {
 
         __auto_type * params = [[MTRThermostatClusterSetpointRaiseLowerParams alloc] init];
         params.mode = [NSNumber numberWithUnsignedChar:0U];
-        params.amount = [NSNumber numberWithChar:30];
+        params.amount = [NSNumber numberWithChar:-30];
         [cluster setpointRaiseLowerWithParams:params
                             completionHandler:^(NSError * _Nullable err) {
-                                NSLog(@"Sends SetpointRaise Command Error: %@", err);
+                                NSLog(@"Sends SetpointRaise Command Heat Only Error: %@", err);
 
                                 VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -49362,7 +49823,7 @@ class Test_TC_TSTAT_2_2 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadsBackOccupiedHeatingSetpointToConfirmTheSuccessOfTheWrite_63()
+    CHIP_ERROR TestReadsBackOccupiedHeatingSetpointToConfirmTheSuccessOfTheWrite_83()
     {
         MTRBaseDevice * device = GetDevice("alpha");
         MTRBaseClusterThermostat * cluster = [[MTRBaseClusterThermostat alloc] initWithDevice:device
@@ -49373,16 +49834,11 @@ class Test_TC_TSTAT_2_2 : public TestCommandBridge {
         [cluster readAttributeOccupiedHeatingSetpointWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
             NSLog(@"Reads back OccupiedHeatingSetpoint to confirm the success of the write Error: %@", err);
 
-            if (err.code == MTRInteractionErrorCodeUnsupportedAttribute) {
-                NextTest();
-                return;
-            }
-
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             {
                 id actualValue = value;
-                VerifyOrReturn(CheckValue("OccupiedHeatingSetpoint", actualValue, 30));
+                VerifyOrReturn(CheckValue("OccupiedHeatingSetpoint", actualValue, 1700));
             }
 
             NextTest();
@@ -49391,7 +49847,7 @@ class Test_TC_TSTAT_2_2 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestSetsOccupiedCoolingSetpointToDefaultValue_64()
+    CHIP_ERROR TestSetsOccupiedHeatingSetpointToDefaultValue_84()
     {
         MTRBaseDevice * device = GetDevice("alpha");
         MTRBaseClusterThermostat * cluster = [[MTRBaseClusterThermostat alloc] initWithDevice:device
@@ -49399,16 +49855,11 @@ class Test_TC_TSTAT_2_2 : public TestCommandBridge {
                                                                                         queue:mCallbackQueue];
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
-        id occupiedCoolingSetpointArgument;
-        occupiedCoolingSetpointArgument = [NSNumber numberWithShort:2600];
-        [cluster writeAttributeOccupiedCoolingSetpointWithValue:occupiedCoolingSetpointArgument
+        id occupiedHeatingSetpointArgument;
+        occupiedHeatingSetpointArgument = [NSNumber numberWithShort:2000];
+        [cluster writeAttributeOccupiedHeatingSetpointWithValue:occupiedHeatingSetpointArgument
                                               completionHandler:^(NSError * _Nullable err) {
-                                                  NSLog(@"Sets OccupiedCoolingSetpoint to default value Error: %@", err);
-
-                                                  if (err.code == MTRInteractionErrorCodeUnsupportedAttribute) {
-                                                      NextTest();
-                                                      return;
-                                                  }
+                                                  NSLog(@"Sets OccupiedHeatingSetpoint to default value Error: %@", err);
 
                                                   VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -49418,7 +49869,54 @@ class Test_TC_TSTAT_2_2 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestSendsSetpointRaiseCommand_65()
+    CHIP_ERROR TestSendsSetpointRaiseCommandHeatOnly_85()
+    {
+        MTRBaseDevice * device = GetDevice("alpha");
+        MTRBaseClusterThermostat * cluster = [[MTRBaseClusterThermostat alloc] initWithDevice:device
+                                                                                     endpoint:1
+                                                                                        queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        __auto_type * params = [[MTRThermostatClusterSetpointRaiseLowerParams alloc] init];
+        params.mode = [NSNumber numberWithUnsignedChar:0U];
+        params.amount = [NSNumber numberWithChar:30];
+        [cluster setpointRaiseLowerWithParams:params
+                            completionHandler:^(NSError * _Nullable err) {
+                                NSLog(@"Sends SetpointRaise Command Heat Only Error: %@", err);
+
+                                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+                                NextTest();
+                            }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestReadsBackOccupiedHeatingSetpointToConfirmTheSuccessOfTheWrite_86()
+    {
+        MTRBaseDevice * device = GetDevice("alpha");
+        MTRBaseClusterThermostat * cluster = [[MTRBaseClusterThermostat alloc] initWithDevice:device
+                                                                                     endpoint:1
+                                                                                        queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        [cluster readAttributeOccupiedHeatingSetpointWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Reads back OccupiedHeatingSetpoint to confirm the success of the write Error: %@", err);
+
+            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+            {
+                id actualValue = value;
+                VerifyOrReturn(CheckValue("OccupiedHeatingSetpoint", actualValue, 2300));
+            }
+
+            NextTest();
+        }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestSendsSetpointRaiseCommandCoolOnly_87()
     {
         MTRBaseDevice * device = GetDevice("alpha");
         MTRBaseClusterThermostat * cluster = [[MTRBaseClusterThermostat alloc] initWithDevice:device
@@ -49431,7 +49929,7 @@ class Test_TC_TSTAT_2_2 : public TestCommandBridge {
         params.amount = [NSNumber numberWithChar:-30];
         [cluster setpointRaiseLowerWithParams:params
                             completionHandler:^(NSError * _Nullable err) {
-                                NSLog(@"Sends SetpointRaise Command Error: %@", err);
+                                NSLog(@"Sends SetpointRaise Command Cool Only Error: %@", err);
 
                                 VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -49441,7 +49939,7 @@ class Test_TC_TSTAT_2_2 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadsBackOccupiedCoolingSetpointToConfirmTheSuccessOfTheWrite_66()
+    CHIP_ERROR TestReadsBackOccupiedCoolingSetpointToConfirmTheSuccessOfTheWrite_88()
     {
         MTRBaseDevice * device = GetDevice("alpha");
         MTRBaseClusterThermostat * cluster = [[MTRBaseClusterThermostat alloc] initWithDevice:device
@@ -49452,16 +49950,11 @@ class Test_TC_TSTAT_2_2 : public TestCommandBridge {
         [cluster readAttributeOccupiedCoolingSetpointWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
             NSLog(@"Reads back OccupiedCoolingSetpoint to confirm the success of the write Error: %@", err);
 
-            if (err.code == MTRInteractionErrorCodeUnsupportedAttribute) {
-                NextTest();
-                return;
-            }
-
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             {
                 id actualValue = value;
-                VerifyOrReturn(CheckValue("OccupiedCoolingSetpoint", actualValue, -30));
+                VerifyOrReturn(CheckValue("OccupiedCoolingSetpoint", actualValue, 2300));
             }
 
             NextTest();
@@ -49470,7 +49963,7 @@ class Test_TC_TSTAT_2_2 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestSetsOccupiedCoolingSetpointToDefaultValue_67()
+    CHIP_ERROR TestSetsOccupiedCoolingSetpointToDefaultValue_89()
     {
         MTRBaseDevice * device = GetDevice("alpha");
         MTRBaseClusterThermostat * cluster = [[MTRBaseClusterThermostat alloc] initWithDevice:device
@@ -49484,11 +49977,6 @@ class Test_TC_TSTAT_2_2 : public TestCommandBridge {
                                               completionHandler:^(NSError * _Nullable err) {
                                                   NSLog(@"Sets OccupiedCoolingSetpoint to default value Error: %@", err);
 
-                                                  if (err.code == MTRInteractionErrorCodeUnsupportedAttribute) {
-                                                      NextTest();
-                                                      return;
-                                                  }
-
                                                   VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
                                                   NextTest();
@@ -49497,7 +49985,7 @@ class Test_TC_TSTAT_2_2 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestSendsSetpointRaiseCommand_68()
+    CHIP_ERROR TestSendsSetpointRaiseCommandCoolOnly_90()
     {
         MTRBaseDevice * device = GetDevice("alpha");
         MTRBaseClusterThermostat * cluster = [[MTRBaseClusterThermostat alloc] initWithDevice:device
@@ -49510,7 +49998,7 @@ class Test_TC_TSTAT_2_2 : public TestCommandBridge {
         params.amount = [NSNumber numberWithChar:30];
         [cluster setpointRaiseLowerWithParams:params
                             completionHandler:^(NSError * _Nullable err) {
-                                NSLog(@"Sends SetpointRaise Command Error: %@", err);
+                                NSLog(@"Sends SetpointRaise Command Cool Only Error: %@", err);
 
                                 VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -49520,7 +50008,7 @@ class Test_TC_TSTAT_2_2 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadsBackOccupiedCoolingSetpointToConfirmTheSuccessOfTheWrite_69()
+    CHIP_ERROR TestReadsBackOccupiedCoolingSetpointToConfirmTheSuccessOfTheWrite_91()
     {
         MTRBaseDevice * device = GetDevice("alpha");
         MTRBaseClusterThermostat * cluster = [[MTRBaseClusterThermostat alloc] initWithDevice:device
@@ -49531,16 +50019,11 @@ class Test_TC_TSTAT_2_2 : public TestCommandBridge {
         [cluster readAttributeOccupiedCoolingSetpointWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
             NSLog(@"Reads back OccupiedCoolingSetpoint to confirm the success of the write Error: %@", err);
 
-            if (err.code == MTRInteractionErrorCodeUnsupportedAttribute) {
-                NextTest();
-                return;
-            }
-
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             {
                 id actualValue = value;
-                VerifyOrReturn(CheckValue("OccupiedCoolingSetpoint", actualValue, 30));
+                VerifyOrReturn(CheckValue("OccupiedCoolingSetpoint", actualValue, 2900));
             }
 
             NextTest();
@@ -49549,7 +50032,7 @@ class Test_TC_TSTAT_2_2 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestSetsOccupiedCoolingSetpointToDefaultValue_70()
+    CHIP_ERROR TestSetsOccupiedCoolingSetpointToDefaultValue_92()
     {
         MTRBaseDevice * device = GetDevice("alpha");
         MTRBaseClusterThermostat * cluster = [[MTRBaseClusterThermostat alloc] initWithDevice:device
@@ -49563,10 +50046,27 @@ class Test_TC_TSTAT_2_2 : public TestCommandBridge {
                                               completionHandler:^(NSError * _Nullable err) {
                                                   NSLog(@"Sets OccupiedCoolingSetpoint to default value Error: %@", err);
 
-                                                  if (err.code == MTRInteractionErrorCodeUnsupportedAttribute) {
-                                                      NextTest();
-                                                      return;
-                                                  }
+                                                  VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+                                                  NextTest();
+                                              }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestSetsOccupiedHeatingSetpointToDefaultValue_93()
+    {
+        MTRBaseDevice * device = GetDevice("alpha");
+        MTRBaseClusterThermostat * cluster = [[MTRBaseClusterThermostat alloc] initWithDevice:device
+                                                                                     endpoint:1
+                                                                                        queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        id occupiedHeatingSetpointArgument;
+        occupiedHeatingSetpointArgument = [NSNumber numberWithShort:2000];
+        [cluster writeAttributeOccupiedHeatingSetpointWithValue:occupiedHeatingSetpointArgument
+                                              completionHandler:^(NSError * _Nullable err) {
+                                                  NSLog(@"Sets OccupiedHeatingSetpoint to default value Error: %@", err);
 
                                                   VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -49576,7 +50076,7 @@ class Test_TC_TSTAT_2_2 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestSendsSetpointRaiseCommand_71()
+    CHIP_ERROR TestSendsSetpointRaiseCommandHeatCool_94()
     {
         MTRBaseDevice * device = GetDevice("alpha");
         MTRBaseClusterThermostat * cluster = [[MTRBaseClusterThermostat alloc] initWithDevice:device
@@ -49589,7 +50089,7 @@ class Test_TC_TSTAT_2_2 : public TestCommandBridge {
         params.amount = [NSNumber numberWithChar:-30];
         [cluster setpointRaiseLowerWithParams:params
                             completionHandler:^(NSError * _Nullable err) {
-                                NSLog(@"Sends SetpointRaise Command Error: %@", err);
+                                NSLog(@"Sends SetpointRaise Command Heat & Cool Error: %@", err);
 
                                 VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -49599,7 +50099,7 @@ class Test_TC_TSTAT_2_2 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadsBackOccupiedCoolingSetpointToConfirmTheSuccessOfTheWrite_72()
+    CHIP_ERROR TestReadsBackOccupiedCoolingSetpointToConfirmTheSuccessOfTheWrite_95()
     {
         MTRBaseDevice * device = GetDevice("alpha");
         MTRBaseClusterThermostat * cluster = [[MTRBaseClusterThermostat alloc] initWithDevice:device
@@ -49610,16 +50110,11 @@ class Test_TC_TSTAT_2_2 : public TestCommandBridge {
         [cluster readAttributeOccupiedCoolingSetpointWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
             NSLog(@"Reads back OccupiedCoolingSetpoint to confirm the success of the write Error: %@", err);
 
-            if (err.code == MTRInteractionErrorCodeUnsupportedAttribute) {
-                NextTest();
-                return;
-            }
-
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             {
                 id actualValue = value;
-                VerifyOrReturn(CheckValue("OccupiedCoolingSetpoint", actualValue, -30));
+                VerifyOrReturn(CheckValue("OccupiedCoolingSetpoint", actualValue, 2300));
             }
 
             NextTest();
@@ -49628,7 +50123,7 @@ class Test_TC_TSTAT_2_2 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadsBackOccupiedHeatingSetpointToConfirmTheSuccessOfTheWrite_73()
+    CHIP_ERROR TestReadsBackOccupiedHeatingSetpointToConfirmTheSuccessOfTheWrite_96()
     {
         MTRBaseDevice * device = GetDevice("alpha");
         MTRBaseClusterThermostat * cluster = [[MTRBaseClusterThermostat alloc] initWithDevice:device
@@ -49639,16 +50134,11 @@ class Test_TC_TSTAT_2_2 : public TestCommandBridge {
         [cluster readAttributeOccupiedHeatingSetpointWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
             NSLog(@"Reads back OccupiedHeatingSetpoint to confirm the success of the write Error: %@", err);
 
-            if (err.code == MTRInteractionErrorCodeUnsupportedAttribute) {
-                NextTest();
-                return;
-            }
-
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             {
                 id actualValue = value;
-                VerifyOrReturn(CheckValue("OccupiedHeatingSetpoint", actualValue, -30));
+                VerifyOrReturn(CheckValue("OccupiedHeatingSetpoint", actualValue, 1700));
             }
 
             NextTest();
@@ -49657,7 +50147,7 @@ class Test_TC_TSTAT_2_2 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestSetsOccupiedCoolingSetpointToDefaultValue_74()
+    CHIP_ERROR TestSetsOccupiedCoolingSetpointToDefaultValue_97()
     {
         MTRBaseDevice * device = GetDevice("alpha");
         MTRBaseClusterThermostat * cluster = [[MTRBaseClusterThermostat alloc] initWithDevice:device
@@ -49671,10 +50161,27 @@ class Test_TC_TSTAT_2_2 : public TestCommandBridge {
                                               completionHandler:^(NSError * _Nullable err) {
                                                   NSLog(@"Sets OccupiedCoolingSetpoint to default value Error: %@", err);
 
-                                                  if (err.code == MTRInteractionErrorCodeUnsupportedAttribute) {
-                                                      NextTest();
-                                                      return;
-                                                  }
+                                                  VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+                                                  NextTest();
+                                              }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestSetsOccupiedHeatingSetpointToDefaultValue_98()
+    {
+        MTRBaseDevice * device = GetDevice("alpha");
+        MTRBaseClusterThermostat * cluster = [[MTRBaseClusterThermostat alloc] initWithDevice:device
+                                                                                     endpoint:1
+                                                                                        queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        id occupiedHeatingSetpointArgument;
+        occupiedHeatingSetpointArgument = [NSNumber numberWithShort:2000];
+        [cluster writeAttributeOccupiedHeatingSetpointWithValue:occupiedHeatingSetpointArgument
+                                              completionHandler:^(NSError * _Nullable err) {
+                                                  NSLog(@"Sets OccupiedHeatingSetpoint to default value Error: %@", err);
 
                                                   VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -49684,7 +50191,7 @@ class Test_TC_TSTAT_2_2 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestSendsSetpointRaiseCommand_75()
+    CHIP_ERROR TestSendsSetpointRaiseCommandHeatCool_99()
     {
         MTRBaseDevice * device = GetDevice("alpha");
         MTRBaseClusterThermostat * cluster = [[MTRBaseClusterThermostat alloc] initWithDevice:device
@@ -49697,7 +50204,7 @@ class Test_TC_TSTAT_2_2 : public TestCommandBridge {
         params.amount = [NSNumber numberWithChar:30];
         [cluster setpointRaiseLowerWithParams:params
                             completionHandler:^(NSError * _Nullable err) {
-                                NSLog(@"Sends SetpointRaise Command Error: %@", err);
+                                NSLog(@"Sends SetpointRaise Command Heat & Cool Error: %@", err);
 
                                 VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -49707,7 +50214,7 @@ class Test_TC_TSTAT_2_2 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadsBackOccupiedCoolingSetpointToConfirmTheSuccessOfTheWrite_76()
+    CHIP_ERROR TestReadsBackOccupiedCoolingSetpointToConfirmTheSuccessOfTheWrite_100()
     {
         MTRBaseDevice * device = GetDevice("alpha");
         MTRBaseClusterThermostat * cluster = [[MTRBaseClusterThermostat alloc] initWithDevice:device
@@ -49718,16 +50225,11 @@ class Test_TC_TSTAT_2_2 : public TestCommandBridge {
         [cluster readAttributeOccupiedCoolingSetpointWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
             NSLog(@"Reads back OccupiedCoolingSetpoint to confirm the success of the write Error: %@", err);
 
-            if (err.code == MTRInteractionErrorCodeUnsupportedAttribute) {
-                NextTest();
-                return;
-            }
-
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             {
                 id actualValue = value;
-                VerifyOrReturn(CheckValue("OccupiedCoolingSetpoint", actualValue, 30));
+                VerifyOrReturn(CheckValue("OccupiedCoolingSetpoint", actualValue, 2900));
             }
 
             NextTest();
@@ -49736,7 +50238,7 @@ class Test_TC_TSTAT_2_2 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadsBackOccupiedHeatingSetpointToConfirmTheSuccessOfTheWrite_77()
+    CHIP_ERROR TestReadsBackOccupiedHeatingSetpointToConfirmTheSuccessOfTheWrite_101()
     {
         MTRBaseDevice * device = GetDevice("alpha");
         MTRBaseClusterThermostat * cluster = [[MTRBaseClusterThermostat alloc] initWithDevice:device
@@ -49747,16 +50249,11 @@ class Test_TC_TSTAT_2_2 : public TestCommandBridge {
         [cluster readAttributeOccupiedHeatingSetpointWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
             NSLog(@"Reads back OccupiedHeatingSetpoint to confirm the success of the write Error: %@", err);
 
-            if (err.code == MTRInteractionErrorCodeUnsupportedAttribute) {
-                NextTest();
-                return;
-            }
-
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             {
                 id actualValue = value;
-                VerifyOrReturn(CheckValue("OccupiedHeatingSetpoint", actualValue, 30));
+                VerifyOrReturn(CheckValue("OccupiedHeatingSetpoint", actualValue, 2300));
             }
 
             NextTest();