diff --git a/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRD2PullProvider.java b/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRD2PullProvider.java
index 4b5f00d2..90d1cf58 100644
--- a/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRD2PullProvider.java
+++ b/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRD2PullProvider.java
@@ -124,7 +124,7 @@ public class ZUGFeRD2PullProvider implements IXMLProvider, IProfileProvider {
 
 		byte[] res = zugferdData;
 		
-		StringWriter sw = new StringWriter();
+		/*StringWriter sw = new StringWriter();
 		Document document=null;
 		try {
 			document = DocumentHelper.parseText(new String(zugferdData));
@@ -140,13 +140,17 @@ public class ZUGFeRD2PullProvider implements IXMLProvider, IProfileProvider {
 		} catch (IOException e) {
 			Logger.getLogger(ZUGFeRD2PullProvider.class.getName()).log(Level.SEVERE, null, e);
 		}
-		
+		*/
 		return res;
 		
 	}
 
 	private BigDecimal getTotalPrepaid() {
-		return trans.getTotalPrepaidAmount();
+		if (trans.getTotalPrepaidAmount()==null) {
+			return new BigDecimal(0);
+		} else {
+			return trans.getTotalPrepaidAmount();
+		}
 	}
 
 	private BigDecimal getTotalGross() {
diff --git a/src/main/resources/COMFORTtoEN16931.xsl b/src/main/resources/COMFORTtoEN16931.xsl
index d6eb2e03..c4f974a9 100644
--- a/src/main/resources/COMFORTtoEN16931.xsl
+++ b/src/main/resources/COMFORTtoEN16931.xsl
@@ -63,7 +63,12 @@ Migrated by Mustangproject XSLT
 	<!-- xsl:template match="//*[local-name() = 'HeaderExchangedDocument']"> 
 		<xsl:copy> <xsl:apply-templates select="@*|node()" /> </xsl:copy> </xsl:template> -->
 
-	<!-- attribute rename -->
+	<!-- element remode -->
+	<xsl:template match="//*[local-name() = 'TestIndicator']">
+	<!-- Testindicator element has been removed -->
+	</xsl:template>
+	
+	<!-- element rename -->
 	<xsl:template match="//*[local-name() = 'SpecifiedExchangedDocumentContext']">
 		<xsl:element name="rsm:ExchangedDocumentContext">
 			<xsl:apply-templates select="@*|node()" />
diff --git a/src/test/resources/migration/reference/ZUGFeRD2-invoice-adjusted.xml b/src/test/resources/migration/reference/ZUGFeRD2-invoice-adjusted.xml
index d0c2bf92..770e7dc9 100644
--- a/src/test/resources/migration/reference/ZUGFeRD2-invoice-adjusted.xml
+++ b/src/test/resources/migration/reference/ZUGFeRD2-invoice-adjusted.xml
@@ -21,9 +21,6 @@
                           xmlns:udt="urn:un:unece:uncefact:data:standard:UnqualifiedDataType:100"><!--
 Migrated by Mustangproject XSLT
 --><rsm:ExchangedDocumentContext>
-        <ram:TestIndicator>
-            <udt:Indicator>false</udt:Indicator>
-        </ram:TestIndicator>
         <ram:GuidelineSpecifiedDocumentContextParameter>
             <ram:ID>urn:cen.eu:en16931:2017#conformant#urn:zugferd.de:2p0:extended</ram:ID>
         </ram:GuidelineSpecifiedDocumentContextParameter>
diff --git a/src/test/resources/migration/reference/ZUGFeRD2-invoice.xml b/src/test/resources/migration/reference/ZUGFeRD2-invoice.xml
index 9502a57d..a1ebb2b3 100644
--- a/src/test/resources/migration/reference/ZUGFeRD2-invoice.xml
+++ b/src/test/resources/migration/reference/ZUGFeRD2-invoice.xml
@@ -21,9 +21,6 @@
                           xmlns:udt="urn:un:unece:uncefact:data:standard:UnqualifiedDataType:100">
     <!--Migrated by Mustangproject XSLT-->
     <rsm:ExchangedDocumentContext>
-        <ram:TestIndicator>
-            <udt:Indicator>false</udt:Indicator>
-        </ram:TestIndicator>
         <ram:GuidelineSpecifiedDocumentContextParameter>
             <ram:ID>urn:cen.eu:en16931:2017#conformant#urn:zugferd.de:2p0:extended</ram:ID>
         </ram:GuidelineSpecifiedDocumentContextParameter>
diff --git a/src/test/resources/migration/reference/ZUGFeRD2_COMFORT_Einfach.xml b/src/test/resources/migration/reference/ZUGFeRD2_COMFORT_Einfach.xml
index 86566c1b..81432621 100644
--- a/src/test/resources/migration/reference/ZUGFeRD2_COMFORT_Einfach.xml
+++ b/src/test/resources/migration/reference/ZUGFeRD2_COMFORT_Einfach.xml
@@ -50,10 +50,6 @@ Kosten, Verluste bzw. Schäden hätte normalerweise vorhergesehen werden können
                           xmlns:udt="urn:un:unece:uncefact:data:standard:UnqualifiedDataType:100"><!--
 Migrated by Mustangproject XSLT
 --><rsm:ExchangedDocumentContext>
-		    <ram:TestIndicator>
-         <udt:Indicator>true</udt:Indicator>
-      </ram:TestIndicator>
-      <!-- Im Echtbetrieb muss der TestIndicator entweder vollständig entfallen oder auf false stehen. -->
 		    <ram:GuidelineSpecifiedDocumentContextParameter>
 			      <ram:ID>urn:cen.eu:en16931:2017</ram:ID>
 		    </ram:GuidelineSpecifiedDocumentContextParameter>
diff --git a/src/test/resources/migration/reference/ZUGFeRD2_EXTENDED_Warenrechnung.xml b/src/test/resources/migration/reference/ZUGFeRD2_EXTENDED_Warenrechnung.xml
index ad6d4ca5..2ee1b6ea 100644
--- a/src/test/resources/migration/reference/ZUGFeRD2_EXTENDED_Warenrechnung.xml
+++ b/src/test/resources/migration/reference/ZUGFeRD2_EXTENDED_Warenrechnung.xml
@@ -50,9 +50,6 @@ Kosten, Verluste bzw. Schäden hätte normalerweise vorhergesehen werden können
                           xmlns:udt="urn:un:unece:uncefact:data:standard:UnqualifiedDataType:100"><!--
 Migrated by Mustangproject XSLT
 --><rsm:ExchangedDocumentContext>
-		    <ram:TestIndicator>
-         <udt:Indicator>true</udt:Indicator>
-      </ram:TestIndicator>
       <!-- Im Echtbetrieb muss der TestIndicator entweder vollständig entfallen oder auf false stehen. -->
 		    <ram:GuidelineSpecifiedDocumentContextParameter>
 			      <ram:ID>urn:cen.eu:en16931:2017#conformant#urn:zugferd.de:2p0:extended</ram:ID>