diff --git a/src/darwin/Framework/CHIPTests/CHIPClustersTests.m b/src/darwin/Framework/CHIPTests/CHIPClustersTests.m
index d99f9a8b777c87..638bf4d2e52883 100644
--- a/src/darwin/Framework/CHIPTests/CHIPClustersTests.m
+++ b/src/darwin/Framework/CHIPTests/CHIPClustersTests.m
@@ -38339,6 +38339,246 @@ - (void)testSendClusterTestSaveAs_000093_ReadAttribute
 
     [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil];
 }
+NSMutableString * readAttributeCharStringDefaultValue;
+- (void)testSendClusterTestSaveAs_000094_ReadAttribute
+{
+    XCTestExpectation * expectation = [self expectationWithDescription:@"Read attribute char_string Default Value"];
+
+    CHIPDevice * device = GetConnectedDevice();
+    dispatch_queue_t queue = dispatch_get_main_queue();
+    CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:queue];
+    XCTAssertNotNil(cluster);
+
+    [cluster readAttributeCharStringWithCompletionHandler:^(NSString * _Nullable value, NSError * _Nullable err) {
+        NSLog(@"Read attribute char_string Default Value Error: %@", err);
+
+        XCTAssertEqual([CHIPErrorTestUtils errorToZCLErrorCode:err], 0);
+
+        {
+            id actualValue = value;
+            XCTAssertTrue([actualValue isEqualToString:@""]);
+            readAttributeCharStringDefaultValue = [NSMutableString stringWithString:actualValue];
+        }
+
+        [expectation fulfill];
+    }];
+
+    [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil];
+}
+- (void)testSendClusterTestSaveAs_000095_WriteAttribute
+{
+    XCTestExpectation * expectation = [self expectationWithDescription:@"Write attribute char_string Not Default Value"];
+
+    CHIPDevice * device = GetConnectedDevice();
+    dispatch_queue_t queue = dispatch_get_main_queue();
+    CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:queue];
+    XCTAssertNotNil(cluster);
+
+    id charStringArgument;
+    charStringArgument = @"NotDefault";
+    [cluster writeAttributeCharStringWithValue:charStringArgument
+                             completionHandler:^(NSError * _Nullable err) {
+                                 NSLog(@"Write attribute char_string Not Default Value Error: %@", err);
+
+                                 XCTAssertEqual([CHIPErrorTestUtils errorToZCLErrorCode:err], 0);
+
+                                 [expectation fulfill];
+                             }];
+
+    [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil];
+}
+- (void)testSendClusterTestSaveAs_000096_ReadAttribute
+{
+    XCTestExpectation * expectation = [self expectationWithDescription:@"Read attribute char_string Not Default Value"];
+
+    CHIPDevice * device = GetConnectedDevice();
+    dispatch_queue_t queue = dispatch_get_main_queue();
+    CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:queue];
+    XCTAssertNotNil(cluster);
+
+    [cluster readAttributeCharStringWithCompletionHandler:^(NSString * _Nullable value, NSError * _Nullable err) {
+        NSLog(@"Read attribute char_string Not Default Value Error: %@", err);
+
+        XCTAssertEqual([CHIPErrorTestUtils errorToZCLErrorCode:err], 0);
+
+        {
+            id actualValue = value;
+            if (actualValue != nil) {
+                XCTAssertNotEqualObjects(actualValue, readAttributeCharStringDefaultValue);
+            }
+        }
+
+        [expectation fulfill];
+    }];
+
+    [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil];
+}
+- (void)testSendClusterTestSaveAs_000097_WriteAttribute
+{
+    XCTestExpectation * expectation = [self expectationWithDescription:@"Write attribute char_string Default Value"];
+
+    CHIPDevice * device = GetConnectedDevice();
+    dispatch_queue_t queue = dispatch_get_main_queue();
+    CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:queue];
+    XCTAssertNotNil(cluster);
+
+    id charStringArgument;
+    charStringArgument = [NSData initWithString:readAttributeCharStringDefaultValue];
+    [cluster writeAttributeCharStringWithValue:charStringArgument
+                             completionHandler:^(NSError * _Nullable err) {
+                                 NSLog(@"Write attribute char_string Default Value Error: %@", err);
+
+                                 XCTAssertEqual([CHIPErrorTestUtils errorToZCLErrorCode:err], 0);
+
+                                 [expectation fulfill];
+                             }];
+
+    [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil];
+}
+- (void)testSendClusterTestSaveAs_000098_ReadAttribute
+{
+    XCTestExpectation * expectation = [self expectationWithDescription:@"Read attribute char_string Default Value"];
+
+    CHIPDevice * device = GetConnectedDevice();
+    dispatch_queue_t queue = dispatch_get_main_queue();
+    CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:queue];
+    XCTAssertNotNil(cluster);
+
+    [cluster readAttributeCharStringWithCompletionHandler:^(NSString * _Nullable value, NSError * _Nullable err) {
+        NSLog(@"Read attribute char_string Default Value Error: %@", err);
+
+        XCTAssertEqual([CHIPErrorTestUtils errorToZCLErrorCode:err], 0);
+
+        {
+            id actualValue = value;
+            XCTAssertEqualObjects(actualValue, readAttributeCharStringDefaultValue);
+        }
+
+        [expectation fulfill];
+    }];
+
+    [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil];
+}
+NSMutableData * readAttributeOctetStringDefaultValue;
+- (void)testSendClusterTestSaveAs_000099_ReadAttribute
+{
+    XCTestExpectation * expectation = [self expectationWithDescription:@"Read attribute octet_string Default Value"];
+
+    CHIPDevice * device = GetConnectedDevice();
+    dispatch_queue_t queue = dispatch_get_main_queue();
+    CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:queue];
+    XCTAssertNotNil(cluster);
+
+    [cluster readAttributeOctetStringWithCompletionHandler:^(NSData * _Nullable value, NSError * _Nullable err) {
+        NSLog(@"Read attribute octet_string Default Value Error: %@", err);
+
+        XCTAssertEqual([CHIPErrorTestUtils errorToZCLErrorCode:err], 0);
+
+        {
+            id actualValue = value;
+            XCTAssertTrue([actualValue isEqualToData:[[NSData alloc] initWithBytes:"" length:0]]);
+            readAttributeOctetStringDefaultValue = [NSMutableData dataWithData:actualValue];
+        }
+
+        [expectation fulfill];
+    }];
+
+    [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil];
+}
+- (void)testSendClusterTestSaveAs_000100_WriteAttribute
+{
+    XCTestExpectation * expectation = [self expectationWithDescription:@"Write attribute octet_string Not Default Value"];
+
+    CHIPDevice * device = GetConnectedDevice();
+    dispatch_queue_t queue = dispatch_get_main_queue();
+    CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:queue];
+    XCTAssertNotNil(cluster);
+
+    id octetStringArgument;
+    octetStringArgument = [[NSData alloc] initWithBytes:"NotDefault" length:10];
+    [cluster writeAttributeOctetStringWithValue:octetStringArgument
+                              completionHandler:^(NSError * _Nullable err) {
+                                  NSLog(@"Write attribute octet_string Not Default Value Error: %@", err);
+
+                                  XCTAssertEqual([CHIPErrorTestUtils errorToZCLErrorCode:err], 0);
+
+                                  [expectation fulfill];
+                              }];
+
+    [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil];
+}
+- (void)testSendClusterTestSaveAs_000101_ReadAttribute
+{
+    XCTestExpectation * expectation = [self expectationWithDescription:@"Read attribute octet_string Not Default Value"];
+
+    CHIPDevice * device = GetConnectedDevice();
+    dispatch_queue_t queue = dispatch_get_main_queue();
+    CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:queue];
+    XCTAssertNotNil(cluster);
+
+    [cluster readAttributeOctetStringWithCompletionHandler:^(NSData * _Nullable value, NSError * _Nullable err) {
+        NSLog(@"Read attribute octet_string Not Default Value Error: %@", err);
+
+        XCTAssertEqual([CHIPErrorTestUtils errorToZCLErrorCode:err], 0);
+
+        {
+            id actualValue = value;
+            if (actualValue != nil) {
+                XCTAssertNotEqualObjects(actualValue, readAttributeOctetStringDefaultValue);
+            }
+        }
+
+        [expectation fulfill];
+    }];
+
+    [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil];
+}
+- (void)testSendClusterTestSaveAs_000102_WriteAttribute
+{
+    XCTestExpectation * expectation = [self expectationWithDescription:@"Write attribute octet_string Default Value"];
+
+    CHIPDevice * device = GetConnectedDevice();
+    dispatch_queue_t queue = dispatch_get_main_queue();
+    CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:queue];
+    XCTAssertNotNil(cluster);
+
+    id octetStringArgument;
+    octetStringArgument = [NSData initWithData:readAttributeOctetStringDefaultValue];
+    [cluster writeAttributeOctetStringWithValue:octetStringArgument
+                              completionHandler:^(NSError * _Nullable err) {
+                                  NSLog(@"Write attribute octet_string Default Value Error: %@", err);
+
+                                  XCTAssertEqual([CHIPErrorTestUtils errorToZCLErrorCode:err], 0);
+
+                                  [expectation fulfill];
+                              }];
+
+    [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil];
+}
+- (void)testSendClusterTestSaveAs_000103_ReadAttribute
+{
+    XCTestExpectation * expectation = [self expectationWithDescription:@"Read attribute octet_string Default Value"];
+
+    CHIPDevice * device = GetConnectedDevice();
+    dispatch_queue_t queue = dispatch_get_main_queue();
+    CHIPTestTestCluster * cluster = [[CHIPTestTestCluster alloc] initWithDevice:device endpoint:1 queue:queue];
+    XCTAssertNotNil(cluster);
+
+    [cluster readAttributeOctetStringWithCompletionHandler:^(NSData * _Nullable value, NSError * _Nullable err) {
+        NSLog(@"Read attribute octet_string Default Value Error: %@", err);
+
+        XCTAssertEqual([CHIPErrorTestUtils errorToZCLErrorCode:err], 0);
+
+        {
+            id actualValue = value;
+            XCTAssertEqualObjects(actualValue, readAttributeOctetStringDefaultValue);
+        }
+
+        [expectation fulfill];
+    }];
+
+    [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil];
+}
 
 - (void)testSendClusterTestConstraints_000000_WaitForCommissionee
 {
diff --git a/zzz_generated/chip-tool/zap-generated/test/Commands.h b/zzz_generated/chip-tool/zap-generated/test/Commands.h
index 3e9075940d9a02..0987529f133973 100644
--- a/zzz_generated/chip-tool/zap-generated/test/Commands.h
+++ b/zzz_generated/chip-tool/zap-generated/test/Commands.h
@@ -183,6 +183,8 @@ class Test_TC_BI_1_1 : public TestCommand
         AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
     }
 
