diff --git a/modules/ppcp-settings/resources/js/utils/countryPriceInfo.js b/modules/ppcp-settings/resources/js/utils/countryPriceInfo.js
index c5cf52a3e0..e32d8e6cef 100644
--- a/modules/ppcp-settings/resources/js/utils/countryPriceInfo.js
+++ b/modules/ppcp-settings/resources/js/utils/countryPriceInfo.js
@@ -2,139 +2,139 @@ export const countryPriceInfo = {
 	US: {
 		fixedFee: {
 			USD: 0.49,
-            GBP: 0.39,
-            CAD: 0.59,
-            AUD: 0.59,
-            EUR: 0.39,
+			GBP: 0.39,
+			CAD: 0.59,
+			AUD: 0.59,
+			EUR: 0.39,
 		},
 		checkout: 3.49,
-        plater: 4.99,
-        ccf: {
-            percentage: 2.59,
-            fixedFee: 0.29,
-        },
+		plater: 4.99,
+		ccf: {
+			percentage: 2.59,
+			fixedFee: 0.29,
+		},
 		dw: {
-            percentage: 2.59,
-            fixedFee: 0.29,
-        },
+			percentage: 2.59,
+			fixedFee: 0.29,
+		},
 		apm: {
-            percentage: 2.89,
-            fixedFee: 0.29,
-        },
-        fast: {
-            percentage: 2.59,
-            fixedFee: 0.29,
-        },
+			percentage: 2.89,
+			fixedFee: 0.29,
+		},
+		fast: {
+			percentage: 2.59,
+			fixedFee: 0.29,
+		},
 		standardCardFields: 2.99,
 	},
