diff --git a/src/include/abstracts/class-wc-retailcrm-abstracts-settings.php b/src/include/abstracts/class-wc-retailcrm-abstracts-settings.php
index 841c92c..5d3f442 100644
--- a/src/include/abstracts/class-wc-retailcrm-abstracts-settings.php
+++ b/src/include/abstracts/class-wc-retailcrm-abstracts-settings.php
@@ -22,6 +22,12 @@ abstract class WC_Retailcrm_Abstracts_Settings extends WC_Integration
     /** @var string */
     public static $option_key;
 
+    /** @var WC_Retailcrm_Url_Validator*/
+    private $urlValidator;
+
+    /** @var string */
+    private $crmUrl;
+
     /**
      * WC_Retailcrm_Abstracts_Settings constructor.
      */
@@ -39,6 +45,9 @@ abstract class WC_Retailcrm_Abstracts_Settings extends WC_Integration
         ) {
             add_action('init', [$this, 'init_settings_fields'], 99);
         }
+
+        // Initialization validator
+        $this->urlValidator = new WC_Retailcrm_Url_Validator();
     }
 
     /**
@@ -75,7 +84,7 @@ abstract class WC_Retailcrm_Abstracts_Settings extends WC_Integration
             'api_url' => [
                 'title'             => __('API of URL', 'retailcrm'),
                 'type'              => 'text',
-                'description'       => __( 'Enter API of URL (https://yourdomain.simla.com)', 'retailcrm' ),
+                'description'       => __('Enter API of URL (https://yourdomain.simla.com)', 'retailcrm'),
                 'desc_tip'          => true,
                 'default'           => ''
             ],
@@ -88,10 +97,6 @@ abstract class WC_Retailcrm_Abstracts_Settings extends WC_Integration
             ]
         ];
 
-        $post = $this->get_post_data();
-        $apiUrl = !empty($post[$this->plugin_id . $this->id . '_api_url']) ? $post[$this->plugin_id . $this->id . '_api_url'] : null;
-        $apiKey = !empty($post[$this->plugin_id . $this->id . '_api_key']) ? $post[$this->plugin_id . $this->id . '_api_key'] : null;
-
         if ($this->apiClient) {
             if (
                 isset($_GET['page']) && $_GET['page'] == 'wc-settings'
@@ -153,7 +158,6 @@ abstract class WC_Retailcrm_Abstracts_Settings extends WC_Integration
                         'type'        => 'checkbox',
                         'desc_tip'    =>  true,
                     ];
-
                 }
 
                 /**
@@ -579,18 +583,6 @@ abstract class WC_Retailcrm_Abstracts_Settings extends WC_Integration
                     'id'          => 'clear_cron_tasks'
                 ];
             }
-        } elseif (empty($apiUrl) === false && empty($apiKey) === false) {
-            $api = new WC_Retailcrm_Proxy(
-                $apiUrl,
-                $apiKey,
-                $this->get_option('corporate_enabled', 'no') === 'yes'
-            );
-
-            $response = $api->apiVersions();
-
-            if ($response->isSuccessful()) {
-                header("Refresh:0");
-            }
         }
     }
 
@@ -686,7 +678,7 @@ abstract class WC_Retailcrm_Abstracts_Settings extends WC_Integration
     }
 
     /**
-     * Validate API url
+    * Validate CRM URL.
      *
      * @param string $key
      * @param string $value
@@ -697,14 +689,22 @@ abstract class WC_Retailcrm_Abstracts_Settings extends WC_Integration
      */
     public function validate_api_url_field($key, $value)
     {
-        $crmUrl = validateUrl($value);
+        $validateMessage = $this->urlValidator->validateUrl($value);
 
-        if (validateUrl($crmUrl) == '') {
-            WC_Admin_Settings::add_error(esc_html__('Enter the correct URL of Simla.com', 'retailcrm'));
-            header("Refresh:3");
+        if ('' !== $validateMessage) {
+            WC_Admin_Settings::add_error(esc_html__('Enter the correct URL of Simla.com:' .  $validateMessage, 'retailcrm'));
+
+            // Need check if change API data in settings
+            if (isset($_POST['woocommerce_integration-retailcrm_whatsapp_number'])) {
+                header("Refresh:3");
+            }
+
+            $value = '';
         }
 
-        return $crmUrl;
+        $this->crmUrl = $value;
+
+        return $value;
     }
 
     /**
@@ -719,30 +719,25 @@ abstract class WC_Retailcrm_Abstracts_Settings extends WC_Integration
      */
     public function validate_api_key_field($key, $value)
     {
-        $crmUrl = $_POST['woocommerce_integration-retailcrm_api_url'];
-
         // If entered the wrong URL, don't need to validate the API key.
-        if (validateUrl($crmUrl) == '') {
+        if ('' === $this->crmUrl) {
             return $value;
         }
 
-        $api = new WC_Retailcrm_Proxy(
-            $crmUrl,
-            $value,
-            $this->get_option('corporate_enabled', 'no') === 'yes'
-        );
-
+        $api = new WC_Retailcrm_Proxy($this->crmUrl, $value);
         $response = $api->apiVersions();
 
-        if (!is_object($response)) {
-            $value = '';
-        }
-
         if (empty($response) || !$response->isSuccessful()) {
             WC_Admin_Settings::add_error(esc_html__('Enter the correct API key', 'retailcrm'));
-            header("Refresh:3");
+
+            // Need check if change API data in settings
+            if (isset($_POST['woocommerce_integration-retailcrm_whatsapp_number'])) {
+                header("Refresh:3");
+            }
 
             $value = '';
+        } else {
+            header("Refresh:0");
         }
 
         return $value;
diff --git a/src/include/api/class-wc-retailcrm-client-v5.php b/src/include/api/class-wc-retailcrm-client-v5.php
index a988b21..35ec6a4 100644
--- a/src/include/api/class-wc-retailcrm-client-v5.php
+++ b/src/include/api/class-wc-retailcrm-client-v5.php
@@ -35,9 +35,6 @@ class WC_Retailcrm_Client_V5
      * @param string $url    api url
      * @param string $apiKey api key
      * @param string $site   site code
-     *
-     * @throws InvalidArgumentException
-     *
      */
     public function __construct($url, $apiKey, $site = null)
     {
diff --git a/src/include/api/class-wc-retailcrm-proxy.php b/src/include/api/class-wc-retailcrm-proxy.php
index 8670f8e..f44f69c 100644
--- a/src/include/api/class-wc-retailcrm-proxy.php
+++ b/src/include/api/class-wc-retailcrm-proxy.php
@@ -138,4 +138,4 @@ if (!class_exists('WC_Retailcrm_Proxy')) :
             return !empty($response) ? $response : new WC_Retailcrm_Response(900, '{}');
         }
     }
-endif;
\ No newline at end of file
+endif;
diff --git a/src/include/api/class-wc-retailcrm-request.php b/src/include/api/class-wc-retailcrm-request.php
index 82d14d3..f21e3b1 100644
--- a/src/include/api/class-wc-retailcrm-request.php
+++ b/src/include/api/class-wc-retailcrm-request.php
@@ -33,16 +33,9 @@ class WC_Retailcrm_Request
      * @param string $url               api url
      * @param array  $defaultParameters array of parameters
      *
-     * @throws \InvalidArgumentException
      */
-    public function __construct($url, array $defaultParameters = array())
+    public function __construct($url, array $defaultParameters = [])
     {
-        if (false === stripos($url, 'https://')) {
-            throw new \InvalidArgumentException(
-                'API schema requires HTTPS protocol'
-            );
-        }
-
         $this->url = $url;
         $this->defaultParameters = $defaultParameters;
     }
diff --git a/src/include/functions.php b/src/include/functions.php
index 95bf7fe..663d273 100644
--- a/src/include/functions.php
+++ b/src/include/functions.php
@@ -137,19 +137,6 @@ function is_wplogin()
     );
 }
 
