diff --git a/l10n_br_cte/demo/fiscal_document_demo.xml b/l10n_br_cte/demo/fiscal_document_demo.xml
index 4225939b7dde..10a89b48813b 100644
--- a/l10n_br_cte/demo/fiscal_document_demo.xml
+++ b/l10n_br_cte/demo/fiscal_document_demo.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <odoo noupdate="1">
 
+    <!-- Empresa Lucro Presumido -->
+
+
     <!-- CTe Test - Modal Rodoviário - LC -->
     <record id="demo_cte_lc_modal_rodoviario" model="l10n_br_fiscal.document">
         <field name="fiscal_operation_id" ref="l10n_br_fiscal.fo_venda" />
@@ -12,7 +15,7 @@
         <field name="company_id" ref="l10n_br_base.empresa_lucro_presumido" />
         <field name="document_number">573</field>
         <field name="document_serie">1</field>
-        <field name="document_key">35240708318053000167570010000000311040645898</field>
+        <field name="document_key">35240781583054000129570010000057311040645894</field>
         <field name="cte_environment">2</field>
         <field name="processador_edoc">oca</field>
         <field name="partner_id" ref="l10n_br_base.res_partner_cliente1_sp" />
@@ -102,23 +105,24 @@
         <value eval="[ref('l10n_br_cte.demo_cte_lc_modal_rodoviario_1-1')]" />
     </function>
 
-    <!-- CTe Test - Modal Rodoviário - SN -->
-    <record id="demo_cte_sn_modal_rodoviario" model="l10n_br_fiscal.document">
+
+    <!-- CTe Test - Modal Aereo - LC -->
+    <record id="demo_cte_lc_modal_aereo" model="l10n_br_fiscal.document">
         <field name="fiscal_operation_id" ref="l10n_br_fiscal.fo_venda" />
         <field name="document_type_id" ref="l10n_br_fiscal.document_57" />
         <field
             name="document_serie_id"
-            ref="l10n_br_fiscal.empresa_sn_document_57_serie_1"
+            ref="l10n_br_fiscal.empresa_lc_document_57_serie_1"
         />
-        <field name="company_id" ref="l10n_br_base.empresa_simples_nacional" />
+        <field name="company_id" ref="l10n_br_base.empresa_lucro_presumido" />
         <field name="document_number">574</field>
         <field name="document_serie">1</field>
-        <field name="document_key">35240708318053000167570010000000311040445899</field>
+        <field name="document_key">35240781583054000129570010000057411040645890</field>
         <field name="cte_environment">2</field>
         <field name="processador_edoc">oca</field>
         <field name="partner_id" ref="l10n_br_base.res_partner_cliente1_sp" />
         <field name="service_provider">3</field>
-        <field name="transport_modal">01</field>
+        <field name="transport_modal">02</field>
 
         <!--Remetente-->
         <field name="partner_sendering_id" ref="l10n_br_base.res_partner_cliente2_sp" />
@@ -148,40 +152,40 @@
 
     </record>
 
-    <!-- CTe Test - Modal Rodoviário - SN - Cargo Quantity Infos -->
+    <!-- CTe Test - Modal Aereo - LC - Cargo Quantity Infos -->
     <record
-        id="demo_cte_sn_modal_rodoviario_cargo_quantity_info_1"
+        id="demo_cte_lc_modal_aereo_cargo_quantity_info_1"
         model="l10n_br_cte.cargo.quantity.infos"
     >
-        <field name="document_id" ref="demo_cte_sn_modal_rodoviario" />
+        <field name="document_id" ref="demo_cte_lc_modal_aereo" />
         <field name="cte40_cUnid">00</field>
         <field name="cte40_tpMed">Volume</field>
         <field name="cte40_qCarga">1000.0</field>
     </record>
 
     <record
-        id="demo_cte_sn_modal_rodoviario_cargo_quantity_info_2"
+        id="demo_cte_lc_modal_aereo_cargo_quantity_info_2"
         model="l10n_br_cte.cargo.quantity.infos"
     >
-        <field name="document_id" ref="demo_cte_sn_modal_rodoviario" />
+        <field name="document_id" ref="demo_cte_lc_modal_aereo" />
         <field name="cte40_cUnid">01</field>
         <field name="cte40_tpMed">Peso Bruto</field>
         <field name="cte40_qCarga">500.0</field>
     </record>
 
     <record
-        id="demo_cte_sn_modal_rodoviario_cargo_quantity_info_3"
+        id="demo_cte_lc_modal_aereo_cargo_quantity_info_3"
         model="l10n_br_cte.cargo.quantity.infos"
     >
-        <field name="document_id" ref="demo_cte_sn_modal_rodoviario" />
+        <field name="document_id" ref="demo_cte_lc_modal_aereo" />
         <field name="cte40_cUnid">03</field>
         <field name="cte40_tpMed">Unidade</field>
         <field name="cte40_qCarga">2</field>
     </record>
 
-    <!-- CTe Test - Modal Rodoviário - SN - Document Lines -->
-    <record id="demo_cte_sn_modal_rodoviario_1-1" model="l10n_br_fiscal.document.line">
-        <field name="document_id" ref="demo_cte_sn_modal_rodoviario" />
+    <!-- CTe Test - Modal Aereo - LC - Document Lines -->
+    <record id="demo_cte_lc_modal_aereo_1-1" model="l10n_br_fiscal.document.line">
+        <field name="document_id" ref="demo_cte_lc_modal_aereo" />
         <field name="name">Frete</field>
         <field name="product_id" ref="product.product_product_9" />
         <field name="uom_id" ref="uom.product_uom_unit" />
@@ -193,19 +197,19 @@
     </record>
 
     <function model="l10n_br_fiscal.document.line" name="_onchange_product_id_fiscal">
-        <value eval="[ref('l10n_br_cte.demo_cte_sn_modal_rodoviario_1-1')]" />
+        <value eval="[ref('l10n_br_cte.demo_cte_lc_modal_aereo_1-1')]" />
     </function>
 
     <function
         model="l10n_br_fiscal.document.line"
         name="_onchange_fiscal_operation_line_id"
     >
-        <value eval="[ref('l10n_br_cte.demo_cte_sn_modal_rodoviario_1-1')]" />
+        <value eval="[ref('l10n_br_cte.demo_cte_lc_modal_aereo_1-1')]" />
     </function>
 
 
-    <!-- CTe Test - Modal Aereo - LC -->
-    <record id="demo_cte_lc_modal_aereo" model="l10n_br_fiscal.document">
+    <!-- CTe Test - Modal Aquaviario - LC -->
+    <record id="demo_cte_lc_modal_aquaviario" model="l10n_br_fiscal.document">
         <field name="fiscal_operation_id" ref="l10n_br_fiscal.fo_venda" />
         <field name="document_type_id" ref="l10n_br_fiscal.document_57" />
         <field
@@ -215,12 +219,12 @@
         <field name="company_id" ref="l10n_br_base.empresa_lucro_presumido" />
         <field name="document_number">575</field>
         <field name="document_serie">1</field>
-        <field name="document_key">35240608318053000167570010000000311040645894</field>
+        <field name="document_key">35240781583054000129570010000057511040645897</field>
         <field name="cte_environment">2</field>
         <field name="processador_edoc">oca</field>
         <field name="partner_id" ref="l10n_br_base.res_partner_cliente1_sp" />
         <field name="service_provider">3</field>
-        <field name="transport_modal">02</field>
+        <field name="transport_modal">03</field>
 
         <!--Remetente-->
         <field name="partner_sendering_id" ref="l10n_br_base.res_partner_cliente2_sp" />
@@ -250,40 +254,40 @@
 
     </record>
 
-    <!-- CTe Test - Modal Aereo - LC - Cargo Quantity Infos -->
+    <!-- CTe Test - Modal Aquaviario - LC - Cargo Quantity Infos -->
     <record
