From 0a423ca705b55969da922578a2e77e64af17aa20 Mon Sep 17 00:00:00 2001
From: Vivien Nicolas <vnicolas@apple.com>
Date: Wed, 7 Dec 2022 16:07:41 +0100
Subject: [PATCH] [YAML] Add some missing steps writing back the value to
 defaults (#23884)

* [TestConstraints.yaml] Write back the default value for BITMAP32 as it is not convenient to run the script multiple times without it

* [TestCluster.yaml] Write back the default value for LIST_STRUCT_OCTET_STRING as it is not convenient to run the script multiple times without it

* Update generated tests code
---
 src/app/tests/suites/TestCluster.yaml         |   12 +
 src/app/tests/suites/TestConstraints.yaml     |    6 +
 .../chip-tool/zap-generated/test/Commands.h   | 2275 ++++++++-------
 .../zap-generated/test/Commands.h             | 2556 +++++++++--------
 4 files changed, 2511 insertions(+), 2338 deletions(-)

diff --git a/src/app/tests/suites/TestCluster.yaml b/src/app/tests/suites/TestCluster.yaml
index ddf4eb1362bc28..ead88b5677c0af 100644
--- a/src/app/tests/suites/TestCluster.yaml
+++ b/src/app/tests/suites/TestCluster.yaml
@@ -914,6 +914,18 @@ tests:
                   "0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef",
               ]
 
+    - label: "Write attribute LIST_LONG_OCTET_STRING (for chunked write)"
+      command: "writeAttribute"
+      attribute: "list_long_octet_string"
+      arguments:
+          value:
+              [
+                  "0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef",
+                  "0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef",
+                  "0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef",
+                  "0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef",
+              ]
+
     # Tests for Epoch Microseconds
 
     - label: "Read attribute EPOCH_US Default Value"
diff --git a/src/app/tests/suites/TestConstraints.yaml b/src/app/tests/suites/TestConstraints.yaml
index f96c8d1d2a513c..92e74944420980 100644
--- a/src/app/tests/suites/TestConstraints.yaml
+++ b/src/app/tests/suites/TestConstraints.yaml
@@ -112,6 +112,12 @@ tests:
           constraints:
               hasMasksSet: [0x01, 0x04] # [MaskVal1, MaskVal3]
 
+    - label: "Write attribute BITMAP32 Back to Default Value"
+      command: "writeAttribute"
+      attribute: "bitmap32"
+      arguments:
+          value: 0
+
     # Tests for INT32U attribute
 
     - label: "Write attribute INT32U Value"
diff --git a/zzz_generated/chip-tool/zap-generated/test/Commands.h b/zzz_generated/chip-tool/zap-generated/test/Commands.h
index c3d4aa04ac2527..bd38690509ec92 100644
--- a/zzz_generated/chip-tool/zap-generated/test/Commands.h
+++ b/zzz_generated/chip-tool/zap-generated/test/Commands.h
@@ -50308,7 +50308,7 @@ class TestCASERecoverySuite : public TestCommand
 class TestClusterSuite : public TestCommand
 {
 public:
-    TestClusterSuite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("TestCluster", 490, credsIssuerConfig)
+    TestClusterSuite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("TestCluster", 491, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -51274,6 +51274,9 @@ class TestClusterSuite : public TestCommand
             }
             break;
         case 136:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 137:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 uint64_t value;
@@ -51281,10 +51284,10 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("epochUs", value, 0ULL));
             }
             break;
-        case 137:
+        case 138:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 138:
+        case 139:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 uint64_t value;
@@ -51292,10 +51295,10 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("epochUs", value, 18446744073709551615ULL));
             }
             break;
-        case 139:
+        case 140:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 140:
+        case 141:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 uint64_t value;
@@ -51303,7 +51306,7 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("epochUs", value, 0ULL));
             }
             break;
-        case 141:
+        case 142:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 uint32_t value;
@@ -51311,10 +51314,10 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("epochS", value, 0UL));
             }
             break;
-        case 142:
+        case 143:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 143:
+        case 144:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 uint32_t value;
@@ -51322,10 +51325,10 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("epochS", value, 4294967295UL));
             }
             break;
-        case 144:
+        case 145:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 145:
+        case 146:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 uint32_t value;
@@ -51333,7 +51336,7 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("epochS", value, 0UL));
             }
             break;
-        case 146:
+        case 147:
             if (IsUnsupported(status.mStatus))
             {
                 return;
@@ -51345,20 +51348,20 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("unsupported", value, 0));
             }
             break;
-        case 147:
+        case 148:
             if (IsUnsupported(status.mStatus))
             {
                 return;
             }
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 148:
+        case 149:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_UNSUPPORTED_ENDPOINT));
             break;
-        case 149:
+        case 150:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_UNSUPPORTED_CLUSTER));
             break;
-        case 150:
+        case 151:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::VendorId value;
@@ -51366,10 +51369,10 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("vendorId", value, 0U));
             }
             break;
-        case 151:
+        case 152:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 152:
+        case 153:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::VendorId value;
@@ -51377,10 +51380,10 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("vendorId", value, 17U));
             }
             break;
-        case 153:
+        case 154:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 154:
+        case 155:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::Clusters::UnitTesting::Commands::TestEnumsResponse::DecodableType value;
@@ -51389,7 +51392,7 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("arg2", value.arg2, 1U));
             }
             break;
-        case 155:
+        case 156:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::Clusters::UnitTesting::Commands::TestEnumsResponse::DecodableType value;
@@ -51398,7 +51401,7 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("arg2", value.arg2, 4U));
             }
             break;
-        case 156:
+        case 157:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::Clusters::UnitTesting::Commands::BooleanResponse::DecodableType value;
@@ -51406,7 +51409,7 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("value", value.value, true));
             }
             break;
-        case 157:
+        case 158:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::Clusters::UnitTesting::Commands::BooleanResponse::DecodableType value;
@@ -51414,7 +51417,7 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("value", value.value, false));
             }
             break;
-        case 158:
+        case 159:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::Clusters::UnitTesting::Commands::BooleanResponse::DecodableType value;
@@ -51422,7 +51425,7 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("value", value.value, true));
             }
             break;
-        case 159:
+        case 160:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::Clusters::UnitTesting::Commands::BooleanResponse::DecodableType value;
@@ -51430,7 +51433,7 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("value", value.value, false));
             }
             break;
-        case 160:
+        case 161:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::Clusters::UnitTesting::Commands::BooleanResponse::DecodableType value;
@@ -51438,7 +51441,7 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("value", value.value, true));
             }
             break;
-        case 161:
+        case 162:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::Clusters::UnitTesting::Commands::BooleanResponse::DecodableType value;
@@ -51446,7 +51449,7 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("value", value.value, false));
             }
             break;
-        case 162:
+        case 163:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::Clusters::UnitTesting::Commands::SimpleStructResponse::DecodableType value;
@@ -51462,7 +51465,7 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("arg1.h", value.arg1.h, 0.1));
             }
             break;
-        case 163:
+        case 164:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::Clusters::UnitTesting::Commands::BooleanResponse::DecodableType value;
@@ -51470,7 +51473,7 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("value", value.value, true));
             }
             break;
-        case 164:
+        case 165:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::Clusters::UnitTesting::Commands::BooleanResponse::DecodableType value;
@@ -51478,7 +51481,7 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("value", value.value, false));
             }
             break;
-        case 165:
+        case 166:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::Clusters::UnitTesting::Commands::TestListInt8UReverseResponse::DecodableType value;
@@ -51507,7 +51510,7 @@ class TestClusterSuite : public TestCommand
                 }
             }
             break;
-        case 166:
+        case 167:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::Clusters::UnitTesting::Commands::TestListInt8UReverseResponse::DecodableType value;
@@ -51518,7 +51521,7 @@ class TestClusterSuite : public TestCommand
                 }
             }
             break;
-        case 167:
+        case 168:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::Clusters::UnitTesting::Commands::BooleanResponse::DecodableType value;
@@ -51526,7 +51529,7 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("value", value.value, true));
             }
             break;
-        case 168:
+        case 169:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::Clusters::UnitTesting::Commands::BooleanResponse::DecodableType value;
@@ -51534,7 +51537,7 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("value", value.value, false));
             }
             break;
-        case 169:
+        case 170:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::Clusters::UnitTesting::Commands::BooleanResponse::DecodableType value;
@@ -51542,7 +51545,7 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("value", value.value, true));
             }
             break;
-        case 170:
+        case 171:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::Clusters::UnitTesting::Commands::BooleanResponse::DecodableType value;
@@ -51550,10 +51553,10 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("value", value.value, false));
             }
             break;
-        case 171:
+        case 172:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 172:
+        case 173:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::DecodableList<uint8_t> value;
@@ -51572,10 +51575,10 @@ class TestClusterSuite : public TestCommand
                 }
             }
             break;
-        case 173:
+        case 174:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 174:
+        case 175:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::DecodableList<chip::ByteSpan> value;
@@ -51598,10 +51601,10 @@ class TestClusterSuite : public TestCommand
                 }
             }
             break;
-        case 175:
+        case 176:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 176:
+        case 177:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::DecodableList<chip::app::Clusters::UnitTesting::Structs::TestListStructOctet::DecodableType>
@@ -51629,7 +51632,7 @@ class TestClusterSuite : public TestCommand
                 }
             }
             break;
-        case 177:
+        case 178:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::Clusters::UnitTesting::Commands::TestNullableOptionalResponse::DecodableType value;
@@ -51644,7 +51647,7 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("originalValue.Value().Value()", value.originalValue.Value().Value(), 5U));
             }
             break;
-        case 178:
+        case 179:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::Clusters::UnitTesting::Commands::TestNullableOptionalResponse::DecodableType value;
@@ -51652,7 +51655,7 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("wasPresent", value.wasPresent, false));
             }
             break;
-        case 179:
+        case 180:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::DecodableList<
@@ -51673,10 +51676,10 @@ class TestClusterSuite : public TestCommand
                 }
             }
             break;
-        case 180:
+        case 181:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 181:
+        case 182:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::DecodableList<
@@ -51710,10 +51713,10 @@ class TestClusterSuite : public TestCommand
                 }
             }
             break;
-        case 182:
+        case 183:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 183:
+        case 184:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<bool> value;
@@ -51722,10 +51725,10 @@ class TestClusterSuite : public TestCommand
                 booValueNull = value;
             }
             break;
-        case 184:
+        case 185:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 185:
+        case 186:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<bool> value;
@@ -51734,7 +51737,7 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("nullableBoolean.Value()", value.Value(), true));
             }
             break;
-        case 186:
+        case 187:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<bool> value;
@@ -51742,10 +51745,10 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckConstraintNotValue("value", value, booValueNull));
             }
             break;
-        case 187:
+        case 188:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 188:
+        case 189:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<chip::BitMask<chip::app::Clusters::UnitTesting::Bitmap8MaskMap>> value;
@@ -51754,10 +51757,10 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("nullableBitmap8.Value()", value.Value(), 254U));
             }
             break;
-        case 189:
+        case 190:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             break;
-        case 190:
+        case 191:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<chip::BitMask<chip::app::Clusters::UnitTesting::Bitmap8MaskMap>> value;
@@ -51767,10 +51770,10 @@ class TestClusterSuite : public TestCommand
                 nullableValue254 = value;
             }
             break;
-        case 191:
+        case 192:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 192:
+        case 193:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<chip::BitMask<chip::app::Clusters::UnitTesting::Bitmap8MaskMap>> value;
@@ -51778,7 +51781,7 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValueNull("nullableBitmap8", value));
             }
             break;
-        case 193:
+        case 194:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<chip::BitMask<chip::app::Clusters::UnitTesting::Bitmap8MaskMap>> value;
@@ -51786,10 +51789,10 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckConstraintNotValue("value", value, nullableValue254));
             }
             break;
-        case 194:
+        case 195:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 195:
+        case 196:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<chip::BitMask<chip::app::Clusters::UnitTesting::Bitmap16MaskMap>> value;
@@ -51798,10 +51801,10 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("nullableBitmap16.Value()", value.Value(), 65534U));
             }
             break;
-        case 196:
+        case 197:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             break;
-        case 197:
+        case 198:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<chip::BitMask<chip::app::Clusters::UnitTesting::Bitmap16MaskMap>> value;
@@ -51810,10 +51813,10 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("nullableBitmap16.Value()", value.Value(), 65534U));
             }
             break;
-        case 198:
+        case 199:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 199:
+        case 200:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<chip::BitMask<chip::app::Clusters::UnitTesting::Bitmap16MaskMap>> value;
@@ -51821,10 +51824,10 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValueNull("nullableBitmap16", value));
             }
             break;
-        case 200:
+        case 201:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 201:
+        case 202:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<chip::BitMask<chip::app::Clusters::UnitTesting::Bitmap32MaskMap>> value;
@@ -51833,10 +51836,10 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("nullableBitmap32.Value()", value.Value(), 4294967294UL));
             }
             break;
-        case 202:
+        case 203:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             break;
-        case 203:
+        case 204:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<chip::BitMask<chip::app::Clusters::UnitTesting::Bitmap32MaskMap>> value;
@@ -51845,10 +51848,10 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("nullableBitmap32.Value()", value.Value(), 4294967294UL));
             }
             break;
-        case 204:
+        case 205:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 205:
+        case 206:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<chip::BitMask<chip::app::Clusters::UnitTesting::Bitmap32MaskMap>> value;
@@ -51856,10 +51859,10 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValueNull("nullableBitmap32", value));
             }
             break;
-        case 206:
+        case 207:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 207:
+        case 208:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<chip::BitMask<chip::app::Clusters::UnitTesting::Bitmap64MaskMap>> value;
@@ -51868,10 +51871,10 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("nullableBitmap64.Value()", value.Value(), 18446744073709551614ULL));
             }
             break;
-        case 208:
+        case 209:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             break;
-        case 209:
+        case 210:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<chip::BitMask<chip::app::Clusters::UnitTesting::Bitmap64MaskMap>> value;
@@ -51880,10 +51883,10 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("nullableBitmap64.Value()", value.Value(), 18446744073709551614ULL));
             }
             break;
-        case 210:
+        case 211:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 211:
+        case 212:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<chip::BitMask<chip::app::Clusters::UnitTesting::Bitmap64MaskMap>> value;
@@ -51891,10 +51894,10 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValueNull("nullableBitmap64", value));
             }
             break;
-        case 212:
+        case 213:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 213:
+        case 214:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<uint8_t> value;
@@ -51903,10 +51906,10 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("nullableInt8u.Value()", value.Value(), 0U));
             }
             break;
-        case 214:
+        case 215:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 215:
+        case 216:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<uint8_t> value;
@@ -51915,10 +51918,10 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("nullableInt8u.Value()", value.Value(), 254U));
             }
             break;
-        case 216:
+        case 217:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             break;
-        case 217:
+        case 218:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<uint8_t> value;
@@ -51927,7 +51930,7 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("nullableInt8u.Value()", value.Value(), 254U));
             }
             break;
-        case 218:
+        case 219:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<uint8_t> value;
@@ -51935,10 +51938,10 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValueNonNull("value", value));
             }
             break;
-        case 219:
+        case 220:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 220:
+        case 221:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<uint8_t> value;
@@ -51946,7 +51949,7 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValueNull("nullableInt8u", value));
             }
             break;
-        case 221:
+        case 222:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<uint8_t> value;
@@ -51955,7 +51958,7 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckConstraintMaxValue("value", value, 254U));
             }
             break;
-        case 222:
+        case 223:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<uint8_t> value;
@@ -51963,10 +51966,10 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckConstraintNotValue("value", value, 254U));
             }
             break;
-        case 223:
+        case 224:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 224:
+        case 225:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<uint8_t> value;
@@ -51975,7 +51978,7 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckConstraintMaxValue("value", value, 254U));
             }
             break;
-        case 225:
+        case 226:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<uint8_t> value;
@@ -51983,10 +51986,10 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckConstraintNotValue("value", value, 129U));
             }
             break;
-        case 226:
+        case 227:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 227:
+        case 228:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<uint16_t> value;
@@ -51995,10 +51998,10 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("nullableInt16u.Value()", value.Value(), 0U));
             }
             break;
-        case 228:
+        case 229:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 229:
+        case 230:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<uint16_t> value;
@@ -52007,10 +52010,10 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("nullableInt16u.Value()", value.Value(), 65534U));
             }
             break;
-        case 230:
+        case 231:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             break;
-        case 231:
+        case 232:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<uint16_t> value;
@@ -52019,10 +52022,10 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("nullableInt16u.Value()", value.Value(), 65534U));
             }
             break;
-        case 232:
+        case 233:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 233:
+        case 234:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<uint16_t> value;
@@ -52030,7 +52033,7 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValueNull("nullableInt16u", value));
             }
             break;
-        case 234:
+        case 235:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<uint16_t> value;
@@ -52039,7 +52042,7 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckConstraintMaxValue("value", value, 65534U));
             }
             break;
-        case 235:
+        case 236:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<uint16_t> value;
@@ -52047,10 +52050,10 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckConstraintNotValue("value", value, 65534U));
             }
             break;
-        case 236:
+        case 237:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 237:
+        case 238:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<uint16_t> value;
@@ -52059,7 +52062,7 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckConstraintMaxValue("value", value, 65534U));
             }
             break;
-        case 238:
+        case 239:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<uint16_t> value;
@@ -52067,10 +52070,10 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckConstraintNotValue("value", value, 32001U));
             }
             break;
-        case 239:
+        case 240:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 240:
+        case 241:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<uint32_t> value;
@@ -52079,10 +52082,10 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("nullableInt32u.Value()", value.Value(), 0UL));
             }
             break;
-        case 241:
+        case 242:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 242:
+        case 243:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<uint32_t> value;
@@ -52091,10 +52094,10 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("nullableInt32u.Value()", value.Value(), 4294967294UL));
             }
             break;
-        case 243:
+        case 244:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             break;
-        case 244:
+        case 245:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<uint32_t> value;
@@ -52103,10 +52106,10 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("nullableInt32u.Value()", value.Value(), 4294967294UL));
             }
             break;
-        case 245:
+        case 246:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 246:
+        case 247:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<uint32_t> value;
@@ -52114,7 +52117,7 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValueNull("nullableInt32u", value));
             }
             break;
-        case 247:
+        case 248:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<uint32_t> value;
@@ -52123,7 +52126,7 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckConstraintMaxValue("value", value, 4294967294UL));
             }
             break;
-        case 248:
+        case 249:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<uint32_t> value;
@@ -52131,10 +52134,10 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckConstraintNotValue("value", value, 4294967294UL));
             }
             break;
-        case 249:
+        case 250:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 250:
+        case 251:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<uint32_t> value;
@@ -52143,7 +52146,7 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckConstraintMaxValue("value", value, 4294967294UL));
             }
             break;
-        case 251:
+        case 252:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<uint32_t> value;
@@ -52151,10 +52154,10 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckConstraintNotValue("value", value, 2147483648UL));
             }
             break;
-        case 252:
+        case 253:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 253:
+        case 254:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<uint64_t> value;
@@ -52163,10 +52166,10 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("nullableInt64u.Value()", value.Value(), 0ULL));
             }
             break;
-        case 254:
+        case 255:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 255:
+        case 256:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<uint64_t> value;
@@ -52175,10 +52178,10 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("nullableInt64u.Value()", value.Value(), 18446744073709551614ULL));
             }
             break;
-        case 256:
+        case 257:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             break;
-        case 257:
+        case 258:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<uint64_t> value;
@@ -52187,10 +52190,10 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("nullableInt64u.Value()", value.Value(), 18446744073709551614ULL));
             }
             break;
-        case 258:
+        case 259:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 259:
+        case 260:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<uint64_t> value;
@@ -52198,7 +52201,7 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValueNull("nullableInt64u", value));
             }
             break;
-        case 260:
+        case 261:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<uint64_t> value;
@@ -52207,7 +52210,7 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckConstraintMaxValue("value", value, 18446744073709551614ULL));
             }
             break;
-        case 261:
+        case 262:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<uint64_t> value;
@@ -52215,10 +52218,10 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckConstraintNotValue("value", value, 18446744073709551614ULL));
             }
             break;
-        case 262:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
         case 263:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 264:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<uint64_t> value;
@@ -52227,7 +52230,7 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckConstraintMaxValue("value", value, 18446744073709551614ULL));
             }
             break;
-        case 264:
+        case 265:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<uint64_t> value;
@@ -52235,10 +52238,10 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckConstraintNotValue("value", value, 18000000000000000001ULL));
             }
             break;
-        case 265:
+        case 266:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 266:
+        case 267:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<int8_t> value;
@@ -52247,10 +52250,10 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("nullableInt8s.Value()", value.Value(), -127));
             }
             break;
-        case 267:
+        case 268:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             break;
-        case 268:
+        case 269:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<int8_t> value;
@@ -52259,10 +52262,10 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("nullableInt8s.Value()", value.Value(), -127));
             }
             break;
-        case 269:
+        case 270:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 270:
+        case 271:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<int8_t> value;
@@ -52270,7 +52273,7 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValueNull("nullableInt8s", value));
             }
             break;
-        case 271:
+        case 272:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<int8_t> value;
@@ -52279,7 +52282,7 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckConstraintMaxValue("value", value, 127));
             }
             break;
-        case 272:
+        case 273:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<int8_t> value;
@@ -52287,10 +52290,10 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckConstraintNotValue("value", value, -127));
             }
             break;
-        case 273:
+        case 274:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 274:
+        case 275:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<int8_t> value;
@@ -52299,7 +52302,7 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckConstraintMaxValue("value", value, 127));
             }
             break;
-        case 275:
+        case 276:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<int8_t> value;
@@ -52307,10 +52310,10 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckConstraintNotValue("value", value, -126));
             }
             break;
-        case 276:
+        case 277:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 277:
+        case 278:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<int16_t> value;
@@ -52319,10 +52322,10 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("nullableInt16s.Value()", value.Value(), -32767));
             }
             break;
-        case 278:
+        case 279:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             break;
-        case 279:
+        case 280:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<int16_t> value;
@@ -52331,10 +52334,10 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("nullableInt16s.Value()", value.Value(), -32767));
             }
             break;
-        case 280:
+        case 281:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 281:
+        case 282:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<int16_t> value;
@@ -52342,7 +52345,7 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValueNull("nullableInt16s", value));
             }
             break;
-        case 282:
+        case 283:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<int16_t> value;
@@ -52351,7 +52354,7 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckConstraintMaxValue("value", value, 32767));
             }
             break;
-        case 283:
+        case 284:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<int16_t> value;
@@ -52359,10 +52362,10 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckConstraintNotValue("value", value, -32767));
             }
             break;
-        case 284:
+        case 285:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 285:
+        case 286:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<int16_t> value;
@@ -52371,7 +52374,7 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckConstraintMaxValue("value", value, 32767));
             }
             break;
-        case 286:
+        case 287:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<int16_t> value;
@@ -52379,10 +52382,10 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckConstraintNotValue("value", value, -32766));
             }
             break;
-        case 287:
+        case 288:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 288:
+        case 289:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<int32_t> value;
@@ -52391,10 +52394,10 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("nullableInt32s.Value()", value.Value(), -2147483647L));
             }
             break;
-        case 289:
+        case 290:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             break;
-        case 290:
+        case 291:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<int32_t> value;
@@ -52403,10 +52406,10 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("nullableInt32s.Value()", value.Value(), -2147483647L));
             }
             break;
-        case 291:
+        case 292:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 292:
+        case 293:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<int32_t> value;
@@ -52414,7 +52417,7 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValueNull("nullableInt32s", value));
             }
             break;
-        case 293:
+        case 294:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<int32_t> value;
@@ -52423,7 +52426,7 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckConstraintMaxValue("value", value, 2147483647L));
             }
             break;
-        case 294:
+        case 295:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<int32_t> value;
@@ -52431,10 +52434,10 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckConstraintNotValue("value", value, -2147483647L));
             }
             break;
-        case 295:
+        case 296:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 296:
+        case 297:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<int32_t> value;
@@ -52443,7 +52446,7 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckConstraintMaxValue("value", value, 2147483647L));
             }
             break;
-        case 297:
+        case 298:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<int32_t> value;
@@ -52451,10 +52454,10 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckConstraintNotValue("value", value, -2147483646L));
             }
             break;
-        case 298:
+        case 299:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 299:
+        case 300:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<int64_t> value;
@@ -52463,10 +52466,10 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("nullableInt64s.Value()", value.Value(), -9223372036854775807LL));
             }
             break;
-        case 300:
+        case 301:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             break;
-        case 301:
+        case 302:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<int64_t> value;
@@ -52475,10 +52478,10 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("nullableInt64s.Value()", value.Value(), -9223372036854775807LL));
             }
             break;
-        case 302:
+        case 303:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 303:
+        case 304:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<int64_t> value;
@@ -52486,7 +52489,7 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValueNull("nullableInt64s", value));
             }
             break;
-        case 304:
+        case 305:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<int64_t> value;
@@ -52495,7 +52498,7 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckConstraintMaxValue("value", value, 9223372036854775807LL));
             }
             break;
-        case 305:
+        case 306:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<int64_t> value;
@@ -52503,10 +52506,10 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckConstraintNotValue("value", value, -9223372036854775807LL));
             }
             break;
-        case 306:
+        case 307:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 307:
+        case 308:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<int64_t> value;
@@ -52515,7 +52518,7 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckConstraintMaxValue("value", value, 9223372036854775807LL));
             }
             break;
-        case 308:
+        case 309:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<int64_t> value;
@@ -52523,10 +52526,10 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckConstraintNotValue("value", value, -9223372036854775806LL));
             }
             break;
-        case 309:
+        case 310:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 310:
+        case 311:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<float> value;
@@ -52535,10 +52538,10 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("nullableFloatSingle.Value()", value.Value(), 0.1f));
             }
             break;
-        case 311:
+        case 312:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 312:
+        case 313:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<float> value;
@@ -52547,10 +52550,10 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("nullableFloatSingle.Value()", value.Value(), INFINITY));
             }
             break;
-        case 313:
+        case 314:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 314:
+        case 315:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<float> value;
@@ -52559,10 +52562,10 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("nullableFloatSingle.Value()", value.Value(), -INFINITY));
             }
             break;
-        case 315:
+        case 316:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 316:
+        case 317:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<float> value;
@@ -52570,10 +52573,10 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValueNull("nullableFloatSingle", value));
             }
             break;
-        case 317:
+        case 318:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 318:
+        case 319:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<float> value;
@@ -52582,10 +52585,10 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("nullableFloatSingle.Value()", value.Value(), 0.0f));
             }
             break;
-        case 319:
+        case 320:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 320:
+        case 321:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<double> value;
@@ -52594,10 +52597,10 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("nullableFloatDouble.Value()", value.Value(), 0.1234567890123));
             }
             break;
-        case 321:
+        case 322:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 322:
+        case 323:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<double> value;
@@ -52606,10 +52609,10 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("nullableFloatDouble.Value()", value.Value(), INFINITY));
             }
             break;
-        case 323:
+        case 324:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 324:
+        case 325:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<double> value;
@@ -52618,10 +52621,10 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("nullableFloatDouble.Value()", value.Value(), -INFINITY));
             }
             break;
-        case 325:
+        case 326:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 326:
+        case 327:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<double> value;
@@ -52629,10 +52632,10 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValueNull("nullableFloatDouble", value));
             }
             break;
-        case 327:
+        case 328:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 328:
+        case 329:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<double> value;
@@ -52641,10 +52644,10 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("nullableFloatDouble.Value()", value.Value(), 0));
             }
             break;
-        case 329:
+        case 330:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 330:
+        case 331:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<uint8_t> value;
@@ -52653,10 +52656,10 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("nullableEnum8.Value()", value.Value(), 0U));
             }
             break;
-        case 331:
+        case 332:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 332:
+        case 333:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<uint8_t> value;
@@ -52665,10 +52668,10 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("nullableEnum8.Value()", value.Value(), 254U));
             }
             break;
-        case 333:
+        case 334:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             break;
-        case 334:
+        case 335:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<uint8_t> value;
@@ -52677,10 +52680,10 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("nullableEnum8.Value()", value.Value(), 254U));
             }
             break;
-        case 335:
+        case 336:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 336:
+        case 337:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<uint8_t> value;
@@ -52688,10 +52691,10 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValueNull("nullableEnum8", value));
             }
             break;
-        case 337:
+        case 338:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 338:
+        case 339:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<uint16_t> value;
@@ -52700,10 +52703,10 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("nullableEnum16.Value()", value.Value(), 0U));
             }
             break;
-        case 339:
+        case 340:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 340:
+        case 341:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<uint16_t> value;
@@ -52712,10 +52715,10 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("nullableEnum16.Value()", value.Value(), 65534U));
             }
             break;
-        case 341:
+        case 342:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             break;
-        case 342:
+        case 343:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<uint16_t> value;
@@ -52724,10 +52727,10 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("nullableEnum16.Value()", value.Value(), 65534U));
             }
             break;
-        case 343:
+        case 344:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 344:
+        case 345:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<uint16_t> value;
@@ -52735,10 +52738,10 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValueNull("nullableEnum16", value));
             }
             break;
-        case 345:
+        case 346:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 346:
+        case 347:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<chip::app::Clusters::UnitTesting::SimpleEnum> value;
@@ -52747,10 +52750,10 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("nullableEnumAttr.Value()", value.Value(), 0U));
             }
             break;
-        case 347:
+        case 348:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 348:
+        case 349:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<chip::app::Clusters::UnitTesting::SimpleEnum> value;
@@ -52759,10 +52762,10 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("nullableEnumAttr.Value()", value.Value(), 3U));
             }
             break;
-        case 349:
+        case 350:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             break;
-        case 350:
+        case 351:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<chip::app::Clusters::UnitTesting::SimpleEnum> value;
@@ -52772,10 +52775,10 @@ class TestClusterSuite : public TestCommand
                 nullableEnumAttr3 = value;
             }
             break;
-        case 351:
+        case 352:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 352:
+        case 353:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<chip::app::Clusters::UnitTesting::SimpleEnum> value;
@@ -52783,7 +52786,7 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValueNull("nullableEnumAttr", value));
             }
             break;
-        case 353:
+        case 354:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<chip::app::Clusters::UnitTesting::SimpleEnum> value;
@@ -52791,7 +52794,7 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckConstraintNotValue("value", value, nullableEnumAttr3));
             }
             break;
-        case 354:
+        case 355:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<chip::ByteSpan> value;
@@ -52801,10 +52804,10 @@ class TestClusterSuite : public TestCommand
                                                   chip::ByteSpan(chip::Uint8::from_const_char(""), 0)));
             }
             break;
-        case 355:
+        case 356:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 356:
+        case 357:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<chip::ByteSpan> value;
@@ -52828,10 +52831,10 @@ class TestClusterSuite : public TestCommand
                 }
             }
             break;
-        case 357:
+        case 358:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 358:
+        case 359:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<chip::ByteSpan> value;
@@ -52839,10 +52842,10 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValueNull("nullableOctetString", value));
             }
             break;
-        case 359:
+        case 360:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 360:
+        case 361:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<chip::ByteSpan> value;
@@ -52852,7 +52855,7 @@ class TestClusterSuite : public TestCommand
                                                   chip::ByteSpan(chip::Uint8::from_const_char(""), 0)));
             }
             break;
-        case 361:
+        case 362:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<chip::ByteSpan> value;
@@ -52860,7 +52863,7 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckConstraintNotValue("value", value, nullableOctetStrTestValue));
             }
             break;
-        case 362:
+        case 363:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<chip::CharSpan> value;
@@ -52869,10 +52872,10 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValueAsString("nullableCharString.Value()", value.Value(), chip::CharSpan("", 0)));
             }
             break;
-        case 363:
+        case 364:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 364:
+        case 365:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<chip::CharSpan> value;
@@ -52895,7 +52898,7 @@ class TestClusterSuite : public TestCommand
                 }
             }
             break;
-        case 365:
+        case 366:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<chip::CharSpan> value;
@@ -52911,10 +52914,10 @@ class TestClusterSuite : public TestCommand
                 }
             }
             break;
-        case 366:
+        case 367:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 367:
+        case 368:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<chip::CharSpan> value;
@@ -52922,10 +52925,10 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValueNull("nullableCharString", value));
             }
             break;
-        case 368:
+        case 369:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 369:
+        case 370:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<chip::CharSpan> value;
@@ -52934,7 +52937,7 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValueAsString("nullableCharString.Value()", value.Value(), chip::CharSpan("", 0)));
             }
             break;
-        case 370:
+        case 371:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<chip::CharSpan> value;
@@ -52942,19 +52945,19 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckConstraintNotValue("value", value, nullableCharStringSave));
             }
             break;
-        case 371:
+        case 372:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_UNSUPPORTED_ENDPOINT));
             break;
-        case 372:
+        case 373:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_UNSUPPORTED_CLUSTER));
             break;
-        case 373:
+        case 374:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_INVALID_VALUE));
             break;
-        case 374:
+        case 375:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 375:
+        case 376:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::DecodableList<uint8_t> value;
@@ -52973,10 +52976,10 @@ class TestClusterSuite : public TestCommand
                 }
             }
             break;
-        case 376:
+        case 377:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 377:
+        case 378:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::DecodableList<uint8_t> value;
@@ -52996,7 +52999,7 @@ class TestClusterSuite : public TestCommand
             }
             shouldContinue = true;
             break;
-        case 378:
+        case 379:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 uint8_t value;
@@ -53004,9 +53007,6 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("rangeRestrictedInt8u", value, 70U));
             }
             break;
-        case 379:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
-            break;
         case 380:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             break;
@@ -53017,6 +53017,9 @@ class TestClusterSuite : public TestCommand
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             break;
         case 383:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
+            break;
+        case 384:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 uint8_t value;
@@ -53024,10 +53027,10 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("rangeRestrictedInt8u", value, 70U));
             }
             break;
-        case 384:
+        case 385:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 385:
+        case 386:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 uint8_t value;
@@ -53035,10 +53038,10 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("rangeRestrictedInt8u", value, 20U));
             }
             break;
-        case 386:
+        case 387:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 387:
+        case 388:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 uint8_t value;
@@ -53046,10 +53049,10 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("rangeRestrictedInt8u", value, 100U));
             }
             break;
-        case 388:
+        case 389:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 389:
+        case 390:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 uint8_t value;
@@ -53057,7 +53060,7 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("rangeRestrictedInt8u", value, 50U));
             }
             break;
-        case 390:
+        case 391:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 uint16_t value;
@@ -53065,9 +53068,6 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("rangeRestrictedInt16u", value, 200U));
             }
             break;
-        case 391:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
-            break;
         case 392:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             break;
@@ -53078,6 +53078,9 @@ class TestClusterSuite : public TestCommand
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             break;
         case 395:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
+            break;
+        case 396:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 uint16_t value;
@@ -53085,10 +53088,10 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("rangeRestrictedInt16u", value, 200U));
             }
             break;
-        case 396:
+        case 397:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 397:
+        case 398:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 uint16_t value;
@@ -53096,10 +53099,10 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("rangeRestrictedInt16u", value, 100U));
             }
             break;
-        case 398:
+        case 399:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 399:
+        case 400:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 uint16_t value;
@@ -53107,10 +53110,10 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("rangeRestrictedInt16u", value, 1000U));
             }
             break;
-        case 400:
+        case 401:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 401:
+        case 402:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 uint16_t value;
@@ -53118,7 +53121,7 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("rangeRestrictedInt16u", value, 500U));
             }
             break;
-        case 402:
+        case 403:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 int8_t value;
@@ -53126,9 +53129,6 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("rangeRestrictedInt8s", value, -20));
             }
             break;
-        case 403:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
-            break;
         case 404:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             break;
@@ -53139,6 +53139,9 @@ class TestClusterSuite : public TestCommand
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             break;
         case 407:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
+            break;
+        case 408:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 int8_t value;
@@ -53146,10 +53149,10 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("rangeRestrictedInt8s", value, -20));
             }
             break;
-        case 408:
+        case 409:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 409:
+        case 410:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 int8_t value;
@@ -53157,10 +53160,10 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("rangeRestrictedInt8s", value, -40));
             }
             break;
-        case 410:
+        case 411:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 411:
+        case 412:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 int8_t value;
@@ -53168,10 +53171,10 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("rangeRestrictedInt8s", value, 50));
             }
             break;
-        case 412:
+        case 413:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 413:
+        case 414:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 int8_t value;
@@ -53179,7 +53182,7 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("rangeRestrictedInt8s", value, 6));
             }
             break;
-        case 414:
+        case 415:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 int16_t value;
@@ -53187,9 +53190,6 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("rangeRestrictedInt16s", value, -100));
             }
             break;
-        case 415:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
-            break;
         case 416:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             break;
@@ -53200,6 +53200,9 @@ class TestClusterSuite : public TestCommand
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             break;
         case 419:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
+            break;
+        case 420:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 int16_t value;
@@ -53207,10 +53210,10 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("rangeRestrictedInt16s", value, -100));
             }
             break;
-        case 420:
+        case 421:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 421:
+        case 422:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 int16_t value;
@@ -53218,10 +53221,10 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("rangeRestrictedInt16s", value, -150));
             }
             break;
-        case 422:
+        case 423:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 423:
+        case 424:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 int16_t value;
@@ -53229,10 +53232,10 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("rangeRestrictedInt16s", value, 200));
             }
             break;
-        case 424:
+        case 425:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 425:
+        case 426:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 int16_t value;
@@ -53240,7 +53243,7 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("rangeRestrictedInt16s", value, 7));
             }
             break;
-        case 426:
+        case 427:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<uint8_t> value;
@@ -53249,9 +53252,6 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("nullableRangeRestrictedInt8u.Value()", value.Value(), 70U));
             }
             break;
-        case 427:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
-            break;
         case 428:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             break;
@@ -53262,6 +53262,9 @@ class TestClusterSuite : public TestCommand
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             break;
         case 431:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
+            break;
+        case 432:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<uint8_t> value;
@@ -53270,10 +53273,10 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("nullableRangeRestrictedInt8u.Value()", value.Value(), 70U));
             }
             break;
-        case 432:
+        case 433:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 433:
+        case 434:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<uint8_t> value;
@@ -53282,10 +53285,10 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("nullableRangeRestrictedInt8u.Value()", value.Value(), 20U));
             }
             break;
-        case 434:
+        case 435:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 435:
+        case 436:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<uint8_t> value;
@@ -53294,10 +53297,10 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("nullableRangeRestrictedInt8u.Value()", value.Value(), 100U));
             }
             break;
-        case 436:
+        case 437:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 437:
+        case 438:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<uint8_t> value;
@@ -53306,10 +53309,10 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("nullableRangeRestrictedInt8u.Value()", value.Value(), 50U));
             }
             break;
-        case 438:
+        case 439:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 439:
+        case 440:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<uint8_t> value;
@@ -53317,7 +53320,7 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValueNull("nullableRangeRestrictedInt8u", value));
             }
             break;
-        case 440:
+        case 441:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<uint16_t> value;
@@ -53326,9 +53329,6 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("nullableRangeRestrictedInt16u.Value()", value.Value(), 200U));
             }
             break;
-        case 441:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
-            break;
         case 442:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             break;
@@ -53339,6 +53339,9 @@ class TestClusterSuite : public TestCommand
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             break;
         case 445:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
+            break;
+        case 446:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<uint16_t> value;
@@ -53347,10 +53350,10 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("nullableRangeRestrictedInt16u.Value()", value.Value(), 200U));
             }
             break;
-        case 446:
+        case 447:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 447:
+        case 448:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<uint16_t> value;
@@ -53359,10 +53362,10 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("nullableRangeRestrictedInt16u.Value()", value.Value(), 100U));
             }
             break;
-        case 448:
+        case 449:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 449:
+        case 450:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<uint16_t> value;
@@ -53371,10 +53374,10 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("nullableRangeRestrictedInt16u.Value()", value.Value(), 1000U));
             }
             break;
-        case 450:
+        case 451:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 451:
+        case 452:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<uint16_t> value;
@@ -53383,10 +53386,10 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("nullableRangeRestrictedInt16u.Value()", value.Value(), 500U));
             }
             break;
-        case 452:
+        case 453:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 453:
+        case 454:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<uint16_t> value;
@@ -53394,7 +53397,7 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValueNull("nullableRangeRestrictedInt16u", value));
             }
             break;
-        case 454:
+        case 455:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<int8_t> value;
@@ -53403,9 +53406,6 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("nullableRangeRestrictedInt8s.Value()", value.Value(), -20));
             }
             break;
-        case 455:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
-            break;
         case 456:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             break;
@@ -53416,6 +53416,9 @@ class TestClusterSuite : public TestCommand
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             break;
         case 459:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
+            break;
+        case 460:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<int8_t> value;
@@ -53424,10 +53427,10 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("nullableRangeRestrictedInt8s.Value()", value.Value(), -20));
             }
             break;
-        case 460:
+        case 461:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 461:
+        case 462:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<int8_t> value;
@@ -53436,10 +53439,10 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("nullableRangeRestrictedInt8s.Value()", value.Value(), -40));
             }
             break;
-        case 462:
+        case 463:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 463:
+        case 464:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<int8_t> value;
@@ -53448,10 +53451,10 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("nullableRangeRestrictedInt8s.Value()", value.Value(), 50));
             }
             break;
-        case 464:
+        case 465:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 465:
+        case 466:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<int8_t> value;
@@ -53460,10 +53463,10 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("nullableRangeRestrictedInt8s.Value()", value.Value(), 6));
             }
             break;
-        case 466:
+        case 467:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 467:
+        case 468:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<int8_t> value;
@@ -53471,7 +53474,7 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValueNull("nullableRangeRestrictedInt8s", value));
             }
             break;
-        case 468:
+        case 469:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<int16_t> value;
@@ -53480,9 +53483,6 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("nullableRangeRestrictedInt16s.Value()", value.Value(), -100));
             }
             break;
-        case 469:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
-            break;
         case 470:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             break;
@@ -53493,6 +53493,9 @@ class TestClusterSuite : public TestCommand
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             break;
         case 473:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
+            break;
+        case 474:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<int16_t> value;
@@ -53501,10 +53504,10 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("nullableRangeRestrictedInt16s.Value()", value.Value(), -100));
             }
             break;
-        case 474:
+        case 475:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 475:
+        case 476:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<int16_t> value;
@@ -53513,10 +53516,10 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("nullableRangeRestrictedInt16s.Value()", value.Value(), -150));
             }
             break;
-        case 476:
+        case 477:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 477:
+        case 478:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<int16_t> value;
@@ -53525,10 +53528,10 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("nullableRangeRestrictedInt16s.Value()", value.Value(), 200));
             }
             break;
-        case 478:
+        case 479:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 479:
+        case 480:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<int16_t> value;
@@ -53537,10 +53540,10 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValue("nullableRangeRestrictedInt16s.Value()", value.Value(), 7));
             }
             break;
-        case 480:
+        case 481:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 481:
+        case 482:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::Nullable<int16_t> value;
@@ -53548,19 +53551,19 @@ class TestClusterSuite : public TestCommand
                 VerifyOrReturn(CheckValueNull("nullableRangeRestrictedInt16s", value));
             }
             break;
-        case 482:
+        case 483:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_INVALID_DATA_TYPE));
             break;
-        case 483:
+        case 484:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_FAILURE));
             break;
-        case 484:
+        case 485:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_INVALID_DATA_TYPE));
             break;
-        case 485:
+        case 486:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_FAILURE));
             break;
-        case 486:
+        case 487:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::DecodableList<chip::CommandId> value;
@@ -53607,7 +53610,7 @@ class TestClusterSuite : public TestCommand
                 }
             }
             break;
-        case 487:
+        case 488:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::DecodableList<chip::CommandId> value;
@@ -53636,10 +53639,10 @@ class TestClusterSuite : public TestCommand
                 }
             }
             break;
-        case 488:
+        case 489:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 489:
+        case 490:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::Clusters::UnitTesting::Structs::SimpleStruct::DecodableType value;
@@ -54603,82 +54606,131 @@ class TestClusterSuite : public TestCommand
                                  true, chip::NullOptional);
         }
         case 136: {
-            LogStep(136, "Read attribute EPOCH_US Default Value");
+            LogStep(136, "Write attribute LIST_LONG_OCTET_STRING (for chunked write)");
+            ListFreer listFreer;
+            chip::app::DataModel::List<const chip::ByteSpan> value;
+
+            {
+                auto * listHolder_0 = new ListHolder<chip::ByteSpan>(4);
+                listFreer.add(listHolder_0);
+                listHolder_0->mList[0] = chip::ByteSpan(
+                    chip::Uint8::from_const_char(
+                        "0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789"
+                        "abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123"
+                        "456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcd"
+                        "ef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef01234567"
+                        "89abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdefgarbage: not in "
+                        "length on purpose"),
+                    512);
+                listHolder_0->mList[1] = chip::ByteSpan(
+                    chip::Uint8::from_const_char(
+                        "0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789"
+                        "abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123"
+                        "456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcd"
+                        "ef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef01234567"
+                        "89abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdefgarbage: not in "
+                        "length on purpose"),
+                    512);
+                listHolder_0->mList[2] = chip::ByteSpan(
+                    chip::Uint8::from_const_char(
+                        "0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789"
+                        "abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123"
+                        "456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcd"
+                        "ef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef01234567"
+                        "89abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdefgarbage: not in "
+                        "length on purpose"),
+                    512);
+                listHolder_0->mList[3] = chip::ByteSpan(
+                    chip::Uint8::from_const_char(
+                        "0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789"
+                        "abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123"
+                        "456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcd"
+                        "ef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef01234567"
+                        "89abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdefgarbage: not in "
+                        "length on purpose"),
+                    512);
+                value = chip::app::DataModel::List<chip::ByteSpan>(listHolder_0->mList, 4);
+            }
+            return WriteAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::ListLongOctetString::Id,
+                                  value, chip::NullOptional, chip::NullOptional);
+        }
+        case 137: {
+            LogStep(137, "Read attribute EPOCH_US Default Value");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::EpochUs::Id, true,
                                  chip::NullOptional);
         }
-        case 137: {
-            LogStep(137, "Write attribute EPOCH_US Max Value");
+        case 138: {
+            LogStep(138, "Write attribute EPOCH_US Max Value");
             ListFreer listFreer;
             uint64_t value;
             value = 18446744073709551615ULL;
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::EpochUs::Id, value,
                                   chip::NullOptional, chip::NullOptional);
         }
-        case 138: {
-            LogStep(138, "Read attribute EPOCH_US Max Value");
+        case 139: {
+            LogStep(139, "Read attribute EPOCH_US Max Value");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::EpochUs::Id, true,
                                  chip::NullOptional);
         }
-        case 139: {
-            LogStep(139, "Write attribute EPOCH_US Min Value");
+        case 140: {
+            LogStep(140, "Write attribute EPOCH_US Min Value");
             ListFreer listFreer;
             uint64_t value;
             value = 0ULL;
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::EpochUs::Id, value,
                                   chip::NullOptional, chip::NullOptional);
         }
-        case 140: {
-            LogStep(140, "Read attribute EPOCH_US Min Value");
+        case 141: {
+            LogStep(141, "Read attribute EPOCH_US Min Value");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::EpochUs::Id, true,
                                  chip::NullOptional);
         }
-        case 141: {
-            LogStep(141, "Read attribute EPOCH_S Default Value");
+        case 142: {
+            LogStep(142, "Read attribute EPOCH_S Default Value");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::EpochS::Id, true,
                                  chip::NullOptional);
         }
-        case 142: {
-            LogStep(142, "Write attribute EPOCH_S Max Value");
+        case 143: {
+            LogStep(143, "Write attribute EPOCH_S Max Value");
             ListFreer listFreer;
             uint32_t value;
             value = 4294967295UL;
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::EpochS::Id, value,
                                   chip::NullOptional, chip::NullOptional);
         }
-        case 143: {
-            LogStep(143, "Read attribute EPOCH_S Max Value");
+        case 144: {
+            LogStep(144, "Read attribute EPOCH_S Max Value");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::EpochS::Id, true,
                                  chip::NullOptional);
         }
-        case 144: {
-            LogStep(144, "Write attribute EPOCH_S Min Value");
+        case 145: {
+            LogStep(145, "Write attribute EPOCH_S Min Value");
             ListFreer listFreer;
             uint32_t value;
             value = 0UL;
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::EpochS::Id, value,
                                   chip::NullOptional, chip::NullOptional);
         }
-        case 145: {
-            LogStep(145, "Read attribute EPOCH_S Min Value");
+        case 146: {
+            LogStep(146, "Read attribute EPOCH_S Min Value");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::EpochS::Id, true,
                                  chip::NullOptional);
         }
-        case 146: {
-            LogStep(146, "Read attribute UNSUPPORTED");
+        case 147: {
+            LogStep(147, "Read attribute UNSUPPORTED");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::Unsupported::Id, true,
                                  chip::NullOptional);
         }
-        case 147: {
-            LogStep(147, "Writeattribute UNSUPPORTED");
+        case 148: {
+            LogStep(148, "Writeattribute UNSUPPORTED");
             ListFreer listFreer;
             bool value;
             value = 0;
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::Unsupported::Id, value,
                                   chip::NullOptional, chip::NullOptional);
         }
-        case 148: {
-            LogStep(148, "Send Test Command to unsupported endpoint");
+        case 149: {
+            LogStep(149, "Send Test Command to unsupported endpoint");
             ListFreer listFreer;
             chip::app::Clusters::UnitTesting::Commands::Test::Type value;
             return SendCommand(kIdentityAlpha, GetEndpoint(200), UnitTesting::Id, UnitTesting::Commands::Test::Id, value,
@@ -54686,8 +54738,8 @@ class TestClusterSuite : public TestCommand
 
             );
         }
-        case 149: {
-            LogStep(149, "Send Test Command to unsupported cluster");
+        case 150: {
+            LogStep(150, "Send Test Command to unsupported cluster");
             ListFreer listFreer;
             chip::app::Clusters::UnitTesting::Commands::Test::Type value;
             return SendCommand(kIdentityAlpha, GetEndpoint(0), UnitTesting::Id, UnitTesting::Commands::Test::Id, value,
@@ -54695,34 +54747,34 @@ class TestClusterSuite : public TestCommand
 
             );
         }
-        case 150: {
-            LogStep(150, "Read attribute vendor_id Default Value");
+        case 151: {
+            LogStep(151, "Read attribute vendor_id Default Value");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::VendorId::Id, true,
                                  chip::NullOptional);
         }
-        case 151: {
-            LogStep(151, "Write attribute vendor_id");
+        case 152: {
+            LogStep(152, "Write attribute vendor_id");
             ListFreer listFreer;
             chip::VendorId value;
             value = static_cast<chip::VendorId>(17);
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::VendorId::Id, value,
                                   chip::NullOptional, chip::NullOptional);
         }
-        case 152: {
-            LogStep(152, "Read attribute vendor_id");
+        case 153: {
+            LogStep(153, "Read attribute vendor_id");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::VendorId::Id, true,
                                  chip::NullOptional);
         }
-        case 153: {
-            LogStep(153, "Restore attribute vendor_id");
+        case 154: {
+            LogStep(154, "Restore attribute vendor_id");
             ListFreer listFreer;
             chip::VendorId value;
             value = static_cast<chip::VendorId>(0);
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::VendorId::Id, value,
                                   chip::NullOptional, chip::NullOptional);
         }
-        case 154: {
-            LogStep(154, "Send a command with a vendor_id and enum");
+        case 155: {
+            LogStep(155, "Send a command with a vendor_id and enum");
             ListFreer listFreer;
             chip::app::Clusters::UnitTesting::Commands::TestEnumsRequest::Type value;
             value.arg1 = static_cast<chip::VendorId>(20003);
@@ -54732,8 +54784,8 @@ class TestClusterSuite : public TestCommand
 
             );
         }
-        case 155: {
-            LogStep(155, "Send a command with a vendor_id and invalid enum");
+        case 156: {
+            LogStep(156, "Send a command with a vendor_id and invalid enum");
             ListFreer listFreer;
             chip::app::Clusters::UnitTesting::Commands::TestEnumsRequest::Type value;
             value.arg1 = static_cast<chip::VendorId>(20003);
@@ -54743,8 +54795,8 @@ class TestClusterSuite : public TestCommand
 
             );
         }
-        case 156: {
-            LogStep(156, "Send Test Command With Struct Argument and arg1.b is true");
+        case 157: {
+            LogStep(157, "Send Test Command With Struct Argument and arg1.b is true");
             ListFreer listFreer;
             chip::app::Clusters::UnitTesting::Commands::TestStructArgumentRequest::Type value;
 
@@ -54762,8 +54814,8 @@ class TestClusterSuite : public TestCommand
 
             );
         }
-        case 157: {
-            LogStep(157, "Send Test Command With Struct Argument and arg1.b is false");
+        case 158: {
+            LogStep(158, "Send Test Command With Struct Argument and arg1.b is false");
             ListFreer listFreer;
             chip::app::Clusters::UnitTesting::Commands::TestStructArgumentRequest::Type value;
 
@@ -54781,8 +54833,8 @@ class TestClusterSuite : public TestCommand
 
             );
         }
-        case 158: {
-            LogStep(158, "Send Test Command With Nested Struct Argument and arg1.c.b is true");
+        case 159: {
+            LogStep(159, "Send Test Command With Nested Struct Argument and arg1.c.b is true");
             ListFreer listFreer;
             chip::app::Clusters::UnitTesting::Commands::TestNestedStructArgumentRequest::Type value;
 
@@ -54803,8 +54855,8 @@ class TestClusterSuite : public TestCommand
 
             );
         }
-        case 159: {
-            LogStep(159, "Send Test Command With Nested Struct Argument arg1.c.b is false");
+        case 160: {
+            LogStep(160, "Send Test Command With Nested Struct Argument arg1.c.b is false");
             ListFreer listFreer;
             chip::app::Clusters::UnitTesting::Commands::TestNestedStructArgumentRequest::Type value;
 
@@ -54825,8 +54877,8 @@ class TestClusterSuite : public TestCommand
 
             );
         }
-        case 160: {
-            LogStep(160, "Send Test Command With Nested Struct List Argument and all fields b of arg1.d are true");
+        case 161: {
+            LogStep(161, "Send Test Command With Nested Struct List Argument and all fields b of arg1.d are true");
             ListFreer listFreer;
             chip::app::Clusters::UnitTesting::Commands::TestNestedStructListArgumentRequest::Type value;
 
@@ -54904,8 +54956,8 @@ class TestClusterSuite : public TestCommand
 
             );
         }
-        case 161: {
-            LogStep(161, "Send Test Command With Nested Struct List Argument and some fields b of arg1.d are false");
+        case 162: {
+            LogStep(162, "Send Test Command With Nested Struct List Argument and some fields b of arg1.d are false");
             ListFreer listFreer;
             chip::app::Clusters::UnitTesting::Commands::TestNestedStructListArgumentRequest::Type value;
 
@@ -54983,8 +55035,8 @@ class TestClusterSuite : public TestCommand
 
             );
         }
-        case 162: {
-            LogStep(162, "Send Test Command With Struct Argument and see what we get back");
+        case 163: {
+            LogStep(163, "Send Test Command With Struct Argument and see what we get back");
             ListFreer listFreer;
             chip::app::Clusters::UnitTesting::Commands::SimpleStructEchoRequest::Type value;
 
@@ -55002,8 +55054,8 @@ class TestClusterSuite : public TestCommand
 
             );
         }
-        case 163: {
-            LogStep(163, "Send Test Command With List of INT8U and none of them is set to 0");
+        case 164: {
+            LogStep(164, "Send Test Command With List of INT8U and none of them is set to 0");
             ListFreer listFreer;
             chip::app::Clusters::UnitTesting::Commands::TestListInt8UArgumentRequest::Type value;
 
@@ -55026,8 +55078,8 @@ class TestClusterSuite : public TestCommand
 
             );
         }
-        case 164: {
-            LogStep(164, "Send Test Command With List of INT8U and one of them is set to 0");
+        case 165: {
+            LogStep(165, "Send Test Command With List of INT8U and one of them is set to 0");
             ListFreer listFreer;
             chip::app::Clusters::UnitTesting::Commands::TestListInt8UArgumentRequest::Type value;
 
@@ -55051,8 +55103,8 @@ class TestClusterSuite : public TestCommand
 
             );
         }
-        case 165: {
-            LogStep(165, "Send Test Command With List of INT8U and get it reversed");
+        case 166: {
+            LogStep(166, "Send Test Command With List of INT8U and get it reversed");
             ListFreer listFreer;
             chip::app::Clusters::UnitTesting::Commands::TestListInt8UReverseRequest::Type value;
 
@@ -55075,8 +55127,8 @@ class TestClusterSuite : public TestCommand
 
             );
         }
-        case 166: {
-            LogStep(166, "Send Test Command With empty List of INT8U and get an empty list back");
+        case 167: {
+            LogStep(167, "Send Test Command With empty List of INT8U and get an empty list back");
             ListFreer listFreer;
             chip::app::Clusters::UnitTesting::Commands::TestListInt8UReverseRequest::Type value;
 
@@ -55086,8 +55138,8 @@ class TestClusterSuite : public TestCommand
 
             );
         }
-        case 167: {
-            LogStep(167, "Send Test Command With List of Struct Argument and arg1.b of first item is true");
+        case 168: {
+            LogStep(168, "Send Test Command With List of Struct Argument and arg1.b of first item is true");
             ListFreer listFreer;
             chip::app::Clusters::UnitTesting::Commands::TestListStructArgumentRequest::Type value;
 
@@ -55123,8 +55175,8 @@ class TestClusterSuite : public TestCommand
 
             );
         }
-        case 168: {
-            LogStep(168, "Send Test Command With List of Struct Argument and arg1.b of first item is false");
+        case 169: {
+            LogStep(169, "Send Test Command With List of Struct Argument and arg1.b of first item is false");
             ListFreer listFreer;
             chip::app::Clusters::UnitTesting::Commands::TestListStructArgumentRequest::Type value;
 
@@ -55160,8 +55212,8 @@ class TestClusterSuite : public TestCommand
 
             );
         }
-        case 169: {
-            LogStep(169,
+        case 170: {
+            LogStep(170,
                     "Send Test Command With List of Nested Struct List Argument and all fields b of elements of arg1.d are true");
             ListFreer listFreer;
             chip::app::Clusters::UnitTesting::Commands::TestListNestedStructListArgumentRequest::Type value;
@@ -55249,8 +55301,8 @@ class TestClusterSuite : public TestCommand
 
             );
         }
-        case 170: {
-            LogStep(170, "Send Test Command With Nested Struct List Argument and some fields b of elements of arg1.d are false");
+        case 171: {
+            LogStep(171, "Send Test Command With Nested Struct List Argument and some fields b of elements of arg1.d are false");
             ListFreer listFreer;
             chip::app::Clusters::UnitTesting::Commands::TestListNestedStructListArgumentRequest::Type value;
 
@@ -55337,8 +55389,8 @@ class TestClusterSuite : public TestCommand
 
             );
         }
-        case 171: {
-            LogStep(171, "Write attribute LIST With List of INT8U and none of them is set to 0");
+        case 172: {
+            LogStep(172, "Write attribute LIST With List of INT8U and none of them is set to 0");
             ListFreer listFreer;
             chip::app::DataModel::List<const uint8_t> value;
 
@@ -55354,13 +55406,13 @@ class TestClusterSuite : public TestCommand
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::ListInt8u::Id, value,
                                   chip::NullOptional, chip::NullOptional);
         }
-        case 172: {
-            LogStep(172, "Read attribute LIST With List of INT8U");
+        case 173: {
+            LogStep(173, "Read attribute LIST With List of INT8U");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::ListInt8u::Id, true,
                                  chip::NullOptional);
         }
-        case 173: {
-            LogStep(173, "Write attribute LIST With List of OCTET_STRING");
+        case 174: {
+            LogStep(174, "Write attribute LIST With List of OCTET_STRING");
             ListFreer listFreer;
             chip::app::DataModel::List<const chip::ByteSpan> value;
 
@@ -55376,13 +55428,13 @@ class TestClusterSuite : public TestCommand
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::ListOctetString::Id,
                                   value, chip::NullOptional, chip::NullOptional);
         }
-        case 174: {
-            LogStep(174, "Read attribute LIST With List of OCTET_STRING");
+        case 175: {
+            LogStep(175, "Read attribute LIST With List of OCTET_STRING");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::ListOctetString::Id,
                                  true, chip::NullOptional);
         }
-        case 175: {
-            LogStep(175, "Write attribute LIST With List of LIST_STRUCT_OCTET_STRING");
+        case 176: {
+            LogStep(176, "Write attribute LIST With List of LIST_STRUCT_OCTET_STRING");
             ListFreer listFreer;
             chip::app::DataModel::List<const chip::app::Clusters::UnitTesting::Structs::TestListStructOctet::Type> value;
 
@@ -55413,13 +55465,13 @@ class TestClusterSuite : public TestCommand
                                   UnitTesting::Attributes::ListStructOctetString::Id, value, chip::NullOptional,
                                   chip::NullOptional);
         }
-        case 176: {
-            LogStep(176, "Read attribute LIST With List of LIST_STRUCT_OCTET_STRING");
+        case 177: {
+            LogStep(177, "Read attribute LIST With List of LIST_STRUCT_OCTET_STRING");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id,
                                  UnitTesting::Attributes::ListStructOctetString::Id, true, chip::NullOptional);
         }
-        case 177: {
-            LogStep(177, "Send Test Command with optional arg set.");
+        case 178: {
+            LogStep(178, "Send Test Command with optional arg set.");
             ListFreer listFreer;
             chip::app::Clusters::UnitTesting::Commands::TestNullableOptionalRequest::Type value;
             value.arg1.Emplace();
@@ -55430,8 +55482,8 @@ class TestClusterSuite : public TestCommand
 
             );
         }
-        case 178: {
-            LogStep(178, "Send Test Command without its optional arg.");
+        case 179: {
+            LogStep(179, "Send Test Command without its optional arg.");
             ListFreer listFreer;
             chip::app::Clusters::UnitTesting::Commands::TestNullableOptionalRequest::Type value;
             return SendCommand(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id,
@@ -55439,13 +55491,13 @@ class TestClusterSuite : public TestCommand
 
             );
         }
-        case 179: {
-            LogStep(179, "Read list of structs containing nullables and optionals");
+        case 180: {
+            LogStep(180, "Read list of structs containing nullables and optionals");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id,
                                  UnitTesting::Attributes::ListNullablesAndOptionalsStruct::Id, true, chip::NullOptional);
         }
-        case 180: {
-            LogStep(180, "Write list of structs containing nullables and optionals");
+        case 181: {
+            LogStep(181, "Write list of structs containing nullables and optionals");
             ListFreer listFreer;
             chip::app::DataModel::List<const chip::app::Clusters::UnitTesting::Structs::NullablesAndOptionalsStruct::Type> value;
 
@@ -55475,26 +55527,26 @@ class TestClusterSuite : public TestCommand
                                   UnitTesting::Attributes::ListNullablesAndOptionalsStruct::Id, value, chip::NullOptional,
                                   chip::NullOptional);
         }
-        case 181: {
-            LogStep(181, "Read list of structs containing nullables and optionals after writing");
+        case 182: {
+            LogStep(182, "Read list of structs containing nullables and optionals after writing");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id,
                                  UnitTesting::Attributes::ListNullablesAndOptionalsStruct::Id, true, chip::NullOptional);
         }
-        case 182: {
-            LogStep(182, "Write attribute NULLABLE_BOOLEAN null");
+        case 183: {
+            LogStep(183, "Write attribute NULLABLE_BOOLEAN null");
             ListFreer listFreer;
             chip::app::DataModel::Nullable<bool> value;
             value.SetNull();
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::NullableBoolean::Id,
                                   value, chip::NullOptional, chip::NullOptional);
         }
-        case 183: {
-            LogStep(183, "Read attribute NULLABLE_BOOLEAN null");
+        case 184: {
+            LogStep(184, "Read attribute NULLABLE_BOOLEAN null");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::NullableBoolean::Id,
                                  true, chip::NullOptional);
         }
-        case 184: {
-            LogStep(184, "Write attribute NULLABLE_BOOLEAN True");
+        case 185: {
+            LogStep(185, "Write attribute NULLABLE_BOOLEAN True");
             ListFreer listFreer;
             chip::app::DataModel::Nullable<bool> value;
             value.SetNonNull();
@@ -55502,18 +55554,18 @@ class TestClusterSuite : public TestCommand
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::NullableBoolean::Id,
                                   value, chip::NullOptional, chip::NullOptional);
         }
-        case 185: {
-            LogStep(185, "Read attribute NULLABLE_BOOLEAN True");
+        case 186: {
+            LogStep(186, "Read attribute NULLABLE_BOOLEAN True");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::NullableBoolean::Id,
                                  true, chip::NullOptional);
         }
-        case 186: {
-            LogStep(186, "Read attribute NULLABLE_BOOLEAN not null");
+        case 187: {
+            LogStep(187, "Read attribute NULLABLE_BOOLEAN not null");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::NullableBoolean::Id,
                                  true, chip::NullOptional);
         }
-        case 187: {
-            LogStep(187, "Write attribute NULLABLE_BITMAP8 Max Value");
+        case 188: {
+            LogStep(188, "Write attribute NULLABLE_BITMAP8 Max Value");
             ListFreer listFreer;
             chip::app::DataModel::Nullable<chip::BitMask<chip::app::Clusters::UnitTesting::Bitmap8MaskMap>> value;
             value.SetNonNull();
@@ -55521,13 +55573,13 @@ class TestClusterSuite : public TestCommand
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::NullableBitmap8::Id,
                                   value, chip::NullOptional, chip::NullOptional);
         }
-        case 188: {
-            LogStep(188, "Read attribute NULLABLE_BITMAP8 Max Value");
+        case 189: {
+            LogStep(189, "Read attribute NULLABLE_BITMAP8 Max Value");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::NullableBitmap8::Id,
                                  true, chip::NullOptional);
         }
-        case 189: {
-            LogStep(189, "Write attribute NULLABLE_BITMAP8 Invalid Value");
+        case 190: {
+            LogStep(190, "Write attribute NULLABLE_BITMAP8 Invalid Value");
             ListFreer listFreer;
             chip::app::DataModel::Nullable<chip::BitMask<chip::app::Clusters::UnitTesting::Bitmap8MaskMap>> value;
             value.SetNonNull();
@@ -55535,31 +55587,31 @@ class TestClusterSuite : public TestCommand
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::NullableBitmap8::Id,
                                   value, chip::NullOptional, chip::NullOptional);
         }
-        case 190: {
-            LogStep(190, "Read attribute NULLABLE_BITMAP8 unchanged Value");
+        case 191: {
+            LogStep(191, "Read attribute NULLABLE_BITMAP8 unchanged Value");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::NullableBitmap8::Id,
                                  true, chip::NullOptional);
         }
-        case 191: {
-            LogStep(191, "Write attribute NULLABLE_BITMAP8 null Value");
+        case 192: {
+            LogStep(192, "Write attribute NULLABLE_BITMAP8 null Value");
             ListFreer listFreer;
             chip::app::DataModel::Nullable<chip::BitMask<chip::app::Clusters::UnitTesting::Bitmap8MaskMap>> value;
             value.SetNull();
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::NullableBitmap8::Id,
                                   value, chip::NullOptional, chip::NullOptional);
         }
-        case 192: {
-            LogStep(192, "Read attribute NULLABLE_BITMAP8 null Value");
+        case 193: {
+            LogStep(193, "Read attribute NULLABLE_BITMAP8 null Value");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::NullableBitmap8::Id,
                                  true, chip::NullOptional);
         }
-        case 193: {
-            LogStep(193, "Read attribute NULLABLE_BITMAP8 not 254 Value");
+        case 194: {
+            LogStep(194, "Read attribute NULLABLE_BITMAP8 not 254 Value");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::NullableBitmap8::Id,
                                  true, chip::NullOptional);
         }
-        case 194: {
-            LogStep(194, "Write attribute NULLABLE_BITMAP16 Max Value");
+        case 195: {
+            LogStep(195, "Write attribute NULLABLE_BITMAP16 Max Value");
             ListFreer listFreer;
             chip::app::DataModel::Nullable<chip::BitMask<chip::app::Clusters::UnitTesting::Bitmap16MaskMap>> value;
             value.SetNonNull();
@@ -55567,13 +55619,13 @@ class TestClusterSuite : public TestCommand
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::NullableBitmap16::Id,
                                   value, chip::NullOptional, chip::NullOptional);
         }
-        case 195: {
-            LogStep(195, "Read attribute NULLABLE_BITMAP16 Max Value");
+        case 196: {
+            LogStep(196, "Read attribute NULLABLE_BITMAP16 Max Value");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::NullableBitmap16::Id,
                                  true, chip::NullOptional);
         }
-        case 196: {
-            LogStep(196, "Write attribute NULLABLE_BITMAP16 Invalid Value");
+        case 197: {
+            LogStep(197, "Write attribute NULLABLE_BITMAP16 Invalid Value");
             ListFreer listFreer;
             chip::app::DataModel::Nullable<chip::BitMask<chip::app::Clusters::UnitTesting::Bitmap16MaskMap>> value;
             value.SetNonNull();
@@ -55581,26 +55633,26 @@ class TestClusterSuite : public TestCommand
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::NullableBitmap16::Id,
                                   value, chip::NullOptional, chip::NullOptional);
         }
-        case 197: {
-            LogStep(197, "Read attribute NULLABLE_BITMAP16 unchanged Value");
+        case 198: {
+            LogStep(198, "Read attribute NULLABLE_BITMAP16 unchanged Value");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::NullableBitmap16::Id,
                                  true, chip::NullOptional);
         }
-        case 198: {
-            LogStep(198, "Write attribute NULLABLE_BITMAP16 null Value");
+        case 199: {
+            LogStep(199, "Write attribute NULLABLE_BITMAP16 null Value");
             ListFreer listFreer;
             chip::app::DataModel::Nullable<chip::BitMask<chip::app::Clusters::UnitTesting::Bitmap16MaskMap>> value;
             value.SetNull();
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::NullableBitmap16::Id,
                                   value, chip::NullOptional, chip::NullOptional);
         }
-        case 199: {
-            LogStep(199, "Read attribute NULLABLE_BITMAP16 null Value");
+        case 200: {
+            LogStep(200, "Read attribute NULLABLE_BITMAP16 null Value");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::NullableBitmap16::Id,
                                  true, chip::NullOptional);
         }
-        case 200: {
-            LogStep(200, "Write attribute NULLABLE_BITMAP32 Max Value");
+        case 201: {
+            LogStep(201, "Write attribute NULLABLE_BITMAP32 Max Value");
             ListFreer listFreer;
             chip::app::DataModel::Nullable<chip::BitMask<chip::app::Clusters::UnitTesting::Bitmap32MaskMap>> value;
             value.SetNonNull();
@@ -55608,13 +55660,13 @@ class TestClusterSuite : public TestCommand
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::NullableBitmap32::Id,
                                   value, chip::NullOptional, chip::NullOptional);
         }
-        case 201: {
-            LogStep(201, "Read attribute NULLABLE_BITMAP32 Max Value");
+        case 202: {
+            LogStep(202, "Read attribute NULLABLE_BITMAP32 Max Value");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::NullableBitmap32::Id,
                                  true, chip::NullOptional);
         }
-        case 202: {
-            LogStep(202, "Write attribute NULLABLE_BITMAP32 Invalid Value");
+        case 203: {
+            LogStep(203, "Write attribute NULLABLE_BITMAP32 Invalid Value");
             ListFreer listFreer;
             chip::app::DataModel::Nullable<chip::BitMask<chip::app::Clusters::UnitTesting::Bitmap32MaskMap>> value;
             value.SetNonNull();
@@ -55622,26 +55674,26 @@ class TestClusterSuite : public TestCommand
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::NullableBitmap32::Id,
                                   value, chip::NullOptional, chip::NullOptional);
         }
-        case 203: {
-            LogStep(203, "Read attribute NULLABLE_BITMAP32 unchanged Value");
+        case 204: {
+            LogStep(204, "Read attribute NULLABLE_BITMAP32 unchanged Value");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::NullableBitmap32::Id,
                                  true, chip::NullOptional);
         }
-        case 204: {
-            LogStep(204, "Write attribute NULLABLE_BITMAP32 null Value");
+        case 205: {
+            LogStep(205, "Write attribute NULLABLE_BITMAP32 null Value");
             ListFreer listFreer;
             chip::app::DataModel::Nullable<chip::BitMask<chip::app::Clusters::UnitTesting::Bitmap32MaskMap>> value;
             value.SetNull();
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::NullableBitmap32::Id,
                                   value, chip::NullOptional, chip::NullOptional);
         }
-        case 205: {
-            LogStep(205, "Read attribute NULLABLE_BITMAP32 null Value");
+        case 206: {
+            LogStep(206, "Read attribute NULLABLE_BITMAP32 null Value");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::NullableBitmap32::Id,
                                  true, chip::NullOptional);
         }
-        case 206: {
-            LogStep(206, "Write attribute NULLABLE_BITMAP64 Max Value");
+        case 207: {
+            LogStep(207, "Write attribute NULLABLE_BITMAP64 Max Value");
             ListFreer listFreer;
             chip::app::DataModel::Nullable<chip::BitMask<chip::app::Clusters::UnitTesting::Bitmap64MaskMap>> value;
             value.SetNonNull();
@@ -55649,13 +55701,13 @@ class TestClusterSuite : public TestCommand
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::NullableBitmap64::Id,
                                   value, chip::NullOptional, chip::NullOptional);
         }
-        case 207: {
-            LogStep(207, "Read attribute NULLABLE_BITMAP64 Max Value");
+        case 208: {
+            LogStep(208, "Read attribute NULLABLE_BITMAP64 Max Value");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::NullableBitmap64::Id,
                                  true, chip::NullOptional);
         }
-        case 208: {
-            LogStep(208, "Write attribute NULLABLE_BITMAP64 Invalid Value");
+        case 209: {
+            LogStep(209, "Write attribute NULLABLE_BITMAP64 Invalid Value");
             ListFreer listFreer;
             chip::app::DataModel::Nullable<chip::BitMask<chip::app::Clusters::UnitTesting::Bitmap64MaskMap>> value;
             value.SetNonNull();
@@ -55663,26 +55715,26 @@ class TestClusterSuite : public TestCommand
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::NullableBitmap64::Id,
                                   value, chip::NullOptional, chip::NullOptional);
         }
-        case 209: {
-            LogStep(209, "Read attribute NULLABLE_BITMAP64 unchanged Value");
+        case 210: {
+            LogStep(210, "Read attribute NULLABLE_BITMAP64 unchanged Value");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::NullableBitmap64::Id,
                                  true, chip::NullOptional);
         }
-        case 210: {
-            LogStep(210, "Write attribute NULLABLE_BITMAP64 null Value");
+        case 211: {
+            LogStep(211, "Write attribute NULLABLE_BITMAP64 null Value");
             ListFreer listFreer;
             chip::app::DataModel::Nullable<chip::BitMask<chip::app::Clusters::UnitTesting::Bitmap64MaskMap>> value;
             value.SetNull();
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::NullableBitmap64::Id,
                                   value, chip::NullOptional, chip::NullOptional);
         }
-        case 211: {
-            LogStep(211, "Read attribute NULLABLE_BITMAP64 null Value");
+        case 212: {
+            LogStep(212, "Read attribute NULLABLE_BITMAP64 null Value");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::NullableBitmap64::Id,
                                  true, chip::NullOptional);
         }
-        case 212: {
-            LogStep(212, "Write attribute NULLABLE_INT8U Min Value");
+        case 213: {
+            LogStep(213, "Write attribute NULLABLE_INT8U Min Value");
             ListFreer listFreer;
             chip::app::DataModel::Nullable<uint8_t> value;
             value.SetNonNull();
@@ -55690,13 +55742,13 @@ class TestClusterSuite : public TestCommand
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::NullableInt8u::Id,
                                   value, chip::NullOptional, chip::NullOptional);
         }
-        case 213: {
-            LogStep(213, "Read attribute NULLABLE_INT8U Min Value");
+        case 214: {
+            LogStep(214, "Read attribute NULLABLE_INT8U Min Value");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::NullableInt8u::Id, true,
                                  chip::NullOptional);
         }
-        case 214: {
-            LogStep(214, "Write attribute NULLABLE_INT8U Max Value");
+        case 215: {
+            LogStep(215, "Write attribute NULLABLE_INT8U Max Value");
             ListFreer listFreer;
             chip::app::DataModel::Nullable<uint8_t> value;
             value.SetNonNull();
@@ -55704,13 +55756,13 @@ class TestClusterSuite : public TestCommand
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::NullableInt8u::Id,
                                   value, chip::NullOptional, chip::NullOptional);
         }
-        case 215: {
-            LogStep(215, "Read attribute NULLABLE_INT8U Max Value");
+        case 216: {
+            LogStep(216, "Read attribute NULLABLE_INT8U Max Value");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::NullableInt8u::Id, true,
                                  chip::NullOptional);
         }
-        case 216: {
-            LogStep(216, "Write attribute NULLABLE_INT8U Invalid Value");
+        case 217: {
+            LogStep(217, "Write attribute NULLABLE_INT8U Invalid Value");
             ListFreer listFreer;
             chip::app::DataModel::Nullable<uint8_t> value;
             value.SetNonNull();
@@ -55718,41 +55770,41 @@ class TestClusterSuite : public TestCommand
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::NullableInt8u::Id,
                                   value, chip::NullOptional, chip::NullOptional);
         }
-        case 217: {
-            LogStep(217, "Read attribute NULLABLE_INT8U unchanged Value");
+        case 218: {
+            LogStep(218, "Read attribute NULLABLE_INT8U unchanged Value");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::NullableInt8u::Id, true,
                                  chip::NullOptional);
         }
-        case 218: {
-            LogStep(218, "Read attribute NULLABLE_INT8U unchanged Value with constraint");
+        case 219: {
+            LogStep(219, "Read attribute NULLABLE_INT8U unchanged Value with constraint");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::NullableInt8u::Id, true,
                                  chip::NullOptional);
         }
-        case 219: {
-            LogStep(219, "Write attribute NULLABLE_INT8U null Value");
+        case 220: {
+            LogStep(220, "Write attribute NULLABLE_INT8U null Value");
             ListFreer listFreer;
             chip::app::DataModel::Nullable<uint8_t> value;
             value.SetNull();
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::NullableInt8u::Id,
                                   value, chip::NullOptional, chip::NullOptional);
         }
-        case 220: {
-            LogStep(220, "Read attribute NULLABLE_INT8U null Value");
-            return ReadAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::NullableInt8u::Id, true,
-                                 chip::NullOptional);
-        }
         case 221: {
-            LogStep(221, "Read attribute NULLABLE_INT8U null Value & range");
+            LogStep(221, "Read attribute NULLABLE_INT8U null Value");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::NullableInt8u::Id, true,
                                  chip::NullOptional);
         }
         case 222: {
-            LogStep(222, "Read attribute NULLABLE_INT8U null Value & not");
+            LogStep(222, "Read attribute NULLABLE_INT8U null Value & range");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::NullableInt8u::Id, true,
                                  chip::NullOptional);
         }
         case 223: {
-            LogStep(223, "Write attribute NULLABLE_INT8U Value");
+            LogStep(223, "Read attribute NULLABLE_INT8U null Value & not");
+            return ReadAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::NullableInt8u::Id, true,
+                                 chip::NullOptional);
+        }
+        case 224: {
+            LogStep(224, "Write attribute NULLABLE_INT8U Value");
             ListFreer listFreer;
             chip::app::DataModel::Nullable<uint8_t> value;
             value.SetNonNull();
@@ -55760,18 +55812,18 @@ class TestClusterSuite : public TestCommand
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::NullableInt8u::Id,
                                   value, chip::NullOptional, chip::NullOptional);
         }
-        case 224: {
-            LogStep(224, "Read attribute NULLABLE_INT8U Value in range");
+        case 225: {
+            LogStep(225, "Read attribute NULLABLE_INT8U Value in range");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::NullableInt8u::Id, true,
                                  chip::NullOptional);
         }
-        case 225: {
-            LogStep(225, "Read attribute NULLABLE_INT8U notValue OK");
+        case 226: {
+            LogStep(226, "Read attribute NULLABLE_INT8U notValue OK");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::NullableInt8u::Id, true,
                                  chip::NullOptional);
         }
-        case 226: {
-            LogStep(226, "Write attribute NULLABLE_INT16U Min Value");
+        case 227: {
+            LogStep(227, "Write attribute NULLABLE_INT16U Min Value");
             ListFreer listFreer;
             chip::app::DataModel::Nullable<uint16_t> value;
             value.SetNonNull();
@@ -55779,13 +55831,13 @@ class TestClusterSuite : public TestCommand
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::NullableInt16u::Id,
                                   value, chip::NullOptional, chip::NullOptional);
         }
-        case 227: {
-            LogStep(227, "Read attribute NULLABLE_INT16U Min Value");
+        case 228: {
+            LogStep(228, "Read attribute NULLABLE_INT16U Min Value");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::NullableInt16u::Id, true,
                                  chip::NullOptional);
         }
-        case 228: {
-            LogStep(228, "Write attribute NULLABLE_INT16U Max Value");
+        case 229: {
+            LogStep(229, "Write attribute NULLABLE_INT16U Max Value");
             ListFreer listFreer;
             chip::app::DataModel::Nullable<uint16_t> value;
             value.SetNonNull();
@@ -55793,13 +55845,13 @@ class TestClusterSuite : public TestCommand
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::NullableInt16u::Id,
                                   value, chip::NullOptional, chip::NullOptional);
         }
-        case 229: {
-            LogStep(229, "Read attribute NULLABLE_INT16U Max Value");
+        case 230: {
+            LogStep(230, "Read attribute NULLABLE_INT16U Max Value");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::NullableInt16u::Id, true,
                                  chip::NullOptional);
         }
-        case 230: {
-            LogStep(230, "Write attribute NULLABLE_INT16U Invalid Value");
+        case 231: {
+            LogStep(231, "Write attribute NULLABLE_INT16U Invalid Value");
             ListFreer listFreer;
             chip::app::DataModel::Nullable<uint16_t> value;
             value.SetNonNull();
@@ -55807,36 +55859,36 @@ class TestClusterSuite : public TestCommand
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::NullableInt16u::Id,
                                   value, chip::NullOptional, chip::NullOptional);
         }
-        case 231: {
-            LogStep(231, "Read attribute NULLABLE_INT16U unchanged Value");
+        case 232: {
+            LogStep(232, "Read attribute NULLABLE_INT16U unchanged Value");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::NullableInt16u::Id, true,
                                  chip::NullOptional);
         }
-        case 232: {
-            LogStep(232, "Write attribute NULLABLE_INT16U null Value");
+        case 233: {
+            LogStep(233, "Write attribute NULLABLE_INT16U null Value");
             ListFreer listFreer;
             chip::app::DataModel::Nullable<uint16_t> value;
             value.SetNull();
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::NullableInt16u::Id,
                                   value, chip::NullOptional, chip::NullOptional);
         }
-        case 233: {
-            LogStep(233, "Read attribute NULLABLE_INT16U null Value");
-            return ReadAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::NullableInt16u::Id, true,
-                                 chip::NullOptional);
-        }
         case 234: {
-            LogStep(234, "Read attribute NULLABLE_INT16U null Value & range");
+            LogStep(234, "Read attribute NULLABLE_INT16U null Value");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::NullableInt16u::Id, true,
                                  chip::NullOptional);
         }
         case 235: {
-            LogStep(235, "Read attribute NULLABLE_INT16U null Value & not");
+            LogStep(235, "Read attribute NULLABLE_INT16U null Value & range");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::NullableInt16u::Id, true,
                                  chip::NullOptional);
         }
         case 236: {
-            LogStep(236, "Write attribute NULLABLE_INT16U Value");
+            LogStep(236, "Read attribute NULLABLE_INT16U null Value & not");
+            return ReadAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::NullableInt16u::Id, true,
+                                 chip::NullOptional);
+        }
+        case 237: {
+            LogStep(237, "Write attribute NULLABLE_INT16U Value");
             ListFreer listFreer;
             chip::app::DataModel::Nullable<uint16_t> value;
             value.SetNonNull();
@@ -55844,18 +55896,18 @@ class TestClusterSuite : public TestCommand
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::NullableInt16u::Id,
                                   value, chip::NullOptional, chip::NullOptional);
         }
-        case 237: {
-            LogStep(237, "Read attribute NULLABLE_INT16U Value in range");
+        case 238: {
+            LogStep(238, "Read attribute NULLABLE_INT16U Value in range");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::NullableInt16u::Id, true,
                                  chip::NullOptional);
         }
-        case 238: {
-            LogStep(238, "Read attribute NULLABLE_INT16U notValue OK");
+        case 239: {
+            LogStep(239, "Read attribute NULLABLE_INT16U notValue OK");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::NullableInt16u::Id, true,
                                  chip::NullOptional);
         }
-        case 239: {
-            LogStep(239, "Write attribute NULLABLE_INT32U Min Value");
+        case 240: {
+            LogStep(240, "Write attribute NULLABLE_INT32U Min Value");
             ListFreer listFreer;
             chip::app::DataModel::Nullable<uint32_t> value;
             value.SetNonNull();
@@ -55863,13 +55915,13 @@ class TestClusterSuite : public TestCommand
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::NullableInt32u::Id,
                                   value, chip::NullOptional, chip::NullOptional);
         }
-        case 240: {
-            LogStep(240, "Read attribute NULLABLE_INT32U Min Value");
+        case 241: {
+            LogStep(241, "Read attribute NULLABLE_INT32U Min Value");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::NullableInt32u::Id, true,
                                  chip::NullOptional);
         }
-        case 241: {
-            LogStep(241, "Write attribute NULLABLE_INT32U Max Value");
+        case 242: {
+            LogStep(242, "Write attribute NULLABLE_INT32U Max Value");
             ListFreer listFreer;
             chip::app::DataModel::Nullable<uint32_t> value;
             value.SetNonNull();
@@ -55877,13 +55929,13 @@ class TestClusterSuite : public TestCommand
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::NullableInt32u::Id,
                                   value, chip::NullOptional, chip::NullOptional);
         }
-        case 242: {
-            LogStep(242, "Read attribute NULLABLE_INT32U Max Value");
+        case 243: {
+            LogStep(243, "Read attribute NULLABLE_INT32U Max Value");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::NullableInt32u::Id, true,
                                  chip::NullOptional);
         }
-        case 243: {
-            LogStep(243, "Write attribute NULLABLE_INT32U Invalid Value");
+        case 244: {
+            LogStep(244, "Write attribute NULLABLE_INT32U Invalid Value");
             ListFreer listFreer;
             chip::app::DataModel::Nullable<uint32_t> value;
             value.SetNonNull();
@@ -55891,36 +55943,36 @@ class TestClusterSuite : public TestCommand
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::NullableInt32u::Id,
                                   value, chip::NullOptional, chip::NullOptional);
         }
-        case 244: {
-            LogStep(244, "Read attribute NULLABLE_INT32U unchanged Value");
+        case 245: {
+            LogStep(245, "Read attribute NULLABLE_INT32U unchanged Value");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::NullableInt32u::Id, true,
                                  chip::NullOptional);
         }
-        case 245: {
-            LogStep(245, "Write attribute NULLABLE_INT32U null Value");
+        case 246: {
+            LogStep(246, "Write attribute NULLABLE_INT32U null Value");
             ListFreer listFreer;
             chip::app::DataModel::Nullable<uint32_t> value;
             value.SetNull();
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::NullableInt32u::Id,
                                   value, chip::NullOptional, chip::NullOptional);
         }
-        case 246: {
-            LogStep(246, "Read attribute NULLABLE_INT32U null Value");
-            return ReadAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::NullableInt32u::Id, true,
-                                 chip::NullOptional);
-        }
         case 247: {
-            LogStep(247, "Read attribute NULLABLE_INT32U null Value & range");
+            LogStep(247, "Read attribute NULLABLE_INT32U null Value");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::NullableInt32u::Id, true,
                                  chip::NullOptional);
         }
         case 248: {
-            LogStep(248, "Read attribute NULLABLE_INT32U null Value & not");
+            LogStep(248, "Read attribute NULLABLE_INT32U null Value & range");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::NullableInt32u::Id, true,
                                  chip::NullOptional);
         }
         case 249: {
-            LogStep(249, "Write attribute NULLABLE_INT32U Value");
+            LogStep(249, "Read attribute NULLABLE_INT32U null Value & not");
+            return ReadAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::NullableInt32u::Id, true,
+                                 chip::NullOptional);
+        }
+        case 250: {
+            LogStep(250, "Write attribute NULLABLE_INT32U Value");
             ListFreer listFreer;
             chip::app::DataModel::Nullable<uint32_t> value;
             value.SetNonNull();
@@ -55928,18 +55980,18 @@ class TestClusterSuite : public TestCommand
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::NullableInt32u::Id,
                                   value, chip::NullOptional, chip::NullOptional);
         }
-        case 250: {
-            LogStep(250, "Read attribute NULLABLE_INT32U Value in range");
+        case 251: {
+            LogStep(251, "Read attribute NULLABLE_INT32U Value in range");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::NullableInt32u::Id, true,
                                  chip::NullOptional);
         }
-        case 251: {
-            LogStep(251, "Read attribute NULLABLE_INT32U notValue OK");
+        case 252: {
+            LogStep(252, "Read attribute NULLABLE_INT32U notValue OK");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::NullableInt32u::Id, true,
                                  chip::NullOptional);
         }
-        case 252: {
-            LogStep(252, "Write attribute NULLABLE_INT64U Min Value");
+        case 253: {
+            LogStep(253, "Write attribute NULLABLE_INT64U Min Value");
             ListFreer listFreer;
             chip::app::DataModel::Nullable<uint64_t> value;
             value.SetNonNull();
@@ -55947,13 +55999,13 @@ class TestClusterSuite : public TestCommand
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::NullableInt64u::Id,
                                   value, chip::NullOptional, chip::NullOptional);
         }
-        case 253: {
-            LogStep(253, "Read attribute NULLABLE_INT64U Min Value");
+        case 254: {
+            LogStep(254, "Read attribute NULLABLE_INT64U Min Value");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::NullableInt64u::Id, true,
                                  chip::NullOptional);
         }
-        case 254: {
-            LogStep(254, "Write attribute NULLABLE_INT64U Max Value");
+        case 255: {
+            LogStep(255, "Write attribute NULLABLE_INT64U Max Value");
             ListFreer listFreer;
             chip::app::DataModel::Nullable<uint64_t> value;
             value.SetNonNull();
@@ -55961,13 +56013,13 @@ class TestClusterSuite : public TestCommand
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::NullableInt64u::Id,
                                   value, chip::NullOptional, chip::NullOptional);
         }
-        case 255: {
-            LogStep(255, "Read attribute NULLABLE_INT64U Max Value");
+        case 256: {
+            LogStep(256, "Read attribute NULLABLE_INT64U Max Value");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::NullableInt64u::Id, true,
                                  chip::NullOptional);
         }
-        case 256: {
-            LogStep(256, "Write attribute NULLABLE_INT64U Invalid Value");
+        case 257: {
+            LogStep(257, "Write attribute NULLABLE_INT64U Invalid Value");
             ListFreer listFreer;
             chip::app::DataModel::Nullable<uint64_t> value;
             value.SetNonNull();
@@ -55975,36 +56027,36 @@ class TestClusterSuite : public TestCommand
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::NullableInt64u::Id,
                                   value, chip::NullOptional, chip::NullOptional);
         }
-        case 257: {
-            LogStep(257, "Read attribute NULLABLE_INT64U unchanged Value");
+        case 258: {
+            LogStep(258, "Read attribute NULLABLE_INT64U unchanged Value");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::NullableInt64u::Id, true,
                                  chip::NullOptional);
         }
-        case 258: {
-            LogStep(258, "Write attribute NULLABLE_INT64U null Value");
+        case 259: {
+            LogStep(259, "Write attribute NULLABLE_INT64U null Value");
             ListFreer listFreer;
             chip::app::DataModel::Nullable<uint64_t> value;
             value.SetNull();
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::NullableInt64u::Id,
                                   value, chip::NullOptional, chip::NullOptional);
         }
-        case 259: {
-            LogStep(259, "Read attribute NULLABLE_INT64U null Value");
-            return ReadAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::NullableInt64u::Id, true,
-                                 chip::NullOptional);
-        }
         case 260: {
-            LogStep(260, "Read attribute NULLABLE_INT64U null Value & range");
+            LogStep(260, "Read attribute NULLABLE_INT64U null Value");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::NullableInt64u::Id, true,
                                  chip::NullOptional);
         }
         case 261: {
-            LogStep(261, "Read attribute NULLABLE_INT64U null Value & not");
+            LogStep(261, "Read attribute NULLABLE_INT64U null Value & range");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::NullableInt64u::Id, true,
                                  chip::NullOptional);
         }
         case 262: {
-            LogStep(262, "Write attribute NULLABLE_INT64U Value");
+            LogStep(262, "Read attribute NULLABLE_INT64U null Value & not");
+            return ReadAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::NullableInt64u::Id, true,
+                                 chip::NullOptional);
+        }
+        case 263: {
+            LogStep(263, "Write attribute NULLABLE_INT64U Value");
             ListFreer listFreer;
             chip::app::DataModel::Nullable<uint64_t> value;
             value.SetNonNull();
@@ -56012,18 +56064,18 @@ class TestClusterSuite : public TestCommand
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::NullableInt64u::Id,
                                   value, chip::NullOptional, chip::NullOptional);
         }
-        case 263: {
-            LogStep(263, "Read attribute NULLABLE_INT64U Value in range");
+        case 264: {
+            LogStep(264, "Read attribute NULLABLE_INT64U Value in range");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::NullableInt64u::Id, true,
                                  chip::NullOptional);
         }
-        case 264: {
-            LogStep(264, "Read attribute NULLABLE_INT64U notValue OK");
+        case 265: {
+            LogStep(265, "Read attribute NULLABLE_INT64U notValue OK");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::NullableInt64u::Id, true,
                                  chip::NullOptional);
         }
-        case 265: {
-            LogStep(265, "Write attribute NULLABLE_INT8S Min Value");
+        case 266: {
+            LogStep(266, "Write attribute NULLABLE_INT8S Min Value");
             ListFreer listFreer;
             chip::app::DataModel::Nullable<int8_t> value;
             value.SetNonNull();
@@ -56031,13 +56083,13 @@ class TestClusterSuite : public TestCommand
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::NullableInt8s::Id,
                                   value, chip::NullOptional, chip::NullOptional);
         }
-        case 266: {
-            LogStep(266, "Read attribute NULLABLE_INT8S Min Value");
+        case 267: {
+            LogStep(267, "Read attribute NULLABLE_INT8S Min Value");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::NullableInt8s::Id, true,
                                  chip::NullOptional);
         }
-        case 267: {
-            LogStep(267, "Write attribute NULLABLE_INT8S Invalid Value");
+        case 268: {
+            LogStep(268, "Write attribute NULLABLE_INT8S Invalid Value");
             ListFreer listFreer;
             chip::app::DataModel::Nullable<int8_t> value;
             value.SetNonNull();
@@ -56045,36 +56097,36 @@ class TestClusterSuite : public TestCommand
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::NullableInt8s::Id,
                                   value, chip::NullOptional, chip::NullOptional);
         }
-        case 268: {
-            LogStep(268, "Read attribute NULLABLE_INT8S unchanged Value");
+        case 269: {
+            LogStep(269, "Read attribute NULLABLE_INT8S unchanged Value");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::NullableInt8s::Id, true,
                                  chip::NullOptional);
         }
-        case 269: {
-            LogStep(269, "Write attribute NULLABLE_INT8S null Value");
+        case 270: {
+            LogStep(270, "Write attribute NULLABLE_INT8S null Value");
             ListFreer listFreer;
             chip::app::DataModel::Nullable<int8_t> value;
             value.SetNull();
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::NullableInt8s::Id,
                                   value, chip::NullOptional, chip::NullOptional);
         }
-        case 270: {
-            LogStep(270, "Read attribute NULLABLE_INT8S null Value");
-            return ReadAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::NullableInt8s::Id, true,
-                                 chip::NullOptional);
-        }
         case 271: {
-            LogStep(271, "Read attribute NULLABLE_INT8S null Value & range");
+            LogStep(271, "Read attribute NULLABLE_INT8S null Value");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::NullableInt8s::Id, true,
                                  chip::NullOptional);
         }
         case 272: {
-            LogStep(272, "Read attribute NULLABLE_INT8S null Value & not");
+            LogStep(272, "Read attribute NULLABLE_INT8S null Value & range");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::NullableInt8s::Id, true,
                                  chip::NullOptional);
         }
         case 273: {
-            LogStep(273, "Write attribute NULLABLE_INT8S Value");
+            LogStep(273, "Read attribute NULLABLE_INT8S null Value & not");
+            return ReadAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::NullableInt8s::Id, true,
+                                 chip::NullOptional);
+        }
+        case 274: {
+            LogStep(274, "Write attribute NULLABLE_INT8S Value");
             ListFreer listFreer;
             chip::app::DataModel::Nullable<int8_t> value;
             value.SetNonNull();
@@ -56082,18 +56134,18 @@ class TestClusterSuite : public TestCommand
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::NullableInt8s::Id,
                                   value, chip::NullOptional, chip::NullOptional);
         }
-        case 274: {
-            LogStep(274, "Read attribute NULLABLE_INT8S Value in range");
+        case 275: {
+            LogStep(275, "Read attribute NULLABLE_INT8S Value in range");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::NullableInt8s::Id, true,
                                  chip::NullOptional);
         }
-        case 275: {
-            LogStep(275, "Read attribute NULLABLE_INT8S notValue OK");
+        case 276: {
+            LogStep(276, "Read attribute NULLABLE_INT8S notValue OK");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::NullableInt8s::Id, true,
                                  chip::NullOptional);
         }
-        case 276: {
-            LogStep(276, "Write attribute NULLABLE_INT16S Min Value");
+        case 277: {
+            LogStep(277, "Write attribute NULLABLE_INT16S Min Value");
             ListFreer listFreer;
             chip::app::DataModel::Nullable<int16_t> value;
             value.SetNonNull();
@@ -56101,13 +56153,13 @@ class TestClusterSuite : public TestCommand
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::NullableInt16s::Id,
                                   value, chip::NullOptional, chip::NullOptional);
         }
-        case 277: {
-            LogStep(277, "Read attribute NULLABLE_INT16S Min Value");
+        case 278: {
+            LogStep(278, "Read attribute NULLABLE_INT16S Min Value");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::NullableInt16s::Id, true,
                                  chip::NullOptional);
         }
-        case 278: {
-            LogStep(278, "Write attribute NULLABLE_INT16S Invalid Value");
+        case 279: {
+            LogStep(279, "Write attribute NULLABLE_INT16S Invalid Value");
             ListFreer listFreer;
             chip::app::DataModel::Nullable<int16_t> value;
             value.SetNonNull();
@@ -56115,36 +56167,36 @@ class TestClusterSuite : public TestCommand
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::NullableInt16s::Id,
                                   value, chip::NullOptional, chip::NullOptional);
         }
-        case 279: {
-            LogStep(279, "Read attribute NULLABLE_INT16S unchanged Value");
+        case 280: {
+            LogStep(280, "Read attribute NULLABLE_INT16S unchanged Value");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::NullableInt16s::Id, true,
                                  chip::NullOptional);
         }
-        case 280: {
-            LogStep(280, "Write attribute NULLABLE_INT16S null Value");
+        case 281: {
+            LogStep(281, "Write attribute NULLABLE_INT16S null Value");
             ListFreer listFreer;
             chip::app::DataModel::Nullable<int16_t> value;
             value.SetNull();
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::NullableInt16s::Id,
                                   value, chip::NullOptional, chip::NullOptional);
         }
-        case 281: {
-            LogStep(281, "Read attribute NULLABLE_INT16S null Value");
-            return ReadAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::NullableInt16s::Id, true,
-                                 chip::NullOptional);
-        }
         case 282: {
-            LogStep(282, "Read attribute NULLABLE_INT16S null Value & range");
+            LogStep(282, "Read attribute NULLABLE_INT16S null Value");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::NullableInt16s::Id, true,
                                  chip::NullOptional);
         }
         case 283: {
-            LogStep(283, "Read attribute NULLABLE_INT16S null Value & not");
+            LogStep(283, "Read attribute NULLABLE_INT16S null Value & range");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::NullableInt16s::Id, true,
                                  chip::NullOptional);
         }
         case 284: {
-            LogStep(284, "Write attribute NULLABLE_INT16S Value");
+            LogStep(284, "Read attribute NULLABLE_INT16S null Value & not");
+            return ReadAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::NullableInt16s::Id, true,
+                                 chip::NullOptional);
+        }
+        case 285: {
+            LogStep(285, "Write attribute NULLABLE_INT16S Value");
             ListFreer listFreer;
             chip::app::DataModel::Nullable<int16_t> value;
             value.SetNonNull();
@@ -56152,18 +56204,18 @@ class TestClusterSuite : public TestCommand
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::NullableInt16s::Id,
                                   value, chip::NullOptional, chip::NullOptional);
         }
-        case 285: {
-            LogStep(285, "Read attribute NULLABLE_INT16S Value in range");
+        case 286: {
+            LogStep(286, "Read attribute NULLABLE_INT16S Value in range");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::NullableInt16s::Id, true,
                                  chip::NullOptional);
         }
-        case 286: {
-            LogStep(286, "Read attribute NULLABLE_INT16S notValue OK");
+        case 287: {
+            LogStep(287, "Read attribute NULLABLE_INT16S notValue OK");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::NullableInt16s::Id, true,
                                  chip::NullOptional);
         }
-        case 287: {
-            LogStep(287, "Write attribute NULLABLE_INT32S Min Value");
+        case 288: {
+            LogStep(288, "Write attribute NULLABLE_INT32S Min Value");
             ListFreer listFreer;
             chip::app::DataModel::Nullable<int32_t> value;
             value.SetNonNull();
@@ -56171,13 +56223,13 @@ class TestClusterSuite : public TestCommand
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::NullableInt32s::Id,
                                   value, chip::NullOptional, chip::NullOptional);
         }
-        case 288: {
-            LogStep(288, "Read attribute NULLABLE_INT32S Min Value");
+        case 289: {
+            LogStep(289, "Read attribute NULLABLE_INT32S Min Value");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::NullableInt32s::Id, true,
                                  chip::NullOptional);
         }
-        case 289: {
-            LogStep(289, "Write attribute NULLABLE_INT32S Invalid Value");
+        case 290: {
+            LogStep(290, "Write attribute NULLABLE_INT32S Invalid Value");
             ListFreer listFreer;
             chip::app::DataModel::Nullable<int32_t> value;
             value.SetNonNull();
@@ -56185,36 +56237,36 @@ class TestClusterSuite : public TestCommand
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::NullableInt32s::Id,
                                   value, chip::NullOptional, chip::NullOptional);
         }
-        case 290: {
-            LogStep(290, "Read attribute NULLABLE_INT32S unchanged Value");
+        case 291: {
+            LogStep(291, "Read attribute NULLABLE_INT32S unchanged Value");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::NullableInt32s::Id, true,
                                  chip::NullOptional);
         }
-        case 291: {
-            LogStep(291, "Write attribute NULLABLE_INT32S null Value");
+        case 292: {
+            LogStep(292, "Write attribute NULLABLE_INT32S null Value");
             ListFreer listFreer;
             chip::app::DataModel::Nullable<int32_t> value;
             value.SetNull();
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::NullableInt32s::Id,
                                   value, chip::NullOptional, chip::NullOptional);
         }
-        case 292: {
-            LogStep(292, "Read attribute NULLABLE_INT32S null Value");
-            return ReadAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::NullableInt32s::Id, true,
-                                 chip::NullOptional);
-        }
         case 293: {
-            LogStep(293, "Read attribute NULLABLE_INT32S null Value & range");
+            LogStep(293, "Read attribute NULLABLE_INT32S null Value");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::NullableInt32s::Id, true,
                                  chip::NullOptional);
         }
         case 294: {
-            LogStep(294, "Read attribute NULLABLE_INT32S null Value & not");
+            LogStep(294, "Read attribute NULLABLE_INT32S null Value & range");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::NullableInt32s::Id, true,
                                  chip::NullOptional);
         }
         case 295: {
-            LogStep(295, "Write attribute NULLABLE_INT32S Value");
+            LogStep(295, "Read attribute NULLABLE_INT32S null Value & not");
+            return ReadAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::NullableInt32s::Id, true,
+                                 chip::NullOptional);
+        }
+        case 296: {
+            LogStep(296, "Write attribute NULLABLE_INT32S Value");
             ListFreer listFreer;
             chip::app::DataModel::Nullable<int32_t> value;
             value.SetNonNull();
@@ -56222,18 +56274,18 @@ class TestClusterSuite : public TestCommand
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::NullableInt32s::Id,
                                   value, chip::NullOptional, chip::NullOptional);
         }
-        case 296: {
-            LogStep(296, "Read attribute NULLABLE_INT32S Value in range");
+        case 297: {
+            LogStep(297, "Read attribute NULLABLE_INT32S Value in range");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::NullableInt32s::Id, true,
                                  chip::NullOptional);
         }
-        case 297: {
-            LogStep(297, "Read attribute NULLABLE_INT32S notValue OK");
+        case 298: {
+            LogStep(298, "Read attribute NULLABLE_INT32S notValue OK");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::NullableInt32s::Id, true,
                                  chip::NullOptional);
         }
-        case 298: {
-            LogStep(298, "Write attribute NULLABLE_INT64S Min Value");
+        case 299: {
+            LogStep(299, "Write attribute NULLABLE_INT64S Min Value");
             ListFreer listFreer;
             chip::app::DataModel::Nullable<int64_t> value;
             value.SetNonNull();
@@ -56241,13 +56293,13 @@ class TestClusterSuite : public TestCommand
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::NullableInt64s::Id,
                                   value, chip::NullOptional, chip::NullOptional);
         }
-        case 299: {
-            LogStep(299, "Read attribute NULLABLE_INT64S Min Value");
+        case 300: {
+            LogStep(300, "Read attribute NULLABLE_INT64S Min Value");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::NullableInt64s::Id, true,
                                  chip::NullOptional);
         }
-        case 300: {
-            LogStep(300, "Write attribute NULLABLE_INT64S Invalid Value");
+        case 301: {
+            LogStep(301, "Write attribute NULLABLE_INT64S Invalid Value");
             ListFreer listFreer;
             chip::app::DataModel::Nullable<int64_t> value;
             value.SetNonNull();
@@ -56255,36 +56307,36 @@ class TestClusterSuite : public TestCommand
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::NullableInt64s::Id,
                                   value, chip::NullOptional, chip::NullOptional);
         }
-        case 301: {
-            LogStep(301, "Read attribute NULLABLE_INT64S unchanged Value");
+        case 302: {
+            LogStep(302, "Read attribute NULLABLE_INT64S unchanged Value");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::NullableInt64s::Id, true,
                                  chip::NullOptional);
         }
-        case 302: {
-            LogStep(302, "Write attribute NULLABLE_INT64S null Value");
+        case 303: {
+            LogStep(303, "Write attribute NULLABLE_INT64S null Value");
             ListFreer listFreer;
             chip::app::DataModel::Nullable<int64_t> value;
             value.SetNull();
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::NullableInt64s::Id,
                                   value, chip::NullOptional, chip::NullOptional);
         }
-        case 303: {
-            LogStep(303, "Read attribute NULLABLE_INT64S null Value");
-            return ReadAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::NullableInt64s::Id, true,
-                                 chip::NullOptional);
-        }
         case 304: {
-            LogStep(304, "Read attribute NULLABLE_INT64S null Value & range");
+            LogStep(304, "Read attribute NULLABLE_INT64S null Value");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::NullableInt64s::Id, true,
                                  chip::NullOptional);
         }
         case 305: {
-            LogStep(305, "Read attribute NULLABLE_INT64S null Value & not");
+            LogStep(305, "Read attribute NULLABLE_INT64S null Value & range");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::NullableInt64s::Id, true,
                                  chip::NullOptional);
         }
         case 306: {
-            LogStep(306, "Write attribute NULLABLE_INT64S Value");
+            LogStep(306, "Read attribute NULLABLE_INT64S null Value & not");
+            return ReadAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::NullableInt64s::Id, true,
+                                 chip::NullOptional);
+        }
+        case 307: {
+            LogStep(307, "Write attribute NULLABLE_INT64S Value");
             ListFreer listFreer;
             chip::app::DataModel::Nullable<int64_t> value;
             value.SetNonNull();
@@ -56292,18 +56344,18 @@ class TestClusterSuite : public TestCommand
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::NullableInt64s::Id,
                                   value, chip::NullOptional, chip::NullOptional);
         }
-        case 307: {
-            LogStep(307, "Read attribute NULLABLE_INT64S Value in range");
+        case 308: {
+            LogStep(308, "Read attribute NULLABLE_INT64S Value in range");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::NullableInt64s::Id, true,
                                  chip::NullOptional);
         }
-        case 308: {
-            LogStep(308, "Read attribute NULLABLE_INT64S notValue OK");
+        case 309: {
+            LogStep(309, "Read attribute NULLABLE_INT64S notValue OK");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::NullableInt64s::Id, true,
                                  chip::NullOptional);
         }
-        case 309: {
-            LogStep(309, "Write attribute NULLABLE_SINGLE medium Value");
+        case 310: {
+            LogStep(310, "Write attribute NULLABLE_SINGLE medium Value");
             ListFreer listFreer;
             chip::app::DataModel::Nullable<float> value;
             value.SetNonNull();
@@ -56311,13 +56363,13 @@ class TestClusterSuite : public TestCommand
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::NullableFloatSingle::Id,
                                   value, chip::NullOptional, chip::NullOptional);
         }
-        case 310: {
-            LogStep(310, "Read attribute NULLABLE_SINGLE medium Value");
+        case 311: {
+            LogStep(311, "Read attribute NULLABLE_SINGLE medium Value");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::NullableFloatSingle::Id,
                                  true, chip::NullOptional);
         }
-        case 311: {
-            LogStep(311, "Write attribute NULLABLE_SINGLE largest Value");
+        case 312: {
+            LogStep(312, "Write attribute NULLABLE_SINGLE largest Value");
             ListFreer listFreer;
             chip::app::DataModel::Nullable<float> value;
             value.SetNonNull();
@@ -56325,13 +56377,13 @@ class TestClusterSuite : public TestCommand
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::NullableFloatSingle::Id,
                                   value, chip::NullOptional, chip::NullOptional);
         }
-        case 312: {
-            LogStep(312, "Read attribute NULLABLE_SINGLE largest Value");
+        case 313: {
+            LogStep(313, "Read attribute NULLABLE_SINGLE largest Value");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::NullableFloatSingle::Id,
                                  true, chip::NullOptional);
         }
-        case 313: {
-            LogStep(313, "Write attribute NULLABLE_SINGLE smallest Value");
+        case 314: {
+            LogStep(314, "Write attribute NULLABLE_SINGLE smallest Value");
             ListFreer listFreer;
             chip::app::DataModel::Nullable<float> value;
             value.SetNonNull();
@@ -56339,26 +56391,26 @@ class TestClusterSuite : public TestCommand
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::NullableFloatSingle::Id,
                                   value, chip::NullOptional, chip::NullOptional);
         }
-        case 314: {
-            LogStep(314, "Read attribute NULLABLE_SINGLE smallest Value");
+        case 315: {
+            LogStep(315, "Read attribute NULLABLE_SINGLE smallest Value");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::NullableFloatSingle::Id,
                                  true, chip::NullOptional);
         }
-        case 315: {
-            LogStep(315, "Write attribute NULLABLE_SINGLE null Value");
+        case 316: {
+            LogStep(316, "Write attribute NULLABLE_SINGLE null Value");
             ListFreer listFreer;
             chip::app::DataModel::Nullable<float> value;
             value.SetNull();
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::NullableFloatSingle::Id,
                                   value, chip::NullOptional, chip::NullOptional);
         }
-        case 316: {
-            LogStep(316, "Read attribute NULLABLE_SINGLE null Value");
+        case 317: {
+            LogStep(317, "Read attribute NULLABLE_SINGLE null Value");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::NullableFloatSingle::Id,
                                  true, chip::NullOptional);
         }
-        case 317: {
-            LogStep(317, "Write attribute NULLABLE_SINGLE 0 Value");
+        case 318: {
+            LogStep(318, "Write attribute NULLABLE_SINGLE 0 Value");
             ListFreer listFreer;
             chip::app::DataModel::Nullable<float> value;
             value.SetNonNull();
@@ -56366,13 +56418,13 @@ class TestClusterSuite : public TestCommand
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::NullableFloatSingle::Id,
                                   value, chip::NullOptional, chip::NullOptional);
         }
-        case 318: {
-            LogStep(318, "Read attribute NULLABLE_SINGLE 0 Value");
+        case 319: {
+            LogStep(319, "Read attribute NULLABLE_SINGLE 0 Value");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::NullableFloatSingle::Id,
                                  true, chip::NullOptional);
         }
-        case 319: {
-            LogStep(319, "Write attribute NULLABLE_DOUBLE medium Value");
+        case 320: {
+            LogStep(320, "Write attribute NULLABLE_DOUBLE medium Value");
             ListFreer listFreer;
             chip::app::DataModel::Nullable<double> value;
             value.SetNonNull();
@@ -56380,13 +56432,13 @@ class TestClusterSuite : public TestCommand
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::NullableFloatDouble::Id,
                                   value, chip::NullOptional, chip::NullOptional);
         }
-        case 320: {
-            LogStep(320, "Read attribute NULLABLE_DOUBLE medium Value");
+        case 321: {
+            LogStep(321, "Read attribute NULLABLE_DOUBLE medium Value");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::NullableFloatDouble::Id,
                                  true, chip::NullOptional);
         }
-        case 321: {
-            LogStep(321, "Write attribute NULLABLE_DOUBLE largest Value");
+        case 322: {
+            LogStep(322, "Write attribute NULLABLE_DOUBLE largest Value");
             ListFreer listFreer;
             chip::app::DataModel::Nullable<double> value;
             value.SetNonNull();
@@ -56394,13 +56446,13 @@ class TestClusterSuite : public TestCommand
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::NullableFloatDouble::Id,
                                   value, chip::NullOptional, chip::NullOptional);
         }
-        case 322: {
-            LogStep(322, "Read attribute NULLABLE_DOUBLE largest Value");
+        case 323: {
+            LogStep(323, "Read attribute NULLABLE_DOUBLE largest Value");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::NullableFloatDouble::Id,
                                  true, chip::NullOptional);
         }
-        case 323: {
-            LogStep(323, "Write attribute NULLABLE_DOUBLE smallest Value");
+        case 324: {
+            LogStep(324, "Write attribute NULLABLE_DOUBLE smallest Value");
             ListFreer listFreer;
             chip::app::DataModel::Nullable<double> value;
             value.SetNonNull();
@@ -56408,26 +56460,26 @@ class TestClusterSuite : public TestCommand
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::NullableFloatDouble::Id,
                                   value, chip::NullOptional, chip::NullOptional);
         }
-        case 324: {
-            LogStep(324, "Read attribute NULLABLE_DOUBLE smallest Value");
+        case 325: {
+            LogStep(325, "Read attribute NULLABLE_DOUBLE smallest Value");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::NullableFloatDouble::Id,
                                  true, chip::NullOptional);
         }
-        case 325: {
-            LogStep(325, "Write attribute NULLABLE_DOUBLE null Value");
+        case 326: {
+            LogStep(326, "Write attribute NULLABLE_DOUBLE null Value");
             ListFreer listFreer;
             chip::app::DataModel::Nullable<double> value;
             value.SetNull();
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::NullableFloatDouble::Id,
                                   value, chip::NullOptional, chip::NullOptional);
         }
-        case 326: {
-            LogStep(326, "Read attribute NULLABLE_DOUBLE null Value");
+        case 327: {
+            LogStep(327, "Read attribute NULLABLE_DOUBLE null Value");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::NullableFloatDouble::Id,
                                  true, chip::NullOptional);
         }
-        case 327: {
-            LogStep(327, "Write attribute NULLABLE_DOUBLE 0 Value");
+        case 328: {
+            LogStep(328, "Write attribute NULLABLE_DOUBLE 0 Value");
             ListFreer listFreer;
             chip::app::DataModel::Nullable<double> value;
             value.SetNonNull();
@@ -56435,13 +56487,13 @@ class TestClusterSuite : public TestCommand
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::NullableFloatDouble::Id,
                                   value, chip::NullOptional, chip::NullOptional);
         }
-        case 328: {
-            LogStep(328, "Read attribute NULLABLE_DOUBLE 0 Value");
+        case 329: {
+            LogStep(329, "Read attribute NULLABLE_DOUBLE 0 Value");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::NullableFloatDouble::Id,
                                  true, chip::NullOptional);
         }
-        case 329: {
-            LogStep(329, "Write attribute NULLABLE_ENUM8 Min Value");
+        case 330: {
+            LogStep(330, "Write attribute NULLABLE_ENUM8 Min Value");
             ListFreer listFreer;
             chip::app::DataModel::Nullable<uint8_t> value;
             value.SetNonNull();
@@ -56449,13 +56501,13 @@ class TestClusterSuite : public TestCommand
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::NullableEnum8::Id,
                                   value, chip::NullOptional, chip::NullOptional);
         }
-        case 330: {
-            LogStep(330, "Read attribute NULLABLE_ENUM8 Min Value");
+        case 331: {
+            LogStep(331, "Read attribute NULLABLE_ENUM8 Min Value");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::NullableEnum8::Id, true,
                                  chip::NullOptional);
         }
-        case 331: {
-            LogStep(331, "Write attribute NULLABLE_ENUM8 Max Value");
+        case 332: {
+            LogStep(332, "Write attribute NULLABLE_ENUM8 Max Value");
             ListFreer listFreer;
             chip::app::DataModel::Nullable<uint8_t> value;
             value.SetNonNull();
@@ -56463,13 +56515,13 @@ class TestClusterSuite : public TestCommand
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::NullableEnum8::Id,
                                   value, chip::NullOptional, chip::NullOptional);
         }
-        case 332: {
-            LogStep(332, "Read attribute NULLABLE_ENUM8 Max Value");
+        case 333: {
+            LogStep(333, "Read attribute NULLABLE_ENUM8 Max Value");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::NullableEnum8::Id, true,
                                  chip::NullOptional);
         }
-        case 333: {
-            LogStep(333, "Write attribute NULLABLE_ENUM8 Invalid Value");
+        case 334: {
+            LogStep(334, "Write attribute NULLABLE_ENUM8 Invalid Value");
             ListFreer listFreer;
             chip::app::DataModel::Nullable<uint8_t> value;
             value.SetNonNull();
@@ -56477,26 +56529,26 @@ class TestClusterSuite : public TestCommand
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::NullableEnum8::Id,
                                   value, chip::NullOptional, chip::NullOptional);
         }
-        case 334: {
-            LogStep(334, "Read attribute NULLABLE_ENUM8 unchanged Value");
+        case 335: {
+            LogStep(335, "Read attribute NULLABLE_ENUM8 unchanged Value");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::NullableEnum8::Id, true,
                                  chip::NullOptional);
         }
-        case 335: {
-            LogStep(335, "Write attribute NULLABLE_ENUM8 null Value");
+        case 336: {
+            LogStep(336, "Write attribute NULLABLE_ENUM8 null Value");
             ListFreer listFreer;
             chip::app::DataModel::Nullable<uint8_t> value;
             value.SetNull();
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::NullableEnum8::Id,
                                   value, chip::NullOptional, chip::NullOptional);
         }
-        case 336: {
-            LogStep(336, "Read attribute NULLABLE_ENUM8 null Value");
+        case 337: {
+            LogStep(337, "Read attribute NULLABLE_ENUM8 null Value");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::NullableEnum8::Id, true,
                                  chip::NullOptional);
         }
-        case 337: {
-            LogStep(337, "Write attribute NULLABLE_ENUM16 Min Value");
+        case 338: {
+            LogStep(338, "Write attribute NULLABLE_ENUM16 Min Value");
             ListFreer listFreer;
             chip::app::DataModel::Nullable<uint16_t> value;
             value.SetNonNull();
@@ -56504,13 +56556,13 @@ class TestClusterSuite : public TestCommand
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::NullableEnum16::Id,
                                   value, chip::NullOptional, chip::NullOptional);
         }
-        case 338: {
-            LogStep(338, "Read attribute NULLABLE_ENUM16 Min Value");
+        case 339: {
+            LogStep(339, "Read attribute NULLABLE_ENUM16 Min Value");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::NullableEnum16::Id, true,
                                  chip::NullOptional);
         }
-        case 339: {
-            LogStep(339, "Write attribute NULLABLE_ENUM16 Max Value");
+        case 340: {
+            LogStep(340, "Write attribute NULLABLE_ENUM16 Max Value");
             ListFreer listFreer;
             chip::app::DataModel::Nullable<uint16_t> value;
             value.SetNonNull();
@@ -56518,13 +56570,13 @@ class TestClusterSuite : public TestCommand
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::NullableEnum16::Id,
                                   value, chip::NullOptional, chip::NullOptional);
         }
-        case 340: {
-            LogStep(340, "Read attribute NULLABLE_ENUM16 Max Value");
+        case 341: {
+            LogStep(341, "Read attribute NULLABLE_ENUM16 Max Value");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::NullableEnum16::Id, true,
                                  chip::NullOptional);
         }
-        case 341: {
-            LogStep(341, "Write attribute NULLABLE_ENUM16 Invalid Value");
+        case 342: {
+            LogStep(342, "Write attribute NULLABLE_ENUM16 Invalid Value");
             ListFreer listFreer;
             chip::app::DataModel::Nullable<uint16_t> value;
             value.SetNonNull();
@@ -56532,26 +56584,26 @@ class TestClusterSuite : public TestCommand
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::NullableEnum16::Id,
                                   value, chip::NullOptional, chip::NullOptional);
         }
-        case 342: {
-            LogStep(342, "Read attribute NULLABLE_ENUM16 unchanged Value");
+        case 343: {
+            LogStep(343, "Read attribute NULLABLE_ENUM16 unchanged Value");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::NullableEnum16::Id, true,
                                  chip::NullOptional);
         }
-        case 343: {
-            LogStep(343, "Write attribute NULLABLE_ENUM16 null Value");
+        case 344: {
+            LogStep(344, "Write attribute NULLABLE_ENUM16 null Value");
             ListFreer listFreer;
             chip::app::DataModel::Nullable<uint16_t> value;
             value.SetNull();
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::NullableEnum16::Id,
                                   value, chip::NullOptional, chip::NullOptional);
         }
-        case 344: {
-            LogStep(344, "Read attribute NULLABLE_ENUM16 null Value");
+        case 345: {
+            LogStep(345, "Read attribute NULLABLE_ENUM16 null Value");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::NullableEnum16::Id, true,
                                  chip::NullOptional);
         }
-        case 345: {
-            LogStep(345, "Write attribute NULLABLE_SIMPLE_ENUM Min Value");
+        case 346: {
+            LogStep(346, "Write attribute NULLABLE_SIMPLE_ENUM Min Value");
             ListFreer listFreer;
             chip::app::DataModel::Nullable<chip::app::Clusters::UnitTesting::SimpleEnum> value;
             value.SetNonNull();
@@ -56559,13 +56611,13 @@ class TestClusterSuite : public TestCommand
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::NullableEnumAttr::Id,
                                   value, chip::NullOptional, chip::NullOptional);
         }
-        case 346: {
-            LogStep(346, "Read attribute NULLABLE_SIMPLE_ENUM Min Value");
+        case 347: {
+            LogStep(347, "Read attribute NULLABLE_SIMPLE_ENUM Min Value");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::NullableEnumAttr::Id,
                                  true, chip::NullOptional);
         }
-        case 347: {
-            LogStep(347, "Write attribute NULLABLE_SIMPLE_ENUM Max Value");
+        case 348: {
+            LogStep(348, "Write attribute NULLABLE_SIMPLE_ENUM Max Value");
             ListFreer listFreer;
             chip::app::DataModel::Nullable<chip::app::Clusters::UnitTesting::SimpleEnum> value;
             value.SetNonNull();
@@ -56573,13 +56625,13 @@ class TestClusterSuite : public TestCommand
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::NullableEnumAttr::Id,
                                   value, chip::NullOptional, chip::NullOptional);
         }
-        case 348: {
-            LogStep(348, "Read attribute NULLABLE_SIMPLE_ENUM Max Value");
+        case 349: {
+            LogStep(349, "Read attribute NULLABLE_SIMPLE_ENUM Max Value");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::NullableEnumAttr::Id,
                                  true, chip::NullOptional);
         }
-        case 349: {
-            LogStep(349, "Write attribute NULLABLE_SIMPLE_ENUM Invalid Value");
+        case 350: {
+            LogStep(350, "Write attribute NULLABLE_SIMPLE_ENUM Invalid Value");
             ListFreer listFreer;
             chip::app::DataModel::Nullable<chip::app::Clusters::UnitTesting::SimpleEnum> value;
             value.SetNonNull();
@@ -56587,36 +56639,36 @@ class TestClusterSuite : public TestCommand
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::NullableEnumAttr::Id,
                                   value, chip::NullOptional, chip::NullOptional);
         }
-        case 350: {
-            LogStep(350, "Read attribute NULLABLE_SIMPLE_ENUM unchanged Value");
+        case 351: {
+            LogStep(351, "Read attribute NULLABLE_SIMPLE_ENUM unchanged Value");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::NullableEnumAttr::Id,
                                  true, chip::NullOptional);
         }
-        case 351: {
-            LogStep(351, "Write attribute NULLABLE_SIMPLE_ENUM null Value");
+        case 352: {
+            LogStep(352, "Write attribute NULLABLE_SIMPLE_ENUM null Value");
             ListFreer listFreer;
             chip::app::DataModel::Nullable<chip::app::Clusters::UnitTesting::SimpleEnum> value;
             value.SetNull();
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::NullableEnumAttr::Id,
                                   value, chip::NullOptional, chip::NullOptional);
         }
-        case 352: {
-            LogStep(352, "Read attribute NULLABLE_SIMPLE_ENUM null Value");
+        case 353: {
+            LogStep(353, "Read attribute NULLABLE_SIMPLE_ENUM null Value");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::NullableEnumAttr::Id,
                                  true, chip::NullOptional);
         }
-        case 353: {
-            LogStep(353, "Read attribute NULLABLE_SIMPLE_ENUM not 3 Value");
+        case 354: {
+            LogStep(354, "Read attribute NULLABLE_SIMPLE_ENUM not 3 Value");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::NullableEnumAttr::Id,
                                  true, chip::NullOptional);
         }
-        case 354: {
-            LogStep(354, "Read attribute NULLABLE_OCTET_STRING Default Value");
+        case 355: {
+            LogStep(355, "Read attribute NULLABLE_OCTET_STRING Default Value");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::NullableOctetString::Id,
                                  true, chip::NullOptional);
         }
-        case 355: {
-            LogStep(355, "Write attribute NULLABLE_OCTET_STRING");
+        case 356: {
+            LogStep(356, "Write attribute NULLABLE_OCTET_STRING");
             ListFreer listFreer;
             chip::app::DataModel::Nullable<chip::ByteSpan> value;
             value.SetNonNull();
@@ -56624,26 +56676,26 @@ class TestClusterSuite : public TestCommand
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::NullableOctetString::Id,
                                   value, chip::NullOptional, chip::NullOptional);
         }
-        case 356: {
-            LogStep(356, "Read attribute NULLABLE_OCTET_STRING");
+        case 357: {
+            LogStep(357, "Read attribute NULLABLE_OCTET_STRING");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::NullableOctetString::Id,
                                  true, chip::NullOptional);
         }
-        case 357: {
-            LogStep(357, "Write attribute NULLABLE_OCTET_STRING");
+        case 358: {
+            LogStep(358, "Write attribute NULLABLE_OCTET_STRING");
             ListFreer listFreer;
             chip::app::DataModel::Nullable<chip::ByteSpan> value;
             value.SetNull();
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::NullableOctetString::Id,
                                   value, chip::NullOptional, chip::NullOptional);
         }
-        case 358: {
-            LogStep(358, "Read attribute NULLABLE_OCTET_STRING");
+        case 359: {
+            LogStep(359, "Read attribute NULLABLE_OCTET_STRING");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::NullableOctetString::Id,
                                  true, chip::NullOptional);
         }
-        case 359: {
-            LogStep(359, "Write attribute NULLABLE_OCTET_STRING");
+        case 360: {
+            LogStep(360, "Write attribute NULLABLE_OCTET_STRING");
             ListFreer listFreer;
             chip::app::DataModel::Nullable<chip::ByteSpan> value;
             value.SetNonNull();
@@ -56651,23 +56703,23 @@ class TestClusterSuite : public TestCommand
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::NullableOctetString::Id,
                                   value, chip::NullOptional, chip::NullOptional);
         }
-        case 360: {
-            LogStep(360, "Read attribute NULLABLE_OCTET_STRING");
+        case 361: {
+            LogStep(361, "Read attribute NULLABLE_OCTET_STRING");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::NullableOctetString::Id,
                                  true, chip::NullOptional);
         }
-        case 361: {
-            LogStep(361, "Read attribute NULLABLE_OCTET_STRING not TestValue");
+        case 362: {
+            LogStep(362, "Read attribute NULLABLE_OCTET_STRING not TestValue");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::NullableOctetString::Id,
                                  true, chip::NullOptional);
         }
-        case 362: {
-            LogStep(362, "Read attribute NULLABLE_CHAR_STRING Default Value");
+        case 363: {
+            LogStep(363, "Read attribute NULLABLE_CHAR_STRING Default Value");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::NullableCharString::Id,
                                  true, chip::NullOptional);
         }
-        case 363: {
-            LogStep(363, "Write attribute NULLABLE_CHAR_STRING");
+        case 364: {
+            LogStep(364, "Write attribute NULLABLE_CHAR_STRING");
             ListFreer listFreer;
             chip::app::DataModel::Nullable<chip::CharSpan> value;
             value.SetNonNull();
@@ -56675,31 +56727,31 @@ class TestClusterSuite : public TestCommand
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::NullableCharString::Id,
                                   value, chip::NullOptional, chip::NullOptional);
         }
-        case 364: {
-            LogStep(364, "Read attribute NULLABLE_CHAR_STRING");
-            return ReadAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::NullableCharString::Id,
-                                 true, chip::NullOptional);
-        }
         case 365: {
             LogStep(365, "Read attribute NULLABLE_CHAR_STRING");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::NullableCharString::Id,
                                  true, chip::NullOptional);
         }
         case 366: {
-            LogStep(366, "Write attribute NULLABLE_CHAR_STRING - Value too long");
+            LogStep(366, "Read attribute NULLABLE_CHAR_STRING");
+            return ReadAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::NullableCharString::Id,
+                                 true, chip::NullOptional);
+        }
+        case 367: {
+            LogStep(367, "Write attribute NULLABLE_CHAR_STRING - Value too long");
             ListFreer listFreer;
             chip::app::DataModel::Nullable<chip::CharSpan> value;
             value.SetNull();
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::NullableCharString::Id,
                                   value, chip::NullOptional, chip::NullOptional);
         }
-        case 367: {
-            LogStep(367, "Read attribute NULLABLE_CHAR_STRING");
+        case 368: {
+            LogStep(368, "Read attribute NULLABLE_CHAR_STRING");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::NullableCharString::Id,
                                  true, chip::NullOptional);
         }
-        case 368: {
-            LogStep(368, "Write attribute NULLABLE_CHAR_STRING - Empty");
+        case 369: {
+            LogStep(369, "Write attribute NULLABLE_CHAR_STRING - Empty");
             ListFreer listFreer;
             chip::app::DataModel::Nullable<chip::CharSpan> value;
             value.SetNonNull();
@@ -56707,28 +56759,28 @@ class TestClusterSuite : public TestCommand
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::NullableCharString::Id,
                                   value, chip::NullOptional, chip::NullOptional);
         }
-        case 369: {
-            LogStep(369, "Read attribute NULLABLE_CHAR_STRING");
+        case 370: {
+            LogStep(370, "Read attribute NULLABLE_CHAR_STRING");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::NullableCharString::Id,
                                  true, chip::NullOptional);
         }
-        case 370: {
-            LogStep(370, "Read attribute NULLABLE_CHAR_STRING not ☉T☉");
+        case 371: {
+            LogStep(371, "Read attribute NULLABLE_CHAR_STRING not ☉T☉");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::NullableCharString::Id,
                                  true, chip::NullOptional);
         }
-        case 371: {
-            LogStep(371, "Read attribute from nonexistent endpoint.");
+        case 372: {
+            LogStep(372, "Read attribute from nonexistent endpoint.");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(200), UnitTesting::Id, UnitTesting::Attributes::ListInt8u::Id, true,
                                  chip::NullOptional);
         }
-        case 372: {
-            LogStep(372, "Read attribute from nonexistent cluster.");
+        case 373: {
+            LogStep(373, "Read attribute from nonexistent cluster.");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(0), UnitTesting::Id, UnitTesting::Attributes::ListInt8u::Id, true,
                                  chip::NullOptional);
         }
-        case 373: {
-            LogStep(373, "Send a command that takes an optional parameter but do not set it.");
+        case 374: {
+            LogStep(374, "Send a command that takes an optional parameter but do not set it.");
             ListFreer listFreer;
             chip::app::Clusters::UnitTesting::Commands::TestSimpleOptionalArgumentRequest::Type value;
             return SendCommand(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id,
@@ -56736,8 +56788,8 @@ class TestClusterSuite : public TestCommand
 
             );
         }
-        case 374: {
-            LogStep(374, "Send a command that takes an optional parameter but do not set it.");
+        case 375: {
+            LogStep(375, "Send a command that takes an optional parameter but do not set it.");
             ListFreer listFreer;
             chip::app::Clusters::UnitTesting::Commands::TestSimpleOptionalArgumentRequest::Type value;
             value.arg1.Emplace();
@@ -56747,13 +56799,13 @@ class TestClusterSuite : public TestCommand
 
             );
         }
-        case 375: {
-            LogStep(375, "Subscribe to list attribute");
+        case 376: {
+            LogStep(376, "Subscribe to list attribute");
             return SubscribeAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::ListInt8u::Id, 2, 5,
                                       true, chip::NullOptional, chip::NullOptional, /* autoResubscribe = */ chip::NullOptional);
         }
-        case 376: {
-            LogStep(376, "Write subscribed-to list attribute");
+        case 377: {
+            LogStep(377, "Write subscribed-to list attribute");
             ListFreer listFreer;
             chip::app::DataModel::List<const uint8_t> value;
 
@@ -56769,98 +56821,98 @@ class TestClusterSuite : public TestCommand
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::ListInt8u::Id, value,
                                   chip::NullOptional, chip::NullOptional);
         }
-        case 377: {
-            LogStep(377, "Check for list attribute report");
+        case 378: {
+            LogStep(378, "Check for list attribute report");
             return WaitForReport();
         }
-        case 378: {
-            LogStep(378, "Read range-restricted unsigned 8-bit integer");
+        case 379: {
+            LogStep(379, "Read range-restricted unsigned 8-bit integer");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::RangeRestrictedInt8u::Id,
                                  true, chip::NullOptional);
         }
-        case 379: {
-            LogStep(379, "Write min value to a range-restricted unsigned 8-bit integer");
+        case 380: {
+            LogStep(380, "Write min value to a range-restricted unsigned 8-bit integer");
             ListFreer listFreer;
             uint8_t value;
             value = 0U;
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id,
                                   UnitTesting::Attributes::RangeRestrictedInt8u::Id, value, chip::NullOptional, chip::NullOptional);
         }
-        case 380: {
-            LogStep(380, "Write just-below-range value to a range-restricted unsigned 8-bit integer");
+        case 381: {
+            LogStep(381, "Write just-below-range value to a range-restricted unsigned 8-bit integer");
             ListFreer listFreer;
             uint8_t value;
             value = 19U;
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id,
                                   UnitTesting::Attributes::RangeRestrictedInt8u::Id, value, chip::NullOptional, chip::NullOptional);
         }
-        case 381: {
-            LogStep(381, "Write just-above-range value to a range-restricted unsigned 8-bit integer");
+        case 382: {
+            LogStep(382, "Write just-above-range value to a range-restricted unsigned 8-bit integer");
             ListFreer listFreer;
             uint8_t value;
             value = 101U;
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id,
                                   UnitTesting::Attributes::RangeRestrictedInt8u::Id, value, chip::NullOptional, chip::NullOptional);
         }
-        case 382: {
-            LogStep(382, "Write max value to a range-restricted unsigned 8-bit integer");
+        case 383: {
+            LogStep(383, "Write max value to a range-restricted unsigned 8-bit integer");
             ListFreer listFreer;
             uint8_t value;
             value = 255U;
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id,
                                   UnitTesting::Attributes::RangeRestrictedInt8u::Id, value, chip::NullOptional, chip::NullOptional);
         }
-        case 383: {
-            LogStep(383, "Verify range-restricted unsigned 8-bit integer value has not changed");
+        case 384: {
+            LogStep(384, "Verify range-restricted unsigned 8-bit integer value has not changed");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::RangeRestrictedInt8u::Id,
                                  true, chip::NullOptional);
         }
-        case 384: {
-            LogStep(384, "Write min valid value to a range-restricted unsigned 8-bit integer");
+        case 385: {
+            LogStep(385, "Write min valid value to a range-restricted unsigned 8-bit integer");
             ListFreer listFreer;
             uint8_t value;
             value = 20U;
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id,
                                   UnitTesting::Attributes::RangeRestrictedInt8u::Id, value, chip::NullOptional, chip::NullOptional);
         }
-        case 385: {
-            LogStep(385, "Verify range-restricted unsigned 8-bit integer value is at min valid");
+        case 386: {
+            LogStep(386, "Verify range-restricted unsigned 8-bit integer value is at min valid");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::RangeRestrictedInt8u::Id,
                                  true, chip::NullOptional);
         }
-        case 386: {
-            LogStep(386, "Write max valid value to a range-restricted unsigned 8-bit integer");
+        case 387: {
+            LogStep(387, "Write max valid value to a range-restricted unsigned 8-bit integer");
             ListFreer listFreer;
             uint8_t value;
             value = 100U;
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id,
                                   UnitTesting::Attributes::RangeRestrictedInt8u::Id, value, chip::NullOptional, chip::NullOptional);
         }
-        case 387: {
-            LogStep(387, "Verify range-restricted unsigned 8-bit integer value is at max valid");
+        case 388: {
+            LogStep(388, "Verify range-restricted unsigned 8-bit integer value is at max valid");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::RangeRestrictedInt8u::Id,
                                  true, chip::NullOptional);
         }
-        case 388: {
-            LogStep(388, "Write middle valid value to a range-restricted unsigned 8-bit integer");
+        case 389: {
+            LogStep(389, "Write middle valid value to a range-restricted unsigned 8-bit integer");
             ListFreer listFreer;
             uint8_t value;
             value = 50U;
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id,
                                   UnitTesting::Attributes::RangeRestrictedInt8u::Id, value, chip::NullOptional, chip::NullOptional);
         }
-        case 389: {
-            LogStep(389, "Verify range-restricted unsigned 8-bit integer value is at mid valid");
+        case 390: {
+            LogStep(390, "Verify range-restricted unsigned 8-bit integer value is at mid valid");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::RangeRestrictedInt8u::Id,
                                  true, chip::NullOptional);
         }
-        case 390: {
-            LogStep(390, "Read range-restricted unsigned 16-bit integer");
+        case 391: {
+            LogStep(391, "Read range-restricted unsigned 16-bit integer");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id,
                                  UnitTesting::Attributes::RangeRestrictedInt16u::Id, true, chip::NullOptional);
         }
-        case 391: {
-            LogStep(391, "Write min value to a range-restricted unsigned 16-bit integer");
+        case 392: {
+            LogStep(392, "Write min value to a range-restricted unsigned 16-bit integer");
             ListFreer listFreer;
             uint16_t value;
             value = 0U;
@@ -56868,8 +56920,8 @@ class TestClusterSuite : public TestCommand
                                   UnitTesting::Attributes::RangeRestrictedInt16u::Id, value, chip::NullOptional,
                                   chip::NullOptional);
         }
-        case 392: {
-            LogStep(392, "Write just-below-range value to a range-restricted unsigned 16-bit integer");
+        case 393: {
+            LogStep(393, "Write just-below-range value to a range-restricted unsigned 16-bit integer");
             ListFreer listFreer;
             uint16_t value;
             value = 99U;
@@ -56877,8 +56929,8 @@ class TestClusterSuite : public TestCommand
                                   UnitTesting::Attributes::RangeRestrictedInt16u::Id, value, chip::NullOptional,
                                   chip::NullOptional);
         }
-        case 393: {
-            LogStep(393, "Write just-above-range value to a range-restricted unsigned 16-bit integer");
+        case 394: {
+            LogStep(394, "Write just-above-range value to a range-restricted unsigned 16-bit integer");
             ListFreer listFreer;
             uint16_t value;
             value = 1001U;
@@ -56886,8 +56938,8 @@ class TestClusterSuite : public TestCommand
                                   UnitTesting::Attributes::RangeRestrictedInt16u::Id, value, chip::NullOptional,
                                   chip::NullOptional);
         }
-        case 394: {
-            LogStep(394, "Write max value to a range-restricted unsigned 16-bit integer");
+        case 395: {
+            LogStep(395, "Write max value to a range-restricted unsigned 16-bit integer");
             ListFreer listFreer;
             uint16_t value;
             value = 65535U;
@@ -56895,13 +56947,13 @@ class TestClusterSuite : public TestCommand
                                   UnitTesting::Attributes::RangeRestrictedInt16u::Id, value, chip::NullOptional,
                                   chip::NullOptional);
         }
-        case 395: {
-            LogStep(395, "Verify range-restricted unsigned 16-bit integer value has not changed");
+        case 396: {
+            LogStep(396, "Verify range-restricted unsigned 16-bit integer value has not changed");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id,
                                  UnitTesting::Attributes::RangeRestrictedInt16u::Id, true, chip::NullOptional);
         }
-        case 396: {
-            LogStep(396, "Write min valid value to a range-restricted unsigned 16-bit integer");
+        case 397: {
+            LogStep(397, "Write min valid value to a range-restricted unsigned 16-bit integer");
             ListFreer listFreer;
             uint16_t value;
             value = 100U;
@@ -56909,13 +56961,13 @@ class TestClusterSuite : public TestCommand
                                   UnitTesting::Attributes::RangeRestrictedInt16u::Id, value, chip::NullOptional,
                                   chip::NullOptional);
         }
-        case 397: {
-            LogStep(397, "Verify range-restricted unsigned 16-bit integer value is at min valid");
+        case 398: {
+            LogStep(398, "Verify range-restricted unsigned 16-bit integer value is at min valid");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id,
                                  UnitTesting::Attributes::RangeRestrictedInt16u::Id, true, chip::NullOptional);
         }
-        case 398: {
-            LogStep(398, "Write max valid value to a range-restricted unsigned 16-bit integer");
+        case 399: {
+            LogStep(399, "Write max valid value to a range-restricted unsigned 16-bit integer");
             ListFreer listFreer;
             uint16_t value;
             value = 1000U;
@@ -56923,13 +56975,13 @@ class TestClusterSuite : public TestCommand
                                   UnitTesting::Attributes::RangeRestrictedInt16u::Id, value, chip::NullOptional,
                                   chip::NullOptional);
         }
-        case 399: {
-            LogStep(399, "Verify range-restricted unsigned 16-bit integer value is at max valid");
+        case 400: {
+            LogStep(400, "Verify range-restricted unsigned 16-bit integer value is at max valid");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id,
                                  UnitTesting::Attributes::RangeRestrictedInt16u::Id, true, chip::NullOptional);
         }
-        case 400: {
-            LogStep(400, "Write middle valid value to a range-restricted unsigned 16-bit integer");
+        case 401: {
+            LogStep(401, "Write middle valid value to a range-restricted unsigned 16-bit integer");
             ListFreer listFreer;
             uint16_t value;
             value = 500U;
@@ -56937,99 +56989,99 @@ class TestClusterSuite : public TestCommand
                                   UnitTesting::Attributes::RangeRestrictedInt16u::Id, value, chip::NullOptional,
                                   chip::NullOptional);
         }
-        case 401: {
-            LogStep(401, "Verify range-restricted unsigned 16-bit integer value is at mid valid");
+        case 402: {
+            LogStep(402, "Verify range-restricted unsigned 16-bit integer value is at mid valid");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id,
                                  UnitTesting::Attributes::RangeRestrictedInt16u::Id, true, chip::NullOptional);
         }
-        case 402: {
-            LogStep(402, "Read range-restricted signed 8-bit integer");
+        case 403: {
+            LogStep(403, "Read range-restricted signed 8-bit integer");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::RangeRestrictedInt8s::Id,
                                  true, chip::NullOptional);
         }
-        case 403: {
-            LogStep(403, "Write min value to a range-restricted signed 8-bit integer");
+        case 404: {
+            LogStep(404, "Write min value to a range-restricted signed 8-bit integer");
             ListFreer listFreer;
             int8_t value;
             value = -128;
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id,
                                   UnitTesting::Attributes::RangeRestrictedInt8s::Id, value, chip::NullOptional, chip::NullOptional);
         }
-        case 404: {
-            LogStep(404, "Write just-below-range value to a range-restricted signed 8-bit integer");
+        case 405: {
+            LogStep(405, "Write just-below-range value to a range-restricted signed 8-bit integer");
             ListFreer listFreer;
             int8_t value;
             value = -41;
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id,
                                   UnitTesting::Attributes::RangeRestrictedInt8s::Id, value, chip::NullOptional, chip::NullOptional);
         }
-        case 405: {
-            LogStep(405, "Write just-above-range value to a range-restricted signed 8-bit integer");
+        case 406: {
+            LogStep(406, "Write just-above-range value to a range-restricted signed 8-bit integer");
             ListFreer listFreer;
             int8_t value;
             value = 51;
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id,
                                   UnitTesting::Attributes::RangeRestrictedInt8s::Id, value, chip::NullOptional, chip::NullOptional);
         }
-        case 406: {
-            LogStep(406, "Write max value to a range-restricted signed 8-bit integer");
+        case 407: {
+            LogStep(407, "Write max value to a range-restricted signed 8-bit integer");
             ListFreer listFreer;
             int8_t value;
             value = 127;
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id,
                                   UnitTesting::Attributes::RangeRestrictedInt8s::Id, value, chip::NullOptional, chip::NullOptional);
         }
-        case 407: {
-            LogStep(407, "Verify range-restricted signed 8-bit integer value has not changed");
+        case 408: {
+            LogStep(408, "Verify range-restricted signed 8-bit integer value has not changed");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::RangeRestrictedInt8s::Id,
                                  true, chip::NullOptional);
         }
-        case 408: {
-            LogStep(408, "Write min valid value to a range-restricted signed 8-bit integer");
+        case 409: {
+            LogStep(409, "Write min valid value to a range-restricted signed 8-bit integer");
             ListFreer listFreer;
             int8_t value;
             value = -40;
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id,
                                   UnitTesting::Attributes::RangeRestrictedInt8s::Id, value, chip::NullOptional, chip::NullOptional);
         }
-        case 409: {
-            LogStep(409, "Verify range-restricted signed 8-bit integer value is at min valid");
+        case 410: {
+            LogStep(410, "Verify range-restricted signed 8-bit integer value is at min valid");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::RangeRestrictedInt8s::Id,
                                  true, chip::NullOptional);
         }
-        case 410: {
-            LogStep(410, "Write max valid value to a range-restricted signed 8-bit integer");
+        case 411: {
+            LogStep(411, "Write max valid value to a range-restricted signed 8-bit integer");
             ListFreer listFreer;
             int8_t value;
             value = 50;
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id,
                                   UnitTesting::Attributes::RangeRestrictedInt8s::Id, value, chip::NullOptional, chip::NullOptional);
         }
-        case 411: {
-            LogStep(411, "Verify range-restricted signed 8-bit integer value is at max valid");
+        case 412: {
+            LogStep(412, "Verify range-restricted signed 8-bit integer value is at max valid");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::RangeRestrictedInt8s::Id,
                                  true, chip::NullOptional);
         }
-        case 412: {
-            LogStep(412, "Write middle valid value to a range-restricted signed 8-bit integer");
+        case 413: {
+            LogStep(413, "Write middle valid value to a range-restricted signed 8-bit integer");
             ListFreer listFreer;
             int8_t value;
             value = 6;
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id,
                                   UnitTesting::Attributes::RangeRestrictedInt8s::Id, value, chip::NullOptional, chip::NullOptional);
         }
-        case 413: {
-            LogStep(413, "Verify range-restricted signed 8-bit integer value is at mid valid");
+        case 414: {
+            LogStep(414, "Verify range-restricted signed 8-bit integer value is at mid valid");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::RangeRestrictedInt8s::Id,
                                  true, chip::NullOptional);
         }
-        case 414: {
-            LogStep(414, "Read range-restricted signed 16-bit integer");
+        case 415: {
+            LogStep(415, "Read range-restricted signed 16-bit integer");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id,
                                  UnitTesting::Attributes::RangeRestrictedInt16s::Id, true, chip::NullOptional);
         }
-        case 415: {
-            LogStep(415, "Write min value to a range-restricted signed 16-bit integer");
+        case 416: {
+            LogStep(416, "Write min value to a range-restricted signed 16-bit integer");
             ListFreer listFreer;
             int16_t value;
             value = -32768;
@@ -57037,8 +57089,8 @@ class TestClusterSuite : public TestCommand
                                   UnitTesting::Attributes::RangeRestrictedInt16s::Id, value, chip::NullOptional,
                                   chip::NullOptional);
         }
-        case 416: {
-            LogStep(416, "Write just-below-range value to a range-restricted signed 16-bit integer");
+        case 417: {
+            LogStep(417, "Write just-below-range value to a range-restricted signed 16-bit integer");
             ListFreer listFreer;
             int16_t value;
             value = -151;
@@ -57046,8 +57098,8 @@ class TestClusterSuite : public TestCommand
                                   UnitTesting::Attributes::RangeRestrictedInt16s::Id, value, chip::NullOptional,
                                   chip::NullOptional);
         }
-        case 417: {
-            LogStep(417, "Write just-above-range value to a range-restricted signed 16-bit integer");
+        case 418: {
+            LogStep(418, "Write just-above-range value to a range-restricted signed 16-bit integer");
             ListFreer listFreer;
             int16_t value;
             value = 201;
@@ -57055,8 +57107,8 @@ class TestClusterSuite : public TestCommand
                                   UnitTesting::Attributes::RangeRestrictedInt16s::Id, value, chip::NullOptional,
                                   chip::NullOptional);
         }
-        case 418: {
-            LogStep(418, "Write max value to a range-restricted signed 16-bit integer");
+        case 419: {
+            LogStep(419, "Write max value to a range-restricted signed 16-bit integer");
             ListFreer listFreer;
             int16_t value;
             value = 32767;
@@ -57064,13 +57116,13 @@ class TestClusterSuite : public TestCommand
                                   UnitTesting::Attributes::RangeRestrictedInt16s::Id, value, chip::NullOptional,
                                   chip::NullOptional);
         }
-        case 419: {
-            LogStep(419, "Verify range-restricted signed 16-bit integer value has not changed");
+        case 420: {
+            LogStep(420, "Verify range-restricted signed 16-bit integer value has not changed");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id,
                                  UnitTesting::Attributes::RangeRestrictedInt16s::Id, true, chip::NullOptional);
         }
-        case 420: {
-            LogStep(420, "Write min valid value to a range-restricted signed 16-bit integer");
+        case 421: {
+            LogStep(421, "Write min valid value to a range-restricted signed 16-bit integer");
             ListFreer listFreer;
             int16_t value;
             value = -150;
@@ -57078,13 +57130,13 @@ class TestClusterSuite : public TestCommand
                                   UnitTesting::Attributes::RangeRestrictedInt16s::Id, value, chip::NullOptional,
                                   chip::NullOptional);
         }
-        case 421: {
-            LogStep(421, "Verify range-restricted signed 16-bit integer value is at min valid");
+        case 422: {
+            LogStep(422, "Verify range-restricted signed 16-bit integer value is at min valid");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id,
                                  UnitTesting::Attributes::RangeRestrictedInt16s::Id, true, chip::NullOptional);
         }
-        case 422: {
-            LogStep(422, "Write max valid value to a range-restricted signed 16-bit integer");
+        case 423: {
+            LogStep(423, "Write max valid value to a range-restricted signed 16-bit integer");
             ListFreer listFreer;
             int16_t value;
             value = 200;
@@ -57092,13 +57144,13 @@ class TestClusterSuite : public TestCommand
                                   UnitTesting::Attributes::RangeRestrictedInt16s::Id, value, chip::NullOptional,
                                   chip::NullOptional);
         }
-        case 423: {
-            LogStep(423, "Verify range-restricted signed 16-bit integer value is at max valid");
+        case 424: {
+            LogStep(424, "Verify range-restricted signed 16-bit integer value is at max valid");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id,
                                  UnitTesting::Attributes::RangeRestrictedInt16s::Id, true, chip::NullOptional);
         }
-        case 424: {
-            LogStep(424, "Write middle valid value to a range-restricted signed 16-bit integer");
+        case 425: {
+            LogStep(425, "Write middle valid value to a range-restricted signed 16-bit integer");
             ListFreer listFreer;
             int16_t value;
             value = 7;
@@ -57106,18 +57158,18 @@ class TestClusterSuite : public TestCommand
                                   UnitTesting::Attributes::RangeRestrictedInt16s::Id, value, chip::NullOptional,
                                   chip::NullOptional);
         }
-        case 425: {
-            LogStep(425, "Verify range-restricted signed 16-bit integer value is at mid valid");
+        case 426: {
+            LogStep(426, "Verify range-restricted signed 16-bit integer value is at mid valid");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id,
                                  UnitTesting::Attributes::RangeRestrictedInt16s::Id, true, chip::NullOptional);
         }
-        case 426: {
-            LogStep(426, "Read nullable range-restricted unsigned 8-bit integer");
+        case 427: {
+            LogStep(427, "Read nullable range-restricted unsigned 8-bit integer");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id,
                                  UnitTesting::Attributes::NullableRangeRestrictedInt8u::Id, true, chip::NullOptional);
         }
-        case 427: {
-            LogStep(427, "Write min value to a nullable range-restricted unsigned 8-bit integer");
+        case 428: {
+            LogStep(428, "Write min value to a nullable range-restricted unsigned 8-bit integer");
             ListFreer listFreer;
             chip::app::DataModel::Nullable<uint8_t> value;
             value.SetNonNull();
@@ -57126,8 +57178,8 @@ class TestClusterSuite : public TestCommand
                                   UnitTesting::Attributes::NullableRangeRestrictedInt8u::Id, value, chip::NullOptional,
                                   chip::NullOptional);
         }
-        case 428: {
-            LogStep(428, "Write just-below-range value to a nullable range-restricted unsigned 8-bit integer");
+        case 429: {
+            LogStep(429, "Write just-below-range value to a nullable range-restricted unsigned 8-bit integer");
             ListFreer listFreer;
             chip::app::DataModel::Nullable<uint8_t> value;
             value.SetNonNull();
@@ -57136,8 +57188,8 @@ class TestClusterSuite : public TestCommand
                                   UnitTesting::Attributes::NullableRangeRestrictedInt8u::Id, value, chip::NullOptional,
                                   chip::NullOptional);
         }
-        case 429: {
-            LogStep(429, "Write just-above-range value to a nullable range-restricted unsigned 8-bit integer");
+        case 430: {
+            LogStep(430, "Write just-above-range value to a nullable range-restricted unsigned 8-bit integer");
             ListFreer listFreer;
             chip::app::DataModel::Nullable<uint8_t> value;
             value.SetNonNull();
@@ -57146,8 +57198,8 @@ class TestClusterSuite : public TestCommand
                                   UnitTesting::Attributes::NullableRangeRestrictedInt8u::Id, value, chip::NullOptional,
                                   chip::NullOptional);
         }
-        case 430: {
-            LogStep(430, "Write max value to a nullable range-restricted unsigned 8-bit integer");
+        case 431: {
+            LogStep(431, "Write max value to a nullable range-restricted unsigned 8-bit integer");
             ListFreer listFreer;
             chip::app::DataModel::Nullable<uint8_t> value;
             value.SetNonNull();
@@ -57156,13 +57208,13 @@ class TestClusterSuite : public TestCommand
                                   UnitTesting::Attributes::NullableRangeRestrictedInt8u::Id, value, chip::NullOptional,
                                   chip::NullOptional);
         }
-        case 431: {
-            LogStep(431, "Verify nullable range-restricted unsigned 8-bit integer value has not changed");
+        case 432: {
+            LogStep(432, "Verify nullable range-restricted unsigned 8-bit integer value has not changed");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id,
                                  UnitTesting::Attributes::NullableRangeRestrictedInt8u::Id, true, chip::NullOptional);
         }
-        case 432: {
-            LogStep(432, "Write min valid value to a nullable range-restricted unsigned 8-bit integer");
+        case 433: {
+            LogStep(433, "Write min valid value to a nullable range-restricted unsigned 8-bit integer");
             ListFreer listFreer;
             chip::app::DataModel::Nullable<uint8_t> value;
             value.SetNonNull();
@@ -57171,13 +57223,13 @@ class TestClusterSuite : public TestCommand
                                   UnitTesting::Attributes::NullableRangeRestrictedInt8u::Id, value, chip::NullOptional,
                                   chip::NullOptional);
         }
-        case 433: {
-            LogStep(433, "Verify nullable range-restricted unsigned 8-bit integer value is at min valid");
+        case 434: {
+            LogStep(434, "Verify nullable range-restricted unsigned 8-bit integer value is at min valid");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id,
                                  UnitTesting::Attributes::NullableRangeRestrictedInt8u::Id, true, chip::NullOptional);
         }
-        case 434: {
-            LogStep(434, "Write max valid value to a nullable range-restricted unsigned 8-bit integer");
+        case 435: {
+            LogStep(435, "Write max valid value to a nullable range-restricted unsigned 8-bit integer");
             ListFreer listFreer;
             chip::app::DataModel::Nullable<uint8_t> value;
             value.SetNonNull();
@@ -57186,13 +57238,13 @@ class TestClusterSuite : public TestCommand
                                   UnitTesting::Attributes::NullableRangeRestrictedInt8u::Id, value, chip::NullOptional,
                                   chip::NullOptional);
         }
-        case 435: {
-            LogStep(435, "Verify nullable range-restricted unsigned 8-bit integer value is at max valid");
+        case 436: {
+            LogStep(436, "Verify nullable range-restricted unsigned 8-bit integer value is at max valid");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id,
                                  UnitTesting::Attributes::NullableRangeRestrictedInt8u::Id, true, chip::NullOptional);
         }
-        case 436: {
-            LogStep(436, "Write middle valid value to a nullable range-restricted unsigned 8-bit integer");
+        case 437: {
+            LogStep(437, "Write middle valid value to a nullable range-restricted unsigned 8-bit integer");
             ListFreer listFreer;
             chip::app::DataModel::Nullable<uint8_t> value;
             value.SetNonNull();
@@ -57201,13 +57253,13 @@ class TestClusterSuite : public TestCommand
                                   UnitTesting::Attributes::NullableRangeRestrictedInt8u::Id, value, chip::NullOptional,
                                   chip::NullOptional);
         }
-        case 437: {
-            LogStep(437, "Verify nullable range-restricted unsigned 8-bit integer value is at mid valid");
+        case 438: {
+            LogStep(438, "Verify nullable range-restricted unsigned 8-bit integer value is at mid valid");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id,
                                  UnitTesting::Attributes::NullableRangeRestrictedInt8u::Id, true, chip::NullOptional);
         }
-        case 438: {
-            LogStep(438, "Write null value to a nullable range-restricted unsigned 8-bit integer");
+        case 439: {
+            LogStep(439, "Write null value to a nullable range-restricted unsigned 8-bit integer");
             ListFreer listFreer;
             chip::app::DataModel::Nullable<uint8_t> value;
             value.SetNull();
@@ -57215,18 +57267,18 @@ class TestClusterSuite : public TestCommand
                                   UnitTesting::Attributes::NullableRangeRestrictedInt8u::Id, value, chip::NullOptional,
                                   chip::NullOptional);
         }
-        case 439: {
-            LogStep(439, "Verify nullable range-restricted unsigned 8-bit integer value is null");
+        case 440: {
+            LogStep(440, "Verify nullable range-restricted unsigned 8-bit integer value is null");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id,
                                  UnitTesting::Attributes::NullableRangeRestrictedInt8u::Id, true, chip::NullOptional);
         }
-        case 440: {
-            LogStep(440, "Read nullable range-restricted unsigned 16-bit integer");
+        case 441: {
+            LogStep(441, "Read nullable range-restricted unsigned 16-bit integer");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id,
                                  UnitTesting::Attributes::NullableRangeRestrictedInt16u::Id, true, chip::NullOptional);
         }
-        case 441: {
-            LogStep(441, "Write min value to a nullable range-restricted unsigned 16-bit integer");
+        case 442: {
+            LogStep(442, "Write min value to a nullable range-restricted unsigned 16-bit integer");
             ListFreer listFreer;
             chip::app::DataModel::Nullable<uint16_t> value;
             value.SetNonNull();
@@ -57235,8 +57287,8 @@ class TestClusterSuite : public TestCommand
                                   UnitTesting::Attributes::NullableRangeRestrictedInt16u::Id, value, chip::NullOptional,
                                   chip::NullOptional);
         }
-        case 442: {
-            LogStep(442, "Write just-below-range value to a nullable range-restricted unsigned 16-bit integer");
+        case 443: {
+            LogStep(443, "Write just-below-range value to a nullable range-restricted unsigned 16-bit integer");
             ListFreer listFreer;
             chip::app::DataModel::Nullable<uint16_t> value;
             value.SetNonNull();
@@ -57245,8 +57297,8 @@ class TestClusterSuite : public TestCommand
                                   UnitTesting::Attributes::NullableRangeRestrictedInt16u::Id, value, chip::NullOptional,
                                   chip::NullOptional);
         }
-        case 443: {
-            LogStep(443, "Write just-above-range value to a nullable range-restricted unsigned 16-bit integer");
+        case 444: {
+            LogStep(444, "Write just-above-range value to a nullable range-restricted unsigned 16-bit integer");
             ListFreer listFreer;
             chip::app::DataModel::Nullable<uint16_t> value;
             value.SetNonNull();
@@ -57255,8 +57307,8 @@ class TestClusterSuite : public TestCommand
                                   UnitTesting::Attributes::NullableRangeRestrictedInt16u::Id, value, chip::NullOptional,
                                   chip::NullOptional);
         }
-        case 444: {
-            LogStep(444, "Write max value to a nullable range-restricted unsigned 16-bit integer");
+        case 445: {
+            LogStep(445, "Write max value to a nullable range-restricted unsigned 16-bit integer");
             ListFreer listFreer;
             chip::app::DataModel::Nullable<uint16_t> value;
             value.SetNonNull();
@@ -57265,13 +57317,13 @@ class TestClusterSuite : public TestCommand
                                   UnitTesting::Attributes::NullableRangeRestrictedInt16u::Id, value, chip::NullOptional,
                                   chip::NullOptional);
         }
-        case 445: {
-            LogStep(445, "Verify nullable range-restricted unsigned 16-bit integer value has not changed");
+        case 446: {
+            LogStep(446, "Verify nullable range-restricted unsigned 16-bit integer value has not changed");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id,
                                  UnitTesting::Attributes::NullableRangeRestrictedInt16u::Id, true, chip::NullOptional);
         }
-        case 446: {
-            LogStep(446, "Write min valid value to a nullable range-restricted unsigned 16-bit integer");
+        case 447: {
+            LogStep(447, "Write min valid value to a nullable range-restricted unsigned 16-bit integer");
             ListFreer listFreer;
             chip::app::DataModel::Nullable<uint16_t> value;
             value.SetNonNull();
@@ -57280,13 +57332,13 @@ class TestClusterSuite : public TestCommand
                                   UnitTesting::Attributes::NullableRangeRestrictedInt16u::Id, value, chip::NullOptional,
                                   chip::NullOptional);
         }
-        case 447: {
-            LogStep(447, "Verify nullable range-restricted unsigned 16-bit integer value is at min valid");
+        case 448: {
+            LogStep(448, "Verify nullable range-restricted unsigned 16-bit integer value is at min valid");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id,
                                  UnitTesting::Attributes::NullableRangeRestrictedInt16u::Id, true, chip::NullOptional);
         }
-        case 448: {
-            LogStep(448, "Write max valid value to a nullable range-restricted unsigned 16-bit integer");
+        case 449: {
+            LogStep(449, "Write max valid value to a nullable range-restricted unsigned 16-bit integer");
             ListFreer listFreer;
             chip::app::DataModel::Nullable<uint16_t> value;
             value.SetNonNull();
@@ -57295,13 +57347,13 @@ class TestClusterSuite : public TestCommand
                                   UnitTesting::Attributes::NullableRangeRestrictedInt16u::Id, value, chip::NullOptional,
                                   chip::NullOptional);
         }
-        case 449: {
-            LogStep(449, "Verify nullable range-restricted unsigned 16-bit integer value is at max valid");
+        case 450: {
+            LogStep(450, "Verify nullable range-restricted unsigned 16-bit integer value is at max valid");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id,
                                  UnitTesting::Attributes::NullableRangeRestrictedInt16u::Id, true, chip::NullOptional);
         }
-        case 450: {
-            LogStep(450, "Write middle valid value to a nullable range-restricted unsigned 16-bit integer");
+        case 451: {
+            LogStep(451, "Write middle valid value to a nullable range-restricted unsigned 16-bit integer");
             ListFreer listFreer;
             chip::app::DataModel::Nullable<uint16_t> value;
             value.SetNonNull();
@@ -57310,13 +57362,13 @@ class TestClusterSuite : public TestCommand
                                   UnitTesting::Attributes::NullableRangeRestrictedInt16u::Id, value, chip::NullOptional,
                                   chip::NullOptional);
         }
-        case 451: {
-            LogStep(451, "Verify nullable range-restricted unsigned 16-bit integer value is at mid valid");
+        case 452: {
+            LogStep(452, "Verify nullable range-restricted unsigned 16-bit integer value is at mid valid");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id,
                                  UnitTesting::Attributes::NullableRangeRestrictedInt16u::Id, true, chip::NullOptional);
         }
-        case 452: {
-            LogStep(452, "Write null value to a nullable range-restricted unsigned 16-bit integer");
+        case 453: {
+            LogStep(453, "Write null value to a nullable range-restricted unsigned 16-bit integer");
             ListFreer listFreer;
             chip::app::DataModel::Nullable<uint16_t> value;
             value.SetNull();
@@ -57324,18 +57376,18 @@ class TestClusterSuite : public TestCommand
                                   UnitTesting::Attributes::NullableRangeRestrictedInt16u::Id, value, chip::NullOptional,
                                   chip::NullOptional);
         }
-        case 453: {
-            LogStep(453, "Verify nullable range-restricted unsigned 16-bit integer value is null");
+        case 454: {
+            LogStep(454, "Verify nullable range-restricted unsigned 16-bit integer value is null");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id,
                                  UnitTesting::Attributes::NullableRangeRestrictedInt16u::Id, true, chip::NullOptional);
         }
-        case 454: {
-            LogStep(454, "Read nullable range-restricted signed 8-bit integer");
+        case 455: {
+            LogStep(455, "Read nullable range-restricted signed 8-bit integer");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id,
                                  UnitTesting::Attributes::NullableRangeRestrictedInt8s::Id, true, chip::NullOptional);
         }
-        case 455: {
-            LogStep(455, "Write min value to a nullable range-restricted signed 8-bit integer");
+        case 456: {
+            LogStep(456, "Write min value to a nullable range-restricted signed 8-bit integer");
             ListFreer listFreer;
             chip::app::DataModel::Nullable<int8_t> value;
             value.SetNonNull();
@@ -57344,8 +57396,8 @@ class TestClusterSuite : public TestCommand
                                   UnitTesting::Attributes::NullableRangeRestrictedInt8s::Id, value, chip::NullOptional,
                                   chip::NullOptional);
         }
-        case 456: {
-            LogStep(456, "Write just-below-range value to a nullable range-restricted signed 8-bit integer");
+        case 457: {
+            LogStep(457, "Write just-below-range value to a nullable range-restricted signed 8-bit integer");
             ListFreer listFreer;
             chip::app::DataModel::Nullable<int8_t> value;
             value.SetNonNull();
@@ -57354,8 +57406,8 @@ class TestClusterSuite : public TestCommand
                                   UnitTesting::Attributes::NullableRangeRestrictedInt8s::Id, value, chip::NullOptional,
                                   chip::NullOptional);
         }
-        case 457: {
-            LogStep(457, "Write just-above-range value to a nullable range-restricted signed 8-bit integer");
+        case 458: {
+            LogStep(458, "Write just-above-range value to a nullable range-restricted signed 8-bit integer");
             ListFreer listFreer;
             chip::app::DataModel::Nullable<int8_t> value;
             value.SetNonNull();
@@ -57364,8 +57416,8 @@ class TestClusterSuite : public TestCommand
                                   UnitTesting::Attributes::NullableRangeRestrictedInt8s::Id, value, chip::NullOptional,
                                   chip::NullOptional);
         }
-        case 458: {
-            LogStep(458, "Write max value to a nullable range-restricted signed 8-bit integer");
+        case 459: {
+            LogStep(459, "Write max value to a nullable range-restricted signed 8-bit integer");
             ListFreer listFreer;
             chip::app::DataModel::Nullable<int8_t> value;
             value.SetNonNull();
@@ -57374,13 +57426,13 @@ class TestClusterSuite : public TestCommand
                                   UnitTesting::Attributes::NullableRangeRestrictedInt8s::Id, value, chip::NullOptional,
                                   chip::NullOptional);
         }
-        case 459: {
-            LogStep(459, "Verify nullable range-restricted signed 8-bit integer value has not changed");
+        case 460: {
+            LogStep(460, "Verify nullable range-restricted signed 8-bit integer value has not changed");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id,
                                  UnitTesting::Attributes::NullableRangeRestrictedInt8s::Id, true, chip::NullOptional);
         }
-        case 460: {
-            LogStep(460, "Write min valid value to a nullable range-restricted signed 8-bit integer");
+        case 461: {
+            LogStep(461, "Write min valid value to a nullable range-restricted signed 8-bit integer");
             ListFreer listFreer;
             chip::app::DataModel::Nullable<int8_t> value;
             value.SetNonNull();
@@ -57389,13 +57441,13 @@ class TestClusterSuite : public TestCommand
                                   UnitTesting::Attributes::NullableRangeRestrictedInt8s::Id, value, chip::NullOptional,
                                   chip::NullOptional);
         }
-        case 461: {
-            LogStep(461, "Verify nullable range-restricted signed 8-bit integer value is at min valid");
+        case 462: {
+            LogStep(462, "Verify nullable range-restricted signed 8-bit integer value is at min valid");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id,
                                  UnitTesting::Attributes::NullableRangeRestrictedInt8s::Id, true, chip::NullOptional);
         }
-        case 462: {
-            LogStep(462, "Write max valid value to a nullable range-restricted signed 8-bit integer");
+        case 463: {
+            LogStep(463, "Write max valid value to a nullable range-restricted signed 8-bit integer");
             ListFreer listFreer;
             chip::app::DataModel::Nullable<int8_t> value;
             value.SetNonNull();
@@ -57404,13 +57456,13 @@ class TestClusterSuite : public TestCommand
                                   UnitTesting::Attributes::NullableRangeRestrictedInt8s::Id, value, chip::NullOptional,
                                   chip::NullOptional);
         }
-        case 463: {
-            LogStep(463, "Verify nullable range-restricted signed 8-bit integer value is at max valid");
+        case 464: {
+            LogStep(464, "Verify nullable range-restricted signed 8-bit integer value is at max valid");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id,
                                  UnitTesting::Attributes::NullableRangeRestrictedInt8s::Id, true, chip::NullOptional);
         }
-        case 464: {
-            LogStep(464, "Write middle valid value to a nullable range-restricted signed 8-bit integer");
+        case 465: {
+            LogStep(465, "Write middle valid value to a nullable range-restricted signed 8-bit integer");
             ListFreer listFreer;
             chip::app::DataModel::Nullable<int8_t> value;
             value.SetNonNull();
@@ -57419,13 +57471,13 @@ class TestClusterSuite : public TestCommand
                                   UnitTesting::Attributes::NullableRangeRestrictedInt8s::Id, value, chip::NullOptional,
                                   chip::NullOptional);
         }
-        case 465: {
-            LogStep(465, "Verify nullable range-restricted signed 8-bit integer value is at mid valid");
+        case 466: {
+            LogStep(466, "Verify nullable range-restricted signed 8-bit integer value is at mid valid");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id,
                                  UnitTesting::Attributes::NullableRangeRestrictedInt8s::Id, true, chip::NullOptional);
         }
-        case 466: {
-            LogStep(466, "Write null value to a nullable range-restricted signed 8-bit integer");
+        case 467: {
+            LogStep(467, "Write null value to a nullable range-restricted signed 8-bit integer");
             ListFreer listFreer;
             chip::app::DataModel::Nullable<int8_t> value;
             value.SetNull();
@@ -57433,18 +57485,18 @@ class TestClusterSuite : public TestCommand
                                   UnitTesting::Attributes::NullableRangeRestrictedInt8s::Id, value, chip::NullOptional,
                                   chip::NullOptional);
         }
-        case 467: {
-            LogStep(467, "Verify nullable range-restricted signed 8-bit integer value is at null");
+        case 468: {
+            LogStep(468, "Verify nullable range-restricted signed 8-bit integer value is at null");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id,
                                  UnitTesting::Attributes::NullableRangeRestrictedInt8s::Id, true, chip::NullOptional);
         }
-        case 468: {
-            LogStep(468, "Read nullable range-restricted signed 16-bit integer");
+        case 469: {
+            LogStep(469, "Read nullable range-restricted signed 16-bit integer");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id,
                                  UnitTesting::Attributes::NullableRangeRestrictedInt16s::Id, true, chip::NullOptional);
         }
-        case 469: {
-            LogStep(469, "Write min value to a nullable range-restricted signed 16-bit integer");
+        case 470: {
+            LogStep(470, "Write min value to a nullable range-restricted signed 16-bit integer");
             ListFreer listFreer;
             chip::app::DataModel::Nullable<int16_t> value;
             value.SetNonNull();
@@ -57453,8 +57505,8 @@ class TestClusterSuite : public TestCommand
                                   UnitTesting::Attributes::NullableRangeRestrictedInt16s::Id, value, chip::NullOptional,
                                   chip::NullOptional);
         }
-        case 470: {
-            LogStep(470, "Write just-below-range value to a nullable range-restricted signed 16-bit integer");
+        case 471: {
+            LogStep(471, "Write just-below-range value to a nullable range-restricted signed 16-bit integer");
             ListFreer listFreer;
             chip::app::DataModel::Nullable<int16_t> value;
             value.SetNonNull();
@@ -57463,8 +57515,8 @@ class TestClusterSuite : public TestCommand
                                   UnitTesting::Attributes::NullableRangeRestrictedInt16s::Id, value, chip::NullOptional,
                                   chip::NullOptional);
         }
-        case 471: {
-            LogStep(471, "Write just-above-range value to a nullable range-restricted signed 16-bit integer");
+        case 472: {
+            LogStep(472, "Write just-above-range value to a nullable range-restricted signed 16-bit integer");
             ListFreer listFreer;
             chip::app::DataModel::Nullable<int16_t> value;
             value.SetNonNull();
@@ -57473,8 +57525,8 @@ class TestClusterSuite : public TestCommand
                                   UnitTesting::Attributes::NullableRangeRestrictedInt16s::Id, value, chip::NullOptional,
                                   chip::NullOptional);
         }
-        case 472: {
-            LogStep(472, "Write max value to a nullable range-restricted signed 16-bit integer");
+        case 473: {
+            LogStep(473, "Write max value to a nullable range-restricted signed 16-bit integer");
             ListFreer listFreer;
             chip::app::DataModel::Nullable<int16_t> value;
             value.SetNonNull();
@@ -57483,13 +57535,13 @@ class TestClusterSuite : public TestCommand
                                   UnitTesting::Attributes::NullableRangeRestrictedInt16s::Id, value, chip::NullOptional,
                                   chip::NullOptional);
         }
-        case 473: {
-            LogStep(473, "Verify nullable range-restricted signed 16-bit integer value has not changed");
+        case 474: {
+            LogStep(474, "Verify nullable range-restricted signed 16-bit integer value has not changed");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id,
                                  UnitTesting::Attributes::NullableRangeRestrictedInt16s::Id, true, chip::NullOptional);
         }
-        case 474: {
-            LogStep(474, "Write min valid value to a nullable range-restricted signed 16-bit integer");
+        case 475: {
+            LogStep(475, "Write min valid value to a nullable range-restricted signed 16-bit integer");
             ListFreer listFreer;
             chip::app::DataModel::Nullable<int16_t> value;
             value.SetNonNull();
@@ -57498,13 +57550,13 @@ class TestClusterSuite : public TestCommand
                                   UnitTesting::Attributes::NullableRangeRestrictedInt16s::Id, value, chip::NullOptional,
                                   chip::NullOptional);
         }
-        case 475: {
-            LogStep(475, "Verify nullable range-restricted signed 16-bit integer value is at min valid");
+        case 476: {
+            LogStep(476, "Verify nullable range-restricted signed 16-bit integer value is at min valid");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id,
                                  UnitTesting::Attributes::NullableRangeRestrictedInt16s::Id, true, chip::NullOptional);
         }
-        case 476: {
-            LogStep(476, "Write max valid value to a nullable range-restricted signed 16-bit integer");
+        case 477: {
+            LogStep(477, "Write max valid value to a nullable range-restricted signed 16-bit integer");
             ListFreer listFreer;
             chip::app::DataModel::Nullable<int16_t> value;
             value.SetNonNull();
@@ -57513,13 +57565,13 @@ class TestClusterSuite : public TestCommand
                                   UnitTesting::Attributes::NullableRangeRestrictedInt16s::Id, value, chip::NullOptional,
                                   chip::NullOptional);
         }
-        case 477: {
-            LogStep(477, "Verify nullable range-restricted signed 16-bit integer value is at max valid");
+        case 478: {
+            LogStep(478, "Verify nullable range-restricted signed 16-bit integer value is at max valid");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id,
                                  UnitTesting::Attributes::NullableRangeRestrictedInt16s::Id, true, chip::NullOptional);
         }
-        case 478: {
-            LogStep(478, "Write middle valid value to a nullable range-restricted signed 16-bit integer");
+        case 479: {
+            LogStep(479, "Write middle valid value to a nullable range-restricted signed 16-bit integer");
             ListFreer listFreer;
             chip::app::DataModel::Nullable<int16_t> value;
             value.SetNonNull();
@@ -57528,13 +57580,13 @@ class TestClusterSuite : public TestCommand
                                   UnitTesting::Attributes::NullableRangeRestrictedInt16s::Id, value, chip::NullOptional,
                                   chip::NullOptional);
         }
-        case 479: {
-            LogStep(479, "Verify nullable range-restricted signed 16-bit integer value is at mid valid");
+        case 480: {
+            LogStep(480, "Verify nullable range-restricted signed 16-bit integer value is at mid valid");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id,
                                  UnitTesting::Attributes::NullableRangeRestrictedInt16s::Id, true, chip::NullOptional);
         }
-        case 480: {
-            LogStep(480, "Write null value to a nullable range-restricted signed 16-bit integer");
+        case 481: {
+            LogStep(481, "Write null value to a nullable range-restricted signed 16-bit integer");
             ListFreer listFreer;
             chip::app::DataModel::Nullable<int16_t> value;
             value.SetNull();
@@ -57542,49 +57594,49 @@ class TestClusterSuite : public TestCommand
                                   UnitTesting::Attributes::NullableRangeRestrictedInt16s::Id, value, chip::NullOptional,
                                   chip::NullOptional);
         }
-        case 481: {
-            LogStep(481, "Verify nullable range-restricted signed 16-bit integer value is null");
+        case 482: {
+            LogStep(482, "Verify nullable range-restricted signed 16-bit integer value is null");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id,
                                  UnitTesting::Attributes::NullableRangeRestrictedInt16s::Id, true, chip::NullOptional);
         }
-        case 482: {
-            LogStep(482, "Write attribute that returns general status on write");
+        case 483: {
+            LogStep(483, "Write attribute that returns general status on write");
             ListFreer listFreer;
             bool value;
             value = false;
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::GeneralErrorBoolean::Id,
                                   value, chip::NullOptional, chip::NullOptional);
         }
-        case 483: {
-            LogStep(483, "Write attribute that returns cluster-specific status on write");
+        case 484: {
+            LogStep(484, "Write attribute that returns cluster-specific status on write");
             ListFreer listFreer;
             bool value;
             value = false;
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::ClusterErrorBoolean::Id,
                                   value, chip::NullOptional, chip::NullOptional);
         }
-        case 484: {
-            LogStep(484, "Read attribute that returns general status on read");
+        case 485: {
+            LogStep(485, "Read attribute that returns general status on read");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::GeneralErrorBoolean::Id,
                                  true, chip::NullOptional);
         }
-        case 485: {
-            LogStep(485, "read attribute that returns cluster-specific status on read");
+        case 486: {
+            LogStep(486, "read attribute that returns cluster-specific status on read");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::ClusterErrorBoolean::Id,
                                  true, chip::NullOptional);
         }
-        case 486: {
-            LogStep(486, "read AcceptedCommandList attribute");
+        case 487: {
+            LogStep(487, "read AcceptedCommandList attribute");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::AcceptedCommandList::Id,
                                  true, chip::NullOptional);
         }
-        case 487: {
-            LogStep(487, "read GeneratedCommandList attribute");
+        case 488: {
+            LogStep(488, "read GeneratedCommandList attribute");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::GeneratedCommandList::Id,
                                  true, chip::NullOptional);
         }
-        case 488: {
-            LogStep(488, "Write struct-typed attribute");
+        case 489: {
+            LogStep(489, "Write struct-typed attribute");
             ListFreer listFreer;
             chip::app::Clusters::UnitTesting::Structs::SimpleStruct::Type value;
 
@@ -57600,8 +57652,8 @@ class TestClusterSuite : public TestCommand
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::StructAttr::Id, value,
                                   chip::NullOptional, chip::NullOptional);
         }
-        case 489: {
-            LogStep(489, "Read struct-typed attribute");
+        case 490: {
+            LogStep(490, "Read struct-typed attribute");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::StructAttr::Id, true,
                                  chip::NullOptional);
         }
@@ -57947,7 +57999,7 @@ class TestClusterComplexTypesSuite : public TestCommand
 class TestConstraintsSuite : public TestCommand
 {
 public:
-    TestConstraintsSuite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("TestConstraints", 32, credsIssuerConfig)
+    TestConstraintsSuite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("TestConstraints", 33, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -58061,6 +58113,9 @@ class TestConstraintsSuite : public TestCommand
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 12:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 13:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 uint32_t value;
@@ -58068,7 +58123,7 @@ class TestConstraintsSuite : public TestCommand
                 VerifyOrReturn(CheckConstraintMinValue("value", value, 5UL));
             }
             break;
-        case 13:
+        case 14:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 uint32_t value;
@@ -58076,7 +58131,7 @@ class TestConstraintsSuite : public TestCommand
                 VerifyOrReturn(CheckConstraintMaxValue("value", value, 5UL));
             }
             break;
-        case 14:
+        case 15:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 uint32_t value;
@@ -58084,13 +58139,13 @@ class TestConstraintsSuite : public TestCommand
                 VerifyOrReturn(CheckConstraintNotValue("value", value, 6UL));
             }
             break;
-        case 15:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
         case 16:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 17:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 18:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::CharSpan value;
@@ -58098,7 +58153,7 @@ class TestConstraintsSuite : public TestCommand
                 VerifyOrReturn(CheckConstraintMinLength("value", value, 5));
             }
             break;
-        case 18:
+        case 19:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::CharSpan value;
@@ -58106,7 +58161,7 @@ class TestConstraintsSuite : public TestCommand
                 VerifyOrReturn(CheckConstraintMaxLength("value", value, 20));
             }
             break;
-        case 19:
+        case 20:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::CharSpan value;
@@ -58114,7 +58169,7 @@ class TestConstraintsSuite : public TestCommand
                 VerifyOrReturn(CheckConstraintStartsWith("value", value, "**"));
             }
             break;
-        case 20:
+        case 21:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::CharSpan value;
@@ -58122,10 +58177,10 @@ class TestConstraintsSuite : public TestCommand
                 VerifyOrReturn(CheckConstraintEndsWith("value", value, "**"));
             }
             break;
-        case 21:
+        case 22:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 22:
+        case 23:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::CharSpan value;
@@ -58134,10 +58189,10 @@ class TestConstraintsSuite : public TestCommand
                 VerifyOrReturn(CheckConstraintIsUpperCase("value", value, false));
             }
             break;
-        case 23:
+        case 24:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 24:
+        case 25:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::CharSpan value;
@@ -58146,10 +58201,10 @@ class TestConstraintsSuite : public TestCommand
                 VerifyOrReturn(CheckConstraintIsLowerCase("value", value, false));
             }
             break;
-        case 25:
+        case 26:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 26:
+        case 27:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::CharSpan value;
@@ -58158,10 +58213,10 @@ class TestConstraintsSuite : public TestCommand
                 VerifyOrReturn(CheckConstraintIsLowerCase("value", value, false));
             }
             break;
-        case 27:
+        case 28:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 28:
+        case 29:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::CharSpan value;
@@ -58169,10 +58224,10 @@ class TestConstraintsSuite : public TestCommand
                 VerifyOrReturn(CheckConstraintIsHexString("value", value, false));
             }
             break;
-        case 29:
+        case 30:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 30:
+        case 31:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::CharSpan value;
@@ -58180,7 +58235,7 @@ class TestConstraintsSuite : public TestCommand
                 VerifyOrReturn(CheckConstraintIsHexString("value", value, true));
             }
             break;
-        case 31:
+        case 32:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         default:
@@ -58275,131 +58330,139 @@ class TestConstraintsSuite : public TestCommand
                                  chip::NullOptional);
         }
         case 11: {
-            LogStep(11, "Write attribute INT32U Value");
+            LogStep(11, "Write attribute BITMAP32 Back to Default Value");
+            ListFreer listFreer;
+            chip::BitMask<chip::app::Clusters::UnitTesting::Bitmap32MaskMap> value;
+            value = static_cast<chip::BitMask<chip::app::Clusters::UnitTesting::Bitmap32MaskMap>>(0UL);
+            return WriteAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::Bitmap32::Id, value,
+                                  chip::NullOptional, chip::NullOptional);
+        }
+        case 12: {
+            LogStep(12, "Write attribute INT32U Value");
             ListFreer listFreer;
             uint32_t value;
             value = 5UL;
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::Int32u::Id, value,
                                   chip::NullOptional, chip::NullOptional);
         }
-        case 12: {
-            LogStep(12, "Read attribute INT32U Value MinValue Constraints");
-            return ReadAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::Int32u::Id, true,
-                                 chip::NullOptional);
-        }
         case 13: {
-            LogStep(13, "Read attribute INT32U Value MaxValue Constraints");
+            LogStep(13, "Read attribute INT32U Value MinValue Constraints");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::Int32u::Id, true,
                                  chip::NullOptional);
         }
         case 14: {
-            LogStep(14, "Read attribute INT32U Value NotValue Constraints");
+            LogStep(14, "Read attribute INT32U Value MaxValue Constraints");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::Int32u::Id, true,
                                  chip::NullOptional);
         }
         case 15: {
-            LogStep(15, "Write attribute INT32U Value Back to Default Value");
+            LogStep(15, "Read attribute INT32U Value NotValue Constraints");
+            return ReadAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::Int32u::Id, true,
+                                 chip::NullOptional);
+        }
+        case 16: {
+            LogStep(16, "Write attribute INT32U Value Back to Default Value");
             ListFreer listFreer;
             uint32_t value;
             value = 0UL;
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::Int32u::Id, value,
                                   chip::NullOptional, chip::NullOptional);
         }
-        case 16: {
-            LogStep(16, "Write attribute CHAR_STRING Value");
+        case 17: {
+            LogStep(17, "Write attribute CHAR_STRING Value");
             ListFreer listFreer;
             chip::CharSpan value;
             value = chip::Span<const char>("** Test **garbage: not in length on purpose", 10);
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::CharString::Id, value,
                                   chip::NullOptional, chip::NullOptional);
         }
-        case 17: {
-            LogStep(17, "Read attribute CHAR_STRING Value MinLength Constraints");
-            return ReadAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::CharString::Id, true,
-                                 chip::NullOptional);
-        }
         case 18: {
-            LogStep(18, "Read attribute CHAR_STRING Value MaxLength Constraints");
+            LogStep(18, "Read attribute CHAR_STRING Value MinLength Constraints");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::CharString::Id, true,
                                  chip::NullOptional);
         }
         case 19: {
-            LogStep(19, "Read attribute CHAR_STRING Value StartsWith Constraints");
+            LogStep(19, "Read attribute CHAR_STRING Value MaxLength Constraints");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::CharString::Id, true,
                                  chip::NullOptional);
         }
         case 20: {
-            LogStep(20, "Read attribute CHAR_STRING Value EndsWith Constraints");
+            LogStep(20, "Read attribute CHAR_STRING Value StartsWith Constraints");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::CharString::Id, true,
                                  chip::NullOptional);
         }
         case 21: {
-            LogStep(21, "Write attribute CHAR_STRING Value");
+            LogStep(21, "Read attribute CHAR_STRING Value EndsWith Constraints");
+            return ReadAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::CharString::Id, true,
+                                 chip::NullOptional);
+        }
+        case 22: {
+            LogStep(22, "Write attribute CHAR_STRING Value");
             ListFreer listFreer;
             chip::CharSpan value;
             value = chip::Span<const char>("lowercasegarbage: not in length on purpose", 9);
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::CharString::Id, value,
                                   chip::NullOptional, chip::NullOptional);
         }
-        case 22: {
-            LogStep(22, "Read attribute CHAR_STRING Value isLowerCase/isUpperCase Constraints");
+        case 23: {
+            LogStep(23, "Read attribute CHAR_STRING Value isLowerCase/isUpperCase Constraints");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::CharString::Id, true,
                                  chip::NullOptional);
         }
-        case 23: {
-            LogStep(23, "Write attribute CHAR_STRING Value");
+        case 24: {
+            LogStep(24, "Write attribute CHAR_STRING Value");
             ListFreer listFreer;
             chip::CharSpan value;
             value = chip::Span<const char>("UPPERCASEgarbage: not in length on purpose", 9);
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::CharString::Id, value,
                                   chip::NullOptional, chip::NullOptional);
         }
-        case 24: {
-            LogStep(24, "Read attribute CHAR_STRING Value isLowerCase/isUpperCase Constraints");
+        case 25: {
+            LogStep(25, "Read attribute CHAR_STRING Value isLowerCase/isUpperCase Constraints");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::CharString::Id, true,
                                  chip::NullOptional);
         }
-        case 25: {
-            LogStep(25, "Write attribute CHAR_STRING Value");
+        case 26: {
+            LogStep(26, "Write attribute CHAR_STRING Value");
             ListFreer listFreer;
             chip::CharSpan value;
             value = chip::Span<const char>("lowUPPERgarbage: not in length on purpose", 8);
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::CharString::Id, value,
                                   chip::NullOptional, chip::NullOptional);
         }
-        case 26: {
-            LogStep(26, "Read attribute CHAR_STRING Value isLowerCase/isUpperCase Constraints");
+        case 27: {
+            LogStep(27, "Read attribute CHAR_STRING Value isLowerCase/isUpperCase Constraints");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::CharString::Id, true,
                                  chip::NullOptional);
         }
-        case 27: {
-            LogStep(27, "Write attribute CHAR_STRING Value");
+        case 28: {
+            LogStep(28, "Write attribute CHAR_STRING Value");
             ListFreer listFreer;
             chip::CharSpan value;
             value = chip::Span<const char>("ABCDEF012Vgarbage: not in length on purpose", 10);
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::CharString::Id, value,
                                   chip::NullOptional, chip::NullOptional);
         }
-        case 28: {
-            LogStep(28, "Read attribute CHAR_STRING Value isHexString Constraints");
+        case 29: {
+            LogStep(29, "Read attribute CHAR_STRING Value isHexString Constraints");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::CharString::Id, true,
                                  chip::NullOptional);
         }
-        case 29: {
-            LogStep(29, "Write attribute CHAR_STRING Value");
+        case 30: {
+            LogStep(30, "Write attribute CHAR_STRING Value");
             ListFreer listFreer;
             chip::CharSpan value;
             value = chip::Span<const char>("ABCDEF0123garbage: not in length on purpose", 10);
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::CharString::Id, value,
                                   chip::NullOptional, chip::NullOptional);
         }
-        case 30: {
-            LogStep(30, "Read attribute CHAR_STRING Value isHexString Constraints");
+        case 31: {
+            LogStep(31, "Read attribute CHAR_STRING Value isHexString Constraints");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), UnitTesting::Id, UnitTesting::Attributes::CharString::Id, true,
                                  chip::NullOptional);
         }
-        case 31: {
-            LogStep(31, "Write attribute CHAR_STRING Value Back to Default Value");
+        case 32: {
+            LogStep(32, "Write attribute CHAR_STRING Value Back to Default Value");
             ListFreer listFreer;
             chip::CharSpan value;
             value = chip::Span<const char>("garbage: not in length on purpose", 0);
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 2329031ef9ec52..0f605c44632231 100644
--- a/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h
+++ b/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h
@@ -74973,970 +74973,969 @@ class TestCluster : public TestCommandBridge {
             err = TestReadAttributeListLongOctetStringForChunkedRead_135();
             break;
         case 136:
-            ChipLogProgress(chipTool, " ***** Test Step 136 : Read attribute EPOCH_US Default Value\n");
-            err = TestReadAttributeEpochUsDefaultValue_136();
+            ChipLogProgress(chipTool, " ***** Test Step 136 : Write attribute LIST_LONG_OCTET_STRING (for chunked write)\n");
+            err = TestWriteAttributeListLongOctetStringForChunkedWrite_136();
             break;
         case 137:
-            ChipLogProgress(chipTool, " ***** Test Step 137 : Write attribute EPOCH_US Max Value\n");
-            err = TestWriteAttributeEpochUsMaxValue_137();
+            ChipLogProgress(chipTool, " ***** Test Step 137 : Read attribute EPOCH_US Default Value\n");
+            err = TestReadAttributeEpochUsDefaultValue_137();
             break;
         case 138:
-            ChipLogProgress(chipTool, " ***** Test Step 138 : Read attribute EPOCH_US Max Value\n");
-            err = TestReadAttributeEpochUsMaxValue_138();
+            ChipLogProgress(chipTool, " ***** Test Step 138 : Write attribute EPOCH_US Max Value\n");
+            err = TestWriteAttributeEpochUsMaxValue_138();
             break;
         case 139:
-            ChipLogProgress(chipTool, " ***** Test Step 139 : Write attribute EPOCH_US Min Value\n");
-            err = TestWriteAttributeEpochUsMinValue_139();
+            ChipLogProgress(chipTool, " ***** Test Step 139 : Read attribute EPOCH_US Max Value\n");
+            err = TestReadAttributeEpochUsMaxValue_139();
             break;
         case 140:
-            ChipLogProgress(chipTool, " ***** Test Step 140 : Read attribute EPOCH_US Min Value\n");
-            err = TestReadAttributeEpochUsMinValue_140();
+            ChipLogProgress(chipTool, " ***** Test Step 140 : Write attribute EPOCH_US Min Value\n");
+            err = TestWriteAttributeEpochUsMinValue_140();
             break;
         case 141:
-            ChipLogProgress(chipTool, " ***** Test Step 141 : Read attribute EPOCH_S Default Value\n");
-            err = TestReadAttributeEpochSDefaultValue_141();
+            ChipLogProgress(chipTool, " ***** Test Step 141 : Read attribute EPOCH_US Min Value\n");
+            err = TestReadAttributeEpochUsMinValue_141();
             break;
         case 142:
-            ChipLogProgress(chipTool, " ***** Test Step 142 : Write attribute EPOCH_S Max Value\n");
-            err = TestWriteAttributeEpochSMaxValue_142();
+            ChipLogProgress(chipTool, " ***** Test Step 142 : Read attribute EPOCH_S Default Value\n");
+            err = TestReadAttributeEpochSDefaultValue_142();
             break;
         case 143:
-            ChipLogProgress(chipTool, " ***** Test Step 143 : Read attribute EPOCH_S Max Value\n");
-            err = TestReadAttributeEpochSMaxValue_143();
+            ChipLogProgress(chipTool, " ***** Test Step 143 : Write attribute EPOCH_S Max Value\n");
+            err = TestWriteAttributeEpochSMaxValue_143();
             break;
         case 144:
-            ChipLogProgress(chipTool, " ***** Test Step 144 : Write attribute EPOCH_S Min Value\n");
-            err = TestWriteAttributeEpochSMinValue_144();
+            ChipLogProgress(chipTool, " ***** Test Step 144 : Read attribute EPOCH_S Max Value\n");
+            err = TestReadAttributeEpochSMaxValue_144();
             break;
         case 145:
-            ChipLogProgress(chipTool, " ***** Test Step 145 : Read attribute EPOCH_S Min Value\n");
-            err = TestReadAttributeEpochSMinValue_145();
+            ChipLogProgress(chipTool, " ***** Test Step 145 : Write attribute EPOCH_S Min Value\n");
+            err = TestWriteAttributeEpochSMinValue_145();
             break;
         case 146:
-            ChipLogProgress(chipTool, " ***** Test Step 146 : Read attribute UNSUPPORTED\n");
-            err = TestReadAttributeUnsupported_146();
+            ChipLogProgress(chipTool, " ***** Test Step 146 : Read attribute EPOCH_S Min Value\n");
+            err = TestReadAttributeEpochSMinValue_146();
             break;
         case 147:
-            ChipLogProgress(chipTool, " ***** Test Step 147 : Writeattribute UNSUPPORTED\n");
-            err = TestWriteattributeUnsupported_147();
+            ChipLogProgress(chipTool, " ***** Test Step 147 : Read attribute UNSUPPORTED\n");
+            err = TestReadAttributeUnsupported_147();
             break;
         case 148:
-            ChipLogProgress(chipTool, " ***** Test Step 148 : Send Test Command to unsupported endpoint\n");
-            err = TestSendTestCommandToUnsupportedEndpoint_148();
+            ChipLogProgress(chipTool, " ***** Test Step 148 : Writeattribute UNSUPPORTED\n");
+            err = TestWriteattributeUnsupported_148();
             break;
         case 149:
-            ChipLogProgress(chipTool, " ***** Test Step 149 : Send Test Command to unsupported cluster\n");
-            err = TestSendTestCommandToUnsupportedCluster_149();
+            ChipLogProgress(chipTool, " ***** Test Step 149 : Send Test Command to unsupported endpoint\n");
+            err = TestSendTestCommandToUnsupportedEndpoint_149();
             break;
         case 150:
-            ChipLogProgress(chipTool, " ***** Test Step 150 : Read attribute vendor_id Default Value\n");
-            err = TestReadAttributeVendorIdDefaultValue_150();
+            ChipLogProgress(chipTool, " ***** Test Step 150 : Send Test Command to unsupported cluster\n");
+            err = TestSendTestCommandToUnsupportedCluster_150();
             break;
         case 151:
-            ChipLogProgress(chipTool, " ***** Test Step 151 : Write attribute vendor_id\n");
-            err = TestWriteAttributeVendorId_151();
+            ChipLogProgress(chipTool, " ***** Test Step 151 : Read attribute vendor_id Default Value\n");
+            err = TestReadAttributeVendorIdDefaultValue_151();
             break;
         case 152:
-            ChipLogProgress(chipTool, " ***** Test Step 152 : Read attribute vendor_id\n");
-            err = TestReadAttributeVendorId_152();
+            ChipLogProgress(chipTool, " ***** Test Step 152 : Write attribute vendor_id\n");
+            err = TestWriteAttributeVendorId_152();
             break;
         case 153:
-            ChipLogProgress(chipTool, " ***** Test Step 153 : Restore attribute vendor_id\n");
-            err = TestRestoreAttributeVendorId_153();
+            ChipLogProgress(chipTool, " ***** Test Step 153 : Read attribute vendor_id\n");
+            err = TestReadAttributeVendorId_153();
             break;
         case 154:
-            ChipLogProgress(chipTool, " ***** Test Step 154 : Send a command with a vendor_id and enum\n");
-            err = TestSendACommandWithAVendorIdAndEnum_154();
+            ChipLogProgress(chipTool, " ***** Test Step 154 : Restore attribute vendor_id\n");
+            err = TestRestoreAttributeVendorId_154();
             break;
         case 155:
-            ChipLogProgress(chipTool, " ***** Test Step 155 : Send a command with a vendor_id and invalid enum\n");
-            err = TestSendACommandWithAVendorIdAndInvalidEnum_155();
+            ChipLogProgress(chipTool, " ***** Test Step 155 : Send a command with a vendor_id and enum\n");
+            err = TestSendACommandWithAVendorIdAndEnum_155();
             break;
         case 156:
-            ChipLogProgress(chipTool, " ***** Test Step 156 : Send Test Command With Struct Argument and arg1.b is true\n");
-            err = TestSendTestCommandWithStructArgumentAndArg1bIsTrue_156();
+            ChipLogProgress(chipTool, " ***** Test Step 156 : Send a command with a vendor_id and invalid enum\n");
+            err = TestSendACommandWithAVendorIdAndInvalidEnum_156();
             break;
         case 157:
-            ChipLogProgress(chipTool, " ***** Test Step 157 : Send Test Command With Struct Argument and arg1.b is false\n");
-            err = TestSendTestCommandWithStructArgumentAndArg1bIsFalse_157();
+            ChipLogProgress(chipTool, " ***** Test Step 157 : Send Test Command With Struct Argument and arg1.b is true\n");
+            err = TestSendTestCommandWithStructArgumentAndArg1bIsTrue_157();
             break;
         case 158:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 158 : Send Test Command With Nested Struct Argument and arg1.c.b is true\n");
-            err = TestSendTestCommandWithNestedStructArgumentAndArg1cbIsTrue_158();
+            ChipLogProgress(chipTool, " ***** Test Step 158 : Send Test Command With Struct Argument and arg1.b is false\n");
+            err = TestSendTestCommandWithStructArgumentAndArg1bIsFalse_158();
             break;
         case 159:
-            ChipLogProgress(chipTool, " ***** Test Step 159 : Send Test Command With Nested Struct Argument arg1.c.b is false\n");
-            err = TestSendTestCommandWithNestedStructArgumentArg1cbIsFalse_159();
+            ChipLogProgress(
+                chipTool, " ***** Test Step 159 : Send Test Command With Nested Struct Argument and arg1.c.b is true\n");
+            err = TestSendTestCommandWithNestedStructArgumentAndArg1cbIsTrue_159();
             break;
         case 160:
-            ChipLogProgress(chipTool,
-                " ***** Test Step 160 : Send Test Command With Nested Struct List Argument and all fields b of arg1.d are true\n");
-            err = TestSendTestCommandWithNestedStructListArgumentAndAllFieldsBOfArg1dAreTrue_160();
+            ChipLogProgress(chipTool, " ***** Test Step 160 : Send Test Command With Nested Struct Argument arg1.c.b is false\n");
+            err = TestSendTestCommandWithNestedStructArgumentArg1cbIsFalse_160();
             break;
         case 161:
             ChipLogProgress(chipTool,
-                " ***** Test Step 161 : Send Test Command With Nested Struct List Argument and some fields b of arg1.d are "
-                "false\n");
-            err = TestSendTestCommandWithNestedStructListArgumentAndSomeFieldsBOfArg1dAreFalse_161();
+                " ***** Test Step 161 : Send Test Command With Nested Struct List Argument and all fields b of arg1.d are true\n");
+            err = TestSendTestCommandWithNestedStructListArgumentAndAllFieldsBOfArg1dAreTrue_161();
             break;
         case 162:
-            ChipLogProgress(chipTool, " ***** Test Step 162 : Send Test Command With Struct Argument and see what we get back\n");
-            err = TestSendTestCommandWithStructArgumentAndSeeWhatWeGetBack_162();
+            ChipLogProgress(chipTool,
+                " ***** Test Step 162 : Send Test Command With Nested Struct List Argument and some fields b of arg1.d are "
+                "false\n");
+            err = TestSendTestCommandWithNestedStructListArgumentAndSomeFieldsBOfArg1dAreFalse_162();
             break;
         case 163:
-            ChipLogProgress(chipTool, " ***** Test Step 163 : Send Test Command With List of INT8U and none of them is set to 0\n");
-            err = TestSendTestCommandWithListOfInt8uAndNoneOfThemIsSetTo0_163();
+            ChipLogProgress(chipTool, " ***** Test Step 163 : Send Test Command With Struct Argument and see what we get back\n");
+            err = TestSendTestCommandWithStructArgumentAndSeeWhatWeGetBack_163();
             break;
         case 164:
-            ChipLogProgress(chipTool, " ***** Test Step 164 : Send Test Command With List of INT8U and one of them is set to 0\n");
-            err = TestSendTestCommandWithListOfInt8uAndOneOfThemIsSetTo0_164();
+            ChipLogProgress(chipTool, " ***** Test Step 164 : Send Test Command With List of INT8U and none of them is set to 0\n");
+            err = TestSendTestCommandWithListOfInt8uAndNoneOfThemIsSetTo0_164();
             break;
         case 165:
-            ChipLogProgress(chipTool, " ***** Test Step 165 : Send Test Command With List of INT8U and get it reversed\n");
-            err = TestSendTestCommandWithListOfInt8uAndGetItReversed_165();
+            ChipLogProgress(chipTool, " ***** Test Step 165 : Send Test Command With List of INT8U and one of them is set to 0\n");
+            err = TestSendTestCommandWithListOfInt8uAndOneOfThemIsSetTo0_165();
             break;
         case 166:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 166 : Send Test Command With empty List of INT8U and get an empty list back\n");
-            err = TestSendTestCommandWithEmptyListOfInt8uAndGetAnEmptyListBack_166();
+            ChipLogProgress(chipTool, " ***** Test Step 166 : Send Test Command With List of INT8U and get it reversed\n");
+            err = TestSendTestCommandWithListOfInt8uAndGetItReversed_166();
             break;
         case 167:
-            ChipLogProgress(chipTool,
-                " ***** Test Step 167 : Send Test Command With List of Struct Argument and arg1.b of first item is true\n");
-            err = TestSendTestCommandWithListOfStructArgumentAndArg1bOfFirstItemIsTrue_167();
+            ChipLogProgress(
+                chipTool, " ***** Test Step 167 : Send Test Command With empty List of INT8U and get an empty list back\n");
+            err = TestSendTestCommandWithEmptyListOfInt8uAndGetAnEmptyListBack_167();
             break;
         case 168:
             ChipLogProgress(chipTool,
-                " ***** Test Step 168 : Send Test Command With List of Struct Argument and arg1.b of first item is false\n");
-            err = TestSendTestCommandWithListOfStructArgumentAndArg1bOfFirstItemIsFalse_168();
+                " ***** Test Step 168 : Send Test Command With List of Struct Argument and arg1.b of first item is true\n");
+            err = TestSendTestCommandWithListOfStructArgumentAndArg1bOfFirstItemIsTrue_168();
             break;
         case 169:
             ChipLogProgress(chipTool,
-                " ***** Test Step 169 : Send Test Command With List of Nested Struct List Argument and all fields b of elements of "
-                "arg1.d are true\n");
-            err = TestSendTestCommandWithListOfNestedStructListArgumentAndAllFieldsBOfElementsOfArg1dAreTrue_169();
+                " ***** Test Step 169 : Send Test Command With List of Struct Argument and arg1.b of first item is false\n");
+            err = TestSendTestCommandWithListOfStructArgumentAndArg1bOfFirstItemIsFalse_169();
             break;
         case 170:
             ChipLogProgress(chipTool,
-                " ***** Test Step 170 : Send Test Command With Nested Struct List Argument and some fields b of elements of arg1.d "
-                "are false\n");
-            err = TestSendTestCommandWithNestedStructListArgumentAndSomeFieldsBOfElementsOfArg1dAreFalse_170();
+                " ***** Test Step 170 : Send Test Command With List of Nested Struct List Argument and all fields b of elements of "
+                "arg1.d are true\n");
+            err = TestSendTestCommandWithListOfNestedStructListArgumentAndAllFieldsBOfElementsOfArg1dAreTrue_170();
             break;
         case 171:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 171 : Write attribute LIST With List of INT8U and none of them is set to 0\n");
-            err = TestWriteAttributeListWithListOfInt8uAndNoneOfThemIsSetTo0_171();
+            ChipLogProgress(chipTool,
+                " ***** Test Step 171 : Send Test Command With Nested Struct List Argument and some fields b of elements of arg1.d "
+                "are false\n");
+            err = TestSendTestCommandWithNestedStructListArgumentAndSomeFieldsBOfElementsOfArg1dAreFalse_171();
             break;
         case 172:
-            ChipLogProgress(chipTool, " ***** Test Step 172 : Read attribute LIST With List of INT8U\n");
-            err = TestReadAttributeListWithListOfInt8u_172();
+            ChipLogProgress(
+                chipTool, " ***** Test Step 172 : Write attribute LIST With List of INT8U and none of them is set to 0\n");
+            err = TestWriteAttributeListWithListOfInt8uAndNoneOfThemIsSetTo0_172();
             break;
         case 173:
-            ChipLogProgress(chipTool, " ***** Test Step 173 : Write attribute LIST With List of OCTET_STRING\n");
-            err = TestWriteAttributeListWithListOfOctetString_173();
+            ChipLogProgress(chipTool, " ***** Test Step 173 : Read attribute LIST With List of INT8U\n");
+            err = TestReadAttributeListWithListOfInt8u_173();
             break;
         case 174:
-            ChipLogProgress(chipTool, " ***** Test Step 174 : Read attribute LIST With List of OCTET_STRING\n");
-            err = TestReadAttributeListWithListOfOctetString_174();
+            ChipLogProgress(chipTool, " ***** Test Step 174 : Write attribute LIST With List of OCTET_STRING\n");
+            err = TestWriteAttributeListWithListOfOctetString_174();
             break;
         case 175:
-            ChipLogProgress(chipTool, " ***** Test Step 175 : Write attribute LIST With List of LIST_STRUCT_OCTET_STRING\n");
-            err = TestWriteAttributeListWithListOfListStructOctetString_175();
+            ChipLogProgress(chipTool, " ***** Test Step 175 : Read attribute LIST With List of OCTET_STRING\n");
+            err = TestReadAttributeListWithListOfOctetString_175();
             break;
         case 176:
-            ChipLogProgress(chipTool, " ***** Test Step 176 : Read attribute LIST With List of LIST_STRUCT_OCTET_STRING\n");
-            err = TestReadAttributeListWithListOfListStructOctetString_176();
+            ChipLogProgress(chipTool, " ***** Test Step 176 : Write attribute LIST With List of LIST_STRUCT_OCTET_STRING\n");
+            err = TestWriteAttributeListWithListOfListStructOctetString_176();
             break;
         case 177:
-            ChipLogProgress(chipTool, " ***** Test Step 177 : Send Test Command with optional arg set.\n");
-            err = TestSendTestCommandWithOptionalArgSet_177();
+            ChipLogProgress(chipTool, " ***** Test Step 177 : Read attribute LIST With List of LIST_STRUCT_OCTET_STRING\n");
+            err = TestReadAttributeListWithListOfListStructOctetString_177();
             break;
         case 178:
-            ChipLogProgress(chipTool, " ***** Test Step 178 : Send Test Command without its optional arg.\n");
-            err = TestSendTestCommandWithoutItsOptionalArg_178();
+            ChipLogProgress(chipTool, " ***** Test Step 178 : Send Test Command with optional arg set.\n");
+            err = TestSendTestCommandWithOptionalArgSet_178();
             break;
         case 179:
-            ChipLogProgress(chipTool, " ***** Test Step 179 : Read list of structs containing nullables and optionals\n");
-            err = TestReadListOfStructsContainingNullablesAndOptionals_179();
+            ChipLogProgress(chipTool, " ***** Test Step 179 : Send Test Command without its optional arg.\n");
+            err = TestSendTestCommandWithoutItsOptionalArg_179();
             break;
         case 180:
-            ChipLogProgress(chipTool, " ***** Test Step 180 : Write list of structs containing nullables and optionals\n");
-            err = TestWriteListOfStructsContainingNullablesAndOptionals_180();
+            ChipLogProgress(chipTool, " ***** Test Step 180 : Read list of structs containing nullables and optionals\n");
+            err = TestReadListOfStructsContainingNullablesAndOptionals_180();
             break;
         case 181:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 181 : Read list of structs containing nullables and optionals after writing\n");
-            err = TestReadListOfStructsContainingNullablesAndOptionalsAfterWriting_181();
+            ChipLogProgress(chipTool, " ***** Test Step 181 : Write list of structs containing nullables and optionals\n");
+            err = TestWriteListOfStructsContainingNullablesAndOptionals_181();
             break;
         case 182:
-            ChipLogProgress(chipTool, " ***** Test Step 182 : Write attribute NULLABLE_BOOLEAN null\n");
-            err = TestWriteAttributeNullableBooleanNull_182();
+            ChipLogProgress(
+                chipTool, " ***** Test Step 182 : Read list of structs containing nullables and optionals after writing\n");
+            err = TestReadListOfStructsContainingNullablesAndOptionalsAfterWriting_182();
             break;
         case 183:
-            ChipLogProgress(chipTool, " ***** Test Step 183 : Read attribute NULLABLE_BOOLEAN null\n");
-            err = TestReadAttributeNullableBooleanNull_183();
+            ChipLogProgress(chipTool, " ***** Test Step 183 : Write attribute NULLABLE_BOOLEAN null\n");
+            err = TestWriteAttributeNullableBooleanNull_183();
             break;
         case 184:
-            ChipLogProgress(chipTool, " ***** Test Step 184 : Write attribute NULLABLE_BOOLEAN True\n");
-            err = TestWriteAttributeNullableBooleanTrue_184();
+            ChipLogProgress(chipTool, " ***** Test Step 184 : Read attribute NULLABLE_BOOLEAN null\n");
+            err = TestReadAttributeNullableBooleanNull_184();
             break;
         case 185:
-            ChipLogProgress(chipTool, " ***** Test Step 185 : Read attribute NULLABLE_BOOLEAN True\n");
-            err = TestReadAttributeNullableBooleanTrue_185();
+            ChipLogProgress(chipTool, " ***** Test Step 185 : Write attribute NULLABLE_BOOLEAN True\n");
+            err = TestWriteAttributeNullableBooleanTrue_185();
             break;
         case 186:
-            ChipLogProgress(chipTool, " ***** Test Step 186 : Read attribute NULLABLE_BOOLEAN not null\n");
-            err = TestReadAttributeNullableBooleanNotNull_186();
+            ChipLogProgress(chipTool, " ***** Test Step 186 : Read attribute NULLABLE_BOOLEAN True\n");
+            err = TestReadAttributeNullableBooleanTrue_186();
             break;
         case 187:
-            ChipLogProgress(chipTool, " ***** Test Step 187 : Write attribute NULLABLE_BITMAP8 Max Value\n");
-            err = TestWriteAttributeNullableBitmap8MaxValue_187();
+            ChipLogProgress(chipTool, " ***** Test Step 187 : Read attribute NULLABLE_BOOLEAN not null\n");
+            err = TestReadAttributeNullableBooleanNotNull_187();
             break;
         case 188:
-            ChipLogProgress(chipTool, " ***** Test Step 188 : Read attribute NULLABLE_BITMAP8 Max Value\n");
-            err = TestReadAttributeNullableBitmap8MaxValue_188();
+            ChipLogProgress(chipTool, " ***** Test Step 188 : Write attribute NULLABLE_BITMAP8 Max Value\n");
+            err = TestWriteAttributeNullableBitmap8MaxValue_188();
             break;
         case 189:
-            ChipLogProgress(chipTool, " ***** Test Step 189 : Write attribute NULLABLE_BITMAP8 Invalid Value\n");
-            err = TestWriteAttributeNullableBitmap8InvalidValue_189();
+            ChipLogProgress(chipTool, " ***** Test Step 189 : Read attribute NULLABLE_BITMAP8 Max Value\n");
+            err = TestReadAttributeNullableBitmap8MaxValue_189();
             break;
         case 190:
-            ChipLogProgress(chipTool, " ***** Test Step 190 : Read attribute NULLABLE_BITMAP8 unchanged Value\n");
-            err = TestReadAttributeNullableBitmap8UnchangedValue_190();
+            ChipLogProgress(chipTool, " ***** Test Step 190 : Write attribute NULLABLE_BITMAP8 Invalid Value\n");
+            err = TestWriteAttributeNullableBitmap8InvalidValue_190();
             break;
         case 191:
-            ChipLogProgress(chipTool, " ***** Test Step 191 : Write attribute NULLABLE_BITMAP8 null Value\n");
-            err = TestWriteAttributeNullableBitmap8NullValue_191();
+            ChipLogProgress(chipTool, " ***** Test Step 191 : Read attribute NULLABLE_BITMAP8 unchanged Value\n");
+            err = TestReadAttributeNullableBitmap8UnchangedValue_191();
             break;
         case 192:
-            ChipLogProgress(chipTool, " ***** Test Step 192 : Read attribute NULLABLE_BITMAP8 null Value\n");
-            err = TestReadAttributeNullableBitmap8NullValue_192();
+            ChipLogProgress(chipTool, " ***** Test Step 192 : Write attribute NULLABLE_BITMAP8 null Value\n");
+            err = TestWriteAttributeNullableBitmap8NullValue_192();
             break;
         case 193:
-            ChipLogProgress(chipTool, " ***** Test Step 193 : Read attribute NULLABLE_BITMAP8 not 254 Value\n");
-            err = TestReadAttributeNullableBitmap8Not254Value_193();
+            ChipLogProgress(chipTool, " ***** Test Step 193 : Read attribute NULLABLE_BITMAP8 null Value\n");
+            err = TestReadAttributeNullableBitmap8NullValue_193();
             break;
         case 194:
-            ChipLogProgress(chipTool, " ***** Test Step 194 : Write attribute NULLABLE_BITMAP16 Max Value\n");
-            err = TestWriteAttributeNullableBitmap16MaxValue_194();
+            ChipLogProgress(chipTool, " ***** Test Step 194 : Read attribute NULLABLE_BITMAP8 not 254 Value\n");
+            err = TestReadAttributeNullableBitmap8Not254Value_194();
             break;
         case 195:
-            ChipLogProgress(chipTool, " ***** Test Step 195 : Read attribute NULLABLE_BITMAP16 Max Value\n");
-            err = TestReadAttributeNullableBitmap16MaxValue_195();
+            ChipLogProgress(chipTool, " ***** Test Step 195 : Write attribute NULLABLE_BITMAP16 Max Value\n");
+            err = TestWriteAttributeNullableBitmap16MaxValue_195();
             break;
         case 196:
-            ChipLogProgress(chipTool, " ***** Test Step 196 : Write attribute NULLABLE_BITMAP16 Invalid Value\n");
-            err = TestWriteAttributeNullableBitmap16InvalidValue_196();
+            ChipLogProgress(chipTool, " ***** Test Step 196 : Read attribute NULLABLE_BITMAP16 Max Value\n");
+            err = TestReadAttributeNullableBitmap16MaxValue_196();
             break;
         case 197:
-            ChipLogProgress(chipTool, " ***** Test Step 197 : Read attribute NULLABLE_BITMAP16 unchanged Value\n");
-            err = TestReadAttributeNullableBitmap16UnchangedValue_197();
+            ChipLogProgress(chipTool, " ***** Test Step 197 : Write attribute NULLABLE_BITMAP16 Invalid Value\n");
+            err = TestWriteAttributeNullableBitmap16InvalidValue_197();
             break;
         case 198:
-            ChipLogProgress(chipTool, " ***** Test Step 198 : Write attribute NULLABLE_BITMAP16 null Value\n");
-            err = TestWriteAttributeNullableBitmap16NullValue_198();
+            ChipLogProgress(chipTool, " ***** Test Step 198 : Read attribute NULLABLE_BITMAP16 unchanged Value\n");
+            err = TestReadAttributeNullableBitmap16UnchangedValue_198();
             break;
         case 199:
-            ChipLogProgress(chipTool, " ***** Test Step 199 : Read attribute NULLABLE_BITMAP16 null Value\n");
-            err = TestReadAttributeNullableBitmap16NullValue_199();
+            ChipLogProgress(chipTool, " ***** Test Step 199 : Write attribute NULLABLE_BITMAP16 null Value\n");
+            err = TestWriteAttributeNullableBitmap16NullValue_199();
             break;
         case 200:
-            ChipLogProgress(chipTool, " ***** Test Step 200 : Write attribute NULLABLE_BITMAP32 Max Value\n");
-            err = TestWriteAttributeNullableBitmap32MaxValue_200();
+            ChipLogProgress(chipTool, " ***** Test Step 200 : Read attribute NULLABLE_BITMAP16 null Value\n");
+            err = TestReadAttributeNullableBitmap16NullValue_200();
             break;
         case 201:
-            ChipLogProgress(chipTool, " ***** Test Step 201 : Read attribute NULLABLE_BITMAP32 Max Value\n");
-            err = TestReadAttributeNullableBitmap32MaxValue_201();
+            ChipLogProgress(chipTool, " ***** Test Step 201 : Write attribute NULLABLE_BITMAP32 Max Value\n");
+            err = TestWriteAttributeNullableBitmap32MaxValue_201();
             break;
         case 202:
-            ChipLogProgress(chipTool, " ***** Test Step 202 : Write attribute NULLABLE_BITMAP32 Invalid Value\n");
-            err = TestWriteAttributeNullableBitmap32InvalidValue_202();
+            ChipLogProgress(chipTool, " ***** Test Step 202 : Read attribute NULLABLE_BITMAP32 Max Value\n");
+            err = TestReadAttributeNullableBitmap32MaxValue_202();
             break;
         case 203:
-            ChipLogProgress(chipTool, " ***** Test Step 203 : Read attribute NULLABLE_BITMAP32 unchanged Value\n");
-            err = TestReadAttributeNullableBitmap32UnchangedValue_203();
+            ChipLogProgress(chipTool, " ***** Test Step 203 : Write attribute NULLABLE_BITMAP32 Invalid Value\n");
+            err = TestWriteAttributeNullableBitmap32InvalidValue_203();
             break;
         case 204:
-            ChipLogProgress(chipTool, " ***** Test Step 204 : Write attribute NULLABLE_BITMAP32 null Value\n");
-            err = TestWriteAttributeNullableBitmap32NullValue_204();
+            ChipLogProgress(chipTool, " ***** Test Step 204 : Read attribute NULLABLE_BITMAP32 unchanged Value\n");
+            err = TestReadAttributeNullableBitmap32UnchangedValue_204();
             break;
         case 205:
-            ChipLogProgress(chipTool, " ***** Test Step 205 : Read attribute NULLABLE_BITMAP32 null Value\n");
-            err = TestReadAttributeNullableBitmap32NullValue_205();
+            ChipLogProgress(chipTool, " ***** Test Step 205 : Write attribute NULLABLE_BITMAP32 null Value\n");
+            err = TestWriteAttributeNullableBitmap32NullValue_205();
             break;
         case 206:
-            ChipLogProgress(chipTool, " ***** Test Step 206 : Write attribute NULLABLE_BITMAP64 Max Value\n");
-            err = TestWriteAttributeNullableBitmap64MaxValue_206();
+            ChipLogProgress(chipTool, " ***** Test Step 206 : Read attribute NULLABLE_BITMAP32 null Value\n");
+            err = TestReadAttributeNullableBitmap32NullValue_206();
             break;
         case 207:
-            ChipLogProgress(chipTool, " ***** Test Step 207 : Read attribute NULLABLE_BITMAP64 Max Value\n");
-            err = TestReadAttributeNullableBitmap64MaxValue_207();
+            ChipLogProgress(chipTool, " ***** Test Step 207 : Write attribute NULLABLE_BITMAP64 Max Value\n");
+            err = TestWriteAttributeNullableBitmap64MaxValue_207();
             break;
         case 208:
-            ChipLogProgress(chipTool, " ***** Test Step 208 : Write attribute NULLABLE_BITMAP64 Invalid Value\n");
-            err = TestWriteAttributeNullableBitmap64InvalidValue_208();
+            ChipLogProgress(chipTool, " ***** Test Step 208 : Read attribute NULLABLE_BITMAP64 Max Value\n");
+            err = TestReadAttributeNullableBitmap64MaxValue_208();
             break;
         case 209:
-            ChipLogProgress(chipTool, " ***** Test Step 209 : Read attribute NULLABLE_BITMAP64 unchanged Value\n");
-            err = TestReadAttributeNullableBitmap64UnchangedValue_209();
+            ChipLogProgress(chipTool, " ***** Test Step 209 : Write attribute NULLABLE_BITMAP64 Invalid Value\n");
+            err = TestWriteAttributeNullableBitmap64InvalidValue_209();
             break;
         case 210:
-            ChipLogProgress(chipTool, " ***** Test Step 210 : Write attribute NULLABLE_BITMAP64 null Value\n");
-            err = TestWriteAttributeNullableBitmap64NullValue_210();
+            ChipLogProgress(chipTool, " ***** Test Step 210 : Read attribute NULLABLE_BITMAP64 unchanged Value\n");
+            err = TestReadAttributeNullableBitmap64UnchangedValue_210();
             break;
         case 211:
-            ChipLogProgress(chipTool, " ***** Test Step 211 : Read attribute NULLABLE_BITMAP64 null Value\n");
-            err = TestReadAttributeNullableBitmap64NullValue_211();
+            ChipLogProgress(chipTool, " ***** Test Step 211 : Write attribute NULLABLE_BITMAP64 null Value\n");
+            err = TestWriteAttributeNullableBitmap64NullValue_211();
             break;
         case 212:
-            ChipLogProgress(chipTool, " ***** Test Step 212 : Write attribute NULLABLE_INT8U Min Value\n");
-            err = TestWriteAttributeNullableInt8uMinValue_212();
+            ChipLogProgress(chipTool, " ***** Test Step 212 : Read attribute NULLABLE_BITMAP64 null Value\n");
+            err = TestReadAttributeNullableBitmap64NullValue_212();
             break;
         case 213:
-            ChipLogProgress(chipTool, " ***** Test Step 213 : Read attribute NULLABLE_INT8U Min Value\n");
-            err = TestReadAttributeNullableInt8uMinValue_213();
+            ChipLogProgress(chipTool, " ***** Test Step 213 : Write attribute NULLABLE_INT8U Min Value\n");
+            err = TestWriteAttributeNullableInt8uMinValue_213();
             break;
         case 214:
-            ChipLogProgress(chipTool, " ***** Test Step 214 : Write attribute NULLABLE_INT8U Max Value\n");
-            err = TestWriteAttributeNullableInt8uMaxValue_214();
+            ChipLogProgress(chipTool, " ***** Test Step 214 : Read attribute NULLABLE_INT8U Min Value\n");
+            err = TestReadAttributeNullableInt8uMinValue_214();
             break;
         case 215:
-            ChipLogProgress(chipTool, " ***** Test Step 215 : Read attribute NULLABLE_INT8U Max Value\n");
-            err = TestReadAttributeNullableInt8uMaxValue_215();
+            ChipLogProgress(chipTool, " ***** Test Step 215 : Write attribute NULLABLE_INT8U Max Value\n");
+            err = TestWriteAttributeNullableInt8uMaxValue_215();
             break;
         case 216:
-            ChipLogProgress(chipTool, " ***** Test Step 216 : Write attribute NULLABLE_INT8U Invalid Value\n");
-            err = TestWriteAttributeNullableInt8uInvalidValue_216();
+            ChipLogProgress(chipTool, " ***** Test Step 216 : Read attribute NULLABLE_INT8U Max Value\n");
+            err = TestReadAttributeNullableInt8uMaxValue_216();
             break;
         case 217:
-            ChipLogProgress(chipTool, " ***** Test Step 217 : Read attribute NULLABLE_INT8U unchanged Value\n");
-            err = TestReadAttributeNullableInt8uUnchangedValue_217();
+            ChipLogProgress(chipTool, " ***** Test Step 217 : Write attribute NULLABLE_INT8U Invalid Value\n");
+            err = TestWriteAttributeNullableInt8uInvalidValue_217();
             break;
         case 218:
-            ChipLogProgress(chipTool, " ***** Test Step 218 : Read attribute NULLABLE_INT8U unchanged Value with constraint\n");
-            err = TestReadAttributeNullableInt8uUnchangedValueWithConstraint_218();
+            ChipLogProgress(chipTool, " ***** Test Step 218 : Read attribute NULLABLE_INT8U unchanged Value\n");
+            err = TestReadAttributeNullableInt8uUnchangedValue_218();
             break;
         case 219:
-            ChipLogProgress(chipTool, " ***** Test Step 219 : Write attribute NULLABLE_INT8U null Value\n");
-            err = TestWriteAttributeNullableInt8uNullValue_219();
+            ChipLogProgress(chipTool, " ***** Test Step 219 : Read attribute NULLABLE_INT8U unchanged Value with constraint\n");
+            err = TestReadAttributeNullableInt8uUnchangedValueWithConstraint_219();
             break;
         case 220:
-            ChipLogProgress(chipTool, " ***** Test Step 220 : Read attribute NULLABLE_INT8U null Value\n");
-            err = TestReadAttributeNullableInt8uNullValue_220();
+            ChipLogProgress(chipTool, " ***** Test Step 220 : Write attribute NULLABLE_INT8U null Value\n");
+            err = TestWriteAttributeNullableInt8uNullValue_220();
             break;
         case 221:
-            ChipLogProgress(chipTool, " ***** Test Step 221 : Read attribute NULLABLE_INT8U null Value & range\n");
-            err = TestReadAttributeNullableInt8uNullValueRange_221();
+            ChipLogProgress(chipTool, " ***** Test Step 221 : Read attribute NULLABLE_INT8U null Value\n");
+            err = TestReadAttributeNullableInt8uNullValue_221();
             break;
         case 222:
-            ChipLogProgress(chipTool, " ***** Test Step 222 : Read attribute NULLABLE_INT8U null Value & not\n");
-            err = TestReadAttributeNullableInt8uNullValueNot_222();
+            ChipLogProgress(chipTool, " ***** Test Step 222 : Read attribute NULLABLE_INT8U null Value & range\n");
+            err = TestReadAttributeNullableInt8uNullValueRange_222();
             break;
         case 223:
-            ChipLogProgress(chipTool, " ***** Test Step 223 : Write attribute NULLABLE_INT8U Value\n");
-            err = TestWriteAttributeNullableInt8uValue_223();
+            ChipLogProgress(chipTool, " ***** Test Step 223 : Read attribute NULLABLE_INT8U null Value & not\n");
+            err = TestReadAttributeNullableInt8uNullValueNot_223();
             break;
         case 224:
-            ChipLogProgress(chipTool, " ***** Test Step 224 : Read attribute NULLABLE_INT8U Value in range\n");
-            err = TestReadAttributeNullableInt8uValueInRange_224();
+            ChipLogProgress(chipTool, " ***** Test Step 224 : Write attribute NULLABLE_INT8U Value\n");
+            err = TestWriteAttributeNullableInt8uValue_224();
             break;
         case 225:
-            ChipLogProgress(chipTool, " ***** Test Step 225 : Read attribute NULLABLE_INT8U notValue OK\n");
-            err = TestReadAttributeNullableInt8uNotValueOk_225();
+            ChipLogProgress(chipTool, " ***** Test Step 225 : Read attribute NULLABLE_INT8U Value in range\n");
+            err = TestReadAttributeNullableInt8uValueInRange_225();
             break;
         case 226:
-            ChipLogProgress(chipTool, " ***** Test Step 226 : Write attribute NULLABLE_INT16U Min Value\n");
-            err = TestWriteAttributeNullableInt16uMinValue_226();
+            ChipLogProgress(chipTool, " ***** Test Step 226 : Read attribute NULLABLE_INT8U notValue OK\n");
+            err = TestReadAttributeNullableInt8uNotValueOk_226();
             break;
         case 227:
-            ChipLogProgress(chipTool, " ***** Test Step 227 : Read attribute NULLABLE_INT16U Min Value\n");
-            err = TestReadAttributeNullableInt16uMinValue_227();
+            ChipLogProgress(chipTool, " ***** Test Step 227 : Write attribute NULLABLE_INT16U Min Value\n");
+            err = TestWriteAttributeNullableInt16uMinValue_227();
             break;
         case 228:
-            ChipLogProgress(chipTool, " ***** Test Step 228 : Write attribute NULLABLE_INT16U Max Value\n");
-            err = TestWriteAttributeNullableInt16uMaxValue_228();
+            ChipLogProgress(chipTool, " ***** Test Step 228 : Read attribute NULLABLE_INT16U Min Value\n");
+            err = TestReadAttributeNullableInt16uMinValue_228();
             break;
         case 229:
-            ChipLogProgress(chipTool, " ***** Test Step 229 : Read attribute NULLABLE_INT16U Max Value\n");
-            err = TestReadAttributeNullableInt16uMaxValue_229();
+            ChipLogProgress(chipTool, " ***** Test Step 229 : Write attribute NULLABLE_INT16U Max Value\n");
+            err = TestWriteAttributeNullableInt16uMaxValue_229();
             break;
         case 230:
-            ChipLogProgress(chipTool, " ***** Test Step 230 : Write attribute NULLABLE_INT16U Invalid Value\n");
-            err = TestWriteAttributeNullableInt16uInvalidValue_230();
+            ChipLogProgress(chipTool, " ***** Test Step 230 : Read attribute NULLABLE_INT16U Max Value\n");
+            err = TestReadAttributeNullableInt16uMaxValue_230();
             break;
         case 231:
-            ChipLogProgress(chipTool, " ***** Test Step 231 : Read attribute NULLABLE_INT16U unchanged Value\n");
-            err = TestReadAttributeNullableInt16uUnchangedValue_231();
+            ChipLogProgress(chipTool, " ***** Test Step 231 : Write attribute NULLABLE_INT16U Invalid Value\n");
+            err = TestWriteAttributeNullableInt16uInvalidValue_231();
             break;
         case 232:
-            ChipLogProgress(chipTool, " ***** Test Step 232 : Write attribute NULLABLE_INT16U null Value\n");
-            err = TestWriteAttributeNullableInt16uNullValue_232();
+            ChipLogProgress(chipTool, " ***** Test Step 232 : Read attribute NULLABLE_INT16U unchanged Value\n");
+            err = TestReadAttributeNullableInt16uUnchangedValue_232();
             break;
         case 233:
-            ChipLogProgress(chipTool, " ***** Test Step 233 : Read attribute NULLABLE_INT16U null Value\n");
-            err = TestReadAttributeNullableInt16uNullValue_233();
+            ChipLogProgress(chipTool, " ***** Test Step 233 : Write attribute NULLABLE_INT16U null Value\n");
+            err = TestWriteAttributeNullableInt16uNullValue_233();
             break;
         case 234:
-            ChipLogProgress(chipTool, " ***** Test Step 234 : Read attribute NULLABLE_INT16U null Value & range\n");
-            err = TestReadAttributeNullableInt16uNullValueRange_234();
+            ChipLogProgress(chipTool, " ***** Test Step 234 : Read attribute NULLABLE_INT16U null Value\n");
+            err = TestReadAttributeNullableInt16uNullValue_234();
             break;
         case 235:
-            ChipLogProgress(chipTool, " ***** Test Step 235 : Read attribute NULLABLE_INT16U null Value & not\n");
-            err = TestReadAttributeNullableInt16uNullValueNot_235();
+            ChipLogProgress(chipTool, " ***** Test Step 235 : Read attribute NULLABLE_INT16U null Value & range\n");
+            err = TestReadAttributeNullableInt16uNullValueRange_235();
             break;
         case 236:
-            ChipLogProgress(chipTool, " ***** Test Step 236 : Write attribute NULLABLE_INT16U Value\n");
-            err = TestWriteAttributeNullableInt16uValue_236();
+            ChipLogProgress(chipTool, " ***** Test Step 236 : Read attribute NULLABLE_INT16U null Value & not\n");
+            err = TestReadAttributeNullableInt16uNullValueNot_236();
             break;
         case 237:
-            ChipLogProgress(chipTool, " ***** Test Step 237 : Read attribute NULLABLE_INT16U Value in range\n");
-            err = TestReadAttributeNullableInt16uValueInRange_237();
+            ChipLogProgress(chipTool, " ***** Test Step 237 : Write attribute NULLABLE_INT16U Value\n");
+            err = TestWriteAttributeNullableInt16uValue_237();
             break;
         case 238:
-            ChipLogProgress(chipTool, " ***** Test Step 238 : Read attribute NULLABLE_INT16U notValue OK\n");
-            err = TestReadAttributeNullableInt16uNotValueOk_238();
+            ChipLogProgress(chipTool, " ***** Test Step 238 : Read attribute NULLABLE_INT16U Value in range\n");
+            err = TestReadAttributeNullableInt16uValueInRange_238();
             break;
         case 239:
-            ChipLogProgress(chipTool, " ***** Test Step 239 : Write attribute NULLABLE_INT32U Min Value\n");
-            err = TestWriteAttributeNullableInt32uMinValue_239();
+            ChipLogProgress(chipTool, " ***** Test Step 239 : Read attribute NULLABLE_INT16U notValue OK\n");
+            err = TestReadAttributeNullableInt16uNotValueOk_239();
             break;
         case 240:
-            ChipLogProgress(chipTool, " ***** Test Step 240 : Read attribute NULLABLE_INT32U Min Value\n");
-            err = TestReadAttributeNullableInt32uMinValue_240();
+            ChipLogProgress(chipTool, " ***** Test Step 240 : Write attribute NULLABLE_INT32U Min Value\n");
+            err = TestWriteAttributeNullableInt32uMinValue_240();
             break;
         case 241:
-            ChipLogProgress(chipTool, " ***** Test Step 241 : Write attribute NULLABLE_INT32U Max Value\n");
-            err = TestWriteAttributeNullableInt32uMaxValue_241();
+            ChipLogProgress(chipTool, " ***** Test Step 241 : Read attribute NULLABLE_INT32U Min Value\n");
+            err = TestReadAttributeNullableInt32uMinValue_241();
             break;
         case 242:
-            ChipLogProgress(chipTool, " ***** Test Step 242 : Read attribute NULLABLE_INT32U Max Value\n");
-            err = TestReadAttributeNullableInt32uMaxValue_242();
+            ChipLogProgress(chipTool, " ***** Test Step 242 : Write attribute NULLABLE_INT32U Max Value\n");
+            err = TestWriteAttributeNullableInt32uMaxValue_242();
             break;
         case 243:
-            ChipLogProgress(chipTool, " ***** Test Step 243 : Write attribute NULLABLE_INT32U Invalid Value\n");
-            err = TestWriteAttributeNullableInt32uInvalidValue_243();
+            ChipLogProgress(chipTool, " ***** Test Step 243 : Read attribute NULLABLE_INT32U Max Value\n");
+            err = TestReadAttributeNullableInt32uMaxValue_243();
             break;
         case 244:
-            ChipLogProgress(chipTool, " ***** Test Step 244 : Read attribute NULLABLE_INT32U unchanged Value\n");
-            err = TestReadAttributeNullableInt32uUnchangedValue_244();
+            ChipLogProgress(chipTool, " ***** Test Step 244 : Write attribute NULLABLE_INT32U Invalid Value\n");
+            err = TestWriteAttributeNullableInt32uInvalidValue_244();
             break;
         case 245:
-            ChipLogProgress(chipTool, " ***** Test Step 245 : Write attribute NULLABLE_INT32U null Value\n");
-            err = TestWriteAttributeNullableInt32uNullValue_245();
+            ChipLogProgress(chipTool, " ***** Test Step 245 : Read attribute NULLABLE_INT32U unchanged Value\n");
+            err = TestReadAttributeNullableInt32uUnchangedValue_245();
             break;
         case 246:
-            ChipLogProgress(chipTool, " ***** Test Step 246 : Read attribute NULLABLE_INT32U null Value\n");
-            err = TestReadAttributeNullableInt32uNullValue_246();
+            ChipLogProgress(chipTool, " ***** Test Step 246 : Write attribute NULLABLE_INT32U null Value\n");
+            err = TestWriteAttributeNullableInt32uNullValue_246();
             break;
         case 247:
-            ChipLogProgress(chipTool, " ***** Test Step 247 : Read attribute NULLABLE_INT32U null Value & range\n");
-            err = TestReadAttributeNullableInt32uNullValueRange_247();
+            ChipLogProgress(chipTool, " ***** Test Step 247 : Read attribute NULLABLE_INT32U null Value\n");
+            err = TestReadAttributeNullableInt32uNullValue_247();
             break;
         case 248:
-            ChipLogProgress(chipTool, " ***** Test Step 248 : Read attribute NULLABLE_INT32U null Value & not\n");
-            err = TestReadAttributeNullableInt32uNullValueNot_248();
+            ChipLogProgress(chipTool, " ***** Test Step 248 : Read attribute NULLABLE_INT32U null Value & range\n");
+            err = TestReadAttributeNullableInt32uNullValueRange_248();
             break;
         case 249:
-            ChipLogProgress(chipTool, " ***** Test Step 249 : Write attribute NULLABLE_INT32U Value\n");
-            err = TestWriteAttributeNullableInt32uValue_249();
+            ChipLogProgress(chipTool, " ***** Test Step 249 : Read attribute NULLABLE_INT32U null Value & not\n");
+            err = TestReadAttributeNullableInt32uNullValueNot_249();
             break;
         case 250:
-            ChipLogProgress(chipTool, " ***** Test Step 250 : Read attribute NULLABLE_INT32U Value in range\n");
-            err = TestReadAttributeNullableInt32uValueInRange_250();
+            ChipLogProgress(chipTool, " ***** Test Step 250 : Write attribute NULLABLE_INT32U Value\n");
+            err = TestWriteAttributeNullableInt32uValue_250();
             break;
         case 251:
-            ChipLogProgress(chipTool, " ***** Test Step 251 : Read attribute NULLABLE_INT32U notValue OK\n");
-            err = TestReadAttributeNullableInt32uNotValueOk_251();
+            ChipLogProgress(chipTool, " ***** Test Step 251 : Read attribute NULLABLE_INT32U Value in range\n");
+            err = TestReadAttributeNullableInt32uValueInRange_251();
             break;
         case 252:
-            ChipLogProgress(chipTool, " ***** Test Step 252 : Write attribute NULLABLE_INT64U Min Value\n");
-            err = TestWriteAttributeNullableInt64uMinValue_252();
+            ChipLogProgress(chipTool, " ***** Test Step 252 : Read attribute NULLABLE_INT32U notValue OK\n");
+            err = TestReadAttributeNullableInt32uNotValueOk_252();
             break;
         case 253:
-            ChipLogProgress(chipTool, " ***** Test Step 253 : Read attribute NULLABLE_INT64U Min Value\n");
-            err = TestReadAttributeNullableInt64uMinValue_253();
+            ChipLogProgress(chipTool, " ***** Test Step 253 : Write attribute NULLABLE_INT64U Min Value\n");
+            err = TestWriteAttributeNullableInt64uMinValue_253();
             break;
         case 254:
-            ChipLogProgress(chipTool, " ***** Test Step 254 : Write attribute NULLABLE_INT64U Max Value\n");
-            err = TestWriteAttributeNullableInt64uMaxValue_254();
+            ChipLogProgress(chipTool, " ***** Test Step 254 : Read attribute NULLABLE_INT64U Min Value\n");
+            err = TestReadAttributeNullableInt64uMinValue_254();
             break;
         case 255:
-            ChipLogProgress(chipTool, " ***** Test Step 255 : Read attribute NULLABLE_INT64U Max Value\n");
-            err = TestReadAttributeNullableInt64uMaxValue_255();
+            ChipLogProgress(chipTool, " ***** Test Step 255 : Write attribute NULLABLE_INT64U Max Value\n");
+            err = TestWriteAttributeNullableInt64uMaxValue_255();
             break;
         case 256:
-            ChipLogProgress(chipTool, " ***** Test Step 256 : Write attribute NULLABLE_INT64U Invalid Value\n");
-            err = TestWriteAttributeNullableInt64uInvalidValue_256();
+            ChipLogProgress(chipTool, " ***** Test Step 256 : Read attribute NULLABLE_INT64U Max Value\n");
+            err = TestReadAttributeNullableInt64uMaxValue_256();
             break;
         case 257:
-            ChipLogProgress(chipTool, " ***** Test Step 257 : Read attribute NULLABLE_INT64U unchanged Value\n");
-            err = TestReadAttributeNullableInt64uUnchangedValue_257();
+            ChipLogProgress(chipTool, " ***** Test Step 257 : Write attribute NULLABLE_INT64U Invalid Value\n");
+            err = TestWriteAttributeNullableInt64uInvalidValue_257();
             break;
         case 258:
-            ChipLogProgress(chipTool, " ***** Test Step 258 : Write attribute NULLABLE_INT64U null Value\n");
-            err = TestWriteAttributeNullableInt64uNullValue_258();
+            ChipLogProgress(chipTool, " ***** Test Step 258 : Read attribute NULLABLE_INT64U unchanged Value\n");
+            err = TestReadAttributeNullableInt64uUnchangedValue_258();
             break;
         case 259:
-            ChipLogProgress(chipTool, " ***** Test Step 259 : Read attribute NULLABLE_INT64U null Value\n");
-            err = TestReadAttributeNullableInt64uNullValue_259();
+            ChipLogProgress(chipTool, " ***** Test Step 259 : Write attribute NULLABLE_INT64U null Value\n");
+            err = TestWriteAttributeNullableInt64uNullValue_259();
             break;
         case 260:
-            ChipLogProgress(chipTool, " ***** Test Step 260 : Read attribute NULLABLE_INT64U null Value & range\n");
-            err = TestReadAttributeNullableInt64uNullValueRange_260();
+            ChipLogProgress(chipTool, " ***** Test Step 260 : Read attribute NULLABLE_INT64U null Value\n");
+            err = TestReadAttributeNullableInt64uNullValue_260();
             break;
         case 261:
-            ChipLogProgress(chipTool, " ***** Test Step 261 : Read attribute NULLABLE_INT64U null Value & not\n");
-            err = TestReadAttributeNullableInt64uNullValueNot_261();
+            ChipLogProgress(chipTool, " ***** Test Step 261 : Read attribute NULLABLE_INT64U null Value & range\n");
+            err = TestReadAttributeNullableInt64uNullValueRange_261();
             break;
         case 262:
-            ChipLogProgress(chipTool, " ***** Test Step 262 : Write attribute NULLABLE_INT64U Value\n");
-            err = TestWriteAttributeNullableInt64uValue_262();
+            ChipLogProgress(chipTool, " ***** Test Step 262 : Read attribute NULLABLE_INT64U null Value & not\n");
+            err = TestReadAttributeNullableInt64uNullValueNot_262();
             break;
         case 263:
-            ChipLogProgress(chipTool, " ***** Test Step 263 : Read attribute NULLABLE_INT64U Value in range\n");
-            err = TestReadAttributeNullableInt64uValueInRange_263();
+            ChipLogProgress(chipTool, " ***** Test Step 263 : Write attribute NULLABLE_INT64U Value\n");
+            err = TestWriteAttributeNullableInt64uValue_263();
             break;
         case 264:
-            ChipLogProgress(chipTool, " ***** Test Step 264 : Read attribute NULLABLE_INT64U notValue OK\n");
-            err = TestReadAttributeNullableInt64uNotValueOk_264();
+            ChipLogProgress(chipTool, " ***** Test Step 264 : Read attribute NULLABLE_INT64U Value in range\n");
+            err = TestReadAttributeNullableInt64uValueInRange_264();
             break;
         case 265:
-            ChipLogProgress(chipTool, " ***** Test Step 265 : Write attribute NULLABLE_INT8S Min Value\n");
-            err = TestWriteAttributeNullableInt8sMinValue_265();
+            ChipLogProgress(chipTool, " ***** Test Step 265 : Read attribute NULLABLE_INT64U notValue OK\n");
+            err = TestReadAttributeNullableInt64uNotValueOk_265();
             break;
         case 266:
-            ChipLogProgress(chipTool, " ***** Test Step 266 : Read attribute NULLABLE_INT8S Min Value\n");
-            err = TestReadAttributeNullableInt8sMinValue_266();
+            ChipLogProgress(chipTool, " ***** Test Step 266 : Write attribute NULLABLE_INT8S Min Value\n");
+            err = TestWriteAttributeNullableInt8sMinValue_266();
             break;
         case 267:
-            ChipLogProgress(chipTool, " ***** Test Step 267 : Write attribute NULLABLE_INT8S Invalid Value\n");
-            err = TestWriteAttributeNullableInt8sInvalidValue_267();
+            ChipLogProgress(chipTool, " ***** Test Step 267 : Read attribute NULLABLE_INT8S Min Value\n");
+            err = TestReadAttributeNullableInt8sMinValue_267();
             break;
         case 268:
-            ChipLogProgress(chipTool, " ***** Test Step 268 : Read attribute NULLABLE_INT8S unchanged Value\n");
-            err = TestReadAttributeNullableInt8sUnchangedValue_268();
+            ChipLogProgress(chipTool, " ***** Test Step 268 : Write attribute NULLABLE_INT8S Invalid Value\n");
+            err = TestWriteAttributeNullableInt8sInvalidValue_268();
             break;
         case 269:
-            ChipLogProgress(chipTool, " ***** Test Step 269 : Write attribute NULLABLE_INT8S null Value\n");
-            err = TestWriteAttributeNullableInt8sNullValue_269();
+            ChipLogProgress(chipTool, " ***** Test Step 269 : Read attribute NULLABLE_INT8S unchanged Value\n");
+            err = TestReadAttributeNullableInt8sUnchangedValue_269();
             break;
         case 270:
-            ChipLogProgress(chipTool, " ***** Test Step 270 : Read attribute NULLABLE_INT8S null Value\n");
-            err = TestReadAttributeNullableInt8sNullValue_270();
+            ChipLogProgress(chipTool, " ***** Test Step 270 : Write attribute NULLABLE_INT8S null Value\n");
+            err = TestWriteAttributeNullableInt8sNullValue_270();
             break;
         case 271:
-            ChipLogProgress(chipTool, " ***** Test Step 271 : Read attribute NULLABLE_INT8S null Value & range\n");
-            err = TestReadAttributeNullableInt8sNullValueRange_271();
+            ChipLogProgress(chipTool, " ***** Test Step 271 : Read attribute NULLABLE_INT8S null Value\n");
+            err = TestReadAttributeNullableInt8sNullValue_271();
             break;
         case 272:
-            ChipLogProgress(chipTool, " ***** Test Step 272 : Read attribute NULLABLE_INT8S null Value & not\n");
-            err = TestReadAttributeNullableInt8sNullValueNot_272();
+            ChipLogProgress(chipTool, " ***** Test Step 272 : Read attribute NULLABLE_INT8S null Value & range\n");
+            err = TestReadAttributeNullableInt8sNullValueRange_272();
             break;
         case 273:
-            ChipLogProgress(chipTool, " ***** Test Step 273 : Write attribute NULLABLE_INT8S Value\n");
-            err = TestWriteAttributeNullableInt8sValue_273();
+            ChipLogProgress(chipTool, " ***** Test Step 273 : Read attribute NULLABLE_INT8S null Value & not\n");
+            err = TestReadAttributeNullableInt8sNullValueNot_273();
             break;
         case 274:
-            ChipLogProgress(chipTool, " ***** Test Step 274 : Read attribute NULLABLE_INT8S Value in range\n");
-            err = TestReadAttributeNullableInt8sValueInRange_274();
+            ChipLogProgress(chipTool, " ***** Test Step 274 : Write attribute NULLABLE_INT8S Value\n");
+            err = TestWriteAttributeNullableInt8sValue_274();
             break;
         case 275:
-            ChipLogProgress(chipTool, " ***** Test Step 275 : Read attribute NULLABLE_INT8S notValue OK\n");
-            err = TestReadAttributeNullableInt8sNotValueOk_275();
+            ChipLogProgress(chipTool, " ***** Test Step 275 : Read attribute NULLABLE_INT8S Value in range\n");
+            err = TestReadAttributeNullableInt8sValueInRange_275();
             break;
         case 276:
-            ChipLogProgress(chipTool, " ***** Test Step 276 : Write attribute NULLABLE_INT16S Min Value\n");
-            err = TestWriteAttributeNullableInt16sMinValue_276();
+            ChipLogProgress(chipTool, " ***** Test Step 276 : Read attribute NULLABLE_INT8S notValue OK\n");
+            err = TestReadAttributeNullableInt8sNotValueOk_276();
             break;
         case 277:
-            ChipLogProgress(chipTool, " ***** Test Step 277 : Read attribute NULLABLE_INT16S Min Value\n");
-            err = TestReadAttributeNullableInt16sMinValue_277();
+            ChipLogProgress(chipTool, " ***** Test Step 277 : Write attribute NULLABLE_INT16S Min Value\n");
+            err = TestWriteAttributeNullableInt16sMinValue_277();
             break;
         case 278:
-            ChipLogProgress(chipTool, " ***** Test Step 278 : Write attribute NULLABLE_INT16S Invalid Value\n");
-            err = TestWriteAttributeNullableInt16sInvalidValue_278();
+            ChipLogProgress(chipTool, " ***** Test Step 278 : Read attribute NULLABLE_INT16S Min Value\n");
+            err = TestReadAttributeNullableInt16sMinValue_278();
             break;
         case 279:
-            ChipLogProgress(chipTool, " ***** Test Step 279 : Read attribute NULLABLE_INT16S unchanged Value\n");
-            err = TestReadAttributeNullableInt16sUnchangedValue_279();
+            ChipLogProgress(chipTool, " ***** Test Step 279 : Write attribute NULLABLE_INT16S Invalid Value\n");
+            err = TestWriteAttributeNullableInt16sInvalidValue_279();
             break;
         case 280:
-            ChipLogProgress(chipTool, " ***** Test Step 280 : Write attribute NULLABLE_INT16S null Value\n");
-            err = TestWriteAttributeNullableInt16sNullValue_280();
+            ChipLogProgress(chipTool, " ***** Test Step 280 : Read attribute NULLABLE_INT16S unchanged Value\n");
+            err = TestReadAttributeNullableInt16sUnchangedValue_280();
             break;
         case 281:
-            ChipLogProgress(chipTool, " ***** Test Step 281 : Read attribute NULLABLE_INT16S null Value\n");
-            err = TestReadAttributeNullableInt16sNullValue_281();
+            ChipLogProgress(chipTool, " ***** Test Step 281 : Write attribute NULLABLE_INT16S null Value\n");
+            err = TestWriteAttributeNullableInt16sNullValue_281();
             break;
         case 282:
-            ChipLogProgress(chipTool, " ***** Test Step 282 : Read attribute NULLABLE_INT16S null Value & range\n");
-            err = TestReadAttributeNullableInt16sNullValueRange_282();
+            ChipLogProgress(chipTool, " ***** Test Step 282 : Read attribute NULLABLE_INT16S null Value\n");
+            err = TestReadAttributeNullableInt16sNullValue_282();
             break;
         case 283:
-            ChipLogProgress(chipTool, " ***** Test Step 283 : Read attribute NULLABLE_INT16S null Value & not\n");
-            err = TestReadAttributeNullableInt16sNullValueNot_283();
+            ChipLogProgress(chipTool, " ***** Test Step 283 : Read attribute NULLABLE_INT16S null Value & range\n");
+            err = TestReadAttributeNullableInt16sNullValueRange_283();
             break;
         case 284:
-            ChipLogProgress(chipTool, " ***** Test Step 284 : Write attribute NULLABLE_INT16S Value\n");
-            err = TestWriteAttributeNullableInt16sValue_284();
+            ChipLogProgress(chipTool, " ***** Test Step 284 : Read attribute NULLABLE_INT16S null Value & not\n");
+            err = TestReadAttributeNullableInt16sNullValueNot_284();
             break;
         case 285:
-            ChipLogProgress(chipTool, " ***** Test Step 285 : Read attribute NULLABLE_INT16S Value in range\n");
-            err = TestReadAttributeNullableInt16sValueInRange_285();
+            ChipLogProgress(chipTool, " ***** Test Step 285 : Write attribute NULLABLE_INT16S Value\n");
+            err = TestWriteAttributeNullableInt16sValue_285();
             break;
         case 286:
-            ChipLogProgress(chipTool, " ***** Test Step 286 : Read attribute NULLABLE_INT16S notValue OK\n");
-            err = TestReadAttributeNullableInt16sNotValueOk_286();
+            ChipLogProgress(chipTool, " ***** Test Step 286 : Read attribute NULLABLE_INT16S Value in range\n");
+            err = TestReadAttributeNullableInt16sValueInRange_286();
             break;
         case 287:
-            ChipLogProgress(chipTool, " ***** Test Step 287 : Write attribute NULLABLE_INT32S Min Value\n");
-            err = TestWriteAttributeNullableInt32sMinValue_287();
+            ChipLogProgress(chipTool, " ***** Test Step 287 : Read attribute NULLABLE_INT16S notValue OK\n");
+            err = TestReadAttributeNullableInt16sNotValueOk_287();
             break;
         case 288:
-            ChipLogProgress(chipTool, " ***** Test Step 288 : Read attribute NULLABLE_INT32S Min Value\n");
-            err = TestReadAttributeNullableInt32sMinValue_288();
+            ChipLogProgress(chipTool, " ***** Test Step 288 : Write attribute NULLABLE_INT32S Min Value\n");
+            err = TestWriteAttributeNullableInt32sMinValue_288();
             break;
         case 289:
-            ChipLogProgress(chipTool, " ***** Test Step 289 : Write attribute NULLABLE_INT32S Invalid Value\n");
-            err = TestWriteAttributeNullableInt32sInvalidValue_289();
+            ChipLogProgress(chipTool, " ***** Test Step 289 : Read attribute NULLABLE_INT32S Min Value\n");
+            err = TestReadAttributeNullableInt32sMinValue_289();
             break;
         case 290:
-            ChipLogProgress(chipTool, " ***** Test Step 290 : Read attribute NULLABLE_INT32S unchanged Value\n");
-            err = TestReadAttributeNullableInt32sUnchangedValue_290();
+            ChipLogProgress(chipTool, " ***** Test Step 290 : Write attribute NULLABLE_INT32S Invalid Value\n");
+            err = TestWriteAttributeNullableInt32sInvalidValue_290();
             break;
         case 291:
-            ChipLogProgress(chipTool, " ***** Test Step 291 : Write attribute NULLABLE_INT32S null Value\n");
-            err = TestWriteAttributeNullableInt32sNullValue_291();
+            ChipLogProgress(chipTool, " ***** Test Step 291 : Read attribute NULLABLE_INT32S unchanged Value\n");
+            err = TestReadAttributeNullableInt32sUnchangedValue_291();
             break;
         case 292:
-            ChipLogProgress(chipTool, " ***** Test Step 292 : Read attribute NULLABLE_INT32S null Value\n");
-            err = TestReadAttributeNullableInt32sNullValue_292();
+            ChipLogProgress(chipTool, " ***** Test Step 292 : Write attribute NULLABLE_INT32S null Value\n");
+            err = TestWriteAttributeNullableInt32sNullValue_292();
             break;
         case 293:
-            ChipLogProgress(chipTool, " ***** Test Step 293 : Read attribute NULLABLE_INT32S null Value & range\n");
-            err = TestReadAttributeNullableInt32sNullValueRange_293();
+            ChipLogProgress(chipTool, " ***** Test Step 293 : Read attribute NULLABLE_INT32S null Value\n");
+            err = TestReadAttributeNullableInt32sNullValue_293();
             break;
         case 294:
-            ChipLogProgress(chipTool, " ***** Test Step 294 : Read attribute NULLABLE_INT32S null Value & not\n");
-            err = TestReadAttributeNullableInt32sNullValueNot_294();
+            ChipLogProgress(chipTool, " ***** Test Step 294 : Read attribute NULLABLE_INT32S null Value & range\n");
+            err = TestReadAttributeNullableInt32sNullValueRange_294();
             break;
         case 295:
-            ChipLogProgress(chipTool, " ***** Test Step 295 : Write attribute NULLABLE_INT32S Value\n");
-            err = TestWriteAttributeNullableInt32sValue_295();
+            ChipLogProgress(chipTool, " ***** Test Step 295 : Read attribute NULLABLE_INT32S null Value & not\n");
+            err = TestReadAttributeNullableInt32sNullValueNot_295();
             break;
         case 296:
-            ChipLogProgress(chipTool, " ***** Test Step 296 : Read attribute NULLABLE_INT32S Value in range\n");
-            err = TestReadAttributeNullableInt32sValueInRange_296();
+            ChipLogProgress(chipTool, " ***** Test Step 296 : Write attribute NULLABLE_INT32S Value\n");
+            err = TestWriteAttributeNullableInt32sValue_296();
             break;
         case 297:
-            ChipLogProgress(chipTool, " ***** Test Step 297 : Read attribute NULLABLE_INT32S notValue OK\n");
-            err = TestReadAttributeNullableInt32sNotValueOk_297();
+            ChipLogProgress(chipTool, " ***** Test Step 297 : Read attribute NULLABLE_INT32S Value in range\n");
+            err = TestReadAttributeNullableInt32sValueInRange_297();
             break;
         case 298:
-            ChipLogProgress(chipTool, " ***** Test Step 298 : Write attribute NULLABLE_INT64S Min Value\n");
-            err = TestWriteAttributeNullableInt64sMinValue_298();
+            ChipLogProgress(chipTool, " ***** Test Step 298 : Read attribute NULLABLE_INT32S notValue OK\n");
+            err = TestReadAttributeNullableInt32sNotValueOk_298();
             break;
         case 299:
-            ChipLogProgress(chipTool, " ***** Test Step 299 : Read attribute NULLABLE_INT64S Min Value\n");
-            err = TestReadAttributeNullableInt64sMinValue_299();
+            ChipLogProgress(chipTool, " ***** Test Step 299 : Write attribute NULLABLE_INT64S Min Value\n");
+            err = TestWriteAttributeNullableInt64sMinValue_299();
             break;
         case 300:
-            ChipLogProgress(chipTool, " ***** Test Step 300 : Write attribute NULLABLE_INT64S Invalid Value\n");
-            err = TestWriteAttributeNullableInt64sInvalidValue_300();
+            ChipLogProgress(chipTool, " ***** Test Step 300 : Read attribute NULLABLE_INT64S Min Value\n");
+            err = TestReadAttributeNullableInt64sMinValue_300();
             break;
         case 301:
-            ChipLogProgress(chipTool, " ***** Test Step 301 : Read attribute NULLABLE_INT64S unchanged Value\n");
-            err = TestReadAttributeNullableInt64sUnchangedValue_301();
+            ChipLogProgress(chipTool, " ***** Test Step 301 : Write attribute NULLABLE_INT64S Invalid Value\n");
+            err = TestWriteAttributeNullableInt64sInvalidValue_301();
             break;
         case 302:
-            ChipLogProgress(chipTool, " ***** Test Step 302 : Write attribute NULLABLE_INT64S null Value\n");
-            err = TestWriteAttributeNullableInt64sNullValue_302();
+            ChipLogProgress(chipTool, " ***** Test Step 302 : Read attribute NULLABLE_INT64S unchanged Value\n");
+            err = TestReadAttributeNullableInt64sUnchangedValue_302();
             break;
         case 303:
-            ChipLogProgress(chipTool, " ***** Test Step 303 : Read attribute NULLABLE_INT64S null Value\n");
-            err = TestReadAttributeNullableInt64sNullValue_303();
+            ChipLogProgress(chipTool, " ***** Test Step 303 : Write attribute NULLABLE_INT64S null Value\n");
+            err = TestWriteAttributeNullableInt64sNullValue_303();
             break;
         case 304:
-            ChipLogProgress(chipTool, " ***** Test Step 304 : Read attribute NULLABLE_INT64S null Value & range\n");
-            err = TestReadAttributeNullableInt64sNullValueRange_304();
+            ChipLogProgress(chipTool, " ***** Test Step 304 : Read attribute NULLABLE_INT64S null Value\n");
+            err = TestReadAttributeNullableInt64sNullValue_304();
             break;
         case 305:
-            ChipLogProgress(chipTool, " ***** Test Step 305 : Read attribute NULLABLE_INT64S null Value & not\n");
-            err = TestReadAttributeNullableInt64sNullValueNot_305();
+            ChipLogProgress(chipTool, " ***** Test Step 305 : Read attribute NULLABLE_INT64S null Value & range\n");
+            err = TestReadAttributeNullableInt64sNullValueRange_305();
             break;
         case 306:
-            ChipLogProgress(chipTool, " ***** Test Step 306 : Write attribute NULLABLE_INT64S Value\n");
-            err = TestWriteAttributeNullableInt64sValue_306();
+            ChipLogProgress(chipTool, " ***** Test Step 306 : Read attribute NULLABLE_INT64S null Value & not\n");
+            err = TestReadAttributeNullableInt64sNullValueNot_306();
             break;
         case 307:
-            ChipLogProgress(chipTool, " ***** Test Step 307 : Read attribute NULLABLE_INT64S Value in range\n");
-            err = TestReadAttributeNullableInt64sValueInRange_307();
+            ChipLogProgress(chipTool, " ***** Test Step 307 : Write attribute NULLABLE_INT64S Value\n");
+            err = TestWriteAttributeNullableInt64sValue_307();
             break;
         case 308:
-            ChipLogProgress(chipTool, " ***** Test Step 308 : Read attribute NULLABLE_INT64S notValue OK\n");
-            err = TestReadAttributeNullableInt64sNotValueOk_308();
+            ChipLogProgress(chipTool, " ***** Test Step 308 : Read attribute NULLABLE_INT64S Value in range\n");
+            err = TestReadAttributeNullableInt64sValueInRange_308();
             break;
         case 309:
-            ChipLogProgress(chipTool, " ***** Test Step 309 : Write attribute NULLABLE_SINGLE medium Value\n");
-            err = TestWriteAttributeNullableSingleMediumValue_309();
+            ChipLogProgress(chipTool, " ***** Test Step 309 : Read attribute NULLABLE_INT64S notValue OK\n");
+            err = TestReadAttributeNullableInt64sNotValueOk_309();
             break;
         case 310:
-            ChipLogProgress(chipTool, " ***** Test Step 310 : Read attribute NULLABLE_SINGLE medium Value\n");
-            err = TestReadAttributeNullableSingleMediumValue_310();
+            ChipLogProgress(chipTool, " ***** Test Step 310 : Write attribute NULLABLE_SINGLE medium Value\n");
+            err = TestWriteAttributeNullableSingleMediumValue_310();
             break;
         case 311:
-            ChipLogProgress(chipTool, " ***** Test Step 311 : Write attribute NULLABLE_SINGLE largest Value\n");
-            err = TestWriteAttributeNullableSingleLargestValue_311();
+            ChipLogProgress(chipTool, " ***** Test Step 311 : Read attribute NULLABLE_SINGLE medium Value\n");
+            err = TestReadAttributeNullableSingleMediumValue_311();
             break;
         case 312:
-            ChipLogProgress(chipTool, " ***** Test Step 312 : Read attribute NULLABLE_SINGLE largest Value\n");
-            err = TestReadAttributeNullableSingleLargestValue_312();
+            ChipLogProgress(chipTool, " ***** Test Step 312 : Write attribute NULLABLE_SINGLE largest Value\n");
+            err = TestWriteAttributeNullableSingleLargestValue_312();
             break;
         case 313:
-            ChipLogProgress(chipTool, " ***** Test Step 313 : Write attribute NULLABLE_SINGLE smallest Value\n");
-            err = TestWriteAttributeNullableSingleSmallestValue_313();
+            ChipLogProgress(chipTool, " ***** Test Step 313 : Read attribute NULLABLE_SINGLE largest Value\n");
+            err = TestReadAttributeNullableSingleLargestValue_313();
             break;
         case 314:
-            ChipLogProgress(chipTool, " ***** Test Step 314 : Read attribute NULLABLE_SINGLE smallest Value\n");
-            err = TestReadAttributeNullableSingleSmallestValue_314();
+            ChipLogProgress(chipTool, " ***** Test Step 314 : Write attribute NULLABLE_SINGLE smallest Value\n");
+            err = TestWriteAttributeNullableSingleSmallestValue_314();
             break;
         case 315:
-            ChipLogProgress(chipTool, " ***** Test Step 315 : Write attribute NULLABLE_SINGLE null Value\n");
-            err = TestWriteAttributeNullableSingleNullValue_315();
+            ChipLogProgress(chipTool, " ***** Test Step 315 : Read attribute NULLABLE_SINGLE smallest Value\n");
+            err = TestReadAttributeNullableSingleSmallestValue_315();
             break;
         case 316:
-            ChipLogProgress(chipTool, " ***** Test Step 316 : Read attribute NULLABLE_SINGLE null Value\n");
-            err = TestReadAttributeNullableSingleNullValue_316();
+            ChipLogProgress(chipTool, " ***** Test Step 316 : Write attribute NULLABLE_SINGLE null Value\n");
+            err = TestWriteAttributeNullableSingleNullValue_316();
             break;
         case 317:
-            ChipLogProgress(chipTool, " ***** Test Step 317 : Write attribute NULLABLE_SINGLE 0 Value\n");
-            err = TestWriteAttributeNullableSingle0Value_317();
+            ChipLogProgress(chipTool, " ***** Test Step 317 : Read attribute NULLABLE_SINGLE null Value\n");
+            err = TestReadAttributeNullableSingleNullValue_317();
             break;
         case 318:
-            ChipLogProgress(chipTool, " ***** Test Step 318 : Read attribute NULLABLE_SINGLE 0 Value\n");
-            err = TestReadAttributeNullableSingle0Value_318();
+            ChipLogProgress(chipTool, " ***** Test Step 318 : Write attribute NULLABLE_SINGLE 0 Value\n");
+            err = TestWriteAttributeNullableSingle0Value_318();
             break;
         case 319:
-            ChipLogProgress(chipTool, " ***** Test Step 319 : Write attribute NULLABLE_DOUBLE medium Value\n");
-            err = TestWriteAttributeNullableDoubleMediumValue_319();
+            ChipLogProgress(chipTool, " ***** Test Step 319 : Read attribute NULLABLE_SINGLE 0 Value\n");
+            err = TestReadAttributeNullableSingle0Value_319();
             break;
         case 320:
-            ChipLogProgress(chipTool, " ***** Test Step 320 : Read attribute NULLABLE_DOUBLE medium Value\n");
-            err = TestReadAttributeNullableDoubleMediumValue_320();
+            ChipLogProgress(chipTool, " ***** Test Step 320 : Write attribute NULLABLE_DOUBLE medium Value\n");
+            err = TestWriteAttributeNullableDoubleMediumValue_320();
             break;
         case 321:
-            ChipLogProgress(chipTool, " ***** Test Step 321 : Write attribute NULLABLE_DOUBLE largest Value\n");
-            err = TestWriteAttributeNullableDoubleLargestValue_321();
+            ChipLogProgress(chipTool, " ***** Test Step 321 : Read attribute NULLABLE_DOUBLE medium Value\n");
+            err = TestReadAttributeNullableDoubleMediumValue_321();
             break;
         case 322:
-            ChipLogProgress(chipTool, " ***** Test Step 322 : Read attribute NULLABLE_DOUBLE largest Value\n");
-            err = TestReadAttributeNullableDoubleLargestValue_322();
+            ChipLogProgress(chipTool, " ***** Test Step 322 : Write attribute NULLABLE_DOUBLE largest Value\n");
+            err = TestWriteAttributeNullableDoubleLargestValue_322();
             break;
         case 323:
-            ChipLogProgress(chipTool, " ***** Test Step 323 : Write attribute NULLABLE_DOUBLE smallest Value\n");
-            err = TestWriteAttributeNullableDoubleSmallestValue_323();
+            ChipLogProgress(chipTool, " ***** Test Step 323 : Read attribute NULLABLE_DOUBLE largest Value\n");
+            err = TestReadAttributeNullableDoubleLargestValue_323();
             break;
         case 324:
-            ChipLogProgress(chipTool, " ***** Test Step 324 : Read attribute NULLABLE_DOUBLE smallest Value\n");
-            err = TestReadAttributeNullableDoubleSmallestValue_324();
+            ChipLogProgress(chipTool, " ***** Test Step 324 : Write attribute NULLABLE_DOUBLE smallest Value\n");
+            err = TestWriteAttributeNullableDoubleSmallestValue_324();
             break;
         case 325:
-            ChipLogProgress(chipTool, " ***** Test Step 325 : Write attribute NULLABLE_DOUBLE null Value\n");
-            err = TestWriteAttributeNullableDoubleNullValue_325();
+            ChipLogProgress(chipTool, " ***** Test Step 325 : Read attribute NULLABLE_DOUBLE smallest Value\n");
+            err = TestReadAttributeNullableDoubleSmallestValue_325();
             break;
         case 326:
-            ChipLogProgress(chipTool, " ***** Test Step 326 : Read attribute NULLABLE_DOUBLE null Value\n");
-            err = TestReadAttributeNullableDoubleNullValue_326();
+            ChipLogProgress(chipTool, " ***** Test Step 326 : Write attribute NULLABLE_DOUBLE null Value\n");
+            err = TestWriteAttributeNullableDoubleNullValue_326();
             break;
         case 327:
-            ChipLogProgress(chipTool, " ***** Test Step 327 : Write attribute NULLABLE_DOUBLE 0 Value\n");
-            err = TestWriteAttributeNullableDouble0Value_327();
+            ChipLogProgress(chipTool, " ***** Test Step 327 : Read attribute NULLABLE_DOUBLE null Value\n");
+            err = TestReadAttributeNullableDoubleNullValue_327();
             break;
         case 328:
-            ChipLogProgress(chipTool, " ***** Test Step 328 : Read attribute NULLABLE_DOUBLE 0 Value\n");
-            err = TestReadAttributeNullableDouble0Value_328();
+            ChipLogProgress(chipTool, " ***** Test Step 328 : Write attribute NULLABLE_DOUBLE 0 Value\n");
+            err = TestWriteAttributeNullableDouble0Value_328();
             break;
         case 329:
-            ChipLogProgress(chipTool, " ***** Test Step 329 : Write attribute NULLABLE_ENUM8 Min Value\n");
-            err = TestWriteAttributeNullableEnum8MinValue_329();
+            ChipLogProgress(chipTool, " ***** Test Step 329 : Read attribute NULLABLE_DOUBLE 0 Value\n");
+            err = TestReadAttributeNullableDouble0Value_329();
             break;
         case 330:
-            ChipLogProgress(chipTool, " ***** Test Step 330 : Read attribute NULLABLE_ENUM8 Min Value\n");
-            err = TestReadAttributeNullableEnum8MinValue_330();
+            ChipLogProgress(chipTool, " ***** Test Step 330 : Write attribute NULLABLE_ENUM8 Min Value\n");
+            err = TestWriteAttributeNullableEnum8MinValue_330();
             break;
         case 331:
-            ChipLogProgress(chipTool, " ***** Test Step 331 : Write attribute NULLABLE_ENUM8 Max Value\n");
-            err = TestWriteAttributeNullableEnum8MaxValue_331();
+            ChipLogProgress(chipTool, " ***** Test Step 331 : Read attribute NULLABLE_ENUM8 Min Value\n");
+            err = TestReadAttributeNullableEnum8MinValue_331();
             break;
         case 332:
-            ChipLogProgress(chipTool, " ***** Test Step 332 : Read attribute NULLABLE_ENUM8 Max Value\n");
-            err = TestReadAttributeNullableEnum8MaxValue_332();
+            ChipLogProgress(chipTool, " ***** Test Step 332 : Write attribute NULLABLE_ENUM8 Max Value\n");
+            err = TestWriteAttributeNullableEnum8MaxValue_332();
             break;
         case 333:
-            ChipLogProgress(chipTool, " ***** Test Step 333 : Write attribute NULLABLE_ENUM8 Invalid Value\n");
-            err = TestWriteAttributeNullableEnum8InvalidValue_333();
+            ChipLogProgress(chipTool, " ***** Test Step 333 : Read attribute NULLABLE_ENUM8 Max Value\n");
+            err = TestReadAttributeNullableEnum8MaxValue_333();
             break;
         case 334:
-            ChipLogProgress(chipTool, " ***** Test Step 334 : Read attribute NULLABLE_ENUM8 unchanged Value\n");
-            err = TestReadAttributeNullableEnum8UnchangedValue_334();
+            ChipLogProgress(chipTool, " ***** Test Step 334 : Write attribute NULLABLE_ENUM8 Invalid Value\n");
+            err = TestWriteAttributeNullableEnum8InvalidValue_334();
             break;
         case 335:
-            ChipLogProgress(chipTool, " ***** Test Step 335 : Write attribute NULLABLE_ENUM8 null Value\n");
-            err = TestWriteAttributeNullableEnum8NullValue_335();
+            ChipLogProgress(chipTool, " ***** Test Step 335 : Read attribute NULLABLE_ENUM8 unchanged Value\n");
+            err = TestReadAttributeNullableEnum8UnchangedValue_335();
             break;
         case 336:
-            ChipLogProgress(chipTool, " ***** Test Step 336 : Read attribute NULLABLE_ENUM8 null Value\n");
-            err = TestReadAttributeNullableEnum8NullValue_336();
+            ChipLogProgress(chipTool, " ***** Test Step 336 : Write attribute NULLABLE_ENUM8 null Value\n");
+            err = TestWriteAttributeNullableEnum8NullValue_336();
             break;
         case 337:
-            ChipLogProgress(chipTool, " ***** Test Step 337 : Write attribute NULLABLE_ENUM16 Min Value\n");
-            err = TestWriteAttributeNullableEnum16MinValue_337();
+            ChipLogProgress(chipTool, " ***** Test Step 337 : Read attribute NULLABLE_ENUM8 null Value\n");
+            err = TestReadAttributeNullableEnum8NullValue_337();
             break;
         case 338:
-            ChipLogProgress(chipTool, " ***** Test Step 338 : Read attribute NULLABLE_ENUM16 Min Value\n");
-            err = TestReadAttributeNullableEnum16MinValue_338();
+            ChipLogProgress(chipTool, " ***** Test Step 338 : Write attribute NULLABLE_ENUM16 Min Value\n");
+            err = TestWriteAttributeNullableEnum16MinValue_338();
             break;
         case 339:
-            ChipLogProgress(chipTool, " ***** Test Step 339 : Write attribute NULLABLE_ENUM16 Max Value\n");
-            err = TestWriteAttributeNullableEnum16MaxValue_339();
+            ChipLogProgress(chipTool, " ***** Test Step 339 : Read attribute NULLABLE_ENUM16 Min Value\n");
+            err = TestReadAttributeNullableEnum16MinValue_339();
             break;
         case 340:
-            ChipLogProgress(chipTool, " ***** Test Step 340 : Read attribute NULLABLE_ENUM16 Max Value\n");
-            err = TestReadAttributeNullableEnum16MaxValue_340();
+            ChipLogProgress(chipTool, " ***** Test Step 340 : Write attribute NULLABLE_ENUM16 Max Value\n");
+            err = TestWriteAttributeNullableEnum16MaxValue_340();
             break;
         case 341:
-            ChipLogProgress(chipTool, " ***** Test Step 341 : Write attribute NULLABLE_ENUM16 Invalid Value\n");
-            err = TestWriteAttributeNullableEnum16InvalidValue_341();
+            ChipLogProgress(chipTool, " ***** Test Step 341 : Read attribute NULLABLE_ENUM16 Max Value\n");
+            err = TestReadAttributeNullableEnum16MaxValue_341();
             break;
         case 342:
-            ChipLogProgress(chipTool, " ***** Test Step 342 : Read attribute NULLABLE_ENUM16 unchanged Value\n");
-            err = TestReadAttributeNullableEnum16UnchangedValue_342();
+            ChipLogProgress(chipTool, " ***** Test Step 342 : Write attribute NULLABLE_ENUM16 Invalid Value\n");
+            err = TestWriteAttributeNullableEnum16InvalidValue_342();
             break;
         case 343:
-            ChipLogProgress(chipTool, " ***** Test Step 343 : Write attribute NULLABLE_ENUM16 null Value\n");
-            err = TestWriteAttributeNullableEnum16NullValue_343();
+            ChipLogProgress(chipTool, " ***** Test Step 343 : Read attribute NULLABLE_ENUM16 unchanged Value\n");
+            err = TestReadAttributeNullableEnum16UnchangedValue_343();
             break;
         case 344:
-            ChipLogProgress(chipTool, " ***** Test Step 344 : Read attribute NULLABLE_ENUM16 null Value\n");
-            err = TestReadAttributeNullableEnum16NullValue_344();
+            ChipLogProgress(chipTool, " ***** Test Step 344 : Write attribute NULLABLE_ENUM16 null Value\n");
+            err = TestWriteAttributeNullableEnum16NullValue_344();
             break;
         case 345:
-            ChipLogProgress(chipTool, " ***** Test Step 345 : Write attribute NULLABLE_SIMPLE_ENUM Min Value\n");
-            err = TestWriteAttributeNullableSimpleEnumMinValue_345();
+            ChipLogProgress(chipTool, " ***** Test Step 345 : Read attribute NULLABLE_ENUM16 null Value\n");
+            err = TestReadAttributeNullableEnum16NullValue_345();
             break;
         case 346:
-            ChipLogProgress(chipTool, " ***** Test Step 346 : Read attribute NULLABLE_SIMPLE_ENUM Min Value\n");
-            err = TestReadAttributeNullableSimpleEnumMinValue_346();
+            ChipLogProgress(chipTool, " ***** Test Step 346 : Write attribute NULLABLE_SIMPLE_ENUM Min Value\n");
+            err = TestWriteAttributeNullableSimpleEnumMinValue_346();
             break;
         case 347:
-            ChipLogProgress(chipTool, " ***** Test Step 347 : Write attribute NULLABLE_SIMPLE_ENUM Max Value\n");
-            err = TestWriteAttributeNullableSimpleEnumMaxValue_347();
+            ChipLogProgress(chipTool, " ***** Test Step 347 : Read attribute NULLABLE_SIMPLE_ENUM Min Value\n");
+            err = TestReadAttributeNullableSimpleEnumMinValue_347();
             break;
         case 348:
-            ChipLogProgress(chipTool, " ***** Test Step 348 : Read attribute NULLABLE_SIMPLE_ENUM Max Value\n");
-            err = TestReadAttributeNullableSimpleEnumMaxValue_348();
+            ChipLogProgress(chipTool, " ***** Test Step 348 : Write attribute NULLABLE_SIMPLE_ENUM Max Value\n");
+            err = TestWriteAttributeNullableSimpleEnumMaxValue_348();
             break;
         case 349:
-            ChipLogProgress(chipTool, " ***** Test Step 349 : Write attribute NULLABLE_SIMPLE_ENUM Invalid Value\n");
-            err = TestWriteAttributeNullableSimpleEnumInvalidValue_349();
+            ChipLogProgress(chipTool, " ***** Test Step 349 : Read attribute NULLABLE_SIMPLE_ENUM Max Value\n");
+            err = TestReadAttributeNullableSimpleEnumMaxValue_349();
             break;
         case 350:
-            ChipLogProgress(chipTool, " ***** Test Step 350 : Read attribute NULLABLE_SIMPLE_ENUM unchanged Value\n");
-            err = TestReadAttributeNullableSimpleEnumUnchangedValue_350();
+            ChipLogProgress(chipTool, " ***** Test Step 350 : Write attribute NULLABLE_SIMPLE_ENUM Invalid Value\n");
+            err = TestWriteAttributeNullableSimpleEnumInvalidValue_350();
             break;
         case 351:
-            ChipLogProgress(chipTool, " ***** Test Step 351 : Write attribute NULLABLE_SIMPLE_ENUM null Value\n");
-            err = TestWriteAttributeNullableSimpleEnumNullValue_351();
+            ChipLogProgress(chipTool, " ***** Test Step 351 : Read attribute NULLABLE_SIMPLE_ENUM unchanged Value\n");
+            err = TestReadAttributeNullableSimpleEnumUnchangedValue_351();
             break;
         case 352:
-            ChipLogProgress(chipTool, " ***** Test Step 352 : Read attribute NULLABLE_SIMPLE_ENUM null Value\n");
-            err = TestReadAttributeNullableSimpleEnumNullValue_352();
+            ChipLogProgress(chipTool, " ***** Test Step 352 : Write attribute NULLABLE_SIMPLE_ENUM null Value\n");
+            err = TestWriteAttributeNullableSimpleEnumNullValue_352();
             break;
         case 353:
-            ChipLogProgress(chipTool, " ***** Test Step 353 : Read attribute NULLABLE_SIMPLE_ENUM not 3 Value\n");
-            err = TestReadAttributeNullableSimpleEnumNot3Value_353();
+            ChipLogProgress(chipTool, " ***** Test Step 353 : Read attribute NULLABLE_SIMPLE_ENUM null Value\n");
+            err = TestReadAttributeNullableSimpleEnumNullValue_353();
             break;
         case 354:
-            ChipLogProgress(chipTool, " ***** Test Step 354 : Read attribute NULLABLE_OCTET_STRING Default Value\n");
-            err = TestReadAttributeNullableOctetStringDefaultValue_354();
+            ChipLogProgress(chipTool, " ***** Test Step 354 : Read attribute NULLABLE_SIMPLE_ENUM not 3 Value\n");
+            err = TestReadAttributeNullableSimpleEnumNot3Value_354();
             break;
         case 355:
-            ChipLogProgress(chipTool, " ***** Test Step 355 : Write attribute NULLABLE_OCTET_STRING\n");
-            err = TestWriteAttributeNullableOctetString_355();
+            ChipLogProgress(chipTool, " ***** Test Step 355 : Read attribute NULLABLE_OCTET_STRING Default Value\n");
+            err = TestReadAttributeNullableOctetStringDefaultValue_355();
             break;
         case 356:
-            ChipLogProgress(chipTool, " ***** Test Step 356 : Read attribute NULLABLE_OCTET_STRING\n");
-            err = TestReadAttributeNullableOctetString_356();
+            ChipLogProgress(chipTool, " ***** Test Step 356 : Write attribute NULLABLE_OCTET_STRING\n");
+            err = TestWriteAttributeNullableOctetString_356();
             break;
         case 357:
-            ChipLogProgress(chipTool, " ***** Test Step 357 : Write attribute NULLABLE_OCTET_STRING\n");
-            err = TestWriteAttributeNullableOctetString_357();
+            ChipLogProgress(chipTool, " ***** Test Step 357 : Read attribute NULLABLE_OCTET_STRING\n");
+            err = TestReadAttributeNullableOctetString_357();
             break;
         case 358:
-            ChipLogProgress(chipTool, " ***** Test Step 358 : Read attribute NULLABLE_OCTET_STRING\n");
-            err = TestReadAttributeNullableOctetString_358();
+            ChipLogProgress(chipTool, " ***** Test Step 358 : Write attribute NULLABLE_OCTET_STRING\n");
+            err = TestWriteAttributeNullableOctetString_358();
             break;
         case 359:
-            ChipLogProgress(chipTool, " ***** Test Step 359 : Write attribute NULLABLE_OCTET_STRING\n");
-            err = TestWriteAttributeNullableOctetString_359();
+            ChipLogProgress(chipTool, " ***** Test Step 359 : Read attribute NULLABLE_OCTET_STRING\n");
+            err = TestReadAttributeNullableOctetString_359();
             break;
         case 360:
-            ChipLogProgress(chipTool, " ***** Test Step 360 : Read attribute NULLABLE_OCTET_STRING\n");
-            err = TestReadAttributeNullableOctetString_360();
+            ChipLogProgress(chipTool, " ***** Test Step 360 : Write attribute NULLABLE_OCTET_STRING\n");
+            err = TestWriteAttributeNullableOctetString_360();
             break;
         case 361:
-            ChipLogProgress(chipTool, " ***** Test Step 361 : Read attribute NULLABLE_OCTET_STRING not TestValue\n");
-            err = TestReadAttributeNullableOctetStringNotTestValue_361();
+            ChipLogProgress(chipTool, " ***** Test Step 361 : Read attribute NULLABLE_OCTET_STRING\n");
+            err = TestReadAttributeNullableOctetString_361();
             break;
         case 362:
-            ChipLogProgress(chipTool, " ***** Test Step 362 : Read attribute NULLABLE_CHAR_STRING Default Value\n");
-            err = TestReadAttributeNullableCharStringDefaultValue_362();
+            ChipLogProgress(chipTool, " ***** Test Step 362 : Read attribute NULLABLE_OCTET_STRING not TestValue\n");
+            err = TestReadAttributeNullableOctetStringNotTestValue_362();
             break;
         case 363:
-            ChipLogProgress(chipTool, " ***** Test Step 363 : Write attribute NULLABLE_CHAR_STRING\n");
-            err = TestWriteAttributeNullableCharString_363();
+            ChipLogProgress(chipTool, " ***** Test Step 363 : Read attribute NULLABLE_CHAR_STRING Default Value\n");
+            err = TestReadAttributeNullableCharStringDefaultValue_363();
             break;
         case 364:
-            ChipLogProgress(chipTool, " ***** Test Step 364 : Read attribute NULLABLE_CHAR_STRING\n");
-            err = TestReadAttributeNullableCharString_364();
+            ChipLogProgress(chipTool, " ***** Test Step 364 : Write attribute NULLABLE_CHAR_STRING\n");
+            err = TestWriteAttributeNullableCharString_364();
             break;
         case 365:
             ChipLogProgress(chipTool, " ***** Test Step 365 : Read attribute NULLABLE_CHAR_STRING\n");
             err = TestReadAttributeNullableCharString_365();
             break;
         case 366:
-            ChipLogProgress(chipTool, " ***** Test Step 366 : Write attribute NULLABLE_CHAR_STRING - Value too long\n");
-            err = TestWriteAttributeNullableCharStringValueTooLong_366();
+            ChipLogProgress(chipTool, " ***** Test Step 366 : Read attribute NULLABLE_CHAR_STRING\n");
+            err = TestReadAttributeNullableCharString_366();
             break;
         case 367:
-            ChipLogProgress(chipTool, " ***** Test Step 367 : Read attribute NULLABLE_CHAR_STRING\n");
-            err = TestReadAttributeNullableCharString_367();
+            ChipLogProgress(chipTool, " ***** Test Step 367 : Write attribute NULLABLE_CHAR_STRING - Value too long\n");
+            err = TestWriteAttributeNullableCharStringValueTooLong_367();
             break;
         case 368:
-            ChipLogProgress(chipTool, " ***** Test Step 368 : Write attribute NULLABLE_CHAR_STRING - Empty\n");
-            err = TestWriteAttributeNullableCharStringEmpty_368();
+            ChipLogProgress(chipTool, " ***** Test Step 368 : Read attribute NULLABLE_CHAR_STRING\n");
+            err = TestReadAttributeNullableCharString_368();
             break;
         case 369:
-            ChipLogProgress(chipTool, " ***** Test Step 369 : Read attribute NULLABLE_CHAR_STRING\n");
-            err = TestReadAttributeNullableCharString_369();
+            ChipLogProgress(chipTool, " ***** Test Step 369 : Write attribute NULLABLE_CHAR_STRING - Empty\n");
+            err = TestWriteAttributeNullableCharStringEmpty_369();
             break;
         case 370:
-            ChipLogProgress(chipTool, " ***** Test Step 370 : Read attribute NULLABLE_CHAR_STRING not ☉T☉\n");
-            err = TestReadAttributeNullableCharStringNott_370();
+            ChipLogProgress(chipTool, " ***** Test Step 370 : Read attribute NULLABLE_CHAR_STRING\n");
+            err = TestReadAttributeNullableCharString_370();
             break;
         case 371:
-            ChipLogProgress(chipTool, " ***** Test Step 371 : Read attribute from nonexistent endpoint.\n");
-            err = TestReadAttributeFromNonexistentEndpoint_371();
+            ChipLogProgress(chipTool, " ***** Test Step 371 : Read attribute NULLABLE_CHAR_STRING not ☉T☉\n");
+            err = TestReadAttributeNullableCharStringNott_371();
             break;
         case 372:
-            ChipLogProgress(chipTool, " ***** Test Step 372 : Read attribute from nonexistent cluster.\n");
-            err = TestReadAttributeFromNonexistentCluster_372();
+            ChipLogProgress(chipTool, " ***** Test Step 372 : Read attribute from nonexistent endpoint.\n");
+            err = TestReadAttributeFromNonexistentEndpoint_372();
             break;
         case 373:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 373 : Send a command that takes an optional parameter but do not set it.\n");
-            err = TestSendACommandThatTakesAnOptionalParameterButDoNotSetIt_373();
+            ChipLogProgress(chipTool, " ***** Test Step 373 : Read attribute from nonexistent cluster.\n");
+            err = TestReadAttributeFromNonexistentCluster_373();
             break;
         case 374:
             ChipLogProgress(
@@ -75944,552 +75943,557 @@ class TestCluster : public TestCommandBridge {
             err = TestSendACommandThatTakesAnOptionalParameterButDoNotSetIt_374();
             break;
         case 375:
-            ChipLogProgress(chipTool, " ***** Test Step 375 : Report: Subscribe to list attribute\n");
-            err = TestReportSubscribeToListAttribute_375();
+            ChipLogProgress(
+                chipTool, " ***** Test Step 375 : Send a command that takes an optional parameter but do not set it.\n");
+            err = TestSendACommandThatTakesAnOptionalParameterButDoNotSetIt_375();
             break;
         case 376:
-            ChipLogProgress(chipTool, " ***** Test Step 376 : Subscribe to list attribute\n");
-            err = TestSubscribeToListAttribute_376();
+            ChipLogProgress(chipTool, " ***** Test Step 376 : Report: Subscribe to list attribute\n");
+            err = TestReportSubscribeToListAttribute_376();
             break;
         case 377:
-            ChipLogProgress(chipTool, " ***** Test Step 377 : Write subscribed-to list attribute\n");
-            err = TestWriteSubscribedToListAttribute_377();
+            ChipLogProgress(chipTool, " ***** Test Step 377 : Subscribe to list attribute\n");
+            err = TestSubscribeToListAttribute_377();
             break;
         case 378:
-            ChipLogProgress(chipTool, " ***** Test Step 378 : Check for list attribute report\n");
-            err = TestCheckForListAttributeReport_378();
+            ChipLogProgress(chipTool, " ***** Test Step 378 : Write subscribed-to list attribute\n");
+            err = TestWriteSubscribedToListAttribute_378();
             break;
         case 379:
-            ChipLogProgress(chipTool, " ***** Test Step 379 : Read range-restricted unsigned 8-bit integer\n");
-            err = TestReadRangeRestrictedUnsigned8BitInteger_379();
+            ChipLogProgress(chipTool, " ***** Test Step 379 : Check for list attribute report\n");
+            err = TestCheckForListAttributeReport_379();
             break;
         case 380:
-            ChipLogProgress(chipTool, " ***** Test Step 380 : Write min value to a range-restricted unsigned 8-bit integer\n");
-            err = TestWriteMinValueToARangeRestrictedUnsigned8BitInteger_380();
+            ChipLogProgress(chipTool, " ***** Test Step 380 : Read range-restricted unsigned 8-bit integer\n");
+            err = TestReadRangeRestrictedUnsigned8BitInteger_380();
             break;
         case 381:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 381 : Write just-below-range value to a range-restricted unsigned 8-bit integer\n");
-            err = TestWriteJustBelowRangeValueToARangeRestrictedUnsigned8BitInteger_381();
+            ChipLogProgress(chipTool, " ***** Test Step 381 : Write min value to a range-restricted unsigned 8-bit integer\n");
+            err = TestWriteMinValueToARangeRestrictedUnsigned8BitInteger_381();
             break;
         case 382:
             ChipLogProgress(
-                chipTool, " ***** Test Step 382 : Write just-above-range value to a range-restricted unsigned 8-bit integer\n");
-            err = TestWriteJustAboveRangeValueToARangeRestrictedUnsigned8BitInteger_382();
+                chipTool, " ***** Test Step 382 : Write just-below-range value to a range-restricted unsigned 8-bit integer\n");
+            err = TestWriteJustBelowRangeValueToARangeRestrictedUnsigned8BitInteger_382();
             break;
         case 383:
-            ChipLogProgress(chipTool, " ***** Test Step 383 : Write max value to a range-restricted unsigned 8-bit integer\n");
-            err = TestWriteMaxValueToARangeRestrictedUnsigned8BitInteger_383();
+            ChipLogProgress(
+                chipTool, " ***** Test Step 383 : Write just-above-range value to a range-restricted unsigned 8-bit integer\n");
+            err = TestWriteJustAboveRangeValueToARangeRestrictedUnsigned8BitInteger_383();
             break;
         case 384:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 384 : Verify range-restricted unsigned 8-bit integer value has not changed\n");
-            err = TestVerifyRangeRestrictedUnsigned8BitIntegerValueHasNotChanged_384();
+            ChipLogProgress(chipTool, " ***** Test Step 384 : Write max value to a range-restricted unsigned 8-bit integer\n");
+            err = TestWriteMaxValueToARangeRestrictedUnsigned8BitInteger_384();
             break;
         case 385:
             ChipLogProgress(
-                chipTool, " ***** Test Step 385 : Write min valid value to a range-restricted unsigned 8-bit integer\n");
-            err = TestWriteMinValidValueToARangeRestrictedUnsigned8BitInteger_385();
+                chipTool, " ***** Test Step 385 : Verify range-restricted unsigned 8-bit integer value has not changed\n");
+            err = TestVerifyRangeRestrictedUnsigned8BitIntegerValueHasNotChanged_385();
             break;
         case 386:
             ChipLogProgress(
-                chipTool, " ***** Test Step 386 : Verify range-restricted unsigned 8-bit integer value is at min valid\n");
-            err = TestVerifyRangeRestrictedUnsigned8BitIntegerValueIsAtMinValid_386();
+                chipTool, " ***** Test Step 386 : Write min valid value to a range-restricted unsigned 8-bit integer\n");
+            err = TestWriteMinValidValueToARangeRestrictedUnsigned8BitInteger_386();
             break;
         case 387:
             ChipLogProgress(
-                chipTool, " ***** Test Step 387 : Write max valid value to a range-restricted unsigned 8-bit integer\n");
-            err = TestWriteMaxValidValueToARangeRestrictedUnsigned8BitInteger_387();
+                chipTool, " ***** Test Step 387 : Verify range-restricted unsigned 8-bit integer value is at min valid\n");
+            err = TestVerifyRangeRestrictedUnsigned8BitIntegerValueIsAtMinValid_387();
             break;
         case 388:
             ChipLogProgress(
-                chipTool, " ***** Test Step 388 : Verify range-restricted unsigned 8-bit integer value is at max valid\n");
-            err = TestVerifyRangeRestrictedUnsigned8BitIntegerValueIsAtMaxValid_388();
+                chipTool, " ***** Test Step 388 : Write max valid value to a range-restricted unsigned 8-bit integer\n");
+            err = TestWriteMaxValidValueToARangeRestrictedUnsigned8BitInteger_388();
             break;
         case 389:
             ChipLogProgress(
-                chipTool, " ***** Test Step 389 : Write middle valid value to a range-restricted unsigned 8-bit integer\n");
-            err = TestWriteMiddleValidValueToARangeRestrictedUnsigned8BitInteger_389();
+                chipTool, " ***** Test Step 389 : Verify range-restricted unsigned 8-bit integer value is at max valid\n");
+            err = TestVerifyRangeRestrictedUnsigned8BitIntegerValueIsAtMaxValid_389();
             break;
         case 390:
             ChipLogProgress(
-                chipTool, " ***** Test Step 390 : Verify range-restricted unsigned 8-bit integer value is at mid valid\n");
-            err = TestVerifyRangeRestrictedUnsigned8BitIntegerValueIsAtMidValid_390();
+                chipTool, " ***** Test Step 390 : Write middle valid value to a range-restricted unsigned 8-bit integer\n");
+            err = TestWriteMiddleValidValueToARangeRestrictedUnsigned8BitInteger_390();
             break;
         case 391:
-            ChipLogProgress(chipTool, " ***** Test Step 391 : Read range-restricted unsigned 16-bit integer\n");
-            err = TestReadRangeRestrictedUnsigned16BitInteger_391();
+            ChipLogProgress(
+                chipTool, " ***** Test Step 391 : Verify range-restricted unsigned 8-bit integer value is at mid valid\n");
+            err = TestVerifyRangeRestrictedUnsigned8BitIntegerValueIsAtMidValid_391();
             break;
         case 392:
-            ChipLogProgress(chipTool, " ***** Test Step 392 : Write min value to a range-restricted unsigned 16-bit integer\n");
-            err = TestWriteMinValueToARangeRestrictedUnsigned16BitInteger_392();
+            ChipLogProgress(chipTool, " ***** Test Step 392 : Read range-restricted unsigned 16-bit integer\n");
+            err = TestReadRangeRestrictedUnsigned16BitInteger_392();
             break;
         case 393:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 393 : Write just-below-range value to a range-restricted unsigned 16-bit integer\n");
-            err = TestWriteJustBelowRangeValueToARangeRestrictedUnsigned16BitInteger_393();
+            ChipLogProgress(chipTool, " ***** Test Step 393 : Write min value to a range-restricted unsigned 16-bit integer\n");
+            err = TestWriteMinValueToARangeRestrictedUnsigned16BitInteger_393();
             break;
         case 394:
             ChipLogProgress(
-                chipTool, " ***** Test Step 394 : Write just-above-range value to a range-restricted unsigned 16-bit integer\n");
-            err = TestWriteJustAboveRangeValueToARangeRestrictedUnsigned16BitInteger_394();
+                chipTool, " ***** Test Step 394 : Write just-below-range value to a range-restricted unsigned 16-bit integer\n");
+            err = TestWriteJustBelowRangeValueToARangeRestrictedUnsigned16BitInteger_394();
             break;
         case 395:
-            ChipLogProgress(chipTool, " ***** Test Step 395 : Write max value to a range-restricted unsigned 16-bit integer\n");
-            err = TestWriteMaxValueToARangeRestrictedUnsigned16BitInteger_395();
+            ChipLogProgress(
+                chipTool, " ***** Test Step 395 : Write just-above-range value to a range-restricted unsigned 16-bit integer\n");
+            err = TestWriteJustAboveRangeValueToARangeRestrictedUnsigned16BitInteger_395();
             break;
         case 396:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 396 : Verify range-restricted unsigned 16-bit integer value has not changed\n");
-            err = TestVerifyRangeRestrictedUnsigned16BitIntegerValueHasNotChanged_396();
+            ChipLogProgress(chipTool, " ***** Test Step 396 : Write max value to a range-restricted unsigned 16-bit integer\n");
+            err = TestWriteMaxValueToARangeRestrictedUnsigned16BitInteger_396();
             break;
         case 397:
             ChipLogProgress(
-                chipTool, " ***** Test Step 397 : Write min valid value to a range-restricted unsigned 16-bit integer\n");
-            err = TestWriteMinValidValueToARangeRestrictedUnsigned16BitInteger_397();
+                chipTool, " ***** Test Step 397 : Verify range-restricted unsigned 16-bit integer value has not changed\n");
+            err = TestVerifyRangeRestrictedUnsigned16BitIntegerValueHasNotChanged_397();
             break;
         case 398:
             ChipLogProgress(
-                chipTool, " ***** Test Step 398 : Verify range-restricted unsigned 16-bit integer value is at min valid\n");
-            err = TestVerifyRangeRestrictedUnsigned16BitIntegerValueIsAtMinValid_398();
+                chipTool, " ***** Test Step 398 : Write min valid value to a range-restricted unsigned 16-bit integer\n");
+            err = TestWriteMinValidValueToARangeRestrictedUnsigned16BitInteger_398();
             break;
         case 399:
             ChipLogProgress(
-                chipTool, " ***** Test Step 399 : Write max valid value to a range-restricted unsigned 16-bit integer\n");
-            err = TestWriteMaxValidValueToARangeRestrictedUnsigned16BitInteger_399();
+                chipTool, " ***** Test Step 399 : Verify range-restricted unsigned 16-bit integer value is at min valid\n");
+            err = TestVerifyRangeRestrictedUnsigned16BitIntegerValueIsAtMinValid_399();
             break;
         case 400:
             ChipLogProgress(
-                chipTool, " ***** Test Step 400 : Verify range-restricted unsigned 16-bit integer value is at max valid\n");
-            err = TestVerifyRangeRestrictedUnsigned16BitIntegerValueIsAtMaxValid_400();
+                chipTool, " ***** Test Step 400 : Write max valid value to a range-restricted unsigned 16-bit integer\n");
+            err = TestWriteMaxValidValueToARangeRestrictedUnsigned16BitInteger_400();
             break;
         case 401:
             ChipLogProgress(
-                chipTool, " ***** Test Step 401 : Write middle valid value to a range-restricted unsigned 16-bit integer\n");
-            err = TestWriteMiddleValidValueToARangeRestrictedUnsigned16BitInteger_401();
+                chipTool, " ***** Test Step 401 : Verify range-restricted unsigned 16-bit integer value is at max valid\n");
+            err = TestVerifyRangeRestrictedUnsigned16BitIntegerValueIsAtMaxValid_401();
             break;
         case 402:
             ChipLogProgress(
-                chipTool, " ***** Test Step 402 : Verify range-restricted unsigned 16-bit integer value is at mid valid\n");
-            err = TestVerifyRangeRestrictedUnsigned16BitIntegerValueIsAtMidValid_402();
+                chipTool, " ***** Test Step 402 : Write middle valid value to a range-restricted unsigned 16-bit integer\n");
+            err = TestWriteMiddleValidValueToARangeRestrictedUnsigned16BitInteger_402();
             break;
         case 403:
-            ChipLogProgress(chipTool, " ***** Test Step 403 : Read range-restricted signed 8-bit integer\n");
-            err = TestReadRangeRestrictedSigned8BitInteger_403();
+            ChipLogProgress(
+                chipTool, " ***** Test Step 403 : Verify range-restricted unsigned 16-bit integer value is at mid valid\n");
+            err = TestVerifyRangeRestrictedUnsigned16BitIntegerValueIsAtMidValid_403();
             break;
         case 404:
-            ChipLogProgress(chipTool, " ***** Test Step 404 : Write min value to a range-restricted signed 8-bit integer\n");
-            err = TestWriteMinValueToARangeRestrictedSigned8BitInteger_404();
+            ChipLogProgress(chipTool, " ***** Test Step 404 : Read range-restricted signed 8-bit integer\n");
+            err = TestReadRangeRestrictedSigned8BitInteger_404();
             break;
         case 405:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 405 : Write just-below-range value to a range-restricted signed 8-bit integer\n");
-            err = TestWriteJustBelowRangeValueToARangeRestrictedSigned8BitInteger_405();
+            ChipLogProgress(chipTool, " ***** Test Step 405 : Write min value to a range-restricted signed 8-bit integer\n");
+            err = TestWriteMinValueToARangeRestrictedSigned8BitInteger_405();
             break;
         case 406:
             ChipLogProgress(
-                chipTool, " ***** Test Step 406 : Write just-above-range value to a range-restricted signed 8-bit integer\n");
-            err = TestWriteJustAboveRangeValueToARangeRestrictedSigned8BitInteger_406();
+                chipTool, " ***** Test Step 406 : Write just-below-range value to a range-restricted signed 8-bit integer\n");
+            err = TestWriteJustBelowRangeValueToARangeRestrictedSigned8BitInteger_406();
             break;
         case 407:
-            ChipLogProgress(chipTool, " ***** Test Step 407 : Write max value to a range-restricted signed 8-bit integer\n");
-            err = TestWriteMaxValueToARangeRestrictedSigned8BitInteger_407();
+            ChipLogProgress(
+                chipTool, " ***** Test Step 407 : Write just-above-range value to a range-restricted signed 8-bit integer\n");
+            err = TestWriteJustAboveRangeValueToARangeRestrictedSigned8BitInteger_407();
             break;
         case 408:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 408 : Verify range-restricted signed 8-bit integer value has not changed\n");
-            err = TestVerifyRangeRestrictedSigned8BitIntegerValueHasNotChanged_408();
+            ChipLogProgress(chipTool, " ***** Test Step 408 : Write max value to a range-restricted signed 8-bit integer\n");
+            err = TestWriteMaxValueToARangeRestrictedSigned8BitInteger_408();
             break;
         case 409:
-            ChipLogProgress(chipTool, " ***** Test Step 409 : Write min valid value to a range-restricted signed 8-bit integer\n");
-            err = TestWriteMinValidValueToARangeRestrictedSigned8BitInteger_409();
+            ChipLogProgress(
+                chipTool, " ***** Test Step 409 : Verify range-restricted signed 8-bit integer value has not changed\n");
+            err = TestVerifyRangeRestrictedSigned8BitIntegerValueHasNotChanged_409();
             break;
         case 410:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 410 : Verify range-restricted signed 8-bit integer value is at min valid\n");
-            err = TestVerifyRangeRestrictedSigned8BitIntegerValueIsAtMinValid_410();
+            ChipLogProgress(chipTool, " ***** Test Step 410 : Write min valid value to a range-restricted signed 8-bit integer\n");
+            err = TestWriteMinValidValueToARangeRestrictedSigned8BitInteger_410();
             break;
         case 411:
-            ChipLogProgress(chipTool, " ***** Test Step 411 : Write max valid value to a range-restricted signed 8-bit integer\n");
-            err = TestWriteMaxValidValueToARangeRestrictedSigned8BitInteger_411();
+            ChipLogProgress(
+                chipTool, " ***** Test Step 411 : Verify range-restricted signed 8-bit integer value is at min valid\n");
+            err = TestVerifyRangeRestrictedSigned8BitIntegerValueIsAtMinValid_411();
             break;
         case 412:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 412 : Verify range-restricted signed 8-bit integer value is at max valid\n");
-            err = TestVerifyRangeRestrictedSigned8BitIntegerValueIsAtMaxValid_412();
+            ChipLogProgress(chipTool, " ***** Test Step 412 : Write max valid value to a range-restricted signed 8-bit integer\n");
+            err = TestWriteMaxValidValueToARangeRestrictedSigned8BitInteger_412();
             break;
         case 413:
             ChipLogProgress(
-                chipTool, " ***** Test Step 413 : Write middle valid value to a range-restricted signed 8-bit integer\n");
-            err = TestWriteMiddleValidValueToARangeRestrictedSigned8BitInteger_413();
+                chipTool, " ***** Test Step 413 : Verify range-restricted signed 8-bit integer value is at max valid\n");
+            err = TestVerifyRangeRestrictedSigned8BitIntegerValueIsAtMaxValid_413();
             break;
         case 414:
             ChipLogProgress(
-                chipTool, " ***** Test Step 414 : Verify range-restricted signed 8-bit integer value is at mid valid\n");
-            err = TestVerifyRangeRestrictedSigned8BitIntegerValueIsAtMidValid_414();
+                chipTool, " ***** Test Step 414 : Write middle valid value to a range-restricted signed 8-bit integer\n");
+            err = TestWriteMiddleValidValueToARangeRestrictedSigned8BitInteger_414();
             break;
         case 415:
-            ChipLogProgress(chipTool, " ***** Test Step 415 : Read range-restricted signed 16-bit integer\n");
-            err = TestReadRangeRestrictedSigned16BitInteger_415();
+            ChipLogProgress(
+                chipTool, " ***** Test Step 415 : Verify range-restricted signed 8-bit integer value is at mid valid\n");
+            err = TestVerifyRangeRestrictedSigned8BitIntegerValueIsAtMidValid_415();
             break;
         case 416:
-            ChipLogProgress(chipTool, " ***** Test Step 416 : Write min value to a range-restricted signed 16-bit integer\n");
-            err = TestWriteMinValueToARangeRestrictedSigned16BitInteger_416();
+            ChipLogProgress(chipTool, " ***** Test Step 416 : Read range-restricted signed 16-bit integer\n");
+            err = TestReadRangeRestrictedSigned16BitInteger_416();
             break;
         case 417:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 417 : Write just-below-range value to a range-restricted signed 16-bit integer\n");
-            err = TestWriteJustBelowRangeValueToARangeRestrictedSigned16BitInteger_417();
+            ChipLogProgress(chipTool, " ***** Test Step 417 : Write min value to a range-restricted signed 16-bit integer\n");
+            err = TestWriteMinValueToARangeRestrictedSigned16BitInteger_417();
             break;
         case 418:
             ChipLogProgress(
-                chipTool, " ***** Test Step 418 : Write just-above-range value to a range-restricted signed 16-bit integer\n");
-            err = TestWriteJustAboveRangeValueToARangeRestrictedSigned16BitInteger_418();
+                chipTool, " ***** Test Step 418 : Write just-below-range value to a range-restricted signed 16-bit integer\n");
+            err = TestWriteJustBelowRangeValueToARangeRestrictedSigned16BitInteger_418();
             break;
         case 419:
-            ChipLogProgress(chipTool, " ***** Test Step 419 : Write max value to a range-restricted signed 16-bit integer\n");
-            err = TestWriteMaxValueToARangeRestrictedSigned16BitInteger_419();
+            ChipLogProgress(
+                chipTool, " ***** Test Step 419 : Write just-above-range value to a range-restricted signed 16-bit integer\n");
+            err = TestWriteJustAboveRangeValueToARangeRestrictedSigned16BitInteger_419();
             break;
         case 420:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 420 : Verify range-restricted signed 16-bit integer value has not changed\n");
-            err = TestVerifyRangeRestrictedSigned16BitIntegerValueHasNotChanged_420();
+            ChipLogProgress(chipTool, " ***** Test Step 420 : Write max value to a range-restricted signed 16-bit integer\n");
+            err = TestWriteMaxValueToARangeRestrictedSigned16BitInteger_420();
             break;
         case 421:
-            ChipLogProgress(chipTool, " ***** Test Step 421 : Write min valid value to a range-restricted signed 16-bit integer\n");
-            err = TestWriteMinValidValueToARangeRestrictedSigned16BitInteger_421();
+            ChipLogProgress(
+                chipTool, " ***** Test Step 421 : Verify range-restricted signed 16-bit integer value has not changed\n");
+            err = TestVerifyRangeRestrictedSigned16BitIntegerValueHasNotChanged_421();
             break;
         case 422:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 422 : Verify range-restricted signed 16-bit integer value is at min valid\n");
-            err = TestVerifyRangeRestrictedSigned16BitIntegerValueIsAtMinValid_422();
+            ChipLogProgress(chipTool, " ***** Test Step 422 : Write min valid value to a range-restricted signed 16-bit integer\n");
+            err = TestWriteMinValidValueToARangeRestrictedSigned16BitInteger_422();
             break;
         case 423:
-            ChipLogProgress(chipTool, " ***** Test Step 423 : Write max valid value to a range-restricted signed 16-bit integer\n");
-            err = TestWriteMaxValidValueToARangeRestrictedSigned16BitInteger_423();
+            ChipLogProgress(
+                chipTool, " ***** Test Step 423 : Verify range-restricted signed 16-bit integer value is at min valid\n");
+            err = TestVerifyRangeRestrictedSigned16BitIntegerValueIsAtMinValid_423();
             break;
         case 424:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 424 : Verify range-restricted signed 16-bit integer value is at max valid\n");
-            err = TestVerifyRangeRestrictedSigned16BitIntegerValueIsAtMaxValid_424();
+            ChipLogProgress(chipTool, " ***** Test Step 424 : Write max valid value to a range-restricted signed 16-bit integer\n");
+            err = TestWriteMaxValidValueToARangeRestrictedSigned16BitInteger_424();
             break;
         case 425:
             ChipLogProgress(
-                chipTool, " ***** Test Step 425 : Write middle valid value to a range-restricted signed 16-bit integer\n");
-            err = TestWriteMiddleValidValueToARangeRestrictedSigned16BitInteger_425();
+                chipTool, " ***** Test Step 425 : Verify range-restricted signed 16-bit integer value is at max valid\n");
+            err = TestVerifyRangeRestrictedSigned16BitIntegerValueIsAtMaxValid_425();
             break;
         case 426:
             ChipLogProgress(
-                chipTool, " ***** Test Step 426 : Verify range-restricted signed 16-bit integer value is at mid valid\n");
-            err = TestVerifyRangeRestrictedSigned16BitIntegerValueIsAtMidValid_426();
+                chipTool, " ***** Test Step 426 : Write middle valid value to a range-restricted signed 16-bit integer\n");
+            err = TestWriteMiddleValidValueToARangeRestrictedSigned16BitInteger_426();
             break;
         case 427:
-            ChipLogProgress(chipTool, " ***** Test Step 427 : Read nullable range-restricted unsigned 8-bit integer\n");
-            err = TestReadNullableRangeRestrictedUnsigned8BitInteger_427();
+            ChipLogProgress(
+                chipTool, " ***** Test Step 427 : Verify range-restricted signed 16-bit integer value is at mid valid\n");
+            err = TestVerifyRangeRestrictedSigned16BitIntegerValueIsAtMidValid_427();
             break;
         case 428:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 428 : Write min value to a nullable range-restricted unsigned 8-bit integer\n");
-            err = TestWriteMinValueToANullableRangeRestrictedUnsigned8BitInteger_428();
+            ChipLogProgress(chipTool, " ***** Test Step 428 : Read nullable range-restricted unsigned 8-bit integer\n");
+            err = TestReadNullableRangeRestrictedUnsigned8BitInteger_428();
             break;
         case 429:
-            ChipLogProgress(chipTool,
-                " ***** Test Step 429 : Write just-below-range value to a nullable range-restricted unsigned 8-bit integer\n");
-            err = TestWriteJustBelowRangeValueToANullableRangeRestrictedUnsigned8BitInteger_429();
+            ChipLogProgress(
+                chipTool, " ***** Test Step 429 : Write min value to a nullable range-restricted unsigned 8-bit integer\n");
+            err = TestWriteMinValueToANullableRangeRestrictedUnsigned8BitInteger_429();
             break;
         case 430:
             ChipLogProgress(chipTool,
-                " ***** Test Step 430 : Write just-above-range value to a nullable range-restricted unsigned 8-bit integer\n");
-            err = TestWriteJustAboveRangeValueToANullableRangeRestrictedUnsigned8BitInteger_430();
+                " ***** Test Step 430 : Write just-below-range value to a nullable range-restricted unsigned 8-bit integer\n");
+            err = TestWriteJustBelowRangeValueToANullableRangeRestrictedUnsigned8BitInteger_430();
             break;
         case 431:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 431 : Write max value to a nullable range-restricted unsigned 8-bit integer\n");
-            err = TestWriteMaxValueToANullableRangeRestrictedUnsigned8BitInteger_431();
+            ChipLogProgress(chipTool,
+                " ***** Test Step 431 : Write just-above-range value to a nullable range-restricted unsigned 8-bit integer\n");
+            err = TestWriteJustAboveRangeValueToANullableRangeRestrictedUnsigned8BitInteger_431();
             break;
         case 432:
             ChipLogProgress(
-                chipTool, " ***** Test Step 432 : Verify nullable range-restricted unsigned 8-bit integer value has not changed\n");
-            err = TestVerifyNullableRangeRestrictedUnsigned8BitIntegerValueHasNotChanged_432();
+                chipTool, " ***** Test Step 432 : Write max value to a nullable range-restricted unsigned 8-bit integer\n");
+            err = TestWriteMaxValueToANullableRangeRestrictedUnsigned8BitInteger_432();
             break;
         case 433:
             ChipLogProgress(
-                chipTool, " ***** Test Step 433 : Write min valid value to a nullable range-restricted unsigned 8-bit integer\n");
-            err = TestWriteMinValidValueToANullableRangeRestrictedUnsigned8BitInteger_433();
+                chipTool, " ***** Test Step 433 : Verify nullable range-restricted unsigned 8-bit integer value has not changed\n");
+            err = TestVerifyNullableRangeRestrictedUnsigned8BitIntegerValueHasNotChanged_433();
             break;
         case 434:
             ChipLogProgress(
-                chipTool, " ***** Test Step 434 : Verify nullable range-restricted unsigned 8-bit integer value is at min valid\n");
-            err = TestVerifyNullableRangeRestrictedUnsigned8BitIntegerValueIsAtMinValid_434();
+                chipTool, " ***** Test Step 434 : Write min valid value to a nullable range-restricted unsigned 8-bit integer\n");
+            err = TestWriteMinValidValueToANullableRangeRestrictedUnsigned8BitInteger_434();
             break;
         case 435:
             ChipLogProgress(
-                chipTool, " ***** Test Step 435 : Write max valid value to a nullable range-restricted unsigned 8-bit integer\n");
-            err = TestWriteMaxValidValueToANullableRangeRestrictedUnsigned8BitInteger_435();
+                chipTool, " ***** Test Step 435 : Verify nullable range-restricted unsigned 8-bit integer value is at min valid\n");
+            err = TestVerifyNullableRangeRestrictedUnsigned8BitIntegerValueIsAtMinValid_435();
             break;
         case 436:
             ChipLogProgress(
-                chipTool, " ***** Test Step 436 : Verify nullable range-restricted unsigned 8-bit integer value is at max valid\n");
-            err = TestVerifyNullableRangeRestrictedUnsigned8BitIntegerValueIsAtMaxValid_436();
+                chipTool, " ***** Test Step 436 : Write max valid value to a nullable range-restricted unsigned 8-bit integer\n");
+            err = TestWriteMaxValidValueToANullableRangeRestrictedUnsigned8BitInteger_436();
             break;
         case 437:
-            ChipLogProgress(chipTool,
-                " ***** Test Step 437 : Write middle valid value to a nullable range-restricted unsigned 8-bit integer\n");
-            err = TestWriteMiddleValidValueToANullableRangeRestrictedUnsigned8BitInteger_437();
+            ChipLogProgress(
+                chipTool, " ***** Test Step 437 : Verify nullable range-restricted unsigned 8-bit integer value is at max valid\n");
+            err = TestVerifyNullableRangeRestrictedUnsigned8BitIntegerValueIsAtMaxValid_437();
             break;
         case 438:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 438 : Verify nullable range-restricted unsigned 8-bit integer value is at mid valid\n");
-            err = TestVerifyNullableRangeRestrictedUnsigned8BitIntegerValueIsAtMidValid_438();
+            ChipLogProgress(chipTool,
+                " ***** Test Step 438 : Write middle valid value to a nullable range-restricted unsigned 8-bit integer\n");
+            err = TestWriteMiddleValidValueToANullableRangeRestrictedUnsigned8BitInteger_438();
             break;
         case 439:
             ChipLogProgress(
-                chipTool, " ***** Test Step 439 : Write null value to a nullable range-restricted unsigned 8-bit integer\n");
-            err = TestWriteNullValueToANullableRangeRestrictedUnsigned8BitInteger_439();
+                chipTool, " ***** Test Step 439 : Verify nullable range-restricted unsigned 8-bit integer value is at mid valid\n");
+            err = TestVerifyNullableRangeRestrictedUnsigned8BitIntegerValueIsAtMidValid_439();
             break;
         case 440:
             ChipLogProgress(
-                chipTool, " ***** Test Step 440 : Verify nullable range-restricted unsigned 8-bit integer value is null\n");
-            err = TestVerifyNullableRangeRestrictedUnsigned8BitIntegerValueIsNull_440();
+                chipTool, " ***** Test Step 440 : Write null value to a nullable range-restricted unsigned 8-bit integer\n");
+            err = TestWriteNullValueToANullableRangeRestrictedUnsigned8BitInteger_440();
             break;
         case 441:
-            ChipLogProgress(chipTool, " ***** Test Step 441 : Read nullable range-restricted unsigned 16-bit integer\n");
-            err = TestReadNullableRangeRestrictedUnsigned16BitInteger_441();
+            ChipLogProgress(
+                chipTool, " ***** Test Step 441 : Verify nullable range-restricted unsigned 8-bit integer value is null\n");
+            err = TestVerifyNullableRangeRestrictedUnsigned8BitIntegerValueIsNull_441();
             break;
         case 442:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 442 : Write min value to a nullable range-restricted unsigned 16-bit integer\n");
-            err = TestWriteMinValueToANullableRangeRestrictedUnsigned16BitInteger_442();
+            ChipLogProgress(chipTool, " ***** Test Step 442 : Read nullable range-restricted unsigned 16-bit integer\n");
+            err = TestReadNullableRangeRestrictedUnsigned16BitInteger_442();
             break;
         case 443:
-            ChipLogProgress(chipTool,
-                " ***** Test Step 443 : Write just-below-range value to a nullable range-restricted unsigned 16-bit integer\n");
-            err = TestWriteJustBelowRangeValueToANullableRangeRestrictedUnsigned16BitInteger_443();
+            ChipLogProgress(
+                chipTool, " ***** Test Step 443 : Write min value to a nullable range-restricted unsigned 16-bit integer\n");
+            err = TestWriteMinValueToANullableRangeRestrictedUnsigned16BitInteger_443();
             break;
         case 444:
             ChipLogProgress(chipTool,
-                " ***** Test Step 444 : Write just-above-range value to a nullable range-restricted unsigned 16-bit integer\n");
-            err = TestWriteJustAboveRangeValueToANullableRangeRestrictedUnsigned16BitInteger_444();
+                " ***** Test Step 444 : Write just-below-range value to a nullable range-restricted unsigned 16-bit integer\n");
+            err = TestWriteJustBelowRangeValueToANullableRangeRestrictedUnsigned16BitInteger_444();
             break;
         case 445:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 445 : Write max value to a nullable range-restricted unsigned 16-bit integer\n");
-            err = TestWriteMaxValueToANullableRangeRestrictedUnsigned16BitInteger_445();
+            ChipLogProgress(chipTool,
+                " ***** Test Step 445 : Write just-above-range value to a nullable range-restricted unsigned 16-bit integer\n");
+            err = TestWriteJustAboveRangeValueToANullableRangeRestrictedUnsigned16BitInteger_445();
             break;
         case 446:
-            ChipLogProgress(chipTool,
-                " ***** Test Step 446 : Verify nullable range-restricted unsigned 16-bit integer value has not changed\n");
-            err = TestVerifyNullableRangeRestrictedUnsigned16BitIntegerValueHasNotChanged_446();
+            ChipLogProgress(
+                chipTool, " ***** Test Step 446 : Write max value to a nullable range-restricted unsigned 16-bit integer\n");
+            err = TestWriteMaxValueToANullableRangeRestrictedUnsigned16BitInteger_446();
             break;
         case 447:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 447 : Write min valid value to a nullable range-restricted unsigned 16-bit integer\n");
-            err = TestWriteMinValidValueToANullableRangeRestrictedUnsigned16BitInteger_447();
+            ChipLogProgress(chipTool,
+                " ***** Test Step 447 : Verify nullable range-restricted unsigned 16-bit integer value has not changed\n");
+            err = TestVerifyNullableRangeRestrictedUnsigned16BitIntegerValueHasNotChanged_447();
             break;
         case 448:
-            ChipLogProgress(chipTool,
-                " ***** Test Step 448 : Verify nullable range-restricted unsigned 16-bit integer value is at min valid\n");
-            err = TestVerifyNullableRangeRestrictedUnsigned16BitIntegerValueIsAtMinValid_448();
+            ChipLogProgress(
+                chipTool, " ***** Test Step 448 : Write min valid value to a nullable range-restricted unsigned 16-bit integer\n");
+            err = TestWriteMinValidValueToANullableRangeRestrictedUnsigned16BitInteger_448();
             break;
         case 449:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 449 : Write max valid value to a nullable range-restricted unsigned 16-bit integer\n");
-            err = TestWriteMaxValidValueToANullableRangeRestrictedUnsigned16BitInteger_449();
+            ChipLogProgress(chipTool,
+                " ***** Test Step 449 : Verify nullable range-restricted unsigned 16-bit integer value is at min valid\n");
+            err = TestVerifyNullableRangeRestrictedUnsigned16BitIntegerValueIsAtMinValid_449();
             break;
         case 450:
-            ChipLogProgress(chipTool,
-                " ***** Test Step 450 : Verify nullable range-restricted unsigned 16-bit integer value is at max valid\n");
-            err = TestVerifyNullableRangeRestrictedUnsigned16BitIntegerValueIsAtMaxValid_450();
+            ChipLogProgress(
+                chipTool, " ***** Test Step 450 : Write max valid value to a nullable range-restricted unsigned 16-bit integer\n");
+            err = TestWriteMaxValidValueToANullableRangeRestrictedUnsigned16BitInteger_450();
             break;
         case 451:
             ChipLogProgress(chipTool,
-                " ***** Test Step 451 : Write middle valid value to a nullable range-restricted unsigned 16-bit integer\n");
-            err = TestWriteMiddleValidValueToANullableRangeRestrictedUnsigned16BitInteger_451();
+                " ***** Test Step 451 : Verify nullable range-restricted unsigned 16-bit integer value is at max valid\n");
+            err = TestVerifyNullableRangeRestrictedUnsigned16BitIntegerValueIsAtMaxValid_451();
             break;
         case 452:
             ChipLogProgress(chipTool,
-                " ***** Test Step 452 : Verify nullable range-restricted unsigned 16-bit integer value is at mid valid\n");
-            err = TestVerifyNullableRangeRestrictedUnsigned16BitIntegerValueIsAtMidValid_452();
+                " ***** Test Step 452 : Write middle valid value to a nullable range-restricted unsigned 16-bit integer\n");
+            err = TestWriteMiddleValidValueToANullableRangeRestrictedUnsigned16BitInteger_452();
             break;
         case 453:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 453 : Write null value to a nullable range-restricted unsigned 16-bit integer\n");
-            err = TestWriteNullValueToANullableRangeRestrictedUnsigned16BitInteger_453();
+            ChipLogProgress(chipTool,
+                " ***** Test Step 453 : Verify nullable range-restricted unsigned 16-bit integer value is at mid valid\n");
+            err = TestVerifyNullableRangeRestrictedUnsigned16BitIntegerValueIsAtMidValid_453();
             break;
         case 454:
             ChipLogProgress(
-                chipTool, " ***** Test Step 454 : Verify nullable range-restricted unsigned 16-bit integer value is null\n");
-            err = TestVerifyNullableRangeRestrictedUnsigned16BitIntegerValueIsNull_454();
+                chipTool, " ***** Test Step 454 : Write null value to a nullable range-restricted unsigned 16-bit integer\n");
+            err = TestWriteNullValueToANullableRangeRestrictedUnsigned16BitInteger_454();
             break;
         case 455:
-            ChipLogProgress(chipTool, " ***** Test Step 455 : Read nullable range-restricted signed 8-bit integer\n");
-            err = TestReadNullableRangeRestrictedSigned8BitInteger_455();
+            ChipLogProgress(
+                chipTool, " ***** Test Step 455 : Verify nullable range-restricted unsigned 16-bit integer value is null\n");
+            err = TestVerifyNullableRangeRestrictedUnsigned16BitIntegerValueIsNull_455();
             break;
         case 456:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 456 : Write min value to a nullable range-restricted signed 8-bit integer\n");
-            err = TestWriteMinValueToANullableRangeRestrictedSigned8BitInteger_456();
+            ChipLogProgress(chipTool, " ***** Test Step 456 : Read nullable range-restricted signed 8-bit integer\n");
+            err = TestReadNullableRangeRestrictedSigned8BitInteger_456();
             break;
         case 457:
-            ChipLogProgress(chipTool,
-                " ***** Test Step 457 : Write just-below-range value to a nullable range-restricted signed 8-bit integer\n");
-            err = TestWriteJustBelowRangeValueToANullableRangeRestrictedSigned8BitInteger_457();
+            ChipLogProgress(
+                chipTool, " ***** Test Step 457 : Write min value to a nullable range-restricted signed 8-bit integer\n");
+            err = TestWriteMinValueToANullableRangeRestrictedSigned8BitInteger_457();
             break;
         case 458:
             ChipLogProgress(chipTool,
-                " ***** Test Step 458 : Write just-above-range value to a nullable range-restricted signed 8-bit integer\n");
-            err = TestWriteJustAboveRangeValueToANullableRangeRestrictedSigned8BitInteger_458();
+                " ***** Test Step 458 : Write just-below-range value to a nullable range-restricted signed 8-bit integer\n");
+            err = TestWriteJustBelowRangeValueToANullableRangeRestrictedSigned8BitInteger_458();
             break;
         case 459:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 459 : Write max value to a nullable range-restricted signed 8-bit integer\n");
-            err = TestWriteMaxValueToANullableRangeRestrictedSigned8BitInteger_459();
+            ChipLogProgress(chipTool,
+                " ***** Test Step 459 : Write just-above-range value to a nullable range-restricted signed 8-bit integer\n");
+            err = TestWriteJustAboveRangeValueToANullableRangeRestrictedSigned8BitInteger_459();
             break;
         case 460:
             ChipLogProgress(
-                chipTool, " ***** Test Step 460 : Verify nullable range-restricted signed 8-bit integer value has not changed\n");
-            err = TestVerifyNullableRangeRestrictedSigned8BitIntegerValueHasNotChanged_460();
+                chipTool, " ***** Test Step 460 : Write max value to a nullable range-restricted signed 8-bit integer\n");
+            err = TestWriteMaxValueToANullableRangeRestrictedSigned8BitInteger_460();
             break;
         case 461:
             ChipLogProgress(
-                chipTool, " ***** Test Step 461 : Write min valid value to a nullable range-restricted signed 8-bit integer\n");
-            err = TestWriteMinValidValueToANullableRangeRestrictedSigned8BitInteger_461();
+                chipTool, " ***** Test Step 461 : Verify nullable range-restricted signed 8-bit integer value has not changed\n");
+            err = TestVerifyNullableRangeRestrictedSigned8BitIntegerValueHasNotChanged_461();
             break;
         case 462:
             ChipLogProgress(
-                chipTool, " ***** Test Step 462 : Verify nullable range-restricted signed 8-bit integer value is at min valid\n");
-            err = TestVerifyNullableRangeRestrictedSigned8BitIntegerValueIsAtMinValid_462();
+                chipTool, " ***** Test Step 462 : Write min valid value to a nullable range-restricted signed 8-bit integer\n");
+            err = TestWriteMinValidValueToANullableRangeRestrictedSigned8BitInteger_462();
             break;
         case 463:
             ChipLogProgress(
-                chipTool, " ***** Test Step 463 : Write max valid value to a nullable range-restricted signed 8-bit integer\n");
-            err = TestWriteMaxValidValueToANullableRangeRestrictedSigned8BitInteger_463();
+                chipTool, " ***** Test Step 463 : Verify nullable range-restricted signed 8-bit integer value is at min valid\n");
+            err = TestVerifyNullableRangeRestrictedSigned8BitIntegerValueIsAtMinValid_463();
             break;
         case 464:
             ChipLogProgress(
-                chipTool, " ***** Test Step 464 : Verify nullable range-restricted signed 8-bit integer value is at max valid\n");
-            err = TestVerifyNullableRangeRestrictedSigned8BitIntegerValueIsAtMaxValid_464();
+                chipTool, " ***** Test Step 464 : Write max valid value to a nullable range-restricted signed 8-bit integer\n");
+            err = TestWriteMaxValidValueToANullableRangeRestrictedSigned8BitInteger_464();
             break;
         case 465:
             ChipLogProgress(
-                chipTool, " ***** Test Step 465 : Write middle valid value to a nullable range-restricted signed 8-bit integer\n");
-            err = TestWriteMiddleValidValueToANullableRangeRestrictedSigned8BitInteger_465();
+                chipTool, " ***** Test Step 465 : Verify nullable range-restricted signed 8-bit integer value is at max valid\n");
+            err = TestVerifyNullableRangeRestrictedSigned8BitIntegerValueIsAtMaxValid_465();
             break;
         case 466:
             ChipLogProgress(
-                chipTool, " ***** Test Step 466 : Verify nullable range-restricted signed 8-bit integer value is at mid valid\n");
-            err = TestVerifyNullableRangeRestrictedSigned8BitIntegerValueIsAtMidValid_466();
+                chipTool, " ***** Test Step 466 : Write middle valid value to a nullable range-restricted signed 8-bit integer\n");
+            err = TestWriteMiddleValidValueToANullableRangeRestrictedSigned8BitInteger_466();
             break;
         case 467:
             ChipLogProgress(
-                chipTool, " ***** Test Step 467 : Write null value to a nullable range-restricted signed 8-bit integer\n");
-            err = TestWriteNullValueToANullableRangeRestrictedSigned8BitInteger_467();
+                chipTool, " ***** Test Step 467 : Verify nullable range-restricted signed 8-bit integer value is at mid valid\n");
+            err = TestVerifyNullableRangeRestrictedSigned8BitIntegerValueIsAtMidValid_467();
             break;
         case 468:
             ChipLogProgress(
-                chipTool, " ***** Test Step 468 : Verify nullable range-restricted signed 8-bit integer value is at null\n");
-            err = TestVerifyNullableRangeRestrictedSigned8BitIntegerValueIsAtNull_468();
+                chipTool, " ***** Test Step 468 : Write null value to a nullable range-restricted signed 8-bit integer\n");
+            err = TestWriteNullValueToANullableRangeRestrictedSigned8BitInteger_468();
             break;
         case 469:
-            ChipLogProgress(chipTool, " ***** Test Step 469 : Read nullable range-restricted signed 16-bit integer\n");
-            err = TestReadNullableRangeRestrictedSigned16BitInteger_469();
+            ChipLogProgress(
+                chipTool, " ***** Test Step 469 : Verify nullable range-restricted signed 8-bit integer value is at null\n");
+            err = TestVerifyNullableRangeRestrictedSigned8BitIntegerValueIsAtNull_469();
             break;
         case 470:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 470 : Write min value to a nullable range-restricted signed 16-bit integer\n");
-            err = TestWriteMinValueToANullableRangeRestrictedSigned16BitInteger_470();
+            ChipLogProgress(chipTool, " ***** Test Step 470 : Read nullable range-restricted signed 16-bit integer\n");
+            err = TestReadNullableRangeRestrictedSigned16BitInteger_470();
             break;
         case 471:
-            ChipLogProgress(chipTool,
-                " ***** Test Step 471 : Write just-below-range value to a nullable range-restricted signed 16-bit integer\n");
-            err = TestWriteJustBelowRangeValueToANullableRangeRestrictedSigned16BitInteger_471();
+            ChipLogProgress(
+                chipTool, " ***** Test Step 471 : Write min value to a nullable range-restricted signed 16-bit integer\n");
+            err = TestWriteMinValueToANullableRangeRestrictedSigned16BitInteger_471();
             break;
         case 472:
             ChipLogProgress(chipTool,
-                " ***** Test Step 472 : Write just-above-range value to a nullable range-restricted signed 16-bit integer\n");
-            err = TestWriteJustAboveRangeValueToANullableRangeRestrictedSigned16BitInteger_472();
+                " ***** Test Step 472 : Write just-below-range value to a nullable range-restricted signed 16-bit integer\n");
+            err = TestWriteJustBelowRangeValueToANullableRangeRestrictedSigned16BitInteger_472();
             break;
         case 473:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 473 : Write max value to a nullable range-restricted signed 16-bit integer\n");
-            err = TestWriteMaxValueToANullableRangeRestrictedSigned16BitInteger_473();
+            ChipLogProgress(chipTool,
+                " ***** Test Step 473 : Write just-above-range value to a nullable range-restricted signed 16-bit integer\n");
+            err = TestWriteJustAboveRangeValueToANullableRangeRestrictedSigned16BitInteger_473();
             break;
         case 474:
             ChipLogProgress(
-                chipTool, " ***** Test Step 474 : Verify nullable range-restricted signed 16-bit integer value has not changed\n");
-            err = TestVerifyNullableRangeRestrictedSigned16BitIntegerValueHasNotChanged_474();
+                chipTool, " ***** Test Step 474 : Write max value to a nullable range-restricted signed 16-bit integer\n");
+            err = TestWriteMaxValueToANullableRangeRestrictedSigned16BitInteger_474();
             break;
         case 475:
             ChipLogProgress(
-                chipTool, " ***** Test Step 475 : Write min valid value to a nullable range-restricted signed 16-bit integer\n");
-            err = TestWriteMinValidValueToANullableRangeRestrictedSigned16BitInteger_475();
+                chipTool, " ***** Test Step 475 : Verify nullable range-restricted signed 16-bit integer value has not changed\n");
+            err = TestVerifyNullableRangeRestrictedSigned16BitIntegerValueHasNotChanged_475();
             break;
         case 476:
             ChipLogProgress(
-                chipTool, " ***** Test Step 476 : Verify nullable range-restricted signed 16-bit integer value is at min valid\n");
-            err = TestVerifyNullableRangeRestrictedSigned16BitIntegerValueIsAtMinValid_476();
+                chipTool, " ***** Test Step 476 : Write min valid value to a nullable range-restricted signed 16-bit integer\n");
+            err = TestWriteMinValidValueToANullableRangeRestrictedSigned16BitInteger_476();
             break;
         case 477:
             ChipLogProgress(
-                chipTool, " ***** Test Step 477 : Write max valid value to a nullable range-restricted signed 16-bit integer\n");
-            err = TestWriteMaxValidValueToANullableRangeRestrictedSigned16BitInteger_477();
+                chipTool, " ***** Test Step 477 : Verify nullable range-restricted signed 16-bit integer value is at min valid\n");
+            err = TestVerifyNullableRangeRestrictedSigned16BitIntegerValueIsAtMinValid_477();
             break;
         case 478:
             ChipLogProgress(
-                chipTool, " ***** Test Step 478 : Verify nullable range-restricted signed 16-bit integer value is at max valid\n");
-            err = TestVerifyNullableRangeRestrictedSigned16BitIntegerValueIsAtMaxValid_478();
+                chipTool, " ***** Test Step 478 : Write max valid value to a nullable range-restricted signed 16-bit integer\n");
+            err = TestWriteMaxValidValueToANullableRangeRestrictedSigned16BitInteger_478();
             break;
         case 479:
             ChipLogProgress(
-                chipTool, " ***** Test Step 479 : Write middle valid value to a nullable range-restricted signed 16-bit integer\n");
-            err = TestWriteMiddleValidValueToANullableRangeRestrictedSigned16BitInteger_479();
+                chipTool, " ***** Test Step 479 : Verify nullable range-restricted signed 16-bit integer value is at max valid\n");
+            err = TestVerifyNullableRangeRestrictedSigned16BitIntegerValueIsAtMaxValid_479();
             break;
         case 480:
             ChipLogProgress(
-                chipTool, " ***** Test Step 480 : Verify nullable range-restricted signed 16-bit integer value is at mid valid\n");
-            err = TestVerifyNullableRangeRestrictedSigned16BitIntegerValueIsAtMidValid_480();
+                chipTool, " ***** Test Step 480 : Write middle valid value to a nullable range-restricted signed 16-bit integer\n");
+            err = TestWriteMiddleValidValueToANullableRangeRestrictedSigned16BitInteger_480();
             break;
         case 481:
             ChipLogProgress(
-                chipTool, " ***** Test Step 481 : Write null value to a nullable range-restricted signed 16-bit integer\n");
-            err = TestWriteNullValueToANullableRangeRestrictedSigned16BitInteger_481();
+                chipTool, " ***** Test Step 481 : Verify nullable range-restricted signed 16-bit integer value is at mid valid\n");
+            err = TestVerifyNullableRangeRestrictedSigned16BitIntegerValueIsAtMidValid_481();
             break;
         case 482:
             ChipLogProgress(
-                chipTool, " ***** Test Step 482 : Verify nullable range-restricted signed 16-bit integer value is null\n");
-            err = TestVerifyNullableRangeRestrictedSigned16BitIntegerValueIsNull_482();
+                chipTool, " ***** Test Step 482 : Write null value to a nullable range-restricted signed 16-bit integer\n");
+            err = TestWriteNullValueToANullableRangeRestrictedSigned16BitInteger_482();
             break;
         case 483:
-            ChipLogProgress(chipTool, " ***** Test Step 483 : Write attribute that returns general status on write\n");
-            err = TestWriteAttributeThatReturnsGeneralStatusOnWrite_483();
+            ChipLogProgress(
+                chipTool, " ***** Test Step 483 : Verify nullable range-restricted signed 16-bit integer value is null\n");
+            err = TestVerifyNullableRangeRestrictedSigned16BitIntegerValueIsNull_483();
             break;
         case 484:
-            ChipLogProgress(chipTool, " ***** Test Step 484 : Write attribute that returns cluster-specific status on write\n");
-            err = TestWriteAttributeThatReturnsClusterSpecificStatusOnWrite_484();
+            ChipLogProgress(chipTool, " ***** Test Step 484 : Write attribute that returns general status on write\n");
+            err = TestWriteAttributeThatReturnsGeneralStatusOnWrite_484();
             break;
         case 485:
-            ChipLogProgress(chipTool, " ***** Test Step 485 : Read attribute that returns general status on read\n");
-            err = TestReadAttributeThatReturnsGeneralStatusOnRead_485();
+            ChipLogProgress(chipTool, " ***** Test Step 485 : Write attribute that returns cluster-specific status on write\n");
+            err = TestWriteAttributeThatReturnsClusterSpecificStatusOnWrite_485();
             break;
         case 486:
-            ChipLogProgress(chipTool, " ***** Test Step 486 : read attribute that returns cluster-specific status on read\n");
-            err = TestReadAttributeThatReturnsClusterSpecificStatusOnRead_486();
+            ChipLogProgress(chipTool, " ***** Test Step 486 : Read attribute that returns general status on read\n");
+            err = TestReadAttributeThatReturnsGeneralStatusOnRead_486();
             break;
         case 487:
-            ChipLogProgress(chipTool, " ***** Test Step 487 : read AcceptedCommandList attribute\n");
-            err = TestReadAcceptedCommandListAttribute_487();
+            ChipLogProgress(chipTool, " ***** Test Step 487 : read attribute that returns cluster-specific status on read\n");
+            err = TestReadAttributeThatReturnsClusterSpecificStatusOnRead_487();
             break;
         case 488:
-            ChipLogProgress(chipTool, " ***** Test Step 488 : read GeneratedCommandList attribute\n");
-            err = TestReadGeneratedCommandListAttribute_488();
+            ChipLogProgress(chipTool, " ***** Test Step 488 : read AcceptedCommandList attribute\n");
+            err = TestReadAcceptedCommandListAttribute_488();
             break;
         case 489:
-            ChipLogProgress(chipTool, " ***** Test Step 489 : Write struct-typed attribute\n");
-            err = TestWriteStructTypedAttribute_489();
+            ChipLogProgress(chipTool, " ***** Test Step 489 : read GeneratedCommandList attribute\n");
+            err = TestReadGeneratedCommandListAttribute_489();
             break;
         case 490:
-            ChipLogProgress(chipTool, " ***** Test Step 490 : Read struct-typed attribute\n");
-            err = TestReadStructTypedAttribute_490();
+            ChipLogProgress(chipTool, " ***** Test Step 490 : Write struct-typed attribute\n");
+            err = TestWriteStructTypedAttribute_490();
+            break;
+        case 491:
+            ChipLogProgress(chipTool, " ***** Test Step 491 : Read struct-typed attribute\n");
+            err = TestReadStructTypedAttribute_491();
             break;
         }
 
@@ -76947,13 +76951,13 @@ class TestCluster : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 148:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_UNSUPPORTED_ENDPOINT));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 149:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_UNSUPPORTED_CLUSTER));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_UNSUPPORTED_ENDPOINT));
             break;
         case 150:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_UNSUPPORTED_CLUSTER));
             break;
         case 151:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
@@ -77070,10 +77074,10 @@ class TestCluster : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 189:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 190:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             break;
         case 191:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
@@ -77091,10 +77095,10 @@ class TestCluster : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 196:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 197:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             break;
         case 198:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
@@ -77109,10 +77113,10 @@ class TestCluster : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 202:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 203:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             break;
         case 204:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
@@ -77127,10 +77131,10 @@ class TestCluster : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 208:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 209:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             break;
         case 210:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
@@ -77151,10 +77155,10 @@ class TestCluster : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 216:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 217:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             break;
         case 218:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
@@ -77193,10 +77197,10 @@ class TestCluster : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 230:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 231:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             break;
         case 232:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
@@ -77232,10 +77236,10 @@ class TestCluster : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 243:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 244:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             break;
         case 245:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
@@ -77271,10 +77275,10 @@ class TestCluster : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 256:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 257:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             break;
         case 258:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
@@ -77304,10 +77308,10 @@ class TestCluster : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 267:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 268:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             break;
         case 269:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
@@ -77337,10 +77341,10 @@ class TestCluster : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 278:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 279:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             break;
         case 280:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
@@ -77370,10 +77374,10 @@ class TestCluster : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 289:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 290:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             break;
         case 291:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
@@ -77403,10 +77407,10 @@ class TestCluster : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 300:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 301:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             break;
         case 302:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
@@ -77502,10 +77506,10 @@ class TestCluster : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 333:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 334:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             break;
         case 335:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
@@ -77526,10 +77530,10 @@ class TestCluster : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 341:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 342:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             break;
         case 343:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
@@ -77550,10 +77554,10 @@ class TestCluster : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 349:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 350:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             break;
         case 351:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
@@ -77616,16 +77620,16 @@ class TestCluster : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 371:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_UNSUPPORTED_ENDPOINT));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 372:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_UNSUPPORTED_CLUSTER));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_UNSUPPORTED_ENDPOINT));
             break;
         case 373:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_INVALID_VALUE));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_UNSUPPORTED_CLUSTER));
             break;
         case 374:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_INVALID_VALUE));
             break;
         case 375:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
@@ -77643,7 +77647,7 @@ class TestCluster : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 380:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 381:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
@@ -77655,7 +77659,7 @@ class TestCluster : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             break;
         case 384:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             break;
         case 385:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
@@ -77679,7 +77683,7 @@ class TestCluster : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 392:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 393:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
@@ -77691,7 +77695,7 @@ class TestCluster : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             break;
         case 396:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             break;
         case 397:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
@@ -77715,7 +77719,7 @@ class TestCluster : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 404:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 405:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
@@ -77727,7 +77731,7 @@ class TestCluster : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             break;
         case 408:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             break;
         case 409:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
@@ -77751,7 +77755,7 @@ class TestCluster : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 416:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 417:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
@@ -77763,7 +77767,7 @@ class TestCluster : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             break;
         case 420:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             break;
         case 421:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
@@ -77787,7 +77791,7 @@ class TestCluster : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 428:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 429:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
@@ -77799,7 +77803,7 @@ class TestCluster : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             break;
         case 432:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             break;
         case 433:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
@@ -77829,7 +77833,7 @@ class TestCluster : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 442:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 443:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
@@ -77841,7 +77845,7 @@ class TestCluster : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             break;
         case 446:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             break;
         case 447:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
@@ -77871,7 +77875,7 @@ class TestCluster : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 456:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 457:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
@@ -77883,7 +77887,7 @@ class TestCluster : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             break;
         case 460:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             break;
         case 461:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
@@ -77913,7 +77917,7 @@ class TestCluster : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 470:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 471:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
@@ -77925,7 +77929,7 @@ class TestCluster : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             break;
         case 474:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR));
             break;
         case 475:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
@@ -77952,19 +77956,19 @@ class TestCluster : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 483:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_INVALID_DATA_TYPE));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
         case 484:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_FAILURE));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_INVALID_DATA_TYPE));
             break;
         case 485:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_INVALID_DATA_TYPE));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_FAILURE));
             break;
         case 486:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_FAILURE));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_INVALID_DATA_TYPE));
             break;
         case 487:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_FAILURE));
             break;
         case 488:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
@@ -77975,6 +77979,9 @@ class TestCluster : public TestCommandBridge {
         case 490:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
+        case 491:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
         }
 
         // Go on to the next test.
@@ -77988,7 +77995,7 @@ class TestCluster : public TestCommandBridge {
 
 private:
     std::atomic_uint16_t mTestIndex;
-    const uint16_t mTestCount = 491;
+    const uint16_t mTestCount = 492;
 
     chip::Optional<chip::NodeId> mNodeId;
     chip::Optional<chip::CharSpan> mCluster;
@@ -81150,7 +81157,64 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeEpochUsDefaultValue_136()
+    CHIP_ERROR TestWriteAttributeListLongOctetStringForChunkedWrite_136()
+    {
+
+        MTRBaseDevice * device = GetDevice("alpha");
+        __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        id listLongOctetStringArgument;
+        {
+            NSMutableArray * temp_0 = [[NSMutableArray alloc] init];
+            temp_0[0] = [[NSData alloc]
+                initWithBytes:
+                    "0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcd"
+                    "ef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789ab"
+                    "cdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789"
+                    "abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef01234567"
+                    "89abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef"
+                       length:512];
+            temp_0[1] = [[NSData alloc]
+                initWithBytes:
+                    "0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcd"
+                    "ef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789ab"
+                    "cdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789"
+                    "abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef01234567"
+                    "89abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef"
+                       length:512];
+            temp_0[2] = [[NSData alloc]
+                initWithBytes:
+                    "0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcd"
+                    "ef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789ab"
+                    "cdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789"
+                    "abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef01234567"
+                    "89abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef"
+                       length:512];
+            temp_0[3] = [[NSData alloc]
+                initWithBytes:
+                    "0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcd"
+                    "ef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789ab"
+                    "cdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789"
+                    "abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef01234567"
+                    "89abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef"
+                       length:512];
+            listLongOctetStringArgument = temp_0;
+        }
+        [cluster
+            writeAttributeListLongOctetStringWithValue:listLongOctetStringArgument
+                                            completion:^(NSError * _Nullable err) {
+                                                NSLog(@"Write attribute LIST_LONG_OCTET_STRING (for chunked write) Error: %@", err);
+
+                                                VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+                                                NextTest();
+                                            }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestReadAttributeEpochUsDefaultValue_137()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -81173,7 +81237,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteAttributeEpochUsMaxValue_137()
+    CHIP_ERROR TestWriteAttributeEpochUsMaxValue_138()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -81194,7 +81258,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeEpochUsMaxValue_138()
+    CHIP_ERROR TestReadAttributeEpochUsMaxValue_139()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -81217,7 +81281,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteAttributeEpochUsMinValue_139()
+    CHIP_ERROR TestWriteAttributeEpochUsMinValue_140()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -81238,7 +81302,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeEpochUsMinValue_140()
+    CHIP_ERROR TestReadAttributeEpochUsMinValue_141()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -81261,7 +81325,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeEpochSDefaultValue_141()
+    CHIP_ERROR TestReadAttributeEpochSDefaultValue_142()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -81284,7 +81348,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteAttributeEpochSMaxValue_142()
+    CHIP_ERROR TestWriteAttributeEpochSMaxValue_143()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -81305,7 +81369,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeEpochSMaxValue_143()
+    CHIP_ERROR TestReadAttributeEpochSMaxValue_144()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -81328,7 +81392,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteAttributeEpochSMinValue_144()
+    CHIP_ERROR TestWriteAttributeEpochSMinValue_145()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -81349,7 +81413,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeEpochSMinValue_145()
+    CHIP_ERROR TestReadAttributeEpochSMinValue_146()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -81372,7 +81436,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeUnsupported_146()
+    CHIP_ERROR TestReadAttributeUnsupported_147()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -81400,7 +81464,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteattributeUnsupported_147()
+    CHIP_ERROR TestWriteattributeUnsupported_148()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -81426,7 +81490,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestSendTestCommandToUnsupportedEndpoint_148()
+    CHIP_ERROR TestSendTestCommandToUnsupportedEndpoint_149()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -81445,7 +81509,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestSendTestCommandToUnsupportedCluster_149()
+    CHIP_ERROR TestSendTestCommandToUnsupportedCluster_150()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -81464,7 +81528,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeVendorIdDefaultValue_150()
+    CHIP_ERROR TestReadAttributeVendorIdDefaultValue_151()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -81487,7 +81551,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteAttributeVendorId_151()
+    CHIP_ERROR TestWriteAttributeVendorId_152()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -81508,7 +81572,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeVendorId_152()
+    CHIP_ERROR TestReadAttributeVendorId_153()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -81531,7 +81595,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestRestoreAttributeVendorId_153()
+    CHIP_ERROR TestRestoreAttributeVendorId_154()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -81552,7 +81616,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestSendACommandWithAVendorIdAndEnum_154()
+    CHIP_ERROR TestSendACommandWithAVendorIdAndEnum_155()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -81585,7 +81649,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestSendACommandWithAVendorIdAndInvalidEnum_155()
+    CHIP_ERROR TestSendACommandWithAVendorIdAndInvalidEnum_156()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -81618,7 +81682,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestSendTestCommandWithStructArgumentAndArg1bIsTrue_156()
+    CHIP_ERROR TestSendTestCommandWithStructArgumentAndArg1bIsTrue_157()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -81654,7 +81718,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestSendTestCommandWithStructArgumentAndArg1bIsFalse_157()
+    CHIP_ERROR TestSendTestCommandWithStructArgumentAndArg1bIsFalse_158()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -81690,7 +81754,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestSendTestCommandWithNestedStructArgumentAndArg1cbIsTrue_158()
+    CHIP_ERROR TestSendTestCommandWithNestedStructArgumentAndArg1cbIsTrue_159()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -81739,7 +81803,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestSendTestCommandWithNestedStructArgumentArg1cbIsFalse_159()
+    CHIP_ERROR TestSendTestCommandWithNestedStructArgumentArg1cbIsFalse_160()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -81787,7 +81851,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestSendTestCommandWithNestedStructListArgumentAndAllFieldsBOfArg1dAreTrue_160()
+    CHIP_ERROR TestSendTestCommandWithNestedStructListArgumentAndAllFieldsBOfArg1dAreTrue_161()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -81880,7 +81944,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestSendTestCommandWithNestedStructListArgumentAndSomeFieldsBOfArg1dAreFalse_161()
+    CHIP_ERROR TestSendTestCommandWithNestedStructListArgumentAndSomeFieldsBOfArg1dAreFalse_162()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -81973,7 +82037,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestSendTestCommandWithStructArgumentAndSeeWhatWeGetBack_162()
+    CHIP_ERROR TestSendTestCommandWithStructArgumentAndSeeWhatWeGetBack_163()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -82026,7 +82090,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestSendTestCommandWithListOfInt8uAndNoneOfThemIsSetTo0_163()
+    CHIP_ERROR TestSendTestCommandWithListOfInt8uAndNoneOfThemIsSetTo0_164()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -82067,7 +82131,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestSendTestCommandWithListOfInt8uAndOneOfThemIsSetTo0_164()
+    CHIP_ERROR TestSendTestCommandWithListOfInt8uAndOneOfThemIsSetTo0_165()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -82109,7 +82173,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestSendTestCommandWithListOfInt8uAndGetItReversed_165()
+    CHIP_ERROR TestSendTestCommandWithListOfInt8uAndGetItReversed_166()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -82158,7 +82222,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestSendTestCommandWithEmptyListOfInt8uAndGetAnEmptyListBack_166()
+    CHIP_ERROR TestSendTestCommandWithEmptyListOfInt8uAndGetAnEmptyListBack_167()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -82190,7 +82254,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestSendTestCommandWithListOfStructArgumentAndArg1bOfFirstItemIsTrue_167()
+    CHIP_ERROR TestSendTestCommandWithListOfStructArgumentAndArg1bOfFirstItemIsTrue_168()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -82242,7 +82306,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestSendTestCommandWithListOfStructArgumentAndArg1bOfFirstItemIsFalse_168()
+    CHIP_ERROR TestSendTestCommandWithListOfStructArgumentAndArg1bOfFirstItemIsFalse_169()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -82294,7 +82358,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestSendTestCommandWithListOfNestedStructListArgumentAndAllFieldsBOfElementsOfArg1dAreTrue_169()
+    CHIP_ERROR TestSendTestCommandWithListOfNestedStructListArgumentAndAllFieldsBOfElementsOfArg1dAreTrue_170()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -82393,7 +82457,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestSendTestCommandWithNestedStructListArgumentAndSomeFieldsBOfElementsOfArg1dAreFalse_170()
+    CHIP_ERROR TestSendTestCommandWithNestedStructListArgumentAndSomeFieldsBOfElementsOfArg1dAreFalse_171()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -82492,7 +82556,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteAttributeListWithListOfInt8uAndNoneOfThemIsSetTo0_171()
+    CHIP_ERROR TestWriteAttributeListWithListOfInt8uAndNoneOfThemIsSetTo0_172()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -82521,7 +82585,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeListWithListOfInt8u_172()
+    CHIP_ERROR TestReadAttributeListWithListOfInt8u_173()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -82548,7 +82612,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteAttributeListWithListOfOctetString_173()
+    CHIP_ERROR TestWriteAttributeListWithListOfOctetString_174()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -82576,7 +82640,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeListWithListOfOctetString_174()
+    CHIP_ERROR TestReadAttributeListWithListOfOctetString_175()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -82603,7 +82667,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteAttributeListWithListOfListStructOctetString_175()
+    CHIP_ERROR TestWriteAttributeListWithListOfListStructOctetString_176()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -82645,7 +82709,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeListWithListOfListStructOctetString_176()
+    CHIP_ERROR TestReadAttributeListWithListOfListStructOctetString_177()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -82680,7 +82744,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestSendTestCommandWithOptionalArgSet_177()
+    CHIP_ERROR TestSendTestCommandWithOptionalArgSet_178()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -82723,7 +82787,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestSendTestCommandWithoutItsOptionalArg_178()
+    CHIP_ERROR TestSendTestCommandWithoutItsOptionalArg_179()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -82749,7 +82813,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadListOfStructsContainingNullablesAndOptionals_179()
+    CHIP_ERROR TestReadListOfStructsContainingNullablesAndOptionals_180()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -82780,7 +82844,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteListOfStructsContainingNullablesAndOptionals_180()
+    CHIP_ERROR TestWriteListOfStructsContainingNullablesAndOptionals_181()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -82817,7 +82881,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadListOfStructsContainingNullablesAndOptionalsAfterWriting_181()
+    CHIP_ERROR TestReadListOfStructsContainingNullablesAndOptionalsAfterWriting_182()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -82855,7 +82919,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteAttributeNullableBooleanNull_182()
+    CHIP_ERROR TestWriteAttributeNullableBooleanNull_183()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -82877,7 +82941,7 @@ class TestCluster : public TestCommandBridge {
     }
     NSNumber * _Nullable booValueNull;
 
-    CHIP_ERROR TestReadAttributeNullableBooleanNull_183()
+    CHIP_ERROR TestReadAttributeNullableBooleanNull_184()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -82903,7 +82967,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteAttributeNullableBooleanTrue_184()
+    CHIP_ERROR TestWriteAttributeNullableBooleanTrue_185()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -82924,7 +82988,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableBooleanTrue_185()
+    CHIP_ERROR TestReadAttributeNullableBooleanTrue_186()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -82948,7 +83012,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableBooleanNotNull_186()
+    CHIP_ERROR TestReadAttributeNullableBooleanNotNull_187()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -82970,7 +83034,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteAttributeNullableBitmap8MaxValue_187()
+    CHIP_ERROR TestWriteAttributeNullableBitmap8MaxValue_188()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -82991,7 +83055,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableBitmap8MaxValue_188()
+    CHIP_ERROR TestReadAttributeNullableBitmap8MaxValue_189()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -83015,7 +83079,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteAttributeNullableBitmap8InvalidValue_189()
+    CHIP_ERROR TestWriteAttributeNullableBitmap8InvalidValue_190()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -83041,7 +83105,7 @@ class TestCluster : public TestCommandBridge {
     }
     NSNumber * _Nullable nullableValue254;
 
-    CHIP_ERROR TestReadAttributeNullableBitmap8UnchangedValue_190()
+    CHIP_ERROR TestReadAttributeNullableBitmap8UnchangedValue_191()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -83068,7 +83132,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteAttributeNullableBitmap8NullValue_191()
+    CHIP_ERROR TestWriteAttributeNullableBitmap8NullValue_192()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -83089,7 +83153,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableBitmap8NullValue_192()
+    CHIP_ERROR TestReadAttributeNullableBitmap8NullValue_193()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -83112,7 +83176,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableBitmap8Not254Value_193()
+    CHIP_ERROR TestReadAttributeNullableBitmap8Not254Value_194()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -83134,7 +83198,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteAttributeNullableBitmap16MaxValue_194()
+    CHIP_ERROR TestWriteAttributeNullableBitmap16MaxValue_195()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -83155,7 +83219,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableBitmap16MaxValue_195()
+    CHIP_ERROR TestReadAttributeNullableBitmap16MaxValue_196()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -83179,7 +83243,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteAttributeNullableBitmap16InvalidValue_196()
+    CHIP_ERROR TestWriteAttributeNullableBitmap16InvalidValue_197()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -83204,7 +83268,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableBitmap16UnchangedValue_197()
+    CHIP_ERROR TestReadAttributeNullableBitmap16UnchangedValue_198()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -83228,7 +83292,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteAttributeNullableBitmap16NullValue_198()
+    CHIP_ERROR TestWriteAttributeNullableBitmap16NullValue_199()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -83249,7 +83313,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableBitmap16NullValue_199()
+    CHIP_ERROR TestReadAttributeNullableBitmap16NullValue_200()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -83272,7 +83336,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteAttributeNullableBitmap32MaxValue_200()
+    CHIP_ERROR TestWriteAttributeNullableBitmap32MaxValue_201()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -83293,7 +83357,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableBitmap32MaxValue_201()
+    CHIP_ERROR TestReadAttributeNullableBitmap32MaxValue_202()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -83317,7 +83381,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteAttributeNullableBitmap32InvalidValue_202()
+    CHIP_ERROR TestWriteAttributeNullableBitmap32InvalidValue_203()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -83342,7 +83406,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableBitmap32UnchangedValue_203()
+    CHIP_ERROR TestReadAttributeNullableBitmap32UnchangedValue_204()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -83366,7 +83430,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteAttributeNullableBitmap32NullValue_204()
+    CHIP_ERROR TestWriteAttributeNullableBitmap32NullValue_205()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -83387,7 +83451,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableBitmap32NullValue_205()
+    CHIP_ERROR TestReadAttributeNullableBitmap32NullValue_206()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -83410,7 +83474,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteAttributeNullableBitmap64MaxValue_206()
+    CHIP_ERROR TestWriteAttributeNullableBitmap64MaxValue_207()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -83431,7 +83495,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableBitmap64MaxValue_207()
+    CHIP_ERROR TestReadAttributeNullableBitmap64MaxValue_208()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -83455,7 +83519,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteAttributeNullableBitmap64InvalidValue_208()
+    CHIP_ERROR TestWriteAttributeNullableBitmap64InvalidValue_209()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -83480,7 +83544,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableBitmap64UnchangedValue_209()
+    CHIP_ERROR TestReadAttributeNullableBitmap64UnchangedValue_210()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -83504,7 +83568,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteAttributeNullableBitmap64NullValue_210()
+    CHIP_ERROR TestWriteAttributeNullableBitmap64NullValue_211()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -83525,7 +83589,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableBitmap64NullValue_211()
+    CHIP_ERROR TestReadAttributeNullableBitmap64NullValue_212()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -83548,7 +83612,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteAttributeNullableInt8uMinValue_212()
+    CHIP_ERROR TestWriteAttributeNullableInt8uMinValue_213()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -83569,7 +83633,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableInt8uMinValue_213()
+    CHIP_ERROR TestReadAttributeNullableInt8uMinValue_214()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -83593,7 +83657,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteAttributeNullableInt8uMaxValue_214()
+    CHIP_ERROR TestWriteAttributeNullableInt8uMaxValue_215()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -83614,7 +83678,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableInt8uMaxValue_215()
+    CHIP_ERROR TestReadAttributeNullableInt8uMaxValue_216()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -83638,7 +83702,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteAttributeNullableInt8uInvalidValue_216()
+    CHIP_ERROR TestWriteAttributeNullableInt8uInvalidValue_217()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -83663,7 +83727,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableInt8uUnchangedValue_217()
+    CHIP_ERROR TestReadAttributeNullableInt8uUnchangedValue_218()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -83687,7 +83751,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableInt8uUnchangedValueWithConstraint_218()
+    CHIP_ERROR TestReadAttributeNullableInt8uUnchangedValueWithConstraint_219()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -83709,7 +83773,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteAttributeNullableInt8uNullValue_219()
+    CHIP_ERROR TestWriteAttributeNullableInt8uNullValue_220()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -83730,7 +83794,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableInt8uNullValue_220()
+    CHIP_ERROR TestReadAttributeNullableInt8uNullValue_221()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -83753,7 +83817,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableInt8uNullValueRange_221()
+    CHIP_ERROR TestReadAttributeNullableInt8uNullValueRange_222()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -83777,7 +83841,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableInt8uNullValueNot_222()
+    CHIP_ERROR TestReadAttributeNullableInt8uNullValueNot_223()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -83799,7 +83863,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteAttributeNullableInt8uValue_223()
+    CHIP_ERROR TestWriteAttributeNullableInt8uValue_224()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -83820,7 +83884,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableInt8uValueInRange_224()
+    CHIP_ERROR TestReadAttributeNullableInt8uValueInRange_225()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -83844,7 +83908,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableInt8uNotValueOk_225()
+    CHIP_ERROR TestReadAttributeNullableInt8uNotValueOk_226()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -83866,7 +83930,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteAttributeNullableInt16uMinValue_226()
+    CHIP_ERROR TestWriteAttributeNullableInt16uMinValue_227()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -83887,7 +83951,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableInt16uMinValue_227()
+    CHIP_ERROR TestReadAttributeNullableInt16uMinValue_228()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -83911,7 +83975,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteAttributeNullableInt16uMaxValue_228()
+    CHIP_ERROR TestWriteAttributeNullableInt16uMaxValue_229()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -83932,7 +83996,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableInt16uMaxValue_229()
+    CHIP_ERROR TestReadAttributeNullableInt16uMaxValue_230()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -83956,7 +84020,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteAttributeNullableInt16uInvalidValue_230()
+    CHIP_ERROR TestWriteAttributeNullableInt16uInvalidValue_231()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -83981,7 +84045,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableInt16uUnchangedValue_231()
+    CHIP_ERROR TestReadAttributeNullableInt16uUnchangedValue_232()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -84005,7 +84069,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteAttributeNullableInt16uNullValue_232()
+    CHIP_ERROR TestWriteAttributeNullableInt16uNullValue_233()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -84026,7 +84090,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableInt16uNullValue_233()
+    CHIP_ERROR TestReadAttributeNullableInt16uNullValue_234()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -84049,7 +84113,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableInt16uNullValueRange_234()
+    CHIP_ERROR TestReadAttributeNullableInt16uNullValueRange_235()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -84073,7 +84137,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableInt16uNullValueNot_235()
+    CHIP_ERROR TestReadAttributeNullableInt16uNullValueNot_236()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -84095,7 +84159,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteAttributeNullableInt16uValue_236()
+    CHIP_ERROR TestWriteAttributeNullableInt16uValue_237()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -84116,7 +84180,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableInt16uValueInRange_237()
+    CHIP_ERROR TestReadAttributeNullableInt16uValueInRange_238()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -84140,7 +84204,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableInt16uNotValueOk_238()
+    CHIP_ERROR TestReadAttributeNullableInt16uNotValueOk_239()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -84162,7 +84226,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteAttributeNullableInt32uMinValue_239()
+    CHIP_ERROR TestWriteAttributeNullableInt32uMinValue_240()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -84183,7 +84247,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableInt32uMinValue_240()
+    CHIP_ERROR TestReadAttributeNullableInt32uMinValue_241()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -84207,7 +84271,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteAttributeNullableInt32uMaxValue_241()
+    CHIP_ERROR TestWriteAttributeNullableInt32uMaxValue_242()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -84228,7 +84292,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableInt32uMaxValue_242()
+    CHIP_ERROR TestReadAttributeNullableInt32uMaxValue_243()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -84252,7 +84316,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteAttributeNullableInt32uInvalidValue_243()
+    CHIP_ERROR TestWriteAttributeNullableInt32uInvalidValue_244()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -84277,7 +84341,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableInt32uUnchangedValue_244()
+    CHIP_ERROR TestReadAttributeNullableInt32uUnchangedValue_245()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -84301,7 +84365,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteAttributeNullableInt32uNullValue_245()
+    CHIP_ERROR TestWriteAttributeNullableInt32uNullValue_246()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -84322,7 +84386,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableInt32uNullValue_246()
+    CHIP_ERROR TestReadAttributeNullableInt32uNullValue_247()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -84345,7 +84409,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableInt32uNullValueRange_247()
+    CHIP_ERROR TestReadAttributeNullableInt32uNullValueRange_248()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -84369,7 +84433,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableInt32uNullValueNot_248()
+    CHIP_ERROR TestReadAttributeNullableInt32uNullValueNot_249()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -84391,7 +84455,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteAttributeNullableInt32uValue_249()
+    CHIP_ERROR TestWriteAttributeNullableInt32uValue_250()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -84412,7 +84476,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableInt32uValueInRange_250()
+    CHIP_ERROR TestReadAttributeNullableInt32uValueInRange_251()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -84436,7 +84500,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableInt32uNotValueOk_251()
+    CHIP_ERROR TestReadAttributeNullableInt32uNotValueOk_252()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -84458,7 +84522,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteAttributeNullableInt64uMinValue_252()
+    CHIP_ERROR TestWriteAttributeNullableInt64uMinValue_253()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -84479,7 +84543,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableInt64uMinValue_253()
+    CHIP_ERROR TestReadAttributeNullableInt64uMinValue_254()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -84503,7 +84567,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteAttributeNullableInt64uMaxValue_254()
+    CHIP_ERROR TestWriteAttributeNullableInt64uMaxValue_255()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -84524,7 +84588,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableInt64uMaxValue_255()
+    CHIP_ERROR TestReadAttributeNullableInt64uMaxValue_256()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -84548,7 +84612,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteAttributeNullableInt64uInvalidValue_256()
+    CHIP_ERROR TestWriteAttributeNullableInt64uInvalidValue_257()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -84573,7 +84637,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableInt64uUnchangedValue_257()
+    CHIP_ERROR TestReadAttributeNullableInt64uUnchangedValue_258()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -84597,7 +84661,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteAttributeNullableInt64uNullValue_258()
+    CHIP_ERROR TestWriteAttributeNullableInt64uNullValue_259()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -84618,7 +84682,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableInt64uNullValue_259()
+    CHIP_ERROR TestReadAttributeNullableInt64uNullValue_260()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -84641,7 +84705,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableInt64uNullValueRange_260()
+    CHIP_ERROR TestReadAttributeNullableInt64uNullValueRange_261()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -84666,7 +84730,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableInt64uNullValueNot_261()
+    CHIP_ERROR TestReadAttributeNullableInt64uNullValueNot_262()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -84688,7 +84752,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteAttributeNullableInt64uValue_262()
+    CHIP_ERROR TestWriteAttributeNullableInt64uValue_263()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -84709,7 +84773,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableInt64uValueInRange_263()
+    CHIP_ERROR TestReadAttributeNullableInt64uValueInRange_264()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -84734,7 +84798,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableInt64uNotValueOk_264()
+    CHIP_ERROR TestReadAttributeNullableInt64uNotValueOk_265()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -84756,7 +84820,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteAttributeNullableInt8sMinValue_265()
+    CHIP_ERROR TestWriteAttributeNullableInt8sMinValue_266()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -84777,7 +84841,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableInt8sMinValue_266()
+    CHIP_ERROR TestReadAttributeNullableInt8sMinValue_267()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -84801,7 +84865,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteAttributeNullableInt8sInvalidValue_267()
+    CHIP_ERROR TestWriteAttributeNullableInt8sInvalidValue_268()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -84826,7 +84890,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableInt8sUnchangedValue_268()
+    CHIP_ERROR TestReadAttributeNullableInt8sUnchangedValue_269()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -84850,7 +84914,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteAttributeNullableInt8sNullValue_269()
+    CHIP_ERROR TestWriteAttributeNullableInt8sNullValue_270()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -84871,7 +84935,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableInt8sNullValue_270()
+    CHIP_ERROR TestReadAttributeNullableInt8sNullValue_271()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -84894,7 +84958,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableInt8sNullValueRange_271()
+    CHIP_ERROR TestReadAttributeNullableInt8sNullValueRange_272()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -84918,7 +84982,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableInt8sNullValueNot_272()
+    CHIP_ERROR TestReadAttributeNullableInt8sNullValueNot_273()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -84940,7 +85004,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteAttributeNullableInt8sValue_273()
+    CHIP_ERROR TestWriteAttributeNullableInt8sValue_274()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -84961,7 +85025,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableInt8sValueInRange_274()
+    CHIP_ERROR TestReadAttributeNullableInt8sValueInRange_275()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -84985,7 +85049,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableInt8sNotValueOk_275()
+    CHIP_ERROR TestReadAttributeNullableInt8sNotValueOk_276()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -85007,7 +85071,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteAttributeNullableInt16sMinValue_276()
+    CHIP_ERROR TestWriteAttributeNullableInt16sMinValue_277()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -85028,7 +85092,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableInt16sMinValue_277()
+    CHIP_ERROR TestReadAttributeNullableInt16sMinValue_278()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -85052,7 +85116,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteAttributeNullableInt16sInvalidValue_278()
+    CHIP_ERROR TestWriteAttributeNullableInt16sInvalidValue_279()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -85077,7 +85141,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableInt16sUnchangedValue_279()
+    CHIP_ERROR TestReadAttributeNullableInt16sUnchangedValue_280()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -85101,7 +85165,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteAttributeNullableInt16sNullValue_280()
+    CHIP_ERROR TestWriteAttributeNullableInt16sNullValue_281()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -85122,7 +85186,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableInt16sNullValue_281()
+    CHIP_ERROR TestReadAttributeNullableInt16sNullValue_282()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -85145,7 +85209,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableInt16sNullValueRange_282()
+    CHIP_ERROR TestReadAttributeNullableInt16sNullValueRange_283()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -85169,7 +85233,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableInt16sNullValueNot_283()
+    CHIP_ERROR TestReadAttributeNullableInt16sNullValueNot_284()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -85191,7 +85255,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteAttributeNullableInt16sValue_284()
+    CHIP_ERROR TestWriteAttributeNullableInt16sValue_285()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -85212,7 +85276,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableInt16sValueInRange_285()
+    CHIP_ERROR TestReadAttributeNullableInt16sValueInRange_286()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -85236,7 +85300,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableInt16sNotValueOk_286()
+    CHIP_ERROR TestReadAttributeNullableInt16sNotValueOk_287()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -85258,7 +85322,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteAttributeNullableInt32sMinValue_287()
+    CHIP_ERROR TestWriteAttributeNullableInt32sMinValue_288()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -85279,7 +85343,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableInt32sMinValue_288()
+    CHIP_ERROR TestReadAttributeNullableInt32sMinValue_289()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -85303,7 +85367,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteAttributeNullableInt32sInvalidValue_289()
+    CHIP_ERROR TestWriteAttributeNullableInt32sInvalidValue_290()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -85328,7 +85392,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableInt32sUnchangedValue_290()
+    CHIP_ERROR TestReadAttributeNullableInt32sUnchangedValue_291()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -85352,7 +85416,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteAttributeNullableInt32sNullValue_291()
+    CHIP_ERROR TestWriteAttributeNullableInt32sNullValue_292()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -85373,7 +85437,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableInt32sNullValue_292()
+    CHIP_ERROR TestReadAttributeNullableInt32sNullValue_293()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -85396,7 +85460,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableInt32sNullValueRange_293()
+    CHIP_ERROR TestReadAttributeNullableInt32sNullValueRange_294()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -85420,7 +85484,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableInt32sNullValueNot_294()
+    CHIP_ERROR TestReadAttributeNullableInt32sNullValueNot_295()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -85442,7 +85506,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteAttributeNullableInt32sValue_295()
+    CHIP_ERROR TestWriteAttributeNullableInt32sValue_296()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -85463,7 +85527,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableInt32sValueInRange_296()
+    CHIP_ERROR TestReadAttributeNullableInt32sValueInRange_297()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -85487,7 +85551,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableInt32sNotValueOk_297()
+    CHIP_ERROR TestReadAttributeNullableInt32sNotValueOk_298()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -85509,7 +85573,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteAttributeNullableInt64sMinValue_298()
+    CHIP_ERROR TestWriteAttributeNullableInt64sMinValue_299()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -85530,7 +85594,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableInt64sMinValue_299()
+    CHIP_ERROR TestReadAttributeNullableInt64sMinValue_300()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -85554,7 +85618,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteAttributeNullableInt64sInvalidValue_300()
+    CHIP_ERROR TestWriteAttributeNullableInt64sInvalidValue_301()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -85579,7 +85643,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableInt64sUnchangedValue_301()
+    CHIP_ERROR TestReadAttributeNullableInt64sUnchangedValue_302()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -85603,7 +85667,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteAttributeNullableInt64sNullValue_302()
+    CHIP_ERROR TestWriteAttributeNullableInt64sNullValue_303()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -85624,7 +85688,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableInt64sNullValue_303()
+    CHIP_ERROR TestReadAttributeNullableInt64sNullValue_304()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -85647,7 +85711,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableInt64sNullValueRange_304()
+    CHIP_ERROR TestReadAttributeNullableInt64sNullValueRange_305()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -85671,7 +85735,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableInt64sNullValueNot_305()
+    CHIP_ERROR TestReadAttributeNullableInt64sNullValueNot_306()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -85693,7 +85757,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteAttributeNullableInt64sValue_306()
+    CHIP_ERROR TestWriteAttributeNullableInt64sValue_307()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -85714,7 +85778,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableInt64sValueInRange_307()
+    CHIP_ERROR TestReadAttributeNullableInt64sValueInRange_308()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -85738,7 +85802,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableInt64sNotValueOk_308()
+    CHIP_ERROR TestReadAttributeNullableInt64sNotValueOk_309()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -85760,7 +85824,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteAttributeNullableSingleMediumValue_309()
+    CHIP_ERROR TestWriteAttributeNullableSingleMediumValue_310()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -85781,7 +85845,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableSingleMediumValue_310()
+    CHIP_ERROR TestReadAttributeNullableSingleMediumValue_311()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -85805,7 +85869,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteAttributeNullableSingleLargestValue_311()
+    CHIP_ERROR TestWriteAttributeNullableSingleLargestValue_312()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -85826,7 +85890,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableSingleLargestValue_312()
+    CHIP_ERROR TestReadAttributeNullableSingleLargestValue_313()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -85850,7 +85914,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteAttributeNullableSingleSmallestValue_313()
+    CHIP_ERROR TestWriteAttributeNullableSingleSmallestValue_314()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -85871,7 +85935,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableSingleSmallestValue_314()
+    CHIP_ERROR TestReadAttributeNullableSingleSmallestValue_315()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -85895,7 +85959,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteAttributeNullableSingleNullValue_315()
+    CHIP_ERROR TestWriteAttributeNullableSingleNullValue_316()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -85916,7 +85980,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableSingleNullValue_316()
+    CHIP_ERROR TestReadAttributeNullableSingleNullValue_317()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -85939,7 +86003,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteAttributeNullableSingle0Value_317()
+    CHIP_ERROR TestWriteAttributeNullableSingle0Value_318()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -85960,7 +86024,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableSingle0Value_318()
+    CHIP_ERROR TestReadAttributeNullableSingle0Value_319()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -85984,7 +86048,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteAttributeNullableDoubleMediumValue_319()
+    CHIP_ERROR TestWriteAttributeNullableDoubleMediumValue_320()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -86005,7 +86069,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableDoubleMediumValue_320()
+    CHIP_ERROR TestReadAttributeNullableDoubleMediumValue_321()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -86029,7 +86093,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteAttributeNullableDoubleLargestValue_321()
+    CHIP_ERROR TestWriteAttributeNullableDoubleLargestValue_322()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -86050,7 +86114,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableDoubleLargestValue_322()
+    CHIP_ERROR TestReadAttributeNullableDoubleLargestValue_323()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -86074,7 +86138,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteAttributeNullableDoubleSmallestValue_323()
+    CHIP_ERROR TestWriteAttributeNullableDoubleSmallestValue_324()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -86095,7 +86159,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableDoubleSmallestValue_324()
+    CHIP_ERROR TestReadAttributeNullableDoubleSmallestValue_325()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -86119,7 +86183,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteAttributeNullableDoubleNullValue_325()
+    CHIP_ERROR TestWriteAttributeNullableDoubleNullValue_326()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -86140,7 +86204,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableDoubleNullValue_326()
+    CHIP_ERROR TestReadAttributeNullableDoubleNullValue_327()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -86163,7 +86227,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteAttributeNullableDouble0Value_327()
+    CHIP_ERROR TestWriteAttributeNullableDouble0Value_328()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -86184,7 +86248,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableDouble0Value_328()
+    CHIP_ERROR TestReadAttributeNullableDouble0Value_329()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -86208,7 +86272,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteAttributeNullableEnum8MinValue_329()
+    CHIP_ERROR TestWriteAttributeNullableEnum8MinValue_330()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -86229,7 +86293,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableEnum8MinValue_330()
+    CHIP_ERROR TestReadAttributeNullableEnum8MinValue_331()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -86253,7 +86317,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteAttributeNullableEnum8MaxValue_331()
+    CHIP_ERROR TestWriteAttributeNullableEnum8MaxValue_332()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -86274,7 +86338,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableEnum8MaxValue_332()
+    CHIP_ERROR TestReadAttributeNullableEnum8MaxValue_333()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -86298,7 +86362,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteAttributeNullableEnum8InvalidValue_333()
+    CHIP_ERROR TestWriteAttributeNullableEnum8InvalidValue_334()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -86323,7 +86387,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableEnum8UnchangedValue_334()
+    CHIP_ERROR TestReadAttributeNullableEnum8UnchangedValue_335()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -86347,7 +86411,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteAttributeNullableEnum8NullValue_335()
+    CHIP_ERROR TestWriteAttributeNullableEnum8NullValue_336()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -86368,7 +86432,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableEnum8NullValue_336()
+    CHIP_ERROR TestReadAttributeNullableEnum8NullValue_337()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -86391,7 +86455,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteAttributeNullableEnum16MinValue_337()
+    CHIP_ERROR TestWriteAttributeNullableEnum16MinValue_338()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -86412,7 +86476,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableEnum16MinValue_338()
+    CHIP_ERROR TestReadAttributeNullableEnum16MinValue_339()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -86436,7 +86500,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteAttributeNullableEnum16MaxValue_339()
+    CHIP_ERROR TestWriteAttributeNullableEnum16MaxValue_340()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -86457,7 +86521,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableEnum16MaxValue_340()
+    CHIP_ERROR TestReadAttributeNullableEnum16MaxValue_341()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -86481,7 +86545,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteAttributeNullableEnum16InvalidValue_341()
+    CHIP_ERROR TestWriteAttributeNullableEnum16InvalidValue_342()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -86506,7 +86570,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableEnum16UnchangedValue_342()
+    CHIP_ERROR TestReadAttributeNullableEnum16UnchangedValue_343()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -86530,7 +86594,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteAttributeNullableEnum16NullValue_343()
+    CHIP_ERROR TestWriteAttributeNullableEnum16NullValue_344()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -86551,7 +86615,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableEnum16NullValue_344()
+    CHIP_ERROR TestReadAttributeNullableEnum16NullValue_345()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -86574,7 +86638,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteAttributeNullableSimpleEnumMinValue_345()
+    CHIP_ERROR TestWriteAttributeNullableSimpleEnumMinValue_346()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -86595,7 +86659,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableSimpleEnumMinValue_346()
+    CHIP_ERROR TestReadAttributeNullableSimpleEnumMinValue_347()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -86619,7 +86683,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteAttributeNullableSimpleEnumMaxValue_347()
+    CHIP_ERROR TestWriteAttributeNullableSimpleEnumMaxValue_348()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -86640,7 +86704,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableSimpleEnumMaxValue_348()
+    CHIP_ERROR TestReadAttributeNullableSimpleEnumMaxValue_349()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -86664,7 +86728,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteAttributeNullableSimpleEnumInvalidValue_349()
+    CHIP_ERROR TestWriteAttributeNullableSimpleEnumInvalidValue_350()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -86690,7 +86754,7 @@ class TestCluster : public TestCommandBridge {
     }
     NSNumber * _Nullable nullableEnumAttr3;
 
-    CHIP_ERROR TestReadAttributeNullableSimpleEnumUnchangedValue_350()
+    CHIP_ERROR TestReadAttributeNullableSimpleEnumUnchangedValue_351()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -86717,7 +86781,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteAttributeNullableSimpleEnumNullValue_351()
+    CHIP_ERROR TestWriteAttributeNullableSimpleEnumNullValue_352()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -86738,7 +86802,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableSimpleEnumNullValue_352()
+    CHIP_ERROR TestReadAttributeNullableSimpleEnumNullValue_353()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -86761,7 +86825,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableSimpleEnumNot3Value_353()
+    CHIP_ERROR TestReadAttributeNullableSimpleEnumNot3Value_354()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -86783,7 +86847,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableOctetStringDefaultValue_354()
+    CHIP_ERROR TestReadAttributeNullableOctetStringDefaultValue_355()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -86808,7 +86872,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteAttributeNullableOctetString_355()
+    CHIP_ERROR TestWriteAttributeNullableOctetString_356()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -86830,7 +86894,7 @@ class TestCluster : public TestCommandBridge {
     }
     NSData * _Nullable nullableOctetStrTestValue;
 
-    CHIP_ERROR TestReadAttributeNullableOctetString_356()
+    CHIP_ERROR TestReadAttributeNullableOctetString_357()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -86858,7 +86922,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteAttributeNullableOctetString_357()
+    CHIP_ERROR TestWriteAttributeNullableOctetString_358()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -86879,7 +86943,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableOctetString_358()
+    CHIP_ERROR TestReadAttributeNullableOctetString_359()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -86902,7 +86966,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteAttributeNullableOctetString_359()
+    CHIP_ERROR TestWriteAttributeNullableOctetString_360()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -86923,7 +86987,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableOctetString_360()
+    CHIP_ERROR TestReadAttributeNullableOctetString_361()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -86948,7 +87012,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableOctetStringNotTestValue_361()
+    CHIP_ERROR TestReadAttributeNullableOctetStringNotTestValue_362()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -86970,7 +87034,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableCharStringDefaultValue_362()
+    CHIP_ERROR TestReadAttributeNullableCharStringDefaultValue_363()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -86994,7 +87058,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteAttributeNullableCharString_363()
+    CHIP_ERROR TestWriteAttributeNullableCharString_364()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -87016,7 +87080,7 @@ class TestCluster : public TestCommandBridge {
     }
     NSString * _Nullable nullableCharStringSave;
 
-    CHIP_ERROR TestReadAttributeNullableCharString_364()
+    CHIP_ERROR TestReadAttributeNullableCharString_365()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -87043,7 +87107,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableCharString_365()
+    CHIP_ERROR TestReadAttributeNullableCharString_366()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -87071,7 +87135,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteAttributeNullableCharStringValueTooLong_366()
+    CHIP_ERROR TestWriteAttributeNullableCharStringValueTooLong_367()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -87092,7 +87156,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableCharString_367()
+    CHIP_ERROR TestReadAttributeNullableCharString_368()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -87115,7 +87179,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteAttributeNullableCharStringEmpty_368()
+    CHIP_ERROR TestWriteAttributeNullableCharStringEmpty_369()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -87136,7 +87200,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableCharString_369()
+    CHIP_ERROR TestReadAttributeNullableCharString_370()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -87160,7 +87224,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableCharStringNott_370()
+    CHIP_ERROR TestReadAttributeNullableCharStringNott_371()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -87182,7 +87246,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeFromNonexistentEndpoint_371()
+    CHIP_ERROR TestReadAttributeFromNonexistentEndpoint_372()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -87201,7 +87265,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeFromNonexistentCluster_372()
+    CHIP_ERROR TestReadAttributeFromNonexistentCluster_373()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -87220,7 +87284,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestSendACommandThatTakesAnOptionalParameterButDoNotSetIt_373()
+    CHIP_ERROR TestSendACommandThatTakesAnOptionalParameterButDoNotSetIt_374()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -87246,7 +87310,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestSendACommandThatTakesAnOptionalParameterButDoNotSetIt_374()
+    CHIP_ERROR TestSendACommandThatTakesAnOptionalParameterButDoNotSetIt_375()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -87268,10 +87332,10 @@ class TestCluster : public TestCommandBridge {
 
         return CHIP_NO_ERROR;
     }
-    bool testSendClusterTestCluster_375_WaitForReport_Fulfilled = false;
+    bool testSendClusterTestCluster_376_WaitForReport_Fulfilled = false;
     ResponseHandler _Nullable test_TestCluster_list_int8u_Reported = nil;
 
-    CHIP_ERROR TestReportSubscribeToListAttribute_375()
+    CHIP_ERROR TestReportSubscribeToListAttribute_376()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -87292,14 +87356,14 @@ class TestCluster : public TestCommandBridge {
                 VerifyOrReturn(CheckValue("", actualValue[3], 4U));
             }
 
-            testSendClusterTestCluster_375_WaitForReport_Fulfilled = true;
+            testSendClusterTestCluster_376_WaitForReport_Fulfilled = true;
         };
 
         NextTest();
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestSubscribeToListAttribute_376()
+    CHIP_ERROR TestSubscribeToListAttribute_377()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -87315,7 +87379,7 @@ class TestCluster : public TestCommandBridge {
         [cluster subscribeAttributeListInt8uWithParams:params
             subscriptionEstablished:^{
                 VerifyOrReturn(
-                    testSendClusterTestCluster_375_WaitForReport_Fulfilled, SetCommandExitStatus(CHIP_ERROR_INCORRECT_STATE));
+                    testSendClusterTestCluster_376_WaitForReport_Fulfilled, SetCommandExitStatus(CHIP_ERROR_INCORRECT_STATE));
                 NextTest();
             }
             reportHandler:^(NSArray * _Nullable value, NSError * _Nullable err) {
@@ -87332,7 +87396,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteSubscribedToListAttribute_377()
+    CHIP_ERROR TestWriteSubscribedToListAttribute_378()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -87360,7 +87424,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestCheckForListAttributeReport_378()
+    CHIP_ERROR TestCheckForListAttributeReport_379()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -87387,7 +87451,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadRangeRestrictedUnsigned8BitInteger_379()
+    CHIP_ERROR TestReadRangeRestrictedUnsigned8BitInteger_380()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -87410,7 +87474,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteMinValueToARangeRestrictedUnsigned8BitInteger_380()
+    CHIP_ERROR TestWriteMinValueToARangeRestrictedUnsigned8BitInteger_381()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -87437,7 +87501,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteJustBelowRangeValueToARangeRestrictedUnsigned8BitInteger_381()
+    CHIP_ERROR TestWriteJustBelowRangeValueToARangeRestrictedUnsigned8BitInteger_382()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -87464,7 +87528,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteJustAboveRangeValueToARangeRestrictedUnsigned8BitInteger_382()
+    CHIP_ERROR TestWriteJustAboveRangeValueToARangeRestrictedUnsigned8BitInteger_383()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -87491,7 +87555,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteMaxValueToARangeRestrictedUnsigned8BitInteger_383()
+    CHIP_ERROR TestWriteMaxValueToARangeRestrictedUnsigned8BitInteger_384()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -87518,7 +87582,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestVerifyRangeRestrictedUnsigned8BitIntegerValueHasNotChanged_384()
+    CHIP_ERROR TestVerifyRangeRestrictedUnsigned8BitIntegerValueHasNotChanged_385()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -87541,7 +87605,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteMinValidValueToARangeRestrictedUnsigned8BitInteger_385()
+    CHIP_ERROR TestWriteMinValidValueToARangeRestrictedUnsigned8BitInteger_386()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -87564,7 +87628,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestVerifyRangeRestrictedUnsigned8BitIntegerValueIsAtMinValid_386()
+    CHIP_ERROR TestVerifyRangeRestrictedUnsigned8BitIntegerValueIsAtMinValid_387()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -87587,7 +87651,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteMaxValidValueToARangeRestrictedUnsigned8BitInteger_387()
+    CHIP_ERROR TestWriteMaxValidValueToARangeRestrictedUnsigned8BitInteger_388()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -87610,7 +87674,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestVerifyRangeRestrictedUnsigned8BitIntegerValueIsAtMaxValid_388()
+    CHIP_ERROR TestVerifyRangeRestrictedUnsigned8BitIntegerValueIsAtMaxValid_389()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -87633,7 +87697,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteMiddleValidValueToARangeRestrictedUnsigned8BitInteger_389()
+    CHIP_ERROR TestWriteMiddleValidValueToARangeRestrictedUnsigned8BitInteger_390()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -87656,7 +87720,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestVerifyRangeRestrictedUnsigned8BitIntegerValueIsAtMidValid_390()
+    CHIP_ERROR TestVerifyRangeRestrictedUnsigned8BitIntegerValueIsAtMidValid_391()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -87679,7 +87743,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadRangeRestrictedUnsigned16BitInteger_391()
+    CHIP_ERROR TestReadRangeRestrictedUnsigned16BitInteger_392()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -87702,7 +87766,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteMinValueToARangeRestrictedUnsigned16BitInteger_392()
+    CHIP_ERROR TestWriteMinValueToARangeRestrictedUnsigned16BitInteger_393()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -87729,7 +87793,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteJustBelowRangeValueToARangeRestrictedUnsigned16BitInteger_393()
+    CHIP_ERROR TestWriteJustBelowRangeValueToARangeRestrictedUnsigned16BitInteger_394()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -87756,7 +87820,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteJustAboveRangeValueToARangeRestrictedUnsigned16BitInteger_394()
+    CHIP_ERROR TestWriteJustAboveRangeValueToARangeRestrictedUnsigned16BitInteger_395()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -87783,7 +87847,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteMaxValueToARangeRestrictedUnsigned16BitInteger_395()
+    CHIP_ERROR TestWriteMaxValueToARangeRestrictedUnsigned16BitInteger_396()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -87810,7 +87874,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestVerifyRangeRestrictedUnsigned16BitIntegerValueHasNotChanged_396()
+    CHIP_ERROR TestVerifyRangeRestrictedUnsigned16BitIntegerValueHasNotChanged_397()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -87833,7 +87897,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteMinValidValueToARangeRestrictedUnsigned16BitInteger_397()
+    CHIP_ERROR TestWriteMinValidValueToARangeRestrictedUnsigned16BitInteger_398()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -87856,7 +87920,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestVerifyRangeRestrictedUnsigned16BitIntegerValueIsAtMinValid_398()
+    CHIP_ERROR TestVerifyRangeRestrictedUnsigned16BitIntegerValueIsAtMinValid_399()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -87879,7 +87943,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteMaxValidValueToARangeRestrictedUnsigned16BitInteger_399()
+    CHIP_ERROR TestWriteMaxValidValueToARangeRestrictedUnsigned16BitInteger_400()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -87902,7 +87966,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestVerifyRangeRestrictedUnsigned16BitIntegerValueIsAtMaxValid_400()
+    CHIP_ERROR TestVerifyRangeRestrictedUnsigned16BitIntegerValueIsAtMaxValid_401()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -87925,7 +87989,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteMiddleValidValueToARangeRestrictedUnsigned16BitInteger_401()
+    CHIP_ERROR TestWriteMiddleValidValueToARangeRestrictedUnsigned16BitInteger_402()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -87948,7 +88012,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestVerifyRangeRestrictedUnsigned16BitIntegerValueIsAtMidValid_402()
+    CHIP_ERROR TestVerifyRangeRestrictedUnsigned16BitIntegerValueIsAtMidValid_403()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -87971,7 +88035,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadRangeRestrictedSigned8BitInteger_403()
+    CHIP_ERROR TestReadRangeRestrictedSigned8BitInteger_404()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -87994,7 +88058,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteMinValueToARangeRestrictedSigned8BitInteger_404()
+    CHIP_ERROR TestWriteMinValueToARangeRestrictedSigned8BitInteger_405()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -88020,7 +88084,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteJustBelowRangeValueToARangeRestrictedSigned8BitInteger_405()
+    CHIP_ERROR TestWriteJustBelowRangeValueToARangeRestrictedSigned8BitInteger_406()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -88047,7 +88111,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteJustAboveRangeValueToARangeRestrictedSigned8BitInteger_406()
+    CHIP_ERROR TestWriteJustAboveRangeValueToARangeRestrictedSigned8BitInteger_407()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -88074,7 +88138,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteMaxValueToARangeRestrictedSigned8BitInteger_407()
+    CHIP_ERROR TestWriteMaxValueToARangeRestrictedSigned8BitInteger_408()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -88100,7 +88164,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestVerifyRangeRestrictedSigned8BitIntegerValueHasNotChanged_408()
+    CHIP_ERROR TestVerifyRangeRestrictedSigned8BitIntegerValueHasNotChanged_409()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -88123,7 +88187,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteMinValidValueToARangeRestrictedSigned8BitInteger_409()
+    CHIP_ERROR TestWriteMinValidValueToARangeRestrictedSigned8BitInteger_410()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -88147,7 +88211,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestVerifyRangeRestrictedSigned8BitIntegerValueIsAtMinValid_410()
+    CHIP_ERROR TestVerifyRangeRestrictedSigned8BitIntegerValueIsAtMinValid_411()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -88170,7 +88234,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteMaxValidValueToARangeRestrictedSigned8BitInteger_411()
+    CHIP_ERROR TestWriteMaxValidValueToARangeRestrictedSigned8BitInteger_412()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -88194,7 +88258,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestVerifyRangeRestrictedSigned8BitIntegerValueIsAtMaxValid_412()
+    CHIP_ERROR TestVerifyRangeRestrictedSigned8BitIntegerValueIsAtMaxValid_413()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -88217,7 +88281,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteMiddleValidValueToARangeRestrictedSigned8BitInteger_413()
+    CHIP_ERROR TestWriteMiddleValidValueToARangeRestrictedSigned8BitInteger_414()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -88240,7 +88304,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestVerifyRangeRestrictedSigned8BitIntegerValueIsAtMidValid_414()
+    CHIP_ERROR TestVerifyRangeRestrictedSigned8BitIntegerValueIsAtMidValid_415()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -88263,7 +88327,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadRangeRestrictedSigned16BitInteger_415()
+    CHIP_ERROR TestReadRangeRestrictedSigned16BitInteger_416()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -88286,7 +88350,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteMinValueToARangeRestrictedSigned16BitInteger_416()
+    CHIP_ERROR TestWriteMinValueToARangeRestrictedSigned16BitInteger_417()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -88313,7 +88377,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteJustBelowRangeValueToARangeRestrictedSigned16BitInteger_417()
+    CHIP_ERROR TestWriteJustBelowRangeValueToARangeRestrictedSigned16BitInteger_418()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -88340,7 +88404,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteJustAboveRangeValueToARangeRestrictedSigned16BitInteger_418()
+    CHIP_ERROR TestWriteJustAboveRangeValueToARangeRestrictedSigned16BitInteger_419()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -88367,7 +88431,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteMaxValueToARangeRestrictedSigned16BitInteger_419()
+    CHIP_ERROR TestWriteMaxValueToARangeRestrictedSigned16BitInteger_420()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -88394,7 +88458,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestVerifyRangeRestrictedSigned16BitIntegerValueHasNotChanged_420()
+    CHIP_ERROR TestVerifyRangeRestrictedSigned16BitIntegerValueHasNotChanged_421()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -88417,7 +88481,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteMinValidValueToARangeRestrictedSigned16BitInteger_421()
+    CHIP_ERROR TestWriteMinValidValueToARangeRestrictedSigned16BitInteger_422()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -88440,7 +88504,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestVerifyRangeRestrictedSigned16BitIntegerValueIsAtMinValid_422()
+    CHIP_ERROR TestVerifyRangeRestrictedSigned16BitIntegerValueIsAtMinValid_423()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -88463,7 +88527,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteMaxValidValueToARangeRestrictedSigned16BitInteger_423()
+    CHIP_ERROR TestWriteMaxValidValueToARangeRestrictedSigned16BitInteger_424()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -88486,7 +88550,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestVerifyRangeRestrictedSigned16BitIntegerValueIsAtMaxValid_424()
+    CHIP_ERROR TestVerifyRangeRestrictedSigned16BitIntegerValueIsAtMaxValid_425()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -88509,7 +88573,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteMiddleValidValueToARangeRestrictedSigned16BitInteger_425()
+    CHIP_ERROR TestWriteMiddleValidValueToARangeRestrictedSigned16BitInteger_426()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -88532,7 +88596,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestVerifyRangeRestrictedSigned16BitIntegerValueIsAtMidValid_426()
+    CHIP_ERROR TestVerifyRangeRestrictedSigned16BitIntegerValueIsAtMidValid_427()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -88555,7 +88619,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadNullableRangeRestrictedUnsigned8BitInteger_427()
+    CHIP_ERROR TestReadNullableRangeRestrictedUnsigned8BitInteger_428()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -88579,7 +88643,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteMinValueToANullableRangeRestrictedUnsigned8BitInteger_428()
+    CHIP_ERROR TestWriteMinValueToANullableRangeRestrictedUnsigned8BitInteger_429()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -88606,7 +88670,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteJustBelowRangeValueToANullableRangeRestrictedUnsigned8BitInteger_429()
+    CHIP_ERROR TestWriteJustBelowRangeValueToANullableRangeRestrictedUnsigned8BitInteger_430()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -88633,7 +88697,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteJustAboveRangeValueToANullableRangeRestrictedUnsigned8BitInteger_430()
+    CHIP_ERROR TestWriteJustAboveRangeValueToANullableRangeRestrictedUnsigned8BitInteger_431()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -88660,7 +88724,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteMaxValueToANullableRangeRestrictedUnsigned8BitInteger_431()
+    CHIP_ERROR TestWriteMaxValueToANullableRangeRestrictedUnsigned8BitInteger_432()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -88687,7 +88751,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestVerifyNullableRangeRestrictedUnsigned8BitIntegerValueHasNotChanged_432()
+    CHIP_ERROR TestVerifyNullableRangeRestrictedUnsigned8BitIntegerValueHasNotChanged_433()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -88711,7 +88775,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteMinValidValueToANullableRangeRestrictedUnsigned8BitInteger_433()
+    CHIP_ERROR TestWriteMinValidValueToANullableRangeRestrictedUnsigned8BitInteger_434()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -88734,7 +88798,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestVerifyNullableRangeRestrictedUnsigned8BitIntegerValueIsAtMinValid_434()
+    CHIP_ERROR TestVerifyNullableRangeRestrictedUnsigned8BitIntegerValueIsAtMinValid_435()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -88758,7 +88822,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteMaxValidValueToANullableRangeRestrictedUnsigned8BitInteger_435()
+    CHIP_ERROR TestWriteMaxValidValueToANullableRangeRestrictedUnsigned8BitInteger_436()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -88781,7 +88845,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestVerifyNullableRangeRestrictedUnsigned8BitIntegerValueIsAtMaxValid_436()
+    CHIP_ERROR TestVerifyNullableRangeRestrictedUnsigned8BitIntegerValueIsAtMaxValid_437()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -88805,7 +88869,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteMiddleValidValueToANullableRangeRestrictedUnsigned8BitInteger_437()
+    CHIP_ERROR TestWriteMiddleValidValueToANullableRangeRestrictedUnsigned8BitInteger_438()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -88828,7 +88892,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestVerifyNullableRangeRestrictedUnsigned8BitIntegerValueIsAtMidValid_438()
+    CHIP_ERROR TestVerifyNullableRangeRestrictedUnsigned8BitIntegerValueIsAtMidValid_439()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -88852,7 +88916,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteNullValueToANullableRangeRestrictedUnsigned8BitInteger_439()
+    CHIP_ERROR TestWriteNullValueToANullableRangeRestrictedUnsigned8BitInteger_440()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -88875,7 +88939,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestVerifyNullableRangeRestrictedUnsigned8BitIntegerValueIsNull_440()
+    CHIP_ERROR TestVerifyNullableRangeRestrictedUnsigned8BitIntegerValueIsNull_441()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -88898,7 +88962,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadNullableRangeRestrictedUnsigned16BitInteger_441()
+    CHIP_ERROR TestReadNullableRangeRestrictedUnsigned16BitInteger_442()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -88922,7 +88986,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteMinValueToANullableRangeRestrictedUnsigned16BitInteger_442()
+    CHIP_ERROR TestWriteMinValueToANullableRangeRestrictedUnsigned16BitInteger_443()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -88949,7 +89013,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteJustBelowRangeValueToANullableRangeRestrictedUnsigned16BitInteger_443()
+    CHIP_ERROR TestWriteJustBelowRangeValueToANullableRangeRestrictedUnsigned16BitInteger_444()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -88976,7 +89040,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteJustAboveRangeValueToANullableRangeRestrictedUnsigned16BitInteger_444()
+    CHIP_ERROR TestWriteJustAboveRangeValueToANullableRangeRestrictedUnsigned16BitInteger_445()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -89003,7 +89067,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteMaxValueToANullableRangeRestrictedUnsigned16BitInteger_445()
+    CHIP_ERROR TestWriteMaxValueToANullableRangeRestrictedUnsigned16BitInteger_446()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -89030,7 +89094,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestVerifyNullableRangeRestrictedUnsigned16BitIntegerValueHasNotChanged_446()
+    CHIP_ERROR TestVerifyNullableRangeRestrictedUnsigned16BitIntegerValueHasNotChanged_447()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -89054,7 +89118,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteMinValidValueToANullableRangeRestrictedUnsigned16BitInteger_447()
+    CHIP_ERROR TestWriteMinValidValueToANullableRangeRestrictedUnsigned16BitInteger_448()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -89077,7 +89141,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestVerifyNullableRangeRestrictedUnsigned16BitIntegerValueIsAtMinValid_448()
+    CHIP_ERROR TestVerifyNullableRangeRestrictedUnsigned16BitIntegerValueIsAtMinValid_449()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -89101,7 +89165,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteMaxValidValueToANullableRangeRestrictedUnsigned16BitInteger_449()
+    CHIP_ERROR TestWriteMaxValidValueToANullableRangeRestrictedUnsigned16BitInteger_450()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -89124,7 +89188,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestVerifyNullableRangeRestrictedUnsigned16BitIntegerValueIsAtMaxValid_450()
+    CHIP_ERROR TestVerifyNullableRangeRestrictedUnsigned16BitIntegerValueIsAtMaxValid_451()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -89148,7 +89212,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteMiddleValidValueToANullableRangeRestrictedUnsigned16BitInteger_451()
+    CHIP_ERROR TestWriteMiddleValidValueToANullableRangeRestrictedUnsigned16BitInteger_452()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -89171,7 +89235,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestVerifyNullableRangeRestrictedUnsigned16BitIntegerValueIsAtMidValid_452()
+    CHIP_ERROR TestVerifyNullableRangeRestrictedUnsigned16BitIntegerValueIsAtMidValid_453()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -89195,7 +89259,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteNullValueToANullableRangeRestrictedUnsigned16BitInteger_453()
+    CHIP_ERROR TestWriteNullValueToANullableRangeRestrictedUnsigned16BitInteger_454()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -89218,7 +89282,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestVerifyNullableRangeRestrictedUnsigned16BitIntegerValueIsNull_454()
+    CHIP_ERROR TestVerifyNullableRangeRestrictedUnsigned16BitIntegerValueIsNull_455()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -89241,7 +89305,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadNullableRangeRestrictedSigned8BitInteger_455()
+    CHIP_ERROR TestReadNullableRangeRestrictedSigned8BitInteger_456()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -89265,7 +89329,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteMinValueToANullableRangeRestrictedSigned8BitInteger_456()
+    CHIP_ERROR TestWriteMinValueToANullableRangeRestrictedSigned8BitInteger_457()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -89292,7 +89356,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteJustBelowRangeValueToANullableRangeRestrictedSigned8BitInteger_457()
+    CHIP_ERROR TestWriteJustBelowRangeValueToANullableRangeRestrictedSigned8BitInteger_458()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -89319,7 +89383,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteJustAboveRangeValueToANullableRangeRestrictedSigned8BitInteger_458()
+    CHIP_ERROR TestWriteJustAboveRangeValueToANullableRangeRestrictedSigned8BitInteger_459()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -89346,7 +89410,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteMaxValueToANullableRangeRestrictedSigned8BitInteger_459()
+    CHIP_ERROR TestWriteMaxValueToANullableRangeRestrictedSigned8BitInteger_460()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -89373,7 +89437,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestVerifyNullableRangeRestrictedSigned8BitIntegerValueHasNotChanged_460()
+    CHIP_ERROR TestVerifyNullableRangeRestrictedSigned8BitIntegerValueHasNotChanged_461()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -89397,7 +89461,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteMinValidValueToANullableRangeRestrictedSigned8BitInteger_461()
+    CHIP_ERROR TestWriteMinValidValueToANullableRangeRestrictedSigned8BitInteger_462()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -89420,7 +89484,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestVerifyNullableRangeRestrictedSigned8BitIntegerValueIsAtMinValid_462()
+    CHIP_ERROR TestVerifyNullableRangeRestrictedSigned8BitIntegerValueIsAtMinValid_463()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -89444,7 +89508,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteMaxValidValueToANullableRangeRestrictedSigned8BitInteger_463()
+    CHIP_ERROR TestWriteMaxValidValueToANullableRangeRestrictedSigned8BitInteger_464()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -89467,7 +89531,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestVerifyNullableRangeRestrictedSigned8BitIntegerValueIsAtMaxValid_464()
+    CHIP_ERROR TestVerifyNullableRangeRestrictedSigned8BitIntegerValueIsAtMaxValid_465()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -89491,7 +89555,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteMiddleValidValueToANullableRangeRestrictedSigned8BitInteger_465()
+    CHIP_ERROR TestWriteMiddleValidValueToANullableRangeRestrictedSigned8BitInteger_466()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -89514,7 +89578,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestVerifyNullableRangeRestrictedSigned8BitIntegerValueIsAtMidValid_466()
+    CHIP_ERROR TestVerifyNullableRangeRestrictedSigned8BitIntegerValueIsAtMidValid_467()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -89538,7 +89602,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteNullValueToANullableRangeRestrictedSigned8BitInteger_467()
+    CHIP_ERROR TestWriteNullValueToANullableRangeRestrictedSigned8BitInteger_468()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -89561,7 +89625,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestVerifyNullableRangeRestrictedSigned8BitIntegerValueIsAtNull_468()
+    CHIP_ERROR TestVerifyNullableRangeRestrictedSigned8BitIntegerValueIsAtNull_469()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -89584,7 +89648,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadNullableRangeRestrictedSigned16BitInteger_469()
+    CHIP_ERROR TestReadNullableRangeRestrictedSigned16BitInteger_470()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -89608,7 +89672,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteMinValueToANullableRangeRestrictedSigned16BitInteger_470()
+    CHIP_ERROR TestWriteMinValueToANullableRangeRestrictedSigned16BitInteger_471()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -89635,7 +89699,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteJustBelowRangeValueToANullableRangeRestrictedSigned16BitInteger_471()
+    CHIP_ERROR TestWriteJustBelowRangeValueToANullableRangeRestrictedSigned16BitInteger_472()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -89662,7 +89726,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteJustAboveRangeValueToANullableRangeRestrictedSigned16BitInteger_472()
+    CHIP_ERROR TestWriteJustAboveRangeValueToANullableRangeRestrictedSigned16BitInteger_473()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -89689,7 +89753,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteMaxValueToANullableRangeRestrictedSigned16BitInteger_473()
+    CHIP_ERROR TestWriteMaxValueToANullableRangeRestrictedSigned16BitInteger_474()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -89716,7 +89780,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestVerifyNullableRangeRestrictedSigned16BitIntegerValueHasNotChanged_474()
+    CHIP_ERROR TestVerifyNullableRangeRestrictedSigned16BitIntegerValueHasNotChanged_475()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -89740,7 +89804,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteMinValidValueToANullableRangeRestrictedSigned16BitInteger_475()
+    CHIP_ERROR TestWriteMinValidValueToANullableRangeRestrictedSigned16BitInteger_476()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -89763,7 +89827,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestVerifyNullableRangeRestrictedSigned16BitIntegerValueIsAtMinValid_476()
+    CHIP_ERROR TestVerifyNullableRangeRestrictedSigned16BitIntegerValueIsAtMinValid_477()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -89787,7 +89851,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteMaxValidValueToANullableRangeRestrictedSigned16BitInteger_477()
+    CHIP_ERROR TestWriteMaxValidValueToANullableRangeRestrictedSigned16BitInteger_478()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -89810,7 +89874,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestVerifyNullableRangeRestrictedSigned16BitIntegerValueIsAtMaxValid_478()
+    CHIP_ERROR TestVerifyNullableRangeRestrictedSigned16BitIntegerValueIsAtMaxValid_479()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -89834,7 +89898,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteMiddleValidValueToANullableRangeRestrictedSigned16BitInteger_479()
+    CHIP_ERROR TestWriteMiddleValidValueToANullableRangeRestrictedSigned16BitInteger_480()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -89857,7 +89921,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestVerifyNullableRangeRestrictedSigned16BitIntegerValueIsAtMidValid_480()
+    CHIP_ERROR TestVerifyNullableRangeRestrictedSigned16BitIntegerValueIsAtMidValid_481()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -89881,7 +89945,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteNullValueToANullableRangeRestrictedSigned16BitInteger_481()
+    CHIP_ERROR TestWriteNullValueToANullableRangeRestrictedSigned16BitInteger_482()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -89904,7 +89968,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestVerifyNullableRangeRestrictedSigned16BitIntegerValueIsNull_482()
+    CHIP_ERROR TestVerifyNullableRangeRestrictedSigned16BitIntegerValueIsNull_483()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -89927,7 +89991,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteAttributeThatReturnsGeneralStatusOnWrite_483()
+    CHIP_ERROR TestWriteAttributeThatReturnsGeneralStatusOnWrite_484()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -89952,7 +90016,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteAttributeThatReturnsClusterSpecificStatusOnWrite_484()
+    CHIP_ERROR TestWriteAttributeThatReturnsClusterSpecificStatusOnWrite_485()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -89979,7 +90043,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeThatReturnsGeneralStatusOnRead_485()
+    CHIP_ERROR TestReadAttributeThatReturnsGeneralStatusOnRead_486()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -89998,7 +90062,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeThatReturnsClusterSpecificStatusOnRead_486()
+    CHIP_ERROR TestReadAttributeThatReturnsClusterSpecificStatusOnRead_487()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -90017,7 +90081,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAcceptedCommandListAttribute_487()
+    CHIP_ERROR TestReadAcceptedCommandListAttribute_488()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -90058,7 +90122,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadGeneratedCommandListAttribute_488()
+    CHIP_ERROR TestReadGeneratedCommandListAttribute_489()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -90090,7 +90154,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteStructTypedAttribute_489()
+    CHIP_ERROR TestWriteStructTypedAttribute_490()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -90120,7 +90184,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadStructTypedAttribute_490()
+    CHIP_ERROR TestReadStructTypedAttribute_491()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -90242,91 +90306,95 @@ class TestConstraints : public TestCommandBridge {
             err = TestReadAttributeBitmap32WithMaskVal1AndMaskVal3AndEnsureMaskval1AndMaskVal3AreSet_10();
             break;
         case 11:
-            ChipLogProgress(chipTool, " ***** Test Step 11 : Write attribute INT32U Value\n");
-            err = TestWriteAttributeInt32uValue_11();
+            ChipLogProgress(chipTool, " ***** Test Step 11 : Write attribute BITMAP32 Back to Default Value\n");
+            err = TestWriteAttributeBitmap32BackToDefaultValue_11();
             break;
         case 12:
-            ChipLogProgress(chipTool, " ***** Test Step 12 : Read attribute INT32U Value MinValue Constraints\n");
-            err = TestReadAttributeInt32uValueMinValueConstraints_12();
+            ChipLogProgress(chipTool, " ***** Test Step 12 : Write attribute INT32U Value\n");
+            err = TestWriteAttributeInt32uValue_12();
             break;
         case 13:
-            ChipLogProgress(chipTool, " ***** Test Step 13 : Read attribute INT32U Value MaxValue Constraints\n");
-            err = TestReadAttributeInt32uValueMaxValueConstraints_13();
+            ChipLogProgress(chipTool, " ***** Test Step 13 : Read attribute INT32U Value MinValue Constraints\n");
+            err = TestReadAttributeInt32uValueMinValueConstraints_13();
             break;
         case 14:
-            ChipLogProgress(chipTool, " ***** Test Step 14 : Read attribute INT32U Value NotValue Constraints\n");
-            err = TestReadAttributeInt32uValueNotValueConstraints_14();
+            ChipLogProgress(chipTool, " ***** Test Step 14 : Read attribute INT32U Value MaxValue Constraints\n");
+            err = TestReadAttributeInt32uValueMaxValueConstraints_14();
             break;
         case 15:
-            ChipLogProgress(chipTool, " ***** Test Step 15 : Write attribute INT32U Value Back to Default Value\n");
-            err = TestWriteAttributeInt32uValueBackToDefaultValue_15();
+            ChipLogProgress(chipTool, " ***** Test Step 15 : Read attribute INT32U Value NotValue Constraints\n");
+            err = TestReadAttributeInt32uValueNotValueConstraints_15();
             break;
         case 16:
-            ChipLogProgress(chipTool, " ***** Test Step 16 : Write attribute CHAR_STRING Value\n");
-            err = TestWriteAttributeCharStringValue_16();
+            ChipLogProgress(chipTool, " ***** Test Step 16 : Write attribute INT32U Value Back to Default Value\n");
+            err = TestWriteAttributeInt32uValueBackToDefaultValue_16();
             break;
         case 17:
-            ChipLogProgress(chipTool, " ***** Test Step 17 : Read attribute CHAR_STRING Value MinLength Constraints\n");
-            err = TestReadAttributeCharStringValueMinLengthConstraints_17();
+            ChipLogProgress(chipTool, " ***** Test Step 17 : Write attribute CHAR_STRING Value\n");
+            err = TestWriteAttributeCharStringValue_17();
             break;
         case 18:
-            ChipLogProgress(chipTool, " ***** Test Step 18 : Read attribute CHAR_STRING Value MaxLength Constraints\n");
-            err = TestReadAttributeCharStringValueMaxLengthConstraints_18();
+            ChipLogProgress(chipTool, " ***** Test Step 18 : Read attribute CHAR_STRING Value MinLength Constraints\n");
+            err = TestReadAttributeCharStringValueMinLengthConstraints_18();
             break;
         case 19:
-            ChipLogProgress(chipTool, " ***** Test Step 19 : Read attribute CHAR_STRING Value StartsWith Constraints\n");
-            err = TestReadAttributeCharStringValueStartsWithConstraints_19();
+            ChipLogProgress(chipTool, " ***** Test Step 19 : Read attribute CHAR_STRING Value MaxLength Constraints\n");
+            err = TestReadAttributeCharStringValueMaxLengthConstraints_19();
             break;
         case 20:
-            ChipLogProgress(chipTool, " ***** Test Step 20 : Read attribute CHAR_STRING Value EndsWith Constraints\n");
-            err = TestReadAttributeCharStringValueEndsWithConstraints_20();
+            ChipLogProgress(chipTool, " ***** Test Step 20 : Read attribute CHAR_STRING Value StartsWith Constraints\n");
+            err = TestReadAttributeCharStringValueStartsWithConstraints_20();
             break;
         case 21:
-            ChipLogProgress(chipTool, " ***** Test Step 21 : Write attribute CHAR_STRING Value\n");
-            err = TestWriteAttributeCharStringValue_21();
+            ChipLogProgress(chipTool, " ***** Test Step 21 : Read attribute CHAR_STRING Value EndsWith Constraints\n");
+            err = TestReadAttributeCharStringValueEndsWithConstraints_21();
             break;
         case 22:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 22 : Read attribute CHAR_STRING Value isLowerCase/isUpperCase Constraints\n");
-            err = TestReadAttributeCharStringValueIsLowerCaseIsUpperCaseConstraints_22();
+            ChipLogProgress(chipTool, " ***** Test Step 22 : Write attribute CHAR_STRING Value\n");
+            err = TestWriteAttributeCharStringValue_22();
             break;
         case 23:
-            ChipLogProgress(chipTool, " ***** Test Step 23 : Write attribute CHAR_STRING Value\n");
-            err = TestWriteAttributeCharStringValue_23();
+            ChipLogProgress(
+                chipTool, " ***** Test Step 23 : Read attribute CHAR_STRING Value isLowerCase/isUpperCase Constraints\n");
+            err = TestReadAttributeCharStringValueIsLowerCaseIsUpperCaseConstraints_23();
             break;
         case 24:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 24 : Read attribute CHAR_STRING Value isLowerCase/isUpperCase Constraints\n");
-            err = TestReadAttributeCharStringValueIsLowerCaseIsUpperCaseConstraints_24();
+            ChipLogProgress(chipTool, " ***** Test Step 24 : Write attribute CHAR_STRING Value\n");
+            err = TestWriteAttributeCharStringValue_24();
             break;
         case 25:
-            ChipLogProgress(chipTool, " ***** Test Step 25 : Write attribute CHAR_STRING Value\n");
-            err = TestWriteAttributeCharStringValue_25();
+            ChipLogProgress(
+                chipTool, " ***** Test Step 25 : Read attribute CHAR_STRING Value isLowerCase/isUpperCase Constraints\n");
+            err = TestReadAttributeCharStringValueIsLowerCaseIsUpperCaseConstraints_25();
             break;
         case 26:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 26 : Read attribute CHAR_STRING Value isLowerCase/isUpperCase Constraints\n");
-            err = TestReadAttributeCharStringValueIsLowerCaseIsUpperCaseConstraints_26();
+            ChipLogProgress(chipTool, " ***** Test Step 26 : Write attribute CHAR_STRING Value\n");
+            err = TestWriteAttributeCharStringValue_26();
             break;
         case 27:
-            ChipLogProgress(chipTool, " ***** Test Step 27 : Write attribute CHAR_STRING Value\n");
-            err = TestWriteAttributeCharStringValue_27();
+            ChipLogProgress(
+                chipTool, " ***** Test Step 27 : Read attribute CHAR_STRING Value isLowerCase/isUpperCase Constraints\n");
+            err = TestReadAttributeCharStringValueIsLowerCaseIsUpperCaseConstraints_27();
             break;
         case 28:
-            ChipLogProgress(chipTool, " ***** Test Step 28 : Read attribute CHAR_STRING Value isHexString Constraints\n");
-            err = TestReadAttributeCharStringValueIsHexStringConstraints_28();
+            ChipLogProgress(chipTool, " ***** Test Step 28 : Write attribute CHAR_STRING Value\n");
+            err = TestWriteAttributeCharStringValue_28();
             break;
         case 29:
-            ChipLogProgress(chipTool, " ***** Test Step 29 : Write attribute CHAR_STRING Value\n");
-            err = TestWriteAttributeCharStringValue_29();
+            ChipLogProgress(chipTool, " ***** Test Step 29 : Read attribute CHAR_STRING Value isHexString Constraints\n");
+            err = TestReadAttributeCharStringValueIsHexStringConstraints_29();
             break;
         case 30:
-            ChipLogProgress(chipTool, " ***** Test Step 30 : Read attribute CHAR_STRING Value isHexString Constraints\n");
-            err = TestReadAttributeCharStringValueIsHexStringConstraints_30();
+            ChipLogProgress(chipTool, " ***** Test Step 30 : Write attribute CHAR_STRING Value\n");
+            err = TestWriteAttributeCharStringValue_30();
             break;
         case 31:
-            ChipLogProgress(chipTool, " ***** Test Step 31 : Write attribute CHAR_STRING Value Back to Default Value\n");
-            err = TestWriteAttributeCharStringValueBackToDefaultValue_31();
+            ChipLogProgress(chipTool, " ***** Test Step 31 : Read attribute CHAR_STRING Value isHexString Constraints\n");
+            err = TestReadAttributeCharStringValueIsHexStringConstraints_31();
+            break;
+        case 32:
+            ChipLogProgress(chipTool, " ***** Test Step 32 : Write attribute CHAR_STRING Value Back to Default Value\n");
+            err = TestWriteAttributeCharStringValueBackToDefaultValue_32();
             break;
         }
 
@@ -90435,6 +90503,9 @@ class TestConstraints : public TestCommandBridge {
         case 31:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
+        case 32:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
         }
 
         // Go on to the next test.
@@ -90448,7 +90519,7 @@ class TestConstraints : public TestCommandBridge {
 
 private:
     std::atomic_uint16_t mTestIndex;
-    const uint16_t mTestCount = 32;
+    const uint16_t mTestCount = 33;
 
     chip::Optional<chip::NodeId> mNodeId;
     chip::Optional<chip::CharSpan> mCluster;
@@ -90694,7 +90765,28 @@ class TestConstraints : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteAttributeInt32uValue_11()
+    CHIP_ERROR TestWriteAttributeBitmap32BackToDefaultValue_11()
+    {
+
+        MTRBaseDevice * device = GetDevice("alpha");
+        __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        id bitmap32Argument;
+        bitmap32Argument = [NSNumber numberWithUnsignedInt:0UL];
+        [cluster writeAttributeBitmap32WithValue:bitmap32Argument
+                                      completion:^(NSError * _Nullable err) {
+                                          NSLog(@"Write attribute BITMAP32 Back to Default Value Error: %@", err);
+
+                                          VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+                                          NextTest();
+                                      }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestWriteAttributeInt32uValue_12()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -90715,7 +90807,7 @@ class TestConstraints : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeInt32uValueMinValueConstraints_12()
+    CHIP_ERROR TestReadAttributeInt32uValueMinValueConstraints_13()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -90735,7 +90827,7 @@ class TestConstraints : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeInt32uValueMaxValueConstraints_13()
+    CHIP_ERROR TestReadAttributeInt32uValueMaxValueConstraints_14()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -90755,7 +90847,7 @@ class TestConstraints : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeInt32uValueNotValueConstraints_14()
+    CHIP_ERROR TestReadAttributeInt32uValueNotValueConstraints_15()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -90775,7 +90867,7 @@ class TestConstraints : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteAttributeInt32uValueBackToDefaultValue_15()
+    CHIP_ERROR TestWriteAttributeInt32uValueBackToDefaultValue_16()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -90796,7 +90888,7 @@ class TestConstraints : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteAttributeCharStringValue_16()
+    CHIP_ERROR TestWriteAttributeCharStringValue_17()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -90817,7 +90909,7 @@ class TestConstraints : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeCharStringValueMinLengthConstraints_17()
+    CHIP_ERROR TestReadAttributeCharStringValueMinLengthConstraints_18()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -90836,7 +90928,7 @@ class TestConstraints : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeCharStringValueMaxLengthConstraints_18()
+    CHIP_ERROR TestReadAttributeCharStringValueMaxLengthConstraints_19()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -90855,7 +90947,7 @@ class TestConstraints : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeCharStringValueStartsWithConstraints_19()
+    CHIP_ERROR TestReadAttributeCharStringValueStartsWithConstraints_20()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -90874,7 +90966,7 @@ class TestConstraints : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeCharStringValueEndsWithConstraints_20()
+    CHIP_ERROR TestReadAttributeCharStringValueEndsWithConstraints_21()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -90893,7 +90985,7 @@ class TestConstraints : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteAttributeCharStringValue_21()
+    CHIP_ERROR TestWriteAttributeCharStringValue_22()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -90914,7 +91006,7 @@ class TestConstraints : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeCharStringValueIsLowerCaseIsUpperCaseConstraints_22()
+    CHIP_ERROR TestReadAttributeCharStringValueIsLowerCaseIsUpperCaseConstraints_23()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -90934,7 +91026,7 @@ class TestConstraints : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteAttributeCharStringValue_23()
+    CHIP_ERROR TestWriteAttributeCharStringValue_24()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -90955,7 +91047,7 @@ class TestConstraints : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeCharStringValueIsLowerCaseIsUpperCaseConstraints_24()
+    CHIP_ERROR TestReadAttributeCharStringValueIsLowerCaseIsUpperCaseConstraints_25()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -90975,7 +91067,7 @@ class TestConstraints : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteAttributeCharStringValue_25()
+    CHIP_ERROR TestWriteAttributeCharStringValue_26()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -90996,7 +91088,7 @@ class TestConstraints : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeCharStringValueIsLowerCaseIsUpperCaseConstraints_26()
+    CHIP_ERROR TestReadAttributeCharStringValueIsLowerCaseIsUpperCaseConstraints_27()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -91016,7 +91108,7 @@ class TestConstraints : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteAttributeCharStringValue_27()
+    CHIP_ERROR TestWriteAttributeCharStringValue_28()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -91037,7 +91129,7 @@ class TestConstraints : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeCharStringValueIsHexStringConstraints_28()
+    CHIP_ERROR TestReadAttributeCharStringValueIsHexStringConstraints_29()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -91056,7 +91148,7 @@ class TestConstraints : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteAttributeCharStringValue_29()
+    CHIP_ERROR TestWriteAttributeCharStringValue_30()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -91077,7 +91169,7 @@ class TestConstraints : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeCharStringValueIsHexStringConstraints_30()
+    CHIP_ERROR TestReadAttributeCharStringValueIsHexStringConstraints_31()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -91096,7 +91188,7 @@ class TestConstraints : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestWriteAttributeCharStringValueBackToDefaultValue_31()
+    CHIP_ERROR TestWriteAttributeCharStringValueBackToDefaultValue_32()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");