diff --git a/tests/functional/Shop/CartTaxesCest.php b/tests/functional/Shop/CartTaxesCest.php
index 85d92429d..ad07d80c6 100644
--- a/tests/functional/Shop/CartTaxesCest.php
+++ b/tests/functional/Shop/CartTaxesCest.php
@@ -89,8 +89,8 @@ class CartTaxesCest
         );
 
         $I->amOnPage('/checkout/cart');
-        $I->seeInSource('Tax ' . $tax1->tax_rate . ' %');
-        $I->seeInSource(core()->currency($expectedTaxAmount1));
+        $I->seeInSource('Tax ' . $tax1->tax_rate . ' %', '#taxrate-' . core()->taxRateAsIdentifier($tax1->tax_rate));
+        $I->seeInSource(core()->currency($expectedTaxAmount1), '#basetaxamount-' . core()->taxRateAsIdentifier($tax1->tax_rate));
 
         Cart::addProduct($product1->id, [
             '_token'     => session('_token'),
@@ -105,8 +105,8 @@ class CartTaxesCest
         );
 
         $I->amOnPage('/checkout/cart');
-        $I->seeInSource('Tax ' . $tax1->tax_rate . ' %');
-        $I->seeInSource(core()->currency($expectedTaxAmount1));
+        $I->seeInSource('Tax ' . $tax1->tax_rate . ' %', '#taxrate-' . core()->taxRateAsIdentifier($tax1->tax_rate));
+        $I->seeInSource(core()->currency($expectedTaxAmount1), '#basetaxamount-' . core()->taxRateAsIdentifier($tax1->tax_rate));
 
         Cart::addProduct($product2->id, [
             '_token'     => session('_token'),
@@ -121,11 +121,11 @@ class CartTaxesCest
         );
 
         $I->amOnPage('/checkout/cart');
-        $I->seeInSource('Tax ' . $tax1->tax_rate . ' %');
-        $I->seeInSource(core()->currency($expectedTaxAmount1));
+        $I->seeInSource('Tax ' . $tax1->tax_rate . ' %', '#taxrate-' . core()->taxRateAsIdentifier($tax1->tax_rate));
+        $I->seeInSource(core()->currency($expectedTaxAmount1), '#basetaxamount-' . core()->taxRateAsIdentifier($tax1->tax_rate));
 
-        $I->seeInSource('Tax ' . $tax2->tax_rate . ' %');
-        $I->seeInSource(core()->currency($expectedTaxAmount2));
+        $I->seeInSource('Tax ' . $tax2->tax_rate . ' %', '#taxrate-' . core()->taxRateAsIdentifier($tax2->tax_rate));
+        $I->seeInSource(core()->currency($expectedTaxAmount2), '#basetaxamount-' . core()->taxRateAsIdentifier($tax2->tax_rate));
         $cart = Cart::getCart();
 
         $I->assertEquals(2, $cart->items_count);
@@ -288,17 +288,17 @@ class CartTaxesCest
         $I->wantToTest('customer address with postcode in range of 00000 - 49999');
         $I->amOnPage('/checkout/cart');
 
-        $I->seeInSource('Tax ' . $tax11->tax_rate . ' %');
-        $I->seeInSource(core()->currency($expectedTaxAmount11));
+        $I->seeInSource('Tax ' . $tax11->tax_rate . ' %', '#taxrate-' . core()->taxRateAsIdentifier($tax11->tax_rate));
+        $I->seeInSource(core()->currency($expectedTaxAmount11), '#basetaxamount-' . core()->taxRateAsIdentifier($tax11->tax_rate));
 
-        $I->dontSeeInSource('Tax ' . $tax12->tax_rate . ' %');
-        $I->dontSeeInSource(core()->currency($expectedTaxAmount12));
+        $I->dontSeeInSource('Tax ' . $tax12->tax_rate . ' %', '#taxrate-' . core()->taxRateAsIdentifier($tax12->tax_rate));
+        $I->dontSeeInSource(core()->currency($expectedTaxAmount12), '#basetaxamount-' . core()->taxRateAsIdentifier($tax12->tax_rate));
 
-        $I->dontSeeInSource('Tax ' . $tax21->tax_rate . ' %');
-        $I->dontSeeInSource(core()->currency($expectedTaxAmount21));
+        $I->dontSeeInSource('Tax ' . $tax21->tax_rate . ' %', '#taxrate-' . core()->taxRateAsIdentifier($tax21->tax_rate));
+        $I->dontSeeInSource(core()->currency($expectedTaxAmount21), '#basetaxamount-' . core()->taxRateAsIdentifier($tax21->tax_rate));
 
-        $I->dontSeeInSource('Tax ' . $tax22->tax_rate . ' %');
-        $I->dontSeeInSource(core()->currency($expectedTaxAmount22));
+        $I->dontSeeInSource('Tax ' . $tax22->tax_rate . ' %', '#taxrate-' . core()->taxRateAsIdentifier($tax22->tax_rate));
+        $I->dontSeeInSource(core()->currency($expectedTaxAmount22), '#basetaxamount-' . core()->taxRateAsIdentifier($tax22->tax_rate));
 
         Cart::addProduct($product2->id, [
             '_token'     => session('_token'),
@@ -308,20 +308,20 @@ class CartTaxesCest
 
         $I->amOnPage('/checkout/cart');
 
-        $I->seeInSource('Tax ' . $tax11->tax_rate . ' %');
-        $I->seeInSource(core()->currency($expectedTaxAmount11));
+        $I->seeInSource('Tax ' . $tax11->tax_rate . ' %', '#taxrate-' . core()->taxRateAsIdentifier($tax11->tax_rate));
+        $I->seeInSource(core()->currency($expectedTaxAmount11), '#basetaxamount-' . core()->taxRateAsIdentifier($tax11->tax_rate));
 
-        $I->dontSeeInSource('Tax ' . $tax12->tax_rate . ' %');
-        $I->dontSeeInSource(core()->currency($expectedTaxAmount12));
+        $I->dontSeeInSource('Tax ' . $tax12->tax_rate . ' %', '#taxrate-' . core()->taxRateAsIdentifier($tax12->tax_rate));
+        $I->dontSeeInSource(core()->currency($expectedTaxAmount12), '#basetaxamount-' . core()->taxRateAsIdentifier($tax12->tax_rate));
 
-        $I->seeInSource('Tax ' . $tax21->tax_rate . ' %');
-        $I->seeInSource(core()->currency($expectedTaxAmount21));
+        $I->seeInSource('Tax ' . $tax21->tax_rate . ' %', '#taxrate-' . core()->taxRateAsIdentifier($tax21->tax_rate));
+        $I->seeInSource(core()->currency($expectedTaxAmount21), '#basetaxamount-' . core()->taxRateAsIdentifier($tax21->tax_rate));
 
-        $I->dontSeeInSource('Tax ' . $tax22->tax_rate . ' %');
-        $I->dontSeeInSource(core()->currency($expectedTaxAmount22));
+        $I->dontSeeInSource('Tax ' . $tax22->tax_rate . ' %', '#taxrate-' . core()->taxRateAsIdentifier($tax22->tax_rate));
+        $I->dontSeeInSource(core()->currency($expectedTaxAmount22), '#basetaxamount-' . core()->taxRateAsIdentifier($tax22->tax_rate));
 
-        $I->seeInSource(core()->currency($expectedTaxAmount11));
-        $I->seeInSource(core()->currency($expectedTaxAmount21));
+        $I->seeInSource(core()->currency($expectedTaxAmount11), '#basetaxamount-' . core()->taxRateAsIdentifier($tax11->tax_rate));
+        $I->seeInSource(core()->currency($expectedTaxAmount21), '#basetaxamount-' . core()->taxRateAsIdentifier($tax21->tax_rate));
 
 
         $I->wantToTest('customer address with postcode in range of 50000 - 89999');
@@ -355,20 +355,20 @@ class CartTaxesCest
 
         $I->amOnPage('/checkout/cart');
 
-        $I->dontSeeInSource('Tax ' . $tax11->tax_rate . ' %');
-        $I->dontSeeInSource(core()->currency($expectedTaxAmount11));
+        $I->dontSeeInSource('Tax ' . $tax11->tax_rate . ' %', '#taxrate-' . core()->taxRateAsIdentifier($tax11->tax_rate));
+        $I->dontSeeInSource(core()->currency($expectedTaxAmount11), '#basetaxamount-' . core()->taxRateAsIdentifier($tax11->tax_rate));
 
-        $I->seeInSource('Tax ' . $tax12->tax_rate . ' %');
-        $I->seeInSource(core()->currency($expectedTaxAmount12));
+        $I->seeInSource('Tax ' . $tax12->tax_rate . ' %', '#taxrate-' . core()->taxRateAsIdentifier($tax12->tax_rate));
+        $I->seeInSource(core()->currency($expectedTaxAmount12), '#basetaxamount-' . core()->taxRateAsIdentifier($tax12->tax_rate));
 
-        $I->dontSeeInSource('Tax ' . $tax21->tax_rate . ' %');
-        $I->dontSeeInSource(core()->currency($expectedTaxAmount21));
+        $I->dontSeeInSource('Tax ' . $tax21->tax_rate . ' %', '#taxrate-' . core()->taxRateAsIdentifier($tax21->tax_rate));
+        $I->dontSeeInSource(core()->currency($expectedTaxAmount21), '#basetaxamount-' . core()->taxRateAsIdentifier($tax21->tax_rate));
 
-        $I->seeInSource('Tax ' . $tax22->tax_rate . ' %');
-        $I->seeInSource(core()->currency(round($product2->price * $tax22->tax_rate / 100, 2)));
+        $I->seeInSource('Tax ' . $tax22->tax_rate . ' %', '#taxrate-' . core()->taxRateAsIdentifier($tax22->tax_rate));
+        $I->seeInSource(core()->currency(round($product2->price * $tax22->tax_rate / 100, 2)), '#basetaxamount-' . core()->taxRateAsIdentifier($tax22->tax_rate));
 
-        $I->seeInSource(core()->currency($expectedTaxAmount12));
-        $I->seeInSource(core()->currency($expectedTaxAmount22));
+        $I->seeInSource(core()->currency($expectedTaxAmount12), '#basetaxamount-' . core()->taxRateAsIdentifier($tax12->tax_rate));
+        $I->seeInSource(core()->currency($expectedTaxAmount22), '#basetaxamount-' . core()->taxRateAsIdentifier($tax22->tax_rate));
 
         $I->wantToTest('customer address with postcode in range of 90000 - 99000');
         $I->wanttoTest('as we dont have any taxes in this zip range');
@@ -402,16 +402,16 @@ class CartTaxesCest
 
         $I->amOnPage('/checkout/cart');
 
-        $I->dontSeeInSource('Tax ' . $tax11->tax_rate . ' %');
-        $I->dontSeeInSource(core()->currency($expectedTaxAmount11));
+        $I->dontSeeInSource('Tax ' . $tax11->tax_rate . ' %', '#taxrate-' . core()->taxRateAsIdentifier($tax11->tax_rate));
+        $I->dontSeeInSource(core()->currency($expectedTaxAmount11), '#basetaxamount-' . core()->taxRateAsIdentifier($tax11->tax_rate));
 
-        $I->dontSeeInSource('Tax ' . $tax12->tax_rate . ' %');
-        $I->dontSeeInSource(core()->currency($expectedTaxAmount12));
+        $I->dontSeeInSource('Tax ' . $tax12->tax_rate . ' %', '#taxrate-' . core()->taxRateAsIdentifier($tax12->tax_rate));
+        $I->dontSeeInSource(core()->currency($expectedTaxAmount12), '#basetaxamount-' . core()->taxRateAsIdentifier($tax12->tax_rate));
 
-        $I->dontSeeInSource('Tax ' . $tax21->tax_rate . ' %');
-        $I->dontSeeInSource(core()->currency($expectedTaxAmount21));
+        $I->dontSeeInSource('Tax ' . $tax21->tax_rate . ' %', '#taxrate-' . core()->taxRateAsIdentifier($tax21->tax_rate));
+        $I->dontSeeInSource(core()->currency($expectedTaxAmount21), '#basetaxamount-' . core()->taxRateAsIdentifier($tax21->tax_rate));
 
-        $I->dontSeeInSource('Tax ' . $tax22->tax_rate . ' %');
-        $I->dontSeeInSource(core()->currency($expectedTaxAmount22));
+        $I->dontSeeInSource('Tax ' . $tax22->tax_rate . ' %', '#taxrate-' . core()->taxRateAsIdentifier($tax22->tax_rate));
+        $I->dontSeeInSource(core()->currency($expectedTaxAmount22), '#basetaxamount-' . core()->taxRateAsIdentifier($tax22->tax_rate));
     }
 }