+    ~Test_TC_BI_1_1() {}
+
     /////////// TestCommand Interface /////////
     void NextTest() override
     {
@@ -383,6 +385,8 @@ class Test_TC_BI_2_1 : public TestCommand
         AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
     }
 
+    ~Test_TC_BI_2_1() {}
+
     /////////// TestCommand Interface /////////
     void NextTest() override
     {
@@ -813,6 +817,8 @@ class Test_TC_BI_2_2 : public TestCommand
         AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
     }
 
+    ~Test_TC_BI_2_2() {}
+
     /////////// TestCommand Interface /////////
     void NextTest() override
     {
@@ -1190,6 +1196,8 @@ class Test_TC_BOOL_1_1 : public TestCommand
         AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
     }
 
+    ~Test_TC_BOOL_1_1() {}
+
     /////////// TestCommand Interface /////////
     void NextTest() override
     {
@@ -1390,6 +1398,8 @@ class Test_TC_BOOL_2_1 : public TestCommand
         AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
     }
 
+    ~Test_TC_BOOL_2_1() {}
+
     /////////// TestCommand Interface /////////
     void NextTest() override
     {
@@ -1590,6 +1600,8 @@ class Test_TC_CC_1_1 : public TestCommand
         AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
     }
 
+    ~Test_TC_CC_1_1() {}
+
     /////////// TestCommand Interface /////////
     void NextTest() override
     {
@@ -1722,6 +1734,8 @@ class Test_TC_CC_2_1 : public TestCommand
         AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
     }
 
+    ~Test_TC_CC_2_1() {}
+
     /////////// TestCommand Interface /////////
     void NextTest() override
     {
@@ -7067,6 +7081,8 @@ class Test_TC_CC_3_1 : public TestCommand
         AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
     }
 
+    ~Test_TC_CC_3_1() {}
+
     /////////// TestCommand Interface /////////
     void NextTest() override
     {
@@ -7382,6 +7398,8 @@ class Test_TC_CC_3_2 : public TestCommand
         AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
     }
 
+    ~Test_TC_CC_3_2() {}
+
     /////////// TestCommand Interface /////////
     void NextTest() override
     {
@@ -7693,6 +7711,8 @@ class Test_TC_CC_3_3 : public TestCommand
         AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
     }
 
+    ~Test_TC_CC_3_3() {}
+
     /////////// TestCommand Interface /////////
     void NextTest() override
     {
@@ -7944,6 +7964,8 @@ class Test_TC_CC_4_1 : public TestCommand
         AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
     }
 
+    ~Test_TC_CC_4_1() {}
+
     /////////// TestCommand Interface /////////
     void NextTest() override
     {
@@ -8162,6 +8184,8 @@ class Test_TC_CC_4_2 : public TestCommand
         AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
     }
 
+    ~Test_TC_CC_4_2() {}
+
     /////////// TestCommand Interface /////////
     void NextTest() override
     {
@@ -8535,6 +8559,8 @@ class Test_TC_CC_4_3 : public TestCommand
         AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
     }
 
+    ~Test_TC_CC_4_3() {}
+
     /////////// TestCommand Interface /////////
     void NextTest() override
     {
@@ -8786,6 +8812,8 @@ class Test_TC_CC_4_4 : public TestCommand
         AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
     }
 
+    ~Test_TC_CC_4_4() {}
+
     /////////// TestCommand Interface /////////
     void NextTest() override
     {
@@ -9005,6 +9033,8 @@ class Test_TC_CC_5_1 : public TestCommand
         AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
     }
 
+    ~Test_TC_CC_5_1() {}
+
     /////////// TestCommand Interface /////////
     void NextTest() override
     {
@@ -9224,6 +9254,8 @@ class Test_TC_CC_5_2 : public TestCommand
         AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
     }
 
+    ~Test_TC_CC_5_2() {}
+
     /////////// TestCommand Interface /////////
     void NextTest() override
     {
@@ -9471,6 +9503,8 @@ class Test_TC_CC_5_3 : public TestCommand
         AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
     }
 
+    ~Test_TC_CC_5_3() {}
+
     /////////// TestCommand Interface /////////
     void NextTest() override
     {
@@ -9690,6 +9724,8 @@ class Test_TC_CC_6_1 : public TestCommand
         AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
     }
 
+    ~Test_TC_CC_6_1() {}
+
     /////////// TestCommand Interface /////////
     void NextTest() override
     {
@@ -9908,6 +9944,8 @@ class Test_TC_CC_6_2 : public TestCommand
         AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
     }
 
+    ~Test_TC_CC_6_2() {}
+
     /////////// TestCommand Interface /////////
     void NextTest() override
     {
@@ -10194,6 +10232,8 @@ class Test_TC_CC_6_3 : public TestCommand
         AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
     }
 
+    ~Test_TC_CC_6_3() {}
+
     /////////// TestCommand Interface /////////
     void NextTest() override
     {
@@ -10449,6 +10489,8 @@ class Test_TC_CC_7_1 : public TestCommand
         AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
     }
 
+    ~Test_TC_CC_7_1() {}
+
     /////////// TestCommand Interface /////////
     void NextTest() override
     {
@@ -10703,6 +10745,8 @@ class Test_TC_CC_7_2 : public TestCommand
         AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
     }
 