-        id="demo_cte_lc_modal_aereo_cargo_quantity_info_1"
+        id="demo_cte_lc_modal_aquaviario_cargo_quantity_info_1"
         model="l10n_br_cte.cargo.quantity.infos"
     >
-        <field name="document_id" ref="demo_cte_lc_modal_aereo" />
+        <field name="document_id" ref="demo_cte_lc_modal_aquaviario" />
         <field name="cte40_cUnid">00</field>
         <field name="cte40_tpMed">Volume</field>
         <field name="cte40_qCarga">1000.0</field>
     </record>
 
     <record
-        id="demo_cte_lc_modal_aereo_cargo_quantity_info_2"
+        id="demo_cte_lc_modal_aquaviario_cargo_quantity_info_2"
         model="l10n_br_cte.cargo.quantity.infos"
     >
-        <field name="document_id" ref="demo_cte_lc_modal_aereo" />
+        <field name="document_id" ref="demo_cte_lc_modal_aquaviario" />
         <field name="cte40_cUnid">01</field>
         <field name="cte40_tpMed">Peso Bruto</field>
         <field name="cte40_qCarga">500.0</field>
     </record>
 
     <record
-        id="demo_cte_lc_modal_aereo_cargo_quantity_info_3"
+        id="demo_cte_lc_modal_aquaviario_cargo_quantity_info_3"
         model="l10n_br_cte.cargo.quantity.infos"
     >
-        <field name="document_id" ref="demo_cte_lc_modal_aereo" />
+        <field name="document_id" ref="demo_cte_lc_modal_aquaviario" />
         <field name="cte40_cUnid">03</field>
         <field name="cte40_tpMed">Unidade</field>
         <field name="cte40_qCarga">2</field>
     </record>
 
-    <!-- CTe Test - Modal Aereo - LC - Document Lines -->
-    <record id="demo_cte_lc_modal_aereo_1-1" model="l10n_br_fiscal.document.line">
-        <field name="document_id" ref="demo_cte_lc_modal_aereo" />
+    <!-- CTe Test - Modal Aquaviario - LC - Document Lines -->
+    <record id="demo_cte_lc_modal_aquaviario_1-1" model="l10n_br_fiscal.document.line">
+        <field name="document_id" ref="demo_cte_lc_modal_aquaviario" />
         <field name="name">Frete</field>
         <field name="product_id" ref="product.product_product_9" />
         <field name="uom_id" ref="uom.product_uom_unit" />
@@ -295,14 +299,323 @@
     </record>
 
     <function model="l10n_br_fiscal.document.line" name="_onchange_product_id_fiscal">
-        <value eval="[ref('l10n_br_cte.demo_cte_lc_modal_aereo_1-1')]" />
+        <value eval="[ref('l10n_br_cte.demo_cte_lc_modal_aquaviario_1-1')]" />
     </function>
 
     <function
         model="l10n_br_fiscal.document.line"
         name="_onchange_fiscal_operation_line_id"
     >
