diff --git a/src/darwin/Framework/CHIPTests/MTRPerControllerStorageTests.m b/src/darwin/Framework/CHIPTests/MTRPerControllerStorageTests.m
index c629dd63dfcaee..fc233ffaebf93d 100644
--- a/src/darwin/Framework/CHIPTests/MTRPerControllerStorageTests.m
+++ b/src/darwin/Framework/CHIPTests/MTRPerControllerStorageTests.m
@@ -2297,7 +2297,6 @@ - (void)testSubscriptionPool
     [self doTestSubscriptionPoolWithSize:1 deviceOnboardingPayloads:deviceOnboardingPayloads];
     [self doTestSubscriptionPoolWithSize:2 deviceOnboardingPayloads:deviceOnboardingPayloads];
 }
-}
 
 - (MTRDevice *)getMTRDevice:(NSNumber *)deviceID
 {
@@ -2489,7 +2488,7 @@ - (void)testDataStorageUpdatesWhenRemovingEndpoints
     [self waitForExpectations:@[ attributeDataReceivedExpectation, reportEndExpectation ] timeout:60];
 
     [controller.controllerDataStore clearAllStoredClusterData];
-    NSDictionary * storedClusterDataAfterClear = [controller.controllerDataStore getStoredClusterDataForNodeID:deviceID];
+    NSDictionary<MTRClusterPath *, MTRDeviceClusterData *> * storedClusterDataAfterClear = [controller.controllerDataStore getStoredClusterDataForNodeID:deviceID];
     XCTAssertEqual(storedClusterDataAfterClear.count, 0);
 
     [controller removeDevice:device];
@@ -2614,7 +2613,7 @@ - (void)testDataStorageUpdatesWhenRemovingClusters
     [self waitForExpectations:@[ attributeDataReceivedExpectation, reportEndExpectation ] timeout:60];
 
     [controller.controllerDataStore clearAllStoredClusterData];
-    NSDictionary * storedClusterDataAfterClear = [controller.controllerDataStore getStoredClusterDataForNodeID:deviceID];
+    NSDictionary<MTRClusterPath *, MTRDeviceClusterData *> * storedClusterDataAfterClear = [controller.controllerDataStore getStoredClusterDataForNodeID:deviceID];
     XCTAssertEqual(storedClusterDataAfterClear.count, 0);
 
     [controller removeDevice:device];
@@ -2683,10 +2682,10 @@ - (void)testDataStorageUpdatesWhenRemovingAttributes
                     XCTAssertNotNil(data);
                     XCTAssertNotNil(data.attributes);
 
-                    NSDictionary * dict = [data.attributes objectForKey:@(MTRAttributeIDTypeGlobalAttributeAttributeListID)];
+                    MTRDeviceDataValueDictionary dict = [data.attributes objectForKey:@(MTRAttributeIDTypeGlobalAttributeAttributeListID)];
                     XCTAssertNotNil(dict);
 
-                    NSMutableArray * persistedAttributes = [device arrayOfNumbersFromAttributeValue:dict];
+                    NSMutableArray<NSNumber *> * persistedAttributes = [device arrayOfNumbersFromAttributeValue:dict];
                     initialTestAttributes = [device arrayOfNumbersFromAttributeValue:@ { MTRTypeKey : MTRArrayValueType, MTRValueKey : testClusterDataValue }];
                     XCTAssertNotNil(persistedAttributes);
                     for (NSNumber * attribute in initialTestAttributes) {
@@ -2770,7 +2769,7 @@ - (void)testDataStorageUpdatesWhenRemovingAttributes
     [self waitForExpectations:@[ attributeDataReceivedExpectation, reportEndExpectation ] timeout:60];
 
     [controller.controllerDataStore clearAllStoredClusterData];
-    NSDictionary * storedClusterDataAfterClear = [controller.controllerDataStore getStoredClusterDataForNodeID:deviceID];
+    NSDictionary<MTRClusterPath *, MTRDeviceClusterData *> * storedClusterDataAfterClear = [controller.controllerDataStore getStoredClusterDataForNodeID:deviceID];
     XCTAssertEqual(storedClusterDataAfterClear.count, 0);
 
     [controller removeDevice:device];