+    ~Test_TC_CC_7_2() {}
+
     /////////// TestCommand Interface /////////
     void NextTest() override
     {
@@ -11014,6 +11058,8 @@ class Test_TC_CC_7_3 : public TestCommand
         AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
     }
 
+    ~Test_TC_CC_7_3() {}
+
     /////////// TestCommand Interface /////////
     void NextTest() override
     {
@@ -11265,6 +11311,8 @@ class Test_TC_CC_7_4 : public TestCommand
         AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
     }
 
+    ~Test_TC_CC_7_4() {}
+
     /////////// TestCommand Interface /////////
     void NextTest() override
     {
@@ -11484,6 +11532,8 @@ class Test_TC_CC_8_1 : public TestCommand
         AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
     }
 
+    ~Test_TC_CC_8_1() {}
+
     /////////// TestCommand Interface /////////
     void NextTest() override
     {
@@ -12080,6 +12130,8 @@ class Test_TC_CC_9_1 : public TestCommand
         AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
     }
 
+    ~Test_TC_CC_9_1() {}
+
     /////////// TestCommand Interface /////////
     void NextTest() override
     {
@@ -13490,6 +13542,8 @@ class Test_TC_CC_9_2 : public TestCommand
         AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
     }
 
+    ~Test_TC_CC_9_2() {}
+
     /////////// TestCommand Interface /////////
     void NextTest() override
     {
@@ -14073,6 +14127,8 @@ class Test_TC_CC_9_3 : public TestCommand
         AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
     }
 
+    ~Test_TC_CC_9_3() {}
+
     /////////// TestCommand Interface /////////
     void NextTest() override
     {
@@ -14656,6 +14712,8 @@ class Test_TC_DD_1_5 : public TestCommand
         AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
     }
 
+    ~Test_TC_DD_1_5() {}
+
     /////////// TestCommand Interface /////////
     void NextTest() override
     {
@@ -14722,6 +14780,8 @@ class Test_TC_DD_1_6 : public TestCommand
         AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
     }
 
+    ~Test_TC_DD_1_6() {}
+
     /////////// TestCommand Interface /////////
     void NextTest() override
     {
@@ -14809,6 +14869,8 @@ class Test_TC_DD_1_7 : public TestCommand
         AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
     }
 
+    ~Test_TC_DD_1_7() {}
+
     /////////// TestCommand Interface /////////
     void NextTest() override
     {
@@ -14885,6 +14947,8 @@ class Test_TC_DD_1_8 : public TestCommand
         AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
     }
 
+    ~Test_TC_DD_1_8() {}
+
     /////////// TestCommand Interface /////////
     void NextTest() override
     {
@@ -14960,6 +15024,8 @@ class Test_TC_DD_1_9 : public TestCommand
         AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
     }
 
+    ~Test_TC_DD_1_9() {}
+
     /////////// TestCommand Interface /////////
     void NextTest() override
     {
@@ -15046,6 +15112,8 @@ class Test_TC_DM_1_1 : public TestCommand
         AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
     }
 
+    ~Test_TC_DM_1_1() {}
+
     /////////// TestCommand Interface /////////
     void NextTest() override
     {
@@ -15791,6 +15859,8 @@ class Test_TC_DM_3_1 : public TestCommand
         AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
     }
 
+    ~Test_TC_DM_3_1() {}
+
     /////////// TestCommand Interface /////////
     void NextTest() override
     {
@@ -15856,6 +15926,8 @@ class Test_TC_DM_2_2 : public TestCommand
         AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
     }
 
+    ~Test_TC_DM_2_2() {}
+
     /////////// TestCommand Interface /////////
     void NextTest() override
     {
@@ -16069,6 +16141,8 @@ class Test_TC_EMR_1_1 : public TestCommand
         AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
     }
 
+    ~Test_TC_EMR_1_1() {}
+
     /////////// TestCommand Interface /////////
     void NextTest() override
     {
@@ -16273,6 +16347,8 @@ class Test_TC_FLW_1_1 : public TestCommand
         AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
     }
 
+    ~Test_TC_FLW_1_1() {}
+
     /////////// TestCommand Interface /////////
     void NextTest() override
     {
@@ -16405,6 +16481,8 @@ class Test_TC_FLW_2_1 : public TestCommand
         AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
     }
 
+    ~Test_TC_FLW_2_1() {}
+
     /////////// TestCommand Interface /////////
     void NextTest() override
     {
@@ -16912,6 +16990,8 @@ class Test_TC_FLW_2_2 : public TestCommand
         AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
     }
 
+    ~Test_TC_FLW_2_2() {}
+
     /////////// TestCommand Interface /////////
     void NextTest() override
     {
@@ -17043,6 +17123,8 @@ class Test_TC_ILL_1_1 : public TestCommand
         AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
     }
 
+    ~Test_TC_ILL_1_1() {}
+
     /////////// TestCommand Interface /////////
     void NextTest() override
     {
@@ -17247,6 +17329,8 @@ class Test_TC_LVL_1_1 : public TestCommand
         AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
     }
 
+    ~Test_TC_LVL_1_1() {}
+
     /////////// TestCommand Interface /////////
     void NextTest() override
     {
@@ -17379,6 +17463,8 @@ class Test_TC_LVL_2_1 : public TestCommand
         AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
     }
 
+    ~Test_TC_LVL_2_1() {}
+
     /////////// TestCommand Interface /////////
     void NextTest() override
     {
@@ -17948,6 +18034,8 @@ class Test_TC_LVL_2_2 : public TestCommand
         AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
     }
 
+    ~Test_TC_LVL_2_2() {}
+
     /////////// TestCommand Interface /////////
     void NextTest() override
     {
@@ -18531,6 +18619,8 @@ class Test_TC_LVL_3_1 : public TestCommand
         AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
     }
 
+    ~Test_TC_LVL_3_1() {}
+
     /////////// TestCommand Interface /////////
     void NextTest() override
     {
@@ -18998,6 +19088,8 @@ class Test_TC_LVL_4_1 : public TestCommand
         AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
     }
 
+    ~Test_TC_LVL_4_1() {}
+
     /////////// TestCommand Interface /////////
     void NextTest() override
     {
@@ -19496,6 +19588,8 @@ class Test_TC_LVL_5_1 : public TestCommand
         AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
     }
 
+    ~Test_TC_LVL_5_1() {}
+
     /////////// TestCommand Interface /////////
     void NextTest() override
     {
@@ -19884,6 +19978,8 @@ class Test_TC_LVL_6_1 : public TestCommand
         AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
     }
 
+    ~Test_TC_LVL_6_1() {}
+
     /////////// TestCommand Interface /////////
     void NextTest() override
     {
@@ -20223,6 +20319,8 @@ class Test_TC_MC_1_1 : public TestCommand
         AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
     }
 
+    ~Test_TC_MC_1_1() {}
+
     /////////// TestCommand Interface /////////
     void NextTest() override
     {
@@ -20355,6 +20453,8 @@ class Test_TC_MC_2_1 : public TestCommand
         AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
     }
 
+    ~Test_TC_MC_2_1() {}
+
     /////////// TestCommand Interface /////////
     void NextTest() override
     {
@@ -20447,6 +20547,8 @@ class Test_TC_MC_3_1 : public TestCommand
         AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
     }
 
+    ~Test_TC_MC_3_1() {}
+
     /////////// TestCommand Interface /////////
     void NextTest() override
     {
@@ -20512,6 +20614,8 @@ class Test_TC_MC_3_2 : public TestCommand
         AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
     }
 
+    ~Test_TC_MC_3_2() {}
+
     /////////// TestCommand Interface /////////
     void NextTest() override
     {
@@ -20577,6 +20681,8 @@ class Test_TC_MC_3_3 : public TestCommand
         AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
     }
 
+    ~Test_TC_MC_3_3() {}
+
     /////////// TestCommand Interface /////////
     void NextTest() override
     {
@@ -20642,6 +20748,8 @@ class Test_TC_MC_3_4 : public TestCommand
         AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
     }
 