-        <value eval="[ref('l10n_br_cte.demo_cte_lc_modal_aereo_1-1')]" />
+        <value eval="[ref('l10n_br_cte.demo_cte_lc_modal_aquaviario_1-1')]" />
+    </function>
+
+
+    <!-- CTe Test - Modal Ferroviario - LC -->
+    <record id="demo_cte_lc_modal_ferroviario" model="l10n_br_fiscal.document">
+        <field name="fiscal_operation_id" ref="l10n_br_fiscal.fo_venda" />
+        <field name="document_type_id" ref="l10n_br_fiscal.document_57" />
+        <field
+            name="document_serie_id"
+            ref="l10n_br_fiscal.empresa_lc_document_57_serie_1"
+        />
+        <field name="company_id" ref="l10n_br_base.empresa_lucro_presumido" />
+        <field name="document_number">576</field>
+        <field name="document_serie">1</field>
+        <field name="document_key">35240781583054000129570010000057611040645893</field>
+        <field name="cte_environment">2</field>
+        <field name="processador_edoc">oca</field>
+        <field name="partner_id" ref="l10n_br_base.res_partner_cliente1_sp" />
+        <field name="service_provider">3</field>
+        <field name="transport_modal">04</field>
+
+        <!--Remetente-->
+        <field name="partner_sendering_id" ref="l10n_br_base.res_partner_cliente2_sp" />
+
+        <!--Expedidor-->
+        <field
+            name="partner_shippering_id"
+            ref="l10n_br_base.res_partner_cliente2_sp"
+        />
+
+        <!--Destinatario-->
+        <field name="partner_shipping_id" ref="l10n_br_base.res_partner_cliente3_am" />
+
+        <!--Recebedor-->
+        <field
+            name="partner_receivering_id"
+            ref="l10n_br_base.res_partner_cliente4_am"
+        />
+
+        <field name="user_id" ref="base.user_demo" />
+        <field name="fiscal_operation_type">out</field>
+
+        <field name="cte40_proPred">XYZ Product</field>
+        <field name="cte40_xOutCat">Other Product Data</field>
+        <field name="cte40_vCarga">1000</field>
+        <field name="cte40_vCargaAverb">1000</field>
+
+    </record>
+
+    <!-- CTe Test - Modal Ferroviario - LC - Cargo Quantity Infos -->
+    <record
+        id="demo_cte_lc_modal_ferroviario_cargo_quantity_info_1"
+        model="l10n_br_cte.cargo.quantity.infos"
+    >
+        <field name="document_id" ref="demo_cte_lc_modal_ferroviario" />
+        <field name="cte40_cUnid">00</field>
+        <field name="cte40_tpMed">Volume</field>
+        <field name="cte40_qCarga">1000.0</field>
+    </record>
+
+    <record
+        id="demo_cte_lc_modal_ferroviario_cargo_quantity_info_2"
+        model="l10n_br_cte.cargo.quantity.infos"
+    >
+        <field name="document_id" ref="demo_cte_lc_modal_ferroviario" />
+        <field name="cte40_cUnid">01</field>
+        <field name="cte40_tpMed">Peso Bruto</field>
+        <field name="cte40_qCarga">500.0</field>
+    </record>
+
+    <record
+        id="demo_cte_lc_modal_ferroviario_cargo_quantity_info_3"
+        model="l10n_br_cte.cargo.quantity.infos"
+    >
+        <field name="document_id" ref="demo_cte_lc_modal_ferroviario" />
+        <field name="cte40_cUnid">03</field>
+        <field name="cte40_tpMed">Unidade</field>
+        <field name="cte40_qCarga">2</field>
+    </record>
+
+    <!-- CTe Test - Modal Ferroviario - LC - Document Lines -->
+    <record id="demo_cte_lc_modal_ferroviario_1-1" model="l10n_br_fiscal.document.line">
+        <field name="document_id" ref="demo_cte_lc_modal_ferroviario" />
+        <field name="name">Frete</field>
+        <field name="product_id" ref="product.product_product_9" />
+        <field name="uom_id" ref="uom.product_uom_unit" />
+        <field name="price_unit">100</field>
+        <field name="quantity">1</field>
+        <field name="fiscal_operation_type">out</field>
+        <field name="fiscal_operation_id" ref="l10n_br_fiscal.fo_venda" />
+        <field name="fiscal_operation_line_id" ref="l10n_br_fiscal.fo_venda_revenda" />
+    </record>
+
+    <function model="l10n_br_fiscal.document.line" name="_onchange_product_id_fiscal">
+        <value eval="[ref('l10n_br_cte.demo_cte_lc_modal_ferroviario_1-1')]" />
+    </function>
+
+    <function
+        model="l10n_br_fiscal.document.line"
+        name="_onchange_fiscal_operation_line_id"
+    >
+        <value eval="[ref('l10n_br_cte.demo_cte_lc_modal_ferroviario_1-1')]" />
+    </function>
+
+
+    <!-- CTe Test - Modal Dutoviario - LC -->
+    <record id="demo_cte_lc_modal_dutoviario" model="l10n_br_fiscal.document">
+        <field name="fiscal_operation_id" ref="l10n_br_fiscal.fo_venda" />
+        <field name="document_type_id" ref="l10n_br_fiscal.document_57" />
+        <field
+            name="document_serie_id"
+            ref="l10n_br_fiscal.empresa_lc_document_57_serie_1"
+        />
+        <field name="company_id" ref="l10n_br_base.empresa_lucro_presumido" />
+        <field name="document_number">577</field>
+        <field name="document_serie">1</field>
+        <field name="document_key">35240781583054000129570010000057711040645890</field>
+        <field name="cte_environment">2</field>
+        <field name="processador_edoc">oca</field>
+        <field name="partner_id" ref="l10n_br_base.res_partner_cliente1_sp" />
+        <field name="service_provider">3</field>
+        <field name="transport_modal">05</field>
+
+        <!--Remetente-->
+        <field name="partner_sendering_id" ref="l10n_br_base.res_partner_cliente2_sp" />
+
+        <!--Expedidor-->
+        <field
+            name="partner_shippering_id"
+            ref="l10n_br_base.res_partner_cliente2_sp"
+        />
+
+        <!--Destinatario-->
+        <field name="partner_shipping_id" ref="l10n_br_base.res_partner_cliente3_am" />
+
+        <!--Recebedor-->
+        <field
+            name="partner_receivering_id"
+            ref="l10n_br_base.res_partner_cliente4_am"
+        />
+
+        <field name="user_id" ref="base.user_demo" />
+        <field name="fiscal_operation_type">out</field>
+
+        <field name="cte40_proPred">XYZ Product</field>
+        <field name="cte40_xOutCat">Other Product Data</field>
+        <field name="cte40_vCarga">1000</field>
+        <field name="cte40_vCargaAverb">1000</field>
+
+    </record>
+
+    <!-- CTe Test - Modal Dutoviario - LC - Cargo Quantity Infos -->
+    <record
+        id="demo_cte_lc_modal_dutoviario_cargo_quantity_info_1"
+        model="l10n_br_cte.cargo.quantity.infos"
+    >
+        <field name="document_id" ref="demo_cte_lc_modal_dutoviario" />
+        <field name="cte40_cUnid">00</field>
+        <field name="cte40_tpMed">Volume</field>
+        <field name="cte40_qCarga">1000.0</field>
+    </record>
+
+    <record
+        id="demo_cte_lc_modal_dutoviario_cargo_quantity_info_2"
+        model="l10n_br_cte.cargo.quantity.infos"
+    >
+        <field name="document_id" ref="demo_cte_lc_modal_dutoviario" />
+        <field name="cte40_cUnid">01</field>
+        <field name="cte40_tpMed">Peso Bruto</field>
+        <field name="cte40_qCarga">500.0</field>
+    </record>
+
+    <record
+        id="demo_cte_lc_modal_dutoviario_cargo_quantity_info_3"
+        model="l10n_br_cte.cargo.quantity.infos"
+    >
+        <field name="document_id" ref="demo_cte_lc_modal_dutoviario" />
+        <field name="cte40_cUnid">03</field>
+        <field name="cte40_tpMed">Unidade</field>
+        <field name="cte40_qCarga">2</field>
+    </record>
+
+    <!-- CTe Test - Modal Dutoviario - LC - Document Lines -->
+    <record id="demo_cte_lc_modal_dutoviario_1-1" model="l10n_br_fiscal.document.line">
+        <field name="document_id" ref="demo_cte_lc_modal_dutoviario" />
+        <field name="name">Frete</field>
+        <field name="product_id" ref="product.product_product_9" />
+        <field name="uom_id" ref="uom.product_uom_unit" />
+        <field name="price_unit">100</field>
+        <field name="quantity">1</field>
+        <field name="fiscal_operation_type">out</field>
+        <field name="fiscal_operation_id" ref="l10n_br_fiscal.fo_venda" />
+        <field name="fiscal_operation_line_id" ref="l10n_br_fiscal.fo_venda_revenda" />
+    </record>
+
+    <function model="l10n_br_fiscal.document.line" name="_onchange_product_id_fiscal">
+        <value eval="[ref('l10n_br_cte.demo_cte_lc_modal_dutoviario_1-1')]" />
+    </function>
+
+    <function
+        model="l10n_br_fiscal.document.line"
+        name="_onchange_fiscal_operation_line_id"
+    >
+        <value eval="[ref('l10n_br_cte.demo_cte_lc_modal_dutoviario_1-1')]" />
+    </function>
+
+
+
+    <!-- Empresa Simples Nacional -->
+
+    <!-- CTe Test - Modal Rodoviário - SN -->
+    <record id="demo_cte_sn_modal_rodoviario" model="l10n_br_fiscal.document">
+        <field name="fiscal_operation_id" ref="l10n_br_fiscal.fo_venda" />
+        <field name="document_type_id" ref="l10n_br_fiscal.document_57" />
+        <field
+            name="document_serie_id"
+            ref="l10n_br_fiscal.empresa_sn_document_57_serie_1"
+        />
+        <field name="company_id" ref="l10n_br_base.empresa_simples_nacional" />
+        <field name="document_number">573</field>
+        <field name="document_serie">1</field>
+        <field name="document_key">35240759594315000157570010000057311040445890</field>
+        <field name="cte_environment">2</field>
+        <field name="processador_edoc">oca</field>
+        <field name="partner_id" ref="l10n_br_base.res_partner_cliente1_sp" />
+        <field name="service_provider">3</field>
+        <field name="transport_modal">01</field>
+
+        <!--Remetente-->
+        <field name="partner_sendering_id" ref="l10n_br_base.res_partner_cliente2_sp" />
+
+        <!--Expedidor-->
+        <field
+            name="partner_shippering_id"
+            ref="l10n_br_base.res_partner_cliente2_sp"
+        />
+
+        <!--Destinatario-->
+        <field name="partner_shipping_id" ref="l10n_br_base.res_partner_cliente3_am" />
+
+        <!--Recebedor-->
+        <field
+            name="partner_receivering_id"
+            ref="l10n_br_base.res_partner_cliente4_am"
+        />
+
+        <field name="user_id" ref="base.user_demo" />
+        <field name="fiscal_operation_type">out</field>
+
+        <field name="cte40_proPred">XYZ Product</field>
+        <field name="cte40_xOutCat">Other Product Data</field>
+        <field name="cte40_vCarga">1000</field>
+        <field name="cte40_vCargaAverb">1000</field>
+
+    </record>
+
+    <!-- CTe Test - Modal Rodoviário - SN - Cargo Quantity Infos -->
+    <record
+        id="demo_cte_sn_modal_rodoviario_cargo_quantity_info_1"
+        model="l10n_br_cte.cargo.quantity.infos"
+    >
+        <field name="document_id" ref="demo_cte_sn_modal_rodoviario" />
+        <field name="cte40_cUnid">00</field>
+        <field name="cte40_tpMed">Volume</field>
+        <field name="cte40_qCarga">1000.0</field>
+    </record>
+
+    <record
+        id="demo_cte_sn_modal_rodoviario_cargo_quantity_info_2"
+        model="l10n_br_cte.cargo.quantity.infos"
+    >
+        <field name="document_id" ref="demo_cte_sn_modal_rodoviario" />
+        <field name="cte40_cUnid">01</field>
+        <field name="cte40_tpMed">Peso Bruto</field>
+        <field name="cte40_qCarga">500.0</field>
+    </record>
+
+    <record
+        id="demo_cte_sn_modal_rodoviario_cargo_quantity_info_3"
+        model="l10n_br_cte.cargo.quantity.infos"
+    >
+        <field name="document_id" ref="demo_cte_sn_modal_rodoviario" />
+        <field name="cte40_cUnid">03</field>
+        <field name="cte40_tpMed">Unidade</field>
+        <field name="cte40_qCarga">2</field>
+    </record>
+
+    <!-- CTe Test - Modal Rodoviário - SN - Document Lines -->
+    <record id="demo_cte_sn_modal_rodoviario_1-1" model="l10n_br_fiscal.document.line">
+        <field name="document_id" ref="demo_cte_sn_modal_rodoviario" />
+        <field name="name">Frete</field>
+        <field name="product_id" ref="product.product_product_9" />
+        <field name="uom_id" ref="uom.product_uom_unit" />
+        <field name="price_unit">100</field>
+        <field name="quantity">1</field>
+        <field name="fiscal_operation_type">out</field>
+        <field name="fiscal_operation_id" ref="l10n_br_fiscal.fo_venda" />
+        <field name="fiscal_operation_line_id" ref="l10n_br_fiscal.fo_venda_revenda" />
+    </record>
+
+    <function model="l10n_br_fiscal.document.line" name="_onchange_product_id_fiscal">
+        <value eval="[ref('l10n_br_cte.demo_cte_sn_modal_rodoviario_1-1')]" />
+    </function>
+
+    <function
+        model="l10n_br_fiscal.document.line"
+        name="_onchange_fiscal_operation_line_id"
+    >
+        <value eval="[ref('l10n_br_cte.demo_cte_sn_modal_rodoviario_1-1')]" />
     </function>
 
 
