diff --git a/mustang/pom.xml b/mustang/pom.xml
index 9d09a237..cbe62a6d 100644
--- a/mustang/pom.xml
+++ b/mustang/pom.xml
@@ -21,6 +21,17 @@
             <artifactId>jaxb-runtime</artifactId>
             <version>2.2.11</version>
         </dependency>
+        
+        <dependency>
+	    <groupId>org.apache.pdfbox</groupId>
+	    <artifactId>preflight</artifactId>
+	    <version>1.8.8</version>
+	</dependency>
+        <dependency>
+	    <groupId>org.apache.pdfbox</groupId>
+	    <artifactId>pdfbox</artifactId>
+	    <version>1.8.8</version>
+	</dependency>
     </dependencies>
 
     <mailingLists>
diff --git a/mustang/src/test/java/org/mustangproject/ZUGFeRD/MustangReaderWriterEdgeTest.java b/mustang/src/test/java/org/mustangproject/ZUGFeRD/MustangReaderWriterEdgeTest.java
index f75bd38b..e75b1925 100644
--- a/mustang/src/test/java/org/mustangproject/ZUGFeRD/MustangReaderWriterEdgeTest.java
+++ b/mustang/src/test/java/org/mustangproject/ZUGFeRD/MustangReaderWriterEdgeTest.java
@@ -118,6 +118,12 @@ public class MustangReaderWriterEdgeTest extends TestCase implements IZUGFeRDExp
   {
     return null;
   }
+
+  @Override
+  public String getCurrency()
+  {
+    return "EUR";
+  }
   
   @Override
   public IZUGFeRDExportableItem[] getZFItems()
@@ -399,13 +405,11 @@ public class MustangReaderWriterEdgeTest extends TestCase implements IZUGFeRDExp
     PDDocument doc;
     try
     {
-      doc = PDDocument.load(SOURCE_PDF);
       // automatically add Zugferd to all outgoing invoices
       ZUGFeRDExporter ze = new ZUGFeRDExporter();
-      ze.PDFmakeA3compliant(doc, "My Application", System.getProperty("user.name"), true);
+      ze.PDFmakeA3compliant(SOURCE_PDF, "My Application", System.getProperty("user.name"), true);
       ze.PDFattachZugferdFile(doc, this);
-      doc.save(TARGET_PDF);
-      doc.close();
+      ze.export(TARGET_PDF);
     }
     catch (IOException e)
     {
diff --git a/mustang/src/test/java/org/mustangproject/ZUGFeRD/MustangReaderWriterTest.java b/mustang/src/test/java/org/mustangproject/ZUGFeRD/MustangReaderWriterTest.java
index e834f3c7..9e1ccb3c 100644
--- a/mustang/src/test/java/org/mustangproject/ZUGFeRD/MustangReaderWriterTest.java
+++ b/mustang/src/test/java/org/mustangproject/ZUGFeRD/MustangReaderWriterTest.java
@@ -118,6 +118,12 @@ public class MustangReaderWriterTest extends TestCase implements IZUGFeRDExporta
     return null;
   }
 
+  @Override
+  public String getCurrency()
+  {
+    return "EUR";
+  }
+
   @Override
   public IZUGFeRDExportableItem[] getZFItems()
   {