+    ~Test_TC_MC_3_4() {}
+
     /////////// TestCommand Interface /////////
     void NextTest() override
     {
@@ -20707,6 +20815,8 @@ class Test_TC_MC_3_5 : public TestCommand
         AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
     }
 
+    ~Test_TC_MC_3_5() {}
+
     /////////// TestCommand Interface /////////
     void NextTest() override
     {
@@ -20772,6 +20882,8 @@ class Test_TC_MC_3_6 : public TestCommand
         AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
     }
 
+    ~Test_TC_MC_3_6() {}
+
     /////////// TestCommand Interface /////////
     void NextTest() override
     {
@@ -20837,6 +20949,8 @@ class Test_TC_MC_3_7 : public TestCommand
         AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
     }
 
+    ~Test_TC_MC_3_7() {}
+
     /////////// TestCommand Interface /////////
     void NextTest() override
     {
@@ -20902,6 +21016,8 @@ class Test_TC_MC_3_8 : public TestCommand
         AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
     }
 
+    ~Test_TC_MC_3_8() {}
+
     /////////// TestCommand Interface /////////
     void NextTest() override
     {
@@ -20967,6 +21083,8 @@ class Test_TC_MC_3_9 : public TestCommand
         AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
     }
 
+    ~Test_TC_MC_3_9() {}
+
     /////////// TestCommand Interface /////////
     void NextTest() override
     {
@@ -21032,6 +21150,8 @@ class Test_TC_MC_3_10 : public TestCommand
         AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
     }
 
+    ~Test_TC_MC_3_10() {}
+
     /////////// TestCommand Interface /////////
     void NextTest() override
     {
@@ -21097,6 +21217,8 @@ class Test_TC_MC_3_11 : public TestCommand
         AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
     }
 
+    ~Test_TC_MC_3_11() {}
+
     /////////// TestCommand Interface /////////
     void NextTest() override
     {
@@ -21162,6 +21284,8 @@ class Test_TC_MC_5_1 : public TestCommand
         AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
     }
 
+    ~Test_TC_MC_5_1() {}
+
     /////////// TestCommand Interface /////////
     void NextTest() override
     {
@@ -21263,6 +21387,8 @@ class Test_TC_MC_5_2 : public TestCommand
         AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
     }
 
+    ~Test_TC_MC_5_2() {}
+
     /////////// TestCommand Interface /////////
     void NextTest() override
     {
@@ -21338,6 +21464,8 @@ class Test_TC_MC_5_3 : public TestCommand
         AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
     }
 
+    ~Test_TC_MC_5_3() {}
+
     /////////// TestCommand Interface /////////
     void NextTest() override
     {
@@ -21413,6 +21541,8 @@ class Test_TC_MC_6_1 : public TestCommand
         AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
     }
 
+    ~Test_TC_MC_6_1() {}
+
     /////////// TestCommand Interface /////////
     void NextTest() override
     {
@@ -21552,6 +21682,8 @@ class Test_TC_MC_6_2 : public TestCommand
         AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
     }
 
+    ~Test_TC_MC_6_2() {}
+
     /////////// TestCommand Interface /////////
     void NextTest() override
     {
@@ -21721,6 +21853,8 @@ class Test_TC_MC_6_3 : public TestCommand
         AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
     }
 
+    ~Test_TC_MC_6_3() {}
+
     /////////// TestCommand Interface /////////
     void NextTest() override
     {
@@ -21816,6 +21950,8 @@ class Test_TC_MC_6_4 : public TestCommand
         AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
     }
 
+    ~Test_TC_MC_6_4() {}
+
     /////////// TestCommand Interface /////////
     void NextTest() override
     {
@@ -22043,6 +22179,8 @@ class Test_TC_MC_7_1 : public TestCommand
         AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
     }
 
+    ~Test_TC_MC_7_1() {}
+
     /////////// TestCommand Interface /////////
     void NextTest() override
     {
@@ -22108,6 +22246,8 @@ class Test_TC_MC_7_2 : public TestCommand
         AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
     }
 
+    ~Test_TC_MC_7_2() {}
+
     /////////// TestCommand Interface /////////
     void NextTest() override
     {
@@ -22173,6 +22313,8 @@ class Test_TC_MC_8_1 : public TestCommand
         AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
     }
 
+    ~Test_TC_MC_8_1() {}
+
     /////////// TestCommand Interface /////////
     void NextTest() override
     {
@@ -22313,6 +22455,8 @@ class Test_TC_MC_9_1 : public TestCommand
         AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
     }
 
+    ~Test_TC_MC_9_1() {}
+
     /////////// TestCommand Interface /////////
     void NextTest() override
     {
@@ -22590,6 +22734,8 @@ class Test_TC_OCC_1_1 : public TestCommand
         AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
     }
 
+    ~Test_TC_OCC_1_1() {}
+
     /////////// TestCommand Interface /////////
     void NextTest() override
     {
@@ -22756,6 +22902,8 @@ class Test_TC_OCC_2_1 : public TestCommand
         AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
     }
 
+    ~Test_TC_OCC_2_1() {}
+
     /////////// TestCommand Interface /////////
     void NextTest() override
     {
@@ -23137,6 +23285,8 @@ class Test_TC_OCC_2_2 : public TestCommand
         AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
     }
 
+    ~Test_TC_OCC_2_2() {}
+
     /////////// TestCommand Interface /////////
     void NextTest() override
     {
@@ -23278,6 +23428,8 @@ class Test_TC_OO_1_1 : public TestCommand
         AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
     }
 
+    ~Test_TC_OO_1_1() {}
+
     /////////// TestCommand Interface /////////
     void NextTest() override
     {
@@ -23622,6 +23774,8 @@ class Test_TC_OO_2_1 : public TestCommand
         AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
     }
 
+    ~Test_TC_OO_2_1() {}
+
     /////////// TestCommand Interface /////////
     void NextTest() override
     {
@@ -24180,6 +24334,8 @@ class Test_TC_OO_2_2 : public TestCommand
         AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
     }
 
+    ~Test_TC_OO_2_2() {}
+
     /////////// TestCommand Interface /////////
     void NextTest() override
     {
@@ -24672,6 +24828,8 @@ class Test_TC_OO_2_3 : public TestCommand
         AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
     }
 
+    ~Test_TC_OO_2_3() {}
+
     /////////// TestCommand Interface /////////
     void NextTest() override
     {
@@ -26374,6 +26532,8 @@ class Test_TC_PRS_1_1 : public TestCommand
         AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
     }
 
+    ~Test_TC_PRS_1_1() {}
+
     /////////// TestCommand Interface /////////
     void NextTest() override
     {
@@ -26507,6 +26667,8 @@ class Test_TC_PRS_2_1 : public TestCommand
         AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
     }
 
+    ~Test_TC_PRS_2_1() {}
+
     /////////// TestCommand Interface /////////
     void NextTest() override
     {
@@ -26878,6 +27040,8 @@ class Test_TC_PCC_1_1 : public TestCommand
         AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
     }
 
+    ~Test_TC_PCC_1_1() {}
+
     /////////// TestCommand Interface /////////
     void NextTest() override
     {
@@ -27046,6 +27210,8 @@ class Test_TC_PCC_2_1 : public TestCommand
         AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
     }
 
+    ~Test_TC_PCC_2_1() {}
+
     /////////// TestCommand Interface /////////
     void NextTest() override
     {
@@ -28890,6 +29056,8 @@ class Test_TC_PCC_2_2 : public TestCommand
         AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
     }
 
+    ~Test_TC_PCC_2_2() {}
+
     /////////// TestCommand Interface /////////
     void NextTest() override
     {
@@ -29060,6 +29228,8 @@ class Test_TC_PCC_2_3 : public TestCommand
         AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
     }
 
+    ~Test_TC_PCC_2_3() {}
+
     /////////// TestCommand Interface /////////
     void NextTest() override
     {
@@ -29450,6 +29620,8 @@ class Test_TC_RH_1_1 : public TestCommand
         AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
     }
 