diff --git a/l10n_br_cte/tests/cte/v4_00/leiauteCTe/CTe35240708318053000167570010000000311040445899.xml b/l10n_br_cte/tests/cte/v4_00/leiauteCTe/CTe35240759594315000157570010000057311040445890.xml
similarity index 97%
rename from l10n_br_cte/tests/cte/v4_00/leiauteCTe/CTe35240708318053000167570010000000311040445899.xml
rename to l10n_br_cte/tests/cte/v4_00/leiauteCTe/CTe35240759594315000157570010000057311040445890.xml
index 826c0bba9cd5..e1024ff57eda 100644
--- a/l10n_br_cte/tests/cte/v4_00/leiauteCTe/CTe35240708318053000167570010000000311040445899.xml
+++ b/l10n_br_cte/tests/cte/v4_00/leiauteCTe/CTe35240759594315000157570010000057311040445890.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <CTe xmlns="http://www.portalfiscal.inf.br/cte">
-  <infCte versao="4.00" Id="CTe35240708318053000167570010000000311040445899">
+  <infCte versao="4.00" Id="CTe35240759594315000157570010000057311040445890">
     <ide>
       <cUF>35</cUF>
       <cCT>57000111</cCT>
@@ -8,11 +8,11 @@
       <natOp>Venda</natOp>
       <mod>57</mod>
       <serie>1</serie>
-      <nCT>574</nCT>
+      <nCT>573</nCT>
       <dhEmi>2020-01-01T12:00:00+01:00</dhEmi>
       <tpImp>1</tpImp>
       <tpEmis>1</tpEmis>
-      <cDV>9</cDV>
+      <cDV>0</cDV>
       <tpAmb>2</tpAmb>
       <tpCTe>0</tpCTe>
       <procEmi>0</procEmi>
diff --git a/l10n_br_cte/tests/cte/v4_00/leiauteCTe/CTe35240708318053000167570010000000311040645898.xml b/l10n_br_cte/tests/cte/v4_00/leiauteCTe/CTe35240781583054000129570010000057311040645894.xml
similarity index 98%
rename from l10n_br_cte/tests/cte/v4_00/leiauteCTe/CTe35240708318053000167570010000000311040645898.xml
rename to l10n_br_cte/tests/cte/v4_00/leiauteCTe/CTe35240781583054000129570010000057311040645894.xml
index f3655a190d86..b13349b795e7 100644
--- a/l10n_br_cte/tests/cte/v4_00/leiauteCTe/CTe35240708318053000167570010000000311040645898.xml
+++ b/l10n_br_cte/tests/cte/v4_00/leiauteCTe/CTe35240781583054000129570010000057311040645894.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <CTe xmlns="http://www.portalfiscal.inf.br/cte">
-  <infCte versao="4.00" Id="CTe35240708318053000167570010000000311040645898">
+  <infCte versao="4.00" Id="CTe35240781583054000129570010000057311040645894">
     <ide>
       <cUF>35</cUF>
       <cCT>57000111</cCT>
@@ -12,7 +12,7 @@
       <dhEmi>2020-01-01T12:00:00+01:00</dhEmi>
       <tpImp>1</tpImp>
       <tpEmis>1</tpEmis>
-      <cDV>8</cDV>
+      <cDV>4</cDV>
       <tpAmb>2</tpAmb>
       <tpCTe>0</tpCTe>
       <procEmi>0</procEmi>
diff --git a/l10n_br_cte/tests/cte/v4_00/leiauteCTe/CTe35240608318053000167570010000000311040645894.xml b/l10n_br_cte/tests/cte/v4_00/leiauteCTe/CTe35240781583054000129570010000057411040645890.xml
similarity index 98%
rename from l10n_br_cte/tests/cte/v4_00/leiauteCTe/CTe35240608318053000167570010000000311040645894.xml
rename to l10n_br_cte/tests/cte/v4_00/leiauteCTe/CTe35240781583054000129570010000057411040645890.xml
index 10a49c086467..52c5a48d0477 100644
--- a/l10n_br_cte/tests/cte/v4_00/leiauteCTe/CTe35240608318053000167570010000000311040645894.xml
+++ b/l10n_br_cte/tests/cte/v4_00/leiauteCTe/CTe35240781583054000129570010000057411040645890.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <CTe xmlns="http://www.portalfiscal.inf.br/cte">
-  <infCte versao="4.00" Id="CTe35240608318053000167570010000000311040645894">
+  <infCte versao="4.00" Id="CTe35240781583054000129570010000057411040645890">
     <ide>
       <cUF>35</cUF>
       <cCT>57000111</cCT>
@@ -8,11 +8,11 @@
       <natOp>Venda</natOp>
       <mod>57</mod>
       <serie>1</serie>
-      <nCT>575</nCT>
+      <nCT>574</nCT>
       <dhEmi>2020-01-01T12:00:00+01:00</dhEmi>
       <tpImp>1</tpImp>
       <tpEmis>1</tpEmis>
-      <cDV>4</cDV>
+      <cDV>0</cDV>
       <tpAmb>2</tpAmb>
       <tpCTe>0</tpCTe>
       <procEmi>0</procEmi>