-	UK: {
+	GB: {
 		fixedFee: {
 			GPB: 0.3,
-            USD: 0.3,
-            CAD: 0.3,
-            AUD: 0.3,
-            EUR: 0.35,
+			USD: 0.3,
+			CAD: 0.3,
+			AUD: 0.3,
+			EUR: 0.35,
 		},
 		checkout: 2.9,
-        plater: 2.9,
+		plater: 2.9,
 		ccf: 1.2,
 		dw: 1.2,
-        fast: 1.2,
+		fast: 1.2,
 		apm: 1.2,
 		standardCardFields: 1.2,
 	},
 	CA: {
 		fixedFee: {
 			CAD: 0.3,
-            USD: 0.3,
-            GBP: 0.2,
-            AUD: 0.3,
-            EUR: 0.35,
+			USD: 0.3,
+			GBP: 0.2,
+			AUD: 0.3,
+			EUR: 0.35,
 		},
 		checkout: 2.9,
 		ccf: 2.7,
 		dw: 2.7,
-        fast: 2.7,
+		fast: 2.7,
 		apm: 2.9,
 		standardCardFields: 2.9,
 	},
 	AU: {
 		fixedFee: {
 			AUD: 0.3,
-            USD: 0.3,
-            GBP: 0.2,
-            CAD: 0.3,
-            EUR: 0.35,
+			USD: 0.3,
+			GBP: 0.2,
+			CAD: 0.3,
+			EUR: 0.35,
 		},
 		checkout: 2.6,
-        plater: 2.6,
+		plater: 2.6,
 		ccf: 1.75,
 		dw: 1.75,
-        fast: 1.75,
+		fast: 1.75,
 		apm: 2.6,
 		standardCardFields: 2.6,
 	},
 	FR: {
 		fixedFee: {
 			EUR: 0.35,
-            USD: 0.3,
-            GBP: 0.3,
-            CAD: 0.3,
-            AUD: 0.3,
+			USD: 0.3,
+			GBP: 0.3,
+			CAD: 0.3,
+			AUD: 0.3,
 		},
 		checkout: 2.9,
-        plater: 2.9,
+		plater: 2.9,
 		ccf: 1.2,
 		dw: 1.2,
-        fast: 1.2,
+		fast: 1.2,
 		apm: 1.2,
 		standardCardFields: 1.2,
 	},
 	IT: {
 		fixedFee: {
-            EUR: 0.35,
-            USD: 0.3,
-            GBP: 0.3,
-            CAD: 0.3,
-            AUD: 0.3,
+			EUR: 0.35,
+			USD: 0.3,
+			GBP: 0.3,
+			CAD: 0.3,
+			AUD: 0.3,
 		},
 		checkout: 3.4,
-        plater: 3.4,
+		plater: 3.4,
 		ccf: 1.2,
 		dw: 1.2,
-        fast: 1.2,
+		fast: 1.2,
 		apm: 1.2,
 		standardCardFields: 1.2,
 	},
 	DE: {
 		fixedFee: {
 			EUR: 0.39,
-            USD: 0.49,
-            GBP: 0.29,
-            CAD: 0.59,
-            AUD: 0.59,
+			USD: 0.49,
+			GBP: 0.29,
+			CAD: 0.59,
+			AUD: 0.59,
 		},
 		checkout: 2.99,
-        plater: 2.99,
+		plater: 2.99,
 		ccf: 2.99,
 		dw: 2.99,
-        fast: 2.99,
+		fast: 2.99,
 		apm: 2.99,
 		standardCardFields: 2.99,
 	},
 	ES: {
 		fixedFee: {
-            EUR: 0.35,
-            USD: 0.3,
-            GBP: 0.3,
-            CAD: 0.3,
-            AUD: 0.3,
+			EUR: 0.35,
+			USD: 0.3,
+			GBP: 0.3,
+			CAD: 0.3,
+			AUD: 0.3,
 		},
 		checkout: 2.9,
-        plater: 2.9,
+		plater: 2.9,
 		ccf: 1.2,
 		dw: 1.2,
-        fast: 1.2,
+		fast: 1.2,
 		apm: 1.2,
 		standardCardFields: 1.2,
 	},
diff --git a/tests/PHPUnit/ApiClient/Entity/PayerTest.php b/tests/PHPUnit/ApiClient/Entity/PayerTest.php
index affdc206df..9efc603d52 100644
--- a/tests/PHPUnit/ApiClient/Entity/PayerTest.php
+++ b/tests/PHPUnit/ApiClient/Entity/PayerTest.php
@@ -18,7 +18,7 @@ public function testPayer()
             ->andReturn(['address']);
 	    $address
 		    ->expects('country_code')
-		    ->andReturn('UK');
+		    ->andReturn('GB');
         $phone = Mockery::mock(PhoneWithType::class);
         $phone
             ->expects('to_array')
@@ -70,7 +70,7 @@ public function testPayerNoId()
             ->andReturn(['address']);
 	    $address
 		    ->expects('country_code')
-		    ->andReturn('UK');
+		    ->andReturn('GB');
         $phone = Mockery::mock(PhoneWithType::class);
         $phone
             ->expects('to_array')
@@ -110,7 +110,7 @@ public function testPayerNoPhone()
             ->andReturn(['address']);
 	    $address
 		    ->expects('country_code')
-		    ->andReturn('UK');
+		    ->andReturn('GB');
         $phone = null;
         $taxInfo = Mockery::mock(PayerTaxInfo::class);
         $taxInfo
@@ -147,7 +147,7 @@ public function testPayerNoTaxInfo()
             ->andReturn(['address']);
 	    $address
 		    ->expects('country_code')
-		    ->andReturn('UK');
+		    ->andReturn('GB');
         $phone = Mockery::mock(PhoneWithType::class);
         $phone
             ->expects('to_array')
@@ -184,7 +184,7 @@ public function testPayerNoBirthDate()
             ->andReturn(['address']);
 	    $address
 		    ->expects('country_code')
-		    ->andReturn('UK');
+		    ->andReturn('GB');
         $phone = Mockery::mock(PhoneWithType::class);
         $phone
             ->expects('to_array')