+    ~Test_TC_RH_1_1() {}
+
     /////////// TestCommand Interface /////////
     void NextTest() override
     {
@@ -29584,6 +29756,8 @@ class Test_TC_RH_2_1 : public TestCommand
         AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
     }
 
+    ~Test_TC_RH_2_1() {}
+
     /////////// TestCommand Interface /////////
     void NextTest() override
     {
@@ -29796,6 +29970,8 @@ class Test_TC_RH_2_2 : public TestCommand
         AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
     }
 
+    ~Test_TC_RH_2_2() {}
+
     /////////// TestCommand Interface /////////
     void NextTest() override
     {
@@ -29939,6 +30115,8 @@ class Test_TC_TM_1_1 : public TestCommand
         AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
     }
 
+    ~Test_TC_TM_1_1() {}
+
     /////////// TestCommand Interface /////////
     void NextTest() override
     {
@@ -30143,6 +30321,8 @@ class Test_TC_TM_2_1 : public TestCommand
         AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
     }
 
+    ~Test_TC_TM_2_1() {}
+
     /////////// TestCommand Interface /////////
     void NextTest() override
     {
@@ -30280,6 +30460,8 @@ class Test_TC_TM_2_2 : public TestCommand
         AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
     }
 
+    ~Test_TC_TM_2_2() {}
+
     /////////// TestCommand Interface /////////
     void NextTest() override
     {
@@ -30423,6 +30605,8 @@ class Test_TC_TSTAT_1_1 : public TestCommand
         AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
     }
 
+    ~Test_TC_TSTAT_1_1() {}
+
     /////////// TestCommand Interface /////////
     void NextTest() override
     {
@@ -30588,6 +30772,8 @@ class Test_TC_TSTAT_2_1 : public TestCommand
         AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
     }
 
+    ~Test_TC_TSTAT_2_1() {}
+
     /////////// TestCommand Interface /////////
     void NextTest() override
     {
@@ -32729,6 +32915,8 @@ class Test_TC_TSTAT_2_2 : public TestCommand
         AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
     }
 
+    ~Test_TC_TSTAT_2_2() {}
+
     /////////// TestCommand Interface /////////
     void NextTest() override
     {
@@ -34600,6 +34788,8 @@ class Test_TC_TSUIC_1_1 : public TestCommand
         AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
     }
 
+    ~Test_TC_TSUIC_1_1() {}
+
     /////////// TestCommand Interface /////////
     void NextTest() override
     {
@@ -34735,6 +34925,8 @@ class Test_TC_TSUIC_2_1 : public TestCommand
         AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
     }
 
+    ~Test_TC_TSUIC_2_1() {}
+
     /////////// TestCommand Interface /////////
     void NextTest() override
     {
@@ -35314,6 +35506,8 @@ class Test_TC_TSUIC_2_2 : public TestCommand
         AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
     }
 
+    ~Test_TC_TSUIC_2_2() {}
+
     /////////// TestCommand Interface /////////
     void NextTest() override
     {
@@ -35735,6 +35929,8 @@ class Test_TC_DIAGTH_1_1 : public TestCommand
         AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
     }
 
+    ~Test_TC_DIAGTH_1_1() {}
+
     /////////// TestCommand Interface /////////
     void NextTest() override
     {
@@ -35939,6 +36135,8 @@ class Test_TC_WNCV_1_1 : public TestCommand
         AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
     }
 
+    ~Test_TC_WNCV_1_1() {}
+
     /////////// TestCommand Interface /////////
     void NextTest() override
     {
@@ -36212,6 +36410,8 @@ class Test_TC_WNCV_2_1 : public TestCommand
         AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
     }
 
+    ~Test_TC_WNCV_2_1() {}
+
     /////////// TestCommand Interface /////////
     void NextTest() override
     {
@@ -38217,6 +38417,8 @@ class Test_TC_WNCV_2_2 : public TestCommand
         AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
     }
 
+    ~Test_TC_WNCV_2_2() {}
+
     /////////// TestCommand Interface /////////
     void NextTest() override
     {
@@ -38282,6 +38484,8 @@ class Test_TC_WNCV_2_4 : public TestCommand
         AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
     }
 
+    ~Test_TC_WNCV_2_4() {}
+
     /////////// TestCommand Interface /////////
     void NextTest() override
     {
@@ -38426,6 +38630,8 @@ class Test_TC_WNCV_2_5 : public TestCommand
         AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
     }
 
+    ~Test_TC_WNCV_2_5() {}
+
     /////////// TestCommand Interface /////////
     void NextTest() override
     {
@@ -38570,6 +38776,8 @@ class Test_TC_WNCV_3_1 : public TestCommand
         AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
     }
 
+    ~Test_TC_WNCV_3_1() {}
+
     /////////// TestCommand Interface /////////
     void NextTest() override
     {
@@ -38723,6 +38931,8 @@ class Test_TC_WNCV_3_2 : public TestCommand
         AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
     }
 
+    ~Test_TC_WNCV_3_2() {}
+
     /////////// TestCommand Interface /////////
     void NextTest() override
     {
@@ -38876,6 +39086,8 @@ class Test_TC_WNCV_3_3 : public TestCommand
         AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
     }
 
+    ~Test_TC_WNCV_3_3() {}
+
     /////////// TestCommand Interface /////////
     void NextTest() override
     {
@@ -39029,6 +39241,8 @@ class TV_TargetNavigatorCluster : public TestCommand
         AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
     }
 
+    ~TV_TargetNavigatorCluster() {}
+
     /////////// TestCommand Interface /////////
     void NextTest() override
     {
@@ -39215,6 +39429,8 @@ class TV_AudioOutputCluster : public TestCommand
         AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
     }
 
+    ~TV_AudioOutputCluster() {}
+
     /////////// TestCommand Interface /////////
     void NextTest() override
     {
@@ -39428,6 +39644,8 @@ class TV_ApplicationLauncherCluster : public TestCommand
         AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
     }
 
+    ~TV_ApplicationLauncherCluster() {}
+
     /////////// TestCommand Interface /////////
     void NextTest() override
     {
@@ -39647,6 +39865,8 @@ class TV_KeypadInputCluster : public TestCommand
         AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
     }
 
+    ~TV_KeypadInputCluster() {}
+
     /////////// TestCommand Interface /////////
     void NextTest() override
     {
@@ -39745,6 +39965,8 @@ class TV_AccountLoginCluster : public TestCommand
         AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
     }
 
+    ~TV_AccountLoginCluster() {}
+
     /////////// TestCommand Interface /////////
     void NextTest() override
     {
@@ -39902,6 +40124,8 @@ class TV_WakeOnLanCluster : public TestCommand
         AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
     }
 
+    ~TV_WakeOnLanCluster() {}
+
     /////////// TestCommand Interface /////////
     void NextTest() override
     {
@@ -40001,6 +40225,8 @@ class TV_ApplicationBasicCluster : public TestCommand
         AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
     }
 
+    ~TV_ApplicationBasicCluster() {}
+
     /////////// TestCommand Interface /////////
     void NextTest() override
     {
@@ -40270,6 +40496,8 @@ class TV_MediaPlaybackCluster : public TestCommand
         AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
     }
 
+    ~TV_MediaPlaybackCluster() {}
+
     /////////// TestCommand Interface /////////
     void NextTest() override
     {
@@ -40894,6 +41122,8 @@ class TV_ChannelCluster : public TestCommand
         AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
     }
 
+    ~TV_ChannelCluster() {}
+
     /////////// TestCommand Interface /////////
     void NextTest() override
     {
@@ -41113,6 +41343,8 @@ class TV_LowPowerCluster : public TestCommand
         AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
     }
 
+    ~TV_LowPowerCluster() {}
+
     /////////// TestCommand Interface /////////
     void NextTest() override
     {
@@ -41205,6 +41437,8 @@ class TV_ContentLauncherCluster : public TestCommand
         AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
     }
 
+    ~TV_ContentLauncherCluster() {}
+
     /////////// TestCommand Interface /////////
     void NextTest() override
     {
@@ -41458,6 +41692,8 @@ class TV_MediaInputCluster : public TestCommand
         AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
     }
 