diff --git a/l10n_br_cte/tests/cte/v4_00/leiauteCTe/CTe35240781583054000129570010000057511040645897.xml b/l10n_br_cte/tests/cte/v4_00/leiauteCTe/CTe35240781583054000129570010000057511040645897.xml
new file mode 100644
index 000000000000..6c2f59d1eb4f
--- /dev/null
+++ b/l10n_br_cte/tests/cte/v4_00/leiauteCTe/CTe35240781583054000129570010000057511040645897.xml
@@ -0,0 +1,196 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<CTe xmlns="http://www.portalfiscal.inf.br/cte">
+  <infCte versao="4.00" Id="CTe35240781583054000129570010000057511040645897">
+    <ide>
+      <cUF>35</cUF>
+      <cCT>57000111</cCT>
+      <CFOP>5352</CFOP>
+      <natOp>Venda</natOp>
+      <mod>57</mod>
+      <serie>1</serie>
+      <nCT>575</nCT>
+      <dhEmi>2020-01-01T12:00:00+01:00</dhEmi>
+      <tpImp>1</tpImp>
+      <tpEmis>1</tpEmis>
+      <cDV>7</cDV>
+      <tpAmb>2</tpAmb>
+      <tpCTe>0</tpCTe>
+      <procEmi>0</procEmi>
+      <verProc>Odoo Brasil OCA v14</verProc>
+      <cMunEnv>3550308</cMunEnv>
+      <xMunEnv>São Paulo</xMunEnv>
+      <UFEnv>SP</UFEnv>
+      <modal>03</modal>
+      <tpServ>0</tpServ>
+      <cMunIni>3550308</cMunIni>
+      <xMunIni>São Paulo</xMunIni>
+      <UFIni>SP</UFIni>
+      <cMunFim>1302603</cMunFim>
+      <xMunFim>Manaus</xMunFim>
+      <UFFim>AM</UFFim>
+      <retira>1</retira>
+      <indIEToma>1</indIEToma>
+      <toma3>
+        <toma>3</toma>
+      </toma3>
+    </ide>
+    <compl>
+      <xObs>Documento emitido por: Marc Demo</xObs>
+      <ObsFisco xCampo="Usuário emissor">
+        <xTexto>Documento emitido por: Marc Demo</xTexto>
+      </ObsFisco>
+    </compl>
+    <emit>
+      <CNPJ>81583054000129</CNPJ>
+      <IE>078016350838</IE>
+      <xNome>Empresa Lucro Presumido Ltda</xNome>
+      <xFant>Empresa Lucro Presumido</xFant>
+      <enderEmit>
+        <xLgr>Avenida Paulista</xLgr>
+        <nro>1</nro>
+        <xBairro>Bela Vista</xBairro>
+        <cMun>3550308</cMun>
+        <xMun>São Paulo</xMun>
+        <CEP>01311000</CEP>
+        <UF>SP</UF>
+        <fone>551199999999</fone>
+      </enderEmit>
+      <CRT>3</CRT>
+    </emit>
+    <rem>
+      <CNPJ>12046835000161</CNPJ>
+      <IE>887273429152</IE>
+      <xNome>CTE EMITIDO EM AMBIENTE DE HOMOLOGACAO - SEM VALOR FISCAL</xNome>
+      <xFant>Cliente 2 -SP - Simples Nacional</xFant>
+      <fone>1177777777</fone>
+      <enderReme>
+        <xLgr>Avenida Doutor Chucri Zaidan</xLgr>
+        <nro>950</nro>
+        <xBairro>Vila Cordeiro</xBairro>
+        <cMun>3550308</cMun>
+        <xMun>São Paulo</xMun>
+        <CEP>04583110</CEP>
+        <UF>SP</UF>
+        <cPais>1058</cPais>
+        <xPais>Brasil</xPais>
+      </enderReme>
+      <email>cliente2@cliente2.com.br</email>
+    </rem>
+    <exped>
+      <CNPJ>12046835000161</CNPJ>
+      <IE>887273429152</IE>
+      <xNome>CTE EMITIDO EM AMBIENTE DE HOMOLOGACAO - SEM VALOR FISCAL</xNome>
+      <fone>1177777777</fone>
+      <enderExped>
+        <xLgr>Avenida Doutor Chucri Zaidan</xLgr>
+        <nro>950</nro>
+        <xBairro>Vila Cordeiro</xBairro>
+        <cMun>3550308</cMun>
+        <xMun>São Paulo</xMun>
+        <CEP>04583110</CEP>
+        <UF>SP</UF>
+        <cPais>1058</cPais>
+        <xPais>Brasil</xPais>
+      </enderExped>
+      <email>cliente2@cliente2.com.br</email>
+    </exped>
+    <receb>
+      <CNPJ>84148732000113</CNPJ>
+      <IE>095693211</IE>
+      <xNome>CTE EMITIDO EM AMBIENTE DE HOMOLOGACAO - SEM VALOR FISCAL</xNome>
+      <fone>9221458888</fone>
+      <enderReceb>
+        <xLgr>Avenida Javari</xLgr>
+        <nro>s/n</nro>
+        <xCpl>Lote 9.45/15E</xCpl>
+        <xBairro>Distrito Industrial</xBairro>
+        <cMun>1302603</cMun>
+        <xMun>Manaus</xMun>
+        <CEP>69075110</CEP>
+        <UF>AM</UF>
+        <cPais>1058</cPais>
+        <xPais>Brasil</xPais>
+      </enderReceb>
+      <email>cliente4@cliente4.com.br</email>
+    </receb>
+    <dest>
+      <CNPJ>46081676000158</CNPJ>
+      <IE>782175040</IE>
+      <xNome>CTE EMITIDO EM AMBIENTE DE HOMOLOGACAO - SEM VALOR FISCAL</xNome>
+      <fone>9221459999</fone>
+      <ISUF>101362102</ISUF>
+      <enderDest>
+        <xLgr>Avenida Javari</xLgr>
+        <nro>s/n</nro>
+        <xCpl>Lote 8.45/30E</xCpl>
+        <xBairro>Distrito Industrial</xBairro>
+        <cMun>1302603</cMun>
+        <xMun>Manaus</xMun>
+        <CEP>69075110</CEP>
+        <UF>AM</UF>
+        <cPais>1058</cPais>
+        <xPais>Brasil</xPais>
+      </enderDest>
+      <email>cliente3@cliente3.com.br</email>
+    </dest>
+    <vPrest>
+      <vTPrest>47.00</vTPrest>
+      <vRec>47.00</vRec>
+      <Comp>
+        <xNome>Frete</xNome>
+        <vComp>47.00</vComp>
+      </Comp>
+    </vPrest>
+    <imp>
+      <ICMS>
+        <ICMS00>
+          <CST>00</CST>
+          <vBC>47.00</vBC>
+          <pICMS>18.00</pICMS>
+          <vICMS>8.46</vICMS>
+        </ICMS00>
+      </ICMS>
+    </imp>
+    <infCTeNorm>
+      <infCarga>
+        <vCarga>1000.00</vCarga>
+        <proPred>XYZ Product</proPred>
+        <xOutCat>Other Product Data</xOutCat>
+        <infQ>
+          <cUnid>00</cUnid>
+          <tpMed>Volume</tpMed>
+          <qCarga>1000.0000</qCarga>
+        </infQ>
+        <infQ>
+          <cUnid>01</cUnid>
+          <tpMed>Peso Bruto</tpMed>
+          <qCarga>500.0000</qCarga>
+        </infQ>
+        <infQ>
+          <cUnid>03</cUnid>
+          <tpMed>Unidade</tpMed>
+          <qCarga>2.0000</qCarga>
+        </infQ>
+        <vCargaAverb>1000.00</vCargaAverb>
+      </infCarga>
+      <infDoc />
+      <infModal versaoModal="4.00">
+        <aquav>
+          <vPrest>47.00</vPrest>
+          <vAFRMM>1200.00</vAFRMM>
+          <xNavio>Navio Mercante 123</xNavio>
+          <balsa>
+            <xBalsa>Balsa A</xBalsa>
+          </balsa>
+          <balsa>
+            <xBalsa>Balsa B</xBalsa>
+          </balsa>
+          <nViag>Viagem001</nViag>
+          <direc>S</direc>
+          <irin>IRIN12345</irin>
+          <tpNav>0</tpNav>
+        </aquav>
+      </infModal>
+    </infCTeNorm>
+  </infCte>
+</CTe>
diff --git a/l10n_br_cte/tests/cte/v4_00/leiauteCTe/CTe35240781583054000129570010000057611040645893.xml b/l10n_br_cte/tests/cte/v4_00/leiauteCTe/CTe35240781583054000129570010000057611040645893.xml
new file mode 100644
index 000000000000..5afc0101f345
--- /dev/null
+++ b/l10n_br_cte/tests/cte/v4_00/leiauteCTe/CTe35240781583054000129570010000057611040645893.xml
@@ -0,0 +1,185 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<CTe xmlns="http://www.portalfiscal.inf.br/cte">
+  <infCte versao="4.00" Id="CTe35240781583054000129570010000057611040645893">
+    <ide>
+      <cUF>35</cUF>
+      <cCT>57000111</cCT>
+      <CFOP>5352</CFOP>
+      <natOp>Venda</natOp>
+      <mod>57</mod>
+      <serie>1</serie>
+      <nCT>576</nCT>
+      <dhEmi>2020-01-01T12:00:00+01:00</dhEmi>
+      <tpImp>1</tpImp>
+      <tpEmis>1</tpEmis>
+      <cDV>3</cDV>
+      <tpAmb>2</tpAmb>
+      <tpCTe>0</tpCTe>
+      <procEmi>0</procEmi>
+      <verProc>Odoo Brasil OCA v14</verProc>
+      <cMunEnv>3550308</cMunEnv>
+      <xMunEnv>São Paulo</xMunEnv>
+      <UFEnv>SP</UFEnv>
+      <modal>04</modal>
+      <tpServ>0</tpServ>
+      <cMunIni>3550308</cMunIni>
+      <xMunIni>São Paulo</xMunIni>
+      <UFIni>SP</UFIni>
+      <cMunFim>1302603</cMunFim>
+      <xMunFim>Manaus</xMunFim>
+      <UFFim>AM</UFFim>
+      <retira>1</retira>
+      <indIEToma>1</indIEToma>
+      <toma3>
+        <toma>3</toma>
+      </toma3>
+    </ide>
+    <compl>
+      <xObs>Documento emitido por: Marc Demo</xObs>
+      <ObsFisco xCampo="Usuário emissor">
+        <xTexto>Documento emitido por: Marc Demo</xTexto>
+      </ObsFisco>
+    </compl>
+    <emit>
+      <CNPJ>81583054000129</CNPJ>
+      <IE>078016350838</IE>
+      <xNome>Empresa Lucro Presumido Ltda</xNome>
+      <xFant>Empresa Lucro Presumido</xFant>
+      <enderEmit>
+        <xLgr>Avenida Paulista</xLgr>
+        <nro>1</nro>
+        <xBairro>Bela Vista</xBairro>
+        <cMun>3550308</cMun>
+        <xMun>São Paulo</xMun>
+        <CEP>01311000</CEP>
+        <UF>SP</UF>
+        <fone>551199999999</fone>
+      </enderEmit>
+      <CRT>3</CRT>
+    </emit>
+    <rem>
+      <CNPJ>12046835000161</CNPJ>
+      <IE>887273429152</IE>
+      <xNome>CTE EMITIDO EM AMBIENTE DE HOMOLOGACAO - SEM VALOR FISCAL</xNome>
+      <xFant>Cliente 2 -SP - Simples Nacional</xFant>
+      <fone>1177777777</fone>
+      <enderReme>
+        <xLgr>Avenida Doutor Chucri Zaidan</xLgr>
+        <nro>950</nro>
+        <xBairro>Vila Cordeiro</xBairro>
+        <cMun>3550308</cMun>
+        <xMun>São Paulo</xMun>
+        <CEP>04583110</CEP>
+        <UF>SP</UF>
+        <cPais>1058</cPais>
+        <xPais>Brasil</xPais>
+      </enderReme>
+      <email>cliente2@cliente2.com.br</email>
+    </rem>
+    <exped>
+      <CNPJ>12046835000161</CNPJ>
+      <IE>887273429152</IE>
+      <xNome>CTE EMITIDO EM AMBIENTE DE HOMOLOGACAO - SEM VALOR FISCAL</xNome>
+      <fone>1177777777</fone>
+      <enderExped>
+        <xLgr>Avenida Doutor Chucri Zaidan</xLgr>
+        <nro>950</nro>
+        <xBairro>Vila Cordeiro</xBairro>
+        <cMun>3550308</cMun>
+        <xMun>São Paulo</xMun>
+        <CEP>04583110</CEP>
+        <UF>SP</UF>
+        <cPais>1058</cPais>
+        <xPais>Brasil</xPais>
+      </enderExped>
+      <email>cliente2@cliente2.com.br</email>
+    </exped>
+    <receb>
+      <CNPJ>84148732000113</CNPJ>
+      <IE>095693211</IE>
+      <xNome>CTE EMITIDO EM AMBIENTE DE HOMOLOGACAO - SEM VALOR FISCAL</xNome>
+      <fone>9221458888</fone>
+      <enderReceb>
+        <xLgr>Avenida Javari</xLgr>
+        <nro>s/n</nro>
+        <xCpl>Lote 9.45/15E</xCpl>
+        <xBairro>Distrito Industrial</xBairro>
+        <cMun>1302603</cMun>
+        <xMun>Manaus</xMun>
+        <CEP>69075110</CEP>
+        <UF>AM</UF>
+        <cPais>1058</cPais>
+        <xPais>Brasil</xPais>
+      </enderReceb>
+      <email>cliente4@cliente4.com.br</email>
+    </receb>
+    <dest>
+      <CNPJ>46081676000158</CNPJ>
+      <IE>782175040</IE>
+      <xNome>CTE EMITIDO EM AMBIENTE DE HOMOLOGACAO - SEM VALOR FISCAL</xNome>
+      <fone>9221459999</fone>
+      <ISUF>101362102</ISUF>
+      <enderDest>
+        <xLgr>Avenida Javari</xLgr>
+        <nro>s/n</nro>
+        <xCpl>Lote 8.45/30E</xCpl>
+        <xBairro>Distrito Industrial</xBairro>
+        <cMun>1302603</cMun>
+        <xMun>Manaus</xMun>
+        <CEP>69075110</CEP>
+        <UF>AM</UF>
+        <cPais>1058</cPais>
+        <xPais>Brasil</xPais>
+      </enderDest>
+      <email>cliente3@cliente3.com.br</email>
+    </dest>
+    <vPrest>
+      <vTPrest>47.00</vTPrest>
+      <vRec>47.00</vRec>
+      <Comp>
+        <xNome>Frete</xNome>
+        <vComp>47.00</vComp>
+      </Comp>
+    </vPrest>
+    <imp>
+      <ICMS>
+        <ICMS00>
+          <CST>00</CST>
+          <vBC>47.00</vBC>
+          <pICMS>18.00</pICMS>
+          <vICMS>8.46</vICMS>
+        </ICMS00>
+      </ICMS>
+    </imp>
+    <infCTeNorm>
+      <infCarga>
+        <vCarga>1000.00</vCarga>
+        <proPred>XYZ Product</proPred>
+        <xOutCat>Other Product Data</xOutCat>
+        <infQ>
+          <cUnid>00</cUnid>
+          <tpMed>Volume</tpMed>
+          <qCarga>1000.0000</qCarga>
+        </infQ>
+        <infQ>
+          <cUnid>01</cUnid>
+          <tpMed>Peso Bruto</tpMed>
+          <qCarga>500.0000</qCarga>
+        </infQ>
+        <infQ>
+          <cUnid>03</cUnid>
+          <tpMed>Unidade</tpMed>
+          <qCarga>2.0000</qCarga>
+        </infQ>
+        <vCargaAverb>1000.00</vCargaAverb>
+      </infCarga>
+      <infDoc />
+      <infModal versaoModal="4.00">
+        <ferrov>
+          <tpTraf>1</tpTraf>
+          <fluxo>Fluxo Norte-Sul</fluxo>
+        </ferrov>
+      </infModal>
+    </infCTeNorm>
+  </infCte>
+</CTe>
diff --git a/l10n_br_cte/tests/cte/v4_00/leiauteCTe/CTe35240781583054000129570010000057711040645890.xml b/l10n_br_cte/tests/cte/v4_00/leiauteCTe/CTe35240781583054000129570010000057711040645890.xml
new file mode 100644
index 000000000000..a40bf7e2b33b
--- /dev/null
+++ b/l10n_br_cte/tests/cte/v4_00/leiauteCTe/CTe35240781583054000129570010000057711040645890.xml
@@ -0,0 +1,186 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<CTe xmlns="http://www.portalfiscal.inf.br/cte">
+  <infCte versao="4.00" Id="CTe35240781583054000129570010000057711040645890">
+    <ide>
+      <cUF>35</cUF>
+      <cCT>57000111</cCT>
+      <CFOP>5352</CFOP>
+      <natOp>Venda</natOp>
+      <mod>57</mod>
+      <serie>1</serie>
+      <nCT>577</nCT>
+      <dhEmi>2020-01-01T12:00:00+01:00</dhEmi>
+      <tpImp>1</tpImp>
+      <tpEmis>1</tpEmis>
+      <cDV>0</cDV>
+      <tpAmb>2</tpAmb>
+      <tpCTe>0</tpCTe>
+      <procEmi>0</procEmi>
+      <verProc>Odoo Brasil OCA v14</verProc>
+      <cMunEnv>3550308</cMunEnv>
+      <xMunEnv>São Paulo</xMunEnv>
+      <UFEnv>SP</UFEnv>
+      <modal>05</modal>
+      <tpServ>0</tpServ>
+      <cMunIni>3550308</cMunIni>
+      <xMunIni>São Paulo</xMunIni>
+      <UFIni>SP</UFIni>
+      <cMunFim>1302603</cMunFim>
+      <xMunFim>Manaus</xMunFim>
+      <UFFim>AM</UFFim>
+      <retira>1</retira>
+      <indIEToma>1</indIEToma>
+      <toma3>
+        <toma>3</toma>
+      </toma3>
+    </ide>
+    <compl>
+      <xObs>Documento emitido por: Marc Demo</xObs>
+      <ObsFisco xCampo="Usuário emissor">
+        <xTexto>Documento emitido por: Marc Demo</xTexto>
+      </ObsFisco>
+    </compl>
+    <emit>
+      <CNPJ>81583054000129</CNPJ>
+      <IE>078016350838</IE>
+      <xNome>Empresa Lucro Presumido Ltda</xNome>
+      <xFant>Empresa Lucro Presumido</xFant>
+      <enderEmit>
+        <xLgr>Avenida Paulista</xLgr>
+        <nro>1</nro>
+        <xBairro>Bela Vista</xBairro>
+        <cMun>3550308</cMun>
+        <xMun>São Paulo</xMun>
+        <CEP>01311000</CEP>
+        <UF>SP</UF>
+        <fone>551199999999</fone>
+      </enderEmit>
+      <CRT>3</CRT>
+    </emit>
+    <rem>
+      <CNPJ>12046835000161</CNPJ>
+      <IE>887273429152</IE>
+      <xNome>CTE EMITIDO EM AMBIENTE DE HOMOLOGACAO - SEM VALOR FISCAL</xNome>
+      <xFant>Cliente 2 -SP - Simples Nacional</xFant>
+      <fone>1177777777</fone>
+      <enderReme>
+        <xLgr>Avenida Doutor Chucri Zaidan</xLgr>
+        <nro>950</nro>
+        <xBairro>Vila Cordeiro</xBairro>
+        <cMun>3550308</cMun>
+        <xMun>São Paulo</xMun>
+        <CEP>04583110</CEP>
+        <UF>SP</UF>
+        <cPais>1058</cPais>
+        <xPais>Brasil</xPais>
+      </enderReme>
+      <email>cliente2@cliente2.com.br</email>
+    </rem>
+    <exped>
+      <CNPJ>12046835000161</CNPJ>
+      <IE>887273429152</IE>
+      <xNome>CTE EMITIDO EM AMBIENTE DE HOMOLOGACAO - SEM VALOR FISCAL</xNome>
+      <fone>1177777777</fone>
+      <enderExped>
+        <xLgr>Avenida Doutor Chucri Zaidan</xLgr>
+        <nro>950</nro>
+        <xBairro>Vila Cordeiro</xBairro>
+        <cMun>3550308</cMun>
+        <xMun>São Paulo</xMun>
+        <CEP>04583110</CEP>
+        <UF>SP</UF>
+        <cPais>1058</cPais>
+        <xPais>Brasil</xPais>
+      </enderExped>
+      <email>cliente2@cliente2.com.br</email>
+    </exped>
+    <receb>
+      <CNPJ>84148732000113</CNPJ>
+      <IE>095693211</IE>
+      <xNome>CTE EMITIDO EM AMBIENTE DE HOMOLOGACAO - SEM VALOR FISCAL</xNome>
+      <fone>9221458888</fone>
+      <enderReceb>
+        <xLgr>Avenida Javari</xLgr>
+        <nro>s/n</nro>
+        <xCpl>Lote 9.45/15E</xCpl>
+        <xBairro>Distrito Industrial</xBairro>
+        <cMun>1302603</cMun>
+        <xMun>Manaus</xMun>
+        <CEP>69075110</CEP>
+        <UF>AM</UF>
+        <cPais>1058</cPais>
+        <xPais>Brasil</xPais>
+      </enderReceb>
+      <email>cliente4@cliente4.com.br</email>
+    </receb>
+    <dest>
+      <CNPJ>46081676000158</CNPJ>
+      <IE>782175040</IE>
+      <xNome>CTE EMITIDO EM AMBIENTE DE HOMOLOGACAO - SEM VALOR FISCAL</xNome>
+      <fone>9221459999</fone>
+      <ISUF>101362102</ISUF>
+      <enderDest>
+        <xLgr>Avenida Javari</xLgr>
+        <nro>s/n</nro>
+        <xCpl>Lote 8.45/30E</xCpl>
+        <xBairro>Distrito Industrial</xBairro>
+        <cMun>1302603</cMun>
+        <xMun>Manaus</xMun>
+        <CEP>69075110</CEP>
+        <UF>AM</UF>
+        <cPais>1058</cPais>
+        <xPais>Brasil</xPais>
+      </enderDest>
+      <email>cliente3@cliente3.com.br</email>
+    </dest>
+    <vPrest>
+      <vTPrest>47.00</vTPrest>
+      <vRec>47.00</vRec>
+      <Comp>
+        <xNome>Frete</xNome>
+        <vComp>47.00</vComp>
+      </Comp>
+    </vPrest>
+    <imp>
+      <ICMS>
+        <ICMS00>
+          <CST>00</CST>
+          <vBC>47.00</vBC>
+          <pICMS>18.00</pICMS>
+          <vICMS>8.46</vICMS>
+        </ICMS00>
+      </ICMS>
+    </imp>
+    <infCTeNorm>
+      <infCarga>
+        <vCarga>1000.00</vCarga>
+        <proPred>XYZ Product</proPred>
+        <xOutCat>Other Product Data</xOutCat>
+        <infQ>
+          <cUnid>00</cUnid>
+          <tpMed>Volume</tpMed>
+          <qCarga>1000.0000</qCarga>
+        </infQ>
+        <infQ>
+          <cUnid>01</cUnid>
+          <tpMed>Peso Bruto</tpMed>
+          <qCarga>500.0000</qCarga>
+        </infQ>
+        <infQ>
+          <cUnid>03</cUnid>
+          <tpMed>Unidade</tpMed>
+          <qCarga>2.0000</qCarga>
+        </infQ>
+        <vCargaAverb>1000.00</vCargaAverb>
+      </infCarga>
+      <infDoc />
+      <infModal versaoModal="4.00">
+        <duto>
+          <vTar>1500.000000</vTar>
+          <dIni>2024-01-01</dIni>
+          <dFim>2024-12-31</dFim>
+        </duto>
+      </infModal>
+    </infCTeNorm>
+  </infCte>
+</CTe>
diff --git a/l10n_br_cte/tests/test_cte_serialize.py b/l10n_br_cte/tests/test_cte_serialize.py
index e94b2496bb85..fb424f849c65 100644
--- a/l10n_br_cte/tests/test_cte_serialize.py
+++ b/l10n_br_cte/tests/test_cte_serialize.py
@@ -51,6 +51,8 @@ def prepare_test_cte(self, cte):
             self.prepare_modal_aquaviario_data(cte)
         elif cte.cte_modal == "04":
             self.prepare_modal_ferroviario_data(cte)
