208 files changed, 207 insertions, 186 deletions

diff --git a/misc/log-analytics b/misc/log-analytics
-Subproject a82a8a311e0ddd9c09602c5f781a034b553f515
+Subproject a97e85190da0bae1446a3f9bd58c3e028afa547
diff --git a/tests/PHPUnit/System/AutoSuggestAPITest.php b/plugins/API/tests/System/AutoSuggestAPITest.php
index 197e4226f1..c1472b506a 100644
--- a/tests/PHPUnit/System/AutoSuggestAPITest.php
+++ b/plugins/API/tests/System/AutoSuggestAPITest.php
@@ -5,21 +5,23 @@
  * @link    http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
-namespace Piwik\Tests\System;
+
+namespace Piwik\Plugins\API\tests\System;
 
 use Piwik\API\Request;
 use Piwik\Application\Environment;
+use Piwik\Cache as PiwikCache;
 use Piwik\Columns\Dimension;
 use Piwik\Common;
+use Piwik\DataTable\Manager;
 use Piwik\Date;
 use Piwik\Plugins\API\API;
 use Piwik\Plugins\CustomVariables\Columns\CustomVariableName;
 use Piwik\Plugins\CustomVariables\Columns\CustomVariableValue;
 use Piwik\Plugins\CustomVariables\Model;
-use Piwik\Tests\Framework\TestCase\SystemTestCase;
 use Piwik\Tests\Fixtures\ManyVisitsWithGeoIP;
+use Piwik\Tests\Framework\TestCase\SystemTestCase;
 use Piwik\Tracker\Cache;
-use Piwik\Cache as PiwikCache;
 
 // Class to cache results of getSuggestedValuesForSegment to prevent it beeing called multiple time for each segment
 class CachedAPI extends API
@@ -39,7 +41,7 @@ class CachedAPI extends API
  * testing a the auto suggest API for all known segments
  *
  * @group AutoSuggestAPITest
- * @group Core
+ * @group Plugins
  */
 class AutoSuggestAPITest extends SystemTestCase
 {
@@ -90,10 +92,10 @@ class AutoSuggestAPITest extends SystemTestCase
             echo "Skipped test \n";
         } else {
             $apiForTesting[] = array('Live.getLastVisitsDetails',
-                                     array('idSite' => $idSite,
-                                           'date'   => '1998-07-12,today',
-                                           'period' => 'range',
-                                           'otherRequestParameters' => array('filter_limit' => 1000)));
+                array('idSite' => $idSite,
+                    'date' => '1998-07-12,today',
+                    'period' => 'range',
+                    'otherRequestParameters' => array('filter_limit' => 1000)));
 
         }
         return $apiForTesting;