+    ~TV_MediaInputCluster() {}
+
     /////////// TestCommand Interface /////////
     void NextTest() override
     {
@@ -41722,6 +41958,8 @@ class TestCluster : public TestCommand
         AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
     }
 
+    ~TestCluster() {}
+
     /////////// TestCommand Interface /////////
     void NextTest() override
     {
@@ -57939,6 +58177,8 @@ class TestClusterComplexTypes : public TestCommand
         AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
     }
 
+    ~TestClusterComplexTypes() {}
+
     /////////// TestCommand Interface /////////
     void NextTest() override
     {
@@ -58688,6 +58928,8 @@ class TestConstraints : public TestCommand
         AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
     }
 
+    ~TestConstraints() {}
+
     /////////// TestCommand Interface /////////
     void NextTest() override
     {
@@ -59417,6 +59659,8 @@ class TestDelayCommands : public TestCommand
         AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
     }
 
+    ~TestDelayCommands() {}
+
     /////////// TestCommand Interface /////////
     void NextTest() override
     {
@@ -59492,6 +59736,8 @@ class TestLogCommands : public TestCommand
         AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
     }
 
+    ~TestLogCommands() {}
+
     /////////// TestCommand Interface /////////
     void NextTest() override
     {
@@ -59577,6 +59823,20 @@ class TestSaveAs : public TestCommand
         AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
     }
 
+    ~TestSaveAs()
+    {
+        if (readAttributeCharStringDefaultValueBuffer != nullptr)
+        {
+            chip::Platform::MemoryFree(readAttributeCharStringDefaultValueBuffer);
+            readAttributeCharStringDefaultValueBuffer = nullptr;
+        }
+        if (readAttributeOctetStringDefaultValueBuffer != nullptr)
+        {
+            chip::Platform::MemoryFree(readAttributeOctetStringDefaultValueBuffer);
+            readAttributeOctetStringDefaultValueBuffer = nullptr;
+        }
+    }
+
     /////////// TestCommand Interface /////////
     void NextTest() override
     {
@@ -59978,6 +60238,46 @@ class TestSaveAs : public TestCommand
             ChipLogProgress(chipTool, " ***** Test Step 93 : Read attribute vendor_id Default Value\n");
             err = TestReadAttributeVendorIdDefaultValue_93();
             break;
+        case 94:
+            ChipLogProgress(chipTool, " ***** Test Step 94 : Read attribute char_string Default Value\n");
+            err = TestReadAttributeCharStringDefaultValue_94();
+            break;
+        case 95:
+            ChipLogProgress(chipTool, " ***** Test Step 95 : Write attribute char_string Not Default Value\n");
+            err = TestWriteAttributeCharStringNotDefaultValue_95();
+            break;
+        case 96:
+            ChipLogProgress(chipTool, " ***** Test Step 96 : Read attribute char_string Not Default Value\n");
+            err = TestReadAttributeCharStringNotDefaultValue_96();
+            break;
+        case 97:
+            ChipLogProgress(chipTool, " ***** Test Step 97 : Write attribute char_string Default Value\n");
+            err = TestWriteAttributeCharStringDefaultValue_97();
+            break;
+        case 98:
+            ChipLogProgress(chipTool, " ***** Test Step 98 : Read attribute char_string Default Value\n");
+            err = TestReadAttributeCharStringDefaultValue_98();
+            break;
+        case 99:
+            ChipLogProgress(chipTool, " ***** Test Step 99 : Read attribute octet_string Default Value\n");
+            err = TestReadAttributeOctetStringDefaultValue_99();
+            break;
+        case 100:
+            ChipLogProgress(chipTool, " ***** Test Step 100 : Write attribute octet_string Not Default Value\n");
+            err = TestWriteAttributeOctetStringNotDefaultValue_100();
+            break;
+        case 101:
+            ChipLogProgress(chipTool, " ***** Test Step 101 : Read attribute octet_string Not Default Value\n");
+            err = TestReadAttributeOctetStringNotDefaultValue_101();
+            break;
+        case 102:
+            ChipLogProgress(chipTool, " ***** Test Step 102 : Write attribute octet_string Default Value\n");
+            err = TestWriteAttributeOctetStringDefaultValue_102();
+            break;
+        case 103:
+            ChipLogProgress(chipTool, " ***** Test Step 103 : Read attribute octet_string Default Value\n");
+            err = TestReadAttributeOctetStringDefaultValue_103();
+            break;
         }
 
         if (CHIP_NO_ERROR != err)
@@ -59989,7 +60289,7 @@ class TestSaveAs : public TestCommand
 
 private:
     std::atomic_uint16_t mTestIndex;
-    const uint16_t mTestCount = 94;
+    const uint16_t mTestCount = 104;
 
     chip::Optional<chip::CharSpan> mCluster;
     chip::Optional<chip::EndpointId> mEndpoint;
@@ -60013,6 +60313,10 @@ class TestSaveAs : public TestCommand
     uint64_t readAttributeEpochUSDefaultValue;
     uint32_t readAttributeEpochSDefaultValue;
     chip::VendorId readAttributeVendorIdDefaultValue;
+    char * readAttributeCharStringDefaultValueBuffer = nullptr;
+    chip::CharSpan readAttributeCharStringDefaultValue;
+    uint8_t * readAttributeOctetStringDefaultValueBuffer = nullptr;
+    chip::ByteSpan readAttributeOctetStringDefaultValue;
 
     static void OnFailureCallback_4(void * context, EmberAfStatus status)
     {
@@ -60806,6 +61110,94 @@ class TestSaveAs : public TestCommand
         (static_cast<TestSaveAs *>(context))->OnSuccessResponse_93(vendorId);
     }
 
+    static void OnFailureCallback_94(void * context, EmberAfStatus status)
+    {
+        (static_cast<TestSaveAs *>(context))->OnFailureResponse_94(status);
+    }
+
+    static void OnSuccessCallback_94(void * context, chip::CharSpan charString)
+    {
+        (static_cast<TestSaveAs *>(context))->OnSuccessResponse_94(charString);
+    }
+
+    static void OnFailureCallback_95(void * context, EmberAfStatus status)
+    {
+        (static_cast<TestSaveAs *>(context))->OnFailureResponse_95(status);
+    }
+
+    static void OnSuccessCallback_95(void * context) { (static_cast<TestSaveAs *>(context))->OnSuccessResponse_95(); }
+
+    static void OnFailureCallback_96(void * context, EmberAfStatus status)
+    {
+        (static_cast<TestSaveAs *>(context))->OnFailureResponse_96(status);
+    }
+
+    static void OnSuccessCallback_96(void * context, chip::CharSpan charString)
+    {
+        (static_cast<TestSaveAs *>(context))->OnSuccessResponse_96(charString);
+    }
+
+    static void OnFailureCallback_97(void * context, EmberAfStatus status)
+    {
+        (static_cast<TestSaveAs *>(context))->OnFailureResponse_97(status);
+    }
+
+    static void OnSuccessCallback_97(void * context) { (static_cast<TestSaveAs *>(context))->OnSuccessResponse_97(); }
+
+    static void OnFailureCallback_98(void * context, EmberAfStatus status)
+    {
+        (static_cast<TestSaveAs *>(context))->OnFailureResponse_98(status);
+    }
+
+    static void OnSuccessCallback_98(void * context, chip::CharSpan charString)
+    {
+        (static_cast<TestSaveAs *>(context))->OnSuccessResponse_98(charString);
+    }
+
+    static void OnFailureCallback_99(void * context, EmberAfStatus status)
+    {
+        (static_cast<TestSaveAs *>(context))->OnFailureResponse_99(status);
+    }
+
+    static void OnSuccessCallback_99(void * context, chip::ByteSpan octetString)
+    {
+        (static_cast<TestSaveAs *>(context))->OnSuccessResponse_99(octetString);
+    }
+
+    static void OnFailureCallback_100(void * context, EmberAfStatus status)
+    {
+        (static_cast<TestSaveAs *>(context))->OnFailureResponse_100(status);
+    }
+
+    static void OnSuccessCallback_100(void * context) { (static_cast<TestSaveAs *>(context))->OnSuccessResponse_100(); }
+
+    static void OnFailureCallback_101(void * context, EmberAfStatus status)
+    {
+        (static_cast<TestSaveAs *>(context))->OnFailureResponse_101(status);
+    }
+
+    static void OnSuccessCallback_101(void * context, chip::ByteSpan octetString)
+    {
+        (static_cast<TestSaveAs *>(context))->OnSuccessResponse_101(octetString);
+    }
+
+    static void OnFailureCallback_102(void * context, EmberAfStatus status)
+    {
+        (static_cast<TestSaveAs *>(context))->OnFailureResponse_102(status);
+    }
+
+    static void OnSuccessCallback_102(void * context) { (static_cast<TestSaveAs *>(context))->OnSuccessResponse_102(); }
+
+    static void OnFailureCallback_103(void * context, EmberAfStatus status)
+    {
+        (static_cast<TestSaveAs *>(context))->OnFailureResponse_103(status);
+    }
+
+    static void OnSuccessCallback_103(void * context, chip::ByteSpan octetString)
+    {
+        (static_cast<TestSaveAs *>(context))->OnSuccessResponse_103(octetString);
+    }
+
     //
     // Tests methods
     //
