diff --git a/src/app/tests/suites/TestArmFailSafe.yaml b/src/app/tests/suites/TestArmFailSafe.yaml
index eb4ee25544d971..245788fd71cc0d 100644
--- a/src/app/tests/suites/TestArmFailSafe.yaml
+++ b/src/app/tests/suites/TestArmFailSafe.yaml
@@ -36,7 +36,7 @@ tests:
       cluster: "Operational Credentials"
       attribute: "Fabrics"
       response:
-          value: [{ Label: "", nodeId: nodeId }]
+          value: [{ Label: "", NodeId: nodeId }]
           constraints:
               type: list
 
diff --git a/src/app/tests/suites/TestClusterMultiFabric.yaml b/src/app/tests/suites/TestClusterMultiFabric.yaml
index 448fef86b9b38a..d11f5f1d4715ed 100644
--- a/src/app/tests/suites/TestClusterMultiFabric.yaml
+++ b/src/app/tests/suites/TestClusterMultiFabric.yaml
@@ -75,7 +75,7 @@ tests:
                       # Write in a bogus value for the fabric index. This should never actually make it across the wire,
                       # nor be meaningfully ingested by a correct receiver.
                       #
-                      fabricIndex: 100,
+                      FabricIndex: 100,
                       fabricSensitiveInt8u: 33,
                       optionalFabricSensitiveInt8u: 34,
                       nullableFabricSensitiveInt8u: null,