@@ -107,9 +109,9 @@ class AutoSuggestAPITest extends SystemTestCase
     protected function getApiForTestingForSegment($idSite, $segment)
     {
         return array('API.getSuggestedValuesForSegment',
-                     array('idSite'                 => $idSite,
-                           'testSuffix'             => '_' . $segment,
-                           'otherRequestParameters' => array('segmentName' => $segment)));
+            array('idSite' => $idSite,
+                'testSuffix' => '_' . $segment,
+                'otherRequestParameters' => array('segmentName' => $segment)));
     }
 
     /**
@@ -121,9 +123,9 @@ class AutoSuggestAPITest extends SystemTestCase
         // Get the top segment value
         $request = new Request(
             'method=API.getSuggestedValuesForSegment'
-                . '&segmentName=' . $params['segmentToComplete']
-                . '&idSite=' . $params['idSite']
-                . '&format=php&serialize=0'
+            . '&segmentName=' . $params['segmentToComplete']
+            . '&idSite=' . $params['idSite']
+            . '&format=php&serialize=0'
         );
         $response = $request->process();
         $this->assertApiResponseHasNoError($response);
@@ -152,11 +154,11 @@ class AutoSuggestAPITest extends SystemTestCase
         $apiForTesting = array();
         foreach ($segments as $segment) {
             $apiForTesting[] = array('VisitsSummary.get',
-                                     array('idSite'            => self::$fixture->idSite,
-                                           'date'              => date("Y-m-d", strtotime(self::$fixture->dateTime)) . ',today',
-                                           'period'            => 'range',
-                                           'testSuffix'        => '_' . $segment,
-                                           'segmentToComplete' => $segment));
+                array('idSite' => self::$fixture->idSite,
+                    'date' => date("Y-m-d", strtotime(self::$fixture->dateTime)) . ',today',
+                    'period' => 'range',
+                    'testSuffix' => '_' . $segment,
+                    'segmentToComplete' => $segment));
         }
         return $apiForTesting;
     }
@@ -168,7 +170,7 @@ class AutoSuggestAPITest extends SystemTestCase
     {
         // Check that only a few haven't been tested specifically (these are all custom variables slots since we only test slot 1, 2, 5 (see the fixture) and example dimension slots and bandwidth)
         $maximumSegmentsToSkip = 17;
-        $this->assertLessThan($maximumSegmentsToSkip, count(self::$skipped) , 'SKIPPED ' . count(self::$skipped) . ' segments --> some segments had no "auto-suggested values"
+        $this->assertLessThan($maximumSegmentsToSkip, count(self::$skipped), 'SKIPPED ' . count(self::$skipped) . ' segments --> some segments had no "auto-suggested values"
             but we should try and test the autosuggest for all new segments. Segments skipped were: ' . implode(', ', self::$skipped));
 
         // and check that most others have been tested
@@ -212,7 +214,7 @@ class AutoSuggestAPITest extends SystemTestCase
         } catch (\Exception $ex) {
             $exception = $ex;
 
-            echo $ex->getMessage()."\n".$ex->getTraceAsString()."\n";
+            echo $ex->getMessage() . "\n" . $ex->getTraceAsString() . "\n";
         }
 
         $environment->destroy();
@@ -241,6 +243,11 @@ class AutoSuggestAPITest extends SystemTestCase
 
         return $result;
     }
+
+    public static function getPathToTestDirectory()
+    {
+        return dirname(__FILE__);
+    }
 }
 
 $date = mktime(0, 0, 0, 1, 1, 2018);
@@ -249,5 +256,5 @@ $lookBack = ceil((time() - $date) / 86400);
 
 API::$_autoSuggestLookBack = $lookBack;
 
-AutoSuggestAPITest::$fixture = new ManyVisitsWithGeoIP();
-AutoSuggestAPITest::$fixture->dateTime = Date::factory($date)->getDatetime();
+\Piwik\Plugins\API\tests\System\AutoSuggestAPITest::$fixture = new ManyVisitsWithGeoIP();
+\Piwik\Plugins\API\tests\System\AutoSuggestAPITest::$fixture->dateTime = Date::factory($date)->getDatetime();
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml
index 4294a7ca9f..4294a7ca9f 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml
+++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_actionServerHour__API.getSuggestedValuesForSegment.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_actionServerHour__API.getSuggestedValuesForSegment.xml
index 98314b9ea4..98314b9ea4 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_actionServerHour__API.getSuggestedValuesForSegment.xml
+++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_actionServerHour__API.getSuggestedValuesForSegment.xml
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_actionServerHour__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_actionServerHour__VisitsSummary.get_range.xml
index 7ace3fcbe7..7ace3fcbe7 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_actionServerHour__VisitsSummary.get_range.xml
+++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_actionServerHour__VisitsSummary.get_range.xml
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_actionServerMinute__API.getSuggestedValuesForSegment.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_actionServerMinute__API.getSuggestedValuesForSegment.xml
index 6e7cfc1a1d..6e7cfc1a1d 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_actionServerMinute__API.getSuggestedValuesForSegment.xml
+++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_actionServerMinute__API.getSuggestedValuesForSegment.xml
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_actionServerMinute__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_actionServerMinute__VisitsSummary.get_range.xml
index f3bee672d6..f3bee672d6 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_actionServerMinute__VisitsSummary.get_range.xml
+++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_actionServerMinute__VisitsSummary.get_range.xml
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_actionType__API.getSuggestedValuesForSegment.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_actionType__API.getSuggestedValuesForSegment.xml
index cff62022a9..cff62022a9 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_actionType__API.getSuggestedValuesForSegment.xml
+++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_actionType__API.getSuggestedValuesForSegment.xml
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_actionType__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_actionType__VisitsSummary.get_range.xml
index f3bee672d6..f3bee672d6 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_actionType__VisitsSummary.get_range.xml
+++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_actionType__VisitsSummary.get_range.xml
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_actionUrl__API.getSuggestedValuesForSegment.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_actionUrl__API.getSuggestedValuesForSegment.xml
index 2aaf85d5c1..2aaf85d5c1 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_actionUrl__API.getSuggestedValuesForSegment.xml
+++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_actionUrl__API.getSuggestedValuesForSegment.xml
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_actionUrl__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_actionUrl__VisitsSummary.get_range.xml
index eb20b7dcf9..eb20b7dcf9 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_actionUrl__VisitsSummary.get_range.xml
+++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_actionUrl__VisitsSummary.get_range.xml
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_actions__API.getSuggestedValuesForSegment.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_actions__API.getSuggestedValuesForSegment.xml
index 7a365ca3af..7a365ca3af 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_actions__API.getSuggestedValuesForSegment.xml
+++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_actions__API.getSuggestedValuesForSegment.xml
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_actions__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_actions__VisitsSummary.get_range.xml
index 7ace3fcbe7..7ace3fcbe7 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_actions__VisitsSummary.get_range.xml
+++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_actions__VisitsSummary.get_range.xml
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_bandwidth__API.getSuggestedValuesForSegment.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_bandwidth__API.getSuggestedValuesForSegment.xml
index c234bed59e..c234bed59e 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_bandwidth__API.getSuggestedValuesForSegment.xml
+++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_bandwidth__API.getSuggestedValuesForSegment.xml
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_browserCode__API.getSuggestedValuesForSegment.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_browserCode__API.getSuggestedValuesForSegment.xml
index 43031de55b..43031de55b 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_browserCode__API.getSuggestedValuesForSegment.xml
+++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_browserCode__API.getSuggestedValuesForSegment.xml
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_browserCode__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_browserCode__VisitsSummary.get_range.xml
index e7e79a4222..e7e79a4222 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_browserCode__VisitsSummary.get_range.xml
+++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_browserCode__VisitsSummary.get_range.xml
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_browserEngine__API.getSuggestedValuesForSegment.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_browserEngine__API.getSuggestedValuesForSegment.xml
index f056787aae..f056787aae 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_browserEngine__API.getSuggestedValuesForSegment.xml
+++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_browserEngine__API.getSuggestedValuesForSegment.xml
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_browserEngine__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_browserEngine__VisitsSummary.get_range.xml
index c0631c362b..c0631c362b 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_browserEngine__VisitsSummary.get_range.xml
+++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_browserEngine__VisitsSummary.get_range.xml
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_browserVersion__API.getSuggestedValuesForSegment.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_browserVersion__API.getSuggestedValuesForSegment.xml
index 91740cd18d..91740cd18d 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_browserVersion__API.getSuggestedValuesForSegment.xml
+++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_browserVersion__API.getSuggestedValuesForSegment.xml
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_browserVersion__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_browserVersion__VisitsSummary.get_range.xml
index 780ddda63a..780ddda63a 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_browserVersion__VisitsSummary.get_range.xml
+++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_browserVersion__VisitsSummary.get_range.xml
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_city__API.getSuggestedValuesForSegment.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_city__API.getSuggestedValuesForSegment.xml
index c5a7afa2b4..c5a7afa2b4 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_city__API.getSuggestedValuesForSegment.xml
+++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_city__API.getSuggestedValuesForSegment.xml
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_city__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_city__VisitsSummary.get_range.xml
index 02d91d0e9c..02d91d0e9c 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_city__VisitsSummary.get_range.xml
+++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_city__VisitsSummary.get_range.xml
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_contentInteraction__API.getSuggestedValuesForSegment.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_contentInteraction__API.getSuggestedValuesForSegment.xml
index c234bed59e..c234bed59e 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_contentInteraction__API.getSuggestedValuesForSegment.xml
+++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_contentInteraction__API.getSuggestedValuesForSegment.xml
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_contentName__API.getSuggestedValuesForSegment.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_contentName__API.getSuggestedValuesForSegment.xml
index c234bed59e..c234bed59e 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_contentName__API.getSuggestedValuesForSegment.xml
+++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_contentName__API.getSuggestedValuesForSegment.xml
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_contentPiece__API.getSuggestedValuesForSegment.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_contentPiece__API.getSuggestedValuesForSegment.xml
index c234bed59e..c234bed59e 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_contentPiece__API.getSuggestedValuesForSegment.xml
+++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_contentPiece__API.getSuggestedValuesForSegment.xml
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_contentTarget__API.getSuggestedValuesForSegment.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_contentTarget__API.getSuggestedValuesForSegment.xml
index c234bed59e..c234bed59e 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_contentTarget__API.getSuggestedValuesForSegment.xml
+++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_contentTarget__API.getSuggestedValuesForSegment.xml
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_continentCode__API.getSuggestedValuesForSegment.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_continentCode__API.getSuggestedValuesForSegment.xml
index f002a6ceae..f002a6ceae 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_continentCode__API.getSuggestedValuesForSegment.xml
+++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_continentCode__API.getSuggestedValuesForSegment.xml
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_continentCode__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_continentCode__VisitsSummary.get_range.xml
index c8839b7ab5..c8839b7ab5 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_continentCode__VisitsSummary.get_range.xml
+++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_continentCode__VisitsSummary.get_range.xml
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_countryCode__API.getSuggestedValuesForSegment.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_countryCode__API.getSuggestedValuesForSegment.xml
index 57ad401634..57ad401634 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_countryCode__API.getSuggestedValuesForSegment.xml
+++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_countryCode__API.getSuggestedValuesForSegment.xml
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_countryCode__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_countryCode__VisitsSummary.get_range.xml
index 02d91d0e9c..02d91d0e9c 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_countryCode__VisitsSummary.get_range.xml
+++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_countryCode__VisitsSummary.get_range.xml
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariableName1__API.getSuggestedValuesForSegment.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariableName1__API.getSuggestedValuesForSegment.xml
index d301db94df..d301db94df 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariableName1__API.getSuggestedValuesForSegment.xml
+++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariableName1__API.getSuggestedValuesForSegment.xml
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariableName1__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariableName1__VisitsSummary.get_range.xml
index 275f332d1e..275f332d1e 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariableName1__VisitsSummary.get_range.xml
+++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariableName1__VisitsSummary.get_range.xml
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariableName2__API.getSuggestedValuesForSegment.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariableName2__API.getSuggestedValuesForSegment.xml
index c234bed59e..c234bed59e 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariableName2__API.getSuggestedValuesForSegment.xml
+++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariableName2__API.getSuggestedValuesForSegment.xml
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariableName3__API.getSuggestedValuesForSegment.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariableName3__API.getSuggestedValuesForSegment.xml
index c234bed59e..c234bed59e 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariableName3__API.getSuggestedValuesForSegment.xml
+++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariableName3__API.getSuggestedValuesForSegment.xml
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariableName4__API.getSuggestedValuesForSegment.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariableName4__API.getSuggestedValuesForSegment.xml
index c234bed59e..c234bed59e 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariableName4__API.getSuggestedValuesForSegment.xml
+++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariableName4__API.getSuggestedValuesForSegment.xml
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariableName5__API.getSuggestedValuesForSegment.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariableName5__API.getSuggestedValuesForSegment.xml
index 3b00ef3096..3b00ef3096 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariableName5__API.getSuggestedValuesForSegment.xml
+++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariableName5__API.getSuggestedValuesForSegment.xml
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariableName5__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariableName5__VisitsSummary.get_range.xml
index 275f332d1e..275f332d1e 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariableName5__VisitsSummary.get_range.xml
+++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariableName5__VisitsSummary.get_range.xml
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariableName__API.getSuggestedValuesForSegment.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariableName__API.getSuggestedValuesForSegment.xml
index 9c10ae8b37..9c10ae8b37 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariableName__API.getSuggestedValuesForSegment.xml
+++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariableName__API.getSuggestedValuesForSegment.xml
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariableName__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariableName__VisitsSummary.get_range.xml
index 275f332d1e..275f332d1e 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariableName__VisitsSummary.get_range.xml
+++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariableName__VisitsSummary.get_range.xml
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariablePageName1__API.getSuggestedValuesForSegment.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariablePageName1__API.getSuggestedValuesForSegment.xml
index c234bed59e..c234bed59e 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariablePageName1__API.getSuggestedValuesForSegment.xml
+++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariablePageName1__API.getSuggestedValuesForSegment.xml
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariablePageName2__API.getSuggestedValuesForSegment.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariablePageName2__API.getSuggestedValuesForSegment.xml
index 8698fbbd4d..8698fbbd4d 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariablePageName2__API.getSuggestedValuesForSegment.xml
+++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariablePageName2__API.getSuggestedValuesForSegment.xml
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariablePageName2__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariablePageName2__VisitsSummary.get_range.xml
index b72146a986..b72146a986 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariablePageName2__VisitsSummary.get_range.xml
+++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariablePageName2__VisitsSummary.get_range.xml
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariablePageName3__API.getSuggestedValuesForSegment.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariablePageName3__API.getSuggestedValuesForSegment.xml
index c234bed59e..c234bed59e 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariablePageName3__API.getSuggestedValuesForSegment.xml
+++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariablePageName3__API.getSuggestedValuesForSegment.xml
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariablePageName4__API.getSuggestedValuesForSegment.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariablePageName4__API.getSuggestedValuesForSegment.xml
index 522fc54866..522fc54866 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariablePageName4__API.getSuggestedValuesForSegment.xml
+++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariablePageName4__API.getSuggestedValuesForSegment.xml
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariablePageName4__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariablePageName4__VisitsSummary.get_range.xml
index d8bcdace18..d8bcdace18 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariablePageName4__VisitsSummary.get_range.xml
+++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariablePageName4__VisitsSummary.get_range.xml
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariablePageName5__API.getSuggestedValuesForSegment.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariablePageName5__API.getSuggestedValuesForSegment.xml
index 3e34700999..3e34700999 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariablePageName5__API.getSuggestedValuesForSegment.xml
+++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariablePageName5__API.getSuggestedValuesForSegment.xml
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariablePageName5__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariablePageName5__VisitsSummary.get_range.xml
index b72146a986..b72146a986 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariablePageName5__VisitsSummary.get_range.xml
+++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariablePageName5__VisitsSummary.get_range.xml
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariablePageName__API.getSuggestedValuesForSegment.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariablePageName__API.getSuggestedValuesForSegment.xml
index 77fa6e91a9..77fa6e91a9 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariablePageName__API.getSuggestedValuesForSegment.xml
+++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariablePageName__API.getSuggestedValuesForSegment.xml
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariablePageName__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariablePageName__VisitsSummary.get_range.xml
index b72146a986..b72146a986 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariablePageName__VisitsSummary.get_range.xml
+++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariablePageName__VisitsSummary.get_range.xml
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariablePageValue1__API.getSuggestedValuesForSegment.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariablePageValue1__API.getSuggestedValuesForSegment.xml
index c234bed59e..c234bed59e 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariablePageValue1__API.getSuggestedValuesForSegment.xml
+++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariablePageValue1__API.getSuggestedValuesForSegment.xml
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariablePageValue2__API.getSuggestedValuesForSegment.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariablePageValue2__API.getSuggestedValuesForSegment.xml
index 18b4e9b372..18b4e9b372 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariablePageValue2__API.getSuggestedValuesForSegment.xml
+++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariablePageValue2__API.getSuggestedValuesForSegment.xml
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariablePageValue2__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariablePageValue2__VisitsSummary.get_range.xml
index 88dae8fd6c..88dae8fd6c 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariablePageValue2__VisitsSummary.get_range.xml
+++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariablePageValue2__VisitsSummary.get_range.xml
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariablePageValue3__API.getSuggestedValuesForSegment.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariablePageValue3__API.getSuggestedValuesForSegment.xml
index c234bed59e..c234bed59e 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariablePageValue3__API.getSuggestedValuesForSegment.xml
+++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariablePageValue3__API.getSuggestedValuesForSegment.xml
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariablePageValue4__API.getSuggestedValuesForSegment.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariablePageValue4__API.getSuggestedValuesForSegment.xml
index f7624776eb..f7624776eb 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariablePageValue4__API.getSuggestedValuesForSegment.xml
+++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariablePageValue4__API.getSuggestedValuesForSegment.xml
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariablePageValue4__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariablePageValue4__VisitsSummary.get_range.xml
index 125518f3a5..125518f3a5 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariablePageValue4__VisitsSummary.get_range.xml
+++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariablePageValue4__VisitsSummary.get_range.xml
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariablePageValue5__API.getSuggestedValuesForSegment.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariablePageValue5__API.getSuggestedValuesForSegment.xml
index 0425837789..0425837789 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariablePageValue5__API.getSuggestedValuesForSegment.xml
+++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariablePageValue5__API.getSuggestedValuesForSegment.xml
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariablePageValue5__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariablePageValue5__VisitsSummary.get_range.xml
index 88dae8fd6c..88dae8fd6c 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariablePageValue5__VisitsSummary.get_range.xml
+++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariablePageValue5__VisitsSummary.get_range.xml
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariablePageValue__API.getSuggestedValuesForSegment.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariablePageValue__API.getSuggestedValuesForSegment.xml
index 0ab1e3a74c..0ab1e3a74c 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariablePageValue__API.getSuggestedValuesForSegment.xml
+++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariablePageValue__API.getSuggestedValuesForSegment.xml
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariablePageValue__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariablePageValue__VisitsSummary.get_range.xml
index 125518f3a5..125518f3a5 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariablePageValue__VisitsSummary.get_range.xml
+++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariablePageValue__VisitsSummary.get_range.xml
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariableValue1__API.getSuggestedValuesForSegment.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariableValue1__API.getSuggestedValuesForSegment.xml
index b157cb068a..b157cb068a 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariableValue1__API.getSuggestedValuesForSegment.xml
+++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariableValue1__API.getSuggestedValuesForSegment.xml
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariableValue1__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariableValue1__VisitsSummary.get_range.xml
index 2748f63834..2748f63834 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariableValue1__VisitsSummary.get_range.xml
+++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariableValue1__VisitsSummary.get_range.xml
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariableValue2__API.getSuggestedValuesForSegment.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariableValue2__API.getSuggestedValuesForSegment.xml
index c234bed59e..c234bed59e 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariableValue2__API.getSuggestedValuesForSegment.xml
+++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariableValue2__API.getSuggestedValuesForSegment.xml
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariableValue3__API.getSuggestedValuesForSegment.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariableValue3__API.getSuggestedValuesForSegment.xml
index c234bed59e..c234bed59e 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariableValue3__API.getSuggestedValuesForSegment.xml
+++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariableValue3__API.getSuggestedValuesForSegment.xml
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariableValue4__API.getSuggestedValuesForSegment.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariableValue4__API.getSuggestedValuesForSegment.xml
index c234bed59e..c234bed59e 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariableValue4__API.getSuggestedValuesForSegment.xml
+++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariableValue4__API.getSuggestedValuesForSegment.xml
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariableValue5__API.getSuggestedValuesForSegment.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariableValue5__API.getSuggestedValuesForSegment.xml
index 40b2b0992a..40b2b0992a 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariableValue5__API.getSuggestedValuesForSegment.xml
+++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariableValue5__API.getSuggestedValuesForSegment.xml
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariableValue5__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariableValue5__VisitsSummary.get_range.xml
index 2748f63834..2748f63834 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariableValue5__VisitsSummary.get_range.xml
+++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariableValue5__VisitsSummary.get_range.xml
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariableValue__API.getSuggestedValuesForSegment.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariableValue__API.getSuggestedValuesForSegment.xml
index 6be328a177..6be328a177 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariableValue__API.getSuggestedValuesForSegment.xml
+++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariableValue__API.getSuggestedValuesForSegment.xml
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariableValue__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariableValue__VisitsSummary.get_range.xml
index 2748f63834..2748f63834 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariableValue__VisitsSummary.get_range.xml
+++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariableValue__VisitsSummary.get_range.xml
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_daysSinceFirstVisit__API.getSuggestedValuesForSegment.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_daysSinceFirstVisit__API.getSuggestedValuesForSegment.xml
index 487ce13284..487ce13284 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_daysSinceFirstVisit__API.getSuggestedValuesForSegment.xml
+++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_daysSinceFirstVisit__API.getSuggestedValuesForSegment.xml
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_daysSinceFirstVisit__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_daysSinceFirstVisit__VisitsSummary.get_range.xml
index eb20b7dcf9..eb20b7dcf9 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_daysSinceFirstVisit__VisitsSummary.get_range.xml
+++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_daysSinceFirstVisit__VisitsSummary.get_range.xml
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_daysSinceLastEcommerceOrder__API.getSuggestedValuesForSegment.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_daysSinceLastEcommerceOrder__API.getSuggestedValuesForSegment.xml
index ab150e6b32..ab150e6b32 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_daysSinceLastEcommerceOrder__API.getSuggestedValuesForSegment.xml
+++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_daysSinceLastEcommerceOrder__API.getSuggestedValuesForSegment.xml
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_daysSinceLastEcommerceOrder__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_daysSinceLastEcommerceOrder__VisitsSummary.get_range.xml
index eb20b7dcf9..eb20b7dcf9 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_daysSinceLastEcommerceOrder__VisitsSummary.get_range.xml
+++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_daysSinceLastEcommerceOrder__VisitsSummary.get_range.xml
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_daysSinceLastVisit__API.getSuggestedValuesForSegment.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_daysSinceLastVisit__API.getSuggestedValuesForSegment.xml
index 9a04ddc8c8..9a04ddc8c8 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_daysSinceLastVisit__API.getSuggestedValuesForSegment.xml
+++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_daysSinceLastVisit__API.getSuggestedValuesForSegment.xml
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_daysSinceLastVisit__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_daysSinceLastVisit__VisitsSummary.get_range.xml
index eb20b7dcf9..eb20b7dcf9 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_daysSinceLastVisit__VisitsSummary.get_range.xml
+++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_daysSinceLastVisit__VisitsSummary.get_range.xml
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_deviceBrand__API.getSuggestedValuesForSegment.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_deviceBrand__API.getSuggestedValuesForSegment.xml
index 6929bcb5c1..6929bcb5c1 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_deviceBrand__API.getSuggestedValuesForSegment.xml
+++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_deviceBrand__API.getSuggestedValuesForSegment.xml
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_deviceBrand__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_deviceBrand__VisitsSummary.get_range.xml
index e5851e11e6..e5851e11e6 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_deviceBrand__VisitsSummary.get_range.xml
+++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_deviceBrand__VisitsSummary.get_range.xml
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_deviceModel__API.getSuggestedValuesForSegment.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_deviceModel__API.getSuggestedValuesForSegment.xml
index f2fa6fe257..f2fa6fe257 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_deviceModel__API.getSuggestedValuesForSegment.xml
+++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_deviceModel__API.getSuggestedValuesForSegment.xml
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_deviceModel__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_deviceModel__VisitsSummary.get_range.xml
index 602805c283..602805c283 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_deviceModel__VisitsSummary.get_range.xml
+++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_deviceModel__VisitsSummary.get_range.xml
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_deviceType__API.getSuggestedValuesForSegment.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_deviceType__API.getSuggestedValuesForSegment.xml
index 811b7dac21..811b7dac21 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_deviceType__API.getSuggestedValuesForSegment.xml
+++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_deviceType__API.getSuggestedValuesForSegment.xml
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_deviceType__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_deviceType__VisitsSummary.get_range.xml
index 602805c283..602805c283 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_deviceType__VisitsSummary.get_range.xml
+++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_deviceType__VisitsSummary.get_range.xml
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_downloadUrl__API.getSuggestedValuesForSegment.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_downloadUrl__API.getSuggestedValuesForSegment.xml
index b30da2f6c7..b30da2f6c7 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_downloadUrl__API.getSuggestedValuesForSegment.xml
+++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_downloadUrl__API.getSuggestedValuesForSegment.xml
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_downloadUrl__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_downloadUrl__VisitsSummary.get_range.xml
index f83f0d8a40..f83f0d8a40 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_downloadUrl__VisitsSummary.get_range.xml
+++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_downloadUrl__VisitsSummary.get_range.xml
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_entryPageTitle__API.getSuggestedValuesForSegment.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_entryPageTitle__API.getSuggestedValuesForSegment.xml
index 9916600524..9916600524 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_entryPageTitle__API.getSuggestedValuesForSegment.xml
+++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_entryPageTitle__API.getSuggestedValuesForSegment.xml
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_entryPageTitle__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_entryPageTitle__VisitsSummary.get_range.xml
index b72146a986..b72146a986 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_entryPageTitle__VisitsSummary.get_range.xml
+++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_entryPageTitle__VisitsSummary.get_range.xml
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_entryPageUrl__API.getSuggestedValuesForSegment.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_entryPageUrl__API.getSuggestedValuesForSegment.xml
index 4d3c877fce..4d3c877fce 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_entryPageUrl__API.getSuggestedValuesForSegment.xml
+++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_entryPageUrl__API.getSuggestedValuesForSegment.xml
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_entryPageUrl__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_entryPageUrl__VisitsSummary.get_range.xml
index 7ace3fcbe7..7ace3fcbe7 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_entryPageUrl__VisitsSummary.get_range.xml
+++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_entryPageUrl__VisitsSummary.get_range.xml
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_eventAction__API.getSuggestedValuesForSegment.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_eventAction__API.getSuggestedValuesForSegment.xml
index df2f6b2dac..df2f6b2dac 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_eventAction__API.getSuggestedValuesForSegment.xml
+++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_eventAction__API.getSuggestedValuesForSegment.xml
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_eventAction__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_eventAction__VisitsSummary.get_range.xml
index f83f0d8a40..f83f0d8a40 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_eventAction__VisitsSummary.get_range.xml
+++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_eventAction__VisitsSummary.get_range.xml
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_eventCategory__API.getSuggestedValuesForSegment.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_eventCategory__API.getSuggestedValuesForSegment.xml
index 952a834c1a..952a834c1a 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_eventCategory__API.getSuggestedValuesForSegment.xml
+++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_eventCategory__API.getSuggestedValuesForSegment.xml
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_eventCategory__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_eventCategory__VisitsSummary.get_range.xml
index f83f0d8a40..f83f0d8a40 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_eventCategory__VisitsSummary.get_range.xml
+++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_eventCategory__VisitsSummary.get_range.xml
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_eventName__API.getSuggestedValuesForSegment.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_eventName__API.getSuggestedValuesForSegment.xml
index fa8c853fcf..fa8c853fcf 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_eventName__API.getSuggestedValuesForSegment.xml
+++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_eventName__API.getSuggestedValuesForSegment.xml
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_eventName__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_eventName__VisitsSummary.get_range.xml
index f83f0d8a40..f83f0d8a40 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_eventName__VisitsSummary.get_range.xml
+++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_eventName__VisitsSummary.get_range.xml
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_eventUrl__API.getSuggestedValuesForSegment.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_eventUrl__API.getSuggestedValuesForSegment.xml
index 60d14d644c..60d14d644c 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_eventUrl__API.getSuggestedValuesForSegment.xml
+++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_eventUrl__API.getSuggestedValuesForSegment.xml
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_eventUrl__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_eventUrl__VisitsSummary.get_range.xml
index eb20b7dcf9..eb20b7dcf9 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_eventUrl__VisitsSummary.get_range.xml
+++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_eventUrl__VisitsSummary.get_range.xml
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_eventValue__API.getSuggestedValuesForSegment.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_eventValue__API.getSuggestedValuesForSegment.xml
index 90d8127471..90d8127471 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_eventValue__API.getSuggestedValuesForSegment.xml
+++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_eventValue__API.getSuggestedValuesForSegment.xml
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_eventValue__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_eventValue__VisitsSummary.get_range.xml
index d8bcdace18..d8bcdace18 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_eventValue__VisitsSummary.get_range.xml
+++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_eventValue__VisitsSummary.get_range.xml
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_events__API.getSuggestedValuesForSegment.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_events__API.getSuggestedValuesForSegment.xml
index 727df89075..727df89075 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_events__API.getSuggestedValuesForSegment.xml
+++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_events__API.getSuggestedValuesForSegment.xml
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_events__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_events__VisitsSummary.get_range.xml
index 7ace3fcbe7..7ace3fcbe7 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_events__VisitsSummary.get_range.xml
+++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_events__VisitsSummary.get_range.xml
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_exitPageTitle__API.getSuggestedValuesForSegment.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_exitPageTitle__API.getSuggestedValuesForSegment.xml
index 9916600524..9916600524 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_exitPageTitle__API.getSuggestedValuesForSegment.xml
+++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_exitPageTitle__API.getSuggestedValuesForSegment.xml
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_exitPageTitle__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_exitPageTitle__VisitsSummary.get_range.xml
index b72146a986..b72146a986 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_exitPageTitle__VisitsSummary.get_range.xml
+++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_exitPageTitle__VisitsSummary.get_range.xml
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_exitPageUrl__API.getSuggestedValuesForSegment.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_exitPageUrl__API.getSuggestedValuesForSegment.xml
index 4d3c877fce..4d3c877fce 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_exitPageUrl__API.getSuggestedValuesForSegment.xml
+++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_exitPageUrl__API.getSuggestedValuesForSegment.xml
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_exitPageUrl__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_exitPageUrl__VisitsSummary.get_range.xml
index 7ace3fcbe7..7ace3fcbe7 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_exitPageUrl__VisitsSummary.get_range.xml
+++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_exitPageUrl__VisitsSummary.get_range.xml
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_interaction_position__API.getSuggestedValuesForSegment.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_interaction_position__API.getSuggestedValuesForSegment.xml
index c234bed59e..c234bed59e 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_interaction_position__API.getSuggestedValuesForSegment.xml
+++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_interaction_position__API.getSuggestedValuesForSegment.xml
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_interactions__API.getSuggestedValuesForSegment.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_interactions__API.getSuggestedValuesForSegment.xml
index 35bc2d8319..35bc2d8319 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_interactions__API.getSuggestedValuesForSegment.xml
+++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_interactions__API.getSuggestedValuesForSegment.xml
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_interactions__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_interactions__VisitsSummary.get_range.xml
index 7c9bf3fd36..7c9bf3fd36 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_interactions__VisitsSummary.get_range.xml
+++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_interactions__VisitsSummary.get_range.xml
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_languageCode__API.getSuggestedValuesForSegment.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_languageCode__API.getSuggestedValuesForSegment.xml
index b437c6054b..b437c6054b 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_languageCode__API.getSuggestedValuesForSegment.xml
+++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_languageCode__API.getSuggestedValuesForSegment.xml
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_languageCode__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_languageCode__VisitsSummary.get_range.xml
index 3ce6d98183..3ce6d98183 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_languageCode__VisitsSummary.get_range.xml
+++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_languageCode__VisitsSummary.get_range.xml
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_latitude__API.getSuggestedValuesForSegment.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_latitude__API.getSuggestedValuesForSegment.xml
index 8cc367528e..8cc367528e 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_latitude__API.getSuggestedValuesForSegment.xml
+++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_latitude__API.getSuggestedValuesForSegment.xml
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_latitude__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_latitude__VisitsSummary.get_range.xml
index 789c2c6fd1..789c2c6fd1 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_latitude__VisitsSummary.get_range.xml
+++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_latitude__VisitsSummary.get_range.xml
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_longitude__API.getSuggestedValuesForSegment.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_longitude__API.getSuggestedValuesForSegment.xml
index 43e5a510a3..43e5a510a3 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_longitude__API.getSuggestedValuesForSegment.xml
+++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_longitude__API.getSuggestedValuesForSegment.xml
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_longitude__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_longitude__VisitsSummary.get_range.xml
index 789c2c6fd1..789c2c6fd1 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_longitude__VisitsSummary.get_range.xml
+++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_longitude__VisitsSummary.get_range.xml
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_operatingSystemCode__API.getSuggestedValuesForSegment.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_operatingSystemCode__API.getSuggestedValuesForSegment.xml
index c79c69b966..c79c69b966 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_operatingSystemCode__API.getSuggestedValuesForSegment.xml
+++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_operatingSystemCode__API.getSuggestedValuesForSegment.xml
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_operatingSystemCode__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_operatingSystemCode__VisitsSummary.get_range.xml
index a2651f3ccd..a2651f3ccd 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_operatingSystemCode__VisitsSummary.get_range.xml
+++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_operatingSystemCode__VisitsSummary.get_range.xml
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_operatingSystemVersion__API.getSuggestedValuesForSegment.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_operatingSystemVersion__API.getSuggestedValuesForSegment.xml
index 4d86f11bfd..4d86f11bfd 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_operatingSystemVersion__API.getSuggestedValuesForSegment.xml
+++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_operatingSystemVersion__API.getSuggestedValuesForSegment.xml
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_operatingSystemVersion__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_operatingSystemVersion__VisitsSummary.get_range.xml
index abb563f023..abb563f023 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_operatingSystemVersion__VisitsSummary.get_range.xml
+++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_operatingSystemVersion__VisitsSummary.get_range.xml
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_outlinkUrl__API.getSuggestedValuesForSegment.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_outlinkUrl__API.getSuggestedValuesForSegment.xml
index 4c58bd37df..4c58bd37df 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_outlinkUrl__API.getSuggestedValuesForSegment.xml
+++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_outlinkUrl__API.getSuggestedValuesForSegment.xml
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_outlinkUrl__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_outlinkUrl__VisitsSummary.get_range.xml
index f83f0d8a40..f83f0d8a40 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_outlinkUrl__VisitsSummary.get_range.xml
+++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_outlinkUrl__VisitsSummary.get_range.xml
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_pageTitle__API.getSuggestedValuesForSegment.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_pageTitle__API.getSuggestedValuesForSegment.xml
index 9916600524..9916600524 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_pageTitle__API.getSuggestedValuesForSegment.xml
+++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_pageTitle__API.getSuggestedValuesForSegment.xml
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_pageTitle__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_pageTitle__VisitsSummary.get_range.xml
index b72146a986..b72146a986 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_pageTitle__VisitsSummary.get_range.xml
+++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_pageTitle__VisitsSummary.get_range.xml
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_pageUrl__API.getSuggestedValuesForSegment.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_pageUrl__API.getSuggestedValuesForSegment.xml
index 4d3c877fce..4d3c877fce 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_pageUrl__API.getSuggestedValuesForSegment.xml
+++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_pageUrl__API.getSuggestedValuesForSegment.xml
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_pageUrl__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_pageUrl__VisitsSummary.get_range.xml
index 7ace3fcbe7..7ace3fcbe7 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_pageUrl__VisitsSummary.get_range.xml
+++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_pageUrl__VisitsSummary.get_range.xml
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_provider__API.getSuggestedValuesForSegment.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_provider__API.getSuggestedValuesForSegment.xml
index 6cf1af346e..6cf1af346e 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_provider__API.getSuggestedValuesForSegment.xml
+++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_provider__API.getSuggestedValuesForSegment.xml
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_provider__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_provider__VisitsSummary.get_range.xml
index c51a1bc13d..c51a1bc13d 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_provider__VisitsSummary.get_range.xml
+++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_provider__VisitsSummary.get_range.xml
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_referrerKeyword__API.getSuggestedValuesForSegment.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_referrerKeyword__API.getSuggestedValuesForSegment.xml
index 2959b13a9c..2959b13a9c 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_referrerKeyword__API.getSuggestedValuesForSegment.xml
+++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_referrerKeyword__API.getSuggestedValuesForSegment.xml
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_referrerKeyword__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_referrerKeyword__VisitsSummary.get_range.xml
index dfa3a20623..dfa3a20623 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_referrerKeyword__VisitsSummary.get_range.xml
+++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_referrerKeyword__VisitsSummary.get_range.xml
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_referrerName__API.getSuggestedValuesForSegment.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_referrerName__API.getSuggestedValuesForSegment.xml
index 6ca2019597..6ca2019597 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_referrerName__API.getSuggestedValuesForSegment.xml
+++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_referrerName__API.getSuggestedValuesForSegment.xml
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_referrerName__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_referrerName__VisitsSummary.get_range.xml
index dfa3a20623..dfa3a20623 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_referrerName__VisitsSummary.get_range.xml
+++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_referrerName__VisitsSummary.get_range.xml
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_referrerType__API.getSuggestedValuesForSegment.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_referrerType__API.getSuggestedValuesForSegment.xml
index 80ee90b880..80ee90b880 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_referrerType__API.getSuggestedValuesForSegment.xml
+++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_referrerType__API.getSuggestedValuesForSegment.xml
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_referrerType__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_referrerType__VisitsSummary.get_range.xml
index d21dc7e9e9..d21dc7e9e9 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_referrerType__VisitsSummary.get_range.xml
+++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_referrerType__VisitsSummary.get_range.xml
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_referrerUrl__API.getSuggestedValuesForSegment.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_referrerUrl__API.getSuggestedValuesForSegment.xml
index f7cd8deb3b..f7cd8deb3b 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_referrerUrl__API.getSuggestedValuesForSegment.xml
+++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_referrerUrl__API.getSuggestedValuesForSegment.xml
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_referrerUrl__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_referrerUrl__VisitsSummary.get_range.xml
index dfa3a20623..dfa3a20623 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_referrerUrl__VisitsSummary.get_range.xml
+++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_referrerUrl__VisitsSummary.get_range.xml
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_regionCode__API.getSuggestedValuesForSegment.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_regionCode__API.getSuggestedValuesForSegment.xml
index 3687cc46dc..3687cc46dc 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_regionCode__API.getSuggestedValuesForSegment.xml
+++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_regionCode__API.getSuggestedValuesForSegment.xml
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_regionCode__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_regionCode__VisitsSummary.get_range.xml
index ca32407536..ca32407536 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_regionCode__VisitsSummary.get_range.xml
+++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_regionCode__VisitsSummary.get_range.xml
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_resolution__API.getSuggestedValuesForSegment.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_resolution__API.getSuggestedValuesForSegment.xml
index 5a29930810..5a29930810 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_resolution__API.getSuggestedValuesForSegment.xml
+++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_resolution__API.getSuggestedValuesForSegment.xml
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_resolution__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_resolution__VisitsSummary.get_range.xml
index f3bee672d6..f3bee672d6 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_resolution__VisitsSummary.get_range.xml
+++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_resolution__VisitsSummary.get_range.xml
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_searches__API.getSuggestedValuesForSegment.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_searches__API.getSuggestedValuesForSegment.xml
index 727df89075..727df89075 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_searches__API.getSuggestedValuesForSegment.xml
+++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_searches__API.getSuggestedValuesForSegment.xml
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_searches__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_searches__VisitsSummary.get_range.xml
index 7c9bf3fd36..7c9bf3fd36 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_searches__VisitsSummary.get_range.xml
+++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_searches__VisitsSummary.get_range.xml
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_siteSearchKeyword__API.getSuggestedValuesForSegment.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_siteSearchKeyword__API.getSuggestedValuesForSegment.xml
index 0690d54c62..0690d54c62 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_siteSearchKeyword__API.getSuggestedValuesForSegment.xml
+++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_siteSearchKeyword__API.getSuggestedValuesForSegment.xml
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_siteSearchKeyword__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_siteSearchKeyword__VisitsSummary.get_range.xml
index 125518f3a5..125518f3a5 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_siteSearchKeyword__VisitsSummary.get_range.xml
+++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_siteSearchKeyword__VisitsSummary.get_range.xml
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_userId__API.getSuggestedValuesForSegment.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_userId__API.getSuggestedValuesForSegment.xml
index 381e1be3af..381e1be3af 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_userId__API.getSuggestedValuesForSegment.xml
+++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_userId__API.getSuggestedValuesForSegment.xml
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_userId__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_userId__VisitsSummary.get_range.xml
index dfa3a20623..dfa3a20623 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_userId__VisitsSummary.get_range.xml
+++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_userId__VisitsSummary.get_range.xml
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitConvertedGoalId__API.getSuggestedValuesForSegment.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitConvertedGoalId__API.getSuggestedValuesForSegment.xml
index 1099070756..1099070756 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitConvertedGoalId__API.getSuggestedValuesForSegment.xml
+++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitConvertedGoalId__API.getSuggestedValuesForSegment.xml
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitConvertedGoalId__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitConvertedGoalId__VisitsSummary.get_range.xml
index f3bee672d6..f3bee672d6 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitConvertedGoalId__VisitsSummary.get_range.xml
+++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitConvertedGoalId__VisitsSummary.get_range.xml
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitConverted__API.getSuggestedValuesForSegment.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitConverted__API.getSuggestedValuesForSegment.xml
index 70bdb9e417..70bdb9e417 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitConverted__API.getSuggestedValuesForSegment.xml
+++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitConverted__API.getSuggestedValuesForSegment.xml
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitConverted__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitConverted__VisitsSummary.get_range.xml
index f3bee672d6..f3bee672d6 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitConverted__VisitsSummary.get_range.xml
+++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitConverted__VisitsSummary.get_range.xml
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitCount__API.getSuggestedValuesForSegment.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitCount__API.getSuggestedValuesForSegment.xml
index cec58f0121..cec58f0121 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitCount__API.getSuggestedValuesForSegment.xml
+++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitCount__API.getSuggestedValuesForSegment.xml
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitCount__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitCount__VisitsSummary.get_range.xml
index 1d724e8969..1d724e8969 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitCount__VisitsSummary.get_range.xml
+++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitCount__VisitsSummary.get_range.xml
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitDuration__API.getSuggestedValuesForSegment.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitDuration__API.getSuggestedValuesForSegment.xml
index 829f7602ef..829f7602ef 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitDuration__API.getSuggestedValuesForSegment.xml
+++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitDuration__API.getSuggestedValuesForSegment.xml
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitDuration__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitDuration__VisitsSummary.get_range.xml
index 7ace3fcbe7..7ace3fcbe7 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitDuration__VisitsSummary.get_range.xml
+++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitDuration__VisitsSummary.get_range.xml
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitEcommerceStatus__API.getSuggestedValuesForSegment.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitEcommerceStatus__API.getSuggestedValuesForSegment.xml
index 5acd8f333f..5acd8f333f 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitEcommerceStatus__API.getSuggestedValuesForSegment.xml
+++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitEcommerceStatus__API.getSuggestedValuesForSegment.xml
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitEcommerceStatus__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitEcommerceStatus__VisitsSummary.get_range.xml
index f3bee672d6..f3bee672d6 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitEcommerceStatus__VisitsSummary.get_range.xml
+++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitEcommerceStatus__VisitsSummary.get_range.xml
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitEndServerDate__API.getSuggestedValuesForSegment.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitEndServerDate__API.getSuggestedValuesForSegment.xml
index 69a9077a56..69a9077a56 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitEndServerDate__API.getSuggestedValuesForSegment.xml
+++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitEndServerDate__API.getSuggestedValuesForSegment.xml
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitEndServerDate__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitEndServerDate__VisitsSummary.get_range.xml
index d8bcdace18..d8bcdace18 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitEndServerDate__VisitsSummary.get_range.xml
+++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitEndServerDate__VisitsSummary.get_range.xml
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitEndServerDayOfMonth__API.getSuggestedValuesForSegment.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitEndServerDayOfMonth__API.getSuggestedValuesForSegment.xml
index 6e7cfc1a1d..6e7cfc1a1d 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitEndServerDayOfMonth__API.getSuggestedValuesForSegment.xml
+++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitEndServerDayOfMonth__API.getSuggestedValuesForSegment.xml
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitEndServerDayOfMonth__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitEndServerDayOfMonth__VisitsSummary.get_range.xml
index d8bcdace18..d8bcdace18 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitEndServerDayOfMonth__VisitsSummary.get_range.xml
+++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitEndServerDayOfMonth__VisitsSummary.get_range.xml
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitEndServerDayOfWeek__API.getSuggestedValuesForSegment.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitEndServerDayOfWeek__API.getSuggestedValuesForSegment.xml
index 02f69dbb12..02f69dbb12 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitEndServerDayOfWeek__API.getSuggestedValuesForSegment.xml
+++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitEndServerDayOfWeek__API.getSuggestedValuesForSegment.xml
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitEndServerDayOfWeek__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitEndServerDayOfWeek__VisitsSummary.get_range.xml
index c07d0eb617..c07d0eb617 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitEndServerDayOfWeek__VisitsSummary.get_range.xml
+++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitEndServerDayOfWeek__VisitsSummary.get_range.xml
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitEndServerDayOfYear__API.getSuggestedValuesForSegment.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitEndServerDayOfYear__API.getSuggestedValuesForSegment.xml
index 35bc2d8319..35bc2d8319 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitEndServerDayOfYear__API.getSuggestedValuesForSegment.xml
+++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitEndServerDayOfYear__API.getSuggestedValuesForSegment.xml
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitEndServerDayOfYear__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitEndServerDayOfYear__VisitsSummary.get_range.xml
index b1a10577da..b1a10577da 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitEndServerDayOfYear__VisitsSummary.get_range.xml
+++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitEndServerDayOfYear__VisitsSummary.get_range.xml
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitEndServerMinute__API.getSuggestedValuesForSegment.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitEndServerMinute__API.getSuggestedValuesForSegment.xml
index 6e7cfc1a1d..6e7cfc1a1d 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitEndServerMinute__API.getSuggestedValuesForSegment.xml
+++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitEndServerMinute__API.getSuggestedValuesForSegment.xml
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitEndServerMinute__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitEndServerMinute__VisitsSummary.get_range.xml
index 7ace3fcbe7..7ace3fcbe7 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitEndServerMinute__VisitsSummary.get_range.xml
+++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitEndServerMinute__VisitsSummary.get_range.xml
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitEndServerMonth__API.getSuggestedValuesForSegment.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitEndServerMonth__API.getSuggestedValuesForSegment.xml
index 823ea43efb..823ea43efb 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitEndServerMonth__API.getSuggestedValuesForSegment.xml
+++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitEndServerMonth__API.getSuggestedValuesForSegment.xml
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitEndServerMonth__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitEndServerMonth__VisitsSummary.get_range.xml
index f3bee672d6..f3bee672d6 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitEndServerMonth__VisitsSummary.get_range.xml
+++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitEndServerMonth__VisitsSummary.get_range.xml
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitEndServerQuarter__API.getSuggestedValuesForSegment.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitEndServerQuarter__API.getSuggestedValuesForSegment.xml
index a549f79155..a549f79155 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitEndServerQuarter__API.getSuggestedValuesForSegment.xml
+++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitEndServerQuarter__API.getSuggestedValuesForSegment.xml
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitEndServerQuarter__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitEndServerQuarter__VisitsSummary.get_range.xml
index f3bee672d6..f3bee672d6 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitEndServerQuarter__VisitsSummary.get_range.xml
+++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitEndServerQuarter__VisitsSummary.get_range.xml
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitEndServerSecond__API.getSuggestedValuesForSegment.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitEndServerSecond__API.getSuggestedValuesForSegment.xml
index 6e7cfc1a1d..6e7cfc1a1d 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitEndServerSecond__API.getSuggestedValuesForSegment.xml
+++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitEndServerSecond__API.getSuggestedValuesForSegment.xml
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitEndServerSecond__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitEndServerSecond__VisitsSummary.get_range.xml
index f3bee672d6..f3bee672d6 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitEndServerSecond__VisitsSummary.get_range.xml
+++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitEndServerSecond__VisitsSummary.get_range.xml
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitEndServerWeekOfYear__API.getSuggestedValuesForSegment.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitEndServerWeekOfYear__API.getSuggestedValuesForSegment.xml
index 35bc2d8319..35bc2d8319 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitEndServerWeekOfYear__API.getSuggestedValuesForSegment.xml
+++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitEndServerWeekOfYear__API.getSuggestedValuesForSegment.xml
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitEndServerWeekOfYear__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitEndServerWeekOfYear__VisitsSummary.get_range.xml
index 83f3ba2d8c..83f3ba2d8c 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitEndServerWeekOfYear__VisitsSummary.get_range.xml
+++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitEndServerWeekOfYear__VisitsSummary.get_range.xml
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitEndServerYear__API.getSuggestedValuesForSegment.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitEndServerYear__API.getSuggestedValuesForSegment.xml
index d829abc6d6..d829abc6d6 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitEndServerYear__API.getSuggestedValuesForSegment.xml
+++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitEndServerYear__API.getSuggestedValuesForSegment.xml
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitEndServerYear__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitEndServerYear__VisitsSummary.get_range.xml
index d8bcdace18..d8bcdace18 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitEndServerYear__VisitsSummary.get_range.xml
+++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitEndServerYear__VisitsSummary.get_range.xml
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitId__API.getSuggestedValuesForSegment.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitId__API.getSuggestedValuesForSegment.xml
index c234bed59e..c234bed59e 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitId__API.getSuggestedValuesForSegment.xml
+++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitId__API.getSuggestedValuesForSegment.xml
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitIp__API.getSuggestedValuesForSegment.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitIp__API.getSuggestedValuesForSegment.xml
index e969ca3cc5..e969ca3cc5 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitIp__API.getSuggestedValuesForSegment.xml
+++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitIp__API.getSuggestedValuesForSegment.xml
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitIp__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitIp__VisitsSummary.get_range.xml
index c07d0eb617..c07d0eb617 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitIp__VisitsSummary.get_range.xml
+++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitIp__VisitsSummary.get_range.xml
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitLocalHour__API.getSuggestedValuesForSegment.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitLocalHour__API.getSuggestedValuesForSegment.xml
index e8a749dda2..e8a749dda2 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitLocalHour__API.getSuggestedValuesForSegment.xml
+++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitLocalHour__API.getSuggestedValuesForSegment.xml
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitLocalHour__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitLocalHour__VisitsSummary.get_range.xml
index f3bee672d6..f3bee672d6 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitLocalHour__VisitsSummary.get_range.xml
+++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitLocalHour__VisitsSummary.get_range.xml
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitLocalMinute__API.getSuggestedValuesForSegment.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitLocalMinute__API.getSuggestedValuesForSegment.xml
index 6e7cfc1a1d..6e7cfc1a1d 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitLocalMinute__API.getSuggestedValuesForSegment.xml
+++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitLocalMinute__API.getSuggestedValuesForSegment.xml
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitLocalMinute__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitLocalMinute__VisitsSummary.get_range.xml
index d8bcdace18..d8bcdace18 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitLocalMinute__VisitsSummary.get_range.xml
+++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitLocalMinute__VisitsSummary.get_range.xml
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitServerHour__API.getSuggestedValuesForSegment.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitServerHour__API.getSuggestedValuesForSegment.xml
index 727df89075..727df89075 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitServerHour__API.getSuggestedValuesForSegment.xml
+++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitServerHour__API.getSuggestedValuesForSegment.xml
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitServerHour__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitServerHour__VisitsSummary.get_range.xml
index 7ace3fcbe7..7ace3fcbe7 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitServerHour__VisitsSummary.get_range.xml
+++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitServerHour__VisitsSummary.get_range.xml
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitServerMinute__API.getSuggestedValuesForSegment.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitServerMinute__API.getSuggestedValuesForSegment.xml
index 6e7cfc1a1d..6e7cfc1a1d 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitServerMinute__API.getSuggestedValuesForSegment.xml
+++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitServerMinute__API.getSuggestedValuesForSegment.xml
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitServerMinute__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitServerMinute__VisitsSummary.get_range.xml
index 7ace3fcbe7..7ace3fcbe7 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitServerMinute__VisitsSummary.get_range.xml
+++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitServerMinute__VisitsSummary.get_range.xml
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitStartServerHour__API.getSuggestedValuesForSegment.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitStartServerHour__API.getSuggestedValuesForSegment.xml
index 98314b9ea4..98314b9ea4 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitStartServerHour__API.getSuggestedValuesForSegment.xml
+++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitStartServerHour__API.getSuggestedValuesForSegment.xml
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitStartServerHour__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitStartServerHour__VisitsSummary.get_range.xml
index 7ace3fcbe7..7ace3fcbe7 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitStartServerHour__VisitsSummary.get_range.xml
+++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitStartServerHour__VisitsSummary.get_range.xml
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitStartServerMinute__API.getSuggestedValuesForSegment.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitStartServerMinute__API.getSuggestedValuesForSegment.xml
index 6e7cfc1a1d..6e7cfc1a1d 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitStartServerMinute__API.getSuggestedValuesForSegment.xml
+++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitStartServerMinute__API.getSuggestedValuesForSegment.xml
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitStartServerMinute__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitStartServerMinute__VisitsSummary.get_range.xml
index 7ace3fcbe7..7ace3fcbe7 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitStartServerMinute__VisitsSummary.get_range.xml
+++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitStartServerMinute__VisitsSummary.get_range.xml
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitorId__API.getSuggestedValuesForSegment.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitorId__API.getSuggestedValuesForSegment.xml
index e21f421867..e21f421867 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitorId__API.getSuggestedValuesForSegment.xml
+++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitorId__API.getSuggestedValuesForSegment.xml
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitorId__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitorId__VisitsSummary.get_range.xml
index 1f4bd3c02b..1f4bd3c02b 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitorId__VisitsSummary.get_range.xml
+++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitorId__VisitsSummary.get_range.xml
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitorType__API.getSuggestedValuesForSegment.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitorType__API.getSuggestedValuesForSegment.xml
index e598eaeee8..e598eaeee8 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitorType__API.getSuggestedValuesForSegment.xml
+++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitorType__API.getSuggestedValuesForSegment.xml
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitorType__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitorType__VisitsSummary.get_range.xml
index 1d724e8969..1d724e8969 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitorType__VisitsSummary.get_range.xml
+++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitorType__VisitsSummary.get_range.xml
diff --git a/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_archive_php_cron_output.txt b/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_archive_php_cron_output.txt
index a5ed07ce73..b062c572f7 100644
--- a/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_archive_php_cron_output.txt
+++ b/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_archive_php_cron_output.txt
@@ -10,96 +10,96 @@ try 'php archive.php --url=http://your.piwik/path'
 -------------------------------------------------------
 
 
-INFO [2018-08-14 20:22:02] 7680  ---------------------------
-INFO [2018-08-14 20:22:02] 7680  INIT
-INFO [2018-08-14 20:22:02] 7680  Running Matomo 3.6.0-b5 as Super User
-INFO [2018-08-14 20:22:02] 7680  ---------------------------
-INFO [2018-08-14 20:22:02] 7680  NOTES
-INFO [2018-08-14 20:22:02] 7680  - If you execute this script at least once per hour (or more often) in a crontab, you may disable 'Browser trigger archiving' in Matomo UI > Settings > General Settings.
-INFO [2018-08-14 20:22:02] 7680    See the doc at: https://matomo.org/docs/setup-auto-archiving/
-INFO [2018-08-14 20:22:02] 7680  - Reports for today will be processed at most every 150 seconds. You can change this value in Matomo UI > Settings > General Settings.
-INFO [2018-08-14 20:22:02] 7680  - Reports for the current week/month/year will be requested at most every 3600 seconds.
-INFO [2018-08-14 20:22:02] 7680  - Will invalidate archived reports for 2012-08-09 for following websites ids: 1
-INFO [2018-08-14 20:22:02] 7680  - Will invalidate archived reports for 2012-08-10 for following websites ids: 1
-INFO [2018-08-14 20:22:02] 7680  - Will invalidate archived reports for 2012-08-11 for following websites ids: 1
-INFO [2018-08-14 20:22:02] 7680  - Will invalidate archived reports for 2012-08-15 for following websites ids: 1,2,3
-INFO [2018-08-14 20:22:02] 7680  - Will invalidate archived reports for 2012-08-19 for following websites ids: 1
-INFO [2018-08-14 20:22:02] 7680  - Will invalidate archived reports for 2012-09-30 for following websites ids: 1
-INFO [2018-08-14 20:22:02] 7680  - Will invalidate archived reports for 2014-03-12 for following websites ids: 1,3
-INFO [2018-08-14 20:22:02] 7680  - Will invalidate archived reports for 2014-03-13 for following websites ids: 1,3
-INFO [2018-08-14 20:22:02] 7680  - Will process 3 other websites because some old data reports have been invalidated (eg. using the Log Import script or the InvalidateReports plugin) , IDs: 1, 2, 3
-INFO [2018-08-14 20:22:02] 7680  ---------------------------
-INFO [2018-08-14 20:22:02] 7680  START
-INFO [2018-08-14 20:22:02] 7680  Starting Matomo reports archiving...
-INFO [2018-08-14 20:22:02] 7680  Old report was invalidated for website id 1
-INFO [2018-08-14 20:22:02] 7680  Will pre-process for website id = 1, period = day, date = last52
-INFO [2018-08-14 20:22:02] 7680  - pre-processing all visits
-INFO [2018-08-14 20:22:05] 7680  - pre-processing segment 1/3 browserCode==IE
-INFO [2018-08-14 20:22:05] 7680  - pre-processing segment 2/3 visitCount<=5;visitorType!=non-existing-type;daysSinceFirstVisit<=50
-INFO [2018-08-14 20:22:05] 7680  - pre-processing segment 3/3 visitCount<=5;visitorType!=re%2C%3Btest%20is%20encoded;daysSinceFirstVisit<=50
-INFO [2018-08-14 20:22:10] 7680  Archived website id = 1, period = day, 3 segments, 0 visits in last 52 days, 0 visits today, Time elapsed: 8.314s
-INFO [2018-08-14 20:22:11] 7680  Will pre-process for website id = 1, period = week, date = last260
-INFO [2018-08-14 20:22:11] 7680  - pre-processing all visits
-INFO [2018-08-14 20:22:11] 7680  - pre-processing segment 1/3 browserCode==IE
-INFO [2018-08-14 20:22:11] 7680  - pre-processing segment 2/3 visitCount<=5;visitorType!=non-existing-type;daysSinceFirstVisit<=50
-INFO [2018-08-14 20:23:51] 7680  - pre-processing segment 3/3 visitCount<=5;visitorType!=re%2C%3Btest%20is%20encoded;daysSinceFirstVisit<=50
-INFO [2018-08-14 20:24:43] 7680  Archived website id = 1, period = week, 3 segments, 12 visits in last 260 weeks, 0 visits this week, Time elapsed: 152.529s
-INFO [2018-08-14 20:24:43] 7680  Will pre-process for website id = 1, period = month, date = last52
-INFO [2018-08-14 20:24:43] 7680  - pre-processing all visits
-INFO [2018-08-14 20:24:43] 7680  - pre-processing segment 1/3 browserCode==IE
-INFO [2018-08-14 20:24:43] 7680  - pre-processing segment 2/3 visitCount<=5;visitorType!=non-existing-type;daysSinceFirstVisit<=50
-INFO [2018-08-14 20:24:55] 7680  - pre-processing segment 3/3 visitCount<=5;visitorType!=re%2C%3Btest%20is%20encoded;daysSinceFirstVisit<=50
-INFO [2018-08-14 20:25:01] 7680  Archived website id = 1, period = month, 3 segments, 0 visits in last 52 months, 0 visits this month, Time elapsed: 17.932s
-INFO [2018-08-14 20:25:01] 7680  Will pre-process for website id = 1, period = year, date = last7
-INFO [2018-08-14 20:25:01] 7680  - pre-processing all visits
-INFO [2018-08-14 20:25:01] 7680  - pre-processing segment 1/3 browserCode==IE
-INFO [2018-08-14 20:25:01] 7680  - pre-processing segment 2/3 visitCount<=5;visitorType!=non-existing-type;daysSinceFirstVisit<=50
-INFO [2018-08-14 20:25:37] 7680  - pre-processing segment 3/3 visitCount<=5;visitorType!=re%2C%3Btest%20is%20encoded;daysSinceFirstVisit<=50
-INFO [2018-08-14 20:25:55] 7680  Archived website id = 1, period = year, 3 segments, 46 visits in last 7 years, 0 visits this year, Time elapsed: 54.369s
-INFO [2018-08-14 20:25:55] 7680  Archived website id = 1, 16 API requests, Time elapsed: 233.154s [1/3 done]
-INFO [2018-08-14 20:25:55] 7680  Old report was invalidated for website id 2
-INFO [2018-08-14 20:25:55] 7680  Will pre-process for website id = 2, period = day, date = last52
-INFO [2018-08-14 20:25:55] 7680  - pre-processing all visits
-INFO [2018-08-14 20:25:58] 7680  Archived website id = 2, period = day, 0 segments, 0 visits in last 52 days, 0 visits today, Time elapsed: 2.555s
-INFO [2018-08-14 20:25:58] 7680  Will pre-process for website id = 2, period = week, date = last260
-INFO [2018-08-14 20:25:58] 7680  - pre-processing all visits
-INFO [2018-08-14 20:26:39] 7680  Archived website id = 2, period = week, 0 segments, 0 visits in last 260 weeks, 0 visits this week, Time elapsed: 40.740s
-INFO [2018-08-14 20:26:39] 7680  Will pre-process for website id = 2, period = month, date = last52
-INFO [2018-08-14 20:26:39] 7680  - pre-processing all visits
-INFO [2018-08-14 20:26:44] 7680  Archived website id = 2, period = month, 0 segments, 0 visits in last 52 months, 0 visits this month, Time elapsed: 5.372s
-INFO [2018-08-14 20:26:44] 7680  Will pre-process for website id = 2, period = year, date = last7
-INFO [2018-08-14 20:26:44] 7680  - pre-processing all visits
-INFO [2018-08-14 20:26:54] 7680  Archived website id = 2, period = year, 0 segments, 1 visits in last 7 years, 0 visits this year, Time elapsed: 10.032s
-INFO [2018-08-14 20:26:54] 7680  Archived website id = 2, 4 API requests, Time elapsed: 58.703s [2/3 done]
-INFO [2018-08-14 20:26:54] 7680  Old report was invalidated for website id 3
-INFO [2018-08-14 20:26:54] 7680  Will pre-process for website id = 3, period = day, date = last52
-INFO [2018-08-14 20:26:54] 7680  - pre-processing all visits
-INFO [2018-08-14 20:26:57] 7680  Archived website id = 3, period = day, 0 segments, 0 visits in last 52 days, 0 visits today, Time elapsed: 2.570s
-INFO [2018-08-14 20:26:57] 7680  Will pre-process for website id = 3, period = week, date = last260
-INFO [2018-08-14 20:26:57] 7680  - pre-processing all visits
-INFO [2018-08-14 20:27:37] 7680  Archived website id = 3, period = week, 0 segments, 12 visits in last 260 weeks, 0 visits this week, Time elapsed: 40.605s
-INFO [2018-08-14 20:27:37] 7680  Will pre-process for website id = 3, period = month, date = last52
-INFO [2018-08-14 20:27:37] 7680  - pre-processing all visits
-INFO [2018-08-14 20:27:42] 7680  Archived website id = 3, period = month, 0 segments, 0 visits in last 52 months, 0 visits this month, Time elapsed: 5.093s
-INFO [2018-08-14 20:27:42] 7680  Will pre-process for website id = 3, period = year, date = last7
-INFO [2018-08-14 20:27:42] 7680  - pre-processing all visits
-INFO [2018-08-14 20:27:54] 7680  Archived website id = 3, period = year, 0 segments, 15 visits in last 7 years, 0 visits this year, Time elapsed: 11.985s
-INFO [2018-08-14 20:27:54] 7680  Archived website id = 3, 4 API requests, Time elapsed: 60.258s [3/3 done]
-INFO [2018-08-14 20:27:54] 7680  Done archiving!
-INFO [2018-08-14 20:27:54] 7680  ---------------------------
-INFO [2018-08-14 20:27:54] 7680  SUMMARY
-INFO [2018-08-14 20:27:54] 7680  Total visits for today across archived websites: 0
-INFO [2018-08-14 20:27:54] 7680  Archived today's reports for 3 websites
-INFO [2018-08-14 20:27:54] 7680  Archived week/month/year for 3 websites
-INFO [2018-08-14 20:27:54] 7680  Skipped 0 websites
-INFO [2018-08-14 20:27:54] 7680  - 0 skipped because no new visit since the last script execution
-INFO [2018-08-14 20:27:54] 7680  - 0 skipped because existing daily reports are less than 150 seconds old
-INFO [2018-08-14 20:27:54] 7680  - 0 skipped because existing week/month/year periods reports are less than 3600 seconds old
-INFO [2018-08-14 20:27:54] 7680  Total API requests: 24
-INFO [2018-08-14 20:27:54] 7680  done: 3/3 100%, 0 vtoday, 3 wtoday, 3 wperiods, 24 req, 352323 ms, no error
-INFO [2018-08-14 20:27:54] 7680  Time elapsed: 352.324s
-INFO [2018-08-14 20:27:54] 7680  ---------------------------
-INFO [2018-08-14 20:27:54] 7680  SCHEDULED TASKS
-INFO [2018-08-14 20:27:54] 7680  Starting Scheduled tasks...
-INFO [2018-08-14 20:27:54] 7680  done
-INFO [2018-08-14 20:27:54] 7680  ---------------------------
\ No newline at end of file
+INFO [2018-09-04 21:39:12] 7982  ---------------------------
+INFO [2018-09-04 21:39:12] 7982  INIT
+INFO [2018-09-04 21:39:12] 7982  Running Matomo 3.6.1-b1 as Super User
+INFO [2018-09-04 21:39:12] 7982  ---------------------------
+INFO [2018-09-04 21:39:12] 7982  NOTES
+INFO [2018-09-04 21:39:12] 7982  - If you execute this script at least once per hour (or more often) in a crontab, you may disable 'Browser trigger archiving' in Matomo UI > Settings > General Settings.
+INFO [2018-09-04 21:39:12] 7982    See the doc at: https://matomo.org/docs/setup-auto-archiving/
+INFO [2018-09-04 21:39:12] 7982  - Reports for today will be processed at most every 150 seconds. You can change this value in Matomo UI > Settings > General Settings.
+INFO [2018-09-04 21:39:12] 7982  - Reports for the current week/month/year will be requested at most every 3600 seconds.
+INFO [2018-09-04 21:39:12] 7982  - Will invalidate archived reports for 2012-08-09 for following websites ids: 1
+INFO [2018-09-04 21:39:12] 7982  - Will invalidate archived reports for 2012-08-10 for following websites ids: 1
+INFO [2018-09-04 21:39:12] 7982  - Will invalidate archived reports for 2012-08-11 for following websites ids: 1
+INFO [2018-09-04 21:39:12] 7982  - Will invalidate archived reports for 2012-08-15 for following websites ids: 1,2,3
+INFO [2018-09-04 21:39:12] 7982  - Will invalidate archived reports for 2012-08-19 for following websites ids: 1
+INFO [2018-09-04 21:39:12] 7982  - Will invalidate archived reports for 2012-09-30 for following websites ids: 1
+INFO [2018-09-04 21:39:12] 7982  - Will invalidate archived reports for 2014-03-12 for following websites ids: 1,3
+INFO [2018-09-04 21:39:12] 7982  - Will invalidate archived reports for 2014-03-13 for following websites ids: 1,3
+INFO [2018-09-04 21:39:12] 7982  - Will process 3 other websites because some old data reports have been invalidated (eg. using the Log Import script or the InvalidateReports plugin) , IDs: 1, 2, 3
+INFO [2018-09-04 21:39:13] 7982  ---------------------------
+INFO [2018-09-04 21:39:13] 7982  START
+INFO [2018-09-04 21:39:13] 7982  Starting Matomo reports archiving...
+INFO [2018-09-04 21:39:13] 7982  Old report was invalidated for website id 1
+INFO [2018-09-04 21:39:13] 7982  Will pre-process for website id = 1, period = day, date = last52
+INFO [2018-09-04 21:39:13] 7982  - pre-processing all visits
+INFO [2018-09-04 21:39:15] 7982  - pre-processing segment 1/3 browserCode==IE
+INFO [2018-09-04 21:39:15] 7982  - pre-processing segment 2/3 visitCount<=5;visitorType!=non-existing-type;daysSinceFirstVisit<=50
+INFO [2018-09-04 21:39:15] 7982  - pre-processing segment 3/3 visitCount<=5;visitorType!=re%2C%3Btest%20is%20encoded;daysSinceFirstVisit<=50
+INFO [2018-09-04 21:39:19] 7982  Archived website id = 1, period = day, 3 segments, 0 visits in last 52 days, 0 visits today, Time elapsed: 6.672s
+INFO [2018-09-04 21:39:19] 7982  Will pre-process for website id = 1, period = week, date = last260
+INFO [2018-09-04 21:39:19] 7982  - pre-processing all visits
+INFO [2018-09-04 21:39:20] 7982  - pre-processing segment 1/3 browserCode==IE
+INFO [2018-09-04 21:39:20] 7982  - pre-processing segment 2/3 visitCount<=5;visitorType!=non-existing-type;daysSinceFirstVisit<=50
+INFO [2018-09-04 21:40:47] 7982  - pre-processing segment 3/3 visitCount<=5;visitorType!=re%2C%3Btest%20is%20encoded;daysSinceFirstVisit<=50
+INFO [2018-09-04 21:41:27] 7982  Archived website id = 1, period = week, 3 segments, 12 visits in last 260 weeks, 0 visits this week, Time elapsed: 127.931s
+INFO [2018-09-04 21:41:27] 7982  Will pre-process for website id = 1, period = month, date = last52
+INFO [2018-09-04 21:41:27] 7982  - pre-processing all visits
+INFO [2018-09-04 21:41:27] 7982  - pre-processing segment 1/3 browserCode==IE
+INFO [2018-09-04 21:41:28] 7982  - pre-processing segment 2/3 visitCount<=5;visitorType!=non-existing-type;daysSinceFirstVisit<=50
+INFO [2018-09-04 21:41:37] 7982  - pre-processing segment 3/3 visitCount<=5;visitorType!=re%2C%3Btest%20is%20encoded;daysSinceFirstVisit<=50
+INFO [2018-09-04 21:41:42] 7982  Archived website id = 1, period = month, 3 segments, 0 visits in last 52 months, 0 visits this month, Time elapsed: 15.024s
+INFO [2018-09-04 21:41:42] 7982  Will pre-process for website id = 1, period = year, date = last7
+INFO [2018-09-04 21:41:42] 7982  - pre-processing all visits
+INFO [2018-09-04 21:41:42] 7982  - pre-processing segment 1/3 browserCode==IE
+INFO [2018-09-04 21:41:43] 7982  - pre-processing segment 2/3 visitCount<=5;visitorType!=non-existing-type;daysSinceFirstVisit<=50
+INFO [2018-09-04 21:42:13] 7982  - pre-processing segment 3/3 visitCount<=5;visitorType!=re%2C%3Btest%20is%20encoded;daysSinceFirstVisit<=50
+INFO [2018-09-04 21:42:30] 7982  Archived website id = 1, period = year, 3 segments, 46 visits in last 7 years, 0 visits this year, Time elapsed: 47.457s
+INFO [2018-09-04 21:42:30] 7982  Archived website id = 1, 16 API requests, Time elapsed: 197.094s [1/3 done]
+INFO [2018-09-04 21:42:30] 7982  Old report was invalidated for website id 2
+INFO [2018-09-04 21:42:30] 7982  Will pre-process for website id = 2, period = day, date = last52
+INFO [2018-09-04 21:42:30] 7982  - pre-processing all visits
+INFO [2018-09-04 21:42:32] 7982  Archived website id = 2, period = day, 0 segments, 0 visits in last 52 days, 0 visits today, Time elapsed: 1.987s
+INFO [2018-09-04 21:42:32] 7982  Will pre-process for website id = 2, period = week, date = last260
+INFO [2018-09-04 21:42:32] 7982  - pre-processing all visits
+INFO [2018-09-04 21:43:02] 7982  Archived website id = 2, period = week, 0 segments, 0 visits in last 260 weeks, 0 visits this week, Time elapsed: 29.919s
+INFO [2018-09-04 21:43:02] 7982  Will pre-process for website id = 2, period = month, date = last52
+INFO [2018-09-04 21:43:02] 7982  - pre-processing all visits
+INFO [2018-09-04 21:43:06] 7982  Archived website id = 2, period = month, 0 segments, 0 visits in last 52 months, 0 visits this month, Time elapsed: 4.214s
+INFO [2018-09-04 21:43:06] 7982  Will pre-process for website id = 2, period = year, date = last7
+INFO [2018-09-04 21:43:06] 7982  - pre-processing all visits
+INFO [2018-09-04 21:43:14] 7982  Archived website id = 2, period = year, 0 segments, 1 visits in last 7 years, 0 visits this year, Time elapsed: 8.528s
+INFO [2018-09-04 21:43:14] 7982  Archived website id = 2, 4 API requests, Time elapsed: 44.652s [2/3 done]
+INFO [2018-09-04 21:43:14] 7982  Old report was invalidated for website id 3
+INFO [2018-09-04 21:43:14] 7982  Will pre-process for website id = 3, period = day, date = last52
+INFO [2018-09-04 21:43:14] 7982  - pre-processing all visits
+INFO [2018-09-04 21:43:16] 7982  Archived website id = 3, period = day, 0 segments, 0 visits in last 52 days, 0 visits today, Time elapsed: 1.998s
+INFO [2018-09-04 21:43:17] 7982  Will pre-process for website id = 3, period = week, date = last260
+INFO [2018-09-04 21:43:17] 7982  - pre-processing all visits
+INFO [2018-09-04 21:43:47] 7982  Archived website id = 3, period = week, 0 segments, 12 visits in last 260 weeks, 0 visits this week, Time elapsed: 30.536s
+INFO [2018-09-04 21:43:47] 7982  Will pre-process for website id = 3, period = month, date = last52
+INFO [2018-09-04 21:43:47] 7982  - pre-processing all visits
+INFO [2018-09-04 21:43:51] 7982  Archived website id = 3, period = month, 0 segments, 0 visits in last 52 months, 0 visits this month, Time elapsed: 4.243s
+INFO [2018-09-04 21:43:51] 7982  Will pre-process for website id = 3, period = year, date = last7
+INFO [2018-09-04 21:43:51] 7982  - pre-processing all visits
+INFO [2018-09-04 21:44:01] 7982  Archived website id = 3, period = year, 0 segments, 15 visits in last 7 years, 0 visits this year, Time elapsed: 9.612s
+INFO [2018-09-04 21:44:01] 7982  Archived website id = 3, 4 API requests, Time elapsed: 46.393s [3/3 done]
+INFO [2018-09-04 21:44:01] 7982  Done archiving!
+INFO [2018-09-04 21:44:01] 7982  ---------------------------
+INFO [2018-09-04 21:44:01] 7982  SUMMARY
+INFO [2018-09-04 21:44:01] 7982  Total visits for today across archived websites: 0
+INFO [2018-09-04 21:44:01] 7982  Archived today's reports for 3 websites
+INFO [2018-09-04 21:44:01] 7982  Archived week/month/year for 3 websites
+INFO [2018-09-04 21:44:01] 7982  Skipped 0 websites
+INFO [2018-09-04 21:44:01] 7982  - 0 skipped because no new visit since the last script execution
+INFO [2018-09-04 21:44:01] 7982  - 0 skipped because existing daily reports are less than 150 seconds old
+INFO [2018-09-04 21:44:01] 7982  - 0 skipped because existing week/month/year periods reports are less than 3600 seconds old
+INFO [2018-09-04 21:44:01] 7982  Total API requests: 24
+INFO [2018-09-04 21:44:01] 7982  done: 3/3 100%, 0 vtoday, 3 wtoday, 3 wperiods, 24 req, 288339 ms, no error
+INFO [2018-09-04 21:44:01] 7982  Time elapsed: 288.339s
+INFO [2018-09-04 21:44:01] 7982  ---------------------------
+INFO [2018-09-04 21:44:01] 7982  SCHEDULED TASKS
+INFO [2018-09-04 21:44:01] 7982  Starting Scheduled tasks...
+INFO [2018-09-04 21:44:01] 7982  done
+INFO [2018-09-04 21:44:01] 7982  ---------------------------
\ No newline at end of file
diff --git a/plugins/Referrers/tests/System/expected/test_phpSerialized__Referrers.getReferrerType_year.original b/plugins/Referrers/tests/System/expected/test_phpSerialized__Referrers.getReferrerType_year.original
index 91cfc4492b..7d66fcde3b 100644
--- a/plugins/Referrers/tests/System/expected/test_phpSerialized__Referrers.getReferrerType_year.original
+++ b/plugins/Referrers/tests/System/expected/test_phpSerialized__Referrers.getReferrerType_year.original
diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_admin_view_admin_load.png b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_admin_view_admin_load.png
index a8ee2c8e3a..a3d494ee66 100644
--- a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_admin_view_admin_load.png
+++ b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_admin_view_admin_load.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:86305a8fafba4a9a687cb2a93b67b65b10354cf8c536e93362124c987453ae73
-size 110246
+oid sha256:1c58f35cb0ad50d6f5efae9cfc8fe33aec6264a1cefc6aaf32bb479231157f14
+size 110140
diff --git a/plugins/VisitorGenerator b/plugins/VisitorGenerator
-Subproject b6dca70124ec2685e8cf4729108b52f80b11878
+Subproject 6ff3798fdffcf7d3677c9cab381a1af9d9df0c2
diff --git a/tests/PHPUnit/Framework/Fixture.php b/tests/PHPUnit/Framework/Fixture.php
index c53809e193..dc8983ecec 100644
--- a/tests/PHPUnit/Framework/Fixture.php
+++ b/tests/PHPUnit/Framework/Fixture.php
@@ -836,7 +836,12 @@ class Fixture extends \PHPUnit_Framework_Assert
 
         $cmd .= '"' . $logFile . '" 2>&1';
 
-        // run the command
+        // on travis ci make sure log importer won't hang forever, otherwise the output will never be printed
+        // and no one will know why the build fails.
+        if (SystemTestCase::isTravisCI()) {
+            $cmd = "timeout 5m $cmd";
+        }
+
         exec($cmd, $output, $result);
         if ($result !== 0
             && !$allowFailure
diff --git a/tests/PHPUnit/Framework/TestCase/SystemTestCase.php b/tests/PHPUnit/Framework/TestCase/SystemTestCase.php
index fef22f1d93..af729554f2 100644
--- a/tests/PHPUnit/Framework/TestCase/SystemTestCase.php
+++ b/tests/PHPUnit/Framework/TestCase/SystemTestCase.php
@@ -13,6 +13,7 @@ use Piwik\ArchiveProcessor\Rules;
 use Piwik\Common;
 use Piwik\Config;
 use Piwik\Container\StaticContainer;
+use Piwik\DataTable\Manager;
 use Piwik\Db;
 use Piwik\DbHelper;
 use Piwik\Http;
@@ -370,6 +371,8 @@ abstract class SystemTestCase extends PHPUnit_Framework_TestCase
 
     protected function _testApiUrl($testName, $apiId, $requestUrl, $compareAgainst, $params = array())
     {
+        Manager::getInstance()->deleteAll(); // clearing the datatable cache here GREATLY speeds up system tests on travis CI
+
         list($processedFilePath, $expectedFilePath) =
             $this->getProcessedAndExpectedPaths($testName, $apiId, $format = null, $compareAgainst);
 
diff --git a/tests/PHPUnit/System/TwoVisitsWithCustomVariablesSegmentMatchNONETest.php b/tests/PHPUnit/System/TwoVisitsWithCustomVariablesSegmentMatchNONETest.php
index f2b8e2e632..c8a4043b33 100644
--- a/tests/PHPUnit/System/TwoVisitsWithCustomVariablesSegmentMatchNONETest.php
+++ b/tests/PHPUnit/System/TwoVisitsWithCustomVariablesSegmentMatchNONETest.php
@@ -7,6 +7,7 @@
  */
 namespace Piwik\Tests\System;
 
