diff --git a/zzz_generated/chip-tool/zap-generated/test/Commands.h b/zzz_generated/chip-tool/zap-generated/test/Commands.h
index c3d4aa04ac2527..32df0d10c92b8c 100644
--- a/zzz_generated/chip-tool/zap-generated/test/Commands.h
+++ b/zzz_generated/chip-tool/zap-generated/test/Commands.h
@@ -62553,6 +62553,7 @@ class TestModeSelectClusterSuite : public TestCommand
                         auto iter_2 = iter_0.GetValue().semanticTags.begin();
                         VerifyOrReturn(CheckNextListItemDecodes<decltype(iter_0.GetValue().semanticTags)>(
                             "supportedModes[0].semanticTags", iter_2, 0));
+                        VerifyOrReturn(CheckValue("supportedModes[0].semanticTags[0].value", iter_2.GetValue().value, 0U));
                         VerifyOrReturn(CheckNoMoreListItems<decltype(iter_0.GetValue().semanticTags)>(
                             "supportedModes[0].semanticTags", iter_2, 1));
                     }
@@ -62564,6 +62565,7 @@ class TestModeSelectClusterSuite : public TestCommand
                         auto iter_2 = iter_0.GetValue().semanticTags.begin();
                         VerifyOrReturn(CheckNextListItemDecodes<decltype(iter_0.GetValue().semanticTags)>(
                             "supportedModes[1].semanticTags", iter_2, 0));
+                        VerifyOrReturn(CheckValue("supportedModes[1].semanticTags[0].value", iter_2.GetValue().value, 0U));
                         VerifyOrReturn(CheckNoMoreListItems<decltype(iter_0.GetValue().semanticTags)>(
                             "supportedModes[1].semanticTags", iter_2, 1));
                     }
@@ -62575,6 +62577,7 @@ class TestModeSelectClusterSuite : public TestCommand
                         auto iter_2 = iter_0.GetValue().semanticTags.begin();
                         VerifyOrReturn(CheckNextListItemDecodes<decltype(iter_0.GetValue().semanticTags)>(
                             "supportedModes[2].semanticTags", iter_2, 0));
+                        VerifyOrReturn(CheckValue("supportedModes[2].semanticTags[0].value", iter_2.GetValue().value, 0U));
                         VerifyOrReturn(CheckNoMoreListItems<decltype(iter_0.GetValue().semanticTags)>(
                             "supportedModes[2].semanticTags", iter_2, 1));
                     }
@@ -64092,6 +64095,8 @@ class TestArmFailSafeSuite : public TestCommand
                 {
                     auto iter_0 = value.begin();
                     VerifyOrReturn(CheckNextListItemDecodes<decltype(value)>("fabrics", iter_0, 0));
+                    VerifyOrReturn(CheckValue("fabrics[0].nodeId", iter_0.GetValue().nodeId,
+                                              mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL));
                     VerifyOrReturn(CheckValueAsString("fabrics[0].label", iter_0.GetValue().label, chip::CharSpan("", 0)));
                     VerifyOrReturn(CheckNoMoreListItems<decltype(value)>("fabrics", iter_0, 1));
                 }
@@ -66097,6 +66102,8 @@ class TestMultiAdminSuite : public TestCommand
                 {
                     auto iter_0 = value.begin();
                     VerifyOrReturn(CheckNextListItemDecodes<decltype(value)>("fabrics", iter_0, 0));
+                    VerifyOrReturn(CheckValue("fabrics[0].nodeId", iter_0.GetValue().nodeId,
+                                              mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL));
                     VerifyOrReturn(CheckNoMoreListItems<decltype(value)>("fabrics", iter_0, 1));
                 }
             }
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..c938e978ed854d 100644
--- a/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h
+++ b/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h
@@ -97788,16 +97788,28 @@ class TestModeSelectCluster : public TestCommandBridge {
                 VerifyOrReturn(CheckValue("Mode", ((MTRModeSelectClusterModeOptionStruct *) actualValue[0]).mode, 0U));
                 VerifyOrReturn(CheckValue("SemanticTags",
                     [((MTRModeSelectClusterModeOptionStruct *) actualValue[0]).semanticTags count], static_cast<uint32_t>(1)));
+                VerifyOrReturn(CheckValue("Value",
+                    ((MTRModeSelectClusterSemanticTag *) ((MTRModeSelectClusterModeOptionStruct *) actualValue[0]).semanticTags[0])
+                        .value,
+                    0U));
                 VerifyOrReturn(
                     CheckValueAsString("Label", ((MTRModeSelectClusterModeOptionStruct *) actualValue[1]).label, @"Cappuccino"));
                 VerifyOrReturn(CheckValue("Mode", ((MTRModeSelectClusterModeOptionStruct *) actualValue[1]).mode, 4U));
                 VerifyOrReturn(CheckValue("SemanticTags",
                     [((MTRModeSelectClusterModeOptionStruct *) actualValue[1]).semanticTags count], static_cast<uint32_t>(1)));
+                VerifyOrReturn(CheckValue("Value",
+                    ((MTRModeSelectClusterSemanticTag *) ((MTRModeSelectClusterModeOptionStruct *) actualValue[1]).semanticTags[0])
+                        .value,
+                    0U));
                 VerifyOrReturn(
                     CheckValueAsString("Label", ((MTRModeSelectClusterModeOptionStruct *) actualValue[2]).label, @"Espresso"));
                 VerifyOrReturn(CheckValue("Mode", ((MTRModeSelectClusterModeOptionStruct *) actualValue[2]).mode, 7U));
                 VerifyOrReturn(CheckValue("SemanticTags",
                     [((MTRModeSelectClusterModeOptionStruct *) actualValue[2]).semanticTags count], static_cast<uint32_t>(1)));
+                VerifyOrReturn(CheckValue("Value",
+                    ((MTRModeSelectClusterSemanticTag *) ((MTRModeSelectClusterModeOptionStruct *) actualValue[2]).semanticTags[0])
+                        .value,
+                    0U));
             }
 
             VerifyOrReturn(CheckConstraintType("supportedModes", "list", "list"));
@@ -100084,6 +100096,9 @@ class TestArmFailSafe : public TestCommandBridge {
                                          {
                                              id actualValue = value;
                                              VerifyOrReturn(CheckValue("Fabrics", [actualValue count], static_cast<uint32_t>(1)));
+                                             VerifyOrReturn(CheckValue("NodeId",
+                                                 ((MTROperationalCredentialsClusterFabricDescriptor *) actualValue[0]).nodeId,
+                                                 mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL));
                                              VerifyOrReturn(CheckValueAsString("Label",
                                                  ((MTROperationalCredentialsClusterFabricDescriptor *) actualValue[0]).label, @""));
                                          }
@@ -103826,6 +103841,9 @@ class TestMultiAdmin : public TestCommandBridge {
                                          {
                                              id actualValue = value;
                                              VerifyOrReturn(CheckValue("Fabrics", [actualValue count], static_cast<uint32_t>(1)));
+                                             VerifyOrReturn(CheckValue("NodeId",
+                                                 ((MTROperationalCredentialsClusterFabricDescriptor *) actualValue[0]).nodeId,
+                                                 mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL));
                                          }
 
                                          NextTest();