diff --git a/auth/src/test/java/com/firebase/ui/auth/ui/idp/AuthMethodPickerActivityTest.java b/auth/src/test/java/com/firebase/ui/auth/ui/idp/AuthMethodPickerActivityTest.java
index fb3f1cb15..63745432e 100644
--- a/auth/src/test/java/com/firebase/ui/auth/ui/idp/AuthMethodPickerActivityTest.java
+++ b/auth/src/test/java/com/firebase/ui/auth/ui/idp/AuthMethodPickerActivityTest.java
@@ -171,7 +171,7 @@ public void testCustomAuthMethodPickerLayoutWithDefaultEmail() {
     private AuthMethodPickerActivity createActivityWithCustomLayout(List<String> providers,
                                                                     AuthMethodPickerLayout layout,
                                                                     boolean hasDefaultEmail) {
-        Intent startIntent = AuthMethodPickerActivity.createIntent(
+        Intent startIntent = AuthMethodPickerActivity.Companion.createIntent(
                 ApplicationProvider.getApplicationContext(),
                 TestHelper.getFlowParameters(providers, false, layout, hasDefaultEmail));
 
@@ -183,7 +183,7 @@ private AuthMethodPickerActivity createActivityWithCustomLayout(List<String> pro
     }
 
     private AuthMethodPickerActivity createActivity(List<String> providers) {
-        Intent startIntent = AuthMethodPickerActivity.createIntent(
+        Intent startIntent = AuthMethodPickerActivity.Companion.createIntent(
                 ApplicationProvider.getApplicationContext(),
                 TestHelper.getFlowParameters(providers));
 
diff --git a/auth/src/test/java/com/firebase/ui/auth/viewmodel/CredentialManagerHandlerTest.java b/auth/src/test/java/com/firebase/ui/auth/viewmodel/CredentialManagerHandlerTest.java
index 4e5c31436..af340bc0b 100644
--- a/auth/src/test/java/com/firebase/ui/auth/viewmodel/CredentialManagerHandlerTest.java
+++ b/auth/src/test/java/com/firebase/ui/auth/viewmodel/CredentialManagerHandlerTest.java
@@ -83,6 +83,7 @@ public void testSaveCredentials_success() {
         mHandler.saveCredentials(
                 testActivity,
                 mockUser,
+                "test@mail.com",
                 "test-password"
         );
 
@@ -98,6 +99,7 @@ public void testSaveCredentials_failure() {
         mHandler.saveCredentials(
                 testActivity,
                 null, // invalid user
+                null,
                 "some-password"
         );
 
diff --git a/auth/src/test/java/com/firebase/ui/auth/viewmodel/GenericIdpSignInHandlerTest.java b/auth/src/test/java/com/firebase/ui/auth/viewmodel/GenericIdpSignInHandlerTest.java
index 30a49f895..0f7ccdfa2 100644
--- a/auth/src/test/java/com/firebase/ui/auth/viewmodel/GenericIdpSignInHandlerTest.java
+++ b/auth/src/test/java/com/firebase/ui/auth/viewmodel/GenericIdpSignInHandlerTest.java
@@ -156,7 +156,7 @@ public void testStartSignIn_normalSignInFlowWithRecoverableError_expectFailure()
                 .build();
         FirebaseAuthUserCollisionException collisionException
                 = new FirebaseAuthUserCollisionException("foo", "bar");
-        collisionException.zzb(EMAIL).zza(credential);
+        collisionException.zza(EMAIL).zza(credential);
 
         when(mMockAuth.startActivityForSignInWithProvider(any(Activity.class), any(OAuthProvider.class)))
                 .thenReturn(AutoCompleteTask.forFailure(collisionException));
@@ -260,7 +260,7 @@ public void testStartSignIn_anonymousUpgradeFlowWithConflict_expectRecoverableEr
                 .build();
         FirebaseAuthUserCollisionException collisionException
                 = new FirebaseAuthUserCollisionException("foo", "bar");
-        collisionException.zzb(EMAIL).zza(credential);
+        collisionException.zza(EMAIL).zza(credential);
         when(mMockAuth.getCurrentUser().startActivityForLinkWithProvider(
                 any(Activity.class), any(OAuthProvider.class)))
                 .thenReturn(AutoCompleteTask.forFailure(collisionException));
@@ -305,7 +305,7 @@ public void testStartSignIn_anonymousUpgradeFlowWithConflict_expectRecoverableLi
                 .build();
         FirebaseAuthUserCollisionException collisionException
                 = new FirebaseAuthUserCollisionException("foo", "bar");
-        collisionException.zzb(EMAIL).zza(credential);
+        collisionException.zza(EMAIL).zza(credential);
 
         when(mMockAuth.getCurrentUser().startActivityForLinkWithProvider(
                 any(Activity.class), any(OAuthProvider.class)))
diff --git a/auth/src/test/java/com/firebase/ui/auth/viewmodel/PhoneProviderResponseHandlerTest.java b/auth/src/test/java/com/firebase/ui/auth/viewmodel/PhoneProviderResponseHandlerTest.java
index e49954172..d64f53c6b 100644
--- a/auth/src/test/java/com/firebase/ui/auth/viewmodel/PhoneProviderResponseHandlerTest.java
+++ b/auth/src/test/java/com/firebase/ui/auth/viewmodel/PhoneProviderResponseHandlerTest.java
@@ -59,7 +59,7 @@ public class PhoneProviderResponseHandlerTest {
     public void setUp() {
         TestHelper.initialize();
         MockitoAnnotations.initMocks(this);
-        mCredential = PhoneAuthCredential.zzc("sessionInfo", "SmsCode");
+        mCredential = PhoneAuthCredential.zza("sessionInfo", "SmsCode");
 
         mHandler = new PhoneProviderResponseHandler((Application) ApplicationProvider.getApplicationContext());
         FlowParameters testParams = TestHelper.getFlowParameters(Collections.singletonList(