+use Piwik\Plugins\API\tests\System\AutoSuggestAPITest;
 use Piwik\Tests\Framework\TestCase\SystemTestCase;
 use Piwik\Tests\Fixtures\TwoVisitsWithCustomVariables;
 use Piwik\Tests\Framework\Fixture;
diff --git a/tests/PHPUnit/System/expected/test_CustomEvents_Events.getAction_lastN__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents_Events.getAction_lastN__API.getProcessedReport_day.xml
index cde986eabc..724e7a30f3 100644
--- a/tests/PHPUnit/System/expected/test_CustomEvents_Events.getAction_lastN__API.getProcessedReport_day.xml
+++ b/tests/PHPUnit/System/expected/test_CustomEvents_Events.getAction_lastN__API.getProcessedReport_day.xml
@@ -282,57 +282,57 @@
 			<row>
 				
 				<segment>eventAction==playTrailer</segment>
-				<idsubdatatable>1615</idsubdatatable>
+				<idsubdatatable>9</idsubdatatable>
 			</row>
 			<row>
 				
 				<segment>eventAction==Search</segment>
-				<idsubdatatable>1608</idsubdatatable>
+				<idsubdatatable>2</idsubdatatable>
 			</row>
 			<row>
 				
 				<segment>eventAction==play25%25</segment>
