diff --git a/modules/ppcp-api-client/src/Entity/CardAuthenticationResult.php b/modules/ppcp-api-client/src/Entity/CardAuthenticationResult.php
index 7eedf7d56..e4d969c5f 100644
--- a/modules/ppcp-api-client/src/Entity/CardAuthenticationResult.php
+++ b/modules/ppcp-api-client/src/Entity/CardAuthenticationResult.php
@@ -14,7 +14,6 @@ namespace WooCommerce\PayPalCommerce\ApiClient\Entity;
  */
 class CardAuthenticationResult {
 
-
 	const LIABILITY_SHIFT_POSSIBLE = 'POSSIBLE';
 	const LIABILITY_SHIFT_NO       = 'NO';
 	const LIABILITY_SHIFT_UNKNOWN  = 'UNKNOWN';
diff --git a/tests/PHPUnit/ApiClient/Endpoint/OrderEndpointTest.php b/tests/PHPUnit/ApiClient/Endpoint/OrderEndpointTest.php
index ef68802b0..557551f8f 100644
--- a/tests/PHPUnit/ApiClient/Endpoint/OrderEndpointTest.php
+++ b/tests/PHPUnit/ApiClient/Endpoint/OrderEndpointTest.php
@@ -1149,6 +1149,7 @@ class OrderEndpointTest extends TestCase
         $logger = Mockery::mock(LoggerInterface::class);
         $logger->shouldReceive('log');
         $logger->shouldReceive('debug');
+        $logger->shouldReceive('warning');
         $applicationContext = Mockery::mock(ApplicationContext::class);
         $applicationContext
             ->expects('to_array')
diff --git a/tests/PHPUnit/ApiClient/Endpoint/OrderTest.php b/tests/PHPUnit/ApiClient/Endpoint/OrderTest.php
index e2c120751..2361db169 100644
--- a/tests/PHPUnit/ApiClient/Endpoint/OrderTest.php
+++ b/tests/PHPUnit/ApiClient/Endpoint/OrderTest.php
@@ -34,9 +34,6 @@ class OrderTest extends TestCase
             ->expects('to_array')
             ->andReturn(['applicationContext']);
         $paymentSource = Mockery::mock(PaymentSource::class);
-        $paymentSource
-            ->expects('to_array')
-            ->andReturn(['paymentSource']);
 
         $testee = new Order(
             $id,
@@ -69,7 +66,7 @@ class OrderTest extends TestCase
             'update_time' => $updateTime->format($this->dateFormat),
             'payer' => ['payer'],
             'application_context' => ['applicationContext'],
-            'payment_source' => ['paymentSource']
+            'payment_source' => $paymentSource
         ];
         $this->assertEquals($expected, $testee->to_array());
     }
diff --git a/tests/PHPUnit/Button/Helper/ThreeDSecureTest.php b/tests/PHPUnit/Button/Helper/ThreeDSecureTest.php
index 406e9fd64..9e009f2b8 100644
--- a/tests/PHPUnit/Button/Helper/ThreeDSecureTest.php
+++ b/tests/PHPUnit/Button/Helper/ThreeDSecureTest.php
@@ -3,15 +3,11 @@ declare(strict_types=1);
 
 namespace WooCommerce\PayPalCommerce\Button\Helper;
 
-
 use Psr\Log\LoggerInterface;
 use WooCommerce\PayPalCommerce\ApiClient\Entity\CardAuthenticationResult;
 use WooCommerce\PayPalCommerce\ApiClient\Entity\Order;
 use WooCommerce\PayPalCommerce\ApiClient\Entity\PaymentSource;
-use WooCommerce\PayPalCommerce\ApiClient\Entity\PaymentSourceCard;
 use WooCommerce\PayPalCommerce\TestCase;
-use Mockery\Mock;
-use function Brain\Monkey\Functions\when;
 
 class ThreeDSecureTest extends TestCase
 {
@@ -28,12 +24,18 @@ class ThreeDSecureTest extends TestCase
         $result->shouldReceive('authentication_result')->andReturn($authenticationResult);
         $result->shouldReceive('enrollment_status')->andReturn($enrollment);
         $result->shouldReceive('to_array')->andReturn(['foo' => 'bar',]);
-        $card = \Mockery::mock(PaymentSourceCard::class);
-        $card->shouldReceive('authentication_result')->andReturn($result);
+
         $source = \Mockery::mock(PaymentSource::class);
-        $source->shouldReceive('card')->andReturn($card);
+		$authentication_result = (object)[
+			'brand' => 'visa',
+			'authentication_result' => $result,
+		];
+        $source->shouldReceive('properties')
+			->andReturn($authentication_result);
+
         $order = \Mockery::mock(Order::class);
         $order->shouldReceive('payment_source')->andReturn($source);
+
         $logger = \Mockery::mock(LoggerInterface::class);
         $logger->shouldReceive('info');
 
diff --git a/tests/PHPUnit/Vaulting/VaultedCreditCardHandlerTest.php b/tests/PHPUnit/Vaulting/VaultedCreditCardHandlerTest.php
index 6ea42c741..fa92f6f89 100644
--- a/tests/PHPUnit/Vaulting/VaultedCreditCardHandlerTest.php
+++ b/tests/PHPUnit/Vaulting/VaultedCreditCardHandlerTest.php
@@ -118,10 +118,11 @@ class VaultedCreditCardHandlerTest extends TestCase
 		$order = Mockery::mock(Order::class);
 		$order->shouldReceive('id')->andReturn('1');
 		$order->shouldReceive('intent')->andReturn('CAPTURE');
+
 		$paymentSource = Mockery::mock(PaymentSource::class);
-		$paymentSourceCard = Mockery::mock(PaymentSourceCard::class);
-		$paymentSource->shouldReceive('card')->andReturn($paymentSourceCard);
+		$paymentSource->shouldReceive('name')->andReturn('card');
 		$order->shouldReceive('payment_source')->andReturn($paymentSource);
+
 		$orderStatus = Mockery::mock(OrderStatus::class);
 		$orderStatus->shouldReceive('is')->andReturn(true);
 		$order->shouldReceive('status')->andReturn($orderStatus);