diff --git a/l10n_br_nfe/__manifest__.py b/l10n_br_nfe/__manifest__.py
index c62b8330aaed..663702ee4b31 100644
--- a/l10n_br_nfe/__manifest__.py
+++ b/l10n_br_nfe/__manifest__.py
@@ -11,7 +11,7 @@
     "maintainers": ["rvalyi", "renatonlima"],
     "website": "https://github.com/OCA/l10n-brazil",
     "development_status": "Beta",
-    "version": "15.0.1.0.0",
+    "version": "16.0.1.0.0",
     "depends": [
         "l10n_br_fiscal",
         "l10n_br_fiscal_certificate",
diff --git a/l10n_br_nfe/models/document_line.py b/l10n_br_nfe/models/document_line.py
index b3d9bf801841..d17d4900b32d 100644
--- a/l10n_br_nfe/models/document_line.py
+++ b/l10n_br_nfe/models/document_line.py
@@ -223,7 +223,11 @@ def _export_fields_nfe_40_prod(self, xsd_fields, class_obj, export_dict):
         export_dict["cProd"] = nfe40_cProd
 
         nfe40_xProd = (
-            self.product_id.with_context(display_default_code=False).display_name
+            self.product_id.with_context(
+                display_default_code=False,
+                lang=self._context.get("force_product_lang")  # used for tests
+                or self._context.get("lang"),
+            ).display_name
             or self.name
             or ""
         )
diff --git a/l10n_br_nfe/models/res_partner.py b/l10n_br_nfe/models/res_partner.py
index 8eaeb55c744f..bd1eab67c08a 100644
--- a/l10n_br_nfe/models/res_partner.py
+++ b/l10n_br_nfe/models/res_partner.py
@@ -383,7 +383,7 @@ def _compute_nfe40_ender(self):
                 rec.nfe40_xMun = rec.city_id.name
                 rec.nfe40_UF = rec.state_id.code
                 rec.nfe40_cPais = rec.country_id.bc_code
-                rec.nfe40_xPais = rec.country_id.name
+                rec.nfe40_xPais = rec.country_id.name.replace("Brazil", "Brasil")
             else:
                 rec.nfe40_xLgr = None
                 rec.nfe40_nro = None
diff --git a/l10n_br_nfe/tests/test_nfe_import_wizard.py b/l10n_br_nfe/tests/test_nfe_import_wizard.py
index c10f4bbbfc47..85a079eb3522 100644
--- a/l10n_br_nfe/tests/test_nfe_import_wizard.py
+++ b/l10n_br_nfe/tests/test_nfe_import_wizard.py
@@ -146,7 +146,7 @@ def test_imported_products(self):
         first_product.product_supplier_id = self.env["product.supplierinfo"].create(
             {
                 "product_id": self.product_1.id,
-                "name": self.partner_1.id,
+                "partner_id": self.partner_1.id,
                 "partner_uom_id": self.env["uom.uom"].search([], limit=1).id,
                 "price": 100,
             }
diff --git a/l10n_br_nfe/tests/test_nfe_serialize.py b/l10n_br_nfe/tests/test_nfe_serialize.py
index 3405163a2255..b7a5c6d72ede 100644
--- a/l10n_br_nfe/tests/test_nfe_serialize.py
+++ b/l10n_br_nfe/tests/test_nfe_serialize.py
@@ -59,7 +59,7 @@ def prepare_test_nfe(self, nfe):
         nfe.action_document_confirm()
         nfe.nfe40_cNF = "06277716"
         nfe.company_id.country_id.name = "Brasil"
-        nfe._document_export()
+        nfe.with_context(force_product_lang="en_US")._document_export()
 
     def serialize_xml(self, nfe_data):
         nfe = nfe_data["nfe"]
diff --git a/l10n_br_nfe/wizards/import_document.py b/l10n_br_nfe/wizards/import_document.py
index 463fba2926ac..3cedd6162915 100644
--- a/l10n_br_nfe/wizards/import_document.py
+++ b/l10n_br_nfe/wizards/import_document.py
@@ -147,7 +147,7 @@ def _prepare_imported_product_values(self, product):
     def _search_product_supplier_by_product_code(self, code):
         return self.env["product.supplierinfo"].search(
             [
-                ("name", "=", self.partner_id.id),
+                ("partner_id", "=", self.partner_id.id),
                 ("product_code", "=", code),
             ],
             limit=1,
@@ -346,7 +346,7 @@ def _create_product_supplier(self):
                 "product_name": self.product_name,
                 "product_code": self.product_code,
                 "price": price,
-                "name": self.imported_partner_id.id,
+                "partner_id": self.imported_partner_id.id,
                 "partner_uom_id": self.uom_internal.id,
                 "partner_uom_factor": self.uom_conversion_factor,
             }
diff --git a/test-requirements.txt b/test-requirements.txt
index 6bde5072dd5a..97525ed72909 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -2,4 +2,4 @@ vcrpy
 odoo-test-helper  # Needed by spec_driven_model
 pyopenssl==22.1.0
 nfelib<=2.0.7
-xsdata
+xmldiff