refs #5940 put tests in correct folders, better testsuite names, some tests still fail and I cannot figure out why

1570 files changed, 1163 insertions, 182 deletions

diff --git a/.gitignore b/.gitignore
index 8f00ee1d60..fcb76175f6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -36,7 +36,7 @@ php_errors.log
 /tests/javascript/unittest2.dbf
 /tests/lib/geoip-files/*.dat*
 /tests/lib/xhprof*
-/tests/PHPUnit/Integration/processed/
+/tests/PHPUnit/System/processed/
 /tests/PHPUnit/phpunit.xml
 /tests/results/
 /.htaccess
diff --git a/.travis.yml b/.travis.yml
index 67925cbeca..8290476d33 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -22,12 +22,12 @@ env:
   matrix:
     # PDO Mysql
     - TEST_SUITE=SystemTests MYSQL_ADAPTER=PDO_MYSQL
-    - TEST_SUITE=PluginTests MYSQL_ADAPTER=PDO_MYSQL
-    - TEST_SUITE=CoreTests MYSQL_ADAPTER=PDO_MYSQL
+    - TEST_SUITE=IntegrationTests MYSQL_ADAPTER=PDO_MYSQL
+    - TEST_SUITE=UnitTests MYSQL_ADAPTER=PDO_MYSQL
     # Mysqli
     - TEST_SUITE=SystemTests MYSQL_ADAPTER=MYSQLI
-    - TEST_SUITE=PluginTests MYSQL_ADAPTER=MYSQLI
-    - TEST_SUITE=CoreTests MYSQL_ADAPTER=MYSQLI
+    - TEST_SUITE=IntegrationTests MYSQL_ADAPTER=MYSQLI
+    - TEST_SUITE=UnitTests MYSQL_ADAPTER=MYSQLI
     # Javascript tests
     - TEST_SUITE=JavascriptTests MYSQL_ADAPTER=PDO_MYSQL
     - TEST_SUITE=AngularJSTests MYSQL_ADAPTER=PDO_MYSQL
@@ -79,27 +79,27 @@ matrix:
     - php: 5.3.3
       env: TEST_SUITE=SystemTests MYSQL_ADAPTER=MYSQLI
     - php: 5.3.3
-      env: TEST_SUITE=PluginTests MYSQL_ADAPTER=MYSQLI
+      env: TEST_SUITE=IntegrationTests MYSQL_ADAPTER=MYSQLI
     - php: 5.3.3
-      env: TEST_SUITE=CoreTests MYSQL_ADAPTER=MYSQLI
+      env: TEST_SUITE=UnitTests MYSQL_ADAPTER=MYSQLI
     - php: 5.5
       env: TEST_SUITE=SystemTests MYSQL_ADAPTER=MYSQLI
     - php: 5.5
-      env: TEST_SUITE=PluginTests MYSQL_ADAPTER=MYSQLI
+      env: TEST_SUITE=IntegrationTests MYSQL_ADAPTER=MYSQLI
     - php: 5.5
-      env: TEST_SUITE=CoreTests MYSQL_ADAPTER=MYSQLI
+      env: TEST_SUITE=UnitTests MYSQL_ADAPTER=MYSQLI
     - php: 5.6
       env: TEST_SUITE=SystemTests MYSQL_ADAPTER=MYSQLI
     - php: 5.6
-      env: TEST_SUITE=PluginTests MYSQL_ADAPTER=MYSQLI
+      env: TEST_SUITE=IntegrationTests MYSQL_ADAPTER=MYSQLI
     - php: 5.6
-      env: TEST_SUITE=CoreTests MYSQL_ADAPTER=MYSQLI
+      env: TEST_SUITE=UnitTests MYSQL_ADAPTER=MYSQLI
     - php: hhvm
       env: TEST_SUITE=SystemTests MYSQL_ADAPTER=MYSQLI
     - php: hhvm
-      env: TEST_SUITE=PluginTests MYSQL_ADAPTER=MYSQLI
+      env: TEST_SUITE=IntegrationTests MYSQL_ADAPTER=MYSQLI
     - php: hhvm
-      env: TEST_SUITE=CoreTests MYSQL_ADAPTER=MYSQLI
+      env: TEST_SUITE=UnitTests MYSQL_ADAPTER=MYSQLI
 
 script: $PIWIK_ROOT_DIR/tests/travis/travis.sh
 
diff --git a/core/Option.php b/core/Option.php
index c4410520ea..d50e5c4235 100644
--- a/core/Option.php
+++ b/core/Option.php
@@ -139,6 +139,7 @@ class Option
         if (self::$instance == null) {
             self::$instance = new self;
         }
+
         return self::$instance;
     }
 
@@ -162,6 +163,7 @@ class Option
         if (isset($this->all[$name])) {
             return $this->all[$name];
         }
+
         $value = Db::fetchOne('SELECT option_value FROM `' . Common::prefixTable('option') . '` ' .
                               'WHERE option_name = ?', $name);
 
@@ -176,10 +178,14 @@ class Option
     protected function setValue($name, $value, $autoLoad = 0)
     {
         $autoLoad = (int)$autoLoad;
-        Db::query('INSERT INTO `' . Common::prefixTable('option') . '` (option_name, option_value, autoload) ' .
-            ' VALUES (?, ?, ?) ' .
-            ' ON DUPLICATE KEY UPDATE option_value = ?',
-            array($name, $value, $autoLoad, $value));
+
+        $sql  = 'INSERT INTO `' . Common::prefixTable('option') . '` (option_name, option_value, autoload) ' .
+                ' VALUES (?, ?, ?) ' .
+                ' ON DUPLICATE KEY UPDATE option_value = ?';
+        $bind = array($name, $value, $autoLoad, $value);
+
+        Db::query($sql, $bind);
+
         $this->all[$name] = $value;
     }
 
@@ -217,11 +223,13 @@ class Option
     {
         $sql  = 'SELECT option_name, option_value FROM `' . Common::prefixTable('option') . '` WHERE option_name LIKE ?';
         $bind = array($name);
+        $rows = Db::fetchAll($sql, $bind);
 
         $result = array();
-        foreach (Db::fetchAll($sql, $bind) as $row) {
+        foreach ($rows as $row) {
             $result[$row['option_name']] = $row['option_value'];
         }
+
         return $result;
     }
 
@@ -236,8 +244,10 @@ class Option
             return;
         }
 
-        $all = Db::fetchAll('SELECT option_value, option_name FROM `' . Common::prefixTable('option') . '`
-                             WHERE autoload = 1');
+        $table = Common::prefixTable('option');
+        $sql   = 'SELECT option_value, option_name FROM `' . $table . '` WHERE autoload = 1';
+        $all   = Db::fetchAll($sql);
+
         foreach ($all as $option) {
             $this->all[$option['option_name']] = $option['option_value'];
         }
diff --git a/plugins/API/tests/RowEvolutionTest.php b/plugins/API/tests/RowEvolutionTest.php
index 55651fa6b4..21ea9224bd 100644
--- a/plugins/API/tests/RowEvolutionTest.php
+++ b/plugins/API/tests/RowEvolutionTest.php
@@ -13,7 +13,7 @@ use Piwik\Tests\Fixture;
 /**
  * @group API
  * @group RowEvolutionTest
- * @group Database
+ * @group Plugins
  */
 class RowEvolutionTest extends \IntegrationTestCase
 {
diff --git a/tests/PHPUnit/Plugins/ActionsTest.php b/plugins/Actions/tests/ArchiverTest.php
index 662ec20fac..6458f425fa 100644
--- a/tests/PHPUnit/Plugins/ActionsTest.php
+++ b/plugins/Actions/tests/ArchiverTest.php
@@ -5,13 +5,21 @@
  * @link    http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
+
+namespace Piwik\Plugins\PrivacyManager\tests;
+
 use Piwik\Plugins\Actions\ArchivingHelper;
 use Piwik\Tracker\Action;
 use Piwik\Translate;
 
-require_once 'Actions/Actions.php';
+require_once PIWIK_INCLUDE_PATH . '/plugins/Actions/Actions.php';
 
-class ActionsTests extends PHPUnit_Framework_TestCase
+/**
+ * @group Actions
+ * @group ArchiverTest
+ * @group Plugins
+ */
+class ArchiverTests extends \PHPUnit_Framework_TestCase
 {
     public function setUp()
     {
@@ -111,7 +119,6 @@ class ActionsTests extends PHPUnit_Framework_TestCase
 
     /**
      * @dataProvider getActionNameTestData
-     * @group        Plugins
      */
     public function testGetActionExplodedNames($params, $expected)
     {
diff --git a/plugins/Contents/tests/ContentsTest.php b/plugins/Contents/tests/ContentsTest.php
index 477886e90f..c07f491546 100644
--- a/plugins/Contents/tests/ContentsTest.php
+++ b/plugins/Contents/tests/ContentsTest.php
@@ -9,6 +9,7 @@ namespace Piwik\Plugins\Contents\tests;
 
 use Piwik\Tests\SystemTestCase;
 use Piwik\Plugins\Contents\tests\Fixtures\TwoVisitsWithContents;
+use Piwik\Translate;
 
 /**
  * Testing Contents
@@ -40,6 +41,12 @@ class ContentsTest extends SystemTestCase
         );
     }
 
+    protected function setup()
+    {
+        parent::setup();
+        Translate::reloadLanguage('en');
+    }
+
     protected function tearDown()
     {
         parent::tearDown();
diff --git a/plugins/CoreConsole/Commands/DevelopmentManageTestFiles.php b/plugins/CoreConsole/Commands/DevelopmentManageTestFiles.php
index 429612ae9c..d2d96a8edf 100644
--- a/plugins/CoreConsole/Commands/DevelopmentManageTestFiles.php
+++ b/plugins/CoreConsole/Commands/DevelopmentManageTestFiles.php
@@ -42,7 +42,7 @@ class DevelopmentManageTestFiles extends ConsoleCommand
     {
         $file = $input->getOption('file');
 
-        $prefix = PIWIK_INCLUDE_PATH . '/tests/PHPUnit/Integration/processed/';
+        $prefix = PIWIK_INCLUDE_PATH . '/tests/PHPUnit/System/processed/';
         $guesses = array(
             '/' . $file,
             $prefix . $file,
@@ -55,6 +55,6 @@ class DevelopmentManageTestFiles extends ConsoleCommand
             }
         }
 
-        copy($file, PIWIK_INCLUDE_PATH . '/tests/PHPUnit/Integration/expected/' . basename($file));
+        copy($file, PIWIK_INCLUDE_PATH . '/tests/PHPUnit/System/expected/' . basename($file));
     }
 }
\ No newline at end of file
diff --git a/plugins/CoreConsole/Commands/GenerateTravisYmlFile.php b/plugins/CoreConsole/Commands/GenerateTravisYmlFile.php
index 1bd68cf0f7..13bcc5ad2f 100644
--- a/plugins/CoreConsole/Commands/GenerateTravisYmlFile.php
+++ b/plugins/CoreConsole/Commands/GenerateTravisYmlFile.php
@@ -44,7 +44,7 @@ class GenerateTravisYmlFile extends ConsoleCommand
 
     protected function execute(InputInterface $input, OutputInterface $output)
     {
-        $targetPlugin = $input->getOption('plugin');
+        $targetPlugin  = $input->getOption('plugin');
         $outputYmlPath = $this->getTravisYmlOutputPath($input, $targetPlugin);
 
         $view = $this->createTravisYmlView($input, $output, $targetPlugin, $outputYmlPath);
diff --git a/plugins/CoreConsole/Commands/TestsRun.php b/plugins/CoreConsole/Commands/TestsRun.php
index f1e6db55e6..4178337057 100644
--- a/plugins/CoreConsole/Commands/TestsRun.php
+++ b/plugins/CoreConsole/Commands/TestsRun.php
@@ -29,7 +29,7 @@ class TestsRun extends ConsoleCommand
         $this->addOption('options', 'o', InputOption::VALUE_OPTIONAL, 'All options will be forwarded to phpunit', '');
         $this->addOption('xhprof', null, InputOption::VALUE_NONE, 'Profile using xhprof.');
         $this->addOption('file', null, InputOption::VALUE_REQUIRED, 'Execute tests within this file. Should be a path relative to the tests/PHPUnit directory.');
-        $this->addOption('suite', null, InputOption::VALUE_REQUIRED, 'Execute tests of a specific test suite, for instance CoreTests, IntegrationTests or SystemTests.');
+        $this->addOption('suite', null, InputOption::VALUE_REQUIRED, 'Execute tests of a specific test suite, for instance UnitTests, IntegrationTests or SystemTests.');
     }
 
     protected function execute(InputInterface $input, OutputInterface $output)
diff --git a/plugins/CoreConsole/TravisYmlView.php b/plugins/CoreConsole/TravisYmlView.php
index a89b5f1df5..9190f220ad 100644
--- a/plugins/CoreConsole/TravisYmlView.php
+++ b/plugins/CoreConsole/TravisYmlView.php
@@ -199,16 +199,16 @@ class TravisYmlView extends View
         $testsToExclude = array();
 
         if ($this->isTargetPluginContainsPluginTests()) {
-            $testsToRun[] = array('name' => 'PluginTests',
+            $testsToRun[] = array('name' => 'IntegrationTests',
                                   'vars' => "MYSQL_ADAPTER=PDO_MYSQL");
-            $testsToRun[] = array('name' => 'PluginTests',
+            $testsToRun[] = array('name' => 'IntegrationTests',
                                   'vars' => "MYSQL_ADAPTER=PDO_MYSQL TEST_AGAINST_CORE=latest_stable");
 
             $testsToExclude[] = array('description' => 'execute latest stable tests only w/ PHP 5.5',
                                       'php' => '5.3.3',
-                                      'env' => 'TEST_SUITE=PluginTests MYSQL_ADAPTER=PDO_MYSQL TEST_AGAINST_CORE=latest_stable');
+                                      'env' => 'TEST_SUITE=IntegrationTests MYSQL_ADAPTER=PDO_MYSQL TEST_AGAINST_CORE=latest_stable');
             $testsToExclude[] = array('php' => '5.4',
-                                      'env' => 'TEST_SUITE=PluginTests MYSQL_ADAPTER=PDO_MYSQL TEST_AGAINST_CORE=latest_stable');
+                                      'env' => 'TEST_SUITE=IntegrationTests MYSQL_ADAPTER=PDO_MYSQL TEST_AGAINST_CORE=latest_stable');
         }
 
         if ($this->isTargetPluginContainsUITests()) {
diff --git a/plugins/CoreConsole/tests/Unit/TravisYmlViewTest.php b/plugins/CoreConsole/tests/Unit/TravisYmlViewTest.php
index eba77d25ba..b35819c7f0 100644
--- a/plugins/CoreConsole/tests/Unit/TravisYmlViewTest.php
+++ b/plugins/CoreConsole/tests/Unit/TravisYmlViewTest.php
@@ -44,8 +44,8 @@ class TravisYmlViewTest extends PHPUnit_Framework_TestCase
         $this->assertContains(array('secure' => 'githubtoken'), $yaml['env']['global']);
 
         $this->assertNotEmpty($yaml['env']['matrix']);
-        $this->assertContains("TEST_SUITE=PluginTests MYSQL_ADAPTER=PDO_MYSQL", $yaml['env']['matrix']);
-        $this->assertContains("TEST_SUITE=PluginTests MYSQL_ADAPTER=PDO_MYSQL TEST_AGAINST_CORE=latest_stable", $yaml['env']['matrix']);
+        $this->assertContains("TEST_SUITE=IntegrationTests MYSQL_ADAPTER=PDO_MYSQL", $yaml['env']['matrix']);
+        $this->assertContains("TEST_SUITE=IntegrationTests MYSQL_ADAPTER=PDO_MYSQL TEST_AGAINST_CORE=latest_stable", $yaml['env']['matrix']);
         $this->assertNotContains("TEST_SUITE=UITests MYSQL_ADAPTER=PDO_MYSQL", $yaml['env']['matrix']);
 
         $this->assertBuildSectionsNotEmpty($yaml);
diff --git a/plugins/CoreConsole/tests/resources/test.travis.yml b/plugins/CoreConsole/tests/resources/test.travis.yml
index 1cdc845f18..3d469b75ff 100644
--- a/plugins/CoreConsole/tests/resources/test.travis.yml
+++ b/plugins/CoreConsole/tests/resources/test.travis.yml
@@ -8,8 +8,8 @@ env:
     - PRESERVED_VAR=123
     - secure: anotherpreservedvar
   matrix:
-    - TEST_SUITE=CoreTests MYSQL_ADAPTER=PDO_MYSQL
-    - TEST_SUITE=PluginTests MYSQL_ADAPTER=PDO_MYSQL
+    - TEST_SUITE=UnitTests MYSQL_ADAPTER=PDO_MYSQL
+    - TEST_SUITE=IntegrationTests MYSQL_ADAPTER=PDO_MYSQL
 
 script: ./travis.sh
 
diff --git a/tests/PHPUnit/Integration/Plugins/CorePluginsAdmin/UpdateCommunicationTest.php b/plugins/CorePluginsAdmin/tests/UpdateCommunicationTest.php
index a54ab52cde..8da5e00928 100644
--- a/tests/PHPUnit/Integration/Plugins/CorePluginsAdmin/UpdateCommunicationTest.php
+++ b/plugins/CorePluginsAdmin/tests/UpdateCommunicationTest.php
@@ -6,6 +6,8 @@
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
 
+namespace Piwik\Plugins\CorePluginsAdmin\tests;
+
 use Piwik\Config;
 use Piwik\Option;
 use Piwik\Plugins\CorePluginsAdmin\UpdateCommunication;
@@ -15,7 +17,7 @@ use Piwik\Plugins\CorePluginsAdmin\UpdateCommunication;
  *
  * @group Plugins
  */
-class Plugins_CorePluginsAdmin_UpdateCommunicationTest extends IntegrationTestCase
+class UpdateCommunicationTest extends \IntegrationTestCase
 {
     /**
      * @var UpdateCommunication
diff --git a/tests/PHPUnit/Integration/Plugins/CoreUpdater/UpdateCommunicationTest.php b/plugins/CoreUpdater/tests/UpdateCommunicationTest.php
index 07fafc5609..d4ee8932c9 100644
--- a/tests/PHPUnit/Integration/Plugins/CoreUpdater/UpdateCommunicationTest.php
+++ b/plugins/CoreUpdater/tests/UpdateCommunicationTest.php
@@ -6,6 +6,8 @@
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
 
+namespace Piwik\Plugins\CoreUpdater\tests;
+
 use Piwik\Config;
 use Piwik\Option;
 use Piwik\Plugins\CoreUpdater\UpdateCommunication;
@@ -17,7 +19,7 @@ use Piwik\Version;
  *
  * @group Plugins
  */
-class Plugins_CoreUpdater_UpdateCommunicationTest extends IntegrationTestCase
+class UpdateCommunicationTest extends \IntegrationTestCase
 {
     public function setUp()
     {
diff --git a/plugins/CustomVariables/tests/Commands/InfoTest.php b/plugins/CustomVariables/tests/Commands/InfoTest.php
index ddddba7ba8..e207cc914a 100644
--- a/plugins/CustomVariables/tests/Commands/InfoTest.php
+++ b/plugins/CustomVariables/tests/Commands/InfoTest.php
@@ -17,7 +17,7 @@ use Symfony\Component\Console\Tester\CommandTester;
 /**
  * @group CustomVariables
  * @group CustomVariablesTest
- * @group Database
+ * @group Plugins
  * @group Plugins
  */
 class InfoTest extends \IntegrationTestCase
diff --git a/plugins/CustomVariables/tests/Commands/SetNumberOfCustomVariablesTest.php b/plugins/CustomVariables/tests/Commands/SetNumberOfCustomVariablesTest.php
index f02bed38b0..2c0d705994 100644
--- a/plugins/CustomVariables/tests/Commands/SetNumberOfCustomVariablesTest.php
+++ b/plugins/CustomVariables/tests/Commands/SetNumberOfCustomVariablesTest.php
@@ -17,7 +17,7 @@ use Symfony\Component\Console\Tester\CommandTester;
 /**
  * @group CustomVariables
  * @group CustomVariablesTest
- * @group Database
+ * @group Plugins
  * @group Plugins
  */
 class SetNumberOfCustomVariablesTest extends \IntegrationTestCase
diff --git a/plugins/CustomVariables/tests/CustomVariablesTest.php b/plugins/CustomVariables/tests/CustomVariablesTest.php
index 19fca37287..25a158589e 100644
--- a/plugins/CustomVariables/tests/CustomVariablesTest.php
+++ b/plugins/CustomVariables/tests/CustomVariablesTest.php
@@ -13,7 +13,7 @@ use Piwik\Tracker\Cache;
 /**
  * @group CustomVariables
  * @group CustomVariablesTest
- * @group Database
+ * @group Plugins
  */
 class CustomVariablesTest extends \IntegrationTestCase
 {
diff --git a/plugins/CustomVariables/tests/ModelTest.php b/plugins/CustomVariables/tests/ModelTest.php
index 8b51e05d3c..db0afbbba9 100644
--- a/plugins/CustomVariables/tests/ModelTest.php
+++ b/plugins/CustomVariables/tests/ModelTest.php
@@ -15,7 +15,7 @@ use Piwik\Plugins\CustomVariables\Model;
 /**
  * @group CustomVariables
  * @group ModelTest
- * @group Database
+ * @group Plugins
  * @group CustomVariables_ModelTest
  */
 class ModelTest extends \IntegrationTestCase
diff --git a/plugins/CustomVariables/tests/processed/test_CustomVariablesSystemTest__CustomVariables.getCustomVariables_day.xml b/plugins/CustomVariables/tests/processed/test_CustomVariablesSystemTest__CustomVariables.getCustomVariables_day.xml
new file mode 100644
index 0000000000..1ecaf61b08
--- /dev/null
+++ b/plugins/CustomVariables/tests/processed/test_CustomVariablesSystemTest__CustomVariables.getCustomVariables_day.xml
@@ -0,0 +1,395 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<result>
+	<row>
+		<label>Name_PAGE_1</label>
+		<nb_actions>1</nb_actions>
+		<subtable>
+			<row>
+				<label>Val_PAGE1</label>
+				<nb_visits>1</nb_visits>
+				<nb_actions>1</nb_actions>
+			</row>
+		</subtable>
+	</row>
+	<row>
+		<label>Name_PAGE_2</label>
+		<nb_actions>1</nb_actions>
+		<subtable>
+			<row>
+				<label>Val_PAGE2</label>
+				<nb_visits>1</nb_visits>
+				<nb_actions>1</nb_actions>
+			</row>
+		</subtable>
+	</row>
+	<row>
+		<label>Name_PAGE_3</label>
+		<nb_actions>1</nb_actions>
+		<subtable>
+			<row>
+				<label>Val_PAGE3</label>
+				<nb_visits>1</nb_visits>
+				<nb_actions>1</nb_actions>
+			</row>
+		</subtable>
+	</row>
+	<row>
+		<label>Name_PAGE_4</label>
+		<nb_actions>1</nb_actions>
+		<subtable>
+			<row>
+				<label>Val_PAGE4</label>
+				<nb_visits>1</nb_visits>
+				<nb_actions>1</nb_actions>
+			</row>
+		</subtable>
+	</row>
+	<row>
+		<label>Name_PAGE_5</label>
+		<nb_actions>1</nb_actions>
+		<subtable>
+			<row>
+				<label>Val_PAGE5</label>
+				<nb_visits>1</nb_visits>
+				<nb_actions>1</nb_actions>
+			</row>
+		</subtable>
+	</row>
+	<row>
+		<label>Name_PAGE_6</label>
+		<nb_actions>1</nb_actions>
+		<subtable>
+			<row>
+				<label>Val_PAGE6</label>
+				<nb_visits>1</nb_visits>
+				<nb_actions>1</nb_actions>
+			</row>
+		</subtable>
+	</row>
+	<row>
+		<label>Name_PAGE_7</label>
+		<nb_actions>1</nb_actions>
+		<subtable>
+			<row>
+				<label>Val_PAGE7</label>
+				<nb_visits>1</nb_visits>
+				<nb_actions>1</nb_actions>
+			</row>
+		</subtable>
+	</row>
+	<row>
+		<label>Name_PAGE_8</label>
+		<nb_actions>1</nb_actions>
+		<subtable>
+			<row>
+				<label>Val_PAGE8</label>
+				<nb_visits>1</nb_visits>
+				<nb_actions>1</nb_actions>
+			</row>
+		</subtable>
+	</row>
+	<row>
+		<label>Name_VISIT_1</label>
+		<nb_visits>1</nb_visits>
+		<nb_actions>1</nb_actions>
+		<nb_users>0</nb_users>
+		<max_actions>1</max_actions>
+		<sum_visit_length>4</sum_visit_length>
+		<bounce_count>1</bounce_count>
+		<goals>
+			<row idgoal='1'>
+				<nb_conversions>1</nb_conversions>
+				<nb_visits_converted>1</nb_visits_converted>
+				<revenue>0</revenue>
+			</row>
+		</goals>
+		<nb_conversions>1</nb_conversions>
+		<revenue>0</revenue>
+		<subtable>
+			<row>
+				<label>Val_VISIT1</label>
+				<nb_visits>1</nb_visits>
+				<nb_actions>1</nb_actions>
+				<nb_users>0</nb_users>
+				<max_actions>1</max_actions>
+				<sum_visit_length>4</sum_visit_length>
+				<bounce_count>1</bounce_count>
+				<goals>
+					<row idgoal='1'>
+						<nb_conversions>1</nb_conversions>
+						<nb_visits_converted>1</nb_visits_converted>
+						<revenue>0</revenue>
+					</row>
+				</goals>
+				<nb_conversions>1</nb_conversions>
+				<revenue>0</revenue>
+			</row>
+		</subtable>
+	</row>
+	<row>
+		<label>Name_VISIT_2</label>
+		<nb_visits>1</nb_visits>
+		<nb_actions>1</nb_actions>
+		<nb_users>0</nb_users>
+		<max_actions>1</max_actions>
+		<sum_visit_length>4</sum_visit_length>
+		<bounce_count>1</bounce_count>
+		<goals>
+			<row idgoal='1'>
+				<nb_conversions>1</nb_conversions>
+				<nb_visits_converted>1</nb_visits_converted>
+				<revenue>0</revenue>
+			</row>
+		</goals>
+		<nb_conversions>1</nb_conversions>
+		<revenue>0</revenue>
+		<subtable>
+			<row>
+				<label>Val_VISIT2</label>
+				<nb_visits>1</nb_visits>
+				<nb_actions>1</nb_actions>
+				<nb_users>0</nb_users>
+				<max_actions>1</max_actions>
+				<sum_visit_length>4</sum_visit_length>
+				<bounce_count>1</bounce_count>
+				<goals>
+					<row idgoal='1'>
+						<nb_conversions>1</nb_conversions>
+						<nb_visits_converted>1</nb_visits_converted>
+						<revenue>0</revenue>
+					</row>
+				</goals>
+				<nb_conversions>1</nb_conversions>
+				<revenue>0</revenue>
+			</row>
+		</subtable>
+	</row>
+	<row>
+		<label>Name_VISIT_3</label>
+		<nb_visits>1</nb_visits>
+		<nb_actions>1</nb_actions>
+		<nb_users>0</nb_users>
+		<max_actions>1</max_actions>
+		<sum_visit_length>4</sum_visit_length>
+		<bounce_count>1</bounce_count>
+		<goals>
+			<row idgoal='1'>
+				<nb_conversions>1</nb_conversions>
+				<nb_visits_converted>1</nb_visits_converted>
+				<revenue>0</revenue>
+			</row>
+		</goals>
+		<nb_conversions>1</nb_conversions>
+		<revenue>0</revenue>
+		<subtable>
+			<row>
+				<label>Val_VISIT3</label>
+				<nb_visits>1</nb_visits>
+				<nb_actions>1</nb_actions>
+				<nb_users>0</nb_users>
+				<max_actions>1</max_actions>
+				<sum_visit_length>4</sum_visit_length>
+				<bounce_count>1</bounce_count>
+				<goals>
+					<row idgoal='1'>
+						<nb_conversions>1</nb_conversions>
+						<nb_visits_converted>1</nb_visits_converted>
+						<revenue>0</revenue>
+					</row>
+				</goals>
+				<nb_conversions>1</nb_conversions>
+				<revenue>0</revenue>
+			</row>
+		</subtable>
+	</row>
+	<row>
+		<label>Name_VISIT_4</label>
+		<nb_visits>1</nb_visits>
+		<nb_actions>1</nb_actions>
+		<nb_users>0</nb_users>
+		<max_actions>1</max_actions>
+		<sum_visit_length>4</sum_visit_length>
+		<bounce_count>1</bounce_count>
+		<goals>
+			<row idgoal='1'>
+				<nb_conversions>1</nb_conversions>
+				<nb_visits_converted>1</nb_visits_converted>
+				<revenue>0</revenue>
+			</row>
+		</goals>
+		<nb_conversions>1</nb_conversions>
+		<revenue>0</revenue>
+		<subtable>
+			<row>
+				<label>Val_VISIT4</label>
+				<nb_visits>1</nb_visits>
+				<nb_actions>1</nb_actions>
+				<nb_users>0</nb_users>
+				<max_actions>1</max_actions>
+				<sum_visit_length>4</sum_visit_length>
+				<bounce_count>1</bounce_count>
+				<goals>
+					<row idgoal='1'>
+						<nb_conversions>1</nb_conversions>
+						<nb_visits_converted>1</nb_visits_converted>
+						<revenue>0</revenue>
+					</row>
+				</goals>
+				<nb_conversions>1</nb_conversions>
+				<revenue>0</revenue>
+			</row>
+		</subtable>
+	</row>
+	<row>
+		<label>Name_VISIT_5</label>
+		<nb_visits>1</nb_visits>
+		<nb_actions>1</nb_actions>
+		<nb_users>0</nb_users>
+		<max_actions>1</max_actions>
+		<sum_visit_length>4</sum_visit_length>
+		<bounce_count>1</bounce_count>
+		<goals>
+			<row idgoal='1'>
+				<nb_conversions>1</nb_conversions>
+				<nb_visits_converted>1</nb_visits_converted>
+				<revenue>0</revenue>
+			</row>
+		</goals>
+		<nb_conversions>1</nb_conversions>
+		<revenue>0</revenue>
+		<subtable>
+			<row>
+				<label>Val_VISIT5</label>
+				<nb_visits>1</nb_visits>
+				<nb_actions>1</nb_actions>
+				<nb_users>0</nb_users>
+				<max_actions>1</max_actions>
+				<sum_visit_length>4</sum_visit_length>
+				<bounce_count>1</bounce_count>
+				<goals>
+					<row idgoal='1'>
+						<nb_conversions>1</nb_conversions>
+						<nb_visits_converted>1</nb_visits_converted>
+						<revenue>0</revenue>
+					</row>
+				</goals>
+				<nb_conversions>1</nb_conversions>
+				<revenue>0</revenue>
+			</row>
+		</subtable>
+	</row>
+	<row>
+		<label>Name_VISIT_6</label>
+		<nb_visits>1</nb_visits>
+		<nb_actions>1</nb_actions>
+		<nb_users>0</nb_users>
+		<max_actions>1</max_actions>
+		<sum_visit_length>4</sum_visit_length>
+		<bounce_count>1</bounce_count>
+		<goals>
+			<row idgoal='1'>
+				<nb_conversions>1</nb_conversions>
+				<nb_visits_converted>1</nb_visits_converted>
+				<revenue>0</revenue>
+			</row>
+		</goals>
+		<nb_conversions>1</nb_conversions>
+		<revenue>0</revenue>
+		<subtable>
+			<row>
+				<label>Val_VISIT6</label>
+				<nb_visits>1</nb_visits>
+				<nb_actions>1</nb_actions>
+				<nb_users>0</nb_users>
+				<max_actions>1</max_actions>
+				<sum_visit_length>4</sum_visit_length>
+				<bounce_count>1</bounce_count>
+				<goals>
+					<row idgoal='1'>
+						<nb_conversions>1</nb_conversions>
+						<nb_visits_converted>1</nb_visits_converted>
+						<revenue>0</revenue>
+					</row>
+				</goals>
+				<nb_conversions>1</nb_conversions>
+				<revenue>0</revenue>
+			</row>
+		</subtable>
+	</row>
+	<row>
+		<label>Name_VISIT_7</label>
+		<nb_visits>1</nb_visits>
+		<nb_actions>1</nb_actions>
+		<nb_users>0</nb_users>
+		<max_actions>1</max_actions>
+		<sum_visit_length>4</sum_visit_length>
+		<bounce_count>1</bounce_count>
+		<goals>
+			<row idgoal='1'>
+				<nb_conversions>1</nb_conversions>
+				<nb_visits_converted>1</nb_visits_converted>
+				<revenue>0</revenue>
+			</row>
+		</goals>
+		<nb_conversions>1</nb_conversions>
+		<revenue>0</revenue>
+		<subtable>
+			<row>
+				<label>Val_VISIT7</label>
+				<nb_visits>1</nb_visits>
+				<nb_actions>1</nb_actions>
+				<nb_users>0</nb_users>
+				<max_actions>1</max_actions>
+				<sum_visit_length>4</sum_visit_length>
+				<bounce_count>1</bounce_count>
+				<goals>
+					<row idgoal='1'>
+						<nb_conversions>1</nb_conversions>
+						<nb_visits_converted>1</nb_visits_converted>
+						<revenue>0</revenue>
+					</row>
+				</goals>
+				<nb_conversions>1</nb_conversions>
+				<revenue>0</revenue>
+			</row>
+		</subtable>
+	</row>
+	<row>
+		<label>Name_VISIT_8</label>
+		<nb_visits>1</nb_visits>
+		<nb_actions>1</nb_actions>
+		<nb_users>0</nb_users>
+		<max_actions>1</max_actions>
+		<sum_visit_length>4</sum_visit_length>
+		<bounce_count>1</bounce_count>
+		<goals>
+			<row idgoal='1'>
+				<nb_conversions>1</nb_conversions>
+				<nb_visits_converted>1</nb_visits_converted>
+				<revenue>0</revenue>
+			</row>
+		</goals>
+		<nb_conversions>1</nb_conversions>
+		<revenue>0</revenue>
+		<subtable>
+			<row>
+				<label>Val_VISIT8</label>
+				<nb_visits>1</nb_visits>
+				<nb_actions>1</nb_actions>
+				<nb_users>0</nb_users>
+				<max_actions>1</max_actions>
+				<sum_visit_length>4</sum_visit_length>
+				<bounce_count>1</bounce_count>
+				<goals>
+					<row idgoal='1'>
+						<nb_conversions>1</nb_conversions>
+						<nb_visits_converted>1</nb_visits_converted>
+						<revenue>0</revenue>
+					</row>
+				</goals>
+				<nb_conversions>1</nb_conversions>
+				<revenue>0</revenue>
+			</row>
+		</subtable>
+	</row>
+</result>
\ No newline at end of file
diff --git a/plugins/CustomVariables/tests/processed/test_CustomVariablesSystemTest__Live.getLastVisitsDetails_day.xml b/plugins/CustomVariables/tests/processed/test_CustomVariablesSystemTest__Live.getLastVisitsDetails_day.xml
new file mode 100644
index 0000000000..a61cb11554
--- /dev/null
+++ b/plugins/CustomVariables/tests/processed/test_CustomVariablesSystemTest__Live.getLastVisitsDetails_day.xml
@@ -0,0 +1,176 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<result>
+	<row>
+		<idSite>1</idSite>
+		<idVisit>1</idVisit>
+		<visitIp>156.5.3.2</visitIp>
+		
+		<actionDetails>
+			<row>
+				<type>goal</type>
+				<goalName>triggered js</goalName>
+				<goalId>1</goalId>
+				<revenue>0</revenue>
+				<goalPageId />
+				
+				<url>http://localhost</url>
+				<icon>plugins/Morpheus/images/goal.png</icon>
+			</row>
+			<row>
+				<type>action</type>
+				<url>http://localhost</url>
+				<pageTitle>Profile page</pageTitle>
+				<pageIdAction>2</pageIdAction>
+				
+				<pageId>1</pageId>
+				<customVariables>
+					<row>
+						<customVariablePageName1>Name_PAGE_1</customVariablePageName1>
+						<customVariablePageValue1>Val_PAGE1</customVariablePageValue1>
+					</row>
+					<row>
+						<customVariablePageName2>Name_PAGE_2</customVariablePageName2>
+						<customVariablePageValue2>Val_PAGE2</customVariablePageValue2>
+					</row>
+					<row>
+						<customVariablePageName3>Name_PAGE_3</customVariablePageName3>
+						<customVariablePageValue3>Val_PAGE3</customVariablePageValue3>
+					</row>
+					<row>
+						<customVariablePageName4>Name_PAGE_4</customVariablePageName4>
+						<customVariablePageValue4>Val_PAGE4</customVariablePageValue4>
+					</row>
+					<row>
+						<customVariablePageName5>Name_PAGE_5</customVariablePageName5>
+						<customVariablePageValue5>Val_PAGE5</customVariablePageValue5>
+					</row>
+					<row>
+						<customVariablePageName6>Name_PAGE_6</customVariablePageName6>
+						<customVariablePageValue6>Val_PAGE6</customVariablePageValue6>
+					</row>
+					<row>
+						<customVariablePageName7>Name_PAGE_7</customVariablePageName7>
+						<customVariablePageValue7>Val_PAGE7</customVariablePageValue7>
+					</row>
+					<row>
+						<customVariablePageName8>Name_PAGE_8</customVariablePageName8>
+						<customVariablePageValue8>Val_PAGE8</customVariablePageValue8>
+					</row>
+				</customVariables>
+				<icon />
+			</row>
+		</actionDetails>
+		<goalConversions>1</goalConversions>
+		<siteCurrency>USD</siteCurrency>
+		<siteCurrencySymbol>$</siteCurrencySymbol>
+		
+		
+		
+		
+		<searches>0</searches>
+		<actions>1</actions>
+		<userId />
+		<visitorType>new</visitorType>
+		<visitorTypeIcon />
+		<visitConverted>1</visitConverted>
+		<visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
+		<visitCount>1</visitCount>
+		
+		<visitEcommerceStatus>none</visitEcommerceStatus>
+		<visitEcommerceStatusIcon />
+		<daysSinceFirstVisit>0</daysSinceFirstVisit>
+		<daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
+		<visitDuration>4</visitDuration>
+		<visitDurationPretty>4s</visitDurationPretty>
+		<customVariables>
+			<row>
+				<customVariableName1>Name_VISIT_1</customVariableName1>
+				<customVariableValue1>Val_VISIT1</customVariableValue1>
+			</row>
+			<row>
+				<customVariableName2>Name_VISIT_2</customVariableName2>
+				<customVariableValue2>Val_VISIT2</customVariableValue2>
+			</row>
+			<row>
+				<customVariableName3>Name_VISIT_3</customVariableName3>
+				<customVariableValue3>Val_VISIT3</customVariableValue3>
+			</row>
+			<row>
+				<customVariableName4>Name_VISIT_4</customVariableName4>
+				<customVariableValue4>Val_VISIT4</customVariableValue4>
+			</row>
+			<row>
+				<customVariableName5>Name_VISIT_5</customVariableName5>
+				<customVariableValue5>Val_VISIT5</customVariableValue5>
+			</row>
+			<row>
+				<customVariableName6>Name_VISIT_6</customVariableName6>
+				<customVariableValue6>Val_VISIT6</customVariableValue6>
+			</row>
+			<row>
+				<customVariableName7>Name_VISIT_7</customVariableName7>
+				<customVariableValue7>Val_VISIT7</customVariableValue7>
+			</row>
+			<row>
+				<customVariableName8>Name_VISIT_8</customVariableName8>
+				<customVariableValue8>Val_VISIT8</customVariableValue8>
+			</row>
+		</customVariables>
+		<deviceType>Desktop</deviceType>
+		<events>0</events>
+		<provider>Unknown</provider>
+		<providerName>Unknown</providerName>
+		<providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl>
+		<referrerType>search</referrerType>
+		<referrerTypeName>Search Engines</referrerTypeName>
+		<referrerName>Google</referrerName>
+		<referrerKeyword>this keyword should be ranked</referrerKeyword>
+		<referrerKeywordPosition>1</referrerKeywordPosition>
+		<referrerUrl>http://www.google.com/search?q=this+keyword+should+be+ranked</referrerUrl>
+		<referrerSearchEngineUrl>http://google.com</referrerSearchEngineUrl>
+		<referrerSearchEngineIcon>plugins/Referrers/images/searchEngines/google.com.png</referrerSearchEngineIcon>
+		<continent>Europe</continent>
+		<continentCode>eur</continentCode>
+		<country>France</country>
+		<countryCode>fr</countryCode>
+		<countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag>
+		<region />
+		<regionCode />
+		<city />
+		<location>France</location>
+		<latitude />
+		<longitude />
+		<operatingSystem>Windows XP</operatingSystem>
+		<operatingSystemCode>WXP</operatingSystemCode>
+		<operatingSystemShortName>Win XP</operatingSystemShortName>
+		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+		<browserFamily>gecko</browserFamily>
+		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
+		<browserName>Firefox 3.6</browserName>
+		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserCode>FF</browserCode>
+		<browserVersion>3.6</browserVersion>
+		<screenType>normal</screenType>
+		<resolution>1024x768</resolution>
+		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
+		<plugins>flash, java</plugins>
+		<pluginsIcons>
+			<row>
+				<pluginIcon>plugins/UserSettings/images/plugins/flash.gif</pluginIcon>
+				<pluginName>flash</pluginName>
+			</row>
+			<row>
+				<pluginIcon>plugins/UserSettings/images/plugins/java.gif</pluginIcon>
+				<pluginName>java</pluginName>
+			</row>
+		</pluginsIcons>
+		<visitLocalTime>12:34:06</visitLocalTime>
+		<visitLocalHour>12</visitLocalHour>
+		<daysSinceLastVisit>0</daysSinceLastVisit>
+		
+		
+		
+		
+		
+	</row>
+</result>
\ No newline at end of file
diff --git a/plugins/ExamplePlugin/.travis.yml b/plugins/ExamplePlugin/.travis.yml
index 7dd870605f..f20c564fdf 100644
--- a/plugins/ExamplePlugin/.travis.yml
+++ b/plugins/ExamplePlugin/.travis.yml
@@ -5,8 +5,8 @@ php:
 
 env:
   matrix:
-    - TEST_SUITE=CoreTests MYSQL_ADAPTER=PDO_MYSQL
-    - TEST_SUITE=PluginTests MYSQL_ADAPTER=PDO_MYSQL
+    - TEST_SUITE=UnitTests MYSQL_ADAPTER=PDO_MYSQL
+    - TEST_SUITE=IntegrationTests MYSQL_ADAPTER=PDO_MYSQL
 
 script: ./travis.sh
 
diff --git a/plugins/Goals/tests/APITest.php b/plugins/Goals/tests/APITest.php
index f3892e8057..39672b722d 100644
--- a/plugins/Goals/tests/APITest.php
+++ b/plugins/Goals/tests/APITest.php
@@ -16,7 +16,7 @@ use Piwik\Tests\Fixture;
  * @group Goals
  * @group Plugins
  * @group APITest
- * @group Database
+ * @group Plugins
  */
 class APITest extends \IntegrationTestCase
 {
diff --git a/plugins/Insights/tests/ApiTest.php b/plugins/Insights/tests/ApiTest.php
index 8a33f82fcc..356bc769de 100644
--- a/plugins/Insights/tests/ApiTest.php
+++ b/plugins/Insights/tests/ApiTest.php
@@ -13,11 +13,12 @@ use Piwik\DataTable\Row;
 use Piwik\Plugins\Insights\API;
 use Piwik\Plugins\Insights\tests\Fixtures\SomeVisitsDifferentPathsOnTwoDays;
 use Piwik\Tests\SystemTestCase;
+use Piwik\Translate;
 
 /**
  * @group Insights
  * @group ApiTest
- * @group Database
+ * @group Plugins
  * @group Plugins
  */
 class ApiTest extends SystemTestCase
@@ -37,6 +38,7 @@ class ApiTest extends SystemTestCase
     {
         parent::setUp();
 
+        Translate::reloadLanguage('en');
         $this->api = API::getInstance();
     }
 
diff --git a/plugins/Insights/tests/ModelTest.php b/plugins/Insights/tests/ModelTest.php
index 2dc0b9f301..94ff52201d 100644
--- a/plugins/Insights/tests/ModelTest.php
+++ b/plugins/Insights/tests/ModelTest.php
@@ -16,7 +16,7 @@ use Piwik\Tests\SystemTestCase;
 /**
  * @group Insights
  * @group ModelTest
- * @group Database
+ * @group Plugins
  * @group Plugins
  */
 class ModelTest extends SystemTestCase
diff --git a/tests/PHPUnit/Plugins/LanguagesManagerTest.php b/plugins/LanguagesManager/tests/LanguagesManagerTest.php
index 13cb46c6e6..3ed219acf4 100755
--- a/tests/PHPUnit/Plugins/LanguagesManagerTest.php
+++ b/plugins/LanguagesManager/tests/LanguagesManagerTest.php
@@ -5,6 +5,9 @@
  * @link    http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
+
+namespace Piwik\Plugins\LanguagesManager\tests;
+
 use Piwik\Common;
 use Piwik\Plugins\LanguagesManager\API;
 use Piwik\Translate\Filter\ByParameterCount;
@@ -14,10 +17,11 @@ use Piwik\Translate\Filter\UnnecassaryWhitespaces;
 use Piwik\Translate\Validate\CoreTranslations;
 use Piwik\Translate\Validate\NoScripts;
 use Piwik\Translate\Writer;
+use \Exception;
 
-require_once 'LanguagesManager/API.php';
+require_once PIWIK_INCLUDE_PATH . '/plugins/LanguagesManager/API.php';
 
-class Test_LanguagesManager extends PHPUnit_Framework_TestCase
+class LanguagesManagerTest extends \PHPUnit_Framework_TestCase
 {
     public function setUp()
     {
@@ -53,6 +57,7 @@ class Test_LanguagesManager extends PHPUnit_Framework_TestCase
                 }
             }
         }
+
         return $return;
     }
 
diff --git a/plugins/LeftMenu/tests/APITest.php b/plugins/LeftMenu/tests/APITest.php
index cb59bc1818..1b80cdc0d8 100644
--- a/plugins/LeftMenu/tests/APITest.php
+++ b/plugins/LeftMenu/tests/APITest.php
@@ -16,7 +16,7 @@ use \FakeAccess;
 /**
  * @group LeftMenu
  * @group APITest
- * @group Database
+ * @group Plugins
  */
 class APITest extends \IntegrationTestCase
 {
diff --git a/tests/PHPUnit/Integration/Plugins/LoginTest.php b/plugins/Login/tests/LoginTest.php
index ded63d53fb..8e431c9372 100644
--- a/tests/PHPUnit/Integration/Plugins/LoginTest.php
+++ b/plugins/Login/tests/LoginTest.php
@@ -5,13 +5,18 @@
  * @link http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
+
+namespace Piwik\Plugins\Login\tests;
+
 use Piwik\Access;
 use Piwik\AuthResult;
 use Piwik\DbHelper;
 use Piwik\Plugins\Login\Auth;
 use Piwik\Plugins\UsersManager\API;
+use IntegrationTestCase;
+use FakeAccess;
 
-require_once 'Login/Auth.php';
+require_once PIWIK_INCLUDE_PATH . '/plugins/Login/Auth.php';
 
 /**
  * Class Plugins_LoginTest
@@ -19,7 +24,7 @@ require_once 'Login/Auth.php';
  * @group Plugins
  * @group Plugins_LoginTest
  */
-class Plugins_LoginTest extends IntegrationTestCase
+class LoginTest extends IntegrationTestCase
 {
 
     /**
diff --git a/tests/PHPUnit/Integration/Plugins/MobileMessagingTest.php b/plugins/MobileMessaging/tests/MobileMessagingTest.php
index a4ed9aa671..dab19beb83 100644
--- a/tests/PHPUnit/Integration/Plugins/MobileMessagingTest.php
+++ b/plugins/MobileMessaging/tests/MobileMessagingTest.php
@@ -6,19 +6,23 @@
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
 
+namespace Piwik\Plugins\MobileMessaging\tests;
+
 use Piwik\Access;
 use Piwik\Plugins\MobileMessaging\API as APIMobileMessaging;
 use Piwik\Plugins\MobileMessaging\MobileMessaging;
 use Piwik\Plugins\MobileMessaging\SMSProvider;
 use Piwik\Plugins\ScheduledReports\API as APIScheduledReports;
 use Piwik\Plugins\SitesManager\API as APISitesManager;
+use IntegrationTestCase;
+use FakeAccess;
 
 /**
  * Class Plugins_MobileMessagingTest
  *
  * @group Plugins
  */
-class Plugins_MobileMessagingTest extends IntegrationTestCase
+class MobileMessagingTest extends IntegrationTestCase
 {
     protected $idSiteAccess;
 
diff --git a/tests/PHPUnit/Integration/Plugins/MultiSitesTest.php b/plugins/MultiSites/tests/MultiSitesTest.php
index c973a7e839..9f317d5ca7 100644
--- a/tests/PHPUnit/Integration/Plugins/MultiSitesTest.php
+++ b/plugins/MultiSites/tests/MultiSitesTest.php
@@ -6,16 +6,19 @@
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
 
+namespace Piwik\Plugins\MultiSites\tests;
+
 use Piwik\Access;
 use Piwik\Plugins\MultiSites\API as APIMultiSites;
 use Piwik\Plugins\SitesManager\API as APISitesManager;
+use IntegrationTestCase;
 
 /**
  * Class Plugins_MultiSitesTest
  *
  * @group Plugins
  */
-class Plugins_MultiSitesTest extends IntegrationTestCase
+class MultiSitesTest extends IntegrationTestCase
 {
     protected $idSiteAccess;
 
diff --git a/tests/PHPUnit/Plugins/AnonymizeIPTest.php b/plugins/PrivacyManager/tests/AnonymizeIPTest.php
index 449d255f1f..0ed4e6e4ca 100644
--- a/tests/PHPUnit/Plugins/AnonymizeIPTest.php
+++ b/plugins/PrivacyManager/tests/AnonymizeIPTest.php
@@ -5,12 +5,15 @@
  * @link http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
+
+namespace Piwik\Plugins\PrivacyManager\tests;
+
 use Piwik\IP;
 use Piwik\Plugins\PrivacyManager\IPAnonymizer;
 
-require_once 'PrivacyManager/IPAnonymizer.php';
+require_once PIWIK_INCLUDE_PATH . '/plugins/PrivacyManager/IPAnonymizer.php';
 
-class AnonymizeIPTest extends PHPUnit_Framework_TestCase
+class AnonymizeIPTest extends \PHPUnit_Framework_TestCase
 {
     // IPv4 addresses and expected results
     public function getipv4Addresses()
diff --git a/tests/PHPUnit/Integration/Plugins/PrivacyManagerConfigTest.php b/plugins/PrivacyManager/tests/PrivacyManagerConfigTest.php
index 06a5b691e7..88194e78f1 100644
--- a/tests/PHPUnit/Integration/Plugins/PrivacyManagerConfigTest.php
+++ b/plugins/PrivacyManager/tests/PrivacyManagerConfigTest.php
@@ -6,15 +6,18 @@
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
 
+namespace Piwik\Plugins\PrivacyManager\tests;
+
 use Piwik\Option;
 use Piwik\Plugins\PrivacyManager\Config as PrivacyManagerConfig;
+use IntegrationTestCase;
 
 /**
  * Class Plugins_SitesManagerTest
  *
  * @group Plugins
  */
-class Plugins_PrivacyManagerConfigTest extends IntegrationTestCase
+class PrivacyManagerConfigTest extends IntegrationTestCase
 {
     /**
      * @var PrivacyManagerConfig
diff --git a/tests/PHPUnit/Integration/Plugins/PrivacyManagerTest.php b/plugins/PrivacyManager/tests/PrivacyManagerTest.php
index ac95705bd3..f9e3b43079 100644
--- a/tests/PHPUnit/Integration/Plugins/PrivacyManagerTest.php
+++ b/plugins/PrivacyManager/tests/PrivacyManagerTest.php
@@ -6,14 +6,17 @@
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
 
+namespace Piwik\Plugins\PrivacyManager\tests;
+
 use Piwik\Plugins\PrivacyManager\PrivacyManager;
+use IntegrationTestCase;
 
 /**
  * Class Plugins_SitesManagerTest
  *
  * @group Plugins
  */
-class Plugins_PrivacyManagerTest extends IntegrationTestCase
+class PrivacyManagerTest extends IntegrationTestCase
 {
     /**
      * @var PrivacyManager
diff --git a/tests/PHPUnit/Plugins/ProxyTest.php b/plugins/Proxy/tests/ProxyTest.php
index ab5a57bcc4..8b460a35cc 100644
--- a/tests/PHPUnit/Plugins/ProxyTest.php
+++ b/plugins/Proxy/tests/ProxyTest.php
@@ -5,9 +5,17 @@
  * @link http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
+
+namespace Piwik\Plugins\Proxy\tests;
+
 use Piwik\Plugins\Proxy\Controller;
 
-class ProxyTest extends PHPUnit_Framework_TestCase
+/**
+ * @group Proxy
+ * @group ProxyTest
+ * @group Plugins
+ */
+class ProxyTest extends \PHPUnit_Framework_TestCase
 {
     public function getAcceptableRemoteUrls()
     {
diff --git a/tests/PHPUnit/Plugins/ReferrersTest.php b/plugins/Referrers/tests/ReferrersTest.php
index c03c9ad61d..909e6bf65e 100644
--- a/tests/PHPUnit/Plugins/ReferrersTest.php
+++ b/plugins/Referrers/tests/ReferrersTest.php
@@ -5,13 +5,16 @@
  * @link http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
-require_once 'Referrers/Referrers.php';
+
+namespace Piwik\Plugins\Referrers\tests;
 
 use Piwik\DataTable;
 use Piwik\DataTable\Row;
 use Piwik\Period;
 
-class ReferrersTest extends PHPUnit_Framework_TestCase
+require_once PIWIK_INCLUDE_PATH . '/plugins/Referrers/Referrers.php';
+
+class ReferrersTest extends \PHPUnit_Framework_TestCase
 {
     /**
      * Dataprovider serving all search engine data
diff --git a/tests/PHPUnit/Plugins/SEOTest.php b/plugins/SEO/tests/SEOTest.php
index 8cb377eeef..06f627d2b4 100644
--- a/tests/PHPUnit/Plugins/SEOTest.php
+++ b/plugins/SEO/tests/SEOTest.php
@@ -5,11 +5,21 @@
  * @link http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
+
+namespace Piwik\Plugins\SEO\tests;
+
 use Piwik\Access;
 use Piwik\DataTable\Renderer;
 use Piwik\Plugins\SEO\API;
+use FakeAccess;
+use Exception;
 
-class SEOTest extends PHPUnit_Framework_TestCase
+/**
+ * @group SEO
+ * @group SEOTest
+ * @group Plugins
+ */
+class SEOTest extends \PHPUnit_Framework_TestCase
 {
     public function setUp()
     {
@@ -36,8 +46,6 @@ class SEOTest extends PHPUnit_Framework_TestCase
 
     /**
      * tell us when the API is broken
-     *
-     * @group Plugins
      */
     public function test_API()
     {
diff --git a/tests/PHPUnit/Integration/Plugins/ScheduledReportsTest.php b/plugins/ScheduledReports/tests/ApiTest.php
index 89ee99e099..7f5f1649e0 100644
--- a/tests/PHPUnit/Integration/Plugins/ScheduledReportsTest.php
+++ b/plugins/ScheduledReports/tests/ApiTest.php
@@ -5,27 +5,33 @@
  * @link http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
+
+namespace Piwik\Plugins\ScheduledReports\tests;
+
 use Piwik\Access;
 use Piwik\Plugins\MobileMessaging\API as APIMobileMessaging;
 use Piwik\Plugins\MobileMessaging\MobileMessaging;
 use Piwik\Plugins\ScheduledReports\API as APIScheduledReports;
 use Piwik\Plugins\ScheduledReports\Menu;
 use Piwik\Plugins\ScheduledReports\Tasks;
-use Piwik\Plugins\ScheduledReports\ScheduledReports;
 use Piwik\Plugins\SitesManager\API as APISitesManager;
 use Piwik\ScheduledTask;
 use Piwik\ScheduledTime\Monthly;
 use Piwik\ScheduledTime;
 use Piwik\Site;
+use IntegrationTestCase;
+use FakeAccess;
+use Exception;
+use ReflectionMethod;
 
-require_once 'ScheduledReports/ScheduledReports.php';
+require_once PIWIK_INCLUDE_PATH . '/plugins/ScheduledReports/ScheduledReports.php';
 
 /**
  * Class Plugins_ScheduledReportsTest
  *
  * @group Plugins
  */
-class Plugins_ScheduledReportsTest extends IntegrationTestCase
+class ApiTest extends IntegrationTestCase
 {
     private $idSite = 1;
 
diff --git a/plugins/ScheduledReports/tests/ScheduledReportsTest.php b/plugins/ScheduledReports/tests/ScheduledReportsTest.php
index c7aef6b8bc..241e063aa0 100644
--- a/plugins/ScheduledReports/tests/ScheduledReportsTest.php
+++ b/plugins/ScheduledReports/tests/ScheduledReportsTest.php
@@ -17,7 +17,7 @@ use Piwik\Tests\Fixture;
 /**
  * @group ScheduledReports
  * @group ScheduledReportsTest
- * @group Database
+ * @group Plugins
  */
 class ScheduledReportsTest extends \IntegrationTestCase
 {
diff --git a/tests/PHPUnit/Integration/Plugins/SegmentEditorTest.php b/plugins/SegmentEditor/tests/SegmentEditorTest.php
index ca91862564..16f1b3fe34 100644
--- a/tests/PHPUnit/Integration/Plugins/SegmentEditorTest.php
+++ b/plugins/SegmentEditor/tests/SegmentEditorTest.php
@@ -5,19 +5,25 @@
  * @link http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
+
+namespace Piwik\Plugins\SegmentEditor\tests;
+
 use Piwik\Access;
 use Piwik\Date;
 use Piwik\Piwik;
 use Piwik\Plugins\SegmentEditor\API;
 use Piwik\Plugins\SegmentEditor\Model;
 use Piwik\Plugins\SitesManager\API as APISitesManager;
+use IntegrationTestCase;
+use FakeAccess;
+use Exception;
 
 /**
  * Class Plugins_SegmentEditorTest
  *
  * @group Plugins
  */
-class Plugins_SegmentEditorTest extends IntegrationTestCase
+class SegmentEditorTest extends IntegrationTestCase
 {
     public function setUp()
     {
@@ -116,7 +122,7 @@ class Plugins_SegmentEditorTest extends IntegrationTestCase
 
         // There is no segment to process for a non existing site
         try {
-            $segments = $model->getSegmentsToAutoArchive(33);
+            $model->getSegmentsToAutoArchive(33);
             $this->fail();
         } catch(Exception $e) {
             // expected
diff --git a/plugins/SitesManager/tests/SiteUrlsTest.php b/plugins/SitesManager/tests/SiteUrlsTest.php
index 1b946ac573..588b3c08f2 100644
--- a/plugins/SitesManager/tests/SiteUrlsTest.php
+++ b/plugins/SitesManager/tests/SiteUrlsTest.php
@@ -14,7 +14,7 @@ use Piwik\Plugins\SitesManager\SiteUrls;
 /**
  * @group SitesManager
  * @group SiteUrlsTest
- * @group Database
+ * @group Plugins
  */
 class SiteUrlsTest extends \IntegrationTestCase
 {
diff --git a/tests/PHPUnit/Integration/Plugins/SitesManagerTest.php b/plugins/SitesManager/tests/SitesManagerTest.php
index cf54ee6140..6d08f0de20 100644
--- a/tests/PHPUnit/Integration/Plugins/SitesManagerTest.php
+++ b/plugins/SitesManager/tests/SitesManagerTest.php
@@ -5,17 +5,24 @@
  * @link http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
+
+namespace Piwik\Plugins\SitesManager\tests;
+
 use Piwik\Access;
 use Piwik\Plugins\SitesManager\API;
 use Piwik\Plugins\UsersManager\API as APIUsersManager;
 use Piwik\Site;
+use IntegrationTestCase;
+use FakeAccess;
+use Exception;
+use PHPUnit_Framework_Constraint_IsType;
 
 /**
  * Class Plugins_SitesManagerTest
  *
  * @group Plugins
  */
-class Plugins_SitesManagerTest extends IntegrationTestCase
+class SitesManagerTest extends IntegrationTestCase
 {
     public function setUp()
     {
diff --git a/tests/PHPUnit/Plugins/UserCountryTest.php b/plugins/UserCountry/tests/UserCountryTest.php
index 72f9e7bfce..4dc6b9b497 100644
--- a/tests/PHPUnit/Plugins/UserCountryTest.php
+++ b/plugins/UserCountry/tests/UserCountryTest.php
@@ -6,16 +6,19 @@
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
 
+namespace Piwik\Plugins\UserCountry\tests;
+
 use Piwik\Plugins\UserCountry\GeoIPAutoUpdater;
 use Piwik\Plugins\UserCountry\LocationProvider\GeoIp;
 use Piwik\Plugins\UserCountry;
 use Piwik\Plugins\UserCountry\LocationProvider;
+use Exception;
 
 require_once PIWIK_INCLUDE_PATH . '/plugins/UserCountry/UserCountry.php';
 require_once PIWIK_INCLUDE_PATH . '/plugins/UserCountry/functions.php';
 require_once PIWIK_INCLUDE_PATH . '/core/DataFiles/Countries.php';
 
-class Test_Piwik_UserCountry extends PHPUnit_Framework_Testcase
+class UserCountryTest extends \PHPUnit_Framework_Testcase
 {
     /**
      * @group Plugins
diff --git a/tests/PHPUnit/Plugins/UserSettingsTest.php b/plugins/UserSettings/tests/UserSettingsTest.php
index b18362f1e5..95188a15e4 100644
--- a/tests/PHPUnit/Plugins/UserSettingsTest.php
+++ b/plugins/UserSettings/tests/UserSettingsTest.php
@@ -5,10 +5,14 @@
  * @link http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
-require_once 'UserSettings/UserSettings.php';
-require_once 'UserSettings/functions.php';
+namespace Piwik\Plugins\UserSettings\tests;
 
-class UserSettingsTest extends PHPUnit_Framework_TestCase
+use UserAgentParser;
+
+require_once PIWIK_INCLUDE_PATH . '/plugins/UserSettings/UserSettings.php';
+require_once PIWIK_INCLUDE_PATH . '/plugins/UserSettings/functions.php';
+
+class UserSettingsTest extends \PHPUnit_Framework_TestCase
 {
     // User agent strings and expected parser results
     public function getUserAgents()
diff --git a/plugins/UserSettings/tests/processed/test___UserSettings.getLanguageCode_day.xml b/plugins/UserSettings/tests/processed/test___UserSettings.getLanguageCode_day.xml
new file mode 100644
index 0000000000..689e3d7d37
--- /dev/null
+++ b/plugins/UserSettings/tests/processed/test___UserSettings.getLanguageCode_day.xml
@@ -0,0 +1,157 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<result>
+	<row>
+		<label>Polish (pl)</label>
+		<nb_uniq_visitors>2</nb_uniq_visitors>
+		<nb_visits>3</nb_visits>
+		<nb_actions>3</nb_actions>
+		<nb_users>0</nb_users>
+		<max_actions>1</max_actions>
+		<sum_visit_length>0</sum_visit_length>
+		<bounce_count>3</bounce_count>
+		<nb_visits_converted>0</nb_visits_converted>
+	</row>
+	<row>
+		<label>English - United States (en-us)</label>
+		<nb_uniq_visitors>1</nb_uniq_visitors>
+		<nb_visits>2</nb_visits>
+		<nb_actions>2</nb_actions>
+		<nb_users>0</nb_users>
+		<max_actions>1</max_actions>
+		<sum_visit_length>0</sum_visit_length>
+		<bounce_count>2</bounce_count>
+		<nb_visits_converted>0</nb_visits_converted>
+	</row>
+	<row>
+		<label>French - Belgium (fr-be)</label>
+		<nb_uniq_visitors>1</nb_uniq_visitors>
+		<nb_visits>2</nb_visits>
+		<nb_actions>2</nb_actions>
+		<nb_users>0</nb_users>
+		<max_actions>1</max_actions>
+		<sum_visit_length>0</sum_visit_length>
+		<bounce_count>2</bounce_count>
+		<nb_visits_converted>0</nb_visits_converted>
+	</row>
+	<row>
+		<label>Arabic - Qatar (ar-qa)</label>
+		<nb_uniq_visitors>1</nb_uniq_visitors>
+		<nb_visits>1</nb_visits>
+		<nb_actions>1</nb_actions>
+		<nb_users>0</nb_users>
+		<max_actions>1</max_actions>
+		<sum_visit_length>0</sum_visit_length>
+		<bounce_count>1</bounce_count>
+		<nb_visits_converted>0</nb_visits_converted>
+	</row>
+	<row>
+		<label>Czech - Czech Republic (cs-cz)</label>
+		<nb_uniq_visitors>1</nb_uniq_visitors>
+		<nb_visits>1</nb_visits>
+		<nb_actions>1</nb_actions>
+		<nb_users>0</nb_users>
+		<max_actions>1</max_actions>
+		<sum_visit_length>0</sum_visit_length>
+		<bounce_count>1</bounce_count>
+		<nb_visits_converted>0</nb_visits_converted>
+	</row>
+	<row>
+		<label>German (de)</label>
+		<nb_uniq_visitors>1</nb_uniq_visitors>
+		<nb_visits>1</nb_visits>
+		<nb_actions>1</nb_actions>
+		<nb_users>0</nb_users>
+		<max_actions>1</max_actions>
+		<sum_visit_length>0</sum_visit_length>
+		<bounce_count>1</bounce_count>
+		<nb_visits_converted>0</nb_visits_converted>
+	</row>
+	<row>
+		<label>Greek - Greece (el-gr)</label>
+		<nb_uniq_visitors>1</nb_uniq_visitors>
+		<nb_visits>1</nb_visits>
+		<nb_actions>1</nb_actions>
+		<nb_users>0</nb_users>
+		<max_actions>1</max_actions>
+		<sum_visit_length>0</sum_visit_length>
+		<bounce_count>1</bounce_count>
+		<nb_visits_converted>0</nb_visits_converted>
+	</row>
+	<row>
+		<label>Basque - Spain (eu-es)</label>
+		<nb_uniq_visitors>1</nb_uniq_visitors>
+		<nb_visits>1</nb_visits>
+		<nb_actions>1</nb_actions>
+		<nb_users>0</nb_users>
+		<max_actions>1</max_actions>
+		<sum_visit_length>0</sum_visit_length>
+		<bounce_count>1</bounce_count>
+		<nb_visits_converted>0</nb_visits_converted>
+	</row>
+	<row>
+		<label>French (fr)</label>
+		<nb_uniq_visitors>1</nb_uniq_visitors>
+		<nb_visits>1</nb_visits>
+		<nb_actions>1</nb_actions>
+		<nb_users>0</nb_users>
+		<max_actions>1</max_actions>
+		<sum_visit_length>0</sum_visit_length>
+		<bounce_count>1</bounce_count>
+		<nb_visits_converted>0</nb_visits_converted>
+	</row>
+	<row>
+		<label>French - Switzerland (fr-ch)</label>
+		<nb_uniq_visitors>1</nb_uniq_visitors>
+		<nb_visits>1</nb_visits>
+		<nb_actions>1</nb_actions>
+		<nb_users>0</nb_users>
+		<max_actions>1</max_actions>
+		<sum_visit_length>0</sum_visit_length>
+		<bounce_count>1</bounce_count>
+		<nb_visits_converted>0</nb_visits_converted>
+	</row>
+	<row>
+		<label>Serbian - Serbia Montenegro (sr-cs)</label>
+		<nb_uniq_visitors>1</nb_uniq_visitors>
+		<nb_visits>1</nb_visits>
+		<nb_actions>1</nb_actions>
+		<nb_users>0</nb_users>
+		<max_actions>1</max_actions>
+		<sum_visit_length>0</sum_visit_length>
+		<bounce_count>1</bounce_count>
+		<nb_visits_converted>0</nb_visits_converted>
+	</row>
+	<row>
+		<label>Thai (th)</label>
+		<nb_uniq_visitors>1</nb_uniq_visitors>
+		<nb_visits>1</nb_visits>
+		<nb_actions>1</nb_actions>
+		<nb_users>0</nb_users>
+		<max_actions>1</max_actions>
+		<sum_visit_length>0</sum_visit_length>
+		<bounce_count>1</bounce_count>
+		<nb_visits_converted>0</nb_visits_converted>
+	</row>
+	<row>
+		<label>Unknown - Liberia (xx-lr)</label>
+		<nb_uniq_visitors>1</nb_uniq_visitors>
+		<nb_visits>1</nb_visits>
+		<nb_actions>1</nb_actions>
+		<nb_users>0</nb_users>
+		<max_actions>1</max_actions>
+		<sum_visit_length>0</sum_visit_length>
+		<bounce_count>1</bounce_count>
+		<nb_visits_converted>0</nb_visits_converted>
+	</row>
+	<row>
+		<label>Chinese - Singapore (zh-sg)</label>
+		<nb_uniq_visitors>1</nb_uniq_visitors>
+		<nb_visits>1</nb_visits>
+		<nb_actions>1</nb_actions>
+		<nb_users>0</nb_users>
+		<max_actions>1</max_actions>
+		<sum_visit_length>0</sum_visit_length>
+		<bounce_count>1</bounce_count>
+		<nb_visits_converted>0</nb_visits_converted>
+	</row>
+</result>
\ No newline at end of file
diff --git a/plugins/UserSettings/tests/processed/test___UserSettings.getLanguage_day.xml b/plugins/UserSettings/tests/processed/test___UserSettings.getLanguage_day.xml
new file mode 100644
index 0000000000..6bb328c660
--- /dev/null
+++ b/plugins/UserSettings/tests/processed/test___UserSettings.getLanguage_day.xml
@@ -0,0 +1,135 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<result>
+	<row>
+		<label>Polish</label>
+		<nb_uniq_visitors>2</nb_uniq_visitors>
+		<nb_visits>3</nb_visits>
+		<nb_actions>3</nb_actions>
+		<nb_users>0</nb_users>
+		<max_actions>1</max_actions>
+		<sum_visit_length>0</sum_visit_length>
+		<bounce_count>3</bounce_count>
+		<nb_visits_converted>0</nb_visits_converted>
+	</row>
+	<row>
+		<label>English</label>
+		<nb_uniq_visitors>1</nb_uniq_visitors>
+		<nb_visits>2</nb_visits>
+		<nb_actions>2</nb_actions>
+		<nb_users>0</nb_users>
+		<max_actions>1</max_actions>
+		<sum_visit_length>0</sum_visit_length>
+		<bounce_count>2</bounce_count>
+		<nb_visits_converted>0</nb_visits_converted>
+	</row>
+	<row>
+		<label>French</label>
+		<nb_uniq_visitors>3</nb_uniq_visitors>
+		<nb_visits>4</nb_visits>
+		<nb_actions>4</nb_actions>
+		<nb_users>0</nb_users>
+		<max_actions>1</max_actions>
+		<sum_visit_length>0</sum_visit_length>
+		<bounce_count>4</bounce_count>
+		<nb_visits_converted>0</nb_visits_converted>
+	</row>
+	<row>
+		<label>Arabic</label>
+		<nb_uniq_visitors>1</nb_uniq_visitors>
+		<nb_visits>1</nb_visits>
+		<nb_actions>1</nb_actions>
+		<nb_users>0</nb_users>
+		<max_actions>1</max_actions>
+		<sum_visit_length>0</sum_visit_length>
+		<bounce_count>1</bounce_count>
+		<nb_visits_converted>0</nb_visits_converted>
+	</row>
+	<row>
+		<label>Czech</label>
+		<nb_uniq_visitors>1</nb_uniq_visitors>
+		<nb_visits>1</nb_visits>
+		<nb_actions>1</nb_actions>
+		<nb_users>0</nb_users>
+		<max_actions>1</max_actions>
+		<sum_visit_length>0</sum_visit_length>
+		<bounce_count>1</bounce_count>
+		<nb_visits_converted>0</nb_visits_converted>
+	</row>
+	<row>
+		<label>German</label>
+		<nb_uniq_visitors>1</nb_uniq_visitors>
+		<nb_visits>1</nb_visits>
+		<nb_actions>1</nb_actions>
+		<nb_users>0</nb_users>
+		<max_actions>1</max_actions>
+		<sum_visit_length>0</sum_visit_length>
+		<bounce_count>1</bounce_count>
+		<nb_visits_converted>0</nb_visits_converted>
+	</row>
+	<row>
+		<label>Greek</label>
+		<nb_uniq_visitors>1</nb_uniq_visitors>
+		<nb_visits>1</nb_visits>
+		<nb_actions>1</nb_actions>
+		<nb_users>0</nb_users>
+		<max_actions>1</max_actions>
+		<sum_visit_length>0</sum_visit_length>
+		<bounce_count>1</bounce_count>
+		<nb_visits_converted>0</nb_visits_converted>
+	</row>
+	<row>
+		<label>Basque</label>
+		<nb_uniq_visitors>1</nb_uniq_visitors>
+		<nb_visits>1</nb_visits>
+		<nb_actions>1</nb_actions>
+		<nb_users>0</nb_users>
+		<max_actions>1</max_actions>
+		<sum_visit_length>0</sum_visit_length>
+		<bounce_count>1</bounce_count>
+		<nb_visits_converted>0</nb_visits_converted>
+	</row>
+	<row>
+		<label>Serbian</label>
+		<nb_uniq_visitors>1</nb_uniq_visitors>
+		<nb_visits>1</nb_visits>
+		<nb_actions>1</nb_actions>
+		<nb_users>0</nb_users>
+		<max_actions>1</max_actions>
+		<sum_visit_length>0</sum_visit_length>
+		<bounce_count>1</bounce_count>
+		<nb_visits_converted>0</nb_visits_converted>
+	</row>
+	<row>
+		<label>Thai</label>
+		<nb_uniq_visitors>1</nb_uniq_visitors>
+		<nb_visits>1</nb_visits>
+		<nb_actions>1</nb_actions>
+		<nb_users>0</nb_users>
+		<max_actions>1</max_actions>
+		<sum_visit_length>0</sum_visit_length>
+		<bounce_count>1</bounce_count>
+		<nb_visits_converted>0</nb_visits_converted>
+	</row>
+	<row>
+		<label>Unknown</label>
+		<nb_uniq_visitors>1</nb_uniq_visitors>
+		<nb_visits>1</nb_visits>
+		<nb_actions>1</nb_actions>
+		<nb_users>0</nb_users>
+		<max_actions>1</max_actions>
+		<sum_visit_length>0</sum_visit_length>
+		<bounce_count>1</bounce_count>
+		<nb_visits_converted>0</nb_visits_converted>
+	</row>
+	<row>
+		<label>Chinese</label>
+		<nb_uniq_visitors>1</nb_uniq_visitors>
+		<nb_visits>1</nb_visits>
+		<nb_actions>1</nb_actions>
+		<nb_users>0</nb_users>
+		<max_actions>1</max_actions>
+		<sum_visit_length>0</sum_visit_length>
+		<bounce_count>1</bounce_count>
+		<nb_visits_converted>0</nb_visits_converted>
+	</row>
+</result>
\ No newline at end of file
diff --git a/plugins/UsersManager/tests/APITest.php b/plugins/UsersManager/tests/APITest.php
index 9cc230f59d..3d77ee7a83 100644
--- a/plugins/UsersManager/tests/APITest.php
+++ b/plugins/UsersManager/tests/APITest.php
@@ -16,7 +16,7 @@ use Piwik\Tests\Fixture;
 /**
  * @group UsersManager
  * @group APITest
- * @group Database
+ * @group Plugins
  */
 class APITest extends \IntegrationTestCase
 {
diff --git a/plugins/UsersManager/tests/UserPreferencesTest.php b/plugins/UsersManager/tests/UserPreferencesTest.php
index 32d56110f4..50658e46e2 100644
--- a/plugins/UsersManager/tests/UserPreferencesTest.php
+++ b/plugins/UsersManager/tests/UserPreferencesTest.php
@@ -7,6 +7,7 @@
  */
 
 namespace Piwik\Plugins\UsersManager\tests;
+
 use Piwik\Piwik;
 use Piwik\Plugins\UsersManager\UserPreferences;
 use Piwik\Plugins\UsersManager\API as APIUsersManager;
@@ -17,7 +18,7 @@ use Piwik\Tests\Fixture;
 /**
  * @group UsersManager
  * @group UserPreferencesTest
- * @group Database
+ * @group Plugins
  * @group Plugins
  */
 class UserPreferencesTest extends \IntegrationTestCase
diff --git a/tests/PHPUnit/Integration/Plugins/UsersManagerTest.php b/plugins/UsersManager/tests/UsersManagerTest.php
index 5f039b7efc..da73e142d3 100644
--- a/tests/PHPUnit/Integration/Plugins/UsersManagerTest.php
+++ b/plugins/UsersManager/tests/UsersManagerTest.php
@@ -5,11 +5,18 @@
  * @link http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
+
+namespace Piwik\Plugins\UsersManager\tests;
+
 use Piwik\Access;
 use Piwik\Plugins\SitesManager\API as APISitesManager;
 use Piwik\Plugins\UsersManager\API;
 use Piwik\Plugins\UsersManager\Model;
 use Piwik\Translate;
+use IntegrationTestCase;
+use FakeAccess;
+use Exception;
+
 
 /**
  * Piwik - free/libre analytics platform
@@ -19,7 +26,7 @@ use Piwik\Translate;
  *
  * @group Plugins
  */
-class Plugins_UsersManagerTest extends IntegrationTestCase
+class UsersManagerTest extends IntegrationTestCase
 {
     /**
      * @var API
diff --git a/plugins/VisitorGenerator b/plugins/VisitorGenerator
-Subproject 5d6355fcb38e7b8964d697da3cf9e2d201bf224
+Subproject 5385c1cf4f30878ddb9bc7f92fda3d1614e9779
diff --git a/tests/PHPUnit/FakeAccess.php b/tests/PHPUnit/FakeAccess.php
index be97babff0..3a7ab32e69 100644
--- a/tests/PHPUnit/FakeAccess.php
+++ b/tests/PHPUnit/FakeAccess.php
@@ -26,21 +26,21 @@ class FakeAccess
 
     public function __construct()
     {
-        self::$superUser = false;
+        self::$superUser    = false;
         self::$idSitesAdmin = array();
-        self::$idSitesView = array();
-        self::$identity = 'superUserLogin';
+        self::$idSitesView  = array();
+        self::$identity     = 'superUserLogin';
     }
 
     public static function setIdSitesAdmin($ids)
     {
-        self::$superUser = false;
+        self::$superUser    = false;
         self::$idSitesAdmin = $ids;
     }
 
     public static function setIdSitesView($ids)
     {
-        self::$superUser = false;
+        self::$superUser   = false;
         self::$idSitesView = $ids;
     }
 
@@ -74,6 +74,7 @@ class FakeAccess
         }
 
         $idSites = Site::getIdSitesFromIdSitesString($idSites);
+
         foreach ($idSites as $idsite) {
             if (!in_array($idsite, $websitesAccess)) {
                 throw new Exception("checkUserHasAdminAccess Fake exception // string not to be tested");
@@ -142,6 +143,7 @@ class FakeAccess
         if (self::$superUser) {
             return API::getInstance()->getAllSitesId();
         }
+
         return self::$idSitesAdmin;
     }
 
@@ -150,6 +152,7 @@ class FakeAccess
         if (self::$superUser) {
             return API::getInstance()->getAllSitesId();
         }
+
         return self::$idSitesView;
     }
 
@@ -158,15 +161,18 @@ class FakeAccess
         if (self::$superUser) {
             return API::getInstance()->getAllSitesId();
         }
+
         return array_merge(self::$idSitesView, self::$idSitesAdmin);
     }
 
     public function getRawSitesWithSomeViewAccess($login)
     {
         $result = array();
+
         foreach (array_merge(self::$idSitesView, self::$idSitesAdmin) as $idSite) {
             $result[] = array('idsite' => $idSite);
         }
+
         return $result;
     }
 }
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/Core/AccessTest.php b/tests/PHPUnit/Integration/AccessTest.php
index 12cd119d8c..12cd119d8c 100644
--- a/tests/PHPUnit/Integration/Core/AccessTest.php
+++ b/tests/PHPUnit/Integration/AccessTest.php
diff --git a/tests/PHPUnit/Integration/Core/ArchiveProcessingTest.php b/tests/PHPUnit/Integration/ArchiveProcessingTest.php
index 65f1dd0c7f..65f1dd0c7f 100644
--- a/tests/PHPUnit/Integration/Core/ArchiveProcessingTest.php
+++ b/tests/PHPUnit/Integration/ArchiveProcessingTest.php
diff --git a/tests/PHPUnit/Integration/Core/CliMultiTest.php b/tests/PHPUnit/Integration/CliMultiTest.php
index 6ae07f2318..6ae07f2318 100644
--- a/tests/PHPUnit/Integration/Core/CliMultiTest.php
+++ b/tests/PHPUnit/Integration/CliMultiTest.php
diff --git a/tests/PHPUnit/Integration/Core/CronArchive/FixedSiteIdsTest.php b/tests/PHPUnit/Integration/CronArchive/FixedSiteIdsTest.php
index 259df6fc9e..259df6fc9e 100644
--- a/tests/PHPUnit/Integration/Core/CronArchive/FixedSiteIdsTest.php
+++ b/tests/PHPUnit/Integration/CronArchive/FixedSiteIdsTest.php
diff --git a/tests/PHPUnit/Integration/Core/CronArchive/SharedSiteIdsTest.php b/tests/PHPUnit/Integration/CronArchive/SharedSiteIdsTest.php
index b9826dc676..b9826dc676 100644
--- a/tests/PHPUnit/Integration/Core/CronArchive/SharedSiteIdsTest.php
+++ b/tests/PHPUnit/Integration/CronArchive/SharedSiteIdsTest.php
diff --git a/tests/PHPUnit/Integration/Core/DbTest.php b/tests/PHPUnit/Integration/DbTest.php
index aacef131e9..aacef131e9 100644
--- a/tests/PHPUnit/Integration/Core/DbTest.php
+++ b/tests/PHPUnit/Integration/DbTest.php
diff --git a/tests/PHPUnit/Integration/Core/JsProxyTest.php b/tests/PHPUnit/Integration/JsProxyTest.php
index cd4c84a763..cd4c84a763 100644
--- a/tests/PHPUnit/Integration/Core/JsProxyTest.php
+++ b/tests/PHPUnit/Integration/JsProxyTest.php
diff --git a/tests/PHPUnit/Integration/Core/LogTest.php b/tests/PHPUnit/Integration/LogTest.php
index b7271dc866..b7271dc866 100644
--- a/tests/PHPUnit/Integration/Core/LogTest.php
+++ b/tests/PHPUnit/Integration/LogTest.php
diff --git a/tests/PHPUnit/Integration/Core/OptionTest.php b/tests/PHPUnit/Integration/OptionTest.php
index 6bab1cf65b..6bab1cf65b 100644
--- a/tests/PHPUnit/Integration/Core/OptionTest.php
+++ b/tests/PHPUnit/Integration/OptionTest.php
diff --git a/tests/PHPUnit/Integration/Core/PiwikTest.php b/tests/PHPUnit/Integration/PiwikTest.php
index fc04c81398..fc04c81398 100644
--- a/tests/PHPUnit/Integration/Core/PiwikTest.php
+++ b/tests/PHPUnit/Integration/PiwikTest.php
diff --git a/tests/PHPUnit/Integration/Core/Plugin/SettingsTest.php b/tests/PHPUnit/Integration/Plugin/SettingsTest.php
index 3846f4cd15..3846f4cd15 100644
--- a/tests/PHPUnit/Integration/Core/Plugin/SettingsTest.php
+++ b/tests/PHPUnit/Integration/Plugin/SettingsTest.php
diff --git a/tests/PHPUnit/Integration/Core/ReportTest.php b/tests/PHPUnit/Integration/ReportTest.php
index a7dc7509c4..a7dc7509c4 100644
--- a/tests/PHPUnit/Integration/Core/ReportTest.php
+++ b/tests/PHPUnit/Integration/ReportTest.php
diff --git a/tests/PHPUnit/Integration/Core/SegmentTest.php b/tests/PHPUnit/Integration/SegmentTest.php
index 00312063c0..00312063c0 100644
--- a/tests/PHPUnit/Integration/Core/SegmentTest.php
+++ b/tests/PHPUnit/Integration/SegmentTest.php
diff --git a/tests/PHPUnit/Integration/Core/SqlTest.php b/tests/PHPUnit/Integration/SqlTest.php
index 843e4e950a..843e4e950a 100755
--- a/tests/PHPUnit/Integration/Core/SqlTest.php
+++ b/tests/PHPUnit/Integration/SqlTest.php
diff --git a/tests/PHPUnit/Integration/Core/Tracker/ActionTest.php b/tests/PHPUnit/Integration/Tracker/ActionTest.php
index 2b7ea04ac0..2b7ea04ac0 100644
--- a/tests/PHPUnit/Integration/Core/Tracker/ActionTest.php
+++ b/tests/PHPUnit/Integration/Tracker/ActionTest.php
diff --git a/tests/PHPUnit/Integration/Core/Tracker/DbTest.php b/tests/PHPUnit/Integration/Tracker/DbTest.php
index 71fd3a97fd..71fd3a97fd 100644
--- a/tests/PHPUnit/Integration/Core/Tracker/DbTest.php
+++ b/tests/PHPUnit/Integration/Tracker/DbTest.php
diff --git a/tests/PHPUnit/Integration/Core/Tracker/Visit2Test.php b/tests/PHPUnit/Integration/Tracker/Visit2Test.php
index 9910d7f51d..9910d7f51d 100644
--- a/tests/PHPUnit/Integration/Core/Tracker/Visit2Test.php
+++ b/tests/PHPUnit/Integration/Tracker/Visit2Test.php
diff --git a/tests/PHPUnit/Integration/Core/Tracker/VisitTest.php b/tests/PHPUnit/Integration/Tracker/VisitTest.php
index 69c1569251..69c1569251 100644
--- a/tests/PHPUnit/Integration/Core/Tracker/VisitTest.php
+++ b/tests/PHPUnit/Integration/Tracker/VisitTest.php
diff --git a/tests/PHPUnit/Integration/Core/TrackerTest.php b/tests/PHPUnit/Integration/TrackerTest.php
index c8176a1a89..c8176a1a89 100644
--- a/tests/PHPUnit/Integration/Core/TrackerTest.php
+++ b/tests/PHPUnit/Integration/TrackerTest.php
diff --git a/tests/PHPUnit/Integration/Core/TravisEnvironmentTest.php b/tests/PHPUnit/Integration/TravisEnvironmentTest.php
index a8b6dfc27a..a8b6dfc27a 100644
--- a/tests/PHPUnit/Integration/Core/TravisEnvironmentTest.php
+++ b/tests/PHPUnit/Integration/TravisEnvironmentTest.php
diff --git a/tests/PHPUnit/Integration/Core/UpdaterTest.php b/tests/PHPUnit/Integration/UpdaterTest.php
index a3070a6950..a3070a6950 100644
--- a/tests/PHPUnit/Integration/Core/UpdaterTest.php
+++ b/tests/PHPUnit/Integration/UpdaterTest.php
diff --git a/tests/PHPUnit/Integration/Core/ViewDataTable/ManagerTest.php b/tests/PHPUnit/Integration/ViewDataTable/ManagerTest.php
index 394bfe4039..394bfe4039 100644
--- a/tests/PHPUnit/Integration/Core/ViewDataTable/ManagerTest.php
+++ b/tests/PHPUnit/Integration/ViewDataTable/ManagerTest.php
diff --git a/tests/PHPUnit/Integration/Core/WidgetsListTest.php b/tests/PHPUnit/Integration/WidgetsListTest.php
index a616bdd5bf..a616bdd5bf 100644
--- a/tests/PHPUnit/Integration/Core/WidgetsListTest.php
+++ b/tests/PHPUnit/Integration/WidgetsListTest.php
diff --git a/tests/PHPUnit/Integration/processed/.gitkeep b/tests/PHPUnit/Integration/processed/.gitkeep
deleted file mode 100644
index e69de29bb2..0000000000
--- a/tests/PHPUnit/Integration/processed/.gitkeep
+++ /dev/null
diff --git a/tests/PHPUnit/IntegrationTestCase.php b/tests/PHPUnit/IntegrationTestCase.php
index f08c7cfac6..6d63779e9c 100644
--- a/tests/PHPUnit/IntegrationTestCase.php
+++ b/tests/PHPUnit/IntegrationTestCase.php
@@ -87,8 +87,8 @@ class IntegrationTestCase extends SystemTestCase
 
     protected static function configureFixture($fixture)
     {
-        $fixture->loadTranslations = false;
-        $fixture->createSuperUser = false;
+        $fixture->loadTranslations    = false;
+        $fixture->createSuperUser     = false;
         $fixture->configureComponents = false;
     }
 }
diff --git a/tests/PHPUnit/MockLocationProvider.php b/tests/PHPUnit/MockLocationProvider.php
index 9d613ae18f..45cb0c8c04 100755
--- a/tests/PHPUnit/MockLocationProvider.php
+++ b/tests/PHPUnit/MockLocationProvider.php
@@ -12,7 +12,7 @@ class MockLocationProvider extends LocationProvider
 {
     public static $locations = array();
     private $currentLocation = 0;
-    private $ipToLocations = array();
+    private $ipToLocations   = array();
 
     public function getLocation($info)
     {
@@ -26,7 +26,9 @@ class MockLocationProvider extends LocationProvider
 
             $this->ipToLocations[$ip] = $result;
         }
+
         $this->completeLocationResult($result);
+
         return $result;
     }
 
diff --git a/tests/PHPUnit/Integration/AnnotationsTest.php b/tests/PHPUnit/System/AnnotationsTest.php
index 211a0ca259..9acf8c7e27 100755
--- a/tests/PHPUnit/Integration/AnnotationsTest.php
+++ b/tests/PHPUnit/System/AnnotationsTest.php
@@ -5,7 +5,7 @@
  * @link    http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
-namespace Piwik\Tests\Integration;
+namespace Piwik\Tests\System;
 
 use Piwik\Access;
 use Piwik\API\Request;
diff --git a/tests/PHPUnit/Integration/ApiGetReportMetadataTest.php b/tests/PHPUnit/System/ApiGetReportMetadataTest.php
index 086be417c9..be86b7f3ab 100755
--- a/tests/PHPUnit/Integration/ApiGetReportMetadataTest.php
+++ b/tests/PHPUnit/System/ApiGetReportMetadataTest.php
@@ -5,7 +5,7 @@
  * @link http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
-namespace Piwik\Tests\Integration;
+namespace Piwik\Tests\System;
 
 use Piwik\API\Proxy;
 use Piwik\Tests\SystemTestCase;
diff --git a/tests/PHPUnit/Integration/ApiGetReportMetadataYearTest.php b/tests/PHPUnit/System/ApiGetReportMetadataYearTest.php
index 824362ca95..d3df009834 100755
--- a/tests/PHPUnit/Integration/ApiGetReportMetadataYearTest.php
+++ b/tests/PHPUnit/System/ApiGetReportMetadataYearTest.php
@@ -5,7 +5,7 @@
  * @link http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
-namespace Piwik\Tests\Integration;
+namespace Piwik\Tests\System;
 
 use Piwik\Tests\SystemTestCase;
 use Piwik\Tests\Fixtures\InvalidVisits;
diff --git a/tests/PHPUnit/Integration/ArchiveCronTest.php b/tests/PHPUnit/System/ArchiveCronTest.php
index eefe9fdca9..75b7fcb2af 100644
--- a/tests/PHPUnit/Integration/ArchiveCronTest.php
+++ b/tests/PHPUnit/System/ArchiveCronTest.php
@@ -5,7 +5,7 @@
  * @link    http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
-namespace Piwik\Tests\Integration;
+namespace Piwik\Tests\System;
 
 use Piwik\Date;
 use Piwik\Plugins\SitesManager\API;
diff --git a/tests/PHPUnit/Integration/ArchiveInvalidationTest.php b/tests/PHPUnit/System/ArchiveInvalidationTest.php
index b600aca355..6d8d22a2c3 100644
--- a/tests/PHPUnit/Integration/ArchiveInvalidationTest.php
+++ b/tests/PHPUnit/System/ArchiveInvalidationTest.php
@@ -5,13 +5,12 @@
  * @link    http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
-namespace Piwik\Tests\Integration;
+namespace Piwik\Tests\System;
 
 use Piwik\API\Request;
 use Piwik\Config;
 use Piwik\Tests\Fixtures\VisitsTwoWebsitesWithAdditionalVisits;
 use Piwik\Tests\SystemTestCase;
-use Exception;
 
 /**
  * Track visits before website creation date and test that Piwik handles them correctly.
diff --git a/tests/PHPUnit/Integration/ArchiveWebTest.php b/tests/PHPUnit/System/ArchiveWebTest.php
index 6b245d1dc2..53f262df1a 100644
--- a/tests/PHPUnit/Integration/ArchiveWebTest.php
+++ b/tests/PHPUnit/System/ArchiveWebTest.php
@@ -5,7 +5,7 @@
  * @link    http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
-namespace Piwik\Tests\Integration;
+namespace Piwik\Tests\System;
 
 use Piwik\Option;
 use Piwik\Http;
diff --git a/tests/PHPUnit/Integration/AutoSuggestAPITest.php b/tests/PHPUnit/System/AutoSuggestAPITest.php
index cdb717ef88..535e1d4250 100644
--- a/tests/PHPUnit/Integration/AutoSuggestAPITest.php
+++ b/tests/PHPUnit/System/AutoSuggestAPITest.php
@@ -5,7 +5,7 @@
  * @link    http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
-namespace Piwik\Tests\Integration;
+namespace Piwik\Tests\System;
 
 use Piwik\API\Request;
 use Piwik\Date;
diff --git a/tests/PHPUnit/Integration/BackwardsCompatibility1XTest.php b/tests/PHPUnit/System/BackwardsCompatibility1XTest.php
index 9c3bf0c9a3..5d20fa81a9 100644
--- a/tests/PHPUnit/Integration/BackwardsCompatibility1XTest.php
+++ b/tests/PHPUnit/System/BackwardsCompatibility1XTest.php
@@ -5,7 +5,7 @@
  * @link http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
-namespace Piwik\Tests\Integration;
+namespace Piwik\Tests\System;
 
 use Piwik\Common;
 use Piwik\Db;
diff --git a/tests/PHPUnit/Integration/BlobReportLimitingTest.php b/tests/PHPUnit/System/BlobReportLimitingTest.php
index 806b9c3433..431709d3cf 100755
--- a/tests/PHPUnit/Integration/BlobReportLimitingTest.php
+++ b/tests/PHPUnit/System/BlobReportLimitingTest.php
@@ -5,7 +5,7 @@
  * @link http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
-namespace Piwik\Tests\Integration;
+namespace Piwik\Tests\System;
 
 use Piwik\Config;
 use Piwik\Plugins\Actions\ArchivingHelper;
diff --git a/tests/PHPUnit/Integration/CsvExportTest.php b/tests/PHPUnit/System/CsvExportTest.php
index bc77b32723..48c9342f8e 100755
--- a/tests/PHPUnit/Integration/CsvExportTest.php
+++ b/tests/PHPUnit/System/CsvExportTest.php
@@ -5,7 +5,7 @@
  * @link http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
-namespace Piwik\Tests\Integration;
+namespace Piwik\Tests\System;
 
 use Piwik\Tests\SystemTestCase;
 use Piwik\Tests\Fixtures\TwoVisitsWithCustomVariables;
diff --git a/tests/PHPUnit/Integration/CustomEventsTest.php b/tests/PHPUnit/System/CustomEventsTest.php
index 44d1c70611..b2e92b30a9 100644
--- a/tests/PHPUnit/Integration/CustomEventsTest.php
+++ b/tests/PHPUnit/System/CustomEventsTest.php
@@ -5,7 +5,7 @@
  * @link    http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
-namespace Piwik\Tests\Integration;
+namespace Piwik\Tests\System;
 
 use Piwik\Tests\SystemTestCase;
 use Piwik\Tests\Fixtures\TwoVisitsWithCustomEvents;
diff --git a/tests/PHPUnit/Integration/EcommerceOrderWithItemsTest.php b/tests/PHPUnit/System/EcommerceOrderWithItemsTest.php
index bb642d4f7f..e2ab0ffd44 100755
--- a/tests/PHPUnit/Integration/EcommerceOrderWithItemsTest.php
+++ b/tests/PHPUnit/System/EcommerceOrderWithItemsTest.php
@@ -5,7 +5,7 @@
  * @link    http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
-namespace Piwik\Tests\Integration;
+namespace Piwik\Tests\System;
 
 use Piwik\Date;
 use Piwik\Piwik;
diff --git a/tests/PHPUnit/Integration/FlattenReportsTest.php b/tests/PHPUnit/System/FlattenReportsTest.php
index d045f2d634..e38e10cf7f 100644
--- a/tests/PHPUnit/Integration/FlattenReportsTest.php
+++ b/tests/PHPUnit/System/FlattenReportsTest.php
@@ -5,7 +5,7 @@
  * @link    http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
-namespace Piwik\Tests\Integration;
+namespace Piwik\Tests\System;
 
 use Piwik\Tests\SystemTestCase;
 use Piwik\Tests\Fixtures\ManyVisitsWithSubDirReferrersAndCustomVars;
diff --git a/tests/PHPUnit/Integration/ImportLogsTest.php b/tests/PHPUnit/System/ImportLogsTest.php
index 21a43b235c..abf7d6a42a 100755
--- a/tests/PHPUnit/Integration/ImportLogsTest.php
+++ b/tests/PHPUnit/System/ImportLogsTest.php
@@ -5,7 +5,7 @@
  * @link    http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
-namespace Piwik\Tests\Integration;
+namespace Piwik\Tests\System;
 
 use Piwik\Access;
 use Piwik\Plugins\SitesManager\API;
diff --git a/tests/PHPUnit/Integration/LabelFilterTest.php b/tests/PHPUnit/System/LabelFilterTest.php
index 710c464e3e..487e09c07f 100644
--- a/tests/PHPUnit/Integration/LabelFilterTest.php
+++ b/tests/PHPUnit/System/LabelFilterTest.php
@@ -5,7 +5,7 @@
  * @link    http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
-namespace Piwik\Tests\Integration;
+namespace Piwik\Tests\System;
 
 use Piwik\Tests\SystemTestCase;
 use Piwik\Tests\Fixtures\OneVisitSeveralPageViews;
diff --git a/tests/PHPUnit/Integration/ManyVisitorsOneWebsiteTest.php b/tests/PHPUnit/System/ManyVisitorsOneWebsiteTest.php
index fdc23e38c0..ec1a0f4f16 100755
--- a/tests/PHPUnit/Integration/ManyVisitorsOneWebsiteTest.php
+++ b/tests/PHPUnit/System/ManyVisitorsOneWebsiteTest.php
@@ -5,7 +5,7 @@
  * @link    http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
-namespace Piwik\Tests\Integration;
+namespace Piwik\Tests\System;
 
 require_once PIWIK_INCLUDE_PATH . '/tests/PHPUnit/MockLocationProvider.php';
 
diff --git a/tests/PHPUnit/Integration/MultipleSitesArchivingTest.php b/tests/PHPUnit/System/MultipleSitesArchivingTest.php
index d347dbf0f4..6d447abb2f 100644
--- a/tests/PHPUnit/Integration/MultipleSitesArchivingTest.php
+++ b/tests/PHPUnit/System/MultipleSitesArchivingTest.php
@@ -5,7 +5,7 @@
  * @link http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
-namespace Piwik\Tests\Integration;
+namespace Piwik\Tests\System;
 
 use Piwik\Config;
 use Piwik\Piwik;
diff --git a/tests/PHPUnit/Integration/NoVisitTest.php b/tests/PHPUnit/System/NoVisitTest.php
index 14c5f57a45..4a81736073 100755
--- a/tests/PHPUnit/Integration/NoVisitTest.php
+++ b/tests/PHPUnit/System/NoVisitTest.php
@@ -5,7 +5,7 @@
  * @link    http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
-namespace Piwik\Tests\Integration;
+namespace Piwik\Tests\System;
 
 use Piwik\Tests\SystemTestCase;
 use Piwik\Tests\Fixtures\InvalidVisits;
diff --git a/tests/PHPUnit/Integration/NonUnicodeTest.php b/tests/PHPUnit/System/NonUnicodeTest.php
index e7521e0ef0..370c4acf16 100755
--- a/tests/PHPUnit/Integration/NonUnicodeTest.php
+++ b/tests/PHPUnit/System/NonUnicodeTest.php
@@ -5,7 +5,7 @@
  * @link    http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
-namespace Piwik\Tests\Integration;
+namespace Piwik\Tests\System;
 
 use Piwik\Tests\SystemTestCase;
 use Piwik\Tests\Fixtures\SomeVisitsWithNonUnicodePageTitles;
diff --git a/tests/PHPUnit/Integration/OneVisitorLongUrlsTruncatedTest.php b/tests/PHPUnit/System/OneVisitorLongUrlsTruncatedTest.php
index ad3a7df82b..83a17e0f11 100644
--- a/tests/PHPUnit/Integration/OneVisitorLongUrlsTruncatedTest.php
+++ b/tests/PHPUnit/System/OneVisitorLongUrlsTruncatedTest.php
@@ -5,7 +5,7 @@
  * @link    http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
-namespace Piwik\Tests\Integration;
+namespace Piwik\Tests\System;
 
 use Piwik\Tests\SystemTestCase;
 use Piwik\Tests\Fixtures\SomeVisitsWithLongUrls;
diff --git a/tests/PHPUnit/Integration/OneVisitorNoKeywordSpecifiedTest.php b/tests/PHPUnit/System/OneVisitorNoKeywordSpecifiedTest.php
index 404d0b7a4d..4bd244f663 100755
--- a/tests/PHPUnit/Integration/OneVisitorNoKeywordSpecifiedTest.php
+++ b/tests/PHPUnit/System/OneVisitorNoKeywordSpecifiedTest.php
@@ -5,7 +5,7 @@
  * @link    http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
-namespace Piwik\Tests\Integration;
+namespace Piwik\Tests\System;
 
 use Piwik\Tests\SystemTestCase;
 use Piwik\Tests\Fixtures\TwoVisitsNoKeywordWithBot;
diff --git a/tests/PHPUnit/Integration/OneVisitorOneWebsiteSeveralDaysDateRangeArchivingTestsTest.php b/tests/PHPUnit/System/OneVisitorOneWebsiteSeveralDaysDateRangeArchivingTestsTest.php
index 531e5b9c35..9441f39318 100755
--- a/tests/PHPUnit/Integration/OneVisitorOneWebsiteSeveralDaysDateRangeArchivingTestsTest.php
+++ b/tests/PHPUnit/System/OneVisitorOneWebsiteSeveralDaysDateRangeArchivingTestsTest.php
@@ -5,7 +5,7 @@
  * @link    http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
-namespace Piwik\Tests\Integration;
+namespace Piwik\Tests\System;
 
 use Piwik\Common;
 use Piwik\Db;
diff --git a/tests/PHPUnit/Integration/OneVisitorOneWebsiteSeveralDaysDateRangeTest.php b/tests/PHPUnit/System/OneVisitorOneWebsiteSeveralDaysDateRangeTest.php
index f2b68d88e9..e744859b70 100755
--- a/tests/PHPUnit/Integration/OneVisitorOneWebsiteSeveralDaysDateRangeTest.php
+++ b/tests/PHPUnit/System/OneVisitorOneWebsiteSeveralDaysDateRangeTest.php
@@ -5,7 +5,7 @@
  * @link    http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
-namespace Piwik\Tests\Integration;
+namespace Piwik\Tests\System;
 
 use Piwik\Tests\SystemTestCase;
 use Piwik\Tests\Fixtures\VisitsOverSeveralDays;
diff --git a/tests/PHPUnit/Integration/OneVisitorSeveralDaysImportedInRandomOrderTest.php b/tests/PHPUnit/System/OneVisitorSeveralDaysImportedInRandomOrderTest.php
index 73fccc5de6..9ad8791c4c 100644
--- a/tests/PHPUnit/Integration/OneVisitorSeveralDaysImportedInRandomOrderTest.php
+++ b/tests/PHPUnit/System/OneVisitorSeveralDaysImportedInRandomOrderTest.php
@@ -5,7 +5,7 @@
  * @link    http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
-namespace Piwik\Tests\Integration;
+namespace Piwik\Tests\System;
 
 use Piwik\Tests\SystemTestCase;
 use Piwik\Tests\Fixtures\VisitOverSeveralDaysImportedLogs;
diff --git a/tests/PHPUnit/Integration/OneVisitorTwoVisitsTest.php b/tests/PHPUnit/System/OneVisitorTwoVisitsTest.php
index 6e5d1b3c96..6c1b3d69ca 100755
--- a/tests/PHPUnit/Integration/OneVisitorTwoVisitsTest.php
+++ b/tests/PHPUnit/System/OneVisitorTwoVisitsTest.php
@@ -5,7 +5,7 @@
  * @link    http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
-namespace Piwik\Tests\Integration;
+namespace Piwik\Tests\System;
 
 use Piwik\API\Proxy;
 use Piwik\Archive;
diff --git a/tests/PHPUnit/Integration/OneVisitorTwoVisitsWithCookieSupportTest.php b/tests/PHPUnit/System/OneVisitorTwoVisitsWithCookieSupportTest.php
index 9721a78670..856e10efad 100755
--- a/tests/PHPUnit/Integration/OneVisitorTwoVisitsWithCookieSupportTest.php
+++ b/tests/PHPUnit/System/OneVisitorTwoVisitsWithCookieSupportTest.php
@@ -5,7 +5,7 @@
  * @link    http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
-namespace Piwik\Tests\Integration;
+namespace Piwik\Tests\System;
 
 use Piwik\Tests\SystemTestCase;
 use Piwik\Tests\Fixtures\OneVisitorTwoVisits;
diff --git a/tests/PHPUnit/Integration/PeriodIsRangeDateIsLastNMetadataAndNormalAPITest.php b/tests/PHPUnit/System/PeriodIsRangeDateIsLastNMetadataAndNormalAPITest.php
index b07013ae9d..52739d310b 100755
--- a/tests/PHPUnit/Integration/PeriodIsRangeDateIsLastNMetadataAndNormalAPITest.php
+++ b/tests/PHPUnit/System/PeriodIsRangeDateIsLastNMetadataAndNormalAPITest.php
@@ -5,7 +5,7 @@
  * @link    http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
-namespace Piwik\Tests\Integration;
+namespace Piwik\Tests\System;
 
 use Piwik\Date;
 use Piwik\Tests\SystemTestCase;
diff --git a/tests/PHPUnit/Integration/PivotByQueryParamTest.php b/tests/PHPUnit/System/PivotByQueryParamTest.php
index ec320d2705..358b9b03c0 100644
--- a/tests/PHPUnit/Integration/PivotByQueryParamTest.php
+++ b/tests/PHPUnit/System/PivotByQueryParamTest.php
@@ -5,7 +5,7 @@
  * @link    http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
-namespace Piwik\Tests\Integration;
+namespace Piwik\Tests\System;
 
 use Piwik\Config;
 use Piwik\Date;
diff --git a/tests/PHPUnit/Integration/PrivacyManagerTest.php b/tests/PHPUnit/System/PrivacyManagerTest.php
index 55cc3733a0..7ba93e7cd2 100644
--- a/tests/PHPUnit/Integration/PrivacyManagerTest.php
+++ b/tests/PHPUnit/System/PrivacyManagerTest.php
@@ -5,7 +5,7 @@
  * @link http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
-namespace Piwik\Tests\Integration;
+namespace Piwik\Tests\System;
 
 use Piwik\Archive;
 use Piwik\ArchiveProcessor\Rules;
diff --git a/tests/PHPUnit/Integration/PurgeDataTest.php b/tests/PHPUnit/System/PurgeDataTest.php
index 816732a2a7..30bf2244ff 100755
--- a/tests/PHPUnit/Integration/PurgeDataTest.php
+++ b/tests/PHPUnit/System/PurgeDataTest.php
@@ -5,7 +5,7 @@
  * @link    http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
-namespace Piwik\Tests\Integration;
+namespace Piwik\Tests\System;
 
 require_once PIWIK_INCLUDE_PATH . '/tests/PHPUnit/MockLocationProvider.php';
 
diff --git a/tests/PHPUnit/Integration/RowEvolutionTest.php b/tests/PHPUnit/System/RowEvolutionTest.php
index 141aa1154c..9eb55e282b 100755
--- a/tests/PHPUnit/Integration/RowEvolutionTest.php
+++ b/tests/PHPUnit/System/RowEvolutionTest.php
@@ -5,7 +5,7 @@
  * @link    http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
-namespace Piwik\Tests\Integration;
+namespace Piwik\Tests\System;
 
 use Piwik\Tests\SystemTestCase;
 use Piwik\Tests\Fixtures\TwoSitesManyVisitsOverSeveralDaysWithSearchEngineReferrers;
diff --git a/tests/PHPUnit/Integration/SiteSearchTest.php b/tests/PHPUnit/System/SiteSearchTest.php
index 4637181cca..bb5b5c3bb0 100755
--- a/tests/PHPUnit/Integration/SiteSearchTest.php
+++ b/tests/PHPUnit/System/SiteSearchTest.php
@@ -5,7 +5,7 @@
  * @link    http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
-namespace Piwik\Tests\Integration;
+namespace Piwik\Tests\System;
 
 use Piwik\Tests\SystemTestCase;
 use Piwik\Tests\Fixtures\ThreeSitesWithManyVisitsWithSiteSearch;
diff --git a/tests/PHPUnit/Integration/TimezonesTest.php b/tests/PHPUnit/System/TimezonesTest.php
index 1dc4e1b19c..d9b11c9ae2 100644
--- a/tests/PHPUnit/Integration/TimezonesTest.php
+++ b/tests/PHPUnit/System/TimezonesTest.php
@@ -5,7 +5,7 @@
  * @link http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
-namespace Piwik\Tests\Integration;
+namespace Piwik\Tests\System;
 
 use Piwik\Date;
 use Piwik\Tests\SystemTestCase;
diff --git a/tests/PHPUnit/Integration/TrackCustomVariablesAndCampaignsForceUsingVisitIdNotHeuristicsTest.php b/tests/PHPUnit/System/TrackCustomVariablesAndCampaignsForceUsingVisitIdNotHeuristicsTest.php
index 768be87a1e..efb4cf4554 100755
--- a/tests/PHPUnit/Integration/TrackCustomVariablesAndCampaignsForceUsingVisitIdNotHeuristicsTest.php
+++ b/tests/PHPUnit/System/TrackCustomVariablesAndCampaignsForceUsingVisitIdNotHeuristicsTest.php
@@ -5,7 +5,7 @@
  * @link    http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
-namespace Piwik\Tests\Integration;
+namespace Piwik\Tests\System;
 
 use Piwik\Tests\SystemTestCase;
 use Piwik\Tests\Fixtures\SomeVisitsCustomVariablesCampaignsNotHeuristics;
diff --git a/tests/PHPUnit/Integration/TrackGoalsAllowMultipleConversionsPerVisitTest.php b/tests/PHPUnit/System/TrackGoalsAllowMultipleConversionsPerVisitTest.php
index b13cebde75..af2469670b 100755
--- a/tests/PHPUnit/Integration/TrackGoalsAllowMultipleConversionsPerVisitTest.php
+++ b/tests/PHPUnit/System/TrackGoalsAllowMultipleConversionsPerVisitTest.php
@@ -5,7 +5,7 @@
  * @link    http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
-namespace Piwik\Tests\Integration;
+namespace Piwik\Tests\System;
 
 use Piwik\Plugins\Goals\API;
 use Piwik\Tests\SystemTestCase;
diff --git a/tests/PHPUnit/Integration/TrackerWindowLookBackTest.php b/tests/PHPUnit/System/TrackerWindowLookBackTest.php
index 97a4ef9e6d..433e6baf43 100644
--- a/tests/PHPUnit/Integration/TrackerWindowLookBackTest.php
+++ b/tests/PHPUnit/System/TrackerWindowLookBackTest.php
@@ -5,7 +5,7 @@
  * @link    http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
-namespace Piwik\Tests\Integration;
+namespace Piwik\Tests\System;
 
 use Piwik\Tests\SystemTestCase;
 use Piwik\Tests\Fixtures\VisitsOverSeveralDays;
diff --git a/tests/PHPUnit/Integration/TransitionsTest.php b/tests/PHPUnit/System/TransitionsTest.php
index c5ece99ab3..e3ca1c4863 100644
--- a/tests/PHPUnit/Integration/TransitionsTest.php
+++ b/tests/PHPUnit/System/TransitionsTest.php
@@ -5,7 +5,7 @@
  * @link    http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
-namespace Piwik\Tests\Integration;
+namespace Piwik\Tests\System;
 
 use Piwik\Tests\SystemTestCase;
 use Piwik\Tests\Fixtures\SomeVisitsManyPageviewsWithTransitions;
diff --git a/tests/PHPUnit/Integration/TwoVisitorsTwoWebsitesDifferentDaysArchivingDisabledTest.php b/tests/PHPUnit/System/TwoVisitorsTwoWebsitesDifferentDaysArchivingDisabledTest.php
index a43562a337..3eb2d2456c 100755
--- a/tests/PHPUnit/Integration/TwoVisitorsTwoWebsitesDifferentDaysArchivingDisabledTest.php
+++ b/tests/PHPUnit/System/TwoVisitorsTwoWebsitesDifferentDaysArchivingDisabledTest.php
@@ -5,7 +5,7 @@
  * @link    http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
-namespace Piwik\Tests\Integration;
+namespace Piwik\Tests\System;
 
 use Piwik\Tests\SystemTestCase;
 use Piwik\Tests\Fixtures\TwoSitesTwoVisitorsDifferentDays;
diff --git a/tests/PHPUnit/Integration/TwoVisitorsTwoWebsitesDifferentDaysConversionsTest.php b/tests/PHPUnit/System/TwoVisitorsTwoWebsitesDifferentDaysConversionsTest.php
index 7fbc8c03bc..243e9761c5 100755
--- a/tests/PHPUnit/Integration/TwoVisitorsTwoWebsitesDifferentDaysConversionsTest.php
+++ b/tests/PHPUnit/System/TwoVisitorsTwoWebsitesDifferentDaysConversionsTest.php
@@ -5,7 +5,7 @@
  * @link    http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
-namespace Piwik\Tests\Integration;
+namespace Piwik\Tests\System;
 
 use Piwik\Plugins\Goals\Archiver;
 use Piwik\Tests\SystemTestCase;
diff --git a/tests/PHPUnit/Integration/TwoVisitorsTwoWebsitesDifferentDaysTest.php b/tests/PHPUnit/System/TwoVisitorsTwoWebsitesDifferentDaysTest.php
index 35c1069787..668924b4d8 100755
--- a/tests/PHPUnit/Integration/TwoVisitorsTwoWebsitesDifferentDaysTest.php
+++ b/tests/PHPUnit/System/TwoVisitorsTwoWebsitesDifferentDaysTest.php
@@ -5,7 +5,7 @@
  * @link    http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
-namespace Piwik\Tests\Integration;
+namespace Piwik\Tests\System;
 
 use Piwik\Tests\SystemTestCase;
 use Piwik\Tests\Fixtures\TwoSitesTwoVisitorsDifferentDays;
diff --git a/tests/PHPUnit/Integration/TwoVisitsWithCustomVariablesSegmentContainsTest.php b/tests/PHPUnit/System/TwoVisitsWithCustomVariablesSegmentContainsTest.php
index e8373c48e7..a8bbdcc092 100755
--- a/tests/PHPUnit/Integration/TwoVisitsWithCustomVariablesSegmentContainsTest.php
+++ b/tests/PHPUnit/System/TwoVisitsWithCustomVariablesSegmentContainsTest.php
@@ -5,7 +5,7 @@
  * @link    http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
-namespace Piwik\Tests\Integration;
+namespace Piwik\Tests\System;
 
 use Piwik\Tests\SystemTestCase;
 use Piwik\Tests\Fixtures\TwoVisitsWithCustomVariables;
diff --git a/tests/PHPUnit/Integration/TwoVisitsWithCustomVariablesSegmentMatchALLNoGoalDataTest.php b/tests/PHPUnit/System/TwoVisitsWithCustomVariablesSegmentMatchALLNoGoalDataTest.php
index 3856416d15..1a16bc627f 100755
--- a/tests/PHPUnit/Integration/TwoVisitsWithCustomVariablesSegmentMatchALLNoGoalDataTest.php
+++ b/tests/PHPUnit/System/TwoVisitsWithCustomVariablesSegmentMatchALLNoGoalDataTest.php
@@ -5,7 +5,7 @@
  * @link    http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
-namespace Piwik\Tests\Integration;
+namespace Piwik\Tests\System;
 
 use Piwik\Tests\SystemTestCase;
 use Piwik\Tests\Fixtures\TwoVisitsWithCustomVariables;
diff --git a/tests/PHPUnit/Integration/TwoVisitsWithCustomVariablesSegmentMatchNONETest.php b/tests/PHPUnit/System/TwoVisitsWithCustomVariablesSegmentMatchNONETest.php
index dd0ce7cf57..27fdbd8167 100755
--- a/tests/PHPUnit/Integration/TwoVisitsWithCustomVariablesSegmentMatchNONETest.php
+++ b/tests/PHPUnit/System/TwoVisitsWithCustomVariablesSegmentMatchNONETest.php
@@ -5,7 +5,7 @@
  * @link    http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
-namespace Piwik\Tests\Integration;
+namespace Piwik\Tests\System;
 
 use Piwik\Plugins\API\API;
 use Piwik\Tests\SystemTestCase;
diff --git a/tests/PHPUnit/Integration/TwoVisitsWithCustomVariablesSegmentMatchVisitorTypeTest.php b/tests/PHPUnit/System/TwoVisitsWithCustomVariablesSegmentMatchVisitorTypeTest.php
index 8502bb3795..5f1db60602 100755
--- a/tests/PHPUnit/Integration/TwoVisitsWithCustomVariablesSegmentMatchVisitorTypeTest.php
+++ b/tests/PHPUnit/System/TwoVisitsWithCustomVariablesSegmentMatchVisitorTypeTest.php
@@ -5,7 +5,7 @@
  * @link    http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
-namespace Piwik\Tests\Integration;
+namespace Piwik\Tests\System;
 
 use Piwik\Common;
 use Piwik\Db;
diff --git a/tests/PHPUnit/Integration/TwoVisitsWithCustomVariablesTest.php b/tests/PHPUnit/System/TwoVisitsWithCustomVariablesTest.php
index c41ac7918a..a7b65b18fb 100755
--- a/tests/PHPUnit/Integration/TwoVisitsWithCustomVariablesTest.php
+++ b/tests/PHPUnit/System/TwoVisitsWithCustomVariablesTest.php
@@ -5,7 +5,7 @@
  * @link http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
-namespace Piwik\Tests\Integration;
+namespace Piwik\Tests\System;
 
 use Piwik\Tests\SystemTestCase;
 use Piwik\Tests\Fixtures\TwoVisitsWithCustomVariables;
diff --git a/tests/PHPUnit/Integration/UrlNormalizationTest.php b/tests/PHPUnit/System/UrlNormalizationTest.php
index d57ad9c2a5..07011200ee 100644
--- a/tests/PHPUnit/Integration/UrlNormalizationTest.php
+++ b/tests/PHPUnit/System/UrlNormalizationTest.php
@@ -5,7 +5,7 @@
  * @link http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
-namespace Piwik\Tests\Integration;
+namespace Piwik\Tests\System;
 
 use Piwik\Common;
 use Piwik\Db;
diff --git a/tests/PHPUnit/Integration/UserIdAndVisitorIdTest.php b/tests/PHPUnit/System/UserIdAndVisitorIdTest.php
index 1bfa1d67df..ca5b2475a9 100644
--- a/tests/PHPUnit/Integration/UserIdAndVisitorIdTest.php
+++ b/tests/PHPUnit/System/UserIdAndVisitorIdTest.php
@@ -5,7 +5,7 @@
  * @link    http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
-namespace Piwik\Tests\Integration;
+namespace Piwik\Tests\System;
 
 use Piwik\API\Proxy;
 use Piwik\Tests\SystemTestCase;
diff --git a/tests/PHPUnit/Integration/VisitsInPastInvalidateOldReportsTest.php b/tests/PHPUnit/System/VisitsInPastInvalidateOldReportsTest.php
index 73af6c15c5..35f9b8ab57 100644
--- a/tests/PHPUnit/Integration/VisitsInPastInvalidateOldReportsTest.php
+++ b/tests/PHPUnit/System/VisitsInPastInvalidateOldReportsTest.php
@@ -5,7 +5,7 @@
  * @link    http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
-namespace Piwik\Tests\Integration;
+namespace Piwik\Tests\System;
 
 use Piwik\API\Request;
 use Piwik\Tests\SystemTestCase;
diff --git a/tests/PHPUnit/Integration/expected/.gitkeep b/tests/PHPUnit/System/expected/.gitkeep
index e69de29bb2..e69de29bb2 100644
--- a/tests/PHPUnit/Integration/expected/.gitkeep
+++ b/tests/PHPUnit/System/expected/.gitkeep
diff --git a/tests/PHPUnit/Integration/expected/test_ArchiveCronTest_archive_php_cron_output.txt b/tests/PHPUnit/System/expected/test_ArchiveCronTest_archive_php_cron_output.txt
index afc6e909b1..afc6e909b1 100644
--- a/tests/PHPUnit/Integration/expected/test_ArchiveCronTest_archive_php_cron_output.txt
+++ b/tests/PHPUnit/System/expected/test_ArchiveCronTest_archive_php_cron_output.txt
diff --git a/tests/PHPUnit/Integration/expected/test_ArchiveCronTest_noOptions__VisitsSummary.get_day.xml b/tests/PHPUnit/System/expected/test_ArchiveCronTest_noOptions__VisitsSummary.get_day.xml
index 32434a44f6..32434a44f6 100644
--- a/tests/PHPUnit/Integration/expected/test_ArchiveCronTest_noOptions__VisitsSummary.get_day.xml
+++ b/tests/PHPUnit/System/expected/test_ArchiveCronTest_noOptions__VisitsSummary.get_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ArchiveCronTest_noOptions__VisitsSummary.get_month.xml b/tests/PHPUnit/System/expected/test_ArchiveCronTest_noOptions__VisitsSummary.get_month.xml
index 527a5d7177..527a5d7177 100644
--- a/tests/PHPUnit/Integration/expected/test_ArchiveCronTest_noOptions__VisitsSummary.get_month.xml
+++ b/tests/PHPUnit/System/expected/test_ArchiveCronTest_noOptions__VisitsSummary.get_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ArchiveCronTest_noOptions__VisitsSummary.get_week.xml b/tests/PHPUnit/System/expected/test_ArchiveCronTest_noOptions__VisitsSummary.get_week.xml
index 1c7f2179e5..1c7f2179e5 100644
--- a/tests/PHPUnit/Integration/expected/test_ArchiveCronTest_noOptions__VisitsSummary.get_week.xml
+++ b/tests/PHPUnit/System/expected/test_ArchiveCronTest_noOptions__VisitsSummary.get_week.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ArchiveCronTest_noOptions__VisitsSummary.get_year.xml b/tests/PHPUnit/System/expected/test_ArchiveCronTest_noOptions__VisitsSummary.get_year.xml
index 46ff0006a8..46ff0006a8 100644
--- a/tests/PHPUnit/Integration/expected/test_ArchiveCronTest_noOptions__VisitsSummary.get_year.xml
+++ b/tests/PHPUnit/System/expected/test_ArchiveCronTest_noOptions__VisitsSummary.get_year.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ArchiveCronTest_nonPreArchivedSegment_noOptions__VisitsSummary.get_day.xml b/tests/PHPUnit/System/expected/test_ArchiveCronTest_nonPreArchivedSegment_noOptions__VisitsSummary.get_day.xml
index 1c7f2179e5..1c7f2179e5 100644
--- a/tests/PHPUnit/Integration/expected/test_ArchiveCronTest_nonPreArchivedSegment_noOptions__VisitsSummary.get_day.xml
+++ b/tests/PHPUnit/System/expected/test_ArchiveCronTest_nonPreArchivedSegment_noOptions__VisitsSummary.get_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ArchiveCronTest_nonPreArchivedSegment_noOptions__VisitsSummary.get_month.xml b/tests/PHPUnit/System/expected/test_ArchiveCronTest_nonPreArchivedSegment_noOptions__VisitsSummary.get_month.xml
index 1c7f2179e5..1c7f2179e5 100644
--- a/tests/PHPUnit/Integration/expected/test_ArchiveCronTest_nonPreArchivedSegment_noOptions__VisitsSummary.get_month.xml
+++ b/tests/PHPUnit/System/expected/test_ArchiveCronTest_nonPreArchivedSegment_noOptions__VisitsSummary.get_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ArchiveCronTest_nonPreArchivedSegment_noOptions__VisitsSummary.get_week.xml b/tests/PHPUnit/System/expected/test_ArchiveCronTest_nonPreArchivedSegment_noOptions__VisitsSummary.get_week.xml
index 1c7f2179e5..1c7f2179e5 100644
--- a/tests/PHPUnit/Integration/expected/test_ArchiveCronTest_nonPreArchivedSegment_noOptions__VisitsSummary.get_week.xml
+++ b/tests/PHPUnit/System/expected/test_ArchiveCronTest_nonPreArchivedSegment_noOptions__VisitsSummary.get_week.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ArchiveCronTest_nonPreArchivedSegment_noOptions__VisitsSummary.get_year.xml b/tests/PHPUnit/System/expected/test_ArchiveCronTest_nonPreArchivedSegment_noOptions__VisitsSummary.get_year.xml
index 1c7f2179e5..1c7f2179e5 100644
--- a/tests/PHPUnit/Integration/expected/test_ArchiveCronTest_nonPreArchivedSegment_noOptions__VisitsSummary.get_year.xml
+++ b/tests/PHPUnit/System/expected/test_ArchiveCronTest_nonPreArchivedSegment_noOptions__VisitsSummary.get_year.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__Live.getLastVisitsDetails_day.xml
index f76bc553cd..f76bc553cd 100644
--- a/tests/PHPUnit/Integration/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__Live.getLastVisitsDetails_day.xml
+++ b/tests/PHPUnit/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__Live.getLastVisitsDetails_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__Live.getLastVisitsDetails_year.xml b/tests/PHPUnit/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__Live.getLastVisitsDetails_year.xml
index 17fe7bfe25..17fe7bfe25 100644
--- a/tests/PHPUnit/Integration/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__Live.getLastVisitsDetails_year.xml
+++ b/tests/PHPUnit/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__Live.getLastVisitsDetails_year.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__VisitsSummary.get_day.xml b/tests/PHPUnit/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__VisitsSummary.get_day.xml
index 7a7644b476..7a7644b476 100644
--- a/tests/PHPUnit/Integration/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__VisitsSummary.get_day.xml
+++ b/tests/PHPUnit/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__VisitsSummary.get_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__VisitsSummary.get_year.xml b/tests/PHPUnit/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__VisitsSummary.get_year.xml
index d59560e4a4..d59560e4a4 100644
--- a/tests/PHPUnit/Integration/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__VisitsSummary.get_year.xml
+++ b/tests/PHPUnit/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__VisitsSummary.get_year.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ArchiveCronTest_segmentNoAutoArchive_noOptions__VisitsSummary.get_day.xml b/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentNoAutoArchive_noOptions__VisitsSummary.get_day.xml
index 1c7f2179e5..1c7f2179e5 100644
--- a/tests/PHPUnit/Integration/expected/test_ArchiveCronTest_segmentNoAutoArchive_noOptions__VisitsSummary.get_day.xml
+++ b/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentNoAutoArchive_noOptions__VisitsSummary.get_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ArchiveCronTest_segmentNoAutoArchive_noOptions__VisitsSummary.get_month.xml b/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentNoAutoArchive_noOptions__VisitsSummary.get_month.xml
index 1c7f2179e5..1c7f2179e5 100644
--- a/tests/PHPUnit/Integration/expected/test_ArchiveCronTest_segmentNoAutoArchive_noOptions__VisitsSummary.get_month.xml
+++ b/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentNoAutoArchive_noOptions__VisitsSummary.get_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ArchiveCronTest_segmentNoAutoArchive_noOptions__VisitsSummary.get_week.xml b/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentNoAutoArchive_noOptions__VisitsSummary.get_week.xml
index 1c7f2179e5..1c7f2179e5 100644
--- a/tests/PHPUnit/Integration/expected/test_ArchiveCronTest_segmentNoAutoArchive_noOptions__VisitsSummary.get_week.xml
+++ b/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentNoAutoArchive_noOptions__VisitsSummary.get_week.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ArchiveCronTest_segmentNoAutoArchive_noOptions__VisitsSummary.get_year.xml b/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentNoAutoArchive_noOptions__VisitsSummary.get_year.xml
index 1c7f2179e5..1c7f2179e5 100644
--- a/tests/PHPUnit/Integration/expected/test_ArchiveCronTest_segmentNoAutoArchive_noOptions__VisitsSummary.get_year.xml
+++ b/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentNoAutoArchive_noOptions__VisitsSummary.get_year.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ArchiveCronTest_segmentOnlyOneSite_noOptions__VisitsSummary.get_day.xml b/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentOnlyOneSite_noOptions__VisitsSummary.get_day.xml
index d7dfbaef5a..d7dfbaef5a 100644
--- a/tests/PHPUnit/Integration/expected/test_ArchiveCronTest_segmentOnlyOneSite_noOptions__VisitsSummary.get_day.xml
+++ b/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentOnlyOneSite_noOptions__VisitsSummary.get_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ArchiveCronTest_segmentOnlyOneSite_noOptions__VisitsSummary.get_month.xml b/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentOnlyOneSite_noOptions__VisitsSummary.get_month.xml
index e949f7b041..e949f7b041 100644
--- a/tests/PHPUnit/Integration/expected/test_ArchiveCronTest_segmentOnlyOneSite_noOptions__VisitsSummary.get_month.xml
+++ b/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentOnlyOneSite_noOptions__VisitsSummary.get_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ArchiveCronTest_segmentOnlyOneSite_noOptions__VisitsSummary.get_week.xml b/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentOnlyOneSite_noOptions__VisitsSummary.get_week.xml
index 4e3f9c3a15..4e3f9c3a15 100644
--- a/tests/PHPUnit/Integration/expected/test_ArchiveCronTest_segmentOnlyOneSite_noOptions__VisitsSummary.get_week.xml
+++ b/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentOnlyOneSite_noOptions__VisitsSummary.get_week.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ArchiveCronTest_segmentOnlyOneSite_noOptions__VisitsSummary.get_year.xml b/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentOnlyOneSite_noOptions__VisitsSummary.get_year.xml
index 5596008ffe..5596008ffe 100644
--- a/tests/PHPUnit/Integration/expected/test_ArchiveCronTest_segmentOnlyOneSite_noOptions__VisitsSummary.get_year.xml
+++ b/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentOnlyOneSite_noOptions__VisitsSummary.get_year.xml
diff --git a/tests/PHPUnit/Integration/expected/test_Archive_InvalidationWebsite1_NewDataShouldAppear__Actions.getPageUrls_month.xml b/tests/PHPUnit/System/expected/test_Archive_InvalidationWebsite1_NewDataShouldAppear__Actions.getPageUrls_month.xml
index 823b29f7a5..823b29f7a5 100644
--- a/tests/PHPUnit/Integration/expected/test_Archive_InvalidationWebsite1_NewDataShouldAppear__Actions.getPageUrls_month.xml
+++ b/tests/PHPUnit/System/expected/test_Archive_InvalidationWebsite1_NewDataShouldAppear__Actions.getPageUrls_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_Archive_InvalidationWebsite1_NewDataShouldAppear__VisitsSummary.get_month.xml b/tests/PHPUnit/System/expected/test_Archive_InvalidationWebsite1_NewDataShouldAppear__VisitsSummary.get_month.xml
index d183cb915b..d183cb915b 100644
--- a/tests/PHPUnit/Integration/expected/test_Archive_InvalidationWebsite1_NewDataShouldAppear__VisitsSummary.get_month.xml
+++ b/tests/PHPUnit/System/expected/test_Archive_InvalidationWebsite1_NewDataShouldAppear__VisitsSummary.get_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_Archive_InvalidationWebsite1_NewDataShouldNotAppear__Actions.getPageUrls_month.xml b/tests/PHPUnit/System/expected/test_Archive_InvalidationWebsite1_NewDataShouldNotAppear__Actions.getPageUrls_month.xml
index d4056f1f70..d4056f1f70 100644
--- a/tests/PHPUnit/Integration/expected/test_Archive_InvalidationWebsite1_NewDataShouldNotAppear__Actions.getPageUrls_month.xml
+++ b/tests/PHPUnit/System/expected/test_Archive_InvalidationWebsite1_NewDataShouldNotAppear__Actions.getPageUrls_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_Archive_InvalidationWebsite1_NewDataShouldNotAppear__VisitsSummary.get_month.xml b/tests/PHPUnit/System/expected/test_Archive_InvalidationWebsite1_NewDataShouldNotAppear__VisitsSummary.get_month.xml
index 5d2578d36f..5d2578d36f 100644
--- a/tests/PHPUnit/Integration/expected/test_Archive_InvalidationWebsite1_NewDataShouldNotAppear__VisitsSummary.get_month.xml
+++ b/tests/PHPUnit/System/expected/test_Archive_InvalidationWebsite1_NewDataShouldNotAppear__VisitsSummary.get_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_Archive_InvalidationWebsite2NewDataShouldNotAppear_BecauseWeekWasNotInvalidated__Actions.getPageUrls_week.xml b/tests/PHPUnit/System/expected/test_Archive_InvalidationWebsite2NewDataShouldNotAppear_BecauseWeekWasNotInvalidated__Actions.getPageUrls_week.xml
index bcd758b7c5..bcd758b7c5 100644
--- a/tests/PHPUnit/Integration/expected/test_Archive_InvalidationWebsite2NewDataShouldNotAppear_BecauseWeekWasNotInvalidated__Actions.getPageUrls_week.xml
+++ b/tests/PHPUnit/System/expected/test_Archive_InvalidationWebsite2NewDataShouldNotAppear_BecauseWeekWasNotInvalidated__Actions.getPageUrls_week.xml
diff --git a/tests/PHPUnit/Integration/expected/test_Archive_InvalidationWebsite2NewDataShouldNotAppear_BecauseWeekWasNotInvalidated__VisitsSummary.get_week.xml b/tests/PHPUnit/System/expected/test_Archive_InvalidationWebsite2NewDataShouldNotAppear_BecauseWeekWasNotInvalidated__VisitsSummary.get_week.xml
index c494788d70..c494788d70 100644
--- a/tests/PHPUnit/Integration/expected/test_Archive_InvalidationWebsite2NewDataShouldNotAppear_BecauseWeekWasNotInvalidated__VisitsSummary.get_week.xml
+++ b/tests/PHPUnit/System/expected/test_Archive_InvalidationWebsite2NewDataShouldNotAppear_BecauseWeekWasNotInvalidated__VisitsSummary.get_week.xml
diff --git a/tests/PHPUnit/Integration/expected/test_Archive_InvalidationWebsite2_NewDataShouldAppear__Actions.getPageUrls_month.xml b/tests/PHPUnit/System/expected/test_Archive_InvalidationWebsite2_NewDataShouldAppear__Actions.getPageUrls_month.xml
index ad5d8b5c44..ad5d8b5c44 100644
--- a/tests/PHPUnit/Integration/expected/test_Archive_InvalidationWebsite2_NewDataShouldAppear__Actions.getPageUrls_month.xml
+++ b/tests/PHPUnit/System/expected/test_Archive_InvalidationWebsite2_NewDataShouldAppear__Actions.getPageUrls_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_Archive_InvalidationWebsite2_NewDataShouldAppear__VisitsSummary.get_month.xml b/tests/PHPUnit/System/expected/test_Archive_InvalidationWebsite2_NewDataShouldAppear__VisitsSummary.get_month.xml
index 1e897c6120..1e897c6120 100644
--- a/tests/PHPUnit/Integration/expected/test_Archive_InvalidationWebsite2_NewDataShouldAppear__VisitsSummary.get_month.xml
+++ b/tests/PHPUnit/System/expected/test_Archive_InvalidationWebsite2_NewDataShouldAppear__VisitsSummary.get_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_Archive_InvalidationWebsite2_NewDataShouldNotAppear_BecauseWeekWasNotInvalidated__Actions.getPageUrls_week.xml b/tests/PHPUnit/System/expected/test_Archive_InvalidationWebsite2_NewDataShouldNotAppear_BecauseWeekWasNotInvalidated__Actions.getPageUrls_week.xml
index 3f580dfcf7..3f580dfcf7 100644
--- a/tests/PHPUnit/Integration/expected/test_Archive_InvalidationWebsite2_NewDataShouldNotAppear_BecauseWeekWasNotInvalidated__Actions.getPageUrls_week.xml
+++ b/tests/PHPUnit/System/expected/test_Archive_InvalidationWebsite2_NewDataShouldNotAppear_BecauseWeekWasNotInvalidated__Actions.getPageUrls_week.xml
diff --git a/tests/PHPUnit/Integration/expected/test_Archive_InvalidationWebsite2_NewDataShouldNotAppear_BecauseWeekWasNotInvalidated__VisitsSummary.get_week.xml b/tests/PHPUnit/System/expected/test_Archive_InvalidationWebsite2_NewDataShouldNotAppear_BecauseWeekWasNotInvalidated__VisitsSummary.get_week.xml
index 75d267cfc4..75d267cfc4 100644
--- a/tests/PHPUnit/Integration/expected/test_Archive_InvalidationWebsite2_NewDataShouldNotAppear_BecauseWeekWasNotInvalidated__VisitsSummary.get_week.xml
+++ b/tests/PHPUnit/System/expected/test_Archive_InvalidationWebsite2_NewDataShouldNotAppear_BecauseWeekWasNotInvalidated__VisitsSummary.get_week.xml
diff --git a/tests/PHPUnit/Integration/expected/test_Archive_InvalidationWebsite2_NewDataShouldNotAppear__Actions.getPageUrls_month.xml b/tests/PHPUnit/System/expected/test_Archive_InvalidationWebsite2_NewDataShouldNotAppear__Actions.getPageUrls_month.xml
index 80d2fcadd7..80d2fcadd7 100644
--- a/tests/PHPUnit/Integration/expected/test_Archive_InvalidationWebsite2_NewDataShouldNotAppear__Actions.getPageUrls_month.xml
+++ b/tests/PHPUnit/System/expected/test_Archive_InvalidationWebsite2_NewDataShouldNotAppear__Actions.getPageUrls_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_Archive_InvalidationWebsite2_NewDataShouldNotAppear__VisitsSummary.get_month.xml b/tests/PHPUnit/System/expected/test_Archive_InvalidationWebsite2_NewDataShouldNotAppear__VisitsSummary.get_month.xml
index 4402121f8a..4402121f8a 100644
--- a/tests/PHPUnit/Integration/expected/test_Archive_InvalidationWebsite2_NewDataShouldNotAppear__VisitsSummary.get_month.xml
+++ b/tests/PHPUnit/System/expected/test_Archive_InvalidationWebsite2_NewDataShouldNotAppear__VisitsSummary.get_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml
index 88e4c569eb..88e4c569eb 100644
--- a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml
diff --git a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_actions__API.getSuggestedValuesForSegment.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_actions__API.getSuggestedValuesForSegment.xml
index 3dfaf6b4fe..3dfaf6b4fe 100644
--- a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_actions__API.getSuggestedValuesForSegment.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_actions__API.getSuggestedValuesForSegment.xml
diff --git a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_actions__VisitsSummary.get_range.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_actions__VisitsSummary.get_range.xml
index 7ace3fcbe7..7ace3fcbe7 100644
--- a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_actions__VisitsSummary.get_range.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_actions__VisitsSummary.get_range.xml
diff --git a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_browserCode__API.getSuggestedValuesForSegment.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_browserCode__API.getSuggestedValuesForSegment.xml
index 8626ac313b..8626ac313b 100644
--- a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_browserCode__API.getSuggestedValuesForSegment.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_browserCode__API.getSuggestedValuesForSegment.xml
diff --git a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_browserCode__VisitsSummary.get_range.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_browserCode__VisitsSummary.get_range.xml
index 5d07770e4e..5d07770e4e 100644
--- a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_browserCode__VisitsSummary.get_range.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_browserCode__VisitsSummary.get_range.xml
diff --git a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_browserVersion__API.getSuggestedValuesForSegment.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_browserVersion__API.getSuggestedValuesForSegment.xml
index abcc43c819..abcc43c819 100644
--- a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_browserVersion__API.getSuggestedValuesForSegment.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_browserVersion__API.getSuggestedValuesForSegment.xml
diff --git a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_browserVersion__VisitsSummary.get_range.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_browserVersion__VisitsSummary.get_range.xml
index 5d07770e4e..5d07770e4e 100644
--- a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_browserVersion__VisitsSummary.get_range.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_browserVersion__VisitsSummary.get_range.xml
diff --git a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_city__API.getSuggestedValuesForSegment.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_city__API.getSuggestedValuesForSegment.xml
index c5a7afa2b4..c5a7afa2b4 100644
--- a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_city__API.getSuggestedValuesForSegment.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_city__API.getSuggestedValuesForSegment.xml
diff --git a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_city__VisitsSummary.get_range.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_city__VisitsSummary.get_range.xml
index 0dadc8d4ed..0dadc8d4ed 100644
--- a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_city__VisitsSummary.get_range.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_city__VisitsSummary.get_range.xml
diff --git a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_contentInteraction__API.getSuggestedValuesForSegment.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_contentInteraction__API.getSuggestedValuesForSegment.xml
index c234bed59e..c234bed59e 100644
--- a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_contentInteraction__API.getSuggestedValuesForSegment.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_contentInteraction__API.getSuggestedValuesForSegment.xml
diff --git a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_contentName__API.getSuggestedValuesForSegment.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_contentName__API.getSuggestedValuesForSegment.xml
index c234bed59e..c234bed59e 100644
--- a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_contentName__API.getSuggestedValuesForSegment.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_contentName__API.getSuggestedValuesForSegment.xml
diff --git a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_contentPiece__API.getSuggestedValuesForSegment.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_contentPiece__API.getSuggestedValuesForSegment.xml
index c234bed59e..c234bed59e 100644
--- a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_contentPiece__API.getSuggestedValuesForSegment.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_contentPiece__API.getSuggestedValuesForSegment.xml
diff --git a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_contentTarget__API.getSuggestedValuesForSegment.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_contentTarget__API.getSuggestedValuesForSegment.xml
index c234bed59e..c234bed59e 100644
--- a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_contentTarget__API.getSuggestedValuesForSegment.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_contentTarget__API.getSuggestedValuesForSegment.xml
diff --git a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_continentCode__API.getSuggestedValuesForSegment.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_continentCode__API.getSuggestedValuesForSegment.xml
index f002a6ceae..f002a6ceae 100644
--- a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_continentCode__API.getSuggestedValuesForSegment.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_continentCode__API.getSuggestedValuesForSegment.xml
diff --git a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_continentCode__VisitsSummary.get_range.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_continentCode__VisitsSummary.get_range.xml
index 7c7cc211dd..7c7cc211dd 100644
--- a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_continentCode__VisitsSummary.get_range.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_continentCode__VisitsSummary.get_range.xml
diff --git a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_countryCode__API.getSuggestedValuesForSegment.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_countryCode__API.getSuggestedValuesForSegment.xml
index 949a6486de..949a6486de 100644
--- a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_countryCode__API.getSuggestedValuesForSegment.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_countryCode__API.getSuggestedValuesForSegment.xml
diff --git a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_countryCode__VisitsSummary.get_range.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_countryCode__VisitsSummary.get_range.xml
index 0dadc8d4ed..0dadc8d4ed 100644
--- a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_countryCode__VisitsSummary.get_range.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_countryCode__VisitsSummary.get_range.xml
diff --git a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_customVariableName1__API.getSuggestedValuesForSegment.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariableName1__API.getSuggestedValuesForSegment.xml
index d301db94df..d301db94df 100644
--- a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_customVariableName1__API.getSuggestedValuesForSegment.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariableName1__API.getSuggestedValuesForSegment.xml
diff --git a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_customVariableName1__VisitsSummary.get_range.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariableName1__VisitsSummary.get_range.xml
index 47eec1002c..47eec1002c 100644
--- a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_customVariableName1__VisitsSummary.get_range.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariableName1__VisitsSummary.get_range.xml
diff --git a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_customVariableName2__API.getSuggestedValuesForSegment.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariableName2__API.getSuggestedValuesForSegment.xml
index c234bed59e..c234bed59e 100644
--- a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_customVariableName2__API.getSuggestedValuesForSegment.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariableName2__API.getSuggestedValuesForSegment.xml
diff --git a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_customVariableName3__API.getSuggestedValuesForSegment.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariableName3__API.getSuggestedValuesForSegment.xml
index c234bed59e..c234bed59e 100644
--- a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_customVariableName3__API.getSuggestedValuesForSegment.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariableName3__API.getSuggestedValuesForSegment.xml
diff --git a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_customVariableName4__API.getSuggestedValuesForSegment.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariableName4__API.getSuggestedValuesForSegment.xml
index c234bed59e..c234bed59e 100644
--- a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_customVariableName4__API.getSuggestedValuesForSegment.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariableName4__API.getSuggestedValuesForSegment.xml
diff --git a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_customVariableName5__API.getSuggestedValuesForSegment.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariableName5__API.getSuggestedValuesForSegment.xml
index 3b00ef3096..3b00ef3096 100644
--- a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_customVariableName5__API.getSuggestedValuesForSegment.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariableName5__API.getSuggestedValuesForSegment.xml
diff --git a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_customVariableName5__VisitsSummary.get_range.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariableName5__VisitsSummary.get_range.xml
index 47eec1002c..47eec1002c 100644
--- a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_customVariableName5__VisitsSummary.get_range.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariableName5__VisitsSummary.get_range.xml
diff --git a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_customVariablePageName1__API.getSuggestedValuesForSegment.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariablePageName1__API.getSuggestedValuesForSegment.xml
index c234bed59e..c234bed59e 100644
--- a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_customVariablePageName1__API.getSuggestedValuesForSegment.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariablePageName1__API.getSuggestedValuesForSegment.xml
diff --git a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_customVariablePageName2__API.getSuggestedValuesForSegment.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariablePageName2__API.getSuggestedValuesForSegment.xml
index 8698fbbd4d..8698fbbd4d 100644
--- a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_customVariablePageName2__API.getSuggestedValuesForSegment.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariablePageName2__API.getSuggestedValuesForSegment.xml
diff --git a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_customVariablePageName2__VisitsSummary.get_range.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariablePageName2__VisitsSummary.get_range.xml
index b72146a986..b72146a986 100644
--- a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_customVariablePageName2__VisitsSummary.get_range.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariablePageName2__VisitsSummary.get_range.xml
diff --git a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_customVariablePageName3__API.getSuggestedValuesForSegment.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariablePageName3__API.getSuggestedValuesForSegment.xml
index c234bed59e..c234bed59e 100644
--- a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_customVariablePageName3__API.getSuggestedValuesForSegment.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariablePageName3__API.getSuggestedValuesForSegment.xml
diff --git a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_customVariablePageName4__API.getSuggestedValuesForSegment.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariablePageName4__API.getSuggestedValuesForSegment.xml
index 522fc54866..522fc54866 100644
--- a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_customVariablePageName4__API.getSuggestedValuesForSegment.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariablePageName4__API.getSuggestedValuesForSegment.xml
diff --git a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_customVariablePageName4__VisitsSummary.get_range.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariablePageName4__VisitsSummary.get_range.xml
index d8bcdace18..d8bcdace18 100644
--- a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_customVariablePageName4__VisitsSummary.get_range.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariablePageName4__VisitsSummary.get_range.xml
diff --git a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_customVariablePageName5__API.getSuggestedValuesForSegment.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariablePageName5__API.getSuggestedValuesForSegment.xml
index 3e34700999..3e34700999 100644
--- a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_customVariablePageName5__API.getSuggestedValuesForSegment.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariablePageName5__API.getSuggestedValuesForSegment.xml
diff --git a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_customVariablePageName5__VisitsSummary.get_range.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariablePageName5__VisitsSummary.get_range.xml
index b72146a986..b72146a986 100644
--- a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_customVariablePageName5__VisitsSummary.get_range.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariablePageName5__VisitsSummary.get_range.xml
diff --git a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_customVariablePageValue1__API.getSuggestedValuesForSegment.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariablePageValue1__API.getSuggestedValuesForSegment.xml
index c234bed59e..c234bed59e 100644
--- a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_customVariablePageValue1__API.getSuggestedValuesForSegment.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariablePageValue1__API.getSuggestedValuesForSegment.xml
diff --git a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_customVariablePageValue2__API.getSuggestedValuesForSegment.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariablePageValue2__API.getSuggestedValuesForSegment.xml
index 18b4e9b372..18b4e9b372 100644
--- a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_customVariablePageValue2__API.getSuggestedValuesForSegment.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariablePageValue2__API.getSuggestedValuesForSegment.xml
diff --git a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_customVariablePageValue2__VisitsSummary.get_range.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariablePageValue2__VisitsSummary.get_range.xml
index 88dae8fd6c..88dae8fd6c 100644
--- a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_customVariablePageValue2__VisitsSummary.get_range.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariablePageValue2__VisitsSummary.get_range.xml
diff --git a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_customVariablePageValue3__API.getSuggestedValuesForSegment.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariablePageValue3__API.getSuggestedValuesForSegment.xml
index c234bed59e..c234bed59e 100644
--- a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_customVariablePageValue3__API.getSuggestedValuesForSegment.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariablePageValue3__API.getSuggestedValuesForSegment.xml
diff --git a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_customVariablePageValue4__API.getSuggestedValuesForSegment.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariablePageValue4__API.getSuggestedValuesForSegment.xml
index f7624776eb..f7624776eb 100644
--- a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_customVariablePageValue4__API.getSuggestedValuesForSegment.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariablePageValue4__API.getSuggestedValuesForSegment.xml
diff --git a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_customVariablePageValue4__VisitsSummary.get_range.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariablePageValue4__VisitsSummary.get_range.xml
index e0144ec833..e0144ec833 100644
--- a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_customVariablePageValue4__VisitsSummary.get_range.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariablePageValue4__VisitsSummary.get_range.xml
diff --git a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_customVariablePageValue5__API.getSuggestedValuesForSegment.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariablePageValue5__API.getSuggestedValuesForSegment.xml
index 0425837789..0425837789 100644
--- a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_customVariablePageValue5__API.getSuggestedValuesForSegment.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariablePageValue5__API.getSuggestedValuesForSegment.xml
diff --git a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_customVariablePageValue5__VisitsSummary.get_range.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariablePageValue5__VisitsSummary.get_range.xml
index 88dae8fd6c..88dae8fd6c 100644
--- a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_customVariablePageValue5__VisitsSummary.get_range.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariablePageValue5__VisitsSummary.get_range.xml
diff --git a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_customVariableValue1__API.getSuggestedValuesForSegment.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariableValue1__API.getSuggestedValuesForSegment.xml
index b157cb068a..b157cb068a 100644
--- a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_customVariableValue1__API.getSuggestedValuesForSegment.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariableValue1__API.getSuggestedValuesForSegment.xml
diff --git a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_customVariableValue1__VisitsSummary.get_range.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariableValue1__VisitsSummary.get_range.xml
index d4214faba0..d4214faba0 100644
--- a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_customVariableValue1__VisitsSummary.get_range.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariableValue1__VisitsSummary.get_range.xml
diff --git a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_customVariableValue2__API.getSuggestedValuesForSegment.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariableValue2__API.getSuggestedValuesForSegment.xml
index c234bed59e..c234bed59e 100644
--- a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_customVariableValue2__API.getSuggestedValuesForSegment.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariableValue2__API.getSuggestedValuesForSegment.xml
diff --git a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_customVariableValue3__API.getSuggestedValuesForSegment.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariableValue3__API.getSuggestedValuesForSegment.xml
index c234bed59e..c234bed59e 100644
--- a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_customVariableValue3__API.getSuggestedValuesForSegment.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariableValue3__API.getSuggestedValuesForSegment.xml
diff --git a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_customVariableValue4__API.getSuggestedValuesForSegment.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariableValue4__API.getSuggestedValuesForSegment.xml
index c234bed59e..c234bed59e 100644
--- a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_customVariableValue4__API.getSuggestedValuesForSegment.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariableValue4__API.getSuggestedValuesForSegment.xml
diff --git a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_customVariableValue5__API.getSuggestedValuesForSegment.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariableValue5__API.getSuggestedValuesForSegment.xml
index 40b2b0992a..40b2b0992a 100644
--- a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_customVariableValue5__API.getSuggestedValuesForSegment.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariableValue5__API.getSuggestedValuesForSegment.xml
diff --git a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_customVariableValue5__VisitsSummary.get_range.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariableValue5__VisitsSummary.get_range.xml
index d4214faba0..d4214faba0 100644
--- a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_customVariableValue5__VisitsSummary.get_range.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariableValue5__VisitsSummary.get_range.xml
diff --git a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_daysSinceFirstVisit__API.getSuggestedValuesForSegment.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_daysSinceFirstVisit__API.getSuggestedValuesForSegment.xml
index 487ce13284..487ce13284 100644
--- a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_daysSinceFirstVisit__API.getSuggestedValuesForSegment.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_daysSinceFirstVisit__API.getSuggestedValuesForSegment.xml
diff --git a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_daysSinceFirstVisit__VisitsSummary.get_range.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_daysSinceFirstVisit__VisitsSummary.get_range.xml
index a0db0ecba0..a0db0ecba0 100644
--- a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_daysSinceFirstVisit__VisitsSummary.get_range.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_daysSinceFirstVisit__VisitsSummary.get_range.xml
diff --git a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_daysSinceLastEcommerceOrder__API.getSuggestedValuesForSegment.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_daysSinceLastEcommerceOrder__API.getSuggestedValuesForSegment.xml
index ab150e6b32..ab150e6b32 100644
--- a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_daysSinceLastEcommerceOrder__API.getSuggestedValuesForSegment.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_daysSinceLastEcommerceOrder__API.getSuggestedValuesForSegment.xml
diff --git a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_daysSinceLastEcommerceOrder__VisitsSummary.get_range.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_daysSinceLastEcommerceOrder__VisitsSummary.get_range.xml
index a0db0ecba0..a0db0ecba0 100644
--- a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_daysSinceLastEcommerceOrder__VisitsSummary.get_range.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_daysSinceLastEcommerceOrder__VisitsSummary.get_range.xml
diff --git a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_daysSinceLastVisit__API.getSuggestedValuesForSegment.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_daysSinceLastVisit__API.getSuggestedValuesForSegment.xml
index 9a04ddc8c8..9a04ddc8c8 100644
--- a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_daysSinceLastVisit__API.getSuggestedValuesForSegment.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_daysSinceLastVisit__API.getSuggestedValuesForSegment.xml
diff --git a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_daysSinceLastVisit__VisitsSummary.get_range.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_daysSinceLastVisit__VisitsSummary.get_range.xml
index a0db0ecba0..a0db0ecba0 100644
--- a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_daysSinceLastVisit__VisitsSummary.get_range.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_daysSinceLastVisit__VisitsSummary.get_range.xml
diff --git a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_deviceType__API.getSuggestedValuesForSegment.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_deviceType__API.getSuggestedValuesForSegment.xml
index 4f5796903a..4f5796903a 100644
--- a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_deviceType__API.getSuggestedValuesForSegment.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_deviceType__API.getSuggestedValuesForSegment.xml
diff --git a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_deviceType__VisitsSummary.get_range.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_deviceType__VisitsSummary.get_range.xml
index 5d07770e4e..5d07770e4e 100644
--- a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_deviceType__VisitsSummary.get_range.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_deviceType__VisitsSummary.get_range.xml
diff --git a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_entryPageTitle__API.getSuggestedValuesForSegment.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_entryPageTitle__API.getSuggestedValuesForSegment.xml
index 9916600524..9916600524 100644
--- a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_entryPageTitle__API.getSuggestedValuesForSegment.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_entryPageTitle__API.getSuggestedValuesForSegment.xml
diff --git a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_entryPageTitle__VisitsSummary.get_range.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_entryPageTitle__VisitsSummary.get_range.xml
index b72146a986..b72146a986 100644
--- a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_entryPageTitle__VisitsSummary.get_range.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_entryPageTitle__VisitsSummary.get_range.xml
diff --git a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_entryPageUrl__API.getSuggestedValuesForSegment.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_entryPageUrl__API.getSuggestedValuesForSegment.xml
index 4d3c877fce..4d3c877fce 100644
--- a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_entryPageUrl__API.getSuggestedValuesForSegment.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_entryPageUrl__API.getSuggestedValuesForSegment.xml
diff --git a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_entryPageUrl__VisitsSummary.get_range.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_entryPageUrl__VisitsSummary.get_range.xml
index 7ace3fcbe7..7ace3fcbe7 100644
--- a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_entryPageUrl__VisitsSummary.get_range.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_entryPageUrl__VisitsSummary.get_range.xml
diff --git a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_eventAction__API.getSuggestedValuesForSegment.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_eventAction__API.getSuggestedValuesForSegment.xml
index df2f6b2dac..df2f6b2dac 100644
--- a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_eventAction__API.getSuggestedValuesForSegment.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_eventAction__API.getSuggestedValuesForSegment.xml
diff --git a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_eventAction__VisitsSummary.get_range.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_eventAction__VisitsSummary.get_range.xml
index 1922b24059..1922b24059 100644
--- a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_eventAction__VisitsSummary.get_range.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_eventAction__VisitsSummary.get_range.xml
diff --git a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_eventCategory__API.getSuggestedValuesForSegment.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_eventCategory__API.getSuggestedValuesForSegment.xml
index 952a834c1a..952a834c1a 100644
--- a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_eventCategory__API.getSuggestedValuesForSegment.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_eventCategory__API.getSuggestedValuesForSegment.xml
diff --git a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_eventCategory__VisitsSummary.get_range.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_eventCategory__VisitsSummary.get_range.xml
index 1922b24059..1922b24059 100644
--- a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_eventCategory__VisitsSummary.get_range.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_eventCategory__VisitsSummary.get_range.xml
diff --git a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_eventName__API.getSuggestedValuesForSegment.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_eventName__API.getSuggestedValuesForSegment.xml
index fa8c853fcf..fa8c853fcf 100644
--- a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_eventName__API.getSuggestedValuesForSegment.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_eventName__API.getSuggestedValuesForSegment.xml
diff --git a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_eventName__VisitsSummary.get_range.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_eventName__VisitsSummary.get_range.xml
index 1922b24059..1922b24059 100644
--- a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_eventName__VisitsSummary.get_range.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_eventName__VisitsSummary.get_range.xml
diff --git a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_events__API.getSuggestedValuesForSegment.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_events__API.getSuggestedValuesForSegment.xml
index 727df89075..727df89075 100644
--- a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_events__API.getSuggestedValuesForSegment.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_events__API.getSuggestedValuesForSegment.xml
diff --git a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_events__VisitsSummary.get_range.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_events__VisitsSummary.get_range.xml
index 7ace3fcbe7..7ace3fcbe7 100644
--- a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_events__VisitsSummary.get_range.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_events__VisitsSummary.get_range.xml
diff --git a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_exitPageTitle__API.getSuggestedValuesForSegment.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_exitPageTitle__API.getSuggestedValuesForSegment.xml
index 9916600524..9916600524 100644
--- a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_exitPageTitle__API.getSuggestedValuesForSegment.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_exitPageTitle__API.getSuggestedValuesForSegment.xml
diff --git a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_exitPageTitle__VisitsSummary.get_range.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_exitPageTitle__VisitsSummary.get_range.xml
index b72146a986..b72146a986 100644
--- a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_exitPageTitle__VisitsSummary.get_range.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_exitPageTitle__VisitsSummary.get_range.xml
diff --git a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_exitPageUrl__API.getSuggestedValuesForSegment.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_exitPageUrl__API.getSuggestedValuesForSegment.xml
index 4d3c877fce..4d3c877fce 100644
--- a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_exitPageUrl__API.getSuggestedValuesForSegment.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_exitPageUrl__API.getSuggestedValuesForSegment.xml
diff --git a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_exitPageUrl__VisitsSummary.get_range.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_exitPageUrl__VisitsSummary.get_range.xml
index 7ace3fcbe7..7ace3fcbe7 100644
--- a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_exitPageUrl__VisitsSummary.get_range.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_exitPageUrl__VisitsSummary.get_range.xml
diff --git a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_latitude__API.getSuggestedValuesForSegment.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_latitude__API.getSuggestedValuesForSegment.xml
index d48ae32332..d48ae32332 100644
--- a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_latitude__API.getSuggestedValuesForSegment.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_latitude__API.getSuggestedValuesForSegment.xml
diff --git a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_latitude__VisitsSummary.get_range.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_latitude__VisitsSummary.get_range.xml
index e023a89081..e023a89081 100644
--- a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_latitude__VisitsSummary.get_range.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_latitude__VisitsSummary.get_range.xml
diff --git a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_longitude__API.getSuggestedValuesForSegment.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_longitude__API.getSuggestedValuesForSegment.xml
index 34b2e9333d..34b2e9333d 100644
--- a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_longitude__API.getSuggestedValuesForSegment.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_longitude__API.getSuggestedValuesForSegment.xml
diff --git a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_longitude__VisitsSummary.get_range.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_longitude__VisitsSummary.get_range.xml
index d8bcdace18..d8bcdace18 100644
--- a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_longitude__VisitsSummary.get_range.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_longitude__VisitsSummary.get_range.xml
diff --git a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_operatingSystemCode__API.getSuggestedValuesForSegment.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_operatingSystemCode__API.getSuggestedValuesForSegment.xml
index 1e74517256..1e74517256 100644
--- a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_operatingSystemCode__API.getSuggestedValuesForSegment.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_operatingSystemCode__API.getSuggestedValuesForSegment.xml
diff --git a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_operatingSystemCode__VisitsSummary.get_range.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_operatingSystemCode__VisitsSummary.get_range.xml
index 5d07770e4e..5d07770e4e 100644
--- a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_operatingSystemCode__VisitsSummary.get_range.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_operatingSystemCode__VisitsSummary.get_range.xml
diff --git a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_pageTitle__API.getSuggestedValuesForSegment.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_pageTitle__API.getSuggestedValuesForSegment.xml
index 9916600524..9916600524 100644
--- a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_pageTitle__API.getSuggestedValuesForSegment.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_pageTitle__API.getSuggestedValuesForSegment.xml
diff --git a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_pageTitle__VisitsSummary.get_range.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_pageTitle__VisitsSummary.get_range.xml
index b72146a986..b72146a986 100644
--- a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_pageTitle__VisitsSummary.get_range.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_pageTitle__VisitsSummary.get_range.xml
diff --git a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_pageUrl__API.getSuggestedValuesForSegment.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_pageUrl__API.getSuggestedValuesForSegment.xml
index 162ce8a72b..162ce8a72b 100644
--- a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_pageUrl__API.getSuggestedValuesForSegment.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_pageUrl__API.getSuggestedValuesForSegment.xml
diff --git a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_pageUrl__VisitsSummary.get_range.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_pageUrl__VisitsSummary.get_range.xml
index a0db0ecba0..a0db0ecba0 100644
--- a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_pageUrl__VisitsSummary.get_range.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_pageUrl__VisitsSummary.get_range.xml
diff --git a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_provider__API.getSuggestedValuesForSegment.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_provider__API.getSuggestedValuesForSegment.xml
index 6cf1af346e..6cf1af346e 100644
--- a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_provider__API.getSuggestedValuesForSegment.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_provider__API.getSuggestedValuesForSegment.xml
diff --git a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_provider__VisitsSummary.get_range.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_provider__VisitsSummary.get_range.xml
index c51a1bc13d..c51a1bc13d 100644
--- a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_provider__VisitsSummary.get_range.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_provider__VisitsSummary.get_range.xml
diff --git a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_referrerKeyword__API.getSuggestedValuesForSegment.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_referrerKeyword__API.getSuggestedValuesForSegment.xml
index 2959b13a9c..2959b13a9c 100644
--- a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_referrerKeyword__API.getSuggestedValuesForSegment.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_referrerKeyword__API.getSuggestedValuesForSegment.xml
diff --git a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_referrerKeyword__VisitsSummary.get_range.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_referrerKeyword__VisitsSummary.get_range.xml
index dfa3a20623..dfa3a20623 100644
--- a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_referrerKeyword__VisitsSummary.get_range.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_referrerKeyword__VisitsSummary.get_range.xml
diff --git a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_referrerName__API.getSuggestedValuesForSegment.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_referrerName__API.getSuggestedValuesForSegment.xml
index 6ca2019597..6ca2019597 100644
--- a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_referrerName__API.getSuggestedValuesForSegment.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_referrerName__API.getSuggestedValuesForSegment.xml
diff --git a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_referrerName__VisitsSummary.get_range.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_referrerName__VisitsSummary.get_range.xml
index dfa3a20623..dfa3a20623 100644
--- a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_referrerName__VisitsSummary.get_range.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_referrerName__VisitsSummary.get_range.xml
diff --git a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_referrerType__API.getSuggestedValuesForSegment.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_referrerType__API.getSuggestedValuesForSegment.xml
index 9b61eb17b1..9b61eb17b1 100644
--- a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_referrerType__API.getSuggestedValuesForSegment.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_referrerType__API.getSuggestedValuesForSegment.xml
diff --git a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_referrerType__VisitsSummary.get_range.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_referrerType__VisitsSummary.get_range.xml
index ce18f5b1dc..ce18f5b1dc 100644
--- a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_referrerType__VisitsSummary.get_range.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_referrerType__VisitsSummary.get_range.xml
diff --git a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_referrerUrl__API.getSuggestedValuesForSegment.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_referrerUrl__API.getSuggestedValuesForSegment.xml
index f7cd8deb3b..f7cd8deb3b 100644
--- a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_referrerUrl__API.getSuggestedValuesForSegment.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_referrerUrl__API.getSuggestedValuesForSegment.xml
diff --git a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_referrerUrl__VisitsSummary.get_range.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_referrerUrl__VisitsSummary.get_range.xml
index dfa3a20623..dfa3a20623 100644
--- a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_referrerUrl__VisitsSummary.get_range.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_referrerUrl__VisitsSummary.get_range.xml
diff --git a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_regionCode__API.getSuggestedValuesForSegment.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_regionCode__API.getSuggestedValuesForSegment.xml
index 68a8855109..68a8855109 100644
--- a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_regionCode__API.getSuggestedValuesForSegment.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_regionCode__API.getSuggestedValuesForSegment.xml
diff --git a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_regionCode__VisitsSummary.get_range.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_regionCode__VisitsSummary.get_range.xml
index e023a89081..e023a89081 100644
--- a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_regionCode__VisitsSummary.get_range.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_regionCode__VisitsSummary.get_range.xml
diff --git a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_resolution__API.getSuggestedValuesForSegment.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_resolution__API.getSuggestedValuesForSegment.xml
index 5a29930810..5a29930810 100644
--- a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_resolution__API.getSuggestedValuesForSegment.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_resolution__API.getSuggestedValuesForSegment.xml
diff --git a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_resolution__VisitsSummary.get_range.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_resolution__VisitsSummary.get_range.xml
index f52326b337..f52326b337 100644
--- a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_resolution__VisitsSummary.get_range.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_resolution__VisitsSummary.get_range.xml
diff --git a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_searches__API.getSuggestedValuesForSegment.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_searches__API.getSuggestedValuesForSegment.xml
index 727df89075..727df89075 100644
--- a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_searches__API.getSuggestedValuesForSegment.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_searches__API.getSuggestedValuesForSegment.xml
diff --git a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_searches__VisitsSummary.get_range.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_searches__VisitsSummary.get_range.xml
index 410df64fa3..410df64fa3 100644
--- a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_searches__VisitsSummary.get_range.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_searches__VisitsSummary.get_range.xml
diff --git a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_siteSearchKeyword__API.getSuggestedValuesForSegment.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_siteSearchKeyword__API.getSuggestedValuesForSegment.xml
index 0690d54c62..0690d54c62 100644
--- a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_siteSearchKeyword__API.getSuggestedValuesForSegment.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_siteSearchKeyword__API.getSuggestedValuesForSegment.xml
diff --git a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_siteSearchKeyword__VisitsSummary.get_range.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_siteSearchKeyword__VisitsSummary.get_range.xml
index e0144ec833..e0144ec833 100644
--- a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_siteSearchKeyword__VisitsSummary.get_range.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_siteSearchKeyword__VisitsSummary.get_range.xml
diff --git a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_userId__API.getSuggestedValuesForSegment.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_userId__API.getSuggestedValuesForSegment.xml
index 381e1be3af..381e1be3af 100644
--- a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_userId__API.getSuggestedValuesForSegment.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_userId__API.getSuggestedValuesForSegment.xml
diff --git a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_userId__VisitsSummary.get_range.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_userId__VisitsSummary.get_range.xml
index dfa3a20623..dfa3a20623 100644
--- a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_userId__VisitsSummary.get_range.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_userId__VisitsSummary.get_range.xml
diff --git a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_visitConvertedGoalId__API.getSuggestedValuesForSegment.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitConvertedGoalId__API.getSuggestedValuesForSegment.xml
index 1099070756..1099070756 100644
--- a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_visitConvertedGoalId__API.getSuggestedValuesForSegment.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitConvertedGoalId__API.getSuggestedValuesForSegment.xml
diff --git a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_visitConvertedGoalId__VisitsSummary.get_range.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitConvertedGoalId__VisitsSummary.get_range.xml
index f52326b337..f52326b337 100644
--- a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_visitConvertedGoalId__VisitsSummary.get_range.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitConvertedGoalId__VisitsSummary.get_range.xml
diff --git a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_visitConverted__API.getSuggestedValuesForSegment.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitConverted__API.getSuggestedValuesForSegment.xml
index 70bdb9e417..70bdb9e417 100644
--- a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_visitConverted__API.getSuggestedValuesForSegment.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitConverted__API.getSuggestedValuesForSegment.xml
diff --git a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_visitConverted__VisitsSummary.get_range.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitConverted__VisitsSummary.get_range.xml
index f52326b337..f52326b337 100644
--- a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_visitConverted__VisitsSummary.get_range.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitConverted__VisitsSummary.get_range.xml
diff --git a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_visitCount__API.getSuggestedValuesForSegment.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitCount__API.getSuggestedValuesForSegment.xml
index cec58f0121..cec58f0121 100644
--- a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_visitCount__API.getSuggestedValuesForSegment.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitCount__API.getSuggestedValuesForSegment.xml
diff --git a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_visitCount__VisitsSummary.get_range.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitCount__VisitsSummary.get_range.xml
index ce025f0a46..ce025f0a46 100644
--- a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_visitCount__VisitsSummary.get_range.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitCount__VisitsSummary.get_range.xml
diff --git a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_visitDuration__API.getSuggestedValuesForSegment.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitDuration__API.getSuggestedValuesForSegment.xml
index 66dead530e..66dead530e 100644
--- a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_visitDuration__API.getSuggestedValuesForSegment.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitDuration__API.getSuggestedValuesForSegment.xml
diff --git a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_visitDuration__VisitsSummary.get_range.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitDuration__VisitsSummary.get_range.xml
index 7ace3fcbe7..7ace3fcbe7 100644
--- a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_visitDuration__VisitsSummary.get_range.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitDuration__VisitsSummary.get_range.xml
diff --git a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_visitEcommerceStatus__API.getSuggestedValuesForSegment.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitEcommerceStatus__API.getSuggestedValuesForSegment.xml
index 405fd9750c..405fd9750c 100644
--- a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_visitEcommerceStatus__API.getSuggestedValuesForSegment.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitEcommerceStatus__API.getSuggestedValuesForSegment.xml
diff --git a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_visitEcommerceStatus__VisitsSummary.get_range.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitEcommerceStatus__VisitsSummary.get_range.xml
index f52326b337..f52326b337 100644
--- a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_visitEcommerceStatus__VisitsSummary.get_range.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitEcommerceStatus__VisitsSummary.get_range.xml
diff --git a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_visitId__API.getSuggestedValuesForSegment.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitId__API.getSuggestedValuesForSegment.xml
index c234bed59e..c234bed59e 100644
--- a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_visitId__API.getSuggestedValuesForSegment.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitId__API.getSuggestedValuesForSegment.xml
diff --git a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_visitIp__API.getSuggestedValuesForSegment.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitIp__API.getSuggestedValuesForSegment.xml
index e71397f869..e71397f869 100644
--- a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_visitIp__API.getSuggestedValuesForSegment.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitIp__API.getSuggestedValuesForSegment.xml
diff --git a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_visitIp__VisitsSummary.get_range.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitIp__VisitsSummary.get_range.xml
index 352cc69e4a..352cc69e4a 100644
--- a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_visitIp__VisitsSummary.get_range.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitIp__VisitsSummary.get_range.xml
diff --git a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_visitLocalHour__API.getSuggestedValuesForSegment.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitLocalHour__API.getSuggestedValuesForSegment.xml
index e8a749dda2..e8a749dda2 100644
--- a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_visitLocalHour__API.getSuggestedValuesForSegment.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitLocalHour__API.getSuggestedValuesForSegment.xml
diff --git a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_visitLocalHour__VisitsSummary.get_range.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitLocalHour__VisitsSummary.get_range.xml
index f52326b337..f52326b337 100644
--- a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_visitLocalHour__VisitsSummary.get_range.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitLocalHour__VisitsSummary.get_range.xml
diff --git a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_visitServerHour__API.getSuggestedValuesForSegment.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitServerHour__API.getSuggestedValuesForSegment.xml
index 727df89075..727df89075 100644
--- a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_visitServerHour__API.getSuggestedValuesForSegment.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitServerHour__API.getSuggestedValuesForSegment.xml
diff --git a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_visitServerHour__VisitsSummary.get_range.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitServerHour__VisitsSummary.get_range.xml
index 7ace3fcbe7..7ace3fcbe7 100644
--- a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_visitServerHour__VisitsSummary.get_range.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitServerHour__VisitsSummary.get_range.xml
diff --git a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_visitorId__API.getSuggestedValuesForSegment.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitorId__API.getSuggestedValuesForSegment.xml
index e21f421867..e21f421867 100644
--- a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_visitorId__API.getSuggestedValuesForSegment.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitorId__API.getSuggestedValuesForSegment.xml
diff --git a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_visitorId__VisitsSummary.get_range.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitorId__VisitsSummary.get_range.xml
index 64efc881e1..64efc881e1 100644
--- a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_visitorId__VisitsSummary.get_range.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitorId__VisitsSummary.get_range.xml
diff --git a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_visitorType__API.getSuggestedValuesForSegment.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitorType__API.getSuggestedValuesForSegment.xml
index 84613aaaf2..84613aaaf2 100644
--- a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_visitorType__API.getSuggestedValuesForSegment.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitorType__API.getSuggestedValuesForSegment.xml
diff --git a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_visitorType__VisitsSummary.get_range.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitorType__VisitsSummary.get_range.xml
index ce025f0a46..ce025f0a46 100644
--- a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_visitorType__VisitsSummary.get_range.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitorType__VisitsSummary.get_range.xml
diff --git a/tests/PHPUnit/Integration/expected/test_BackwardsCompatibility1XTest__VisitFrequency.get_day.xml b/tests/PHPUnit/System/expected/test_BackwardsCompatibility1XTest__VisitFrequency.get_day.xml
index 3633fe5914..3633fe5914 100644
--- a/tests/PHPUnit/Integration/expected/test_BackwardsCompatibility1XTest__VisitFrequency.get_day.xml
+++ b/tests/PHPUnit/System/expected/test_BackwardsCompatibility1XTest__VisitFrequency.get_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_BackwardsCompatibility1XTest__VisitFrequency.get_month.xml b/tests/PHPUnit/System/expected/test_BackwardsCompatibility1XTest__VisitFrequency.get_month.xml
index 3c62d79738..3c62d79738 100644
--- a/tests/PHPUnit/Integration/expected/test_BackwardsCompatibility1XTest__VisitFrequency.get_month.xml
+++ b/tests/PHPUnit/System/expected/test_BackwardsCompatibility1XTest__VisitFrequency.get_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_BackwardsCompatibility1XTest__VisitFrequency.get_range.xml b/tests/PHPUnit/System/expected/test_BackwardsCompatibility1XTest__VisitFrequency.get_range.xml
index a232e03046..a232e03046 100644
--- a/tests/PHPUnit/Integration/expected/test_BackwardsCompatibility1XTest__VisitFrequency.get_range.xml
+++ b/tests/PHPUnit/System/expected/test_BackwardsCompatibility1XTest__VisitFrequency.get_range.xml
diff --git a/tests/PHPUnit/Integration/expected/test_BackwardsCompatibility1XTest__VisitFrequency.get_week.xml b/tests/PHPUnit/System/expected/test_BackwardsCompatibility1XTest__VisitFrequency.get_week.xml
index 3c62d79738..3c62d79738 100644
--- a/tests/PHPUnit/Integration/expected/test_BackwardsCompatibility1XTest__VisitFrequency.get_week.xml
+++ b/tests/PHPUnit/System/expected/test_BackwardsCompatibility1XTest__VisitFrequency.get_week.xml
diff --git a/tests/PHPUnit/Integration/expected/test_BackwardsCompatibility1XTest__VisitFrequency.get_year.xml b/tests/PHPUnit/System/expected/test_BackwardsCompatibility1XTest__VisitFrequency.get_year.xml
index a232e03046..a232e03046 100644
--- a/tests/PHPUnit/Integration/expected/test_BackwardsCompatibility1XTest__VisitFrequency.get_year.xml
+++ b/tests/PHPUnit/System/expected/test_BackwardsCompatibility1XTest__VisitFrequency.get_year.xml
diff --git a/tests/PHPUnit/Integration/expected/test_BackwardsCompatibility1XTest_multipleDates__VisitFrequency.get_day.xml b/tests/PHPUnit/System/expected/test_BackwardsCompatibility1XTest_multipleDates__VisitFrequency.get_day.xml
index b8e30312d7..b8e30312d7 100644
--- a/tests/PHPUnit/Integration/expected/test_BackwardsCompatibility1XTest_multipleDates__VisitFrequency.get_day.xml
+++ b/tests/PHPUnit/System/expected/test_BackwardsCompatibility1XTest_multipleDates__VisitFrequency.get_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_BackwardsCompatibility1XTest_multipleOldNew__VisitFrequency.get_month.xml b/tests/PHPUnit/System/expected/test_BackwardsCompatibility1XTest_multipleOldNew__VisitFrequency.get_month.xml
index 9b5f22a3ea..9b5f22a3ea 100644
--- a/tests/PHPUnit/Integration/expected/test_BackwardsCompatibility1XTest_multipleOldNew__VisitFrequency.get_month.xml
+++ b/tests/PHPUnit/System/expected/test_BackwardsCompatibility1XTest_multipleOldNew__VisitFrequency.get_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_CustomEvents_Actions.getPageUrls_lastN__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents_Actions.getPageUrls_lastN__API.getProcessedReport_day.xml
index 01171d06ab..01171d06ab 100644
--- a/tests/PHPUnit/Integration/expected/test_CustomEvents_Actions.getPageUrls_lastN__API.getProcessedReport_day.xml
+++ b/tests/PHPUnit/System/expected/test_CustomEvents_Actions.getPageUrls_lastN__API.getProcessedReport_day.xml
diff --git a/tests/PHPUnit/Integration/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 ef94481043..ef94481043 100644
--- a/tests/PHPUnit/Integration/expected/test_CustomEvents_Events.getAction_lastN__API.getProcessedReport_day.xml
+++ b/tests/PHPUnit/System/expected/test_CustomEvents_Events.getAction_lastN__API.getProcessedReport_day.xml
diff --git a/tests/PHPUnit/Integration/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 b503ab7292..b503ab7292 100644
--- a/tests/PHPUnit/Integration/expected/test_CustomEvents_Events.getCategory_lastN__API.getProcessedReport_day.xml
+++ b/tests/PHPUnit/System/expected/test_CustomEvents_Events.getCategory_lastN__API.getProcessedReport_day.xml
diff --git a/tests/PHPUnit/Integration/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 403acff85f..403acff85f 100644
--- a/tests/PHPUnit/Integration/expected/test_CustomEvents_Events.getName_lastN__API.getProcessedReport_day.xml
+++ b/tests/PHPUnit/System/expected/test_CustomEvents_Events.getName_lastN__API.getProcessedReport_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_CustomEvents__Actions.getPageUrls_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents__Actions.getPageUrls_day.xml
index b09bbc9e7f..b09bbc9e7f 100644
--- a/tests/PHPUnit/Integration/expected/test_CustomEvents__Actions.getPageUrls_day.xml
+++ b/tests/PHPUnit/System/expected/test_CustomEvents__Actions.getPageUrls_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_CustomEvents__Actions.getPageUrls_month.xml b/tests/PHPUnit/System/expected/test_CustomEvents__Actions.getPageUrls_month.xml
index 5e6a7b260b..5e6a7b260b 100644
--- a/tests/PHPUnit/Integration/expected/test_CustomEvents__Actions.getPageUrls_month.xml
+++ b/tests/PHPUnit/System/expected/test_CustomEvents__Actions.getPageUrls_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_CustomEvents__Actions.get_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents__Actions.get_day.xml
index 65ae232e68..65ae232e68 100644
--- a/tests/PHPUnit/Integration/expected/test_CustomEvents__Actions.get_day.xml
+++ b/tests/PHPUnit/System/expected/test_CustomEvents__Actions.get_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_CustomEvents__Actions.get_month.xml b/tests/PHPUnit/System/expected/test_CustomEvents__Actions.get_month.xml
index 65ae232e68..65ae232e68 100644
--- a/tests/PHPUnit/Integration/expected/test_CustomEvents__Actions.get_month.xml
+++ b/tests/PHPUnit/System/expected/test_CustomEvents__Actions.get_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_CustomEvents__Events.getAction_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents__Events.getAction_day.xml
index 26752bbd7b..26752bbd7b 100644
--- a/tests/PHPUnit/Integration/expected/test_CustomEvents__Events.getAction_day.xml
+++ b/tests/PHPUnit/System/expected/test_CustomEvents__Events.getAction_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_CustomEvents__Events.getAction_month.xml b/tests/PHPUnit/System/expected/test_CustomEvents__Events.getAction_month.xml
index 9868947268..9868947268 100644
--- a/tests/PHPUnit/Integration/expected/test_CustomEvents__Events.getAction_month.xml
+++ b/tests/PHPUnit/System/expected/test_CustomEvents__Events.getAction_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_CustomEvents__Events.getCategory_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents__Events.getCategory_day.xml
index 5f3469aa23..5f3469aa23 100644
--- a/tests/PHPUnit/Integration/expected/test_CustomEvents__Events.getCategory_day.xml
+++ b/tests/PHPUnit/System/expected/test_CustomEvents__Events.getCategory_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_CustomEvents__Events.getCategory_month.xml b/tests/PHPUnit/System/expected/test_CustomEvents__Events.getCategory_month.xml
index 1f8fdb7c02..1f8fdb7c02 100644
--- a/tests/PHPUnit/Integration/expected/test_CustomEvents__Events.getCategory_month.xml
+++ b/tests/PHPUnit/System/expected/test_CustomEvents__Events.getCategory_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_CustomEvents__Events.getName_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents__Events.getName_day.xml
index 9461eeb42e..9461eeb42e 100644
--- a/tests/PHPUnit/Integration/expected/test_CustomEvents__Events.getName_day.xml
+++ b/tests/PHPUnit/System/expected/test_CustomEvents__Events.getName_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_CustomEvents__Events.getName_month.xml b/tests/PHPUnit/System/expected/test_CustomEvents__Events.getName_month.xml
index 5f8de9463f..5f8de9463f 100644
--- a/tests/PHPUnit/Integration/expected/test_CustomEvents__Events.getName_month.xml
+++ b/tests/PHPUnit/System/expected/test_CustomEvents__Events.getName_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_CustomEvents__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_day.xml
index 61b4626535..61b4626535 100644
--- a/tests/PHPUnit/Integration/expected/test_CustomEvents__Live.getLastVisitsDetails_day.xml
+++ b/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_CustomEvents__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_month.xml
index 61b4626535..61b4626535 100644
--- a/tests/PHPUnit/Integration/expected/test_CustomEvents__Live.getLastVisitsDetails_month.xml
+++ b/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_CustomEvents_eventCategoryOrNameMatch__Actions.getPageUrls_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents_eventCategoryOrNameMatch__Actions.getPageUrls_day.xml
index c234bed59e..c234bed59e 100644
--- a/tests/PHPUnit/Integration/expected/test_CustomEvents_eventCategoryOrNameMatch__Actions.getPageUrls_day.xml
+++ b/tests/PHPUnit/System/expected/test_CustomEvents_eventCategoryOrNameMatch__Actions.getPageUrls_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_CustomEvents_eventCategoryOrNameMatch__Events.getAction_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents_eventCategoryOrNameMatch__Events.getAction_day.xml
index d70e8c2950..d70e8c2950 100644
--- a/tests/PHPUnit/Integration/expected/test_CustomEvents_eventCategoryOrNameMatch__Events.getAction_day.xml
+++ b/tests/PHPUnit/System/expected/test_CustomEvents_eventCategoryOrNameMatch__Events.getAction_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_CustomEvents_eventCategoryOrNameMatch__Events.getCategory_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents_eventCategoryOrNameMatch__Events.getCategory_day.xml
index d65a2784c3..d65a2784c3 100644
--- a/tests/PHPUnit/Integration/expected/test_CustomEvents_eventCategoryOrNameMatch__Events.getCategory_day.xml
+++ b/tests/PHPUnit/System/expected/test_CustomEvents_eventCategoryOrNameMatch__Events.getCategory_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_CustomEvents_eventCategoryOrNameMatch__Events.getName_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents_eventCategoryOrNameMatch__Events.getName_day.xml
index 71ccc3d69b..71ccc3d69b 100644
--- a/tests/PHPUnit/Integration/expected/test_CustomEvents_eventCategoryOrNameMatch__Events.getName_day.xml
+++ b/tests/PHPUnit/System/expected/test_CustomEvents_eventCategoryOrNameMatch__Events.getName_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_CustomEvents_secondaryDimensionIsEventAction__Events.getAction_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventAction__Events.getAction_day.xml
index 098124ac66..098124ac66 100644
--- a/tests/PHPUnit/Integration/expected/test_CustomEvents_secondaryDimensionIsEventAction__Events.getAction_day.xml
+++ b/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventAction__Events.getAction_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_CustomEvents_secondaryDimensionIsEventAction__Events.getAction_month.xml b/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventAction__Events.getAction_month.xml
index 098124ac66..098124ac66 100644
--- a/tests/PHPUnit/Integration/expected/test_CustomEvents_secondaryDimensionIsEventAction__Events.getAction_month.xml
+++ b/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventAction__Events.getAction_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_CustomEvents_secondaryDimensionIsEventAction__Events.getCategory_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventAction__Events.getCategory_day.xml
index 5f3469aa23..5f3469aa23 100644
--- a/tests/PHPUnit/Integration/expected/test_CustomEvents_secondaryDimensionIsEventAction__Events.getCategory_day.xml
+++ b/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventAction__Events.getCategory_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_CustomEvents_secondaryDimensionIsEventAction__Events.getCategory_month.xml b/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventAction__Events.getCategory_month.xml
index 1f8fdb7c02..1f8fdb7c02 100644
--- a/tests/PHPUnit/Integration/expected/test_CustomEvents_secondaryDimensionIsEventAction__Events.getCategory_month.xml
+++ b/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventAction__Events.getCategory_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_CustomEvents_secondaryDimensionIsEventAction__Events.getName_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventAction__Events.getName_day.xml
index 9461eeb42e..9461eeb42e 100644
--- a/tests/PHPUnit/Integration/expected/test_CustomEvents_secondaryDimensionIsEventAction__Events.getName_day.xml
+++ b/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventAction__Events.getName_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_CustomEvents_secondaryDimensionIsEventAction__Events.getName_month.xml b/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventAction__Events.getName_month.xml
index 5f8de9463f..5f8de9463f 100644
--- a/tests/PHPUnit/Integration/expected/test_CustomEvents_secondaryDimensionIsEventAction__Events.getName_month.xml
+++ b/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventAction__Events.getName_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_CustomEvents_secondaryDimensionIsEventCategory__Events.getAction_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventCategory__Events.getAction_day.xml
index 8d225ad12f..8d225ad12f 100644
--- a/tests/PHPUnit/Integration/expected/test_CustomEvents_secondaryDimensionIsEventCategory__Events.getAction_day.xml
+++ b/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventCategory__Events.getAction_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_CustomEvents_secondaryDimensionIsEventCategory__Events.getAction_month.xml b/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventCategory__Events.getAction_month.xml
index f558d64451..f558d64451 100644
--- a/tests/PHPUnit/Integration/expected/test_CustomEvents_secondaryDimensionIsEventCategory__Events.getAction_month.xml
+++ b/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventCategory__Events.getAction_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_CustomEvents_secondaryDimensionIsEventCategory__Events.getCategory_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventCategory__Events.getCategory_day.xml
index 18cffa0445..18cffa0445 100644
--- a/tests/PHPUnit/Integration/expected/test_CustomEvents_secondaryDimensionIsEventCategory__Events.getCategory_day.xml
+++ b/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventCategory__Events.getCategory_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_CustomEvents_secondaryDimensionIsEventCategory__Events.getCategory_month.xml b/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventCategory__Events.getCategory_month.xml
index 18cffa0445..18cffa0445 100644
--- a/tests/PHPUnit/Integration/expected/test_CustomEvents_secondaryDimensionIsEventCategory__Events.getCategory_month.xml
+++ b/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventCategory__Events.getCategory_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_CustomEvents_secondaryDimensionIsEventCategory__Events.getName_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventCategory__Events.getName_day.xml
index 03b5718c7b..03b5718c7b 100644
--- a/tests/PHPUnit/Integration/expected/test_CustomEvents_secondaryDimensionIsEventCategory__Events.getName_day.xml
+++ b/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventCategory__Events.getName_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_CustomEvents_secondaryDimensionIsEventCategory__Events.getName_month.xml b/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventCategory__Events.getName_month.xml
index 54676e7511..54676e7511 100644
--- a/tests/PHPUnit/Integration/expected/test_CustomEvents_secondaryDimensionIsEventCategory__Events.getName_month.xml
+++ b/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventCategory__Events.getName_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_CustomEvents_secondaryDimensionIsEventName__Events.getAction_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventName__Events.getAction_day.xml
index 26752bbd7b..26752bbd7b 100644
--- a/tests/PHPUnit/Integration/expected/test_CustomEvents_secondaryDimensionIsEventName__Events.getAction_day.xml
+++ b/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventName__Events.getAction_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_CustomEvents_secondaryDimensionIsEventName__Events.getAction_month.xml b/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventName__Events.getAction_month.xml
index 9868947268..9868947268 100644
--- a/tests/PHPUnit/Integration/expected/test_CustomEvents_secondaryDimensionIsEventName__Events.getAction_month.xml
+++ b/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventName__Events.getAction_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_CustomEvents_secondaryDimensionIsEventName__Events.getCategory_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventName__Events.getCategory_day.xml
index d6f7a63bbe..d6f7a63bbe 100644
--- a/tests/PHPUnit/Integration/expected/test_CustomEvents_secondaryDimensionIsEventName__Events.getCategory_day.xml
+++ b/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventName__Events.getCategory_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_CustomEvents_secondaryDimensionIsEventName__Events.getCategory_month.xml b/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventName__Events.getCategory_month.xml
index 835e7cc629..835e7cc629 100644
--- a/tests/PHPUnit/Integration/expected/test_CustomEvents_secondaryDimensionIsEventName__Events.getCategory_month.xml
+++ b/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventName__Events.getCategory_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_CustomEvents_secondaryDimensionIsEventName__Events.getName_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventName__Events.getName_day.xml
index d2eee9f023..d2eee9f023 100644
--- a/tests/PHPUnit/Integration/expected/test_CustomEvents_secondaryDimensionIsEventName__Events.getName_day.xml
+++ b/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventName__Events.getName_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_CustomEvents_secondaryDimensionIsEventName__Events.getName_month.xml b/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventName__Events.getName_month.xml
index d2eee9f023..d2eee9f023 100644
--- a/tests/PHPUnit/Integration/expected/test_CustomEvents_secondaryDimensionIsEventName__Events.getName_month.xml
+++ b/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventName__Events.getName_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_CustomEvents_segmentMatchesEventActionPlay__Actions.getPageUrls_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents_segmentMatchesEventActionPlay__Actions.getPageUrls_day.xml
index c234bed59e..c234bed59e 100644
--- a/tests/PHPUnit/Integration/expected/test_CustomEvents_segmentMatchesEventActionPlay__Actions.getPageUrls_day.xml
+++ b/tests/PHPUnit/System/expected/test_CustomEvents_segmentMatchesEventActionPlay__Actions.getPageUrls_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_CustomEvents_segmentMatchesEventActionPlay__Events.getAction_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents_segmentMatchesEventActionPlay__Events.getAction_day.xml
index 609b2b8d6c..609b2b8d6c 100644
--- a/tests/PHPUnit/Integration/expected/test_CustomEvents_segmentMatchesEventActionPlay__Events.getAction_day.xml
+++ b/tests/PHPUnit/System/expected/test_CustomEvents_segmentMatchesEventActionPlay__Events.getAction_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_CustomEvents_segmentMatchesEventActionPlay__Events.getCategory_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents_segmentMatchesEventActionPlay__Events.getCategory_day.xml
index 7582baa657..7582baa657 100644
--- a/tests/PHPUnit/Integration/expected/test_CustomEvents_segmentMatchesEventActionPlay__Events.getCategory_day.xml
+++ b/tests/PHPUnit/System/expected/test_CustomEvents_segmentMatchesEventActionPlay__Events.getCategory_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_CustomEvents_segmentMatchesEventActionPlay__Events.getName_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents_segmentMatchesEventActionPlay__Events.getName_day.xml
index e1aa570c57..e1aa570c57 100644
--- a/tests/PHPUnit/Integration/expected/test_CustomEvents_segmentMatchesEventActionPlay__Events.getName_day.xml
+++ b/tests/PHPUnit/System/expected/test_CustomEvents_segmentMatchesEventActionPlay__Events.getName_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_FlattenReports__Actions.getPageUrls_week.xml b/tests/PHPUnit/System/expected/test_FlattenReports__Actions.getPageUrls_week.xml
index 2e48a2f945..2e48a2f945 100644
--- a/tests/PHPUnit/Integration/expected/test_FlattenReports__Actions.getPageUrls_week.xml
+++ b/tests/PHPUnit/System/expected/test_FlattenReports__Actions.getPageUrls_week.xml
diff --git a/tests/PHPUnit/Integration/expected/test_FlattenReports__CustomVariables.getCustomVariables_day.xml b/tests/PHPUnit/System/expected/test_FlattenReports__CustomVariables.getCustomVariables_day.xml
index 8a085297ce..8a085297ce 100644
--- a/tests/PHPUnit/Integration/expected/test_FlattenReports__CustomVariables.getCustomVariables_day.xml
+++ b/tests/PHPUnit/System/expected/test_FlattenReports__CustomVariables.getCustomVariables_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_FlattenReports__Referrers.getWebsites_day.xml b/tests/PHPUnit/System/expected/test_FlattenReports__Referrers.getWebsites_day.xml
index 8c9042be1c..8c9042be1c 100644
--- a/tests/PHPUnit/Integration/expected/test_FlattenReports__Referrers.getWebsites_day.xml
+++ b/tests/PHPUnit/System/expected/test_FlattenReports__Referrers.getWebsites_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_FlattenReports_expandedSubtable__Actions.getPageUrls_week.xml b/tests/PHPUnit/System/expected/test_FlattenReports_expandedSubtable__Actions.getPageUrls_week.xml
index a40bfb0dea..a40bfb0dea 100644
--- a/tests/PHPUnit/Integration/expected/test_FlattenReports_expandedSubtable__Actions.getPageUrls_week.xml
+++ b/tests/PHPUnit/System/expected/test_FlattenReports_expandedSubtable__Actions.getPageUrls_week.xml
diff --git a/tests/PHPUnit/Integration/expected/test_FlattenReports_expandedWithDepth__Actions.getPageUrls_week.xml b/tests/PHPUnit/System/expected/test_FlattenReports_expandedWithDepth__Actions.getPageUrls_week.xml
index 326bf6903d..326bf6903d 100644
--- a/tests/PHPUnit/Integration/expected/test_FlattenReports_expandedWithDepth__Actions.getPageUrls_week.xml
+++ b/tests/PHPUnit/System/expected/test_FlattenReports_expandedWithDepth__Actions.getPageUrls_week.xml
diff --git a/tests/PHPUnit/Integration/expected/test_FlattenReports_flatFilterPatternRecursive__Actions.getPageUrls_week.xml b/tests/PHPUnit/System/expected/test_FlattenReports_flatFilterPatternRecursive__Actions.getPageUrls_week.xml
index 6acf67f60c..6acf67f60c 100644
--- a/tests/PHPUnit/Integration/expected/test_FlattenReports_flatFilterPatternRecursive__Actions.getPageUrls_week.xml
+++ b/tests/PHPUnit/System/expected/test_FlattenReports_flatFilterPatternRecursive__Actions.getPageUrls_week.xml
diff --git a/tests/PHPUnit/Integration/expected/test_FlattenReports_withAggregate__Actions.getPageUrls_week.xml b/tests/PHPUnit/System/expected/test_FlattenReports_withAggregate__Actions.getPageUrls_week.xml
index fb09d47fce..fb09d47fce 100644
--- a/tests/PHPUnit/Integration/expected/test_FlattenReports_withAggregate__Actions.getPageUrls_week.xml
+++ b/tests/PHPUnit/System/expected/test_FlattenReports_withAggregate__Actions.getPageUrls_week.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getDownload_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getDownload_month.xml
index c234bed59e..c234bed59e 100644
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getDownload_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getDownload_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getDownload_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getDownload_range.xml
index c234bed59e..c234bed59e 100644
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getDownload_range.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getDownload_range.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getDownloads_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getDownloads_month.xml
index 5eb17eb532..5eb17eb532 100644
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getDownloads_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getDownloads_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getDownloads_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getDownloads_range.xml
index 9c5b690268..9c5b690268 100644
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getDownloads_range.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getDownloads_range.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getEntryPageTitles_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageTitles_month.xml
index 77e2b64918..77e2b64918 100644
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getEntryPageTitles_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageTitles_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getEntryPageTitles_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageTitles_range.xml
index d8014b0c28..d8014b0c28 100644
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getEntryPageTitles_range.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageTitles_range.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getEntryPageUrls_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageUrls_month.xml
index 8845a80655..8845a80655 100644
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getEntryPageUrls_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageUrls_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getEntryPageUrls_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageUrls_range.xml
index b8b7233c2e..b8b7233c2e 100644
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getEntryPageUrls_range.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageUrls_range.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getExitPageTitles_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageTitles_month.xml
index f1b90a5e1d..f1b90a5e1d 100644
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getExitPageTitles_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageTitles_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getExitPageTitles_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageTitles_range.xml
index fbb87d260d..fbb87d260d 100644
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getExitPageTitles_range.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageTitles_range.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getExitPageUrls_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageUrls_month.xml
index 28acca1242..28acca1242 100644
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getExitPageUrls_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageUrls_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getExitPageUrls_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageUrls_range.xml
index ebf0fdffcf..ebf0fdffcf 100644
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getExitPageUrls_range.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageUrls_range.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getOutlink_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getOutlink_month.xml
index c234bed59e..c234bed59e 100644
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getOutlink_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getOutlink_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getOutlink_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getOutlink_range.xml
index c234bed59e..c234bed59e 100644
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getOutlink_range.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getOutlink_range.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getOutlinks_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getOutlinks_month.xml
index c234bed59e..c234bed59e 100644
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getOutlinks_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getOutlinks_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getOutlinks_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getOutlinks_range.xml
index d03b4e81bb..d03b4e81bb 100644
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getOutlinks_range.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getOutlinks_range.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getPageTitle_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageTitle_month.xml
index c234bed59e..c234bed59e 100644
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getPageTitle_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageTitle_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getPageTitle_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageTitle_range.xml
index c234bed59e..c234bed59e 100644
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getPageTitle_range.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageTitle_range.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getPageTitlesFollowingSiteSearch_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageTitlesFollowingSiteSearch_month.xml
index c234bed59e..c234bed59e 100644
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getPageTitlesFollowingSiteSearch_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageTitlesFollowingSiteSearch_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getPageTitlesFollowingSiteSearch_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageTitlesFollowingSiteSearch_range.xml
index c234bed59e..c234bed59e 100644
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getPageTitlesFollowingSiteSearch_range.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageTitlesFollowingSiteSearch_range.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getPageTitles_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageTitles_month.xml
index 143229b5e7..143229b5e7 100644
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getPageTitles_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageTitles_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getPageTitles_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageTitles_range.xml
index 6285169aa5..6285169aa5 100644
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getPageTitles_range.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageTitles_range.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getPageUrl_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrl_month.xml
index c5d48fa621..c5d48fa621 100644
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getPageUrl_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrl_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getPageUrl_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrl_range.xml
index c5d48fa621..c5d48fa621 100644
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getPageUrl_range.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrl_range.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getPageUrlsFollowingSiteSearch_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrlsFollowingSiteSearch_month.xml
index c234bed59e..c234bed59e 100644
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getPageUrlsFollowingSiteSearch_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrlsFollowingSiteSearch_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getPageUrlsFollowingSiteSearch_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrlsFollowingSiteSearch_range.xml
index c234bed59e..c234bed59e 100644
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getPageUrlsFollowingSiteSearch_range.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrlsFollowingSiteSearch_range.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getPageUrls_day.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrls_day.xml
index 94423ac9d9..94423ac9d9 100644
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getPageUrls_day.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrls_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getPageUrls_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrls_month.xml
index c3f7304c25..c3f7304c25 100644
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getPageUrls_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrls_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getPageUrls_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrls_range.xml
index 4ce246f6cf..4ce246f6cf 100644
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getPageUrls_range.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrls_range.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getSiteSearchCategories_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getSiteSearchCategories_month.xml
index c234bed59e..c234bed59e 100644
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getSiteSearchCategories_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getSiteSearchCategories_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getSiteSearchCategories_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getSiteSearchCategories_range.xml
index c234bed59e..c234bed59e 100644
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getSiteSearchCategories_range.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getSiteSearchCategories_range.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getSiteSearchKeywords_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getSiteSearchKeywords_month.xml
index c234bed59e..c234bed59e 100644
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getSiteSearchKeywords_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getSiteSearchKeywords_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getSiteSearchKeywords_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getSiteSearchKeywords_range.xml
index c234bed59e..c234bed59e 100644
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getSiteSearchKeywords_range.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getSiteSearchKeywords_range.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getSiteSearchNoResultKeywords_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getSiteSearchNoResultKeywords_month.xml
index c234bed59e..c234bed59e 100644
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getSiteSearchNoResultKeywords_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getSiteSearchNoResultKeywords_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getSiteSearchNoResultKeywords_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getSiteSearchNoResultKeywords_range.xml
index c234bed59e..c234bed59e 100644
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getSiteSearchNoResultKeywords_range.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getSiteSearchNoResultKeywords_range.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.get_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.get_month.xml
index 1f9e1351ba..1f9e1351ba 100644
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.get_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.get_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.get_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.get_range.xml
index a87ec05ee3..a87ec05ee3 100644
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.get_range.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.get_range.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__Contents.getContentNames_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Contents.getContentNames_month.xml
index c234bed59e..c234bed59e 100644
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__Contents.getContentNames_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Contents.getContentNames_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__Contents.getContentPieces_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Contents.getContentPieces_month.xml
index c234bed59e..c234bed59e 100644
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__Contents.getContentPieces_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Contents.getContentPieces_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__CustomVariables.getCustomVariables_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__CustomVariables.getCustomVariables_month.xml
index 6f8a9a4c98..6f8a9a4c98 100644
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__CustomVariables.getCustomVariables_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__CustomVariables.getCustomVariables_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getBrand_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrand_month.xml
index 38d80d2b64..38d80d2b64 100644
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getBrand_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrand_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getBrowserFamilies_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserFamilies_month.xml
index 77308fd9e7..77308fd9e7 100644
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getBrowserFamilies_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserFamilies_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getBrowserVersions_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserVersions_month.xml
index 80d06470a3..80d06470a3 100644
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getBrowserVersions_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserVersions_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getModel_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getModel_month.xml
index b9bf650ebc..b9bf650ebc 100644
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getModel_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getModel_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getOsFamilies_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getOsFamilies_month.xml
index 62d091d83d..62d091d83d 100644
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getOsFamilies_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getOsFamilies_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getOsVersions_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getOsVersions_month.xml
index 7cad47e0a1..7cad47e0a1 100644
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getOsVersions_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getOsVersions_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getType_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getType_month.xml
index 276e820253..276e820253 100644
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getType_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getType_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__Events.getAction_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Events.getAction_month.xml
index c234bed59e..c234bed59e 100644
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__Events.getAction_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Events.getAction_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__Events.getCategory_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Events.getCategory_month.xml
index c234bed59e..c234bed59e 100644
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__Events.getCategory_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Events.getCategory_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__Events.getName_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Events.getName_month.xml
index c234bed59e..c234bed59e 100644
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__Events.getName_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Events.getName_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__ExamplePlugin.getAnswerToLife.xml b/tests/PHPUnit/System/expected/test_ImportLogs__ExamplePlugin.getAnswerToLife.xml
index 36a787c47a..36a787c47a 100644
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__ExamplePlugin.getAnswerToLife.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__ExamplePlugin.getAnswerToLife.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__ExamplePlugin.getExampleReport_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__ExamplePlugin.getExampleReport_month.xml
index 1b2fed39f9..1b2fed39f9 100644
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__ExamplePlugin.getExampleReport_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__ExamplePlugin.getExampleReport_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__Goals.getDaysToConversion_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Goals.getDaysToConversion_month.xml
index 1ba1449d50..1ba1449d50 100644
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__Goals.getDaysToConversion_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Goals.getDaysToConversion_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__Goals.getGoals.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Goals.getGoals.xml
index b33fbbd767..b33fbbd767 100644
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__Goals.getGoals.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Goals.getGoals.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__Goals.getItemsCategory_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Goals.getItemsCategory_month.xml
index 89122851de..89122851de 100644
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__Goals.getItemsCategory_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Goals.getItemsCategory_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__Goals.getItemsName_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Goals.getItemsName_month.xml
index 161d8ffeae..161d8ffeae 100644
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__Goals.getItemsName_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Goals.getItemsName_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__Goals.getItemsSku_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Goals.getItemsSku_month.xml
index c5ee399492..c5ee399492 100644
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__Goals.getItemsSku_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Goals.getItemsSku_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__Goals.getVisitsUntilConversion_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Goals.getVisitsUntilConversion_month.xml
index 0a94d5f36d..0a94d5f36d 100644
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__Goals.getVisitsUntilConversion_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Goals.getVisitsUntilConversion_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__Goals.get_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Goals.get_month.xml
index fc80cf81c0..fc80cf81c0 100644
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__Goals.get_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Goals.get_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml
index 06291c5c5f..06291c5c5f 100644
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__MultiSites.getAll_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__MultiSites.getAll_month.xml
index eb2209a224..eb2209a224 100644
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__MultiSites.getAll_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__MultiSites.getAll_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__MultiSites.getOne_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__MultiSites.getOne_month.xml
index 1fb93e2a2a..1fb93e2a2a 100644
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__MultiSites.getOne_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__MultiSites.getOne_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__Provider.getProvider_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Provider.getProvider_month.xml
index e248df22a8..e248df22a8 100644
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__Provider.getProvider_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Provider.getProvider_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__Referrers.getAll_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Referrers.getAll_month.xml
index 808d27a0c7..808d27a0c7 100644
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__Referrers.getAll_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Referrers.getAll_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__Referrers.getCampaigns_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Referrers.getCampaigns_month.xml
index c234bed59e..c234bed59e 100644
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__Referrers.getCampaigns_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Referrers.getCampaigns_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__Referrers.getKeywordsForPageUrl_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Referrers.getKeywordsForPageUrl_month.xml
index c234bed59e..c234bed59e 100644
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__Referrers.getKeywordsForPageUrl_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Referrers.getKeywordsForPageUrl_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__Referrers.getKeywords_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Referrers.getKeywords_month.xml
index c234bed59e..c234bed59e 100644
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__Referrers.getKeywords_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Referrers.getKeywords_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__Referrers.getNumberOfDistinctCampaigns_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Referrers.getNumberOfDistinctCampaigns_month.xml
index f5722c2b94..f5722c2b94 100644
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__Referrers.getNumberOfDistinctCampaigns_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Referrers.getNumberOfDistinctCampaigns_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__Referrers.getNumberOfDistinctKeywords_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Referrers.getNumberOfDistinctKeywords_month.xml
index f5722c2b94..f5722c2b94 100644
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__Referrers.getNumberOfDistinctKeywords_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Referrers.getNumberOfDistinctKeywords_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__Referrers.getNumberOfDistinctSearchEngines_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Referrers.getNumberOfDistinctSearchEngines_month.xml
index f5722c2b94..f5722c2b94 100644
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__Referrers.getNumberOfDistinctSearchEngines_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Referrers.getNumberOfDistinctSearchEngines_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__Referrers.getNumberOfDistinctWebsitesUrls_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Referrers.getNumberOfDistinctWebsitesUrls_month.xml
index 13002b2017..13002b2017 100644
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__Referrers.getNumberOfDistinctWebsitesUrls_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Referrers.getNumberOfDistinctWebsitesUrls_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__Referrers.getNumberOfDistinctWebsites_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Referrers.getNumberOfDistinctWebsites_month.xml
index 13002b2017..13002b2017 100644
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__Referrers.getNumberOfDistinctWebsites_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Referrers.getNumberOfDistinctWebsites_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__Referrers.getReferrerType_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Referrers.getReferrerType_month.xml
index 80a6349ac1..80a6349ac1 100644
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__Referrers.getReferrerType_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Referrers.getReferrerType_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__Referrers.getSearchEngines_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Referrers.getSearchEngines_month.xml
index c234bed59e..c234bed59e 100644
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__Referrers.getSearchEngines_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Referrers.getSearchEngines_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__Referrers.getSocials_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Referrers.getSocials_month.xml
index c234bed59e..c234bed59e 100644
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__Referrers.getSocials_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Referrers.getSocials_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__Referrers.getUrlsForSocial_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Referrers.getUrlsForSocial_month.xml
index c234bed59e..c234bed59e 100644
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__Referrers.getUrlsForSocial_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Referrers.getUrlsForSocial_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__Referrers.getWebsites_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Referrers.getWebsites_month.xml
index bfba8f21af..bfba8f21af 100644
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__Referrers.getWebsites_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Referrers.getWebsites_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserCountry.getCity_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getCity_month.xml
index a14f0cec91..a14f0cec91 100644
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserCountry.getCity_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getCity_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserCountry.getContinent_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getContinent_month.xml
index 23e244b751..23e244b751 100644
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserCountry.getContinent_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getContinent_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserCountry.getCountry_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getCountry_month.xml
index ce5523efde..ce5523efde 100644
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserCountry.getCountry_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getCountry_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserCountry.getNumberOfDistinctCountries_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getNumberOfDistinctCountries_month.xml
index 17feb622cc..17feb622cc 100644
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserCountry.getNumberOfDistinctCountries_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getNumberOfDistinctCountries_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserCountry.getRegion_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getRegion_month.xml
index 4067fb2618..4067fb2618 100644
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserCountry.getRegion_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getRegion_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getBrowserType_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getBrowserType_month.xml
index 0a914aaf35..0a914aaf35 100644
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getBrowserType_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getBrowserType_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getBrowserVersion_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getBrowserVersion_month.xml
index 4be2e497a2..4be2e497a2 100644
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getBrowserVersion_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getBrowserVersion_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getBrowser_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getBrowser_month.xml
index 99d9c637a2..99d9c637a2 100644
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getBrowser_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getBrowser_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getConfiguration_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getConfiguration_month.xml
index 99f2f8d770..99f2f8d770 100644
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getConfiguration_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getConfiguration_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getLanguageCode_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getLanguageCode_month.xml
index fc37ec8a8f..fc37ec8a8f 100644
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getLanguageCode_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getLanguageCode_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getLanguage_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getLanguage_month.xml
index 1f8c578db7..1f8c578db7 100644
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getLanguage_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getLanguage_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getMobileVsDesktop_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getMobileVsDesktop_month.xml
index 27bfc099ba..27bfc099ba 100644
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getMobileVsDesktop_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getMobileVsDesktop_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getOSFamily_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getOSFamily_month.xml
index cb47530ed2..cb47530ed2 100644
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getOSFamily_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getOSFamily_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getOS_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getOS_month.xml
index 1ac05e3dda..1ac05e3dda 100644
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getOS_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getOS_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getPlugin_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getPlugin_month.xml
index 7079af5413..7079af5413 100644
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getPlugin_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getPlugin_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getResolution_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getResolution_month.xml
index 659d5beea1..659d5beea1 100644
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getResolution_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getResolution_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getWideScreen_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getWideScreen_month.xml
index 2048a44e64..2048a44e64 100644
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getWideScreen_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getWideScreen_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitFrequency.get_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitFrequency.get_month.xml
index 3633fe5914..3633fe5914 100644
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitFrequency.get_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitFrequency.get_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitFrequency.get_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitFrequency.get_range.xml
index f301254690..f301254690 100644
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitFrequency.get_range.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitFrequency.get_range.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitTime.getByDayOfWeek_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getByDayOfWeek_month.xml
index 1a729a8e26..1a729a8e26 100644
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitTime.getByDayOfWeek_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getByDayOfWeek_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitTime.getVisitInformationPerLocalTime_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getVisitInformationPerLocalTime_month.xml
index 427319a89f..427319a89f 100644
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitTime.getVisitInformationPerLocalTime_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getVisitInformationPerLocalTime_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitTime.getVisitInformationPerServerTime_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getVisitInformationPerServerTime_month.xml
index 515e54eb3b..515e54eb3b 100644
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitTime.getVisitInformationPerServerTime_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getVisitInformationPerServerTime_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByDaysSinceLast_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByDaysSinceLast_month.xml
index c47de22fc4..c47de22fc4 100644
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByDaysSinceLast_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByDaysSinceLast_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByDaysSinceLast_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByDaysSinceLast_range.xml
index c7ed81d100..c7ed81d100 100644
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByDaysSinceLast_range.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByDaysSinceLast_range.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByVisitCount_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByVisitCount_month.xml
index 0830ca0d10..0830ca0d10 100644
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByVisitCount_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByVisitCount_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByVisitCount_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByVisitCount_range.xml
index d7672ae30c..d7672ae30c 100644
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByVisitCount_range.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByVisitCount_range.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerPage_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerPage_month.xml
index 4e6a9ab29e..4e6a9ab29e 100644
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerPage_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerPage_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerPage_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerPage_range.xml
index 11e27426c0..11e27426c0 100644
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerPage_range.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerPage_range.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerVisitDuration_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerVisitDuration_month.xml
index a64c14a967..a64c14a967 100644
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerVisitDuration_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerVisitDuration_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerVisitDuration_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerVisitDuration_range.xml
index a0cba6d294..a0cba6d294 100644
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerVisitDuration_range.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerVisitDuration_range.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitsSummary.getActions_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getActions_month.xml
index 3fb9469667..3fb9469667 100644
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitsSummary.getActions_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getActions_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitsSummary.getBounceCount_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getBounceCount_month.xml
index 4c77f1f6e6..4c77f1f6e6 100644
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitsSummary.getBounceCount_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getBounceCount_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitsSummary.getMaxActions_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getMaxActions_month.xml
index 15ef03fb49..15ef03fb49 100644
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitsSummary.getMaxActions_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getMaxActions_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitsSummary.getSumVisitsLengthPretty_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getSumVisitsLengthPretty_month.xml
index 2c93902a53..2c93902a53 100644
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitsSummary.getSumVisitsLengthPretty_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getSumVisitsLengthPretty_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitsSummary.getSumVisitsLength_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getSumVisitsLength_month.xml
index df25f1c1f3..df25f1c1f3 100644
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitsSummary.getSumVisitsLength_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getSumVisitsLength_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitsSummary.getUniqueVisitors_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getUniqueVisitors_month.xml
index 40bd2e592a..40bd2e592a 100644
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitsSummary.getUniqueVisitors_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getUniqueVisitors_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitsSummary.getUsers_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getUsers_month.xml
index f5722c2b94..f5722c2b94 100644
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitsSummary.getUsers_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getUsers_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitsSummary.getVisitsConverted_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getVisitsConverted_month.xml
index 4c77f1f6e6..4c77f1f6e6 100644
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitsSummary.getVisitsConverted_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getVisitsConverted_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitsSummary.getVisits_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getVisits_month.xml
index 40bd2e592a..40bd2e592a 100644
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitsSummary.getVisits_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getVisits_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitsSummary.get_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.get_month.xml
index 327d564f47..327d564f47 100644
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitsSummary.get_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.get_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs_siteIdTwo_TrackedUsingLogReplay__VisitsSummary.get_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs_siteIdTwo_TrackedUsingLogReplay__VisitsSummary.get_month.xml
index b0e66b9280..b0e66b9280 100644
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs_siteIdTwo_TrackedUsingLogReplay__VisitsSummary.get_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs_siteIdTwo_TrackedUsingLogReplay__VisitsSummary.get_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs_withEnhancedAndLast7__MultiSites.getAll_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs_withEnhancedAndLast7__MultiSites.getAll_month.xml
index 0fb183d46f..0fb183d46f 100644
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs_withEnhancedAndLast7__MultiSites.getAll_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs_withEnhancedAndLast7__MultiSites.getAll_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_LabelFilter_0__Actions.getPageUrls_day.xml b/tests/PHPUnit/System/expected/test_LabelFilter_0__Actions.getPageUrls_day.xml
index 88bdbcf6cd..88bdbcf6cd 100644
--- a/tests/PHPUnit/Integration/expected/test_LabelFilter_0__Actions.getPageUrls_day.xml
+++ b/tests/PHPUnit/System/expected/test_LabelFilter_0__Actions.getPageUrls_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_LabelFilter_dir2sub0filephp__Actions.getPageUrls_day.xml b/tests/PHPUnit/System/expected/test_LabelFilter_dir2sub0filephp__Actions.getPageUrls_day.xml
index 8cedb2f9a9..8cedb2f9a9 100644
--- a/tests/PHPUnit/Integration/expected/test_LabelFilter_dir2sub0filephp__Actions.getPageUrls_day.xml
+++ b/tests/PHPUnit/System/expected/test_LabelFilter_dir2sub0filephp__Actions.getPageUrls_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_LabelFilter_dir__Actions.getPageUrls_day.xml b/tests/PHPUnit/System/expected/test_LabelFilter_dir__Actions.getPageUrls_day.xml
index 3634faa18a..3634faa18a 100644
--- a/tests/PHPUnit/Integration/expected/test_LabelFilter_dir__Actions.getPageUrls_day.xml
+++ b/tests/PHPUnit/System/expected/test_LabelFilter_dir__Actions.getPageUrls_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_LabelFilter_dir_range__Actions.getPageUrls_day.xml b/tests/PHPUnit/System/expected/test_LabelFilter_dir_range__Actions.getPageUrls_day.xml
index b648ce6807..b648ce6807 100644
--- a/tests/PHPUnit/Integration/expected/test_LabelFilter_dir_range__Actions.getPageUrls_day.xml
+++ b/tests/PHPUnit/System/expected/test_LabelFilter_dir_range__Actions.getPageUrls_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_LabelFilter_dirfilephpfoobarfoo2bar__Actions.getPageUrls_day.xml b/tests/PHPUnit/System/expected/test_LabelFilter_dirfilephpfoobarfoo2bar__Actions.getPageUrls_day.xml
index b557287b32..b557287b32 100644
--- a/tests/PHPUnit/Integration/expected/test_LabelFilter_dirfilephpfoobarfoo2bar__Actions.getPageUrls_day.xml
+++ b/tests/PHPUnit/System/expected/test_LabelFilter_dirfilephpfoobarfoo2bar__Actions.getPageUrls_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_LabelFilter_dirnonExistent__Actions.getPageUrls_day.xml b/tests/PHPUnit/System/expected/test_LabelFilter_dirnonExistent__Actions.getPageUrls_day.xml
index c234bed59e..c234bed59e 100644
--- a/tests/PHPUnit/Integration/expected/test_LabelFilter_dirnonExistent__Actions.getPageUrls_day.xml
+++ b/tests/PHPUnit/System/expected/test_LabelFilter_dirnonExistent__Actions.getPageUrls_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_LabelFilter_keywords_html__Referrers.getSearchEngines_day.xml b/tests/PHPUnit/System/expected/test_LabelFilter_keywords_html__Referrers.getSearchEngines_day.xml
index 411d2a2eb9..411d2a2eb9 100644
--- a/tests/PHPUnit/Integration/expected/test_LabelFilter_keywords_html__Referrers.getSearchEngines_day.xml
+++ b/tests/PHPUnit/System/expected/test_LabelFilter_keywords_html__Referrers.getSearchEngines_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_LabelFilter_shouldBeNoData__Actions.getPageUrls_day.xml b/tests/PHPUnit/System/expected/test_LabelFilter_shouldBeNoData__Actions.getPageUrls_day.xml
index c234bed59e..c234bed59e 100644
--- a/tests/PHPUnit/Integration/expected/test_LabelFilter_shouldBeNoData__Actions.getPageUrls_day.xml
+++ b/tests/PHPUnit/System/expected/test_LabelFilter_shouldBeNoData__Actions.getPageUrls_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_LabelFilter_terminalOperator_selectBranch__Actions.getPageTitles_day.xml b/tests/PHPUnit/System/expected/test_LabelFilter_terminalOperator_selectBranch__Actions.getPageTitles_day.xml
index 04dac45ecd..04dac45ecd 100644
--- a/tests/PHPUnit/Integration/expected/test_LabelFilter_terminalOperator_selectBranch__Actions.getPageTitles_day.xml
+++ b/tests/PHPUnit/System/expected/test_LabelFilter_terminalOperator_selectBranch__Actions.getPageTitles_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_LabelFilter_terminalOperator_selectTerminal__Actions.getPageTitles_day.xml b/tests/PHPUnit/System/expected/test_LabelFilter_terminalOperator_selectTerminal__Actions.getPageTitles_day.xml
index 1517efab30..1517efab30 100644
--- a/tests/PHPUnit/Integration/expected/test_LabelFilter_terminalOperator_selectTerminal__Actions.getPageTitles_day.xml
+++ b/tests/PHPUnit/System/expected/test_LabelFilter_terminalOperator_selectTerminal__Actions.getPageTitles_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_LabelFilter_terminalOperator_selectTerminal__Actions.getPageUrls_day.xml b/tests/PHPUnit/System/expected/test_LabelFilter_terminalOperator_selectTerminal__Actions.getPageUrls_day.xml
index 2a3958ceba..2a3958ceba 100644
--- a/tests/PHPUnit/Integration/expected/test_LabelFilter_terminalOperator_selectTerminal__Actions.getPageUrls_day.xml
+++ b/tests/PHPUnit/System/expected/test_LabelFilter_terminalOperator_selectTerminal__Actions.getPageUrls_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_LabelFilter_thisiscool__Actions.getPageUrls_day.xml b/tests/PHPUnit/System/expected/test_LabelFilter_thisiscool__Actions.getPageUrls_day.xml
index 4cec8aa9aa..4cec8aa9aa 100644
--- a/tests/PHPUnit/Integration/expected/test_LabelFilter_thisiscool__Actions.getPageUrls_day.xml
+++ b/tests/PHPUnit/System/expected/test_LabelFilter_thisiscool__Actions.getPageUrls_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_LabelFilter_titlesRecursive__Actions.getPageTitles_day.xml b/tests/PHPUnit/System/expected/test_LabelFilter_titlesRecursive__Actions.getPageTitles_day.xml
index 718edc60ac..718edc60ac 100644
--- a/tests/PHPUnit/Integration/expected/test_LabelFilter_titlesRecursive__Actions.getPageTitles_day.xml
+++ b/tests/PHPUnit/System/expected/test_LabelFilter_titlesRecursive__Actions.getPageTitles_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_LabelFilter_titles__Actions.getPageTitles_day.xml b/tests/PHPUnit/System/expected/test_LabelFilter_titles__Actions.getPageTitles_day.xml
index afffc60a48..afffc60a48 100644
--- a/tests/PHPUnit/Integration/expected/test_LabelFilter_titles__Actions.getPageTitles_day.xml
+++ b/tests/PHPUnit/System/expected/test_LabelFilter_titles__Actions.getPageTitles_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortAsc__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortAsc__Live.getLastVisitsDetails_month.xml
index 9e965a6fa7..9e965a6fa7 100644
--- a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortAsc__Live.getLastVisitsDetails_month.xml
+++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortAsc__Live.getLastVisitsDetails_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisitAsc__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisitAsc__Live.getLastVisitsDetails_month.xml
index 02678e9aee..02678e9aee 100644
--- a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisitAsc__Live.getLastVisitsDetails_month.xml
+++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisitAsc__Live.getLastVisitsDetails_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisit__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisit__Live.getLastVisitsDetails_month.xml
index 47c2f38c4e..47c2f38c4e 100644
--- a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisit__Live.getLastVisitsDetails_month.xml
+++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisit__Live.getLastVisitsDetails_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByVisitCount__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByVisitCount__Live.getLastVisitsDetails_month.xml
index 8c0eba69bb..8c0eba69bb 100644
--- a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByVisitCount__Live.getLastVisitsDetails_month.xml
+++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByVisitCount__Live.getLastVisitsDetails_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortDesc__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortDesc__Live.getLastVisitsDetails_month.xml
index 47c2f38c4e..47c2f38c4e 100644
--- a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortDesc__Live.getLastVisitsDetails_month.xml
+++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortDesc__Live.getLastVisitsDetails_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__Live.getLastVisitsDetails_month.xml
index ce1748a73a..ce1748a73a 100644
--- a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest__Live.getLastVisitsDetails_month.xml
+++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__Live.getLastVisitsDetails_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getCity_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getCity_month.xml
index 15d7f11b70..15d7f11b70 100644
--- a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getCity_month.xml
+++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getCity_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getContinent_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getContinent_month.xml
index 9572d1df13..9572d1df13 100644
--- a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getContinent_month.xml
+++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getContinent_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getCountry_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getCountry_month.xml
index c37c6d773b..c37c6d773b 100644
--- a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getCountry_month.xml
+++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getCountry_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getLocationFromIP.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getLocationFromIP.xml
index e3708f1486..e3708f1486 100644
--- a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getLocationFromIP.xml
+++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getLocationFromIP.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getNumberOfDistinctCountries_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getNumberOfDistinctCountries_month.xml
index 5fec83d011..5fec83d011 100644
--- a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getNumberOfDistinctCountries_month.xml
+++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getNumberOfDistinctCountries_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getRegion_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getRegion_month.xml
index dc3dfb8724..dc3dfb8724 100644
--- a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getRegion_month.xml
+++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getRegion_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_city__UserCountry.getCity_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_city__UserCountry.getCity_month.xml
index 9f9d42d029..9f9d42d029 100644
--- a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_city__UserCountry.getCity_month.xml
+++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_city__UserCountry.getCity_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_city__UserCountry.getContinent_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_city__UserCountry.getContinent_month.xml
index 0d795a3fdc..0d795a3fdc 100644
--- a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_city__UserCountry.getContinent_month.xml
+++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_city__UserCountry.getContinent_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_city__UserCountry.getCountry_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_city__UserCountry.getCountry_month.xml
index 369a9aa0e0..369a9aa0e0 100644
--- a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_city__UserCountry.getCountry_month.xml
+++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_city__UserCountry.getCountry_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_city__UserCountry.getNumberOfDistinctCountries_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_city__UserCountry.getNumberOfDistinctCountries_month.xml
index 606fbb5241..606fbb5241 100644
--- a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_city__UserCountry.getNumberOfDistinctCountries_month.xml
+++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_city__UserCountry.getNumberOfDistinctCountries_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_city__UserCountry.getRegion_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_city__UserCountry.getRegion_month.xml
index 1324cdf0bc..1324cdf0bc 100644
--- a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_city__UserCountry.getRegion_month.xml
+++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_city__UserCountry.getRegion_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_continent__UserCountry.getCountry_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_continent__UserCountry.getCountry_month.xml
index 18fe81f3a0..18fe81f3a0 100644
--- a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_continent__UserCountry.getCountry_month.xml
+++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_continent__UserCountry.getCountry_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getCity_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getCity_month.xml
index 77c07df86f..77c07df86f 100644
--- a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getCity_month.xml
+++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getCity_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getContinent_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getContinent_month.xml
index 6f06048a7f..6f06048a7f 100644
--- a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getContinent_month.xml
+++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getContinent_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getCountry_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getCountry_month.xml
index f881b40d77..f881b40d77 100644
--- a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getCountry_month.xml
+++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getCountry_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getNumberOfDistinctCountries_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getNumberOfDistinctCountries_month.xml
index 606fbb5241..606fbb5241 100644
--- a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getNumberOfDistinctCountries_month.xml
+++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getNumberOfDistinctCountries_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getRegion_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getRegion_month.xml
index 16373b92ee..16373b92ee 100644
--- a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getRegion_month.xml
+++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getRegion_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getCity_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getCity_month.xml
index 0f87ed59f3..0f87ed59f3 100644
--- a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getCity_month.xml
+++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getCity_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getContinent_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getContinent_month.xml
index b5566a46cd..b5566a46cd 100644
--- a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getContinent_month.xml
+++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getContinent_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getCountry_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getCountry_month.xml
index 48c3eea1ad..48c3eea1ad 100644
--- a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getCountry_month.xml
+++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getCountry_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getNumberOfDistinctCountries_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getNumberOfDistinctCountries_month.xml
index 606fbb5241..606fbb5241 100644
--- a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getNumberOfDistinctCountries_month.xml
+++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getNumberOfDistinctCountries_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getRegion_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getRegion_month.xml
index 5b3a0754a3..5b3a0754a3 100644
--- a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getRegion_month.xml
+++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getRegion_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_sortByProcessedMetric__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_sortByProcessedMetric__API.getProcessedReport_day.xml
index ea574a289f..ea574a289f 100644
--- a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_sortByProcessedMetric__API.getProcessedReport_day.xml
+++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_sortByProcessedMetric__API.getProcessedReport_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_sortByProcessedMetric_constantRowsCountShouldKeepEmptyRows__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_sortByProcessedMetric_constantRowsCountShouldKeepEmptyRows__API.getProcessedReport_day.xml
index 3861e6c668..3861e6c668 100644
--- a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_sortByProcessedMetric_constantRowsCountShouldKeepEmptyRows__API.getProcessedReport_day.xml
+++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_sortByProcessedMetric_constantRowsCountShouldKeepEmptyRows__API.getProcessedReport_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_MultipleSitesArchivingTest_sitesGroup__VisitsSummary.get_day.xml b/tests/PHPUnit/System/expected/test_MultipleSitesArchivingTest_sitesGroup__VisitsSummary.get_day.xml
index 64e9c36af1..64e9c36af1 100644
--- a/tests/PHPUnit/Integration/expected/test_MultipleSitesArchivingTest_sitesGroup__VisitsSummary.get_day.xml
+++ b/tests/PHPUnit/System/expected/test_MultipleSitesArchivingTest_sitesGroup__VisitsSummary.get_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_MultipleSitesArchivingTest_sitesGroup__VisitsSummary.get_month.xml b/tests/PHPUnit/System/expected/test_MultipleSitesArchivingTest_sitesGroup__VisitsSummary.get_month.xml
index 64e9c36af1..64e9c36af1 100644
--- a/tests/PHPUnit/Integration/expected/test_MultipleSitesArchivingTest_sitesGroup__VisitsSummary.get_month.xml
+++ b/tests/PHPUnit/System/expected/test_MultipleSitesArchivingTest_sitesGroup__VisitsSummary.get_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_NonUnicode__Actions.getPageTitles_day.xml b/tests/PHPUnit/System/expected/test_NonUnicode__Actions.getPageTitles_day.xml
index 008d9e87fb..008d9e87fb 100644
--- a/tests/PHPUnit/Integration/expected/test_NonUnicode__Actions.getPageTitles_day.xml
+++ b/tests/PHPUnit/System/expected/test_NonUnicode__Actions.getPageTitles_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_NonUnicode__Actions.getPageUrls_day.xml b/tests/PHPUnit/System/expected/test_NonUnicode__Actions.getPageUrls_day.xml
index 3b556b046b..3b556b046b 100644
--- a/tests/PHPUnit/Integration/expected/test_NonUnicode__Actions.getPageUrls_day.xml
+++ b/tests/PHPUnit/System/expected/test_NonUnicode__Actions.getPageUrls_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_NonUnicode__Actions.getSiteSearchKeywords_day.xml b/tests/PHPUnit/System/expected/test_NonUnicode__Actions.getSiteSearchKeywords_day.xml
index 9b4eb015d0..9b4eb015d0 100644
--- a/tests/PHPUnit/Integration/expected/test_NonUnicode__Actions.getSiteSearchKeywords_day.xml
+++ b/tests/PHPUnit/System/expected/test_NonUnicode__Actions.getSiteSearchKeywords_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_NonUnicode__Referrers.getWebsites_day.xml b/tests/PHPUnit/System/expected/test_NonUnicode__Referrers.getWebsites_day.xml
index bf07781a28..bf07781a28 100644
--- a/tests/PHPUnit/Integration/expected/test_NonUnicode__Referrers.getWebsites_day.xml
+++ b/tests/PHPUnit/System/expected/test_NonUnicode__Referrers.getWebsites_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__Actions.getDownload_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Actions.getDownload_day.xml
index 32470e4bcb..32470e4bcb 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__Actions.getDownload_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Actions.getDownload_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__Actions.getDownloads_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Actions.getDownloads_day.xml
index c064136f43..c064136f43 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__Actions.getDownloads_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Actions.getDownloads_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__Actions.getEntryPageTitles_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Actions.getEntryPageTitles_day.xml
index 124e271777..124e271777 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__Actions.getEntryPageTitles_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Actions.getEntryPageTitles_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__Actions.getEntryPageUrls_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Actions.getEntryPageUrls_day.xml
index 5b3878f7b2..5b3878f7b2 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__Actions.getEntryPageUrls_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Actions.getEntryPageUrls_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__Actions.getExitPageTitles_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Actions.getExitPageTitles_day.xml
index f80bfdd222..f80bfdd222 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__Actions.getExitPageTitles_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Actions.getExitPageTitles_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__Actions.getExitPageUrls_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Actions.getExitPageUrls_day.xml
index 3986b5b44b..3986b5b44b 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__Actions.getExitPageUrls_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Actions.getExitPageUrls_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__Actions.getOutlink_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Actions.getOutlink_day.xml
index 5971863326..5971863326 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__Actions.getOutlink_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Actions.getOutlink_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__Actions.getOutlinks_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Actions.getOutlinks_day.xml
index 539d798e9b..539d798e9b 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__Actions.getOutlinks_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Actions.getOutlinks_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__Actions.getPageTitle_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Actions.getPageTitle_day.xml
index 629847ae61..629847ae61 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__Actions.getPageTitle_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Actions.getPageTitle_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__Actions.getPageTitlesFollowingSiteSearch_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Actions.getPageTitlesFollowingSiteSearch_day.xml
index c234bed59e..c234bed59e 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__Actions.getPageTitlesFollowingSiteSearch_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Actions.getPageTitlesFollowingSiteSearch_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__Actions.getPageTitles_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Actions.getPageTitles_day.xml
index 510f81282a..510f81282a 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__Actions.getPageTitles_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Actions.getPageTitles_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__Actions.getPageUrl_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Actions.getPageUrl_day.xml
index 0880f58750..0880f58750 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__Actions.getPageUrl_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Actions.getPageUrl_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__Actions.getPageUrlsFollowingSiteSearch_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Actions.getPageUrlsFollowingSiteSearch_day.xml
index c234bed59e..c234bed59e 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__Actions.getPageUrlsFollowingSiteSearch_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Actions.getPageUrlsFollowingSiteSearch_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__Actions.getPageUrls_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Actions.getPageUrls_day.xml
index 62c8fa6fc8..62c8fa6fc8 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__Actions.getPageUrls_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Actions.getPageUrls_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__Actions.getSiteSearchCategories_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Actions.getSiteSearchCategories_day.xml
index c234bed59e..c234bed59e 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__Actions.getSiteSearchCategories_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Actions.getSiteSearchCategories_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__Actions.getSiteSearchKeywords_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Actions.getSiteSearchKeywords_day.xml
index c234bed59e..c234bed59e 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__Actions.getSiteSearchKeywords_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Actions.getSiteSearchKeywords_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__Actions.getSiteSearchNoResultKeywords_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Actions.getSiteSearchNoResultKeywords_day.xml
index c234bed59e..c234bed59e 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__Actions.getSiteSearchNoResultKeywords_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Actions.getSiteSearchNoResultKeywords_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__Actions.get_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Actions.get_day.xml
index e04ea4296d..e04ea4296d 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__Actions.get_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Actions.get_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__Contents.getContentNames_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Contents.getContentNames_day.xml
index c234bed59e..c234bed59e 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__Contents.getContentNames_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Contents.getContentNames_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__Contents.getContentPieces_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Contents.getContentPieces_day.xml
index c234bed59e..c234bed59e 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__Contents.getContentPieces_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Contents.getContentPieces_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__CoreAdminHome.getKnownSegmentsToArchive.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__CoreAdminHome.getKnownSegmentsToArchive.xml
index c234bed59e..c234bed59e 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__CoreAdminHome.getKnownSegmentsToArchive.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__CoreAdminHome.getKnownSegmentsToArchive.xml
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__CoreAdminHome.getWebsiteIdsToInvalidate.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__CoreAdminHome.getWebsiteIdsToInvalidate.xml
index c234bed59e..c234bed59e 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__CoreAdminHome.getWebsiteIdsToInvalidate.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__CoreAdminHome.getWebsiteIdsToInvalidate.xml
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__CustomVariables.getCustomVariables_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__CustomVariables.getCustomVariables_day.xml
index c234bed59e..c234bed59e 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__CustomVariables.getCustomVariables_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__CustomVariables.getCustomVariables_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__CustomVariables.getReservedCustomVariableKeys.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__CustomVariables.getReservedCustomVariableKeys.xml
index f10505afcc..f10505afcc 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__CustomVariables.getReservedCustomVariableKeys.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__CustomVariables.getReservedCustomVariableKeys.xml
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrand_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrand_day.xml
index 8b154c9334..8b154c9334 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrand_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrand_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrowserFamilies_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrowserFamilies_day.xml
index 84860eba92..84860eba92 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrowserFamilies_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrowserFamilies_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrowserVersions_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrowserVersions_day.xml
index 6f656fdf68..6f656fdf68 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrowserVersions_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrowserVersions_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__DevicesDetection.getModel_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getModel_day.xml
index 050a4cc6c8..050a4cc6c8 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__DevicesDetection.getModel_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getModel_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__DevicesDetection.getOsFamilies_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getOsFamilies_day.xml
index 379e429ee3..379e429ee3 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__DevicesDetection.getOsFamilies_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getOsFamilies_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__DevicesDetection.getOsVersions_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getOsVersions_day.xml
index 4e417535ae..4e417535ae 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__DevicesDetection.getOsVersions_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getOsVersions_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__DevicesDetection.getType_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getType_day.xml
index 347eac465f..347eac465f 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__DevicesDetection.getType_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getType_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__Events.getAction_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Events.getAction_day.xml
index c234bed59e..c234bed59e 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__Events.getAction_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Events.getAction_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__Events.getCategory_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Events.getCategory_day.xml
index c234bed59e..c234bed59e 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__Events.getCategory_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Events.getCategory_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__Events.getName_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Events.getName_day.xml
index c234bed59e..c234bed59e 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__Events.getName_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Events.getName_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__ExamplePlugin.getAnswerToLife.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__ExamplePlugin.getAnswerToLife.xml
index 36a787c47a..36a787c47a 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__ExamplePlugin.getAnswerToLife.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__ExamplePlugin.getAnswerToLife.xml
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__ExamplePlugin.getExampleReport_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__ExamplePlugin.getExampleReport_day.xml
index 1b2fed39f9..1b2fed39f9 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__ExamplePlugin.getExampleReport_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__ExamplePlugin.getExampleReport_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__Goals.getConversionRate_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Goals.getConversionRate_day.xml
index dff1089a71..dff1089a71 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__Goals.getConversionRate_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Goals.getConversionRate_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__Goals.getConversions_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Goals.getConversions_day.xml
index 13002b2017..13002b2017 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__Goals.getConversions_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Goals.getConversions_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__Goals.getDaysToConversion_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Goals.getDaysToConversion_day.xml
index 3c241e5091..3c241e5091 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__Goals.getDaysToConversion_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Goals.getDaysToConversion_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__Goals.getGoals.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Goals.getGoals.xml
index c9cc82f044..c9cc82f044 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__Goals.getGoals.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Goals.getGoals.xml
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__Goals.getItemsCategory_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Goals.getItemsCategory_day.xml
index c234bed59e..c234bed59e 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__Goals.getItemsCategory_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Goals.getItemsCategory_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__Goals.getItemsName_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Goals.getItemsName_day.xml
index c234bed59e..c234bed59e 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__Goals.getItemsName_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Goals.getItemsName_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__Goals.getItemsSku_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Goals.getItemsSku_day.xml
index c234bed59e..c234bed59e 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__Goals.getItemsSku_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Goals.getItemsSku_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__Goals.getNbVisitsConverted_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Goals.getNbVisitsConverted_day.xml
index 13002b2017..13002b2017 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__Goals.getNbVisitsConverted_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Goals.getNbVisitsConverted_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__Goals.getRevenue_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Goals.getRevenue_day.xml
index 4ca6db758a..4ca6db758a 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__Goals.getRevenue_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Goals.getRevenue_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__Goals.getVisitsUntilConversion_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Goals.getVisitsUntilConversion_day.xml
index ec350f6b48..ec350f6b48 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__Goals.getVisitsUntilConversion_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Goals.getVisitsUntilConversion_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__Goals.get_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Goals.get_day.xml
index d0e395f9e8..d0e395f9e8 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__Goals.get_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Goals.get_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__MultiSites.getAll_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__MultiSites.getAll_day.xml
index 0ecae3aea1..0ecae3aea1 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__MultiSites.getAll_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__MultiSites.getAll_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__MultiSites.getOne_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__MultiSites.getOne_day.xml
index b76e6ee906..b76e6ee906 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__MultiSites.getOne_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__MultiSites.getOne_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__Provider.getProvider_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Provider.getProvider_day.xml
index 7b9b086c44..7b9b086c44 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__Provider.getProvider_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Provider.getProvider_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__Referrers.getAll_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Referrers.getAll_day.xml
index 0e80bf7ceb..0e80bf7ceb 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__Referrers.getAll_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Referrers.getAll_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__Referrers.getCampaigns_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Referrers.getCampaigns_day.xml
index c234bed59e..c234bed59e 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__Referrers.getCampaigns_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Referrers.getCampaigns_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__Referrers.getCleanKeyword.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Referrers.getCleanKeyword.xml
index 3ad4041057..3ad4041057 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__Referrers.getCleanKeyword.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Referrers.getCleanKeyword.xml
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__Referrers.getKeywordNotDefinedString.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Referrers.getKeywordNotDefinedString.xml
index 60b9a623a5..60b9a623a5 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__Referrers.getKeywordNotDefinedString.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Referrers.getKeywordNotDefinedString.xml
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__Referrers.getKeywordsForPageUrl_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Referrers.getKeywordsForPageUrl_day.xml
index 7ade91cdb5..7ade91cdb5 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__Referrers.getKeywordsForPageUrl_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Referrers.getKeywordsForPageUrl_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__Referrers.getKeywords_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Referrers.getKeywords_day.xml
index e5e6ad0926..e5e6ad0926 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__Referrers.getKeywords_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Referrers.getKeywords_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__Referrers.getNumberOfDistinctCampaigns_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Referrers.getNumberOfDistinctCampaigns_day.xml
index 606fbb5241..606fbb5241 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__Referrers.getNumberOfDistinctCampaigns_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Referrers.getNumberOfDistinctCampaigns_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__Referrers.getNumberOfDistinctKeywords_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Referrers.getNumberOfDistinctKeywords_day.xml
index 606fbb5241..606fbb5241 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__Referrers.getNumberOfDistinctKeywords_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Referrers.getNumberOfDistinctKeywords_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__Referrers.getNumberOfDistinctSearchEngines_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Referrers.getNumberOfDistinctSearchEngines_day.xml
index 606fbb5241..606fbb5241 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__Referrers.getNumberOfDistinctSearchEngines_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Referrers.getNumberOfDistinctSearchEngines_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__Referrers.getNumberOfDistinctWebsitesUrls_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Referrers.getNumberOfDistinctWebsitesUrls_day.xml
index 606fbb5241..606fbb5241 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__Referrers.getNumberOfDistinctWebsitesUrls_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Referrers.getNumberOfDistinctWebsitesUrls_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__Referrers.getNumberOfDistinctWebsites_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Referrers.getNumberOfDistinctWebsites_day.xml
index 606fbb5241..606fbb5241 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__Referrers.getNumberOfDistinctWebsites_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Referrers.getNumberOfDistinctWebsites_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__Referrers.getReferrerType_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Referrers.getReferrerType_day.xml
index deb88da799..deb88da799 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__Referrers.getReferrerType_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Referrers.getReferrerType_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__Referrers.getSearchEngines_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Referrers.getSearchEngines_day.xml
index 8a34da6deb..8a34da6deb 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__Referrers.getSearchEngines_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Referrers.getSearchEngines_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__Referrers.getSocials_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Referrers.getSocials_day.xml
index c234bed59e..c234bed59e 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__Referrers.getSocials_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Referrers.getSocials_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__Referrers.getUrlsForSocial_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Referrers.getUrlsForSocial_day.xml
index c234bed59e..c234bed59e 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__Referrers.getUrlsForSocial_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Referrers.getUrlsForSocial_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__Referrers.getWebsites_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Referrers.getWebsites_day.xml
index 5d8d25b332..5d8d25b332 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__Referrers.getWebsites_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Referrers.getWebsites_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__UserCountry.getCity_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserCountry.getCity_day.xml
index e2562def53..e2562def53 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__UserCountry.getCity_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserCountry.getCity_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__UserCountry.getContinent_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserCountry.getContinent_day.xml
index 280b7fd6fc..280b7fd6fc 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__UserCountry.getContinent_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserCountry.getContinent_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__UserCountry.getCountry_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserCountry.getCountry_day.xml
index 86f61ceeba..86f61ceeba 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__UserCountry.getCountry_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserCountry.getCountry_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__UserCountry.getNumberOfDistinctCountries_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserCountry.getNumberOfDistinctCountries_day.xml
index 606fbb5241..606fbb5241 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__UserCountry.getNumberOfDistinctCountries_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserCountry.getNumberOfDistinctCountries_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__UserCountry.getRegion_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserCountry.getRegion_day.xml
index a32f142d6e..a32f142d6e 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__UserCountry.getRegion_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserCountry.getRegion_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__UserSettings.getBrowserType_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getBrowserType_day.xml
index 6d13aaf736..6d13aaf736 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__UserSettings.getBrowserType_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getBrowserType_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__UserSettings.getBrowserVersion_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getBrowserVersion_day.xml
index 8210497910..8210497910 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__UserSettings.getBrowserVersion_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getBrowserVersion_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__UserSettings.getBrowser_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getBrowser_day.xml
index 84860eba92..84860eba92 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__UserSettings.getBrowser_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getBrowser_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__UserSettings.getConfiguration_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getConfiguration_day.xml
index 1a63f1933a..1a63f1933a 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__UserSettings.getConfiguration_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getConfiguration_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__UserSettings.getLanguageCode_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getLanguageCode_day.xml
index b5d5e44542..b5d5e44542 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__UserSettings.getLanguageCode_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getLanguageCode_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__UserSettings.getLanguage_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getLanguage_day.xml
index a1a81bcc68..a1a81bcc68 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__UserSettings.getLanguage_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getLanguage_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__UserSettings.getMobileVsDesktop_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getMobileVsDesktop_day.xml
index fe566ebe7c..fe566ebe7c 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__UserSettings.getMobileVsDesktop_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getMobileVsDesktop_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__UserSettings.getOSFamily_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getOSFamily_day.xml
index 5c3a3311e3..5c3a3311e3 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__UserSettings.getOSFamily_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getOSFamily_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__UserSettings.getOS_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getOS_day.xml
index 32ec517b60..32ec517b60 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__UserSettings.getOS_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getOS_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__UserSettings.getPlugin_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getPlugin_day.xml
index 9ddd1bed44..9ddd1bed44 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__UserSettings.getPlugin_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getPlugin_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__UserSettings.getResolution_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getResolution_day.xml
index ede209680d..ede209680d 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__UserSettings.getResolution_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getResolution_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__UserSettings.getWideScreen_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getWideScreen_day.xml
index f1acb38cb9..f1acb38cb9 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__UserSettings.getWideScreen_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getWideScreen_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__VisitFrequency.get_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__VisitFrequency.get_day.xml
index eb4e37fdf7..eb4e37fdf7 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__VisitFrequency.get_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__VisitFrequency.get_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__VisitTime.getByDayOfWeek_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__VisitTime.getByDayOfWeek_day.xml
index e715309206..e715309206 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__VisitTime.getByDayOfWeek_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__VisitTime.getByDayOfWeek_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__VisitTime.getVisitInformationPerLocalTime_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__VisitTime.getVisitInformationPerLocalTime_day.xml
index b95f277bfc..b95f277bfc 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__VisitTime.getVisitInformationPerLocalTime_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__VisitTime.getVisitInformationPerLocalTime_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__VisitTime.getVisitInformationPerServerTime_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__VisitTime.getVisitInformationPerServerTime_day.xml
index 5f96c55a5b..5f96c55a5b 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__VisitTime.getVisitInformationPerServerTime_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__VisitTime.getVisitInformationPerServerTime_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__VisitorInterest.getNumberOfVisitsByDaysSinceLast_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__VisitorInterest.getNumberOfVisitsByDaysSinceLast_day.xml
index ce8a1e0b00..ce8a1e0b00 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__VisitorInterest.getNumberOfVisitsByDaysSinceLast_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__VisitorInterest.getNumberOfVisitsByDaysSinceLast_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__VisitorInterest.getNumberOfVisitsByVisitCount_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__VisitorInterest.getNumberOfVisitsByVisitCount_day.xml
index eefa7f6d38..eefa7f6d38 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__VisitorInterest.getNumberOfVisitsByVisitCount_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__VisitorInterest.getNumberOfVisitsByVisitCount_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__VisitorInterest.getNumberOfVisitsPerPage_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__VisitorInterest.getNumberOfVisitsPerPage_day.xml
index 30a3a7f161..30a3a7f161 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__VisitorInterest.getNumberOfVisitsPerPage_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__VisitorInterest.getNumberOfVisitsPerPage_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__VisitorInterest.getNumberOfVisitsPerVisitDuration_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__VisitorInterest.getNumberOfVisitsPerVisitDuration_day.xml
index 730677c405..730677c405 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__VisitorInterest.getNumberOfVisitsPerVisitDuration_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__VisitorInterest.getNumberOfVisitsPerVisitDuration_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__VisitsSummary.getActions_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__VisitsSummary.getActions_day.xml
index e52ca0ecb1..e52ca0ecb1 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__VisitsSummary.getActions_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__VisitsSummary.getActions_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__VisitsSummary.getBounceCount_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__VisitsSummary.getBounceCount_day.xml
index 606fbb5241..606fbb5241 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__VisitsSummary.getBounceCount_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__VisitsSummary.getBounceCount_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__VisitsSummary.getColumns_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__VisitsSummary.getColumns_day.xml
index e8e90f91e7..e8e90f91e7 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__VisitsSummary.getColumns_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__VisitsSummary.getColumns_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__VisitsSummary.getMaxActions_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__VisitsSummary.getMaxActions_day.xml
index 773871bab0..773871bab0 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__VisitsSummary.getMaxActions_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__VisitsSummary.getMaxActions_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__VisitsSummary.getSumVisitsLengthPretty_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__VisitsSummary.getSumVisitsLengthPretty_day.xml
index 3912ba15a2..3912ba15a2 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__VisitsSummary.getSumVisitsLengthPretty_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__VisitsSummary.getSumVisitsLengthPretty_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__VisitsSummary.getSumVisitsLength_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__VisitsSummary.getSumVisitsLength_day.xml
index f7692644ac..f7692644ac 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__VisitsSummary.getSumVisitsLength_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__VisitsSummary.getSumVisitsLength_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__VisitsSummary.getUniqueVisitors_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__VisitsSummary.getUniqueVisitors_day.xml
index 606fbb5241..606fbb5241 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__VisitsSummary.getUniqueVisitors_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__VisitsSummary.getUniqueVisitors_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__VisitsSummary.getUsers_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__VisitsSummary.getUsers_day.xml
index c234bed59e..c234bed59e 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__VisitsSummary.getUsers_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__VisitsSummary.getUsers_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__VisitsSummary.getVisitsConverted_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__VisitsSummary.getVisitsConverted_day.xml
index 13002b2017..13002b2017 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__VisitsSummary.getVisitsConverted_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__VisitsSummary.getVisitsConverted_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__VisitsSummary.getVisits_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__VisitsSummary.getVisits_day.xml
index 13002b2017..13002b2017 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__VisitsSummary.getVisits_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__VisitsSummary.getVisits_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__VisitsSummary.get_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__VisitsSummary.get_day.xml
index 40498bf45d..40498bf45d 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__VisitsSummary.get_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__VisitsSummary.get_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__subtable__API.getProcessedReport_week.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__subtable__API.getProcessedReport_week.xml
index 7279329235..7279329235 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__subtable__API.getProcessedReport_week.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__subtable__API.getProcessedReport_week.xml
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_bulk_json__API.getBulkRequest.json b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_bulk_json__API.getBulkRequest.json
index 54eec7681d..54eec7681d 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_bulk_json__API.getBulkRequest.json
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_bulk_json__API.getBulkRequest.json
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_bulk_xml__API.getBulkRequest.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_bulk_xml__API.getBulkRequest.xml
index e3455beeec..e3455beeec 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_bulk_xml__API.getBulkRequest.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_bulk_xml__API.getBulkRequest.xml
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_csv__API.get_month.csv b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_csv__API.get_month.csv
index 6fed0a71f2..6fed0a71f2 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_csv__API.get_month.csv
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_csv__API.get_month.csv
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_hideAllColumns___VisitsSummary.get_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_hideAllColumns___VisitsSummary.get_day.xml
index f5722c2b94..f5722c2b94 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_hideAllColumns___VisitsSummary.get_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_hideAllColumns___VisitsSummary.get_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_hideColumns___API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_hideColumns___API.getProcessedReport_day.xml
index fe3da65352..fe3da65352 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_hideColumns___API.getProcessedReport_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_hideColumns___API.getProcessedReport_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_hideColumns___Actions.getPageTitles_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_hideColumns___Actions.getPageTitles_day.xml
index 793f02d8be..793f02d8be 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_hideColumns___Actions.getPageTitles_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_hideColumns___Actions.getPageTitles_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_hideColumns___VisitsSummary.get_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_hideColumns___VisitsSummary.get_day.xml
index e84bd27189..e84bd27189 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_hideColumns___VisitsSummary.get_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_hideColumns___VisitsSummary.get_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_showColumnsWithProcessedMetrics___API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_showColumnsWithProcessedMetrics___API.getProcessedReport_day.xml
index 1a1180bbff..1a1180bbff 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_showColumnsWithProcessedMetrics___API.getProcessedReport_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_showColumnsWithProcessedMetrics___API.getProcessedReport_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_showColumns__API.get_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_showColumns__API.get_day.xml
index cdd370d354..cdd370d354 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_showColumns__API.get_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_showColumns__API.get_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_showColumns___API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_showColumns___API.getProcessedReport_day.xml
index 6c94a197f7..6c94a197f7 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_showColumns___API.getProcessedReport_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_showColumns___API.getProcessedReport_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_showColumns___VisitsSummary.get_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_showColumns___VisitsSummary.get_day.xml
index 4d2a909a67..4d2a909a67 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_showColumns___VisitsSummary.get_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_showColumns___VisitsSummary.get_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_showColumns_onlyOne__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_showColumns_onlyOne__API.getProcessedReport_day.xml
index 7484c9c620..7484c9c620 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_showColumns_onlyOne__API.getProcessedReport_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_showColumns_onlyOne__API.getProcessedReport_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getDownload_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getDownload_day.xml
index 32470e4bcb..32470e4bcb 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getDownload_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getDownload_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getDownloads_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getDownloads_day.xml
index c064136f43..c064136f43 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getDownloads_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getDownloads_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getEntryPageTitles_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getEntryPageTitles_day.xml
index 9493eb4991..9493eb4991 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getEntryPageTitles_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getEntryPageTitles_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getEntryPageUrls_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getEntryPageUrls_day.xml
index 5e51da8014..5e51da8014 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getEntryPageUrls_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getEntryPageUrls_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getExitPageTitles_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getExitPageTitles_day.xml
index 64b810c76b..64b810c76b 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getExitPageTitles_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getExitPageTitles_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getExitPageUrls_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getExitPageUrls_day.xml
index ef8f599623..ef8f599623 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getExitPageUrls_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getExitPageUrls_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getOutlink_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getOutlink_day.xml
index 0f328b414d..0f328b414d 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getOutlink_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getOutlink_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getOutlinks_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getOutlinks_day.xml
index 1767641648..1767641648 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getOutlinks_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getOutlinks_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getPageTitle_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getPageTitle_day.xml
index 629847ae61..629847ae61 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getPageTitle_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getPageTitle_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getPageTitlesFollowingSiteSearch_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getPageTitlesFollowingSiteSearch_day.xml
index da8ea736e7..da8ea736e7 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getPageTitlesFollowingSiteSearch_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getPageTitlesFollowingSiteSearch_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getPageTitles_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getPageTitles_day.xml
index cd205048c8..cd205048c8 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getPageTitles_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getPageTitles_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getPageUrl_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getPageUrl_day.xml
index 46a13d42c3..46a13d42c3 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getPageUrl_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getPageUrl_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getPageUrlsFollowingSiteSearch_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getPageUrlsFollowingSiteSearch_day.xml
index 46a13d42c3..46a13d42c3 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getPageUrlsFollowingSiteSearch_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getPageUrlsFollowingSiteSearch_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getPageUrls_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getPageUrls_day.xml
index ad64d61bfe..ad64d61bfe 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getPageUrls_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getPageUrls_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getSiteSearchCategories_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getSiteSearchCategories_day.xml
index c234bed59e..c234bed59e 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getSiteSearchCategories_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getSiteSearchCategories_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getSiteSearchKeywords_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getSiteSearchKeywords_day.xml
index fde425ab9e..fde425ab9e 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getSiteSearchKeywords_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getSiteSearchKeywords_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getSiteSearchNoResultKeywords_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getSiteSearchNoResultKeywords_day.xml
index c234bed59e..c234bed59e 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getSiteSearchNoResultKeywords_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getSiteSearchNoResultKeywords_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.get_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.get_day.xml
index 0eea12ac0b..0eea12ac0b 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.get_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.get_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__CustomVariables.getCustomVariables_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__CustomVariables.getCustomVariables_day.xml
index c234bed59e..c234bed59e 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__CustomVariables.getCustomVariables_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__CustomVariables.getCustomVariables_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Goals.getDaysToConversion_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Goals.getDaysToConversion_day.xml
index 3c241e5091..3c241e5091 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Goals.getDaysToConversion_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Goals.getDaysToConversion_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Goals.getGoals.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Goals.getGoals.xml
index c9cc82f044..c9cc82f044 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Goals.getGoals.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Goals.getGoals.xml
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Goals.getItemsCategory_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Goals.getItemsCategory_day.xml
index c234bed59e..c234bed59e 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Goals.getItemsCategory_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Goals.getItemsCategory_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Goals.getItemsName_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Goals.getItemsName_day.xml
index c234bed59e..c234bed59e 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Goals.getItemsName_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Goals.getItemsName_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Goals.getItemsSku_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Goals.getItemsSku_day.xml
index c234bed59e..c234bed59e 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Goals.getItemsSku_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Goals.getItemsSku_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Goals.getVisitsUntilConversion_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Goals.getVisitsUntilConversion_day.xml
index ec350f6b48..ec350f6b48 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Goals.getVisitsUntilConversion_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Goals.getVisitsUntilConversion_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Goals.get_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Goals.get_day.xml
index d0e395f9e8..d0e395f9e8 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Goals.get_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Goals.get_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Live.getLastVisitsDetails_day.xml
index 2ceb5d70bf..2ceb5d70bf 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Live.getLastVisitsDetails_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Live.getLastVisitsDetails_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Provider.getProvider_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Provider.getProvider_day.xml
index 7254c4a970..7254c4a970 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Provider.getProvider_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Provider.getProvider_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getAll_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getAll_day.xml
index fd61a97675..fd61a97675 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getAll_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getAll_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getCampaigns_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getCampaigns_day.xml
index c234bed59e..c234bed59e 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getCampaigns_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getCampaigns_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getKeywordsForPageUrl_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getKeywordsForPageUrl_day.xml
index 7ade91cdb5..7ade91cdb5 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getKeywordsForPageUrl_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getKeywordsForPageUrl_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getKeywords_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getKeywords_day.xml
index 52501d1f57..52501d1f57 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getKeywords_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getKeywords_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getNumberOfDistinctCampaigns_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getNumberOfDistinctCampaigns_day.xml
index 606fbb5241..606fbb5241 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getNumberOfDistinctCampaigns_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getNumberOfDistinctCampaigns_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getNumberOfDistinctKeywords_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getNumberOfDistinctKeywords_day.xml
index 606fbb5241..606fbb5241 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getNumberOfDistinctKeywords_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getNumberOfDistinctKeywords_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getNumberOfDistinctSearchEngines_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getNumberOfDistinctSearchEngines_day.xml
index 606fbb5241..606fbb5241 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getNumberOfDistinctSearchEngines_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getNumberOfDistinctSearchEngines_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getNumberOfDistinctWebsitesUrls_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getNumberOfDistinctWebsitesUrls_day.xml
index 606fbb5241..606fbb5241 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getNumberOfDistinctWebsitesUrls_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getNumberOfDistinctWebsitesUrls_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getNumberOfDistinctWebsites_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getNumberOfDistinctWebsites_day.xml
index 606fbb5241..606fbb5241 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getNumberOfDistinctWebsites_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getNumberOfDistinctWebsites_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getReferrerType_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getReferrerType_day.xml
index 2225e62fa0..2225e62fa0 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getReferrerType_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getReferrerType_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getSearchEngines_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getSearchEngines_day.xml
index 325ad6ac4f..325ad6ac4f 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getSearchEngines_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getSearchEngines_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getSocials_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getSocials_day.xml
index c234bed59e..c234bed59e 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getSocials_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getSocials_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getUrlsForSocial_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getUrlsForSocial_day.xml
index c234bed59e..c234bed59e 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getUrlsForSocial_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getUrlsForSocial_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getWebsites_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getWebsites_day.xml
index b3100810b3..b3100810b3 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getWebsites_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getWebsites_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserCountry.getCity_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserCountry.getCity_day.xml
index 0c927196d9..0c927196d9 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserCountry.getCity_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserCountry.getCity_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserCountry.getContinent_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserCountry.getContinent_day.xml
index dd647ae66e..dd647ae66e 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserCountry.getContinent_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserCountry.getContinent_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserCountry.getCountry_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserCountry.getCountry_day.xml
index c7cdb13402..c7cdb13402 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserCountry.getCountry_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserCountry.getCountry_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserCountry.getNumberOfDistinctCountries_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserCountry.getNumberOfDistinctCountries_day.xml
index 606fbb5241..606fbb5241 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserCountry.getNumberOfDistinctCountries_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserCountry.getNumberOfDistinctCountries_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserCountry.getRegion_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserCountry.getRegion_day.xml
index 2a364cd566..2a364cd566 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserCountry.getRegion_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserCountry.getRegion_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getBrowserType_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getBrowserType_day.xml
index e84a021ee9..e84a021ee9 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getBrowserType_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getBrowserType_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getBrowserVersion_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getBrowserVersion_day.xml
index 6451b5cbbb..6451b5cbbb 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getBrowserVersion_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getBrowserVersion_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getBrowser_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getBrowser_day.xml
index 968ffc7d90..968ffc7d90 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getBrowser_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getBrowser_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getConfiguration_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getConfiguration_day.xml
index 7ce7628e83..7ce7628e83 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getConfiguration_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getConfiguration_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getLanguageCode_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getLanguageCode_day.xml
index 7ae1dc2443..7ae1dc2443 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getLanguageCode_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getLanguageCode_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getLanguage_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getLanguage_day.xml
index e03cfdd581..e03cfdd581 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getLanguage_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getLanguage_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getMobileVsDesktop_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getMobileVsDesktop_day.xml
index 1456e8c033..1456e8c033 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getMobileVsDesktop_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getMobileVsDesktop_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getOSFamily_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getOSFamily_day.xml
index 63f67f61ca..63f67f61ca 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getOSFamily_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getOSFamily_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getOS_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getOS_day.xml
index e041ea2409..e041ea2409 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getOS_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getOS_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getPlugin_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getPlugin_day.xml
index 9ddd1bed44..9ddd1bed44 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getPlugin_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getPlugin_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getResolution_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getResolution_day.xml
index 05f05aaf02..05f05aaf02 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getResolution_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getResolution_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getWideScreen_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getWideScreen_day.xml
index 1aa955af66..1aa955af66 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getWideScreen_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getWideScreen_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitFrequency.get_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitFrequency.get_day.xml
index 3633fe5914..3633fe5914 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitFrequency.get_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitFrequency.get_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitTime.getByDayOfWeek_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitTime.getByDayOfWeek_day.xml
index 16a8a552ba..16a8a552ba 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitTime.getByDayOfWeek_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitTime.getByDayOfWeek_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitTime.getVisitInformationPerLocalTime_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitTime.getVisitInformationPerLocalTime_day.xml
index 09556822a9..09556822a9 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitTime.getVisitInformationPerLocalTime_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitTime.getVisitInformationPerLocalTime_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitTime.getVisitInformationPerServerTime_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitTime.getVisitInformationPerServerTime_day.xml
index 9ded5c32c2..9ded5c32c2 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitTime.getVisitInformationPerServerTime_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitTime.getVisitInformationPerServerTime_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitorInterest.getNumberOfVisitsByDaysSinceLast_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitorInterest.getNumberOfVisitsByDaysSinceLast_day.xml
index ce8a1e0b00..ce8a1e0b00 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitorInterest.getNumberOfVisitsByDaysSinceLast_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitorInterest.getNumberOfVisitsByDaysSinceLast_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitorInterest.getNumberOfVisitsByVisitCount_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitorInterest.getNumberOfVisitsByVisitCount_day.xml
index eefa7f6d38..eefa7f6d38 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitorInterest.getNumberOfVisitsByVisitCount_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitorInterest.getNumberOfVisitsByVisitCount_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitorInterest.getNumberOfVisitsPerPage_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitorInterest.getNumberOfVisitsPerPage_day.xml
index 5a89cd9c00..5a89cd9c00 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitorInterest.getNumberOfVisitsPerPage_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitorInterest.getNumberOfVisitsPerPage_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitorInterest.getNumberOfVisitsPerVisitDuration_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitorInterest.getNumberOfVisitsPerVisitDuration_day.xml
index 730677c405..730677c405 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitorInterest.getNumberOfVisitsPerVisitDuration_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitorInterest.getNumberOfVisitsPerVisitDuration_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitsSummary.getActions_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitsSummary.getActions_day.xml
index 39535fab28..39535fab28 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitsSummary.getActions_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitsSummary.getActions_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitsSummary.getBounceCount_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitsSummary.getBounceCount_day.xml
index 606fbb5241..606fbb5241 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitsSummary.getBounceCount_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitsSummary.getBounceCount_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitsSummary.getMaxActions_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitsSummary.getMaxActions_day.xml
index e52ca0ecb1..e52ca0ecb1 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitsSummary.getMaxActions_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitsSummary.getMaxActions_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitsSummary.getSumVisitsLengthPretty_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitsSummary.getSumVisitsLengthPretty_day.xml
index 3912ba15a2..3912ba15a2 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitsSummary.getSumVisitsLengthPretty_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitsSummary.getSumVisitsLengthPretty_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitsSummary.getSumVisitsLength_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitsSummary.getSumVisitsLength_day.xml
index f7692644ac..f7692644ac 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitsSummary.getSumVisitsLength_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitsSummary.getSumVisitsLength_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitsSummary.getUniqueVisitors_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitsSummary.getUniqueVisitors_day.xml
index 606fbb5241..606fbb5241 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitsSummary.getUniqueVisitors_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitsSummary.getUniqueVisitors_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitsSummary.getUsers_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitsSummary.getUsers_day.xml
index f5722c2b94..f5722c2b94 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitsSummary.getUsers_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitsSummary.getUsers_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitsSummary.getVisitsConverted_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitsSummary.getVisitsConverted_day.xml
index 13002b2017..13002b2017 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitsSummary.getVisitsConverted_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitsSummary.getVisitsConverted_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitsSummary.getVisits_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitsSummary.getVisits_day.xml
index 13002b2017..13002b2017 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitsSummary.getVisits_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitsSummary.getVisits_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitsSummary.get_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitsSummary.get_day.xml
index 9f63db28ef..9f63db28ef 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitsSummary.get_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitsSummary.get_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitor_LongUrlsTruncated__Actions.getPageUrls_day.xml b/tests/PHPUnit/System/expected/test_OneVisitor_LongUrlsTruncated__Actions.getPageUrls_day.xml
index d1914d0e11..d1914d0e11 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitor_LongUrlsTruncated__Actions.getPageUrls_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitor_LongUrlsTruncated__Actions.getPageUrls_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitor_LongUrlsTruncated__Referrers.getKeywords_day.xml b/tests/PHPUnit/System/expected/test_OneVisitor_LongUrlsTruncated__Referrers.getKeywords_day.xml
index aa89682153..aa89682153 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitor_LongUrlsTruncated__Referrers.getKeywords_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitor_LongUrlsTruncated__Referrers.getKeywords_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitor_LongUrlsTruncated__UserSettings.getPlugin_day.xml b/tests/PHPUnit/System/expected/test_OneVisitor_LongUrlsTruncated__UserSettings.getPlugin_day.xml
index 1058fa4e08..1058fa4e08 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitor_LongUrlsTruncated__UserSettings.getPlugin_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitor_LongUrlsTruncated__UserSettings.getPlugin_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitor_NoKeywordSpecified__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/System/expected/test_OneVisitor_NoKeywordSpecified__Live.getLastVisitsDetails_day.xml
index 9175168a74..9175168a74 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitor_NoKeywordSpecified__Live.getLastVisitsDetails_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitor_NoKeywordSpecified__Live.getLastVisitsDetails_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitor_NoKeywordSpecified__Referrers.getKeywords_day.xml b/tests/PHPUnit/System/expected/test_OneVisitor_NoKeywordSpecified__Referrers.getKeywords_day.xml
index 9b2a6b9b0e..9b2a6b9b0e 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitor_NoKeywordSpecified__Referrers.getKeywords_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitor_NoKeywordSpecified__Referrers.getKeywords_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitor_SeveralDays_ImportedInRandomOrderTest_shouldShowOneVisit_InEachOfThreeDays__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_OneVisitor_SeveralDays_ImportedInRandomOrderTest_shouldShowOneVisit_InEachOfThreeDays__Live.getLastVisitsDetails_month.xml
index f77489d7a3..f77489d7a3 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitor_SeveralDays_ImportedInRandomOrderTest_shouldShowOneVisit_InEachOfThreeDays__Live.getLastVisitsDetails_month.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitor_SeveralDays_ImportedInRandomOrderTest_shouldShowOneVisit_InEachOfThreeDays__Live.getLastVisitsDetails_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_PivotByQueryParamTest_test_PivotByParam_PlaysNiceWithDataTableMaps__Referrers.getKeywords_day.xml b/tests/PHPUnit/System/expected/test_PivotByQueryParamTest_test_PivotByParam_PlaysNiceWithDataTableMaps__Referrers.getKeywords_day.xml
index d98cace554..d98cace554 100644
--- a/tests/PHPUnit/Integration/expected/test_PivotByQueryParamTest_test_PivotByParam_PlaysNiceWithDataTableMaps__Referrers.getKeywords_day.xml
+++ b/tests/PHPUnit/System/expected/test_PivotByQueryParamTest_test_PivotByParam_PlaysNiceWithDataTableMaps__Referrers.getKeywords_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_PivotByQueryParamTest_test_PivotByParam_PlaysNiceWithOtherQueryParams__Referrers.getKeywords_week.xml b/tests/PHPUnit/System/expected/test_PivotByQueryParamTest_test_PivotByParam_PlaysNiceWithOtherQueryParams__Referrers.getKeywords_week.xml
index 05553ef4f8..05553ef4f8 100644
--- a/tests/PHPUnit/Integration/expected/test_PivotByQueryParamTest_test_PivotByParam_PlaysNiceWithOtherQueryParams__Referrers.getKeywords_week.xml
+++ b/tests/PHPUnit/System/expected/test_PivotByQueryParamTest_test_PivotByParam_PlaysNiceWithOtherQueryParams__Referrers.getKeywords_week.xml
diff --git a/tests/PHPUnit/Integration/expected/test_PivotByQueryParamTest_test_PivotByParam_WorksWithColumnLimiting__Referrers.getKeywords_week.xml b/tests/PHPUnit/System/expected/test_PivotByQueryParamTest_test_PivotByParam_WorksWithColumnLimiting__Referrers.getKeywords_week.xml
index ac43686db0..ac43686db0 100644
--- a/tests/PHPUnit/Integration/expected/test_PivotByQueryParamTest_test_PivotByParam_WorksWithColumnLimiting__Referrers.getKeywords_week.xml
+++ b/tests/PHPUnit/System/expected/test_PivotByQueryParamTest_test_PivotByParam_WorksWithColumnLimiting__Referrers.getKeywords_week.xml
diff --git a/tests/PHPUnit/Integration/expected/test_PivotByQueryParamTest_test_PivotByParam_WorksWithCsvOutput__Referrers.getKeywords_week.csv b/tests/PHPUnit/System/expected/test_PivotByQueryParamTest_test_PivotByParam_WorksWithCsvOutput__Referrers.getKeywords_week.csv
index a465a67a14..a465a67a14 100644
--- a/tests/PHPUnit/Integration/expected/test_PivotByQueryParamTest_test_PivotByParam_WorksWithCsvOutput__Referrers.getKeywords_week.csv
+++ b/tests/PHPUnit/System/expected/test_PivotByQueryParamTest_test_PivotByParam_WorksWithCsvOutput__Referrers.getKeywords_week.csv
diff --git a/tests/PHPUnit/Integration/expected/test_PivotByQueryParamTest_test_PivotByParam_WorksWithJsonOutput__Referrers.getKeywords_week.json b/tests/PHPUnit/System/expected/test_PivotByQueryParamTest_test_PivotByParam_WorksWithJsonOutput__Referrers.getKeywords_week.json
index 25e1824fc6..25e1824fc6 100644
--- a/tests/PHPUnit/Integration/expected/test_PivotByQueryParamTest_test_PivotByParam_WorksWithJsonOutput__Referrers.getKeywords_week.json
+++ b/tests/PHPUnit/System/expected/test_PivotByQueryParamTest_test_PivotByParam_WorksWithJsonOutput__Referrers.getKeywords_week.json
diff --git a/tests/PHPUnit/Integration/expected/test_PivotByQueryParamTest_test_PivotByParam_WorksWithReportWhoseSubtableIsSelf__Actions.getPageUrls_week.xml b/tests/PHPUnit/System/expected/test_PivotByQueryParamTest_test_PivotByParam_WorksWithReportWhoseSubtableIsSelf__Actions.getPageUrls_week.xml
index 0b88c2ff59..0b88c2ff59 100644
--- a/tests/PHPUnit/Integration/expected/test_PivotByQueryParamTest_test_PivotByParam_WorksWithReportWhoseSubtableIsSelf__Actions.getPageUrls_week.xml
+++ b/tests/PHPUnit/System/expected/test_PivotByQueryParamTest_test_PivotByParam_WorksWithReportWhoseSubtableIsSelf__Actions.getPageUrls_week.xml
diff --git a/tests/PHPUnit/Integration/expected/test_PivotByQueryParamTest_test_PivotBySegment_CreatesCorrectPivotTable_WhenSegmentUsedInRequest__Referrers.getKeywords_week.xml b/tests/PHPUnit/System/expected/test_PivotByQueryParamTest_test_PivotBySegment_CreatesCorrectPivotTable_WhenSegmentUsedInRequest__Referrers.getKeywords_week.xml
index 52686d6610..52686d6610 100644
--- a/tests/PHPUnit/Integration/expected/test_PivotByQueryParamTest_test_PivotBySegment_CreatesCorrectPivotTable_WhenSegmentUsedInRequest__Referrers.getKeywords_week.xml
+++ b/tests/PHPUnit/System/expected/test_PivotByQueryParamTest_test_PivotBySegment_CreatesCorrectPivotTable_WhenSegmentUsedInRequest__Referrers.getKeywords_week.xml
diff --git a/tests/PHPUnit/Integration/expected/test_PivotByQueryParamTest_test_PivotBySegment_CreatesCorrectPivotTable__Referrers.getKeywords_week.xml b/tests/PHPUnit/System/expected/test_PivotByQueryParamTest_test_PivotBySegment_CreatesCorrectPivotTable__Referrers.getKeywords_week.xml
index 8112e991f5..8112e991f5 100644
--- a/tests/PHPUnit/Integration/expected/test_PivotByQueryParamTest_test_PivotBySegment_CreatesCorrectPivotTable__Referrers.getKeywords_week.xml
+++ b/tests/PHPUnit/System/expected/test_PivotByQueryParamTest_test_PivotBySegment_CreatesCorrectPivotTable__Referrers.getKeywords_week.xml
diff --git a/tests/PHPUnit/Integration/expected/test_PivotByQueryParamTest_test_PivotBySubtableDimension_CreatesCorrectPivotTable__Referrers.getKeywords_week.xml b/tests/PHPUnit/System/expected/test_PivotByQueryParamTest_test_PivotBySubtableDimension_CreatesCorrectPivotTable__Referrers.getKeywords_week.xml
index 1adf9d722a..1adf9d722a 100644
--- a/tests/PHPUnit/Integration/expected/test_PivotByQueryParamTest_test_PivotBySubtableDimension_CreatesCorrectPivotTable__Referrers.getKeywords_week.xml
+++ b/tests/PHPUnit/System/expected/test_PivotByQueryParamTest_test_PivotBySubtableDimension_CreatesCorrectPivotTable__Referrers.getKeywords_week.xml
diff --git a/tests/PHPUnit/Integration/expected/test_PivotByQueryParamTest_test_PivotBySubtableDimension_WhenEntireHirearchyIsNotLoaded__Referrers.getKeywords_week.xml b/tests/PHPUnit/System/expected/test_PivotByQueryParamTest_test_PivotBySubtableDimension_WhenEntireHirearchyIsNotLoaded__Referrers.getKeywords_week.xml
index 6ab5630422..6ab5630422 100644
--- a/tests/PHPUnit/Integration/expected/test_PivotByQueryParamTest_test_PivotBySubtableDimension_WhenEntireHirearchyIsNotLoaded__Referrers.getKeywords_week.xml
+++ b/tests/PHPUnit/System/expected/test_PivotByQueryParamTest_test_PivotBySubtableDimension_WhenEntireHirearchyIsNotLoaded__Referrers.getKeywords_week.xml
diff --git a/tests/PHPUnit/Integration/expected/test_PiwikTracker_trackForceUsingVisitId_insteadOfHeuristics_alsoTestsCampaignTracking__Referrers.getCampaigns_day.xml b/tests/PHPUnit/System/expected/test_PiwikTracker_trackForceUsingVisitId_insteadOfHeuristics_alsoTestsCampaignTracking__Referrers.getCampaigns_day.xml
index 0ad33169a4..0ad33169a4 100644
--- a/tests/PHPUnit/Integration/expected/test_PiwikTracker_trackForceUsingVisitId_insteadOfHeuristics_alsoTestsCampaignTracking__Referrers.getCampaigns_day.xml
+++ b/tests/PHPUnit/System/expected/test_PiwikTracker_trackForceUsingVisitId_insteadOfHeuristics_alsoTestsCampaignTracking__Referrers.getCampaigns_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_PiwikTracker_trackForceUsingVisitId_insteadOfHeuristics_alsoTestsCampaignTracking__Referrers.getWebsites_day.xml b/tests/PHPUnit/System/expected/test_PiwikTracker_trackForceUsingVisitId_insteadOfHeuristics_alsoTestsCampaignTracking__Referrers.getWebsites_day.xml
index c234bed59e..c234bed59e 100644
--- a/tests/PHPUnit/Integration/expected/test_PiwikTracker_trackForceUsingVisitId_insteadOfHeuristics_alsoTestsCampaignTracking__Referrers.getWebsites_day.xml
+++ b/tests/PHPUnit/System/expected/test_PiwikTracker_trackForceUsingVisitId_insteadOfHeuristics_alsoTestsCampaignTracking__Referrers.getWebsites_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_PiwikTracker_trackForceUsingVisitId_insteadOfHeuristics_alsoTestsCampaignTracking__VisitsSummary.get_day.xml b/tests/PHPUnit/System/expected/test_PiwikTracker_trackForceUsingVisitId_insteadOfHeuristics_alsoTestsCampaignTracking__VisitsSummary.get_day.xml
index 78c6610886..78c6610886 100644
--- a/tests/PHPUnit/Integration/expected/test_PiwikTracker_trackForceUsingVisitId_insteadOfHeuristics_alsoTestsCampaignTracking__VisitsSummary.get_day.xml
+++ b/tests/PHPUnit/System/expected/test_PiwikTracker_trackForceUsingVisitId_insteadOfHeuristics_alsoTestsCampaignTracking__VisitsSummary.get_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_RowEvolution_LabelReservedCharactersHierarchical__API.getRowEvolution_day.xml b/tests/PHPUnit/System/expected/test_RowEvolution_LabelReservedCharactersHierarchical__API.getRowEvolution_day.xml
index 7295efb518..7295efb518 100644
--- a/tests/PHPUnit/Integration/expected/test_RowEvolution_LabelReservedCharactersHierarchical__API.getRowEvolution_day.xml
+++ b/tests/PHPUnit/System/expected/test_RowEvolution_LabelReservedCharactersHierarchical__API.getRowEvolution_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_RowEvolution_LabelReservedCharacters__API.getRowEvolution_day.xml b/tests/PHPUnit/System/expected/test_RowEvolution_LabelReservedCharacters__API.getRowEvolution_day.xml
index b0534b1fd1..b0534b1fd1 100644
--- a/tests/PHPUnit/Integration/expected/test_RowEvolution_LabelReservedCharacters__API.getRowEvolution_day.xml
+++ b/tests/PHPUnit/System/expected/test_RowEvolution_LabelReservedCharacters__API.getRowEvolution_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_RowEvolution_entryPageTitles__API.getRowEvolution_day.xml b/tests/PHPUnit/System/expected/test_RowEvolution_entryPageTitles__API.getRowEvolution_day.xml
index e73ba39d1d..e73ba39d1d 100644
--- a/tests/PHPUnit/Integration/expected/test_RowEvolution_entryPageTitles__API.getRowEvolution_day.xml
+++ b/tests/PHPUnit/System/expected/test_RowEvolution_entryPageTitles__API.getRowEvolution_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_RowEvolution_flatFilters__Referrers.getSearchEngines_month.xml b/tests/PHPUnit/System/expected/test_RowEvolution_flatFilters__Referrers.getSearchEngines_month.xml
index e1f0382dda..e1f0382dda 100644
--- a/tests/PHPUnit/Integration/expected/test_RowEvolution_flatFilters__Referrers.getSearchEngines_month.xml
+++ b/tests/PHPUnit/System/expected/test_RowEvolution_flatFilters__Referrers.getSearchEngines_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_RowEvolution_goals_visitsUntilConversion_WithoutLabels__API.getRowEvolution_day.xml b/tests/PHPUnit/System/expected/test_RowEvolution_goals_visitsUntilConversion_WithoutLabels__API.getRowEvolution_day.xml
index bed5b4c44e..bed5b4c44e 100644
--- a/tests/PHPUnit/Integration/expected/test_RowEvolution_goals_visitsUntilConversion_WithoutLabels__API.getRowEvolution_day.xml
+++ b/tests/PHPUnit/System/expected/test_RowEvolution_goals_visitsUntilConversion_WithoutLabels__API.getRowEvolution_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_RowEvolution_goals_visitsUntilConversion__API.getRowEvolution_day.xml b/tests/PHPUnit/System/expected/test_RowEvolution_goals_visitsUntilConversion__API.getRowEvolution_day.xml
index 6b29ea0e98..6b29ea0e98 100644
--- a/tests/PHPUnit/Integration/expected/test_RowEvolution_goals_visitsUntilConversion__API.getRowEvolution_day.xml
+++ b/tests/PHPUnit/System/expected/test_RowEvolution_goals_visitsUntilConversion__API.getRowEvolution_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_RowEvolution_mobileDesktop__API.getRowEvolution_day.xml b/tests/PHPUnit/System/expected/test_RowEvolution_mobileDesktop__API.getRowEvolution_day.xml
index 86026aff84..86026aff84 100644
--- a/tests/PHPUnit/Integration/expected/test_RowEvolution_mobileDesktop__API.getRowEvolution_day.xml
+++ b/tests/PHPUnit/System/expected/test_RowEvolution_mobileDesktop__API.getRowEvolution_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_RowEvolution_multiWithFilterLimit__API.getRowEvolution_day.xml b/tests/PHPUnit/System/expected/test_RowEvolution_multiWithFilterLimit__API.getRowEvolution_day.xml
index 29f0426935..29f0426935 100644
--- a/tests/PHPUnit/Integration/expected/test_RowEvolution_multiWithFilterLimit__API.getRowEvolution_day.xml
+++ b/tests/PHPUnit/System/expected/test_RowEvolution_multiWithFilterLimit__API.getRowEvolution_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_RowEvolution_multiWithNoData__API.getRowEvolution_day.xml b/tests/PHPUnit/System/expected/test_RowEvolution_multiWithNoData__API.getRowEvolution_day.xml
index 9a1a1b9d35..9a1a1b9d35 100644
--- a/tests/PHPUnit/Integration/expected/test_RowEvolution_multiWithNoData__API.getRowEvolution_day.xml
+++ b/tests/PHPUnit/System/expected/test_RowEvolution_multiWithNoData__API.getRowEvolution_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_RowEvolution_multipleDates_lastNoData__API.getRowEvolution_month.xml b/tests/PHPUnit/System/expected/test_RowEvolution_multipleDates_lastNoData__API.getRowEvolution_month.xml
index ff4f69a79d..ff4f69a79d 100644
--- a/tests/PHPUnit/Integration/expected/test_RowEvolution_multipleDates_lastNoData__API.getRowEvolution_month.xml
+++ b/tests/PHPUnit/System/expected/test_RowEvolution_multipleDates_lastNoData__API.getRowEvolution_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_RowEvolution_pageTitlesMulti__API.getRowEvolution_day.xml b/tests/PHPUnit/System/expected/test_RowEvolution_pageTitlesMulti__API.getRowEvolution_day.xml
index 67f2b8e444..67f2b8e444 100644
--- a/tests/PHPUnit/Integration/expected/test_RowEvolution_pageTitlesMulti__API.getRowEvolution_day.xml
+++ b/tests/PHPUnit/System/expected/test_RowEvolution_pageTitlesMulti__API.getRowEvolution_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_RowEvolution_pageTitlesMulti__API.getRowEvolution_week.xml b/tests/PHPUnit/System/expected/test_RowEvolution_pageTitlesMulti__API.getRowEvolution_week.xml
index 49ee397bd0..49ee397bd0 100644
--- a/tests/PHPUnit/Integration/expected/test_RowEvolution_pageTitlesMulti__API.getRowEvolution_week.xml
+++ b/tests/PHPUnit/System/expected/test_RowEvolution_pageTitlesMulti__API.getRowEvolution_week.xml
diff --git a/tests/PHPUnit/Integration/expected/test_RowEvolution_pageTitles__API.getRowEvolution_day.xml b/tests/PHPUnit/System/expected/test_RowEvolution_pageTitles__API.getRowEvolution_day.xml
index 00281d68e1..00281d68e1 100644
--- a/tests/PHPUnit/Integration/expected/test_RowEvolution_pageTitles__API.getRowEvolution_day.xml
+++ b/tests/PHPUnit/System/expected/test_RowEvolution_pageTitles__API.getRowEvolution_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_RowEvolution_pageTitles__API.getRowEvolution_week.xml b/tests/PHPUnit/System/expected/test_RowEvolution_pageTitles__API.getRowEvolution_week.xml
index ffd938a2fb..ffd938a2fb 100644
--- a/tests/PHPUnit/Integration/expected/test_RowEvolution_pageTitles__API.getRowEvolution_week.xml
+++ b/tests/PHPUnit/System/expected/test_RowEvolution_pageTitles__API.getRowEvolution_week.xml
diff --git a/tests/PHPUnit/Integration/expected/test_RowEvolution_pageUrls__API.getRowEvolution_range.xml b/tests/PHPUnit/System/expected/test_RowEvolution_pageUrls__API.getRowEvolution_range.xml
index c58ead4c78..c58ead4c78 100644
--- a/tests/PHPUnit/Integration/expected/test_RowEvolution_pageUrls__API.getRowEvolution_range.xml
+++ b/tests/PHPUnit/System/expected/test_RowEvolution_pageUrls__API.getRowEvolution_range.xml
diff --git a/tests/PHPUnit/Integration/expected/test_RowEvolution_processedRowLabel__API.getRowEvolution_day.xml b/tests/PHPUnit/System/expected/test_RowEvolution_processedRowLabel__API.getRowEvolution_day.xml
index 68837cb7a6..68837cb7a6 100644
--- a/tests/PHPUnit/Integration/expected/test_RowEvolution_processedRowLabel__API.getRowEvolution_day.xml
+++ b/tests/PHPUnit/System/expected/test_RowEvolution_processedRowLabel__API.getRowEvolution_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_RowEvolution_referrer1__API.getRowEvolution_day.xml b/tests/PHPUnit/System/expected/test_RowEvolution_referrer1__API.getRowEvolution_day.xml
index f75c05f7f8..f75c05f7f8 100644
--- a/tests/PHPUnit/Integration/expected/test_RowEvolution_referrer1__API.getRowEvolution_day.xml
+++ b/tests/PHPUnit/System/expected/test_RowEvolution_referrer1__API.getRowEvolution_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_RowEvolution_referrer2__API.getRowEvolution_day.xml b/tests/PHPUnit/System/expected/test_RowEvolution_referrer2__API.getRowEvolution_day.xml
index c424df6d30..c424df6d30 100644
--- a/tests/PHPUnit/Integration/expected/test_RowEvolution_referrer2__API.getRowEvolution_day.xml
+++ b/tests/PHPUnit/System/expected/test_RowEvolution_referrer2__API.getRowEvolution_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_RowEvolution_referrerMulti1__API.getRowEvolution_day.xml b/tests/PHPUnit/System/expected/test_RowEvolution_referrerMulti1__API.getRowEvolution_day.xml
index 01184a360d..01184a360d 100644
--- a/tests/PHPUnit/Integration/expected/test_RowEvolution_referrerMulti1__API.getRowEvolution_day.xml
+++ b/tests/PHPUnit/System/expected/test_RowEvolution_referrerMulti1__API.getRowEvolution_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_SiteSearch_Actions.getPageTitlesFollowingSiteSearch_firstSite_lastN__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_SiteSearch_Actions.getPageTitlesFollowingSiteSearch_firstSite_lastN__API.getProcessedReport_day.xml
index e1254c611b..e1254c611b 100644
--- a/tests/PHPUnit/Integration/expected/test_SiteSearch_Actions.getPageTitlesFollowingSiteSearch_firstSite_lastN__API.getProcessedReport_day.xml
+++ b/tests/PHPUnit/System/expected/test_SiteSearch_Actions.getPageTitlesFollowingSiteSearch_firstSite_lastN__API.getProcessedReport_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_SiteSearch_Actions.getPageTitlesFollowingSiteSearch_firstSite_lastN__API.getProcessedReport_month.xml b/tests/PHPUnit/System/expected/test_SiteSearch_Actions.getPageTitlesFollowingSiteSearch_firstSite_lastN__API.getProcessedReport_month.xml
index 358b09c180..358b09c180 100644
--- a/tests/PHPUnit/Integration/expected/test_SiteSearch_Actions.getPageTitlesFollowingSiteSearch_firstSite_lastN__API.getProcessedReport_month.xml
+++ b/tests/PHPUnit/System/expected/test_SiteSearch_Actions.getPageTitlesFollowingSiteSearch_firstSite_lastN__API.getProcessedReport_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_SiteSearch_Actions.getPageTitles_firstSite_lastN__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_SiteSearch_Actions.getPageTitles_firstSite_lastN__API.getProcessedReport_day.xml
index c1f7037343..c1f7037343 100644
--- a/tests/PHPUnit/Integration/expected/test_SiteSearch_Actions.getPageTitles_firstSite_lastN__API.getProcessedReport_day.xml
+++ b/tests/PHPUnit/System/expected/test_SiteSearch_Actions.getPageTitles_firstSite_lastN__API.getProcessedReport_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_SiteSearch_Actions.getPageTitles_firstSite_lastN__API.getProcessedReport_month.xml b/tests/PHPUnit/System/expected/test_SiteSearch_Actions.getPageTitles_firstSite_lastN__API.getProcessedReport_month.xml
index 33516984c8..33516984c8 100644
--- a/tests/PHPUnit/Integration/expected/test_SiteSearch_Actions.getPageTitles_firstSite_lastN__API.getProcessedReport_month.xml
+++ b/tests/PHPUnit/System/expected/test_SiteSearch_Actions.getPageTitles_firstSite_lastN__API.getProcessedReport_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_SiteSearch_Actions.getPageUrlsFollowingSiteSearch_firstSite_lastN__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_SiteSearch_Actions.getPageUrlsFollowingSiteSearch_firstSite_lastN__API.getProcessedReport_day.xml
index a139b8c186..a139b8c186 100644
--- a/tests/PHPUnit/Integration/expected/test_SiteSearch_Actions.getPageUrlsFollowingSiteSearch_firstSite_lastN__API.getProcessedReport_day.xml
+++ b/tests/PHPUnit/System/expected/test_SiteSearch_Actions.getPageUrlsFollowingSiteSearch_firstSite_lastN__API.getProcessedReport_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_SiteSearch_Actions.getPageUrlsFollowingSiteSearch_firstSite_lastN__API.getProcessedReport_month.xml b/tests/PHPUnit/System/expected/test_SiteSearch_Actions.getPageUrlsFollowingSiteSearch_firstSite_lastN__API.getProcessedReport_month.xml
index ddbfc27323..ddbfc27323 100644
--- a/tests/PHPUnit/Integration/expected/test_SiteSearch_Actions.getPageUrlsFollowingSiteSearch_firstSite_lastN__API.getProcessedReport_month.xml
+++ b/tests/PHPUnit/System/expected/test_SiteSearch_Actions.getPageUrlsFollowingSiteSearch_firstSite_lastN__API.getProcessedReport_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_SiteSearch_Actions.getPageUrls_firstSite_lastN__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_SiteSearch_Actions.getPageUrls_firstSite_lastN__API.getProcessedReport_day.xml
index 3778066188..3778066188 100644
--- a/tests/PHPUnit/Integration/expected/test_SiteSearch_Actions.getPageUrls_firstSite_lastN__API.getProcessedReport_day.xml
+++ b/tests/PHPUnit/System/expected/test_SiteSearch_Actions.getPageUrls_firstSite_lastN__API.getProcessedReport_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_SiteSearch_Actions.getPageUrls_firstSite_lastN__API.getProcessedReport_month.xml b/tests/PHPUnit/System/expected/test_SiteSearch_Actions.getPageUrls_firstSite_lastN__API.getProcessedReport_month.xml
index c4d5795571..c4d5795571 100644
--- a/tests/PHPUnit/Integration/expected/test_SiteSearch_Actions.getPageUrls_firstSite_lastN__API.getProcessedReport_month.xml
+++ b/tests/PHPUnit/System/expected/test_SiteSearch_Actions.getPageUrls_firstSite_lastN__API.getProcessedReport_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_SiteSearch_Actions.getSiteSearchCategories_firstSite_lastN__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_SiteSearch_Actions.getSiteSearchCategories_firstSite_lastN__API.getProcessedReport_day.xml
index 48dec5534c..48dec5534c 100644
--- a/tests/PHPUnit/Integration/expected/test_SiteSearch_Actions.getSiteSearchCategories_firstSite_lastN__API.getProcessedReport_day.xml
+++ b/tests/PHPUnit/System/expected/test_SiteSearch_Actions.getSiteSearchCategories_firstSite_lastN__API.getProcessedReport_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_SiteSearch_Actions.getSiteSearchCategories_firstSite_lastN__API.getProcessedReport_month.xml b/tests/PHPUnit/System/expected/test_SiteSearch_Actions.getSiteSearchCategories_firstSite_lastN__API.getProcessedReport_month.xml
index cb33390062..cb33390062 100644
--- a/tests/PHPUnit/Integration/expected/test_SiteSearch_Actions.getSiteSearchCategories_firstSite_lastN__API.getProcessedReport_month.xml
+++ b/tests/PHPUnit/System/expected/test_SiteSearch_Actions.getSiteSearchCategories_firstSite_lastN__API.getProcessedReport_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_SiteSearch_Actions.getSiteSearchKeywords_firstSite_lastN__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_SiteSearch_Actions.getSiteSearchKeywords_firstSite_lastN__API.getProcessedReport_day.xml
index 84b4b19ea1..84b4b19ea1 100644
--- a/tests/PHPUnit/Integration/expected/test_SiteSearch_Actions.getSiteSearchKeywords_firstSite_lastN__API.getProcessedReport_day.xml
+++ b/tests/PHPUnit/System/expected/test_SiteSearch_Actions.getSiteSearchKeywords_firstSite_lastN__API.getProcessedReport_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_SiteSearch_Actions.getSiteSearchKeywords_firstSite_lastN__API.getProcessedReport_month.xml b/tests/PHPUnit/System/expected/test_SiteSearch_Actions.getSiteSearchKeywords_firstSite_lastN__API.getProcessedReport_month.xml
index 133ef2f538..133ef2f538 100644
--- a/tests/PHPUnit/Integration/expected/test_SiteSearch_Actions.getSiteSearchKeywords_firstSite_lastN__API.getProcessedReport_month.xml
+++ b/tests/PHPUnit/System/expected/test_SiteSearch_Actions.getSiteSearchKeywords_firstSite_lastN__API.getProcessedReport_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_SiteSearch_Actions.getSiteSearchNoResultKeywords_firstSite_lastN__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_SiteSearch_Actions.getSiteSearchNoResultKeywords_firstSite_lastN__API.getProcessedReport_day.xml
index e52d6cd8f3..e52d6cd8f3 100644
--- a/tests/PHPUnit/Integration/expected/test_SiteSearch_Actions.getSiteSearchNoResultKeywords_firstSite_lastN__API.getProcessedReport_day.xml
+++ b/tests/PHPUnit/System/expected/test_SiteSearch_Actions.getSiteSearchNoResultKeywords_firstSite_lastN__API.getProcessedReport_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_SiteSearch_Actions.getSiteSearchNoResultKeywords_firstSite_lastN__API.getProcessedReport_month.xml b/tests/PHPUnit/System/expected/test_SiteSearch_Actions.getSiteSearchNoResultKeywords_firstSite_lastN__API.getProcessedReport_month.xml
index 63ba94eaf9..63ba94eaf9 100644
--- a/tests/PHPUnit/Integration/expected/test_SiteSearch_Actions.getSiteSearchNoResultKeywords_firstSite_lastN__API.getProcessedReport_month.xml
+++ b/tests/PHPUnit/System/expected/test_SiteSearch_Actions.getSiteSearchNoResultKeywords_firstSite_lastN__API.getProcessedReport_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_SiteSearch_Actions.get_firstSite_lastN__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_SiteSearch_Actions.get_firstSite_lastN__API.getProcessedReport_day.xml
index 77af413fc5..77af413fc5 100644
--- a/tests/PHPUnit/Integration/expected/test_SiteSearch_Actions.get_firstSite_lastN__API.getProcessedReport_day.xml
+++ b/tests/PHPUnit/System/expected/test_SiteSearch_Actions.get_firstSite_lastN__API.getProcessedReport_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_SiteSearch_Actions.get_firstSite_lastN__API.getProcessedReport_month.xml b/tests/PHPUnit/System/expected/test_SiteSearch_Actions.get_firstSite_lastN__API.getProcessedReport_month.xml
index 1b0f9d2bec..1b0f9d2bec 100644
--- a/tests/PHPUnit/Integration/expected/test_SiteSearch_Actions.get_firstSite_lastN__API.getProcessedReport_month.xml
+++ b/tests/PHPUnit/System/expected/test_SiteSearch_Actions.get_firstSite_lastN__API.getProcessedReport_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_SiteSearch_AllSites__Actions.getPageTitlesFollowingSiteSearch_day.xml b/tests/PHPUnit/System/expected/test_SiteSearch_AllSites__Actions.getPageTitlesFollowingSiteSearch_day.xml
index 7ea5167dfd..7ea5167dfd 100644
--- a/tests/PHPUnit/Integration/expected/test_SiteSearch_AllSites__Actions.getPageTitlesFollowingSiteSearch_day.xml
+++ b/tests/PHPUnit/System/expected/test_SiteSearch_AllSites__Actions.getPageTitlesFollowingSiteSearch_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_SiteSearch_AllSites__Actions.getPageTitlesFollowingSiteSearch_month.xml b/tests/PHPUnit/System/expected/test_SiteSearch_AllSites__Actions.getPageTitlesFollowingSiteSearch_month.xml
index 86ae401b60..86ae401b60 100644
--- a/tests/PHPUnit/Integration/expected/test_SiteSearch_AllSites__Actions.getPageTitlesFollowingSiteSearch_month.xml
+++ b/tests/PHPUnit/System/expected/test_SiteSearch_AllSites__Actions.getPageTitlesFollowingSiteSearch_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_SiteSearch_AllSites__Actions.getPageTitles_day.xml b/tests/PHPUnit/System/expected/test_SiteSearch_AllSites__Actions.getPageTitles_day.xml
index 9dc49472a7..9dc49472a7 100644
--- a/tests/PHPUnit/Integration/expected/test_SiteSearch_AllSites__Actions.getPageTitles_day.xml
+++ b/tests/PHPUnit/System/expected/test_SiteSearch_AllSites__Actions.getPageTitles_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_SiteSearch_AllSites__Actions.getPageTitles_month.xml b/tests/PHPUnit/System/expected/test_SiteSearch_AllSites__Actions.getPageTitles_month.xml
index d9462f0f36..d9462f0f36 100644
--- a/tests/PHPUnit/Integration/expected/test_SiteSearch_AllSites__Actions.getPageTitles_month.xml
+++ b/tests/PHPUnit/System/expected/test_SiteSearch_AllSites__Actions.getPageTitles_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_SiteSearch_AllSites__Actions.getPageUrlsFollowingSiteSearch_day.xml b/tests/PHPUnit/System/expected/test_SiteSearch_AllSites__Actions.getPageUrlsFollowingSiteSearch_day.xml
index 74ece58337..74ece58337 100644
--- a/tests/PHPUnit/Integration/expected/test_SiteSearch_AllSites__Actions.getPageUrlsFollowingSiteSearch_day.xml
+++ b/tests/PHPUnit/System/expected/test_SiteSearch_AllSites__Actions.getPageUrlsFollowingSiteSearch_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_SiteSearch_AllSites__Actions.getPageUrlsFollowingSiteSearch_month.xml b/tests/PHPUnit/System/expected/test_SiteSearch_AllSites__Actions.getPageUrlsFollowingSiteSearch_month.xml
index 1c66040802..1c66040802 100644
--- a/tests/PHPUnit/Integration/expected/test_SiteSearch_AllSites__Actions.getPageUrlsFollowingSiteSearch_month.xml
+++ b/tests/PHPUnit/System/expected/test_SiteSearch_AllSites__Actions.getPageUrlsFollowingSiteSearch_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_SiteSearch_AllSites__Actions.getPageUrls_day.xml b/tests/PHPUnit/System/expected/test_SiteSearch_AllSites__Actions.getPageUrls_day.xml
index ff058d70eb..ff058d70eb 100644
--- a/tests/PHPUnit/Integration/expected/test_SiteSearch_AllSites__Actions.getPageUrls_day.xml
+++ b/tests/PHPUnit/System/expected/test_SiteSearch_AllSites__Actions.getPageUrls_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_SiteSearch_AllSites__Actions.getPageUrls_month.xml b/tests/PHPUnit/System/expected/test_SiteSearch_AllSites__Actions.getPageUrls_month.xml
index 87e23ee986..87e23ee986 100644
--- a/tests/PHPUnit/Integration/expected/test_SiteSearch_AllSites__Actions.getPageUrls_month.xml
+++ b/tests/PHPUnit/System/expected/test_SiteSearch_AllSites__Actions.getPageUrls_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_SiteSearch_AllSites__Actions.getSiteSearchCategories_day.xml b/tests/PHPUnit/System/expected/test_SiteSearch_AllSites__Actions.getSiteSearchCategories_day.xml
index a91076f826..a91076f826 100644
--- a/tests/PHPUnit/Integration/expected/test_SiteSearch_AllSites__Actions.getSiteSearchCategories_day.xml
+++ b/tests/PHPUnit/System/expected/test_SiteSearch_AllSites__Actions.getSiteSearchCategories_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_SiteSearch_AllSites__Actions.getSiteSearchCategories_month.xml b/tests/PHPUnit/System/expected/test_SiteSearch_AllSites__Actions.getSiteSearchCategories_month.xml
index a91076f826..a91076f826 100644
--- a/tests/PHPUnit/Integration/expected/test_SiteSearch_AllSites__Actions.getSiteSearchCategories_month.xml
+++ b/tests/PHPUnit/System/expected/test_SiteSearch_AllSites__Actions.getSiteSearchCategories_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_SiteSearch_AllSites__Actions.getSiteSearchKeywords_day.xml b/tests/PHPUnit/System/expected/test_SiteSearch_AllSites__Actions.getSiteSearchKeywords_day.xml
index 4798b08e6e..4798b08e6e 100644
--- a/tests/PHPUnit/Integration/expected/test_SiteSearch_AllSites__Actions.getSiteSearchKeywords_day.xml
+++ b/tests/PHPUnit/System/expected/test_SiteSearch_AllSites__Actions.getSiteSearchKeywords_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_SiteSearch_AllSites__Actions.getSiteSearchKeywords_month.xml b/tests/PHPUnit/System/expected/test_SiteSearch_AllSites__Actions.getSiteSearchKeywords_month.xml
index 5b6e7c4828..5b6e7c4828 100644
--- a/tests/PHPUnit/Integration/expected/test_SiteSearch_AllSites__Actions.getSiteSearchKeywords_month.xml
+++ b/tests/PHPUnit/System/expected/test_SiteSearch_AllSites__Actions.getSiteSearchKeywords_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_SiteSearch_AllSites__Actions.getSiteSearchNoResultKeywords_day.xml b/tests/PHPUnit/System/expected/test_SiteSearch_AllSites__Actions.getSiteSearchNoResultKeywords_day.xml
index b30ddb01d7..b30ddb01d7 100644
--- a/tests/PHPUnit/Integration/expected/test_SiteSearch_AllSites__Actions.getSiteSearchNoResultKeywords_day.xml
+++ b/tests/PHPUnit/System/expected/test_SiteSearch_AllSites__Actions.getSiteSearchNoResultKeywords_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_SiteSearch_AllSites__Actions.getSiteSearchNoResultKeywords_month.xml b/tests/PHPUnit/System/expected/test_SiteSearch_AllSites__Actions.getSiteSearchNoResultKeywords_month.xml
index 4f8b06fb5b..4f8b06fb5b 100644
--- a/tests/PHPUnit/Integration/expected/test_SiteSearch_AllSites__Actions.getSiteSearchNoResultKeywords_month.xml
+++ b/tests/PHPUnit/System/expected/test_SiteSearch_AllSites__Actions.getSiteSearchNoResultKeywords_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_SiteSearch_AllSites__Actions.get_day.xml b/tests/PHPUnit/System/expected/test_SiteSearch_AllSites__Actions.get_day.xml
index 13c2a7e8ac..13c2a7e8ac 100644
--- a/tests/PHPUnit/Integration/expected/test_SiteSearch_AllSites__Actions.get_day.xml
+++ b/tests/PHPUnit/System/expected/test_SiteSearch_AllSites__Actions.get_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_SiteSearch_AllSites__Actions.get_month.xml b/tests/PHPUnit/System/expected/test_SiteSearch_AllSites__Actions.get_month.xml
index d078913108..d078913108 100644
--- a/tests/PHPUnit/Integration/expected/test_SiteSearch_AllSites__Actions.get_month.xml
+++ b/tests/PHPUnit/System/expected/test_SiteSearch_AllSites__Actions.get_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_SiteSearch_AllSites__CustomVariables.getCustomVariables_day.xml b/tests/PHPUnit/System/expected/test_SiteSearch_AllSites__CustomVariables.getCustomVariables_day.xml
index 55f9028117..55f9028117 100644
--- a/tests/PHPUnit/Integration/expected/test_SiteSearch_AllSites__CustomVariables.getCustomVariables_day.xml
+++ b/tests/PHPUnit/System/expected/test_SiteSearch_AllSites__CustomVariables.getCustomVariables_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_SiteSearch_AllSites__CustomVariables.getCustomVariables_month.xml b/tests/PHPUnit/System/expected/test_SiteSearch_AllSites__CustomVariables.getCustomVariables_month.xml
index 1a0871477a..1a0871477a 100644
--- a/tests/PHPUnit/Integration/expected/test_SiteSearch_AllSites__CustomVariables.getCustomVariables_month.xml
+++ b/tests/PHPUnit/System/expected/test_SiteSearch_AllSites__CustomVariables.getCustomVariables_month.xml
diff --git a/tests/PHPUnit/Integration/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 349f30ef0e..349f30ef0e 100644
--- a/tests/PHPUnit/Integration/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
diff --git a/tests/PHPUnit/Integration/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 d2c8572231..d2c8572231 100644
--- a/tests/PHPUnit/Integration/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
diff --git a/tests/PHPUnit/Integration/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageTitlesFollowingSiteSearch_day.xml b/tests/PHPUnit/System/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageTitlesFollowingSiteSearch_day.xml
index 66f8e8a41d..66f8e8a41d 100644
--- a/tests/PHPUnit/Integration/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageTitlesFollowingSiteSearch_day.xml
+++ b/tests/PHPUnit/System/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageTitlesFollowingSiteSearch_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageTitlesFollowingSiteSearch_month.xml b/tests/PHPUnit/System/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageTitlesFollowingSiteSearch_month.xml
index 450ab9b87a..450ab9b87a 100644
--- a/tests/PHPUnit/Integration/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageTitlesFollowingSiteSearch_month.xml
+++ b/tests/PHPUnit/System/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageTitlesFollowingSiteSearch_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageTitles_day.xml b/tests/PHPUnit/System/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageTitles_day.xml
index 200b1c3565..200b1c3565 100644
--- a/tests/PHPUnit/Integration/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageTitles_day.xml
+++ b/tests/PHPUnit/System/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageTitles_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageTitles_month.xml b/tests/PHPUnit/System/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageTitles_month.xml
index 3adcd2fca8..3adcd2fca8 100644
--- a/tests/PHPUnit/Integration/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageTitles_month.xml
+++ b/tests/PHPUnit/System/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageTitles_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageUrlsFollowingSiteSearch_day.xml b/tests/PHPUnit/System/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageUrlsFollowingSiteSearch_day.xml
index 3fbf138c64..3fbf138c64 100644
--- a/tests/PHPUnit/Integration/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageUrlsFollowingSiteSearch_day.xml
+++ b/tests/PHPUnit/System/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageUrlsFollowingSiteSearch_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageUrlsFollowingSiteSearch_month.xml b/tests/PHPUnit/System/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageUrlsFollowingSiteSearch_month.xml
index 77a97cfa0b..77a97cfa0b 100644
--- a/tests/PHPUnit/Integration/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageUrlsFollowingSiteSearch_month.xml
+++ b/tests/PHPUnit/System/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageUrlsFollowingSiteSearch_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageUrls_day.xml b/tests/PHPUnit/System/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageUrls_day.xml
index f709bef598..f709bef598 100644
--- a/tests/PHPUnit/Integration/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageUrls_day.xml
+++ b/tests/PHPUnit/System/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageUrls_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageUrls_month.xml b/tests/PHPUnit/System/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageUrls_month.xml
index a7eeb309c9..a7eeb309c9 100644
--- a/tests/PHPUnit/Integration/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageUrls_month.xml
+++ b/tests/PHPUnit/System/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageUrls_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_SiteSearch_NotLastNPeriods__Actions.getSiteSearchCategories_day.xml b/tests/PHPUnit/System/expected/test_SiteSearch_NotLastNPeriods__Actions.getSiteSearchCategories_day.xml
index 4dc5305623..4dc5305623 100644
--- a/tests/PHPUnit/Integration/expected/test_SiteSearch_NotLastNPeriods__Actions.getSiteSearchCategories_day.xml
+++ b/tests/PHPUnit/System/expected/test_SiteSearch_NotLastNPeriods__Actions.getSiteSearchCategories_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_SiteSearch_NotLastNPeriods__Actions.getSiteSearchCategories_month.xml b/tests/PHPUnit/System/expected/test_SiteSearch_NotLastNPeriods__Actions.getSiteSearchCategories_month.xml
index 26395c7055..26395c7055 100644
--- a/tests/PHPUnit/Integration/expected/test_SiteSearch_NotLastNPeriods__Actions.getSiteSearchCategories_month.xml
+++ b/tests/PHPUnit/System/expected/test_SiteSearch_NotLastNPeriods__Actions.getSiteSearchCategories_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_SiteSearch_NotLastNPeriods__Actions.getSiteSearchKeywords_day.xml b/tests/PHPUnit/System/expected/test_SiteSearch_NotLastNPeriods__Actions.getSiteSearchKeywords_day.xml
index 588feafeea..588feafeea 100644
--- a/tests/PHPUnit/Integration/expected/test_SiteSearch_NotLastNPeriods__Actions.getSiteSearchKeywords_day.xml
+++ b/tests/PHPUnit/System/expected/test_SiteSearch_NotLastNPeriods__Actions.getSiteSearchKeywords_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_SiteSearch_NotLastNPeriods__Actions.getSiteSearchKeywords_month.xml b/tests/PHPUnit/System/expected/test_SiteSearch_NotLastNPeriods__Actions.getSiteSearchKeywords_month.xml
index 3e1015bd31..3e1015bd31 100644
--- a/tests/PHPUnit/Integration/expected/test_SiteSearch_NotLastNPeriods__Actions.getSiteSearchKeywords_month.xml
+++ b/tests/PHPUnit/System/expected/test_SiteSearch_NotLastNPeriods__Actions.getSiteSearchKeywords_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_SiteSearch_NotLastNPeriods__Actions.getSiteSearchNoResultKeywords_day.xml b/tests/PHPUnit/System/expected/test_SiteSearch_NotLastNPeriods__Actions.getSiteSearchNoResultKeywords_day.xml
index 7eb0674f50..7eb0674f50 100644
--- a/tests/PHPUnit/Integration/expected/test_SiteSearch_NotLastNPeriods__Actions.getSiteSearchNoResultKeywords_day.xml
+++ b/tests/PHPUnit/System/expected/test_SiteSearch_NotLastNPeriods__Actions.getSiteSearchNoResultKeywords_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_SiteSearch_NotLastNPeriods__Actions.getSiteSearchNoResultKeywords_month.xml b/tests/PHPUnit/System/expected/test_SiteSearch_NotLastNPeriods__Actions.getSiteSearchNoResultKeywords_month.xml
index f1569434b4..f1569434b4 100644
--- a/tests/PHPUnit/Integration/expected/test_SiteSearch_NotLastNPeriods__Actions.getSiteSearchNoResultKeywords_month.xml
+++ b/tests/PHPUnit/System/expected/test_SiteSearch_NotLastNPeriods__Actions.getSiteSearchNoResultKeywords_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_SiteSearch_NotLastNPeriods__Actions.get_day.xml b/tests/PHPUnit/System/expected/test_SiteSearch_NotLastNPeriods__Actions.get_day.xml
index f125336842..f125336842 100644
--- a/tests/PHPUnit/Integration/expected/test_SiteSearch_NotLastNPeriods__Actions.get_day.xml
+++ b/tests/PHPUnit/System/expected/test_SiteSearch_NotLastNPeriods__Actions.get_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_SiteSearch_NotLastNPeriods__Actions.get_month.xml b/tests/PHPUnit/System/expected/test_SiteSearch_NotLastNPeriods__Actions.get_month.xml
index 9d598b649a..9d598b649a 100644
--- a/tests/PHPUnit/Integration/expected/test_SiteSearch_NotLastNPeriods__Actions.get_month.xml
+++ b/tests/PHPUnit/System/expected/test_SiteSearch_NotLastNPeriods__Actions.get_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_SiteSearch_NotLastNPeriods__CustomVariables.getCustomVariables_day.xml b/tests/PHPUnit/System/expected/test_SiteSearch_NotLastNPeriods__CustomVariables.getCustomVariables_day.xml
index c234bed59e..c234bed59e 100644
--- a/tests/PHPUnit/Integration/expected/test_SiteSearch_NotLastNPeriods__CustomVariables.getCustomVariables_day.xml
+++ b/tests/PHPUnit/System/expected/test_SiteSearch_NotLastNPeriods__CustomVariables.getCustomVariables_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_SiteSearch_NotLastNPeriods__CustomVariables.getCustomVariables_month.xml b/tests/PHPUnit/System/expected/test_SiteSearch_NotLastNPeriods__CustomVariables.getCustomVariables_month.xml
index c234bed59e..c234bed59e 100644
--- a/tests/PHPUnit/Integration/expected/test_SiteSearch_NotLastNPeriods__CustomVariables.getCustomVariables_month.xml
+++ b/tests/PHPUnit/System/expected/test_SiteSearch_NotLastNPeriods__CustomVariables.getCustomVariables_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_TimezonesTest__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/System/expected/test_TimezonesTest__Live.getLastVisitsDetails_day.xml
index 4d5a3bb878..4d5a3bb878 100644
--- a/tests/PHPUnit/Integration/expected/test_TimezonesTest__Live.getLastVisitsDetails_day.xml
+++ b/tests/PHPUnit/System/expected/test_TimezonesTest__Live.getLastVisitsDetails_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_TimezonesTest_dayAfterVisit__VisitsSummary.get_day.xml b/tests/PHPUnit/System/expected/test_TimezonesTest_dayAfterVisit__VisitsSummary.get_day.xml
index 32b66284be..32b66284be 100644
--- a/tests/PHPUnit/Integration/expected/test_TimezonesTest_dayAfterVisit__VisitsSummary.get_day.xml
+++ b/tests/PHPUnit/System/expected/test_TimezonesTest_dayAfterVisit__VisitsSummary.get_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_TimezonesTest_withVisit__VisitsSummary.get_day.xml b/tests/PHPUnit/System/expected/test_TimezonesTest_withVisit__VisitsSummary.get_day.xml
index b0e66b9280..b0e66b9280 100644
--- a/tests/PHPUnit/Integration/expected/test_TimezonesTest_withVisit__VisitsSummary.get_day.xml
+++ b/tests/PHPUnit/System/expected/test_TimezonesTest_withVisit__VisitsSummary.get_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_TrackerWindowLookBack__VisitsSummary.getVisits_range.xml b/tests/PHPUnit/System/expected/test_TrackerWindowLookBack__VisitsSummary.getVisits_range.xml
index 5fec83d011..5fec83d011 100644
--- a/tests/PHPUnit/Integration/expected/test_TrackerWindowLookBack__VisitsSummary.getVisits_range.xml
+++ b/tests/PHPUnit/System/expected/test_TrackerWindowLookBack__VisitsSummary.getVisits_range.xml
diff --git a/tests/PHPUnit/Integration/expected/test_Transitions__Transitions.getTransitionsForPageUrl_day.xml b/tests/PHPUnit/System/expected/test_Transitions__Transitions.getTransitionsForPageUrl_day.xml
index 55793129f6..55793129f6 100644
--- a/tests/PHPUnit/Integration/expected/test_Transitions__Transitions.getTransitionsForPageUrl_day.xml
+++ b/tests/PHPUnit/System/expected/test_Transitions__Transitions.getTransitionsForPageUrl_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_Transitions__Transitions.getTransitionsForPageUrl_month.xml b/tests/PHPUnit/System/expected/test_Transitions__Transitions.getTransitionsForPageUrl_month.xml
index 5ed9538508..5ed9538508 100644
--- a/tests/PHPUnit/Integration/expected/test_Transitions__Transitions.getTransitionsForPageUrl_month.xml
+++ b/tests/PHPUnit/System/expected/test_Transitions__Transitions.getTransitionsForPageUrl_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_Transitions_noData__Transitions.getTransitionsForPageTitle_day.xml b/tests/PHPUnit/System/expected/test_Transitions_noData__Transitions.getTransitionsForPageTitle_day.xml
index a0995fa6e9..a0995fa6e9 100644
--- a/tests/PHPUnit/Integration/expected/test_Transitions_noData__Transitions.getTransitionsForPageTitle_day.xml
+++ b/tests/PHPUnit/System/expected/test_Transitions_noData__Transitions.getTransitionsForPageTitle_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_Transitions_noData__Transitions.getTransitionsForPageTitle_month.xml b/tests/PHPUnit/System/expected/test_Transitions_noData__Transitions.getTransitionsForPageTitle_month.xml
index a0995fa6e9..a0995fa6e9 100644
--- a/tests/PHPUnit/Integration/expected/test_Transitions_noData__Transitions.getTransitionsForPageTitle_month.xml
+++ b/tests/PHPUnit/System/expected/test_Transitions_noData__Transitions.getTransitionsForPageTitle_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_Transitions_noData__Transitions.getTransitionsForPageUrl_day.xml b/tests/PHPUnit/System/expected/test_Transitions_noData__Transitions.getTransitionsForPageUrl_day.xml
index a0995fa6e9..a0995fa6e9 100644
--- a/tests/PHPUnit/Integration/expected/test_Transitions_noData__Transitions.getTransitionsForPageUrl_day.xml
+++ b/tests/PHPUnit/System/expected/test_Transitions_noData__Transitions.getTransitionsForPageUrl_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_Transitions_noData__Transitions.getTransitionsForPageUrl_month.xml b/tests/PHPUnit/System/expected/test_Transitions_noData__Transitions.getTransitionsForPageUrl_month.xml
index a0995fa6e9..a0995fa6e9 100644
--- a/tests/PHPUnit/Integration/expected/test_Transitions_noData__Transitions.getTransitionsForPageUrl_month.xml
+++ b/tests/PHPUnit/System/expected/test_Transitions_noData__Transitions.getTransitionsForPageUrl_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_Transitions_noLimit__Transitions.getTransitionsForPageTitle_day.xml b/tests/PHPUnit/System/expected/test_Transitions_noLimit__Transitions.getTransitionsForPageTitle_day.xml
index 380f8c0fe5..380f8c0fe5 100644
--- a/tests/PHPUnit/Integration/expected/test_Transitions_noLimit__Transitions.getTransitionsForPageTitle_day.xml
+++ b/tests/PHPUnit/System/expected/test_Transitions_noLimit__Transitions.getTransitionsForPageTitle_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_Transitions_noLimit__Transitions.getTransitionsForPageTitle_month.xml b/tests/PHPUnit/System/expected/test_Transitions_noLimit__Transitions.getTransitionsForPageTitle_month.xml
index 2e262a752e..2e262a752e 100644
--- a/tests/PHPUnit/Integration/expected/test_Transitions_noLimit__Transitions.getTransitionsForPageTitle_month.xml
+++ b/tests/PHPUnit/System/expected/test_Transitions_noLimit__Transitions.getTransitionsForPageTitle_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_Transitions_noLimit__Transitions.getTransitionsForPageUrl_day.xml b/tests/PHPUnit/System/expected/test_Transitions_noLimit__Transitions.getTransitionsForPageUrl_day.xml
index f69f385cb8..f69f385cb8 100644
--- a/tests/PHPUnit/Integration/expected/test_Transitions_noLimit__Transitions.getTransitionsForPageUrl_day.xml
+++ b/tests/PHPUnit/System/expected/test_Transitions_noLimit__Transitions.getTransitionsForPageUrl_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_Transitions_noLimit__Transitions.getTransitionsForPageUrl_month.xml b/tests/PHPUnit/System/expected/test_Transitions_noLimit__Transitions.getTransitionsForPageUrl_month.xml
index 8a14c26ccf..8a14c26ccf 100644
--- a/tests/PHPUnit/Integration/expected/test_Transitions_noLimit__Transitions.getTransitionsForPageUrl_month.xml
+++ b/tests/PHPUnit/System/expected/test_Transitions_noLimit__Transitions.getTransitionsForPageUrl_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Actions.getOutlinks_firstSite_lastN__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Actions.getOutlinks_firstSite_lastN__API.getProcessedReport_day.xml
index 85885d4462..85885d4462 100644
--- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Actions.getOutlinks_firstSite_lastN__API.getProcessedReport_day.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Actions.getOutlinks_firstSite_lastN__API.getProcessedReport_day.xml
diff --git a/tests/PHPUnit/Integration/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 7d8be22272..7d8be22272 100644
--- a/tests/PHPUnit/Integration/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
diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Actions.getPageUrls_firstSite_lastN__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Actions.getPageUrls_firstSite_lastN__API.getProcessedReport_day.xml
index dfccc81659..dfccc81659 100644
--- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Actions.getPageUrls_firstSite_lastN__API.getProcessedReport_day.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Actions.getPageUrls_firstSite_lastN__API.getProcessedReport_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_disabledAfter__VisitsSummary.get_day.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_disabledAfter__VisitsSummary.get_day.xml
index 89cd627339..89cd627339 100644
--- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_disabledAfter__VisitsSummary.get_day.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_disabledAfter__VisitsSummary.get_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_disabledAfter__VisitsSummary.get_month.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_disabledAfter__VisitsSummary.get_month.xml
index 50c77f2755..50c77f2755 100644
--- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_disabledAfter__VisitsSummary.get_month.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_disabledAfter__VisitsSummary.get_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_disabledAfter__VisitsSummary.get_week.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_disabledAfter__VisitsSummary.get_week.xml
index 89cd627339..89cd627339 100644
--- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_disabledAfter__VisitsSummary.get_week.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_disabledAfter__VisitsSummary.get_week.xml
diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_disabledAfter__VisitsSummary.get_year.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_disabledAfter__VisitsSummary.get_year.xml
index f520263652..f520263652 100644
--- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_disabledAfter__VisitsSummary.get_year.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_disabledAfter__VisitsSummary.get_year.xml
diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_disabledBefore__VisitsSummary.get_day.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_disabledBefore__VisitsSummary.get_day.xml
index 1c7f2179e5..1c7f2179e5 100644
--- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_disabledBefore__VisitsSummary.get_day.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_disabledBefore__VisitsSummary.get_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_disabledBefore__VisitsSummary.get_month.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_disabledBefore__VisitsSummary.get_month.xml
index 1c7f2179e5..1c7f2179e5 100644
--- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_disabledBefore__VisitsSummary.get_month.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_disabledBefore__VisitsSummary.get_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_disabledBefore__VisitsSummary.get_week.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_disabledBefore__VisitsSummary.get_week.xml
index 1c7f2179e5..1c7f2179e5 100644
--- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_disabledBefore__VisitsSummary.get_week.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_disabledBefore__VisitsSummary.get_week.xml
diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_disabledBefore__VisitsSummary.get_year.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_disabledBefore__VisitsSummary.get_year.xml
index 1c7f2179e5..1c7f2179e5 100644
--- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_disabledBefore__VisitsSummary.get_year.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_disabledBefore__VisitsSummary.get_year.xml
diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_disabledBefore_isDateRange__VisitsSummary.get_range.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_disabledBefore_isDateRange__VisitsSummary.get_range.xml
index f520263652..f520263652 100644
--- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_disabledBefore_isDateRange__VisitsSummary.get_range.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_disabledBefore_isDateRange__VisitsSummary.get_range.xml
diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_enabledBefore_isDateRange__VisitsSummary.get_range.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_enabledBefore_isDateRange__VisitsSummary.get_range.xml
index f520263652..f520263652 100644
--- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_enabledBefore_isDateRange__VisitsSummary.get_range.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_enabledBefore_isDateRange__VisitsSummary.get_range.xml
diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_enabled__VisitsSummary.get_day.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_enabled__VisitsSummary.get_day.xml
index 89cd627339..89cd627339 100644
--- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_enabled__VisitsSummary.get_day.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_enabled__VisitsSummary.get_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_enabled__VisitsSummary.get_month.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_enabled__VisitsSummary.get_month.xml
index 50c77f2755..50c77f2755 100644
--- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_enabled__VisitsSummary.get_month.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_enabled__VisitsSummary.get_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_enabled__VisitsSummary.get_week.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_enabled__VisitsSummary.get_week.xml
index 89cd627339..89cd627339 100644
--- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_enabled__VisitsSummary.get_week.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_enabled__VisitsSummary.get_week.xml
diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_enabled__VisitsSummary.get_year.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_enabled__VisitsSummary.get_year.xml
index f520263652..f520263652 100644
--- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_enabled__VisitsSummary.get_year.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_enabled__VisitsSummary.get_year.xml
diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_Goals.getDaysToConversion_firstSite_lastN__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_Goals.getDaysToConversion_firstSite_lastN__API.getProcessedReport_day.xml
index 5518322f9d..5518322f9d 100644
--- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_Goals.getDaysToConversion_firstSite_lastN__API.getProcessedReport_day.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_Goals.getDaysToConversion_firstSite_lastN__API.getProcessedReport_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_MultiSites.getAll_firstSite_lastN__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_MultiSites.getAll_firstSite_lastN__API.getProcessedReport_day.xml
index 31f9f11927..31f9f11927 100644
--- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_MultiSites.getAll_firstSite_lastN__API.getProcessedReport_day.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_MultiSites.getAll_firstSite_lastN__API.getProcessedReport_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_NotLastNPeriods__Goals.get_day.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_NotLastNPeriods__Goals.get_day.xml
index 6dc2190ded..6dc2190ded 100644
--- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_NotLastNPeriods__Goals.get_day.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_NotLastNPeriods__Goals.get_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_NotLastNPeriods__Goals.get_month.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_NotLastNPeriods__Goals.get_month.xml
index b22657ae32..b22657ae32 100644
--- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_NotLastNPeriods__Goals.get_month.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_NotLastNPeriods__Goals.get_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_NotLastNPeriods__VisitsSummary.get_day.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_NotLastNPeriods__VisitsSummary.get_day.xml
index 89cd627339..89cd627339 100644
--- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_NotLastNPeriods__VisitsSummary.get_day.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_NotLastNPeriods__VisitsSummary.get_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_NotLastNPeriods__VisitsSummary.get_month.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_NotLastNPeriods__VisitsSummary.get_month.xml
index 50c77f2755..50c77f2755 100644
--- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_NotLastNPeriods__VisitsSummary.get_month.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_NotLastNPeriods__VisitsSummary.get_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__Goals.getDaysToConversion_day.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__Goals.getDaysToConversion_day.xml
index 6812efd47b..6812efd47b 100644
--- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__Goals.getDaysToConversion_day.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__Goals.getDaysToConversion_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__Goals.getDaysToConversion_month.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__Goals.getDaysToConversion_month.xml
index ea5ebdc416..ea5ebdc416 100644
--- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__Goals.getDaysToConversion_month.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__Goals.getDaysToConversion_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__Goals.getDaysToConversion_week.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__Goals.getDaysToConversion_week.xml
index e64f82133c..e64f82133c 100644
--- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__Goals.getDaysToConversion_week.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__Goals.getDaysToConversion_week.xml
diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__Goals.getDaysToConversion_year.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__Goals.getDaysToConversion_year.xml
index aec231ccd9..aec231ccd9 100644
--- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__Goals.getDaysToConversion_year.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__Goals.getDaysToConversion_year.xml
diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__MultiSites.getAll_day.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__MultiSites.getAll_day.xml
index cb0f03a1ca..cb0f03a1ca 100644
--- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__MultiSites.getAll_day.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__MultiSites.getAll_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__MultiSites.getAll_month.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__MultiSites.getAll_month.xml
index 7abc0f83ec..7abc0f83ec 100644
--- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__MultiSites.getAll_month.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__MultiSites.getAll_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__MultiSites.getAll_week.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__MultiSites.getAll_week.xml
index 8283409adb..8283409adb 100644
--- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__MultiSites.getAll_week.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__MultiSites.getAll_week.xml
diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__MultiSites.getAll_year.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__MultiSites.getAll_year.xml
index 9feb3bf709..9feb3bf709 100644
--- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__MultiSites.getAll_year.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__MultiSites.getAll_year.xml
diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_getMetricsFromDifferentReports__VisitsSummary.get_range.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_getMetricsFromDifferentReports__VisitsSummary.get_range.xml
index 16cafd4926..16cafd4926 100644
--- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_getMetricsFromDifferentReports__VisitsSummary.get_range.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_getMetricsFromDifferentReports__VisitsSummary.get_range.xml
diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_idSiteOne___Goals.getDaysToConversion_day.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_idSiteOne___Goals.getDaysToConversion_day.xml
index 3028f63bd5..3028f63bd5 100644
--- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_idSiteOne___Goals.getDaysToConversion_day.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_idSiteOne___Goals.getDaysToConversion_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_idSiteOne___Goals.getDaysToConversion_month.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_idSiteOne___Goals.getDaysToConversion_month.xml
index 4c4cde2aaa..4c4cde2aaa 100644
--- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_idSiteOne___Goals.getDaysToConversion_month.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_idSiteOne___Goals.getDaysToConversion_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_idSiteOne___Goals.getDaysToConversion_week.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_idSiteOne___Goals.getDaysToConversion_week.xml
index d14e5969a6..d14e5969a6 100644
--- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_idSiteOne___Goals.getDaysToConversion_week.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_idSiteOne___Goals.getDaysToConversion_week.xml
diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_idSiteOne___Goals.getDaysToConversion_year.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_idSiteOne___Goals.getDaysToConversion_year.xml
index 5b7b43f93c..5b7b43f93c 100644
--- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_idSiteOne___Goals.getDaysToConversion_year.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_idSiteOne___Goals.getDaysToConversion_year.xml
diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_idSiteOne___MultiSites.getAll_day.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_idSiteOne___MultiSites.getAll_day.xml
index cb0f03a1ca..cb0f03a1ca 100644
--- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_idSiteOne___MultiSites.getAll_day.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_idSiteOne___MultiSites.getAll_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_idSiteOne___MultiSites.getAll_month.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_idSiteOne___MultiSites.getAll_month.xml
index 7abc0f83ec..7abc0f83ec 100644
--- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_idSiteOne___MultiSites.getAll_month.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_idSiteOne___MultiSites.getAll_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_idSiteOne___MultiSites.getAll_week.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_idSiteOne___MultiSites.getAll_week.xml
index 8283409adb..8283409adb 100644
--- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_idSiteOne___MultiSites.getAll_week.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_idSiteOne___MultiSites.getAll_week.xml
diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_idSiteOne___MultiSites.getAll_year.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_idSiteOne___MultiSites.getAll_year.xml
index 9feb3bf709..9feb3bf709 100644
--- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_idSiteOne___MultiSites.getAll_year.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_idSiteOne___MultiSites.getAll_year.xml
diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_NotLastNPeriods__Goals.get_day.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_NotLastNPeriods__Goals.get_day.xml
index 1c7f2179e5..1c7f2179e5 100644
--- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_NotLastNPeriods__Goals.get_day.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_NotLastNPeriods__Goals.get_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_NotLastNPeriods__Goals.get_month.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_NotLastNPeriods__Goals.get_month.xml
index 1c7f2179e5..1c7f2179e5 100644
--- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_NotLastNPeriods__Goals.get_month.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_NotLastNPeriods__Goals.get_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_NotLastNPeriods__VisitsSummary.get_day.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_NotLastNPeriods__VisitsSummary.get_day.xml
index 296741c7a0..296741c7a0 100644
--- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_NotLastNPeriods__VisitsSummary.get_day.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_NotLastNPeriods__VisitsSummary.get_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_NotLastNPeriods__VisitsSummary.get_month.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_NotLastNPeriods__VisitsSummary.get_month.xml
index 9aa711753b..9aa711753b 100644
--- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_NotLastNPeriods__VisitsSummary.get_month.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_NotLastNPeriods__VisitsSummary.get_month.xml
diff --git a/tests/PHPUnit/Integration/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 b44b46c790..b44b46c790 100644
--- a/tests/PHPUnit/Integration/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
diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_VisitFrequency.get_firstSite_lastN__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_VisitFrequency.get_firstSite_lastN__API.getProcessedReport_day.xml
index fa28a54c25..fa28a54c25 100644
--- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_VisitFrequency.get_firstSite_lastN__API.getProcessedReport_day.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_VisitFrequency.get_firstSite_lastN__API.getProcessedReport_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_VisitorInterest.getNumberOfVisitsByDaysSinceLast_firstSite_lastN__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_VisitorInterest.getNumberOfVisitsByDaysSinceLast_firstSite_lastN__API.getProcessedReport_day.xml
index 0cfdf60b49..0cfdf60b49 100644
--- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_VisitorInterest.getNumberOfVisitsByDaysSinceLast_firstSite_lastN__API.getProcessedReport_day.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_VisitorInterest.getNumberOfVisitsByDaysSinceLast_firstSite_lastN__API.getProcessedReport_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_VisitsSummary.get_firstSite_lastN__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_VisitsSummary.get_firstSite_lastN__API.getProcessedReport_day.xml
index 0e48ca569f..0e48ca569f 100644
--- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_VisitsSummary.get_firstSite_lastN__API.getProcessedReport_day.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_VisitsSummary.get_firstSite_lastN__API.getProcessedReport_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getOutlinks_day.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getOutlinks_day.xml
index 232751d99e..232751d99e 100644
--- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getOutlinks_day.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getOutlinks_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getOutlinks_month.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getOutlinks_month.xml
index c01baa78e0..c01baa78e0 100644
--- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getOutlinks_month.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getOutlinks_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getOutlinks_week.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getOutlinks_week.xml
index 42386fd091..42386fd091 100644
--- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getOutlinks_week.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getOutlinks_week.xml
diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getOutlinks_year.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getOutlinks_year.xml
index 1b66731da4..1b66731da4 100644
--- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getOutlinks_year.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getOutlinks_year.xml
diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageTitle_day.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageTitle_day.xml
index 31cace930f..31cace930f 100644
--- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageTitle_day.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageTitle_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageTitle_month.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageTitle_month.xml
index 8e94360fea..8e94360fea 100644
--- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageTitle_month.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageTitle_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageTitle_week.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageTitle_week.xml
index 5138d96b47..5138d96b47 100644
--- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageTitle_week.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageTitle_week.xml
diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageTitle_year.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageTitle_year.xml
index 8e94360fea..8e94360fea 100644
--- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageTitle_year.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageTitle_year.xml
diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageTitles_day.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageTitles_day.xml
index 41b3ee1ab8..41b3ee1ab8 100644
--- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageTitles_day.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageTitles_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageTitles_month.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageTitles_month.xml
index d803ad11f9..d803ad11f9 100644
--- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageTitles_month.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageTitles_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageTitles_week.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageTitles_week.xml
index d04244796f..d04244796f 100644
--- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageTitles_week.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageTitles_week.xml
diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageTitles_year.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageTitles_year.xml
index 8622de5d82..8622de5d82 100644
--- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageTitles_year.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageTitles_year.xml
diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrl_day.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrl_day.xml
index baf847ce36..baf847ce36 100644
--- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrl_day.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrl_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrl_month.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrl_month.xml
index 00bb5030af..00bb5030af 100644
--- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrl_month.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrl_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrl_week.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrl_week.xml
index a8fdd76865..a8fdd76865 100644
--- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrl_week.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrl_week.xml
diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrl_year.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrl_year.xml
index 00bb5030af..00bb5030af 100644
--- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrl_year.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrl_year.xml
diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_day.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_day.xml
index eda852deae..eda852deae 100644
--- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_day.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_month.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_month.xml
index faa058da6b..faa058da6b 100644
--- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_month.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_week.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_week.xml
index 89ffb01c30..89ffb01c30 100644
--- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_week.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_week.xml
diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_year.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_year.xml
index 4bccd4e8bc..4bccd4e8bc 100644
--- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_year.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_year.xml
diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__Referrers.getWebsites_day.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Referrers.getWebsites_day.xml
index 03e010ff91..03e010ff91 100644
--- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__Referrers.getWebsites_day.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Referrers.getWebsites_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__Referrers.getWebsites_month.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Referrers.getWebsites_month.xml
index aae3dbad27..aae3dbad27 100644
--- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__Referrers.getWebsites_month.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Referrers.getWebsites_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__Referrers.getWebsites_week.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Referrers.getWebsites_week.xml
index 1ba3ef39a1..1ba3ef39a1 100644
--- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__Referrers.getWebsites_week.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Referrers.getWebsites_week.xml
diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__Referrers.getWebsites_year.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Referrers.getWebsites_year.xml
index 81caacb06a..81caacb06a 100644
--- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__Referrers.getWebsites_year.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Referrers.getWebsites_year.xml
diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__VisitFrequency.get_day.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__VisitFrequency.get_day.xml
index 1132f1191d..1132f1191d 100644
--- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__VisitFrequency.get_day.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__VisitFrequency.get_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__VisitFrequency.get_month.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__VisitFrequency.get_month.xml
index f6da2a541d..f6da2a541d 100644
--- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__VisitFrequency.get_month.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__VisitFrequency.get_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__VisitFrequency.get_week.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__VisitFrequency.get_week.xml
index d64e929e8a..d64e929e8a 100644
--- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__VisitFrequency.get_week.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__VisitFrequency.get_week.xml
diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__VisitFrequency.get_year.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__VisitFrequency.get_year.xml
index dd6204a199..dd6204a199 100644
--- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__VisitFrequency.get_year.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__VisitFrequency.get_year.xml
diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__VisitorInterest.getNumberOfVisitsByDaysSinceLast_day.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__VisitorInterest.getNumberOfVisitsByDaysSinceLast_day.xml
index 0bc2b88f8f..0bc2b88f8f 100644
--- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__VisitorInterest.getNumberOfVisitsByDaysSinceLast_day.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__VisitorInterest.getNumberOfVisitsByDaysSinceLast_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__VisitorInterest.getNumberOfVisitsByDaysSinceLast_month.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__VisitorInterest.getNumberOfVisitsByDaysSinceLast_month.xml
index 16113a3774..16113a3774 100644
--- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__VisitorInterest.getNumberOfVisitsByDaysSinceLast_month.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__VisitorInterest.getNumberOfVisitsByDaysSinceLast_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__VisitorInterest.getNumberOfVisitsByDaysSinceLast_week.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__VisitorInterest.getNumberOfVisitsByDaysSinceLast_week.xml
index 7595c2461e..7595c2461e 100644
--- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__VisitorInterest.getNumberOfVisitsByDaysSinceLast_week.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__VisitorInterest.getNumberOfVisitsByDaysSinceLast_week.xml
diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__VisitorInterest.getNumberOfVisitsByDaysSinceLast_year.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__VisitorInterest.getNumberOfVisitsByDaysSinceLast_year.xml
index 59903493cd..59903493cd 100644
--- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__VisitorInterest.getNumberOfVisitsByDaysSinceLast_year.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__VisitorInterest.getNumberOfVisitsByDaysSinceLast_year.xml
diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__VisitsSummary.get_day.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__VisitsSummary.get_day.xml
index c0f0001ebf..c0f0001ebf 100644
--- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__VisitsSummary.get_day.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__VisitsSummary.get_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__VisitsSummary.get_month.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__VisitsSummary.get_month.xml
index d60436c3c9..d60436c3c9 100644
--- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__VisitsSummary.get_month.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__VisitsSummary.get_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__VisitsSummary.get_week.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__VisitsSummary.get_week.xml
index f754acd177..f754acd177 100644
--- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__VisitsSummary.get_week.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__VisitsSummary.get_week.xml
diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__VisitsSummary.get_year.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__VisitsSummary.get_year.xml
index 301adee7ee..301adee7ee 100644
--- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__VisitsSummary.get_year.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__VisitsSummary.get_year.xml
diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getOutlinks_day.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getOutlinks_day.xml
index d1ed3007ac..d1ed3007ac 100644
--- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getOutlinks_day.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getOutlinks_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getOutlinks_month.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getOutlinks_month.xml
index e1456fb1fb..e1456fb1fb 100644
--- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getOutlinks_month.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getOutlinks_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getOutlinks_week.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getOutlinks_week.xml
index 09097240f3..09097240f3 100644
--- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getOutlinks_week.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getOutlinks_week.xml
diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getOutlinks_year.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getOutlinks_year.xml
index 6996352bad..6996352bad 100644
--- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getOutlinks_year.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getOutlinks_year.xml
diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageTitle_day.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageTitle_day.xml
index eaed13c9ae..eaed13c9ae 100644
--- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageTitle_day.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageTitle_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageTitle_month.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageTitle_month.xml
index 4e3e4c0a67..4e3e4c0a67 100644
--- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageTitle_month.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageTitle_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageTitle_week.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageTitle_week.xml
index fe4e40c5bc..fe4e40c5bc 100644
--- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageTitle_week.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageTitle_week.xml
diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageTitle_year.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageTitle_year.xml
index aa7f84dbc7..aa7f84dbc7 100644
--- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageTitle_year.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageTitle_year.xml
diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageTitles_day.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageTitles_day.xml
index 9f120e0ee0..9f120e0ee0 100644
--- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageTitles_day.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageTitles_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageTitles_month.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageTitles_month.xml
index 7b53ef8a32..7b53ef8a32 100644
--- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageTitles_month.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageTitles_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageTitles_week.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageTitles_week.xml
index c8f777c165..c8f777c165 100644
--- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageTitles_week.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageTitles_week.xml
diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageTitles_year.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageTitles_year.xml
index 0d8b62b451..0d8b62b451 100644
--- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageTitles_year.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageTitles_year.xml
diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrl_day.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrl_day.xml
index b5ee40f53b..b5ee40f53b 100644
--- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrl_day.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrl_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrl_month.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrl_month.xml
index b12b6dbe6a..b12b6dbe6a 100644
--- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrl_month.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrl_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrl_week.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrl_week.xml
index 3227ff9c6a..3227ff9c6a 100644
--- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrl_week.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrl_week.xml
diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrl_year.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrl_year.xml
index 071c0d3fa2..071c0d3fa2 100644
--- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrl_year.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrl_year.xml
diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrls_day.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrls_day.xml
index efb03f5be4..efb03f5be4 100644
--- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrls_day.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrls_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrls_month.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrls_month.xml
index 56e3fc8c35..56e3fc8c35 100644
--- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrls_month.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrls_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrls_week.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrls_week.xml
index 7d086860eb..7d086860eb 100644
--- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrls_week.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrls_week.xml
diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrls_year.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrls_year.xml
index 284466a853..284466a853 100644
--- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrls_year.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrls_year.xml
diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Referrers.getWebsites_day.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Referrers.getWebsites_day.xml
index 1a10c7ba69..1a10c7ba69 100644
--- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Referrers.getWebsites_day.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Referrers.getWebsites_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Referrers.getWebsites_month.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Referrers.getWebsites_month.xml
index 2be1501d3c..2be1501d3c 100644
--- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Referrers.getWebsites_month.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Referrers.getWebsites_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Referrers.getWebsites_week.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Referrers.getWebsites_week.xml
index c0579730ef..c0579730ef 100644
--- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Referrers.getWebsites_week.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Referrers.getWebsites_week.xml
diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Referrers.getWebsites_year.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Referrers.getWebsites_year.xml
index 76f90bbf1d..76f90bbf1d 100644
--- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Referrers.getWebsites_year.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Referrers.getWebsites_year.xml
diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitFrequency.get_day.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitFrequency.get_day.xml
index f760097ff0..f760097ff0 100644
--- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitFrequency.get_day.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitFrequency.get_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitFrequency.get_month.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitFrequency.get_month.xml
index ddce4b63c9..ddce4b63c9 100644
--- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitFrequency.get_month.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitFrequency.get_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitFrequency.get_week.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitFrequency.get_week.xml
index d44fe0f184..d44fe0f184 100644
--- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitFrequency.get_week.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitFrequency.get_week.xml
diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitFrequency.get_year.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitFrequency.get_year.xml
index a7e7659d80..a7e7659d80 100644
--- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitFrequency.get_year.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitFrequency.get_year.xml
diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitorInterest.getNumberOfVisitsByDaysSinceLast_day.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitorInterest.getNumberOfVisitsByDaysSinceLast_day.xml
index c5d48206a0..c5d48206a0 100644
--- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitorInterest.getNumberOfVisitsByDaysSinceLast_day.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitorInterest.getNumberOfVisitsByDaysSinceLast_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitorInterest.getNumberOfVisitsByDaysSinceLast_month.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitorInterest.getNumberOfVisitsByDaysSinceLast_month.xml
index 617d79b103..617d79b103 100644
--- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitorInterest.getNumberOfVisitsByDaysSinceLast_month.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitorInterest.getNumberOfVisitsByDaysSinceLast_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitorInterest.getNumberOfVisitsByDaysSinceLast_week.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitorInterest.getNumberOfVisitsByDaysSinceLast_week.xml
index d657c3bad5..d657c3bad5 100644
--- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitorInterest.getNumberOfVisitsByDaysSinceLast_week.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitorInterest.getNumberOfVisitsByDaysSinceLast_week.xml
diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitorInterest.getNumberOfVisitsByDaysSinceLast_year.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitorInterest.getNumberOfVisitsByDaysSinceLast_year.xml
index 491a6fce6e..491a6fce6e 100644
--- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitorInterest.getNumberOfVisitsByDaysSinceLast_year.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitorInterest.getNumberOfVisitsByDaysSinceLast_year.xml
diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitsSummary.get_day.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitsSummary.get_day.xml
index 057ccb1b63..057ccb1b63 100644
--- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitsSummary.get_day.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitsSummary.get_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitsSummary.get_month.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitsSummary.get_month.xml
index 30c69614b1..30c69614b1 100644
--- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitsSummary.get_month.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitsSummary.get_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitsSummary.get_week.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitsSummary.get_week.xml
index bb7f2a5509..bb7f2a5509 100644
--- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitsSummary.get_week.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitsSummary.get_week.xml
diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitsSummary.get_year.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitsSummary.get_year.xml
index 10e5329cb6..10e5329cb6 100644
--- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitsSummary.get_year.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitsSummary.get_year.xml
diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_csv__ScheduledReports.generateReport_month.original.csv b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_csv__ScheduledReports.generateReport_month.original.csv
index cb454743aa..cb454743aa 100644
--- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_csv__ScheduledReports.generateReport_month.original.csv
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_csv__ScheduledReports.generateReport_month.original.csv
diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_row_evolution_graph__ScheduledReports.generateReport_month.original.html b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_row_evolution_graph__ScheduledReports.generateReport_month.original.html
index fc803f8028..fc803f8028 100644
--- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_row_evolution_graph__ScheduledReports.generateReport_month.original.html
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_row_evolution_graph__ScheduledReports.generateReport_month.original.html
diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_month.original.html b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_month.original.html
index c5183f184f..c5183f184f 100644
--- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_month.original.html
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_month.original.html
diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_month.original.html b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_month.original.html
index 8e8c6e7cd1..8e8c6e7cd1 100644
--- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_month.original.html
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_month.original.html
diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_pdf_tables_only__ScheduledReports.generateReport_month.original.pdf b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_pdf_tables_only__ScheduledReports.generateReport_month.original.pdf
index 7891c7d5ca..7891c7d5ca 100644
--- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_pdf_tables_only__ScheduledReports.generateReport_month.original.pdf
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_pdf_tables_only__ScheduledReports.generateReport_month.original.pdf
diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_via_sms_all_sites__ScheduledReports.generateReport_month.original.sms.txt b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_via_sms_all_sites__ScheduledReports.generateReport_month.original.sms.txt
index dd8d8a31dd..dd8d8a31dd 100644
--- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_via_sms_all_sites__ScheduledReports.generateReport_month.original.sms.txt
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_via_sms_all_sites__ScheduledReports.generateReport_month.original.sms.txt
diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_via_sms_one_site__ScheduledReports.generateReport_month.original.sms.txt b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_via_sms_one_site__ScheduledReports.generateReport_month.original.sms.txt
index 176db1187b..176db1187b 100644
--- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_via_sms_one_site__ScheduledReports.generateReport_month.original.sms.txt
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_via_sms_one_site__ScheduledReports.generateReport_month.original.sms.txt
diff --git a/tests/PHPUnit/Integration/expected/test_UrlNormalization_keywords__Referrers.getKeywordsForPageUrl_day.xml b/tests/PHPUnit/System/expected/test_UrlNormalization_keywords__Referrers.getKeywordsForPageUrl_day.xml
index 2c2c9551a8..2c2c9551a8 100644
--- a/tests/PHPUnit/Integration/expected/test_UrlNormalization_keywords__Referrers.getKeywordsForPageUrl_day.xml
+++ b/tests/PHPUnit/System/expected/test_UrlNormalization_keywords__Referrers.getKeywordsForPageUrl_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_UrlNormalization_pagesSegmentedRef__Actions.getPageUrls_day.xml b/tests/PHPUnit/System/expected/test_UrlNormalization_pagesSegmentedRef__Actions.getPageUrls_day.xml
index bbb576d7a5..bbb576d7a5 100644
--- a/tests/PHPUnit/Integration/expected/test_UrlNormalization_pagesSegmentedRef__Actions.getPageUrls_day.xml
+++ b/tests/PHPUnit/System/expected/test_UrlNormalization_pagesSegmentedRef__Actions.getPageUrls_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_UrlNormalization_pagesSegmented__Actions.getPageUrls_day.xml b/tests/PHPUnit/System/expected/test_UrlNormalization_pagesSegmented__Actions.getPageUrls_day.xml
index 2d5f40e9cb..2d5f40e9cb 100644
--- a/tests/PHPUnit/Integration/expected/test_UrlNormalization_pagesSegmented__Actions.getPageUrls_day.xml
+++ b/tests/PHPUnit/System/expected/test_UrlNormalization_pagesSegmented__Actions.getPageUrls_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_UrlNormalization_titles__Actions.getPageTitles_day.xml b/tests/PHPUnit/System/expected/test_UrlNormalization_titles__Actions.getPageTitles_day.xml
index 564a6ae28f..564a6ae28f 100644
--- a/tests/PHPUnit/Integration/expected/test_UrlNormalization_titles__Actions.getPageTitles_day.xml
+++ b/tests/PHPUnit/System/expected/test_UrlNormalization_titles__Actions.getPageTitles_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_UrlNormalization_urls__Actions.getPageUrls_day.xml b/tests/PHPUnit/System/expected/test_UrlNormalization_urls__Actions.getPageUrls_day.xml
index bbb576d7a5..bbb576d7a5 100644
--- a/tests/PHPUnit/Integration/expected/test_UrlNormalization_urls__Actions.getPageUrls_day.xml
+++ b/tests/PHPUnit/System/expected/test_UrlNormalization_urls__Actions.getPageUrls_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_UserId_VisitorId__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_UserId_VisitorId__Live.getLastVisitsDetails_month.xml
index cc28b360a0..cc28b360a0 100644
--- a/tests/PHPUnit/Integration/expected/test_UserId_VisitorId__Live.getLastVisitsDetails_month.xml
+++ b/tests/PHPUnit/System/expected/test_UserId_VisitorId__Live.getLastVisitsDetails_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_UserId_VisitorId__VisitsSummary.getUsers_day.xml b/tests/PHPUnit/System/expected/test_UserId_VisitorId__VisitsSummary.getUsers_day.xml
index 13002b2017..13002b2017 100644
--- a/tests/PHPUnit/Integration/expected/test_UserId_VisitorId__VisitsSummary.getUsers_day.xml
+++ b/tests/PHPUnit/System/expected/test_UserId_VisitorId__VisitsSummary.getUsers_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_UserId_VisitorId__VisitsSummary.getUsers_month.xml b/tests/PHPUnit/System/expected/test_UserId_VisitorId__VisitsSummary.getUsers_month.xml
index 15ef03fb49..15ef03fb49 100644
--- a/tests/PHPUnit/Integration/expected/test_UserId_VisitorId__VisitsSummary.getUsers_month.xml
+++ b/tests/PHPUnit/System/expected/test_UserId_VisitorId__VisitsSummary.getUsers_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_UserId_VisitorId__VisitsSummary.getUsers_week.xml b/tests/PHPUnit/System/expected/test_UserId_VisitorId__VisitsSummary.getUsers_week.xml
index 13002b2017..13002b2017 100644
--- a/tests/PHPUnit/Integration/expected/test_UserId_VisitorId__VisitsSummary.getUsers_week.xml
+++ b/tests/PHPUnit/System/expected/test_UserId_VisitorId__VisitsSummary.getUsers_week.xml
diff --git a/tests/PHPUnit/Integration/expected/test_UserId_VisitorId__VisitsSummary.getUsers_year.xml b/tests/PHPUnit/System/expected/test_UserId_VisitorId__VisitsSummary.getUsers_year.xml
index e8e63ff5b6..e8e63ff5b6 100644
--- a/tests/PHPUnit/Integration/expected/test_UserId_VisitorId__VisitsSummary.getUsers_year.xml
+++ b/tests/PHPUnit/System/expected/test_UserId_VisitorId__VisitsSummary.getUsers_year.xml
diff --git a/tests/PHPUnit/Integration/expected/test_UserId_VisitorId__VisitsSummary.get_day.xml b/tests/PHPUnit/System/expected/test_UserId_VisitorId__VisitsSummary.get_day.xml
index ca85e8dede..ca85e8dede 100644
--- a/tests/PHPUnit/Integration/expected/test_UserId_VisitorId__VisitsSummary.get_day.xml
+++ b/tests/PHPUnit/System/expected/test_UserId_VisitorId__VisitsSummary.get_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_UserId_VisitorId__VisitsSummary.get_month.xml b/tests/PHPUnit/System/expected/test_UserId_VisitorId__VisitsSummary.get_month.xml
index 7731535795..7731535795 100644
--- a/tests/PHPUnit/Integration/expected/test_UserId_VisitorId__VisitsSummary.get_month.xml
+++ b/tests/PHPUnit/System/expected/test_UserId_VisitorId__VisitsSummary.get_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_UserId_VisitorId__VisitsSummary.get_week.xml b/tests/PHPUnit/System/expected/test_UserId_VisitorId__VisitsSummary.get_week.xml
index ca85e8dede..ca85e8dede 100644
--- a/tests/PHPUnit/Integration/expected/test_UserId_VisitorId__VisitsSummary.get_week.xml
+++ b/tests/PHPUnit/System/expected/test_UserId_VisitorId__VisitsSummary.get_week.xml
diff --git a/tests/PHPUnit/Integration/expected/test_UserId_VisitorId__VisitsSummary.get_year.xml b/tests/PHPUnit/System/expected/test_UserId_VisitorId__VisitsSummary.get_year.xml
index 84850ee827..84850ee827 100644
--- a/tests/PHPUnit/Integration/expected/test_UserId_VisitorId__VisitsSummary.get_year.xml
+++ b/tests/PHPUnit/System/expected/test_UserId_VisitorId__VisitsSummary.get_year.xml
diff --git a/tests/PHPUnit/Integration/expected/test_UserId_VisitorId_invalidSegmentUserId__VisitsSummary.get_day.xml b/tests/PHPUnit/System/expected/test_UserId_VisitorId_invalidSegmentUserId__VisitsSummary.get_day.xml
index 71903c4801..71903c4801 100644
--- a/tests/PHPUnit/Integration/expected/test_UserId_VisitorId_invalidSegmentUserId__VisitsSummary.get_day.xml
+++ b/tests/PHPUnit/System/expected/test_UserId_VisitorId_invalidSegmentUserId__VisitsSummary.get_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_UserId_VisitorId_segmentUserIdAndCartAbandoned_getAbandonedCartItems__Goals.getItemsName_day.xml b/tests/PHPUnit/System/expected/test_UserId_VisitorId_segmentUserIdAndCartAbandoned_getAbandonedCartItems__Goals.getItemsName_day.xml
index 39c7de375f..39c7de375f 100644
--- a/tests/PHPUnit/Integration/expected/test_UserId_VisitorId_segmentUserIdAndCartAbandoned_getAbandonedCartItems__Goals.getItemsName_day.xml
+++ b/tests/PHPUnit/System/expected/test_UserId_VisitorId_segmentUserIdAndCartAbandoned_getAbandonedCartItems__Goals.getItemsName_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_UserId_VisitorId_segmentUserId__Goals.get_day.xml b/tests/PHPUnit/System/expected/test_UserId_VisitorId_segmentUserId__Goals.get_day.xml
index a43cbc433e..a43cbc433e 100644
--- a/tests/PHPUnit/Integration/expected/test_UserId_VisitorId_segmentUserId__Goals.get_day.xml
+++ b/tests/PHPUnit/System/expected/test_UserId_VisitorId_segmentUserId__Goals.get_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_UserId_VisitorId_segmentUserId__VisitsSummary.get_day.xml b/tests/PHPUnit/System/expected/test_UserId_VisitorId_segmentUserId__VisitsSummary.get_day.xml
index 969fd130e8..969fd130e8 100644
--- a/tests/PHPUnit/Integration/expected/test_UserId_VisitorId_segmentUserId__VisitsSummary.get_day.xml
+++ b/tests/PHPUnit/System/expected/test_UserId_VisitorId_segmentUserId__VisitsSummary.get_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_VisitsInPast_InvalidateOldReportsWebsite1_OldReportsShouldAppear__Actions.getPageUrls_month.xml b/tests/PHPUnit/System/expected/test_VisitsInPast_InvalidateOldReportsWebsite1_OldReportsShouldAppear__Actions.getPageUrls_month.xml
index 2f10eb3f97..2f10eb3f97 100644
--- a/tests/PHPUnit/Integration/expected/test_VisitsInPast_InvalidateOldReportsWebsite1_OldReportsShouldAppear__Actions.getPageUrls_month.xml
+++ b/tests/PHPUnit/System/expected/test_VisitsInPast_InvalidateOldReportsWebsite1_OldReportsShouldAppear__Actions.getPageUrls_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_VisitsInPast_InvalidateOldReportsWebsite1_OldReportsShouldAppear__VisitsSummary.get_month.xml b/tests/PHPUnit/System/expected/test_VisitsInPast_InvalidateOldReportsWebsite1_OldReportsShouldAppear__VisitsSummary.get_month.xml
index 2f7ce19aa5..2f7ce19aa5 100644
--- a/tests/PHPUnit/Integration/expected/test_VisitsInPast_InvalidateOldReportsWebsite1_OldReportsShouldAppear__VisitsSummary.get_month.xml
+++ b/tests/PHPUnit/System/expected/test_VisitsInPast_InvalidateOldReportsWebsite1_OldReportsShouldAppear__VisitsSummary.get_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_VisitsInPast_InvalidateOldReportsWebsite1_OldReportsShouldNotAppear__Actions.getPageUrls_month.xml b/tests/PHPUnit/System/expected/test_VisitsInPast_InvalidateOldReportsWebsite1_OldReportsShouldNotAppear__Actions.getPageUrls_month.xml
index 89eec3fbc3..89eec3fbc3 100644
--- a/tests/PHPUnit/Integration/expected/test_VisitsInPast_InvalidateOldReportsWebsite1_OldReportsShouldNotAppear__Actions.getPageUrls_month.xml
+++ b/tests/PHPUnit/System/expected/test_VisitsInPast_InvalidateOldReportsWebsite1_OldReportsShouldNotAppear__Actions.getPageUrls_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_VisitsInPast_InvalidateOldReportsWebsite1_OldReportsShouldNotAppear__VisitsSummary.get_month.xml b/tests/PHPUnit/System/expected/test_VisitsInPast_InvalidateOldReportsWebsite1_OldReportsShouldNotAppear__VisitsSummary.get_month.xml
index d84e6c4f35..d84e6c4f35 100644
--- a/tests/PHPUnit/Integration/expected/test_VisitsInPast_InvalidateOldReportsWebsite1_OldReportsShouldNotAppear__VisitsSummary.get_month.xml
+++ b/tests/PHPUnit/System/expected/test_VisitsInPast_InvalidateOldReportsWebsite1_OldReportsShouldNotAppear__VisitsSummary.get_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_VisitsInPast_InvalidateOldReportsWebsite2_OldReportsShouldAppear__Actions.getPageUrls_month.xml b/tests/PHPUnit/System/expected/test_VisitsInPast_InvalidateOldReportsWebsite2_OldReportsShouldAppear__Actions.getPageUrls_month.xml
index 401e8d2dc7..401e8d2dc7 100644
--- a/tests/PHPUnit/Integration/expected/test_VisitsInPast_InvalidateOldReportsWebsite2_OldReportsShouldAppear__Actions.getPageUrls_month.xml
+++ b/tests/PHPUnit/System/expected/test_VisitsInPast_InvalidateOldReportsWebsite2_OldReportsShouldAppear__Actions.getPageUrls_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_VisitsInPast_InvalidateOldReportsWebsite2_OldReportsShouldAppear__VisitsSummary.get_month.xml b/tests/PHPUnit/System/expected/test_VisitsInPast_InvalidateOldReportsWebsite2_OldReportsShouldAppear__VisitsSummary.get_month.xml
index ed3e2b6ade..ed3e2b6ade 100644
--- a/tests/PHPUnit/Integration/expected/test_VisitsInPast_InvalidateOldReportsWebsite2_OldReportsShouldAppear__VisitsSummary.get_month.xml
+++ b/tests/PHPUnit/System/expected/test_VisitsInPast_InvalidateOldReportsWebsite2_OldReportsShouldAppear__VisitsSummary.get_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_VisitsInPast_InvalidateOldReportsWebsite2_OldReportsShouldNotAppear__Actions.getPageUrls_month.xml b/tests/PHPUnit/System/expected/test_VisitsInPast_InvalidateOldReportsWebsite2_OldReportsShouldNotAppear__Actions.getPageUrls_month.xml
index aaef3a0ec5..aaef3a0ec5 100644
--- a/tests/PHPUnit/Integration/expected/test_VisitsInPast_InvalidateOldReportsWebsite2_OldReportsShouldNotAppear__Actions.getPageUrls_month.xml
+++ b/tests/PHPUnit/System/expected/test_VisitsInPast_InvalidateOldReportsWebsite2_OldReportsShouldNotAppear__Actions.getPageUrls_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_VisitsInPast_InvalidateOldReportsWebsite2_OldReportsShouldNotAppear__VisitsSummary.get_month.xml b/tests/PHPUnit/System/expected/test_VisitsInPast_InvalidateOldReportsWebsite2_OldReportsShouldNotAppear__VisitsSummary.get_month.xml
index d046dca549..d046dca549 100644
--- a/tests/PHPUnit/Integration/expected/test_VisitsInPast_InvalidateOldReportsWebsite2_OldReportsShouldNotAppear__VisitsSummary.get_month.xml
+++ b/tests/PHPUnit/System/expected/test_VisitsInPast_InvalidateOldReportsWebsite2_OldReportsShouldNotAppear__VisitsSummary.get_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_annotations__Annotations.get.xml b/tests/PHPUnit/System/expected/test_annotations__Annotations.get.xml
index 8ac7b4520a..8ac7b4520a 100644
--- a/tests/PHPUnit/Integration/expected/test_annotations__Annotations.get.xml
+++ b/tests/PHPUnit/System/expected/test_annotations__Annotations.get.xml
diff --git a/tests/PHPUnit/Integration/expected/test_annotations__Annotations.getAll_day.xml b/tests/PHPUnit/System/expected/test_annotations__Annotations.getAll_day.xml
index c65b44912c..c65b44912c 100644
--- a/tests/PHPUnit/Integration/expected/test_annotations__Annotations.getAll_day.xml
+++ b/tests/PHPUnit/System/expected/test_annotations__Annotations.getAll_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_annotations__Annotations.getAll_month.xml b/tests/PHPUnit/System/expected/test_annotations__Annotations.getAll_month.xml
index fa326bf6fd..fa326bf6fd 100644
--- a/tests/PHPUnit/Integration/expected/test_annotations__Annotations.getAll_month.xml
+++ b/tests/PHPUnit/System/expected/test_annotations__Annotations.getAll_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_annotations__Annotations.getAll_week.xml b/tests/PHPUnit/System/expected/test_annotations__Annotations.getAll_week.xml
index 3d0078beac..3d0078beac 100644
--- a/tests/PHPUnit/Integration/expected/test_annotations__Annotations.getAll_week.xml
+++ b/tests/PHPUnit/System/expected/test_annotations__Annotations.getAll_week.xml
diff --git a/tests/PHPUnit/Integration/expected/test_annotations__Annotations.getAll_year.xml b/tests/PHPUnit/System/expected/test_annotations__Annotations.getAll_year.xml
index f2f2835d16..f2f2835d16 100644
--- a/tests/PHPUnit/Integration/expected/test_annotations__Annotations.getAll_year.xml
+++ b/tests/PHPUnit/System/expected/test_annotations__Annotations.getAll_year.xml
diff --git a/tests/PHPUnit/Integration/expected/test_annotations__Annotations.getAnnotationCountForDates_day.xml b/tests/PHPUnit/System/expected/test_annotations__Annotations.getAnnotationCountForDates_day.xml
index 7409bdf738..7409bdf738 100644
--- a/tests/PHPUnit/Integration/expected/test_annotations__Annotations.getAnnotationCountForDates_day.xml
+++ b/tests/PHPUnit/System/expected/test_annotations__Annotations.getAnnotationCountForDates_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_annotations__Annotations.getAnnotationCountForDates_month.xml b/tests/PHPUnit/System/expected/test_annotations__Annotations.getAnnotationCountForDates_month.xml
index 152be4e272..152be4e272 100644
--- a/tests/PHPUnit/Integration/expected/test_annotations__Annotations.getAnnotationCountForDates_month.xml
+++ b/tests/PHPUnit/System/expected/test_annotations__Annotations.getAnnotationCountForDates_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_annotations__Annotations.getAnnotationCountForDates_week.xml b/tests/PHPUnit/System/expected/test_annotations__Annotations.getAnnotationCountForDates_week.xml
index d428059285..d428059285 100644
--- a/tests/PHPUnit/Integration/expected/test_annotations__Annotations.getAnnotationCountForDates_week.xml
+++ b/tests/PHPUnit/System/expected/test_annotations__Annotations.getAnnotationCountForDates_week.xml
diff --git a/tests/PHPUnit/Integration/expected/test_annotations__Annotations.getAnnotationCountForDates_year.xml b/tests/PHPUnit/System/expected/test_annotations__Annotations.getAnnotationCountForDates_year.xml
index 3d501c35f1..3d501c35f1 100644
--- a/tests/PHPUnit/Integration/expected/test_annotations__Annotations.getAnnotationCountForDates_year.xml
+++ b/tests/PHPUnit/System/expected/test_annotations__Annotations.getAnnotationCountForDates_year.xml
diff --git a/tests/PHPUnit/Integration/expected/test_annotations_lastN__Annotations.getAll_week.xml b/tests/PHPUnit/System/expected/test_annotations_lastN__Annotations.getAll_week.xml
index d3aecc147b..d3aecc147b 100644
--- a/tests/PHPUnit/Integration/expected/test_annotations_lastN__Annotations.getAll_week.xml
+++ b/tests/PHPUnit/System/expected/test_annotations_lastN__Annotations.getAll_week.xml
diff --git a/tests/PHPUnit/Integration/expected/test_annotations_lastN__Annotations.getAnnotationCountForDates_week.xml b/tests/PHPUnit/System/expected/test_annotations_lastN__Annotations.getAnnotationCountForDates_week.xml
index 2abbab5b3f..2abbab5b3f 100644
--- a/tests/PHPUnit/Integration/expected/test_annotations_lastN__Annotations.getAnnotationCountForDates_week.xml
+++ b/tests/PHPUnit/System/expected/test_annotations_lastN__Annotations.getAnnotationCountForDates_week.xml
diff --git a/tests/PHPUnit/Integration/expected/test_annotations_multipleSites__Annotations.getAll_month.xml b/tests/PHPUnit/System/expected/test_annotations_multipleSites__Annotations.getAll_month.xml
index 0d3c8ae176..0d3c8ae176 100644
--- a/tests/PHPUnit/Integration/expected/test_annotations_multipleSites__Annotations.getAll_month.xml
+++ b/tests/PHPUnit/System/expected/test_annotations_multipleSites__Annotations.getAll_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_annotations_multipleSites__Annotations.getAnnotationCountForDates_month.xml b/tests/PHPUnit/System/expected/test_annotations_multipleSites__Annotations.getAnnotationCountForDates_month.xml
index 8549b62364..8549b62364 100644
--- a/tests/PHPUnit/Integration/expected/test_annotations_multipleSites__Annotations.getAnnotationCountForDates_month.xml
+++ b/tests/PHPUnit/System/expected/test_annotations_multipleSites__Annotations.getAnnotationCountForDates_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_annotations_range__Annotations.getAll_range.xml b/tests/PHPUnit/System/expected/test_annotations_range__Annotations.getAll_range.xml
index 2e351524dc..2e351524dc 100644
--- a/tests/PHPUnit/Integration/expected/test_annotations_range__Annotations.getAll_range.xml
+++ b/tests/PHPUnit/System/expected/test_annotations_range__Annotations.getAll_range.xml
diff --git a/tests/PHPUnit/Integration/expected/test_annotations_range__Annotations.getAnnotationCountForDates_range.xml b/tests/PHPUnit/System/expected/test_annotations_range__Annotations.getAnnotationCountForDates_range.xml
index 77c83c9c84..77c83c9c84 100644
--- a/tests/PHPUnit/Integration/expected/test_annotations_range__Annotations.getAnnotationCountForDates_range.xml
+++ b/tests/PHPUnit/System/expected/test_annotations_range__Annotations.getAnnotationCountForDates_range.xml
diff --git a/tests/PHPUnit/Integration/expected/test_apiGetReportMetadata__API.getDefaultMetricTranslations.xml b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getDefaultMetricTranslations.xml
index 82c64dfc5c..82c64dfc5c 100644
--- a/tests/PHPUnit/Integration/expected/test_apiGetReportMetadata__API.getDefaultMetricTranslations.xml
+++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getDefaultMetricTranslations.xml
diff --git a/tests/PHPUnit/Integration/expected/test_apiGetReportMetadata__API.getIpFromHeader.xml b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getIpFromHeader.xml
index 7c42ec92e0..7c42ec92e0 100644
--- a/tests/PHPUnit/Integration/expected/test_apiGetReportMetadata__API.getIpFromHeader.xml
+++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getIpFromHeader.xml
diff --git a/tests/PHPUnit/Integration/expected/test_apiGetReportMetadata__API.getLastDate_day.xml b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getLastDate_day.xml
index 612d6fbf5c..612d6fbf5c 100644
--- a/tests/PHPUnit/Integration/expected/test_apiGetReportMetadata__API.getLastDate_day.xml
+++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getLastDate_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_apiGetReportMetadata__API.getMetadata_day.xml b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getMetadata_day.xml
index c495e00070..c495e00070 100644
--- a/tests/PHPUnit/Integration/expected/test_apiGetReportMetadata__API.getMetadata_day.xml
+++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getMetadata_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_apiGetReportMetadata__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getProcessedReport_day.xml
index f08e134ae6..f08e134ae6 100644
--- a/tests/PHPUnit/Integration/expected/test_apiGetReportMetadata__API.getProcessedReport_day.xml
+++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getProcessedReport_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_apiGetReportMetadata__API.getReportMetadata_day.xml b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportMetadata_day.xml
index a0c585b68a..a0c585b68a 100644
--- a/tests/PHPUnit/Integration/expected/test_apiGetReportMetadata__API.getReportMetadata_day.xml
+++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportMetadata_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_apiGetReportMetadata__API.getRowEvolution_day.xml b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getRowEvolution_day.xml
index 29bf42cae8..29bf42cae8 100644
--- a/tests/PHPUnit/Integration/expected/test_apiGetReportMetadata__API.getRowEvolution_day.xml
+++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getRowEvolution_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_apiGetReportMetadata__API.getSegmentsMetadata.xml b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getSegmentsMetadata.xml
index 9709fdfbaf..9709fdfbaf 100644
--- a/tests/PHPUnit/Integration/expected/test_apiGetReportMetadata__API.getSegmentsMetadata.xml
+++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getSegmentsMetadata.xml
diff --git a/tests/PHPUnit/Integration/expected/test_apiGetReportMetadata__API.getSettings.xml b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getSettings.xml
index a43ea923e8..a43ea923e8 100644
--- a/tests/PHPUnit/Integration/expected/test_apiGetReportMetadata__API.getSettings.xml
+++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getSettings.xml
diff --git a/tests/PHPUnit/Integration/expected/test_apiGetReportMetadata__API.getSuggestedValuesForSegment.xml b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getSuggestedValuesForSegment.xml
index c234bed59e..c234bed59e 100644
--- a/tests/PHPUnit/Integration/expected/test_apiGetReportMetadata__API.getSuggestedValuesForSegment.xml
+++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getSuggestedValuesForSegment.xml
diff --git a/tests/PHPUnit/Integration/expected/test_apiGetReportMetadata__API.get_day.xml b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.get_day.xml
index 8615d546da..8615d546da 100644
--- a/tests/PHPUnit/Integration/expected/test_apiGetReportMetadata__API.get_day.xml
+++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.get_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_apiGetReportMetadata_hideMetricsDoc__API.getMetadata_day.xml b/tests/PHPUnit/System/expected/test_apiGetReportMetadata_hideMetricsDoc__API.getMetadata_day.xml
index 590b2acbe5..590b2acbe5 100644
--- a/tests/PHPUnit/Integration/expected/test_apiGetReportMetadata_hideMetricsDoc__API.getMetadata_day.xml
+++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata_hideMetricsDoc__API.getMetadata_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_apiGetReportMetadata_hideMetricsDoc__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_apiGetReportMetadata_hideMetricsDoc__API.getProcessedReport_day.xml
index 6eb752956e..6eb752956e 100644
--- a/tests/PHPUnit/Integration/expected/test_apiGetReportMetadata_hideMetricsDoc__API.getProcessedReport_day.xml
+++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata_hideMetricsDoc__API.getProcessedReport_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_apiGetReportMetadata_pageTitleZeroString__Actions.getPageTitles_day.xml b/tests/PHPUnit/System/expected/test_apiGetReportMetadata_pageTitleZeroString__Actions.getPageTitles_day.xml
index 63017ad657..63017ad657 100644
--- a/tests/PHPUnit/Integration/expected/test_apiGetReportMetadata_pageTitleZeroString__Actions.getPageTitles_day.xml
+++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata_pageTitleZeroString__Actions.getPageTitles_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_apiGetReportMetadata_phpRenderer__API.getDefaultMetricTranslations.php b/tests/PHPUnit/System/expected/test_apiGetReportMetadata_phpRenderer__API.getDefaultMetricTranslations.php
index d9144d3e39..d9144d3e39 100644
--- a/tests/PHPUnit/Integration/expected/test_apiGetReportMetadata_phpRenderer__API.getDefaultMetricTranslations.php
+++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata_phpRenderer__API.getDefaultMetricTranslations.php
diff --git a/tests/PHPUnit/Integration/expected/test_apiGetReportMetadata_showRawMetrics__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_apiGetReportMetadata_showRawMetrics__API.getProcessedReport_day.xml
index 4b38b3da7f..4b38b3da7f 100644
--- a/tests/PHPUnit/Integration/expected/test_apiGetReportMetadata_showRawMetrics__API.getProcessedReport_day.xml
+++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata_showRawMetrics__API.getProcessedReport_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_apiGetReportMetadata_year__API.getProcessedReport_year.xml b/tests/PHPUnit/System/expected/test_apiGetReportMetadata_year__API.getProcessedReport_year.xml
index f371029f1b..f371029f1b 100644
--- a/tests/PHPUnit/Integration/expected/test_apiGetReportMetadata_year__API.getProcessedReport_year.xml
+++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata_year__API.getProcessedReport_year.xml
diff --git a/tests/PHPUnit/Integration/expected/test_apiGetReportMetadata_year__LanguagesManager.getAvailableLanguageNames.xml b/tests/PHPUnit/System/expected/test_apiGetReportMetadata_year__LanguagesManager.getAvailableLanguageNames.xml
index d7738f1123..d7738f1123 100644
--- a/tests/PHPUnit/Integration/expected/test_apiGetReportMetadata_year__LanguagesManager.getAvailableLanguageNames.xml
+++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata_year__LanguagesManager.getAvailableLanguageNames.xml
diff --git a/tests/PHPUnit/Integration/expected/test_apiGetReportMetadata_year__SitesManager.getJavascriptTag.xml b/tests/PHPUnit/System/expected/test_apiGetReportMetadata_year__SitesManager.getJavascriptTag.xml
index d4c25ca522..d4c25ca522 100644
--- a/tests/PHPUnit/Integration/expected/test_apiGetReportMetadata_year__SitesManager.getJavascriptTag.xml
+++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata_year__SitesManager.getJavascriptTag.xml
diff --git a/tests/PHPUnit/Integration/expected/test_csvExport__Live.getLastVisitsDetails_day.csv b/tests/PHPUnit/System/expected/test_csvExport__Live.getLastVisitsDetails_day.csv
index c287c4bf01..c287c4bf01 100644
--- a/tests/PHPUnit/Integration/expected/test_csvExport__Live.getLastVisitsDetails_day.csv
+++ b/tests/PHPUnit/System/expected/test_csvExport__Live.getLastVisitsDetails_day.csv
diff --git a/tests/PHPUnit/Integration/expected/test_csvExport_xp0__CustomVariables.getCustomVariables_day.csv b/tests/PHPUnit/System/expected/test_csvExport_xp0__CustomVariables.getCustomVariables_day.csv
index 89e329416e..89e329416e 100644
--- a/tests/PHPUnit/Integration/expected/test_csvExport_xp0__CustomVariables.getCustomVariables_day.csv
+++ b/tests/PHPUnit/System/expected/test_csvExport_xp0__CustomVariables.getCustomVariables_day.csv
diff --git a/tests/PHPUnit/Integration/expected/test_csvExport_xp0__VisitsSummary.get_day.csv b/tests/PHPUnit/System/expected/test_csvExport_xp0__VisitsSummary.get_day.csv
index 26adb45055..26adb45055 100644
--- a/tests/PHPUnit/Integration/expected/test_csvExport_xp0__VisitsSummary.get_day.csv
+++ b/tests/PHPUnit/System/expected/test_csvExport_xp0__VisitsSummary.get_day.csv
diff --git a/tests/PHPUnit/Integration/expected/test_csvExport_xp1_inner0_trans-en__CustomVariables.getCustomVariables_day.csv b/tests/PHPUnit/System/expected/test_csvExport_xp1_inner0_trans-en__CustomVariables.getCustomVariables_day.csv
index 1dde5308a4..1dde5308a4 100644
--- a/tests/PHPUnit/Integration/expected/test_csvExport_xp1_inner0_trans-en__CustomVariables.getCustomVariables_day.csv
+++ b/tests/PHPUnit/System/expected/test_csvExport_xp1_inner0_trans-en__CustomVariables.getCustomVariables_day.csv
diff --git a/tests/PHPUnit/Integration/expected/test_csvExport_xp1_inner0_trans-en__VisitsSummary.get_day.csv b/tests/PHPUnit/System/expected/test_csvExport_xp1_inner0_trans-en__VisitsSummary.get_day.csv
index 58e88ae47a..58e88ae47a 100644
--- a/tests/PHPUnit/Integration/expected/test_csvExport_xp1_inner0_trans-en__VisitsSummary.get_day.csv
+++ b/tests/PHPUnit/System/expected/test_csvExport_xp1_inner0_trans-en__VisitsSummary.get_day.csv
diff --git a/tests/PHPUnit/Integration/expected/test_csvExport_xp1_inner1_trans-de__CustomVariables.getCustomVariables_day.csv b/tests/PHPUnit/System/expected/test_csvExport_xp1_inner1_trans-de__CustomVariables.getCustomVariables_day.csv
index 24c786dd47..24c786dd47 100644
--- a/tests/PHPUnit/Integration/expected/test_csvExport_xp1_inner1_trans-de__CustomVariables.getCustomVariables_day.csv
+++ b/tests/PHPUnit/System/expected/test_csvExport_xp1_inner1_trans-de__CustomVariables.getCustomVariables_day.csv
diff --git a/tests/PHPUnit/Integration/expected/test_csvExport_xp1_inner1_trans-de__VisitsSummary.get_day.csv b/tests/PHPUnit/System/expected/test_csvExport_xp1_inner1_trans-de__VisitsSummary.get_day.csv
index 7315bde871..7315bde871 100644
--- a/tests/PHPUnit/Integration/expected/test_csvExport_xp1_inner1_trans-de__VisitsSummary.get_day.csv
+++ b/tests/PHPUnit/System/expected/test_csvExport_xp1_inner1_trans-de__VisitsSummary.get_day.csv
diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_API_get__API.get_day.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_API_get__API.get_day.xml
index f321ae62e1..f321ae62e1 100644
--- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_API_get__API.get_day.xml
+++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_API_get__API.get_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_API_get__API.get_week.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_API_get__API.get_week.xml
index 330e0110bf..330e0110bf 100644
--- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_API_get__API.get_week.xml
+++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_API_get__API.get_week.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_AbandonedCarts__Goals.getItemsCategory_day.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_AbandonedCarts__Goals.getItemsCategory_day.xml
index b27ccd173e..b27ccd173e 100644
--- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_AbandonedCarts__Goals.getItemsCategory_day.xml
+++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_AbandonedCarts__Goals.getItemsCategory_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_AbandonedCarts__Goals.getItemsCategory_week.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_AbandonedCarts__Goals.getItemsCategory_week.xml
index b29f7fd16b..b29f7fd16b 100644
--- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_AbandonedCarts__Goals.getItemsCategory_week.xml
+++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_AbandonedCarts__Goals.getItemsCategory_week.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_AbandonedCarts__Goals.getItemsName_day.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_AbandonedCarts__Goals.getItemsName_day.xml
index 76195df336..76195df336 100644
--- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_AbandonedCarts__Goals.getItemsName_day.xml
+++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_AbandonedCarts__Goals.getItemsName_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_AbandonedCarts__Goals.getItemsName_week.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_AbandonedCarts__Goals.getItemsName_week.xml
index 5a0ddd4302..5a0ddd4302 100644
--- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_AbandonedCarts__Goals.getItemsName_week.xml
+++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_AbandonedCarts__Goals.getItemsName_week.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_AbandonedCarts__Goals.getItemsSku_day.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_AbandonedCarts__Goals.getItemsSku_day.xml
index ca2b2296ed..ca2b2296ed 100644
--- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_AbandonedCarts__Goals.getItemsSku_day.xml
+++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_AbandonedCarts__Goals.getItemsSku_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_AbandonedCarts__Goals.getItemsSku_week.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_AbandonedCarts__Goals.getItemsSku_week.xml
index 5c1999197a..5c1999197a 100644
--- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_AbandonedCarts__Goals.getItemsSku_week.xml
+++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_AbandonedCarts__Goals.getItemsSku_week.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_GoalAbandonedCart__Goals.get_day.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_GoalAbandonedCart__Goals.get_day.xml
index 343be649b7..343be649b7 100644
--- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_GoalAbandonedCart__Goals.get_day.xml
+++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_GoalAbandonedCart__Goals.get_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_GoalAbandonedCart__Goals.get_week.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_GoalAbandonedCart__Goals.get_week.xml
index a2d20e0f55..a2d20e0f55 100644
--- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_GoalAbandonedCart__Goals.get_week.xml
+++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_GoalAbandonedCart__Goals.get_week.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_GoalMatchTitle__Goals.get_day.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_GoalMatchTitle__Goals.get_day.xml
index 28ecffa619..28ecffa619 100644
--- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_GoalMatchTitle__Goals.get_day.xml
+++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_GoalMatchTitle__Goals.get_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_GoalMatchTitle__Goals.get_week.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_GoalMatchTitle__Goals.get_week.xml
index 46934b1c19..46934b1c19 100644
--- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_GoalMatchTitle__Goals.get_week.xml
+++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_GoalMatchTitle__Goals.get_week.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_GoalOrder__Goals.get_day.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_GoalOrder__Goals.get_day.xml
index 698b353eab..698b353eab 100644
--- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_GoalOrder__Goals.get_day.xml
+++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_GoalOrder__Goals.get_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_GoalOrder__Goals.get_week.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_GoalOrder__Goals.get_week.xml
index 1daeb97961..1daeb97961 100644
--- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_GoalOrder__Goals.get_week.xml
+++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_GoalOrder__Goals.get_week.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_GoalOverall__Goals.get_day.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_GoalOverall__Goals.get_day.xml
index c2cd462325..c2cd462325 100644
--- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_GoalOverall__Goals.get_day.xml
+++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_GoalOverall__Goals.get_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_GoalOverall__Goals.get_week.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_GoalOverall__Goals.get_week.xml
index 8190aee36f..8190aee36f 100644
--- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_GoalOverall__Goals.get_week.xml
+++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_GoalOverall__Goals.get_week.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_LiveEcommerceStatusOrdered__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_LiveEcommerceStatusOrdered__Live.getLastVisitsDetails_day.xml
index 25ac19a415..25ac19a415 100644
--- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_LiveEcommerceStatusOrdered__Live.getLastVisitsDetails_day.xml
+++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_LiveEcommerceStatusOrdered__Live.getLastVisitsDetails_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_Metadata_Goals.Get_AbandonedCart__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_Metadata_Goals.Get_AbandonedCart__API.getProcessedReport_day.xml
index 65e862ccc6..65e862ccc6 100644
--- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_Metadata_Goals.Get_AbandonedCart__API.getProcessedReport_day.xml
+++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_Metadata_Goals.Get_AbandonedCart__API.getProcessedReport_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_Metadata_Goals.Get_NormalGoal__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_Metadata_Goals.Get_NormalGoal__API.getProcessedReport_day.xml
index 358467f45e..358467f45e 100644
--- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_Metadata_Goals.Get_NormalGoal__API.getProcessedReport_day.xml
+++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_Metadata_Goals.Get_NormalGoal__API.getProcessedReport_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_Metadata_Goals.Get_NotExistingGoal__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_Metadata_Goals.Get_NotExistingGoal__API.getProcessedReport_day.xml
index 1625ba026c..1625ba026c 100644
--- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_Metadata_Goals.Get_NotExistingGoal__API.getProcessedReport_day.xml
+++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_Metadata_Goals.Get_NotExistingGoal__API.getProcessedReport_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_Metadata_Goals.Get_Order__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_Metadata_Goals.Get_Order__API.getProcessedReport_day.xml
index 795e631e81..795e631e81 100644
--- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_Metadata_Goals.Get_Order__API.getProcessedReport_day.xml
+++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_Metadata_Goals.Get_Order__API.getProcessedReport_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_Metadata_ItemsCategory__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_Metadata_ItemsCategory__API.getProcessedReport_day.xml
index 002d38705c..002d38705c 100644
--- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_Metadata_ItemsCategory__API.getProcessedReport_day.xml
+++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_Metadata_ItemsCategory__API.getProcessedReport_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_Metadata_ItemsSku__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_Metadata_ItemsSku__API.getProcessedReport_day.xml
index cb341801b4..cb341801b4 100644
--- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_Metadata_ItemsSku__API.getProcessedReport_day.xml
+++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_Metadata_ItemsSku__API.getProcessedReport_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_Metadata_VisitTime.getVisitInformationPerServerTime__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_Metadata_VisitTime.getVisitInformationPerServerTime__API.getProcessedReport_day.xml
index 71282d9145..71282d9145 100644
--- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_Metadata_VisitTime.getVisitInformationPerServerTime__API.getProcessedReport_day.xml
+++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_Metadata_VisitTime.getVisitInformationPerServerTime__API.getProcessedReport_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentAbandonedCart__VisitsSummary.get_day.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_SegmentAbandonedCart__VisitsSummary.get_day.xml
index 2ecf693474..2ecf693474 100644
--- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentAbandonedCart__VisitsSummary.get_day.xml
+++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_SegmentAbandonedCart__VisitsSummary.get_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentConvertedGoalId1__VisitsSummary.get_day.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_SegmentConvertedGoalId1__VisitsSummary.get_day.xml
index a9d2095dfb..a9d2095dfb 100644
--- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentConvertedGoalId1__VisitsSummary.get_day.xml
+++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_SegmentConvertedGoalId1__VisitsSummary.get_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentConvertedGoalId1__VisitsSummary.get_week.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_SegmentConvertedGoalId1__VisitsSummary.get_week.xml
index a9d2095dfb..a9d2095dfb 100644
--- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentConvertedGoalId1__VisitsSummary.get_week.xml
+++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_SegmentConvertedGoalId1__VisitsSummary.get_week.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentCountryIsFr__Goals.getItemsCategory_day.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_SegmentCountryIsFr__Goals.getItemsCategory_day.xml
index 02187588c4..02187588c4 100644
--- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentCountryIsFr__Goals.getItemsCategory_day.xml
+++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_SegmentCountryIsFr__Goals.getItemsCategory_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentCountryIsFr__Goals.getItemsCategory_week.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_SegmentCountryIsFr__Goals.getItemsCategory_week.xml
index 19944203ad..19944203ad 100644
--- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentCountryIsFr__Goals.getItemsCategory_week.xml
+++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_SegmentCountryIsFr__Goals.getItemsCategory_week.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentCountryIsFr__Goals.getItemsName_day.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_SegmentCountryIsFr__Goals.getItemsName_day.xml
index bf093d7b73..bf093d7b73 100644
--- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentCountryIsFr__Goals.getItemsName_day.xml
+++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_SegmentCountryIsFr__Goals.getItemsName_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentCountryIsFr__Goals.getItemsName_week.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_SegmentCountryIsFr__Goals.getItemsName_week.xml
index 1adac8c4ec..1adac8c4ec 100644
--- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentCountryIsFr__Goals.getItemsName_week.xml
+++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_SegmentCountryIsFr__Goals.getItemsName_week.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentCountryIsFr__Goals.getItemsSku_day.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_SegmentCountryIsFr__Goals.getItemsSku_day.xml
index db5fcd88f4..db5fcd88f4 100644
--- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentCountryIsFr__Goals.getItemsSku_day.xml
+++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_SegmentCountryIsFr__Goals.getItemsSku_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentCountryIsFr__Goals.getItemsSku_week.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_SegmentCountryIsFr__Goals.getItemsSku_week.xml
index 6a14444a59..6a14444a59 100644
--- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentCountryIsFr__Goals.getItemsSku_week.xml
+++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_SegmentCountryIsFr__Goals.getItemsSku_week.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentDidNotConvertGoalId1__VisitsSummary.get_day.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_SegmentDidNotConvertGoalId1__VisitsSummary.get_day.xml
index 2ecf693474..2ecf693474 100644
--- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentDidNotConvertGoalId1__VisitsSummary.get_day.xml
+++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_SegmentDidNotConvertGoalId1__VisitsSummary.get_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentNewVisitors__VisitsSummary.get_week.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_SegmentNewVisitors__VisitsSummary.get_week.xml
index a9d2095dfb..a9d2095dfb 100644
--- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentNewVisitors__VisitsSummary.get_week.xml
+++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_SegmentNewVisitors__VisitsSummary.get_week.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentNoEcommerce__VisitsSummary.get_day.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_SegmentNoEcommerce__VisitsSummary.get_day.xml
index a9d2095dfb..a9d2095dfb 100644
--- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentNoEcommerce__VisitsSummary.get_day.xml
+++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_SegmentNoEcommerce__VisitsSummary.get_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentNoVisit_HaveConvertedNonExistingGoal__Goals.getItemsCategory_week.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_SegmentNoVisit_HaveConvertedNonExistingGoal__Goals.getItemsCategory_week.xml
index c234bed59e..c234bed59e 100644
--- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentNoVisit_HaveConvertedNonExistingGoal__Goals.getItemsCategory_week.xml
+++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_SegmentNoVisit_HaveConvertedNonExistingGoal__Goals.getItemsCategory_week.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentNoVisit_HaveConvertedNonExistingGoal__Goals.getItemsName_week.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_SegmentNoVisit_HaveConvertedNonExistingGoal__Goals.getItemsName_week.xml
index c234bed59e..c234bed59e 100644
--- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentNoVisit_HaveConvertedNonExistingGoal__Goals.getItemsName_week.xml
+++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_SegmentNoVisit_HaveConvertedNonExistingGoal__Goals.getItemsName_week.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentNoVisit_HaveConvertedNonExistingGoal__Goals.getItemsSku_week.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_SegmentNoVisit_HaveConvertedNonExistingGoal__Goals.getItemsSku_week.xml
index c234bed59e..c234bed59e 100644
--- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentNoVisit_HaveConvertedNonExistingGoal__Goals.getItemsSku_week.xml
+++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_SegmentNoVisit_HaveConvertedNonExistingGoal__Goals.getItemsSku_week.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentNoVisit_HaveConvertedNonExistingGoal__Goals.get_week.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_SegmentNoVisit_HaveConvertedNonExistingGoal__Goals.get_week.xml
index 257dd359a5..257dd359a5 100644
--- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentNoVisit_HaveConvertedNonExistingGoal__Goals.get_week.xml
+++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_SegmentNoVisit_HaveConvertedNonExistingGoal__Goals.get_week.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentNoVisit_HaveConvertedNonExistingGoal__VisitsSummary.get_week.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_SegmentNoVisit_HaveConvertedNonExistingGoal__VisitsSummary.get_week.xml
index 32b66284be..32b66284be 100644
--- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentNoVisit_HaveConvertedNonExistingGoal__VisitsSummary.get_week.xml
+++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_SegmentNoVisit_HaveConvertedNonExistingGoal__VisitsSummary.get_week.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentOrderedSomething__VisitsSummary.get_day.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_SegmentOrderedSomething__VisitsSummary.get_day.xml
index 44b18e613c..44b18e613c 100644
--- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentOrderedSomething__VisitsSummary.get_day.xml
+++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_SegmentOrderedSomething__VisitsSummary.get_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentPageTitleMatch__VisitsSummary.get_day.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_SegmentPageTitleMatch__VisitsSummary.get_day.xml
index a9d2095dfb..a9d2095dfb 100644
--- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentPageTitleMatch__VisitsSummary.get_day.xml
+++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_SegmentPageTitleMatch__VisitsSummary.get_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentPageUrlContains__Goals.getItemsCategory_day.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_SegmentPageUrlContains__Goals.getItemsCategory_day.xml
index c234bed59e..c234bed59e 100644
--- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentPageUrlContains__Goals.getItemsCategory_day.xml
+++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_SegmentPageUrlContains__Goals.getItemsCategory_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentPageUrlContains__Goals.getItemsCategory_week.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_SegmentPageUrlContains__Goals.getItemsCategory_week.xml
index c234bed59e..c234bed59e 100644
--- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentPageUrlContains__Goals.getItemsCategory_week.xml
+++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_SegmentPageUrlContains__Goals.getItemsCategory_week.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentPageUrlContains__Goals.getItemsName_day.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_SegmentPageUrlContains__Goals.getItemsName_day.xml
index c234bed59e..c234bed59e 100644
--- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentPageUrlContains__Goals.getItemsName_day.xml
+++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_SegmentPageUrlContains__Goals.getItemsName_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentPageUrlContains__Goals.getItemsName_week.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_SegmentPageUrlContains__Goals.getItemsName_week.xml
index c234bed59e..c234bed59e 100644
--- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentPageUrlContains__Goals.getItemsName_week.xml
+++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_SegmentPageUrlContains__Goals.getItemsName_week.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentPageUrlContains__Goals.getItemsSku_day.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_SegmentPageUrlContains__Goals.getItemsSku_day.xml
index c234bed59e..c234bed59e 100644
--- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentPageUrlContains__Goals.getItemsSku_day.xml
+++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_SegmentPageUrlContains__Goals.getItemsSku_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentPageUrlContains__Goals.getItemsSku_week.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_SegmentPageUrlContains__Goals.getItemsSku_week.xml
index c234bed59e..c234bed59e 100644
--- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentPageUrlContains__Goals.getItemsSku_week.xml
+++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_SegmentPageUrlContains__Goals.getItemsSku_week.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentReturningCustomers__VisitsSummary.get_week.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_SegmentReturningCustomers__VisitsSummary.get_week.xml
index 02458f0645..02458f0645 100644
--- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentReturningCustomers__VisitsSummary.get_week.xml
+++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_SegmentReturningCustomers__VisitsSummary.get_week.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentReturningVisitors__VisitsSummary.get_week.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_SegmentReturningVisitors__VisitsSummary.get_week.xml
index 44b18e613c..44b18e613c 100644
--- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentReturningVisitors__VisitsSummary.get_week.xml
+++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_SegmentReturningVisitors__VisitsSummary.get_week.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentVisitHasConvertedGoal__Goals.getItemsCategory_week.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_SegmentVisitHasConvertedGoal__Goals.getItemsCategory_week.xml
index c0730f15dd..c0730f15dd 100644
--- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentVisitHasConvertedGoal__Goals.getItemsCategory_week.xml
+++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_SegmentVisitHasConvertedGoal__Goals.getItemsCategory_week.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentVisitHasConvertedGoal__Goals.getItemsName_week.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_SegmentVisitHasConvertedGoal__Goals.getItemsName_week.xml
index cea3474969..cea3474969 100644
--- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentVisitHasConvertedGoal__Goals.getItemsName_week.xml
+++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_SegmentVisitHasConvertedGoal__Goals.getItemsName_week.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentVisitHasConvertedGoal__Goals.getItemsSku_week.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_SegmentVisitHasConvertedGoal__Goals.getItemsSku_week.xml
index 79f78fc9d3..79f78fc9d3 100644
--- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentVisitHasConvertedGoal__Goals.getItemsSku_week.xml
+++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_SegmentVisitHasConvertedGoal__Goals.getItemsSku_week.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentVisitHasConvertedGoal__Goals.get_week.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_SegmentVisitHasConvertedGoal__Goals.get_week.xml
index 78dc5020d7..78dc5020d7 100644
--- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentVisitHasConvertedGoal__Goals.get_week.xml
+++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_SegmentVisitHasConvertedGoal__Goals.get_week.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentVisitHasConvertedGoal__VisitsSummary.get_week.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_SegmentVisitHasConvertedGoal__VisitsSummary.get_week.xml
index a9d2095dfb..a9d2095dfb 100644
--- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentVisitHasConvertedGoal__VisitsSummary.get_week.xml
+++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_SegmentVisitHasConvertedGoal__VisitsSummary.get_week.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentVisitHasNotOrderedAndConvertedGoal__Goals.getItemsCategory_week.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_SegmentVisitHasNotOrderedAndConvertedGoal__Goals.getItemsCategory_week.xml
index c0730f15dd..c0730f15dd 100644
--- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentVisitHasNotOrderedAndConvertedGoal__Goals.getItemsCategory_week.xml
+++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_SegmentVisitHasNotOrderedAndConvertedGoal__Goals.getItemsCategory_week.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentVisitHasNotOrderedAndConvertedGoal__Goals.getItemsName_week.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_SegmentVisitHasNotOrderedAndConvertedGoal__Goals.getItemsName_week.xml
index cea3474969..cea3474969 100644
--- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentVisitHasNotOrderedAndConvertedGoal__Goals.getItemsName_week.xml
+++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_SegmentVisitHasNotOrderedAndConvertedGoal__Goals.getItemsName_week.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentVisitHasNotOrderedAndConvertedGoal__Goals.getItemsSku_week.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_SegmentVisitHasNotOrderedAndConvertedGoal__Goals.getItemsSku_week.xml
index 79f78fc9d3..79f78fc9d3 100644
--- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentVisitHasNotOrderedAndConvertedGoal__Goals.getItemsSku_week.xml
+++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_SegmentVisitHasNotOrderedAndConvertedGoal__Goals.getItemsSku_week.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentVisitHasNotOrderedAndConvertedGoal__Goals.get_week.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_SegmentVisitHasNotOrderedAndConvertedGoal__Goals.get_week.xml
index 78dc5020d7..78dc5020d7 100644
--- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentVisitHasNotOrderedAndConvertedGoal__Goals.get_week.xml
+++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_SegmentVisitHasNotOrderedAndConvertedGoal__Goals.get_week.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentVisitHasNotOrderedAndConvertedGoal__VisitsSummary.get_week.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_SegmentVisitHasNotOrderedAndConvertedGoal__VisitsSummary.get_week.xml
index a9d2095dfb..a9d2095dfb 100644
--- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentVisitHasNotOrderedAndConvertedGoal__VisitsSummary.get_week.xml
+++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_SegmentVisitHasNotOrderedAndConvertedGoal__VisitsSummary.get_week.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_Website2__Goals.getItemsCategory_week.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_Website2__Goals.getItemsCategory_week.xml
index df23a6ffa1..df23a6ffa1 100644
--- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_Website2__Goals.getItemsCategory_week.xml
+++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_Website2__Goals.getItemsCategory_week.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_Website2__Goals.getItemsName_week.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_Website2__Goals.getItemsName_week.xml
index b271d3219f..b271d3219f 100644
--- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_Website2__Goals.getItemsName_week.xml
+++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_Website2__Goals.getItemsName_week.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_Website2__Goals.getItemsSku_week.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_Website2__Goals.getItemsSku_week.xml
index 83e2cd8798..83e2cd8798 100644
--- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_Website2__Goals.getItemsSku_week.xml
+++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_Website2__Goals.getItemsSku_week.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_Website2__Goals.get_week.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_Website2__Goals.get_week.xml
index d896b423d7..d896b423d7 100644
--- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_Website2__Goals.get_week.xml
+++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_Website2__Goals.get_week.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__API.getProcessedReport_day.xml
index 79289ce2d7..79289ce2d7 100644
--- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__API.getProcessedReport_day.xml
+++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__API.getProcessedReport_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__CustomVariables.getCustomVariables_day.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__CustomVariables.getCustomVariables_day.xml
index 8056021220..8056021220 100644
--- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__CustomVariables.getCustomVariables_day.xml
+++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__CustomVariables.getCustomVariables_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__Goals.getItemsCategory_day.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__Goals.getItemsCategory_day.xml
index 4b0694c88f..4b0694c88f 100644
--- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__Goals.getItemsCategory_day.xml
+++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__Goals.getItemsCategory_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__Goals.getItemsCategory_week.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__Goals.getItemsCategory_week.xml
index 96af10c76f..96af10c76f 100644
--- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__Goals.getItemsCategory_week.xml
+++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__Goals.getItemsCategory_week.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__Goals.getItemsName_day.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__Goals.getItemsName_day.xml
index 80da495736..80da495736 100644
--- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__Goals.getItemsName_day.xml
+++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__Goals.getItemsName_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__Goals.getItemsName_week.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__Goals.getItemsName_week.xml
index 854349a01e..854349a01e 100644
--- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__Goals.getItemsName_week.xml
+++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__Goals.getItemsName_week.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__Goals.getItemsSku_day.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__Goals.getItemsSku_day.xml
index 83b6b8ab73..83b6b8ab73 100644
--- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__Goals.getItemsSku_day.xml
+++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__Goals.getItemsSku_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__Goals.getItemsSku_week.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__Goals.getItemsSku_week.xml
index 3781b91168..3781b91168 100644
--- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__Goals.getItemsSku_week.xml
+++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__Goals.getItemsSku_week.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__Goals.get_day.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__Goals.get_day.xml
index c2cd462325..c2cd462325 100644
--- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__Goals.get_day.xml
+++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__Goals.get_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__Goals.get_week.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__Goals.get_week.xml
index 8190aee36f..8190aee36f 100644
--- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__Goals.get_week.xml
+++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__Goals.get_week.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__Live.getLastVisitsDetails_day.xml
index 30ae50eb8f..30ae50eb8f 100644
--- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__Live.getLastVisitsDetails_day.xml
+++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__Live.getLastVisitsDetails_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__UserCountry.getCity_day.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__UserCountry.getCity_day.xml
index 99fad8ffbf..99fad8ffbf 100644
--- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__UserCountry.getCity_day.xml
+++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__UserCountry.getCity_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__UserCountry.getContinent_day.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__UserCountry.getContinent_day.xml
index 152f156767..152f156767 100644
--- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__UserCountry.getContinent_day.xml
+++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__UserCountry.getContinent_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__UserCountry.getCountry_day.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__UserCountry.getCountry_day.xml
index a61fe0658f..a61fe0658f 100644
--- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__UserCountry.getCountry_day.xml
+++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__UserCountry.getCountry_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__UserCountry.getNumberOfDistinctCountries_day.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__UserCountry.getNumberOfDistinctCountries_day.xml
index 13002b2017..13002b2017 100644
--- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__UserCountry.getNumberOfDistinctCountries_day.xml
+++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__UserCountry.getNumberOfDistinctCountries_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__UserCountry.getRegion_day.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__UserCountry.getRegion_day.xml
index 7a0583f3a4..7a0583f3a4 100644
--- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__UserCountry.getRegion_day.xml
+++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__UserCountry.getRegion_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__VisitTime.getByDayOfWeek_day.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__VisitTime.getByDayOfWeek_day.xml
index a982f9b2c6..a982f9b2c6 100644
--- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__VisitTime.getByDayOfWeek_day.xml
+++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__VisitTime.getByDayOfWeek_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__VisitTime.getVisitInformationPerLocalTime_day.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__VisitTime.getVisitInformationPerLocalTime_day.xml
index 18762c91ed..18762c91ed 100644
--- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__VisitTime.getVisitInformationPerLocalTime_day.xml
+++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__VisitTime.getVisitInformationPerLocalTime_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__VisitTime.getVisitInformationPerServerTime_day.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__VisitTime.getVisitInformationPerServerTime_day.xml
index ac8065dbb1..ac8065dbb1 100644
--- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__VisitTime.getVisitInformationPerServerTime_day.xml
+++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__VisitTime.getVisitInformationPerServerTime_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__VisitsSummary.get_day.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__VisitsSummary.get_day.xml
index 115904be39..115904be39 100644
--- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__VisitsSummary.get_day.xml
+++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__VisitsSummary.get_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_csv__ScheduledReports.generateReport_week.original.csv b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_csv__ScheduledReports.generateReport_week.original.csv
index bf003f9781..bf003f9781 100644
--- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_csv__ScheduledReports.generateReport_week.original.csv
+++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_csv__ScheduledReports.generateReport_week.original.csv
diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_row_evolution_graph__ScheduledReports.generateReport_week.original.html b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_row_evolution_graph__ScheduledReports.generateReport_week.original.html
index 451b79191c..451b79191c 100644
--- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_row_evolution_graph__ScheduledReports.generateReport_week.original.html
+++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_row_evolution_graph__ScheduledReports.generateReport_week.original.html
diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_week.original.html b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_week.original.html
index b5f59686c4..b5f59686c4 100644
--- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_week.original.html
+++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_week.original.html
diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_week.original.html b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_week.original.html
index 8283259e33..8283259e33 100644
--- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_week.original.html
+++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_week.original.html
diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_pdf_tables_only__ScheduledReports.generateReport_week.original.pdf b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_pdf_tables_only__ScheduledReports.generateReport_week.original.pdf
index e8e37848fd..e8e37848fd 100644
--- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_pdf_tables_only__ScheduledReports.generateReport_week.original.pdf
+++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_pdf_tables_only__ScheduledReports.generateReport_week.original.pdf
diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_via_sms_all_sites__ScheduledReports.generateReport_week.original.sms.txt b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_via_sms_all_sites__ScheduledReports.generateReport_week.original.sms.txt
index e0d2df5b77..e0d2df5b77 100644
--- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_via_sms_all_sites__ScheduledReports.generateReport_week.original.sms.txt
+++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_via_sms_all_sites__ScheduledReports.generateReport_week.original.sms.txt
diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_via_sms_one_site__ScheduledReports.generateReport_week.original.sms.txt b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_via_sms_one_site__ScheduledReports.generateReport_week.original.sms.txt
index fa6a9d691e..fa6a9d691e 100644
--- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_via_sms_one_site__ScheduledReports.generateReport_week.original.sms.txt
+++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_via_sms_one_site__ScheduledReports.generateReport_week.original.sms.txt
diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItemsmultipleDates__Goals.getItemsCategory_day.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItemsmultipleDates__Goals.getItemsCategory_day.xml
index f5f998c048..f5f998c048 100644
--- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItemsmultipleDates__Goals.getItemsCategory_day.xml
+++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItemsmultipleDates__Goals.getItemsCategory_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItemsmultipleDates__Goals.getItemsName_day.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItemsmultipleDates__Goals.getItemsName_day.xml
index bdc280c4c9..bdc280c4c9 100644
--- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItemsmultipleDates__Goals.getItemsName_day.xml
+++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItemsmultipleDates__Goals.getItemsName_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItemsmultipleDates__Goals.getItemsSku_day.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItemsmultipleDates__Goals.getItemsSku_day.xml
index 4854d5e83c..4854d5e83c 100644
--- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItemsmultipleDates__Goals.getItemsSku_day.xml
+++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItemsmultipleDates__Goals.getItemsSku_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItemsmultipleDates_andMultipleWebsites__Goals.getItemsCategory_day.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItemsmultipleDates_andMultipleWebsites__Goals.getItemsCategory_day.xml
index 477b37f3d5..477b37f3d5 100644
--- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItemsmultipleDates_andMultipleWebsites__Goals.getItemsCategory_day.xml
+++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItemsmultipleDates_andMultipleWebsites__Goals.getItemsCategory_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItemsmultipleDates_andMultipleWebsites__Goals.getItemsName_day.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItemsmultipleDates_andMultipleWebsites__Goals.getItemsName_day.xml
index 01995b63ea..01995b63ea 100644
--- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItemsmultipleDates_andMultipleWebsites__Goals.getItemsName_day.xml
+++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItemsmultipleDates_andMultipleWebsites__Goals.getItemsName_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItemsmultipleDates_andMultipleWebsites__Goals.getItemsSku_day.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItemsmultipleDates_andMultipleWebsites__Goals.getItemsSku_day.xml
index 2c696320d5..2c696320d5 100644
--- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItemsmultipleDates_andMultipleWebsites__Goals.getItemsSku_day.xml
+++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItemsmultipleDates_andMultipleWebsites__Goals.getItemsSku_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Actions.getDownload_day.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Actions.getDownload_day.xml
index 106f23f16b..106f23f16b 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Actions.getDownload_day.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Actions.getDownload_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Actions.getDownload_week.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Actions.getDownload_week.xml
index 5cfb246edc..5cfb246edc 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Actions.getDownload_week.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Actions.getDownload_week.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Actions.getDownloads_day.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Actions.getDownloads_day.xml
index 106f23f16b..106f23f16b 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Actions.getDownloads_day.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Actions.getDownloads_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Actions.getDownloads_week.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Actions.getDownloads_week.xml
index 5cfb246edc..5cfb246edc 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Actions.getDownloads_week.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Actions.getDownloads_week.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Actions.getEntryPageTitles_day.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Actions.getEntryPageTitles_day.xml
index 106f23f16b..106f23f16b 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Actions.getEntryPageTitles_day.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Actions.getEntryPageTitles_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Actions.getEntryPageTitles_week.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Actions.getEntryPageTitles_week.xml
index 5cfb246edc..5cfb246edc 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Actions.getEntryPageTitles_week.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Actions.getEntryPageTitles_week.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Actions.getEntryPageUrls_day.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Actions.getEntryPageUrls_day.xml
index 106f23f16b..106f23f16b 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Actions.getEntryPageUrls_day.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Actions.getEntryPageUrls_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Actions.getEntryPageUrls_week.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Actions.getEntryPageUrls_week.xml
index 5cfb246edc..5cfb246edc 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Actions.getEntryPageUrls_week.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Actions.getEntryPageUrls_week.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Actions.getExitPageTitles_day.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Actions.getExitPageTitles_day.xml
index 106f23f16b..106f23f16b 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Actions.getExitPageTitles_day.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Actions.getExitPageTitles_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Actions.getExitPageTitles_week.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Actions.getExitPageTitles_week.xml
index 5cfb246edc..5cfb246edc 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Actions.getExitPageTitles_week.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Actions.getExitPageTitles_week.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Actions.getExitPageUrls_day.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Actions.getExitPageUrls_day.xml
index 106f23f16b..106f23f16b 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Actions.getExitPageUrls_day.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Actions.getExitPageUrls_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Actions.getExitPageUrls_week.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Actions.getExitPageUrls_week.xml
index 5cfb246edc..5cfb246edc 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Actions.getExitPageUrls_week.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Actions.getExitPageUrls_week.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Actions.getOutlink_day.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Actions.getOutlink_day.xml
index 106f23f16b..106f23f16b 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Actions.getOutlink_day.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Actions.getOutlink_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Actions.getOutlink_week.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Actions.getOutlink_week.xml
index 5cfb246edc..5cfb246edc 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Actions.getOutlink_week.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Actions.getOutlink_week.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Actions.getOutlinks_day.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Actions.getOutlinks_day.xml
index 106f23f16b..106f23f16b 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Actions.getOutlinks_day.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Actions.getOutlinks_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Actions.getOutlinks_week.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Actions.getOutlinks_week.xml
index 5cfb246edc..5cfb246edc 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Actions.getOutlinks_week.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Actions.getOutlinks_week.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Actions.getPageTitle_day.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Actions.getPageTitle_day.xml
index 106f23f16b..106f23f16b 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Actions.getPageTitle_day.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Actions.getPageTitle_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Actions.getPageTitle_week.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Actions.getPageTitle_week.xml
index 5cfb246edc..5cfb246edc 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Actions.getPageTitle_week.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Actions.getPageTitle_week.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Actions.getPageTitlesFollowingSiteSearch_day.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Actions.getPageTitlesFollowingSiteSearch_day.xml
index 106f23f16b..106f23f16b 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Actions.getPageTitlesFollowingSiteSearch_day.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Actions.getPageTitlesFollowingSiteSearch_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Actions.getPageTitlesFollowingSiteSearch_week.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Actions.getPageTitlesFollowingSiteSearch_week.xml
index 5cfb246edc..5cfb246edc 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Actions.getPageTitlesFollowingSiteSearch_week.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Actions.getPageTitlesFollowingSiteSearch_week.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Actions.getPageTitles_day.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Actions.getPageTitles_day.xml
index 106f23f16b..106f23f16b 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Actions.getPageTitles_day.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Actions.getPageTitles_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Actions.getPageTitles_week.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Actions.getPageTitles_week.xml
index 5cfb246edc..5cfb246edc 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Actions.getPageTitles_week.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Actions.getPageTitles_week.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Actions.getPageUrl_day.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Actions.getPageUrl_day.xml
index 106f23f16b..106f23f16b 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Actions.getPageUrl_day.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Actions.getPageUrl_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Actions.getPageUrl_week.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Actions.getPageUrl_week.xml
index 5cfb246edc..5cfb246edc 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Actions.getPageUrl_week.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Actions.getPageUrl_week.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Actions.getPageUrlsFollowingSiteSearch_day.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Actions.getPageUrlsFollowingSiteSearch_day.xml
index 106f23f16b..106f23f16b 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Actions.getPageUrlsFollowingSiteSearch_day.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Actions.getPageUrlsFollowingSiteSearch_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Actions.getPageUrlsFollowingSiteSearch_week.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Actions.getPageUrlsFollowingSiteSearch_week.xml
index 5cfb246edc..5cfb246edc 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Actions.getPageUrlsFollowingSiteSearch_week.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Actions.getPageUrlsFollowingSiteSearch_week.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Actions.getPageUrls_day.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Actions.getPageUrls_day.xml
index 106f23f16b..106f23f16b 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Actions.getPageUrls_day.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Actions.getPageUrls_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Actions.getPageUrls_week.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Actions.getPageUrls_week.xml
index 5cfb246edc..5cfb246edc 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Actions.getPageUrls_week.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Actions.getPageUrls_week.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Actions.getSiteSearchCategories_day.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Actions.getSiteSearchCategories_day.xml
index a91076f826..a91076f826 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Actions.getSiteSearchCategories_day.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Actions.getSiteSearchCategories_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Actions.getSiteSearchCategories_week.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Actions.getSiteSearchCategories_week.xml
index a91076f826..a91076f826 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Actions.getSiteSearchCategories_week.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Actions.getSiteSearchCategories_week.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Actions.getSiteSearchKeywords_day.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Actions.getSiteSearchKeywords_day.xml
index 106f23f16b..106f23f16b 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Actions.getSiteSearchKeywords_day.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Actions.getSiteSearchKeywords_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Actions.getSiteSearchKeywords_week.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Actions.getSiteSearchKeywords_week.xml
index 5cfb246edc..5cfb246edc 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Actions.getSiteSearchKeywords_week.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Actions.getSiteSearchKeywords_week.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Actions.getSiteSearchNoResultKeywords_day.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Actions.getSiteSearchNoResultKeywords_day.xml
index 106f23f16b..106f23f16b 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Actions.getSiteSearchNoResultKeywords_day.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Actions.getSiteSearchNoResultKeywords_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Actions.getSiteSearchNoResultKeywords_week.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Actions.getSiteSearchNoResultKeywords_week.xml
index 5cfb246edc..5cfb246edc 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Actions.getSiteSearchNoResultKeywords_week.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Actions.getSiteSearchNoResultKeywords_week.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Actions.get_day.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Actions.get_day.xml
index 106f23f16b..106f23f16b 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Actions.get_day.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Actions.get_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Actions.get_week.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Actions.get_week.xml
index 5cfb246edc..5cfb246edc 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Actions.get_week.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Actions.get_week.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Contents.getContentNames_day.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Contents.getContentNames_day.xml
index 106f23f16b..106f23f16b 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Contents.getContentNames_day.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Contents.getContentNames_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Contents.getContentNames_week.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Contents.getContentNames_week.xml
index 5cfb246edc..5cfb246edc 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Contents.getContentNames_week.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Contents.getContentNames_week.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Contents.getContentPieces_day.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Contents.getContentPieces_day.xml
index 106f23f16b..106f23f16b 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Contents.getContentPieces_day.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Contents.getContentPieces_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Contents.getContentPieces_week.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Contents.getContentPieces_week.xml
index 5cfb246edc..5cfb246edc 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Contents.getContentPieces_week.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Contents.getContentPieces_week.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__CustomVariables.getCustomVariables_day.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__CustomVariables.getCustomVariables_day.xml
index 106f23f16b..106f23f16b 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__CustomVariables.getCustomVariables_day.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__CustomVariables.getCustomVariables_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__CustomVariables.getCustomVariables_week.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__CustomVariables.getCustomVariables_week.xml
index 5cfb246edc..5cfb246edc 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__CustomVariables.getCustomVariables_week.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__CustomVariables.getCustomVariables_week.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__DevicesDetection.getBrand_day.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__DevicesDetection.getBrand_day.xml
index 106f23f16b..106f23f16b 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__DevicesDetection.getBrand_day.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__DevicesDetection.getBrand_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__DevicesDetection.getBrand_week.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__DevicesDetection.getBrand_week.xml
index 5cfb246edc..5cfb246edc 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__DevicesDetection.getBrand_week.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__DevicesDetection.getBrand_week.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__DevicesDetection.getBrowserFamilies_day.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__DevicesDetection.getBrowserFamilies_day.xml
index 106f23f16b..106f23f16b 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__DevicesDetection.getBrowserFamilies_day.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__DevicesDetection.getBrowserFamilies_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__DevicesDetection.getBrowserFamilies_week.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__DevicesDetection.getBrowserFamilies_week.xml
index 5cfb246edc..5cfb246edc 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__DevicesDetection.getBrowserFamilies_week.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__DevicesDetection.getBrowserFamilies_week.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__DevicesDetection.getBrowserVersions_day.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__DevicesDetection.getBrowserVersions_day.xml
index 106f23f16b..106f23f16b 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__DevicesDetection.getBrowserVersions_day.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__DevicesDetection.getBrowserVersions_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__DevicesDetection.getBrowserVersions_week.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__DevicesDetection.getBrowserVersions_week.xml
index 5cfb246edc..5cfb246edc 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__DevicesDetection.getBrowserVersions_week.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__DevicesDetection.getBrowserVersions_week.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__DevicesDetection.getModel_day.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__DevicesDetection.getModel_day.xml
index 106f23f16b..106f23f16b 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__DevicesDetection.getModel_day.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__DevicesDetection.getModel_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__DevicesDetection.getModel_week.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__DevicesDetection.getModel_week.xml
index 5cfb246edc..5cfb246edc 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__DevicesDetection.getModel_week.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__DevicesDetection.getModel_week.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__DevicesDetection.getOsFamilies_day.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__DevicesDetection.getOsFamilies_day.xml
index 106f23f16b..106f23f16b 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__DevicesDetection.getOsFamilies_day.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__DevicesDetection.getOsFamilies_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__DevicesDetection.getOsFamilies_week.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__DevicesDetection.getOsFamilies_week.xml
index 5cfb246edc..5cfb246edc 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__DevicesDetection.getOsFamilies_week.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__DevicesDetection.getOsFamilies_week.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__DevicesDetection.getOsVersions_day.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__DevicesDetection.getOsVersions_day.xml
index 106f23f16b..106f23f16b 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__DevicesDetection.getOsVersions_day.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__DevicesDetection.getOsVersions_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__DevicesDetection.getOsVersions_week.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__DevicesDetection.getOsVersions_week.xml
index 5cfb246edc..5cfb246edc 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__DevicesDetection.getOsVersions_week.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__DevicesDetection.getOsVersions_week.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__DevicesDetection.getType_day.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__DevicesDetection.getType_day.xml
index 106f23f16b..106f23f16b 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__DevicesDetection.getType_day.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__DevicesDetection.getType_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__DevicesDetection.getType_week.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__DevicesDetection.getType_week.xml
index 5cfb246edc..5cfb246edc 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__DevicesDetection.getType_week.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__DevicesDetection.getType_week.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Events.getAction_day.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Events.getAction_day.xml
index 106f23f16b..106f23f16b 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Events.getAction_day.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Events.getAction_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Events.getAction_week.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Events.getAction_week.xml
index 5cfb246edc..5cfb246edc 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Events.getAction_week.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Events.getAction_week.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Events.getCategory_day.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Events.getCategory_day.xml
index 106f23f16b..106f23f16b 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Events.getCategory_day.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Events.getCategory_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Events.getCategory_week.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Events.getCategory_week.xml
index 5cfb246edc..5cfb246edc 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Events.getCategory_week.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Events.getCategory_week.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Events.getName_day.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Events.getName_day.xml
index 106f23f16b..106f23f16b 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Events.getName_day.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Events.getName_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Events.getName_week.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Events.getName_week.xml
index 5cfb246edc..5cfb246edc 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Events.getName_week.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Events.getName_week.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__ExamplePlugin.getAnswerToLife.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__ExamplePlugin.getAnswerToLife.xml
index 36a787c47a..36a787c47a 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__ExamplePlugin.getAnswerToLife.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__ExamplePlugin.getAnswerToLife.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__ExamplePlugin.getExampleReport_day.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__ExamplePlugin.getExampleReport_day.xml
index 1b2fed39f9..1b2fed39f9 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__ExamplePlugin.getExampleReport_day.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__ExamplePlugin.getExampleReport_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__ExamplePlugin.getExampleReport_week.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__ExamplePlugin.getExampleReport_week.xml
index 1b2fed39f9..1b2fed39f9 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__ExamplePlugin.getExampleReport_week.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__ExamplePlugin.getExampleReport_week.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Goals.getDaysToConversion_day.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Goals.getDaysToConversion_day.xml
index 106f23f16b..106f23f16b 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Goals.getDaysToConversion_day.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Goals.getDaysToConversion_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Goals.getDaysToConversion_week.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Goals.getDaysToConversion_week.xml
index 5cfb246edc..5cfb246edc 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Goals.getDaysToConversion_week.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Goals.getDaysToConversion_week.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Goals.getGoals.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Goals.getGoals.xml
index c234bed59e..c234bed59e 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Goals.getGoals.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Goals.getGoals.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Goals.getItemsCategory_day.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Goals.getItemsCategory_day.xml
index 106f23f16b..106f23f16b 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Goals.getItemsCategory_day.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Goals.getItemsCategory_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Goals.getItemsCategory_week.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Goals.getItemsCategory_week.xml
index 5cfb246edc..5cfb246edc 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Goals.getItemsCategory_week.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Goals.getItemsCategory_week.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Goals.getItemsName_day.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Goals.getItemsName_day.xml
index 106f23f16b..106f23f16b 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Goals.getItemsName_day.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Goals.getItemsName_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Goals.getItemsName_week.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Goals.getItemsName_week.xml
index 5cfb246edc..5cfb246edc 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Goals.getItemsName_week.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Goals.getItemsName_week.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Goals.getItemsSku_day.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Goals.getItemsSku_day.xml
index 106f23f16b..106f23f16b 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Goals.getItemsSku_day.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Goals.getItemsSku_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Goals.getItemsSku_week.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Goals.getItemsSku_week.xml
index 5cfb246edc..5cfb246edc 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Goals.getItemsSku_week.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Goals.getItemsSku_week.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Goals.getVisitsUntilConversion_day.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Goals.getVisitsUntilConversion_day.xml
index 106f23f16b..106f23f16b 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Goals.getVisitsUntilConversion_day.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Goals.getVisitsUntilConversion_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Goals.getVisitsUntilConversion_week.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Goals.getVisitsUntilConversion_week.xml
index 5cfb246edc..5cfb246edc 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Goals.getVisitsUntilConversion_week.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Goals.getVisitsUntilConversion_week.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Goals.get_day.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Goals.get_day.xml
index 106f23f16b..106f23f16b 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Goals.get_day.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Goals.get_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Goals.get_week.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Goals.get_week.xml
index 5cfb246edc..5cfb246edc 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Goals.get_week.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Goals.get_week.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__MultiSites.getAll_day.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__MultiSites.getAll_day.xml
index 106f23f16b..106f23f16b 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__MultiSites.getAll_day.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__MultiSites.getAll_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__MultiSites.getAll_week.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__MultiSites.getAll_week.xml
index 5cfb246edc..5cfb246edc 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__MultiSites.getAll_week.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__MultiSites.getAll_week.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__MultiSites.getOne_day.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__MultiSites.getOne_day.xml
index b34eb3e56b..b34eb3e56b 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__MultiSites.getOne_day.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__MultiSites.getOne_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__MultiSites.getOne_week.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__MultiSites.getOne_week.xml
index 61e2dd5a02..61e2dd5a02 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__MultiSites.getOne_week.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__MultiSites.getOne_week.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Provider.getProvider_day.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Provider.getProvider_day.xml
index 106f23f16b..106f23f16b 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Provider.getProvider_day.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Provider.getProvider_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Provider.getProvider_week.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Provider.getProvider_week.xml
index 5cfb246edc..5cfb246edc 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Provider.getProvider_week.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Provider.getProvider_week.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Referrers.getAll_day.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Referrers.getAll_day.xml
index 64d7aebcb2..64d7aebcb2 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Referrers.getAll_day.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Referrers.getAll_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Referrers.getAll_week.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Referrers.getAll_week.xml
index 64d7aebcb2..64d7aebcb2 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Referrers.getAll_week.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Referrers.getAll_week.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Referrers.getCampaigns_day.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Referrers.getCampaigns_day.xml
index 106f23f16b..106f23f16b 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Referrers.getCampaigns_day.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Referrers.getCampaigns_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Referrers.getCampaigns_week.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Referrers.getCampaigns_week.xml
index 5cfb246edc..5cfb246edc 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Referrers.getCampaigns_week.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Referrers.getCampaigns_week.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Referrers.getKeywordsForPageUrl_day.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Referrers.getKeywordsForPageUrl_day.xml
index c234bed59e..c234bed59e 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Referrers.getKeywordsForPageUrl_day.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Referrers.getKeywordsForPageUrl_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Referrers.getKeywordsForPageUrl_week.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Referrers.getKeywordsForPageUrl_week.xml
index c234bed59e..c234bed59e 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Referrers.getKeywordsForPageUrl_week.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Referrers.getKeywordsForPageUrl_week.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Referrers.getKeywords_day.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Referrers.getKeywords_day.xml
index 106f23f16b..106f23f16b 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Referrers.getKeywords_day.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Referrers.getKeywords_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Referrers.getKeywords_week.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Referrers.getKeywords_week.xml
index 5cfb246edc..5cfb246edc 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Referrers.getKeywords_week.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Referrers.getKeywords_week.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Referrers.getNumberOfDistinctCampaigns_day.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Referrers.getNumberOfDistinctCampaigns_day.xml
index 106f23f16b..106f23f16b 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Referrers.getNumberOfDistinctCampaigns_day.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Referrers.getNumberOfDistinctCampaigns_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Referrers.getNumberOfDistinctCampaigns_week.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Referrers.getNumberOfDistinctCampaigns_week.xml
index 5cfb246edc..5cfb246edc 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Referrers.getNumberOfDistinctCampaigns_week.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Referrers.getNumberOfDistinctCampaigns_week.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Referrers.getNumberOfDistinctKeywords_day.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Referrers.getNumberOfDistinctKeywords_day.xml
index 106f23f16b..106f23f16b 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Referrers.getNumberOfDistinctKeywords_day.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Referrers.getNumberOfDistinctKeywords_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Referrers.getNumberOfDistinctKeywords_week.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Referrers.getNumberOfDistinctKeywords_week.xml
index 5cfb246edc..5cfb246edc 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Referrers.getNumberOfDistinctKeywords_week.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Referrers.getNumberOfDistinctKeywords_week.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Referrers.getNumberOfDistinctSearchEngines_day.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Referrers.getNumberOfDistinctSearchEngines_day.xml
index 106f23f16b..106f23f16b 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Referrers.getNumberOfDistinctSearchEngines_day.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Referrers.getNumberOfDistinctSearchEngines_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Referrers.getNumberOfDistinctSearchEngines_week.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Referrers.getNumberOfDistinctSearchEngines_week.xml
index 5cfb246edc..5cfb246edc 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Referrers.getNumberOfDistinctSearchEngines_week.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Referrers.getNumberOfDistinctSearchEngines_week.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Referrers.getNumberOfDistinctWebsitesUrls_day.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Referrers.getNumberOfDistinctWebsitesUrls_day.xml
index 106f23f16b..106f23f16b 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Referrers.getNumberOfDistinctWebsitesUrls_day.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Referrers.getNumberOfDistinctWebsitesUrls_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Referrers.getNumberOfDistinctWebsitesUrls_week.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Referrers.getNumberOfDistinctWebsitesUrls_week.xml
index 5cfb246edc..5cfb246edc 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Referrers.getNumberOfDistinctWebsitesUrls_week.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Referrers.getNumberOfDistinctWebsitesUrls_week.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Referrers.getNumberOfDistinctWebsites_day.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Referrers.getNumberOfDistinctWebsites_day.xml
index 106f23f16b..106f23f16b 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Referrers.getNumberOfDistinctWebsites_day.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Referrers.getNumberOfDistinctWebsites_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Referrers.getNumberOfDistinctWebsites_week.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Referrers.getNumberOfDistinctWebsites_week.xml
index 5cfb246edc..5cfb246edc 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Referrers.getNumberOfDistinctWebsites_week.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Referrers.getNumberOfDistinctWebsites_week.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Referrers.getReferrerType_day.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Referrers.getReferrerType_day.xml
index 106f23f16b..106f23f16b 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Referrers.getReferrerType_day.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Referrers.getReferrerType_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Referrers.getReferrerType_week.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Referrers.getReferrerType_week.xml
index 5cfb246edc..5cfb246edc 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Referrers.getReferrerType_week.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Referrers.getReferrerType_week.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Referrers.getSearchEngines_day.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Referrers.getSearchEngines_day.xml
index 106f23f16b..106f23f16b 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Referrers.getSearchEngines_day.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Referrers.getSearchEngines_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Referrers.getSearchEngines_week.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Referrers.getSearchEngines_week.xml
index 5cfb246edc..5cfb246edc 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Referrers.getSearchEngines_week.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Referrers.getSearchEngines_week.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Referrers.getSocials_day.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Referrers.getSocials_day.xml
index 106f23f16b..106f23f16b 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Referrers.getSocials_day.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Referrers.getSocials_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Referrers.getSocials_week.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Referrers.getSocials_week.xml
index 5cfb246edc..5cfb246edc 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Referrers.getSocials_week.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Referrers.getSocials_week.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Referrers.getUrlsForSocial_day.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Referrers.getUrlsForSocial_day.xml
index 106f23f16b..106f23f16b 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Referrers.getUrlsForSocial_day.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Referrers.getUrlsForSocial_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Referrers.getUrlsForSocial_week.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Referrers.getUrlsForSocial_week.xml
index 5cfb246edc..5cfb246edc 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Referrers.getUrlsForSocial_week.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Referrers.getUrlsForSocial_week.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Referrers.getWebsites_day.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Referrers.getWebsites_day.xml
index 106f23f16b..106f23f16b 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Referrers.getWebsites_day.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Referrers.getWebsites_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Referrers.getWebsites_week.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Referrers.getWebsites_week.xml
index 5cfb246edc..5cfb246edc 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Referrers.getWebsites_week.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Referrers.getWebsites_week.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__UserCountry.getCity_day.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__UserCountry.getCity_day.xml
index 106f23f16b..106f23f16b 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__UserCountry.getCity_day.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__UserCountry.getCity_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__UserCountry.getCity_week.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__UserCountry.getCity_week.xml
index 5cfb246edc..5cfb246edc 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__UserCountry.getCity_week.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__UserCountry.getCity_week.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__UserCountry.getContinent_day.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__UserCountry.getContinent_day.xml
index 106f23f16b..106f23f16b 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__UserCountry.getContinent_day.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__UserCountry.getContinent_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__UserCountry.getContinent_week.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__UserCountry.getContinent_week.xml
index 5cfb246edc..5cfb246edc 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__UserCountry.getContinent_week.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__UserCountry.getContinent_week.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__UserCountry.getCountry_day.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__UserCountry.getCountry_day.xml
index 106f23f16b..106f23f16b 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__UserCountry.getCountry_day.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__UserCountry.getCountry_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__UserCountry.getCountry_week.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__UserCountry.getCountry_week.xml
index 5cfb246edc..5cfb246edc 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__UserCountry.getCountry_week.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__UserCountry.getCountry_week.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__UserCountry.getNumberOfDistinctCountries_day.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__UserCountry.getNumberOfDistinctCountries_day.xml
index 106f23f16b..106f23f16b 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__UserCountry.getNumberOfDistinctCountries_day.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__UserCountry.getNumberOfDistinctCountries_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__UserCountry.getNumberOfDistinctCountries_week.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__UserCountry.getNumberOfDistinctCountries_week.xml
index 5cfb246edc..5cfb246edc 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__UserCountry.getNumberOfDistinctCountries_week.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__UserCountry.getNumberOfDistinctCountries_week.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__UserCountry.getRegion_day.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__UserCountry.getRegion_day.xml
index 106f23f16b..106f23f16b 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__UserCountry.getRegion_day.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__UserCountry.getRegion_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__UserCountry.getRegion_week.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__UserCountry.getRegion_week.xml
index 5cfb246edc..5cfb246edc 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__UserCountry.getRegion_week.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__UserCountry.getRegion_week.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__UserSettings.getBrowserType_day.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__UserSettings.getBrowserType_day.xml
index 106f23f16b..106f23f16b 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__UserSettings.getBrowserType_day.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__UserSettings.getBrowserType_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__UserSettings.getBrowserType_week.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__UserSettings.getBrowserType_week.xml
index 5cfb246edc..5cfb246edc 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__UserSettings.getBrowserType_week.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__UserSettings.getBrowserType_week.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__UserSettings.getBrowserVersion_day.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__UserSettings.getBrowserVersion_day.xml
index 106f23f16b..106f23f16b 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__UserSettings.getBrowserVersion_day.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__UserSettings.getBrowserVersion_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__UserSettings.getBrowserVersion_week.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__UserSettings.getBrowserVersion_week.xml
index 5cfb246edc..5cfb246edc 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__UserSettings.getBrowserVersion_week.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__UserSettings.getBrowserVersion_week.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__UserSettings.getBrowser_day.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__UserSettings.getBrowser_day.xml
index 106f23f16b..106f23f16b 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__UserSettings.getBrowser_day.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__UserSettings.getBrowser_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__UserSettings.getBrowser_week.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__UserSettings.getBrowser_week.xml
index 5cfb246edc..5cfb246edc 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__UserSettings.getBrowser_week.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__UserSettings.getBrowser_week.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__UserSettings.getConfiguration_day.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__UserSettings.getConfiguration_day.xml
index 106f23f16b..106f23f16b 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__UserSettings.getConfiguration_day.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__UserSettings.getConfiguration_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__UserSettings.getConfiguration_week.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__UserSettings.getConfiguration_week.xml
index 5cfb246edc..5cfb246edc 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__UserSettings.getConfiguration_week.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__UserSettings.getConfiguration_week.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__UserSettings.getLanguageCode_day.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__UserSettings.getLanguageCode_day.xml
index 106f23f16b..106f23f16b 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__UserSettings.getLanguageCode_day.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__UserSettings.getLanguageCode_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__UserSettings.getLanguageCode_week.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__UserSettings.getLanguageCode_week.xml
index 5cfb246edc..5cfb246edc 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__UserSettings.getLanguageCode_week.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__UserSettings.getLanguageCode_week.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__UserSettings.getLanguage_day.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__UserSettings.getLanguage_day.xml
index 106f23f16b..106f23f16b 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__UserSettings.getLanguage_day.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__UserSettings.getLanguage_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__UserSettings.getLanguage_week.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__UserSettings.getLanguage_week.xml
index 5cfb246edc..5cfb246edc 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__UserSettings.getLanguage_week.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__UserSettings.getLanguage_week.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__UserSettings.getMobileVsDesktop_day.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__UserSettings.getMobileVsDesktop_day.xml
index 106f23f16b..106f23f16b 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__UserSettings.getMobileVsDesktop_day.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__UserSettings.getMobileVsDesktop_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__UserSettings.getMobileVsDesktop_week.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__UserSettings.getMobileVsDesktop_week.xml
index 5cfb246edc..5cfb246edc 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__UserSettings.getMobileVsDesktop_week.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__UserSettings.getMobileVsDesktop_week.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__UserSettings.getOSFamily_day.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__UserSettings.getOSFamily_day.xml
index 106f23f16b..106f23f16b 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__UserSettings.getOSFamily_day.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__UserSettings.getOSFamily_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__UserSettings.getOSFamily_week.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__UserSettings.getOSFamily_week.xml
index 5cfb246edc..5cfb246edc 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__UserSettings.getOSFamily_week.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__UserSettings.getOSFamily_week.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__UserSettings.getOS_day.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__UserSettings.getOS_day.xml
index 106f23f16b..106f23f16b 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__UserSettings.getOS_day.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__UserSettings.getOS_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__UserSettings.getOS_week.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__UserSettings.getOS_week.xml
index 5cfb246edc..5cfb246edc 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__UserSettings.getOS_week.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__UserSettings.getOS_week.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__UserSettings.getPlugin_day.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__UserSettings.getPlugin_day.xml
index 106f23f16b..106f23f16b 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__UserSettings.getPlugin_day.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__UserSettings.getPlugin_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__UserSettings.getPlugin_week.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__UserSettings.getPlugin_week.xml
index 5cfb246edc..5cfb246edc 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__UserSettings.getPlugin_week.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__UserSettings.getPlugin_week.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__UserSettings.getResolution_day.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__UserSettings.getResolution_day.xml
index 106f23f16b..106f23f16b 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__UserSettings.getResolution_day.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__UserSettings.getResolution_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__UserSettings.getResolution_week.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__UserSettings.getResolution_week.xml
index 5cfb246edc..5cfb246edc 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__UserSettings.getResolution_week.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__UserSettings.getResolution_week.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__UserSettings.getWideScreen_day.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__UserSettings.getWideScreen_day.xml
index 106f23f16b..106f23f16b 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__UserSettings.getWideScreen_day.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__UserSettings.getWideScreen_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__UserSettings.getWideScreen_week.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__UserSettings.getWideScreen_week.xml
index 5cfb246edc..5cfb246edc 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__UserSettings.getWideScreen_week.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__UserSettings.getWideScreen_week.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__VisitFrequency.get_day.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__VisitFrequency.get_day.xml
index 106f23f16b..106f23f16b 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__VisitFrequency.get_day.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__VisitFrequency.get_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__VisitFrequency.get_week.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__VisitFrequency.get_week.xml
index 5cfb246edc..5cfb246edc 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__VisitFrequency.get_week.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__VisitFrequency.get_week.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__VisitTime.getByDayOfWeek_day.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__VisitTime.getByDayOfWeek_day.xml
index 547baf7416..547baf7416 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__VisitTime.getByDayOfWeek_day.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__VisitTime.getByDayOfWeek_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__VisitTime.getByDayOfWeek_week.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__VisitTime.getByDayOfWeek_week.xml
index 547baf7416..547baf7416 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__VisitTime.getByDayOfWeek_week.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__VisitTime.getByDayOfWeek_week.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__VisitTime.getVisitInformationPerLocalTime_day.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__VisitTime.getVisitInformationPerLocalTime_day.xml
index 106f23f16b..106f23f16b 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__VisitTime.getVisitInformationPerLocalTime_day.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__VisitTime.getVisitInformationPerLocalTime_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__VisitTime.getVisitInformationPerLocalTime_week.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__VisitTime.getVisitInformationPerLocalTime_week.xml
index 5cfb246edc..5cfb246edc 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__VisitTime.getVisitInformationPerLocalTime_week.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__VisitTime.getVisitInformationPerLocalTime_week.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__VisitTime.getVisitInformationPerServerTime_day.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__VisitTime.getVisitInformationPerServerTime_day.xml
index 106f23f16b..106f23f16b 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__VisitTime.getVisitInformationPerServerTime_day.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__VisitTime.getVisitInformationPerServerTime_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__VisitTime.getVisitInformationPerServerTime_week.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__VisitTime.getVisitInformationPerServerTime_week.xml
index 5cfb246edc..5cfb246edc 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__VisitTime.getVisitInformationPerServerTime_week.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__VisitTime.getVisitInformationPerServerTime_week.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__VisitorInterest.getNumberOfVisitsByDaysSinceLast_day.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__VisitorInterest.getNumberOfVisitsByDaysSinceLast_day.xml
index 106f23f16b..106f23f16b 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__VisitorInterest.getNumberOfVisitsByDaysSinceLast_day.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__VisitorInterest.getNumberOfVisitsByDaysSinceLast_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__VisitorInterest.getNumberOfVisitsByDaysSinceLast_week.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__VisitorInterest.getNumberOfVisitsByDaysSinceLast_week.xml
index 5cfb246edc..5cfb246edc 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__VisitorInterest.getNumberOfVisitsByDaysSinceLast_week.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__VisitorInterest.getNumberOfVisitsByDaysSinceLast_week.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__VisitorInterest.getNumberOfVisitsByVisitCount_day.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__VisitorInterest.getNumberOfVisitsByVisitCount_day.xml
index 106f23f16b..106f23f16b 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__VisitorInterest.getNumberOfVisitsByVisitCount_day.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__VisitorInterest.getNumberOfVisitsByVisitCount_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__VisitorInterest.getNumberOfVisitsByVisitCount_week.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__VisitorInterest.getNumberOfVisitsByVisitCount_week.xml
index 5cfb246edc..5cfb246edc 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__VisitorInterest.getNumberOfVisitsByVisitCount_week.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__VisitorInterest.getNumberOfVisitsByVisitCount_week.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__VisitorInterest.getNumberOfVisitsPerPage_day.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__VisitorInterest.getNumberOfVisitsPerPage_day.xml
index 106f23f16b..106f23f16b 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__VisitorInterest.getNumberOfVisitsPerPage_day.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__VisitorInterest.getNumberOfVisitsPerPage_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__VisitorInterest.getNumberOfVisitsPerPage_week.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__VisitorInterest.getNumberOfVisitsPerPage_week.xml
index 5cfb246edc..5cfb246edc 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__VisitorInterest.getNumberOfVisitsPerPage_week.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__VisitorInterest.getNumberOfVisitsPerPage_week.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__VisitorInterest.getNumberOfVisitsPerVisitDuration_day.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__VisitorInterest.getNumberOfVisitsPerVisitDuration_day.xml
index 106f23f16b..106f23f16b 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__VisitorInterest.getNumberOfVisitsPerVisitDuration_day.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__VisitorInterest.getNumberOfVisitsPerVisitDuration_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__VisitorInterest.getNumberOfVisitsPerVisitDuration_week.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__VisitorInterest.getNumberOfVisitsPerVisitDuration_week.xml
index 5cfb246edc..5cfb246edc 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__VisitorInterest.getNumberOfVisitsPerVisitDuration_week.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__VisitorInterest.getNumberOfVisitsPerVisitDuration_week.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__VisitsSummary.getActions_day.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__VisitsSummary.getActions_day.xml
index 106f23f16b..106f23f16b 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__VisitsSummary.getActions_day.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__VisitsSummary.getActions_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__VisitsSummary.getActions_week.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__VisitsSummary.getActions_week.xml
index 5cfb246edc..5cfb246edc 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__VisitsSummary.getActions_week.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__VisitsSummary.getActions_week.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__VisitsSummary.getBounceCount_day.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__VisitsSummary.getBounceCount_day.xml
index 106f23f16b..106f23f16b 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__VisitsSummary.getBounceCount_day.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__VisitsSummary.getBounceCount_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__VisitsSummary.getBounceCount_week.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__VisitsSummary.getBounceCount_week.xml
index 5cfb246edc..5cfb246edc 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__VisitsSummary.getBounceCount_week.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__VisitsSummary.getBounceCount_week.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__VisitsSummary.getMaxActions_day.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__VisitsSummary.getMaxActions_day.xml
index 106f23f16b..106f23f16b 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__VisitsSummary.getMaxActions_day.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__VisitsSummary.getMaxActions_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__VisitsSummary.getMaxActions_week.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__VisitsSummary.getMaxActions_week.xml
index 5cfb246edc..5cfb246edc 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__VisitsSummary.getMaxActions_week.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__VisitsSummary.getMaxActions_week.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__VisitsSummary.getSumVisitsLengthPretty_day.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__VisitsSummary.getSumVisitsLengthPretty_day.xml
index c908c9a75d..c908c9a75d 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__VisitsSummary.getSumVisitsLengthPretty_day.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__VisitsSummary.getSumVisitsLengthPretty_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__VisitsSummary.getSumVisitsLengthPretty_week.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__VisitsSummary.getSumVisitsLengthPretty_week.xml
index 1f731a8248..1f731a8248 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__VisitsSummary.getSumVisitsLengthPretty_week.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__VisitsSummary.getSumVisitsLengthPretty_week.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__VisitsSummary.getSumVisitsLength_day.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__VisitsSummary.getSumVisitsLength_day.xml
index 106f23f16b..106f23f16b 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__VisitsSummary.getSumVisitsLength_day.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__VisitsSummary.getSumVisitsLength_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__VisitsSummary.getSumVisitsLength_week.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__VisitsSummary.getSumVisitsLength_week.xml
index 5cfb246edc..5cfb246edc 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__VisitsSummary.getSumVisitsLength_week.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__VisitsSummary.getSumVisitsLength_week.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__VisitsSummary.getUniqueVisitors_day.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__VisitsSummary.getUniqueVisitors_day.xml
index 106f23f16b..106f23f16b 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__VisitsSummary.getUniqueVisitors_day.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__VisitsSummary.getUniqueVisitors_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__VisitsSummary.getUniqueVisitors_week.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__VisitsSummary.getUniqueVisitors_week.xml
index 5cfb246edc..5cfb246edc 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__VisitsSummary.getUniqueVisitors_week.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__VisitsSummary.getUniqueVisitors_week.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__VisitsSummary.getUsers_day.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__VisitsSummary.getUsers_day.xml
index 106f23f16b..106f23f16b 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__VisitsSummary.getUsers_day.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__VisitsSummary.getUsers_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__VisitsSummary.getUsers_week.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__VisitsSummary.getUsers_week.xml
index 5cfb246edc..5cfb246edc 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__VisitsSummary.getUsers_week.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__VisitsSummary.getUsers_week.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__VisitsSummary.getVisitsConverted_day.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__VisitsSummary.getVisitsConverted_day.xml
index 106f23f16b..106f23f16b 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__VisitsSummary.getVisitsConverted_day.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__VisitsSummary.getVisitsConverted_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__VisitsSummary.getVisitsConverted_week.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__VisitsSummary.getVisitsConverted_week.xml
index 5cfb246edc..5cfb246edc 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__VisitsSummary.getVisitsConverted_week.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__VisitsSummary.getVisitsConverted_week.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__VisitsSummary.getVisits_day.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__VisitsSummary.getVisits_day.xml
index 106f23f16b..106f23f16b 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__VisitsSummary.getVisits_day.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__VisitsSummary.getVisits_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__VisitsSummary.getVisits_week.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__VisitsSummary.getVisits_week.xml
index 5cfb246edc..5cfb246edc 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__VisitsSummary.getVisits_week.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__VisitsSummary.getVisits_week.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__VisitsSummary.get_day.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__VisitsSummary.get_day.xml
index 106f23f16b..106f23f16b 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__VisitsSummary.get_day.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__VisitsSummary.get_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__VisitsSummary.get_week.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__VisitsSummary.get_week.xml
index 5cfb246edc..5cfb246edc 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__VisitsSummary.get_week.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__VisitsSummary.get_week.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit__Actions.getDownload_day.xml b/tests/PHPUnit/System/expected/test_noVisit__Actions.getDownload_day.xml
index c234bed59e..c234bed59e 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit__Actions.getDownload_day.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit__Actions.getDownload_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit__Actions.getDownloads_day.xml b/tests/PHPUnit/System/expected/test_noVisit__Actions.getDownloads_day.xml
index c234bed59e..c234bed59e 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit__Actions.getDownloads_day.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit__Actions.getDownloads_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit__Actions.getEntryPageTitles_day.xml b/tests/PHPUnit/System/expected/test_noVisit__Actions.getEntryPageTitles_day.xml
index c234bed59e..c234bed59e 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit__Actions.getEntryPageTitles_day.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit__Actions.getEntryPageTitles_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit__Actions.getEntryPageUrls_day.xml b/tests/PHPUnit/System/expected/test_noVisit__Actions.getEntryPageUrls_day.xml
index c234bed59e..c234bed59e 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit__Actions.getEntryPageUrls_day.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit__Actions.getEntryPageUrls_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit__Actions.getExitPageTitles_day.xml b/tests/PHPUnit/System/expected/test_noVisit__Actions.getExitPageTitles_day.xml
index c234bed59e..c234bed59e 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit__Actions.getExitPageTitles_day.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit__Actions.getExitPageTitles_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit__Actions.getExitPageUrls_day.xml b/tests/PHPUnit/System/expected/test_noVisit__Actions.getExitPageUrls_day.xml
index c234bed59e..c234bed59e 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit__Actions.getExitPageUrls_day.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit__Actions.getExitPageUrls_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit__Actions.getOutlink_day.xml b/tests/PHPUnit/System/expected/test_noVisit__Actions.getOutlink_day.xml
index c234bed59e..c234bed59e 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit__Actions.getOutlink_day.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit__Actions.getOutlink_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit__Actions.getOutlinks_day.xml b/tests/PHPUnit/System/expected/test_noVisit__Actions.getOutlinks_day.xml
index c234bed59e..c234bed59e 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit__Actions.getOutlinks_day.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit__Actions.getOutlinks_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit__Actions.getPageTitle_day.xml b/tests/PHPUnit/System/expected/test_noVisit__Actions.getPageTitle_day.xml
index c234bed59e..c234bed59e 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit__Actions.getPageTitle_day.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit__Actions.getPageTitle_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit__Actions.getPageTitlesFollowingSiteSearch_day.xml b/tests/PHPUnit/System/expected/test_noVisit__Actions.getPageTitlesFollowingSiteSearch_day.xml
index c234bed59e..c234bed59e 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit__Actions.getPageTitlesFollowingSiteSearch_day.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit__Actions.getPageTitlesFollowingSiteSearch_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit__Actions.getPageTitles_day.xml b/tests/PHPUnit/System/expected/test_noVisit__Actions.getPageTitles_day.xml
index c234bed59e..c234bed59e 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit__Actions.getPageTitles_day.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit__Actions.getPageTitles_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit__Actions.getPageUrl_day.xml b/tests/PHPUnit/System/expected/test_noVisit__Actions.getPageUrl_day.xml
index c234bed59e..c234bed59e 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit__Actions.getPageUrl_day.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit__Actions.getPageUrl_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit__Actions.getPageUrlsFollowingSiteSearch_day.xml b/tests/PHPUnit/System/expected/test_noVisit__Actions.getPageUrlsFollowingSiteSearch_day.xml
index c234bed59e..c234bed59e 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit__Actions.getPageUrlsFollowingSiteSearch_day.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit__Actions.getPageUrlsFollowingSiteSearch_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit__Actions.getPageUrls_day.xml b/tests/PHPUnit/System/expected/test_noVisit__Actions.getPageUrls_day.xml
index c234bed59e..c234bed59e 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit__Actions.getPageUrls_day.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit__Actions.getPageUrls_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit__Actions.getSiteSearchCategories_day.xml b/tests/PHPUnit/System/expected/test_noVisit__Actions.getSiteSearchCategories_day.xml
index c234bed59e..c234bed59e 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit__Actions.getSiteSearchCategories_day.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit__Actions.getSiteSearchCategories_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit__Actions.getSiteSearchKeywords_day.xml b/tests/PHPUnit/System/expected/test_noVisit__Actions.getSiteSearchKeywords_day.xml
index c234bed59e..c234bed59e 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit__Actions.getSiteSearchKeywords_day.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit__Actions.getSiteSearchKeywords_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit__Actions.getSiteSearchNoResultKeywords_day.xml b/tests/PHPUnit/System/expected/test_noVisit__Actions.getSiteSearchNoResultKeywords_day.xml
index c234bed59e..c234bed59e 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit__Actions.getSiteSearchNoResultKeywords_day.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit__Actions.getSiteSearchNoResultKeywords_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit__Actions.get_day.xml b/tests/PHPUnit/System/expected/test_noVisit__Actions.get_day.xml
index 6eb4818cba..6eb4818cba 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit__Actions.get_day.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit__Actions.get_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit__Contents.getContentNames_day.xml b/tests/PHPUnit/System/expected/test_noVisit__Contents.getContentNames_day.xml
index c234bed59e..c234bed59e 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit__Contents.getContentNames_day.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit__Contents.getContentNames_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit__Contents.getContentPieces_day.xml b/tests/PHPUnit/System/expected/test_noVisit__Contents.getContentPieces_day.xml
index c234bed59e..c234bed59e 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit__Contents.getContentPieces_day.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit__Contents.getContentPieces_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit__CustomVariables.getCustomVariables_day.xml b/tests/PHPUnit/System/expected/test_noVisit__CustomVariables.getCustomVariables_day.xml
index c234bed59e..c234bed59e 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit__CustomVariables.getCustomVariables_day.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit__CustomVariables.getCustomVariables_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit__DevicesDetection.getBrand_day.xml b/tests/PHPUnit/System/expected/test_noVisit__DevicesDetection.getBrand_day.xml
index c234bed59e..c234bed59e 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit__DevicesDetection.getBrand_day.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit__DevicesDetection.getBrand_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit__DevicesDetection.getBrowserFamilies_day.xml b/tests/PHPUnit/System/expected/test_noVisit__DevicesDetection.getBrowserFamilies_day.xml
index c234bed59e..c234bed59e 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit__DevicesDetection.getBrowserFamilies_day.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit__DevicesDetection.getBrowserFamilies_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit__DevicesDetection.getBrowserVersions_day.xml b/tests/PHPUnit/System/expected/test_noVisit__DevicesDetection.getBrowserVersions_day.xml
index c234bed59e..c234bed59e 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit__DevicesDetection.getBrowserVersions_day.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit__DevicesDetection.getBrowserVersions_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit__DevicesDetection.getModel_day.xml b/tests/PHPUnit/System/expected/test_noVisit__DevicesDetection.getModel_day.xml
index c234bed59e..c234bed59e 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit__DevicesDetection.getModel_day.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit__DevicesDetection.getModel_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit__DevicesDetection.getOsFamilies_day.xml b/tests/PHPUnit/System/expected/test_noVisit__DevicesDetection.getOsFamilies_day.xml
index c234bed59e..c234bed59e 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit__DevicesDetection.getOsFamilies_day.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit__DevicesDetection.getOsFamilies_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit__DevicesDetection.getOsVersions_day.xml b/tests/PHPUnit/System/expected/test_noVisit__DevicesDetection.getOsVersions_day.xml
index c234bed59e..c234bed59e 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit__DevicesDetection.getOsVersions_day.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit__DevicesDetection.getOsVersions_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit__DevicesDetection.getType_day.xml b/tests/PHPUnit/System/expected/test_noVisit__DevicesDetection.getType_day.xml
index c234bed59e..c234bed59e 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit__DevicesDetection.getType_day.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit__DevicesDetection.getType_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit__Events.getAction_day.xml b/tests/PHPUnit/System/expected/test_noVisit__Events.getAction_day.xml
index c234bed59e..c234bed59e 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit__Events.getAction_day.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit__Events.getAction_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit__Events.getCategory_day.xml b/tests/PHPUnit/System/expected/test_noVisit__Events.getCategory_day.xml
index c234bed59e..c234bed59e 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit__Events.getCategory_day.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit__Events.getCategory_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit__Events.getName_day.xml b/tests/PHPUnit/System/expected/test_noVisit__Events.getName_day.xml
index c234bed59e..c234bed59e 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit__Events.getName_day.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit__Events.getName_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit__ExamplePlugin.getAnswerToLife.xml b/tests/PHPUnit/System/expected/test_noVisit__ExamplePlugin.getAnswerToLife.xml
index 36a787c47a..36a787c47a 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit__ExamplePlugin.getAnswerToLife.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit__ExamplePlugin.getAnswerToLife.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit__ExamplePlugin.getExampleReport_day.xml b/tests/PHPUnit/System/expected/test_noVisit__ExamplePlugin.getExampleReport_day.xml
index 1b2fed39f9..1b2fed39f9 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit__ExamplePlugin.getExampleReport_day.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit__ExamplePlugin.getExampleReport_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit__Goals.getDaysToConversion_day.xml b/tests/PHPUnit/System/expected/test_noVisit__Goals.getDaysToConversion_day.xml
index c234bed59e..c234bed59e 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit__Goals.getDaysToConversion_day.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit__Goals.getDaysToConversion_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit__Goals.getGoals.xml b/tests/PHPUnit/System/expected/test_noVisit__Goals.getGoals.xml
index c234bed59e..c234bed59e 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit__Goals.getGoals.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit__Goals.getGoals.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit__Goals.getItemsCategory_day.xml b/tests/PHPUnit/System/expected/test_noVisit__Goals.getItemsCategory_day.xml
index c234bed59e..c234bed59e 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit__Goals.getItemsCategory_day.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit__Goals.getItemsCategory_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit__Goals.getItemsName_day.xml b/tests/PHPUnit/System/expected/test_noVisit__Goals.getItemsName_day.xml
index c234bed59e..c234bed59e 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit__Goals.getItemsName_day.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit__Goals.getItemsName_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit__Goals.getItemsSku_day.xml b/tests/PHPUnit/System/expected/test_noVisit__Goals.getItemsSku_day.xml
index c234bed59e..c234bed59e 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit__Goals.getItemsSku_day.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit__Goals.getItemsSku_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit__Goals.getVisitsUntilConversion_day.xml b/tests/PHPUnit/System/expected/test_noVisit__Goals.getVisitsUntilConversion_day.xml
index c234bed59e..c234bed59e 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit__Goals.getVisitsUntilConversion_day.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit__Goals.getVisitsUntilConversion_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit__Goals.get_day.xml b/tests/PHPUnit/System/expected/test_noVisit__Goals.get_day.xml
index 257dd359a5..257dd359a5 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit__Goals.get_day.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit__Goals.get_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit__MultiSites.getAll_day.xml b/tests/PHPUnit/System/expected/test_noVisit__MultiSites.getAll_day.xml
index c234bed59e..c234bed59e 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit__MultiSites.getAll_day.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit__MultiSites.getAll_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit__MultiSites.getOne_day.xml b/tests/PHPUnit/System/expected/test_noVisit__MultiSites.getOne_day.xml
index 2c523aeb3e..2c523aeb3e 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit__MultiSites.getOne_day.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit__MultiSites.getOne_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit__Provider.getProvider_day.xml b/tests/PHPUnit/System/expected/test_noVisit__Provider.getProvider_day.xml
index c234bed59e..c234bed59e 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit__Provider.getProvider_day.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit__Provider.getProvider_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit__Referrers.getAll_day.xml b/tests/PHPUnit/System/expected/test_noVisit__Referrers.getAll_day.xml
index c234bed59e..c234bed59e 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit__Referrers.getAll_day.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit__Referrers.getAll_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit__Referrers.getCampaigns_day.xml b/tests/PHPUnit/System/expected/test_noVisit__Referrers.getCampaigns_day.xml
index c234bed59e..c234bed59e 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit__Referrers.getCampaigns_day.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit__Referrers.getCampaigns_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit__Referrers.getKeywordsForPageUrl_day.xml b/tests/PHPUnit/System/expected/test_noVisit__Referrers.getKeywordsForPageUrl_day.xml
index c234bed59e..c234bed59e 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit__Referrers.getKeywordsForPageUrl_day.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit__Referrers.getKeywordsForPageUrl_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit__Referrers.getKeywords_day.xml b/tests/PHPUnit/System/expected/test_noVisit__Referrers.getKeywords_day.xml
index c234bed59e..c234bed59e 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit__Referrers.getKeywords_day.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit__Referrers.getKeywords_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit__Referrers.getNumberOfDistinctCampaigns_day.xml b/tests/PHPUnit/System/expected/test_noVisit__Referrers.getNumberOfDistinctCampaigns_day.xml
index f5722c2b94..f5722c2b94 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit__Referrers.getNumberOfDistinctCampaigns_day.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit__Referrers.getNumberOfDistinctCampaigns_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit__Referrers.getNumberOfDistinctKeywords_day.xml b/tests/PHPUnit/System/expected/test_noVisit__Referrers.getNumberOfDistinctKeywords_day.xml
index f5722c2b94..f5722c2b94 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit__Referrers.getNumberOfDistinctKeywords_day.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit__Referrers.getNumberOfDistinctKeywords_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit__Referrers.getNumberOfDistinctSearchEngines_day.xml b/tests/PHPUnit/System/expected/test_noVisit__Referrers.getNumberOfDistinctSearchEngines_day.xml
index f5722c2b94..f5722c2b94 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit__Referrers.getNumberOfDistinctSearchEngines_day.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit__Referrers.getNumberOfDistinctSearchEngines_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit__Referrers.getNumberOfDistinctWebsitesUrls_day.xml b/tests/PHPUnit/System/expected/test_noVisit__Referrers.getNumberOfDistinctWebsitesUrls_day.xml
index f5722c2b94..f5722c2b94 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit__Referrers.getNumberOfDistinctWebsitesUrls_day.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit__Referrers.getNumberOfDistinctWebsitesUrls_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit__Referrers.getNumberOfDistinctWebsites_day.xml b/tests/PHPUnit/System/expected/test_noVisit__Referrers.getNumberOfDistinctWebsites_day.xml
index f5722c2b94..f5722c2b94 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit__Referrers.getNumberOfDistinctWebsites_day.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit__Referrers.getNumberOfDistinctWebsites_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit__Referrers.getReferrerType_day.xml b/tests/PHPUnit/System/expected/test_noVisit__Referrers.getReferrerType_day.xml
index c234bed59e..c234bed59e 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit__Referrers.getReferrerType_day.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit__Referrers.getReferrerType_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit__Referrers.getSearchEngines_day.xml b/tests/PHPUnit/System/expected/test_noVisit__Referrers.getSearchEngines_day.xml
index c234bed59e..c234bed59e 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit__Referrers.getSearchEngines_day.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit__Referrers.getSearchEngines_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit__Referrers.getSocials_day.xml b/tests/PHPUnit/System/expected/test_noVisit__Referrers.getSocials_day.xml
index c234bed59e..c234bed59e 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit__Referrers.getSocials_day.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit__Referrers.getSocials_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit__Referrers.getUrlsForSocial_day.xml b/tests/PHPUnit/System/expected/test_noVisit__Referrers.getUrlsForSocial_day.xml
index c234bed59e..c234bed59e 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit__Referrers.getUrlsForSocial_day.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit__Referrers.getUrlsForSocial_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit__Referrers.getWebsites_day.xml b/tests/PHPUnit/System/expected/test_noVisit__Referrers.getWebsites_day.xml
index c234bed59e..c234bed59e 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit__Referrers.getWebsites_day.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit__Referrers.getWebsites_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit__UserCountry.getCity_day.xml b/tests/PHPUnit/System/expected/test_noVisit__UserCountry.getCity_day.xml
index c234bed59e..c234bed59e 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit__UserCountry.getCity_day.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit__UserCountry.getCity_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit__UserCountry.getContinent_day.xml b/tests/PHPUnit/System/expected/test_noVisit__UserCountry.getContinent_day.xml
index c234bed59e..c234bed59e 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit__UserCountry.getContinent_day.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit__UserCountry.getContinent_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit__UserCountry.getCountry_day.xml b/tests/PHPUnit/System/expected/test_noVisit__UserCountry.getCountry_day.xml
index c234bed59e..c234bed59e 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit__UserCountry.getCountry_day.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit__UserCountry.getCountry_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit__UserCountry.getNumberOfDistinctCountries_day.xml b/tests/PHPUnit/System/expected/test_noVisit__UserCountry.getNumberOfDistinctCountries_day.xml
index f5722c2b94..f5722c2b94 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit__UserCountry.getNumberOfDistinctCountries_day.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit__UserCountry.getNumberOfDistinctCountries_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit__UserCountry.getRegion_day.xml b/tests/PHPUnit/System/expected/test_noVisit__UserCountry.getRegion_day.xml
index c234bed59e..c234bed59e 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit__UserCountry.getRegion_day.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit__UserCountry.getRegion_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit__UserSettings.getBrowserType_day.xml b/tests/PHPUnit/System/expected/test_noVisit__UserSettings.getBrowserType_day.xml
index c234bed59e..c234bed59e 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit__UserSettings.getBrowserType_day.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit__UserSettings.getBrowserType_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit__UserSettings.getBrowserVersion_day.xml b/tests/PHPUnit/System/expected/test_noVisit__UserSettings.getBrowserVersion_day.xml
index c234bed59e..c234bed59e 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit__UserSettings.getBrowserVersion_day.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit__UserSettings.getBrowserVersion_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit__UserSettings.getBrowser_day.xml b/tests/PHPUnit/System/expected/test_noVisit__UserSettings.getBrowser_day.xml
index c234bed59e..c234bed59e 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit__UserSettings.getBrowser_day.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit__UserSettings.getBrowser_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit__UserSettings.getConfiguration_day.xml b/tests/PHPUnit/System/expected/test_noVisit__UserSettings.getConfiguration_day.xml
index c234bed59e..c234bed59e 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit__UserSettings.getConfiguration_day.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit__UserSettings.getConfiguration_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit__UserSettings.getLanguageCode_day.xml b/tests/PHPUnit/System/expected/test_noVisit__UserSettings.getLanguageCode_day.xml
index c234bed59e..c234bed59e 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit__UserSettings.getLanguageCode_day.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit__UserSettings.getLanguageCode_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit__UserSettings.getLanguage_day.xml b/tests/PHPUnit/System/expected/test_noVisit__UserSettings.getLanguage_day.xml
index c234bed59e..c234bed59e 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit__UserSettings.getLanguage_day.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit__UserSettings.getLanguage_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit__UserSettings.getMobileVsDesktop_day.xml b/tests/PHPUnit/System/expected/test_noVisit__UserSettings.getMobileVsDesktop_day.xml
index c234bed59e..c234bed59e 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit__UserSettings.getMobileVsDesktop_day.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit__UserSettings.getMobileVsDesktop_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit__UserSettings.getOSFamily_day.xml b/tests/PHPUnit/System/expected/test_noVisit__UserSettings.getOSFamily_day.xml
index c234bed59e..c234bed59e 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit__UserSettings.getOSFamily_day.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit__UserSettings.getOSFamily_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit__UserSettings.getOS_day.xml b/tests/PHPUnit/System/expected/test_noVisit__UserSettings.getOS_day.xml
index c234bed59e..c234bed59e 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit__UserSettings.getOS_day.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit__UserSettings.getOS_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit__UserSettings.getPlugin_day.xml b/tests/PHPUnit/System/expected/test_noVisit__UserSettings.getPlugin_day.xml
index c234bed59e..c234bed59e 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit__UserSettings.getPlugin_day.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit__UserSettings.getPlugin_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit__UserSettings.getResolution_day.xml b/tests/PHPUnit/System/expected/test_noVisit__UserSettings.getResolution_day.xml
index c234bed59e..c234bed59e 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit__UserSettings.getResolution_day.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit__UserSettings.getResolution_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit__UserSettings.getWideScreen_day.xml b/tests/PHPUnit/System/expected/test_noVisit__UserSettings.getWideScreen_day.xml
index c234bed59e..c234bed59e 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit__UserSettings.getWideScreen_day.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit__UserSettings.getWideScreen_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit__VisitFrequency.get_day.xml b/tests/PHPUnit/System/expected/test_noVisit__VisitFrequency.get_day.xml
index c415099916..c415099916 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit__VisitFrequency.get_day.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit__VisitFrequency.get_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit__VisitTime.getByDayOfWeek_day.xml b/tests/PHPUnit/System/expected/test_noVisit__VisitTime.getByDayOfWeek_day.xml
index c234bed59e..c234bed59e 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit__VisitTime.getByDayOfWeek_day.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit__VisitTime.getByDayOfWeek_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit__VisitTime.getVisitInformationPerLocalTime_day.xml b/tests/PHPUnit/System/expected/test_noVisit__VisitTime.getVisitInformationPerLocalTime_day.xml
index c234bed59e..c234bed59e 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit__VisitTime.getVisitInformationPerLocalTime_day.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit__VisitTime.getVisitInformationPerLocalTime_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit__VisitTime.getVisitInformationPerServerTime_day.xml b/tests/PHPUnit/System/expected/test_noVisit__VisitTime.getVisitInformationPerServerTime_day.xml
index c234bed59e..c234bed59e 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit__VisitTime.getVisitInformationPerServerTime_day.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit__VisitTime.getVisitInformationPerServerTime_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit__VisitorInterest.getNumberOfVisitsByDaysSinceLast_day.xml b/tests/PHPUnit/System/expected/test_noVisit__VisitorInterest.getNumberOfVisitsByDaysSinceLast_day.xml
index c234bed59e..c234bed59e 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit__VisitorInterest.getNumberOfVisitsByDaysSinceLast_day.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit__VisitorInterest.getNumberOfVisitsByDaysSinceLast_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit__VisitorInterest.getNumberOfVisitsByVisitCount_day.xml b/tests/PHPUnit/System/expected/test_noVisit__VisitorInterest.getNumberOfVisitsByVisitCount_day.xml
index c234bed59e..c234bed59e 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit__VisitorInterest.getNumberOfVisitsByVisitCount_day.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit__VisitorInterest.getNumberOfVisitsByVisitCount_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit__VisitorInterest.getNumberOfVisitsPerPage_day.xml b/tests/PHPUnit/System/expected/test_noVisit__VisitorInterest.getNumberOfVisitsPerPage_day.xml
index c234bed59e..c234bed59e 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit__VisitorInterest.getNumberOfVisitsPerPage_day.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit__VisitorInterest.getNumberOfVisitsPerPage_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit__VisitorInterest.getNumberOfVisitsPerVisitDuration_day.xml b/tests/PHPUnit/System/expected/test_noVisit__VisitorInterest.getNumberOfVisitsPerVisitDuration_day.xml
index c234bed59e..c234bed59e 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit__VisitorInterest.getNumberOfVisitsPerVisitDuration_day.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit__VisitorInterest.getNumberOfVisitsPerVisitDuration_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit__VisitsSummary.getActions_day.xml b/tests/PHPUnit/System/expected/test_noVisit__VisitsSummary.getActions_day.xml
index f5722c2b94..f5722c2b94 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit__VisitsSummary.getActions_day.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit__VisitsSummary.getActions_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit__VisitsSummary.getBounceCount_day.xml b/tests/PHPUnit/System/expected/test_noVisit__VisitsSummary.getBounceCount_day.xml
index f5722c2b94..f5722c2b94 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit__VisitsSummary.getBounceCount_day.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit__VisitsSummary.getBounceCount_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit__VisitsSummary.getMaxActions_day.xml b/tests/PHPUnit/System/expected/test_noVisit__VisitsSummary.getMaxActions_day.xml
index f5722c2b94..f5722c2b94 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit__VisitsSummary.getMaxActions_day.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit__VisitsSummary.getMaxActions_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit__VisitsSummary.getSumVisitsLengthPretty_day.xml b/tests/PHPUnit/System/expected/test_noVisit__VisitsSummary.getSumVisitsLengthPretty_day.xml
index 6b13a17caa..6b13a17caa 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit__VisitsSummary.getSumVisitsLengthPretty_day.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit__VisitsSummary.getSumVisitsLengthPretty_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit__VisitsSummary.getSumVisitsLength_day.xml b/tests/PHPUnit/System/expected/test_noVisit__VisitsSummary.getSumVisitsLength_day.xml
index f5722c2b94..f5722c2b94 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit__VisitsSummary.getSumVisitsLength_day.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit__VisitsSummary.getSumVisitsLength_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit__VisitsSummary.getUniqueVisitors_day.xml b/tests/PHPUnit/System/expected/test_noVisit__VisitsSummary.getUniqueVisitors_day.xml
index f5722c2b94..f5722c2b94 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit__VisitsSummary.getUniqueVisitors_day.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit__VisitsSummary.getUniqueVisitors_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit__VisitsSummary.getUsers_day.xml b/tests/PHPUnit/System/expected/test_noVisit__VisitsSummary.getUsers_day.xml
index f5722c2b94..f5722c2b94 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit__VisitsSummary.getUsers_day.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit__VisitsSummary.getUsers_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit__VisitsSummary.getVisitsConverted_day.xml b/tests/PHPUnit/System/expected/test_noVisit__VisitsSummary.getVisitsConverted_day.xml
index f5722c2b94..f5722c2b94 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit__VisitsSummary.getVisitsConverted_day.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit__VisitsSummary.getVisitsConverted_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit__VisitsSummary.getVisits_day.xml b/tests/PHPUnit/System/expected/test_noVisit__VisitsSummary.getVisits_day.xml
index f5722c2b94..f5722c2b94 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit__VisitsSummary.getVisits_day.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit__VisitsSummary.getVisits_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit__VisitsSummary.get_day.xml b/tests/PHPUnit/System/expected/test_noVisit__VisitsSummary.get_day.xml
index 32b66284be..32b66284be 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit__VisitsSummary.get_day.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit__VisitsSummary.get_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_oneVisitor_oneWebsite_severalDays_DateRange_IndexedByDate__MultiSites.getAll_day.xml b/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange_IndexedByDate__MultiSites.getAll_day.xml
index 75e0ce7728..75e0ce7728 100644
--- a/tests/PHPUnit/Integration/expected/test_oneVisitor_oneWebsite_severalDays_DateRange_IndexedByDate__MultiSites.getAll_day.xml
+++ b/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange_IndexedByDate__MultiSites.getAll_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_oneVisitor_oneWebsite_severalDays_DateRange_IndexedByDate__Referrers.getSocials_day.xml b/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange_IndexedByDate__Referrers.getSocials_day.xml
index 1ffd258f3c..1ffd258f3c 100644
--- a/tests/PHPUnit/Integration/expected/test_oneVisitor_oneWebsite_severalDays_DateRange_IndexedByDate__Referrers.getSocials_day.xml
+++ b/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange_IndexedByDate__Referrers.getSocials_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_oneVisitor_oneWebsite_severalDays_DateRange_MultipleDatesNotSupported__MultiSites.getAll_day.xml b/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange_MultipleDatesNotSupported__MultiSites.getAll_day.xml
index 2fb69ad710..2fb69ad710 100644
--- a/tests/PHPUnit/Integration/expected/test_oneVisitor_oneWebsite_severalDays_DateRange_MultipleDatesNotSupported__MultiSites.getAll_day.xml
+++ b/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange_MultipleDatesNotSupported__MultiSites.getAll_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__Actions.getPageUrls_range.xml b/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__Actions.getPageUrls_range.xml
index fdcb7efcf3..fdcb7efcf3 100644
--- a/tests/PHPUnit/Integration/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__Actions.getPageUrls_range.xml
+++ b/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__Actions.getPageUrls_range.xml
diff --git a/tests/PHPUnit/Integration/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__MultiSites.getAll_range.xml b/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__MultiSites.getAll_range.xml
index 5e03453232..5e03453232 100644
--- a/tests/PHPUnit/Integration/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__MultiSites.getAll_range.xml
+++ b/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__MultiSites.getAll_range.xml
diff --git a/tests/PHPUnit/Integration/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__MultiSites.getOne_range.xml b/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__MultiSites.getOne_range.xml
index 148c3cd10d..148c3cd10d 100644
--- a/tests/PHPUnit/Integration/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__MultiSites.getOne_range.xml
+++ b/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__MultiSites.getOne_range.xml
diff --git a/tests/PHPUnit/Integration/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__Referrers.getSocials_range.xml b/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__Referrers.getSocials_range.xml
index ec49edb3fd..ec49edb3fd 100644
--- a/tests/PHPUnit/Integration/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__Referrers.getSocials_range.xml
+++ b/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__Referrers.getSocials_range.xml
diff --git a/tests/PHPUnit/Integration/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__Referrers.getUrlsForSocial_range.xml b/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__Referrers.getUrlsForSocial_range.xml
index 2b521b00a4..2b521b00a4 100644
--- a/tests/PHPUnit/Integration/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__Referrers.getUrlsForSocial_range.xml
+++ b/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__Referrers.getUrlsForSocial_range.xml
diff --git a/tests/PHPUnit/Integration/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__UserCountry.getCountry_range.xml b/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__UserCountry.getCountry_range.xml
index 7cbd671101..7cbd671101 100644
--- a/tests/PHPUnit/Integration/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__UserCountry.getCountry_range.xml
+++ b/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__UserCountry.getCountry_range.xml
diff --git a/tests/PHPUnit/Integration/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__UserSettings.getResolution_range.xml b/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__UserSettings.getResolution_range.xml
index bef1e186ef..bef1e186ef 100644
--- a/tests/PHPUnit/Integration/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__UserSettings.getResolution_range.xml
+++ b/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__UserSettings.getResolution_range.xml
diff --git a/tests/PHPUnit/Integration/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__VisitFrequency.get_range.xml b/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__VisitFrequency.get_range.xml
index d7c74b8645..d7c74b8645 100644
--- a/tests/PHPUnit/Integration/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__VisitFrequency.get_range.xml
+++ b/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__VisitFrequency.get_range.xml
diff --git a/tests/PHPUnit/Integration/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__VisitTime.getVisitInformationPerServerTime_range.xml b/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__VisitTime.getVisitInformationPerServerTime_range.xml
index b054303185..b054303185 100644
--- a/tests/PHPUnit/Integration/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__VisitTime.getVisitInformationPerServerTime_range.xml
+++ b/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__VisitTime.getVisitInformationPerServerTime_range.xml
diff --git a/tests/PHPUnit/Integration/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__VisitsSummary.get_range.xml b/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__VisitsSummary.get_range.xml
index 29d972ff8a..29d972ff8a 100644
--- a/tests/PHPUnit/Integration/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__VisitsSummary.get_range.xml
+++ b/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__VisitsSummary.get_range.xml
diff --git a/tests/PHPUnit/Integration/expected/test_oneVisitor_oneWebsite_severalDays_DateRange_noIdSubtable__Referrers.getUrlsForSocial_range.xml b/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange_noIdSubtable__Referrers.getUrlsForSocial_range.xml
index 4649b78a18..4649b78a18 100644
--- a/tests/PHPUnit/Integration/expected/test_oneVisitor_oneWebsite_severalDays_DateRange_noIdSubtable__Referrers.getUrlsForSocial_range.xml
+++ b/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange_noIdSubtable__Referrers.getUrlsForSocial_range.xml
diff --git a/tests/PHPUnit/Integration/expected/test_oneVisitor_oneWebsite_severalDays_DateRange_periodIsRange_expanded___Actions.getPageUrls_range.xml b/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange_periodIsRange_expanded___Actions.getPageUrls_range.xml
index f5ed922233..f5ed922233 100644
--- a/tests/PHPUnit/Integration/expected/test_oneVisitor_oneWebsite_severalDays_DateRange_periodIsRange_expanded___Actions.getPageUrls_range.xml
+++ b/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange_periodIsRange_expanded___Actions.getPageUrls_range.xml
diff --git a/tests/PHPUnit/Integration/expected/test_oneVisitor_oneWebsite_severalDays_DateRange_periodIsRange_flattened___Actions.getPageUrls_range.xml b/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange_periodIsRange_flattened___Actions.getPageUrls_range.xml
index 1f11de6d95..1f11de6d95 100644
--- a/tests/PHPUnit/Integration/expected/test_oneVisitor_oneWebsite_severalDays_DateRange_periodIsRange_flattened___Actions.getPageUrls_range.xml
+++ b/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange_periodIsRange_flattened___Actions.getPageUrls_range.xml
diff --git a/tests/PHPUnit/Integration/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__API.getProcessedReport_range.xml b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__API.getProcessedReport_range.xml
index 9efeb67c66..9efeb67c66 100644
--- a/tests/PHPUnit/Integration/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__API.getProcessedReport_range.xml
+++ b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__API.getProcessedReport_range.xml
diff --git a/tests/PHPUnit/Integration/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Actions.getPageUrls_range.xml b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Actions.getPageUrls_range.xml
index 7bc6d955d2..7bc6d955d2 100644
--- a/tests/PHPUnit/Integration/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Actions.getPageUrls_range.xml
+++ b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Actions.getPageUrls_range.xml
diff --git a/tests/PHPUnit/Integration/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__CustomVariables.getCustomVariables_range.xml b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__CustomVariables.getCustomVariables_range.xml
index 1639c238a3..1639c238a3 100644
--- a/tests/PHPUnit/Integration/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__CustomVariables.getCustomVariables_range.xml
+++ b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__CustomVariables.getCustomVariables_range.xml
diff --git a/tests/PHPUnit/Integration/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Goals.get_range.xml b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Goals.get_range.xml
index cf9900ec47..cf9900ec47 100644
--- a/tests/PHPUnit/Integration/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Goals.get_range.xml
+++ b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Goals.get_range.xml
diff --git a/tests/PHPUnit/Integration/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getCounters.xml b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getCounters.xml
index ba6489a54c..ba6489a54c 100644
--- a/tests/PHPUnit/Integration/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getCounters.xml
+++ b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getCounters.xml
diff --git a/tests/PHPUnit/Integration/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisitsDetails_range.xml b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisitsDetails_range.xml
index 8112427124..8112427124 100644
--- a/tests/PHPUnit/Integration/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisitsDetails_range.xml
+++ b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisitsDetails_range.xml
diff --git a/tests/PHPUnit/Integration/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getMostRecentVisitorId.xml b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getMostRecentVisitorId.xml
index 943e78b64e..943e78b64e 100644
--- a/tests/PHPUnit/Integration/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getMostRecentVisitorId.xml
+++ b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getMostRecentVisitorId.xml
diff --git a/tests/PHPUnit/Integration/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getVisitorProfile.xml b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getVisitorProfile.xml
index 20546709ec..20546709ec 100644
--- a/tests/PHPUnit/Integration/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getVisitorProfile.xml
+++ b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getVisitorProfile.xml
diff --git a/tests/PHPUnit/Integration/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Referrers.getCampaigns_range.xml b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Referrers.getCampaigns_range.xml
index 4faa5d55df..4faa5d55df 100644
--- a/tests/PHPUnit/Integration/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Referrers.getCampaigns_range.xml
+++ b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Referrers.getCampaigns_range.xml
diff --git a/tests/PHPUnit/Integration/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Referrers.getKeywords_range.xml b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Referrers.getKeywords_range.xml
index bd1f763bd0..bd1f763bd0 100644
--- a/tests/PHPUnit/Integration/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Referrers.getKeywords_range.xml
+++ b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Referrers.getKeywords_range.xml
diff --git a/tests/PHPUnit/Integration/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__VisitsSummary.get_range.xml b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__VisitsSummary.get_range.xml
index 4a5151e912..4a5151e912 100644
--- a/tests/PHPUnit/Integration/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__VisitsSummary.get_range.xml
+++ b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__VisitsSummary.get_range.xml
diff --git a/tests/PHPUnit/Integration/expected/test_reportLimiting__Actions.getDownloads_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting__Actions.getDownloads_day.xml
index ee5d1985fc..ee5d1985fc 100644
--- a/tests/PHPUnit/Integration/expected/test_reportLimiting__Actions.getDownloads_day.xml
+++ b/tests/PHPUnit/System/expected/test_reportLimiting__Actions.getDownloads_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_reportLimiting__Actions.getOutlinks_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting__Actions.getOutlinks_day.xml
index 1181f0a0c3..1181f0a0c3 100644
--- a/tests/PHPUnit/Integration/expected/test_reportLimiting__Actions.getOutlinks_day.xml
+++ b/tests/PHPUnit/System/expected/test_reportLimiting__Actions.getOutlinks_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_reportLimiting__Actions.getPageTitles_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting__Actions.getPageTitles_day.xml
index 75278b578c..75278b578c 100644
--- a/tests/PHPUnit/Integration/expected/test_reportLimiting__Actions.getPageTitles_day.xml
+++ b/tests/PHPUnit/System/expected/test_reportLimiting__Actions.getPageTitles_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_reportLimiting__Actions.getPageUrls_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting__Actions.getPageUrls_day.xml
index db723f1f22..db723f1f22 100644
--- a/tests/PHPUnit/Integration/expected/test_reportLimiting__Actions.getPageUrls_day.xml
+++ b/tests/PHPUnit/System/expected/test_reportLimiting__Actions.getPageUrls_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_reportLimiting__CustomVariables.getCustomVariables_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting__CustomVariables.getCustomVariables_day.xml
index 994f62a320..994f62a320 100644
--- a/tests/PHPUnit/Integration/expected/test_reportLimiting__CustomVariables.getCustomVariables_day.xml
+++ b/tests/PHPUnit/System/expected/test_reportLimiting__CustomVariables.getCustomVariables_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_reportLimiting__Goals.getItemsCategory_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting__Goals.getItemsCategory_day.xml
index a8d3e17e53..a8d3e17e53 100644
--- a/tests/PHPUnit/Integration/expected/test_reportLimiting__Goals.getItemsCategory_day.xml
+++ b/tests/PHPUnit/System/expected/test_reportLimiting__Goals.getItemsCategory_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_reportLimiting__Goals.getItemsName_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting__Goals.getItemsName_day.xml
index 95cb364b56..95cb364b56 100644
--- a/tests/PHPUnit/Integration/expected/test_reportLimiting__Goals.getItemsName_day.xml
+++ b/tests/PHPUnit/System/expected/test_reportLimiting__Goals.getItemsName_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_reportLimiting__Goals.getItemsSku_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting__Goals.getItemsSku_day.xml
index c234bed59e..c234bed59e 100644
--- a/tests/PHPUnit/Integration/expected/test_reportLimiting__Goals.getItemsSku_day.xml
+++ b/tests/PHPUnit/System/expected/test_reportLimiting__Goals.getItemsSku_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_reportLimiting__Referrers.getAll_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting__Referrers.getAll_day.xml
index 8202c35460..8202c35460 100644
--- a/tests/PHPUnit/Integration/expected/test_reportLimiting__Referrers.getAll_day.xml
+++ b/tests/PHPUnit/System/expected/test_reportLimiting__Referrers.getAll_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_reportLimiting__Referrers.getKeywords_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting__Referrers.getKeywords_day.xml
index dd1f7037e6..dd1f7037e6 100644
--- a/tests/PHPUnit/Integration/expected/test_reportLimiting__Referrers.getKeywords_day.xml
+++ b/tests/PHPUnit/System/expected/test_reportLimiting__Referrers.getKeywords_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_reportLimiting__Referrers.getReferrerType_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting__Referrers.getReferrerType_day.xml
index 6b8c754c71..6b8c754c71 100644
--- a/tests/PHPUnit/Integration/expected/test_reportLimiting__Referrers.getReferrerType_day.xml
+++ b/tests/PHPUnit/System/expected/test_reportLimiting__Referrers.getReferrerType_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_reportLimiting__Referrers.getSearchEngines_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting__Referrers.getSearchEngines_day.xml
index cfcc0601a9..cfcc0601a9 100644
--- a/tests/PHPUnit/Integration/expected/test_reportLimiting__Referrers.getSearchEngines_day.xml
+++ b/tests/PHPUnit/System/expected/test_reportLimiting__Referrers.getSearchEngines_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_reportLimiting__Referrers.getWebsites_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting__Referrers.getWebsites_day.xml
index 6b473345a8..6b473345a8 100644
--- a/tests/PHPUnit/Integration/expected/test_reportLimiting__Referrers.getWebsites_day.xml
+++ b/tests/PHPUnit/System/expected/test_reportLimiting__Referrers.getWebsites_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_reportLimiting__UserCountry.getCity_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting__UserCountry.getCity_day.xml
index c9eb98ffda..c9eb98ffda 100644
--- a/tests/PHPUnit/Integration/expected/test_reportLimiting__UserCountry.getCity_day.xml
+++ b/tests/PHPUnit/System/expected/test_reportLimiting__UserCountry.getCity_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_reportLimiting__UserCountry.getRegion_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting__UserCountry.getRegion_day.xml
index 50888ce069..50888ce069 100644
--- a/tests/PHPUnit/Integration/expected/test_reportLimiting__UserCountry.getRegion_day.xml
+++ b/tests/PHPUnit/System/expected/test_reportLimiting__UserCountry.getRegion_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_reportLimiting__UserSettings.getBrowserVersion_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting__UserSettings.getBrowserVersion_day.xml
index 72dab998db..72dab998db 100644
--- a/tests/PHPUnit/Integration/expected/test_reportLimiting__UserSettings.getBrowserVersion_day.xml
+++ b/tests/PHPUnit/System/expected/test_reportLimiting__UserSettings.getBrowserVersion_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_reportLimiting__UserSettings.getConfiguration_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting__UserSettings.getConfiguration_day.xml
index 9f4d67971d..9f4d67971d 100644
--- a/tests/PHPUnit/Integration/expected/test_reportLimiting__UserSettings.getConfiguration_day.xml
+++ b/tests/PHPUnit/System/expected/test_reportLimiting__UserSettings.getConfiguration_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_reportLimiting__UserSettings.getOS_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting__UserSettings.getOS_day.xml
index 803dcc4819..803dcc4819 100644
--- a/tests/PHPUnit/Integration/expected/test_reportLimiting__UserSettings.getOS_day.xml
+++ b/tests/PHPUnit/System/expected/test_reportLimiting__UserSettings.getOS_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_reportLimiting__UserSettings.getResolution_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting__UserSettings.getResolution_day.xml
index 7b29bb6e65..7b29bb6e65 100644
--- a/tests/PHPUnit/Integration/expected/test_reportLimiting__UserSettings.getResolution_day.xml
+++ b/tests/PHPUnit/System/expected/test_reportLimiting__UserSettings.getResolution_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_reportLimiting_rangeFlat_rankingQueryDisabled__Actions.getDownloads_range.xml b/tests/PHPUnit/System/expected/test_reportLimiting_rangeFlat_rankingQueryDisabled__Actions.getDownloads_range.xml
index d91a3e6444..d91a3e6444 100644
--- a/tests/PHPUnit/Integration/expected/test_reportLimiting_rangeFlat_rankingQueryDisabled__Actions.getDownloads_range.xml
+++ b/tests/PHPUnit/System/expected/test_reportLimiting_rangeFlat_rankingQueryDisabled__Actions.getDownloads_range.xml
diff --git a/tests/PHPUnit/Integration/expected/test_reportLimiting_rankingQueryDisabled__Actions.getPageUrls_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQueryDisabled__Actions.getPageUrls_day.xml
index b895fdd1a4..b895fdd1a4 100644
--- a/tests/PHPUnit/Integration/expected/test_reportLimiting_rankingQueryDisabled__Actions.getPageUrls_day.xml
+++ b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQueryDisabled__Actions.getPageUrls_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_reportLimiting_rankingQueryDisabled__Provider.getProvider_month.xml b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQueryDisabled__Provider.getProvider_month.xml
index eb96e297f5..eb96e297f5 100644
--- a/tests/PHPUnit/Integration/expected/test_reportLimiting_rankingQueryDisabled__Provider.getProvider_month.xml
+++ b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQueryDisabled__Provider.getProvider_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_reportLimiting_rankingQuery__Actions.getDownloads_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__Actions.getDownloads_day.xml
index 486f5a4a80..486f5a4a80 100644
--- a/tests/PHPUnit/Integration/expected/test_reportLimiting_rankingQuery__Actions.getDownloads_day.xml
+++ b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__Actions.getDownloads_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_reportLimiting_rankingQuery__Actions.getOutlinks_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__Actions.getOutlinks_day.xml
index d7f085aa42..d7f085aa42 100644
--- a/tests/PHPUnit/Integration/expected/test_reportLimiting_rankingQuery__Actions.getOutlinks_day.xml
+++ b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__Actions.getOutlinks_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_reportLimiting_rankingQuery__Actions.getPageTitles_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__Actions.getPageTitles_day.xml
index a6451384fc..a6451384fc 100644
--- a/tests/PHPUnit/Integration/expected/test_reportLimiting_rankingQuery__Actions.getPageTitles_day.xml
+++ b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__Actions.getPageTitles_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_reportLimiting_rankingQuery__Actions.getPageUrls_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__Actions.getPageUrls_day.xml
index d50996584c..d50996584c 100644
--- a/tests/PHPUnit/Integration/expected/test_reportLimiting_rankingQuery__Actions.getPageUrls_day.xml
+++ b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__Actions.getPageUrls_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_reportLimiting_rankingQuery__CustomVariables.getCustomVariables_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__CustomVariables.getCustomVariables_day.xml
index 994f62a320..994f62a320 100644
--- a/tests/PHPUnit/Integration/expected/test_reportLimiting_rankingQuery__CustomVariables.getCustomVariables_day.xml
+++ b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__CustomVariables.getCustomVariables_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_reportLimiting_rankingQuery__Goals.getItemsCategory_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__Goals.getItemsCategory_day.xml
index a8d3e17e53..a8d3e17e53 100644
--- a/tests/PHPUnit/Integration/expected/test_reportLimiting_rankingQuery__Goals.getItemsCategory_day.xml
+++ b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__Goals.getItemsCategory_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_reportLimiting_rankingQuery__Goals.getItemsName_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__Goals.getItemsName_day.xml
index 95cb364b56..95cb364b56 100644
--- a/tests/PHPUnit/Integration/expected/test_reportLimiting_rankingQuery__Goals.getItemsName_day.xml
+++ b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__Goals.getItemsName_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_reportLimiting_rankingQuery__Goals.getItemsSku_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__Goals.getItemsSku_day.xml
index c234bed59e..c234bed59e 100644
--- a/tests/PHPUnit/Integration/expected/test_reportLimiting_rankingQuery__Goals.getItemsSku_day.xml
+++ b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__Goals.getItemsSku_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_reportLimiting_rankingQuery__Referrers.getAll_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__Referrers.getAll_day.xml
index 8202c35460..8202c35460 100644
--- a/tests/PHPUnit/Integration/expected/test_reportLimiting_rankingQuery__Referrers.getAll_day.xml
+++ b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__Referrers.getAll_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_reportLimiting_rankingQuery__Referrers.getKeywords_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__Referrers.getKeywords_day.xml
index dd1f7037e6..dd1f7037e6 100644
--- a/tests/PHPUnit/Integration/expected/test_reportLimiting_rankingQuery__Referrers.getKeywords_day.xml
+++ b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__Referrers.getKeywords_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_reportLimiting_rankingQuery__Referrers.getReferrerType_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__Referrers.getReferrerType_day.xml
index 6b8c754c71..6b8c754c71 100644
--- a/tests/PHPUnit/Integration/expected/test_reportLimiting_rankingQuery__Referrers.getReferrerType_day.xml
+++ b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__Referrers.getReferrerType_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_reportLimiting_rankingQuery__Referrers.getSearchEngines_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__Referrers.getSearchEngines_day.xml
index cfcc0601a9..cfcc0601a9 100644
--- a/tests/PHPUnit/Integration/expected/test_reportLimiting_rankingQuery__Referrers.getSearchEngines_day.xml
+++ b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__Referrers.getSearchEngines_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_reportLimiting_rankingQuery__Referrers.getWebsites_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__Referrers.getWebsites_day.xml
index 6b473345a8..6b473345a8 100644
--- a/tests/PHPUnit/Integration/expected/test_reportLimiting_rankingQuery__Referrers.getWebsites_day.xml
+++ b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__Referrers.getWebsites_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_reportLimiting_rankingQuery__UserCountry.getCity_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__UserCountry.getCity_day.xml
index c9eb98ffda..c9eb98ffda 100644
--- a/tests/PHPUnit/Integration/expected/test_reportLimiting_rankingQuery__UserCountry.getCity_day.xml
+++ b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__UserCountry.getCity_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_reportLimiting_rankingQuery__UserCountry.getRegion_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__UserCountry.getRegion_day.xml
index 50888ce069..50888ce069 100644
--- a/tests/PHPUnit/Integration/expected/test_reportLimiting_rankingQuery__UserCountry.getRegion_day.xml
+++ b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__UserCountry.getRegion_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_reportLimiting_rankingQuery__UserSettings.getBrowserVersion_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__UserSettings.getBrowserVersion_day.xml
index 72dab998db..72dab998db 100644
--- a/tests/PHPUnit/Integration/expected/test_reportLimiting_rankingQuery__UserSettings.getBrowserVersion_day.xml
+++ b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__UserSettings.getBrowserVersion_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_reportLimiting_rankingQuery__UserSettings.getConfiguration_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__UserSettings.getConfiguration_day.xml
index 9f4d67971d..9f4d67971d 100644
--- a/tests/PHPUnit/Integration/expected/test_reportLimiting_rankingQuery__UserSettings.getConfiguration_day.xml
+++ b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__UserSettings.getConfiguration_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_reportLimiting_rankingQuery__UserSettings.getOS_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__UserSettings.getOS_day.xml
index 803dcc4819..803dcc4819 100644
--- a/tests/PHPUnit/Integration/expected/test_reportLimiting_rankingQuery__UserSettings.getOS_day.xml
+++ b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__UserSettings.getOS_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_reportLimiting_rankingQuery__UserSettings.getResolution_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__UserSettings.getResolution_day.xml
index 7b29bb6e65..7b29bb6e65 100644
--- a/tests/PHPUnit/Integration/expected/test_reportLimiting_rankingQuery__UserSettings.getResolution_day.xml
+++ b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__UserSettings.getResolution_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_reportLimiting_segment_provider_rankingQueryDisabled__Provider.getProvider_month.xml b/tests/PHPUnit/System/expected/test_reportLimiting_segment_provider_rankingQueryDisabled__Provider.getProvider_month.xml
index 7993897a0a..7993897a0a 100644
--- a/tests/PHPUnit/Integration/expected/test_reportLimiting_segment_provider_rankingQueryDisabled__Provider.getProvider_month.xml
+++ b/tests/PHPUnit/System/expected/test_reportLimiting_segment_provider_rankingQueryDisabled__Provider.getProvider_month.xml
diff --git a/tests/PHPUnit/Integration/expected/test_trackGoals_allowMultipleConversionsPerVisit__VisitTime.getVisitInformationPerServerTime_day.xml b/tests/PHPUnit/System/expected/test_trackGoals_allowMultipleConversionsPerVisit__VisitTime.getVisitInformationPerServerTime_day.xml
index 55a4fa3bd0..55a4fa3bd0 100644
--- a/tests/PHPUnit/Integration/expected/test_trackGoals_allowMultipleConversionsPerVisit__VisitTime.getVisitInformationPerServerTime_day.xml
+++ b/tests/PHPUnit/System/expected/test_trackGoals_allowMultipleConversionsPerVisit__VisitTime.getVisitInformationPerServerTime_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_trackGoals_allowMultipleConversionsPerVisit__VisitsSummary.get_day.xml b/tests/PHPUnit/System/expected/test_trackGoals_allowMultipleConversionsPerVisit__VisitsSummary.get_day.xml
index 7168091d51..7168091d51 100644
--- a/tests/PHPUnit/Integration/expected/test_trackGoals_allowMultipleConversionsPerVisit__VisitsSummary.get_day.xml
+++ b/tests/PHPUnit/System/expected/test_trackGoals_allowMultipleConversionsPerVisit__VisitsSummary.get_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_SegmentPageTitleContainsStrangeCharacters__Actions.getPageTitles_day.xml b/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_SegmentPageTitleContainsStrangeCharacters__Actions.getPageTitles_day.xml
index 14874d56d6..14874d56d6 100644
--- a/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_SegmentPageTitleContainsStrangeCharacters__Actions.getPageTitles_day.xml
+++ b/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_SegmentPageTitleContainsStrangeCharacters__Actions.getPageTitles_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_SegmentPageTitleContainsStrangeCharacters__VisitsSummary.get_day.xml b/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_SegmentPageTitleContainsStrangeCharacters__VisitsSummary.get_day.xml
index 9cdfb2d5b7..9cdfb2d5b7 100644
--- a/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_SegmentPageTitleContainsStrangeCharacters__VisitsSummary.get_day.xml
+++ b/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_SegmentPageTitleContainsStrangeCharacters__VisitsSummary.get_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_SegmentPageTitleContains__Actions.getPageTitles_day.xml b/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_SegmentPageTitleContains__Actions.getPageTitles_day.xml
index 7cfe228274..7cfe228274 100644
--- a/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_SegmentPageTitleContains__Actions.getPageTitles_day.xml
+++ b/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_SegmentPageTitleContains__Actions.getPageTitles_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_SegmentPageTitleContains__Actions.getPageUrls_day.xml b/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_SegmentPageTitleContains__Actions.getPageUrls_day.xml
index c64e18155a..c64e18155a 100644
--- a/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_SegmentPageTitleContains__Actions.getPageUrls_day.xml
+++ b/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_SegmentPageTitleContains__Actions.getPageUrls_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_SegmentPageTitleContains__VisitsSummary.get_day.xml b/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_SegmentPageTitleContains__VisitsSummary.get_day.xml
index 9cdfb2d5b7..9cdfb2d5b7 100644
--- a/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_SegmentPageTitleContains__VisitsSummary.get_day.xml
+++ b/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_SegmentPageTitleContains__VisitsSummary.get_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_SegmentPageTitleExcludes__Actions.getPageTitles_day.xml b/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_SegmentPageTitleExcludes__Actions.getPageTitles_day.xml
index f4d18a6307..f4d18a6307 100644
--- a/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_SegmentPageTitleExcludes__Actions.getPageTitles_day.xml
+++ b/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_SegmentPageTitleExcludes__Actions.getPageTitles_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_SegmentPageTitleExcludes__Actions.getPageUrls_day.xml b/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_SegmentPageTitleExcludes__Actions.getPageUrls_day.xml
index 2c178c678b..2c178c678b 100644
--- a/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_SegmentPageTitleExcludes__Actions.getPageUrls_day.xml
+++ b/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_SegmentPageTitleExcludes__Actions.getPageUrls_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_SegmentPageTitleExcludes__VisitsSummary.get_day.xml b/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_SegmentPageTitleExcludes__VisitsSummary.get_day.xml
index 06b9efca77..06b9efca77 100644
--- a/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_SegmentPageTitleExcludes__VisitsSummary.get_day.xml
+++ b/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_SegmentPageTitleExcludes__VisitsSummary.get_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_SegmentPageUrlContains__Actions.getPageTitles_day.xml b/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_SegmentPageUrlContains__Actions.getPageTitles_day.xml
index 7cfe228274..7cfe228274 100644
--- a/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_SegmentPageUrlContains__Actions.getPageTitles_day.xml
+++ b/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_SegmentPageUrlContains__Actions.getPageTitles_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_SegmentPageUrlContains__Actions.getPageUrls_day.xml b/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_SegmentPageUrlContains__Actions.getPageUrls_day.xml
index c64e18155a..c64e18155a 100644
--- a/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_SegmentPageUrlContains__Actions.getPageUrls_day.xml
+++ b/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_SegmentPageUrlContains__Actions.getPageUrls_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_SegmentPageUrlContains__VisitsSummary.get_day.xml b/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_SegmentPageUrlContains__VisitsSummary.get_day.xml
index 9cdfb2d5b7..9cdfb2d5b7 100644
--- a/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_SegmentPageUrlContains__VisitsSummary.get_day.xml
+++ b/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_SegmentPageUrlContains__VisitsSummary.get_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_SegmentPageUrlExcludes__Actions.getPageTitles_day.xml b/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_SegmentPageUrlExcludes__Actions.getPageTitles_day.xml
index f4d18a6307..f4d18a6307 100644
--- a/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_SegmentPageUrlExcludes__Actions.getPageTitles_day.xml
+++ b/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_SegmentPageUrlExcludes__Actions.getPageTitles_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_SegmentPageUrlExcludes__Actions.getPageUrls_day.xml b/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_SegmentPageUrlExcludes__Actions.getPageUrls_day.xml
index 2c178c678b..2c178c678b 100644
--- a/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_SegmentPageUrlExcludes__Actions.getPageUrls_day.xml
+++ b/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_SegmentPageUrlExcludes__Actions.getPageUrls_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_SegmentPageUrlExcludes__VisitsSummary.get_day.xml b/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_SegmentPageUrlExcludes__VisitsSummary.get_day.xml
index 06b9efca77..06b9efca77 100644
--- a/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_SegmentPageUrlExcludes__VisitsSummary.get_day.xml
+++ b/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_SegmentPageUrlExcludes__VisitsSummary.get_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables__CustomVariables.getCustomVariables_day.xml b/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables__CustomVariables.getCustomVariables_day.xml
index c92fc50036..c92fc50036 100644
--- a/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables__CustomVariables.getCustomVariables_day.xml
+++ b/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables__CustomVariables.getCustomVariables_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables__CustomVariables.getCustomVariables_week.xml b/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables__CustomVariables.getCustomVariables_week.xml
index 60639711b9..60639711b9 100644
--- a/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables__CustomVariables.getCustomVariables_week.xml
+++ b/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables__CustomVariables.getCustomVariables_week.xml
diff --git a/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables__VisitsSummary.get_day.xml b/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables__VisitsSummary.get_day.xml
index ab7f9f9a18..ab7f9f9a18 100644
--- a/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables__VisitsSummary.get_day.xml
+++ b/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables__VisitsSummary.get_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables__VisitsSummary.get_week.xml b/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables__VisitsSummary.get_week.xml
index b5e37b20aa..b5e37b20aa 100644
--- a/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables__VisitsSummary.get_week.xml
+++ b/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables__VisitsSummary.get_week.xml
diff --git a/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables__subtable__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables__subtable__API.getProcessedReport_day.xml
index 104b5cfd27..104b5cfd27 100644
--- a/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables__subtable__API.getProcessedReport_day.xml
+++ b/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables__subtable__API.getProcessedReport_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_segmentMatchALL_noGoalData__CustomVariables.getCustomVariables_day.xml b/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentMatchALL_noGoalData__CustomVariables.getCustomVariables_day.xml
index 5b779b60c6..5b779b60c6 100644
--- a/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_segmentMatchALL_noGoalData__CustomVariables.getCustomVariables_day.xml
+++ b/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentMatchALL_noGoalData__CustomVariables.getCustomVariables_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_segmentMatchALL_noGoalData__CustomVariables.getCustomVariables_week.xml b/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentMatchALL_noGoalData__CustomVariables.getCustomVariables_week.xml
index 6b156a1379..6b156a1379 100644
--- a/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_segmentMatchALL_noGoalData__CustomVariables.getCustomVariables_week.xml
+++ b/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentMatchALL_noGoalData__CustomVariables.getCustomVariables_week.xml
diff --git a/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_segmentMatchALL_noGoalData__VisitsSummary.get_day.xml b/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentMatchALL_noGoalData__VisitsSummary.get_day.xml
index 283758c4ec..283758c4ec 100644
--- a/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_segmentMatchALL_noGoalData__VisitsSummary.get_day.xml
+++ b/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentMatchALL_noGoalData__VisitsSummary.get_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_segmentMatchALL_noGoalData__VisitsSummary.get_week.xml b/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentMatchALL_noGoalData__VisitsSummary.get_week.xml
index 4dab22a018..4dab22a018 100644
--- a/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_segmentMatchALL_noGoalData__VisitsSummary.get_week.xml
+++ b/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentMatchALL_noGoalData__VisitsSummary.get_week.xml
diff --git a/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_segmentMatchNONE__CustomVariables.getCustomVariables_day.xml b/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentMatchNONE__CustomVariables.getCustomVariables_day.xml
index b9dfec843f..b9dfec843f 100644
--- a/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_segmentMatchNONE__CustomVariables.getCustomVariables_day.xml
+++ b/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentMatchNONE__CustomVariables.getCustomVariables_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_segmentMatchNONE__CustomVariables.getCustomVariables_week.xml b/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentMatchNONE__CustomVariables.getCustomVariables_week.xml
index 0023e2ea8f..0023e2ea8f 100644
--- a/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_segmentMatchNONE__CustomVariables.getCustomVariables_week.xml
+++ b/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentMatchNONE__CustomVariables.getCustomVariables_week.xml
diff --git a/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_segmentMatchNONE__VisitsSummary.get_day.xml b/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentMatchNONE__VisitsSummary.get_day.xml
index b9dfec843f..b9dfec843f 100644
--- a/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_segmentMatchNONE__VisitsSummary.get_day.xml
+++ b/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentMatchNONE__VisitsSummary.get_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_segmentMatchNONE__VisitsSummary.get_week.xml b/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentMatchNONE__VisitsSummary.get_week.xml
index 0023e2ea8f..0023e2ea8f 100644
--- a/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_segmentMatchNONE__VisitsSummary.get_week.xml
+++ b/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentMatchNONE__VisitsSummary.get_week.xml
diff --git a/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_segmentMatchVisitorType__CustomVariables.getCustomVariables_day.xml b/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentMatchVisitorType__CustomVariables.getCustomVariables_day.xml
index 4a549e2004..4a549e2004 100644
--- a/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_segmentMatchVisitorType__CustomVariables.getCustomVariables_day.xml
+++ b/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentMatchVisitorType__CustomVariables.getCustomVariables_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_segmentMatchVisitorType__CustomVariables.getCustomVariables_week.xml b/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentMatchVisitorType__CustomVariables.getCustomVariables_week.xml
index 28956c8523..28956c8523 100644
--- a/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_segmentMatchVisitorType__CustomVariables.getCustomVariables_week.xml
+++ b/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentMatchVisitorType__CustomVariables.getCustomVariables_week.xml
diff --git a/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_segmentMatchVisitorType__Referrers.getKeywords_day.xml b/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentMatchVisitorType__Referrers.getKeywords_day.xml
index 5f34b6f1bb..5f34b6f1bb 100644
--- a/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_segmentMatchVisitorType__Referrers.getKeywords_day.xml
+++ b/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentMatchVisitorType__Referrers.getKeywords_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_segmentMatchVisitorType__Referrers.getKeywords_week.xml b/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentMatchVisitorType__Referrers.getKeywords_week.xml
index 94f2fa7c83..94f2fa7c83 100644
--- a/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_segmentMatchVisitorType__Referrers.getKeywords_week.xml
+++ b/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentMatchVisitorType__Referrers.getKeywords_week.xml
diff --git a/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_segmentMatchVisitorType__VisitsSummary.get_day.xml b/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentMatchVisitorType__VisitsSummary.get_day.xml
index de4eac0560..de4eac0560 100644
--- a/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_segmentMatchVisitorType__VisitsSummary.get_day.xml
+++ b/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentMatchVisitorType__VisitsSummary.get_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_segmentMatchVisitorType__VisitsSummary.get_week.xml b/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentMatchVisitorType__VisitsSummary.get_week.xml
index b23508240f..b23508240f 100644
--- a/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_segmentMatchVisitorType__VisitsSummary.get_week.xml
+++ b/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentMatchVisitorType__VisitsSummary.get_week.xml
diff --git a/tests/PHPUnit/SystemTestCase.php b/tests/PHPUnit/SystemTestCase.php
index c554552f19..90e7da4725 100755
--- a/tests/PHPUnit/SystemTestCase.php
+++ b/tests/PHPUnit/SystemTestCase.php
@@ -162,7 +162,7 @@ abstract class SystemTestCase extends PHPUnit_Framework_TestCase
 
         if (Fixture::canImagesBeIncludedInScheduledReports()) {
             // PDF Scheduled Report
-            // tests/PHPUnit/Integration/processed/test_ecommerceOrderWithItems_scheduled_report_in_pdf_tables_only__ScheduledReports.generateReport_week.original.pdf
+            // tests/PHPUnit/System/processed/test_ecommerceOrderWithItems_scheduled_report_in_pdf_tables_only__ScheduledReports.generateReport_week.original.pdf
             array_push(
                 $apiCalls,
                 array(
@@ -489,7 +489,7 @@ abstract class SystemTestCase extends PHPUnit_Framework_TestCase
      */
     public static function getPathToTestDirectory()
     {
-        return dirname(__FILE__) . DIRECTORY_SEPARATOR . 'Integration';
+        return dirname(__FILE__) . DIRECTORY_SEPARATOR . 'System';
     }
 
     /**
diff --git a/tests/PHPUnit/TestingEnvironment.php b/tests/PHPUnit/TestingEnvironment.php
index ba15855f61..3e2d0ec4c7 100644
--- a/tests/PHPUnit/TestingEnvironment.php
+++ b/tests/PHPUnit/TestingEnvironment.php
@@ -232,9 +232,9 @@ class Piwik_TestingEnvironment
             $outputContent = str_replace("=3D", "=", $outputContent);
 
             $outputContents = array(
-                'from' => $mail->getFrom(),
-                'to' => $mail->getRecipients(),
-                'subject' => $mail->getSubject(),
+                'from'     => $mail->getFrom(),
+                'to'       => $mail->getRecipients(),
+                'subject'  => $mail->getSubject(),
                 'contents' => $outputContent
             );
 
diff --git a/tests/PHPUnit/Core/API/ApiRendererTest.php b/tests/PHPUnit/Unit/API/ApiRendererTest.php
index ebe1952a90..ebe1952a90 100644
--- a/tests/PHPUnit/Core/API/ApiRendererTest.php
+++ b/tests/PHPUnit/Unit/API/ApiRendererTest.php
diff --git a/tests/PHPUnit/Core/API/ResponseBuilderTest.php b/tests/PHPUnit/Unit/API/ResponseBuilderTest.php
index 9d6d0bc779..9d6d0bc779 100644
--- a/tests/PHPUnit/Core/API/ResponseBuilderTest.php
+++ b/tests/PHPUnit/Unit/API/ResponseBuilderTest.php
diff --git a/tests/PHPUnit/Core/AssetManager/PluginManagerMock.php b/tests/PHPUnit/Unit/AssetManager/PluginManagerMock.php
index 2dd91867f2..2dd91867f2 100644
--- a/tests/PHPUnit/Core/AssetManager/PluginManagerMock.php
+++ b/tests/PHPUnit/Unit/AssetManager/PluginManagerMock.php
diff --git a/tests/PHPUnit/Core/AssetManager/PluginMock.php b/tests/PHPUnit/Unit/AssetManager/PluginMock.php
index 6b6e8919ab..6b6e8919ab 100644
--- a/tests/PHPUnit/Core/AssetManager/PluginMock.php
+++ b/tests/PHPUnit/Unit/AssetManager/PluginMock.php
diff --git a/tests/PHPUnit/Core/AssetManager/ThemeMock.php b/tests/PHPUnit/Unit/AssetManager/ThemeMock.php
index 213a14d737..213a14d737 100644
--- a/tests/PHPUnit/Core/AssetManager/ThemeMock.php
+++ b/tests/PHPUnit/Unit/AssetManager/ThemeMock.php
diff --git a/tests/PHPUnit/Core/AssetManager/UIAssetCacheBusterMock.php b/tests/PHPUnit/Unit/AssetManager/UIAssetCacheBusterMock.php
index c6d2205aae..c6d2205aae 100644
--- a/tests/PHPUnit/Core/AssetManager/UIAssetCacheBusterMock.php
+++ b/tests/PHPUnit/Unit/AssetManager/UIAssetCacheBusterMock.php
diff --git a/tests/PHPUnit/Core/AssetManager/UIAssetCacheBusterTest.php b/tests/PHPUnit/Unit/AssetManager/UIAssetCacheBusterTest.php
index 85c4b613b3..85c4b613b3 100644
--- a/tests/PHPUnit/Core/AssetManager/UIAssetCacheBusterTest.php
+++ b/tests/PHPUnit/Unit/AssetManager/UIAssetCacheBusterTest.php
diff --git a/tests/PHPUnit/Core/AssetManager/UIAssetCatalogSorterTest.php b/tests/PHPUnit/Unit/AssetManager/UIAssetCatalogSorterTest.php
index 820d8161bf..820d8161bf 100644
--- a/tests/PHPUnit/Core/AssetManager/UIAssetCatalogSorterTest.php
+++ b/tests/PHPUnit/Unit/AssetManager/UIAssetCatalogSorterTest.php
diff --git a/tests/PHPUnit/Core/AssetManager/UIAssetMinifierTest.php b/tests/PHPUnit/Unit/AssetManager/UIAssetMinifierTest.php
index df62e5c86b..df62e5c86b 100644
--- a/tests/PHPUnit/Core/AssetManager/UIAssetMinifierTest.php
+++ b/tests/PHPUnit/Unit/AssetManager/UIAssetMinifierTest.php
diff --git a/tests/PHPUnit/Core/AssetManager/configs/merged-assets-disabled.ini.php b/tests/PHPUnit/Unit/AssetManager/configs/merged-assets-disabled.ini.php
index 610d020da1..610d020da1 100644
--- a/tests/PHPUnit/Core/AssetManager/configs/merged-assets-disabled.ini.php
+++ b/tests/PHPUnit/Unit/AssetManager/configs/merged-assets-disabled.ini.php
diff --git a/tests/PHPUnit/Core/AssetManager/configs/merged-assets-enabled.ini.php b/tests/PHPUnit/Unit/AssetManager/configs/merged-assets-enabled.ini.php
index 69a1facd8a..69a1facd8a 100644
--- a/tests/PHPUnit/Core/AssetManager/configs/merged-assets-enabled.ini.php
+++ b/tests/PHPUnit/Unit/AssetManager/configs/merged-assets-enabled.ini.php
diff --git a/tests/PHPUnit/Core/AssetManager/configs/plugins.ini.php b/tests/PHPUnit/Unit/AssetManager/configs/plugins.ini.php
index 72834098e0..72834098e0 100644
--- a/tests/PHPUnit/Core/AssetManager/configs/plugins.ini.php
+++ b/tests/PHPUnit/Unit/AssetManager/configs/plugins.ini.php
diff --git a/tests/PHPUnit/Core/AssetManager/scripts/ExpectedMergeResultCore.js b/tests/PHPUnit/Unit/AssetManager/scripts/ExpectedMergeResultCore.js
index 823fc76cdb..823fc76cdb 100644
--- a/tests/PHPUnit/Core/AssetManager/scripts/ExpectedMergeResultCore.js
+++ b/tests/PHPUnit/Unit/AssetManager/scripts/ExpectedMergeResultCore.js
diff --git a/tests/PHPUnit/Core/AssetManager/scripts/ExpectedMergeResultNonCore.js b/tests/PHPUnit/Unit/AssetManager/scripts/ExpectedMergeResultNonCore.js
index f004dcc501..f004dcc501 100644
--- a/tests/PHPUnit/Core/AssetManager/scripts/ExpectedMergeResultNonCore.js
+++ b/tests/PHPUnit/Unit/AssetManager/scripts/ExpectedMergeResultNonCore.js
diff --git a/tests/PHPUnit/Core/AssetManager/scripts/SimpleAlert.js b/tests/PHPUnit/Unit/AssetManager/scripts/SimpleAlert.js
index 003d113a36..003d113a36 100644
--- a/tests/PHPUnit/Core/AssetManager/scripts/SimpleAlert.js
+++ b/tests/PHPUnit/Unit/AssetManager/scripts/SimpleAlert.js
diff --git a/tests/PHPUnit/Core/AssetManager/scripts/SimpleArray.js b/tests/PHPUnit/Unit/AssetManager/scripts/SimpleArray.js
index 3176f85cff..3176f85cff 100644
--- a/tests/PHPUnit/Core/AssetManager/scripts/SimpleArray.js
+++ b/tests/PHPUnit/Unit/AssetManager/scripts/SimpleArray.js
diff --git a/tests/PHPUnit/Core/AssetManager/scripts/SimpleComments.js b/tests/PHPUnit/Unit/AssetManager/scripts/SimpleComments.js
index 5a7103256a..5a7103256a 100644
--- a/tests/PHPUnit/Core/AssetManager/scripts/SimpleComments.js
+++ b/tests/PHPUnit/Unit/AssetManager/scripts/SimpleComments.js
diff --git a/tests/PHPUnit/Core/AssetManager/scripts/SimpleObject.js b/tests/PHPUnit/Unit/AssetManager/scripts/SimpleObject.js
index aacdf5069c..aacdf5069c 100644
--- a/tests/PHPUnit/Core/AssetManager/scripts/SimpleObject.js
+++ b/tests/PHPUnit/Unit/AssetManager/scripts/SimpleObject.js
diff --git a/tests/PHPUnit/Core/AssetManager/stylesheets/CssWithURLs.css b/tests/PHPUnit/Unit/AssetManager/stylesheets/CssWithURLs.css
index 75c919da98..f53dbe37b5 100644
--- a/tests/PHPUnit/Core/AssetManager/stylesheets/CssWithURLs.css
+++ b/tests/PHPUnit/Unit/AssetManager/stylesheets/CssWithURLs.css
@@ -2,7 +2,7 @@ h1 {
     color: orange;
     text-align: center;
     /* url relative to root: must not be rewritten*/
-    background: url(tests/PHPUnit/Core/AssetManager/stylesheets/images/test-image.png);
+    background: url(tests/PHPUnit/Unit/AssetManager/stylesheets/images/test-image.png);
 }
 
 p {
diff --git a/tests/PHPUnit/Core/AssetManager/stylesheets/ExpectedMergeResult.css b/tests/PHPUnit/Unit/AssetManager/stylesheets/ExpectedMergeResult.css
index 3b86a91e52..12acb9937c 100644
--- a/tests/PHPUnit/Core/AssetManager/stylesheets/ExpectedMergeResult.css
+++ b/tests/PHPUnit/Unit/AssetManager/stylesheets/ExpectedMergeResult.css
@@ -18,11 +18,11 @@
 h1 {
   color: orange;
   text-align: center;
-  background: url(tests/PHPUnit/Core/AssetManager/stylesheets/images/test-image.png);
+  background: url(tests/PHPUnit/Unit/AssetManager/stylesheets/images/test-image.png);
 }
 p {
   font-size: 20px;
-  background: url(tests/PHPUnit/Core/AssetManager/stylesheets/images/test-image.png);
+  background: url(tests/PHPUnit/Unit/AssetManager/stylesheets/images/test-image.png);
 }
 body {
   background-color: #b0c4de;
diff --git a/tests/PHPUnit/Core/AssetManager/stylesheets/ImportedLess.less b/tests/PHPUnit/Unit/AssetManager/stylesheets/ImportedLess.less
index db566317b6..db566317b6 100644
--- a/tests/PHPUnit/Core/AssetManager/stylesheets/ImportedLess.less
+++ b/tests/PHPUnit/Unit/AssetManager/stylesheets/ImportedLess.less
diff --git a/tests/PHPUnit/Core/AssetManager/stylesheets/SimpleBody.css b/tests/PHPUnit/Unit/AssetManager/stylesheets/SimpleBody.css
index 6e0e55777a..6e0e55777a 100644
--- a/tests/PHPUnit/Core/AssetManager/stylesheets/SimpleBody.css
+++ b/tests/PHPUnit/Unit/AssetManager/stylesheets/SimpleBody.css
diff --git a/tests/PHPUnit/Core/AssetManager/stylesheets/SimpleLess.less b/tests/PHPUnit/Unit/AssetManager/stylesheets/SimpleLess.less
index fd7b33af31..fd7b33af31 100644
--- a/tests/PHPUnit/Core/AssetManager/stylesheets/SimpleLess.less
+++ b/tests/PHPUnit/Unit/AssetManager/stylesheets/SimpleLess.less
diff --git a/tests/PHPUnit/Core/AssetManager/stylesheets/images/test-image.png b/tests/PHPUnit/Unit/AssetManager/stylesheets/images/test-image.png
index da6e1bbe89..da6e1bbe89 100644
--- a/tests/PHPUnit/Core/AssetManager/stylesheets/images/test-image.png
+++ b/tests/PHPUnit/Unit/AssetManager/stylesheets/images/test-image.png
diff --git a/tests/PHPUnit/Core/AssetManagerTest.php b/tests/PHPUnit/Unit/AssetManagerTest.php
index 85fc6d9764..5d3e709004 100644
--- a/tests/PHPUnit/Core/AssetManagerTest.php
+++ b/tests/PHPUnit/Unit/AssetManagerTest.php
@@ -14,10 +14,10 @@ use Piwik\Plugin;
 use Piwik\Plugin\Manager;
 use Piwik\EventDispatcher;
 
-require_once PIWIK_INCLUDE_PATH . "/tests/PHPUnit/Core/AssetManager/UIAssetCacheBusterMock.php";
-require_once PIWIK_INCLUDE_PATH . "/tests/PHPUnit/Core/AssetManager/PluginManagerMock.php";
-require_once PIWIK_INCLUDE_PATH . "/tests/PHPUnit/Core/AssetManager/PluginMock.php";
-require_once PIWIK_INCLUDE_PATH . "/tests/PHPUnit/Core/AssetManager/ThemeMock.php";
+require_once PIWIK_INCLUDE_PATH . "/tests/PHPUnit/Unit/AssetManager/UIAssetCacheBusterMock.php";
+require_once PIWIK_INCLUDE_PATH . "/tests/PHPUnit/Unit/AssetManager/PluginManagerMock.php";
+require_once PIWIK_INCLUDE_PATH . "/tests/PHPUnit/Unit/AssetManager/PluginMock.php";
+require_once PIWIK_INCLUDE_PATH . "/tests/PHPUnit/Unit/AssetManager/ThemeMock.php";
 
 /**
  * @group AssetManagerTest
@@ -26,7 +26,7 @@ class AssetManagerTest extends PHPUnit_Framework_TestCase
 {
     // todo Theme->rewriteAssetPathIfOverridesFound is not tested
 
-    const ASSET_MANAGER_TEST_DIR = 'tests/PHPUnit/Core/AssetManager/';
+    const ASSET_MANAGER_TEST_DIR = 'tests/PHPUnit/Unit/AssetManager/';
 
     const FIRST_CACHE_BUSTER_JS = 'first-cache-buster-js';
     const SECOND_CACHE_BUSTER_JS = 'second-cache-buster-js';
@@ -620,10 +620,10 @@ class AssetManagerTest extends PHPUnit_Framework_TestCase
 
         $expectedJsInclusionDirective =
             $this->getJsTranslationScript() .
-            '<script type="text/javascript" src="tests/PHPUnit/Core/AssetManager/scripts/SimpleObject.js"></script>' . PHP_EOL .
-            '<script type="text/javascript" src="tests/PHPUnit/Core/AssetManager/scripts/SimpleArray.js"></script>' . PHP_EOL .
-            '<script type="text/javascript" src="tests/PHPUnit/Core/AssetManager/scripts/SimpleComments.js"></script>' . PHP_EOL .
-            '<script type="text/javascript" src="tests/PHPUnit/Core/AssetManager/scripts/SimpleAlert.js"></script>' . PHP_EOL;
+            '<script type="text/javascript" src="tests/PHPUnit/Unit/AssetManager/scripts/SimpleObject.js"></script>' . PHP_EOL .
+            '<script type="text/javascript" src="tests/PHPUnit/Unit/AssetManager/scripts/SimpleArray.js"></script>' . PHP_EOL .
+            '<script type="text/javascript" src="tests/PHPUnit/Unit/AssetManager/scripts/SimpleComments.js"></script>' . PHP_EOL .
+            '<script type="text/javascript" src="tests/PHPUnit/Unit/AssetManager/scripts/SimpleAlert.js"></script>' . PHP_EOL;
 
         $this->assertEquals($expectedJsInclusionDirective, $this->assetManager->getJsInclusionDirective());
     }
diff --git a/tests/PHPUnit/Core/CliMulti/OutputTest.php b/tests/PHPUnit/Unit/CliMulti/OutputTest.php
index 355fe2c4c7..355fe2c4c7 100644
--- a/tests/PHPUnit/Core/CliMulti/OutputTest.php
+++ b/tests/PHPUnit/Unit/CliMulti/OutputTest.php
diff --git a/tests/PHPUnit/Core/CliMulti/ProcessTest.php b/tests/PHPUnit/Unit/CliMulti/ProcessTest.php
index 12ec4c98e8..12ec4c98e8 100644
--- a/tests/PHPUnit/Core/CliMulti/ProcessTest.php
+++ b/tests/PHPUnit/Unit/CliMulti/ProcessTest.php
diff --git a/tests/PHPUnit/Core/Columns/DimensionTest.php b/tests/PHPUnit/Unit/Columns/DimensionTest.php
index 6952b3880f..6952b3880f 100644
--- a/tests/PHPUnit/Core/Columns/DimensionTest.php
+++ b/tests/PHPUnit/Unit/Columns/DimensionTest.php
diff --git a/tests/PHPUnit/Core/CommonTest.php b/tests/PHPUnit/Unit/CommonTest.php
index 86d03c4bdb..86d03c4bdb 100644
--- a/tests/PHPUnit/Core/CommonTest.php
+++ b/tests/PHPUnit/Unit/CommonTest.php
diff --git a/tests/PHPUnit/Core/ConfigTest.php b/tests/PHPUnit/Unit/ConfigTest.php
index 128e198eeb..128e198eeb 100644
--- a/tests/PHPUnit/Core/ConfigTest.php
+++ b/tests/PHPUnit/Unit/ConfigTest.php
diff --git a/tests/PHPUnit/Core/CookieTest.php b/tests/PHPUnit/Unit/CookieTest.php
index 9b77aeddaf..9b77aeddaf 100644
--- a/tests/PHPUnit/Core/CookieTest.php
+++ b/tests/PHPUnit/Unit/CookieTest.php
diff --git a/tests/PHPUnit/Core/DataTable/Filter/AddSummaryRowTest.php b/tests/PHPUnit/Unit/DataTable/Filter/AddSummaryRowTest.php
index 71b41bd429..71b41bd429 100644
--- a/tests/PHPUnit/Core/DataTable/Filter/AddSummaryRowTest.php
+++ b/tests/PHPUnit/Unit/DataTable/Filter/AddSummaryRowTest.php
diff --git a/tests/PHPUnit/Core/DataTable/Filter/ExcludeLowPopulationTest.php b/tests/PHPUnit/Unit/DataTable/Filter/ExcludeLowPopulationTest.php
index 469015a24c..469015a24c 100644
--- a/tests/PHPUnit/Core/DataTable/Filter/ExcludeLowPopulationTest.php
+++ b/tests/PHPUnit/Unit/DataTable/Filter/ExcludeLowPopulationTest.php
diff --git a/tests/PHPUnit/Core/DataTable/Filter/LimitTest.php b/tests/PHPUnit/Unit/DataTable/Filter/LimitTest.php
index 14705926a5..14705926a5 100644
--- a/tests/PHPUnit/Core/DataTable/Filter/LimitTest.php
+++ b/tests/PHPUnit/Unit/DataTable/Filter/LimitTest.php
diff --git a/tests/PHPUnit/Core/DataTable/Filter/PatternRecursiveTest.php b/tests/PHPUnit/Unit/DataTable/Filter/PatternRecursiveTest.php
index 7ab59d8c4a..7ab59d8c4a 100644
--- a/tests/PHPUnit/Core/DataTable/Filter/PatternRecursiveTest.php
+++ b/tests/PHPUnit/Unit/DataTable/Filter/PatternRecursiveTest.php
diff --git a/tests/PHPUnit/Core/DataTable/Filter/PatternTest.php b/tests/PHPUnit/Unit/DataTable/Filter/PatternTest.php
index 1f1c25bc61..1f1c25bc61 100644
--- a/tests/PHPUnit/Core/DataTable/Filter/PatternTest.php
+++ b/tests/PHPUnit/Unit/DataTable/Filter/PatternTest.php
diff --git a/tests/PHPUnit/Core/DataTable/Filter/PivotByDimensionTest.php b/tests/PHPUnit/Unit/DataTable/Filter/PivotByDimensionTest.php
index 80162b362f..80162b362f 100644
--- a/tests/PHPUnit/Core/DataTable/Filter/PivotByDimensionTest.php
+++ b/tests/PHPUnit/Unit/DataTable/Filter/PivotByDimensionTest.php
diff --git a/tests/PHPUnit/Core/DataTable/Filter/RangeCheckTest.php b/tests/PHPUnit/Unit/DataTable/Filter/RangeCheckTest.php
index e9140c3aed..e9140c3aed 100644
--- a/tests/PHPUnit/Core/DataTable/Filter/RangeCheckTest.php
+++ b/tests/PHPUnit/Unit/DataTable/Filter/RangeCheckTest.php
diff --git a/tests/PHPUnit/Core/DataTable/Filter/SortTest.php b/tests/PHPUnit/Unit/DataTable/Filter/SortTest.php
index bf23dbd7dc..bf23dbd7dc 100644
--- a/tests/PHPUnit/Core/DataTable/Filter/SortTest.php
+++ b/tests/PHPUnit/Unit/DataTable/Filter/SortTest.php
diff --git a/tests/PHPUnit/Core/DataTable/Filter/TruncateTest.php b/tests/PHPUnit/Unit/DataTable/Filter/TruncateTest.php
index 2cb53e701f..2cb53e701f 100644
--- a/tests/PHPUnit/Core/DataTable/Filter/TruncateTest.php
+++ b/tests/PHPUnit/Unit/DataTable/Filter/TruncateTest.php
diff --git a/tests/PHPUnit/Core/DataTable/MapTest.php b/tests/PHPUnit/Unit/DataTable/MapTest.php
index de08a14787..de08a14787 100644
--- a/tests/PHPUnit/Core/DataTable/MapTest.php
+++ b/tests/PHPUnit/Unit/DataTable/MapTest.php
diff --git a/tests/PHPUnit/Core/DataTable/Renderer/CSVTest.php b/tests/PHPUnit/Unit/DataTable/Renderer/CSVTest.php
index 64ffcf6a06..64ffcf6a06 100644
--- a/tests/PHPUnit/Core/DataTable/Renderer/CSVTest.php
+++ b/tests/PHPUnit/Unit/DataTable/Renderer/CSVTest.php
diff --git a/tests/PHPUnit/Core/DataTable/Renderer/ConsoleTest.php b/tests/PHPUnit/Unit/DataTable/Renderer/ConsoleTest.php
index 7da7dedb53..7da7dedb53 100644
--- a/tests/PHPUnit/Core/DataTable/Renderer/ConsoleTest.php
+++ b/tests/PHPUnit/Unit/DataTable/Renderer/ConsoleTest.php
diff --git a/tests/PHPUnit/Core/DataTable/Renderer/JSONTest.php b/tests/PHPUnit/Unit/DataTable/Renderer/JSONTest.php
index c18ee12e60..c18ee12e60 100644
--- a/tests/PHPUnit/Core/DataTable/Renderer/JSONTest.php
+++ b/tests/PHPUnit/Unit/DataTable/Renderer/JSONTest.php
diff --git a/tests/PHPUnit/Core/DataTable/Renderer/PHPTest.php b/tests/PHPUnit/Unit/DataTable/Renderer/PHPTest.php
index 7ba4088e5c..7ba4088e5c 100644
--- a/tests/PHPUnit/Core/DataTable/Renderer/PHPTest.php
+++ b/tests/PHPUnit/Unit/DataTable/Renderer/PHPTest.php
diff --git a/tests/PHPUnit/Core/DataTable/Renderer/XMLTest.php b/tests/PHPUnit/Unit/DataTable/Renderer/XMLTest.php
index f8c2a93072..f8c2a93072 100644
--- a/tests/PHPUnit/Core/DataTable/Renderer/XMLTest.php
+++ b/tests/PHPUnit/Unit/DataTable/Renderer/XMLTest.php
diff --git a/tests/PHPUnit/Core/DataTable/RowTest.php b/tests/PHPUnit/Unit/DataTable/RowTest.php
index 2ecb2d3d53..2ecb2d3d53 100644
--- a/tests/PHPUnit/Core/DataTable/RowTest.php
+++ b/tests/PHPUnit/Unit/DataTable/RowTest.php
diff --git a/tests/PHPUnit/Core/DataTableTest.php b/tests/PHPUnit/Unit/DataTableTest.php
index afb3e168fe..afb3e168fe 100644
--- a/tests/PHPUnit/Core/DataTableTest.php
+++ b/tests/PHPUnit/Unit/DataTableTest.php
diff --git a/tests/PHPUnit/Core/DateTest.php b/tests/PHPUnit/Unit/DateTest.php
index 84041f53fd..84041f53fd 100644
--- a/tests/PHPUnit/Core/DateTest.php
+++ b/tests/PHPUnit/Unit/DateTest.php
diff --git a/tests/PHPUnit/Core/DependencyTest.php b/tests/PHPUnit/Unit/DependencyTest.php
index 3c7b783e95..3c7b783e95 100644
--- a/tests/PHPUnit/Core/DependencyTest.php
+++ b/tests/PHPUnit/Unit/DependencyTest.php
diff --git a/tests/PHPUnit/Core/DeprecatedMethodsTest.php b/tests/PHPUnit/Unit/DeprecatedMethodsTest.php
index 6bbcc64110..6bbcc64110 100644
--- a/tests/PHPUnit/Core/DeprecatedMethodsTest.php
+++ b/tests/PHPUnit/Unit/DeprecatedMethodsTest.php
diff --git a/tests/PHPUnit/Core/FactoryTest.php b/tests/PHPUnit/Unit/FactoryTest.php
index d85efcc2ce..d85efcc2ce 100644
--- a/tests/PHPUnit/Core/FactoryTest.php
+++ b/tests/PHPUnit/Unit/FactoryTest.php
diff --git a/tests/PHPUnit/Core/FilesystemTest.php b/tests/PHPUnit/Unit/FilesystemTest.php
index 26518c1a08..26518c1a08 100644
--- a/tests/PHPUnit/Core/FilesystemTest.php
+++ b/tests/PHPUnit/Unit/FilesystemTest.php
diff --git a/tests/PHPUnit/Core/Http/fixture.zip b/tests/PHPUnit/Unit/Http/fixture.zip
index 2388859d52..2388859d52 100644
--- a/tests/PHPUnit/Core/Http/fixture.zip
+++ b/tests/PHPUnit/Unit/Http/fixture.zip
diff --git a/tests/PHPUnit/Core/HttpTest.php b/tests/PHPUnit/Unit/HttpTest.php
index af2711c530..71f03aa528 100644
--- a/tests/PHPUnit/Core/HttpTest.php
+++ b/tests/PHPUnit/Unit/HttpTest.php
@@ -54,7 +54,7 @@ class HttpTest extends PHPUnit_Framework_TestCase
     public function testFetchLatestZip()
     {
         $destinationPath = PIWIK_USER_PATH . '/tmp/latest/latest.zip';
-        Http::fetchRemoteFile(Fixture::getRootUrl() . 'tests/PHPUnit/Core/Http/fixture.zip', $destinationPath, 3, 30);
+        Http::fetchRemoteFile(Fixture::getRootUrl() . 'tests/PHPUnit/Unit/Http/fixture.zip', $destinationPath, 3, 30);
         $this->assertFileExists($destinationPath);
         $this->assertGreaterThan(0, filesize($destinationPath));
     }
@@ -100,7 +100,7 @@ class HttpTest extends PHPUnit_Framework_TestCase
 
         $result = Http::sendHttpRequestBy(
             $method,
-            Fixture::getRootUrl() . 'tests/PHPUnit/Core/Http/fixture.zip',
+            Fixture::getRootUrl() . 'tests/PHPUnit/Unit/Http/fixture.zip',
             30,
             $userAgent = null,
             $destinationPath = null,
diff --git a/tests/PHPUnit/Core/IPTest.php b/tests/PHPUnit/Unit/IPTest.php
index f12d37dfed..f12d37dfed 100644
--- a/tests/PHPUnit/Core/IPTest.php
+++ b/tests/PHPUnit/Unit/IPTest.php
diff --git a/tests/PHPUnit/Core/Menu/MenuReportingTest.php b/tests/PHPUnit/Unit/Menu/MenuReportingTest.php
index b82c4a1aaf..b82c4a1aaf 100644
--- a/tests/PHPUnit/Core/Menu/MenuReportingTest.php
+++ b/tests/PHPUnit/Unit/Menu/MenuReportingTest.php
diff --git a/tests/PHPUnit/Core/MetricsTest.php b/tests/PHPUnit/Unit/MetricsTest.php
index c7052102e8..c7052102e8 100644
--- a/tests/PHPUnit/Core/MetricsTest.php
+++ b/tests/PHPUnit/Unit/MetricsTest.php
diff --git a/tests/PHPUnit/Core/NonceTest.php b/tests/PHPUnit/Unit/NonceTest.php
index 9d0d8ef37d..9d0d8ef37d 100644
--- a/tests/PHPUnit/Core/NonceTest.php
+++ b/tests/PHPUnit/Unit/NonceTest.php
diff --git a/tests/PHPUnit/Core/Period/DayTest.php b/tests/PHPUnit/Unit/Period/DayTest.php
index eb653fcc5c..eb653fcc5c 100644
--- a/tests/PHPUnit/Core/Period/DayTest.php
+++ b/tests/PHPUnit/Unit/Period/DayTest.php
diff --git a/tests/PHPUnit/Core/Period/MonthTest.php b/tests/PHPUnit/Unit/Period/MonthTest.php
index 5821aceee5..5821aceee5 100644
--- a/tests/PHPUnit/Core/Period/MonthTest.php
+++ b/tests/PHPUnit/Unit/Period/MonthTest.php
diff --git a/tests/PHPUnit/Core/Period/RangeTest.php b/tests/PHPUnit/Unit/Period/RangeTest.php
index b2114a4372..b2114a4372 100644
--- a/tests/PHPUnit/Core/Period/RangeTest.php
+++ b/tests/PHPUnit/Unit/Period/RangeTest.php
diff --git a/tests/PHPUnit/Core/Period/WeekTest.php b/tests/PHPUnit/Unit/Period/WeekTest.php
index 2994f8e13d..2994f8e13d 100644
--- a/tests/PHPUnit/Core/Period/WeekTest.php
+++ b/tests/PHPUnit/Unit/Period/WeekTest.php
diff --git a/tests/PHPUnit/Core/Period/YearTest.php b/tests/PHPUnit/Unit/Period/YearTest.php
index ef28d619d6..ef28d619d6 100644
--- a/tests/PHPUnit/Core/Period/YearTest.php
+++ b/tests/PHPUnit/Unit/Period/YearTest.php
diff --git a/tests/PHPUnit/Core/PeriodTest.php b/tests/PHPUnit/Unit/PeriodTest.php
index 8888c4c763..8888c4c763 100644
--- a/tests/PHPUnit/Core/PeriodTest.php
+++ b/tests/PHPUnit/Unit/PeriodTest.php
diff --git a/tests/PHPUnit/Core/Plugin/ComponentFactoryTest.php b/tests/PHPUnit/Unit/Plugin/ComponentFactoryTest.php
index b7b0f30fc3..b7b0f30fc3 100644
--- a/tests/PHPUnit/Core/Plugin/ComponentFactoryTest.php
+++ b/tests/PHPUnit/Unit/Plugin/ComponentFactoryTest.php
diff --git a/tests/PHPUnit/Core/Plugin/Dimension/ActionDimensionTest.php b/tests/PHPUnit/Unit/Plugin/Dimension/ActionDimensionTest.php
index 5ea77cca84..5ea77cca84 100644
--- a/tests/PHPUnit/Core/Plugin/Dimension/ActionDimensionTest.php
+++ b/tests/PHPUnit/Unit/Plugin/Dimension/ActionDimensionTest.php
diff --git a/tests/PHPUnit/Core/Plugin/Dimension/ConversionDimensionTest.php b/tests/PHPUnit/Unit/Plugin/Dimension/ConversionDimensionTest.php
index 38b2e4856f..38b2e4856f 100644
--- a/tests/PHPUnit/Core/Plugin/Dimension/ConversionDimensionTest.php
+++ b/tests/PHPUnit/Unit/Plugin/Dimension/ConversionDimensionTest.php
diff --git a/tests/PHPUnit/Core/Plugin/Dimension/VisitDimensionTest.php b/tests/PHPUnit/Unit/Plugin/Dimension/VisitDimensionTest.php
index e34806371e..e34806371e 100644
--- a/tests/PHPUnit/Core/Plugin/Dimension/VisitDimensionTest.php
+++ b/tests/PHPUnit/Unit/Plugin/Dimension/VisitDimensionTest.php
diff --git a/tests/PHPUnit/Core/RankingQueryTest.php b/tests/PHPUnit/Unit/RankingQueryTest.php
index 7941c25d35..7941c25d35 100644
--- a/tests/PHPUnit/Core/RankingQueryTest.php
+++ b/tests/PHPUnit/Unit/RankingQueryTest.php
diff --git a/tests/PHPUnit/Core/RegistryTest.php b/tests/PHPUnit/Unit/RegistryTest.php
index c6c2aff894..c6c2aff894 100644
--- a/tests/PHPUnit/Core/RegistryTest.php
+++ b/tests/PHPUnit/Unit/RegistryTest.php
diff --git a/tests/PHPUnit/Core/ReleaseCheckListTest.php b/tests/PHPUnit/Unit/ReleaseCheckListTest.php
index ba70ff9410..255c03fb79 100644
--- a/tests/PHPUnit/Core/ReleaseCheckListTest.php
+++ b/tests/PHPUnit/Unit/ReleaseCheckListTest.php
@@ -367,8 +367,8 @@ class ReleaseCheckListTest extends PHPUnit_Framework_TestCase
     protected function isSkipPhpFileStartWithPhpBlock($file, $isIniFile)
     {
         $isIniFileInTests = strpos($file, "/tests/") !== false;
-        $isTestResultFile = strpos($file, "/Integration/expected") !== false
-            || strpos($file, "/Integration/processed") !== false
+        $isTestResultFile = strpos($file, "/System/expected") !== false
+            || strpos($file, "/System/processed") !== false
             || strpos($file, "tests/resources/Updater/") !== false
             || strpos($file, "Twig/Tests/") !== false
             || strpos($file, "/vendor/") !== false;
diff --git a/tests/PHPUnit/Core/ScheduledTaskTest.php b/tests/PHPUnit/Unit/ScheduledTaskTest.php
index 5a131521ff..5a131521ff 100644
--- a/tests/PHPUnit/Core/ScheduledTaskTest.php
+++ b/tests/PHPUnit/Unit/ScheduledTaskTest.php
diff --git a/tests/PHPUnit/Core/ScheduledTime/DailyTest.php b/tests/PHPUnit/Unit/ScheduledTime/DailyTest.php
index 1a62019392..1a62019392 100644
--- a/tests/PHPUnit/Core/ScheduledTime/DailyTest.php
+++ b/tests/PHPUnit/Unit/ScheduledTime/DailyTest.php
diff --git a/tests/PHPUnit/Core/ScheduledTime/HourlyTest.php b/tests/PHPUnit/Unit/ScheduledTime/HourlyTest.php
index 14f4ce3c0e..14f4ce3c0e 100644
--- a/tests/PHPUnit/Core/ScheduledTime/HourlyTest.php
+++ b/tests/PHPUnit/Unit/ScheduledTime/HourlyTest.php
diff --git a/tests/PHPUnit/Core/ScheduledTime/MonthlyTest.php b/tests/PHPUnit/Unit/ScheduledTime/MonthlyTest.php
index 17bde4ee6d..17bde4ee6d 100644
--- a/tests/PHPUnit/Core/ScheduledTime/MonthlyTest.php
+++ b/tests/PHPUnit/Unit/ScheduledTime/MonthlyTest.php
diff --git a/tests/PHPUnit/Core/ScheduledTime/WeeklyTest.php b/tests/PHPUnit/Unit/ScheduledTime/WeeklyTest.php
index 62b6fce8ed..62b6fce8ed 100644
--- a/tests/PHPUnit/Core/ScheduledTime/WeeklyTest.php
+++ b/tests/PHPUnit/Unit/ScheduledTime/WeeklyTest.php
diff --git a/tests/PHPUnit/Core/SegmentExpressionTest.php b/tests/PHPUnit/Unit/SegmentExpressionTest.php
index 874df9e2d1..874df9e2d1 100644
--- a/tests/PHPUnit/Core/SegmentExpressionTest.php
+++ b/tests/PHPUnit/Unit/SegmentExpressionTest.php
diff --git a/tests/PHPUnit/Core/ServeStaticFileTest.php b/tests/PHPUnit/Unit/ServeStaticFileTest.php
index 588c1b8c25..a3ec57a7af 100644
--- a/tests/PHPUnit/Core/ServeStaticFileTest.php
+++ b/tests/PHPUnit/Unit/ServeStaticFileTest.php
@@ -13,6 +13,8 @@
 
 // This is Piwik logo, the static file used in this test suit
 
+// TODO this is an integration or system test! not a unit test
+
 use Piwik\ProxyHttp;
 use Piwik\SettingsServer;
 use Piwik\Tests\Fixture;
diff --git a/tests/PHPUnit/Core/TaskSchedulerTest.php b/tests/PHPUnit/Unit/TaskSchedulerTest.php
index 3ec8781df7..3ec8781df7 100644
--- a/tests/PHPUnit/Core/TaskSchedulerTest.php
+++ b/tests/PHPUnit/Unit/TaskSchedulerTest.php
diff --git a/tests/PHPUnit/Core/Translate/Filter/ByBaseTranslationsTest.php b/tests/PHPUnit/Unit/Translate/Filter/ByBaseTranslationsTest.php
index 8ca2f09319..8ca2f09319 100644
--- a/tests/PHPUnit/Core/Translate/Filter/ByBaseTranslationsTest.php
+++ b/tests/PHPUnit/Unit/Translate/Filter/ByBaseTranslationsTest.php
diff --git a/tests/PHPUnit/Core/Translate/Filter/ByParameterCountTest.php b/tests/PHPUnit/Unit/Translate/Filter/ByParameterCountTest.php
index 06c72ed24f..06c72ed24f 100644
--- a/tests/PHPUnit/Core/Translate/Filter/ByParameterCountTest.php
+++ b/tests/PHPUnit/Unit/Translate/Filter/ByParameterCountTest.php
diff --git a/tests/PHPUnit/Core/Translate/Filter/EmptyTranslationsTest.php b/tests/PHPUnit/Unit/Translate/Filter/EmptyTranslationsTest.php
index a083e50a43..a083e50a43 100644
--- a/tests/PHPUnit/Core/Translate/Filter/EmptyTranslationsTest.php
+++ b/tests/PHPUnit/Unit/Translate/Filter/EmptyTranslationsTest.php
diff --git a/tests/PHPUnit/Core/Translate/Filter/EncodedEntitiesTest.php b/tests/PHPUnit/Unit/Translate/Filter/EncodedEntitiesTest.php
index cfad46387b..cfad46387b 100644
--- a/tests/PHPUnit/Core/Translate/Filter/EncodedEntitiesTest.php
+++ b/tests/PHPUnit/Unit/Translate/Filter/EncodedEntitiesTest.php
diff --git a/tests/PHPUnit/Core/Translate/Filter/UnnecassaryWhitespacesTest.php b/tests/PHPUnit/Unit/Translate/Filter/UnnecassaryWhitespacesTest.php
index 3f86b97a0d..3f86b97a0d 100644
--- a/tests/PHPUnit/Core/Translate/Filter/UnnecassaryWhitespacesTest.php
+++ b/tests/PHPUnit/Unit/Translate/Filter/UnnecassaryWhitespacesTest.php
diff --git a/tests/PHPUnit/Core/Translate/Validate/CoreTranslationsTest.php b/tests/PHPUnit/Unit/Translate/Validate/CoreTranslationsTest.php
index 3cde1e42c8..3cde1e42c8 100644
--- a/tests/PHPUnit/Core/Translate/Validate/CoreTranslationsTest.php
+++ b/tests/PHPUnit/Unit/Translate/Validate/CoreTranslationsTest.php
diff --git a/tests/PHPUnit/Core/Translate/Validate/NoScriptsTest.php b/tests/PHPUnit/Unit/Translate/Validate/NoScriptsTest.php
index e0a8f27b80..e0a8f27b80 100644
--- a/tests/PHPUnit/Core/Translate/Validate/NoScriptsTest.php
+++ b/tests/PHPUnit/Unit/Translate/Validate/NoScriptsTest.php
diff --git a/tests/PHPUnit/Core/Translate/WriterTest.php b/tests/PHPUnit/Unit/Translate/WriterTest.php
index 500009941a..500009941a 100644
--- a/tests/PHPUnit/Core/Translate/WriterTest.php
+++ b/tests/PHPUnit/Unit/Translate/WriterTest.php
diff --git a/tests/PHPUnit/Core/TranslateTest.php b/tests/PHPUnit/Unit/TranslateTest.php
index b7a99f70ee..b7a99f70ee 100644
--- a/tests/PHPUnit/Core/TranslateTest.php
+++ b/tests/PHPUnit/Unit/TranslateTest.php
diff --git a/tests/PHPUnit/Core/UrlHelperTest.php b/tests/PHPUnit/Unit/UrlHelperTest.php
index 79ba4fbecd..79ba4fbecd 100644
--- a/tests/PHPUnit/Core/UrlHelperTest.php
+++ b/tests/PHPUnit/Unit/UrlHelperTest.php
diff --git a/tests/PHPUnit/Core/UrlTest.php b/tests/PHPUnit/Unit/UrlTest.php
index c77907ee04..c77907ee04 100644
--- a/tests/PHPUnit/Core/UrlTest.php
+++ b/tests/PHPUnit/Unit/UrlTest.php
diff --git a/tests/PHPUnit/phpunit.xml.dist b/tests/PHPUnit/phpunit.xml.dist
index 3035150bbd..6aef96407c 100644
--- a/tests/PHPUnit/phpunit.xml.dist
+++ b/tests/PHPUnit/phpunit.xml.dist
@@ -31,20 +31,20 @@
 </php>
 
 <testsuites>
-  <testsuite name="SystemTests">
-      <directory>./Integration</directory>
-  </testsuite>
-  <testsuite name="PluginTests">
-      <directory>./Plugins</directory>
-      <directory>../../plugins/*/tests</directory>
-      <directory>../../plugins/*/Test</directory>
-  </testsuite>
-  <testsuite name="CoreTests">
-      <directory>./Core</directory>
-  </testsuite>
-  <testsuite name="UITests">
-      <directory>./UI</directory>
-  </testsuite>
+    <testsuite name="SystemTests">
+        <directory>./System</directory>
+    </testsuite>
+    <testsuite name="IntegrationTests">
+        <directory>./Integration</directory>
+        <directory>../../plugins/*/tests</directory>
+        <directory>../../plugins/*/Test</directory>
+    </testsuite>
+    <testsuite name="UnitTests">
+        <directory>./Unit</directory>
+    </testsuite>
+    <testsuite name="UITests">
+        <directory>./UI</directory>
+    </testsuite>
 </testsuites>
 
 <filter>
diff --git a/tests/PHPUnit/proxy/index.php b/tests/PHPUnit/proxy/index.php
index 3363d90ba8..213df21cf8 100644
--- a/tests/PHPUnit/proxy/index.php
+++ b/tests/PHPUnit/proxy/index.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * Proxy to index.php, but will use the Test DB
- * Used by tests/PHPUnit/Integration/ImportLogsTest.php and tests/PHPUnit/Integration/UITest.php
+ * Used by tests/PHPUnit/System/ImportLogsTest.php and tests/PHPUnit/System/UITest.php
  */
 
 require realpath(dirname(__FILE__)) . "/includes.php";
diff --git a/tests/README.md b/tests/README.md
index 24b2699b43..bce6f554ea 100644
--- a/tests/README.md
+++ b/tests/README.md
@@ -71,8 +71,8 @@ To execute the tests:
 4. 	Run the tests
 
 	$ cd /path/to/piwik/tests/PHPUnit
-	$ phpunit --testsuite CoreTests
-    $ phpunit --testsuite PluginTests
+	$ phpunit --testsuite UnitTests
+    $ phpunit --testsuite IntegrationTests
     $ phpunit --testsuite SystemTests
 
 	There are also two main groups of tests: Core and Plugins
@@ -84,7 +84,7 @@ To execute the tests:
 
 ## System Tests
 
-System tests files are in `tests/PHPUnit/Integration/*Test.php`
+System tests files are in `tests/PHPUnit/System/*Test.php`
 
 System tests allow to test how major Piwik components interact together.
 A test will typically generate hits to the Tracker (record visits and page views)
@@ -93,8 +93,8 @@ If a test fails, you can compare the processed/ and expected/ directories in a g
 text compare tool, such as WinMerge on Win, or MELD on Linux, to easily view changes between files.
 
 For example using Meld, click on "Start new comparison", "Directory comparison",
-in "Original" select "path/to/piwik/tests/PHPUnit/Integration/expected"
-in "Mine" select "path/to/piwik/tests/PHPUnit/Integration/processed"
+in "Original" select "path/to/piwik/tests/PHPUnit/System/expected"
+in "Mine" select "path/to/piwik/tests/PHPUnit/System/processed"
 
 If changes are expected due to the code changes you make, simply copy the file from processed/ to
 expected/, and test will then pass. Copying files is done easily using Meld (ALT+LEFT).
diff --git a/tests/travis/travis.sh b/tests/travis/travis.sh
index 7647211a12..71859ea70e 100755
--- a/tests/travis/travis.sh
+++ b/tests/travis/travis.sh
@@ -73,11 +73,11 @@ else
         phpunit --configuration phpunit.xml --testsuite SystemTests --exclude-group System --colors --coverage-clover $TRAVIS_BUILD_DIR/build/logs/clover-integration.xml || true
     elif [ "$COVERAGE" = "Core" ]
     then
-        echo "Executing tests in test suite CoreTests..."
-        phpunit --configuration phpunit.xml --testsuite CoreTests --colors --coverage-clover $TRAVIS_BUILD_DIR/build/logs/clover-core.xml || true
+        echo "Executing tests in test suite UnitTests..."
+        phpunit --configuration phpunit.xml --testsuite UnitTests --colors --coverage-clover $TRAVIS_BUILD_DIR/build/logs/clover-core.xml || true
     elif [ "$COVERAGE" = "Plugins" ]
     then
-        echo "Executing tests in test suite PluginTests..."
-        phpunit --configuration phpunit.xml --testsuite PluginTests --colors --coverage-clover $TRAVIS_BUILD_DIR/build/logs/clover-plugins.xml || true
+        echo "Executing tests in test suite IntegrationTests..."
+        phpunit --configuration phpunit.xml --testsuite IntegrationTests --colors --coverage-clover $TRAVIS_BUILD_DIR/build/logs/clover-plugins.xml || true
     fi;
 fi
\ No newline at end of file
diff --git a/tests/travis/upload_artifacts.sh b/tests/travis/upload_artifacts.sh
index 822fd795be..325f0448b5 100755
--- a/tests/travis/upload_artifacts.sh
+++ b/tests/travis/upload_artifacts.sh
@@ -6,7 +6,7 @@ then
 
     echo "Uploading artifacts for $TEST_SUITE..."
 
-    cd ./tests/PHPUnit/Integration
+    cd ./tests/PHPUnit/System
 
     # upload processed tarball
     tar -cjf processed.tar.bz2 processed --exclude='.gitkeep'