From 8466d0cd13a152818b59d77c49c243c0c3318fb9 Mon Sep 17 00:00:00 2001
From: Georg <georg@midran.is>
Date: Fri, 25 Oct 2024 12:51:18 +0000
Subject: [PATCH] Adding unit test to SelfBilling

---
 .../unit-UBL-PEPPOL-SB/PEPPOL-COMMON-R042.xml | 139 ++++++++
 .../unit-UBL-PEPPOL-SB/PEPPOL-COMMON-R043.xml | 117 +++++++
 .../unit-UBL-PEPPOL-SB/PEPPOL-COMMON-R044.xml | 102 ++++++
 .../unit-UBL-PEPPOL-SB/PEPPOL-COMMON-R045.xml | 101 ++++++
 .../unit-UBL-PEPPOL-SB/PEPPOL-COMMON-R046.xml |  78 +++++
 .../unit-UBL-PEPPOL-SB/PEPPOL-COMMON-R047.xml | 103 ++++++
 .../unit-UBL-PEPPOL-SB/PEPPOL-COMMON-R048.xml |  37 ++
 .../unit-UBL-PEPPOL-SB/PEPPOL-COMMON-R049.xml |  62 ++++
 .../unit-UBL-PEPPOL-SB/PEPPOL-COMMON-R050.xml |  49 +++
 .../PEPPOL-EN16931-CL001.xml                  |  36 ++
 .../PEPPOL-EN16931-CL002.xml                  |  43 +++
 .../PEPPOL-EN16931-CL003.xml                  |  43 +++
 .../PEPPOL-EN16931-CL006.xml                  |  47 +++
 .../PEPPOL-EN16931-CL007.xml                  |  63 ++++
 .../PEPPOL-EN16931-CL008.xml                  |  98 ++++++
 .../PEPPOL-EN16931-F001.xml                   |  41 +++
 .../PEPPOL-EN16931-P0104.xml                  |  84 +++++
 .../PEPPOL-EN16931-P0105.xml                  |  84 +++++
 .../PEPPOL-EN16931-P0106.xml                  |  84 +++++
 .../PEPPOL-EN16931-P0107.xml                  |  84 +++++
 .../PEPPOL-EN16931-P0108.xml                  |  84 +++++
 .../PEPPOL-EN16931-P0109.xml                  |  84 +++++
 .../PEPPOL-EN16931-P0110.xml                  |  84 +++++
 .../PEPPOL-EN16931-P0111.xml                  |  84 +++++
 .../PEPPOL-EN16931-R001.xml                   |  31 ++
 .../PEPPOL-EN16931-R002.xml                   |  44 +++
 .../PEPPOL-EN16931-R003.xml                   |  65 ++++
 .../PEPPOL-EN16931-R004.xml                   |  43 +++
 .../PEPPOL-EN16931-R005.xml                   |  58 ++++
 .../PEPPOL-EN16931-R007.xml                   |  31 ++
 .../PEPPOL-EN16931-R010.xml                   |  39 +++
 .../PEPPOL-EN16931-R020.xml                   |  39 +++
 .../PEPPOL-EN16931-R040.xml                   | 176 ++++++++++
 .../PEPPOL-EN16931-R041.xml                   | 150 +++++++++
 .../PEPPOL-EN16931-R042.xml                   | 150 +++++++++
 .../PEPPOL-EN16931-R043.xml                   | 128 +++++++
 .../PEPPOL-EN16931-R044.xml                   |  91 +++++
 .../PEPPOL-EN16931-R046.xml                   |  87 +++++
 .../PEPPOL-EN16931-R051.xml                   |  63 ++++
 .../PEPPOL-EN16931-R053.xml                   |  56 +++
 .../PEPPOL-EN16931-R054.xml                   |  74 ++++
 .../PEPPOL-EN16931-R055.xml                   |  48 +++
 .../PEPPOL-EN16931-R061.xml                   |  41 +++
 .../PEPPOL-EN16931-R080.xml                   |  83 +++++
 .../PEPPOL-EN16931-R100.xml                   |  86 +++++
 .../PEPPOL-EN16931-R101.xml                   |  42 +++
 .../PEPPOL-EN16931-R110.xml                   | 127 +++++++
 .../PEPPOL-EN16931-R111.xml                   | 127 +++++++
 .../PEPPOL-EN16931-R120.xml                   | 318 ++++++++++++++++++
 .../PEPPOL-EN16931-R121.xml                   |  71 ++++
 .../PEPPOL-EN16931-R130.xml                   |  61 ++++
 .../PEPPOL-EN16931-R131.xml                   | 110 ++++++
 52 files changed, 4270 insertions(+)
 create mode 100644 rules/unit-UBL-PEPPOL-SB/PEPPOL-COMMON-R042.xml
 create mode 100644 rules/unit-UBL-PEPPOL-SB/PEPPOL-COMMON-R043.xml
 create mode 100644 rules/unit-UBL-PEPPOL-SB/PEPPOL-COMMON-R044.xml
 create mode 100644 rules/unit-UBL-PEPPOL-SB/PEPPOL-COMMON-R045.xml
 create mode 100644 rules/unit-UBL-PEPPOL-SB/PEPPOL-COMMON-R046.xml
 create mode 100644 rules/unit-UBL-PEPPOL-SB/PEPPOL-COMMON-R047.xml
 create mode 100644 rules/unit-UBL-PEPPOL-SB/PEPPOL-COMMON-R048.xml
 create mode 100644 rules/unit-UBL-PEPPOL-SB/PEPPOL-COMMON-R049.xml
 create mode 100644 rules/unit-UBL-PEPPOL-SB/PEPPOL-COMMON-R050.xml
 create mode 100644 rules/unit-UBL-PEPPOL-SB/PEPPOL-EN16931-CL001.xml
 create mode 100644 rules/unit-UBL-PEPPOL-SB/PEPPOL-EN16931-CL002.xml
 create mode 100644 rules/unit-UBL-PEPPOL-SB/PEPPOL-EN16931-CL003.xml
 create mode 100644 rules/unit-UBL-PEPPOL-SB/PEPPOL-EN16931-CL006.xml
 create mode 100644 rules/unit-UBL-PEPPOL-SB/PEPPOL-EN16931-CL007.xml
 create mode 100644 rules/unit-UBL-PEPPOL-SB/PEPPOL-EN16931-CL008.xml
 create mode 100644 rules/unit-UBL-PEPPOL-SB/PEPPOL-EN16931-F001.xml
 create mode 100644 rules/unit-UBL-PEPPOL-SB/PEPPOL-EN16931-P0104.xml
 create mode 100644 rules/unit-UBL-PEPPOL-SB/PEPPOL-EN16931-P0105.xml
 create mode 100644 rules/unit-UBL-PEPPOL-SB/PEPPOL-EN16931-P0106.xml
 create mode 100644 rules/unit-UBL-PEPPOL-SB/PEPPOL-EN16931-P0107.xml
 create mode 100644 rules/unit-UBL-PEPPOL-SB/PEPPOL-EN16931-P0108.xml
 create mode 100644 rules/unit-UBL-PEPPOL-SB/PEPPOL-EN16931-P0109.xml
 create mode 100644 rules/unit-UBL-PEPPOL-SB/PEPPOL-EN16931-P0110.xml
 create mode 100644 rules/unit-UBL-PEPPOL-SB/PEPPOL-EN16931-P0111.xml
 create mode 100644 rules/unit-UBL-PEPPOL-SB/PEPPOL-EN16931-R001.xml
 create mode 100644 rules/unit-UBL-PEPPOL-SB/PEPPOL-EN16931-R002.xml
 create mode 100644 rules/unit-UBL-PEPPOL-SB/PEPPOL-EN16931-R003.xml
 create mode 100644 rules/unit-UBL-PEPPOL-SB/PEPPOL-EN16931-R004.xml
 create mode 100644 rules/unit-UBL-PEPPOL-SB/PEPPOL-EN16931-R005.xml
 create mode 100644 rules/unit-UBL-PEPPOL-SB/PEPPOL-EN16931-R007.xml
 create mode 100644 rules/unit-UBL-PEPPOL-SB/PEPPOL-EN16931-R010.xml
 create mode 100644 rules/unit-UBL-PEPPOL-SB/PEPPOL-EN16931-R020.xml
 create mode 100644 rules/unit-UBL-PEPPOL-SB/PEPPOL-EN16931-R040.xml
 create mode 100644 rules/unit-UBL-PEPPOL-SB/PEPPOL-EN16931-R041.xml
 create mode 100644 rules/unit-UBL-PEPPOL-SB/PEPPOL-EN16931-R042.xml
 create mode 100644 rules/unit-UBL-PEPPOL-SB/PEPPOL-EN16931-R043.xml
 create mode 100644 rules/unit-UBL-PEPPOL-SB/PEPPOL-EN16931-R044.xml
 create mode 100644 rules/unit-UBL-PEPPOL-SB/PEPPOL-EN16931-R046.xml
 create mode 100644 rules/unit-UBL-PEPPOL-SB/PEPPOL-EN16931-R051.xml
 create mode 100644 rules/unit-UBL-PEPPOL-SB/PEPPOL-EN16931-R053.xml
 create mode 100644 rules/unit-UBL-PEPPOL-SB/PEPPOL-EN16931-R054.xml
 create mode 100644 rules/unit-UBL-PEPPOL-SB/PEPPOL-EN16931-R055.xml
 create mode 100644 rules/unit-UBL-PEPPOL-SB/PEPPOL-EN16931-R061.xml
 create mode 100644 rules/unit-UBL-PEPPOL-SB/PEPPOL-EN16931-R080.xml
 create mode 100644 rules/unit-UBL-PEPPOL-SB/PEPPOL-EN16931-R100.xml
 create mode 100644 rules/unit-UBL-PEPPOL-SB/PEPPOL-EN16931-R101.xml
 create mode 100644 rules/unit-UBL-PEPPOL-SB/PEPPOL-EN16931-R110.xml
 create mode 100644 rules/unit-UBL-PEPPOL-SB/PEPPOL-EN16931-R111.xml
 create mode 100644 rules/unit-UBL-PEPPOL-SB/PEPPOL-EN16931-R120.xml
 create mode 100644 rules/unit-UBL-PEPPOL-SB/PEPPOL-EN16931-R121.xml
 create mode 100644 rules/unit-UBL-PEPPOL-SB/PEPPOL-EN16931-R130.xml
 create mode 100644 rules/unit-UBL-PEPPOL-SB/PEPPOL-EN16931-R131.xml

