diff --git a/tests/PHPUnit/WcGateway/Gateway/WcGatewayTest.php b/tests/PHPUnit/WcGateway/Gateway/WcGatewayTest.php
index a7b3d3082..1cc802f9a 100644
--- a/tests/PHPUnit/WcGateway/Gateway/WcGatewayTest.php
+++ b/tests/PHPUnit/WcGateway/Gateway/WcGatewayTest.php
@@ -10,6 +10,7 @@ use Inpsyde\PayPalCommerce\WcGateway\Notice\AuthorizeOrderActionNotice;
 use Inpsyde\PayPalCommerce\WcGateway\Processor\AuthorizedPaymentsProcessor;
 use Inpsyde\PayPalCommerce\WcGateway\Processor\OrderProcessor;
 use Inpsyde\PayPalCommerce\WcGateway\Settings\SettingsFields;
+use Inpsyde\PayPalCommerce\WcGateway\Settings\SettingsRenderer;
 use Mockery;
 use function Brain\Monkey\Functions\expect;
 
@@ -17,37 +18,11 @@ class WcGatewayTest extends TestCase
 {
 
 
-    public function testFormFieldsAreSet()
-    {
-
-        $expectedFields = ['key' => 'value'];
-        $settingsFields = Mockery::mock(SettingsFields::class);
-        $settingsFields
-            ->expects('fields')
-            ->andReturn($expectedFields);
-        $orderProcessor = Mockery::mock(OrderProcessor::class);
-        $authorizedPaymentsProcessor = Mockery::mock(AuthorizedPaymentsProcessor::class);
-        $authorizedOrderActionNotice = Mockery::mock(AuthorizeOrderActionNotice::class);
-        $onboardingRenderer = Mockery::mock(OnboardingRenderer::class);
-        $testee = new WcGateway(
-            $settingsFields,
-            $orderProcessor,
-            $authorizedPaymentsProcessor,
-            $authorizedOrderActionNotice,
-            $onboardingRenderer
-        );
-        $this->assertEquals($testee->form_fields, $expectedFields);
-    }
-
-
     public function testProcessPaymentSuccess() {
 
         $orderId = 1;
         $wcOrder = Mockery::mock(\WC_Order::class);
-        $settingsFields = Mockery::mock(SettingsFields::class);
-        $settingsFields
-            ->expects('fields')
-            ->andReturn([]);
+        $settingsRenderer = Mockery::mock(SettingsRenderer::class);
         $orderProcessor = Mockery::mock(OrderProcessor::class);
         $orderProcessor
             ->expects('process')
@@ -60,7 +35,7 @@ class WcGatewayTest extends TestCase
         $authorizedOrderActionNotice = Mockery::mock(AuthorizeOrderActionNotice::class);
         $onboardingRenderer = Mockery::mock(OnboardingRenderer::class);
         $testee = new WcGateway(
-            $settingsFields,
+            $settingsRenderer,
             $orderProcessor,
             $authorizedPaymentsProcessor,
             $authorizedOrderActionNotice,
@@ -80,16 +55,13 @@ class WcGatewayTest extends TestCase
     public function testProcessPaymentOrderNotFound() {
 
         $orderId = 1;
-        $settingsFields = Mockery::mock(SettingsFields::class);
-        $settingsFields
-            ->expects('fields')
-            ->andReturn([]);
+        $settingsRenderer = Mockery::mock(SettingsRenderer::class);
         $orderProcessor = Mockery::mock(OrderProcessor::class);
         $authorizedPaymentsProcessor = Mockery::mock(AuthorizedPaymentsProcessor::class);
         $authorizedOrderActionNotice = Mockery::mock(AuthorizeOrderActionNotice::class);
         $onboardingRenderer = Mockery::mock(OnboardingRenderer::class);
         $testee = new WcGateway(
-            $settingsFields,
+            $settingsRenderer,
             $orderProcessor,
             $authorizedPaymentsProcessor,
             $authorizedOrderActionNotice,
@@ -109,10 +81,7 @@ class WcGatewayTest extends TestCase
         $orderId = 1;
         $wcOrder = Mockery::mock(\WC_Order::class);
         $lastError = 'some-error';
-        $settingsFields = Mockery::mock(SettingsFields::class);
-        $settingsFields
-            ->expects('fields')
-            ->andReturn([]);
+        $settingsRenderer = Mockery::mock(SettingsRenderer::class);
         $orderProcessor = Mockery::mock(OrderProcessor::class);
         $orderProcessor
             ->expects('process')
@@ -124,7 +93,7 @@ class WcGatewayTest extends TestCase
         $authorizedOrderActionNotice = Mockery::mock(AuthorizeOrderActionNotice::class);
         $onboardingRenderer = Mockery::mock(OnboardingRenderer::class);
         $testee = new WcGateway(
-            $settingsFields,
+            $settingsRenderer,
             $orderProcessor,
             $authorizedPaymentsProcessor,
             $authorizedOrderActionNotice,
@@ -154,10 +123,7 @@ class WcGatewayTest extends TestCase
             ->with(WcGateway::CAPTURED_META_KEY, 'true');
         $wcOrder
             ->expects('save');
-        $settingsFields = Mockery::mock(SettingsFields::class);
-        $settingsFields
-            ->expects('fields')
-            ->andReturn([]);
+        $settingsRenderer = Mockery::mock(SettingsRenderer::class);
         $orderProcessor = Mockery::mock(OrderProcessor::class);
         $authorizedPaymentsProcessor = Mockery::mock(AuthorizedPaymentsProcessor::class);
         $authorizedPaymentsProcessor
@@ -174,7 +140,7 @@ class WcGatewayTest extends TestCase
 
         $onboardingRenderer = Mockery::mock(OnboardingRenderer::class);
         $testee = new WcGateway(
-            $settingsFields,
+            $settingsRenderer,
             $orderProcessor,
             $authorizedPaymentsProcessor,
             $authorizedOrderActionNotice,
@@ -200,10 +166,7 @@ class WcGatewayTest extends TestCase
             ->with(WcGateway::CAPTURED_META_KEY, 'true');
         $wcOrder
             ->expects('save');
-        $settingsFields = Mockery::mock(SettingsFields::class);
-        $settingsFields
-            ->expects('fields')
-            ->andReturn([]);
+        $settingsRenderer = Mockery::mock(SettingsRenderer::class);
         $orderProcessor = Mockery::mock(OrderProcessor::class);
         $authorizedPaymentsProcessor = Mockery::mock(AuthorizedPaymentsProcessor::class);
         $authorizedPaymentsProcessor
@@ -219,7 +182,7 @@ class WcGatewayTest extends TestCase
             ->with(AuthorizeOrderActionNotice::ALREADY_CAPTURED);
         $onboardingRenderer = Mockery::mock(OnboardingRenderer::class);
         $testee = new WcGateway(
-            $settingsFields,
+            $settingsRenderer,
             $orderProcessor,
             $authorizedPaymentsProcessor,
             $authorizedOrderActionNotice,
@@ -238,10 +201,7 @@ class WcGatewayTest extends TestCase
     public function testCaptureAuthorizedPaymentNoActionableFailures($lastStatus, $expectedMessage) {
 
         $wcOrder = Mockery::mock(\WC_Order::class);
-        $settingsFields = Mockery::mock(SettingsFields::class);
-        $settingsFields
-            ->expects('fields')
-            ->andReturn([]);
+        $settingsRenderer = Mockery::mock(SettingsRenderer::class);
         $orderProcessor = Mockery::mock(OrderProcessor::class);
         $authorizedPaymentsProcessor = Mockery::mock(AuthorizedPaymentsProcessor::class);
         $authorizedPaymentsProcessor
@@ -257,7 +217,7 @@ class WcGatewayTest extends TestCase
             ->with($expectedMessage);
         $onboardingRenderer = Mockery::mock(OnboardingRenderer::class);
         $testee = new WcGateway(
-            $settingsFields,
+            $settingsRenderer,
             $orderProcessor,
             $authorizedPaymentsProcessor,
             $authorizedOrderActionNotice,