diff --git a/BraintreeCore/src/androidTest/java/com/braintreepayments/api/AnalyticsClientTest.java b/BraintreeCore/src/androidTest/java/com/braintreepayments/api/AnalyticsClientTest.java
index 75cb26566c..929ef9bf5a 100644
--- a/BraintreeCore/src/androidTest/java/com/braintreepayments/api/AnalyticsClientTest.java
+++ b/BraintreeCore/src/androidTest/java/com/braintreepayments/api/AnalyticsClientTest.java
@@ -14,7 +14,6 @@
 import androidx.work.testing.WorkManagerTestInitHelper;
 
 import org.junit.Before;
-import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
diff --git a/BraintreeCore/src/androidTest/java/com/braintreepayments/api/ApiClientTest.java b/BraintreeCore/src/androidTest/java/com/braintreepayments/api/ApiClientTest.java
index 2daae5fab7..18e04be9fc 100644
--- a/BraintreeCore/src/androidTest/java/com/braintreepayments/api/ApiClientTest.java
+++ b/BraintreeCore/src/androidTest/java/com/braintreepayments/api/ApiClientTest.java
@@ -1,6 +1,10 @@
 package com.braintreepayments.api;
 
-import androidx.appcompat.app.AppCompatActivity;
+import static com.braintreepayments.api.Assertions.assertIsANonce;
+import static junit.framework.Assert.fail;
+
+import android.content.Context;
+
 import androidx.test.core.app.ApplicationProvider;
 import androidx.test.internal.runner.junit4.AndroidJUnit4ClassRunner;
 
@@ -8,17 +12,11 @@
 import org.json.JSONObject;
 import org.junit.Before;
 import org.junit.Ignore;
-import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
 import java.util.concurrent.CountDownLatch;
 