+        elif cte.cte_modal == "05":
+            self.prepare_modal_dutoviario_data(cte)
 
         cte._document_export()
 
@@ -114,56 +116,78 @@ def prepare_modal_aereo_data(self, cte):
         ]
 
     def prepare_modal_aquaviario_data(self, cte):
-        pass
-        # cte.cte40_irin = "1234567899"
-        # cte.cte40_tpEmb = "01"
-        # cte.cte40_cEmbar = "123456"
-        # cte.cte40_xEmbar = "teste"
-        # cte.cte40_nViag = "123456"
-        # cte.cte40_cPrtEmb = "BRADR"
-        # cte.cte40_cPrtDest = "BRAFU"
-        # cte.cte40_infTermCarreg = [
-        #     (0, 0, {"loading_harbor": "BRADR"}),
-        #     (0, 0, {"loading_harbor": "BRANT"}),
-        # ]
-        # cte.cte40_infTermDescarreg = [
-        #     (0, 0, {"unloading_harbor": "BRAFU"}),
-        #     (0, 0, {"unloading_harbor": "BRBZC"}),
-        # ]
+        # Dados gerais do modal aquaviário
+        cte.cte40_vAFRMM = (
+            1200.00
+        )  # Valor do Adicional de Frete para Renovação da Marinha Mercante
+        # cte.cte40_vPrest = 3500.00  # Valor total do frete aquaviário
+        cte.cte40_xNavio = "Navio Mercante 123"  # Nome do navio
+        cte.cte40_nViag = "Viagem001"  # Número da viagem
+        cte.cte40_direc = "S"  # Direção de navegação: 1 = Cabotagem, 2 = Longo curso
+        cte.cte40_irin = "IRIN12345"  # Inscrição do Registro Internacional de Navios
+        cte.cte40_tpNav = "0"  # Tipo de navegação: 01 = Interior, 02 = Cabotagem, etc.
+
+        # Informações das balsas transportadas
+        cte.cte40_balsa = [
+            (
+                0,
+                0,
+                {
+                    "cte40_xBalsa": "Balsa A",  # Identificador da primeira balsa
+                },
+            ),
+            (
+                0,
+                0,
+                {
+                    "cte40_xBalsa": "Balsa B",  # Identificador da segunda balsa
+                },
+            ),
+        ]
+
+    def prepare_modal_dutoviario_data(self, cte):
+        # Dados gerais do modal dutoviário
+        cte.cte40_dIni = "2024-01-01"  # Data de início da operação dutoviária
+        cte.cte40_dFim = "2024-12-31"  # Data de término da operação dutoviária
+        cte.cte40_vTar = 1500.00  # Valor da tarifa aplicada no transporte
 
     def prepare_modal_ferroviario_data(self, cte):