-				<idsubdatatable>1610</idsubdatatable>
+				<idsubdatatable>4</idsubdatatable>
 			</row>
 			<row>
 				
 				<segment>eventAction==play50%25</segment>
-				<idsubdatatable>1611</idsubdatatable>
+				<idsubdatatable>5</idsubdatatable>
 			</row>
 			<row>
 				
 				<segment>eventAction==play75%25</segment>
-				<idsubdatatable>1612</idsubdatatable>
+				<idsubdatatable>6</idsubdatatable>
 			</row>
 			<row>
 				
 				<segment>eventAction==playEnd</segment>
-				<idsubdatatable>1613</idsubdatatable>
+				<idsubdatatable>7</idsubdatatable>
 			</row>
 			<row>
 				
 				<segment>eventAction==rating</segment>
-				<idsubdatatable>1614</idsubdatatable>
+				<idsubdatatable>8</idsubdatatable>
 			</row>
 			<row>
 				
 				<segment>eventAction==clickBuyNow</segment>
-				<idsubdatatable>1616</idsubdatatable>
+				<idsubdatatable>10</idsubdatatable>
 			</row>
 			<row>
 				
 				<segment>eventAction==event+action+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+---%26gt%3B+SHOULD+APPEAR+IN+TEST+OUTPUT+NOT+TRUNCATED+%26lt%3B---</segment>
