diff --git a/FirebaseAuth/Sources/Swift/Backend/AuthBackend.swift b/FirebaseAuth/Sources/Swift/Backend/AuthBackend.swift
index 444a97c1c07..84bf5ec55c9 100644
--- a/FirebaseAuth/Sources/Swift/Backend/AuthBackend.swift
+++ b/FirebaseAuth/Sources/Swift/Backend/AuthBackend.swift
@@ -76,21 +76,19 @@ class AuthBackend {
     return "FirebaseAuth.iOS/\(FirebaseVersion()) \(GTMFetcherStandardUserAgentString(nil))"
   }
 
-  private static var gBackendImplementation: AuthBackendImplementation?
+  private static var realRPCBackend = AuthBackendRPCImplementation()
+  private static var gBackendImplementation = realRPCBackend
 
-  class func setDefaultBackendImplementationWithRPCIssuer(issuer: AuthBackendRPCIssuer?) {
-    let defaultImplementation = AuthBackendRPCImplementation()
-    if let issuer = issuer {
-      defaultImplementation.rpcIssuer = issuer
-    }
-    gBackendImplementation = defaultImplementation
+  class func setTestRPCIssuer(issuer: AuthBackendRPCIssuer) {
+    gBackendImplementation.rpcIssuer = issuer
+  }
+
+  class func resetRPCIssuer() {
+    gBackendImplementation.rpcIssuer = realRPCBackend.rpcIssuer
   }
 
   class func implementation() -> AuthBackendImplementation {
-    if gBackendImplementation == nil {
-      gBackendImplementation = AuthBackendRPCImplementation()
-    }
-    return gBackendImplementation!
+    return gBackendImplementation
   }
 
   class func call<T: AuthRPCRequest>(with request: T) async throws -> T.Response {
diff --git a/FirebaseAuth/Tests/Unit/FIROAuthProviderTests.m b/FirebaseAuth/Tests/Unit/FIROAuthProviderTests.m
index b5921312caa..0a8e7d30b05 100644
--- a/FirebaseAuth/Tests/Unit/FIROAuthProviderTests.m
+++ b/FirebaseAuth/Tests/Unit/FIROAuthProviderTests.m
@@ -22,11 +22,6 @@
 @import FirebaseAuth;
 @import FirebaseCore;
 
-/** @var kExpectationTimeout
-    @brief The maximum time waiting for expectations to fulfill.
- */
-static const NSTimeInterval kExpectationTimeout = 1;
-
 /** @var kFakeAuthorizedDomain
     @brief A fake authorized domain for the app.
  */
@@ -162,32 +157,6 @@ - (void)testObtainingOAuthCredentialWithIDToken {
   XCTAssertEqualObjects(OAuthCredential.IDToken, kFakeIDToken);
 }
 
-/** @fn testGetCredentialWithUIDelegateWithClientIDOnMainThread
-    @brief Verifies @c getCredentialWithUIDelegate:completion: calls its completion handler on the
-   main thread. Regression test for  firebase/FirebaseUI-iOS#1199.
- */
-- (void)testGetCredentialWithUIDelegateWithClientIDOnMainThread {
-  XCTestExpectation *expectation = [self expectationWithDescription:@"callback"];
-
-  FIROptions *options =
-      [[FIROptions alloc] initWithGoogleAppID:@"0:0000000000000:ios:0000000000000000"
-                                  GCMSenderID:@"00000000000000000-00000000000-000000000"];
-  options.APIKey = kFakeAPIKey;
-  options.projectID = @"myProjectID";
-  options.clientID = kFakeClientID;
-  [FIRApp configureWithName:@"objAppName" options:options];
-  FIRAuth *auth = [FIRAuth authWithApp:[FIRApp appNamed:@"objAppName"]];
-  [auth setMainBundleUrlTypes:@[ @{@"CFBundleURLSchemes" : @[ kFakeReverseClientID ]} ]];
-
-  FIROAuthProvider *provider = [FIROAuthProvider providerWithProviderID:kFakeProviderID auth:auth];
-  [provider getCredentialWithUIDelegate:nil
-                             completion:^(FIRAuthCredential *_Nullable credential,
-                                          NSError *_Nullable error) {
-                               XCTAssertTrue([NSThread isMainThread]);
-                               [expectation fulfill];
-                             }];
-  [self waitForExpectationsWithTimeout:kExpectationTimeout handler:nil];
-}
 @end
 
 #endif  // TARGET_OS_IOS
diff --git a/FirebaseAuth/Tests/Unit/RPCBaseTests.swift b/FirebaseAuth/Tests/Unit/RPCBaseTests.swift
index cca4e1ee3cb..567b3aa4bbd 100644
--- a/FirebaseAuth/Tests/Unit/RPCBaseTests.swift
+++ b/FirebaseAuth/Tests/Unit/RPCBaseTests.swift
@@ -72,13 +72,13 @@ class RPCBaseTests: XCTestCase {
 
   override func setUp() {
     rpcIssuer = FakeBackendRPCIssuer()
-    AuthBackend.setDefaultBackendImplementationWithRPCIssuer(issuer: rpcIssuer)
+    AuthBackend.setTestRPCIssuer(issuer: rpcIssuer)
     rpcImplementation = AuthBackend.implementation()
   }
 
   override func tearDown() {
     rpcIssuer = nil
-    AuthBackend.setDefaultBackendImplementationWithRPCIssuer(issuer: nil)
+    AuthBackend.resetRPCIssuer()
   }
 
   /** @fn checkRequest