diff --git a/library/src/test/java/org/mustangproject/ZUGFeRD/DXTest.java b/library/src/test/java/org/mustangproject/ZUGFeRD/DXTest.java
index 5e4a5316..04ed7fa0 100644
--- a/library/src/test/java/org/mustangproject/ZUGFeRD/DXTest.java
+++ b/library/src/test/java/org/mustangproject/ZUGFeRD/DXTest.java
@@ -335,10 +335,8 @@ public class DXTest extends MustangReaderTestCase {
 		zf2p.setProfile(Profiles.getByName(EStandard.despatchadvice,"Pilot",1));
 		zf2p.generateXML(i);
 		String theXML = new String(zf2p.getXML(), StandardCharsets.UTF_8);
-		try {
-			BufferedWriter writer = new BufferedWriter(new FileWriter(TARGET_XML));
+		try(BufferedWriter writer = new BufferedWriter(new FileWriter(TARGET_XML))) {
 			writer.write(theXML);
-			writer.close();
 		} catch (IOException e) {
 			e.printStackTrace();
 		}
diff --git a/library/src/test/java/org/mustangproject/ZUGFeRD/FXTest.java b/library/src/test/java/org/mustangproject/ZUGFeRD/FXTest.java
index fbe986b3..1eeed4e6 100644
--- a/library/src/test/java/org/mustangproject/ZUGFeRD/FXTest.java
+++ b/library/src/test/java/org/mustangproject/ZUGFeRD/FXTest.java
@@ -62,10 +62,8 @@ public class FXTest extends TestCase {
 		assertThat(theXML).valueByXPath("//*[local-name()='DuePayableAmount']")
 				.asDouble()
 				.isEqualTo(1);
-		try {
-			BufferedWriter writer = new BufferedWriter(new FileWriter(TARGET_XML));
+		try(BufferedWriter writer = new BufferedWriter(new FileWriter(TARGET_XML))) {
 			writer.write(theXML);
-			writer.close();
 		} catch (IOException e) {
 			e.printStackTrace();
 		}
diff --git a/library/src/test/java/org/mustangproject/ZUGFeRD/XRTest.java b/library/src/test/java/org/mustangproject/ZUGFeRD/XRTest.java
index 3109f1b7..495a0563 100644
--- a/library/src/test/java/org/mustangproject/ZUGFeRD/XRTest.java
+++ b/library/src/test/java/org/mustangproject/ZUGFeRD/XRTest.java
@@ -81,10 +81,8 @@ public class XRTest extends TestCase {
 		assertThat(theXML).valueByXPath("//*[local-name()='DuePayableAmount']")
 			.asDouble()
 			.isEqualTo(1);
-		try {
-			BufferedWriter writer = new BufferedWriter(new FileWriter(TARGET_XML));
+		try(BufferedWriter writer = new BufferedWriter(new FileWriter(TARGET_XML))) {
 			writer.write(theXML);
-			writer.close();
 		} catch (IOException e) {
 			e.printStackTrace();
 		}
@@ -134,10 +132,8 @@ public class XRTest extends TestCase {
 		assertThat(theXML).valueByXPath("//*[local-name()='DuePayableAmount']")
 			.asDouble()
 			.isEqualTo(1);
-		try {
-			BufferedWriter writer = new BufferedWriter(new FileWriter(TARGET_EDGE_XML));
+		try(BufferedWriter writer = new BufferedWriter(new FileWriter(TARGET_EDGE_XML))) {
 			writer.write(theXML);
-			writer.close();
 		} catch (IOException e) {
 			e.printStackTrace();
 		}
@@ -251,10 +247,8 @@ public class XRTest extends TestCase {
 		assertThat(theXML).valueByXPath("//*[local-name()='DuePayableAmount']")
 			.asDouble()
 			.isEqualTo(1);
-		try {
-			BufferedWriter writer = new BufferedWriter(new FileWriter(TARGET_XML));
+		try(BufferedWriter writer = new BufferedWriter(new FileWriter(TARGET_XML))) {
 			writer.write(theXML);
-			writer.close();
 		} catch (IOException e) {
 			e.printStackTrace();
 		}
diff --git a/library/src/test/java/org/mustangproject/ZUGFeRD/ZF2PushTest.java b/library/src/test/java/org/mustangproject/ZUGFeRD/ZF2PushTest.java
index 3408b9a0..3cddc296 100644
--- a/library/src/test/java/org/mustangproject/ZUGFeRD/ZF2PushTest.java
+++ b/library/src/test/java/org/mustangproject/ZUGFeRD/ZF2PushTest.java
@@ -309,9 +309,7 @@ public class ZF2PushTest extends TestCase {
 		String number = "123";
 		String priceStr = "3.00";
 		BigDecimal price = new BigDecimal(priceStr);
-		try {
-			InputStream SOURCE_PDF = this.getClass().getResourceAsStream("/MustangGnuaccountingBeispielRE-20170509_505blanko.pdf");
-
+		try(InputStream SOURCE_PDF = this.getClass().getResourceAsStream("/MustangGnuaccountingBeispielRE-20170509_505blanko.pdf")) {
 			ZUGFeRDExporterFromA1 ze = new ZUGFeRDExporterFromA1();
 			ze.ignorePDFAErrors().load(SOURCE_PDF);
 			ze.setProfile(Profiles.getByName("Extended"));
@@ -359,7 +357,7 @@ public class ZF2PushTest extends TestCase {
 
 
 	/***
-	 * you can activate intra community suppliy on item level
+	 * you can activate intra community supply on item level
 	 */
 	public void testIntraCommunitySupplyItemExport() {