MC-33459: Magento\Quote\Model\ShippingMethodManagementTest::testEstimateByAddressWithInclExclTaxAndVATGroup failed for 2.4-develop

Author: serhii-balko

dev/tests/integration/testsuite/Magento/Quote/Model/ShippingMethodManagementTest.php

@@ -303,17 +303,15 @@ private function executeTestFlow($flatRateAmount, $tableRateAmount)
      */
     public function testEstimateByAddressWithInclExclTaxAndVATGroup()
     {
-        $this->mockCustomerVat();
-
-        /** @var CustomerRepositoryInterface $customerRepository */
-        $customerRepository = $this->objectManager->get(CustomerRepositoryInterface::class);
-        $customer = $customerRepository->get('customer@example.com');
-
         /** @var GroupInterface $customerGroup */
         $customerGroup = $this->findCustomerGroupByCode('custom_group');
+        $this->mockCustomerVat((int)$customerGroup->getId());
+
         $customerGroup->setTaxClassId($this->getTaxClass('CustomerTaxClass')->getClassId());
         $this->groupRepository->save($customerGroup);
-
+        /** @var CustomerRepositoryInterface $customerRepository */
+        $customerRepository = $this->objectManager->get(CustomerRepositoryInterface::class);
+        $customer = $customerRepository->get('customer@example.com');
         $customer->setGroupId($customerGroup->getId());
         $customer->setTaxvat('12');
         $customerRepository->save($customer);
@@ -332,8 +330,10 @@ public function testEstimateByAddressWithInclExclTaxAndVATGroup()
 
     /**
      * Create a test double fot customer vat class
+     *
+     * @param int $customerGroupId
      */
-    private function mockCustomerVat(): void
+    private function mockCustomerVat(int $customerGroupId): void
     {
         $gatewayResponse = new DataObject([
             'is_valid' => false,
@@ -356,14 +356,12 @@ private function mockCustomerVat(): void
         $customerVat->method('isCountryInEU')->willReturn(true);
         $customerVat->method('getMerchantCountryCode')->willReturn('GB');
         $customerVat->method('getMerchantVatNumber')->willReturn('11111');
-        $customerVat->method('getCustomerGroupIdBasedOnVatNumber')->willReturn('4');
+        $customerVat->method('getCustomerGroupIdBasedOnVatNumber')->willReturn($customerGroupId);
         $this->objectManager->removeSharedInstance(Vat::class);
         $this->objectManager->addSharedInstance($customerVat, Vat::class);
 
         // Remove instances where the customer vat object is cached
         $this->objectManager->removeSharedInstance(CollectTotalsObserver::class);
-        $this->objectManager->removeSharedInstance(AfterAddressSaveObserver::class);
-        $this->objectManager->removeSharedInstance(VatValidator::class);
     }
 
     /**