-				<idsubdatatable>1618</idsubdatatable>
+				<idsubdatatable>12</idsubdatatable>
 			</row>
 			<row>
 				
 				<segment>eventAction==play</segment>
-				<idsubdatatable>1609</idsubdatatable>
+				<idsubdatatable>3</idsubdatatable>
 			</row>
 			<row>
 				
 				<segment>eventAction==playStart</segment>
-				<idsubdatatable>1617</idsubdatatable>
+				<idsubdatatable>11</idsubdatatable>
 			</row>
 			<row>
 				<segment>eventAction==Purchase</segment>
@@ -345,57 +345,57 @@
 			<row>
 				
 				<segment>eventAction==playTrailer</segment>
-				<idsubdatatable>1627</idsubdatatable>
+				<idsubdatatable>21</idsubdatatable>
 			</row>
 			<row>
 				
 				<segment>eventAction==Search</segment>
-				<idsubdatatable>1620</idsubdatatable>
+				<idsubdatatable>14</idsubdatatable>
 			</row>
 			<row>
 				
 				<segment>eventAction==play25%25</segment>
-				<idsubdatatable>1622</idsubdatatable>
+				<idsubdatatable>16</idsubdatatable>
 			</row>
 			<row>
 				
 				<segment>eventAction==play50%25</segment>