@@ -95,7 +95,7 @@ tests:
                       fabricSensitiveInt8uList: [1, 2, 3, 4],
                   },
                   {
-                      fabricIndex: 100,
+                      FabricIndex: 100,
                       fabricSensitiveInt8u: 43,
                       optionalFabricSensitiveInt8u: 44,
                       nullableFabricSensitiveInt8u: null,
@@ -125,7 +125,7 @@ tests:
           value:
               [
                   {
-                      fabricIndex: 100,
+                      FabricIndex: 100,
                       fabricSensitiveInt8u: 133,
                       optionalFabricSensitiveInt8u: 134,
                       nullableFabricSensitiveInt8u: null,
@@ -145,7 +145,7 @@ tests:
                       fabricSensitiveInt8uList: [11, 12, 13, 14],
                   },
                   {
-                      fabricIndex: 100,
+                      FabricIndex: 100,
                       fabricSensitiveInt8u: 143,
                       optionalFabricSensitiveInt8u: 144,
                       nullableFabricSensitiveInt8u: null,
@@ -175,7 +175,7 @@ tests:
           value:
               [
                   {
-                      fabricIndex: 1,
+                      FabricIndex: 1,
                       fabricSensitiveInt8u: 33,
                       optionalFabricSensitiveInt8u: 34,
                       nullableFabricSensitiveInt8u: null,
@@ -195,7 +195,7 @@ tests:
                       fabricSensitiveInt8uList: [1, 2, 3, 4],
                   },
                   {
-                      fabricIndex: 1,
+                      FabricIndex: 1,
                       fabricSensitiveInt8u: 43,
                       optionalFabricSensitiveInt8u: 44,
                       nullableFabricSensitiveInt8u: null,
@@ -225,7 +225,7 @@ tests:
           value:
               [
                   {
-                      fabricIndex: 2,
+                      FabricIndex: 2,
                       fabricSensitiveInt8u: 133,
                       optionalFabricSensitiveInt8u: 134,
                       nullableFabricSensitiveInt8u: null,
@@ -245,7 +245,7 @@ tests:
                       fabricSensitiveInt8uList: [11, 12, 13, 14],
                   },
                   {
-                      fabricIndex: 2,
+                      FabricIndex: 2,
                       fabricSensitiveInt8u: 143,
                       optionalFabricSensitiveInt8u: 144,
                       nullableFabricSensitiveInt8u: null,
@@ -287,7 +287,7 @@ tests:
           value:
               [
                   {
-                      fabricIndex: 1,
+                      FabricIndex: 1,
                       fabricSensitiveInt8u: 33,
                       optionalFabricSensitiveInt8u: 34,
                       nullableFabricSensitiveInt8u: null,
@@ -307,7 +307,7 @@ tests:
                       fabricSensitiveInt8uList: [1, 2, 3, 4],
                   },
                   {
-                      fabricIndex: 1,
+                      FabricIndex: 1,
                       fabricSensitiveInt8u: 43,
                       optionalFabricSensitiveInt8u: 44,
                       nullableFabricSensitiveInt8u: null,
@@ -327,7 +327,7 @@ tests:
                       fabricSensitiveInt8uList: [2, 3, 4, 5],
                   },
                   {
-                      fabricIndex: 2,
+                      FabricIndex: 2,
                       fabricSensitiveInt8u: 0,
                       nullableFabricSensitiveInt8u: null,
                       fabricSensitiveCharString: "",
@@ -345,7 +345,7 @@ tests:
                       fabricSensitiveInt8uList: [],
                   },
                   {
-                      fabricIndex: 2,
+                      FabricIndex: 2,
                       fabricSensitiveInt8u: 0,
                       nullableFabricSensitiveInt8u: null,
                       fabricSensitiveCharString: "",
@@ -374,7 +374,7 @@ tests:
           value:
               [
                   {
-                      fabricIndex: 1,
+                      FabricIndex: 1,
                       fabricSensitiveInt8u: 0,
                       nullableFabricSensitiveInt8u: null,
                       fabricSensitiveCharString: "",
@@ -392,7 +392,7 @@ tests:
                       fabricSensitiveInt8uList: [],
                   },
                   {
-                      fabricIndex: 1,
+                      FabricIndex: 1,
                       fabricSensitiveInt8u: 0,
                       nullableFabricSensitiveInt8u: null,
                       fabricSensitiveCharString: "",
@@ -410,7 +410,7 @@ tests:
                       fabricSensitiveInt8uList: [],
                   },
                   {
-                      fabricIndex: 2,
+                      FabricIndex: 2,
                       fabricSensitiveInt8u: 133,
                       optionalFabricSensitiveInt8u: 134,
                       nullableFabricSensitiveInt8u: null,
@@ -430,7 +430,7 @@ tests:
                       fabricSensitiveInt8uList: [11, 12, 13, 14],
                   },
                   {
-                      fabricIndex: 2,
+                      FabricIndex: 2,
                       fabricSensitiveInt8u: 143,
                       optionalFabricSensitiveInt8u: 144,
                       nullableFabricSensitiveInt8u: null,
@@ -460,7 +460,7 @@ tests:
           value:
               [
                   {
-                      fabricIndex: 100,
+                      FabricIndex: 100,
                       fabricSensitiveInt8u: 53,
                       optionalFabricSensitiveInt8u: 54,
                       nullableFabricSensitiveInt8u: null,
@@ -490,7 +490,7 @@ tests:
           value:
               [
                   {
-                      fabricIndex: 2,
+                      FabricIndex: 2,
                       fabricSensitiveInt8u: 133,
                       optionalFabricSensitiveInt8u: 134,
                       nullableFabricSensitiveInt8u: null,
@@ -510,7 +510,7 @@ tests:
                       fabricSensitiveInt8uList: [11, 12, 13, 14],
                   },
                   {
-                      fabricIndex: 2,
+                      FabricIndex: 2,
                       fabricSensitiveInt8u: 143,
                       optionalFabricSensitiveInt8u: 144,
                       nullableFabricSensitiveInt8u: null,
@@ -540,7 +540,7 @@ tests:
           value:
               [
                   {
-                      fabricIndex: 1,
+                      FabricIndex: 1,
                       fabricSensitiveInt8u: 53,
                       optionalFabricSensitiveInt8u: 54,
                       nullableFabricSensitiveInt8u: null,
diff --git a/src/app/tests/suites/TestModeSelectCluster.yaml b/src/app/tests/suites/TestModeSelectCluster.yaml
index 68f8317e16580f..43ae57d4e7097d 100644
--- a/src/app/tests/suites/TestModeSelectCluster.yaml
+++ b/src/app/tests/suites/TestModeSelectCluster.yaml
@@ -45,16 +45,16 @@ tests:
       response:
           value:
               [
-                  { Label: "Black", Mode: 0, SemanticTags: [{ "value": 0 }] },
+                  { Label: "Black", Mode: 0, SemanticTags: [{ "Value": 0 }] },
                   {
                       Label: "Cappuccino",
                       Mode: 4,
-                      SemanticTags: [{ "value": 0 }],
+                      SemanticTags: [{ "Value": 0 }],
                   },
                   {
                       Label: "Espresso",
                       Mode: 7,
-                      SemanticTags: [{ "value": 0 }],
+                      SemanticTags: [{ "Value": 0 }],
                   },
               ]
           constraints:
diff --git a/src/app/tests/suites/TestMultiAdmin.yaml b/src/app/tests/suites/TestMultiAdmin.yaml
index fb05ce34893cee..b26e0b2159edc0 100644
--- a/src/app/tests/suites/TestMultiAdmin.yaml
+++ b/src/app/tests/suites/TestMultiAdmin.yaml
@@ -98,7 +98,7 @@ tests:
       attribute: "Fabrics"
       fabricFiltered: false
       response:
-          value: [{ "nodeID": nodeId }]
+          value: [{ "NodeId": nodeId }]
 
     - label: "Close Commissioning Window after failed commissioning"
       cluster: "AdministratorCommissioning"
diff --git a/zzz_generated/chip-tool/zap-generated/test/Commands.h b/zzz_generated/chip-tool/zap-generated/test/Commands.h
index bd38690509ec92..2091c79610662a 100644
--- a/zzz_generated/chip-tool/zap-generated/test/Commands.h
+++ b/zzz_generated/chip-tool/zap-generated/test/Commands.h
@@ -62616,6 +62616,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));
                     }
@@ -62627,6 +62628,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));
                     }
@@ -62638,6 +62640,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));
                     }
@@ -64155,6 +64158,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));
                 }
@@ -66160,6 +66165,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 0f605c44632231..9fd2ea0102cf72 100644
--- a/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h
+++ b/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h
@@ -97880,16 +97880,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"));
@@ -100176,6 +100188,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, @""));
                                          }
@@ -103918,6 +103933,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();