diff --git a/tests/facturx-extended.xml b/tests/facturx-extended.xml
index 61ed5d5..66ad2ae 100644
--- a/tests/facturx-extended.xml
+++ b/tests/facturx-extended.xml
@@ -20,12 +20,12 @@
             <ram:Content>Description of invoice</ram:Content>
         </ram:IncludedNote>
         <ram:IncludedNote>
-            <ram:Content>Some notes to the customer.</ram:Content>
             <ram:ContentCode>1</ram:ContentCode>
+            <ram:Content>Some notes to the customer.</ram:Content>
         </ram:IncludedNote>
         <ram:IncludedNote>
-            <ram:Content>Goes to field comment.</ram:Content>
             <ram:ContentCode>22</ram:ContentCode>
+            <ram:Content>Goes to field comment.</ram:Content>
             <ram:SubjectCode>42</ram:SubjectCode>
         </ram:IncludedNote>
     </rsm:ExchangedDocument>
@@ -82,8 +82,8 @@
                 <ram:ApplicableProductCharacteristic>
                     <ram:TypeCode>123</ram:TypeCode>
                     <ram:Description>Kilogram</ram:Description>
-                    <ram:ValueMeasure>kg</ram:ValueMeasure>
-                    <ram:ValueY>23</ram:ValueY>
+                    <ram:ValueMeasure>123.0</ram:ValueMeasure>
+                    <ram:Value>kg</ram:Value>
                 </ram:ApplicableProductCharacteristic>
                 <ram:DesignatedProductClassification>
                     <ram:ClassCode>3c</ram:ClassCode>
@@ -93,7 +93,9 @@
                     <ram:BatchID>22</ram:BatchID>
                     <ram:SupplierAssignedSerialID>1234</ram:SupplierAssignedSerialID>
                 </ram:IndividualTradeProductInstance>
-                <ram:OriginTradeCountry>DE</ram:OriginTradeCountry>
+                <ram:OriginTradeCountry>
+                    <ram:ID>DE</ram:ID>
+                </ram:OriginTradeCountry>
                 <ram:IncludedReferencedProduct>
                     <ram:ID>1</ram:ID>
                     <ram:GlobalID>2</ram:GlobalID>
@@ -105,19 +107,23 @@
                 </ram:IncludedReferencedProduct>
             </ram:SpecifiedTradeProduct>
             <ram:SpecifiedLineTradeAgreement>
-                <ram:NetPriceProductTradePrice>
-                    <ram:ChargeAmount currencyID="EUR">800.00</ram:ChargeAmount>
-                    <ram:BasisQuantity unitCode="C62">1.0</ram:BasisQuantity>
-                </ram:NetPriceProductTradePrice>
                 <ram:GrossPriceProductTradePrice>
                     <ram:ChargeAmount currencyID="EUR">950.00</ram:ChargeAmount>
                     <ram:BasisQuantity unitCode="C62">1.0</ram:BasisQuantity>
                 </ram:GrossPriceProductTradePrice>
+                <ram:NetPriceProductTradePrice>
+                    <ram:ChargeAmount currencyID="EUR">800.00</ram:ChargeAmount>
+                    <ram:BasisQuantity unitCode="C62">1.0</ram:BasisQuantity>
+                </ram:NetPriceProductTradePrice>
             </ram:SpecifiedLineTradeAgreement>
             <ram:SpecifiedLineTradeDelivery>
                 <ram:BilledQuantity unitCode="C62">1.5</ram:BilledQuantity>
                 <ram:PackageQuantity unitCode="C62">1.5</ram:PackageQuantity>
-                <ram:ActualDeliverySupplyChainEvent format="102">20240101</ram:ActualDeliverySupplyChainEvent>
+                <ram:ActualDeliverySupplyChainEvent>
+                    <ram:OccurrenceDateTime>
+                        <udt:DateTimeString format="102">20240101</udt:DateTimeString>
+                    </ram:OccurrenceDateTime>
+                </ram:ActualDeliverySupplyChainEvent>
             </ram:SpecifiedLineTradeDelivery>
             <ram:SpecifiedLineTradeSettlement>
                 <ram:ApplicableTradeTax>
@@ -195,17 +201,17 @@
             <ram:SpecifiedTradeSettlementPaymentMeans>
                 <ram:TypeCode>30</ram:TypeCode>
                 <ram:Information>Wire transfer</ram:Information>
-                <ram:PayeePartyCreditorFinancialAccount>
-                    <ram:IBANID>DE02300209000106531065</ram:IBANID>
-                    <ram:AccountName>mbs</ram:AccountName>
-                </ram:PayeePartyCreditorFinancialAccount>
-                <ram:PayerPartyDebtorFinancialAccount>
-                    <ram:IBANID>DE02300209000106531065</ram:IBANID>
-                </ram:PayerPartyDebtorFinancialAccount>
                 <ram:ApplicableTradeSettlementFinancialCard>
                     <ram:ID>DE02300209000106531065</ram:ID>
                     <ram:CardholderName>Card Holder</ram:CardholderName>
                 </ram:ApplicableTradeSettlementFinancialCard>
+                <ram:PayerPartyDebtorFinancialAccount>
+                    <ram:IBANID>DE02300209000106531065</ram:IBANID>
+                </ram:PayerPartyDebtorFinancialAccount>
+                <ram:PayeePartyCreditorFinancialAccount>
+                    <ram:IBANID>DE02300209000106531065</ram:IBANID>
+                    <ram:AccountName>mbs</ram:AccountName>
+                </ram:PayeePartyCreditorFinancialAccount>
                 <ram:PayeeSpecifiedCreditorFinancialInstitution>
                     <ram:BICID>WELADED1PMB</ram:BICID>
                 </ram:PayeeSpecifiedCreditorFinancialInstitution>
@@ -226,10 +232,10 @@
             </ram:ApplicableTradeTax>
             <ram:SpecifiedTradePaymentTerms>
                 <ram:Description>Payment description</ram:Description>
-                <ram:DirectDebitMandateID>mandat id</ram:DirectDebitMandateID>
                 <ram:DueDateDateTime>
                     <udt:DateTimeString format="102">20240701</udt:DateTimeString>
                 </ram:DueDateDateTime>
+                <ram:DirectDebitMandateID>mandat id</ram:DirectDebitMandateID>
                 <ram:PartialPaymentAmount currencyID="EUR">3355.50</ram:PartialPaymentAmount>
                 <ram:ApplicableTradePaymentDiscountTerms>
                     <ram:BasisDateTime>