diff --git a/rules/unit-UBL-PEPPOL-SB/PEPPOL-COMMON-R042.xml b/rules/unit-UBL-PEPPOL-SB/PEPPOL-COMMON-R042.xml
new file mode 100644
index 0000000..eb32e4a
--- /dev/null
+++ b/rules/unit-UBL-PEPPOL-SB/PEPPOL-COMMON-R042.xml
@@ -0,0 +1,139 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<testSet xmlns="http://difi.no/xsd/vefa/validator/1.0" configuration="peppolbis-en16931-sbbase-3.0-ubl">
+	<assert>
+		<description>Invalid Danish organization number (CVR) provided.</description>
+		<scope>PEPPOL-COMMON-R042</scope>
+	</assert>
+	
+	<test>
+		<assert>
+			<success>PEPPOL-COMMON-R042</success>
+		</assert>
+		<Invoice xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2" xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2" xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2">
+			<cac:AccountingCustomerParty>
+				<cac:Party>
+					<cac:PartyLegalEntity>
+						<cbc:RegistrationName>Customer A A/S</cbc:RegistrationName>
+						<cbc:CompanyID schemeID="0184">DK12345678</cbc:CompanyID>
+					</cac:PartyLegalEntity>
+				</cac:Party>
+			</cac:AccountingCustomerParty>
+		</Invoice>
+	</test>
+    
+    <test>
+		<assert>
+			<success>PEPPOL-COMMON-R042</success>
+		</assert>
+		<Invoice xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2" xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2" xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2">
+			<cac:AccountingSupplierParty>
+				<cac:Party>
+					<cac:PartyLegalEntity>
+						<cbc:RegistrationName>Supplier A/S</cbc:RegistrationName>
+						<cbc:CompanyID schemeID="0184">DK12345678</cbc:CompanyID>
+					</cac:PartyLegalEntity>
+				</cac:Party>
+			</cac:AccountingSupplierParty>
+		</Invoice>
+	</test>
+    
+    <test>
+		<assert>
+			<success>PEPPOL-COMMON-R042</success>
+		</assert>
+		<CreditNote xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2" xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2" xmlns="urn:oasis:names:specification:ubl:schema:xsd:CreditNote-2">
+			<cac:AccountingCustomerParty>
+				<cac:Party>
+					<cac:PartyLegalEntity>
+						<cbc:RegistrationName>Customer A A/S</cbc:RegistrationName>
+						<cbc:CompanyID schemeID="0184">DK12345678</cbc:CompanyID>
+					</cac:PartyLegalEntity>
+				</cac:Party>
+			</cac:AccountingCustomerParty>
+		</CreditNote>
+	</test>
+    
+    <test>
+		<assert>
+			<success>PEPPOL-COMMON-R042</success>
+		</assert>
+		<CreditNote xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2" xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2" xmlns="urn:oasis:names:specification:ubl:schema:xsd:CreditNote-2">
+			<cac:AccountingSupplierParty>
+				<cac:Party>
+					<cac:PartyLegalEntity>
+						<cbc:RegistrationName>Supplier A/S</cbc:RegistrationName>
+						<cbc:CompanyID schemeID="0184">DK12345678</cbc:CompanyID>
+					</cac:PartyLegalEntity>
+				</cac:Party>
+			</cac:AccountingSupplierParty>
+		</CreditNote>
+	</test>
+    
+    
+    
+    <test>
+		<assert>
+			<error>PEPPOL-COMMON-R042</error>
+		</assert>
+		<Invoice xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2" xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2" xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2">
+			<cac:AccountingCustomerParty>
+				<cac:Party>
+					<cac:PartyLegalEntity>
+						<cbc:RegistrationName>Customer A A/S</cbc:RegistrationName>
+						<cbc:CompanyID schemeID="0184">DK:1234567</cbc:CompanyID>
+					</cac:PartyLegalEntity>
+				</cac:Party>
+			</cac:AccountingCustomerParty>
+		</Invoice>
+	</test>
+    
+    <test>
+		<assert>
+			<error>PEPPOL-COMMON-R042</error>
+		</assert>
+		<Invoice xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2" xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2" xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2">
+			<cac:AccountingCustomerParty>
+				<cac:Party>
+					<cac:PartyLegalEntity>
+						<cbc:RegistrationName>Customer A A/S</cbc:RegistrationName>
+						<cbc:CompanyID schemeID="0184">DK-12345678</cbc:CompanyID>
+					</cac:PartyLegalEntity>
+				</cac:Party>
+			</cac:AccountingCustomerParty>
+		</Invoice>
+	</test>
+    
+    <test>
+		<assert>
+			<error>PEPPOL-COMMON-R042</error>
+		</assert>
+		<Invoice xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2" xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2" xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2">
+			<cac:AccountingSupplierParty>
+				<cac:Party>
+					<cac:PartyLegalEntity>
+						<cbc:RegistrationName>Supplier A/S</cbc:RegistrationName>
+						<cbc:CompanyID schemeID="0184">12345678</cbc:CompanyID>
+					</cac:PartyLegalEntity>
+				</cac:Party>
+			</cac:AccountingSupplierParty>
+		</Invoice>
+	</test>
+    
+        <test>
+		<assert>
+			<error>PEPPOL-COMMON-R042</error>
+		</assert>
+		<Invoice xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2" xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2" xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2">
+			<cac:AccountingSupplierParty>
+				<cac:Party>
+					<cac:PartyLegalEntity>
+						<cbc:RegistrationName>Supplier A/S</cbc:RegistrationName>
+						<cbc:CompanyID schemeID="0184">DK012345678</cbc:CompanyID>
+					</cac:PartyLegalEntity>
+				</cac:Party>
+			</cac:AccountingSupplierParty>
+		</Invoice>
+	</test>
+    
+	
+</testSet>
diff --git a/rules/unit-UBL-PEPPOL-SB/PEPPOL-COMMON-R043.xml b/rules/unit-UBL-PEPPOL-SB/PEPPOL-COMMON-R043.xml
new file mode 100644
index 0000000..b38487e
--- /dev/null
+++ b/rules/unit-UBL-PEPPOL-SB/PEPPOL-COMMON-R043.xml
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<testSet xmlns="http://difi.no/xsd/vefa/validator/1.0" configuration="peppolbis-en16931-sbbase-3.0-ubl">
+	<assert>
+		<description>Invalid Beligan organization number (0208) provided.</description>
+		<scope>PEPPOL-COMMON-R043</scope>
+	</assert>
+	
+	<test>
+		<assert>
+			<success>PEPPOL-COMMON-R043</success>
+		</assert>
+		<Invoice xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2" xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2" xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2">
+			<cac:AccountingCustomerParty>
+				<cac:Party>
+					<cac:PartyLegalEntity>
+						<cbc:RegistrationName>Duvel</cbc:RegistrationName>
+						<cbc:CompanyID schemeID="0208">0739484052</cbc:CompanyID>
+					</cac:PartyLegalEntity>
+				</cac:Party>
+			</cac:AccountingCustomerParty>
+		</Invoice>
+	</test>
+    
+	    <test>
+		<assert>
+			<success>PEPPOL-COMMON-R043</success>
+		</assert>
+		<Invoice xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2" xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2" xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2">
+			<cac:AccountingCustomerParty>
+				<cac:Party>
+					<cbc:EndpointID schemeID="0208">0739484052</cbc:EndpointID>
+				</cac:Party>
+			</cac:AccountingCustomerParty>
+		</Invoice>
+	</test>
+	
+    <test>
+		<assert>
+			<success>PEPPOL-COMMON-R043</success>
+		</assert>
+		<Invoice xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2" xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2" xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2">
+			<cac:AccountingSupplierParty>
+				<cac:Party>
+					<cbc:EndpointID schemeID="0208">0739484052</cbc:EndpointID>
+				</cac:Party>
+			</cac:AccountingSupplierParty>
+		</Invoice>
+	</test>
+    
+    <test>
+		<assert>
+			<success>PEPPOL-COMMON-R043</success>
+		</assert>
+		<CreditNote xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2" xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2" xmlns="urn:oasis:names:specification:ubl:schema:xsd:CreditNote-2">
+			<cac:AccountingCustomerParty>
+				<cac:Party>
+					<cac:PartyLegalEntity>
+						<cbc:RegistrationName>Duvel</cbc:RegistrationName>
+						<cbc:CompanyID schemeID="0208">0739484052</cbc:CompanyID>
+					</cac:PartyLegalEntity>
+				</cac:Party>
+			</cac:AccountingCustomerParty>
+		</CreditNote>
+	</test>
+    
+   
+    <test>
+		<assert>
+			<error>PEPPOL-COMMON-R043</error>
+		</assert>
+		<Invoice xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2" xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2" xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2">
+			<cac:AccountingCustomerParty>
+				<cac:Party>
+					<cac:PartyLegalEntity>
+						<cbc:RegistrationName>Duvel</cbc:RegistrationName>
+						<cbc:CompanyID schemeID="0208">07399999484052</cbc:CompanyID> <!-- too long -->
+					</cac:PartyLegalEntity>
+				</cac:Party>
+			</cac:AccountingCustomerParty>
+		</Invoice>
+	</test>
+    
+    <test>
+		<assert>
+			<error>PEPPOL-COMMON-R043</error>
+		</assert>
+		<Invoice xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2" xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2" xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2">
+			<cac:AccountingCustomerParty>
+				<cac:Party>
+					<cac:PartyLegalEntity>
+						<cbc:RegistrationName>Duvel</cbc:RegistrationName>
+						<cbc:CompanyID schemeID="0208">0739484059</cbc:CompanyID> <!-- Wrong modulus calc-->
+					</cac:PartyLegalEntity>
+				</cac:Party>
+			</cac:AccountingCustomerParty>
+		</Invoice>
+	</test>
+    
+    <test>
+		<assert>
+			<error>PEPPOL-COMMON-R043</error>
+		</assert>
+		<Invoice xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2" xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2" xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2">
+			<cac:AccountingSupplierParty>
+				<cac:Party>
+					<cac:PartyLegalEntity>
+						<cbc:RegistrationName>Duvel</cbc:RegistrationName>
+						<cbc:CompanyID schemeID="0208">ABC</cbc:CompanyID> <!-- Not numeric -->
+					</cac:PartyLegalEntity>
+				</cac:Party>
+			</cac:AccountingSupplierParty>
+		</Invoice>
+	</test>
+    
+    
+	
+</testSet>
diff --git a/rules/unit-UBL-PEPPOL-SB/PEPPOL-COMMON-R044.xml b/rules/unit-UBL-PEPPOL-SB/PEPPOL-COMMON-R044.xml
new file mode 100644
index 0000000..905dd23
--- /dev/null
+++ b/rules/unit-UBL-PEPPOL-SB/PEPPOL-COMMON-R044.xml
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<testSet xmlns="http://difi.no/xsd/vefa/validator/1.0" configuration="peppolbis-en16931-sbbase-3.0-ubl">
+	<assert>
+		<description>ICD (0201) provided.</description>
+		<scope>PEPPOL-COMMON-R044</scope>
+	</assert>
+	
+	<test>
+		<assert>
+			<success>PEPPOL-COMMON-R044</success>
+		</assert>
+		<Invoice xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2" xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2" xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2">
+			<cac:AccountingCustomerParty>
+				<cac:Party>
+					<cac:PartyLegalEntity>
+						<cbc:RegistrationName>Duvel</cbc:RegistrationName>
+						<cbc:CompanyID schemeID="0201">F7VRDL</cbc:CompanyID>
+					</cac:PartyLegalEntity>
+				</cac:Party>
+			</cac:AccountingCustomerParty>
+		</Invoice>
+	</test>
+    
+	    <test>
+		<assert>
+			<success>PEPPOL-COMMON-R044</success>
+		</assert>
+		<Invoice xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2" xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2" xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2">
+			<cac:AccountingCustomerParty>
+				<cac:Party>
+					<cbc:EndpointID schemeID="0201">F7VRDL</cbc:EndpointID>
+				</cac:Party>
+			</cac:AccountingCustomerParty>
+		</Invoice>
+	</test>
+	
+    <test>
+		<assert>
+			<success>PEPPOL-COMMON-R044</success>
+		</assert>
+		<Invoice xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2" xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2" xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2">
+			<cac:AccountingSupplierParty>
+				<cac:Party>
+					<cbc:EndpointID schemeID="0201">F7VRDL</cbc:EndpointID>
+				</cac:Party>
+			</cac:AccountingSupplierParty>
+		</Invoice>
+	</test>
+    
+    <test>
+		<assert>
+			<success>PEPPOL-COMMON-R044</success>
+		</assert>
+		<CreditNote xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2" xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2" xmlns="urn:oasis:names:specification:ubl:schema:xsd:CreditNote-2">
+			<cac:AccountingCustomerParty>
+				<cac:Party>
+					<cac:PartyLegalEntity>
+						<cbc:RegistrationName>Duvel</cbc:RegistrationName>
+						<cbc:CompanyID schemeID="0201">F7VRDL</cbc:CompanyID>
+					</cac:PartyLegalEntity>
+				</cac:Party>
+			</cac:AccountingCustomerParty>
+		</CreditNote>
+	</test>
+    
+   
+    <test>
+		<assert>
+			<warning>PEPPOL-COMMON-R044</warning>
+		</assert>
+		<Invoice xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2" xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2" xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2">
+			<cac:AccountingCustomerParty>
+				<cac:Party>
+					<cac:PartyLegalEntity>
+						<cbc:RegistrationName>Duvel</cbc:RegistrationName>
+						<cbc:CompanyID schemeID="0201">F7VRDLF7VRDLF7VRDL</cbc:CompanyID> <!-- too long -->
+					</cac:PartyLegalEntity>
+				</cac:Party>
+			</cac:AccountingCustomerParty>
+		</Invoice>
+	</test>
+    
+    <test>
+		<assert>
+			<warning>PEPPOL-COMMON-R044</warning>
+		</assert>
+		<Invoice xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2" xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2" xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2">
+			<cac:AccountingCustomerParty>
+				<cac:Party>
+					<cac:PartyLegalEntity>
+						<cbc:RegistrationName>Duvel</cbc:RegistrationName>
+						<cbc:CompanyID schemeID="0201">0739484059</cbc:CompanyID> 
+					</cac:PartyLegalEntity>
+				</cac:Party>
+			</cac:AccountingCustomerParty>
+		</Invoice>
+	</test>
+    
+
+    
+	
+</testSet>
diff --git a/rules/unit-UBL-PEPPOL-SB/PEPPOL-COMMON-R045.xml b/rules/unit-UBL-PEPPOL-SB/PEPPOL-COMMON-R045.xml
new file mode 100644
index 0000000..388f75e
--- /dev/null
+++ b/rules/unit-UBL-PEPPOL-SB/PEPPOL-COMMON-R045.xml
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<testSet xmlns="http://difi.no/xsd/vefa/validator/1.0" configuration="peppolbis-en16931-sbbase-3.0-ubl">
+	<assert>
+		<description>ICD (0210) provided.</description>
+		<scope>PEPPOL-COMMON-R045</scope>
+	</assert>
+	
+	<test>
+		<assert>
+			<success>PEPPOL-COMMON-R045</success>
+		</assert>
+		<Invoice xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2" xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2" xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2">
+			<cac:AccountingCustomerParty>
+				<cac:Party>
+					<cac:PartyLegalEntity>
+						<cbc:RegistrationName>Duvel</cbc:RegistrationName>
+						<cbc:CompanyID schemeID="0210">97735020584</cbc:CompanyID>
+					</cac:PartyLegalEntity>
+				</cac:Party>
+			</cac:AccountingCustomerParty>
+		</Invoice>
+	</test>
+    
+	    <test>
+		<assert>
+			<success>PEPPOL-COMMON-R045</success>
+		</assert>
+		<Invoice xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2" xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2" xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2">
+			<cac:AccountingCustomerParty>
+				<cac:Party>
+					<cbc:EndpointID schemeID="0210">97735020584</cbc:EndpointID>
+				</cac:Party>
+			</cac:AccountingCustomerParty>
+		</Invoice>
+	</test>
+	
+    <test>
+		<assert>
+			<success>PEPPOL-COMMON-R045</success>
+		</assert>
+		<Invoice xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2" xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2" xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2">
+			<cac:AccountingSupplierParty>
+				<cac:Party>
+					<cbc:EndpointID schemeID="0210">97735020584</cbc:EndpointID>
+				</cac:Party>
+			</cac:AccountingSupplierParty>
+		</Invoice>
+	</test>
+    
+    <test>
+		<assert>
+			<success>PEPPOL-COMMON-R045</success>
+		</assert>
+		<CreditNote xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2" xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2" xmlns="urn:oasis:names:specification:ubl:schema:xsd:CreditNote-2">
+			<cac:AccountingCustomerParty>
+				<cac:Party>
+					<cac:PartyLegalEntity>
+						<cbc:RegistrationName>Duvel</cbc:RegistrationName>
+						<cbc:CompanyID schemeID="0210">97735020584</cbc:CompanyID>
+					</cac:PartyLegalEntity>
+				</cac:Party>
+			</cac:AccountingCustomerParty>
+		</CreditNote>
+	</test>
+    
+   
+    <test>
+		<assert>
+			<warning>PEPPOL-COMMON-R045</warning>
+		</assert>
+		<Invoice xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2" xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2" xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2">
+			<cac:AccountingCustomerParty>
+				<cac:Party>
+					<cac:PartyLegalEntity>
+						<cbc:RegistrationName>Duvel</cbc:RegistrationName>
+						<cbc:CompanyID schemeID="0210">9773502058497735020584</cbc:CompanyID> <!-- too long -->
+					</cac:PartyLegalEntity>
+				</cac:Party>
+			</cac:AccountingCustomerParty>
+		</Invoice>
+	</test>
+    
+    <test>
+		<assert>
+			<warning>PEPPOL-COMMON-R045</warning>
+		</assert>
+		<Invoice xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2" xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2" xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2">
+			<cac:AccountingCustomerParty>
+				<cac:Party>
+					<cac:PartyLegalEntity>
+						<cbc:RegistrationName>Duvel</cbc:RegistrationName>
+						<cbc:CompanyID schemeID="0210">ABC</cbc:CompanyID> 
+					</cac:PartyLegalEntity>
+				</cac:Party>
+			</cac:AccountingCustomerParty>
+		</Invoice>
+	</test>
+    
+    
+	
+</testSet>
diff --git a/rules/unit-UBL-PEPPOL-SB/PEPPOL-COMMON-R046.xml b/rules/unit-UBL-PEPPOL-SB/PEPPOL-COMMON-R046.xml
new file mode 100644
index 0000000..e23c990
--- /dev/null
+++ b/rules/unit-UBL-PEPPOL-SB/PEPPOL-COMMON-R046.xml
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<testSet xmlns="http://difi.no/xsd/vefa/validator/1.0" configuration="peppolbis-en16931-sbbase-3.0-ubl">
+	<assert>
+		<description>ICD (9907) provided.</description>
+		<scope>PEPPOL-COMMON-R046</scope>
+	</assert>
+	
+    
+	    <test>
+		<assert>
+			<success>PEPPOL-COMMON-R046</success>
+		</assert>
+		<Invoice xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2" xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2" xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2">
+			<cac:AccountingCustomerParty>
+				<cac:Party>
+					<cbc:EndpointID schemeID="9907">97735020584</cbc:EndpointID>
+				</cac:Party>
+			</cac:AccountingCustomerParty>
+		</Invoice>
+	</test>
+	
+    <test>
+		<assert>
+			<success>PEPPOL-COMMON-R046</success>
+		</assert>
+		<Invoice xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2" xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2" xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2">
+			<cac:AccountingSupplierParty>
+				<cac:Party>
+					<cbc:EndpointID schemeID="9907">97735020584</cbc:EndpointID>
+				</cac:Party>
+			</cac:AccountingSupplierParty>
+		</Invoice>
+	</test>
+    
+    <test>
+		<assert>
+			<success>PEPPOL-COMMON-R046</success>
+		</assert>
+		<CreditNote xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2" xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2" xmlns="urn:oasis:names:specification:ubl:schema:xsd:CreditNote-2">
+			<cac:AccountingSupplierParty>
+				<cac:Party>
+					<cbc:EndpointID schemeID="9907">97735020584</cbc:EndpointID>
+				</cac:Party>
+			</cac:AccountingSupplierParty>
+		</CreditNote>
+	</test>
+    
+   
+   
+    <test>
+		<assert>
+			<warning>PEPPOL-COMMON-R046</warning>
+		</assert>
+		<Invoice xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2" xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2" xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2">
+			<cac:AccountingSupplierParty>
+				<cac:Party>
+					<cbc:EndpointID schemeID="9907">9773502058497735020584</cbc:EndpointID>
+				</cac:Party>
+			</cac:AccountingSupplierParty>
+		</Invoice>
+	</test>
+    
+    <test>
+		<assert>
+			<warning>PEPPOL-COMMON-R046</warning>
+		</assert>
+		<Invoice xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2" xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2" xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2">
+			<cac:AccountingSupplierParty>
+				<cac:Party>
+					<cbc:EndpointID schemeID="9907">ABC</cbc:EndpointID>
+				</cac:Party>
+			</cac:AccountingSupplierParty>
+		</Invoice>
+	</test>
+    
+    
+	
+</testSet>
diff --git a/rules/unit-UBL-PEPPOL-SB/PEPPOL-COMMON-R047.xml b/rules/unit-UBL-PEPPOL-SB/PEPPOL-COMMON-R047.xml
new file mode 100644
index 0000000..8af26a0
--- /dev/null
+++ b/rules/unit-UBL-PEPPOL-SB/PEPPOL-COMMON-R047.xml
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<testSet xmlns="http://difi.no/xsd/vefa/validator/1.0" configuration="peppolbis-en16931-sbbase-3.0-ubl">
+	<assert>
+		<description>ICD (0211) provided.</description>
+		<scope>PEPPOL-COMMON-R047</scope>
+	</assert>
+	
+	<test>
+		<assert>
+			<success>PEPPOL-COMMON-R047</success>
+		</assert>
+		<Invoice xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2" xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2" xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2">
+			<cac:AccountingCustomerParty>
+				<cac:Party>
+					<cac:PartyLegalEntity>
+						<cbc:RegistrationName>Duvel</cbc:RegistrationName>
+						<cbc:CompanyID schemeID="0211">IT02985591201</cbc:CompanyID>
+					</cac:PartyLegalEntity>
+				</cac:Party>
+			</cac:AccountingCustomerParty>
+		</Invoice>
+	</test>
+    
+	    <test>
+		<assert>
+			<success>PEPPOL-COMMON-R047</success>
+		</assert>
+		<Invoice xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2" xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2" xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2">
+			<cac:AccountingCustomerParty>
+				<cac:Party>
+					<cbc:EndpointID schemeID="0211">IT02985591201</cbc:EndpointID>
+				</cac:Party>
+			</cac:AccountingCustomerParty>
+		</Invoice>
+	</test>
+	
+    <test>
+		<assert>
+			<success>PEPPOL-COMMON-R047</success>
+		</assert>
+		<Invoice xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2" xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2" xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2">
+			<cac:AccountingSupplierParty>
+				<cac:Party>
+					<cbc:EndpointID schemeID="0211">IT02985591201</cbc:EndpointID>
+				</cac:Party>
+			</cac:AccountingSupplierParty>
+		</Invoice>
+	</test>
+    
+    <test>
+		<assert>
+			<success>PEPPOL-COMMON-R047</success>
+		</assert>
+		<CreditNote xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2" xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2" xmlns="urn:oasis:names:specification:ubl:schema:xsd:CreditNote-2">
+			<cac:AccountingCustomerParty>
+				<cac:Party>
+					<cac:PartyLegalEntity>
+						<cbc:RegistrationName>Duvel</cbc:RegistrationName>
+						<cbc:CompanyID schemeID="0211">IT02985591201</cbc:CompanyID>
+					</cac:PartyLegalEntity>
+				</cac:Party>
+			</cac:AccountingCustomerParty>
+		</CreditNote>
+	</test>
+    
+   
+    <test>
+		<assert>
+			<warning>PEPPOL-COMMON-R047</warning>
+		</assert>
+		<Invoice xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2" xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2" xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2">
+			<cac:AccountingCustomerParty>
+				<cac:Party>
+					<cac:PartyLegalEntity>
+						<cbc:RegistrationName>Duvel</cbc:RegistrationName>
+						<cbc:CompanyID schemeID="0211">IT1</cbc:CompanyID> 
+					</cac:PartyLegalEntity>
+				</cac:Party>
+			</cac:AccountingCustomerParty>
+		</Invoice>
+	</test>
+    
+    <test>
+		<assert>
+			<warning>PEPPOL-COMMON-R047</warning>
+		</assert>
+		<Invoice xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2" xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2" xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2">
+			<cac:AccountingCustomerParty>
+				<cac:Party>
+					<cac:PartyLegalEntity>
+						<cbc:RegistrationName>Duvel</cbc:RegistrationName>
+						<cbc:CompanyID schemeID="0211">ITABC</cbc:CompanyID>
+					</cac:PartyLegalEntity>
+				</cac:Party>
+			</cac:AccountingCustomerParty>
+		</Invoice>
+	</test>
+    
+
+    
+    
+	
+</testSet>
diff --git a/rules/unit-UBL-PEPPOL-SB/PEPPOL-COMMON-R048.xml b/rules/unit-UBL-PEPPOL-SB/PEPPOL-COMMON-R048.xml
new file mode 100644
index 0000000..87ee279
--- /dev/null
+++ b/rules/unit-UBL-PEPPOL-SB/PEPPOL-COMMON-R048.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<testSet xmlns="http://difi.no/xsd/vefa/validator/1.0" configuration="peppolbis-en16931-sbbase-3.0-ubl">
+	<assert>
+		<description>ICD (9906) provided.</description>
+		<scope>PEPPOL-COMMON-R048</scope>
+	</assert>
+	<!-- Rule is commented out
+
+        <test>
+      <assert>
+        <success>PEPPOL-COMMON-R048</success>
+      </assert>
+      <Invoice xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2" xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2" xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2">
+        <cac:AccountingCustomerParty>
+          <cac:Party>
+            <cbc:EndpointID schemeID="9906">IT02985591201</cbc:EndpointID>
+          </cac:Party>
+        </cac:AccountingCustomerParty>
+      </Invoice>
+    </test>
+
+
+      <test>
+      <assert>
+        <warning>PEPPOL-COMMON-R048</warning>
+      </assert>
+      <Invoice xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2" xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2" xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2">
+        <cac:AccountingCustomerParty>
+          <cac:Party>
+            <cbc:EndpointID schemeID="9906">ITABC</cbc:EndpointID>
+          </cac:Party>
+        </cac:AccountingCustomerParty>
+      </Invoice>
+    </test>
+   -->
+	
+</testSet>
diff --git a/rules/unit-UBL-PEPPOL-SB/PEPPOL-COMMON-R049.xml b/rules/unit-UBL-PEPPOL-SB/PEPPOL-COMMON-R049.xml
new file mode 100644
index 0000000..0a0b5a9
--- /dev/null
+++ b/rules/unit-UBL-PEPPOL-SB/PEPPOL-COMMON-R049.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<testSet xmlns="http://difi.no/xsd/vefa/validator/1.0" configuration="peppolbis-en16931-sbbase-3.0-ubl">
+	<assert>
+		<description>ICD (0007) provided.</description>
+		<scope>PEPPOL-COMMON-R049</scope>
+	</assert>
+	
+
+	    <test>
+		<assert>
+			<success>PEPPOL-COMMON-R049</success>
+		</assert>
+		<Invoice xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2" xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2" xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2">
+			<cac:AccountingCustomerParty>
+				<cac:Party>
+					<cbc:EndpointID schemeID="0007">2021005489</cbc:EndpointID>
+				</cac:Party>
+			</cac:AccountingCustomerParty>
+		</Invoice>
+	</test>
+	
+
+    <test>
+		<assert>
+			<error>PEPPOL-COMMON-R049</error>
+		</assert>
+		<Invoice xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2" xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2" xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2">
+			<cac:AccountingCustomerParty>
+				<cac:Party>
+					<cbc:EndpointID schemeID="0007">556622-1100</cbc:EndpointID>
+				</cac:Party>
+			</cac:AccountingCustomerParty>
+		</Invoice>
+	</test>
+    
+        <test>
+		<assert>
+			<error>PEPPOL-COMMON-R049</error>
+		</assert>
+		<Invoice xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2" xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2" xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2">
+			<cac:AccountingCustomerParty>
+				<cac:Party>
+					<cbc:EndpointID schemeID="0007">SE5566221100</cbc:EndpointID>
+				</cac:Party>
+			</cac:AccountingCustomerParty>
+		</Invoice>
+	</test>
+	
+	<test>
+		<assert>
+			<error>PEPPOL-COMMON-R049</error>
+		</assert>
+		<Invoice xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2" xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2" xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2">
+			<cac:AccountingCustomerParty>
+				<cac:Party>
+					<cbc:EndpointID schemeID="0007">2021005480</cbc:EndpointID>
+				</cac:Party>
+			</cac:AccountingCustomerParty>
+		</Invoice>
+	</test>
+	
+</testSet>
diff --git a/rules/unit-UBL-PEPPOL-SB/PEPPOL-COMMON-R050.xml b/rules/unit-UBL-PEPPOL-SB/PEPPOL-COMMON-R050.xml
new file mode 100644
index 0000000..f829912
--- /dev/null
+++ b/rules/unit-UBL-PEPPOL-SB/PEPPOL-COMMON-R050.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<testSet xmlns="http://difi.no/xsd/vefa/validator/1.0" configuration="peppolbis-en16931-sbbase-3.0-ubl">
+	<assert>
+		<description>ICD (0151) provided.</description>
+		<scope>PEPPOL-COMMON-R050</scope>
+	</assert>
+	
+
+	    <test>
+		<assert>
+			<success>PEPPOL-COMMON-R050</success>
+		</assert>
+		<Invoice xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2" xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2" xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2">
+			<cac:AccountingCustomerParty>
+				<cac:Party>
+					<cbc:EndpointID schemeID="0151">51824753556</cbc:EndpointID>
+				</cac:Party>
+			</cac:AccountingCustomerParty>
+		</Invoice>
+	</test>
+	
+
+    <test>
+		<assert>
+			<error>PEPPOL-COMMON-R050</error>
+		</assert>
+		<Invoice xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2" xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2" xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2">
+			<cac:AccountingCustomerParty>
+				<cac:Party>
+					<cbc:EndpointID schemeID="0151">ERR51824753556</cbc:EndpointID>
+				</cac:Party>
+			</cac:AccountingCustomerParty>
+		</Invoice>
+	</test>
+    
+        <test>
+		<assert>
+			<error>PEPPOL-COMMON-R050</error>
+		</assert>
+		<Invoice xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2" xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2" xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2">
+			<cac:AccountingCustomerParty>
+				<cac:Party>
+					<cbc:EndpointID schemeID="0151">51824753550</cbc:EndpointID>
+				</cac:Party>
+			</cac:AccountingCustomerParty>
+		</Invoice>
+	</test>
+	
+</testSet>
diff --git a/rules/unit-UBL-PEPPOL-SB/PEPPOL-EN16931-CL001.xml b/rules/unit-UBL-PEPPOL-SB/PEPPOL-EN16931-CL001.xml
new file mode 100644
index 0000000..291e7e4
--- /dev/null
+++ b/rules/unit-UBL-PEPPOL-SB/PEPPOL-EN16931-CL001.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<testSet xmlns="http://difi.no/xsd/vefa/validator/1.0" configuration="peppolbis-en16931-sbbase-3.0-ubl">
+	<assert>
+    <description>Correct use of mime codes.</description>
+		<scope>PEPPOL-EN16931-CL001</scope>
+	</assert>
+	<test>
+		<assert>
+			<success number="6">PEPPOL-EN16931-CL001</success>
+		</assert>
+		<Invoice xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
+			xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
+			xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2">
+
+			<cbc:EmbeddedDocumentBinaryObject mimeCode="application/pdf"/>
+			<cbc:EmbeddedDocumentBinaryObject mimeCode="image/png"/>
+			<cbc:EmbeddedDocumentBinaryObject mimeCode="image/jpeg"/>
+			<cbc:EmbeddedDocumentBinaryObject mimeCode="text/csv"/>
+			<cbc:EmbeddedDocumentBinaryObject mimeCode="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"/>
+			<cbc:EmbeddedDocumentBinaryObject mimeCode="application/vnd.oasis.opendocument.spreadsheet"/>
+
+		</Invoice>
+	</test>
+	<test>
+		<assert>
+			<error number="1">PEPPOL-EN16931-CL001</error>
+		</assert>
+		<Invoice xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
+			xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
+			xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2">
+
+			<cbc:EmbeddedDocumentBinaryObject mimeCode="image/tiff"/>
+
+		</Invoice>
+	</test>
+</testSet>
diff --git a/rules/unit-UBL-PEPPOL-SB/PEPPOL-EN16931-CL002.xml b/rules/unit-UBL-PEPPOL-SB/PEPPOL-EN16931-CL002.xml
new file mode 100644
index 0000000..03430e3
--- /dev/null
+++ b/rules/unit-UBL-PEPPOL-SB/PEPPOL-EN16931-CL002.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<testSet xmlns="http://difi.no/xsd/vefa/validator/1.0" configuration="peppolbis-en16931-sbbase-3.0-ubl">
+	<assert>
+    	<description>Correct use of allowance codes.</description>
+		<scope>PEPPOL-EN16931-CL002</scope>
+	</assert>
+	<test>
+		<assert>
+			<success number="3">PEPPOL-EN16931-CL002</success>
+		</assert>
+		<Invoice xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
+			xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
+			xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2">
+
+
+			<cac:AllowanceCharge>
+				<cbc:ChargeIndicator>false</cbc:ChargeIndicator>
+				<cbc:AllowanceChargeReasonCode>60</cbc:AllowanceChargeReasonCode>
+				<cbc:AllowanceChargeReasonCode>70</cbc:AllowanceChargeReasonCode>
+				<cbc:AllowanceChargeReasonCode>100</cbc:AllowanceChargeReasonCode>
+			</cac:AllowanceCharge>
+
+		</Invoice>
+	</test>
+	<test>
+		<assert>
+			<error number="3">PEPPOL-EN16931-CL002</error>
+		</assert>
+		<Invoice xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
+			xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
+			xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2">
+
+
+			<cac:AllowanceCharge>
+				<cbc:ChargeIndicator>false</cbc:ChargeIndicator>
+				<cbc:AllowanceChargeReasonCode>40</cbc:AllowanceChargeReasonCode>
+				<cbc:AllowanceChargeReasonCode>80</cbc:AllowanceChargeReasonCode>
+				<cbc:AllowanceChargeReasonCode>110</cbc:AllowanceChargeReasonCode>
+			</cac:AllowanceCharge>
+
+		</Invoice>
+	</test>
+</testSet>
diff --git a/rules/unit-UBL-PEPPOL-SB/PEPPOL-EN16931-CL003.xml b/rules/unit-UBL-PEPPOL-SB/PEPPOL-EN16931-CL003.xml
new file mode 100644
index 0000000..3f51d6f
--- /dev/null
+++ b/rules/unit-UBL-PEPPOL-SB/PEPPOL-EN16931-CL003.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<testSet xmlns="http://difi.no/xsd/vefa/validator/1.0" configuration="peppolbis-en16931-sbbase-3.0-ubl">
+	<assert>
+	    <description>Correct use of charge codes.</description>
+		<scope>PEPPOL-EN16931-CL003</scope>
+	</assert>
+	<test>
+		<assert>
+			<success number="3">PEPPOL-EN16931-CL003</success>
+		</assert>
+		<Invoice xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
+			xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
+			xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2">
+
+
+			<cac:AllowanceCharge>
+				<cbc:ChargeIndicator>true</cbc:ChargeIndicator>
+				<cbc:AllowanceChargeReasonCode>HAA</cbc:AllowanceChargeReasonCode>
+				<cbc:AllowanceChargeReasonCode>SU</cbc:AllowanceChargeReasonCode>
+				<cbc:AllowanceChargeReasonCode>AAA</cbc:AllowanceChargeReasonCode>
+			</cac:AllowanceCharge>
+
+		</Invoice>
+	</test>
+	<test>
+		<assert>
+			<error number="3">PEPPOL-EN16931-CL003</error>
+		</assert>
+		<Invoice xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
+			xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
+			xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2">
+
+
+			<cac:AllowanceCharge>
+				<cbc:ChargeIndicator>true</cbc:ChargeIndicator>
+				<cbc:AllowanceChargeReasonCode>AAB</cbc:AllowanceChargeReasonCode>
+				<cbc:AllowanceChargeReasonCode>ADS</cbc:AllowanceChargeReasonCode>
+				<cbc:AllowanceChargeReasonCode>TOS</cbc:AllowanceChargeReasonCode>
+			</cac:AllowanceCharge>
+
+		</Invoice>
+	</test>
+</testSet>
diff --git a/rules/unit-UBL-PEPPOL-SB/PEPPOL-EN16931-CL006.xml b/rules/unit-UBL-PEPPOL-SB/PEPPOL-EN16931-CL006.xml
new file mode 100644
index 0000000..f96134d
--- /dev/null
+++ b/rules/unit-UBL-PEPPOL-SB/PEPPOL-EN16931-CL006.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<testSet xmlns="http://difi.no/xsd/vefa/validator/1.0" configuration="peppolbis-en16931-sbbase-3.0-ubl">
+	<assert>
+    <description>Correct use of invoice periode description code.</description>
+		<scope>PEPPOL-EN16931-CL006</scope>
+	</assert>
+	<test>
+		<assert>
+			<success number="3">PEPPOL-EN16931-CL006</success>
+		</assert>
+		<Invoice xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
+			xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
+			xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2">
+
+			<cac:InvoicePeriod>
+				<cbc:DescriptionCode>3</cbc:DescriptionCode>
+			</cac:InvoicePeriod>
+			<cac:InvoicePeriod>
+				<cbc:DescriptionCode>35</cbc:DescriptionCode>
+			</cac:InvoicePeriod>
+			<cac:InvoicePeriod>
+				<cbc:DescriptionCode>432</cbc:DescriptionCode>
+			</cac:InvoicePeriod>
+
+		</Invoice>
+	</test>
+	<test>
+		<assert>
+			<error number="3">PEPPOL-EN16931-CL006</error>
+		</assert>
+		<Invoice xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
+			xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
+			xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2">
+
+			<cac:InvoicePeriod>
+				<cbc:DescriptionCode>ZZZ</cbc:DescriptionCode>
+			</cac:InvoicePeriod>
+			<cac:InvoicePeriod>
+				<cbc:DescriptionCode>50</cbc:DescriptionCode>
+			</cac:InvoicePeriod>
+			<cac:InvoicePeriod>
+				<cbc:DescriptionCode></cbc:DescriptionCode>
+			</cac:InvoicePeriod>
+
+		</Invoice>
+	</test>
+</testSet>
diff --git a/rules/unit-UBL-PEPPOL-SB/PEPPOL-EN16931-CL007.xml b/rules/unit-UBL-PEPPOL-SB/PEPPOL-EN16931-CL007.xml
new file mode 100644
index 0000000..6266177
--- /dev/null
+++ b/rules/unit-UBL-PEPPOL-SB/PEPPOL-EN16931-CL007.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<testSet xmlns="http://difi.no/xsd/vefa/validator/1.0" configuration="peppolbis-en16931-sbbase-3.0-ubl">
+	<assert>
+    <description>Verify currency is provided.</description>
+		<scope>PEPPOL-EN16931-CL007</scope>
+	</assert>
+	<test>
+		<assert>
+			<success number="4">PEPPOL-EN16931-CL007</success>
+		</assert>
+		<Invoice xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
+			xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
+			xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2">
+
+			<cbc:DocumentCurrencyCode>EUR</cbc:DocumentCurrencyCode>
+
+			<cac:TaxTotal>
+				<cbc:TaxAmount currencyID="EUR">10</cbc:TaxAmount>
+				<cac:TaxSubtotal/>
+			</cac:TaxTotal>
+
+			<cac:LegalMonetaryTotal>
+				<cbc:PayableAmount currencyID="EUR">100</cbc:PayableAmount>
+			</cac:LegalMonetaryTotal>
+
+			<cac:InvoiceLine>
+				<cbc:LineExtensionAmount currencyID="EUR">100</cbc:LineExtensionAmount>
+				<cac:Price>
+					<cbc:PriceAmount currencyID="EUR">100</cbc:PriceAmount>
+				</cac:Price>
+			</cac:InvoiceLine>
+
+		</Invoice>
+	</test>
+	<test>
+		<assert>
+			<error number="4">PEPPOL-EN16931-CL007</error>
+		</assert>
+		<Invoice xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
+			xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
+			xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2">
+
+			<cbc:DocumentCurrencyCode>EUS</cbc:DocumentCurrencyCode>
+
+			<cac:TaxTotal>
+				<cbc:TaxAmount currencyID="ITL">10</cbc:TaxAmount>
+				<cac:TaxSubtotal/>
+			</cac:TaxTotal>
+
+			<cac:LegalMonetaryTotal>
+				<cbc:PayableAmount currencyID="FRF">100</cbc:PayableAmount>
+			</cac:LegalMonetaryTotal>
+
+			<cac:InvoiceLine>
+				<cbc:LineExtensionAmount currencyID="DEM">100</cbc:LineExtensionAmount>
+				<cac:Price>
+					<cbc:PriceAmount currencyID="TOS">100</cbc:PriceAmount>
+				</cac:Price>
+			</cac:InvoiceLine>
+
+		</Invoice>
+	</test>
+</testSet>
diff --git a/rules/unit-UBL-PEPPOL-SB/PEPPOL-EN16931-CL008.xml b/rules/unit-UBL-PEPPOL-SB/PEPPOL-EN16931-CL008.xml
new file mode 100644
index 0000000..070233a
--- /dev/null
+++ b/rules/unit-UBL-PEPPOL-SB/PEPPOL-EN16931-CL008.xml
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<testSet xmlns="http://difi.no/xsd/vefa/validator/1.0" configuration="peppolbis-en16931-sbbase-3.0-ubl">
+	<assert>
+    <description>Verify that EndpointID scheme identifier is from the eaid list</description>
+		<scope>PEPPOL-EN16931-CL008</scope>
+	</assert>
+	<test>
+		<assert>
+			<success>PEPPOL-EN16931-CL008</success>
+		</assert>
+		<Invoice xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
+			xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
+			xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2">
+
+			<cac:AccountingSupplierParty>
+				<cac:Party>
+					<cbc:EndpointID schemeID="9950"/>
+				</cac:Party>
+			</cac:AccountingSupplierParty>
+			
+			<cac:AccountingCustomerParty>
+				<cac:Party>
+					<cbc:EndpointID schemeID="0088"/>
+				</cac:Party>
+			</cac:AccountingCustomerParty>
+
+		</Invoice>
+	</test>
+	<test>
+		<assert>
+			<error number="2">PEPPOL-EN16931-CL008</error>
+		</assert>
+		<Invoice xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
+			xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
+			xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2">
+
+			<cac:AccountingSupplierParty>
+				<cac:Party>
+					<cbc:EndpointID schemeID="NO:ORGNR"/>
+				</cac:Party>
+			</cac:AccountingSupplierParty>
+			
+			<cac:AccountingCustomerParty>
+				<cac:Party>
+					<cbc:EndpointID schemeID="1234"/>
+				</cac:Party>
+			</cac:AccountingCustomerParty>
+
+		</Invoice>
+	</test>
+
+	<test>
+		<assert>
+			<success number="3">PEPPOL-EN16931-CL008</success>
+		</assert>
+		<Invoice xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
+			xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
+			xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2">
+
+			<cac:AccountingSupplierParty>
+				<cac:Party>
+					<cbc:EndpointID schemeID="0209"/>
+				</cac:Party>
+			</cac:AccountingSupplierParty>
+			
+			<cac:AccountingCustomerParty>
+				<cac:Party>
+					<cbc:EndpointID schemeID="0209"/>
+				</cac:Party>
+			</cac:AccountingCustomerParty>
+
+		</Invoice>
+	</test>
+
+	<test>
+		<assert>
+			<error number="2">PEPPOL-EN16931-CL008</error>
+		</assert>
+		<Invoice xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
+			xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
+			xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2">
+
+			<cac:AccountingSupplierParty>
+				<cac:Party>
+					<cbc:EndpointID schemeID="9958"/>
+				</cac:Party>
+			</cac:AccountingSupplierParty>
+			
+			<cac:AccountingCustomerParty>
+				<cac:Party>
+					<cbc:EndpointID schemeID="9958"/>
+				</cac:Party>
+			</cac:AccountingCustomerParty>
+
+		</Invoice>
+	</test>
+
+</testSet>
diff --git a/rules/unit-UBL-PEPPOL-SB/PEPPOL-EN16931-F001.xml b/rules/unit-UBL-PEPPOL-SB/PEPPOL-EN16931-F001.xml
new file mode 100644
index 0000000..5778fda
--- /dev/null
+++ b/rules/unit-UBL-PEPPOL-SB/PEPPOL-EN16931-F001.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<testSet xmlns="http://difi.no/xsd/vefa/validator/1.0" configuration="peppolbis-en16931-sbbase-3.0-ubl">
+	<assert>
+    <description>Verify formatting of date elements.</description>
+		<scope>PEPPOL-EN16931-F001</scope>
+	</assert>
+	<test>
+		<assert>
+			<success number="6">PEPPOL-EN16931-F001</success>
+		</assert>
+		<Invoice xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
+			xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
+			xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2">
+
+			<cbc:IssueDate>2017-01-01</cbc:IssueDate>
+			<cbc:DueDate>2018-01-01</cbc:DueDate>
+			<cbc:TaxPointDate>2017-09-30</cbc:TaxPointDate>
+			<cbc:StartDate>2019-01-01</cbc:StartDate>
+			<cbc:EndDate>2018-05-01</cbc:EndDate>
+			<cbc:ActualDeliveryDate>2018-10-01</cbc:ActualDeliveryDate>
+
+		</Invoice>
+	</test>
+	<test>
+		<assert>
+			<error number="6">PEPPOL-EN16931-F001</error>
+		</assert>
+		<Invoice xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
+			xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
+			xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2">
+
+			<cbc:IssueDate>2017-01-00</cbc:IssueDate>
+			<cbc:DueDate>2018-01-01T20:00:00</cbc:DueDate>
+			<cbc:TaxPointDate>2017-09-31</cbc:TaxPointDate>
+			<cbc:StartDate>2019-00-01</cbc:StartDate>
+			<cbc:EndDate>2018-05-32</cbc:EndDate>
+			<cbc:ActualDeliveryDate>18-10-01</cbc:ActualDeliveryDate>
+
+		</Invoice>
+	</test>
+</testSet>
diff --git a/rules/unit-UBL-PEPPOL-SB/PEPPOL-EN16931-P0104.xml b/rules/unit-UBL-PEPPOL-SB/PEPPOL-EN16931-P0104.xml
new file mode 100644
index 0000000..6a6bd63
--- /dev/null
+++ b/rules/unit-UBL-PEPPOL-SB/PEPPOL-EN16931-P0104.xml
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<testSet xmlns="http://difi.no/xsd/vefa/validator/1.0" configuration="peppolbis-en16931-sbbase-3.0-ubl">
+	<assert>
+    	<description>Verify tax exemption reason codes in correspondance with category code.</description>
+		<scope>PEPPOL-EN16931-P0104</scope>
+	</assert>
+	<test>
+		<assert>
+			<success>PEPPOL-EN16931-P0104</success>
+		</assert>
+		<Invoice xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
+			xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
+			xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2">
+
+			<cac:TaxTotal>
+				<cbc:TaxAmount currencyID="GBP">0.00</cbc:TaxAmount>
+				<cac:TaxSubtotal>
+					<cbc:TaxableAmount currencyID="GBP">1200.00</cbc:TaxableAmount>
+					<cbc:TaxAmount currencyID="GBP">0.00</cbc:TaxAmount>
+					<cac:TaxCategory>
+						<cbc:ID>G</cbc:ID>
+						<cbc:TaxExemptionReasonCode>VATEX-EU-G</cbc:TaxExemptionReasonCode>
+						<cbc:Percent>0</cbc:Percent>
+						<cac:TaxScheme>
+							<cbc:ID>VAT</cbc:ID>
+						</cac:TaxScheme>
+					</cac:TaxCategory>
+				</cac:TaxSubtotal>  
+			</cac:TaxTotal>
+		</Invoice>
+	</test>
+
+	<test>
+		<assert>
+			<error>PEPPOL-EN16931-P0104</error>
+		</assert>
+		<Invoice xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
+			xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
+			xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2">
+
+			<cac:TaxTotal>
+				<cbc:TaxAmount currencyID="GBP">0.00</cbc:TaxAmount>
+				<cac:TaxSubtotal>
+					<cbc:TaxableAmount currencyID="GBP">1200.00</cbc:TaxableAmount>
+					<cbc:TaxAmount currencyID="GBP">0.00</cbc:TaxAmount>
+					<cac:TaxCategory>
+						<cbc:ID>S</cbc:ID>
+						<cbc:TaxExemptionReasonCode>VATEX-EU-G</cbc:TaxExemptionReasonCode>
+						<cbc:Percent>0</cbc:Percent>
+						<cac:TaxScheme>
+							<cbc:ID>VAT</cbc:ID>
+						</cac:TaxScheme>
+					</cac:TaxCategory>
+				</cac:TaxSubtotal>  
+			</cac:TaxTotal>
+		</Invoice>
+	</test>
+	<test>
+		<assert>
+			<error>PEPPOL-EN16931-P0104</error>
+		</assert>
+		<CreditNote xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
+			xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
+			xmlns="urn:oasis:names:specification:ubl:schema:xsd:CreditNote-2">
+
+			<cac:TaxTotal>
+				<cbc:TaxAmount currencyID="GBP">0.00</cbc:TaxAmount>
+				<cac:TaxSubtotal>
+					<cbc:TaxableAmount currencyID="GBP">1200.00</cbc:TaxableAmount>
+					<cbc:TaxAmount currencyID="GBP">0.00</cbc:TaxAmount>
+					<cac:TaxCategory>
+						<cbc:ID>S</cbc:ID>
+						<cbc:TaxExemptionReasonCode>VATEX-EU-G</cbc:TaxExemptionReasonCode>
+						<cbc:Percent>0</cbc:Percent>
+						<cac:TaxScheme>
+							<cbc:ID>VAT</cbc:ID>
+						</cac:TaxScheme>
+					</cac:TaxCategory>
+				</cac:TaxSubtotal>  
+			</cac:TaxTotal>
+
+		</CreditNote>
+	</test>
+</testSet>
diff --git a/rules/unit-UBL-PEPPOL-SB/PEPPOL-EN16931-P0105.xml b/rules/unit-UBL-PEPPOL-SB/PEPPOL-EN16931-P0105.xml
new file mode 100644
index 0000000..a9df230
--- /dev/null
+++ b/rules/unit-UBL-PEPPOL-SB/PEPPOL-EN16931-P0105.xml
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<testSet xmlns="http://difi.no/xsd/vefa/validator/1.0" configuration="peppolbis-en16931-sbbase-3.0-ubl">
+	<assert>
+    	<description>Verify tax exemption reason codes in correspondance with category code.</description>
+		<scope>PEPPOL-EN16931-P0105</scope>
+	</assert>
+	<test>
+		<assert>
+			<success>PEPPOL-EN16931-P0105</success>
+		</assert>
+		<Invoice xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
+			xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
+			xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2">
+
+			<cac:TaxTotal>
+				<cbc:TaxAmount currencyID="GBP">0.00</cbc:TaxAmount>
+				<cac:TaxSubtotal>
+					<cbc:TaxableAmount currencyID="GBP">1200.00</cbc:TaxableAmount>
+					<cbc:TaxAmount currencyID="GBP">0.00</cbc:TaxAmount>
+					<cac:TaxCategory>
+						<cbc:ID>O</cbc:ID>
+						<cbc:TaxExemptionReasonCode>VATEX-EU-O</cbc:TaxExemptionReasonCode>
+						<cbc:Percent>0</cbc:Percent>
+						<cac:TaxScheme>
+							<cbc:ID>VAT</cbc:ID>
+						</cac:TaxScheme>
+					</cac:TaxCategory>
+				</cac:TaxSubtotal>  
+			</cac:TaxTotal>
+		</Invoice>
+	</test>
+
+	<test>
+		<assert>
+			<error>PEPPOL-EN16931-P0105</error>
+		</assert>
+		<Invoice xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
+			xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
+			xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2">
+
+			<cac:TaxTotal>
+				<cbc:TaxAmount currencyID="GBP">0.00</cbc:TaxAmount>
+				<cac:TaxSubtotal>
+					<cbc:TaxableAmount currencyID="GBP">1200.00</cbc:TaxableAmount>
+					<cbc:TaxAmount currencyID="GBP">0.00</cbc:TaxAmount>
+					<cac:TaxCategory>
+						<cbc:ID>S</cbc:ID>
+						<cbc:TaxExemptionReasonCode>VATEX-EU-O</cbc:TaxExemptionReasonCode>
+						<cbc:Percent>0</cbc:Percent>
+						<cac:TaxScheme>
+							<cbc:ID>VAT</cbc:ID>
+						</cac:TaxScheme>
+					</cac:TaxCategory>
+				</cac:TaxSubtotal>  
+			</cac:TaxTotal>
+		</Invoice>
+	</test>
+	<test>
+		<assert>
+			<error>PEPPOL-EN16931-P0105</error>
+		</assert>
+		<CreditNote xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
+			xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
+			xmlns="urn:oasis:names:specification:ubl:schema:xsd:CreditNote-2">
+
+			<cac:TaxTotal>
+				<cbc:TaxAmount currencyID="GBP">0.00</cbc:TaxAmount>
+				<cac:TaxSubtotal>
+					<cbc:TaxableAmount currencyID="GBP">1200.00</cbc:TaxableAmount>
+					<cbc:TaxAmount currencyID="GBP">0.00</cbc:TaxAmount>
+					<cac:TaxCategory>
+						<cbc:ID>S</cbc:ID>
+						<cbc:TaxExemptionReasonCode>VATEX-EU-O</cbc:TaxExemptionReasonCode>
+						<cbc:Percent>0</cbc:Percent>
+						<cac:TaxScheme>
+							<cbc:ID>VAT</cbc:ID>
+						</cac:TaxScheme>
+					</cac:TaxCategory>
+				</cac:TaxSubtotal>  
+			</cac:TaxTotal>
+
+		</CreditNote>
+	</test>
+</testSet>
diff --git a/rules/unit-UBL-PEPPOL-SB/PEPPOL-EN16931-P0106.xml b/rules/unit-UBL-PEPPOL-SB/PEPPOL-EN16931-P0106.xml
new file mode 100644
index 0000000..3f56108
--- /dev/null
+++ b/rules/unit-UBL-PEPPOL-SB/PEPPOL-EN16931-P0106.xml
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<testSet xmlns="http://difi.no/xsd/vefa/validator/1.0" configuration="peppolbis-en16931-sbbase-3.0-ubl">
+	<assert>
+    	<description>Verify tax exemption reason codes in correspondance with category code.</description>
+		<scope>PEPPOL-EN16931-P0106</scope>
+	</assert>
+	<test>
+		<assert>
+			<success>PEPPOL-EN16931-P0106</success>
+		</assert>
+		<Invoice xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
+			xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
+			xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2">
+
+			<cac:TaxTotal>
+				<cbc:TaxAmount currencyID="GBP">0.00</cbc:TaxAmount>
+				<cac:TaxSubtotal>
+					<cbc:TaxableAmount currencyID="GBP">1200.00</cbc:TaxableAmount>
+					<cbc:TaxAmount currencyID="GBP">0.00</cbc:TaxAmount>
+					<cac:TaxCategory>
+						<cbc:ID>K</cbc:ID>
+						<cbc:TaxExemptionReasonCode>VATEX-EU-IC</cbc:TaxExemptionReasonCode>
+						<cbc:Percent>0</cbc:Percent>
+						<cac:TaxScheme>
+							<cbc:ID>VAT</cbc:ID>
+						</cac:TaxScheme>
+					</cac:TaxCategory>
+				</cac:TaxSubtotal>  
+			</cac:TaxTotal>
+		</Invoice>
+	</test>
+
+	<test>
+		<assert>
+			<error>PEPPOL-EN16931-P0106</error>
+		</assert>
+		<Invoice xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
+			xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
+			xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2">
+
+			<cac:TaxTotal>
+				<cbc:TaxAmount currencyID="GBP">0.00</cbc:TaxAmount>
+				<cac:TaxSubtotal>
+					<cbc:TaxableAmount currencyID="GBP">1200.00</cbc:TaxableAmount>
+					<cbc:TaxAmount currencyID="GBP">0.00</cbc:TaxAmount>
+					<cac:TaxCategory>
+						<cbc:ID>S</cbc:ID>
+						<cbc:TaxExemptionReasonCode>VATEX-EU-IC</cbc:TaxExemptionReasonCode>
+						<cbc:Percent>0</cbc:Percent>
+						<cac:TaxScheme>
+							<cbc:ID>VAT</cbc:ID>
+						</cac:TaxScheme>
+					</cac:TaxCategory>
+				</cac:TaxSubtotal>  
+			</cac:TaxTotal>
+		</Invoice>
+	</test>
+	<test>
+		<assert>
+			<error>PEPPOL-EN16931-P0106</error>
+		</assert>
+		<CreditNote xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
+			xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
+			xmlns="urn:oasis:names:specification:ubl:schema:xsd:CreditNote-2">
+
+			<cac:TaxTotal>
+				<cbc:TaxAmount currencyID="GBP">0.00</cbc:TaxAmount>
+				<cac:TaxSubtotal>
+					<cbc:TaxableAmount currencyID="GBP">1200.00</cbc:TaxableAmount>
+					<cbc:TaxAmount currencyID="GBP">0.00</cbc:TaxAmount>
+					<cac:TaxCategory>
+						<cbc:ID>S</cbc:ID>
+						<cbc:TaxExemptionReasonCode>VATEX-EU-IC</cbc:TaxExemptionReasonCode>
+						<cbc:Percent>0</cbc:Percent>
+						<cac:TaxScheme>
+							<cbc:ID>VAT</cbc:ID>
+						</cac:TaxScheme>
+					</cac:TaxCategory>
+				</cac:TaxSubtotal>  
+			</cac:TaxTotal>
+
+		</CreditNote>
+	</test>
+</testSet>
diff --git a/rules/unit-UBL-PEPPOL-SB/PEPPOL-EN16931-P0107.xml b/rules/unit-UBL-PEPPOL-SB/PEPPOL-EN16931-P0107.xml
new file mode 100644
index 0000000..f9be980
--- /dev/null
+++ b/rules/unit-UBL-PEPPOL-SB/PEPPOL-EN16931-P0107.xml
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<testSet xmlns="http://difi.no/xsd/vefa/validator/1.0" configuration="peppolbis-en16931-sbbase-3.0-ubl">
+	<assert>
+    	<description>Verify tax exemption reason codes in correspondance with category code.</description>
+		<scope>PEPPOL-EN16931-P0107</scope>
+	</assert>
+	<test>
+		<assert>
+			<success>PEPPOL-EN16931-P0107</success>
+		</assert>
+		<Invoice xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
+			xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
+			xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2">
+
+			<cac:TaxTotal>
+				<cbc:TaxAmount currencyID="GBP">0.00</cbc:TaxAmount>
+				<cac:TaxSubtotal>
+					<cbc:TaxableAmount currencyID="GBP">1200.00</cbc:TaxableAmount>
+					<cbc:TaxAmount currencyID="GBP">0.00</cbc:TaxAmount>
+					<cac:TaxCategory>
+						<cbc:ID>AE</cbc:ID>
+						<cbc:TaxExemptionReasonCode>VATEX-EU-AE</cbc:TaxExemptionReasonCode>
+						<cbc:Percent>0</cbc:Percent>
+						<cac:TaxScheme>
+							<cbc:ID>VAT</cbc:ID>
+						</cac:TaxScheme>
+					</cac:TaxCategory>
+				</cac:TaxSubtotal>  
+			</cac:TaxTotal>
+		</Invoice>
+	</test>
+
+	<test>
+		<assert>
+			<error>PEPPOL-EN16931-P0107</error>
+		</assert>
+		<Invoice xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
+			xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
+			xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2">
+
+			<cac:TaxTotal>
+				<cbc:TaxAmount currencyID="GBP">0.00</cbc:TaxAmount>
+				<cac:TaxSubtotal>
+					<cbc:TaxableAmount currencyID="GBP">1200.00</cbc:TaxableAmount>
+					<cbc:TaxAmount currencyID="GBP">0.00</cbc:TaxAmount>
+					<cac:TaxCategory>
+						<cbc:ID>S</cbc:ID>
+						<cbc:TaxExemptionReasonCode>VATEX-EU-AE</cbc:TaxExemptionReasonCode>
+						<cbc:Percent>0</cbc:Percent>
+						<cac:TaxScheme>
+							<cbc:ID>VAT</cbc:ID>
+						</cac:TaxScheme>
+					</cac:TaxCategory>
+				</cac:TaxSubtotal>  
+			</cac:TaxTotal>
+		</Invoice>
+	</test>
+	<test>
+		<assert>
+			<error>PEPPOL-EN16931-P0107</error>
+		</assert>
+		<CreditNote xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
+			xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
+			xmlns="urn:oasis:names:specification:ubl:schema:xsd:CreditNote-2">
+
+			<cac:TaxTotal>
+				<cbc:TaxAmount currencyID="GBP">0.00</cbc:TaxAmount>
+				<cac:TaxSubtotal>
+					<cbc:TaxableAmount currencyID="GBP">1200.00</cbc:TaxableAmount>
+					<cbc:TaxAmount currencyID="GBP">0.00</cbc:TaxAmount>
+					<cac:TaxCategory>
+						<cbc:ID>S</cbc:ID>
+						<cbc:TaxExemptionReasonCode>VATEX-EU-AE</cbc:TaxExemptionReasonCode>
+						<cbc:Percent>0</cbc:Percent>
+						<cac:TaxScheme>
+							<cbc:ID>VAT</cbc:ID>
+						</cac:TaxScheme>
+					</cac:TaxCategory>
+				</cac:TaxSubtotal>  
+			</cac:TaxTotal>
+
+		</CreditNote>
+	</test>
+</testSet>
diff --git a/rules/unit-UBL-PEPPOL-SB/PEPPOL-EN16931-P0108.xml b/rules/unit-UBL-PEPPOL-SB/PEPPOL-EN16931-P0108.xml
new file mode 100644
index 0000000..bd33cc9
--- /dev/null
+++ b/rules/unit-UBL-PEPPOL-SB/PEPPOL-EN16931-P0108.xml
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<testSet xmlns="http://difi.no/xsd/vefa/validator/1.0" configuration="peppolbis-en16931-sbbase-3.0-ubl">
+	<assert>
+    	<description>Verify tax exemption reason codes in correspondance with category code.</description>
+		<scope>PEPPOL-EN16931-P0108</scope>
+	</assert>
+	<test>
+		<assert>
+			<success>PEPPOL-EN16931-P0108</success>
+		</assert>
+		<Invoice xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
+			xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
+			xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2">
+
+			<cac:TaxTotal>
+				<cbc:TaxAmount currencyID="GBP">0.00</cbc:TaxAmount>
+				<cac:TaxSubtotal>
+					<cbc:TaxableAmount currencyID="GBP">1200.00</cbc:TaxableAmount>
+					<cbc:TaxAmount currencyID="GBP">0.00</cbc:TaxAmount>
+					<cac:TaxCategory>
+						<cbc:ID>E</cbc:ID>
+						<cbc:TaxExemptionReasonCode>VATEX-EU-D</cbc:TaxExemptionReasonCode>
+						<cbc:Percent>0</cbc:Percent>
+						<cac:TaxScheme>
+							<cbc:ID>VAT</cbc:ID>
+						</cac:TaxScheme>
+					</cac:TaxCategory>
+				</cac:TaxSubtotal>  
+			</cac:TaxTotal>
+		</Invoice>
+	</test>
+
+	<test>
+		<assert>
+			<error>PEPPOL-EN16931-P0108</error>
+		</assert>
+		<Invoice xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
+			xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
+			xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2">
+
+			<cac:TaxTotal>
+				<cbc:TaxAmount currencyID="GBP">0.00</cbc:TaxAmount>
+				<cac:TaxSubtotal>
+					<cbc:TaxableAmount currencyID="GBP">1200.00</cbc:TaxableAmount>
+					<cbc:TaxAmount currencyID="GBP">0.00</cbc:TaxAmount>
+					<cac:TaxCategory>
+						<cbc:ID>S</cbc:ID>
+						<cbc:TaxExemptionReasonCode>VATEX-EU-D</cbc:TaxExemptionReasonCode>
+						<cbc:Percent>0</cbc:Percent>
+						<cac:TaxScheme>
+							<cbc:ID>VAT</cbc:ID>
+						</cac:TaxScheme>
+					</cac:TaxCategory>
+				</cac:TaxSubtotal>  
+			</cac:TaxTotal>
+		</Invoice>
+	</test>
+	<test>
+		<assert>
+			<error>PEPPOL-EN16931-P0108</error>
+		</assert>
+		<CreditNote xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
+			xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
+			xmlns="urn:oasis:names:specification:ubl:schema:xsd:CreditNote-2">
+
+			<cac:TaxTotal>
+				<cbc:TaxAmount currencyID="GBP">0.00</cbc:TaxAmount>
+				<cac:TaxSubtotal>
+					<cbc:TaxableAmount currencyID="GBP">1200.00</cbc:TaxableAmount>
+					<cbc:TaxAmount currencyID="GBP">0.00</cbc:TaxAmount>
+					<cac:TaxCategory>
+						<cbc:ID>S</cbc:ID>
+						<cbc:TaxExemptionReasonCode>VATEX-EU-D</cbc:TaxExemptionReasonCode>
+						<cbc:Percent>0</cbc:Percent>
+						<cac:TaxScheme>
+							<cbc:ID>VAT</cbc:ID>
+						</cac:TaxScheme>
+					</cac:TaxCategory>
+				</cac:TaxSubtotal>  
+			</cac:TaxTotal>
+
+		</CreditNote>
+	</test>
+</testSet>
diff --git a/rules/unit-UBL-PEPPOL-SB/PEPPOL-EN16931-P0109.xml b/rules/unit-UBL-PEPPOL-SB/PEPPOL-EN16931-P0109.xml
new file mode 100644
index 0000000..3cf0748
--- /dev/null
+++ b/rules/unit-UBL-PEPPOL-SB/PEPPOL-EN16931-P0109.xml
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<testSet xmlns="http://difi.no/xsd/vefa/validator/1.0" configuration="peppolbis-en16931-sbbase-3.0-ubl">
+	<assert>
+    	<description>Verify tax exemption reason codes in correspondance with category code.</description>
+		<scope>PEPPOL-EN16931-P0109</scope>
+	</assert>
+	<test>
+		<assert>
+			<success>PEPPOL-EN16931-P0109</success>
+		</assert>
+		<Invoice xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
+			xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
+			xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2">
+
+			<cac:TaxTotal>
+				<cbc:TaxAmount currencyID="GBP">0.00</cbc:TaxAmount>
+				<cac:TaxSubtotal>
+					<cbc:TaxableAmount currencyID="GBP">1200.00</cbc:TaxableAmount>
+					<cbc:TaxAmount currencyID="GBP">0.00</cbc:TaxAmount>
+					<cac:TaxCategory>
+						<cbc:ID>E</cbc:ID>
+						<cbc:TaxExemptionReasonCode>VATEX-EU-F</cbc:TaxExemptionReasonCode>
+						<cbc:Percent>0</cbc:Percent>
+						<cac:TaxScheme>
+							<cbc:ID>VAT</cbc:ID>
+						</cac:TaxScheme>
+					</cac:TaxCategory>
+				</cac:TaxSubtotal>  
+			</cac:TaxTotal>
+		</Invoice>
+	</test>
+
+	<test>
+		<assert>
+			<error>PEPPOL-EN16931-P0109</error>
+		</assert>
+		<Invoice xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
+			xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
+			xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2">
+
+			<cac:TaxTotal>
+				<cbc:TaxAmount currencyID="GBP">0.00</cbc:TaxAmount>
+				<cac:TaxSubtotal>
+					<cbc:TaxableAmount currencyID="GBP">1200.00</cbc:TaxableAmount>
+					<cbc:TaxAmount currencyID="GBP">0.00</cbc:TaxAmount>
+					<cac:TaxCategory>
+						<cbc:ID>S</cbc:ID>
+						<cbc:TaxExemptionReasonCode>VATEX-EU-F</cbc:TaxExemptionReasonCode>
+						<cbc:Percent>0</cbc:Percent>
+						<cac:TaxScheme>
+							<cbc:ID>VAT</cbc:ID>
+						</cac:TaxScheme>
+					</cac:TaxCategory>
+				</cac:TaxSubtotal>  
+			</cac:TaxTotal>
+		</Invoice>
+	</test>
+	<test>
+		<assert>
+			<error>PEPPOL-EN16931-P0109</error>
+		</assert>
+		<CreditNote xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
+			xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
+			xmlns="urn:oasis:names:specification:ubl:schema:xsd:CreditNote-2">
+
+			<cac:TaxTotal>
+				<cbc:TaxAmount currencyID="GBP">0.00</cbc:TaxAmount>
+				<cac:TaxSubtotal>
+					<cbc:TaxableAmount currencyID="GBP">1200.00</cbc:TaxableAmount>
+					<cbc:TaxAmount currencyID="GBP">0.00</cbc:TaxAmount>
+					<cac:TaxCategory>
+						<cbc:ID>S</cbc:ID>
+						<cbc:TaxExemptionReasonCode>VATEX-EU-F</cbc:TaxExemptionReasonCode>
+						<cbc:Percent>0</cbc:Percent>
+						<cac:TaxScheme>
+							<cbc:ID>VAT</cbc:ID>
+						</cac:TaxScheme>
+					</cac:TaxCategory>
+				</cac:TaxSubtotal>  
+			</cac:TaxTotal>
+
+		</CreditNote>
+	</test>
+</testSet>
diff --git a/rules/unit-UBL-PEPPOL-SB/PEPPOL-EN16931-P0110.xml b/rules/unit-UBL-PEPPOL-SB/PEPPOL-EN16931-P0110.xml
new file mode 100644
index 0000000..12adba4
--- /dev/null
+++ b/rules/unit-UBL-PEPPOL-SB/PEPPOL-EN16931-P0110.xml
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<testSet xmlns="http://difi.no/xsd/vefa/validator/1.0" configuration="peppolbis-en16931-sbbase-3.0-ubl">
+	<assert>
+    	<description>Verify tax exemption reason codes in correspondance with category code.</description>
+		<scope>PEPPOL-EN16931-P0110</scope>
+	</assert>
+	<test>
+		<assert>
+			<success>PEPPOL-EN16931-P0110</success>
+		</assert>
+		<Invoice xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
+			xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
+			xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2">
+
+			<cac:TaxTotal>
+				<cbc:TaxAmount currencyID="GBP">0.00</cbc:TaxAmount>
+				<cac:TaxSubtotal>
+					<cbc:TaxableAmount currencyID="GBP">1200.00</cbc:TaxableAmount>
+					<cbc:TaxAmount currencyID="GBP">0.00</cbc:TaxAmount>
+					<cac:TaxCategory>
+						<cbc:ID>E</cbc:ID>
+						<cbc:TaxExemptionReasonCode>VATEX-EU-I</cbc:TaxExemptionReasonCode>
+						<cbc:Percent>0</cbc:Percent>
+						<cac:TaxScheme>
+							<cbc:ID>VAT</cbc:ID>
+						</cac:TaxScheme>
+					</cac:TaxCategory>
+				</cac:TaxSubtotal>  
+			</cac:TaxTotal>
+		</Invoice>
+	</test>
+
+	<test>
+		<assert>
+			<error>PEPPOL-EN16931-P0110</error>
+		</assert>
+		<Invoice xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
+			xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
+			xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2">
+
+			<cac:TaxTotal>
+				<cbc:TaxAmount currencyID="GBP">0.00</cbc:TaxAmount>
+				<cac:TaxSubtotal>
+					<cbc:TaxableAmount currencyID="GBP">1200.00</cbc:TaxableAmount>
+					<cbc:TaxAmount currencyID="GBP">0.00</cbc:TaxAmount>
+					<cac:TaxCategory>
+						<cbc:ID>S</cbc:ID>
+						<cbc:TaxExemptionReasonCode>VATEX-EU-I</cbc:TaxExemptionReasonCode>
+						<cbc:Percent>0</cbc:Percent>
+						<cac:TaxScheme>
+							<cbc:ID>VAT</cbc:ID>
+						</cac:TaxScheme>
+					</cac:TaxCategory>
+				</cac:TaxSubtotal>  
+			</cac:TaxTotal>
+		</Invoice>
+	</test>
+	<test>
+		<assert>
+			<error>PEPPOL-EN16931-P0110</error>
+		</assert>
+		<CreditNote xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
+			xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
+			xmlns="urn:oasis:names:specification:ubl:schema:xsd:CreditNote-2">
+
+			<cac:TaxTotal>
+				<cbc:TaxAmount currencyID="GBP">0.00</cbc:TaxAmount>
+				<cac:TaxSubtotal>
+					<cbc:TaxableAmount currencyID="GBP">1200.00</cbc:TaxableAmount>
+					<cbc:TaxAmount currencyID="GBP">0.00</cbc:TaxAmount>
+					<cac:TaxCategory>
+						<cbc:ID>S</cbc:ID>
+						<cbc:TaxExemptionReasonCode>VATEX-EU-I</cbc:TaxExemptionReasonCode>
+						<cbc:Percent>0</cbc:Percent>
+						<cac:TaxScheme>
+							<cbc:ID>VAT</cbc:ID>
+						</cac:TaxScheme>
+					</cac:TaxCategory>
+				</cac:TaxSubtotal>  
+			</cac:TaxTotal>
+
+		</CreditNote>
+	</test>
+</testSet>
diff --git a/rules/unit-UBL-PEPPOL-SB/PEPPOL-EN16931-P0111.xml b/rules/unit-UBL-PEPPOL-SB/PEPPOL-EN16931-P0111.xml
new file mode 100644
index 0000000..cde0f88
--- /dev/null
+++ b/rules/unit-UBL-PEPPOL-SB/PEPPOL-EN16931-P0111.xml
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<testSet xmlns="http://difi.no/xsd/vefa/validator/1.0" configuration="peppolbis-en16931-sbbase-3.0-ubl">
+	<assert>
+    	<description>Verify tax exemption reason codes in correspondance with category code.</description>
+		<scope>PEPPOL-EN16931-P0111</scope>
+	</assert>
+	<test>
+		<assert>
+			<success>PEPPOL-EN16931-P0111</success>
+		</assert>
+		<Invoice xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
+			xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
+			xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2">
+
+			<cac:TaxTotal>
+				<cbc:TaxAmount currencyID="GBP">0.00</cbc:TaxAmount>
+				<cac:TaxSubtotal>
+					<cbc:TaxableAmount currencyID="GBP">1200.00</cbc:TaxableAmount>
+					<cbc:TaxAmount currencyID="GBP">0.00</cbc:TaxAmount>
+					<cac:TaxCategory>
+						<cbc:ID>E</cbc:ID>
+						<cbc:TaxExemptionReasonCode>VATEX-EU-J</cbc:TaxExemptionReasonCode>
+						<cbc:Percent>0</cbc:Percent>
+						<cac:TaxScheme>
+							<cbc:ID>VAT</cbc:ID>
+						</cac:TaxScheme>
+					</cac:TaxCategory>
+				</cac:TaxSubtotal>  
+			</cac:TaxTotal>
+		</Invoice>
+	</test>
+
+	<test>
+		<assert>
+			<error>PEPPOL-EN16931-P0111</error>
+		</assert>
+		<Invoice xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
+			xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
+			xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2">
+
+			<cac:TaxTotal>
+				<cbc:TaxAmount currencyID="GBP">0.00</cbc:TaxAmount>
+				<cac:TaxSubtotal>
+					<cbc:TaxableAmount currencyID="GBP">1200.00</cbc:TaxableAmount>
+					<cbc:TaxAmount currencyID="GBP">0.00</cbc:TaxAmount>
+					<cac:TaxCategory>
+						<cbc:ID>S</cbc:ID>
+						<cbc:TaxExemptionReasonCode>VATEX-EU-J</cbc:TaxExemptionReasonCode>
+						<cbc:Percent>0</cbc:Percent>
+						<cac:TaxScheme>
+							<cbc:ID>VAT</cbc:ID>
+						</cac:TaxScheme>
+					</cac:TaxCategory>
+				</cac:TaxSubtotal>  
+			</cac:TaxTotal>
+		</Invoice>
+	</test>
+	<test>
+		<assert>
+			<error>PEPPOL-EN16931-P0111</error>
+		</assert>
+		<CreditNote xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
+			xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
+			xmlns="urn:oasis:names:specification:ubl:schema:xsd:CreditNote-2">
+
+			<cac:TaxTotal>
+				<cbc:TaxAmount currencyID="GBP">0.00</cbc:TaxAmount>
+				<cac:TaxSubtotal>
+					<cbc:TaxableAmount currencyID="GBP">1200.00</cbc:TaxableAmount>
+					<cbc:TaxAmount currencyID="GBP">0.00</cbc:TaxAmount>
+					<cac:TaxCategory>
+						<cbc:ID>S</cbc:ID>
+						<cbc:TaxExemptionReasonCode>VATEX-EU-J</cbc:TaxExemptionReasonCode>
+						<cbc:Percent>0</cbc:Percent>
+						<cac:TaxScheme>
+							<cbc:ID>VAT</cbc:ID>
+						</cac:TaxScheme>
+					</cac:TaxCategory>
+				</cac:TaxSubtotal>  
+			</cac:TaxTotal>
+
+		</CreditNote>
+	</test>
+</testSet>
diff --git a/rules/unit-UBL-PEPPOL-SB/PEPPOL-EN16931-R001.xml b/rules/unit-UBL-PEPPOL-SB/PEPPOL-EN16931-R001.xml
new file mode 100644
index 0000000..7ff2c34
--- /dev/null
+++ b/rules/unit-UBL-PEPPOL-SB/PEPPOL-EN16931-R001.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<testSet xmlns="http://difi.no/xsd/vefa/validator/1.0" configuration="peppolbis-en16931-sbbase-3.0-ubl">
+	<assert>
+    <description>Verify existence of ProfileID.</description>
+		<scope>PEPPOL-EN16931-R001</scope>
+	</assert>
+	<test>
+		<assert>
+			<success>PEPPOL-EN16931-R001</success>
+		</assert>
+		<Invoice xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
+			xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
+			xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2">
+
+			<cbc:ProfileID/>
+
+		</Invoice>
+	</test>
+	<test>
+		<assert>
+			<error>PEPPOL-EN16931-R001</error>
+		</assert>
+		<Invoice xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
+			xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
+			xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2">
+
+			<!-- <cbc:ProfileID/> -->
+
+		</Invoice>
+	</test>
+</testSet>
diff --git a/rules/unit-UBL-PEPPOL-SB/PEPPOL-EN16931-R002.xml b/rules/unit-UBL-PEPPOL-SB/PEPPOL-EN16931-R002.xml
new file mode 100644
index 0000000..37c9387
--- /dev/null
+++ b/rules/unit-UBL-PEPPOL-SB/PEPPOL-EN16931-R002.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<testSet xmlns="http://difi.no/xsd/vefa/validator/1.0" configuration="peppolbis-en16931-sbbase-3.0-ubl">
+	<assert>
+    	<description>Verify existence of not more than a single Note element on line level.</description>
+		<scope>PEPPOL-EN16931-R002</scope>
+	</assert>
+	<test>
+		<assert>
+			<success>PEPPOL-EN16931-R002</success>
+		</assert>
+		<Invoice xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
+			xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
+			xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2">
+
+			<!-- <cbc:Note/> -->
+
+		</Invoice>
+	</test>
+	<test>
+		<assert>
+			<success>PEPPOL-EN16931-R002</success>
+		</assert>
+		<Invoice xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
+			xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
+			xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2">
+
+			<cbc:Note/>
+
+		</Invoice>
+	</test>
+	<test>
+		<assert>
+			<error>PEPPOL-EN16931-R002</error>
+		</assert>
+		<Invoice xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
+			xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
+			xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2">
+
+			<cbc:Note/>
+			<cbc:Note/>
+
+		</Invoice>
+	</test>
+</testSet>
diff --git a/rules/unit-UBL-PEPPOL-SB/PEPPOL-EN16931-R003.xml b/rules/unit-UBL-PEPPOL-SB/PEPPOL-EN16931-R003.xml
new file mode 100644
index 0000000..196a05d
--- /dev/null
+++ b/rules/unit-UBL-PEPPOL-SB/PEPPOL-EN16931-R003.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<testSet xmlns="http://difi.no/xsd/vefa/validator/1.0" configuration="peppolbis-en16931-sbbase-3.0-ubl">
+	<assert>
+    	<description>Verify existence of buyer reference or purchase order reference.</description>
+		<scope>PEPPOL-EN16931-R003</scope>
+	</assert>
+	<test>
+		<assert>
+			<success>PEPPOL-EN16931-R003</success>
+		</assert>
+		<Invoice xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
+			xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
+			xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2">
+
+			<cbc:BuyerReference/>
+
+			<cac:OrderReference>
+				<cbc:ID/>
+			</cac:OrderReference>
+
+		</Invoice>
+	</test>
+	<test>
+		<assert>
+			<success>PEPPOL-EN16931-R003</success>
+		</assert>
+		<Invoice xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
+			xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
+			xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2">
+
+			<cac:OrderReference>
+				<cbc:ID/>
+			</cac:OrderReference>
+
+		</Invoice>
+	</test>
+	<test>
+		<assert>
+			<success>PEPPOL-EN16931-R003</success>
+		</assert>
+		<Invoice xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
+			xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
+			xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2">
+
+			<cbc:BuyerReference/>
+
+		</Invoice>
+	</test>
+	<test>
+		<assert>
+			<error>PEPPOL-EN16931-R003</error>
+		</assert>
+		<Invoice xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
+			xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
+			xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2">
+
+			<!-- <cbc:BuyerReference/> -->
+
+			<!-- <cac:OrderReference>
+				<cbc:ID/>
+			</cac:OrderReference> -->
+
+		</Invoice>
+	</test>
+</testSet>
diff --git a/rules/unit-UBL-PEPPOL-SB/PEPPOL-EN16931-R004.xml b/rules/unit-UBL-PEPPOL-SB/PEPPOL-EN16931-R004.xml
new file mode 100644
index 0000000..bcc298f
--- /dev/null
+++ b/rules/unit-UBL-PEPPOL-SB/PEPPOL-EN16931-R004.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<testSet xmlns="http://difi.no/xsd/vefa/validator/1.0" configuration="peppolbis-en16931-sbbase-3.0-ubl">
+	<assert>
+    <description>Verify customization identifier.</description>
+		<scope>PEPPOL-EN16931-R004</scope>
+	</assert>
+	<test>
+		<assert>
+			<success>PEPPOL-EN16931-R004</success>
+		</assert>
+		<Invoice xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
+			xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
+			xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2">
+
+			<cbc:CustomizationID>urn:cen.eu:en16931:2017#compliant#urn:fdc:peppol.eu:2017:poacc:billing:3.0</cbc:CustomizationID>
+
+		</Invoice>
+	</test>
+	<test>
+		<assert>
+			<success>PEPPOL-EN16931-R004</success>
+		</assert>
+		<Invoice xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
+			xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
+			xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2">
+
+			<cbc:CustomizationID>urn:cen.eu:en16931:2017#compliant#urn:fdc:peppol.eu:2017:poacc:billing:3.0#compliant#urn:www.difi.no:ehf:ver3.0</cbc:CustomizationID>
+
+		</Invoice>
+	</test>
+	<test>
+		<assert>
+			<error>PEPPOL-EN16931-R004</error>
+		</assert>
+		<Invoice xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
+			xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
+			xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2">
+
+			<cbc:CustomizationID>urn:cen.eu:en16931:2017#compliant#compliant#urn:www.difi.no:ehf:ver3.0</cbc:CustomizationID>
+
+		</Invoice>
+	</test>
+</testSet>
diff --git a/rules/unit-UBL-PEPPOL-SB/PEPPOL-EN16931-R005.xml b/rules/unit-UBL-PEPPOL-SB/PEPPOL-EN16931-R005.xml
new file mode 100644
index 0000000..16bc31a
--- /dev/null
+++ b/rules/unit-UBL-PEPPOL-SB/PEPPOL-EN16931-R005.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<testSet xmlns="http://difi.no/xsd/vefa/validator/1.0" configuration="peppolbis-en16931-sbbase-3.0-ubl">
+	<assert>
+    	<description>Verify correct use of tax currency code.</description>
+		<scope>PEPPOL-EN16931-R005</scope>
+	</assert>
+	<test>
+		<assert>
+			<success>PEPPOL-EN16931-R005</success>
+		</assert>
+		<Invoice xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
+			xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
+			xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2">
+
+			<cbc:DocumentCurrencyCode>NOK</cbc:DocumentCurrencyCode>
+			<cbc:TaxCurrencyCode>SEK</cbc:TaxCurrencyCode>
+
+		</Invoice>
+	</test>
+	<test>
+		<assert>
+			<success>PEPPOL-EN16931-R005</success>
+		</assert>
+		<Invoice xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
+			xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
+			xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2">
+
+			<cbc:DocumentCurrencyCode>NOK</cbc:DocumentCurrencyCode>
+
+		</Invoice>
+	</test>
+	<test>
+		<assert>
+			<error>PEPPOL-EN16931-R005</error>
+		</assert>
+		<Invoice xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
+			xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
+			xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2">
+
+			<cbc:DocumentCurrencyCode>NOK</cbc:DocumentCurrencyCode>
+			<cbc:TaxCurrencyCode>NOK</cbc:TaxCurrencyCode>
+
+		</Invoice>
+	</test>
+	<test>
+		<assert>
+			<error>PEPPOL-EN16931-R005</error>
+		</assert>
+		<Invoice xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
+			xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
+			xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2">
+
+			<cbc:DocumentCurrencyCode>SEK</cbc:DocumentCurrencyCode>
+			<cbc:TaxCurrencyCode>SEK</cbc:TaxCurrencyCode>
+
+		</Invoice>
+	</test>
+</testSet>
diff --git a/rules/unit-UBL-PEPPOL-SB/PEPPOL-EN16931-R007.xml b/rules/unit-UBL-PEPPOL-SB/PEPPOL-EN16931-R007.xml
new file mode 100644
index 0000000..e050c02
--- /dev/null
+++ b/rules/unit-UBL-PEPPOL-SB/PEPPOL-EN16931-R007.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<testSet xmlns="http://difi.no/xsd/vefa/validator/1.0" configuration="peppolbis-en16931-sbbase-3.0-ubl">
+	<assert>
+    <description>Verify format of ProfileID.</description>
+		<scope>PEPPOL-EN16931-R007</scope>
+	</assert>
+	<test>
+		<assert>
+			<success>PEPPOL-EN16931-R007</success>
+		</assert>
+		<Invoice xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
+			xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
+			xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2">
+
+			<cbc:ProfileID>urn:fdc:peppol.eu:2017:poacc:billing:01:1.0</cbc:ProfileID>
+
+		</Invoice>
+	</test>
+	<test>
+		<assert>
+			<error>PEPPOL-EN16931-R007</error>
+		</assert>
+		<Invoice xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
+			xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
+			xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2">
+
+			<cbc:ProfileID>urn:fdc:peppol.eu:2017:NOT:CORRECT:AT:ALL:01:1.0</cbc:ProfileID>
+
+		</Invoice>
+	</test>
+</testSet>
diff --git a/rules/unit-UBL-PEPPOL-SB/PEPPOL-EN16931-R010.xml b/rules/unit-UBL-PEPPOL-SB/PEPPOL-EN16931-R010.xml
new file mode 100644
index 0000000..8075c67
--- /dev/null
+++ b/rules/unit-UBL-PEPPOL-SB/PEPPOL-EN16931-R010.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<testSet xmlns="http://difi.no/xsd/vefa/validator/1.0" configuration="peppolbis-en16931-sbbase-3.0-ubl">
+	<assert>
+    <description>Verify existence of EndpointID for customer.</description>
+		<scope>PEPPOL-EN16931-R010</scope>
+	</assert>
+	<test>
+		<assert>
+			<success>PEPPOL-EN16931-R010</success>
+		</assert>
+		<Invoice xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
+			xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
+			xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2">
+
+			<cac:AccountingCustomerParty>
+				<cac:Party>
+					<cbc:EndpointID/>
+				</cac:Party>
+			</cac:AccountingCustomerParty>
+
+		</Invoice>
+	</test>
+	<test>
+		<assert>
+			<error>PEPPOL-EN16931-R010</error>
+		</assert>
+		<Invoice xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
+			xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
+			xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2">
+
+			<cac:AccountingCustomerParty>
+				<cac:Party>
+					<!-- <cbc:EndpointID/> -->
+				</cac:Party>
+			</cac:AccountingCustomerParty>
+
+		</Invoice>
+	</test>
+</testSet>
diff --git a/rules/unit-UBL-PEPPOL-SB/PEPPOL-EN16931-R020.xml b/rules/unit-UBL-PEPPOL-SB/PEPPOL-EN16931-R020.xml
new file mode 100644
index 0000000..6435e6d
--- /dev/null
+++ b/rules/unit-UBL-PEPPOL-SB/PEPPOL-EN16931-R020.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<testSet xmlns="http://difi.no/xsd/vefa/validator/1.0" configuration="peppolbis-en16931-sbbase-3.0-ubl">
+	<assert>
+    <description>Verify existence of EndpointID for seller.</description>
+		<scope>PEPPOL-EN16931-R020</scope>
+	</assert>
+	<test>
+		<assert>
+			<success>PEPPOL-EN16931-R020</success>
+		</assert>
+		<Invoice xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
+			xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
+			xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2">
+
+			<cac:AccountingSupplierParty>
+				<cac:Party>
+					<cbc:EndpointID/>
+				</cac:Party>
+			</cac:AccountingSupplierParty>
+
+		</Invoice>
+	</test>
+	<test>
+		<assert>
+			<error>PEPPOL-EN16931-R020</error>
+		</assert>
+		<Invoice xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
+			xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
+			xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2">
+
+			<cac:AccountingSupplierParty>
+				<cac:Party>
+					<!-- <cbc:EndpointID/> -->
+				</cac:Party>
+			</cac:AccountingSupplierParty>
+
+		</Invoice>
+	</test>
+</testSet>
diff --git a/rules/unit-UBL-PEPPOL-SB/PEPPOL-EN16931-R040.xml b/rules/unit-UBL-PEPPOL-SB/PEPPOL-EN16931-R040.xml
new file mode 100644
index 0000000..017202f
--- /dev/null
+++ b/rules/unit-UBL-PEPPOL-SB/PEPPOL-EN16931-R040.xml
@@ -0,0 +1,176 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<testSet xmlns="http://difi.no/xsd/vefa/validator/1.0" configuration="peppolbis-en16931-sbbase-3.0-ubl">
+	<assert>
+    	<description>Verify calculation of allowance/charge.</description>
+		<scope>PEPPOL-EN16931-R040</scope>
+	</assert>
+	<test>
+		<assert>
+			<success>PEPPOL-EN16931-R040</success>
+		</assert>
+		<Invoice xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
+			xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
+			xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2">
+
+			<cac:AllowanceCharge>
+				<cbc:MultiplierFactorNumeric>200</cbc:MultiplierFactorNumeric>
+				<cbc:BaseAmount currencyID="NOK">50</cbc:BaseAmount>
+				<cbc:Amount currencyID="NOK">100</cbc:Amount>
+			</cac:AllowanceCharge>
+
+		</Invoice>
+	</test>
+	<test>
+		<assert>
+			<success>PEPPOL-EN16931-R040</success>
+		</assert>
+		<Invoice xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
+			xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
+			xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2">
+
+			<cac:AllowanceCharge>
+				<cbc:MultiplierFactorNumeric>200</cbc:MultiplierFactorNumeric>
+				<cbc:BaseAmount currencyID="NOK">50</cbc:BaseAmount>
+				<cbc:Amount currencyID="NOK">100.01</cbc:Amount>
+			</cac:AllowanceCharge>
+
+		</Invoice>
+	</test>
+	<test>
+		<assert>
+			<success>PEPPOL-EN16931-R040</success>
+		</assert>
+		<Invoice xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
+			xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
+			xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2">
+
+			<cac:AllowanceCharge>
+				<cbc:MultiplierFactorNumeric>200</cbc:MultiplierFactorNumeric>
+				<cbc:BaseAmount currencyID="NOK">50</cbc:BaseAmount>
+				<cbc:Amount currencyID="NOK">100.02</cbc:Amount>
+			</cac:AllowanceCharge>
+
+		</Invoice>
+	</test>
+	<test>
+		<assert>
+			<error>PEPPOL-EN16931-R040</error>
+		</assert>
+		<Invoice xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
+			xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
+			xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2">
+
+			<cac:AllowanceCharge>
+				<cbc:MultiplierFactorNumeric>200</cbc:MultiplierFactorNumeric>
+				<cbc:BaseAmount currencyID="NOK">50</cbc:BaseAmount>
+				<cbc:Amount currencyID="NOK">100.03</cbc:Amount>
+			</cac:AllowanceCharge>
+
+		</Invoice>
+	</test>
+	<test>
+		<assert>
+			<success>PEPPOL-EN16931-R040</success>
+		</assert>
+		<Invoice xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
+			xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
+			xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2">
+
+			<cac:AllowanceCharge>
+				<cbc:MultiplierFactorNumeric>200</cbc:MultiplierFactorNumeric>
+				<cbc:BaseAmount currencyID="NOK">50</cbc:BaseAmount>
+				<cbc:Amount currencyID="NOK">99.99</cbc:Amount>
+			</cac:AllowanceCharge>
+
+		</Invoice>
+	</test>
+	<test>
+		<assert>
+			<success>PEPPOL-EN16931-R040</success>
+		</assert>
+		<Invoice xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
+			xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
+			xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2">
+
+			<cac:AllowanceCharge>
+				<cbc:MultiplierFactorNumeric>200</cbc:MultiplierFactorNumeric>
+				<cbc:BaseAmount currencyID="NOK">50</cbc:BaseAmount>
+				<cbc:Amount currencyID="NOK">99.98</cbc:Amount>
+			</cac:AllowanceCharge>
+
+		</Invoice>
+	</test>
+	<test>
+		<assert>
+			<error>PEPPOL-EN16931-R040</error>
+		</assert>
+		<Invoice xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
+			xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
+			xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2">
+
+			<cac:AllowanceCharge>
+				<cbc:MultiplierFactorNumeric>200</cbc:MultiplierFactorNumeric>
+				<cbc:BaseAmount currencyID="NOK">50</cbc:BaseAmount>
+				<cbc:Amount currencyID="NOK">99.97</cbc:Amount>
+			</cac:AllowanceCharge>
+
+		</Invoice>
+	</test>
+	<test>
+		<assert>
+			<success>PEPPOL-EN16931-R040</success>
+		</assert>
+		<Invoice xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
+			xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
+			xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2">
+
+			<cac:InvoiceLine>
+				<cac:AllowanceCharge>
+					<cbc:MultiplierFactorNumeric>200</cbc:MultiplierFactorNumeric>
+					<cbc:BaseAmount currencyID="NOK">50</cbc:BaseAmount>
+					<cbc:Amount currencyID="NOK">99.98</cbc:Amount>
+				</cac:AllowanceCharge>
+			</cac:InvoiceLine>
+
+		</Invoice>
+	</test>
+	<test>
+		<assert>
+			<error>PEPPOL-EN16931-R040</error>
+		</assert>
+		<Invoice xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
+			xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
+			xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2">
+
+			<cac:InvoiceLine>
+				<cac:AllowanceCharge>
+					<cbc:MultiplierFactorNumeric>200</cbc:MultiplierFactorNumeric>
+					<cbc:BaseAmount currencyID="NOK">50</cbc:BaseAmount>
+					<cbc:Amount currencyID="NOK">99.97</cbc:Amount>
+				</cac:AllowanceCharge>
+			</cac:InvoiceLine>
+
+		</Invoice>
+	</test>
+	<test>
+		<assert>
+			<description>Make sure rule is not triggered on Price-level.</description>
+			<success>PEPPOL-EN16931-R040</success>
+		</assert>
+		<Invoice xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
+			xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
+			xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2">
+
+			<cac:InvoiceLine>
+				<cac:Price>
+					<cac:AllowanceCharge>
+						<cbc:MultiplierFactorNumeric>200</cbc:MultiplierFactorNumeric>
+						<cbc:BaseAmount currencyID="NOK">50</cbc:BaseAmount>
+						<cbc:Amount currencyID="NOK">99.97</cbc:Amount>
+					</cac:AllowanceCharge>
+				</cac:Price>
+			</cac:InvoiceLine>
+
+		</Invoice>
+	</test>
+</testSet>
diff --git a/rules/unit-UBL-PEPPOL-SB/PEPPOL-EN16931-R041.xml b/rules/unit-UBL-PEPPOL-SB/PEPPOL-EN16931-R041.xml
new file mode 100644
index 0000000..e49b135
--- /dev/null
+++ b/rules/unit-UBL-PEPPOL-SB/PEPPOL-EN16931-R041.xml
@@ -0,0 +1,150 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<testSet xmlns="http://difi.no/xsd/vefa/validator/1.0" configuration="peppolbis-en16931-sbbase-3.0-ubl">
+	<assert>
+    	<description>Verify existence of base amount.</description>
+		<scope>PEPPOL-EN16931-R041</scope>
+	</assert>
+	<test>
+		<assert>
+			<success>PEPPOL-EN16931-R041</success>
+		</assert>
+		<Invoice xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
+			xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
+			xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2">
+
+			<cac:AllowanceCharge>
+				<cbc:MultiplierFactorNumeric>100</cbc:MultiplierFactorNumeric>
+				<cbc:BaseAmount currencyID="NOK">100</cbc:BaseAmount>
+			</cac:AllowanceCharge>
+
+		</Invoice>
+	</test>
+	<test>
+		<assert>
+			<error>PEPPOL-EN16931-R041</error>
+		</assert>
+		<Invoice xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
+			xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
+			xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2">
+
+			<cac:AllowanceCharge>
+				<cbc:MultiplierFactorNumeric>100</cbc:MultiplierFactorNumeric>
+			</cac:AllowanceCharge>
+
+		</Invoice>
+	</test>
+	<test>
+		<assert>
+			<success>PEPPOL-EN16931-R041</success>
+		</assert>
+		<Invoice xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
+			xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
+			xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2">
+
+			<cac:InvoiceLine>
+				<cac:AllowanceCharge>
+					<cbc:MultiplierFactorNumeric>100</cbc:MultiplierFactorNumeric>
+					<cbc:BaseAmount currencyID="NOK">100</cbc:BaseAmount>
+				</cac:AllowanceCharge>
+			</cac:InvoiceLine>
+
+		</Invoice>
+	</test>
+	<test>
+		<assert>
+			<error>PEPPOL-EN16931-R041</error>
+		</assert>
+		<Invoice xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
+			xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
+			xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2">
+
+			<cac:InvoiceLine>
+				<cac:AllowanceCharge>
+					<cbc:MultiplierFactorNumeric>100</cbc:MultiplierFactorNumeric>
+				</cac:AllowanceCharge>
+			</cac:InvoiceLine>
+
+		</Invoice>
+	</test>
+	<test>
+		<assert>
+			<success>PEPPOL-EN16931-R041</success>
+		</assert>
+		<CreditNote xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
+			xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
+			xmlns="urn:oasis:names:specification:ubl:schema:xsd:CreditNote-2">
+
+			<cac:AllowanceCharge>
+				<cbc:MultiplierFactorNumeric>100</cbc:MultiplierFactorNumeric>
+				<cbc:BaseAmount currencyID="NOK">100</cbc:BaseAmount>
+			</cac:AllowanceCharge>
+
+		</CreditNote>
+	</test>
+	<test>
+		<assert>
+			<error>PEPPOL-EN16931-R041</error>
+		</assert>
+		<CreditNote xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
+					xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
+					xmlns="urn:oasis:names:specification:ubl:schema:xsd:CreditNote-2">
+
+			<cac:AllowanceCharge>
+				<cbc:MultiplierFactorNumeric>100</cbc:MultiplierFactorNumeric>
+			</cac:AllowanceCharge>
+
+        </CreditNote>
+	</test>
+	<test>
+		<assert>
+			<success>PEPPOL-EN16931-R041</success>
+		</assert>
+		<CreditNote xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
+					xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
+					xmlns="urn:oasis:names:specification:ubl:schema:xsd:CreditNote-2">
+
+			<cac:CreditNoteLine>
+				<cac:AllowanceCharge>
+					<cbc:MultiplierFactorNumeric>100</cbc:MultiplierFactorNumeric>
+					<cbc:BaseAmount currencyID="NOK">100</cbc:BaseAmount>
+				</cac:AllowanceCharge>
+			</cac:CreditNoteLine>
+
+        </CreditNote>
+	</test>
+	<test>
+		<assert>
+			<error>PEPPOL-EN16931-R041</error>
+		</assert>
+		<CreditNote xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
+					xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
+					xmlns="urn:oasis:names:specification:ubl:schema:xsd:CreditNote-2">
+
+			<cac:CreditNoteLine>
+				<cac:AllowanceCharge>
+					<cbc:MultiplierFactorNumeric>100</cbc:MultiplierFactorNumeric>
+				</cac:AllowanceCharge>
+			</cac:CreditNoteLine>
+
+        </CreditNote>
+	</test>
+	<test>
+		<assert>
+            <description>Make sure rule is not triggered on Price-level.</description>
+			<success>PEPPOL-EN16931-R041</success>
+		</assert>
+		<Invoice xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
+					xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
+					xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2">
+
+			<cac:InvoiceLine>
+                <cac:Price>
+                    <cac:AllowanceCharge>
+                        <cbc:MultiplierFactorNumeric>100</cbc:MultiplierFactorNumeric>
+                    </cac:AllowanceCharge>
+                </cac:Price>
+			</cac:InvoiceLine>
+
+		</Invoice>
+	</test>
+</testSet>
diff --git a/rules/unit-UBL-PEPPOL-SB/PEPPOL-EN16931-R042.xml b/rules/unit-UBL-PEPPOL-SB/PEPPOL-EN16931-R042.xml
new file mode 100644
index 0000000..81a7ebc
--- /dev/null
+++ b/rules/unit-UBL-PEPPOL-SB/PEPPOL-EN16931-R042.xml
@@ -0,0 +1,150 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<testSet xmlns="http://difi.no/xsd/vefa/validator/1.0" configuration="peppolbis-en16931-sbbase-3.0-ubl">
+	<assert>
+	    <description>Verify existence of multiplier.</description>
+		<scope>PEPPOL-EN16931-R042</scope>
+	</assert>
+	<test>
+		<assert>
+			<success>PEPPOL-EN16931-R042</success>
+		</assert>
+		<Invoice xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
+			xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
+			xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2">
+
+			<cac:AllowanceCharge>
+				<cbc:MultiplierFactorNumeric>100</cbc:MultiplierFactorNumeric>
+				<cbc:BaseAmount currencyID="NOK">100</cbc:BaseAmount>
+			</cac:AllowanceCharge>
+
+		</Invoice>
+	</test>
+	<test>
+		<assert>
+			<error>PEPPOL-EN16931-R042</error>
+		</assert>
+		<Invoice xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
+			xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
+			xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2">
+
+			<cac:AllowanceCharge>
+				<cbc:BaseAmount currencyID="NOK">100</cbc:BaseAmount>
+			</cac:AllowanceCharge>
+
+		</Invoice>
+	</test>
+	<test>
+		<assert>
+			<success>PEPPOL-EN16931-R042</success>
+		</assert>
+		<Invoice xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
+			xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
+			xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2">
+
+			<cac:InvoiceLine>
+				<cac:AllowanceCharge>
+					<cbc:MultiplierFactorNumeric>100</cbc:MultiplierFactorNumeric>
+					<cbc:BaseAmount currencyID="NOK">100</cbc:BaseAmount>
+				</cac:AllowanceCharge>
+			</cac:InvoiceLine>
+
+		</Invoice>
+	</test>
+	<test>
+		<assert>
+			<error>PEPPOL-EN16931-R042</error>
+		</assert>
+		<Invoice xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
+			xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
+			xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2">
+
+			<cac:InvoiceLine>
+				<cac:AllowanceCharge>
+					<cbc:BaseAmount currencyID="NOK">100</cbc:BaseAmount>
+				</cac:AllowanceCharge>
+			</cac:InvoiceLine>
+
+		</Invoice>
+	</test>
+	<test>
+		<assert>
+			<success>PEPPOL-EN16931-R042</success>
+		</assert>
+		<CreditNote xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
+			xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
+			xmlns="urn:oasis:names:specification:ubl:schema:xsd:CreditNote-2">
+
+			<cac:AllowanceCharge>
+				<cbc:MultiplierFactorNumeric>100</cbc:MultiplierFactorNumeric>
+				<cbc:BaseAmount currencyID="NOK">100</cbc:BaseAmount>
+			</cac:AllowanceCharge>
+
+		</CreditNote>
+	</test>
+	<test>
+		<assert>
+			<error>PEPPOL-EN16931-R042</error>
+		</assert>
+		<CreditNote xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
+			xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
+			xmlns="urn:oasis:names:specification:ubl:schema:xsd:CreditNote-2">
+
+			<cac:AllowanceCharge>
+				<cbc:BaseAmount currencyID="NOK">100</cbc:BaseAmount>
+			</cac:AllowanceCharge>
+
+		</CreditNote>
+	</test>
+	<test>
+		<assert>
+			<success>PEPPOL-EN16931-R042</success>
+		</assert>
+		<CreditNote xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
+			xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
+			xmlns="urn:oasis:names:specification:ubl:schema:xsd:CreditNote-2">
+
+			<cac:CreditNoteLine>
+				<cac:AllowanceCharge>
+					<cbc:MultiplierFactorNumeric>100</cbc:MultiplierFactorNumeric>
+					<cbc:BaseAmount currencyID="NOK">100</cbc:BaseAmount>
+				</cac:AllowanceCharge>
+			</cac:CreditNoteLine>
+
+		</CreditNote>
+	</test>
+	<test>
+		<assert>
+			<error>PEPPOL-EN16931-R042</error>
+		</assert>
+		<CreditNote xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
+			xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
+			xmlns="urn:oasis:names:specification:ubl:schema:xsd:CreditNote-2">
+
+			<cac:CreditNoteLine>
+				<cac:AllowanceCharge>
+					<cbc:BaseAmount currencyID="NOK">100</cbc:BaseAmount>
+				</cac:AllowanceCharge>
+			</cac:CreditNoteLine>
+
+		</CreditNote>
+	</test>
+	<test>
+		<assert>
+			<description>Make sure rule is not triggered on Price-level.</description>
+			<success>PEPPOL-EN16931-R042</success>
+		</assert>
+		<Invoice xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
+			xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
+			xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2">
+
+				<cac:InvoiceLine>
+					<cac:Price>
+						<cac:AllowanceCharge>
+							<cbc:BaseAmount currencyID="NOK">100</cbc:BaseAmount>
+						</cac:AllowanceCharge>
+					</cac:Price>
+				</cac:InvoiceLine>
+
+		</Invoice>
+	</test>
+</testSet>
diff --git a/rules/unit-UBL-PEPPOL-SB/PEPPOL-EN16931-R043.xml b/rules/unit-UBL-PEPPOL-SB/PEPPOL-EN16931-R043.xml
new file mode 100644
index 0000000..581c41d
--- /dev/null
+++ b/rules/unit-UBL-PEPPOL-SB/PEPPOL-EN16931-R043.xml
@@ -0,0 +1,128 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<testSet xmlns="http://difi.no/xsd/vefa/validator/1.0" configuration="peppolbis-en16931-sbbase-3.0-ubl">
+	<assert>
+	    <description>Verify format of indicator</description>
+		<scope>PEPPOL-EN16931-R043</scope>
+	</assert>
+	<test>
+		<assert>
+			<success>PEPPOL-EN16931-R043</success>
+		</assert>
+		<Invoice xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
+			xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
+			xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2">
+
+			<cac:AllowanceCharge>
+					<cbc:ChargeIndicator>false</cbc:ChargeIndicator>
+			</cac:AllowanceCharge>
+
+		</Invoice>
+	</test>
+	<test>
+		<assert>
+			<error>PEPPOL-EN16931-R043</error>
+		</assert>
+		<Invoice xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
+			xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
+			xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2">
+
+			<cac:AllowanceCharge>
+				<cbc:ChargeIndicator>0</cbc:ChargeIndicator>
+			</cac:AllowanceCharge>
+
+		</Invoice>
+	</test>
+	<test>
+		<assert>
+			<success>PEPPOL-EN16931-R043</success>
+		</assert>
+		<Invoice xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
+			xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
+			xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2">
+
+			<cac:InvoiceLine>
+				<cac:AllowanceCharge>
+					<cbc:ChargeIndicator>false</cbc:ChargeIndicator>
+				</cac:AllowanceCharge>
+			</cac:InvoiceLine>
+
+		</Invoice>
+	</test>
+	<test>
+		<assert>
+			<error>PEPPOL-EN16931-R043</error>
+		</assert>
+		<Invoice xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
+			xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
+			xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2">
+
+			<cac:InvoiceLine>
+				<cac:AllowanceCharge>
+					<cbc:ChargeIndicator>0</cbc:ChargeIndicator>
+				</cac:AllowanceCharge>
+			</cac:InvoiceLine>
+
+		</Invoice>
+	</test>
+	<test>
+		<assert>
+			<success>PEPPOL-EN16931-R043</success>
+		</assert>
+		<CreditNote xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
+			xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
+			xmlns="urn:oasis:names:specification:ubl:schema:xsd:CreditNote-2">
+
+			<cac:AllowanceCharge>
+					<cbc:ChargeIndicator>false</cbc:ChargeIndicator>
+			</cac:AllowanceCharge>
+
+		</CreditNote>
+	</test>
+	<test>
+		<assert>
+			<error>PEPPOL-EN16931-R043</error>
+		</assert>
+		<CreditNote xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
+			xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
+			xmlns="urn:oasis:names:specification:ubl:schema:xsd:CreditNote-2">
+
+			<cac:AllowanceCharge>
+					<cbc:ChargeIndicator>0</cbc:ChargeIndicator>
+			</cac:AllowanceCharge>
+
+		</CreditNote>
+	</test>
+	<test>
+		<assert>
+			<success>PEPPOL-EN16931-R043</success>
+		</assert>
+		<CreditNote xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
+			xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
+			xmlns="urn:oasis:names:specification:ubl:schema:xsd:CreditNote-2">
+
+			<cac:CreditNoteLine>
+				<cac:AllowanceCharge>
+					<cbc:ChargeIndicator>false</cbc:ChargeIndicator>
+				</cac:AllowanceCharge>
+			</cac:CreditNoteLine>
+
+		</CreditNote>
+	</test>
+	<test>
+		<assert>
+			<error>PEPPOL-EN16931-R043</error>
+		</assert>
+		<CreditNote xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
+			xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
+			xmlns="urn:oasis:names:specification:ubl:schema:xsd:CreditNote-2">
+
+			<cac:CreditNoteLine>
+				<cac:AllowanceCharge>
+					<cbc:ChargeIndicator>0</cbc:ChargeIndicator>
+				</cac:AllowanceCharge>
+			</cac:CreditNoteLine>
+
+		</CreditNote>
+	</test>
+
+</testSet>
diff --git a/rules/unit-UBL-PEPPOL-SB/PEPPOL-EN16931-R044.xml b/rules/unit-UBL-PEPPOL-SB/PEPPOL-EN16931-R044.xml
new file mode 100644
index 0000000..aefc915
--- /dev/null
+++ b/rules/unit-UBL-PEPPOL-SB/PEPPOL-EN16931-R044.xml
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<testSet xmlns="http://difi.no/xsd/vefa/validator/1.0" configuration="peppolbis-en16931-sbbase-3.0-ubl">
+	<assert>
+    	<description>Verify allowance/charge is allowance on price level.</description>
+		<scope>PEPPOL-EN16931-R044</scope>
+	</assert>
+	<test>
+		<assert>
+			<success>PEPPOL-EN16931-R044</success>
+		</assert>
+		<Invoice xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
+			xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
+			xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2">
+
+			<cac:InvoiceLine>
+				<cac:Price>
+					<cac:AllowanceCharge>
+						<cbc:ChargeIndicator>false</cbc:ChargeIndicator>
+					</cac:AllowanceCharge>
+				</cac:Price>
+			</cac:InvoiceLine>
+
+		</Invoice>
+	</test>
+	<test>
+		<assert>
+			<error>PEPPOL-EN16931-R044</error>
+		</assert>
+		<Invoice xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
+			xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
+			xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2">
+
+			<cac:InvoiceLine>
+				<cac:Price>
+					<cac:AllowanceCharge>
+						<cbc:ChargeIndicator>true</cbc:ChargeIndicator>
+					</cac:AllowanceCharge>
+				</cac:Price>
+			</cac:InvoiceLine>
+
+		</Invoice>
+	</test>
+	<test>
+		<assert>
+			<error>PEPPOL-EN16931-R044</error>
+		</assert>
+		<Invoice xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
+			xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
+			xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2">
+
+			<cac:InvoiceLine>
+				<cac:Price>
+					<cac:AllowanceCharge>
+						<cbc:ChargeIndicator>0</cbc:ChargeIndicator>
+					</cac:AllowanceCharge>
+				</cac:Price>
+			</cac:InvoiceLine>
+
+		</Invoice>
+	</test>
+	<test>
+		<assert>
+			<success>PEPPOL-EN16931-R044</success>
+		</assert>
+		<Invoice xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
+			xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
+			xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2">
+
+			<cac:InvoiceLine>
+				<cac:AllowanceCharge>
+					<cbc:ChargeIndicator>true</cbc:ChargeIndicator>
+				</cac:AllowanceCharge>
+			</cac:InvoiceLine>
+
+		</Invoice>
+	</test>
+	<test>
+		<assert>
+			<success>PEPPOL-EN16931-R044</success>
+		</assert>
+		<Invoice xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
+			xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
+			xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2">
+
+			<cac:AllowanceCharge>
+				<cbc:ChargeIndicator>true</cbc:ChargeIndicator>
+			</cac:AllowanceCharge>
+
+		</Invoice>
+	</test>
+</testSet>
diff --git a/rules/unit-UBL-PEPPOL-SB/PEPPOL-EN16931-R046.xml b/rules/unit-UBL-PEPPOL-SB/PEPPOL-EN16931-R046.xml
new file mode 100644
index 0000000..93315d6
--- /dev/null
+++ b/rules/unit-UBL-PEPPOL-SB/PEPPOL-EN16931-R046.xml
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<testSet xmlns="http://difi.no/xsd/vefa/validator/1.0" configuration="peppolbis-en16931-sbbase-3.0-ubl">
+	<assert>
+    	<description>Verify calculation of item net price.</description>
+		<scope>PEPPOL-EN16931-R046</scope>
+	</assert>
+	<test>
+		<assert>
+			<success>PEPPOL-EN16931-R046</success>
+		</assert>
+		<Invoice xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
+			xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
+			xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2">
+
+			<cac:InvoiceLine>
+				<cac:Price>
+					<cbc:PriceAmount currencyID="NOK">90</cbc:PriceAmount>
+					<cac:AllowanceCharge>
+						<cbc:Amount currencyID="NOK">10</cbc:Amount>
+						<cbc:BaseAmount currencyID="NOK">100</cbc:BaseAmount>
+					</cac:AllowanceCharge>
+				</cac:Price>
+			</cac:InvoiceLine>
+
+		</Invoice>
+	</test>
+	<test>
+		<assert>
+			<success>PEPPOL-EN16931-R046</success>
+		</assert>
+		<Invoice xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
+			xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
+			xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2">
+
+			<cac:InvoiceLine>
+				<cac:Price>
+					<cbc:PriceAmount currencyID="NOK">90</cbc:PriceAmount>
+					<cac:AllowanceCharge>
+						<cbc:Amount currencyID="NOK">10</cbc:Amount>
+						<!-- <cbc:BaseAmount currencyID="NOK">100</cbc:BaseAmount> -->
+					</cac:AllowanceCharge>
+				</cac:Price>
+			</cac:InvoiceLine>
+
+		</Invoice>
+	</test>
+	<test>
+		<assert>
+			<success>PEPPOL-EN16931-R046</success>
+		</assert>
+		<Invoice xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
+			xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
+			xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2">
+
+			<cac:InvoiceLine>
+				<cac:Price>
+					<cbc:PriceAmount currencyID="NOK">90</cbc:PriceAmount>
+					<!-- <cac:AllowanceCharge>
+						<cbc:Amount currencyID="NOK">10</cbc:Amount>
+						<cbc:BaseAmount currencyID="NOK">100</cbc:BaseAmount>
+					</cac:AllowanceCharge> -->
+				</cac:Price>
+			</cac:InvoiceLine>
+
+		</Invoice>
+	</test>
+	<test>
+		<assert>
+			<error>PEPPOL-EN16931-R046</error>
+		</assert>
+		<Invoice xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
+			xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
+			xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2">
+
+			<cac:InvoiceLine>
+				<cac:Price>
+					<cbc:PriceAmount currencyID="NOK">90.01</cbc:PriceAmount>
+					<cac:AllowanceCharge>
+						<cbc:Amount currencyID="NOK">10</cbc:Amount>
+						<cbc:BaseAmount currencyID="NOK">100</cbc:BaseAmount>
+					</cac:AllowanceCharge>
+				</cac:Price>
+			</cac:InvoiceLine>
+
+		</Invoice>
+	</test>
+</testSet>
diff --git a/rules/unit-UBL-PEPPOL-SB/PEPPOL-EN16931-R051.xml b/rules/unit-UBL-PEPPOL-SB/PEPPOL-EN16931-R051.xml
new file mode 100644
index 0000000..6e91889
--- /dev/null
+++ b/rules/unit-UBL-PEPPOL-SB/PEPPOL-EN16931-R051.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<testSet xmlns="http://difi.no/xsd/vefa/validator/1.0" configuration="peppolbis-en16931-sbbase-3.0-ubl">
+	<assert>
+    	<description>Verify currency is provided.</description>
+		<scope>PEPPOL-EN16931-R051</scope>
+	</assert>
+	<test>
+		<assert>
+			<success number="4">PEPPOL-EN16931-R051</success>
+		</assert>
+		<Invoice xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
+			xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
+			xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2">
+
+			<cbc:DocumentCurrencyCode>EUR</cbc:DocumentCurrencyCode>
+
+			<cac:TaxTotal>
+				<cbc:TaxAmount currencyID="EUR">10</cbc:TaxAmount>
+				<cac:TaxSubtotal/>
+			</cac:TaxTotal>
+
+			<cac:LegalMonetaryTotal>
+				<cbc:PayableAmount currencyID="EUR">100</cbc:PayableAmount>
+			</cac:LegalMonetaryTotal>
+
+			<cac:InvoiceLine>
+				<cbc:LineExtensionAmount currencyID="EUR">100</cbc:LineExtensionAmount>
+				<cac:Price>
+					<cbc:PriceAmount currencyID="EUR">100</cbc:PriceAmount>
+				</cac:Price>
+			</cac:InvoiceLine>
+
+		</Invoice>
+	</test>
+	<test>
+		<assert>
+			<error number="4">PEPPOL-EN16931-R051</error>
+		</assert>
+		<Invoice xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
+			xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
+			xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2">
+
+			<cbc:DocumentCurrencyCode>EUR</cbc:DocumentCurrencyCode>
+
+			<cac:TaxTotal>
+				<cbc:TaxAmount currencyID="NOK">10</cbc:TaxAmount>
+				<cac:TaxSubtotal/>
+			</cac:TaxTotal>
+
+			<cac:LegalMonetaryTotal>
+				<cbc:PayableAmount currencyID="NOK">100</cbc:PayableAmount>
+			</cac:LegalMonetaryTotal>
+
+			<cac:InvoiceLine>
+				<cbc:LineExtensionAmount currencyID="NOK">100</cbc:LineExtensionAmount>
+				<cac:Price>
+					<cbc:PriceAmount currencyID="NOK">100</cbc:PriceAmount>
+				</cac:Price>
+			</cac:InvoiceLine>
+
+		</Invoice>
+	</test>
+</testSet>
diff --git a/rules/unit-UBL-PEPPOL-SB/PEPPOL-EN16931-R053.xml b/rules/unit-UBL-PEPPOL-SB/PEPPOL-EN16931-R053.xml
new file mode 100644
index 0000000..ea244d0
--- /dev/null
+++ b/rules/unit-UBL-PEPPOL-SB/PEPPOL-EN16931-R053.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<testSet xmlns="http://difi.no/xsd/vefa/validator/1.0" configuration="peppolbis-en16931-sbbase-3.0-ubl">
+	<assert>
+    	<description>Verify amount of tax totals.</description>
+		<scope>PEPPOL-EN16931-R053</scope>
+	</assert>
+	<test>
+		<assert>
+			<success>PEPPOL-EN16931-R053</success>
+		</assert>
+		<Invoice xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
+			xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
+			xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2">
+
+			<cac:TaxTotal>
+				<cbc:TaxAmount currencyID="EUR">10</cbc:TaxAmount>
+				<cac:TaxSubtotal/>
+			</cac:TaxTotal>
+
+		</Invoice>
+	</test>
+	<test>
+		<assert>
+			<error>PEPPOL-EN16931-R053</error>
+		</assert>
+		<Invoice xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
+			xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
+			xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2">
+
+			<!-- <cac:TaxTotal>
+				<cbc:TaxAmount currencyID="EUR">10</cbc:TaxAmount>
+				<cac:TaxSubtotal/>
+			</cac:TaxTotal> -->
+
+		</Invoice>
+	</test>
+	<test>
+		<assert>
+			<error>PEPPOL-EN16931-R053</error>
+		</assert>
+		<Invoice xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
+			xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
+			xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2">
+
+			<cac:TaxTotal>
+				<cbc:TaxAmount currencyID="EUR">10</cbc:TaxAmount>
+				<cac:TaxSubtotal/>
+			</cac:TaxTotal>
+			<cac:TaxTotal>
+				<cbc:TaxAmount currencyID="EUR">10</cbc:TaxAmount>
+				<cac:TaxSubtotal/>
+			</cac:TaxTotal>
+
+		</Invoice>
+	</test>
+</testSet>
diff --git a/rules/unit-UBL-PEPPOL-SB/PEPPOL-EN16931-R054.xml b/rules/unit-UBL-PEPPOL-SB/PEPPOL-EN16931-R054.xml
new file mode 100644
index 0000000..c8cc6c7
--- /dev/null
+++ b/rules/unit-UBL-PEPPOL-SB/PEPPOL-EN16931-R054.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<testSet xmlns="http://difi.no/xsd/vefa/validator/1.0" configuration="peppolbis-en16931-sbbase-3.0-ubl">
+	<assert>
+    <description>Verify amount of tax totals.</description>
+		<scope>PEPPOL-EN16931-R054</scope>
+	</assert>
+	<test>
+		<assert>
+			<success>PEPPOL-EN16931-R054</success>
+		</assert>
+		<Invoice xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
+			xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
+			xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2">
+
+			<cbc:TaxCurrencyCode/>
+
+			<cac:TaxTotal>
+				<cbc:TaxAmount currencyID="EUR">10</cbc:TaxAmount>
+			</cac:TaxTotal>
+
+		</Invoice>
+	</test>
+	<test>
+		<assert>
+			<error>PEPPOL-EN16931-R054</error>
+		</assert>
+		<Invoice xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
+			xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
+			xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2">
+
+			<!-- <cbc:TaxCurrencyCode/> -->
+
+			<cac:TaxTotal>
+				<cbc:TaxAmount currencyID="EUR">10</cbc:TaxAmount>
+			</cac:TaxTotal>
+
+		</Invoice>
+	</test>
+	<test>
+		<assert>
+			<error>PEPPOL-EN16931-R054</error>
+		</assert>
+		<Invoice xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
+			xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
+			xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2">
+
+			<cbc:TaxCurrencyCode/>
+
+			<!-- <cac:TaxTotal>
+				<cbc:TaxAmount currencyID="EUR">10</cbc:TaxAmount>
+			</cac:TaxTotal> -->
+
+		</Invoice>
+	</test>
+	<test>
+		<assert>
+			<error>PEPPOL-EN16931-R054</error>
+		</assert>
+		<Invoice xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
+			xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
+			xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2">
+
+			<cbc:TaxCurrencyCode/>
+
+			<cac:TaxTotal>
+				<cbc:TaxAmount currencyID="EUR">10</cbc:TaxAmount>
+			</cac:TaxTotal>
+			<cac:TaxTotal>
+				<cbc:TaxAmount currencyID="EUR">10</cbc:TaxAmount>
+			</cac:TaxTotal>
+
+		</Invoice>
+	</test>
+</testSet>
diff --git a/rules/unit-UBL-PEPPOL-SB/PEPPOL-EN16931-R055.xml b/rules/unit-UBL-PEPPOL-SB/PEPPOL-EN16931-R055.xml
new file mode 100644
index 0000000..52dcf96
--- /dev/null
+++ b/rules/unit-UBL-PEPPOL-SB/PEPPOL-EN16931-R055.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<testSet xmlns="http://difi.no/xsd/vefa/validator/1.0" configuration="peppolbis-en16931-sbbase-3.0-ubl">
+	<assert>
+    	<description>Verify operational sign of TaxTotals in different currency</description>
+		<scope>PEPPOL-EN16931-R055</scope>
+	</assert>
+	<test>
+		<assert>
+			<success>PEPPOL-EN16931-R055</success>
+		</assert>
+		<Invoice xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
+			xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
+			xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2">
+
+			<cbc:DocumentCurrencyCode>EUR</cbc:DocumentCurrencyCode>
+			<cbc:TaxCurrencyCode>SEK</cbc:TaxCurrencyCode>
+
+			<cac:TaxTotal>
+				<cbc:TaxAmount currencyID="EUR">10</cbc:TaxAmount>
+			</cac:TaxTotal>
+			<cac:TaxTotal>
+				<cbc:TaxAmount currencyID="SEK">100</cbc:TaxAmount>
+			</cac:TaxTotal>
+
+		</Invoice>
+	</test>
+	<test>
+		<assert>
+			<error>PEPPOL-EN16931-R055</error>
+		</assert>
+		<Invoice xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
+			xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
+			xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2">
+
+			<cbc:DocumentCurrencyCode>EUR</cbc:DocumentCurrencyCode>
+			<cbc:TaxCurrencyCode>SEK</cbc:TaxCurrencyCode>
+
+			<cac:TaxTotal>
+				<cbc:TaxAmount currencyID="EUR">10</cbc:TaxAmount>
+			</cac:TaxTotal>
+			<cac:TaxTotal>
+				<cbc:TaxAmount currencyID="SEK">-100</cbc:TaxAmount>
+			</cac:TaxTotal>
+		</Invoice>
+	</test>
+	
+
+</testSet>
diff --git a/rules/unit-UBL-PEPPOL-SB/PEPPOL-EN16931-R061.xml b/rules/unit-UBL-PEPPOL-SB/PEPPOL-EN16931-R061.xml
new file mode 100644
index 0000000..57b5bf0
--- /dev/null
+++ b/rules/unit-UBL-PEPPOL-SB/PEPPOL-EN16931-R061.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<testSet xmlns="http://difi.no/xsd/vefa/validator/1.0" configuration="peppolbis-en16931-sbbase-3.0-ubl">
+	<assert>
+    	<description>Verify existence of required element.</description>
+		<scope>PEPPOL-EN16931-R061</scope>
+	</assert>
+	<test>
+		<assert>
+			<success>PEPPOL-EN16931-R061</success>
+		</assert>
+		<Invoice xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
+			xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
+			xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2">
+
+			<cac:PaymentMeans>
+				<cbc:PaymentMeansCode>49</cbc:PaymentMeansCode>
+				<cac:PaymentMandate>
+					<cbc:ID/>
+				</cac:PaymentMandate>
+			</cac:PaymentMeans>
+
+		</Invoice>
+	</test>
+	<test>
+		<assert>
+			<error>PEPPOL-EN16931-R061</error>
+		</assert>
+		<Invoice xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
+			xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
+			xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2">
+
+			<cac:PaymentMeans>
+				<cbc:PaymentMeansCode>49</cbc:PaymentMeansCode>
+				<!-- <cac:PaymentMandate>
+					<cbc:ID/>
+				</cac:PaymentMandate> -->
+			</cac:PaymentMeans>
+
+		</Invoice>
+	</test>
+</testSet>
diff --git a/rules/unit-UBL-PEPPOL-SB/PEPPOL-EN16931-R080.xml b/rules/unit-UBL-PEPPOL-SB/PEPPOL-EN16931-R080.xml
new file mode 100644
index 0000000..13f56e1
--- /dev/null
+++ b/rules/unit-UBL-PEPPOL-SB/PEPPOL-EN16931-R080.xml
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<testSet xmlns="http://difi.no/xsd/vefa/validator/1.0" configuration="peppolbis-en16931-sbbase-3.0-ubl">
+	<assert>
+    	<description>Verify existence of not more than a single project reference identifier on document level</description>
+		<scope>PEPPOL-EN16931-R080</scope>
+	</assert>
+	<test>
+		<assert>
+			<success>PEPPOL-EN16931-R080</success>
+		</assert>
+		<CreditNote xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
+			xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
+			xmlns="urn:oasis:names:specification:ubl:schema:xsd:CreditNote-2">
+
+			<cac:AdditionalDocumentReference>
+				<cbc:DocumentTypeCode>50</cbc:DocumentTypeCode>
+			</cac:AdditionalDocumentReference>
+			
+			<cac:AdditionalDocumentReference>
+				<cbc:ID>ts12345</cbc:ID>
+				<cbc:DocumentDescription>Technical specification</cbc:DocumentDescription>
+				<cac:Attachment>
+					<cac:ExternalReference>
+						<cbc:URI>http://www.techspec.no</cbc:URI>
+					</cac:ExternalReference>
+				</cac:Attachment>
+			</cac:AdditionalDocumentReference>
+
+		</CreditNote>
+	</test>
+	<test>
+		<assert>
+			<success>PEPPOL-EN16931-R080</success>
+		</assert>
+		<CreditNote xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
+			xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
+			xmlns="urn:oasis:names:specification:ubl:schema:xsd:CreditNote-2">
+
+			<cac:AdditionalDocumentReference>
+				<cbc:ID>ts12345</cbc:ID>
+				<cbc:DocumentDescription>Technical specification</cbc:DocumentDescription>
+				<cac:Attachment>
+					<cac:ExternalReference>
+						<cbc:URI>http://www.techspec.no</cbc:URI>
+					</cac:ExternalReference>
+				</cac:Attachment>
+			</cac:AdditionalDocumentReference>
+
+		</CreditNote>
+	</test>
+	<test>
+		<assert>
+			<success>PEPPOL-EN16931-R080</success>
+		</assert>
+		<CreditNote xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
+			xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
+			xmlns="urn:oasis:names:specification:ubl:schema:xsd:CreditNote-2">
+			
+<!--			<cac:AdditionalDocumentReference/>-->
+			
+			
+		</CreditNote>
+	</test>
+	<test>
+		<assert>
+			<error>PEPPOL-EN16931-R080</error>
+		</assert>
+		<CreditNote xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
+			xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
+			xmlns="urn:oasis:names:specification:ubl:schema:xsd:CreditNote-2">
+
+
+			<cac:AdditionalDocumentReference>
+				<cbc:DocumentTypeCode>50</cbc:DocumentTypeCode>
+			</cac:AdditionalDocumentReference>
+			
+			<cac:AdditionalDocumentReference>
+				<cbc:DocumentTypeCode>50</cbc:DocumentTypeCode>
+			</cac:AdditionalDocumentReference>
+
+		</CreditNote>
+	</test>
+</testSet>
diff --git a/rules/unit-UBL-PEPPOL-SB/PEPPOL-EN16931-R100.xml b/rules/unit-UBL-PEPPOL-SB/PEPPOL-EN16931-R100.xml
new file mode 100644
index 0000000..9dcfd03
--- /dev/null
+++ b/rules/unit-UBL-PEPPOL-SB/PEPPOL-EN16931-R100.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<testSet xmlns="http://difi.no/xsd/vefa/validator/1.0"
+	configuration="peppolbis-en16931-sbbase-3.0-ubl">
+	<assert>
+		<description>Verify existence of not more than a single object identifier pr invoice
+			line</description>
+		<scope>PEPPOL-EN16931-R100</scope>
+	</assert>
+	<test>
+		<assert>
+			<success>PEPPOL-EN16931-R100</success>
+		</assert>
+		<Invoice
+			xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
+			xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
+			xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2">
+			<cac:InvoiceLine>
+				<cac:DocumentReference>
+					<cbc:DocumentTypeCode>130</cbc:DocumentTypeCode>
+				</cac:DocumentReference>
+			</cac:InvoiceLine>
+
+		</Invoice>
+	</test>
+	<test>
+		<assert>
+			<success>PEPPOL-EN16931-R100</success>
+		</assert>
+		<Invoice
+			xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
+			xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
+			xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2">
+			<cac:InvoiceLine>
+				<cac:DocumentReference>
+					<cbc:DocumentTypeCode>130</cbc:DocumentTypeCode>
+				</cac:DocumentReference>
+			</cac:InvoiceLine>
+			
+			<cac:InvoiceLine>
+				<cac:DocumentReference>
+					<cbc:DocumentTypeCode>130</cbc:DocumentTypeCode>
+				</cac:DocumentReference>
+			</cac:InvoiceLine>
+			
+		</Invoice>
+	</test>
+	<test>
+		<assert>
+			<success>PEPPOL-EN16931-R100</success>
+		</assert>
+		<Invoice
+			xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
+			xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
+			xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2">
+
+			<cac:InvoiceLine>
+				<!--<cac:DocumentReference>
+					<cbc:DocumentTypeCode>130</cbc:DocumentTypeCode>
+				</cac:DocumentReference>-->
+			</cac:InvoiceLine>
+
+		</Invoice>
+	</test>
+
+	<test>
+		<assert>
+			<error>PEPPOL-EN16931-R100</error>
+		</assert>
+		<Invoice
+			xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
+			xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
+			xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2">
+
+			<cac:InvoiceLine>
+				<cac:DocumentReference>
+					<cbc:DocumentTypeCode>130</cbc:DocumentTypeCode>
+				</cac:DocumentReference>
+				
+				<cac:DocumentReference>
+					<cbc:DocumentTypeCode>130</cbc:DocumentTypeCode>
+				</cac:DocumentReference>
+			</cac:InvoiceLine>
+
+		</Invoice>
+	</test>
+</testSet>
diff --git a/rules/unit-UBL-PEPPOL-SB/PEPPOL-EN16931-R101.xml b/rules/unit-UBL-PEPPOL-SB/PEPPOL-EN16931-R101.xml
new file mode 100644
index 0000000..551e989
--- /dev/null
+++ b/rules/unit-UBL-PEPPOL-SB/PEPPOL-EN16931-R101.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<testSet xmlns="http://difi.no/xsd/vefa/validator/1.0"
+	configuration="peppolbis-en16931-sbbase-3.0-ubl">
+	<assert>
+		<description>Verify that element DocumentReference is not used for information other than invoiced line object.</description>
+		<scope>PEPPOL-EN16931-R101</scope>
+	</assert>
+	<test>
+		<assert>
+			<success>PEPPOL-EN16931-R101</success>
+		</assert>
+		<Invoice
+			xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
+			xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
+			xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2">
+			<cac:InvoiceLine>
+				<cac:DocumentReference>
+					<cbc:DocumentTypeCode>130</cbc:DocumentTypeCode>
+				</cac:DocumentReference>
+			</cac:InvoiceLine>
+
+		</Invoice>
+	</test>
+
+	<test>
+		<assert>
+			<error>PEPPOL-EN16931-R101</error>
+		</assert>
+		<Invoice
+			xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
+			xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
+			xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2">
+
+			<cac:InvoiceLine>
+				<cac:DocumentReference>
+					<cbc:DocumentTypeCode>122</cbc:DocumentTypeCode>
+				</cac:DocumentReference>
+			</cac:InvoiceLine>
+
+		</Invoice>
+	</test>
+</testSet>
diff --git a/rules/unit-UBL-PEPPOL-SB/PEPPOL-EN16931-R110.xml b/rules/unit-UBL-PEPPOL-SB/PEPPOL-EN16931-R110.xml
new file mode 100644
index 0000000..2301e48
--- /dev/null
+++ b/rules/unit-UBL-PEPPOL-SB/PEPPOL-EN16931-R110.xml
@@ -0,0 +1,127 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<testSet xmlns="http://difi.no/xsd/vefa/validator/1.0" configuration="peppolbis-en16931-sbbase-3.0-ubl">
+	<assert>
+    <description>Verify verification of invoice period.</description>
+		<scope>PEPPOL-EN16931-R110</scope>
+	</assert>
+	<test>
+		<assert>
+			<success>PEPPOL-EN16931-R110</success>
+		</assert>
+		<Invoice xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
+			xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
+			xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2">
+
+			<cac:InvoicePeriod>
+				<cbc:StartDate>2017-10-01</cbc:StartDate>
+			</cac:InvoicePeriod>
+
+			<cac:InvoiceLine>
+				<cac:InvoicePeriod>
+					<cbc:StartDate>2017-10-01</cbc:StartDate>
+				</cac:InvoicePeriod>
+			</cac:InvoiceLine>
+
+		</Invoice>
+	</test>
+	<test>
+		<assert>
+			<success>PEPPOL-EN16931-R110</success>
+		</assert>
+		<CreditNote xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
+			xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
+			xmlns="urn:oasis:names:specification:ubl:schema:xsd:CreditNote-2">
+
+			<cac:InvoicePeriod>
+				<cbc:StartDate>2017-10-01</cbc:StartDate>
+			</cac:InvoicePeriod>
+
+			<cac:CreditNoteLine>
+				<cac:InvoicePeriod>
+					<cbc:StartDate>2017-10-01</cbc:StartDate>
+				</cac:InvoicePeriod>
+			</cac:CreditNoteLine>
+
+		</CreditNote>
+	</test>
+	<test>
+		<assert>
+			<success>PEPPOL-EN16931-R110</success>
+		</assert>
+		<Invoice xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
+			xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
+			xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2">
+
+			<cac:InvoicePeriod>
+				<cbc:StartDate>2017-10-01</cbc:StartDate>
+			</cac:InvoicePeriod>
+
+			<cac:InvoiceLine>
+				<cac:InvoicePeriod>
+					<cbc:StartDate>2017-10-02</cbc:StartDate>
+				</cac:InvoicePeriod>
+			</cac:InvoiceLine>
+
+		</Invoice>
+	</test>
+	<test>
+		<assert>
+			<success>PEPPOL-EN16931-R110</success>
+		</assert>
+		<CreditNote xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
+			xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
+			xmlns="urn:oasis:names:specification:ubl:schema:xsd:CreditNote-2">
+
+			<cac:InvoicePeriod>
+				<cbc:StartDate>2017-10-01</cbc:StartDate>
+			</cac:InvoicePeriod>
+
+			<cac:CreditNoteLine>
+				<cac:InvoicePeriod>
+					<cbc:StartDate>2017-10-02</cbc:StartDate>
+				</cac:InvoicePeriod>
+			</cac:CreditNoteLine>
+
+		</CreditNote>
+	</test>
+	<test>
+		<assert>
+			<error>PEPPOL-EN16931-R110</error>
+		</assert>
+		<Invoice xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
+			xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
+			xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2">
+
+			<cac:InvoicePeriod>
+				<cbc:StartDate>2017-10-01</cbc:StartDate>
+			</cac:InvoicePeriod>
+
+			<cac:InvoiceLine>
+				<cac:InvoicePeriod>
+					<cbc:StartDate>2017-09-30</cbc:StartDate>
+				</cac:InvoicePeriod>
+			</cac:InvoiceLine>
+
+		</Invoice>
+	</test>
+	<test>
+		<assert>
+			<error>PEPPOL-EN16931-R110</error>
+		</assert>
+		<CreditNote xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
+			xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
+			xmlns="urn:oasis:names:specification:ubl:schema:xsd:CreditNote-2">
+
+			<cac:InvoicePeriod>
+				<cbc:StartDate>2017-10-01</cbc:StartDate>
+			</cac:InvoicePeriod>
+
+			<cac:CreditNoteLine>
+				<cac:InvoicePeriod>
+					<cbc:StartDate>2017-09-30</cbc:StartDate>
+				</cac:InvoicePeriod>
+			</cac:CreditNoteLine>
+
+		</CreditNote>
+	</test>
+</testSet>
diff --git a/rules/unit-UBL-PEPPOL-SB/PEPPOL-EN16931-R111.xml b/rules/unit-UBL-PEPPOL-SB/PEPPOL-EN16931-R111.xml
new file mode 100644
index 0000000..d8394f5
--- /dev/null
+++ b/rules/unit-UBL-PEPPOL-SB/PEPPOL-EN16931-R111.xml
@@ -0,0 +1,127 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<testSet xmlns="http://difi.no/xsd/vefa/validator/1.0" configuration="peppolbis-en16931-sbbase-3.0-ubl">
+	<assert>
+    <description>Verify verification of invoice period.</description>
+		<scope>PEPPOL-EN16931-R111</scope>
+	</assert>
+	<test>
+		<assert>
+			<success>PEPPOL-EN16931-R111</success>
+		</assert>
+		<Invoice xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
+			xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
+			xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2">
+
+			<cac:InvoicePeriod>
+				<cbc:EndDate>2017-10-01</cbc:EndDate>
+			</cac:InvoicePeriod>
+
+			<cac:InvoiceLine>
+				<cac:InvoicePeriod>
+					<cbc:EndDate>2017-10-01</cbc:EndDate>
+				</cac:InvoicePeriod>
+			</cac:InvoiceLine>
+
+		</Invoice>
+	</test>
+	<test>
+		<assert>
+			<success>PEPPOL-EN16931-R111</success>
+		</assert>
+		<CreditNote xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
+			xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
+			xmlns="urn:oasis:names:specification:ubl:schema:xsd:CreditNote-2">
+
+			<cac:InvoicePeriod>
+				<cbc:EndDate>2017-10-01</cbc:EndDate>
+			</cac:InvoicePeriod>
+
+			<cac:CreditNoteLine>
+				<cac:InvoicePeriod>
+					<cbc:EndDate>2017-10-01</cbc:EndDate>
+				</cac:InvoicePeriod>
+			</cac:CreditNoteLine>
+
+		</CreditNote>
+	</test>
+	<test>
+		<assert>
+			<success>PEPPOL-EN16931-R111</success>
+		</assert>
+		<Invoice xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
+			xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
+			xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2">
+
+			<cac:InvoicePeriod>
+				<cbc:EndDate>2017-10-01</cbc:EndDate>
+			</cac:InvoicePeriod>
+
+			<cac:InvoiceLine>
+				<cac:InvoicePeriod>
+					<cbc:EndDate>2017-09-30</cbc:EndDate>
+				</cac:InvoicePeriod>
+			</cac:InvoiceLine>
+
+		</Invoice>
+	</test>
+	<test>
+		<assert>
+			<success>PEPPOL-EN16931-R111</success>
+		</assert>
+		<CreditNote xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
+			xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
+			xmlns="urn:oasis:names:specification:ubl:schema:xsd:CreditNote-2">
+
+			<cac:InvoicePeriod>
+				<cbc:EndDate>2017-10-01</cbc:EndDate>
+			</cac:InvoicePeriod>
+
+			<cac:CreditNoteLine>
+				<cac:InvoicePeriod>
+					<cbc:EndDate>2017-09-30</cbc:EndDate>
+				</cac:InvoicePeriod>
+			</cac:CreditNoteLine>
+
+		</CreditNote>
+	</test>
+	<test>
+		<assert>
+			<error>PEPPOL-EN16931-R111</error>
+		</assert>
+		<Invoice xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
+			xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
+			xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2">
+
+			<cac:InvoicePeriod>
+				<cbc:EndDate>2017-10-01</cbc:EndDate>
+			</cac:InvoicePeriod>
+
+			<cac:InvoiceLine>
+				<cac:InvoicePeriod>
+					<cbc:EndDate>2017-10-02</cbc:EndDate>
+				</cac:InvoicePeriod>
+			</cac:InvoiceLine>
+
+		</Invoice>
+	</test>
+	<test>
+		<assert>
+			<error>PEPPOL-EN16931-R111</error>
+		</assert>
+		<CreditNote xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
+			xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
+			xmlns="urn:oasis:names:specification:ubl:schema:xsd:CreditNote-2">
+
+			<cac:InvoicePeriod>
+				<cbc:EndDate>2017-10-01</cbc:EndDate>
+			</cac:InvoicePeriod>
+
+			<cac:CreditNoteLine>
+				<cac:InvoicePeriod>
+					<cbc:EndDate>2017-10-02</cbc:EndDate>
+				</cac:InvoicePeriod>
+			</cac:CreditNoteLine>
+
+		</CreditNote>
+	</test>
+</testSet>
diff --git a/rules/unit-UBL-PEPPOL-SB/PEPPOL-EN16931-R120.xml b/rules/unit-UBL-PEPPOL-SB/PEPPOL-EN16931-R120.xml
new file mode 100644
index 0000000..47d9cb3
--- /dev/null
+++ b/rules/unit-UBL-PEPPOL-SB/PEPPOL-EN16931-R120.xml
@@ -0,0 +1,318 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<testSet xmlns="http://difi.no/xsd/vefa/validator/1.0" configuration="peppolbis-en16931-sbbase-3.0-ubl">
+	<assert>
+	    <description>Verify calculation of line extension amount.</description>
+		<scope>PEPPOL-EN16931-R120</scope>
+	</assert>
+	<test>
+		<assert>
+			<success>PEPPOL-EN16931-R120</success>
+		</assert>
+		<Invoice xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
+			xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
+			xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2">
+
+			<cac:InvoiceLine>
+				<cbc:InvoicedQuantity>10</cbc:InvoicedQuantity>
+				<cbc:LineExtensionAmount currencyID="NOK">100</cbc:LineExtensionAmount>
+
+				<cac:Price>
+					<cbc:PriceAmount currencyID="NOK">10</cbc:PriceAmount>
+				</cac:Price>
+			</cac:InvoiceLine>
+
+		</Invoice>
+	</test>
+	<test>
+		<assert>
+			<success>PEPPOL-EN16931-R120</success>
+		</assert>
+		<Invoice xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
+			xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
+			xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2">
+
+			<cac:InvoiceLine>
+				<cbc:InvoicedQuantity>10</cbc:InvoicedQuantity>
+				<cbc:LineExtensionAmount currencyID="NOK">110</cbc:LineExtensionAmount>
+
+				<cac:AllowanceCharge>
+					<cbc:ChargeIndicator>true</cbc:ChargeIndicator>
+					<cbc:Amount currencyID="NOK">10</cbc:Amount>
+				</cac:AllowanceCharge>
+
+				<cac:Price>
+					<cbc:PriceAmount currencyID="NOK">10</cbc:PriceAmount>
+				</cac:Price>
+			</cac:InvoiceLine>
+
+		</Invoice>
+	</test>
+	<test>
+		<assert>
+			<success>PEPPOL-EN16931-R120</success>
+		</assert>
+		<Invoice xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
+			xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
+			xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2">
+
+			<cac:InvoiceLine>
+				<cbc:InvoicedQuantity>10</cbc:InvoicedQuantity>
+				<cbc:LineExtensionAmount currencyID="NOK">90</cbc:LineExtensionAmount>
+
+				<cac:AllowanceCharge>
+					<cbc:ChargeIndicator>false</cbc:ChargeIndicator>
+					<cbc:Amount currencyID="NOK">10</cbc:Amount>
+				</cac:AllowanceCharge>
+
+				<cac:Price>
+					<cbc:PriceAmount currencyID="NOK">10</cbc:PriceAmount>
+				</cac:Price>
+			</cac:InvoiceLine>
+
+		</Invoice>
+	</test>
+	<test>
+		<assert>
+			<success>PEPPOL-EN16931-R120</success>
+		</assert>
+		<Invoice xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
+			xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
+			xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2">
+
+			<cac:InvoiceLine>
+				<cbc:InvoicedQuantity>10</cbc:InvoicedQuantity>
+				<cbc:LineExtensionAmount currencyID="NOK">90</cbc:LineExtensionAmount>
+
+				<cac:AllowanceCharge>
+					<cbc:ChargeIndicator>false</cbc:ChargeIndicator>
+					<cbc:Amount currencyID="NOK">30</cbc:Amount>
+				</cac:AllowanceCharge>
+				<cac:AllowanceCharge>
+					<cbc:ChargeIndicator>true</cbc:ChargeIndicator>
+					<cbc:Amount currencyID="NOK">10</cbc:Amount>
+				</cac:AllowanceCharge>
+				<cac:AllowanceCharge>
+					<cbc:ChargeIndicator>true</cbc:ChargeIndicator>
+					<cbc:Amount currencyID="NOK">10</cbc:Amount>
+				</cac:AllowanceCharge>
+
+				<cac:Price>
+					<cbc:PriceAmount currencyID="NOK">10</cbc:PriceAmount>
+				</cac:Price>
+			</cac:InvoiceLine>
+
+		</Invoice>
+	</test>
+	<test>
+		<assert>
+			<success>PEPPOL-EN16931-R120</success>
+		</assert>
+		<Invoice xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
+			xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
+			xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2">
+
+			<cac:InvoiceLine>
+				<cbc:InvoicedQuantity>10</cbc:InvoicedQuantity>
+				<cbc:LineExtensionAmount currencyID="NOK">90.02</cbc:LineExtensionAmount>
+
+				<cac:AllowanceCharge>
+					<cbc:ChargeIndicator>false</cbc:ChargeIndicator>
+					<cbc:Amount currencyID="NOK">30</cbc:Amount>
+				</cac:AllowanceCharge>
+				<cac:AllowanceCharge>
+					<cbc:ChargeIndicator>true</cbc:ChargeIndicator>
+					<cbc:Amount currencyID="NOK">10</cbc:Amount>
+				</cac:AllowanceCharge>
+				<cac:AllowanceCharge>
+					<cbc:ChargeIndicator>true</cbc:ChargeIndicator>
+					<cbc:Amount currencyID="NOK">10</cbc:Amount>
+				</cac:AllowanceCharge>
+
+				<cac:Price>
+					<cbc:PriceAmount currencyID="NOK">10</cbc:PriceAmount>
+				</cac:Price>
+			</cac:InvoiceLine>
+
+		</Invoice>
+	</test>
+	<test>
+		<assert>
+			<success>PEPPOL-EN16931-R120</success>
+		</assert>
+		<Invoice xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
+			xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
+			xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2">
+
+			<cac:InvoiceLine>
+				<cbc:InvoicedQuantity>10</cbc:InvoicedQuantity>
+				<cbc:LineExtensionAmount currencyID="NOK">89.98</cbc:LineExtensionAmount>
+
+				<cac:AllowanceCharge>
+					<cbc:ChargeIndicator>false</cbc:ChargeIndicator>
+					<cbc:Amount currencyID="NOK">30</cbc:Amount>
+				</cac:AllowanceCharge>
+				<cac:AllowanceCharge>
+					<cbc:ChargeIndicator>true</cbc:ChargeIndicator>
+					<cbc:Amount currencyID="NOK">10</cbc:Amount>
+				</cac:AllowanceCharge>
+				<cac:AllowanceCharge>
+					<cbc:ChargeIndicator>true</cbc:ChargeIndicator>
+					<cbc:Amount currencyID="NOK">10</cbc:Amount>
+				</cac:AllowanceCharge>
+
+				<cac:Price>
+					<cbc:PriceAmount currencyID="NOK">10</cbc:PriceAmount>
+				</cac:Price>
+			</cac:InvoiceLine>
+
+		</Invoice>
+	</test>
+	<test>
+		<assert>
+			<error>PEPPOL-EN16931-R120</error>
+		</assert>
+		<Invoice xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
+			xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
+			xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2">
+
+			<cac:InvoiceLine>
+				<cbc:InvoicedQuantity>10</cbc:InvoicedQuantity>
+				<cbc:LineExtensionAmount currencyID="NOK">90.03</cbc:LineExtensionAmount>
+
+				<cac:AllowanceCharge>
+					<cbc:ChargeIndicator>false</cbc:ChargeIndicator>
+					<cbc:Amount currencyID="NOK">30</cbc:Amount>
+				</cac:AllowanceCharge>
+				<cac:AllowanceCharge>
+					<cbc:ChargeIndicator>true</cbc:ChargeIndicator>
+					<cbc:Amount currencyID="NOK">10</cbc:Amount>
+				</cac:AllowanceCharge>
+				<cac:AllowanceCharge>
+					<cbc:ChargeIndicator>true</cbc:ChargeIndicator>
+					<cbc:Amount currencyID="NOK">10</cbc:Amount>
+				</cac:AllowanceCharge>
+
+				<cac:Price>
+					<cbc:PriceAmount currencyID="NOK">10</cbc:PriceAmount>
+				</cac:Price>
+			</cac:InvoiceLine>
+
+		</Invoice>
+	</test>
+	<test>
+		<assert>
+			<error>PEPPOL-EN16931-R120</error>
+		</assert>
+		<Invoice xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
+			xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
+			xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2">
+
+			<cac:InvoiceLine>
+				<cbc:InvoicedQuantity>10</cbc:InvoicedQuantity>
+				<cbc:LineExtensionAmount currencyID="NOK">89.97</cbc:LineExtensionAmount>
+
+				<cac:AllowanceCharge>
+					<cbc:ChargeIndicator>false</cbc:ChargeIndicator>
+					<cbc:Amount currencyID="NOK">30</cbc:Amount>
+				</cac:AllowanceCharge>
+				<cac:AllowanceCharge>
+					<cbc:ChargeIndicator>true</cbc:ChargeIndicator>
+					<cbc:Amount currencyID="NOK">10</cbc:Amount>
+				</cac:AllowanceCharge>
+				<cac:AllowanceCharge>
+					<cbc:ChargeIndicator>true</cbc:ChargeIndicator>
+					<cbc:Amount currencyID="NOK">10</cbc:Amount>
+				</cac:AllowanceCharge>
+
+				<cac:Price>
+					<cbc:PriceAmount currencyID="NOK">10</cbc:PriceAmount>
+				</cac:Price>
+			</cac:InvoiceLine>
+
+		</Invoice>
+	</test>
+	<test>
+		<assert>
+			<error>PEPPOL-EN16931-R120</error>
+		</assert>
+		<CreditNote xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
+			xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
+			xmlns="urn:oasis:names:specification:ubl:schema:xsd:CreditNote-2">
+
+			<cac:CreditNoteLine>
+				<cbc:CreditedQuantity>10</cbc:CreditedQuantity>
+				<cbc:LineExtensionAmount currencyID="NOK">89.97</cbc:LineExtensionAmount>
+
+				<cac:AllowanceCharge>
+					<cbc:ChargeIndicator>false</cbc:ChargeIndicator>
+					<cbc:Amount currencyID="NOK">30</cbc:Amount>
+				</cac:AllowanceCharge>
+				<cac:AllowanceCharge>
+					<cbc:ChargeIndicator>true</cbc:ChargeIndicator>
+					<cbc:Amount currencyID="NOK">10</cbc:Amount>
+				</cac:AllowanceCharge>
+				<cac:AllowanceCharge>
+					<cbc:ChargeIndicator>true</cbc:ChargeIndicator>
+					<cbc:Amount currencyID="NOK">10</cbc:Amount>
+				</cac:AllowanceCharge>
+
+				<cac:Price>
+					<cbc:PriceAmount currencyID="NOK">10</cbc:PriceAmount>
+				</cac:Price>
+			</cac:CreditNoteLine>
+
+		</CreditNote>
+	</test>
+	<test>
+		<assert>
+			<success>PEPPOL-EN16931-R120</success>
+		</assert>
+		<Invoice xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
+				 xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
+				 xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2">
+
+			<cac:InvoiceLine>
+				<cbc:InvoicedQuantity>10</cbc:InvoicedQuantity>
+				<cbc:LineExtensionAmount currencyID="NOK">90</cbc:LineExtensionAmount>
+
+				<cac:AllowanceCharge>
+					<cbc:ChargeIndicator>false</cbc:ChargeIndicator>
+					<cbc:Amount currencyID="NOK">30</cbc:Amount>
+				</cac:AllowanceCharge>
+				<cac:AllowanceCharge>
+					<cbc:ChargeIndicator>true</cbc:ChargeIndicator>
+					<cbc:Amount currencyID="NOK">10</cbc:Amount>
+				</cac:AllowanceCharge>
+				<cac:AllowanceCharge>
+					<cbc:ChargeIndicator>true</cbc:ChargeIndicator>
+					<cbc:Amount currencyID="NOK">10</cbc:Amount>
+				</cac:AllowanceCharge>
+
+				<cac:Price>
+					<cbc:PriceAmount currencyID="NOK">20</cbc:PriceAmount>
+					<cbc:BaseQuantity>2</cbc:BaseQuantity>
+				</cac:Price>
+			</cac:InvoiceLine>
+
+		</Invoice>
+	</test>
+	<test>
+		<assert>
+			<error>PEPPOL-EN16931-R120</error>
+		</assert>
+		<Invoice xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
+				 xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
+				 xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2">
+
+			<cac:InvoiceLine>
+				<!-- <cbc:InvoicedQuantity>10</cbc:InvoicedQuantity> -->
+				<!-- <cbc:LineExtensionAmount currencyID="NOK">100</cbc:LineExtensionAmount> -->
+				<cac:Price>
+					<cbc:PriceAmount currencyID="NOK">20</cbc:PriceAmount>
+					<cbc:BaseQuantity>2</cbc:BaseQuantity>
+				</cac:Price>
+			</cac:InvoiceLine>
+
+		</Invoice>
+	</test>
+</testSet>
diff --git a/rules/unit-UBL-PEPPOL-SB/PEPPOL-EN16931-R121.xml b/rules/unit-UBL-PEPPOL-SB/PEPPOL-EN16931-R121.xml
new file mode 100644
index 0000000..56df314
--- /dev/null
+++ b/rules/unit-UBL-PEPPOL-SB/PEPPOL-EN16931-R121.xml
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<testSet xmlns="http://difi.no/xsd/vefa/validator/1.0" configuration="peppolbis-en16931-sbbase-3.0-ubl">
+	<assert>
+    	<description>Verify base amount is above zero.</description>
+		<scope>PEPPOL-EN16931-R121</scope>
+	</assert>
+	<test>
+		<assert>
+			<success>PEPPOL-EN16931-R121</success>
+		</assert>
+		<Invoice xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
+				 xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
+				 xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2">
+
+			<cac:InvoiceLine>
+				<cac:Price>
+					<!-- <cbc:BaseQuantity>1</cbc:BaseQuantity> -->
+				</cac:Price>
+			</cac:InvoiceLine>
+
+		</Invoice>
+	</test>
+	<test>
+		<assert>
+			<success>PEPPOL-EN16931-R121</success>
+		</assert>
+		<Invoice xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
+				 xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
+				 xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2">
+
+			<cac:InvoiceLine>
+				<cac:Price>
+					<cbc:BaseQuantity>1</cbc:BaseQuantity>
+				</cac:Price>
+			</cac:InvoiceLine>
+
+		</Invoice>
+	</test>
+	<test>
+		<assert>
+			<error>PEPPOL-EN16931-R121</error>
+		</assert>
+		<Invoice xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
+				 xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
+				 xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2">
+
+			<cac:InvoiceLine>
+				<cac:Price>
+					<cbc:BaseQuantity>0</cbc:BaseQuantity>
+				</cac:Price>
+			</cac:InvoiceLine>
+
+		</Invoice>
+	</test>
+	<test>
+		<assert>
+			<error>PEPPOL-EN16931-R121</error>
+		</assert>
+		<Invoice xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
+				 xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
+				 xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2">
+
+			<cac:InvoiceLine>
+				<cac:Price>
+					<cbc:BaseQuantity>-1</cbc:BaseQuantity>
+				</cac:Price>
+			</cac:InvoiceLine>
+
+		</Invoice>
+	</test>
+</testSet>
diff --git a/rules/unit-UBL-PEPPOL-SB/PEPPOL-EN16931-R130.xml b/rules/unit-UBL-PEPPOL-SB/PEPPOL-EN16931-R130.xml
new file mode 100644
index 0000000..9b5f9eb
--- /dev/null
+++ b/rules/unit-UBL-PEPPOL-SB/PEPPOL-EN16931-R130.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<testSet xmlns="http://difi.no/xsd/vefa/validator/1.0" configuration="peppolbis-en16931-sbbase-3.0-ubl">
+	<assert>
+    	<description>Verify unit codes are same.</description>
+		<scope>PEPPOL-EN16931-R130</scope>
+	</assert>
+	<test>
+		<assert>
+			<success>PEPPOL-EN16931-R130</success>
+		</assert>
+		<Invoice xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
+			xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
+			xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2">
+
+			<cac:InvoiceLine>
+				<cbc:InvoicedQuantity unitCode="STK">10</cbc:InvoicedQuantity>
+
+				<cac:Price>
+					<cbc:BaseQuantity unitCode="STK">1</cbc:BaseQuantity>
+				</cac:Price>
+			</cac:InvoiceLine>
+
+		</Invoice>
+	</test>
+	<test>
+		<assert>
+			<error>PEPPOL-EN16931-R130</error>
+		</assert>
+		<Invoice xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
+			xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
+			xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2">
+
+			<cac:InvoiceLine>
+				<cbc:InvoicedQuantity unitCode="STK">10</cbc:InvoicedQuantity>
+
+				<cac:Price>
+					<cbc:BaseQuantity unitCode="AA">1</cbc:BaseQuantity>
+				</cac:Price>
+			</cac:InvoiceLine>
+
+		</Invoice>
+	</test>
+	<test>
+		<assert>
+			<error>PEPPOL-EN16931-R130</error>
+		</assert>
+		<CreditNote xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
+			xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
+			xmlns="urn:oasis:names:specification:ubl:schema:xsd:CreditNote-2">
+
+			<cac:CreditNoteLine>
+				<cbc:CreditedQuantity unitCode="STK">10</cbc:CreditedQuantity>
+
+				<cac:Price>
+					<cbc:BaseQuantity unitCode="AA">1</cbc:BaseQuantity>
+				</cac:Price>
+			</cac:CreditNoteLine>
+
+		</CreditNote>
+	</test>
+</testSet>
diff --git a/rules/unit-UBL-PEPPOL-SB/PEPPOL-EN16931-R131.xml b/rules/unit-UBL-PEPPOL-SB/PEPPOL-EN16931-R131.xml
new file mode 100644
index 0000000..c0aaf69
--- /dev/null
+++ b/rules/unit-UBL-PEPPOL-SB/PEPPOL-EN16931-R131.xml
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<testSet xmlns="http://difi.no/xsd/vefa/validator/1.0"
+	configuration="peppolbis-en16931-sbbase-3.0-ubl">
+	<assert>
+		<description>Verify that URI has a correct Uniform Resource Locator.</description>
+		<scope>PEPPOL-EN16931-R131</scope>
+	</assert>
+	<test>
+		<assert>
+			<success>PEPPOL-EN16931-R131</success>
+		</assert>
+		<Invoice
+			xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
+			xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
+			xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2">
+			<cac:AdditionalDocumentReference>
+				<cac:Attachment>
+					<cac:ExternalReference>
+						<cbc:URI>ftp://some/invoice/203040</cbc:URI>
+					</cac:ExternalReference>
+				</cac:Attachment>
+			</cac:AdditionalDocumentReference>
+		</Invoice>
+	</test>
+	<test>
+		<assert>
+			<success>PEPPOL-EN16931-R131</success>
+		</assert>
+		<Invoice
+			xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
+			xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
+			xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2">
+			<cac:AdditionalDocumentReference>
+				<cac:Attachment>
+					<cac:ExternalReference>
+						<cbc:URI>http://some/invoice/203041</cbc:URI>
+					</cac:ExternalReference>
+				</cac:Attachment>
+			</cac:AdditionalDocumentReference>
+		</Invoice>
+	</test>
+	<test>
+		<assert>
+			<success>PEPPOL-EN16931-R131</success>
+		</assert>
+		<Invoice
+			xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
+			xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
+			xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2">
+			<cac:AdditionalDocumentReference>
+				<cac:Attachment>
+					<cac:ExternalReference>
+						<cbc:URI>FTPS://some/invoice/203042</cbc:URI>
+					</cac:ExternalReference>
+				</cac:Attachment>
+			</cac:AdditionalDocumentReference>
+		</Invoice>
+	</test>
+	<test>
+		<assert>
+			<success>PEPPOL-EN16931-R131</success>
+		</assert>
+		<Invoice
+			xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
+			xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
+			xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2">
+			<cac:AdditionalDocumentReference>
+				<cac:Attachment>
+					<cac:ExternalReference>
+						<cbc:URI>HTTPS://some/invoice/203043</cbc:URI>
+					</cac:ExternalReference>
+				</cac:Attachment>
+			</cac:AdditionalDocumentReference>
+		</Invoice>
+	</test>
+	<test>
+		<assert>
+			<error>PEPPOL-EN16931-R131</error>
+		</assert>
+		<Invoice
+			xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
+			xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
+			xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2">
+			<cac:AdditionalDocumentReference>
+				<cac:Attachment>
+					<cac:ExternalReference>
+						<cbc:URI>HTTPSInvoice 203050</cbc:URI>
+					</cac:ExternalReference>
+				</cac:Attachment>
+			</cac:AdditionalDocumentReference>
+		</Invoice>
+	</test>
+	<test>
+		<assert>
+			<error>PEPPOL-EN16931-R131</error>
+		</assert>
+		<Invoice
+			xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
+			xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
+			xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2">
+			<cac:AdditionalDocumentReference>
+				<cac:Attachment>
+					<cac:ExternalReference>
+						<cbc:URI>FTPInvoice 203051</cbc:URI>
+					</cac:ExternalReference>
+				</cac:Attachment>
+			</cac:AdditionalDocumentReference>
+		</Invoice>
+	</test>
+</testSet>
\ No newline at end of file