-				<idsubdatatable>1623</idsubdatatable>
+				<idsubdatatable>17</idsubdatatable>
 			</row>
 			<row>
 				
 				<segment>eventAction==play75%25</segment>
-				<idsubdatatable>1624</idsubdatatable>
+				<idsubdatatable>18</idsubdatatable>
 			</row>
 			<row>
 				
 				<segment>eventAction==playEnd</segment>
-				<idsubdatatable>1625</idsubdatatable>
+				<idsubdatatable>19</idsubdatatable>
 			</row>
 			<row>
 				
 				<segment>eventAction==rating</segment>
-				<idsubdatatable>1626</idsubdatatable>
+				<idsubdatatable>20</idsubdatatable>
 			</row>
 			<row>
 				
 				<segment>eventAction==clickBuyNow</segment>
-				<idsubdatatable>1628</idsubdatatable>
+				<idsubdatatable>22</idsubdatatable>
 			</row>
 			<row>
 				
 				<segment>eventAction==event+action+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+---%26gt%3B+SHOULD+APPEAR+IN+TEST+OUTPUT+NOT+TRUNCATED+%26lt%3B---</segment>
-				<idsubdatatable>1630</idsubdatatable>
+				<idsubdatatable>24</idsubdatatable>
 			</row>
 			<row>
 				
 				<segment>eventAction==play</segment>