-import static com.braintreepayments.api.Assertions.assertIsANonce;
-import static junit.framework.Assert.fail;
-
-import android.content.Context;
-
 @RunWith(AndroidJUnit4ClassRunner.class)
 public class ApiClientTest {
 
diff --git a/BraintreeCore/src/androidTest/java/com/braintreepayments/api/BraintreeClientTest.java b/BraintreeCore/src/androidTest/java/com/braintreepayments/api/BraintreeClientTest.java
index 3a359dba9e..d7ec2db373 100644
--- a/BraintreeCore/src/androidTest/java/com/braintreepayments/api/BraintreeClientTest.java
+++ b/BraintreeCore/src/androidTest/java/com/braintreepayments/api/BraintreeClientTest.java
@@ -1,20 +1,19 @@
 package com.braintreepayments.api;
 
+import static junit.framework.Assert.assertNotNull;
+
+import android.content.Context;
+
 import androidx.annotation.Nullable;
 import androidx.test.core.app.ApplicationProvider;
 import androidx.test.internal.runner.junit4.AndroidJUnit4ClassRunner;
 
 import org.junit.Before;
-import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
 import java.util.concurrent.CountDownLatch;
 
-import static junit.framework.Assert.assertNotNull;
-
-import android.content.Context;
-
 @RunWith(AndroidJUnit4ClassRunner.class)
 public class BraintreeClientTest {
 
diff --git a/BraintreeCore/src/main/java/com/braintreepayments/api/BraintreeGraphQLResponseParser.kt b/BraintreeCore/src/main/java/com/braintreepayments/api/BraintreeGraphQLResponseParser.kt
index d6a011cde7..b5e1a679bd 100644
--- a/BraintreeCore/src/main/java/com/braintreepayments/api/BraintreeGraphQLResponseParser.kt
+++ b/BraintreeCore/src/main/java/com/braintreepayments/api/BraintreeGraphQLResponseParser.kt
@@ -24,8 +24,8 @@ internal class BraintreeGraphQLResponseParser @VisibleForTesting constructor(
         val errors = JSONObject(response).optJSONArray(GraphQLConstants.Keys.ERRORS)
         if (errors == null) return response
 
-        for (i in 0 until errors!!.length()) {
-            val error = errors!!.getJSONObject(i)
+        for (i in 0 until errors.length()) {
+            val error = errors.getJSONObject(i)
             val extensions = error.optJSONObject(GraphQLConstants.Keys.EXTENSIONS)
             val message = Json.optString(
                 error,
diff --git a/BraintreeCore/src/main/java/com/braintreepayments/api/DeviceInspector.kt b/BraintreeCore/src/main/java/com/braintreepayments/api/DeviceInspector.kt
index 75e7f51967..ef24799e6b 100644
--- a/BraintreeCore/src/main/java/com/braintreepayments/api/DeviceInspector.kt
+++ b/BraintreeCore/src/main/java/com/braintreepayments/api/DeviceInspector.kt
@@ -30,7 +30,6 @@ class DeviceInspector @VisibleForTesting internal constructor(
         File("/system/app/Superuser.apk")
     )
 
-    @VisibleForTesting
     internal fun getDeviceMetadata(
         context: Context?,
         sessionId: String?,
diff --git a/BraintreeCore/src/test/java/com/braintreepayments/api/BraintreeClientUnitTest.kt b/BraintreeCore/src/test/java/com/braintreepayments/api/BraintreeClientUnitTest.kt
index ff06a595d9..dbdb32c151 100644
--- a/BraintreeCore/src/test/java/com/braintreepayments/api/BraintreeClientUnitTest.kt
+++ b/BraintreeCore/src/test/java/com/braintreepayments/api/BraintreeClientUnitTest.kt
@@ -510,7 +510,7 @@ class BraintreeClientUnitTest {
             manifestValidator.isUrlSchemeDeclaredInAndroidManifest(
                 applicationContext,
                 "a-url-scheme",
-                any()
+                FragmentActivity::class.java
             )
         } returns true
 
diff --git a/BraintreeCore/src/test/java/com/braintreepayments/api/BraintreeGraphQLResponseParserUnitTest.kt b/BraintreeCore/src/test/java/com/braintreepayments/api/BraintreeGraphQLResponseParserUnitTest.kt
index 5d300fd039..c333036476 100644
--- a/BraintreeCore/src/test/java/com/braintreepayments/api/BraintreeGraphQLResponseParserUnitTest.kt
+++ b/BraintreeCore/src/test/java/com/braintreepayments/api/BraintreeGraphQLResponseParserUnitTest.kt
@@ -4,9 +4,7 @@ import io.mockk.every
 import io.mockk.mockk
 import org.junit.Assert.*
 import org.junit.Before
-import org.junit.Rule
 import org.junit.Test
-import org.junit.rules.ExpectedException
 import java.net.HttpURLConnection
 
 class BraintreeGraphQLResponseParserUnitTest {
@@ -14,10 +12,6 @@ class BraintreeGraphQLResponseParserUnitTest {
     private lateinit var urlConnection: HttpURLConnection
     private lateinit var baseParser: BaseHttpResponseParser
 
-    @Rule
-    @JvmField
-    var exceptionRule: ExpectedException = ExpectedException.none()
-
     @Before
     fun beforeEach() {
         baseParser = mockk()
@@ -38,14 +32,16 @@ class BraintreeGraphQLResponseParserUnitTest {
     @Test
     @Throws(Exception::class)
     fun parse_propagatesExceptionsByDefault() {
-        exceptionRule.expect(Exception::class.java)
-        exceptionRule.expectMessage("error")
-
         val exception = Exception("error")
         every { baseParser.parse(123, urlConnection) } throws exception
 
         val sut = BraintreeGraphQLResponseParser(baseParser)
-        sut.parse(123, urlConnection)
+        try {
+            sut.parse(123, urlConnection)
+            fail("should not get here")
+        } catch (actualException: Exception) {
+            assertSame(exception, actualException)
+        }
     }
 
     @Test
diff --git a/BraintreeCore/src/test/java/com/braintreepayments/api/BraintreeHttpResponseParserUnitTest.kt b/BraintreeCore/src/test/java/com/braintreepayments/api/BraintreeHttpResponseParserUnitTest.kt
index 516e78ead7..041f9d9780 100644
--- a/BraintreeCore/src/test/java/com/braintreepayments/api/BraintreeHttpResponseParserUnitTest.kt
+++ b/BraintreeCore/src/test/java/com/braintreepayments/api/BraintreeHttpResponseParserUnitTest.kt
@@ -2,11 +2,9 @@ package com.braintreepayments.api
 
 import io.mockk.every
 import io.mockk.mockk
-import org.junit.Assert.assertEquals
+import org.junit.Assert.*
 import org.junit.Before
-import org.junit.Rule
 import org.junit.Test
-import org.junit.rules.ExpectedException
 import java.net.HttpURLConnection
 
 class BraintreeHttpResponseParserUnitTest {
@@ -14,10 +12,6 @@ class BraintreeHttpResponseParserUnitTest {
     private lateinit var urlConnection: HttpURLConnection
     private lateinit var baseParser: BaseHttpResponseParser
 
-    @Rule
-    @JvmField
-    var exceptionRule: ExpectedException = ExpectedException.none()
-
     @Before
     fun beforeEach() {
         baseParser = mockk()
@@ -36,34 +30,36 @@ class BraintreeHttpResponseParserUnitTest {
     @Test
     @Throws(Exception::class)
     fun parse_propagatesExceptionsByDefault() {
-        exceptionRule.expect(Exception::class.java)
-        exceptionRule.expectMessage("error")
-
         val exception = Exception("error")
         every { baseParser.parse(123, urlConnection) } throws exception
 
         val sut = BraintreeHttpResponseParser(baseParser)
-        sut.parse(123, urlConnection)
+        try {
+            sut.parse(123, urlConnection)
+            fail("should not get here")
+        } catch (actualException: Exception) {
+            assertSame(exception, actualException)
+        }
     }
 
     @Test
     @Throws(Exception::class)
     fun parse_whenBaseParserThrowsAuthorizationException_throwsNewAuthorizationExceptionWithMessage() {
-        exceptionRule.expect(AuthorizationException::class.java)
-        exceptionRule.expectMessage("There was an error")
-
         val authorizationException = AuthorizationException(Fixtures.ERROR_RESPONSE)
         every { baseParser.parse(123, urlConnection) } throws authorizationException
 
         val sut = BraintreeHttpResponseParser(baseParser)
-        sut.parse(123, urlConnection)
+        try {
+            sut.parse(123, urlConnection)
+            fail("should not get here")
+        } catch (actualException: AuthorizationException) {
+            assertEquals("There was an error", actualException.message)
+        }
     }
 
     @Test
     @Throws(Exception::class)
     fun parse_whenBaseParserThrowsUnprocessibleEntityException_throwsErrorWithResponseException() {
-        exceptionRule.expect(ErrorWithResponse::class.java)
-        exceptionRule.expectMessage("There was an error")
         val unprocessableEntityException = UnprocessableEntityException(Fixtures.ERROR_RESPONSE)
 
         every {
@@ -71,6 +67,11 @@ class BraintreeHttpResponseParserUnitTest {
         } throws unprocessableEntityException
 
         val sut = BraintreeHttpResponseParser(baseParser)
-        sut.parse(123, urlConnection)
+        try {
+            sut.parse(123, urlConnection)
+            fail("should not get here")
+        } catch (actualException: ErrorWithResponse) {
+            assertEquals("There was an error", actualException.message)
+        }
     }
 }
\ No newline at end of file
diff --git a/BraintreeCore/src/test/java/com/braintreepayments/api/UUIDHelperUnitTest.kt b/BraintreeCore/src/test/java/com/braintreepayments/api/UUIDHelperUnitTest.kt
index fca9dab46e..162d62af06 100644
--- a/BraintreeCore/src/test/java/com/braintreepayments/api/UUIDHelperUnitTest.kt
+++ b/BraintreeCore/src/test/java/com/braintreepayments/api/UUIDHelperUnitTest.kt
@@ -3,8 +3,8 @@ package com.braintreepayments.api
 import io.mockk.every
 import io.mockk.mockk
 import io.mockk.verify
-import junit.framework.Assert.assertEquals
-import junit.framework.Assert.assertNotNull
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertNotNull
 
 import org.junit.Test
 import java.util.*
diff --git a/BraintreeCore/src/test/java/com/braintreepayments/api/VisaCheckoutConfigurationUnitTest.kt b/BraintreeCore/src/test/java/com/braintreepayments/api/VisaCheckoutConfigurationUnitTest.kt
index 8ebf630989..081430ddb4 100644
--- a/BraintreeCore/src/test/java/com/braintreepayments/api/VisaCheckoutConfigurationUnitTest.kt
+++ b/BraintreeCore/src/test/java/com/braintreepayments/api/VisaCheckoutConfigurationUnitTest.kt
@@ -37,7 +37,7 @@ class VisaCheckoutConfigurationUnitTest {
         assertFalse(sut.isEnabled)
         assertEquals("", sut.apiKey)
         assertEquals("", sut.externalClientId)
-        assertTrue(sut.acceptedCardBrands!!.isEmpty())
+        assertTrue(sut.acceptedCardBrands.isEmpty())
     }
 
     @Test
@@ -46,6 +46,6 @@ class VisaCheckoutConfigurationUnitTest {
         assertFalse(sut.isEnabled)
         assertEquals("", sut.apiKey)
         assertEquals("", sut.externalClientId)
-        assertTrue(sut.acceptedCardBrands!!.isEmpty())
+        assertTrue(sut.acceptedCardBrands.isEmpty())
     }
 }
\ No newline at end of file
diff --git a/BraintreeDataCollector/src/androidTest/java/com/braintreepayments/api/DataCollectorTest.java b/BraintreeDataCollector/src/androidTest/java/com/braintreepayments/api/DataCollectorTest.java
index 718d182a24..bc8298aa82 100644
--- a/BraintreeDataCollector/src/androidTest/java/com/braintreepayments/api/DataCollectorTest.java
+++ b/BraintreeDataCollector/src/androidTest/java/com/braintreepayments/api/DataCollectorTest.java
@@ -1,10 +1,15 @@
 package com.braintreepayments.api;
 
+import static junit.framework.Assert.assertEquals;
+import static junit.framework.Assert.assertFalse;
+import static junit.framework.Assert.assertNotNull;
+import static junit.framework.Assert.assertNull;
+import static junit.framework.Assert.fail;
+
 import android.content.Context;
 import android.text.TextUtils;
 
 import androidx.annotation.Nullable;
-import androidx.appcompat.app.AppCompatActivity;
 import androidx.test.core.app.ApplicationProvider;
 import androidx.test.internal.runner.junit4.AndroidJUnit4ClassRunner;
 
@@ -14,18 +19,11 @@
 import org.json.JSONObject;
 import org.junit.After;
 import org.junit.Before;
-import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
 import java.util.concurrent.CountDownLatch;
 
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertFalse;
-import static junit.framework.Assert.assertNotNull;
-import static junit.framework.Assert.assertNull;
-import static junit.framework.Assert.fail;
-
 @RunWith(AndroidJUnit4ClassRunner.class)
 public class DataCollectorTest {
 
diff --git a/Card/src/androidTest/java/com/braintreepayments/api/CardClientTest.java b/Card/src/androidTest/java/com/braintreepayments/api/CardClientTest.java
index 6fdb8f5850..cdaf59264d 100644
--- a/Card/src/androidTest/java/com/braintreepayments/api/CardClientTest.java
+++ b/Card/src/androidTest/java/com/braintreepayments/api/CardClientTest.java
@@ -1,12 +1,18 @@
 package com.braintreepayments.api;
 
+import static com.braintreepayments.api.CardNumber.VISA;
+import static com.braintreepayments.api.Fixtures.TOKENIZATION_KEY;
+import static junit.framework.Assert.assertEquals;
+import static junit.framework.Assert.assertFalse;
+import static junit.framework.Assert.assertNotNull;
+import static junit.framework.Assert.assertTrue;
+
 import android.content.Context;
 
 import androidx.test.core.app.ApplicationProvider;
 
 import org.json.JSONException;
 import org.junit.Ignore;
-import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
@@ -15,13 +21,6 @@
 import java.util.Collection;
 import java.util.concurrent.CountDownLatch;
 
-import static com.braintreepayments.api.CardNumber.VISA;
-import static com.braintreepayments.api.Fixtures.TOKENIZATION_KEY;
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertFalse;
-import static junit.framework.Assert.assertNotNull;
-import static junit.framework.Assert.assertTrue;
-
 @RunWith(Parameterized.class)
 public class CardClientTest {
 
diff --git a/Card/src/main/java/com/braintreepayments/api/AuthenticationInsight.java b/Card/src/main/java/com/braintreepayments/api/AuthenticationInsight.java
index fb8c8320f8..c9c3ed6bde 100644
--- a/Card/src/main/java/com/braintreepayments/api/AuthenticationInsight.java
+++ b/Card/src/main/java/com/braintreepayments/api/AuthenticationInsight.java
@@ -4,7 +4,6 @@
 import android.os.Parcelable;
 
 import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
 
 import org.json.JSONObject;
 
diff --git a/Demo/src/main/java/com/braintreepayments/demo/BraintreeClientCallback.java b/Demo/src/main/java/com/braintreepayments/demo/BraintreeClientCallback.java
index 8b09704708..3515ac0254 100644
--- a/Demo/src/main/java/com/braintreepayments/demo/BraintreeClientCallback.java
+++ b/Demo/src/main/java/com/braintreepayments/demo/BraintreeClientCallback.java
@@ -1,10 +1,10 @@
 package com.braintreepayments.demo;
 
 import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
 
 import com.braintreepayments.api.BraintreeClient;
 
+// NEXT MAJOR VERSION: remove
 public interface BraintreeClientCallback {
     void onResult(@NonNull BraintreeClient braintreeClient);
 }
diff --git a/Demo/src/main/java/com/braintreepayments/demo/CardFragment.java b/Demo/src/main/java/com/braintreepayments/demo/CardFragment.java
index 129bb072ab..a3d39e5142 100644
--- a/Demo/src/main/java/com/braintreepayments/demo/CardFragment.java
+++ b/Demo/src/main/java/com/braintreepayments/demo/CardFragment.java
@@ -1,5 +1,8 @@
 package com.braintreepayments.demo;
 
+import static android.view.View.GONE;
+import static android.view.View.VISIBLE;
+
 import android.app.ProgressDialog;
 import android.os.Bundle;
 import android.text.TextUtils;
@@ -14,18 +17,16 @@
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.fragment.app.FragmentActivity;
-import androidx.lifecycle.ViewModelProvider;
 import androidx.navigation.fragment.NavHostFragment;
 
 import com.braintreepayments.api.AmericanExpressClient;
 import com.braintreepayments.api.AmericanExpressRewardsBalance;
 import com.braintreepayments.api.BraintreeClient;
-import com.braintreepayments.api.PaymentMethodNonce;
-import com.braintreepayments.api.BrowserSwitchResult;
 import com.braintreepayments.api.Card;
 import com.braintreepayments.api.CardClient;
 import com.braintreepayments.api.CardNonce;
 import com.braintreepayments.api.DataCollector;
+import com.braintreepayments.api.PaymentMethodNonce;
 import com.braintreepayments.api.ThreeDSecureAdditionalInformation;
 import com.braintreepayments.api.ThreeDSecureClient;
 import com.braintreepayments.api.ThreeDSecureListener;
@@ -48,9 +49,6 @@
 import com.braintreepayments.cardform.view.CardForm;
 import com.google.android.material.textfield.TextInputLayout;
 
-import static android.view.View.GONE;
-import static android.view.View.VISIBLE;
-
 public class CardFragment extends BaseFragment implements OnCardFormSubmitListener, OnCardFormFieldFocusedListener, ThreeDSecureListener {
 
     private static final String EXTRA_THREE_D_SECURE_REQUESTED = "com.braintreepayments.demo.EXTRA_THREE_D_SECURE_REQUESTED";
diff --git a/Demo/src/main/java/com/braintreepayments/demo/DemoActivity.java b/Demo/src/main/java/com/braintreepayments/demo/DemoActivity.java
index 6bc3f7e26e..824860bc28 100644
--- a/Demo/src/main/java/com/braintreepayments/demo/DemoActivity.java
+++ b/Demo/src/main/java/com/braintreepayments/demo/DemoActivity.java
@@ -3,7 +3,6 @@
 import android.app.AlertDialog;
 import android.content.Intent;
 import android.content.SharedPreferences;
-import android.content.pm.PackageManager;
 import android.os.Bundle;
 import android.view.Menu;
 import android.view.MenuItem;
@@ -15,7 +14,6 @@
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.widget.Toolbar;
 import androidx.core.app.ActivityCompat;
-import androidx.core.content.ContextCompat;
 import androidx.fragment.app.Fragment;
 import androidx.navigation.NavController;
 import androidx.navigation.fragment.NavHostFragment;
@@ -27,8 +25,6 @@
 import java.util.Arrays;
 import java.util.List;
 
-import static android.Manifest.permission.WRITE_EXTERNAL_STORAGE;
-
 public class DemoActivity extends AppCompatActivity implements ActivityCompat.OnRequestPermissionsResultCallback, ActionBar.OnNavigationListener {
 
     private BraintreeClient braintreeClient;
@@ -126,17 +122,18 @@ public boolean onCreateOptionsMenu(Menu menu) {
 
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
-        switch (item.getItemId()) {
-            case R.id.reset:
-                performReset();
-                return true;
-            case R.id.settings:
-                NavController navController = getNavController();
-                navController.navigate(R.id.open_settings_fragment);
-                return true;
-            default:
-                return false;
+        boolean didHandleSelection = false;
+
+        int itemId = item.getItemId();
+        if (itemId == R.id.reset) {
+            performReset();
+            didHandleSelection = true;
+        } else if (itemId == R.id.settings) {
+            NavController navController = getNavController();
+            navController.navigate(R.id.open_settings_fragment);
+            didHandleSelection = true;
         }
+        return didHandleSelection;
     }
 
     @Override
diff --git a/Demo/src/main/java/com/braintreepayments/demo/DisplayNonceFragment.java b/Demo/src/main/java/com/braintreepayments/demo/DisplayNonceFragment.java
index 7651d4b7bf..80c17c1e59 100644
--- a/Demo/src/main/java/com/braintreepayments/demo/DisplayNonceFragment.java
+++ b/Demo/src/main/java/com/braintreepayments/demo/DisplayNonceFragment.java
@@ -8,7 +8,6 @@
 import android.widget.TextView;
 
 import androidx.fragment.app.Fragment;
-import androidx.navigation.NavDirections;
 import androidx.navigation.fragment.NavHostFragment;
 
 import com.braintreepayments.api.PaymentMethodNonce;
diff --git a/Demo/src/main/java/com/braintreepayments/demo/PayPalFragment.java b/Demo/src/main/java/com/braintreepayments/demo/PayPalFragment.java
index 45c10943e6..b033f9fa52 100644
--- a/Demo/src/main/java/com/braintreepayments/demo/PayPalFragment.java
+++ b/Demo/src/main/java/com/braintreepayments/demo/PayPalFragment.java
@@ -21,8 +21,6 @@
 import com.braintreepayments.api.PayPalListener;
 import com.braintreepayments.api.PaymentMethodNonce;
 
-import java.util.Random;
-
 public class PayPalFragment extends BaseFragment implements PayPalListener {
 
     private String deviceData;
diff --git a/Demo/src/main/java/com/braintreepayments/demo/PayPalNativeCheckoutRequestFactory.java b/Demo/src/main/java/com/braintreepayments/demo/PayPalNativeCheckoutRequestFactory.java
index b113e29765..985665c1b5 100644
--- a/Demo/src/main/java/com/braintreepayments/demo/PayPalNativeCheckoutRequestFactory.java
+++ b/Demo/src/main/java/com/braintreepayments/demo/PayPalNativeCheckoutRequestFactory.java
@@ -2,9 +2,8 @@
 
 import android.content.Context;
 
-import com.braintreepayments.api.PayPalNativeCheckoutRequest;
 import com.braintreepayments.api.PayPalNativeCheckoutPaymentIntent;
-import com.braintreepayments.api.PayPalNativeRequest;
+import com.braintreepayments.api.PayPalNativeCheckoutRequest;
 import com.braintreepayments.api.PayPalNativeCheckoutVaultRequest;
 import com.braintreepayments.api.PostalAddress;
 
diff --git a/Demo/src/main/java/com/braintreepayments/demo/RandomDollarAmount.java b/Demo/src/main/java/com/braintreepayments/demo/RandomDollarAmount.java
index 87af238143..50be1343ec 100644
--- a/Demo/src/main/java/com/braintreepayments/demo/RandomDollarAmount.java
+++ b/Demo/src/main/java/com/braintreepayments/demo/RandomDollarAmount.java
@@ -1,5 +1,6 @@
 package com.braintreepayments.demo;
 
+import java.util.Locale;
 import java.util.Random;
 
 public class RandomDollarAmount {
@@ -10,6 +11,6 @@ private RandomDollarAmount() {}
 
     public static String getNext() {
         int dollars = random.nextInt(100);
-        return String.format("%d.00", dollars);
+        return String.format(Locale.getDefault(), "%d.00", dollars);
     }
 }
diff --git a/Demo/src/main/java/com/braintreepayments/demo/SEPADirectDebitTestHelper.java b/Demo/src/main/java/com/braintreepayments/demo/SEPADirectDebitTestHelper.java
index 9f28e59235..76c922b141 100644
--- a/Demo/src/main/java/com/braintreepayments/demo/SEPADirectDebitTestHelper.java
+++ b/Demo/src/main/java/com/braintreepayments/demo/SEPADirectDebitTestHelper.java
@@ -3,6 +3,7 @@
 import java.math.BigInteger;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Locale;
 import java.util.concurrent.ThreadLocalRandom;
 
 /**
@@ -54,6 +55,6 @@ private static String checksum(long bankCode, String branchCode, String accountN
         BigInteger bban = new BigInteger(bbanString);
         BigInteger modResult = bban.mod(BigInteger.valueOf(97));
         BigInteger subtractionResult = BigInteger.valueOf(98).subtract(modResult);
-        return String.format("%02d", subtractionResult);
+        return String.format(Locale.getDefault(), "%02d", subtractionResult);
     }
 }
diff --git a/Demo/src/main/java/com/braintreepayments/demo/SamsungPayFragment.java b/Demo/src/main/java/com/braintreepayments/demo/SamsungPayFragment.java
index ce838e0e75..29b3ec4b6d 100644
--- a/Demo/src/main/java/com/braintreepayments/demo/SamsungPayFragment.java
+++ b/Demo/src/main/java/com/braintreepayments/demo/SamsungPayFragment.java
@@ -60,7 +60,7 @@ private void setupSamsungPayButton() {
                 } else {
                     if (error instanceof SamsungPayException) {
                         SamsungPayException samsungPayError = (SamsungPayException) error;
-                        @SamsungPayError int errorCode = samsungPayError.getErrorCode();
+                        int errorCode = samsungPayError.getErrorCode();
                         switch (errorCode) {
                             case SamsungPayError.SAMSUNG_PAY_APP_NEEDS_UPDATE:
                                 dialogMessage = "Need to update Samsung Pay app...";
diff --git a/Demo/src/main/java/com/braintreepayments/demo/VenmoFragment.java b/Demo/src/main/java/com/braintreepayments/demo/VenmoFragment.java
index 635c37c091..9db4aa5eea 100644
--- a/Demo/src/main/java/com/braintreepayments/demo/VenmoFragment.java
+++ b/Demo/src/main/java/com/braintreepayments/demo/VenmoFragment.java
@@ -10,7 +10,6 @@
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.fragment.app.FragmentActivity;
-import androidx.lifecycle.ViewModelProvider;
 import androidx.navigation.NavDirections;
 import androidx.navigation.fragment.NavHostFragment;
 
@@ -18,10 +17,8 @@
 import com.braintreepayments.api.VenmoAccountNonce;
 import com.braintreepayments.api.VenmoClient;
 import com.braintreepayments.api.VenmoListener;
-import com.braintreepayments.api.VenmoOnActivityResultCallback;
 import com.braintreepayments.api.VenmoPaymentMethodUsage;
 import com.braintreepayments.api.VenmoRequest;
-import com.braintreepayments.api.VenmoTokenizeAccountCallback;
 
 public class VenmoFragment extends BaseFragment implements VenmoListener {
 
diff --git a/Demo/src/main/java/com/braintreepayments/demo/internal/ApiClient.java b/Demo/src/main/java/com/braintreepayments/demo/internal/ApiClient.java
index c720936f39..b9e4ca9ae1 100644
--- a/Demo/src/main/java/com/braintreepayments/demo/internal/ApiClient.java
+++ b/Demo/src/main/java/com/braintreepayments/demo/internal/ApiClient.java
@@ -3,18 +3,11 @@
 import com.braintreepayments.demo.ClientTokenRequest;
 import com.braintreepayments.demo.TransactionRequest;
 import com.braintreepayments.demo.models.ClientToken;
-import com.braintreepayments.demo.models.Nonce;
-import com.braintreepayments.demo.models.PaymentMethodToken;
 import com.braintreepayments.demo.models.Transaction;
 
 import retrofit.Callback;
 import retrofit.http.Body;
-import retrofit.http.Field;
-import retrofit.http.FormUrlEncoded;
-import retrofit.http.GET;
 import retrofit.http.POST;
-import retrofit.http.Path;
-import retrofit.http.Query;
 
 public interface ApiClient {
 
diff --git a/Demo/src/main/java/com/braintreepayments/demo/models/ClientToken.java b/Demo/src/main/java/com/braintreepayments/demo/models/ClientToken.java
index b71a9654fc..f3c5e83f1a 100644
--- a/Demo/src/main/java/com/braintreepayments/demo/models/ClientToken.java
+++ b/Demo/src/main/java/com/braintreepayments/demo/models/ClientToken.java
@@ -1,12 +1,8 @@
 package com.braintreepayments.demo.models;
 
-import com.google.gson.annotations.SerializedName;
-
 public class ClientToken {
 
-
     private String value;
-
     public String getValue() {
         return value;
     }
diff --git a/Demo/src/main/java/com/braintreepayments/demo/views/SummaryEditTestPreference.java b/Demo/src/main/java/com/braintreepayments/demo/views/SummaryEditTestPreference.java
index f7895fb0c5..bc06a0634e 100644
--- a/Demo/src/main/java/com/braintreepayments/demo/views/SummaryEditTestPreference.java
+++ b/Demo/src/main/java/com/braintreepayments/demo/views/SummaryEditTestPreference.java
@@ -1,8 +1,6 @@
 package com.braintreepayments.demo.views;
 
-import android.annotation.TargetApi;
 import android.content.Context;
-import android.os.Build.VERSION_CODES;
 import android.util.AttributeSet;
 
 import androidx.preference.EditTextPreference;
@@ -26,7 +24,6 @@ public SummaryEditTestPreference(Context context, AttributeSet attrs, int defSty
         init();
     }
 
-    @TargetApi(VERSION_CODES.LOLLIPOP)
     public SummaryEditTestPreference(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
         super(context, attrs, defStyleAttr, defStyleRes);
         init();
diff --git a/Demo/src/main/res/drawable-xhdpi/logo_android_pay.png b/Demo/src/main/res/drawable-xhdpi/logo_android_pay.png
deleted file mode 100644
index 223dd05166..0000000000
Binary files a/Demo/src/main/res/drawable-xhdpi/logo_android_pay.png and /dev/null differ
diff --git a/Demo/src/main/res/layout/fragment_local_payment.xml b/Demo/src/main/res/layout/fragment_local_payment.xml
index f57bfcc83e..ad6cd7826d 100644
--- a/Demo/src/main/res/layout/fragment_local_payment.xml
+++ b/Demo/src/main/res/layout/fragment_local_payment.xml
@@ -22,5 +22,5 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:padding="10dp"
-        android:text="This feature uses a hard-coded sandbox tokenization key that is enabled for this local payment." />
+        android:text="@string/bt_local_payment_description" />
 </RelativeLayout>
\ No newline at end of file
diff --git a/Demo/src/main/res/values/strings.xml b/Demo/src/main/res/values/strings.xml
index 7e1fde510d..acf288ca97 100644
--- a/Demo/src/main/res/values/strings.xml
+++ b/Demo/src/main/res/values/strings.xml
@@ -123,4 +123,7 @@
     <!-- SamsungPay -->
     <string name="bt_start_samsung_pay">Start SamsungPay</string>
 
+    <!-- LocalPayment -->
+    <string name="bt_local_payment_description">This feature uses a hard-coded sandbox tokenization key that is enabled for this local payment.</string>
+
 </resources>
diff --git a/Demo/src/main/res/values/styles.xml b/Demo/src/main/res/values/styles.xml
index caf9377500..303005a777 100644
--- a/Demo/src/main/res/values/styles.xml
+++ b/Demo/src/main/res/values/styles.xml
@@ -4,7 +4,7 @@
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">wrap_content</item>
         <item name="android:layout_marginTop">12dp</item>
-        <item name="android:accessibilityLiveRegion" tools:targetApi="kitkat">polite</item>
+        <item name="android:accessibilityLiveRegion">polite</item>
     </style>
     <style name="card_form_field" parent="bt_base_textview">
         <item name="android:layout_width">match_parent</item>
diff --git a/GooglePay/build.gradle b/GooglePay/build.gradle
index 15d22aa562..cef459bb9a 100644
--- a/GooglePay/build.gradle
+++ b/GooglePay/build.gradle
@@ -48,7 +48,6 @@ dependencies {
     testImplementation deps.androidxTestRules
     testImplementation deps.androidxTestRunner
     testImplementation deps.playServicesWallet
-    testImplementation deps.assertJ
     testImplementation deps.powermockJunit
     testImplementation deps.powermockRule
     testImplementation deps.powermockMockito
diff --git a/GooglePay/src/test/java/com/braintreepayments/api/GooglePayInternalClientUnitTest.kt b/GooglePay/src/test/java/com/braintreepayments/api/GooglePayInternalClientUnitTest.kt
index 4fb56a75d3..a7b6956492 100644
--- a/GooglePay/src/test/java/com/braintreepayments/api/GooglePayInternalClientUnitTest.kt
+++ b/GooglePay/src/test/java/com/braintreepayments/api/GooglePayInternalClientUnitTest.kt
@@ -1,9 +1,10 @@
 package com.braintreepayments.api
 
+import android.app.Activity
 import androidx.fragment.app.FragmentActivity
 import com.google.android.gms.common.api.ApiException
 import com.google.android.gms.common.api.Status
-import com.google.android.gms.tasks.Tasks
+import com.google.android.gms.tasks.*
 import com.google.android.gms.wallet.IsReadyToPayRequest
 import com.google.android.gms.wallet.PaymentsClient
 import com.google.android.gms.wallet.Wallet
@@ -18,10 +19,52 @@ import org.junit.Test
 import org.junit.runner.RunWith
 import org.robolectric.RobolectricTestRunner
 import java.util.concurrent.CountDownLatch
+import java.util.concurrent.Executor
 
 @RunWith(RobolectricTestRunner::class)
 class GooglePayInternalClientUnitTest {
 
+    // Ref: https://stackoverflow.com/a/75834762
+    abstract class MockBooleanTask : Task<Boolean>() {
+        override fun addOnFailureListener(p0: OnFailureListener): Task<Boolean> = this
+        override fun addOnFailureListener(p0: Activity, p1: OnFailureListener): Task<Boolean> = this
+        override fun addOnFailureListener(p0: Executor, p1: OnFailureListener): Task<Boolean> = this
+        override fun getException(): Exception? = null
+        override fun isCanceled(): Boolean = false
+        override fun isComplete(): Boolean = true
+        override fun isSuccessful(): Boolean = true
+
+        override fun addOnSuccessListener(
+            p0: Executor,
+            p1: OnSuccessListener<in Boolean>
+        ): Task<Boolean> = this
+
+        override fun addOnSuccessListener(
+            p0: Activity,
+            p1: OnSuccessListener<in Boolean>
+        ): Task<Boolean> = this
+
+        override fun addOnSuccessListener(p0: OnSuccessListener<in Boolean>): Task<Boolean> = this
+
+        override fun addOnCompleteListener(p0: OnCompleteListener<Boolean>): Task<Boolean> {
+            p0.onComplete(this)
+            return this
+        }
+    }
+
+    class SuccessfulBooleanTask(private val result: Boolean): MockBooleanTask() {
+        override fun getResult(): Boolean = result
+        override fun <X : Throwable?> getResult(p0: Class<X>): Boolean = result
+    }
+
+    class FailingBooleanTask(private val apiException: ApiException): MockBooleanTask() {
+        override fun getResult(): Boolean = false
+
+        override fun <X : Throwable?> getResult(p0: Class<X>): Boolean {
+            throw apiException
+        }
+    }
+
     private lateinit var activity: FragmentActivity
     private lateinit var isReadyToPayCallback: GooglePayIsReadyToPayCallback
     private lateinit var paymentsClient: PaymentsClient
@@ -52,7 +95,8 @@ class GooglePayInternalClientUnitTest {
 
     @Test
     fun `isReadyToPay requests Production Wallet environment when configuration environment is Production`() {
-        val configuration = Configuration.fromJson(Fixtures.CONFIGURATION_WITH_GOOGLE_PAY_PRODUCTION)
+        val configuration =
+            Configuration.fromJson(Fixtures.CONFIGURATION_WITH_GOOGLE_PAY_PRODUCTION)
         every { paymentsClient.isReadyToPay(isReadyToPayRequest) } returns Tasks.forResult(true)
 
         val walletOptionsSlot = slot<Wallet.WalletOptions>()
@@ -70,9 +114,7 @@ class GooglePayInternalClientUnitTest {
         val configuration = Configuration.fromJson(Fixtures.CONFIGURATION_WITH_GOOGLE_PAY)
         every { Wallet.getPaymentsClient(any(), any()) } returns paymentsClient
 
-        every { paymentsClient.isReadyToPay(isReadyToPayRequest) } answers {
-            Tasks.forResult(true)
-        }
+        every { paymentsClient.isReadyToPay(isReadyToPayRequest) } returns SuccessfulBooleanTask(true)
 
         val sut = GooglePayInternalClient()
         sut.isReadyToPay(activity, configuration, isReadyToPayRequest) { isReadyToPay, error ->
@@ -90,9 +132,8 @@ class GooglePayInternalClientUnitTest {
         every { Wallet.getPaymentsClient(any(), any()) } returns paymentsClient
 
         val expectedError = ApiException(Status.RESULT_INTERNAL_ERROR)
-        every { paymentsClient.isReadyToPay(isReadyToPayRequest) } answers {
-            Tasks.forException(expectedError)
-        }
+        val failedTask: Task<Boolean> = FailingBooleanTask(expectedError)
+        every { paymentsClient.isReadyToPay(isReadyToPayRequest) } returns failedTask
 
         val sut = GooglePayInternalClient()
         sut.isReadyToPay(activity, configuration, isReadyToPayRequest) { isReadyToPay, error ->
diff --git a/GooglePay/src/test/java/com/braintreepayments/api/GooglePayLifecycleObserverUnitTest.java b/GooglePay/src/test/java/com/braintreepayments/api/GooglePayLifecycleObserverUnitTest.java
index 123d023d6d..6997254a75 100644
--- a/GooglePay/src/test/java/com/braintreepayments/api/GooglePayLifecycleObserverUnitTest.java
+++ b/GooglePay/src/test/java/com/braintreepayments/api/GooglePayLifecycleObserverUnitTest.java
@@ -21,6 +21,7 @@
 import org.junit.runner.RunWith;
 import org.mockito.ArgumentCaptor;
 import org.mockito.Captor;
+import org.mockito.Mock;
 import org.mockito.Mockito;
 import org.mockito.MockitoAnnotations;
 import org.robolectric.RobolectricTestRunner;
@@ -28,6 +29,9 @@
 @RunWith(RobolectricTestRunner.class)
 public class GooglePayLifecycleObserverUnitTest {
 
+    @Mock
+    ActivityResultLauncher<GooglePayIntentData> activityLauncher;
+
     @Captor
     ArgumentCaptor<ActivityResultCallback<GooglePayResult>> googlePayResultCaptor;
 
@@ -78,15 +82,14 @@ public void launch_launchesActivity() {
 
         PaymentDataRequest paymentDataRequest = PaymentDataRequest.fromJson(googlePayRequest.toJson());
         GooglePayIntentData intentData = new GooglePayIntentData(1, paymentDataRequest);
-        ActivityResultLauncher<GooglePayIntentData> resultLauncher = mock(ActivityResultLauncher.class);
         ActivityResultRegistry activityResultRegistry = mock(ActivityResultRegistry.class);
 
         GooglePayClient googlePayClient = mock(GooglePayClient.class);
         GooglePayLifecycleObserver sut = new GooglePayLifecycleObserver(activityResultRegistry, googlePayClient);
-        sut.activityLauncher = resultLauncher;
+        sut.activityLauncher = activityLauncher;
 
         sut.launch(intentData);
-        verify(resultLauncher).launch(intentData);
+        verify(activityLauncher).launch(intentData);
     }
 }
 
diff --git a/LocalPayment/src/androidTest/java/com/braintreepayments/api/LocalPaymentClientTest.java b/LocalPayment/src/androidTest/java/com/braintreepayments/api/LocalPaymentClientTest.java
index 88d5ecb208..f9f2210b28 100644
--- a/LocalPayment/src/androidTest/java/com/braintreepayments/api/LocalPaymentClientTest.java
+++ b/LocalPayment/src/androidTest/java/com/braintreepayments/api/LocalPaymentClientTest.java
@@ -1,18 +1,17 @@
 package com.braintreepayments.api;
 
+import static junit.framework.Assert.assertNotNull;
+
 import androidx.annotation.Nullable;
 import androidx.test.core.app.ApplicationProvider;
 import androidx.test.internal.runner.junit4.AndroidJUnit4ClassRunner;
 
 import org.junit.Before;
-import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
 import java.util.concurrent.CountDownLatch;
 
-import static junit.framework.Assert.assertNotNull;
-
 @RunWith(AndroidJUnit4ClassRunner.class)
 public class LocalPaymentClientTest {
 
diff --git a/LocalPayment/src/test/java/com/braintreepayments/api/LocalPaymentLifecycleObserverUnitTest.java b/LocalPayment/src/test/java/com/braintreepayments/api/LocalPaymentLifecycleObserverUnitTest.java
index da8ad5cf8b..28b358769f 100644
--- a/LocalPayment/src/test/java/com/braintreepayments/api/LocalPaymentLifecycleObserverUnitTest.java
+++ b/LocalPayment/src/test/java/com/braintreepayments/api/LocalPaymentLifecycleObserverUnitTest.java
@@ -1,5 +1,6 @@
 package com.braintreepayments.api;
 
+import static android.os.Looper.getMainLooper;
 import static com.braintreepayments.api.BraintreeRequestCodes.LOCAL_PAYMENT;
 import static com.braintreepayments.api.BraintreeRequestCodes.PAYPAL;
 import static org.mockito.ArgumentMatchers.any;
@@ -8,6 +9,7 @@
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
+import static org.robolectric.Shadows.shadowOf;
 
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentActivity;
@@ -34,9 +36,10 @@ public void onResume_whenLifeCycleObserverIsFragment_payPalClientDeliversResultW
         when(localPaymentClient.deliverBrowserSwitchResult(activity)).thenReturn(browserSwitchResult);
 
         LocalPaymentLifecycleObserver sut = new LocalPaymentLifecycleObserver(localPaymentClient);
-
         sut.onStateChanged(fragment, Lifecycle.Event.ON_RESUME);
 
+        // Ref: https://robolectric.org/blog/2019/06/04/paused-looper/
+        shadowOf(getMainLooper()).idle();
         verify(localPaymentClient).onBrowserSwitchResult(same(activity), same(browserSwitchResult));
     }
 
@@ -52,9 +55,9 @@ public void onResume_whenLifeCycleObserverIsActivity_payPalClientDeliversResultW
         when(localPaymentClient.deliverBrowserSwitchResult(activity)).thenReturn(browserSwitchResult);
 
         LocalPaymentLifecycleObserver sut = new LocalPaymentLifecycleObserver(localPaymentClient);
-
         sut.onStateChanged(activity, Lifecycle.Event.ON_RESUME);
 
+        shadowOf(getMainLooper()).idle();
         verify(localPaymentClient).onBrowserSwitchResult(same(activity), same(browserSwitchResult));
     }
 
@@ -72,9 +75,9 @@ public void onResume_whenLifeCycleObserverIsFragment_payPalClientDeliversResultF
         when(localPaymentClient.deliverBrowserSwitchResultFromNewTask(activity)).thenReturn(browserSwitchResult);
 
         LocalPaymentLifecycleObserver sut = new LocalPaymentLifecycleObserver(localPaymentClient);
-
         sut.onStateChanged(fragment, Lifecycle.Event.ON_RESUME);
 
+        shadowOf(getMainLooper()).idle();
         verify(localPaymentClient).onBrowserSwitchResult(same(activity), same(browserSwitchResult));
     }
 
@@ -90,9 +93,9 @@ public void onResume_whenLifeCycleObserverIsActivity_payPalClientDeliversResultF
         when(localPaymentClient.deliverBrowserSwitchResultFromNewTask(activity)).thenReturn(browserSwitchResult);
 
         LocalPaymentLifecycleObserver sut = new LocalPaymentLifecycleObserver(localPaymentClient);
-
         sut.onStateChanged(activity, Lifecycle.Event.ON_RESUME);
 
+        shadowOf(getMainLooper()).idle();
         verify(localPaymentClient).onBrowserSwitchResult(same(activity), same(browserSwitchResult));
     }
 
@@ -107,9 +110,9 @@ public void onResume_whenPendingBrowserSwitchResultExists_andRequestCodeNotPayPa
         when(localPaymentClient.getBrowserSwitchResult(activity)).thenReturn(browserSwitchResult);
 
         LocalPaymentLifecycleObserver sut = new LocalPaymentLifecycleObserver(localPaymentClient);
-
         sut.onStateChanged(activity, Lifecycle.Event.ON_RESUME);
 
+        shadowOf(getMainLooper()).idle();
         verify(localPaymentClient, never()).onBrowserSwitchResult(any(FragmentActivity.class), any(BrowserSwitchResult.class));
     }
 
@@ -124,9 +127,9 @@ public void onResume_whenCachedBrowserSwitchResultExists_andRequestCodeNotLocalP
         when(localPaymentClient.getBrowserSwitchResultFromNewTask(activity)).thenReturn(browserSwitchResult);
 
         LocalPaymentLifecycleObserver sut = new LocalPaymentLifecycleObserver(localPaymentClient);
-
         sut.onStateChanged(activity, Lifecycle.Event.ON_RESUME);
 
+        shadowOf(getMainLooper()).idle();
         verify(localPaymentClient, never()).onBrowserSwitchResult(any(FragmentActivity.class), any(BrowserSwitchResult.class));
     }
 }
diff --git a/PayPal/src/test/java/com/braintreepayments/api/PayPalAccountUnitTest.java b/PayPal/src/test/java/com/braintreepayments/api/PayPalAccountUnitTest.java
index 9b1f2737d9..3197e93737 100644
--- a/PayPal/src/test/java/com/braintreepayments/api/PayPalAccountUnitTest.java
+++ b/PayPal/src/test/java/com/braintreepayments/api/PayPalAccountUnitTest.java
@@ -1,5 +1,9 @@
 package com.braintreepayments.api;
 
+import static junit.framework.Assert.assertEquals;
+import static junit.framework.Assert.assertFalse;
+import static junit.framework.Assert.assertNull;
+
 import org.json.JSONException;
 import org.json.JSONObject;
 import org.junit.Test;
@@ -8,11 +12,6 @@
 import org.skyscreamer.jsonassert.JSONAssert;
 import org.skyscreamer.jsonassert.JSONCompareMode;
 
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertFalse;
-import static junit.framework.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-
 @RunWith(RobolectricTestRunner.class)
 public class PayPalAccountUnitTest {
 
diff --git a/PayPal/src/test/java/com/braintreepayments/api/PayPalClientUnitTest.java b/PayPal/src/test/java/com/braintreepayments/api/PayPalClientUnitTest.java
index 195fa94171..bf9d51a1e9 100644
--- a/PayPal/src/test/java/com/braintreepayments/api/PayPalClientUnitTest.java
+++ b/PayPal/src/test/java/com/braintreepayments/api/PayPalClientUnitTest.java
@@ -1,5 +1,18 @@
 package com.braintreepayments.api;
 
+import static junit.framework.Assert.assertEquals;
+import static junit.framework.Assert.assertTrue;
+import static junit.framework.TestCase.assertFalse;
+import static junit.framework.TestCase.assertNull;
+import static junit.framework.TestCase.assertSame;
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Matchers.same;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
 import android.net.Uri;
 
 import androidx.fragment.app.Fragment;
@@ -15,20 +28,6 @@
 import org.robolectric.RobolectricTestRunner;
 import org.skyscreamer.jsonassert.JSONAssert;
 
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertTrue;
-import static junit.framework.TestCase.assertFalse;
-import static junit.framework.TestCase.assertNull;
-import static junit.framework.TestCase.assertSame;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Matchers.isNull;
-import static org.mockito.Matchers.same;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
 @RunWith(RobolectricTestRunner.class)
 public class PayPalClientUnitTest {
 
diff --git a/PayPal/src/test/java/com/braintreepayments/api/PayPalLifecycleObserverUnitTest.java b/PayPal/src/test/java/com/braintreepayments/api/PayPalLifecycleObserverUnitTest.java
index 81edbe8b6b..eb8e0d0725 100644
--- a/PayPal/src/test/java/com/braintreepayments/api/PayPalLifecycleObserverUnitTest.java
+++ b/PayPal/src/test/java/com/braintreepayments/api/PayPalLifecycleObserverUnitTest.java
@@ -1,5 +1,6 @@
 package com.braintreepayments.api;
 
+import static android.os.Looper.getMainLooper;
 import static com.braintreepayments.api.BraintreeRequestCodes.PAYPAL;
 import static com.braintreepayments.api.BraintreeRequestCodes.THREE_D_SECURE;
 import static org.mockito.ArgumentMatchers.any;
@@ -8,6 +9,7 @@
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
+import static org.robolectric.Shadows.shadowOf;
 
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentActivity;
@@ -34,9 +36,10 @@ public void onResume_whenLifeCycleObserverIsFragment_payPalClientDeliversResultW
         when(payPalClient.deliverBrowserSwitchResult(activity)).thenReturn(browserSwitchResult);
 
         PayPalLifecycleObserver sut = new PayPalLifecycleObserver(payPalClient);
-
         sut.onStateChanged(fragment, Lifecycle.Event.ON_RESUME);
 
+        // Ref: https://robolectric.org/blog/2019/06/04/paused-looper/
+        shadowOf(getMainLooper()).idle();
         verify(payPalClient).onBrowserSwitchResult(same(browserSwitchResult));
     }
 
@@ -52,9 +55,9 @@ public void onResume_whenLifeCycleObserverIsActivity_payPalClientDeliversResultW
         when(payPalClient.deliverBrowserSwitchResult(activity)).thenReturn(browserSwitchResult);
 
         PayPalLifecycleObserver sut = new PayPalLifecycleObserver(payPalClient);
-
         sut.onStateChanged(activity, Lifecycle.Event.ON_RESUME);
 
+        shadowOf(getMainLooper()).idle();
         verify(payPalClient).onBrowserSwitchResult(same(browserSwitchResult));
     }
 
@@ -72,9 +75,9 @@ public void onResume_whenLifeCycleObserverIsFragment_payPalClientDeliversResultF
         when(payPalClient.deliverBrowserSwitchResultFromNewTask(activity)).thenReturn(browserSwitchResult);
 
         PayPalLifecycleObserver sut = new PayPalLifecycleObserver(payPalClient);
-
         sut.onStateChanged(fragment, Lifecycle.Event.ON_RESUME);
 
+        shadowOf(getMainLooper()).idle();
         verify(payPalClient).onBrowserSwitchResult(same(browserSwitchResult));
     }
 
@@ -90,9 +93,9 @@ public void onResume_whenLifeCycleObserverIsActivity_payPalClientDeliversResultF
         when(payPalClient.deliverBrowserSwitchResultFromNewTask(activity)).thenReturn(browserSwitchResult);
 
         PayPalLifecycleObserver sut = new PayPalLifecycleObserver(payPalClient);
-
         sut.onStateChanged(activity, Lifecycle.Event.ON_RESUME);
 
+        shadowOf(getMainLooper()).idle();
         verify(payPalClient).onBrowserSwitchResult(same(browserSwitchResult));
     }
 
@@ -108,9 +111,9 @@ public void onResume_whenPendingBrowserSwitchResultExists_andRequestCodeNotPayPa
         when(payPalClient.deliverBrowserSwitchResult(activity)).thenReturn(browserSwitchResult);
 
         PayPalLifecycleObserver sut = new PayPalLifecycleObserver(payPalClient);
-
         sut.onStateChanged(activity, Lifecycle.Event.ON_RESUME);
 
+        shadowOf(getMainLooper()).idle();
         verify(payPalClient, never()).onBrowserSwitchResult(any(BrowserSwitchResult.class));
     }
 
@@ -125,9 +128,9 @@ public void onResume_whenCachedBrowserSwitchResultExists_andRequestCodeNotPayPal
         when(payPalClient.getBrowserSwitchResultFromNewTask(activity)).thenReturn(browserSwitchResult);
 
         PayPalLifecycleObserver sut = new PayPalLifecycleObserver(payPalClient);
-
         sut.onStateChanged(activity, Lifecycle.Event.ON_RESUME);
 
+        shadowOf(getMainLooper()).idle();
         verify(payPalClient, never()).onBrowserSwitchResult(any(BrowserSwitchResult.class));
     }
 }
\ No newline at end of file
diff --git a/PayPalDataCollector/src/test/java/com/braintreepayments/api/PayPalDataCollectorRequestUnitTest.java b/PayPalDataCollector/src/test/java/com/braintreepayments/api/PayPalDataCollectorRequestUnitTest.java
index 16ffaef738..8ba93bb41b 100644
--- a/PayPalDataCollector/src/test/java/com/braintreepayments/api/PayPalDataCollectorRequestUnitTest.java
+++ b/PayPalDataCollector/src/test/java/com/braintreepayments/api/PayPalDataCollectorRequestUnitTest.java
@@ -1,9 +1,9 @@
 package com.braintreepayments.api;
 
-import org.junit.Test;
-
 import static junit.framework.Assert.assertEquals;
 
+import org.junit.Test;
+
 public class PayPalDataCollectorRequestUnitTest {
 
     @Test
diff --git a/PayPalNativeCheckout/src/test/java/com/braintreepayments/api/PayPalNativeCheckoutAccountUnitTest.java b/PayPalNativeCheckout/src/test/java/com/braintreepayments/api/PayPalNativeCheckoutAccountUnitTest.java
index 646ee9c127..b43dade9a5 100644
--- a/PayPalNativeCheckout/src/test/java/com/braintreepayments/api/PayPalNativeCheckoutAccountUnitTest.java
+++ b/PayPalNativeCheckout/src/test/java/com/braintreepayments/api/PayPalNativeCheckoutAccountUnitTest.java
@@ -1,17 +1,14 @@
 package com.braintreepayments.api;
 
+import static junit.framework.Assert.assertEquals;
+import static junit.framework.Assert.assertFalse;
+import static junit.framework.Assert.assertNull;
+
 import org.json.JSONException;
 import org.json.JSONObject;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.RobolectricTestRunner;
-import org.skyscreamer.jsonassert.JSONAssert;
-import org.skyscreamer.jsonassert.JSONCompareMode;
-
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertFalse;
-import static junit.framework.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
 
 @RunWith(RobolectricTestRunner.class)
 public class PayPalNativeCheckoutAccountUnitTest {
diff --git a/SEPADirectDebit/src/main/java/com/braintreepayments/api/SEPADirectDebitApi.java b/SEPADirectDebit/src/main/java/com/braintreepayments/api/SEPADirectDebitApi.java
index 4d44ac6fb1..4f3218c56b 100644
--- a/SEPADirectDebit/src/main/java/com/braintreepayments/api/SEPADirectDebitApi.java
+++ b/SEPADirectDebit/src/main/java/com/braintreepayments/api/SEPADirectDebitApi.java
@@ -1,13 +1,8 @@
 package com.braintreepayments.api;
 
-import androidx.annotation.VisibleForTesting;
-
 import org.json.JSONException;
 import org.json.JSONObject;
 
-import javax.net.ssl.SSLException;
-import javax.net.ssl.SSLSocketFactory;
-
 class SEPADirectDebitApi {
 
     private final BraintreeClient braintreeClient;
diff --git a/SamsungPay/src/test/java/com/braintreepayments/api/MockSamsungPayInternalClientBuilder.java b/SamsungPay/src/test/java/com/braintreepayments/api/MockSamsungPayInternalClientBuilder.java
index 2ae1bae135..7719e3763e 100644
--- a/SamsungPay/src/test/java/com/braintreepayments/api/MockSamsungPayInternalClientBuilder.java
+++ b/SamsungPay/src/test/java/com/braintreepayments/api/MockSamsungPayInternalClientBuilder.java
@@ -1,19 +1,16 @@
 package com.braintreepayments.api;
 
-import android.os.Bundle;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.doAnswer;
+import static org.mockito.Mockito.mock;
 
 import com.samsung.android.sdk.samsungpay.v2.SpaySdk;
-import com.samsung.android.sdk.samsungpay.v2.StatusListener;
 
 import org.mockito.invocation.InvocationOnMock;
 import org.mockito.stubbing.Answer;
 
 import java.util.List;
 
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.doAnswer;
-import static org.mockito.Mockito.mock;
-
 public class MockSamsungPayInternalClientBuilder {
 
     private Integer getSamsungPayStatusSuccess;
diff --git a/SharedUtils/src/androidTest/java/com/braintreepayments/api/HttpClientTest.java b/SharedUtils/src/androidTest/java/com/braintreepayments/api/HttpClientTest.java
index c8c5d0b3f3..1275549354 100644
--- a/SharedUtils/src/androidTest/java/com/braintreepayments/api/HttpClientTest.java
+++ b/SharedUtils/src/androidTest/java/com/braintreepayments/api/HttpClientTest.java
@@ -1,5 +1,8 @@
 package com.braintreepayments.api;
 
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+
 import androidx.test.internal.runner.junit4.AndroidJUnit4ClassRunner;
 
 import org.junit.Before;
@@ -8,10 +11,6 @@
 
 import java.util.concurrent.CountDownLatch;
 
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.fail;
-
 @RunWith(AndroidJUnit4ClassRunner.class)
 public class HttpClientTest {
 
diff --git a/SharedUtils/src/main/java/com/braintreepayments/api/ClassHelper.java b/SharedUtils/src/main/java/com/braintreepayments/api/ClassHelper.java
index 2be597853a..22281481d6 100644
--- a/SharedUtils/src/main/java/com/braintreepayments/api/ClassHelper.java
+++ b/SharedUtils/src/main/java/com/braintreepayments/api/ClassHelper.java
@@ -1,7 +1,5 @@
 package com.braintreepayments.api;
 
-import java.lang.reflect.Field;
-
 class ClassHelper {
 
     ClassHelper() {}
@@ -14,24 +12,4 @@ boolean isClassAvailable(String className) {
             return false;
         }
     }
-
-    /**
-     * @param className The name of the class we need a field from
-     * @param fieldName The name of the field we need a value from
-     * @param <FIELD_TYPE> The type of the field value
-     * @return the value of a field on a class, or null.
-     */
-    <FIELD_TYPE> FIELD_TYPE getFieldValue(String className, String fieldName) {
-        FIELD_TYPE value = null;
-
-        try {
-            Class<?> clazz = Class.forName(className);
-            Field field = clazz.getField(fieldName);
-
-            field.setAccessible(true);
-            value = (FIELD_TYPE) field.get(Object.class);
-        } catch (ClassNotFoundException | NoSuchFieldException | IllegalAccessException ignored) {}
-
-        return value;
-    }
 }
diff --git a/SharedUtils/src/main/java/com/braintreepayments/api/ManifestValidator.java b/SharedUtils/src/main/java/com/braintreepayments/api/ManifestValidator.java
index 6cd897f169..083b4768fa 100644
--- a/SharedUtils/src/main/java/com/braintreepayments/api/ManifestValidator.java
+++ b/SharedUtils/src/main/java/com/braintreepayments/api/ManifestValidator.java
@@ -7,15 +7,16 @@
 import android.content.pm.PackageManager;
 import android.content.pm.PackageManager.NameNotFoundException;
 import android.net.Uri;
+
 import androidx.annotation.Nullable;
 
 class ManifestValidator {
 
-    boolean isActivityDeclaredInAndroidManifest(Context context, Class klass) {
+    <T> boolean isActivityDeclaredInAndroidManifest(Context context, Class<T> klass) {
         return getActivityInfo(context, klass) != null;
     }
 
-    boolean isUrlSchemeDeclaredInAndroidManifest(Context context, String urlScheme, Class klass) {
+    <T> boolean isUrlSchemeDeclaredInAndroidManifest(Context context, String urlScheme, Class<T> klass) {
         Intent intent = new Intent(Intent.ACTION_VIEW)
                 .setData(Uri.parse(urlScheme + "://"))
                 .addCategory(Intent.CATEGORY_DEFAULT)
@@ -28,7 +29,7 @@ boolean isUrlSchemeDeclaredInAndroidManifest(Context context, String urlScheme,
     }
 
     @Nullable
-    ActivityInfo getActivityInfo(Context context, Class klass) {
+    <T> ActivityInfo getActivityInfo(Context context, Class<T> klass) {
         try {
             PackageInfo packageInfo =
                     context.getPackageManager().getPackageInfo(context.getPackageName(), PackageManager.GET_ACTIVITIES);
diff --git a/SharedUtils/src/main/java/com/braintreepayments/api/SynchronousHttpClient.java b/SharedUtils/src/main/java/com/braintreepayments/api/SynchronousHttpClient.java
index 2c894c8a59..67267070f3 100644
--- a/SharedUtils/src/main/java/com/braintreepayments/api/SynchronousHttpClient.java
+++ b/SharedUtils/src/main/java/com/braintreepayments/api/SynchronousHttpClient.java
@@ -3,7 +3,6 @@
 import java.io.OutputStream;
 import java.net.HttpURLConnection;
 import java.net.URL;
-import java.nio.charset.StandardCharsets;
 import java.util.Map;
 
 import javax.net.ssl.HttpsURLConnection;
diff --git a/TestUtils/src/main/java/com/braintreepayments/api/MockBraintreeClientBuilder.java b/TestUtils/src/main/java/com/braintreepayments/api/MockBraintreeClientBuilder.java
index da4b07c6c2..49c6a557fa 100644
--- a/TestUtils/src/main/java/com/braintreepayments/api/MockBraintreeClientBuilder.java
+++ b/TestUtils/src/main/java/com/braintreepayments/api/MockBraintreeClientBuilder.java
@@ -1,12 +1,5 @@
 package com.braintreepayments.api;
 
-import android.content.pm.ActivityInfo;
-
-import androidx.fragment.app.FragmentActivity;
-
-import org.mockito.invocation.InvocationOnMock;
-import org.mockito.stubbing.Answer;
-
 import static org.mockito.Matchers.any;
 import static org.mockito.Matchers.anyInt;
 import static org.mockito.Matchers.anyString;
@@ -15,6 +8,14 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
+import android.content.pm.ActivityInfo;
+
+import androidx.fragment.app.FragmentActivity;
+
+import org.mockito.ArgumentMatchers;
+import org.mockito.invocation.InvocationOnMock;
+import org.mockito.stubbing.Answer;
+
 public class MockBraintreeClientBuilder {
 
     private String sendGETSuccess;
@@ -157,7 +158,7 @@ public Void answer(InvocationOnMock invocation) {
             } catch (BrowserSwitchException ignored) {}
         }
 
-        when(braintreeClient.getManifestActivityInfo(any(Class.class))).thenReturn(activityInfo);
+        when(braintreeClient.getManifestActivityInfo(ArgumentMatchers.any())).thenReturn(activityInfo);
         when(braintreeClient.deliverBrowserSwitchResult(any(FragmentActivity.class))).thenReturn(browserSwitchResult);
         when(braintreeClient.launchesBrowserSwitchAsNewTask()).thenReturn(launchesBrowserSwitchAsNewTask);
 
diff --git a/ThreeDSecure/src/test/java/com/braintreepayments/api/ThreeDSecureLifecycleObserverUnitTest.java b/ThreeDSecure/src/test/java/com/braintreepayments/api/ThreeDSecureLifecycleObserverUnitTest.java
index ea4bfa3270..0325c49646 100644
--- a/ThreeDSecure/src/test/java/com/braintreepayments/api/ThreeDSecureLifecycleObserverUnitTest.java
+++ b/ThreeDSecure/src/test/java/com/braintreepayments/api/ThreeDSecureLifecycleObserverUnitTest.java
@@ -1,5 +1,6 @@
 package com.braintreepayments.api;
 
+import static android.os.Looper.getMainLooper;
 import static com.braintreepayments.api.BraintreeRequestCodes.PAYPAL;
 import static com.braintreepayments.api.BraintreeRequestCodes.THREE_D_SECURE;
 import static org.mockito.ArgumentMatchers.anyString;
@@ -10,6 +11,7 @@
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
+import static org.robolectric.Shadows.shadowOf;
 
 import androidx.activity.result.ActivityResultCallback;
 import androidx.activity.result.ActivityResultLauncher;
@@ -95,9 +97,10 @@ public void onResume_whenLifeCycleObserverIsFragment_threeDSecureClientDeliversR
         when(threeDSecureClient.deliverBrowserSwitchResult(activity)).thenReturn(browserSwitchResult);
 
         ThreeDSecureLifecycleObserver sut = new ThreeDSecureLifecycleObserver(activityResultRegistry, threeDSecureClient);
-
         sut.onStateChanged(fragment, Lifecycle.Event.ON_RESUME);
 
+        // Ref: https://robolectric.org/blog/2019/06/04/paused-looper/
+        shadowOf(getMainLooper()).idle();
         verify(threeDSecureClient).onBrowserSwitchResult(same(browserSwitchResult));
     }
 
@@ -114,9 +117,9 @@ public void onResume_whenLifeCycleObserverIsActivity_threeDSecureClientDeliversR
         when(threeDSecureClient.deliverBrowserSwitchResult(activity)).thenReturn(browserSwitchResult);
 
         ThreeDSecureLifecycleObserver sut = new ThreeDSecureLifecycleObserver(activityResultRegistry, threeDSecureClient);
-
         sut.onStateChanged(activity, Lifecycle.Event.ON_RESUME);
 
+        shadowOf(getMainLooper()).idle();
         verify(threeDSecureClient).onBrowserSwitchResult(same(browserSwitchResult));
     }
 
@@ -136,9 +139,9 @@ public void onResume_whenLifeCycleObserverIsFragment_threeDSecureClientDeliversR
         when(threeDSecureClient.deliverBrowserSwitchResultFromNewTask(activity)).thenReturn(browserSwitchResult);
 
         ThreeDSecureLifecycleObserver sut = new ThreeDSecureLifecycleObserver(activityResultRegistry, threeDSecureClient);
-
         sut.onStateChanged(fragment, Lifecycle.Event.ON_RESUME);
 
+        shadowOf(getMainLooper()).idle();
         verify(threeDSecureClient).onBrowserSwitchResult(same(browserSwitchResult));
     }
 
@@ -155,9 +158,9 @@ public void onResume_whenLifeCycleObserverIsActivity_threeDSecureClientDeliversR
         when(threeDSecureClient.deliverBrowserSwitchResultFromNewTask(activity)).thenReturn(browserSwitchResult);
 
         ThreeDSecureLifecycleObserver sut = new ThreeDSecureLifecycleObserver(activityResultRegistry, threeDSecureClient);
-
         sut.onStateChanged(activity, Lifecycle.Event.ON_RESUME);
 
+        shadowOf(getMainLooper()).idle();
         verify(threeDSecureClient).onBrowserSwitchResult(same(browserSwitchResult));
     }
 
@@ -192,9 +195,9 @@ public void onResume_whenCachedBrowserSwitchResultExists_andRequestCodeNotThreeD
         when(threeDSecureClient.getBrowserSwitchResultFromNewTask(activity)).thenReturn(browserSwitchResult);
 
         ThreeDSecureLifecycleObserver sut = new ThreeDSecureLifecycleObserver(activityResultRegistry, threeDSecureClient);
-
         sut.onStateChanged(activity, Lifecycle.Event.ON_RESUME);
 
+        shadowOf(getMainLooper()).idle();
         verify(threeDSecureClient, never()).onBrowserSwitchResult(any(BrowserSwitchResult.class));
     }
 
diff --git a/ThreeDSecure/src/test/java/com/braintreepayments/api/ThreeDSecureResultUnitTest.java b/ThreeDSecure/src/test/java/com/braintreepayments/api/ThreeDSecureResultUnitTest.java
index 17b7ff6066..1413dff644 100644
--- a/ThreeDSecure/src/test/java/com/braintreepayments/api/ThreeDSecureResultUnitTest.java
+++ b/ThreeDSecure/src/test/java/com/braintreepayments/api/ThreeDSecureResultUnitTest.java
@@ -1,5 +1,9 @@
 package com.braintreepayments.api;
 
+import static junit.framework.Assert.assertEquals;
+import static junit.framework.Assert.assertNull;
+import static junit.framework.Assert.assertTrue;
+
 import android.os.Parcel;
 
 import org.json.JSONException;
@@ -7,11 +11,6 @@
 import org.junit.runner.RunWith;
 import org.robolectric.RobolectricTestRunner;
 
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertFalse;
-import static junit.framework.Assert.assertNull;
-import static junit.framework.Assert.assertTrue;
-
 @RunWith(RobolectricTestRunner.class)
 public class ThreeDSecureResultUnitTest {
 
diff --git a/Venmo/src/test/java/com/braintreepayments/api/VenmoAccountUnitTest.java b/Venmo/src/test/java/com/braintreepayments/api/VenmoAccountUnitTest.java
index 2b5ce37f1e..896ead3823 100644
--- a/Venmo/src/test/java/com/braintreepayments/api/VenmoAccountUnitTest.java
+++ b/Venmo/src/test/java/com/braintreepayments/api/VenmoAccountUnitTest.java
@@ -1,14 +1,13 @@
 package com.braintreepayments.api;
 
+import static junit.framework.Assert.assertEquals;
+
 import org.json.JSONException;
 import org.json.JSONObject;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.RobolectricTestRunner;
 
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertTrue;
-
 @RunWith(RobolectricTestRunner.class)
 public class VenmoAccountUnitTest {
 
diff --git a/Venmo/src/test/java/com/braintreepayments/api/VenmoActivityResultContractUnitTest.java b/Venmo/src/test/java/com/braintreepayments/api/VenmoActivityResultContractUnitTest.java
index 6e1a906d05..df1ce7bb3b 100644
--- a/Venmo/src/test/java/com/braintreepayments/api/VenmoActivityResultContractUnitTest.java
+++ b/Venmo/src/test/java/com/braintreepayments/api/VenmoActivityResultContractUnitTest.java
@@ -8,7 +8,6 @@
 import static com.braintreepayments.api.VenmoClient.EXTRA_MERCHANT_ID;
 import static com.braintreepayments.api.VenmoClient.EXTRA_RESOURCE_ID;
 import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertTrue;
 import static junit.framework.TestCase.assertFalse;
 import static junit.framework.TestCase.assertNotNull;
 
diff --git a/Venmo/src/test/java/com/braintreepayments/api/VenmoLifecycleObserverUnitTest.java b/Venmo/src/test/java/com/braintreepayments/api/VenmoLifecycleObserverUnitTest.java
index df0ca313e8..7360595a58 100644
--- a/Venmo/src/test/java/com/braintreepayments/api/VenmoLifecycleObserverUnitTest.java
+++ b/Venmo/src/test/java/com/braintreepayments/api/VenmoLifecycleObserverUnitTest.java
@@ -20,6 +20,7 @@
 import org.junit.runner.RunWith;
 import org.mockito.ArgumentCaptor;
 import org.mockito.Captor;
+import org.mockito.Mock;
 import org.mockito.Mockito;
 import org.mockito.MockitoAnnotations;
 import org.robolectric.RobolectricTestRunner;
@@ -27,6 +28,9 @@
 @RunWith(RobolectricTestRunner.class)
 public class VenmoLifecycleObserverUnitTest {
 
+    @Mock
+    ActivityResultLauncher<VenmoIntentData> activityResultLauncher;
+
     @Captor
     ArgumentCaptor<ActivityResultCallback<VenmoResult>> venmoResultCaptor;
 
@@ -71,14 +75,13 @@ public void onCreate_whenActivityResultReceived_forwardsActivityResultToVenmoCli
     public void launch_launchesActivity() throws JSONException {
         VenmoIntentData venmoIntentData =
                 new VenmoIntentData(Configuration.fromJson(Fixtures.CONFIGURATION_WITH_PAY_WITH_VENMO), "venmoAccount", "venmoUsername", "sessionId", "integrationType");
-        ActivityResultLauncher<VenmoIntentData> resultLauncher = mock(ActivityResultLauncher.class);
         ActivityResultRegistry activityResultRegistry = mock(ActivityResultRegistry.class);
 
         VenmoClient venmoClient = mock(VenmoClient.class);
         VenmoLifecycleObserver sut = new VenmoLifecycleObserver(activityResultRegistry, venmoClient);
-        sut.activityLauncher = resultLauncher;
+        sut.activityLauncher = activityResultLauncher;
 
         sut.launch(venmoIntentData);
-        verify(resultLauncher).launch(venmoIntentData);
+        verify(activityResultLauncher).launch(venmoIntentData);
     }
 }
diff --git a/Venmo/src/test/java/com/braintreepayments/api/VenmoRequestUnitTest.java b/Venmo/src/test/java/com/braintreepayments/api/VenmoRequestUnitTest.java
index 13bdf95e8c..98081258c0 100644
--- a/Venmo/src/test/java/com/braintreepayments/api/VenmoRequestUnitTest.java
+++ b/Venmo/src/test/java/com/braintreepayments/api/VenmoRequestUnitTest.java
@@ -1,16 +1,14 @@
 package com.braintreepayments.api;
 
 import static junit.framework.TestCase.assertTrue;
+import static org.junit.Assert.assertEquals;
+
+import android.os.Parcel;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.RobolectricTestRunner;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-
-import android.os.Parcel;
-
 @RunWith(RobolectricTestRunner.class)
 public class VenmoRequestUnitTest {
 
diff --git a/VisaCheckout/build.gradle b/VisaCheckout/build.gradle
index 6ce6432c53..0353f5c3aa 100644
--- a/VisaCheckout/build.gradle
+++ b/VisaCheckout/build.gradle
@@ -51,7 +51,6 @@ dependencies {
     testImplementation deps.powermockMockito
     testImplementation deps.powermockClassloading
     testImplementation deps.jsonAssert
-    testImplementation deps.assertJ
 }
 
 /* maven deploy + signing */
diff --git a/VisaCheckout/src/main/java/com/braintreepayments/api/VisaCheckoutNonce.java b/VisaCheckout/src/main/java/com/braintreepayments/api/VisaCheckoutNonce.java
index ef0d35a2b5..b184bcc5be 100644
--- a/VisaCheckout/src/main/java/com/braintreepayments/api/VisaCheckoutNonce.java
+++ b/VisaCheckout/src/main/java/com/braintreepayments/api/VisaCheckoutNonce.java
@@ -1,15 +1,14 @@
 package com.braintreepayments.api;
 
+import static com.braintreepayments.api.BinData.BIN_DATA_KEY;
+
 import android.os.Parcel;
 
 import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
 
 import org.json.JSONException;
 import org.json.JSONObject;
 
-import static com.braintreepayments.api.BinData.BIN_DATA_KEY;
-
 
 /**
  * {@link PaymentMethodNonce} representing a Visa Checkout card.
diff --git a/build.gradle b/build.gradle
index c2e08cc441..6820bb18ed 100644
--- a/build.gradle
+++ b/build.gradle
@@ -64,12 +64,11 @@ buildscript {
 
             "junit"                      : "junit:junit:4.13",
             "junitTest"                  : "androidx.test.ext:junit:1.1.3",
-            "robolectric"                : "org.robolectric:robolectric:4.1",
+            "robolectric"                : "org.robolectric:robolectric:4.7.3",
             "dexmakerMockito"            : "com.google.dexmaker:dexmaker-mockito:1.2",
             "mockitoCore"                : "org.mockito:mockito-core:3.6.0",
-            "jsonAssert"                 : "org.skyscreamer:jsonassert:1.5.0",
-            "assertJ"                    : "com.squareup.assertj:assertj-android:1.1.1",
-            "mockk"                      : "io.mockk:mockk:1.12.0",
+            "jsonAssert"                 : "org.skyscreamer:jsonassert:1.5.1",
+            "mockk"                      : "io.mockk:mockk:1.13.4",
 
             "powermockJunit"             : "org.powermock:powermock-module-junit4:${versions.powermock}",
             "powermockRule"              : "org.powermock:powermock-module-junit4-rule:${versions.powermock}",
diff --git a/ci b/ci
new file mode 100755
index 0000000000..f02ea72d07
--- /dev/null
+++ b/ci
@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+
+command_name="$1"
+
+case $command_name in
+  unit_tests)
+    ./gradlew --continue clean testRelease
+    ;;
+esac
+