diff --git a/src/Plugin/WebformHandler/SalesforceWebToLeadPostWebformHandler.php b/src/Plugin/WebformHandler/SalesforceWebToLeadPostWebformHandler.php
index 858634a..8b12976 100644
--- a/src/Plugin/WebformHandler/SalesforceWebToLeadPostWebformHandler.php
+++ b/src/Plugin/WebformHandler/SalesforceWebToLeadPostWebformHandler.php
@@ -21,13 +21,20 @@ use Drupal\webform\WebformSubmissionInterface;
 class SalesforceWebToLeadPostWebformHandler extends RemotePostWebformHandler {
 
   /**
-   * Typical salesforce campaign fields
+   * Typical salesforce campaign fields.
+   *
    * Used for available list of campaign fields.
    *
-   * @see https://help.salesforce.com/articleView?id=setting_up_web-to-lead.htm&type=0
    * @var array
    */
-  protected $salesforceCampaignFields = ['description', 'email', 'first_name', 'last_name', 'lead_source', 'phone'];
+  protected $salesforceCampaignFields = [
+    'description',
+    'email',
+    'first_name',
+    'last_name',
+    'lead_source',
+    'phone',
+  ];
 
   /**
    * {@inheritdoc}
diff --git a/tests/src/Kernel/Plugin/WebformHandler/SalesforceWebToLeadPostWebformHandlerTest.php b/tests/src/Kernel/Plugin/WebformHandler/SalesforceWebToLeadPostWebformHandlerTest.php
index 1d3e9f9..e6c7718 100644
--- a/tests/src/Kernel/Plugin/WebformHandler/SalesforceWebToLeadPostWebformHandlerTest.php
+++ b/tests/src/Kernel/Plugin/WebformHandler/SalesforceWebToLeadPostWebformHandlerTest.php
@@ -7,7 +7,7 @@ use Drupal\sfweb2lead_webform\Plugin\WebformHandler\SalesforceWebToLeadPostWebfo
 use Drupal\webform\WebformSubmissionInterface;
 
 /**
- * SalesforceWebToLeadPostWebformHandler unit tests.
+ * SalesforceWebToLeadPostWebformHandler kernel tests.
  *
  * @group SalesforceWebToLeadWebform
  */
@@ -28,10 +28,10 @@ class SalesforceWebToLeadPostWebformHandlerTest extends EntityKernelTestBase {
     $configuration = [
       'settings' => [
         'salesforce_mapping' => [
-          'my_form_element_2' => 'first_name'
+          'my_form_element_2' => 'first_name',
         ],
         'salesforce_oid' => 'XXX1234567890',
-      ]
+      ],
     ];
     $plugin_id = 'sfweb2lead_post';
     $plugin_definition = '';
@@ -43,14 +43,18 @@ class SalesforceWebToLeadPostWebformHandlerTest extends EntityKernelTestBase {
     $http_client = $this->getMockHttpClient();
     $message_manager = $this->getMockWebformMessageManager();
 
-    // Mock toekn manager and replace method.
+    // Mock token manager and replace method.
     $token_manager = $this->getMockTokenManager();
     $token_manager->expects($this->any())
       ->method('replace')
       ->will($this->returnArgument(0));
 
+    // Make getRequestData public.
+    $method = new \ReflectionMethod('\Drupal\sfweb2lead_webform\Plugin\WebformHandler\SalesforceWebToLeadPostWebformHandler', 'getRequestData');
+    $method->setAccessible(TRUE);
+
     // Instantiate handler.
-    $handler = new TestSalesforceWebToLeadPostWebformHandler($configuration, $plugin_id, $plugin_definition, $logger_factory, $config_factory, $entity_type_manager, $conditions_validator, $module_handler, $http_client, $token_manager, $message_manager);
+    $handler = new SalesforceWebToLeadPostWebformHandler($configuration, $plugin_id, $plugin_definition, $logger_factory, $config_factory, $entity_type_manager, $conditions_validator, $module_handler, $http_client, $token_manager, $message_manager);
 
     // Mock webform submission.
     $webform_submission_array = [
@@ -68,7 +72,7 @@ class SalesforceWebToLeadPostWebformHandlerTest extends EntityKernelTestBase {
       'oid' => 'XXX1234567890',
       'first_name' => 'bar',
     ];
-    $actual_salesforce_data = $handler->getRequestData('', $webform_submission);
+    $actual_salesforce_data = $method->invoke($handler, '', $webform_submission);
     $this->assertEquals($expected_salesforce_data, $actual_salesforce_data);
   }
 
@@ -76,15 +80,15 @@ class SalesforceWebToLeadPostWebformHandlerTest extends EntityKernelTestBase {
    * Tests setStateUrl().
    */
   public function testSetStateUrl() {
-    // Get contructor args and mocks.
+    // Get constructor args and mocks.
     $configuration = [
       'settings' => [
         'salesforce_mapping' => [
-          'my_form_element_2' => 'first_name'
+          'my_form_element_2' => 'first_name',
         ],
         'salesforce_oid' => 'XXX1234567890',
         'salesforce_url' => 'foo',
-      ]
+      ],
     ];
     $plugin_id = 'sfweb2lead_post';
     $plugin_definition = '';
@@ -96,13 +100,20 @@ class SalesforceWebToLeadPostWebformHandlerTest extends EntityKernelTestBase {
     $http_client = $this->getMockHttpClient();
     $message_manager = $this->getMockWebformMessageManager();
     $token_manager = $this->getMockTokenManager();
+
+    // Make setStateUrl public.
+    $method = new \ReflectionMethod('\Drupal\sfweb2lead_webform\Plugin\WebformHandler\SalesforceWebToLeadPostWebformHandler', 'setStateUrl');
+    $method->setAccessible(TRUE);
+
     // Instantiate handler.
-    $handler = new TestSalesforceWebToLeadPostWebformHandler($configuration, $plugin_id, $plugin_definition, $logger_factory, $config_factory, $entity_type_manager, $conditions_validator, $module_handler, $http_client, $token_manager, $message_manager);
+    $handler = new SalesforceWebToLeadPostWebformHandler($configuration, $plugin_id, $plugin_definition, $logger_factory, $config_factory, $entity_type_manager, $conditions_validator, $module_handler, $http_client, $token_manager, $message_manager);
     $handler->setLabel($plugin_id);
-    $handler->setStateUrl(WebformSubmissionInterface::STATE_DRAFT);
+
+    // Check the logic.
+    $method->invoke($handler, WebformSubmissionInterface::STATE_DRAFT);
     $this->assertArrayNotHasKey(WebformSubmissionInterface::STATE_DRAFT . '_url', $handler->getConfiguration()['settings']);
     $this->assertArrayNotHasKey(WebformSubmissionInterface::STATE_COMPLETED . '_url', $handler->getConfiguration()['settings']);
-    $handler->setStateUrl(WebformSubmissionInterface::STATE_COMPLETED);
+    $method->invoke($handler, WebformSubmissionInterface::STATE_COMPLETED);
     $this->assertArrayHasKey(WebformSubmissionInterface::STATE_COMPLETED . '_url', $handler->getConfiguration()['settings']);
   }
 
@@ -117,21 +128,21 @@ class SalesforceWebToLeadPostWebformHandlerTest extends EntityKernelTestBase {
    * Get a mock config factory.
    */
   protected function getMockConfigFactory() {
-    return $this->getMockBuilder('Drupal\Core\Config\ConfigFactoryInterface')->getMock();
+    return $this->getMockBuilder('\Drupal\Core\Config\ConfigFactoryInterface')->getMock();
   }
 
   /**
    * Get a mock entity type manager.
    */
   protected function getMockEntityTypeManager() {
-    return $this->getMockBuilder('Drupal\Core\Entity\EntityTypeManagerInterface')->getMock();
+    return $this->getMockBuilder('\Drupal\Core\Entity\EntityTypeManagerInterface')->getMock();
   }
 
   /**
    * Get a mock webform submission conditions validator.
    */
   protected function getMockWebformSubmissionConditionsValidator() {
-    return $this->getMockBuilder('Drupal\webform\WebformSubmissionConditionsValidatorInterface')->getMock();
+    return $this->getMockBuilder('\Drupal\webform\WebformSubmissionConditionsValidatorInterface')->getMock();
   }
 
   /**
@@ -163,23 +174,3 @@ class SalesforceWebToLeadPostWebformHandlerTest extends EntityKernelTestBase {
   }
 
 }
-
-/**
- * Test class extending SalesforceWebToLeadPostWebformHandler to aid testing.
- */
-class TestSalesforceWebToLeadPostWebformHandler extends SalesforceWebToLeadPostWebformHandler {
-
-  /**
-   * Public wrapper method for SalesforceWebToLeadPostWebformHandler::getRequestData().
-   */
-  public function getRequestData($state, WebformSubmissionInterface $webform_submission) {
-    return parent::getRequestData($state, $webform_submission);
-  }
-
-  /**
-   * Public wrapper method for SalesforceWebToLeadPostWebformHandler::setStateUrl().
-   */
-  public function setStateUrl($state) {
-    return parent::setStateUrl($state);
-  }
-}