@@ -62622,7 +63014,7 @@ class TestSaveAs : public TestCommand
         cluster.Associate(mDevices[kIdentityAlpha], endpoint);
 
         chip::VendorId vendorIdArgument;
-        vendorIdArgument = static_cast<chip::VendorId>(readAttributeVendorIdDefaultValue);
+        vendorIdArgument = readAttributeVendorIdDefaultValue;
 
         ReturnErrorOnFailure(cluster.WriteAttribute<chip::app::Clusters::TestCluster::Attributes::VendorId::TypeInfo>(
             vendorIdArgument, this, OnSuccessCallback_92, OnFailureCallback_92));
@@ -62652,6 +63044,212 @@ class TestSaveAs : public TestCommand
 
         NextTest();
     }
+
+    CHIP_ERROR TestReadAttributeCharStringDefaultValue_94()
+    {
+        const chip::EndpointId endpoint = mEndpoint.HasValue() ? mEndpoint.Value() : 1;
+        chip::Controller::TestClusterClusterTest cluster;
+        cluster.Associate(mDevices[kIdentityAlpha], endpoint);
+
+        ReturnErrorOnFailure(cluster.ReadAttribute<chip::app::Clusters::TestCluster::Attributes::CharString::TypeInfo>(
+            this, OnSuccessCallback_94, OnFailureCallback_94));
+        return CHIP_NO_ERROR;
+    }
+
+    void OnFailureResponse_94(EmberAfStatus status) { ThrowFailureResponse(); }
+
+    void OnSuccessResponse_94(chip::CharSpan charString)
+    {
+        VerifyOrReturn(CheckValueAsString("charString", charString, chip::CharSpan("", 0)));
+
+        if (readAttributeCharStringDefaultValueBuffer != nullptr)
+        {
+            chip::Platform::MemoryFree(readAttributeCharStringDefaultValueBuffer);
+        }
+        readAttributeCharStringDefaultValueBuffer = static_cast<char *>(chip::Platform::MemoryAlloc(charString.size()));
+        memcpy(readAttributeCharStringDefaultValueBuffer, charString.data(), charString.size());
+        readAttributeCharStringDefaultValue = chip::CharSpan(readAttributeCharStringDefaultValueBuffer, charString.size());
+        NextTest();
+    }
+
+    CHIP_ERROR TestWriteAttributeCharStringNotDefaultValue_95()
+    {
+        const chip::EndpointId endpoint = mEndpoint.HasValue() ? mEndpoint.Value() : 1;
+        chip::Controller::TestClusterClusterTest cluster;
+        cluster.Associate(mDevices[kIdentityAlpha], endpoint);
+
+        chip::CharSpan charStringArgument;
+        charStringArgument = chip::Span<const char>("NotDefaultgarbage: not in length on purpose", 10);
+
+        ReturnErrorOnFailure(cluster.WriteAttribute<chip::app::Clusters::TestCluster::Attributes::CharString::TypeInfo>(
+            charStringArgument, this, OnSuccessCallback_95, OnFailureCallback_95));
+        return CHIP_NO_ERROR;
+    }
+
+    void OnFailureResponse_95(EmberAfStatus status) { ThrowFailureResponse(); }
+
+    void OnSuccessResponse_95() { NextTest(); }
+
+    CHIP_ERROR TestReadAttributeCharStringNotDefaultValue_96()
+    {
+        const chip::EndpointId endpoint = mEndpoint.HasValue() ? mEndpoint.Value() : 1;
+        chip::Controller::TestClusterClusterTest cluster;
+        cluster.Associate(mDevices[kIdentityAlpha], endpoint);
+
+        ReturnErrorOnFailure(cluster.ReadAttribute<chip::app::Clusters::TestCluster::Attributes::CharString::TypeInfo>(
+            this, OnSuccessCallback_96, OnFailureCallback_96));
+        return CHIP_NO_ERROR;
+    }
+
+    void OnFailureResponse_96(EmberAfStatus status) { ThrowFailureResponse(); }
+
+    void OnSuccessResponse_96(chip::CharSpan charString)
+    {
+        VerifyOrReturn(CheckConstraintNotValue("charString", charString, readAttributeCharStringDefaultValue));
+
+        NextTest();
+    }
+
+    CHIP_ERROR TestWriteAttributeCharStringDefaultValue_97()
+    {
+        const chip::EndpointId endpoint = mEndpoint.HasValue() ? mEndpoint.Value() : 1;
+        chip::Controller::TestClusterClusterTest cluster;
+        cluster.Associate(mDevices[kIdentityAlpha], endpoint);
+
+        chip::CharSpan charStringArgument;
+        charStringArgument = readAttributeCharStringDefaultValue;
+
+        ReturnErrorOnFailure(cluster.WriteAttribute<chip::app::Clusters::TestCluster::Attributes::CharString::TypeInfo>(
+            charStringArgument, this, OnSuccessCallback_97, OnFailureCallback_97));
+        return CHIP_NO_ERROR;
+    }
+
+    void OnFailureResponse_97(EmberAfStatus status) { ThrowFailureResponse(); }
+
+    void OnSuccessResponse_97() { NextTest(); }
+
+    CHIP_ERROR TestReadAttributeCharStringDefaultValue_98()
+    {
+        const chip::EndpointId endpoint = mEndpoint.HasValue() ? mEndpoint.Value() : 1;
+        chip::Controller::TestClusterClusterTest cluster;
+        cluster.Associate(mDevices[kIdentityAlpha], endpoint);
+
+        ReturnErrorOnFailure(cluster.ReadAttribute<chip::app::Clusters::TestCluster::Attributes::CharString::TypeInfo>(
+            this, OnSuccessCallback_98, OnFailureCallback_98));
+        return CHIP_NO_ERROR;
+    }
+
+    void OnFailureResponse_98(EmberAfStatus status) { ThrowFailureResponse(); }
+
+    void OnSuccessResponse_98(chip::CharSpan charString)
+    {
+        VerifyOrReturn(CheckValueAsString("charString", charString, readAttributeCharStringDefaultValue));
+
+        NextTest();
+    }
+
+    CHIP_ERROR TestReadAttributeOctetStringDefaultValue_99()
+    {
+        const chip::EndpointId endpoint = mEndpoint.HasValue() ? mEndpoint.Value() : 1;
+        chip::Controller::TestClusterClusterTest cluster;
+        cluster.Associate(mDevices[kIdentityAlpha], endpoint);
+
+        ReturnErrorOnFailure(cluster.ReadAttribute<chip::app::Clusters::TestCluster::Attributes::OctetString::TypeInfo>(
+            this, OnSuccessCallback_99, OnFailureCallback_99));
+        return CHIP_NO_ERROR;
+    }
+
+    void OnFailureResponse_99(EmberAfStatus status) { ThrowFailureResponse(); }
+
+    void OnSuccessResponse_99(chip::ByteSpan octetString)
+    {
+        VerifyOrReturn(CheckValueAsString("octetString", octetString, chip::ByteSpan(chip::Uint8::from_const_char(""), 0)));
+
+        if (readAttributeOctetStringDefaultValueBuffer != nullptr)
+        {
+            chip::Platform::MemoryFree(readAttributeOctetStringDefaultValueBuffer);
+        }
+        readAttributeOctetStringDefaultValueBuffer = static_cast<uint8_t *>(chip::Platform::MemoryAlloc(octetString.size()));
+        memcpy(readAttributeOctetStringDefaultValueBuffer, octetString.data(), octetString.size());
+        readAttributeOctetStringDefaultValue = chip::ByteSpan(readAttributeOctetStringDefaultValueBuffer, octetString.size());
+        NextTest();
+    }
+
+    CHIP_ERROR TestWriteAttributeOctetStringNotDefaultValue_100()
+    {
+        const chip::EndpointId endpoint = mEndpoint.HasValue() ? mEndpoint.Value() : 1;
+        chip::Controller::TestClusterClusterTest cluster;
+        cluster.Associate(mDevices[kIdentityAlpha], endpoint);
+
+        chip::ByteSpan octetStringArgument;
+        octetStringArgument = chip::ByteSpan(chip::Uint8::from_const_char("NotDefaultgarbage: not in length on purpose"), 10);
+
+        ReturnErrorOnFailure(cluster.WriteAttribute<chip::app::Clusters::TestCluster::Attributes::OctetString::TypeInfo>(
+            octetStringArgument, this, OnSuccessCallback_100, OnFailureCallback_100));
+        return CHIP_NO_ERROR;
+    }
+
+    void OnFailureResponse_100(EmberAfStatus status) { ThrowFailureResponse(); }
+
+    void OnSuccessResponse_100() { NextTest(); }
+
+    CHIP_ERROR TestReadAttributeOctetStringNotDefaultValue_101()
+    {
+        const chip::EndpointId endpoint = mEndpoint.HasValue() ? mEndpoint.Value() : 1;
+        chip::Controller::TestClusterClusterTest cluster;
+        cluster.Associate(mDevices[kIdentityAlpha], endpoint);
+
+        ReturnErrorOnFailure(cluster.ReadAttribute<chip::app::Clusters::TestCluster::Attributes::OctetString::TypeInfo>(
+            this, OnSuccessCallback_101, OnFailureCallback_101));
+        return CHIP_NO_ERROR;
+    }
+
+    void OnFailureResponse_101(EmberAfStatus status) { ThrowFailureResponse(); }
+
+    void OnSuccessResponse_101(chip::ByteSpan octetString)
+    {
+        VerifyOrReturn(CheckConstraintNotValue("octetString", octetString, readAttributeOctetStringDefaultValue));
+
+        NextTest();
+    }
+
+    CHIP_ERROR TestWriteAttributeOctetStringDefaultValue_102()
+    {
+        const chip::EndpointId endpoint = mEndpoint.HasValue() ? mEndpoint.Value() : 1;
+        chip::Controller::TestClusterClusterTest cluster;
+        cluster.Associate(mDevices[kIdentityAlpha], endpoint);
+
+        chip::ByteSpan octetStringArgument;
+        octetStringArgument = readAttributeOctetStringDefaultValue;
+
+        ReturnErrorOnFailure(cluster.WriteAttribute<chip::app::Clusters::TestCluster::Attributes::OctetString::TypeInfo>(
+            octetStringArgument, this, OnSuccessCallback_102, OnFailureCallback_102));
+        return CHIP_NO_ERROR;
+    }
+
+    void OnFailureResponse_102(EmberAfStatus status) { ThrowFailureResponse(); }
+
+    void OnSuccessResponse_102() { NextTest(); }
+
+    CHIP_ERROR TestReadAttributeOctetStringDefaultValue_103()
+    {
+        const chip::EndpointId endpoint = mEndpoint.HasValue() ? mEndpoint.Value() : 1;
+        chip::Controller::TestClusterClusterTest cluster;
+        cluster.Associate(mDevices[kIdentityAlpha], endpoint);
+
+        ReturnErrorOnFailure(cluster.ReadAttribute<chip::app::Clusters::TestCluster::Attributes::OctetString::TypeInfo>(
+            this, OnSuccessCallback_103, OnFailureCallback_103));
+        return CHIP_NO_ERROR;
+    }
+
+    void OnFailureResponse_103(EmberAfStatus status) { ThrowFailureResponse(); }
+
+    void OnSuccessResponse_103(chip::ByteSpan octetString)
+    {
+        VerifyOrReturn(CheckValueAsString("octetString", octetString, readAttributeOctetStringDefaultValue));
+
+        NextTest();
+    }
 };
 
 class TestConfigVariables : public TestCommand