-        pass
-        # cte.cte40_dhTrem = datetime.strptime(
-        #   "2020-01-01T11:00:00", "%Y-%m-%dT%H:%M:%S")
-        # cte.cte40_xPref = "TES"
-        # cte.cte40_xOri = "TES"
-        # cte.cte40_xDest = "TES"
-        # cte.cte40_qVag = 2
-        # cte.cte40_vag = [
-        #     (
-        #         0,
-        #         0,
-        #         {
-        #             "cte40_pesoBC": 500,
-        #             "cte40_pesoR": 1,
-        #             "cte40_tpVag": 123,
-        #             "cte40_serie": 123,
-        #             "cte40_nVag": 123,
-        #             "cte40_nSeq": 123,
-        #             "cte40_TU": 1,
-        #         },
-        #     ),
+        # Dados gerais do modal ferroviário
+        cte.cte40_tpTraf = "1"  # Tipo de Tráfego: 1 = Nacional, 2 = Internacional
+        cte.cte40_fluxo = "Fluxo Norte-Sul"  # Fluxo de transporte
+        cte.cte40_vFrete = 5000.00  # Valor do frete ferroviário
+        cte.cte40_chCTeFerroOrigem = (
+            "CTE123456789"
+        )  # Chave do CTe Ferroviário de origem
+        cte.cte40_respFat = (
+            "1"
+        )  # Responsável pelo Faturamento: 1 = Emitente, 2 = Receptor
+        cte.cte40_ferrEmi = (
+            "1"
+        )  # Emissor do documento: 1 = Ferrovia Emitente, 2 = Outro
+        # cte.cte40_ferroEnv = [
         #     (
         #         0,
         #         0,
         #         {