-
-/**
- *  Validate API url.
- *
- * @param string $url URL of Simla.com.
- *
- * @return string
- */
-function validateUrl(string $url)
-{
-    return (preg_match("/https:\/\/(.*).(retailcrm.(pro|ru|es)|simla.com)/", $url)) ? $url : '';
-}
-
 /**
  *  Get shipping rate.
  *
diff --git a/src/include/validators/class-wc-retailcrm-validator-exception.php b/src/include/validators/class-wc-retailcrm-validator-exception.php
new file mode 100644
index 0000000..c7c882e
--- /dev/null
+++ b/src/include/validators/class-wc-retailcrm-validator-exception.php
@@ -0,0 +1,10 @@
+<?php
+
+class ValidatorException extends Exception
+{
+    public function __construct(string $message = '', int $code = 0)
+    {
+        // Add filter, if you need customization message of exception
+        parent::__construct(apply_filters('retailcrm_validator_message', $message), $code);
+    }
+}
diff --git a/src/include/validators/url-validator/class-wc-retailcrm-url-constraint.php b/src/include/validators/url-validator/class-wc-retailcrm-url-constraint.php
new file mode 100644
index 0000000..be219d3
--- /dev/null
+++ b/src/include/validators/url-validator/class-wc-retailcrm-url-constraint.php
@@ -0,0 +1,67 @@
+<?php
+
+if (!class_exists('WC_Retailcrm_Url_Constraint')) :
+    /**
+     * PHP version 7.0
+     *
+     * Class WC_Retailcrm_Url_Constraint - Constraint for CRM url.
+     *
+     * @category Integration
+     * @author   RetailCRM <integration@retailcrm.ru>
+     * @license  http://retailcrm.ru Proprietary
+     * @link     http://retailcrm.ru
+     * @see      http://help.retailcrm.ru
+     */
+    class WC_Retailcrm_Url_Constraint
+    {
+        /**
+         * @var string
+         */
+        public $schemeFail = 'Incorrect protocol. Only https is allowed.';
+
+        /**
+         * @var string
+         */
+        public $pathFail = 'The domain path must be empty.';
+
+        /**
+         * @var string
+         */
+        public $portFail = 'The port does not need to be specified.';
+
+        /**
+         * @var string
+         */
+        public $domainFail = 'An invalid domain is specified.';
+
+        /**
+         * @var string
+         */
+        public $noValidUrlHost = 'Incorrect Host URL.';
+
+        /**
+         * @var string
+         */
+        public $noValidUrl = 'Incorrect URL.';
+
+        /**
+         * @var string
+         */
+        public $queryFail = 'The query must be blank.';
+
+        /**
+         * @var string
+         */
+        public $fragmentFail = 'The fragment should be blank.';
+
+        /**
+         * @var string
+         */
+        public $authFail = 'No need to provide authorization data.';
+
+        /**
+         * @var string
+         */
+        public $getFileError = 'Unable to obtain reference values.';
+    }
+endif;
diff --git a/src/include/validators/url-validator/class-wc-retailcrm-url-validator.php b/src/include/validators/url-validator/class-wc-retailcrm-url-validator.php
new file mode 100644
index 0000000..248a34b
--- /dev/null
+++ b/src/include/validators/url-validator/class-wc-retailcrm-url-validator.php
@@ -0,0 +1,205 @@
+<?php
+
+if (!class_exists('WC_Retailcrm_Url_Validator')) :
+    /**
+     * PHP version 7.0
+     *
+     * Class WC_Retailcrm_Url_Validator - Validate CRM url.
+     *
+     * @category Integration
+     * @author   RetailCRM <integration@retailcrm.ru>
+     * @license  http://retailcrm.ru Proprietary
+     * @link     http://retailcrm.ru
+     * @see      http://help.retailcrm.ru
+     */
+    class WC_Retailcrm_Url_Validator extends WC_Retailcrm_Url_Constraint
+    {
+        const CRM_DOMAINS_URL = 'https://infra-data.retailcrm.tech/crm-domains.json';
+        const BOX_DOMAINS_URL = 'https://infra-data.retailcrm.tech/box-domains.json';
+
+        /**
+         * @param string $crmUrl
+         *
+         * @return string
+         */
+        public function validateUrl(string $crmUrl): string
+        {
+            $validateMessage = '';
+
+            try {
+                $filteredUrl = filter_var($crmUrl, FILTER_VALIDATE_URL);
+
+                if (false === $filteredUrl) {
+                    throw new ValidatorException($this->noValidUrl, 400);
+                }
+
+                $urlArray = parse_url($filteredUrl);
+
+                $this->validateUrlFormat($urlArray);
+                $this->validateUrlDomains($urlArray);
+            } catch (ValidatorException $exception) {
+                $validateMessage = $exception->getMessage();
+            }
+
+            return $validateMessage;
+        }
+
+        /**
+         * @param array $crmUrl
+         *
+         * @throws ValidatorException
+         */
+        private function validateUrlFormat(array $crmUrl)
+        {
+            $this->checkHost($crmUrl);
+            $this->checkScheme($crmUrl);
+            $this->checkAuth($crmUrl);
+            $this->checkFragment($crmUrl);
+            $this->checkPath($crmUrl);
+            $this->checkPort($crmUrl);
+            $this->checkQuery($crmUrl);
+        }
+
+        /**
+         * @param array $crmUrl
+         *
+         * @throws ValidatorException
+         */
+        private function validateUrlDomains(array $crmUrl)
+        {
+            $mainDomain = $this->getMainDomain($crmUrl['host']);
+            $existInCrm = $this->checkDomains(self::CRM_DOMAINS_URL, $mainDomain);
+            $existInBox = $this->checkDomains(self::BOX_DOMAINS_URL, $crmUrl['host']);
+
+            if (false === $existInCrm && false === $existInBox) {
+                throw new ValidatorException($this->domainFail);
+            }
+        }
+
+        /**
+         * @param array $crmUrl
+         *
+         * @throws ValidatorException
+         */
+        private function checkHost(array $crmUrl)
+        {
+            if (empty($crmUrl['host'])) {
+                throw new ValidatorException($this->noValidUrlHost);
+            }
+        }
+
+        /**
+         * @param array $crmUrl
+         *
+         * @throws ValidatorException
+         */
+        private function checkScheme(array $crmUrl)
+        {
+            if (!empty($crmUrl['scheme']) && 'https' !== $crmUrl['scheme']) {
+                throw new ValidatorException($this->schemeFail);
+            }
+        }
+
+        /**
+         * @param array $crmUrl
+         *
+         * @throws ValidatorException
+         */
+        private function checkQuery(array $crmUrl)
+        {
+            if (!empty($crmUrl['query'])) {
+                throw new ValidatorException($this->queryFail);
+            }
+        }
+
+        /**
+         * @param array $crmUrl
+         *
+         * @throws ValidatorException
+         */
+        private function checkAuth(array $crmUrl)
+        {
+            if (!empty($crmUrl['pass']) || !empty($crmUrl['user'])) {
+                throw new ValidatorException($this->authFail);
+            }
+        }
+
+        /**
+         * @param array $crmUrl
+         *
+         * @throws ValidatorException
+         */
+        private function checkFragment(array $crmUrl)
+        {
+            if (!empty($crmUrl['fragment'])) {
+                throw new ValidatorException($this->fragmentFail);
+            }
+        }
+
+        /**
+         * @param array $crmUrl
+         *
+         * @throws ValidatorException
+         */
+        private function checkPort(array $crmUrl)
+        {
+            if (!empty($crmUrl['port'])) {
+                throw new ValidatorException($this->portFail);
+            }
+        }
+
+        /**
+         * @param array $crmUrl
+         *
+         * @throws ValidatorException
+         */
+        private function checkPath(array $crmUrl)
+        {
+            if (!empty($crmUrl['path']) && '/' !== $crmUrl['path']) {
+                throw new ValidatorException($this->pathFail);
+            }
+        }
+
+        /**
+         * @param string $domainUrl
+         *
+         * @return array
+         * @throws ValidatorException
+         */
+        private function getValidDomains(string $domainUrl): array
+        {
+            try {
+                $content = json_decode(file_get_contents($domainUrl), true);
+
+                return array_column($content['domains'], 'domain');
+            } catch (Exception $exception) {
+                throw new ValidatorException($this->getFileError);
+            }
+        }
+
+        /**
+         * @param string $host
+         *
+         * @return string
+         */
+        private function getMainDomain(string $host): string
+        {
+            $hostArray = explode('.', $host);
+            unset($hostArray[0]);
+
+            return implode('.', $hostArray);
+        }
+
+        /**
+         * @param string $crmDomainsUrl
+         * @param string $domainHost
+         *
+         * @return bool
+         * @throws ValidatorException
+         */
+        private function checkDomains(string $crmDomainsUrl, string $domainHost): bool
+        {
+            return in_array($domainHost, $this->getValidDomains($crmDomainsUrl), true);
+        }
+    }
+endif;
diff --git a/src/retailcrm.php b/src/retailcrm.php
index 1cca569..637be60 100644
--- a/src/retailcrm.php
+++ b/src/retailcrm.php
@@ -127,6 +127,9 @@ if (!class_exists( 'WC_Integration_Retailcrm')) :
             require_once(self::checkCustomFile('include/class-wc-retailcrm-base.php'));
             require_once(self::checkCustomFile('include/class-wc-retailcrm-uploader.php'));
             require_once(self::checkCustomFile('include/functions.php'));
