diff --git a/library/src/main/java/org/mustangproject/TradeParty.java b/library/src/main/java/org/mustangproject/TradeParty.java
index 95619d76..fe519522 100644
--- a/library/src/main/java/org/mustangproject/TradeParty.java
+++ b/library/src/main/java/org/mustangproject/TradeParty.java
@@ -656,7 +656,7 @@ public class TradeParty implements IZUGFeRDExportableTradeParty {
 
 	@Override
 	public String getCountry() {
-		return taxScheme;
+		return country;
 	}
 
 	/***
@@ -665,7 +665,7 @@ public class TradeParty implements IZUGFeRDExportableTradeParty {
 	 * @return fluent setter
 	 */
 	public TradeParty setCountry(String country) {
-		this.taxScheme = country;
+		this.country = country;
 		return this;
 	}
 
diff --git a/library/src/test/java/org/mustangproject/ZUGFeRD/ZF2ZInvoiceImporterTest.java b/library/src/test/java/org/mustangproject/ZUGFeRD/ZF2ZInvoiceImporterTest.java
index f0feeff3..7d7473bb 100644
--- a/library/src/test/java/org/mustangproject/ZUGFeRD/ZF2ZInvoiceImporterTest.java
+++ b/library/src/test/java/org/mustangproject/ZUGFeRD/ZF2ZInvoiceImporterTest.java
@@ -350,11 +350,7 @@ public class ZF2ZInvoiceImporterTest extends ResourceCase {
 
 
 	}
-
-
-
-
-
+	
 	public void testImportMinimum() {
 		File CIIinputFile = getResourceAsFile("cii/facturFrMinimum.xml");
 		try {
@@ -375,59 +371,5 @@ public class ZF2ZInvoiceImporterTest extends ResourceCase {
 
 
 	}
-/*
-this would test if for all elements/attributes
- */
-
-	public void testEEISI_300_cii_Import() throws XPathExpressionException, ParseException {
-		boolean hasExceptions = false;
-		File inputCII = getResourceAsFile("not_validating_full_invoice_based_onTest_EeISI_300_CENfullmodel.cii.xml");
-		File inputUBL = getResourceAsFile("not_validating_full_invoice_based_onTest_EeISI_300_CENfullmodel.ubl.xml");
-
-
-		ZUGFeRDInvoiceImporter zii = new ZUGFeRDInvoiceImporter();
-		try {
-			zii.fromXML(new String(Files.readAllBytes(inputCII.toPath()), StandardCharsets.UTF_8));
-
-		} catch (IOException e) {
-			hasExceptions = true;
-		}
-
-		Invoice invoiceUBL = null;
-		invoiceUBL = zii.extractInvoice();
-
-		try {
-			zii.fromXML(new String(Files.readAllBytes(inputUBL.toPath()), StandardCharsets.UTF_8));
-
-		} catch (IOException e) {
-			hasExceptions = true;
-		}
-
-		Invoice invoiceCII = null;
-		try {
-			invoiceCII = zii.extractInvoice();
-			ObjectMapper mapper = new ObjectMapper();
-			String ubl=mapper.writeValueAsString(invoiceUBL).replace("," ,"\n");
-			String cii=mapper.writeValueAsString(invoiceCII).replace("," ,"\n");
-
-			assertEquals(cii,ubl);
-
-
-				/*
-				<cbc:Name>Seller contact point</cbc:Name>
-        <cbc:Telephone>+41 345 654455</cbc:Telephone>
-        <cbc:ElectronicMail>seller@contact.de);*/
-		} catch (XPathExpressionException | ParseException e) {
-			hasExceptions = true;
-		} catch (JsonProcessingException e) {
-			throw new RuntimeException(e);
-		}
-		assertFalse(hasExceptions);
-
-//		TransactionCalculator tc = new TransactionCalculator(invoiceCII);
-//		assertEquals(new BigDecimal("205.00"), tc.getGrandTotal());
-
-	}
-
 
 }
diff --git a/validator/src/test/java/org/mustangproject/validator/ZUGFeRDValidatorTest.java b/validator/src/test/java/org/mustangproject/validator/ZUGFeRDValidatorTest.java
index 695e51da..d0e17daa 100644
--- a/validator/src/test/java/org/mustangproject/validator/ZUGFeRDValidatorTest.java
+++ b/validator/src/test/java/org/mustangproject/validator/ZUGFeRDValidatorTest.java
@@ -224,10 +224,10 @@ public class ZUGFeRDValidatorTest extends ResourceCase {
 
 		assertThat(res).valueByXPath("count(//error)")
 			.asInt()
-			.isEqualTo(3);
+			.isEqualTo(1);
 		assertThat(res).valueByXPath("count(//warning)")
 			.asInt()
-			.isEqualTo(1);
+			.isEqualTo(3);
 
 		assertThat(res).valueByXPath("count(//notice)")
 			.asInt()