diff --git a/plugins/CustomAlerts b/plugins/CustomAlerts
index f5557b8bcdb2ef6936b651a39f4e4f510b83bf6c..643984c1bab2bc48f120e3cb83fac39b270d9481 160000
--- a/plugins/CustomAlerts
+++ b/plugins/CustomAlerts
@@ -1 +1 @@
-Subproject commit f5557b8bcdb2ef6936b651a39f4e4f510b83bf6c
+Subproject commit 643984c1bab2bc48f120e3cb83fac39b270d9481
diff --git a/plugins/TasksTimetable b/plugins/TasksTimetable
index 267da78ac140e117fdc7ed351c69b729014165f2..140de8db1a1795178efd8b0d2f8e6208a192e562 160000
--- a/plugins/TasksTimetable
+++ b/plugins/TasksTimetable
@@ -1 +1 @@
-Subproject commit 267da78ac140e117fdc7ed351c69b729014165f2
+Subproject commit 140de8db1a1795178efd8b0d2f8e6208a192e562
diff --git a/plugins/VisitorGenerator b/plugins/VisitorGenerator
index 90327ea31c298d17cf14312d4eeefad7228c54a4..874920ab1c338a9afe24d3c7229dc5be8e741987 160000
--- a/plugins/VisitorGenerator
+++ b/plugins/VisitorGenerator
@@ -1 +1 @@
-Subproject commit 90327ea31c298d17cf14312d4eeefad7228c54a4
+Subproject commit 874920ab1c338a9afe24d3c7229dc5be8e741987
diff --git a/tests/PHPUnit/Impl/TestRequestResponse.php b/tests/PHPUnit/Impl/TestRequestResponse.php
index 62a51d38e351b2ad5cfd166866c268e0c30c0071..d1f37112156f5cd51e47976b813d8c38db6a25e8 100644
--- a/tests/PHPUnit/Impl/TestRequestResponse.php
+++ b/tests/PHPUnit/Impl/TestRequestResponse.php
@@ -80,10 +80,6 @@ class TestRequestResponse
 
     private function normalizeApiResponse($apiResponse)
     {
-        if(strpos($this->requestUrl['format'], 'json') === 0) {
-            $apiResponse = str_replace(' ', '\u00a0', $apiResponse);
-        }
-
         if ($this->shouldDeleteLiveIds()) {
             $apiResponse = $this->removeAllIdsFromXml($apiResponse);
         }
@@ -112,6 +108,7 @@ class TestRequestResponse
         $apiResponse = $this->removeXmlFields($apiResponse);
         $apiResponse = $this->normalizeDecimalFields($apiResponse);
         $apiResponse = $this->normalizeEncodingPhp533($apiResponse);
+        $apiResponse = $this->normaliseSpaces($apiResponse);
 
         return $apiResponse;
     }
@@ -249,4 +246,15 @@ class TestRequestResponse
         $response = str_replace('.11</revenue>', '</revenue>', $response);
         return $response;
     }
+
+    private function normaliseSpaces($apiResponse)
+    {
+        if (strpos($this->requestUrl['format'], 'json') === 0) {
+            $apiResponse = str_replace('&nbsp;', '\u00a0', $apiResponse);
+        }
+        if (strpos($this->requestUrl['format'], 'xml') === 0) {
+            $apiResponse = str_replace('&#xA0;', ' ', $apiResponse);
+        }
+        return $apiResponse;
+    }
 }
\ No newline at end of file
diff --git a/tests/PHPUnit/UI b/tests/PHPUnit/UI
index 58bcc47a9245bb25ca25fd23b5f0c7b1302f3a58..2073992deab2a2439fccb98c4befa1798ec6d649 160000
--- a/tests/PHPUnit/UI
+++ b/tests/PHPUnit/UI
@@ -1 +1 @@
-Subproject commit 58bcc47a9245bb25ca25fd23b5f0c7b1302f3a58
+Subproject commit 2073992deab2a2439fccb98c4befa1798ec6d649