@@ -62665,6 +63263,8 @@ class TestConfigVariables : public TestCommand
         AddArgument("returnValueWithArg1", 0, UINT8_MAX, &mReturnValueWithArg1);
     }
 
+    ~TestConfigVariables() {}
+
     /////////// TestCommand Interface /////////
     void NextTest() override
     {
@@ -62803,6 +63403,8 @@ class TestDescriptorCluster : public TestCommand
         AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
     }
 
+    ~TestDescriptorCluster() {}
+
     /////////// TestCommand Interface /////////
     void NextTest() override
     {
@@ -63074,6 +63676,8 @@ class TestBasicInformation : public TestCommand
         AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
     }
 
+    ~TestBasicInformation() {}
+
     /////////// TestCommand Interface /////////
     void NextTest() override
     {
@@ -63276,6 +63880,8 @@ class TestIdentifyCluster : public TestCommand
         AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
     }
 
+    ~TestIdentifyCluster() {}
+
     /////////// TestCommand Interface /////////
     void NextTest() override
     {
@@ -63369,6 +63975,8 @@ class TestGroupsCluster : public TestCommand
         AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
     }
 
+    ~TestGroupsCluster() {}
+
     /////////// TestCommand Interface /////////
     void NextTest() override
     {
@@ -64090,6 +64698,8 @@ class TestGroupKeyManagementCluster : public TestCommand
         AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
     }
 
+    ~TestGroupKeyManagementCluster() {}
+
     /////////// TestCommand Interface /////////
     void NextTest() override
     {
@@ -64225,6 +64835,8 @@ class TestOperationalCredentialsCluster : public TestCommand
         AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
     }
 
+    ~TestOperationalCredentialsCluster() {}
+
     /////////// TestCommand Interface /////////
     void NextTest() override
     {
@@ -64395,6 +65007,8 @@ class TestModeSelectCluster : public TestCommand
         AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
     }
 
+    ~TestModeSelectCluster() {}
+
     /////////// TestCommand Interface /////////
     void NextTest() override
     {
@@ -64745,6 +65359,8 @@ class TestGroupMessaging : public TestCommand
         AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
     }
 
+    ~TestGroupMessaging() {}
+
     /////////// TestCommand Interface /////////
     void NextTest() override
     {
@@ -64944,6 +65560,8 @@ class Test_TC_SWDIAG_1_1 : public TestCommand
         AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
     }
 
+    ~Test_TC_SWDIAG_1_1() {}
+
     /////////// TestCommand Interface /////////
     void NextTest() override
     {
@@ -65128,6 +65746,8 @@ class Test_TC_SWDIAG_2_1 : public TestCommand
         AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
     }
 
+    ~Test_TC_SWDIAG_2_1() {}
+
     /////////// TestCommand Interface /////////
     void NextTest() override
     {
@@ -65183,6 +65803,8 @@ class Test_TC_SWDIAG_3_1 : public TestCommand
         AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
     }
 
+    ~Test_TC_SWDIAG_3_1() {}
+
     /////////// TestCommand Interface /////////
     void NextTest() override
     {
@@ -65333,6 +65955,8 @@ class TestSubscribe_OnOff : public TestCommand
         AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
     }
 
+    ~TestSubscribe_OnOff() {}
+
     /////////// TestCommand Interface /////////
     void NextTest() override
     {