-				<idsubdatatable>1621</idsubdatatable>
+				<idsubdatatable>15</idsubdatatable>
 			</row>
 			<row>
 				
 				<segment>eventAction==playStart</segment>
-				<idsubdatatable>1629</idsubdatatable>
+				<idsubdatatable>23</idsubdatatable>
 			</row>
 			<row>
 				<segment>eventAction==Purchase</segment>
diff --git a/tests/PHPUnit/System/expected/test_CustomEvents_Events.getCategory_lastN__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents_Events.getCategory_lastN__API.getProcessedReport_day.xml
index f84be1e44f..a04ad2db8d 100644
--- a/tests/PHPUnit/System/expected/test_CustomEvents_Events.getCategory_lastN__API.getProcessedReport_day.xml
+++ b/tests/PHPUnit/System/expected/test_CustomEvents_Events.getCategory_lastN__API.getProcessedReport_day.xml
@@ -120,39 +120,39 @@
 			<row>
 				
 				<segment>eventCategory==Movie</segment>
-				<idsubdatatable>1533</idsubdatatable>
+				<idsubdatatable>2</idsubdatatable>
 			</row>
 			<row>
 				
 				<segment>eventCategory==Music</segment>
-				<idsubdatatable>1534</idsubdatatable>
+				<idsubdatatable>3</idsubdatatable>
 			</row>
 			<row>
 				
 				<segment>eventCategory==event+category+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+---%26gt%3B+SHOULD+APPEAR+IN+TEST+OUTPUT+NOT+TRUNCATED+%26lt%3B---</segment>
-				<idsubdatatable>1535</idsubdatatable>
+				<idsubdatatable>4</idsubdatatable>
 			</row>
 			<row>
 				
 				<segment>eventCategory==CategoryTriggersGoal+here</segment>
-				<idsubdatatable>1536</idsubdatatable>
+				<idsubdatatable>5</idsubdatatable>
 			</row>
 		</result>
 		<result prettyDate="Monday, January 4, 2010">
 			<row>
 				
 				<segment>eventCategory==Movie</segment>
-				<idsubdatatable>1538</idsubdatatable>
+				<idsubdatatable>7</idsubdatatable>
 			</row>
 			<row>
 				
 				<segment>eventCategory==Music</segment>
-				<idsubdatatable>1539</idsubdatatable>
+				<idsubdatatable>8</idsubdatatable>
 			</row>
 			<row>
 				
 				<segment>eventCategory==event+category+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+---%26gt%3B+SHOULD+APPEAR+IN+TEST+OUTPUT+NOT+TRUNCATED+%26lt%3B---</segment>
-				<idsubdatatable>1540</idsubdatatable>
+				<idsubdatatable>9</idsubdatatable>
 			</row>
 		</result>
 		<result prettyDate="Tuesday, January 5, 2010" />
diff --git a/tests/PHPUnit/System/expected/test_CustomEvents_Events.getName_lastN__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents_Events.getName_lastN__API.getProcessedReport_day.xml
index a9092dc113..12f5c7f97c 100644
--- a/tests/PHPUnit/System/expected/test_CustomEvents_Events.getName_lastN__API.getProcessedReport_day.xml
+++ b/tests/PHPUnit/System/expected/test_CustomEvents_Events.getName_lastN__API.getProcessedReport_day.xml
@@ -183,72 +183,72 @@
 			<row>
 				
 				<segment>eventName==Spirited+Away+%28%E5%8D%83%E3%81%A8%E5%8D%83%E5%B0%8B%E3%81%AE%E7%A5%9E%E9%9A%A0%E3%81%97%29</segment>
