diff --git a/examples/Activity.php b/examples/Activity.php
index ef2f58c1..3fc6453e 100644
--- a/examples/Activity.php
+++ b/examples/Activity.php
@@ -69,7 +69,7 @@
  *
  */
 
-//List all with pattern "A*", field 0 (= search code or number), firstRow 1, maxRows 10, options -> accessrules = 0
+//List all with pattern "A*", field 0 (= search code or name), firstRow 1, maxRows 10, options -> accessrules = 0
 if ($executeListAllWithFilter) {
     $options = array('accessrules' => 0);
 
diff --git a/examples/Article.php b/examples/Article.php
index ebec6173..da4679fb 100644
--- a/examples/Article.php
+++ b/examples/Article.php
@@ -60,7 +60,7 @@
  *
  */
 
-//List all with pattern "O*", field 0 (= search code or number), firstRow 1, maxRows 10, options -> vat = 'inclusive'
+//List all with pattern "O*", field 0 (= search code or name), firstRow 1, maxRows 10, options -> vat = 'inclusive'
 if ($executeListAllWithFilter) {
     $options = array('vat' => 'inclusive');
 
diff --git a/examples/CashBankBook.php b/examples/CashBankBook.php
index 7423faf2..3bb1a3e2 100644
--- a/examples/CashBankBook.php
+++ b/examples/CashBankBook.php
@@ -45,7 +45,7 @@
  *                         Usage:                  $options['banktype'] = -1;
  */
 
-//List all with pattern "BNK", field 0 (= search code or number), firstRow 1, maxRows 10, options -> banktype = 0
+//List all with pattern "BNK", field 0 (= search code or name), firstRow 1, maxRows 10, options -> banktype = 0
 if ($executeListAllWithFilter) {
     $options = array('banktype' => 0);
 
diff --git a/examples/CostCenter.php b/examples/CostCenter.php
index 05e3756e..14f45fb5 100644
--- a/examples/CostCenter.php
+++ b/examples/CostCenter.php
@@ -65,7 +65,7 @@
  *                         Usage:                  $options['group'] = 'DimensionGroup';
  */
 
-//List all with pattern "Apeldoorn", field 0 (= search code or number), firstRow 1, maxRows 10, options -> modifiedsince = '20190101100000', group = 'DimensionGroup'
+//List all with pattern "Apeldoorn", field 0 (= search code or name), firstRow 1, maxRows 10, options -> modifiedsince = '20190101100000', group = 'DimensionGroup'
 if ($executeListAllWithFilter) {
     $options = array('modifiedsince' => '20190101100000', 'group' => 'DimensionGroup');
 
diff --git a/examples/Country.php b/examples/Country.php
index ed048ab0..ddd7769d 100644
--- a/examples/Country.php
+++ b/examples/Country.php
@@ -41,7 +41,7 @@
  *                         Usage:                  $options['office'] = 'SomeOfficeCode';
  */
 
-//List all with pattern "NL", field 0 (= search code or number), firstRow 1, maxRows 10
+//List all with pattern "NL", field 0 (= search code or name), firstRow 1, maxRows 10
 if ($executeListAllWithFilter) {
     try {
         $countries = $countryApiConnector->listAll('NL', 0, 1, 10);
diff --git a/examples/Currency.php b/examples/Currency.php
index 938e8176..f714e86f 100644
--- a/examples/Currency.php
+++ b/examples/Currency.php
@@ -54,7 +54,7 @@
  *                         Usage:                  $options['office'] = 'SomeOfficeCode';
  */
 
-//List all with pattern "EUR", field 0 (= search code or number), firstRow 1, maxRows 10, options []
+//List all with pattern "EUR", field 0 (= search code or name), firstRow 1, maxRows 10, options []
 if ($executeListAllWithFilter) {
     try {
         $currencies = $currencyApiConnector->listAll("EUR", 0, 1, 10);
diff --git a/examples/DimensionGroup.php b/examples/DimensionGroup.php
index 9a89942e..b7c20f78 100644
--- a/examples/DimensionGroup.php
+++ b/examples/DimensionGroup.php
@@ -62,7 +62,7 @@
  *
  */
 
-//List all with pattern "*", field 0 (= search code or number), firstRow 1, maxRows 10, options -> dimtype = 'BAS'
+//List all with pattern "*", field 0 (= search code or name), firstRow 1, maxRows 10, options -> dimtype = 'BAS'
 if ($executeListAllWithFilter) {
     $options = array('dimtype' => 'BAS');
 
diff --git a/examples/DimensionType.php b/examples/DimensionType.php
index c299076d..0521dbd1 100644
--- a/examples/DimensionType.php
+++ b/examples/DimensionType.php
@@ -60,7 +60,7 @@
  *
  */
 
-//List all with pattern "*", field 0 (= search code or number), firstRow 1, maxRows 10, options -> finlevel = 2
+//List all with pattern "*", field 0 (= search code or name), firstRow 1, maxRows 10, options -> finlevel = 2
 if ($executeListAllWithFilter) {
     $options = array('finlevel' => 2);
 
diff --git a/examples/Invoice.php b/examples/Invoice.php
index 0fc7391d..2de30cee 100644
--- a/examples/Invoice.php
+++ b/examples/Invoice.php
@@ -64,7 +64,7 @@
  *
  */
 
-//List all with pattern "2019*", field 0 (= search code or number), firstRow 1, maxRows 10, options -> openvalue = 50.25
+//List all with pattern "2019*", field 0 (= search code or name), firstRow 1, maxRows 10, options -> openvalue = 50.25
 if ($executeListAllWithFilter) {
     $options = array('openvalue' => 50.25);
 
diff --git a/examples/InvoiceType.php b/examples/InvoiceType.php
index 1649ebfd..a77182a1 100644
--- a/examples/InvoiceType.php
+++ b/examples/InvoiceType.php
@@ -35,7 +35,7 @@
  *                         to add multiple options. An option name may be used once, specifying an option multiple
  *                         times will cause an error.
  *
- *                         Available options:      office
+ *                         Available options:      office, vat
  *
  *                         office                  Sets the office code.
  *                         Usage:                  $options['office'] = 'SomeOfficeCode';
@@ -45,7 +45,7 @@
  *                         Usage:                  $options['vat'] = 'inclusive';
  */
 
-//List all with pattern "INV*", field 0 (= search code or number), firstRow 1, maxRows 10, options, options -> vat = 'exclusive'
+//List all with pattern "INV*", field 0 (= search code or name), firstRow 1, maxRows 10, options, options -> vat = 'exclusive'
 if ($executeListAllWithFilter) {
     $options = array('vat' => 'exclusive');
 
diff --git a/examples/Office.php b/examples/Office.php
new file mode 100644
index 00000000..e7e706fa
--- /dev/null
+++ b/examples/Office.php
@@ -0,0 +1,157 @@
+<?php
+
+/* Office
+ * Twinfield UI:            https://accounting.twinfield.com/UI/#/Companies/All
+ * API Documentation:       https://c3.twinfield.com/webservices/documentation/#/ApiReference/Masters/Offices
+ */
+
+//Optionally declare the namespace PhpTwinfield so u can call classes without prepending \PhpTwinfield\
+namespace PhpTwinfield;
+
+// Use the ResponseException class to handle errors when listing, getting and sending objects to/from Twinfield
+use PhpTwinfield\Response\ResponseException;
+
+require_once('vendor/autoload.php');
+
+// Retrieve an OAuth 2 connection
+require_once('Connection.php');
+
+/* Office API Connector
+ * \PhpTwinfield\ApiConnectors\OfficeApiConnector
+ * Available methods: get, listAll, listAllWithoutOfficeCode
+ */
+
+// Run all or only some of the following examples
+$executeListAllWithoutOfficeCode    = false;
+$executeListAllWithFilter           = false;
+$executeListAllWithoutFilter        = true;
+$executeRead                        = true;
+
+$officeApiConnector = new \PhpTwinfield\ApiConnectors\OfficeApiConnector($connection);
+
+// Office code
+$officeCode = "SomeOfficeCode";
+
+// Create a new Office object from the $officeCode
+$defaultOffice = \PhpTwinfield\Office::fromCode($officeCode);
+
+/* List all offices
+ * @param string $pattern  The search pattern. May contain wildcards * and ?
+ * @param int    $field    The search field determines which field or fields will be searched. The available fields
+ *                         depends on the finder type. Passing a value outside the specified values will cause an
+ *                         error.
+ * @param int    $firstRow First row to return, useful for paging
+ * @param int    $maxRows  Maximum number of rows to return, useful for paging
+ * @param array  $options  The Finder options. Passing an unsupported name or value causes an error. It's possible
+ *                         to add multiple options. An option name may be used once, specifying an option multiple
+ *                         times will cause an error.
+ *
+ *                         Available options:      office, consolidate, withouttaxgroup
+ *
+ *                         office                  Sets the office code.
+ *                         Usage:                  $options['office'] = 'SomeOfficeCode';
+ *
+ *                         consolidate             Shows offices for which the consolidate option is true of false.
+ *                         Available values:       0 = false, 1 = true
+ *                         Usage:                  $options['consolidate'] = 0;
+ *
+ *                         withouttaxgroup         If set to 1, the list of offices is limited to offices that are not part of a tax group and those offices don't contain VAT returns which are not approved yet.
+ *                         Available values:       0 = false, 1 = true
+ *                         Usage:                  $options['consolidate'] = 0;
+ */
+
+ //List all offices without knowing any of the office codes, only available when using OAuth 2 login
+ if ($executeListAllWithoutOfficeCode) {
+    try {
+        $offices = $officeApiConnector->listAllWithoutOfficeCode();
+    } catch (ResponseException $e) {
+        $offices = $e->getReturnedObject();
+    }
+
+    echo "<pre>";
+    print_r($offices);
+    echo "</pre>";
+}
+
+//List all with pattern "NL*", field 0 (= search code or name), firstRow 1, maxRows 10, options -> consolidate = 0
+if ($executeListAllWithFilter) {
+    $options = array('consolidate' => 0);
+
+    try {
+        $offices = $officeApiConnector->listAll("NL*", 0, 1, 10, $options);
+    } catch (ResponseException $e) {
+        $offices = $e->getReturnedObject();
+    }
+
+    echo "<pre>";
+    print_r($offices);
+    echo "</pre>";
+}
+
+//List all with default settings (pattern '*', field 0, firstRow 1, maxRows 100, options [])
+if ($executeListAllWithoutFilter) {
+    try {
+        $offices = $officeApiConnector->listAll();
+    } catch (ResponseException $e) {
+        $offices = $e->getReturnedObject();
+    }
+
+    echo "<pre>";
+    print_r($offices);
+    echo "</pre>";
+}
+
+/* Office
+ * \PhpTwinfield\Office
+ * Available getters: __toString, getCode, getCountryCode, getCountryCodeToString, getCreated, getCreatedToString, getMessages, getModified, getModifiedToString, getName, getResult, getShortName, getStatus, getTouched, getUser, getUserToString, getVatFirstQuarterStartsIn, getVatPeriod, hasMessages
+ * Available setters: fromCode, setCode, setCountryCode, setCountryCodeFromString, setName, setShortName, setStatus, setStatusFromString, setVatFirstQuarterStartsIn,setVatPeriod
+ */
+
+if ($executeListAllWithoutOfficeCode || $executeListAllWithFilter || $executeListAllWithoutFilter) {
+    foreach ($offices as $key => $office) {
+        echo "Office {$key}<br />";
+        echo "Code: {$office->getCode()}<br />";
+        echo "Name: {$office->getName()}<br /><br />";
+        echo "CountryCode (\\PhpTwinfield\\Country): <pre>" . print_r($office->getCountryCode(), true) . "</pre><br />";
+        echo "CountryCode (string): {$office->getCountryCodeToString()}<br />";
+        echo "VatFirstQuarterStartsIn: {$office->getVatFirstQuarterStartsIn()}<br />";
+        echo "VatPeriod: {$office->getVatPeriod()}<br />";
+    }
+}
+
+// Read an Office based off the passed in code and optionally the office.
+if ($executeRead) {
+    try {
+        $office = $officeApiConnector->get("NLA000001", $defaultOffice);
+    } catch (ResponseException $e) {
+        $office = $e->getReturnedObject();
+    }
+
+    echo "<pre>";
+    print_r($office);
+    echo "</pre>";
+
+    echo "Office<br />";
+    echo "Code: {$office}<br />";                                                                                        	// string|null
+    echo "Code: {$office->getCode()}<br />";                                                                              	// string|null
+    //echo "CountryCode (\\PhpTwinfield\\Country): <pre>" . print_r($office->getCountryCode(), true) . "</pre><br />";      // Country|null
+    //echo "CountryCode (string): {$office->getCountryCodeToString()}<br />";                                               // string|null
+    echo "Created (\\DateTimeInterface): <pre>" . print_r($office->getCreated(), true) . "</pre><br />";              	    // \DateTimeInterface|null      The date/time the office was created.
+    echo "Created (string): {$office->getCreatedToString()}<br />";                                                   	    // string|null
+
+    if ($office->hasMessages()) {                                                                                         	// bool                         Object contains (error) messages true/false.
+        echo "Messages: " . print_r($office->getMessages(), true) . "<br />";                                             	// Array|null                   (Error) messages.
+    }
+
+    echo "Modified (\\DateTimeInterface): <pre>" . print_r($office->getModified(), true) . "</pre><br />";            	    // \DateTimeInterface|null      The date/time the office was modified.
+    echo "Modified (string): {$office->getModifiedToString()}<br />";                                                 	    // string|null
+    echo "Name: {$office->getName()}<br />";                                                                              	// string|null
+    echo "Result: {$office->getResult()}<br />";                                                                          	// int|null                     Result (0 = error, 1 or empty = success).
+    echo "ShortName: {$office->getShortName()}<br />";                                                                    	// string|null
+    echo "Status: {$office->getStatus()}<br />";                                                                          	// Status|null
+    echo "Touched: {$office->getTouched()}<br />";                                                                        	// int|null                     The number of times the office is modified.
+    echo "User (\\PhpTwinfield\\User): <pre>" . print_r($office->getUser(), true) . "</pre><br />";                       	// User|null                    The code of the user who created or modified the Office.
+    echo "User (string): {$office->getUserToString()}<br />";                                                             	// string|null
+    //echo "VatFirstQuarterStartsIn: {$office->getVatFirstQuarterStartsIn()}<br />";                                        // string|null
+    //echo "VatPeriod: {$office->getVatPeriod()}<br />";                                                                    // string|null
+}
\ No newline at end of file
diff --git a/examples/PayCode.php b/examples/PayCode.php
index 4456fd1f..d20efade 100644
--- a/examples/PayCode.php
+++ b/examples/PayCode.php
@@ -45,7 +45,7 @@
  *                         Usage:                  $options['paytype'] = 'pay';
  */
 
-//List all with pattern "SEPA*", field 0 (= search code or number), firstRow 1, maxRows 10, options -> paytype = pay
+//List all with pattern "SEPA*", field 0 (= search code or name), firstRow 1, maxRows 10, options -> paytype = pay
 if ($executeListAllWithFilter) {
     $options = array('paytype' => 'pay');
 
diff --git a/examples/Project.php b/examples/Project.php
index e769450c..7e4177cc 100644
--- a/examples/Project.php
+++ b/examples/Project.php
@@ -69,7 +69,7 @@
  *
  */
 
-//List all with pattern "P*", field 0 (= search code or number), firstRow 1, maxRows 10, options -> accessrules = 0
+//List all with pattern "P*", field 0 (= search code or name), firstRow 1, maxRows 10, options -> accessrules = 0
 if ($executeListAllWithFilter) {
     $options = array('accessrules' => 0);
 
diff --git a/examples/Rate.php b/examples/Rate.php
index 80fbeae4..13200e46 100644
--- a/examples/Rate.php
+++ b/examples/Rate.php
@@ -48,7 +48,7 @@
  *                         to add multiple options. An option name may be used once, specifying an option multiple
  *                         times will cause an error.
  *
- *                         Available options:      office
+ *                         Available options:      office, ratetype
  *
  *                         office                  Sets the office code.
  *                         Usage:                  $options['office'] = 'SomeOfficeCode';
@@ -58,7 +58,7 @@
  *                         Usage:                  $options['ratetype'] = 'quantity';
  */
 
-//List all with pattern "DIR*", field 0 (= search code or number), firstRow 1, maxRows 10, options -> ratetype = 'quantity'
+//List all with pattern "DIR*", field 0 (= search code or name), firstRow 1, maxRows 10, options -> ratetype = 'quantity'
 if ($executeListAllWithFilter) {
     $options = array('ratetype' => 'time');
 
diff --git a/examples/UserRole.php b/examples/UserRole.php
index dfb6f90c..845be5c8 100644
--- a/examples/UserRole.php
+++ b/examples/UserRole.php
@@ -41,7 +41,7 @@
  *                         Usage:                  $options['office'] = 'SomeOfficeCode';
  */
 
-//List all with pattern "LVL1*", field 0 (= search code or number), firstRow 1, maxRows 10
+//List all with pattern "LVL1*", field 0 (= search code or name), firstRow 1, maxRows 10
 if ($executeListAllWithFilter) {
     try {
         $userRoles = $userRoleApiConnector->listAll("LVL1*", 0, 1, 10);
diff --git a/examples/VatCode.php b/examples/VatCode.php
index 5bfa0c5b..8a8659bc 100644
--- a/examples/VatCode.php
+++ b/examples/VatCode.php
@@ -59,7 +59,7 @@
  *
  */
 
-//List all with pattern "V*", field 0 (= search code or number), firstRow 1, maxRows 10, options -> vattype = 'sales'
+//List all with pattern "V*", field 0 (= search code or name), firstRow 1, maxRows 10, options -> vattype = 'sales'
 if ($executeListAllWithFilter) {
     $options = array('vattype' => 'sales');
 
diff --git a/examples/VatGroup.php b/examples/VatGroup.php
index 8e3f705a..01cff0ee 100644
--- a/examples/VatGroup.php
+++ b/examples/VatGroup.php
@@ -41,7 +41,7 @@
  *                         Usage:                  $options['office'] = 'SomeOfficeCode';
  */
 
-//List all with pattern "1*", field 0 (= search code or number), firstRow 1, maxRows 10
+//List all with pattern "1*", field 0 (= search code or name), firstRow 1, maxRows 10
 if ($executeListAllWithFilter) {
     try {
         $vatGroups = $vatGroupApiConnector->listAll("1*", 0, 1, 10);
diff --git a/examples/VatGroupCountry.php b/examples/VatGroupCountry.php
index c5f51535..e94dd500 100644
--- a/examples/VatGroupCountry.php
+++ b/examples/VatGroupCountry.php
@@ -44,7 +44,7 @@
  *                         Usage:                  $options['country'] = 'NL';
  */
 
-//List all with pattern "*", field 0 (= search code or number), firstRow 1, maxRows 10, options -> country = NL
+//List all with pattern "*", field 0 (= search code or name), firstRow 1, maxRows 10, options -> country = NL
 if ($executeListAllWithFilter) {
     $options = array('country' => 'NL');
 
diff --git a/src/DomDocuments/TransactionsDocument.php b/src/DomDocuments/TransactionsDocument.php
index ca48eeba..db631c82 100644
--- a/src/DomDocuments/TransactionsDocument.php
+++ b/src/DomDocuments/TransactionsDocument.php
@@ -11,10 +11,10 @@
 use PhpTwinfield\Fields\FreeText1Field;
 use PhpTwinfield\Fields\FreeText2Field;
 use PhpTwinfield\Fields\FreeText3Field;
+use PhpTwinfield\Fields\InvoiceNumberField;
 use PhpTwinfield\Fields\PerformanceDateField;
 use PhpTwinfield\Fields\PerformanceTypeField;
 use PhpTwinfield\Fields\Transaction\CloseAndStartValueFields;
-use PhpTwinfield\Fields\Transaction\InvoiceNumberField;
 use PhpTwinfield\Fields\Transaction\PaymentReferenceField;
 use PhpTwinfield\Fields\Transaction\RegimeField;
 use PhpTwinfield\Fields\Transaction\StatementNumberField;
diff --git a/src/Fields/Invoice/InvoiceNumberField.php b/src/Fields/InvoiceNumberField.php
similarity index 81%
rename from src/Fields/Invoice/InvoiceNumberField.php
rename to src/Fields/InvoiceNumberField.php
index 5327a8c4..70d09bc5 100644
--- a/src/Fields/Invoice/InvoiceNumberField.php
+++ b/src/Fields/InvoiceNumberField.php
@@ -1,32 +1,32 @@
-<?php
-
-namespace PhpTwinfield\Fields\Invoice;
-
-trait InvoiceNumberField
-{
-    /**
-     * Invoice number field
-     * Used by: Invoice
-     *
-     * @var string|null
-     */
-    private $invoiceNumber;
-
-    /**
-     * @return null|string
-     */
-    public function getInvoiceNumber(): ?string
-    {
-        return $this->invoiceNumber;
-    }
-
-    /**
-     * @param null|string $invoiceNumber
-     * @return $this
-     */
-    public function setInvoiceNumber(?string $invoiceNumber): self
-    {
-        $this->invoiceNumber = $invoiceNumber;
-        return $this;
-    }
+<?php
+
+namespace PhpTwinfield\Fields;
+
+trait InvoiceNumberField
+{
+    /**
+     * Invoice number field
+     * Used by: Invoice, JournalTransactionLine, PurchaseTransaction, SalesTransaction
+     *
+     * @var string|null
+     */
+    private $invoiceNumber;
+
+    /**
+     * @return null|string
+     */
+    public function getInvoiceNumber(): ?string
+    {
+        return $this->invoiceNumber;
+    }
+
+    /**
+     * @param null|string $invoiceNumber
+     * @return $this
+     */
+    public function setInvoiceNumber(?string $invoiceNumber): self
+    {
+        $this->invoiceNumber = $invoiceNumber;
+        return $this;
+    }
 }
\ No newline at end of file
diff --git a/src/Fields/Transaction/InvoiceNumberField.php b/src/Fields/Transaction/InvoiceNumberField.php
deleted file mode 100644
index e341d426..00000000
--- a/src/Fields/Transaction/InvoiceNumberField.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-namespace PhpTwinfield\Fields\Transaction;
-
-trait InvoiceNumberField
-{
-    /**
-     * Invoice number field
-     * Used by: JournalTransactionLine, PurchaseTransaction, SalesTransaction
-     *
-     * @var string|null
-     */
-    private $invoiceNumber;
-
-    /**
-     * @return null|string
-     */
-    public function getInvoiceNumber(): ?string
-    {
-        return $this->invoiceNumber;
-    }
-
-    /**
-     * @param null|string $invoiceNumber
-     * @return $this
-     */
-    public function setInvoiceNumber(?string $invoiceNumber): self
-    {
-        $this->invoiceNumber = $invoiceNumber;
-        return $this;
-    }
-}
\ No newline at end of file
diff --git a/src/Invoice.php b/src/Invoice.php
index 5771c268..9466d44a 100644
--- a/src/Invoice.php
+++ b/src/Invoice.php
@@ -16,12 +16,12 @@
 use PhpTwinfield\Fields\Invoice\InvoiceAddressNumberField;
 use PhpTwinfield\Fields\Invoice\InvoiceAmountField;
 use PhpTwinfield\Fields\Invoice\InvoiceDateField;
-use PhpTwinfield\Fields\Invoice\InvoiceNumberField;
 use PhpTwinfield\Fields\Invoice\InvoiceTypeField;
 use PhpTwinfield\Fields\Invoice\PaymentMethodField;
 use PhpTwinfield\Fields\Invoice\PeriodRaiseWarningField;
 use PhpTwinfield\Fields\Invoice\RaiseWarningField;
 use PhpTwinfield\Fields\Invoice\StatusField;
+use PhpTwinfield\Fields\InvoiceNumberField;
 use PhpTwinfield\Fields\OfficeField;
 use PhpTwinfield\Fields\PerformanceDateField;
 use PhpTwinfield\Fields\PeriodField;
diff --git a/src/JournalTransactionLine.php b/src/JournalTransactionLine.php
index d3f73df5..3fe8e04b 100644
--- a/src/JournalTransactionLine.php
+++ b/src/JournalTransactionLine.php
@@ -6,9 +6,9 @@
 use PhpTwinfield\Enums\LineType;
 use PhpTwinfield\Enums\PerformanceType;
 use PhpTwinfield\Enums\MatchStatus;
+use PhpTwinfield\Fields\InvoiceNumberField;
 use PhpTwinfield\Fields\PerformanceDateField;
 use PhpTwinfield\Fields\PerformanceTypeField;
-use PhpTwinfield\Fields\Transaction\InvoiceNumberField;
 use PhpTwinfield\Fields\Transaction\TransactionLine\BaselineField;
 use PhpTwinfield\Fields\Transaction\TransactionLine\CurrencyDateField;
 use PhpTwinfield\Fields\Transaction\TransactionLine\PerformanceCountryField;
diff --git a/src/Mappers/TransactionMapper.php b/src/Mappers/TransactionMapper.php
index 10dd6b94..88595386 100644
--- a/src/Mappers/TransactionMapper.php
+++ b/src/Mappers/TransactionMapper.php
@@ -11,10 +11,10 @@
 use PhpTwinfield\Fields\FreeText1Field;
 use PhpTwinfield\Fields\FreeText2Field;
 use PhpTwinfield\Fields\FreeText3Field;
+use PhpTwinfield\Fields\InvoiceNumberField;
 use PhpTwinfield\Fields\PerformanceDateField;
 use PhpTwinfield\Fields\PerformanceTypeField;
 use PhpTwinfield\Fields\Transaction\CloseAndStartValueFields;
-use PhpTwinfield\Fields\Transaction\InvoiceNumberField;
 use PhpTwinfield\Fields\Transaction\OriginReferenceField;
 use PhpTwinfield\Fields\Transaction\PaymentReferenceField;
 use PhpTwinfield\Fields\Transaction\RegimeField;
diff --git a/src/PurchaseTransaction.php b/src/PurchaseTransaction.php
index 05f6d7fc..cda947ab 100644
--- a/src/PurchaseTransaction.php
+++ b/src/PurchaseTransaction.php
@@ -3,7 +3,7 @@
 namespace PhpTwinfield;
 
 use PhpTwinfield\Fields\DueDateField;
-use PhpTwinfield\Fields\Transaction\InvoiceNumberField;
+use PhpTwinfield\Fields\InvoiceNumberField;
 use PhpTwinfield\Fields\Transaction\InvoiceNumberRaiseWarningField;
 use PhpTwinfield\Fields\Transaction\PaymentReferenceField;
 
diff --git a/src/SalesTransaction.php b/src/SalesTransaction.php
index b1a547b4..c86d7cac 100644
--- a/src/SalesTransaction.php
+++ b/src/SalesTransaction.php
@@ -3,7 +3,7 @@
 namespace PhpTwinfield;
 
 use PhpTwinfield\Fields\DueDateField;
-use PhpTwinfield\Fields\Transaction\InvoiceNumberField;
+use PhpTwinfield\Fields\InvoiceNumberField;
 use PhpTwinfield\Fields\Transaction\InvoiceNumberRaiseWarningField;
 use PhpTwinfield\Fields\Transaction\OriginReferenceField;
 use PhpTwinfield\Fields\Transaction\PaymentReferenceField;
diff --git a/tests/UnitTests/ApiConnectors/ActivityApiConnectorTest.php b/tests/UnitTests/ApiConnectors/ActivityApiConnectorTest.php
new file mode 100644
index 00000000..180800d4
--- /dev/null
+++ b/tests/UnitTests/ApiConnectors/ActivityApiConnectorTest.php
@@ -0,0 +1,67 @@
+<?php
+
+namespace PhpTwinfield\UnitTests;
+
+use PhpTwinfield\ApiConnectors\ActivityApiConnector;
+use PhpTwinfield\Activity;
+use PhpTwinfield\Response\Response;
+use PhpTwinfield\Secure\AuthenticatedConnection;
+use PhpTwinfield\Services\ProcessXmlService;
+use PHPUnit\Framework\TestCase;
+
+class ActivityApiConnectorTest extends TestCase
+{
+    /**
+     * @var ActivityApiConnector
+     */
+    protected $apiConnector;
+
+    /**
+     * @var ProcessXmlService|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $processXmlService;
+
+    protected function setUp()
+    {
+        parent::setUp();
+
+        $this->processXmlService = $this->getMockBuilder(ProcessXmlService::class)
+            ->setMethods(["sendDocument"])
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        /** @var AuthenticatedConnection|\PHPUnit_Framework_MockObject_MockObject $connection */
+        $connection = $this->createMock(AuthenticatedConnection::class);
+        $connection
+            ->expects($this->any())
+            ->method("getAuthenticatedClient")
+            ->willReturn($this->processXmlService);
+
+        $this->apiConnector = new ActivityApiConnector($connection);
+    }
+
+    private function createActivity(): Activity
+    {
+        $activity = new Activity();
+        return $activity;
+    }
+
+    public function testSendAllReturnsMappedObjects()
+    {
+        $response = Response::fromString(file_get_contents(
+            __DIR__."/resources/activity-response.xml"
+        ));
+
+        $this->processXmlService->expects($this->once())
+            ->method("sendDocument")
+            ->willReturn($response);
+
+        $activity = $this->createActivity();
+
+        $mapped = $this->apiConnector->send($activity);
+
+        $this->assertInstanceOf(Activity::class, $mapped);
+        $this->assertEquals("A001", $mapped->getCode());
+        $this->assertEquals("Test Activity", $mapped->getName());
+    }
+}
diff --git a/tests/UnitTests/ApiConnectors/AssetMethodApiConnectorTest.php b/tests/UnitTests/ApiConnectors/AssetMethodApiConnectorTest.php
new file mode 100644
index 00000000..595b4e2f
--- /dev/null
+++ b/tests/UnitTests/ApiConnectors/AssetMethodApiConnectorTest.php
@@ -0,0 +1,67 @@
+<?php
+
+namespace PhpTwinfield\UnitTests;
+
+use PhpTwinfield\ApiConnectors\AssetMethodApiConnector;
+use PhpTwinfield\AssetMethod;
+use PhpTwinfield\Response\Response;
+use PhpTwinfield\Secure\AuthenticatedConnection;
+use PhpTwinfield\Services\ProcessXmlService;
+use PHPUnit\Framework\TestCase;
+
+class AssetMethodApiConnectorTest extends TestCase
+{
+    /**
+     * @var AssetMethodApiConnector
+     */
+    protected $apiConnector;
+
+    /**
+     * @var ProcessXmlService|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $processXmlService;
+
+    protected function setUp()
+    {
+        parent::setUp();
+
+        $this->processXmlService = $this->getMockBuilder(ProcessXmlService::class)
+            ->setMethods(["sendDocument"])
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        /** @var AuthenticatedConnection|\PHPUnit_Framework_MockObject_MockObject $connection */
+        $connection = $this->createMock(AuthenticatedConnection::class);
+        $connection
+            ->expects($this->any())
+            ->method("getAuthenticatedClient")
+            ->willReturn($this->processXmlService);
+
+        $this->apiConnector = new AssetMethodApiConnector($connection);
+    }
+
+    private function createAssetMethod(): AssetMethod
+    {
+        $assetMethod = new AssetMethod();
+        return $assetMethod;
+    }
+
+    public function testSendAllReturnsMappedObjects()
+    {
+        $response = Response::fromString(file_get_contents(
+            __DIR__."/resources/assetmethod-response.xml"
+        ));
+
+        $this->processXmlService->expects($this->once())
+            ->method("sendDocument")
+            ->willReturn($response);
+
+        $assetMethod = $this->createAssetMethod();
+
+        $mapped = $this->apiConnector->send($assetMethod);
+
+        $this->assertInstanceOf(AssetMethod::class, $mapped);
+        $this->assertEquals("101", $mapped->getCode());
+        $this->assertEquals("Inventaris", $mapped->getName());
+    }
+}
diff --git a/tests/UnitTests/ApiConnectors/CostCenterApiConnectorTest.php b/tests/UnitTests/ApiConnectors/CostCenterApiConnectorTest.php
new file mode 100644
index 00000000..eb9b071e
--- /dev/null
+++ b/tests/UnitTests/ApiConnectors/CostCenterApiConnectorTest.php
@@ -0,0 +1,67 @@
+<?php
+
+namespace PhpTwinfield\UnitTests;
+
+use PhpTwinfield\ApiConnectors\CostCenterApiConnector;
+use PhpTwinfield\CostCenter;
+use PhpTwinfield\Response\Response;
+use PhpTwinfield\Secure\AuthenticatedConnection;
+use PhpTwinfield\Services\ProcessXmlService;
+use PHPUnit\Framework\TestCase;
+
+class CostCenterApiConnectorTest extends TestCase
+{
+    /**
+     * @var CostCenterApiConnector
+     */
+    protected $apiConnector;
+
+    /**
+     * @var ProcessXmlService|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $processXmlService;
+
+    protected function setUp()
+    {
+        parent::setUp();
+
+        $this->processXmlService = $this->getMockBuilder(ProcessXmlService::class)
+            ->setMethods(["sendDocument"])
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        /** @var AuthenticatedConnection|\PHPUnit_Framework_MockObject_MockObject $connection */
+        $connection = $this->createMock(AuthenticatedConnection::class);
+        $connection
+            ->expects($this->any())
+            ->method("getAuthenticatedClient")
+            ->willReturn($this->processXmlService);
+
+        $this->apiConnector = new CostCenterApiConnector($connection);
+    }
+
+    private function createCostCenter(): CostCenter
+    {
+        $costCenter = new CostCenter();
+        return $costCenter;
+    }
+
+    public function testSendAllReturnsMappedObjects()
+    {
+        $response = Response::fromString(file_get_contents(
+            __DIR__."/resources/costcenter-response.xml"
+        ));
+
+        $this->processXmlService->expects($this->once())
+            ->method("sendDocument")
+            ->willReturn($response);
+
+        $costCenter = $this->createCostCenter();
+
+        $mapped = $this->apiConnector->send($costCenter);
+
+        $this->assertInstanceOf(CostCenter::class, $mapped);
+        $this->assertEquals("00001", $mapped->getCode());
+        $this->assertEquals("Hoevelaken", $mapped->getName());
+    }
+}
diff --git a/tests/UnitTests/ApiConnectors/CustomerApiConnectorTest.php b/tests/UnitTests/ApiConnectors/CustomerApiConnectorTest.php
index eb7e875d..5ac98ae2 100644
--- a/tests/UnitTests/ApiConnectors/CustomerApiConnectorTest.php
+++ b/tests/UnitTests/ApiConnectors/CustomerApiConnectorTest.php
@@ -49,7 +49,7 @@ private function createCustomer(): Customer
     public function testSendAllReturnsMappedObjects()
     {
         $response = Response::fromString(file_get_contents(
-            __DIR__."/resources/customers-response.xml"
+            __DIR__."/resources/customer-response.xml"
         ));
 
         $this->processXmlService->expects($this->once())
diff --git a/tests/UnitTests/ApiConnectors/DimensionGroupApiConnectorTest.php b/tests/UnitTests/ApiConnectors/DimensionGroupApiConnectorTest.php
new file mode 100644
index 00000000..3b0eceb4
--- /dev/null
+++ b/tests/UnitTests/ApiConnectors/DimensionGroupApiConnectorTest.php
@@ -0,0 +1,67 @@
+<?php
+
+namespace PhpTwinfield\UnitTests;
+
+use PhpTwinfield\ApiConnectors\DimensionGroupApiConnector;
+use PhpTwinfield\DimensionGroup;
+use PhpTwinfield\Response\Response;
+use PhpTwinfield\Secure\AuthenticatedConnection;
+use PhpTwinfield\Services\ProcessXmlService;
+use PHPUnit\Framework\TestCase;
+
+class DimensionGroupApiConnectorTest extends TestCase
+{
+    /**
+     * @var DimensionGroupApiConnector
+     */
+    protected $apiConnector;
+
+    /**
+     * @var ProcessXmlService|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $processXmlService;
+
+    protected function setUp()
+    {
+        parent::setUp();
+
+        $this->processXmlService = $this->getMockBuilder(ProcessXmlService::class)
+            ->setMethods(["sendDocument"])
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        /** @var AuthenticatedConnection|\PHPUnit_Framework_MockObject_MockObject $connection */
+        $connection = $this->createMock(AuthenticatedConnection::class);
+        $connection
+            ->expects($this->any())
+            ->method("getAuthenticatedClient")
+            ->willReturn($this->processXmlService);
+
+        $this->apiConnector = new DimensionGroupApiConnector($connection);
+    }
+
+    private function createDimensionGroup(): DimensionGroup
+    {
+        $dimensionGroup = new DimensionGroup();
+        return $dimensionGroup;
+    }
+
+    public function testSendAllReturnsMappedObjects()
+    {
+        $response = Response::fromString(file_get_contents(
+            __DIR__."/resources/dimensiongroup-response.xml"
+        ));
+
+        $this->processXmlService->expects($this->once())
+            ->method("sendDocument")
+            ->willReturn($response);
+
+        $dimensionGroup = $this->createDimensionGroup();
+
+        $mapped = $this->apiConnector->send($dimensionGroup);
+
+        $this->assertInstanceOf(DimensionGroup::class, $mapped);
+        $this->assertEquals("TSTDIMGRP", $mapped->getCode());
+        $this->assertEquals("Test Dimension Group", $mapped->getName());
+    }
+}
diff --git a/tests/UnitTests/ApiConnectors/DimensionTypeApiConnectorTest.php b/tests/UnitTests/ApiConnectors/DimensionTypeApiConnectorTest.php
new file mode 100644
index 00000000..bd074fe0
--- /dev/null
+++ b/tests/UnitTests/ApiConnectors/DimensionTypeApiConnectorTest.php
@@ -0,0 +1,67 @@
+<?php
+
+namespace PhpTwinfield\UnitTests;
+
+use PhpTwinfield\ApiConnectors\DimensionTypeApiConnector;
+use PhpTwinfield\DimensionType;
+use PhpTwinfield\Response\Response;
+use PhpTwinfield\Secure\AuthenticatedConnection;
+use PhpTwinfield\Services\ProcessXmlService;
+use PHPUnit\Framework\TestCase;
+
+class DimensionTypeApiConnectorTest extends TestCase
+{
+    /**
+     * @var DimensionTypeApiConnector
+     */
+    protected $apiConnector;
+
+    /**
+     * @var ProcessXmlService|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $processXmlService;
+
+    protected function setUp()
+    {
+        parent::setUp();
+
+        $this->processXmlService = $this->getMockBuilder(ProcessXmlService::class)
+            ->setMethods(["sendDocument"])
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        /** @var AuthenticatedConnection|\PHPUnit_Framework_MockObject_MockObject $connection */
+        $connection = $this->createMock(AuthenticatedConnection::class);
+        $connection
+            ->expects($this->any())
+            ->method("getAuthenticatedClient")
+            ->willReturn($this->processXmlService);
+
+        $this->apiConnector = new DimensionTypeApiConnector($connection);
+    }
+
+    private function createDimensionType(): DimensionType
+    {
+        $dimensionType = new DimensionType();
+        return $dimensionType;
+    }
+
+    public function testSendAllReturnsMappedObjects()
+    {
+        $response = Response::fromString(file_get_contents(
+            __DIR__."/resources/dimensiontype-response.xml"
+        ));
+
+        $this->processXmlService->expects($this->once())
+            ->method("sendDocument")
+            ->willReturn($response);
+
+        $dimensionType = $this->createDimensionType();
+
+        $mapped = $this->apiConnector->send($dimensionType);
+
+        $this->assertInstanceOf(DimensionType::class, $mapped);
+        $this->assertEquals("DEB", $mapped->getCode());
+        $this->assertEquals("Debiteuren", $mapped->getName());
+    }
+}
diff --git a/tests/UnitTests/ApiConnectors/FixedAssetApiConnectorTest.php b/tests/UnitTests/ApiConnectors/FixedAssetApiConnectorTest.php
new file mode 100644
index 00000000..7fda71d7
--- /dev/null
+++ b/tests/UnitTests/ApiConnectors/FixedAssetApiConnectorTest.php
@@ -0,0 +1,67 @@
+<?php
+
+namespace PhpTwinfield\UnitTests;
+
+use PhpTwinfield\ApiConnectors\FixedAssetApiConnector;
+use PhpTwinfield\FixedAsset;
+use PhpTwinfield\Response\Response;
+use PhpTwinfield\Secure\AuthenticatedConnection;
+use PhpTwinfield\Services\ProcessXmlService;
+use PHPUnit\Framework\TestCase;
+
+class FixedAssetApiConnectorTest extends TestCase
+{
+    /**
+     * @var FixedAssetApiConnector
+     */
+    protected $apiConnector;
+
+    /**
+     * @var ProcessXmlService|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $processXmlService;
+
+    protected function setUp()
+    {
+        parent::setUp();
+
+        $this->processXmlService = $this->getMockBuilder(ProcessXmlService::class)
+            ->setMethods(["sendDocument"])
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        /** @var AuthenticatedConnection|\PHPUnit_Framework_MockObject_MockObject $connection */
+        $connection = $this->createMock(AuthenticatedConnection::class);
+        $connection
+            ->expects($this->any())
+            ->method("getAuthenticatedClient")
+            ->willReturn($this->processXmlService);
+
+        $this->apiConnector = new FixedAssetApiConnector($connection);
+    }
+
+    private function createFixedAsset(): FixedAsset
+    {
+        $fixedAsset = new FixedAsset();
+        return $fixedAsset;
+    }
+
+    public function testSendAllReturnsMappedObjects()
+    {
+        $response = Response::fromString(file_get_contents(
+            __DIR__."/resources/fixedasset-response.xml"
+        ));
+
+        $this->processXmlService->expects($this->once())
+            ->method("sendDocument")
+            ->willReturn($response);
+
+        $fixedAsset = $this->createFixedAsset();
+
+        $mapped = $this->apiConnector->send($fixedAsset);
+
+        $this->assertInstanceOf(FixedAsset::class, $mapped);
+        $this->assertEquals("60000", $mapped->getCode());
+        $this->assertEquals("Afschrijving Computer", $mapped->getName());
+    }
+}
diff --git a/tests/UnitTests/ApiConnectors/GeneralLedgerApiConnectorTest.php b/tests/UnitTests/ApiConnectors/GeneralLedgerApiConnectorTest.php
new file mode 100644
index 00000000..1329bca9
--- /dev/null
+++ b/tests/UnitTests/ApiConnectors/GeneralLedgerApiConnectorTest.php
@@ -0,0 +1,67 @@
+<?php
+
+namespace PhpTwinfield\UnitTests;
+
+use PhpTwinfield\ApiConnectors\GeneralLedgerApiConnector;
+use PhpTwinfield\GeneralLedger;
+use PhpTwinfield\Response\Response;
+use PhpTwinfield\Secure\AuthenticatedConnection;
+use PhpTwinfield\Services\ProcessXmlService;
+use PHPUnit\Framework\TestCase;
+
+class GeneralLedgerApiConnectorTest extends TestCase
+{
+    /**
+     * @var GeneralLedgerApiConnector
+     */
+    protected $apiConnector;
+
+    /**
+     * @var ProcessXmlService|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $processXmlService;
+
+    protected function setUp()
+    {
+        parent::setUp();
+
+        $this->processXmlService = $this->getMockBuilder(ProcessXmlService::class)
+            ->setMethods(["sendDocument"])
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        /** @var AuthenticatedConnection|\PHPUnit_Framework_MockObject_MockObject $connection */
+        $connection = $this->createMock(AuthenticatedConnection::class);
+        $connection
+            ->expects($this->any())
+            ->method("getAuthenticatedClient")
+            ->willReturn($this->processXmlService);
+
+        $this->apiConnector = new GeneralLedgerApiConnector($connection);
+    }
+
+    private function createGeneralLedger(): GeneralLedger
+    {
+        $generalLedger = new GeneralLedger();
+        return $generalLedger;
+    }
+
+    public function testSendAllReturnsMappedObjects()
+    {
+        $response = Response::fromString(file_get_contents(
+            __DIR__."/resources/generalledger-response.xml"
+        ));
+
+        $this->processXmlService->expects($this->once())
+            ->method("sendDocument")
+            ->willReturn($response);
+
+        $generalLedger = $this->createGeneralLedger();
+
+        $mapped = $this->apiConnector->send($generalLedger);
+
+        $this->assertInstanceOf(GeneralLedger::class, $mapped);
+        $this->assertEquals("4004", $mapped->getCode());
+        $this->assertEquals("Bonussen/gratificaties", $mapped->getName());
+    }
+}
diff --git a/tests/UnitTests/ApiConnectors/InvoiceApiConnectorTest.php b/tests/UnitTests/ApiConnectors/InvoiceApiConnectorTest.php
new file mode 100644
index 00000000..9be43557
--- /dev/null
+++ b/tests/UnitTests/ApiConnectors/InvoiceApiConnectorTest.php
@@ -0,0 +1,67 @@
+<?php
+
+namespace PhpTwinfield\UnitTests;
+
+use PhpTwinfield\ApiConnectors\InvoiceApiConnector;
+use PhpTwinfield\Invoice;
+use PhpTwinfield\Response\Response;
+use PhpTwinfield\Secure\AuthenticatedConnection;
+use PhpTwinfield\Services\ProcessXmlService;
+use PHPUnit\Framework\TestCase;
+
+class InvoiceApiConnectorTest extends TestCase
+{
+    /**
+     * @var InvoiceApiConnector
+     */
+    protected $apiConnector;
+
+    /**
+     * @var ProcessXmlService|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $processXmlService;
+
+    protected function setUp()
+    {
+        parent::setUp();
+
+        $this->processXmlService = $this->getMockBuilder(ProcessXmlService::class)
+            ->setMethods(["sendDocument"])
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        /** @var AuthenticatedConnection|\PHPUnit_Framework_MockObject_MockObject $connection */
+        $connection = $this->createMock(AuthenticatedConnection::class);
+        $connection
+            ->expects($this->any())
+            ->method("getAuthenticatedClient")
+            ->willReturn($this->processXmlService);
+
+        $this->apiConnector = new InvoiceApiConnector($connection);
+    }
+
+    private function createInvoice(): Invoice
+    {
+        $invoice = new Invoice();
+        return $invoice;
+    }
+
+    public function testSendAllReturnsMappedObjects()
+    {
+        $response = Response::fromString(file_get_contents(
+            __DIR__."/resources/invoice-response.xml"
+        ));
+
+        $this->processXmlService->expects($this->once())
+            ->method("sendDocument")
+            ->willReturn($response);
+
+        $invoice = $this->createInvoice();
+
+        $mapped = $this->apiConnector->send($invoice);
+
+        $this->assertInstanceOf(Invoice::class, $mapped);
+        $this->assertEquals("10", $mapped->getInvoiceNumber());
+        $this->assertEquals("20190410", $mapped->getInvoiceDateToString());
+    }
+}
diff --git a/tests/UnitTests/ApiConnectors/ProjectApiConnectorTest.php b/tests/UnitTests/ApiConnectors/ProjectApiConnectorTest.php
new file mode 100644
index 00000000..9d531398
--- /dev/null
+++ b/tests/UnitTests/ApiConnectors/ProjectApiConnectorTest.php
@@ -0,0 +1,67 @@
+<?php
+
+namespace PhpTwinfield\UnitTests;
+
+use PhpTwinfield\ApiConnectors\ProjectApiConnector;
+use PhpTwinfield\Project;
+use PhpTwinfield\Response\Response;
+use PhpTwinfield\Secure\AuthenticatedConnection;
+use PhpTwinfield\Services\ProcessXmlService;
+use PHPUnit\Framework\TestCase;
+
+class ProjectApiConnectorTest extends TestCase
+{
+    /**
+     * @var ProjectApiConnector
+     */
+    protected $apiConnector;
+
+    /**
+     * @var ProcessXmlService|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $processXmlService;
+
+    protected function setUp()
+    {
+        parent::setUp();
+
+        $this->processXmlService = $this->getMockBuilder(ProcessXmlService::class)
+            ->setMethods(["sendDocument"])
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        /** @var AuthenticatedConnection|\PHPUnit_Framework_MockObject_MockObject $connection */
+        $connection = $this->createMock(AuthenticatedConnection::class);
+        $connection
+            ->expects($this->any())
+            ->method("getAuthenticatedClient")
+            ->willReturn($this->processXmlService);
+
+        $this->apiConnector = new ProjectApiConnector($connection);
+    }
+
+    private function createProject(): Project
+    {
+        $project = new Project();
+        return $project;
+    }
+
+    public function testSendAllReturnsMappedObjects()
+    {
+        $response = Response::fromString(file_get_contents(
+            __DIR__."/resources/project-response.xml"
+        ));
+
+        $this->processXmlService->expects($this->once())
+            ->method("sendDocument")
+            ->willReturn($response);
+
+        $project = $this->createProject();
+
+        $mapped = $this->apiConnector->send($project);
+
+        $this->assertInstanceOf(Project::class, $mapped);
+        $this->assertEquals("P0000", $mapped->getCode());
+        $this->assertEquals("Project direct", $mapped->getName());
+    }
+}
diff --git a/tests/UnitTests/ApiConnectors/RateApiConnectorTest.php b/tests/UnitTests/ApiConnectors/RateApiConnectorTest.php
new file mode 100644
index 00000000..fc1025b0
--- /dev/null
+++ b/tests/UnitTests/ApiConnectors/RateApiConnectorTest.php
@@ -0,0 +1,67 @@
+<?php
+
+namespace PhpTwinfield\UnitTests;
+
+use PhpTwinfield\ApiConnectors\RateApiConnector;
+use PhpTwinfield\Rate;
+use PhpTwinfield\Response\Response;
+use PhpTwinfield\Secure\AuthenticatedConnection;
+use PhpTwinfield\Services\ProcessXmlService;
+use PHPUnit\Framework\TestCase;
+
+class RateApiConnectorTest extends TestCase
+{
+    /**
+     * @var RateApiConnector
+     */
+    protected $apiConnector;
+
+    /**
+     * @var ProcessXmlService|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $processXmlService;
+
+    protected function setUp()
+    {
+        parent::setUp();
+
+        $this->processXmlService = $this->getMockBuilder(ProcessXmlService::class)
+            ->setMethods(["sendDocument"])
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        /** @var AuthenticatedConnection|\PHPUnit_Framework_MockObject_MockObject $connection */
+        $connection = $this->createMock(AuthenticatedConnection::class);
+        $connection
+            ->expects($this->any())
+            ->method("getAuthenticatedClient")
+            ->willReturn($this->processXmlService);
+
+        $this->apiConnector = new RateApiConnector($connection);
+    }
+
+    private function createRate(): Rate
+    {
+        $rate = new Rate();
+        return $rate;
+    }
+
+    public function testSendAllReturnsMappedObjects()
+    {
+        $response = Response::fromString(file_get_contents(
+            __DIR__."/resources/rate-response.xml"
+        ));
+
+        $this->processXmlService->expects($this->once())
+            ->method("sendDocument")
+            ->willReturn($response);
+
+        $rate = $this->createRate();
+
+        $mapped = $this->apiConnector->send($rate);
+
+        $this->assertInstanceOf(Rate::class, $mapped);
+        $this->assertEquals("DIRECT", $mapped->getCode());
+        $this->assertEquals("Direct rate", $mapped->getName());
+    }
+}
diff --git a/tests/UnitTests/ApiConnectors/SupplierApiConnectorTest.php b/tests/UnitTests/ApiConnectors/SupplierApiConnectorTest.php
new file mode 100644
index 00000000..8fb73c1c
--- /dev/null
+++ b/tests/UnitTests/ApiConnectors/SupplierApiConnectorTest.php
@@ -0,0 +1,67 @@
+<?php
+
+namespace PhpTwinfield\UnitTests;
+
+use PhpTwinfield\ApiConnectors\SupplierApiConnector;
+use PhpTwinfield\Supplier;
+use PhpTwinfield\Response\Response;
+use PhpTwinfield\Secure\AuthenticatedConnection;
+use PhpTwinfield\Services\ProcessXmlService;
+use PHPUnit\Framework\TestCase;
+
+class SupplierApiConnectorTest extends TestCase
+{
+    /**
+     * @var SupplierApiConnector
+     */
+    protected $apiConnector;
+
+    /**
+     * @var ProcessXmlService|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $processXmlService;
+
+    protected function setUp()
+    {
+        parent::setUp();
+
+        $this->processXmlService = $this->getMockBuilder(ProcessXmlService::class)
+            ->setMethods(["sendDocument"])
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        /** @var AuthenticatedConnection|\PHPUnit_Framework_MockObject_MockObject $connection */
+        $connection = $this->createMock(AuthenticatedConnection::class);
+        $connection
+            ->expects($this->any())
+            ->method("getAuthenticatedClient")
+            ->willReturn($this->processXmlService);
+
+        $this->apiConnector = new SupplierApiConnector($connection);
+    }
+
+    private function createSupplier(): Supplier
+    {
+        $supplier = new Supplier();
+        return $supplier;
+    }
+
+    public function testSendAllReturnsMappedObjects()
+    {
+        $response = Response::fromString(file_get_contents(
+            __DIR__."/resources/supplier-response.xml"
+        ));
+
+        $this->processXmlService->expects($this->once())
+            ->method("sendDocument")
+            ->willReturn($response);
+
+        $supplier = $this->createSupplier();
+
+        $mapped = $this->apiConnector->send($supplier);
+
+        $this->assertInstanceOf(Supplier::class, $mapped);
+        $this->assertEquals("2000", $mapped->getCode());
+        $this->assertEquals("Smits", $mapped->getName());
+    }
+}
diff --git a/tests/UnitTests/ApiConnectors/TransactionApiConnectorTest.php b/tests/UnitTests/ApiConnectors/TransactionApiConnectorTest.php
index d4be823e..e6c7ba6a 100644
--- a/tests/UnitTests/ApiConnectors/TransactionApiConnectorTest.php
+++ b/tests/UnitTests/ApiConnectors/TransactionApiConnectorTest.php
@@ -2,7 +2,6 @@
 
 namespace PhpTwinfield\UnitTests;
 
-use Money\Currency;
 use PhpTwinfield\ApiConnectors\TransactionApiConnector;
 use PhpTwinfield\BaseTransaction;
 use PhpTwinfield\Enums\Destiny;
diff --git a/tests/UnitTests/ApiConnectors/VatCodeApiConnectorTest.php b/tests/UnitTests/ApiConnectors/VatCodeApiConnectorTest.php
new file mode 100644
index 00000000..cd63624b
--- /dev/null
+++ b/tests/UnitTests/ApiConnectors/VatCodeApiConnectorTest.php
@@ -0,0 +1,67 @@
+<?php
+
+namespace PhpTwinfield\UnitTests;
+
+use PhpTwinfield\ApiConnectors\VatCodeApiConnector;
+use PhpTwinfield\VatCode;
+use PhpTwinfield\Response\Response;
+use PhpTwinfield\Secure\AuthenticatedConnection;
+use PhpTwinfield\Services\ProcessXmlService;
+use PHPUnit\Framework\TestCase;
+
+class VatCodeApiConnectorTest extends TestCase
+{
+    /**
+     * @var VatCodeApiConnector
+     */
+    protected $apiConnector;
+
+    /**
+     * @var ProcessXmlService|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $processXmlService;
+
+    protected function setUp()
+    {
+        parent::setUp();
+
+        $this->processXmlService = $this->getMockBuilder(ProcessXmlService::class)
+            ->setMethods(["sendDocument"])
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        /** @var AuthenticatedConnection|\PHPUnit_Framework_MockObject_MockObject $connection */
+        $connection = $this->createMock(AuthenticatedConnection::class);
+        $connection
+            ->expects($this->any())
+            ->method("getAuthenticatedClient")
+            ->willReturn($this->processXmlService);
+
+        $this->apiConnector = new VatCodeApiConnector($connection);
+    }
+
+    private function createVatCode(): VatCode
+    {
+        $vatCode = new VatCode();
+        return $vatCode;
+    }
+
+    public function testSendAllReturnsMappedObjects()
+    {
+        $response = Response::fromString(file_get_contents(
+            __DIR__."/resources/vatcode-response.xml"
+        ));
+
+        $this->processXmlService->expects($this->once())
+            ->method("sendDocument")
+            ->willReturn($response);
+
+        $vatCode = $this->createVatCode();
+
+        $mapped = $this->apiConnector->send($vatCode);
+
+        $this->assertInstanceOf(VatCode::class, $mapped);
+        $this->assertEquals("VH", $mapped->getCode());
+        $this->assertEquals("VAT Sales High", $mapped->getName());
+    }
+}
diff --git a/tests/UnitTests/ApiConnectors/resources/2-failed-and-1-successful-banktransactions.xml b/tests/UnitTests/ApiConnectors/resources/2-failed-and-1-successful-banktransactions.xml
deleted file mode 100644
index 848ba3d8..00000000
--- a/tests/UnitTests/ApiConnectors/resources/2-failed-and-1-successful-banktransactions.xml
+++ /dev/null
@@ -1,178 +0,0 @@
-<?xml version="1.0"?>
-<transactions result="0">
-  <transaction destiny="temporary" autobalancevat="false" raisewarning="false" msgtype="error" msg="De boeking is niet in balans. Er ontbreekt 0.01 debet.//De boeking balanceert niet in de basisvaluta. Er ontbreekt 0.01 debet.//De boeking balanceert niet in de rapportagevaluta. Er ontbreekt 0.01 debet." result="0">
-    <header>
-      <code name="Standaard bank" shortname="Standaard bank">BNK</code>
-      <office name="My office" shortname="My office">OFFICE001</office>
-      <period>2017/06</period>
-      <date>20170901</date>
-      <currency name="Euro" shortname="Euro">EUR</currency>
-      <startvalue>0.00</startvalue>
-      <closevalue>0.00</closevalue>
-      <origin>import</origin>
-      <user name="Chuck-Norris" shortname="Chuck-Norris">CHUCK-NORRIS</user>
-      <regime>generic</regime>
-      <statementnumber>0</statementnumber>
-    </header>
-    <lines>
-      <line type="total" id="1">
-        <dim1 name="Standaard bank" shortname="" type="BAS" inuse="true" vatcode="" vatobligatory="false">1100</dim1>
-        <debitcredit>credit</debitcredit>
-        <value>0.01</value>
-        <invoicenumber>2017.123456</invoicenumber>
-        <description>2017.123456</description>
-        <comment>2017.123456</comment>
-        <rate>1</rate>
-        <basevalue>0.01</basevalue>
-        <reprate>1</reprate>
-        <repvalue>0.01</repvalue>
-        <matchstatus>notmatchable</matchstatus>
-      </line>
-      <line type="detail" id="2">
-        <dim1 name="Tussenrekening" shortname="" type="BAS" inuse="true" vatcode="" vatobligatory="false">1800</dim1>
-        <debitcredit>credit</debitcredit>
-        <value>12.90</value>
-        <invoicenumber>2017.123456</invoicenumber>
-        <description>2017.123456</description>
-        <comment>2017.123456</comment>
-        <rate>1</rate>
-        <basevalue>12.90</basevalue>
-        <reprate>1</reprate>
-        <repvalue>12.90</repvalue>
-        <currencydate/>
-        <matchstatus>notmatchable</matchstatus>
-      </line>
-      <line type="detail" id="3">
-        <dim1 name="Hoog 21%" shortname="" type="PNL" inuse="true" vatcode="" vatobligatory="false">4700</dim1>
-        <debitcredit>debit</debitcredit>
-        <value>12.90</value>
-        <invoicenumber>2017.123456</invoicenumber>
-        <description>Some description</description>
-        <comment>Some comment</comment>
-        <rate>1</rate>
-        <basevalue>12.90</basevalue>
-        <reprate>1</reprate>
-        <repvalue>12.90</repvalue>
-        <currencydate/>
-        <matchstatus>notmatchable</matchstatus>
-      </line>
-    </lines>
-  </transaction>
-  <transaction destiny="temporary" autobalancevat="false" raisewarning="false" msgtype="error" msg="De boeking is niet in balans. Er ontbreekt 0.01 debet.//De boeking balanceert niet in de basisvaluta. Er ontbreekt 0.01 debet.//De boeking balanceert niet in de rapportagevaluta. Er ontbreekt 0.01 debet." result="0">
-    <header>
-      <code name="Standaard bank" shortname="Standaard bank">BNK</code>
-      <office name="My Office" shortname="My Office">OFFICE001</office>
-      <period>2017/07</period>
-      <date>20170901</date>
-      <currency name="Euro" shortname="Euro">EUR</currency>
-      <startvalue>0.00</startvalue>
-      <closevalue>0.00</closevalue>
-      <origin>import</origin>
-      <user name="Chuck-Norris" shortname="Chuck-Norris">CHUCK-NORRIS</user>
-      <regime>generic</regime>
-      <statementnumber>0</statementnumber>
-    </header>
-    <lines>
-      <line type="total" id="1">
-        <dim1 name="Standaard bank" shortname="" type="BAS" inuse="true" vatcode="" vatobligatory="false">1100</dim1>
-        <debitcredit>credit</debitcredit>
-        <value>0.01</value>
-        <invoicenumber>2017.123456</invoicenumber>
-        <description>2017.123456</description>
-        <comment>2017.123456</comment>
-        <rate>1</rate>
-        <basevalue>0.01</basevalue>
-        <reprate>1</reprate>
-        <repvalue>0.01</repvalue>
-        <matchstatus>notmatchable</matchstatus>
-      </line>
-      <line type="detail" id="2">
-        <dim1 name="Tussenrekening" shortname="" type="BAS" inuse="true" vatcode="" vatobligatory="false">1800</dim1>
-        <debitcredit>credit</debitcredit>
-        <value>5.15</value>
-        <invoicenumber>2017.123456</invoicenumber>
-        <description>2017.123456</description>
-        <comment>2017.123456</comment>
-        <rate>1</rate>
-        <basevalue>5.15</basevalue>
-        <reprate>1</reprate>
-        <repvalue>5.15</repvalue>
-        <currencydate/>
-        <matchstatus>notmatchable</matchstatus>
-      </line>
-      <line type="detail" id="3">
-        <dim1 name="Hoog 21%" shortname="" type="PNL" inuse="true" vatcode="" vatobligatory="false">4700</dim1>
-        <debitcredit>debit</debitcredit>
-        <value>5.15</value>
-        <invoicenumber>2017.123456</invoicenumber>
-        <description>Some other description</description>
-        <comment>Some other comment</comment>
-        <rate>1</rate>
-        <basevalue>5.15</basevalue>
-        <reprate>1</reprate>
-        <repvalue>5.15</repvalue>
-        <currencydate/>
-        <matchstatus>notmatchable</matchstatus>
-      </line>
-    </lines>
-  </transaction>
-  <transaction autobalancevat="false" raisewarning="false" result="1" location="temporary">
-    <header>
-      <code name="Standaard bank" shortname="Standaard bank">BNK</code>
-      <office name="My Office" shortname="My Office">OFFICE001</office>
-      <period>2017/08</period>
-      <date>20170901</date>
-      <currency name="Euro" shortname="Euro">EUR</currency>
-      <startvalue>0.00</startvalue>
-      <closevalue>0.00</closevalue>
-      <origin>import</origin>
-      <user name="Chuck-Norris" shortname="Chuck-Norris">CHUCK-NORRIS</user>
-      <regime>generic</regime>
-      <statementnumber>0</statementnumber>
-      <number>201700334</number>
-    </header>
-    <lines>
-      <line type="total" id="1">
-        <dim1 name="Standaard bank" shortname="" type="BAS" inuse="true" vatcode="" vatobligatory="false">1100</dim1>
-        <debitcredit>debit</debitcredit>
-        <value>0.00</value>
-        <invoicenumber>2017.123456</invoicenumber>
-        <description>2017.123456</description>
-        <comment>2017.123456</comment>
-        <rate>1</rate>
-        <basevalue>0.00</basevalue>
-        <reprate>1</reprate>
-        <repvalue>0.00</repvalue>
-        <matchstatus>notmatchable</matchstatus>
-      </line>
-      <line type="detail" id="2">
-        <dim1 name="Tussenrekening" shortname="" type="BAS" inuse="true" vatcode="" vatobligatory="false">1800</dim1>
-        <debitcredit>debit</debitcredit>
-        <value>0.87</value>
-        <invoicenumber>2017.123456</invoicenumber>
-        <description>2017.123456</description>
-        <comment>2017.123456</comment>
-        <rate>1</rate>
-        <basevalue>0.87</basevalue>
-        <reprate>1</reprate>
-        <repvalue>0.87</repvalue>
-        <currencydate/>
-        <matchstatus>notmatchable</matchstatus>
-      </line>
-      <line type="detail" id="3">
-        <dim1 name="Omzet" shortname="" type="PNL" inuse="true" vatcode="" vatobligatory="false">8000</dim1>
-        <debitcredit>credit</debitcredit>
-        <value>0.87</value>
-        <invoicenumber>2017.123456</invoicenumber>
-        <description>Last description</description>
-        <comment>Last comment</comment>
-        <rate>1</rate>
-        <basevalue>0.87</basevalue>
-        <reprate>1</reprate>
-        <repvalue>0.87</repvalue>
-        <currencydate/>
-        <matchstatus>notmatchable</matchstatus>
-      </line>
-    </lines>
-  </transaction>
-</transactions>
\ No newline at end of file
diff --git a/tests/UnitTests/ApiConnectors/resources/activity-response.xml b/tests/UnitTests/ApiConnectors/resources/activity-response.xml
new file mode 100644
index 00000000..116f75d2
--- /dev/null
+++ b/tests/UnitTests/ApiConnectors/resources/activity-response.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0"?>
+<dimension status="active" result="1">
+    <office name="Development BV" shortname="Development BV">DEV1000</office>
+    <type name="Activiteiten" shortname="Activiteiten">ACT</type>
+    <code>A001</code>
+    <uid>149e5dcb-8b37-446b-b865-f3928572618f</uid>
+    <name>Test Activity</name>
+    <shortname>TstAct</shortname>
+    <inuse>false</inuse
+    ><behaviour>normal</behaviour>
+    <touched>1</touched>
+    <beginperiod>0</beginperiod>
+    <beginyear>0</beginyear>
+    <endperiod>0</endperiod>
+    <endyear>0</endyear>
+    <website/>
+    <cocnumber/>
+    <vatnumber/>
+    <editdimensionname>true</editdimensionname>
+    <financials>
+        <matchtype>notmatchable</matchtype>
+        <accounttype>inherit</accounttype>
+        <subanalyse>false</subanalyse>
+        <duedays>0</duedays>
+        <level>4</level>
+        <payavailable>false</payavailable>
+        <meansofpayment>none</meansofpayment>
+        <paycode name="" shortname=""/>
+        <ebilling>false</ebilling>
+        <ebillmail/>
+        <substitutionlevel>0</substitutionlevel>
+        <substitutewith/>
+        <relationsreference/>
+        <vattype name="" shortname=""/>
+        <vatcode fixed="false"/>
+        <vatobligatory>false</vatobligatory>
+        <performancetype/>
+        <collectmandate>
+            <id>A001</id>
+            <signaturedate/>
+            <firstrundate/>
+        </collectmandate>
+        <collectionschema>core</collectionschema>
+        <childvalidations>
+            <childvalidation type="type" level="3">PRJ</childvalidation>
+        </childvalidations>
+    </financials>
+    <remittanceadvice>
+        <sendtype>ToFileManager</sendtype>
+        <sendmail/>
+    </remittanceadvice>
+    <banks/>
+    <projects>
+        <invoicedescription/>
+        <validfrom/>
+        <validtill/>
+        <authoriser locked="true" inherit="true"/>
+        <customer locked="true" inherit="true"/>
+        <billable locked="false" inherit="false" forratio="false">true</billable>
+        <rate locked="true" inherit="true"/>
+        <quantities/>
+    </projects>
+</dimension>
\ No newline at end of file
diff --git a/tests/UnitTests/ApiConnectors/resources/article-response.xml b/tests/UnitTests/ApiConnectors/resources/article-response.xml
new file mode 100644
index 00000000..6de9f20f
--- /dev/null
+++ b/tests/UnitTests/ApiConnectors/resources/article-response.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0"?>
+<article result="1">
+    <header status="active">
+        <office>DEV1000</office>
+        <code>9060</code>
+        <type>normal</type>
+        <name>Test Article</name>
+        <shortname>TstArt</shortname>
+        <unitnamesingular>Test Article</unitnamesingular>
+        <unitnameplural>Test Articles</unitnameplural>
+        <vatcode>VN</vatcode>
+        <allowchangevatcode>false</allowchangevatcode>
+        <performancetype/>
+        <allowchangeperformancetype>false</allowchangeperformancetype>
+        <percentage>false</percentage>
+        <allowdiscountorpremium>true</allowdiscountorpremium>
+        <allowchangeunitsprice>true</allowchangeunitsprice>
+        <allowdecimalquantity>true</allowdecimalquantity>
+    </header>
+    <lines>
+        <line inuse="true" status="active">
+            <unitspriceexcl>0.00</unitspriceexcl>
+            <unitspriceinc>0.00</unitspriceinc>
+            <units>1</units>
+            <name>Test SubArticle</name>
+            <shortname>TstSubArt</shortname>
+            <subcode>9060</subcode>
+            <freetext1 name="Afrondingsverschillen" shortname="Afrondingsverschille" dimensiontype="PNL">9060</freetext1>
+            <freetext2 name="" shortname="" dimensiontype=""/>
+            <freetext3/>
+            <freetext4/>
+            <freetext5/>
+            <freetext6/>
+        </line>
+    </lines>
+</article>
\ No newline at end of file
diff --git a/tests/UnitTests/ApiConnectors/resources/assetmethod-response.xml b/tests/UnitTests/ApiConnectors/resources/assetmethod-response.xml
new file mode 100644
index 00000000..d4103ae9
--- /dev/null
+++ b/tests/UnitTests/ApiConnectors/resources/assetmethod-response.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0"?>
+<assetmethod inuse="false" result="1" status="active">
+    <office name="Development BV" shortname="Development BV">DEV1000</office>
+    <code>101</code>
+    <name>Inventaris</name>
+    <shortname>Inv</shortname>
+    <created>20190426120347</created>
+    <modified>20190501092003</modified>
+    <touched>10</touched>
+    <user name="Test User" shortname="TstUsr">API000001</user>
+    <nrofperiods>0</nrofperiods>
+    <percentage>10</percentage>
+    <depreciatereconciliation>from_purchase_date</depreciatereconciliation>
+    <calcmethod>linearpercentage</calcmethod>
+    <balanceaccounts>
+        <purchasevaluegroup name="" shortname=""/>
+        <purchasevalue name="Afschr inventaris" shortname="Afschr inventaris" dimensiontype="BAS">0155</purchasevalue>
+        <depreciationgroup name="" shortname=""/>
+        <depreciation name="Inventaris" shortname="Inventaris" dimensiontype="BAS">0150</depreciation>
+        <assetstoactivate name="" shortname="" dimensiontype=""/>
+        <reconciliation name="" shortname="" dimensiontype=""/>
+        <tobeinvoiced name="" shortname="" dimensiontype=""/>
+    </balanceaccounts>
+    <profitlossaccounts>
+        <depreciation name="Afschr kstn inventaris" shortname="Afschr kstn inventar" dimensiontype="PNL">4750</depreciation>
+        <sales name="" shortname="" dimensiontype=""/>
+        <reconciliation name="" shortname="" dimensiontype=""/>
+    </profitlossaccounts>
+    <freetexts>
+        <freetext id="1" type="text">1</freetext>
+        <freetext id="2" type="text">2</freetext>
+        <freetext id="3" type="text">3</freetext>
+        <freetext id="4" type="text">4</freetext>
+        <freetext id="5" type="text">5</freetext>
+    </freetexts>
+</assetmethod>
\ No newline at end of file
diff --git a/tests/UnitTests/ApiConnectors/resources/banktransaction-with-all-line-types.xml b/tests/UnitTests/ApiConnectors/resources/banktransaction-with-all-line-types.xml
deleted file mode 100644
index 7c03cb95..00000000
--- a/tests/UnitTests/ApiConnectors/resources/banktransaction-with-all-line-types.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0"?>
-<transactions result="1">
-    <transaction result="1" location="temporary">
-        <header>
-            <code name="Standaard bank" shortname="Standaard bank">BNK</code>
-            <office name="Office 001" shortname="Office 001">OFFICE001</office>
-            <period>2017/09</period>
-            <date>20170901</date>
-            <currency name="Euro" shortname="Euro">EUR</currency>
-            <startvalue>0.00</startvalue>
-            <closevalue>121.00</closevalue>
-            <origin>import</origin>
-            <user name="User" shortname="User">USER</user>
-            <regime>generic</regime>
-            <statementnumber>0</statementnumber>
-            <number>201700001</number>
-        </header>
-        <lines>
-            <line type="total" id="1">
-                <dim1 name="Standaard bank" shortname="" type="BAS" inuse="false" vatcode="" vatobligatory="false">1100</dim1>
-                <debitcredit>debit</debitcredit>
-                <value>121.00</value>
-                <rate>1</rate>
-                <basevalue>121.00</basevalue>
-                <reprate>1</reprate>
-                <repvalue>121.00</repvalue>
-                <matchstatus>notmatchable</matchstatus>
-            </line>
-            <line type="detail" id="2">
-                <dim1 name="Vraagposten" shortname="" type="BAS" inuse="true" vatcode="" vatobligatory="false">2200</dim1>
-                <debitcredit>credit</debitcredit>
-                <value>100.00</value>
-                <description>My transaction</description>
-                <vatcode name="Verkoop 21%" shortname="Verkoop 21%">VH</vatcode>
-                <vatvalue>21.00</vatvalue>
-                <rate>1</rate>
-                <basevalue>100.00</basevalue>
-                <reprate>1</reprate>
-                <repvalue>100.00</repvalue>
-                <currencydate/>
-                <invoicenumber/>
-                <vatbasevalue>21.00</vatbasevalue>
-                <matchstatus>notmatchable</matchstatus>
-            </line>
-            <line type="vat" id="3">
-                <debitcredit>credit</debitcredit>
-                <value>21.00</value>
-                <vatcode name="Verkoop 21%" shortname="Verkoop 21%">VH</vatcode>
-                <rate>1</rate>
-                <basevalue>21.00</basevalue>
-                <reprate>1</reprate>
-                <repvalue>21.00</repvalue>
-                <baseline>1</baseline>
-                <vatturnover>100.00</vatturnover>
-                <vatbaseturnover>100.00</vatbaseturnover>
-                <dim1 name="BTW af te dragen 21%" shortname="" type="BAS" inuse="true" vatcode="" vatobligatory="false">1502</dim1>
-                <matchstatus>notmatchable</matchstatus>
-            </line>
-        </lines>
-    </transaction>
-</transactions>
\ No newline at end of file
diff --git a/tests/UnitTests/ApiConnectors/resources/costcenter-response.xml b/tests/UnitTests/ApiConnectors/resources/costcenter-response.xml
new file mode 100644
index 00000000..5e8782fe
--- /dev/null
+++ b/tests/UnitTests/ApiConnectors/resources/costcenter-response.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0"?>
+<dimension status="active" result="1">
+    <office name="Development BV" shortname="Development BV">DEV1000</office>
+    <type name="Kostenplaatsen" shortname="Kostenplaatsen">KPL</type>
+    <code>00001</code>
+    <uid>149e5dcb-8b37-446b-b865-f3928572618f</uid>
+    <name>Hoevelaken</name>
+    <shortname/>
+    <inuse>false</inuse>
+    <behaviour>normal</behaviour>
+    <touched>0</touched>
+    <beginperiod>0</beginperiod>
+    <beginyear>0</beginyear>
+    <endperiod>0</endperiod>
+    <endyear>0</endyear>
+    <website/>
+    <cocnumber/>
+    <vatnumber/>
+    <editdimensionname>true</editdimensionname>
+    <financials>
+        <matchtype>notmatchable</matchtype>
+        <accounttype>inherit</accounttype>
+        <subanalyse>maybe</subanalyse>
+        <duedays>0</duedays>
+        <level>2</level>
+        <payavailable>false</payavailable>
+        <meansofpayment>none</meansofpayment>
+        <paycode name="" shortname=""/>
+        <ebilling>false</ebilling>
+        <ebillmail/>
+        <substitutionlevel>0</substitutionlevel>
+        <substitutewith/>
+        <relationsreference/>
+        <vattype name="" shortname=""/>
+        <vatcode fixed="false"/>
+        <vatobligatory>false</vatobligatory>
+        <performancetype/>
+        <collectmandate>
+            <id>00001</id>
+            <signaturedate/>
+            <firstrundate/>
+        </collectmandate>
+        <collectionschema>core</collectionschema>
+    </financials>
+    <remittanceadvice>
+        <sendtype>ToFileManager</sendtype>
+        <sendmail/>
+    </remittanceadvice>
+    <banks/>
+</dimension>
\ No newline at end of file
diff --git a/tests/UnitTests/ApiConnectors/resources/customer-response.xml b/tests/UnitTests/ApiConnectors/resources/customer-response.xml
new file mode 100644
index 00000000..d60118e8
--- /dev/null
+++ b/tests/UnitTests/ApiConnectors/resources/customer-response.xml
@@ -0,0 +1,80 @@
+<?xml version="1.0"?>
+<dimension status="active" result="1">
+    <code>D1001</code>
+    <name>Hr E G H K&#xFC;ppers en/of MW M.J. K&#xFC;ppers-Veeneman</name>
+    <type name="Debiteuren" shortname="Debiteuren">DEB</type>
+    <office name="Development BV" shortname="Development BV">DEV1000</office>
+    <addresses>
+        <address default="true" type="invoice" id="1">
+            <name/>
+            <contact/>
+            <country name="Belgi&#xEB;" shortname="">BE</country>
+            <city/>
+            <postcode/>
+            <telephone/>
+            <telefax/>
+            <email/>
+            <field1/>
+            <field2/>
+            <field3/>
+            <field4>BE0123456789</field4>
+            <field5/>
+            <field6/>
+        </address>
+    </addresses>
+    <uid>149e5dcb-8b37-446b-b865-f3928572618f</uid>
+    <inuse>true</inuse>
+    <shortname/>
+    <behaviour>normal</behaviour>
+    <touched>4</touched>
+    <beginperiod>0</beginperiod>
+    <beginyear>0</beginyear>
+    <endperiod>0</endperiod>
+    <endyear>0</endyear>
+    <website/>
+    <vatnumber/>
+    <cocnumber/>
+    <editdimensionname>true</editdimensionname>
+    <financials>
+        <matchtype>customersupplier</matchtype>
+        <accounttype>inherit</accounttype>
+        <subanalyse>false</subanalyse>
+        <duedays>30</duedays>
+        <level>2</level>
+        <payavailable>false</payavailable>
+        <meansofpayment>none</meansofpayment>
+        <paycode name="" shortname="" id=""/>
+        <ebilling>false</ebilling>
+        <ebillmail/>
+        <substitutionlevel>1</substitutionlevel>
+        <substitutewith name="Debiteuren" shortname="" dimensiontype="BAS" id="089dd2f4-5c28-4f88-8988-b7cbc5d6bedc">
+            130000
+        </substitutewith>
+        <relationsreference/>
+        <vattype name="" shortname=""/>
+        <vatcode fixed="false"/>
+        <vatobligatory>false</vatobligatory>
+        <performancetype/>
+        <collectmandate>
+            <id>D1001</id>
+            <signaturedate/>
+            <firstrundate/>
+        </collectmandate>
+        <collectionschema>core</collectionschema>
+        <childvalidations>
+            <childvalidation type="code" level="1">130000</childvalidation>
+        </childvalidations>
+    </financials>
+    <creditmanagement>
+        <responsibleuser name="" shortname=""/>
+        <basecreditlimit>0.00</basecreditlimit>
+        <sendreminder>true</sendreminder>
+        <reminderemail/>
+        <blocked locked="false" modified="">false</blocked>
+        <freetext1/>
+        <freetext2/>
+        <freetext3/>
+        <comment/>
+    </creditmanagement>
+    <banks/>
+</dimension>
\ No newline at end of file
diff --git a/tests/UnitTests/ApiConnectors/resources/customers-response.xml b/tests/UnitTests/ApiConnectors/resources/customers-response.xml
deleted file mode 100644
index c1e8ae7b..00000000
--- a/tests/UnitTests/ApiConnectors/resources/customers-response.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0"?>
-<customers>
-	<dimension status="active" result="1">
-		<code>D1001</code>
-		<name>Hr E G H K&#xFC;ppers en/of MW M.J. K&#xFC;ppers-Veeneman</name>
-		<type name="Debiteuren" shortname="Debiteuren">DEB</type>
-		<office name="Development BV" shortname="Development BV">DEV1000</office>
-		<addresses>
-			<address default="true" type="invoice" id="1">
-				<name/>
-				<contact/>
-				<country name="Belgi&#xEB;" shortname="">BE</country>
-				<city/>
-				<postcode/>
-				<telephone/>
-				<telefax/>
-				<email/>
-				<field1/>
-				<field2/>
-				<field3/>
-				<field4>BE0123456789</field4>
-				<field5/>
-				<field6/>
-			</address>
-		</addresses>
-		<uid>149e5dcb-8b37-446b-b865-f3928572618f</uid>
-		<inuse>true</inuse>
-		<shortname/>
-		<behaviour>normal</behaviour>
-		<touched>4</touched>
-		<beginperiod>0</beginperiod>
-		<beginyear>0</beginyear>
-		<endperiod>0</endperiod>
-		<endyear>0</endyear>
-		<website/>
-		<vatnumber/>
-		<cocnumber/>
-		<editdimensionname>true</editdimensionname>
-		<financials>
-			<matchtype>customersupplier</matchtype>
-			<accounttype>inherit</accounttype>
-			<subanalyse>false</subanalyse>
-			<duedays>30</duedays>
-			<level>2</level>
-			<payavailable>false</payavailable>
-			<meansofpayment>none</meansofpayment>
-			<paycode name="" shortname="" id=""/>
-			<ebilling>false</ebilling>
-			<ebillmail/>
-			<substitutionlevel>1</substitutionlevel>
-			<substitutewith name="Debiteuren" shortname="" dimensiontype="BAS" id="089dd2f4-5c28-4f88-8988-b7cbc5d6bedc">
-				130000
-			</substitutewith>
-			<relationsreference/>
-			<vattype name="" shortname=""/>
-			<vatcode fixed="false"/>
-			<vatobligatory>false</vatobligatory>
-			<performancetype/>
-			<collectmandate>
-				<id>D1001</id>
-				<signaturedate/>
-				<firstrundate/>
-			</collectmandate>
-			<collectionschema>core</collectionschema>
-			<childvalidations>
-				<childvalidation type="code" level="1">130000</childvalidation>
-			</childvalidations>
-		</financials>
-		<creditmanagement>
-			<responsibleuser name="" shortname=""/>
-			<basecreditlimit>0.00</basecreditlimit>
-			<sendreminder>true</sendreminder>
-			<reminderemail/>
-			<blocked locked="false" modified="">false</blocked>
-			<freetext1/>
-			<freetext2/>
-			<freetext3/>
-			<comment/>
-		</creditmanagement>
-		<banks/>
-	</dimension>
-</customers>
\ No newline at end of file
diff --git a/tests/UnitTests/ApiConnectors/resources/dimensiongroup-response.xml b/tests/UnitTests/ApiConnectors/resources/dimensiongroup-response.xml
new file mode 100644
index 00000000..c839dd4c
--- /dev/null
+++ b/tests/UnitTests/ApiConnectors/resources/dimensiongroup-response.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<dimensiongroup status="active" result="1">
+    <office name="Development BV" shortname="Development BV">DEV1000</office>
+    <code>TSTDIMGRP</code>
+    <name>Test Dimension Group</name>
+    <shortname>TstDimGrp</shortname>
+    <touched>35</touched>
+    <dimensions>
+        <dimension>
+            <type name="Balans" shortname="Balans">BAS</type>
+            <code name="Goodwill" shortname="Goodwill">0100</code>
+        </dimension>
+        <dimension>
+            <type name="Balans" shortname="Balans">BAS</type>
+            <code name="Afschr goodwill" shortname="Afschr goodwill">0105</code>
+        </dimension>
+    </dimensions>
+</dimensiongroup>
\ No newline at end of file
diff --git a/tests/UnitTests/ApiConnectors/resources/dimensiontype-response.xml b/tests/UnitTests/ApiConnectors/resources/dimensiontype-response.xml
new file mode 100644
index 00000000..a5f966ae
--- /dev/null
+++ b/tests/UnitTests/ApiConnectors/resources/dimensiontype-response.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0"?>
+<dimensiontype status="active" result="1">
+    <office name="Development BV" shortname="Development BV">DEV1000</office>
+    <code>DEB</code>
+    <name>Debiteuren</name>
+    <shortname>Debiteuren</shortname>
+    <mask>1[0-9][0-9][0-9]</mask>
+    <touched>8</touched>
+    <levels>
+        <financials>2</financials>
+        <time>0</time>
+        <fixedassets>0</fixedassets>
+        <invoices>0</invoices>
+    </levels>
+    <address>
+        <label1>Tav</label1>
+        <label2>Adres</label2>
+        <label3>Postadres</label3>
+        <label4>BTW nummer</label4>
+        <label5>KVK nummer</label5>
+        <label6/>
+    </address>
+</dimensiontype>
\ No newline at end of file
diff --git a/tests/UnitTests/ApiConnectors/resources/failed-response-without-line-ids.xml b/tests/UnitTests/ApiConnectors/resources/failed-response-without-line-ids.xml
deleted file mode 100644
index 9e197dcd..00000000
--- a/tests/UnitTests/ApiConnectors/resources/failed-response-without-line-ids.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0"?>
-<transactions result="0">
-	<transaction destiny="temporary" msgtype="error" msg="Configuratiefout in rekening-courant. Er is geen directe ontvangstregel in administratie MyAdministration (450)." result="0">
-		<header>
-			<code>BNK_CODE_123</code>
-			<office>450</office>
-			<date>20170901</date>
-			<statementnumber>321</statementnumber>
-			<currency>EUR</currency>
-			<startvalue>0.00</startvalue>
-			<closevalue>126.17</closevalue>
-			<origin>import</origin>
-		</header>
-		<lines>
-			<line type="total">
-				<dim1>123456</dim1>
-				<debitcredit>credit</debitcredit>
-				<value>126.17</value>
-			</line>
-			<line type="detail">
-				<dim1>654321</dim1>
-				<debitcredit>credit</debitcredit>
-				<value>126.17</value>
-				<description>description</description>
-				<comment>comment</comment>
-			</line>
-		</lines>
-	</transaction>
-</transactions>
\ No newline at end of file
diff --git a/tests/UnitTests/ApiConnectors/resources/fixedasset-response.xml b/tests/UnitTests/ApiConnectors/resources/fixedasset-response.xml
new file mode 100644
index 00000000..113993d3
--- /dev/null
+++ b/tests/UnitTests/ApiConnectors/resources/fixedasset-response.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0"?>
+<dimension status="active" result="1">
+    <office name="Development BV" shortname="Development BV">DEV1000</office>
+    <type name="Vaste activa" shortname="">AST</type>
+    <code>60000</code>
+    <uid>149e5dcb-8b37-446b-b865-f3928572618f</uid>
+    <name>Afschrijving Computer</name>
+    <shortname/>
+    <inuse>false</inuse>
+    <behaviour>normal</behaviour>
+    <touched>0</touched>
+    <beginperiod>0</beginperiod>
+    <beginyear>0</beginyear>
+    <endperiod>0</endperiod>
+    <endyear>0</endyear>
+    <website/>
+    <cocnumber/>
+    <vatnumber/>
+    <editdimensionname>true</editdimensionname>
+    <financials>
+        <matchtype>notmatchable</matchtype>
+        <accounttype>inherit</accounttype>
+        <subanalyse>false</subanalyse>
+        <duedays>30</duedays>
+        <level>3</level>
+        <payavailable>false</payavailable>
+        <meansofpayment>none</meansofpayment>
+        <paycode name="" shortname=""/>
+        <ebilling>false</ebilling>
+        <ebillmail/>
+        <substitutionlevel>2</substitutionlevel>
+        <substitutewith name="Hoevelaken" shortname="" dimensiontype="KPL" id="235B085C-AFB8-4479-BFC5-C210E18D51F9">00001</substitutewith>
+        <relationsreference/>
+        <vattype name="" shortname=""/>
+        <vatcode fixed="false"/>
+        <vatobligatory>false</vatobligatory>
+        <performancetype/>
+        <collectmandate>
+            <id>60000</id>
+            <signaturedate/>
+            <firstrundate/>
+        </collectmandate>
+        <collectionschema>core</collectionschema>
+    </financials>
+    <remittanceadvice>
+        <sendtype>ToFileManager</sendtype>
+        <sendmail/>
+    </remittanceadvice>
+    <banks/>
+    <fixedassets>
+        <status locked="true">active</status>
+        <residualvalue locked="false">500.00</residualvalue>
+        <stopvalue locked="false">0.00</stopvalue>
+        <method name="Afschrijving Computers" shortname="AfschrijvingComp" locked="false">100</method>
+        <beginperiod locked="false">2019/01</beginperiod>
+        <purchasedate locked="false">20180401</purchasedate>
+        <selldate locked="true"/>
+        <freetext1 locked="false"/>
+        <freetext2 locked="false"/>
+        <freetext3 locked="false"/>
+        <freetext4 locked="false"/>
+        <freetext5 locked="false"/>
+        <translines locked="true"/>
+        <nrofperiods inherited="true" locked="false">0</nrofperiods>
+        <percentage locked="false">10</percentage>
+        <lastdepreciation locked="false">2019/12</lastdepreciation>
+    </fixedassets>
+</dimension>
diff --git a/tests/UnitTests/ApiConnectors/resources/generalledger-response.xml b/tests/UnitTests/ApiConnectors/resources/generalledger-response.xml
new file mode 100644
index 00000000..dc20cf53
--- /dev/null
+++ b/tests/UnitTests/ApiConnectors/resources/generalledger-response.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0"?>
+<dimension status="active" result="1">
+    <office name="Development BV" shortname="Development BV">DEV1000</office>       
+    <type name="Winst &amp; verlies" shortname="Winst &amp; verlies">PNL</type>
+    <code>4004</code>
+    <uid>149e5dcb-8b37-446b-b865-f3928572618f</uid>
+    <name>Bonussen/gratificaties</name>
+    <shortname>Bonussen/gratificati</shortname>
+    <inuse>false</inuse>
+    <behaviour>normal</behaviour>
+    <touched>0</touched>
+    <beginperiod>0</beginperiod>
+    <beginyear>0</beginyear>
+    <endperiod>0</endperiod>
+    <endyear>0</endyear>
+    <website/>
+    <cocnumber/>
+    <vatnumber/>
+    <editdimensionname>true</editdimensionname>
+    <financials>
+        <matchtype>notmatchable</matchtype>
+        <accounttype>profitandloss</accounttype>
+        <subanalyse>maybe</subanalyse>
+        <duedays>0</duedays>
+        <level>1</level>
+        <payavailable>false</payavailable>
+        <meansofpayment>none</meansofpayment>
+        <paycode name="" shortname=""/>
+        <ebilling>false</ebilling>
+        <ebillmail/>
+        <substitutionlevel>0</substitutionlevel>
+        <substitutewith/>
+        <relationsreference/>
+        <vattype name="" shortname=""/>
+        <vatcode fixed="false"/>
+        <vatobligatory>false</vatobligatory>
+        <performancetype/>
+        <collectmandate>
+            <id/>
+            <signaturedate/>
+            <firstrundate/>
+        </collectmandate>
+        <collectionschema>core</collectionschema>
+        <childvalidations>
+            <childvalidation type="type" level="2">KPL</childvalidation>
+        </childvalidations>
+    </financials>
+    <remittanceadvice>
+        <sendtype>ToFileManager</sendtype>
+        <sendmail/>
+    </remittanceadvice>
+    <banks/>
+</dimension>
diff --git a/tests/UnitTests/ApiConnectors/resources/invoice-response.xml b/tests/UnitTests/ApiConnectors/resources/invoice-response.xml
new file mode 100644
index 00000000..5e4e710e
--- /dev/null
+++ b/tests/UnitTests/ApiConnectors/resources/invoice-response.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0"?>
+<salesinvoice result="1">
+    <header>
+        <office>DEV1000</office>
+        <invoicetype>INVOICE</invoicetype>
+        <invoicenumber>10</invoicenumber>
+        <invoicedate>20190410</invoicedate>
+        <duedate>20190510</duedate>
+        <bank>BNK</bank>
+        <invoiceaddressnumber>1</invoiceaddressnumber>
+        <deliveraddressnumber>1</deliveraddressnumber>
+        <customer>1000</customer>
+        <period>2019/4</period>
+        <currency>EUR</currency>
+        <status>concept</status>
+        <paymentmethod>cash</paymentmethod>
+        <headertext>Headertext</headertext>
+        <footertext>Footertext</footertext>
+    </header>
+    <lines>
+        <line id="1">
+            <article>9060</article>
+            <subarticle>9060</subarticle>
+            <quantity>1</quantity>
+            <units>1</units>
+            <allowdiscountorpremium>true</allowdiscountorpremium>
+            <description>Afronding</description>
+            <valueexcl>0.00</valueexcl>
+            <vatvalue>0.00</vatvalue>
+            <valueinc>0.00</valueinc>
+            <unitspriceexcl>0.00</unitspriceexcl>
+            <freetext1/>
+            <freetext2/>
+            <freetext3/>
+            <dim1>9060</dim1>
+            <vatcode name="Export Buiten EU naam" shortname="EXP-BUI-EUK" type="sales">EXP-BUI-EU</vatcode>
+        </line>
+    </lines>
+    <vatlines>
+        <vatline>
+            <vatcode name="RExport Buiten EU naam">EXP-BUI-EU</vatcode>
+            <vatvalue>0.00</vatvalue>
+            <performancetype/>
+            <performancedate/>
+        </vatline>
+    </vatlines>
+    <totals>
+        <valueinc>0.00</valueinc>
+        <valueexcl>0.00</valueexcl>
+    </totals>
+</salesinvoice>
\ No newline at end of file
diff --git a/tests/UnitTests/ApiConnectors/resources/project-response.xml b/tests/UnitTests/ApiConnectors/resources/project-response.xml
new file mode 100644
index 00000000..6c501905
--- /dev/null
+++ b/tests/UnitTests/ApiConnectors/resources/project-response.xml
@@ -0,0 +1,71 @@
+<?xml version="1.0"?>
+<dimension status="active" result="1">
+    <office name="Development BV" shortname="Development BV">DEV1000</office>
+    <type name="Projecten" shortname="Projecten">PRJ</type>
+    <code>P0000</code>
+    <uid>149e5dcb-8b37-446b-b865-f3928572618f</uid>
+    <name>Project direct</name>
+    <shortname>Project directK</shortname>
+    <inuse>false</inuse>
+    <behaviour>normal</behaviour>
+    <touched>0</touched>
+    <beginperiod>0</beginperiod>
+    <beginyear>0</beginyear>
+    <endperiod>0</endperiod>
+    <endyear>0</endyear>
+    <website/>
+    <cocnumber/>
+    <vatnumber/>
+    <editdimensionname>true</editdimensionname>
+    <financials>
+        <matchtype>matchable</matchtype>
+        <accounttype>inherit</accounttype>
+        <subanalyse>maybe</subanalyse>
+        <duedays>0</duedays>
+        <level>3</level>
+        <payavailable>false</payavailable>
+        <meansofpayment>none</meansofpayment>
+        <paycode name="" shortname=""/>
+        <ebilling>false</ebilling>
+        <ebillmail/>
+        <substitutionlevel>2</substitutionlevel>
+        <substitutewith name="" shortname="" dimensiontype="">09999</substitutewith>
+        <relationsreference/>
+        <vattype name="" shortname=""/>
+        <vatcode fixed="false"/>
+        <vatobligatory>false</vatobligatory>
+        <performancetype/>
+        <collectmandate>
+            <id>P0000</id>
+            <signaturedate/>
+            <firstrundate/>
+        </collectmandate>
+        <collectionschema>core</collectionschema>
+        <childvalidations>
+            <childvalidation type="type" level="2">KPL</childvalidation>
+            <childvalidation type="type" level="4">ACT</childvalidation>
+        </childvalidations>
+    </financials>
+    <remittanceadvice>
+        <sendtype>ToFileManager</sendtype>
+        <sendmail/>
+    </remittanceadvice>
+    <banks/>
+    <projects>
+        <invoicedescription>Project direct invoice description</invoicedescription>
+        <validfrom/>
+        <validtill/>
+        <authoriser locked="true" inherit="true"/>
+        <customer locked="true" inherit="true"/>
+        <billable locked="true" inherit="true" forratio="false"/>
+        <rate locked="true" inherit="true"/>
+        <quantities>
+            <quantity>
+                <label>Kilometers</label>
+                <rate>KILOMETERS</rate>
+                <billable locked="false">true</billable>
+                <mandatory>false</mandatory>
+            </quantity>
+        </quantities>
+    </projects>
+</dimension>
\ No newline at end of file
diff --git a/tests/UnitTests/ApiConnectors/resources/rate-response.xml b/tests/UnitTests/ApiConnectors/resources/rate-response.xml
new file mode 100644
index 00000000..6b9dc82a
--- /dev/null
+++ b/tests/UnitTests/ApiConnectors/resources/rate-response.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0"?>
+<projectrate status="active" inuse="false" result="1">
+    <office name="Development BV" shortname="Development BV">DEV1000</office>
+    <code>DIRECT</code>
+    <name>Direct rate</name>
+    <shortname>DirectK</shortname>
+    <created>20161223182142</created>
+    <modified>20161223182142</modified>
+    <touched>0</touched>
+    <user name="Site supervisor" shortname="Site supervisor">SUPER</user>
+    <type>time</type>
+    <unit>60</unit>
+    <currency name="EURO" shortname="&#x20AC;">EUR</currency>
+    <ratechanges>
+        <ratechange lastused="" status="active" id="2">
+            <begindate>20100101</begindate>
+            <enddate>20991231</enddate>
+            <internalrate>60.0000</internalrate>
+            <externalrate>120.0000</externalrate>
+        </ratechange>
+    </ratechanges>
+</projectrate>
diff --git a/tests/UnitTests/ApiConnectors/resources/supplier-response.xml b/tests/UnitTests/ApiConnectors/resources/supplier-response.xml
new file mode 100644
index 00000000..cfd908da
--- /dev/null
+++ b/tests/UnitTests/ApiConnectors/resources/supplier-response.xml
@@ -0,0 +1,116 @@
+<?xml version="1.0"?>
+<dimension status="active" result="1">
+    <office name="Development BV" shortname="Development BV">DEV1000</office>
+    <type name="Crediteuren" shortname="Crediteuren">CRD</type>
+    <code>2000</code>
+    <uid>149e5dcb-8b37-446b-b865-f3928572618f</uid>
+    <name>Smits</name>
+    <shortname/>
+    <inuse>true</inuse>
+    <behaviour>normal</behaviour>
+    <touched>6</touched>
+    <beginperiod>0</beginperiod>
+    <beginyear>0</beginyear>
+    <endperiod>0</endperiod>
+    <endyear>0</endyear>
+    <website>http://www.test.com</website>
+    <cocnumber/>
+    <vatnumber/>
+    <editdimensionname>true</editdimensionname>
+    <financials>
+        <matchtype>customersupplier</matchtype>
+        <accounttype>inherit</accounttype>
+        <subanalyse>false</subanalyse>
+        <duedays>30</duedays>
+        <level>2</level>
+        <payavailable>true</payavailable>
+        <meansofpayment>paymentfile</meansofpayment>
+        <paycode name="SEPA betalingen Nederland" shortname="SEPA betalingen NL" id="F8A7C510-E28A-46CF-9257-482747020837">SEPANLCT</paycode>
+        <ebilling>false</ebilling>
+        <ebillmail/>
+        <substitutionlevel>1</substitutionlevel>
+        <substitutewith name="Crediteuren" shortname="Crediteuren" dimensiontype="BAS" id="96BCE6FD-D8FB-4238-9066-335951B6AE9B">1600</substitutewith>
+        <relationsreference>L2000</relationsreference>
+        <vattype name="" shortname=""/>
+        <vatcode name="BTW Hoog naam" shortname="HoogK" type="purchase" fixed="false">IH</vatcode>
+        <vatobligatory>false</vatobligatory>
+        <performancetype/>
+        <collectmandate>
+            <id>2000</id>
+            <signaturedate/>
+            <firstrundate/>
+        </collectmandate>
+        <collectionschema>core</collectionschema>
+        <childvalidations>
+            <childvalidation type="code" level="1">1600</childvalidation>
+        </childvalidations>
+    </financials>
+    <remittanceadvice>
+        <sendtype>ByEmail</sendtype>
+        <sendmail>test@test.nl</sendmail>
+    </remittanceadvice>
+    <addresses>
+        <address id="1" type="invoice" default="true">
+            <name>BDRNAAM</name>
+            <country name="Nederland" shortname="">NL</country>
+            <city>Utrecht</city>
+            <postcode>Postcode</postcode>
+            <telephone>Telefoon</telephone>
+            <telefax>Fax</telefax>
+            <email>test@test.com</email>
+            <contact/>
+            <field1>TAV</field1>
+            <field2>ADRESRGL1</field2>
+            <field3>ADRESRGL2</field3>
+            <field4>NL854800219B01</field4>
+            <field5>KVK</field5>
+            <field6/>
+        </address>
+    </addresses>
+    <banks>
+        <bank default="true" id="1" blocked="false" destination="1">
+            <ascription>Smits</ascription>
+            <accountnumber>417164300</accountnumber>
+            <address>
+                <field2>Testadres</field2>
+                <field3>10</field3>
+            </address>
+            <bankname>ABN</bankname>
+            <biccode>ABNANL2A</biccode>
+            <city>Utrecht</city>
+            <country name="Nederland" shortname="">NL</country>
+            <iban>NL91ABNA0417164300</iban>
+            <natbiccode>NL</natbiccode>
+            <postcode>1234AB</postcode>
+            <state>Teststraat</state>
+        </bank>
+    </banks>
+    <postingrules>
+        <postingrule id="1" status="active">
+            <currency name="EURO" shortname="&#x20AC;">EUR</currency>
+            <amount>100.00</amount>
+            <description>Test</description>
+            <lines>
+                <line>
+                    <office name="" shortname=""/>
+                    <dimension1 name="Goodwill" shortname="Goodwill" dimensiontype="BAS" id="223E7623-6BF8-44D9-97FC-E6C07EF912FD">0100</dimension1>
+                    <dimension2 name="Hoevelaken" shortname="" dimensiontype="KPL" id="235B085C-AFB8-4479-BFC5-C210E18D51F9">00001</dimension2>
+                    <dimension3 name="Afschrijving Computer" shortname="" dimensiontype="AST" id="64ECC423-9C05-43AA-84A0-204A276A68D9">60010</dimension3>
+                    <ratio>23</ratio>
+                    <vatcode name="Geen btw" shortname="Geen btw">#</vatcode>
+                    <description>Test</description>
+                </line>
+            </lines>
+        </postingrule>
+    </postingrules>
+    <paymentconditions>
+        <paymentcondition>
+            <discountdays>14</discountdays>
+            <discountpercentage>10.00</discountpercentage>
+        </paymentcondition>
+    </paymentconditions>
+    <blockedaccountpaymentconditions>
+        <percentage>20.00</percentage>
+        <includevat>true</includevat>
+    </blockedaccountpaymentconditions>
+</dimension>
\ No newline at end of file
diff --git a/tests/UnitTests/ApiConnectors/resources/vatcode-response.xml b/tests/UnitTests/ApiConnectors/resources/vatcode-response.xml
new file mode 100644
index 00000000..9967ae7f
--- /dev/null
+++ b/tests/UnitTests/ApiConnectors/resources/vatcode-response.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0"?>
+<vat status="active" result="1">
+    <code>VH</code>
+    <name>VAT Sales High</name>
+    <shortname>VATSlsHigh</shortname>
+    <uid>149e5dcb-8b37-446b-b865-f3928572618f</uid>
+    <created>20041027101342</created>
+    <modified>20190410185128</modified>
+    <touched>0</touched>
+    <user name="Twinapps" shortname="Twinapps">TWINAPPS</user>
+    <type>sales</type>
+    <percentages>
+        <percentage status="active" inuse="true">
+            <date>20121001</date>
+            <percentage>21.000000000</percentage>
+            <created>20171016135323</created>
+            <name>VAT Sales High</name>
+            <shortname>VATSlsHigh</shortname>
+            <user name="Site supervisor" shortname="Site supervisor">SUPER</user>
+            <discountaccount name="" shortname="" dimensiontype=""/>
+            <writeoffaccount name="" shortname="" dimensiontype=""/>
+            <accounts>
+                <account id="1">
+                    <dim1 name="Te betalen OB hoog" shortname="Te betalen OB 19%" dimensiontype="BAS">1530</dim1>
+                    <groupcountry name="Nederland" shortname="">NL</groupcountry>
+                    <group name="Leveringen/Diensten belast met hoog %" shortname="L/D Hoog">NL1A</group>
+                    <percentage>100.0</percentage>
+                    <linetype>vat</linetype>
+                </account>
+            </accounts>
+        </percentage>
+    </percentages>
+</vat>
diff --git a/tests/UnitTests/DomDocuments/CustomersDocumentUnitTest.php b/tests/UnitTests/DomDocuments/CustomersDocumentUnitTest.php
index d5923a2a..ece6f3dd 100644
--- a/tests/UnitTests/DomDocuments/CustomersDocumentUnitTest.php
+++ b/tests/UnitTests/DomDocuments/CustomersDocumentUnitTest.php
@@ -34,14 +34,14 @@ public function testXmlIsCreatedPerSpec()
         $customer->setOffice(Office::fromCode("DEV-10000"));
         $customer->setStatusFromString('active');
 
-	$financials = new CustomerFinancials();
+        $financials = new CustomerFinancials();
         $financials->setDueDays(1);
         $financials->setPayAvailable(true);
         $financials->setPayCodeFromString('pay-code');
         $financials->setVatCodeFromString('vat-code');
         $financials->setEBilling(true);
         $financials->setEBillMail('ebillingmail@mail.com');
-	$customer->setFinancials($financials);
+        $customer->setFinancials($financials);
 
         $customer->setCreditManagement(
             (new CustomerCreditManagement())
@@ -54,6 +54,7 @@ public function testXmlIsCreatedPerSpec()
                 ->setFreeText2('free2')
                 ->setComment('comment    comment')
         );
+
         $customer->addAddress(
             (new CustomerAddress())
                 ->setDefault(true)
@@ -72,6 +73,7 @@ public function testXmlIsCreatedPerSpec()
                 ->setField5('field 5')
                 ->setField6('field 6')
         );
+
         $customer->addBank(
             (new CustomerBank())
                 ->setDefault(true)
diff --git a/tests/UnitTests/Supplier/OfficeTest.php b/tests/UnitTests/Supplier/OfficeTest.php
deleted file mode 100644
index 98befed6..00000000
--- a/tests/UnitTests/Supplier/OfficeTest.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-namespace PhpTwinfield\Secure;
-
-use PhpTwinfield\DomDocuments\SuppliersDocument;
-use PhpTwinfield\Office;
-use PhpTwinfield\Supplier;
-
-class SupplierOfficeTest extends \PHPUnit\Framework\TestCase
-{
-    /**
-     * @var Office
-     */
-    private $office;
-
-    /**
-     * Sets up the fixture, for example, opens a network connection.
-     * This method is called before a test is executed.
-     */
-    protected function setUp()
-    {
-        parent::setUp();
-
-        $this->office = Office::fromCode('TEST-001');
-    }
-
-    /**
-     * @covers \PhpTwinfield\Supplier::setOffice()
-     * @todo   Implement testSetOffice().
-     */
-    public function testSetOffice()
-    {
-        $customer = new Supplier;
-        
-        $customer->setOffice($this->office);
-        
-        $this->assertEquals($this->office, $customer->getOffice());
-        
-        return $customer;
-    }
-    
-    /**
-     * Checks if the office field is correctly serialized
-     *
-     * @depends testSetOffice
-     */
-    public function testSetOfficeAndSerializes(Supplier $customer)
-    {
-        $document = new SuppliersDocument;
-        
-        $document->addSupplier($customer);
-
-        $this->assertEquals($document->getElementsByTagName('office')->item(0)->nodeValue, $this->office);
-    }
-}
diff --git a/tests/UnitTests/Transactions/TransactionLineFields/ValueFieldsUnitTest.php b/tests/UnitTests/Transactions/ValueFieldsUnitTest.php
similarity index 99%
rename from tests/UnitTests/Transactions/TransactionLineFields/ValueFieldsUnitTest.php
rename to tests/UnitTests/Transactions/ValueFieldsUnitTest.php
index 9f32d6f7..f5d0275b 100644
--- a/tests/UnitTests/Transactions/TransactionLineFields/ValueFieldsUnitTest.php
+++ b/tests/UnitTests/Transactions/ValueFieldsUnitTest.php
@@ -7,7 +7,7 @@
 use PHPUnit\Framework\TestCase;
 
 /**
- * @covers \PhpTwinfield\Transactions\TransactionLineFields\ValueFields
+ * @covers \PhpTwinfield\Fields\Transaction\TransactionLine\ValueFields
  */
 class ValueFieldsUnitTest extends TestCase
 {