+            require_once(self::checkCustomFile('include/validators/url-validator/class-wc-retailcrm-url-constraint.php'));
+            require_once(self::checkCustomFile('include/validators/url-validator/class-wc-retailcrm-url-validator.php'));
+            require_once(self::checkCustomFile('include/validators/class-wc-retailcrm-validator-exception.php'));
         }
 
         /**
diff --git a/tests/datasets/data-base-retailcrm.php b/tests/datasets/data-base-retailcrm.php
index bc2f880..aafe15a 100644
--- a/tests/datasets/data-base-retailcrm.php
+++ b/tests/datasets/data-base-retailcrm.php
@@ -15,6 +15,23 @@ namespace datasets;
  */
 class DataBaseRetailCrm
 {
+    public static function getResponseCustomFields()
+    {
+        return [
+            'success' => true,
+            'customFields' => [
+                [
+                    'name' => 'Test_Upload',
+                    'code' => 'test_upload',
+                ],
+                [
+                    'name' => 'test123',
+                    'code' => 'test',
+                ],
+            ]
+        ];
+    }
+
     public static function getResponseStatuses()
     {
         return [
diff --git a/tests/helpers/class-wc-retailcrm-test-case-helper.php b/tests/helpers/class-wc-retailcrm-test-case-helper.php
index a1f2a4c..217665f 100644
--- a/tests/helpers/class-wc-retailcrm-test-case-helper.php
+++ b/tests/helpers/class-wc-retailcrm-test-case-helper.php
@@ -20,7 +20,7 @@ class WC_Retailcrm_Test_Case_Helper extends WC_Unit_Test_Case
     {
         $options = [
             'api_url' => 'https://example.retailcrm.ru',
-            'api_key' => 'test_key',
+            'api_key' => 'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX1',
             'corporate_enabled' => 'yes',
             'online_assistant'  => 'code',
             'p_draft'   => 'no',
diff --git a/tests/test-wc-retailcrm-base.php b/tests/test-wc-retailcrm-base.php
index 4a81fcc..bf26428 100644
--- a/tests/test-wc-retailcrm-base.php
+++ b/tests/test-wc-retailcrm-base.php
@@ -20,34 +20,37 @@ class WC_Retailcrm_Base_Test extends WC_Retailcrm_Test_Case_Helper
     protected $responseMockDeliveryTypes;
     protected $responseMockPaymentTypes;
     protected $responseMockStatuses;
+    protected $responseMockCustomFields;
     protected $dataOptions;
     private $baseRetailcrm;
 
     public function setUp()
     {
-        $this->apiMock = $this->getMockBuilder('\WC_Retailcrm_Proxy')
-                              ->disableOriginalConstructor()
-                              ->setMethods(
-                                  [
-                                      'orderMethodsList',
-                                      'deliveryTypesList',
-                                      'paymentTypesList',
-                                      'statusesList',
-                                      'customFieldsList',
-                                  ]
-                              )
-                              ->getMock();
+        $this->apiMock = $this
+            ->getMockBuilder('\WC_Retailcrm_Proxy')
+            ->disableOriginalConstructor()
+            ->setMethods(
+                [
+                    'orderMethodsList',
+                    'deliveryTypesList',
+                    'paymentTypesList',
+                    'statusesList',
+                    'customFieldsList',
+                ]
+            )
+            ->getMock();
 
         $this->setMockOrderMethods();
         $this->setMockDeliveryTypes();
         $this->setMockPaymentTypes();
         $this->setMockStatuses();
+        $this->setMockCustomFields();
 
         $_GET['page'] = 'wc-settings';
         $_GET['tab'] = 'integration';
 
         $this->dataOptions = $this->setOptions();
-        $this->baseRetailcrm = new \WC_Retailcrm_Base($this->apiMock);
+        $this->baseRetailcrm = new WC_Retailcrm_Base($this->apiMock);
     }
 
     public function test_retailcrm_form_fields()
@@ -158,14 +161,14 @@ class WC_Retailcrm_Base_Test extends WC_Retailcrm_Test_Case_Helper
     public function test_option_cron_disabled()
     {
         $settings = $this->baseRetailcrm->api_sanitized(
-            array(
+            [
                 'api_url' => 'https://example.retailcrm.ru',
-                'api_key' => 'test_key',
+                'api_key' => 'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX1',
                 'corporate_enabled' => 'yes',
                 'sync' => 'no',
                 'icml' => 'no',
                 'history' => 'no',
-            )
+            ]
         );
 
         $history = date('H:i:s d-m-Y', wp_next_scheduled('retailcrm_history'));
@@ -180,7 +183,7 @@ class WC_Retailcrm_Base_Test extends WC_Retailcrm_Test_Case_Helper
         $this->assertArrayHasKey('api_url', $settings);
         $this->assertEquals('https://example.retailcrm.ru', $settings['api_url']);
         $this->assertArrayHasKey('api_key', $settings);
-        $this->assertEquals('test_key', $settings['api_key']);
+        $this->assertEquals('XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX1', $settings['api_key']);
         $this->assertArrayHasKey('corporate_enabled', $settings);
         $this->assertEquals('yes', $settings['corporate_enabled']);
         $this->assertArrayHasKey('sync', $settings);
@@ -214,7 +217,7 @@ class WC_Retailcrm_Base_Test extends WC_Retailcrm_Test_Case_Helper
 
     public function test_get_cron_info_off()
     {
-        $this->baseRetailcrm->settings = array('sync' => 'no', 'icml' => 'no', 'history' => 'no');
+        $this->baseRetailcrm->settings = ['sync' => 'no', 'icml' => 'no', 'history' => 'no'];
 
         ob_start();
         $this->baseRetailcrm->get_cron_info();
@@ -263,11 +266,11 @@ class WC_Retailcrm_Base_Test extends WC_Retailcrm_Test_Case_Helper
 
     public function test_initialize_whatsapp_off()
     {
-        $this->baseRetailcrm->settings = array(
+        $this->baseRetailcrm->settings = [
             'whatsapp_active' => 'no',
             'whatsapp_location_icon' => 'no',
             'whatsapp_number' => '',
-        );
+        ];
 
         ob_start();
         $this->baseRetailcrm->initialize_whatsapp();
@@ -278,7 +281,7 @@ class WC_Retailcrm_Base_Test extends WC_Retailcrm_Test_Case_Helper
 
     public function test_initialize_daemon_collector_off()
     {
-        $this->baseRetailcrm->settings = array('daemon_collector' => 'no', 'daemon_collector_key' => '');
+        $this->baseRetailcrm->settings = ['daemon_collector' => 'no', 'daemon_collector_key' => ''];
 
         ob_start();
         $this->baseRetailcrm->initialize_daemon_collector();
@@ -301,7 +304,7 @@ class WC_Retailcrm_Base_Test extends WC_Retailcrm_Test_Case_Helper
 
     public function test_initialize_analytics_off()
     {
-        $this->baseRetailcrm->settings = array('ua' => '', 'ua_code' => '', 'ua_custom' => '');
+        $this->baseRetailcrm->settings = ['ua' => '', 'ua_code' => '', 'ua_custom' => ''];
 
         ob_start();
         $this->baseRetailcrm->initialize_analytics();
@@ -312,31 +315,6 @@ class WC_Retailcrm_Base_Test extends WC_Retailcrm_Test_Case_Helper
 
     public function test_set_meta_fields()
     {
-        $responseApiMock = $this->getMockBuilder('\WC_Retailcrm_Response_Helper')
-                                ->disableOriginalConstructor()
-                                ->setMethods(['isSuccessful'])
-                                ->getMock();
-
-        $this->setMockResponse($responseApiMock, 'isSuccessful', true);
-
-        $responseApiMock->setResponse(
-            [
-                'success' => true,
-                'customFields' => [
-                    [
-                        'name' => 'Test_Upload',
-                        'code' => 'test_upload',
-                    ],
-                    [
-                        'name' => 'test123',
-                        'code' => 'test',
-                    ],
-                ]
-            ]
-        );
-
-        $this->setMockResponse($this->apiMock, 'customFieldsList', $responseApiMock);
-
         ob_start();
 
         $this->baseRetailcrm->set_meta_fields();
@@ -378,6 +356,34 @@ class WC_Retailcrm_Base_Test extends WC_Retailcrm_Test_Case_Helper
         ob_end_clean();
     }
 
+    public function test_validate_crm_url()
+    {
+        $this->assertEquals(
+            'https://test.simla.com',
+            $this->baseRetailcrm->validate_api_url_field('', 'https://test.simla.com')
+        );
+        $this->assertEquals(
+            'https://test.retailcrm.ru',
+            $this->baseRetailcrm->validate_api_url_field('', 'https://test.retailcrm.ru')
+        );
+        $this->assertEquals(
+            'https://test.retailcrm.pro',
+            $this->baseRetailcrm->validate_api_url_field('', 'https://test.retailcrm.pro')
+        );
+        $this->assertEquals(
+            '',
+            $this->baseRetailcrm->validate_api_url_field('', 'https://test.test.pro')
+        );
+
+        $this->assertEquals('', $this->baseRetailcrm->validate_api_url_field('', 'http://test.retailcrm.pro'));
+        $this->assertEquals('', $this->baseRetailcrm->validate_api_url_field('', 'https://test.simla.com?query=test'));
+        $this->assertEquals('', $this->baseRetailcrm->validate_api_url_field('', 'https://test.simla.com?pass=test'));
+        $this->assertEquals('', $this->baseRetailcrm->validate_api_url_field('', 'https://test.simla.com?user=test'));
+        $this->assertEquals('', $this->baseRetailcrm->validate_api_url_field('', 'https://te.simla.com?fragment=test'));
+        $this->assertEquals('', $this->baseRetailcrm->validate_api_url_field('', 'https://test.simla.com:12345'));
+        $this->assertEquals('', $this->baseRetailcrm->validate_api_url_field('', 'https://test.simla.com/test'));
+    }
+
     private function getJsonData($text)
     {
         preg_match('/{.*}/', $text, $matches);
@@ -387,10 +393,12 @@ class WC_Retailcrm_Base_Test extends WC_Retailcrm_Test_Case_Helper
 
     private function setMockOrderMethods()
     {
-        $this->responseMockOrderMethods = $this->getMockBuilder('\WC_Retailcrm_Response_Helper')
-                                               ->disableOriginalConstructor()
-                                               ->setMethods(array('isSuccessful'))
-                                               ->getMock();
+        $this->responseMockOrderMethods = $this
+            ->getMockBuilder('\WC_Retailcrm_Response_Helper')
+            ->disableOriginalConstructor()
+            ->setMethods(['isSuccessful'])
+            ->getMock();
+
         $this->setMockResponse($this->responseMockOrderMethods, 'isSuccessful', true);
 
         $this->responseMockOrderMethods->setResponse(DataBaseRetailCrm::getResponseOrderMethods());
@@ -399,10 +407,12 @@ class WC_Retailcrm_Base_Test extends WC_Retailcrm_Test_Case_Helper
 
     private function setMockDeliveryTypes()
     {
-        $this->responseMockDeliveryTypes = $this->getMockBuilder('\WC_Retailcrm_Response_Helper')
-                                                ->disableOriginalConstructor()
-                                                ->setMethods(array('isSuccessful'))
-                                                ->getMock();
+        $this->responseMockDeliveryTypes = $this
+            ->getMockBuilder('\WC_Retailcrm_Response_Helper')
+            ->disableOriginalConstructor()
+            ->setMethods(['isSuccessful'])
+            ->getMock();
+
         $this->setMockResponse($this->responseMockDeliveryTypes, 'isSuccessful', true);
 
         $this->responseMockDeliveryTypes->setResponse(DataBaseRetailCrm::getResponseDeliveryTypes());
@@ -411,10 +421,12 @@ class WC_Retailcrm_Base_Test extends WC_Retailcrm_Test_Case_Helper
 
     private function setMockPaymentTypes()
     {
-        $this->responseMockPaymentTypes = $this->getMockBuilder('\WC_Retailcrm_Response_Helper')
-                                               ->disableOriginalConstructor()
-                                               ->setMethods(array('isSuccessful'))
-                                               ->getMock();
+        $this->responseMockPaymentTypes = $this
+            ->getMockBuilder('\WC_Retailcrm_Response_Helper')
+            ->disableOriginalConstructor()
+            ->setMethods(['isSuccessful'])
+            ->getMock();
+
         $this->setMockResponse($this->responseMockPaymentTypes, 'isSuccessful', true);
 
         $this->responseMockPaymentTypes->setResponse(DataBaseRetailCrm::getResponsePaymentTypes());
@@ -423,13 +435,30 @@ class WC_Retailcrm_Base_Test extends WC_Retailcrm_Test_Case_Helper
 
     private function setMockStatuses()
     {
-        $this->responseMockStatuses = $this->getMockBuilder('\WC_Retailcrm_Response_Helper')
-                                           ->disableOriginalConstructor()
-                                           ->setMethods(array('isSuccessful'))
-                                           ->getMock();
+        $this->responseMockStatuses = $this
+            ->getMockBuilder('\WC_Retailcrm_Response_Helper')
+            ->disableOriginalConstructor()
+            ->setMethods(['isSuccessful'])
+            ->getMock();
+
         $this->setMockResponse($this->responseMockStatuses, 'isSuccessful', true);
 
         $this->responseMockStatuses->setResponse(DataBaseRetailCrm::getResponseStatuses());
         $this->setMockResponse($this->apiMock, 'statusesList', $this->responseMockStatuses);
     }
+
+    private function setMockCustomFields()
+    {
+        $this->responseMockCustomFields = $this
+            ->getMockBuilder('\WC_Retailcrm_Response_Helper')
+            ->disableOriginalConstructor()
+            ->setMethods(['isSuccessful'])
+            ->getMock();
+
+        $this->setMockResponse($this->responseMockCustomFields, 'isSuccessful', true);
+
+        $this->responseMockCustomFields->setResponse(DataBaseRetailCrm::getResponseCustomFields());
+
+        $this->setMockResponse($this->apiMock, 'customFieldsList', $this->responseMockCustomFields);
+    }
 }
diff --git a/tests/test-wc-retailcrm-orders.php b/tests/test-wc-retailcrm-orders.php
index 2107226..2b904a6 100644
--- a/tests/test-wc-retailcrm-orders.php
+++ b/tests/test-wc-retailcrm-orders.php
@@ -429,14 +429,6 @@ class WC_Retailcrm_Orders_Test extends WC_Retailcrm_Test_Case_Helper
         $this->assertEquals(null, $rate);
     }
 
-    public function test_validate_url()
-    {
-        $this->assertEquals('https://test.simla.com', validateUrl('https://test.simla.com'));
-
-        // Not valid url
-        $this->assertEquals('', validateUrl('https://test.com'));
-    }
-
     public function test_is_corporate_crm_order()
     {
         $this->assertEquals(