-				<idsubdatatable>1715</idsubdatatable>
+				<idsubdatatable>4</idsubdatatable>
 			</row>
 			<row>
 				
 				<segment>eventName==La+fianc%C3%A9e+de+l%26%23039%3Beau</segment>
-				<idsubdatatable>1714</idsubdatatable>
+				<idsubdatatable>3</idsubdatatable>
 			</row>
 			<row>
 				
-				<idsubdatatable>1713</idsubdatatable>
+				<idsubdatatable>2</idsubdatatable>
 			</row>
 			<row>
 				
 				<segment>eventName==event+name+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+---%26gt%3B+SHOULD+APPEAR+IN+TEST+OUTPUT+NOT+TRUNCATED+%26lt%3B---</segment>
-				<idsubdatatable>1719</idsubdatatable>
+				<idsubdatatable>8</idsubdatatable>
 			</row>
 			<row>
 				
 				<segment>eventName==Ponyo+%28%E5%B4%96%E3%81%AE%E4%B8%8A%E3%81%AE%E3%83%9D%E3%83%8B%E3%83%A7%29</segment>
-				<idsubdatatable>1717</idsubdatatable>
+				<idsubdatatable>6</idsubdatatable>
 			</row>
 			<row>
 				
 				<segment>eventName==Princess+Mononoke+%28%E3%82%82%E3%81%AE%E3%81%AE%E3%81%91%E5%A7%AB%29</segment>
-				<idsubdatatable>1716</idsubdatatable>
+				<idsubdatatable>5</idsubdatatable>
 			</row>
 			<row>
 				
 				<segment>eventName==Search+query+here</segment>
-				<idsubdatatable>1718</idsubdatatable>
+				<idsubdatatable>7</idsubdatatable>
 			</row>
 		</result>
 		<result prettyDate="Monday, January 4, 2010">
 			<row>
 				
 				<segment>eventName==Spirited+Away+%28%E5%8D%83%E3%81%A8%E5%8D%83%E5%B0%8B%E3%81%AE%E7%A5%9E%E9%9A%A0%E3%81%97%29</segment>
-				<idsubdatatable>1723</idsubdatatable>
+				<idsubdatatable>12</idsubdatatable>
 			</row>
 			<row>
 				
 				<segment>eventName==La+fianc%C3%A9e+de+l%26%23039%3Beau</segment>
-				<idsubdatatable>1722</idsubdatatable>
+				<idsubdatatable>11</idsubdatatable>
 			</row>
 			<row>
 				
-				<idsubdatatable>1721</idsubdatatable>
+				<idsubdatatable>10</idsubdatatable>
 			</row>
 			<row>
 				
 				<segment>eventName==event+name+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+---%26gt%3B+SHOULD+APPEAR+IN+TEST+OUTPUT+NOT+TRUNCATED+%26lt%3B---</segment>
-				<idsubdatatable>1727</idsubdatatable>
+				<idsubdatatable>16</idsubdatatable>
 			</row>
 			<row>
 				
 				<segment>eventName==Ponyo+%28%E5%B4%96%E3%81%AE%E4%B8%8A%E3%81%AE%E3%83%9D%E3%83%8B%E3%83%A7%29</segment>
-				<idsubdatatable>1725</idsubdatatable>
+				<idsubdatatable>14</idsubdatatable>
 			</row>
 			<row>
 				
 				<segment>eventName==Princess+Mononoke+%28%E3%82%82%E3%81%AE%E3%81%AE%E3%81%91%E5%A7%AB%29</segment>
-				<idsubdatatable>1724</idsubdatatable>
+				<idsubdatatable>13</idsubdatatable>
 			</row>
 			<row>
 				
 				<segment>eventName==Search+query+here</segment>
-				<idsubdatatable>1726</idsubdatatable>
+				<idsubdatatable>15</idsubdatatable>
 			</row>
 		</result>
 		<result prettyDate="Tuesday, January 5, 2010" />
diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_sortByProcessedMetric__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_sortByProcessedMetric__API.getProcessedReport_day.xml
index b52aad7a58..13e9116aa2 100644
--- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_sortByProcessedMetric__API.getProcessedReport_day.xml
+++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_sortByProcessedMetric__API.getProcessedReport_day.xml
@@ -61,11 +61,11 @@
 	<reportMetadata>
 		<row>
 			
-			<idsubdatatable>2840</idsubdatatable>
+			<idsubdatatable>3</idsubdatatable>
 		</row>
 		<row>
 			
-			<idsubdatatable>2839</idsubdatatable>
+			<idsubdatatable>2</idsubdatatable>
 		</row>
 	</reportMetadata>
 	<reportTotal>
diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_hideColumns___API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_hideColumns___API.getProcessedReport_day.xml
index 240253b0d8..fd3a09c9d7 100644
--- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_hideColumns___API.getProcessedReport_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_hideColumns___API.getProcessedReport_day.xml
@@ -58,7 +58,7 @@
 	<reportMetadata>
 		<row>
 			
-			<idsubdatatable>5200</idsubdatatable>
+			<idsubdatatable>2</idsubdatatable>
 		</row>
 		<row>
 		</row>
diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_showColumns___API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_showColumns___API.getProcessedReport_day.xml
index a556c93dfc..64e2375288 100644
--- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_showColumns___API.getProcessedReport_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_showColumns___API.getProcessedReport_day.xml
@@ -67,7 +67,7 @@
 	<reportMetadata>
 		<row>
 			
-			<idsubdatatable>5204</idsubdatatable>
+			<idsubdatatable>2</idsubdatatable>
 		</row>
 		<row>
 		</row>
diff --git a/tests/PHPUnit/System/expected/test_SiteSearch_CustomVariables.getCustomVariables_firstSite_lastN__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_SiteSearch_CustomVariables.getCustomVariables_firstSite_lastN__API.getProcessedReport_day.xml
index b7e349890b..cc4087c2fc 100644
--- a/tests/PHPUnit/System/expected/test_SiteSearch_CustomVariables.getCustomVariables_firstSite_lastN__API.getProcessedReport_day.xml
+++ b/tests/PHPUnit/System/expected/test_SiteSearch_CustomVariables.getCustomVariables_firstSite_lastN__API.getProcessedReport_day.xml
@@ -120,7 +120,7 @@
 				</slots>
 				
 				<segment>customVariableName==_pk_scount</segment>
-				<idsubdatatable>3309</idsubdatatable>
+				<idsubdatatable>3</idsubdatatable>
 			</row>
 			<row>
 				<slots>
@@ -131,7 +131,7 @@
 				</slots>
 				
 				<segment>customVariableName==_pk_scat</segment>
-				<idsubdatatable>3308</idsubdatatable>
+				<idsubdatatable>2</idsubdatatable>
 			</row>
 		</result>
 		<result prettyDate="Monday, January 4, 2010">
@@ -144,7 +144,7 @@
 				</slots>
 				
 				<segment>customVariableName==_pk_scount</segment>
-				<idsubdatatable>3312</idsubdatatable>
+				<idsubdatatable>6</idsubdatatable>
 			</row>
 			<row>
 				<slots>
@@ -155,7 +155,7 @@
 				</slots>
 				
 				<segment>customVariableName==_pk_scat</segment>
-				<idsubdatatable>3311</idsubdatatable>
+				<idsubdatatable>5</idsubdatatable>
 			</row>
 		</result>
 		<result prettyDate="Tuesday, January 5, 2010" />
diff --git a/tests/PHPUnit/System/expected/test_SiteSearch_CustomVariables.getCustomVariables_firstSite_lastN__API.getProcessedReport_month.xml b/tests/PHPUnit/System/expected/test_SiteSearch_CustomVariables.getCustomVariables_firstSite_lastN__API.getProcessedReport_month.xml
index 4568d6f013..9750447674 100644
--- a/tests/PHPUnit/System/expected/test_SiteSearch_CustomVariables.getCustomVariables_firstSite_lastN__API.getProcessedReport_month.xml
+++ b/tests/PHPUnit/System/expected/test_SiteSearch_CustomVariables.getCustomVariables_firstSite_lastN__API.getProcessedReport_month.xml
@@ -89,7 +89,7 @@
 				</slots>
 				
 				<segment>customVariableName==_pk_scount</segment>
-				<idsubdatatable>3339</idsubdatatable>
+				<idsubdatatable>3</idsubdatatable>
 			</row>
 			<row>
 				<slots>
@@ -100,7 +100,7 @@
 				</slots>
 				
 				<segment>customVariableName==_pk_scat</segment>
-				<idsubdatatable>3338</idsubdatatable>
+				<idsubdatatable>2</idsubdatatable>
 			</row>
 		</result>
 		<result prettyDate="February 2010" />
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Actions.getPageTitles_firstSite_lastN__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Actions.getPageTitles_firstSite_lastN__API.getProcessedReport_day.xml
index f7dff2d14a..4b4313873d 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Actions.getPageTitles_firstSite_lastN__API.getProcessedReport_day.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Actions.getPageTitles_firstSite_lastN__API.getProcessedReport_day.xml
@@ -184,51 +184,51 @@
 		<result prettyDate="Tuesday, January 5, 2010">
 			<row>
 				
-				<idsubdatatable>2145</idsubdatatable>
+				<idsubdatatable>5</idsubdatatable>
 			</row>
 			<row>
 				
-				<idsubdatatable>2144</idsubdatatable>
+				<idsubdatatable>4</idsubdatatable>
 			</row>
 		</result>
 		<result prettyDate="Wednesday, January 6, 2010">
 			<row>
 				
-				<idsubdatatable>2149</idsubdatatable>
+				<idsubdatatable>9</idsubdatatable>
 			</row>
 			<row>
 				
-				<idsubdatatable>2148</idsubdatatable>
+				<idsubdatatable>8</idsubdatatable>
 			</row>
 		</result>
 		<result prettyDate="Thursday, January 7, 2010">
 			<row>
 				
-				<idsubdatatable>2153</idsubdatatable>
+				<idsubdatatable>13</idsubdatatable>
 			</row>
 			<row>
 				
-				<idsubdatatable>2152</idsubdatatable>
+				<idsubdatatable>12</idsubdatatable>
 			</row>
 		</result>
 		<result prettyDate="Friday, January 8, 2010">
 			<row>
 				
-				<idsubdatatable>2157</idsubdatatable>
+				<idsubdatatable>17</idsubdatatable>
 			</row>
 			<row>
 				
-				<idsubdatatable>2156</idsubdatatable>
+				<idsubdatatable>16</idsubdatatable>
 			</row>
 		</result>
 		<result prettyDate="Saturday, January 9, 2010">
 			<row>
 				
-				<idsubdatatable>2161</idsubdatatable>
+				<idsubdatatable>21</idsubdatatable>
 			</row>
 			<row>
 				
-				<idsubdatatable>2160</idsubdatatable>
+				<idsubdatatable>20</idsubdatatable>
 			</row>
 		</result>
 	</reportMetadata>
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Referrers.getWebsites_firstSite_lastN__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Referrers.getWebsites_firstSite_lastN__API.getProcessedReport_day.xml
index 8faf0c6c1e..df26f7fb77 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Referrers.getWebsites_firstSite_lastN__API.getProcessedReport_day.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Referrers.getWebsites_firstSite_lastN__API.getProcessedReport_day.xml
@@ -116,14 +116,14 @@
 			<row>
 				
 				<segment>referrerName==referrer.com</segment>
-				<idsubdatatable>2093</idsubdatatable>
+				<idsubdatatable>2</idsubdatatable>
 			</row>
 		</result>
 		<result prettyDate="Monday, January 4, 2010">
 			<row>
 				
 				<segment>referrerName==referrer.com</segment>
-				<idsubdatatable>2095</idsubdatatable>
+				<idsubdatatable>4</idsubdatatable>
 			</row>
 		</result>
 		<result prettyDate="Tuesday, January 5, 2010" />
@@ -133,14 +133,14 @@
 			<row>
 				
 				<segment>referrerName==referrer.com</segment>
-				<idsubdatatable>2100</idsubdatatable>
+				<idsubdatatable>9</idsubdatatable>
 			</row>
 		</result>
 		<result prettyDate="Saturday, January 9, 2010">
 			<row>
 				
 				<segment>referrerName==referrer.com</segment>
-				<idsubdatatable>2102</idsubdatatable>
+				<idsubdatatable>11</idsubdatatable>
 			</row>
 		</result>
 	</reportMetadata>
diff --git a/tests/PHPUnit/System/expected/test_apiGetReportMetadata_year__LanguagesManager.getAvailableLanguageNames.xml b/tests/PHPUnit/System/expected/test_apiGetReportMetadata_year__LanguagesManager.getAvailableLanguageNames.xml
index c12dc93c9b..08d8dcc833 100644
--- a/tests/PHPUnit/System/expected/test_apiGetReportMetadata_year__LanguagesManager.getAvailableLanguageNames.xml
+++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata_year__LanguagesManager.getAvailableLanguageNames.xml
@@ -66,6 +66,11 @@
 		<english_name>English</english_name>
 	</row>
 	<row>
+		<code>es-ar</code>
+		<name>Español (Argentina)</name>
+		<english_name>Spanish (Argentina)</english_name>
+	</row>
+	<row>
 		<code>es</code>
 		<name>Español</name>
 		<english_name>Spanish</english_name>