diff --git a/FirebaseRemoteConfig/Interop/RemoteConfigInterop.swift b/FirebaseRemoteConfig/Interop/RemoteConfigInterop.swift
index 879dfc67db09..b7988efa389e 100644
--- a/FirebaseRemoteConfig/Interop/RemoteConfigInterop.swift
+++ b/FirebaseRemoteConfig/Interop/RemoteConfigInterop.swift
@@ -16,6 +16,6 @@ import Foundation
 
 @objc(FIRRemoteConfigInterop)
 public protocol RemoteConfigInterop {
-  func registerRolloutsStateSubscriber(_ subscriber: RolloutsStateSubscriber?,
+  func registerRolloutsStateSubscriber(_ subscriber: RolloutsStateSubscriber,
                                        for namespace: String)
 }
diff --git a/FirebaseRemoteConfig/Sources/FIRRemoteConfigComponent.h b/FirebaseRemoteConfig/Sources/FIRRemoteConfigComponent.h
index 3c6ec1ec7300..e8dda531a018 100644
--- a/FirebaseRemoteConfig/Sources/FIRRemoteConfigComponent.h
+++ b/FirebaseRemoteConfig/Sources/FIRRemoteConfigComponent.h
@@ -47,6 +47,10 @@ NS_ASSUME_NONNULL_BEGIN
 /// Cached instances of Remote Config objects.
 @property(nonatomic, strong) NSMutableDictionary<NSString *, FIRRemoteConfig *> *instances;
 
+/// Clear all the component instances from the singleton which created previously, this is for
+/// testing only
++ (void)clearAllComponentInstances;
+
 /// Default method for retrieving a Remote Config instance, or creating one if it doesn't exist.
 - (FIRRemoteConfig *)remoteConfigForNamespace:(NSString *)remoteConfigNamespace;
 
diff --git a/FirebaseRemoteConfig/Sources/FIRRemoteConfigComponent.m b/FirebaseRemoteConfig/Sources/FIRRemoteConfigComponent.m
index 408050db51ad..0b6d38fc0b34 100644
--- a/FirebaseRemoteConfig/Sources/FIRRemoteConfigComponent.m
+++ b/FirebaseRemoteConfig/Sources/FIRRemoteConfigComponent.m
@@ -40,6 +40,12 @@ + (FIRRemoteConfigComponent *)getComponentForApp:(FIRApp *)app {
   return nil;
 }
 
++ (void)clearAllComponentInstances {
+  @synchronized(_componentInstances) {
+    [_componentInstances removeAllObjects];
+  }
+}
+
 /// Default method for retrieving a Remote Config instance, or creating one if it doesn't exist.
 - (FIRRemoteConfig *)remoteConfigForNamespace:(NSString *)remoteConfigNamespace {
   if (!remoteConfigNamespace) {
diff --git a/FirebaseRemoteConfig/Tests/SwiftUnit/RemoteConfigInteropTests.swift b/FirebaseRemoteConfig/Tests/SwiftUnit/RemoteConfigInteropTests.swift
index 522e88fef86f..d4610a03d65f 100644
--- a/FirebaseRemoteConfig/Tests/SwiftUnit/RemoteConfigInteropTests.swift
+++ b/FirebaseRemoteConfig/Tests/SwiftUnit/RemoteConfigInteropTests.swift
@@ -18,7 +18,7 @@ import XCTest
 class MockRCInterop: RemoteConfigInterop {
   weak var subscriber: FirebaseRemoteConfigInterop.RolloutsStateSubscriber?
   func registerRolloutsStateSubscriber(_ subscriber: FirebaseRemoteConfigInterop
-    .RolloutsStateSubscriber?,
+    .RolloutsStateSubscriber,
     for namespace: String) {
     self.subscriber = subscriber
   }
diff --git a/FirebaseRemoteConfig/Tests/Unit/FIRRemoteConfigComponentTest.m b/FirebaseRemoteConfig/Tests/Unit/FIRRemoteConfigComponentTest.m
index d7ab885d4529..de19b11f4ccb 100644
--- a/FirebaseRemoteConfig/Tests/Unit/FIRRemoteConfigComponentTest.m
+++ b/FirebaseRemoteConfig/Tests/Unit/FIRRemoteConfigComponentTest.m
@@ -32,6 +32,7 @@ - (void)tearDown {
 
   // Clear out any apps that were called with `configure`.
   [FIRApp resetApps];
+  [FIRRemoteConfigComponent clearAllComponentInstances];
 }
 
 - (void)testRCInstanceCreationAndCaching {
@@ -93,7 +94,7 @@ - (void)testInitialization {
 }
 
 - (void)testRegistersAsLibrary {
-  // Now compoment has two register, one is provider and another one is Interop
+  // Now compoments has two register, one is provider and another one is Interop
   XCTAssertEqual([FIRRemoteConfigComponent componentsToRegister].count, 2);
 
   // Configure a test FIRApp for fetching an instance of the FIRRemoteConfigProvider.
diff --git a/FirebaseRemoteConfig/Tests/Unit/RCNRemoteConfigTest.m b/FirebaseRemoteConfig/Tests/Unit/RCNRemoteConfigTest.m
index e1a23b5a695b..6bf23d0777ff 100644
--- a/FirebaseRemoteConfig/Tests/Unit/RCNRemoteConfigTest.m
+++ b/FirebaseRemoteConfig/Tests/Unit/RCNRemoteConfigTest.m
@@ -18,6 +18,7 @@
 #import <OCMock/OCMock.h>
 #import <XCTest/XCTest.h>
 
+#import "FirebaseRemoteConfig/Sources/FIRRemoteConfigComponent.h"
 #import "FirebaseRemoteConfig/Sources/Private/FIRRemoteConfig_Private.h"
 #import "FirebaseRemoteConfig/Sources/Private/RCNConfigFetch.h"
 #import "FirebaseRemoteConfig/Sources/Public/FirebaseRemoteConfig/FIRRemoteConfig.h"
@@ -286,6 +287,7 @@ __unsafe_unretained void (^handler)(FIRRemoteConfigFetchStatus status,
 
 - (void)tearDown {
   [_DBManager removeDatabaseOnDatabaseQueueAtPath:_DBPath];
+  [FIRRemoteConfigComponent clearAllComponentInstances];
   [[NSUserDefaults standardUserDefaults] removePersistentDomainForName:_userDefaultsSuiteName];
   [_DBManagerMock stopMocking];
   _DBManagerMock = nil;