diff --git a/src/credentials/examples/GroupDataProviderExample.cpp b/src/credentials/examples/GroupDataProviderExample.cpp
index 7b63f9faf9ce12..0706c52fc55c81 100644
--- a/src/credentials/examples/GroupDataProviderExample.cpp
+++ b/src/credentials/examples/GroupDataProviderExample.cpp
@@ -37,12 +37,24 @@ class StaticGroupsProvider : public GroupDataProvider
     struct EndpointEntry : public GroupMapping
     {
         bool in_use = false;
+        void Clear()
+        {
+            endpoint = 0;
+            group    = 0;
+            in_use   = false;
+        }
     };
 
     struct KeysEntry : public KeySet
     {
         bool in_use = false;
-        uint16_t key_set_index;
+        void Clear()
+        {
+            memset(epoch_keys, 0x00, sizeof(epoch_keys));
+            key_set_index = 0;
+            num_keys_used = 0;
+            in_use        = false;
+        }
     };
 
     struct Fabric
@@ -63,8 +75,14 @@ class StaticGroupsProvider : public GroupDataProvider
             in_use       = false;
             fabric_index = 0;
             states_count = 0;
-            memset(endpoints, 0x00, sizeof(endpoints));
-            memset(keys, 0x00, sizeof(keys));
+            for (size_t i = 0; i < kEndpointEntriesMax; i++)
+            {
+                endpoints[i].Clear();
+            }
+            for (size_t i = 0; i < kKeyEntriesMax; i++)
+            {
+                keys[i].Clear();
+            }
         }
     };
 
@@ -324,7 +342,7 @@ class StaticGroupsProvider : public GroupDataProvider
         VerifyOrReturnError(mInitialized, false);
 
         Fabric * fabric = GetExistingFabric(fabric_index);