-        #             "cte40_pesoBC": 500,
-        #             "cte40_pesoR": 1,
-        #             "cte40_tpVag": 321,
-        #             "cte40_serie": 321,
-        #             "cte40_nVag": 321,
-        #             "cte40_nSeq": 321,
-        #             "cte40_TU": 1,
+        #             "cte40_CNPJ": "12345678000199",  # CNPJ da ferrovia envolvida
+        #             "cte40_cInt": "FERRO001",  # Código interno da ferrovia
+        #             "cte40_IE": "ISENTO",  # Inscrição Estadual
+        #             "cte40_xNome": "Ferrovia Teste LTDA",  # Nome ou razão social
+        #             "cte40_enderFerro": (
+        #                 0,
+        #                 0,
+        #                 {
+        #                     "cte40_xLgr": "Rua da Ferrovia",
+        #                     "cte40_nro": "123",
+        #                     "cte40_xCpl": "Prédio 2",
+        #                     "cte40_xBairro": "Centro",
+        #                     "cte40_cMun": "1234567",  # Código do município IBGE
+        #                     "cte40_xMun": "Cidade Ferrovia",
+        #                     "cte40_CEP": "12345000",
+        #                     "cte40_UF": "SP",  # Unidade Federativa
+        #                 },
+        #             ),
         #         },
         #     ),
         # ]
diff --git a/l10n_br_cte/tests/test_cte_serialize_lc.py b/l10n_br_cte/tests/test_cte_serialize_lc.py
index 2857e9bd19dd..7c43edc2ecd9 100644
--- a/l10n_br_cte/tests/test_cte_serialize_lc.py
+++ b/l10n_br_cte/tests/test_cte_serialize_lc.py
@@ -12,11 +12,23 @@ def setUp(self):
         cte_list = [
             {
                 "record_ref": "l10n_br_cte.demo_cte_lc_modal_rodoviario",
-                "xml_file": "CTe35240708318053000167570010000000311040645898.xml",
+                "xml_file": "CTe35240781583054000129570010000057311040645894.xml",
             },
             {
                 "record_ref": "l10n_br_cte.demo_cte_lc_modal_aereo",
-                "xml_file": "CTe35240608318053000167570010000000311040645894.xml",
+                "xml_file": "CTe35240781583054000129570010000057411040645890.xml",
+            },
+            {
+                "record_ref": "l10n_br_cte.demo_cte_lc_modal_aquaviario",
+                "xml_file": "CTe35240781583054000129570010000057511040645897.xml",
+            },
+            {
+                "record_ref": "l10n_br_cte.demo_cte_lc_modal_ferroviario",
+                "xml_file": "CTe35240781583054000129570010000057611040645893.xml",
+            },
+            {
+                "record_ref": "l10n_br_cte.demo_cte_lc_modal_dutoviario",
+                "xml_file": "CTe35240781583054000129570010000057711040645890.xml",
             },
         ]
 
diff --git a/l10n_br_cte/tests/test_cte_serialize_sn.py b/l10n_br_cte/tests/test_cte_serialize_sn.py
index f067b8f800b1..a65ff2d3db34 100644
--- a/l10n_br_cte/tests/test_cte_serialize_sn.py
+++ b/l10n_br_cte/tests/test_cte_serialize_sn.py
@@ -12,7 +12,7 @@ def setUp(self):
         cte_list = [
             {
                 "record_ref": "l10n_br_cte.demo_cte_sn_modal_rodoviario",
-                "xml_file": "CTe35240708318053000167570010000000311040445899.xml",
+                "xml_file": "CTe35240759594315000157570010000057311040445890.xml",
             },
         ]