-        VerifyOrReturnError(fabric, false);
+        VerifyOrReturnError(nullptr != fabric, false);
 
         for (uint16_t i = 0; fabric && i < kEndpointEntriesMax; ++i)
         {
@@ -344,7 +362,7 @@ class StaticGroupsProvider : public GroupDataProvider
         (void) name; // Unused!
 
         Fabric * fabric = GetExistingFabricOrAllocateNew(fabric_index);
-        VerifyOrReturnError(fabric, CHIP_ERROR_NO_MEMORY);
+        VerifyOrReturnError(nullptr != fabric, CHIP_ERROR_NO_MEMORY);
 
         // Search for existing mapping
         for (uint16_t i = 0; i < kEndpointEntriesMax; ++i)
@@ -376,7 +394,7 @@ class StaticGroupsProvider : public GroupDataProvider
         VerifyOrReturnError(mInitialized, CHIP_ERROR_INTERNAL);
 
         Fabric * fabric = GetExistingFabric(fabric_index);
-        VerifyOrReturnError(fabric, CHIP_ERROR_INVALID_FABRIC_ID);
+        VerifyOrReturnError(fabric != nullptr, CHIP_ERROR_INVALID_FABRIC_ID);
 
         // Search for existing mapping
         for (uint16_t i = 0; fabric && i < kEndpointEntriesMax; ++i)
@@ -398,7 +416,7 @@ class StaticGroupsProvider : public GroupDataProvider
         VerifyOrReturnError(mInitialized, CHIP_ERROR_INTERNAL);
 
         Fabric * fabric = GetExistingFabric(fabric_index);
-        VerifyOrReturnError(fabric, CHIP_ERROR_INVALID_FABRIC_ID);
+        VerifyOrReturnError(fabric != nullptr, CHIP_ERROR_INVALID_FABRIC_ID);
 
         // Remove all mappings from fabric
         for (uint16_t i = 0; fabric && i < kEndpointEntriesMax; ++i)
@@ -426,7 +444,7 @@ class StaticGroupsProvider : public GroupDataProvider
         VerifyOrReturnError(static_cast<size_t>(state_index) <= mGroupStatesCount, CHIP_ERROR_INVALID_ARGUMENT);
 
         Fabric * fabric = GetExistingFabricOrAllocateNew(state.fabric_index);
-        VerifyOrReturnError(fabric, CHIP_ERROR_NO_MEMORY);
+        VerifyOrReturnError(nullptr != fabric, CHIP_ERROR_NO_MEMORY);
 
         StateEntry & entry = mGroupStates[state_index];
         bool appending     = static_cast<size_t>(state_index) == mGroupStatesCount;
@@ -538,7 +556,7 @@ class StaticGroupsProvider : public GroupDataProvider
         Fabric * fabric   = GetExistingFabricOrAllocateNew(fabric_index);
         KeysEntry * entry = nullptr;
 
-        VerifyOrReturnError(fabric, CHIP_ERROR_INVALID_FABRIC_ID);
+        VerifyOrReturnError(fabric != nullptr, CHIP_ERROR_INVALID_FABRIC_ID);
 
         // Search for existing, or unused entry
         for (uint16_t i = 0; fabric && i < kKeyEntriesMax; ++i)
@@ -574,7 +592,7 @@ class StaticGroupsProvider : public GroupDataProvider
     {
         VerifyOrReturnError(mInitialized, CHIP_ERROR_INTERNAL);
         Fabric * fabric = GetExistingFabric(fabric_index);
-        VerifyOrReturnError(fabric, CHIP_ERROR_INVALID_FABRIC_ID);
+        VerifyOrReturnError(fabric != nullptr, CHIP_ERROR_INVALID_FABRIC_ID);
 
         // Search for existing keys
         for (uint16_t i = 0; fabric && i < kKeyEntriesMax; ++i)
@@ -596,7 +614,7 @@ class StaticGroupsProvider : public GroupDataProvider
     {
         VerifyOrReturnError(mInitialized, CHIP_ERROR_INTERNAL);
         Fabric * fabric = GetExistingFabric(fabric_index);
-        VerifyOrReturnError(fabric, CHIP_ERROR_INVALID_FABRIC_ID);
+        VerifyOrReturnError(fabric != nullptr, CHIP_ERROR_INVALID_FABRIC_ID);
 
         // Search for existing keys
         for (uint16_t i = 0; fabric && i < kKeyEntriesMax; ++i)
@@ -623,7 +641,7 @@ class StaticGroupsProvider : public GroupDataProvider
     CHIP_ERROR RemoveFabric(chip::FabricIndex fabric_index) override
     {
         Fabric * fabric = GetExistingFabric(fabric_index);
-        VerifyOrReturnError(fabric, CHIP_ERROR_INVALID_FABRIC_ID);
+        VerifyOrReturnError(fabric != nullptr, CHIP_ERROR_INVALID_FABRIC_ID);
         // Remove group states
         for (size_t i = 0; i < kMaxNumGroupStates; ++i)
         {
@@ -632,7 +650,9 @@ class StaticGroupsProvider : public GroupDataProvider
                 RemoveGroupState(i);
             }
         }
-        // Release fabric entry
+        // Release other resources associated with the fabric entry, such as mapped
+        // endpoints (i.e. through the Groups cluster) and group key sets, both of which
+        // live in the `Fabric` data structure of this implementation.
         fabric->Clear();
         return CHIP_NO_ERROR;
     }
diff --git a/src/credentials/tests/TestGroupDataProvider.cpp b/src/credentials/tests/TestGroupDataProvider.cpp
index b14036f451e3e6..3f9c0832eea801 100644
--- a/src/credentials/tests/TestGroupDataProvider.cpp
+++ b/src/credentials/tests/TestGroupDataProvider.cpp
@@ -504,13 +504,13 @@ void TestKeys(nlTestSuite * apSuite, void * apContext)
     NL_TEST_ASSERT(apSuite, CHIP_NO_ERROR == err);
     NL_TEST_ASSERT(apSuite, keys0a.policy == keys0b.policy);
     NL_TEST_ASSERT(apSuite, keys0a.num_keys_used == keys0b.num_keys_used);
-    NL_TEST_ASSERT(apSuite, !memcmp(keys0a.epoch_keys, keys0b.epoch_keys, sizeof(keys0a.epoch_keys[0]) * keys0a.num_keys_used));
+    NL_TEST_ASSERT(apSuite, 0 == memcmp(keys0a.epoch_keys, keys0b.epoch_keys, sizeof(keys0a.epoch_keys[0]) * keys0a.num_keys_used));
 
     err = groups->GetKeySet(kFabricIndex, 1, keys1b);
     NL_TEST_ASSERT(apSuite, CHIP_NO_ERROR == err);
     NL_TEST_ASSERT(apSuite, keys1a.policy == keys1b.policy);
     NL_TEST_ASSERT(apSuite, keys1a.num_keys_used == keys1b.num_keys_used);
-    NL_TEST_ASSERT(apSuite, !memcmp(keys1a.epoch_keys, keys1b.epoch_keys, sizeof(keys1a.epoch_keys[0]) * keys1a.num_keys_used));
+    NL_TEST_ASSERT(apSuite, 0 == memcmp(keys1a.epoch_keys, keys1b.epoch_keys, sizeof(keys1a.epoch_keys[0]) * keys1a.num_keys_used));
 
     err = groups->GetKeySet(kFabricIndex, 3, keys3);
     NL_TEST_ASSERT(apSuite, CHIP_ERROR_KEY_NOT_FOUND == err);
@@ -579,7 +579,7 @@ void TestKeysIterator(nlTestSuite * apSuite, void * apContext)
     groups->Finish();
 }
 
-void TestFabrics(nlTestSuite * apSuite, void * apContext)
+void TestPerFabricData(nlTestSuite * apSuite, void * apContext)
 {
     GroupDataProvider * groups = GetGroupDataProvider();
     NL_TEST_ASSERT(apSuite, CHIP_NO_ERROR == groups->Init());
@@ -714,37 +714,43 @@ void TestFabrics(nlTestSuite * apSuite, void * apContext)
     NL_TEST_ASSERT(apSuite, CHIP_NO_ERROR == err);
     NL_TEST_ASSERT(apSuite, keys0a.policy == keys_out.policy);
     NL_TEST_ASSERT(apSuite, keys0a.num_keys_used == keys_out.num_keys_used);
-    NL_TEST_ASSERT(apSuite, !memcmp(keys0a.epoch_keys, keys_out.epoch_keys, sizeof(keys0a.epoch_keys[0]) * keys0a.num_keys_used));
+    NL_TEST_ASSERT(apSuite,
+                   0 == memcmp(keys0a.epoch_keys, keys_out.epoch_keys, sizeof(keys0a.epoch_keys[0]) * keys0a.num_keys_used));
 
     err = groups->GetKeySet(kFabricIndex2, 303, keys_out);
     NL_TEST_ASSERT(apSuite, CHIP_NO_ERROR == err);
     NL_TEST_ASSERT(apSuite, keys1a.policy == keys_out.policy);
     NL_TEST_ASSERT(apSuite, keys1a.num_keys_used == keys_out.num_keys_used);
-    NL_TEST_ASSERT(apSuite, !memcmp(keys1a.epoch_keys, keys_out.epoch_keys, sizeof(keys1a.epoch_keys[0]) * keys1a.num_keys_used));
+    NL_TEST_ASSERT(apSuite,
+                   0 == memcmp(keys1a.epoch_keys, keys_out.epoch_keys, sizeof(keys1a.epoch_keys[0]) * keys1a.num_keys_used));
 
     err = groups->GetKeySet(kFabricIndex2, 505, keys_out);
     NL_TEST_ASSERT(apSuite, CHIP_NO_ERROR == err);
     NL_TEST_ASSERT(apSuite, keys0a.policy == keys_out.policy);
     NL_TEST_ASSERT(apSuite, keys0a.num_keys_used == keys_out.num_keys_used);
-    NL_TEST_ASSERT(apSuite, !memcmp(keys0a.epoch_keys, keys_out.epoch_keys, sizeof(keys0a.epoch_keys[0]) * keys0a.num_keys_used));
+    NL_TEST_ASSERT(apSuite,
+                   0 == memcmp(keys0a.epoch_keys, keys_out.epoch_keys, sizeof(keys0a.epoch_keys[0]) * keys0a.num_keys_used));
 
     err = groups->GetKeySet(kFabricIndex1, 202, keys_out);
     NL_TEST_ASSERT(apSuite, CHIP_NO_ERROR == err);
     NL_TEST_ASSERT(apSuite, keys0a.policy == keys_out.policy);
     NL_TEST_ASSERT(apSuite, keys0a.num_keys_used == keys_out.num_keys_used);
-    NL_TEST_ASSERT(apSuite, !memcmp(keys0a.epoch_keys, keys_out.epoch_keys, sizeof(keys0a.epoch_keys[0]) * keys0a.num_keys_used));
+    NL_TEST_ASSERT(apSuite,
+                   0 == memcmp(keys0a.epoch_keys, keys_out.epoch_keys, sizeof(keys0a.epoch_keys[0]) * keys0a.num_keys_used));
 
     err = groups->GetKeySet(kFabricIndex1, 404, keys_out);
     NL_TEST_ASSERT(apSuite, CHIP_NO_ERROR == err);
     NL_TEST_ASSERT(apSuite, keys1a.policy == keys_out.policy);
     NL_TEST_ASSERT(apSuite, keys1a.num_keys_used == keys_out.num_keys_used);
-    NL_TEST_ASSERT(apSuite, !memcmp(keys1a.epoch_keys, keys_out.epoch_keys, sizeof(keys1a.epoch_keys[0]) * keys1a.num_keys_used));
+    NL_TEST_ASSERT(apSuite,
+                   0 == memcmp(keys1a.epoch_keys, keys_out.epoch_keys, sizeof(keys1a.epoch_keys[0]) * keys1a.num_keys_used));
 
     err = groups->GetKeySet(kFabricIndex1, 606, keys_out);
     NL_TEST_ASSERT(apSuite, CHIP_NO_ERROR == err);
     NL_TEST_ASSERT(apSuite, keys0a.policy == keys_out.policy);
     NL_TEST_ASSERT(apSuite, keys0a.num_keys_used == keys_out.num_keys_used);
-    NL_TEST_ASSERT(apSuite, !memcmp(keys0a.epoch_keys, keys_out.epoch_keys, sizeof(keys0a.epoch_keys[0]) * keys0a.num_keys_used));
+    NL_TEST_ASSERT(apSuite,
+                   0 == memcmp(keys0a.epoch_keys, keys_out.epoch_keys, sizeof(keys0a.epoch_keys[0]) * keys0a.num_keys_used));
 
     // Remove Fabric
     err = groups->RemoveFabric(kFabricIndex1);
@@ -770,7 +776,7 @@ void TestFabrics(nlTestSuite * apSuite, void * apContext)
     exists = groups->GroupMappingExists(kFabricIndex2, group1c);
     NL_TEST_ASSERT(apSuite, exists);
 
-    // States
+    // States: Removing the fabric shift the remaining groups states to a lower index
 
     err = groups->GetGroupState(0, state0b);
     NL_TEST_ASSERT(apSuite, CHIP_NO_ERROR == err);
@@ -793,19 +799,22 @@ void TestFabrics(nlTestSuite * apSuite, void * apContext)
     NL_TEST_ASSERT(apSuite, CHIP_NO_ERROR == err);
     NL_TEST_ASSERT(apSuite, keys0a.policy == keys_out.policy);
     NL_TEST_ASSERT(apSuite, keys0a.num_keys_used == keys_out.num_keys_used);
-    NL_TEST_ASSERT(apSuite, !memcmp(keys0a.epoch_keys, keys_out.epoch_keys, sizeof(keys0a.epoch_keys[0]) * keys0a.num_keys_used));
+    NL_TEST_ASSERT(apSuite,
+                   0 == memcmp(keys0a.epoch_keys, keys_out.epoch_keys, sizeof(keys0a.epoch_keys[0]) * keys0a.num_keys_used));
 
     err = groups->GetKeySet(kFabricIndex2, 303, keys_out);
     NL_TEST_ASSERT(apSuite, CHIP_NO_ERROR == err);
     NL_TEST_ASSERT(apSuite, keys1a.policy == keys_out.policy);
     NL_TEST_ASSERT(apSuite, keys1a.num_keys_used == keys_out.num_keys_used);
-    NL_TEST_ASSERT(apSuite, !memcmp(keys1a.epoch_keys, keys_out.epoch_keys, sizeof(keys1a.epoch_keys[0]) * keys1a.num_keys_used));
+    NL_TEST_ASSERT(apSuite,
+                   0 == memcmp(keys1a.epoch_keys, keys_out.epoch_keys, sizeof(keys1a.epoch_keys[0]) * keys1a.num_keys_used));
 
     err = groups->GetKeySet(kFabricIndex2, 505, keys_out);
     NL_TEST_ASSERT(apSuite, CHIP_NO_ERROR == err);
     NL_TEST_ASSERT(apSuite, keys0a.policy == keys_out.policy);
     NL_TEST_ASSERT(apSuite, keys0a.num_keys_used == keys_out.num_keys_used);
-    NL_TEST_ASSERT(apSuite, !memcmp(keys0a.epoch_keys, keys_out.epoch_keys, sizeof(keys0a.epoch_keys[0]) * keys0a.num_keys_used));
+    NL_TEST_ASSERT(apSuite,
+                   0 == memcmp(keys0a.epoch_keys, keys_out.epoch_keys, sizeof(keys0a.epoch_keys[0]) * keys0a.num_keys_used));
 
     err = groups->GetKeySet(kFabricIndex1, 202, keys_out);
     NL_TEST_ASSERT(apSuite, CHIP_ERROR_INVALID_FABRIC_ID == err);
@@ -855,7 +864,7 @@ const nlTest sTests[] = { NL_TEST_DEF("TestEndpoints", chip::app::TestGroups::Te
                           NL_TEST_DEF("TestStateIterator", chip::app::TestGroups::TestStateIterator),
                           NL_TEST_DEF("TestKeys", chip::app::TestGroups::TestKeys),
                           NL_TEST_DEF("TestKeysIterator", chip::app::TestGroups::TestKeysIterator),
-                          NL_TEST_DEF("TestFabrics", chip::app::TestGroups::TestFabrics),
+                          NL_TEST_DEF("TestPerFabricData", chip::app::TestGroups::TestPerFabricData),
                           NL_TEST_SENTINEL() };
 } // namespace