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

1538 files changed, 102 insertions, 5843 deletions

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/Plugins/CorePluginsAdmin/UpdateCommunicationTest.php b/tests/PHPUnit/Integration/Plugins/CorePluginsAdmin/UpdateCommunicationTest.php
deleted file mode 100644
index a54ab52cde..0000000000
--- a/tests/PHPUnit/Integration/Plugins/CorePluginsAdmin/UpdateCommunicationTest.php
+++ /dev/null
@@ -1,183 +0,0 @@
-<?php
-/**
- * Piwik - free/libre analytics platform
- *
- * @link http://piwik.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- */
-
-use Piwik\Config;
-use Piwik\Option;
-use Piwik\Plugins\CorePluginsAdmin\UpdateCommunication;
-
-/**
- * Class Plugins_CorePluginsAdmin_UpdateCommunicationTest
- *
- * @group Plugins
- */
-class Plugins_CorePluginsAdmin_UpdateCommunicationTest extends IntegrationTestCase
-{
-    /**
-     * @var UpdateCommunication
-     */
-    private $updateCommunication;
-
-    public function setUp()
-    {
-        parent::setUp();
-
-        $this->updateCommunication = new UpdateCommunication();
-        $this->updateCommunication->enable();
-    }
-
-    public function test_canBeEnabled()
-    {
-        $this->assertTrue($this->updateCommunication->canBeEnabled());
-
-        Config::getInstance()->General['enable_update_communication'] = 0;
-        $this->assertFalse($this->updateCommunication->canBeEnabled());
-
-        Config::getInstance()->General['enable_update_communication'] = 1;
-        $this->assertTrue($this->updateCommunication->canBeEnabled());
-    }
-
-    public function test_enable()
-    {
-        $this->updateCommunication->enable();
-        $this->assertTrue($this->updateCommunication->isEnabled());
-    }
-
-    public function test_disable()
-    {
-        $this->assertTrue($this->updateCommunication->isEnabled());
-
-        $this->updateCommunication->disable();
-        $this->assertFalse($this->updateCommunication->isEnabled());
-    }
-
-    public function test_isEnabled_shouldReturnFalse_IfCannotBeEnabled()
-    {
-        $this->assertTrue($this->updateCommunication->isEnabled());
-
-        Config::getInstance()->General['enable_update_communication'] = 0;
-        $this->assertFalse($this->updateCommunication->isEnabled());
-    }
-
-    public function test_sendNotificationIfUpdatesAvailable_shouldNotSendNotification_IfNoUpdateAvailable()
-    {
-        $mock = $this->getCommunicationMock(array());
-        $mock->expects($this->never())->method('sendEmailNotification');
-        $mock->sendNotificationIfUpdatesAvailable();
-    }
-
-    /**
-     * @dataProvider provideSendNotificationData
-     */
-    public function test_sendNotificationIfUpdatesAvailable($latestVersion, $lastSentVersion, $expects, $expectedLastSentVersion)
-    {
-        $pluginsHavingUpdate = array(
-            array('name' => 'MyTest', 'latestVersion' => $latestVersion, 'isTheme' => false)
-        );
-        $this->setLastSentVersion('MyTest', $lastSentVersion);
-
-        $mock = $this->getCommunicationMock($pluginsHavingUpdate);
-        $mock->expects($expects)->method('sendEmailNotification');
-        $mock->sendNotificationIfUpdatesAvailable();
-
-        $this->assertEquals($expectedLastSentVersion, $this->getLastSentVersion('MyTest'));
-    }
-
-    public function provideSendNotificationData()
-    {
-        return array(
-            array('33.0.0', '33.0.0', $this->never(), '33.0.0'), // shouldNotSend_IfAlreadyNotified
-            array('31.0.0', '33.0.0', $this->never(), '33.0.0'), // shouldNotSend_IfAlreadyNotifiedAboutLaterRelease
-            array('33.0.0', false,    $this->once(), '33.0.0'),  // shouldSend_IfUpdateAvailableAndNeverSentAnyBefore
-            array('33.0.0', '31.0.0', $this->once(), '33.0.0'),  // shouldSend_IfUpdateAvailable,
-        );
-    }
-
-    public function test_sendNotificationIfUpdatesAvailable_ShouldSendOnlyOneEmail_IfMultipleUpdatesAreAvailable()
-    {
-        $mock = $this->getCommunicationMockHavingManyUpdates();
-        $mock->expects($this->once())->method('sendEmailNotification');
-        $mock->sendNotificationIfUpdatesAvailable();
-    }
-
-    public function test_sendNotificationIfUpdatesAvailable_ShouldUpdateAllSentVersions_IfMultipleUpdatesAreAvailable()
-    {
-        $mock = $this->getCommunicationMockHavingManyUpdates();
-        $mock->expects($this->once())->method('sendEmailNotification');
-        $mock->sendNotificationIfUpdatesAvailable();
-
-        $this->assertEquals('33.0.0', $this->getLastSentVersion('MyTest1'));
-        $this->assertEquals('32.0.0', $this->getLastSentVersion('MyTest2'));
-        $this->assertEquals('31.0.0', $this->getLastSentVersion('MyTest3'));
-    }
-
-    public function test_sendNotificationIfUpdatesAvailable_ShouldSendCorrectText()
-    {
-        $subject = 'CoreUpdater_NotificationSubjectAvailablePluginUpdate';
-        $message = 'ScheduledReports_EmailHello
-
-CoreUpdater_ThereIsNewPluginVersionAvailableForUpdate
-
- * MyTest1 33.0.0
- * MyTest2 32.0.0
- * MyTest3 31.0.0
-
-CoreUpdater_NotificationClickToUpdatePlugins
-index.php?module=CorePluginsAdmin&action=plugins
-
-Installation_HappyAnalysing';
-
-        $mock = $this->getCommunicationMockHavingManyUpdates();
-
-        $mock->expects($this->once())->method('sendEmailNotification')
-             ->with($this->equalTo($subject), $this->equalTo($message));
-
-        $mock->sendNotificationIfUpdatesAvailable();
-    }
-
-    private function setLastSentVersion($pluginName, $version)
-    {
-        Option::set('last_update_communication_sent_plugin_' . $pluginName, $version);
-    }
-
-    private function getLastSentVersion($pluginName)
-    {
-        return Option::get('last_update_communication_sent_plugin_' . $pluginName);
-    }
-
-    /**
-     * @param array $pluginsHavingUpdate
-     * @return UpdateCommunication
-     */
-    private function getCommunicationMock($pluginsHavingUpdate)
-    {
-        $mock = $this->getMock('\Piwik\Plugins\CorePluginsAdmin\UpdateCommunication', array('getPluginsHavingUpdate', 'sendEmailNotification'));
-
-        $mock->expects($this->any())
-             ->method('getPluginsHavingUpdate')
-             ->will($this->returnValue($pluginsHavingUpdate));
-
-        return $mock;
-    }
-
-    private function getCommunicationMockHavingManyUpdates()
-    {
-        $pluginsHavingUpdate = array(
-            array('name' => 'MyTest1', 'latestVersion' => '33.0.0', 'isTheme' => false),
-            array('name' => 'MyTest2', 'latestVersion' => '32.0.0', 'isTheme' => false),
-            array('name' => 'MyTest3', 'latestVersion' => '31.0.0', 'isTheme' => false),
-        );
-
-        $this->setLastSentVersion('MyTest1', false);
-        $this->setLastSentVersion('MyTest2', false);
-        $this->setLastSentVersion('MyTest3', false);
-
-        $mock = $this->getCommunicationMock($pluginsHavingUpdate);
-
-        return $mock;
-    }
-}
diff --git a/tests/PHPUnit/Integration/Plugins/CoreUpdater/UpdateCommunicationTest.php b/tests/PHPUnit/Integration/Plugins/CoreUpdater/UpdateCommunicationTest.php
deleted file mode 100644
index 07fafc5609..0000000000
--- a/tests/PHPUnit/Integration/Plugins/CoreUpdater/UpdateCommunicationTest.php
+++ /dev/null
@@ -1,119 +0,0 @@
-<?php
-/**
- * Piwik - free/libre analytics platform
- *
- * @link http://piwik.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- */
-
-use Piwik\Config;
-use Piwik\Option;
-use Piwik\Plugins\CoreUpdater\UpdateCommunication;
-use Piwik\UpdateCheck;
-use Piwik\Version;
-
-/**
- * Class Plugins_CoreUpdater_UpdateCommunicationTest
- *
- * @group Plugins
- */
-class Plugins_CoreUpdater_UpdateCommunicationTest extends IntegrationTestCase
-{
-    public function setUp()
-    {
-        parent::setUp();
-    }
-
-    public function test_isEnabled()
-    {
-        $updateCommunication = new UpdateCommunication();
-
-        $this->assertTrue($updateCommunication->isEnabled());
-
-        Config::getInstance()->General['enable_update_communication'] = 0;
-        $this->assertFalse($updateCommunication->isEnabled());
-
-        Config::getInstance()->General['enable_update_communication'] = 1;
-        $this->assertTrue($updateCommunication->isEnabled());
-    }
-
-    /**
-     * @dataProvider provideSendNotificationData
-     */
-    public function test_sendNotificationIfUpdateAvailable($latestVersion, $lastSentVersion, $expects, $expectedLastSentVersion)
-    {
-        $this->setLatestVersion($latestVersion);
-        $this->setLastSentVersion($lastSentVersion);
-
-        $mock = $this->getCommunicationMock(array('sendNotifications'));
-        $mock->expects($expects)->method('sendNotifications');
-        $mock->sendNotificationIfUpdateAvailable();
-
-        $this->assertEquals($expectedLastSentVersion, $this->getLastSentVersion());
-    }
-
-    public function provideSendNotificationData()
-    {
-        return array(
-            array(Version::VERSION, false, $this->never(), false), // shouldNotSend_IfNoUpdateAvailable
-            array('33.0.0', '33.0.0', $this->never(), '33.0.0'),   // shouldNotSend_IfAlreadyNotified
-            array('31.0.0', '33.0.0', $this->never(), '33.0.0'),   // shouldNotSend_IfAlreadyNotifiedAboutLaterRelease
-            array('3333.3333.3333-beta10', '31.0.0', $this->never(), '31.0.0'),  // shouldNotSend_IfLatestVersionIsNotVersionLike,
-            array('33.0.0', false,    $this->once(), '33.0.0'),    // shouldSend_IfUpdateAvailableAndNeverSentAnyBefore
-            array('33.0.0', '31.0.0', $this->once(), '33.0.0'),    // shouldSend_IfUpdateAvailable
-        );
-    }
-
-    public function test_sendNotifications_shouldSentCorrectEmail()
-    {
-        $this->setLatestVersion('33.0.0');
-
-        $subject = 'CoreUpdater_NotificationSubjectAvailableCoreUpdate';
-        $message = 'ScheduledReports_EmailHello
-
-CoreUpdater_ThereIsNewVersionAvailableForUpdate
-
-CoreUpdater_YouCanUpgradeAutomaticallyOrDownloadPackage
-
-index.php?module=CoreUpdater&action=newVersionAvailable
-
-CoreUpdater_FeedbackRequest
-http://piwik.org/contact/';
-
-        $mock = $this->getCommunicationMock(array('sendEmailNotification'));
-        $mock->expects($this->once())
-                   ->method('sendEmailNotification')
-                   ->with($this->equalTo($subject), $this->equalTo($message));
-        $mock->sendNotificationIfUpdateAvailable();
-    }
-
-    private function setLastSentVersion($value)
-    {
-        Option::set('last_update_communication_sent_core', $value);
-    }
-
-    private function getLastSentVersion()
-    {
-        return Option::get('last_update_communication_sent_core');
-    }
-
-    private function setLatestVersion($value)
-    {
-        $this->preventVersionIsOverwrittenByActualVersionCheck();
-        Option::set(UpdateCheck::LATEST_VERSION, $value);
-    }
-
-    private function preventVersionIsOverwrittenByActualVersionCheck()
-    {
-        Config::getInstance()->General['enable_auto_update'] = false;
-    }
-
-    /**
-     * @param array $methodsToOverwrite
-     * @return UpdateCommunication
-     */
-    private function getCommunicationMock($methodsToOverwrite)
-    {
-        return $this->getMock('\Piwik\Plugins\CoreUpdater\UpdateCommunication', $methodsToOverwrite);
-    }
-}
diff --git a/tests/PHPUnit/Integration/Plugins/LoginTest.php b/tests/PHPUnit/Integration/Plugins/LoginTest.php
deleted file mode 100644
index ded63d53fb..0000000000
--- a/tests/PHPUnit/Integration/Plugins/LoginTest.php
+++ /dev/null
@@ -1,399 +0,0 @@
-<?php
-/**
- * Piwik - free/libre analytics platform
- *
- * @link http://piwik.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- */
-use Piwik\Access;
-use Piwik\AuthResult;
-use Piwik\DbHelper;
-use Piwik\Plugins\Login\Auth;
-use Piwik\Plugins\UsersManager\API;
-
-require_once 'Login/Auth.php';
-
-/**
- * Class Plugins_LoginTest
- *
- * @group Plugins
- * @group Plugins_LoginTest
- */
-class Plugins_LoginTest extends IntegrationTestCase
-{
-
-    /**
-     * @var Auth
-     */
-    private $auth;
-
-    public function setUp()
-    {
-        parent::setUp();
-
-        // setup the access layer
-        $pseudoMockAccess = new FakeAccess;
-        FakeAccess::setIdSitesView(array(1, 2));
-        FakeAccess::setIdSitesAdmin(array(3, 4));
-
-        //finally we set the user as a Super User by default
-        FakeAccess::$superUser = true;
-        Access::setSingletonInstance($pseudoMockAccess);
-
-        $this->auth = new Auth();
-    }
-
-    /**
-     * @group Plugins
-     */
-    public function testAuthenticateFailureNoLoginNoTokenAuth()
-    {
-        // no login; no token auth
-        $rc = $this->auth->authenticate();
-        $this->assertFailedLogin($rc);
-    }
-
-    /**
-     * @group Plugins
-     */
-    public function testAuthenticateFailureEmptyLoginNoTokenAuth()
-    {
-        // empty login; no token auth
-        $this->auth->setLogin('');
-        $rc = $this->auth->authenticate();
-        $this->assertFailedLogin($rc);
-    }
-
-    /**
-     * @group Plugins
-     */
-    public function testAuthenticateFailureNonExistentUser()
-    {
-        // non-existent user
-        $this->auth->setLogin('nobody');
-        $rc = $this->auth->authenticate();
-        $this->assertFailedLogin($rc);
-    }
-
-    /**
-     * @group Plugins
-     */
-    public function testAuthenticateFailureAnonymousNotExisting()
-    {
-        // anonymous user doesn't exist yet
-        $rc = $this->authenticate($login = 'anonymous', $authToken = '');
-        $this->assertFailedLogin($rc);
-    }
-
-    /**
-     * @group Plugins
-     */
-    public function testAuthenticateFailureAnonymousNotExistentEmptyLogin()
-    {
-        // empty login; anonymous user doesn't exist yet
-        $rc = $this->authenticate($login = '', $authToken = 'anonymous');
-
-        $this->assertFailedLogin($rc);
-    }
-
-    /**
-     * @group Plugins
-     */
-    public function testAuthenticateFailureAnonymousNotExistentEmptyLoginWithTokenAuth()
-    {
-        // API authentication; anonymous user doesn't exist yet
-        $rc = $this->authenticate($login = null, $authToken = 'anonymous');
-        $this->assertFailedLogin($rc);
-    }
-
-    /**
-     * @group Plugins
-     */
-    public function testAuthenticateFailureAnonymousNotExistentWithLoginAndTokenAuth()
-    {
-        // anonymous user doesn't exist yet
-        $rc = $this->authenticate($login = 'anonymous', $authToken = 'anonymous');
-        $this->assertFailedLogin($rc);
-    }
-
-    /**
-     * @group Plugins
-     */
-    public function testAuthenticateFailureAnonymousWithLogin()
-    {
-        DbHelper::createAnonymousUser();
-
-        // missing token_auth
-        $rc = $this->authenticate($login = 'anonymous', $authToken = '');
-        $this->assertFailedLogin($rc);
-    }
-
-    /**
-     * @group Plugins
-     */
-    public function testAuthenticateFailureAnonymousEmptyLoginWithTokenAuth()
-    {
-        DbHelper::createAnonymousUser();
-
-        // empty login
-        $rc = $this->authenticate($login = '', $authToken = 'anonymous');
-        $this->assertFailedLogin($rc);
-    }
-
-    /**
-     * @group Plugins
-     */
-    public function testAuthenticateFailureAnonymousLoginTokenAuthMissmatch()
-    {
-        DbHelper::createAnonymousUser();
-
-        // not equal
-        $rc = $this->authenticate($login = 'anonymous', $authToken = 0);
-        $this->assertFailedLogin($rc);
-    }
-
-    /**
-     * @group Plugins
-     */
-    public function testAuthenticateSuccessAnonymousWithTokenAuth()
-    {
-        DbHelper::createAnonymousUser();
-
-        // API authentication
-        $rc = $this->authenticate($login = null, $authToken = 'anonymous');
-        $this->assertUserLogin($rc, $login = 'anonymous', $tokenLength = 9);
-    }
-
-    /**
-     * @group Plugins
-     */
-    public function testAuthenticateSuccessAnonymous()
-    {
-        DbHelper::createAnonymousUser();
-
-        // valid login & token auth
-        $rc = $this->authenticate($login = 'anonymous', $authToken = 'anonymous');
-        $this->assertUserLogin($rc, $login = 'anonymous', $tokenLength = 9);
-    }
-
-    /**
-     * @group Plugins
-     */
-    public function testAuthenticateFailureUserEmptyTokenAuth()
-    {
-        $user = $this->_setUpUser();
-
-        // empty token auth
-        $rc = $this->authenticate($login = $user['login'], $authToken = '');
-        $this->assertFailedLogin($rc);
-    }
-
-    /**
-     * @group Plugins
-     */
-    public function testAuthenticateFailureUserInvalidTokenAuth()
-    {
-        $user = $this->_setUpUser();
-
-        // not a token auth
-        $rc = $this->authenticate($login = $user['login'], $authToken = $user['password']);
-        $this->assertFailedLogin($rc);
-    }
-
-    /**
-     * @group Plugins
-     */
-    public function testAuthenticateFailureUserInvalidTokenAuth2()
-    {
-        $user = $this->_setUpUser();
-
-        // not a token auth
-        $rc = $this->authenticate($login = $user['login'], $authToken = md5($user['password']));
-        $this->assertFailedLogin($rc);
-    }
-
-    /**
-     * @group Plugins
-     */
-    public function testAuthenticateFailureUserEmptyLogin()
-    {
-        $user = $this->_setUpUser();
-
-        // empty login
-        $rc = $this->authenticate($login = '', $user['tokenAuth']);
-        $this->assertFailedLogin($rc);
-    }
-
-    /**
-     * @group Plugins
-     */
-    public function testAuthenticateFailureUserWithSuperUserAccessEmptyLogin()
-    {
-        $user = $this->_setUpUser();
-        $this->_setUpSuperUserAccessViaDb();
-
-        // empty login
-        $rc = $this->authenticate($login = '', $user['tokenAuth']);
-        $this->assertFailedLogin($rc);
-    }
-
-    /**
-     * @group Plugins
-     */
-    public function testAuthenticateFailureUserLoginTokenAuthMissmatch()
-    {
-        $this->_setUpUser();
-
-        // not equal
-        $rc = $this->authenticate($login = 0, $authToken = 0);
-        $this->assertFailedLogin($rc);
-    }
-
-    /**
-     * @group Plugins
-     */
-    public function testAuthenticateFailureUserLoginTokenAuthMissmatch2()
-    {
-        $user = $this->_setUpUser();
-
-        // not equal
-        $rc = $this->authenticate($login = 0, $user['tokenAuth']);
-        $this->assertFailedLogin($rc);
-    }
-
-    /**
-     * @group Plugins
-     */
-    public function testAuthenticateFailureUserLoginTokenAuthMissmatch3()
-    {
-        $user = $this->_setUpUser();
-
-        // not equal
-        $rc = $this->authenticate($user['login'], $authToken = 0);
-        $this->assertFailedLogin($rc);
-    }
-
-    /**
-     * @group Plugins
-     */
-    public function testAuthenticateFailureUserWithSuperUserAccessLoginTokenAuthMissmatch()
-    {
-        $user = $this->_setUpUser();
-        $this->_setUpSuperUserAccessViaDb();
-
-        // not equal
-        $rc = $this->authenticate($login = null, $authToken = $user['password']);
-        $this->assertFailedLogin($rc);
-    }
-
-    /**
-     * @group Plugins
-     */
-    public function testAuthenticateSuccessUserTokenAuth()
-    {
-        $user = $this->_setUpUser();
-
-        // API authentication
-        $rc = $this->authenticate($login = null, $user['tokenAuth']);
-        $this->assertUserLogin($rc);
-    }
-
-    /**
-     * @group Plugins
-     */
-    public function testAuthenticateSuccessUserWithSuperUserAccessByTokenAuth()
-    {
-        $user = $this->_setUpUser();
-        $this->_setUpSuperUserAccessViaDb();
-
-        // API authentication
-        $rc = $this->authenticate($login = null, $user['tokenAuth']);
-        $this->assertSuperUserLogin($rc, 'user');
-    }
-
-    /**
-     * @group Plugins
-     */
-    public function testAuthenticateSuccessUserLoginAndTokenAuth()
-    {
-        $user = $this->_setUpUser();
-
-        // valid login & token auth
-        $rc = $this->authenticate($user['login'], $user['tokenAuth']);
-        $this->assertUserLogin($rc);
-    }
-
-    /**
-     * @group Plugins
-     */
-    public function testAuthenticateSuccessUserWithSuperUserAccessLoginAndTokenAuth()
-    {
-        $user = $this->_setUpUser();
-        $this->_setUpSuperUserAccessViaDb();
-
-        // valid login & token auth
-        $rc = $this->authenticate($user['login'], $user['tokenAuth']);
-        $this->assertSuperUserLogin($rc, 'user');
-    }
-
-    /**
-     * @group Plugins
-     */
-    public function testAuthenticateSuccessLoginAndHashedTokenAuth()
-    {
-        $user = $this->_setUpUser();
-        $hash = \Piwik\Plugins\Login\SessionInitializer::getHashTokenAuth($user['login'], $user['tokenAuth']);
-
-        // valid login & hashed token auth
-        $rc = $this->authenticate($user['login'], $tokenAuth = $hash);
-        $this->assertUserLogin($rc);
-    }
-
-    protected function _setUpUser()
-    {
-        $user = array('login'    => 'user',
-                      'password' => 'geqgeagae',
-                      'email'    => 'test@test.com',
-                      'alias'    => 'alias',
-                      'superuser_access' => 0);
-
-        API::getInstance()->addUser($user['login'], $user['password'], $user['email'], $user['alias']);
-
-        $user['tokenAuth'] = API::getInstance()->getTokenAuth($user['login'], md5($user['password']));
-
-        return $user;
-    }
-
-    private function _setUpSuperUserAccessViaDb()
-    {
-        API::getInstance()->setSuperUserAccess('user', true);
-    }
-
-    private function authenticate($login, $tokenAuth)
-    {
-        $this->auth->setLogin($login);
-        $this->auth->setTokenAuth($tokenAuth);
-
-        return $this->auth->authenticate();
-    }
-
-    private function assertFailedLogin(AuthResult $authResult)
-    {
-        $this->assertEquals(AuthResult::FAILURE, $authResult->getCode());
-    }
-
-    private function assertSuperUserLogin(AuthResult $authResult, $login = 'superUserLogin', $tokenLength = 32)
-    {
-        $this->assertEquals(AuthResult::SUCCESS_SUPERUSER_AUTH_CODE, $authResult->getCode());
-        $this->assertEquals($login, $authResult->getIdentity());
-        $this->assertEquals($tokenLength, strlen($authResult->getTokenAuth()));
-    }
-
-    private function assertUserLogin(AuthResult $authResult, $login = 'user', $tokenLength = 32)
-    {
-        $this->assertEquals(AuthResult::SUCCESS, $authResult->getCode());
-        $this->assertEquals($login, $authResult->getIdentity());
-        $this->assertEquals($tokenLength, strlen($authResult->getTokenAuth()));
-    }
-
-}
diff --git a/tests/PHPUnit/Integration/Plugins/MobileMessagingTest.php b/tests/PHPUnit/Integration/Plugins/MobileMessagingTest.php
deleted file mode 100644
index a4ed9aa671..0000000000
--- a/tests/PHPUnit/Integration/Plugins/MobileMessagingTest.php
+++ /dev/null
@@ -1,258 +0,0 @@
-<?php
-/**
- * Piwik - free/libre analytics platform
- *
- * @link http://piwik.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- */
-
-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;
-
-/**
- * Class Plugins_MobileMessagingTest
- *
- * @group Plugins
- */
-class Plugins_MobileMessagingTest extends IntegrationTestCase
-{
-    protected $idSiteAccess;
-
-    public function setUp()
-    {
-        parent::setUp();
-
-        // setup the access layer
-        $pseudoMockAccess = new FakeAccess;
-        FakeAccess::$superUser = true;
-        //finally we set the user as a Super User by default
-        Access::setSingletonInstance($pseudoMockAccess);
-
-        $this->idSiteAccess = APISitesManager::getInstance()->addSite("test", "http://test");
-
-        \Piwik\Plugin\Manager::getInstance()->loadPlugins(array('ScheduledReports', 'MobileMessaging', 'MultiSites'));
-        \Piwik\Plugin\Manager::getInstance()->installLoadedPlugins();
-    }
-
-    /**
-     * When the MultiSites plugin is not activated, the SMS content should invite the user to activate it back
-     *
-     * @group Plugins
-     */
-    public function testWarnUserViaSMSMultiSitesDeactivated()
-    {
-        // safety net
-        \Piwik\Plugin\Manager::getInstance()->loadPlugins(array('ScheduledReports', 'MobileMessaging'));
-        $this->assertFalse(\Piwik\Plugin\Manager::getInstance()->isPluginActivated('MultiSites'));
-
-        $APIScheduledReports = APIScheduledReports::getInstance();
-        $reportId = $APIScheduledReports->addReport(
-            $this->idSiteAccess,
-            'description',
-            'month',
-            0,
-            'mobile',
-            'sms',
-            array(),
-            array("phoneNumbers" => array('33698896656'))
-        );
-
-        list($outputFilename, $prettyDate, $websiteName, $additionalFiles) =
-            $APIScheduledReports->generateReport(
-                $reportId,
-                '01-01-2010',
-                'en',
-                2
-            );
-
-        $handle = fopen($outputFilename, "r");
-        $contents = fread($handle, filesize($outputFilename));
-        fclose($handle);
-
-        $this->assertEquals(
-            \Piwik\Piwik::translate('MobileMessaging_MultiSites_Must_Be_Activated'),
-            $contents
-        );
-    }
-
-    /**
-     * Dataprovider for testTruncate
-     */
-    public function getTruncateTestCases()
-    {
-
-        $stdGSMx459 = str_repeat('a', 459);
-
-        $extGSMx229 = str_repeat('€', 229);
-
-        $alternatedGSMx153 = str_repeat('a€', 153);
-
-        $GSMWithRegExpSpecialChars = $stdGSMx459 . '[\^$.|?*/+()';
-
-        $UCS2x201 = str_repeat('控', 201);
-
-        // appended strings
-        $stdGSMAppendedString = 'too long';
-        $extGSMAppendedString = '[too long]';
-        $UCS2AppendedString = '[控控]';
-
-        return array(
-
-            // maximum number of standard GSM characters
-            array($stdGSMx459, $stdGSMx459, 3, 'N/A'),
-
-            // maximum number of extended GSM characters
-            array($extGSMx229, $extGSMx229, 3, 'N/A'),
-
-            // maximum number of alternated GSM characters
-            array($alternatedGSMx153, $alternatedGSMx153, 3, 'N/A'),
-
-            // standard GSM, one 'a' too many, appended with standard GSM characters
-            array(str_repeat('a', 451) . $stdGSMAppendedString, $stdGSMx459 . 'a', 3, $stdGSMAppendedString),
-
-            // standard GSM, one 'a' too many, appended with extended GSM characters
-            array(str_repeat('a', 447) . $extGSMAppendedString, $stdGSMx459 . 'a', 3, $extGSMAppendedString),
-
-            // standard GSM, one 'a' too many, appended with UCS2 characters
-            array(str_repeat('a', 197) . $UCS2AppendedString, $stdGSMx459 . 'a', 3, $UCS2AppendedString),
-
-            // extended GSM, one '€' too many, appended with standard GSM characters
-            array(str_repeat('€', 225) . $stdGSMAppendedString, $extGSMx229 . '€', 3, $stdGSMAppendedString),
-
-            // extended GSM, one '€' too many, appended with extended GSM characters
-            array(str_repeat('€', 223) . $extGSMAppendedString, $extGSMx229 . '€', 3, $extGSMAppendedString),
-
-            // extended GSM, one '€' too many, appended with UCS2 characters
-            array(str_repeat('€', 197) . $UCS2AppendedString, $extGSMx229 . '€', 3, $UCS2AppendedString),
-
-            // alternated GSM, one 'a' too many, appended with standard GSM characters
-            array(str_repeat('a€', 150) . 'a' . $stdGSMAppendedString, $alternatedGSMx153 . 'a', 3, $stdGSMAppendedString),
-
-            // alternated GSM, one 'a' too many, appended with extended GSM characters
-            array(str_repeat('a€', 149) . $extGSMAppendedString, $alternatedGSMx153 . 'a', 3, $extGSMAppendedString),
-
-            // alternated GSM, one 'a' too many, appended with UCS2 characters
-            array(str_repeat('a€', 98) . 'a' . $UCS2AppendedString, $alternatedGSMx153 . 'a', 3, $UCS2AppendedString),
-
-            // alternated GSM, one '€' too many, appended with standard GSM characters
-            array(str_repeat('a€', 150) . 'a' . $stdGSMAppendedString, $alternatedGSMx153 . '€', 3, $stdGSMAppendedString),
-
-            // alternated GSM, one '€' too many, appended with extended GSM characters
-            array(str_repeat('a€', 149) . $extGSMAppendedString, $alternatedGSMx153 . '€', 3, $extGSMAppendedString),
-
-            // alternated GSM, one '€' too many, appended with UCS2 characters
-            array(str_repeat('a€', 98) . 'a' . $UCS2AppendedString, $alternatedGSMx153 . '€', 3, $UCS2AppendedString),
-
-            // GSM with RegExp reserved special chars
-            array(str_repeat('a', 451) . $stdGSMAppendedString, $GSMWithRegExpSpecialChars, 3, $stdGSMAppendedString),
-
-            // maximum number of UCS-2 characters
-            array($UCS2x201, $UCS2x201, 3, 'N/A'),
-
-            // UCS-2, one '控' too many, appended with UCS2 characters
-            array(str_repeat('控', 197) . $UCS2AppendedString, $UCS2x201 . '控', 3, $UCS2AppendedString),
-
-            // UCS-2, one '控' too many, appended with standard GSM characters
-            array(str_repeat('控', 193) . $stdGSMAppendedString, $UCS2x201 . '控', 3, $stdGSMAppendedString)
-        );
-    }
-
-    /**
-     * @group Plugins
-     *
-     * @dataProvider getTruncateTestCases
-     */
-    public function testTruncate($expected, $stringToTruncate, $maximumNumberOfConcatenatedSMS, $appendedString)
-    {
-        $this->assertEquals(
-            $expected,
-            SMSProvider::truncate($stringToTruncate, $maximumNumberOfConcatenatedSMS, $appendedString)
-        );
-    }
-
-    /**
-     * Dataprovider for testContainsUCS2Characters
-     */
-    public function getContainsUCS2CharactersTestCases()
-    {
-        return array(
-            array(false, 'too long'),
-            array(false, '[too long]'),
-            array(false, '€'),
-            array(true, '[控控]'),
-        );
-    }
-
-    /**
-     * @group Plugins
-     *
-     * @dataProvider getContainsUCS2CharactersTestCases
-     */
-    public function testContainsUCS2Characters($expected, $stringToTest)
-    {
-        $this->assertEquals(
-            $expected,
-            SMSProvider::containsUCS2Characters($stringToTest)
-        );
-    }
-
-    /**
-     * @group Plugins
-     */
-    public function testSanitizePhoneNumber()
-    {
-        $this->assertEquals('676932647', APIMobileMessaging::sanitizePhoneNumber('  6  76 93 26 47'));
-    }
-
-    /**
-     * @group Plugins
-     */
-    public function testPhoneNumberIsSanitized()
-    {
-        $mobileMessagingAPI = APIMobileMessaging::getInstance();
-        $mobileMessagingAPI->setSMSAPICredential('StubbedProvider', '');
-        $mobileMessagingAPI->addPhoneNumber('  6  76 93 26 47');
-        $this->assertEquals('676932647', key($mobileMessagingAPI->getPhoneNumbers()));
-    }
-
-    /**
-     * Dataprovider for testSendReport
-     */
-    public function getSendReportTestCases()
-    {
-        return array(
-            array('reportContent', '0101010101', 'Piwik.org', 'reportContent', '0101010101', 'Piwik.org'),
-            array('reportContent', '0101010101', 'General_Reports', 'reportContent', '0101010101', 'General_MultiSitesSummary'),
-        );
-    }
-
-    /**
-     * @group Plugins
-     *
-     * @dataProvider getSendReportTestCases
-     */
-    public function testSendReport($expectedReportContent, $expectedPhoneNumber, $expectedFrom, $reportContent, $phoneNumber, $reportSubject)
-    {
-        $report = array(
-            'parameters' => array(MobileMessaging::PHONE_NUMBERS_PARAMETER => array($phoneNumber)),
-        );
-
-        $stubbedAPIMobileMessaging = $this->getMock('\\Piwik\\Plugins\\MobileMessaging\\API', array('sendSMS', 'getInstance'), $arguments = array(), $mockClassName = '', $callOriginalConstructor = false);
-        $stubbedAPIMobileMessaging->expects($this->once())->method('sendSMS')->with(
-            $this->equalTo($expectedReportContent, 0),
-            $this->equalTo($expectedPhoneNumber, 1),
-            $this->equalTo($expectedFrom, 2)
-        );
-
-        \Piwik\Plugins\MobileMessaging\API::setSingletonInstance($stubbedAPIMobileMessaging);
-
-        $mobileMessaging = new MobileMessaging();
-        $mobileMessaging->sendReport(MobileMessaging::MOBILE_TYPE, $report, $reportContent, null, null, $reportSubject, null, null);
-
-        \Piwik\Plugins\MobileMessaging\API::unsetInstance();
-    }
-}
diff --git a/tests/PHPUnit/Integration/Plugins/MultiSitesTest.php b/tests/PHPUnit/Integration/Plugins/MultiSitesTest.php
deleted file mode 100644
index c973a7e839..0000000000
--- a/tests/PHPUnit/Integration/Plugins/MultiSitesTest.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-/**
- * Piwik - free/libre analytics platform
- *
- * @link http://piwik.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- */
-
-use Piwik\Access;
-use Piwik\Plugins\MultiSites\API as APIMultiSites;
-use Piwik\Plugins\SitesManager\API as APISitesManager;
-
-/**
- * Class Plugins_MultiSitesTest
- *
- * @group Plugins
- */
-class Plugins_MultiSitesTest extends IntegrationTestCase
-{
-    protected $idSiteAccess;
-
-    public function setUp()
-    {
-        parent::setUp();
-
-        $access = Access::getInstance();
-        $access->setSuperUserAccess(true);
-
-        $this->idSiteAccess = APISitesManager::getInstance()->addSite("test", "http://test");
-
-        \Piwik\Plugin\Manager::getInstance()->loadPlugins(array('MultiSites', 'VisitsSummary', 'Actions'));
-        \Piwik\Plugin\Manager::getInstance()->installLoadedPlugins();
-    }
-
-    /**
-     * Testing that getOne returns a row even when there are no data
-     * This is necessary otherwise ResponseBuilder throws 'Call to a member function getColumns() on a non-object'
-     *
-     * @group Plugins
-     */
-    public function testWhenNoDataGetOneReturnsRow()
-    {
-        $dataTable = APIMultiSites::getInstance()->getOne($this->idSiteAccess, 'month', '01-01-2010');
-        $this->assertEquals(1, $dataTable->getRowsCount());
-
-        // safety net
-        $this->assertEquals(0, $dataTable->getFirstRow()->getColumn('nb_visits'));
-    }
-}
diff --git a/tests/PHPUnit/Integration/Plugins/PrivacyManagerConfigTest.php b/tests/PHPUnit/Integration/Plugins/PrivacyManagerConfigTest.php
deleted file mode 100644
index 06a5b691e7..0000000000
--- a/tests/PHPUnit/Integration/Plugins/PrivacyManagerConfigTest.php
+++ /dev/null
@@ -1,99 +0,0 @@
-<?php
-/**
- * Piwik - free/libre analytics platform
- *
- * @link http://piwik.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- */
-
-use Piwik\Option;
-use Piwik\Plugins\PrivacyManager\Config as PrivacyManagerConfig;
-
-/**
- * Class Plugins_SitesManagerTest
- *
- * @group Plugins
- */
-class Plugins_PrivacyManagerConfigTest extends IntegrationTestCase
-{
-    /**
-     * @var PrivacyManagerConfig
-     */
-    private $config;
-
-    public function setUp()
-    {
-        parent::setUp();
-
-        $this->config = new PrivacyManagerConfig();
-    }
-
-    public function test_useAnonymizedIpForVisitEnrichment()
-    {
-        $this->assertTrue($this->config->useAnonymizedIpForVisitEnrichment);
-
-        $this->config->useAnonymizedIpForVisitEnrichment = false;
-
-        $this->assertFalse($this->config->useAnonymizedIpForVisitEnrichment);
-
-        $this->config->useAnonymizedIpForVisitEnrichment = true;
-
-        $this->assertTrue($this->config->useAnonymizedIpForVisitEnrichment);
-    }
-
-    public function test_doNotTrackEnabled()
-    {
-        $this->assertTrue($this->config->doNotTrackEnabled);
-
-        $this->config->doNotTrackEnabled = true;
-
-        $this->assertTrue($this->config->doNotTrackEnabled);
-
-        $this->config->doNotTrackEnabled = false;
-
-        $this->assertFalse($this->config->doNotTrackEnabled);
-    }
-
-    public function test_ipAnonymizerEnabled()
-    {
-        $this->assertFalse($this->config->ipAnonymizerEnabled);
-
-        $this->config->ipAnonymizerEnabled = true;
-
-        $this->assertTrue($this->config->ipAnonymizerEnabled);
-    }
-
-    public function test_ipAddressMaskLength()
-    {
-        $this->assertSame(1, $this->config->ipAddressMaskLength);
-
-        $this->config->ipAddressMaskLength = '19';
-
-        $this->assertSame(19, $this->config->ipAddressMaskLength);
-    }
-
-    public function test_setTrackerCacheContent()
-    {
-        $content = $this->config->setTrackerCacheGeneral(array('existingEntry' => 'test'));
-
-        $expected = array(
-            'existingEntry' => 'test',
-            'PrivacyManager.ipAddressMaskLength' => 1,
-            'PrivacyManager.ipAnonymizerEnabled' => false,
-            'PrivacyManager.doNotTrackEnabled'   => true,
-            'PrivacyManager.useAnonymizedIpForVisitEnrichment' => true,
-        );
-
-        $this->assertEquals($expected, $content);
-    }
-
-    public function test_setTrackerCacheContent_ShouldGetValuesFromConfig()
-    {
-        Option::set('PrivacyManager.ipAddressMaskLength', '232');
-
-        $content = $this->config->setTrackerCacheGeneral(array('existingEntry' => 'test'));
-
-        $this->assertEquals(232, $content['PrivacyManager.ipAddressMaskLength']);
-    }
-
-}
diff --git a/tests/PHPUnit/Integration/Plugins/PrivacyManagerTest.php b/tests/PHPUnit/Integration/Plugins/PrivacyManagerTest.php
deleted file mode 100644
index ac95705bd3..0000000000
--- a/tests/PHPUnit/Integration/Plugins/PrivacyManagerTest.php
+++ /dev/null
@@ -1,83 +0,0 @@
-<?php
-/**
- * Piwik - free/libre analytics platform
- *
- * @link http://piwik.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- */
-
-use Piwik\Plugins\PrivacyManager\PrivacyManager;
-
-/**
- * Class Plugins_SitesManagerTest
- *
- * @group Plugins
- */
-class Plugins_PrivacyManagerTest extends IntegrationTestCase
-{
-    /**
-     * @var PrivacyManager
-     */
-    private $manager;
-
-    public function setUp()
-    {
-        parent::setUp();
-
-        $this->manager = new PrivacyManager();
-        \Piwik\Option::set('delete_logs_enable', 1);
-        \Piwik\Option::set('delete_logs_older_than', 270);
-        \Piwik\Option::set('delete_reports_keep_week_reports', 1);
-    }
-
-    public function test_getPurgeDataSettings_shouldUseOnlyConfigValuesIfUIisDisabled()
-    {
-        $this->setUIEnabled(false);
-
-        $settings = $this->manager->getPurgeDataSettings();
-        $expected = $this->getDefaultPurgeSettings();
-
-        $this->assertEquals($expected, $settings);
-    }
-
-    public function test_getPurgeDataSettings_shouldAlsoUseOptionValuesIfUIisEnabled()
-    {
-        $this->setUIEnabled(true);
-
-        $settings = $this->manager->getPurgeDataSettings();
-        $expected = $this->getDefaultPurgeSettings();
-
-        $expected['delete_logs_enable'] = 1;
-        $expected['delete_logs_older_than'] = 270;
-        $expected['delete_reports_keep_week_reports'] = 1;
-
-        $this->assertEquals($expected, $settings);
-    }
-
-    private function setUIEnabled($enabled)
-    {
-        \Piwik\Config::getInstance()->General['enable_delete_old_data_settings_admin'] = $enabled;
-    }
-
-    private function getDefaultPurgeSettings()
-    {
-        $expected = array(
-            'delete_logs_enable' => 0,
-            'delete_logs_schedule_lowest_interval' => 7,
-            'delete_logs_older_than' => 180,
-            'delete_logs_max_rows_per_query' => 100000,
-            'enable_auto_database_size_estimate' => 1,
-            'delete_reports_enable' => 0,
-            'delete_reports_older_than' => 12,
-            'delete_reports_keep_basic_metrics' => 1,
-            'delete_reports_keep_day_reports' => 0,
-            'delete_reports_keep_week_reports' => 0,
-            'delete_reports_keep_month_reports' => 1,
-            'delete_reports_keep_year_reports' => 1,
-            'delete_reports_keep_range_reports' => 0,
-            'delete_reports_keep_segment_reports' => 0,
-        );
-        return $expected;
-    }
-
-}
diff --git a/tests/PHPUnit/Integration/Plugins/ScheduledReportsTest.php b/tests/PHPUnit/Integration/Plugins/ScheduledReportsTest.php
deleted file mode 100644
index 89ee99e099..0000000000
--- a/tests/PHPUnit/Integration/Plugins/ScheduledReportsTest.php
+++ /dev/null
@@ -1,507 +0,0 @@
-<?php
-/**
- * Piwik - free/libre analytics platform
- *
- * @link http://piwik.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- */
-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;
-
-require_once 'ScheduledReports/ScheduledReports.php';
-
-/**
- * Class Plugins_ScheduledReportsTest
- *
- * @group Plugins
- */
-class Plugins_ScheduledReportsTest extends IntegrationTestCase
-{
-    private $idSite = 1;
-
-    public function setUp()
-    {
-        parent::setUp();
-
-        // setup the access layer
-        self::setSuperUser();
-        \Piwik\Plugin\Manager::getInstance()->loadPlugins(array('API', 'UserCountry', 'ScheduledReports', 'MobileMessaging'));
-        \Piwik\Plugin\Manager::getInstance()->installLoadedPlugins();
-
-        APISitesManager::getInstance()->addSite("Test", array("http://piwik.net"));
-
-        APISitesManager::getInstance()->addSite("Test", array("http://piwik.net"));
-        FakeAccess::setIdSitesView(array($this->idSite, 2));
-        APIScheduledReports::$cache = array();
-    }
-
-    /**
-     * @group Plugins
-     */
-    public function testAddReportGetReports()
-    {
-        $data = array(
-            'idsite'      => $this->idSite,
-            'description' => 'test description"',
-            'type'        => 'email',
-            'period'      => ScheduledTime::PERIOD_DAY,
-            'hour'        => '4',
-            'format'      => 'pdf',
-            'reports'     => array('UserCountry_getCountry'),
-            'parameters'  => array(
-                'displayFormat'    => '1',
-                'emailMe'          => true,
-                'additionalEmails' => array('test@test.com', 't2@test.com'),
-                'evolutionGraph'   => true
-            )
-        );
-
-        $dataWebsiteTwo = $data;
-        $dataWebsiteTwo['idsite'] = 2;
-        $dataWebsiteTwo['period'] = ScheduledTime::PERIOD_MONTH;
-
-        self::addReport($dataWebsiteTwo);
-
-        // Testing getReports without parameters
-        $tmp = APIScheduledReports::getInstance()->getReports();
-        $report = reset($tmp);
-        $this->assertReportsEqual($report, $dataWebsiteTwo);
-
-        $idReport = self::addReport($data);
-
-        // Passing 3 parameters
-        $tmp = APIScheduledReports::getInstance()->getReports($this->idSite, $data['period'], $idReport);
-        $report = reset($tmp);
-        $this->assertReportsEqual($report, $data);
-
-        // Passing only idsite
-        $tmp = APIScheduledReports::getInstance()->getReports($this->idSite);
-        $report = reset($tmp);
-        $this->assertReportsEqual($report, $data);
-
-        // Passing only period
-        $tmp = APIScheduledReports::getInstance()->getReports($idSite = false, $data['period']);
-        $report = reset($tmp);
-        $this->assertReportsEqual($report, $data);
-
-        // Passing only idreport
-        $tmp = APIScheduledReports::getInstance()->getReports($idSite = false, $period = false, $idReport);
-        $report = reset($tmp);
-        $this->assertReportsEqual($report, $data);
-    }
-
-    /**
-     * @group Plugins
-     */
-    public function testGetReportsIdReportNotFound()
-    {
-        try {
-            APIScheduledReports::getInstance()->getReports($idSite = false, $period = false, $idReport = 1);
-        } catch (Exception $e) {
-            return;
-        }
-        $this->fail('Expected exception not raised');
-    }
-
-    /**
-     * @group Plugins
-     */
-    public function testGetReportsInvalidPermission()
-    {
-        try {
-            APIScheduledReports::getInstance()->getReports(
-                $idSite = 44,
-                $period = false,
-                self::addReport(self::getDailyPDFReportData($this->idSite))
-            );
-
-        } catch (Exception $e) {
-            return;
-        }
-        $this->fail('Expected exception not raised');
-    }
-
-    /**
-     * @group Plugins
-     */
-    public function testAddReportInvalidWebsite()
-    {
-        try {
-            self::addReport(self::getDailyPDFReportData(33));
-        } catch (Exception $e) {
-            return;
-        }
-        $this->fail('Expected exception not raised');
-    }
-
-    /**
-     * @group Plugins
-     */
-    public function testAddReportInvalidPeriod()
-    {
-        try {
-            $data = self::getDailyPDFReportData($this->idSite);
-            $data['period'] = 'dx';
-            self::addReport($data);
-        } catch (Exception $e) {
-            return;
-        }
-        $this->fail('Expected exception not raised');
-    }
-
-    /**
-     * @group Plugins
-     */
-    public function testUpdateReport()
-    {
-        $idReport = self::addReport(self::getDailyPDFReportData($this->idSite));
-        $dataAfter = self::getMonthlyEmailReportData($this->idSite);
-
-        self::updateReport($idReport, $dataAfter);
-
-        $reports = APIScheduledReports::getInstance()->getReports($idSite = false, $period = false, $idReport);
-
-        $this->assertReportsEqual(
-            reset($reports),
-            $dataAfter
-        );
-    }
-
-    /**
-     * @group Plugins
-     */
-    public function testDeleteReport()
-    {
-        // Deletes non existing report throws exception
-        try {
-            APIScheduledReports::getInstance()->deleteReport($idReport = 1);
-            $this->fail('Exception not raised');
-        } catch (Exception $e) {
-        }
-
-        $idReport = self::addReport(self::getMonthlyEmailReportData($this->idSite));
-        $this->assertEquals(1, count(APIScheduledReports::getInstance()->getReports()));
-        APIScheduledReports::getInstance()->deleteReport($idReport);
-        $this->assertEquals(0, count(APIScheduledReports::getInstance()->getReports()));
-    }
-
-    /**
-     * @group Plugins
-     */
-    public function testGetTopMenuTranslationKeyMobileMessagingInactive()
-    {
-        // unload MobileMessaging plugin
-        \Piwik\Plugin\Manager::getInstance()->loadPlugins(array('ScheduledReports'));
-
-        $pdfReportPlugin = new Menu();
-        $this->assertEquals(
-            Menu::PDF_REPORTS_TOP_MENU_TRANSLATION_KEY,
-            $pdfReportPlugin->getTopMenuTranslationKey()
-        );
-    }
-
-    /**
-     * @group Plugins
-     */
-    public function testGetTopMenuTranslationKeyUserIsAnonymous()
-    {
-        $anonymousAccess = new FakeAccess;
-        FakeAccess::$identity = 'anonymous';
-        Access::setSingletonInstance($anonymousAccess);
-
-        $pdfReportPlugin = new Menu();
-        $this->assertEquals(
-            Menu::MOBILE_MESSAGING_TOP_MENU_TRANSLATION_KEY,
-            $pdfReportPlugin->getTopMenuTranslationKey()
-        );
-    }
-
-    /**
-     * top menu should display 'Email & SMS reports' when the user has set-up a valid mobile provider account
-     * even though there is no sms reports configured
-     *
-     * @group Plugins
-     */
-    public function testGetTopMenuTranslationKeyNoReportMobileAccountOK()
-    {
-        // set mobile provider account
-        self::setSuperUser();
-        APIMobileMessaging::getInstance()->setSMSAPICredential('StubbedProvider', '');
-
-        $pdfReportPlugin = new Menu();
-        $this->assertEquals(
-            Menu::MOBILE_MESSAGING_TOP_MENU_TRANSLATION_KEY,
-            $pdfReportPlugin->getTopMenuTranslationKey()
-        );
-    }
-
-    /**
-     * top menu should display 'Email reports' when the user has not set-up a valid mobile provider account
-     * and no reports at all have been configured
-     *
-     * @group Plugins
-     */
-    public function testGetTopMenuTranslationKeyNoReportMobileAccountKO()
-    {
-        $pdfReportPlugin = new Menu();
-        $this->assertEquals(
-            Menu::PDF_REPORTS_TOP_MENU_TRANSLATION_KEY,
-            $pdfReportPlugin->getTopMenuTranslationKey()
-        );
-    }
-
-    /**
-     * top menu should display 'Email & SMS reports' if there is at least one sms report
-     * whatever the status of the mobile provider account
-     *
-     * @group Plugins
-     */
-    public function testGetTopMenuTranslationKeyOneSMSReportMobileAccountKO()
-    {
-        APIScheduledReports::getInstance()->addReport(
-            1,
-            '',
-            ScheduledTime::PERIOD_DAY,
-            0,
-            MobileMessaging::MOBILE_TYPE,
-            MobileMessaging::SMS_FORMAT,
-            array(),
-            array(
-                 MobileMessaging::PHONE_NUMBERS_PARAMETER => array()
-            )
-        );
-
-        $pdfReportPlugin = new Menu();
-        $this->assertEquals(
-            Menu::MOBILE_MESSAGING_TOP_MENU_TRANSLATION_KEY,
-            $pdfReportPlugin->getTopMenuTranslationKey()
-        );
-    }
-
-    /**
-     * top menu should display 'Email reports' if there are no SMS reports and at least one email report
-     * whatever the status of the mobile provider account
-     *
-     * @group Plugins
-     */
-    public function testGetTopMenuTranslationKeyNoSMSReportAccountOK()
-    {
-        // set mobile provider account
-        self::setSuperUser();
-        APIMobileMessaging::getInstance()->setSMSAPICredential('StubbedProvider', '');
-
-        self::addReport(self::getMonthlyEmailReportData($this->idSite));
-
-        $pdfReportPlugin = new Menu();
-        $this->assertEquals(
-            Menu::PDF_REPORTS_TOP_MENU_TRANSLATION_KEY,
-            $pdfReportPlugin->getTopMenuTranslationKey()
-        );
-    }
-
-    /**
-     * @group Plugins
-     */
-    public function testGetScheduledTasks()
-    {
-        // stub API to control getReports() return values
-        $report1 = self::getDailyPDFReportData($this->idSite);
-        $report1['idreport'] = 1;
-        $report1['hour'] = 0;
-        $report1['deleted'] = 0;
-
-        $report2 = self::getMonthlyEmailReportData($this->idSite);
-        $report2['idreport'] = 2;
-        $report2['idsite'] = 2;
-        $report2['hour'] = 0;
-        $report2['deleted'] = 0;
-
-        $report3 = self::getMonthlyEmailReportData($this->idSite);
-        $report3['idreport'] = 3;
-        $report3['deleted'] = 1; // should not be scheduled
-
-        $report4 = self::getMonthlyEmailReportData($this->idSite);
-        $report4['idreport'] = 4;
-        $report4['idsite'] = 1;
-        $report4['hour'] = 8;
-        $report4['deleted'] = 0;
-
-        $report5 = self::getMonthlyEmailReportData($this->idSite);
-        $report5['idreport'] = 5;
-        $report5['idsite'] = 2;
-        $report5['hour'] = 8;
-        $report5['deleted'] = 0;
-
-        // test no exception is raised when a scheduled report is set to never send
-        $report6 = self::getMonthlyEmailReportData($this->idSite);
-        $report6['idreport'] = 6;
-        $report6['period'] = ScheduledTime::PERIOD_NEVER;
-        $report6['deleted'] = 0;
-
-        $stubbedAPIScheduledReports = $this->getMock('\\Piwik\\Plugins\\ScheduledReports\\API', array('getReports', 'getInstance'), $arguments = array(), $mockClassName = '', $callOriginalConstructor = false);
-        $stubbedAPIScheduledReports->expects($this->any())->method('getReports')->will($this->returnValue(
-                array($report1, $report2, $report3, $report4, $report5, $report6))
-        );
-        \Piwik\Plugins\ScheduledReports\API::setSingletonInstance($stubbedAPIScheduledReports);
-
-        // initialize sites 1 and 2
-        Site::setSites( array(
-            1 => array('timezone' => 'Europe/Paris'),
-            2 => array('timezone' => 'UTC-6.5'),
-        ));
-
-        // expected tasks
-        $scheduleTask1 = ScheduledTime::factory('daily');
-        $scheduleTask1->setHour(0); // paris is UTC-1, period ends at 23h UTC
-        $scheduleTask1->setTimezone('Europe/Paris');
-
-        $scheduleTask2 = new Monthly();
-        $scheduleTask2->setHour(0); // site is UTC-6.5, period ends at 6h30 UTC, smallest resolution is hour
-        $scheduleTask2->setTimezone('UTC-6.5');
-
-        $scheduleTask3 = new Monthly();
-        $scheduleTask3->setHour(8); // paris is UTC-1, configured to be sent at 8h
-        $scheduleTask3->setTimezone('Europe/Paris');
-
-        $scheduleTask4 = new Monthly();
-        $scheduleTask4->setHour(8); // site is UTC-6.5, configured to be sent at 8h
-        $scheduleTask4->setTimezone('UTC-6.5');
-
-        $expectedTasks = array(
-            new ScheduledTask (APIScheduledReports::getInstance(), 'sendReport', 1, $scheduleTask1),
-            new ScheduledTask (APIScheduledReports::getInstance(), 'sendReport', 2, $scheduleTask2),
-            new ScheduledTask (APIScheduledReports::getInstance(), 'sendReport', 4, $scheduleTask3),
-            new ScheduledTask (APIScheduledReports::getInstance(), 'sendReport', 5, $scheduleTask4),
-        );
-
-        $pdfReportPlugin = new Tasks();
-        $pdfReportPlugin->schedule();
-        $tasks = $pdfReportPlugin->getScheduledTasks();
-        $this->assertEquals($expectedTasks, $tasks);
-
-        \Piwik\Plugins\ScheduledReports\API::unsetInstance();
-
-    }
-
-    /**
-     * Dataprovider for testGetReportSubjectAndReportTitle
-     */
-    public function getGetReportSubjectAndReportTitleTestCases()
-    {
-        return array(
-            array('Piwik.org', 'General_Website Piwik.org', 'Piwik.org', array('UserSettings_getBrowserType')),
-            array('Piwik.org', 'General_Website Piwik.org', 'Piwik.org', array('MultiSites_getAll', 'UserSettings_getBrowserType')),
-            array('General_MultiSitesSummary', 'General_MultiSitesSummary', 'Piwik.org', array('MultiSites_getAll')),
-        );
-    }
-
-    /**
-     * @group Plugins
-     *
-     * @dataProvider getGetReportSubjectAndReportTitleTestCases
-     */
-    public function testGetReportSubjectAndReportTitle($expectedReportSubject, $expectedReportTitle, $websiteName, $reports)
-    {
-        $getReportSubjectAndReportTitle = new ReflectionMethod(
-            '\\Piwik\\Plugins\\ScheduledReports\\API', 'getReportSubjectAndReportTitle'
-        );
-        $getReportSubjectAndReportTitle->setAccessible(true);
-
-        list($reportSubject, $reportTitle) = $getReportSubjectAndReportTitle->invoke( APIScheduledReports::getInstance(), $websiteName, $reports);
-        $this->assertEquals($expectedReportSubject, $reportSubject);
-        $this->assertEquals($expectedReportTitle, $reportTitle);
-    }
-
-    private function assertReportsEqual($report, $data)
-    {
-        foreach ($data as $key => $value) {
-            if ($key == 'description') $value = substr($value, 0, 250);
-            $this->assertEquals($value, $report[$key], "Error for $key for report " . var_export($report, true) . " and data " . var_export($data, true));
-        }
-    }
-
-    private static function addReport($data)
-    {
-        $idReport = APIScheduledReports::getInstance()->addReport(
-            $data['idsite'],
-            $data['description'],
-            $data['period'],
-            $data['hour'],
-            $data['type'],
-            $data['format'],
-            $data['reports'],
-            $data['parameters']
-        );
-        return $idReport;
-    }
-
-    private static function getDailyPDFReportData($idSite)
-    {
-        return array(
-            'idsite'      => $idSite,
-            'description' => 'test description"',
-            'period'      => ScheduledTime::PERIOD_DAY,
-            'hour'        => '7',
-            'type'        => 'email',
-            'format'      => 'pdf',
-            'reports'     => array('UserCountry_getCountry'),
-            'parameters'  => array(
-                'displayFormat'    => '1',
-                'emailMe'          => true,
-                'additionalEmails' => array('test@test.com', 't2@test.com'),
-                'evolutionGraph'   => false
-            )
-        );
-    }
-
-    private static function getMonthlyEmailReportData($idSite)
-    {
-        return array(
-            'idsite'      => $idSite,
-            'description' => 'very very long and possibly truncated description. very very long and possibly truncated description. very very long and possibly truncated description. very very long and possibly truncated description. very very long and possibly truncated description. ',
-            'period'      => ScheduledTime::PERIOD_MONTH,
-            'hour'        => '0',
-            'type'        => 'email',
-            'format'      => 'pdf',
-            'reports'     => array('UserCountry_getContinent'),
-            'parameters'  => array(
-                'displayFormat'    => '1',
-                'emailMe'          => false,
-                'additionalEmails' => array('blabla@ec.fr'),
-                'evolutionGraph'   => false
-            )
-        );
-    }
-
-    private static function updateReport($idReport, $data)
-    {
-        $idReport = APIScheduledReports::getInstance()->updateReport(
-            $idReport,
-            $data['idsite'],
-            $data['description'],
-            $data['period'],
-            $data['hour'],
-            $data['type'],
-            $data['format'],
-            $data['reports'],
-            $data['parameters']);
-        return $idReport;
-    }
-
-    private static function setSuperUser()
-    {
-        $pseudoMockAccess = new FakeAccess;
-        FakeAccess::$superUser = true;
-        Access::setSingletonInstance($pseudoMockAccess);
-    }
-}
diff --git a/tests/PHPUnit/Integration/Plugins/SegmentEditorTest.php b/tests/PHPUnit/Integration/Plugins/SegmentEditorTest.php
deleted file mode 100644
index ca91862564..0000000000
--- a/tests/PHPUnit/Integration/Plugins/SegmentEditorTest.php
+++ /dev/null
@@ -1,204 +0,0 @@
-<?php
-/**
- * Piwik - free/libre analytics platform
- *
- * @link http://piwik.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- */
-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;
-
-/**
- * Class Plugins_SegmentEditorTest
- *
- * @group Plugins
- */
-class Plugins_SegmentEditorTest extends IntegrationTestCase
-{
-    public function setUp()
-    {
-        parent::setUp();
-
-        \Piwik\Plugin\Manager::getInstance()->loadPlugin('SegmentEditor');
-        \Piwik\Plugin\Manager::getInstance()->installLoadedPlugins();
-
-        // setup the access layer
-        $pseudoMockAccess = new FakeAccess;
-        FakeAccess::setIdSitesView(array(1, 2));
-        FakeAccess::setIdSitesAdmin(array(3, 4));
-
-        //finally we set the user as a Super User by default
-        FakeAccess::$superUser = true;
-        FakeAccess::$superUserLogin = 'superusertest';
-        Access::setSingletonInstance($pseudoMockAccess);
-
-        APISitesManager::getInstance()->addSite('test', 'http://example.org');
-    }
-
-    /**
-     * @group Plugins
-     */
-    public function testAddInvalidSegment_ShouldThrow()
-    {
-        try {
-            API::getInstance()->add('name', 'test==test2');
-            $this->fail("Exception not raised.");
-        } catch (Exception $expected) {
-        }
-        try {
-            API::getInstance()->add('name', 'test');
-            $this->fail("Exception not raised.");
-        } catch (Exception $expected) {
-        }
-    }
-
-    /**
-     * @group Plugins
-     */
-    public function test_AddAndGet_SimpleSegment()
-    {
-        $name = 'name';
-        $definition = 'searches>1,visitIp!=127.0.0.1';
-        $idSegment = API::getInstance()->add($name, $definition);
-        $this->assertEquals($idSegment, 1);
-        $segment = API::getInstance()->get($idSegment);
-        unset($segment['ts_created']);
-        $expected = array(
-            'idsegment' => 1,
-            'name' => $name,
-            'definition' => $definition,
-            'login' => 'superUserLogin',
-            'enable_all_users' => '0',
-            'enable_only_idsite' => '0',
-            'auto_archive' => '0',
-            'ts_last_edit' => null,
-            'deleted' => '0',
-        );
-
-        $this->assertEquals($segment, $expected);
-    }
-
-    /**
-     * @group Plugins
-     */
-    public function test_AddAndGet_AnotherSegment()
-    {
-        $name = 'name';
-        $definition = 'searches>1,visitIp!=127.0.0.1';
-        $idSegment = API::getInstance()->add($name, $definition, $idSite = 1, $autoArchive = 1, $enabledAllUsers = 1);
-        $this->assertEquals($idSegment, 1);
-
-        // Testing get()
-        $segment = API::getInstance()->get($idSegment);
-        $expected = array(
-            'idsegment' => '1',
-            'name' => $name,
-            'definition' => $definition,
-            'login' => 'superUserLogin',
-            'enable_all_users' => '1',
-            'enable_only_idsite' => '1',
-            'auto_archive' => '1',
-            'ts_last_edit' => null,
-            'deleted' => '0',
-        );
-        unset($segment['ts_created']);
-        $this->assertEquals($segment, $expected);
-
-        // There is a segment to process for this particular site
-        $model = new Model();
-        $segments = $model->getSegmentsToAutoArchive($idSite);
-        unset($segments[0]['ts_created']);
-        $this->assertEquals($segments, array($expected));
-
-        // There is no segment to process for a non existing site
-        try {
-            $segments = $model->getSegmentsToAutoArchive(33);
-            $this->fail();
-        } catch(Exception $e) {
-            // expected
-        }
-
-        // There is no segment to process across all sites
-        $segments = $model->getSegmentsToAutoArchive($idSite = false);
-        $this->assertEquals($segments, array());
-    }
-
-    /**
-     * @group Plugins
-     */
-    public function test_UpdateSegment()
-    {
-        $name = 'name"';
-        $definition = 'searches>1,visitIp!=127.0.0.1';
-        $nameSegment1 = 'hello';
-        $idSegment1 = API::getInstance()->add($nameSegment1, 'searches==0', $idSite = 1, $autoArchive = 1, $enabledAllUsers = 1);
-        $idSegment2 = API::getInstance()->add($name, $definition, $idSite = 1, $autoArchive = 1, $enabledAllUsers = 1);
-
-        $updatedSegment = array(
-            'idsegment' => $idSegment2,
-            'name' =>   'NEW name',
-            'definition' =>  'searches==0',
-            'enable_only_idsite' => '0',
-            'enable_all_users' => '0',
-            'auto_archive' => '0',
-            'ts_last_edit' => Date::now()->getDatetime(),
-            'ts_created' => Date::now()->getDatetime(),
-            'login' => Piwik::getCurrentUserLogin(),
-            'deleted' => '0',
-        );
-        API::getInstance()->update($idSegment2,
-            $updatedSegment['name'],
-            $updatedSegment['definition'],
-            $updatedSegment['enable_only_idsite'],
-            $updatedSegment['auto_archive'],
-            $updatedSegment['enable_all_users']
-        );
-
-        $newSegment = API::getInstance()->get($idSegment2);
-
-        // avoid test failures for when ts_created/ts_last_edit are different by between 1/2 secs
-        $this->removeSecondsFromSegmentInfo($updatedSegment);
-        $this->removeSecondsFromSegmentInfo($newSegment);
-
-        $this->assertEquals($newSegment, $updatedSegment);
-
-        // Check the other segmenet was not updated
-        $newSegment = API::getInstance()->get($idSegment1);
-        $this->assertEquals($newSegment['name'], $nameSegment1);
-    }
-
-    /**
-     * @group Plugins
-     */
-    public function test_deleteSegment()
-    {
-        $idSegment1 = API::getInstance()->add('name 1', 'searches==0', $idSite = 1, $autoArchive = 1, $enabledAllUsers = 1);
-        $idSegment2 = API::getInstance()->add('name 2', 'searches>1,visitIp!=127.0.0.1', $idSite = 1, $autoArchive = 1, $enabledAllUsers = 1);
-
-        $deleted = API::getInstance()->delete($idSegment2);
-        $this->assertTrue($deleted);
-        try {
-            API::getInstance()->get($idSegment2);
-            $this->fail("getting deleted segment should have failed");
-        } catch(Exception $e) {
-            // expected
-        }
-
-        // and this should work
-        API::getInstance()->get($idSegment1);
-    }
-
-    private function removeSecondsFromSegmentInfo(&$segmentInfo)
-    {
-        $timestampProperties = array('ts_last_edit', 'ts_created');
-        foreach ($timestampProperties as $propertyName) {
-            if (isset($segmentInfo[$propertyName])) {
-                $segmentInfo[$propertyName] = substr($segmentInfo[$propertyName], 0, strlen($segmentInfo[$propertyName] - 2));
-            }
-        }
-    }
-}
diff --git a/tests/PHPUnit/Integration/Plugins/SitesManagerTest.php b/tests/PHPUnit/Integration/Plugins/SitesManagerTest.php
deleted file mode 100644
index cf54ee6140..0000000000
--- a/tests/PHPUnit/Integration/Plugins/SitesManagerTest.php
+++ /dev/null
@@ -1,993 +0,0 @@
-<?php
-/**
- * Piwik - free/libre analytics platform
- *
- * @link http://piwik.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- */
-use Piwik\Access;
-use Piwik\Plugins\SitesManager\API;
-use Piwik\Plugins\UsersManager\API as APIUsersManager;
-use Piwik\Site;
-
-/**
- * Class Plugins_SitesManagerTest
- *
- * @group Plugins
- */
-class Plugins_SitesManagerTest extends IntegrationTestCase
-{
-    public function setUp()
-    {
-        parent::setUp();
-
-        // setup the access layer
-        $pseudoMockAccess = new FakeAccess;
-        FakeAccess::$superUser = true;
-        Access::setSingletonInstance($pseudoMockAccess);
-    }
-
-    /**
-     * empty name -> exception
-     *
-     * @group Plugins
-     */
-    public function testAddSiteEmptyName()
-    {
-        try {
-            API::getInstance()->addSite("", array("http://piwik.net"));
-        } catch (Exception $e) {
-            return;
-        }
-        $this->fail('Expected exception not raised');
-    }
-
-    /**
-     * DataProvider for testAddSiteWrongUrls
-     */
-    public function getInvalidUrlData()
-    {
-        return array(
-            array(array()), // no urls
-            array(array("")),
-            array(""),
-            array("httpww://piwik.net"),
-            array("httpww://piwik.net/gqg~#"),
-        );
-    }
-
-    /**
-     * wrong urls -> exception
-     *
-     * @dataProvider getInvalidUrlData
-     * @group Plugins
-     */
-    public function testAddSiteWrongUrls($url)
-    {
-        try {
-            API::getInstance()->addSite("name", $url);
-        } catch (Exception $e) {
-            return;
-        }
-        $this->fail('Expected exception not raised');
-    }
-
-    /**
-     * Test with valid IPs
-     *
-     * @group Plugins
-     */
-    public function testAddSiteExcludedIpsAndtimezoneAndCurrencyAndExcludedQueryParametersValid()
-    {
-        $ips = '1.2.3.4,1.1.1.*,1.2.*.*,1.*.*.*';
-        $timezone = 'Europe/Paris';
-        $currency = 'EUR';
-        $excludedQueryParameters = 'p1,P2, P33333';
-        $expectedExcludedQueryParameters = 'p1,P2,P33333';
-        $excludedUserAgents = " p1,P2, \nP3333 ";
-        $expectedExcludedUserAgents = "p1,P2,P3333";
-        $expectedWebsiteType = 'mobile-\'app';
-        $keepUrlFragment = 1;
-        $idsite = API::getInstance()->addSite("name", "http://piwik.net/", $ecommerce = 1,
-            $siteSearch = 1, $searchKeywordParameters = 'search,param', $searchCategoryParameters = 'cat,category',
-            $ips, $excludedQueryParameters, $timezone, $currency, $group = null, $startDate = null, $excludedUserAgents,
-            $keepUrlFragment, $expectedWebsiteType);
-        $siteInfo = API::getInstance()->getSiteFromId($idsite);
-        $this->assertEquals($ips, $siteInfo['excluded_ips']);
-        $this->assertEquals($timezone, $siteInfo['timezone']);
-        $this->assertEquals($currency, $siteInfo['currency']);
-        $this->assertEquals($ecommerce, $siteInfo['ecommerce']);
-        $this->assertTrue(Site::isEcommerceEnabledFor($idsite));
-        $this->assertEquals($siteSearch, $siteInfo['sitesearch']);
-        $this->assertTrue(Site::isSiteSearchEnabledFor($idsite));
-        $this->assertEquals($expectedWebsiteType, $siteInfo['type']);
-        $this->assertEquals($expectedWebsiteType, Site::getTypeFor($idsite));
-
-        $this->assertEquals($searchKeywordParameters, $siteInfo['sitesearch_keyword_parameters']);
-        $this->assertEquals($searchCategoryParameters, $siteInfo['sitesearch_category_parameters']);
-        $this->assertEquals($expectedExcludedQueryParameters, $siteInfo['excluded_parameters']);
-        $this->assertEquals($expectedExcludedUserAgents, $siteInfo['excluded_user_agents']);
-    }
-
-    /**
-     * dataProvider for testAddSiteExcludedIpsNotValid
-     */
-    public function getInvalidIPsData()
-    {
-        return array(
-            array('35817587341'),
-            array('ieagieha'),
-            array('1.2.3'),
-            array('*.1.1.1'),
-            array('*.*.1.1'),
-            array('*.*.*.1'),
-            array('1.1.1.1.1'),
-        );
-    }
-
-    /**
-     * Test with invalid IPs
-     *
-     * @dataProvider getInvalidIPsData
-     * @group Plugins
-     */
-    public function testAddSiteExcludedIpsNotValid($ip)
-    {
-        try {
-            API::getInstance()->addSite("name", "http://piwik.net/", $ecommerce = 0,
-                $siteSearch = 1, $searchKeywordParameters = null, $searchCategoryParameters = null, $ip);
-        } catch (Exception $e) {
-            return;
-        }
-        $this->fail('Expected exception not raised');
-    }
-
-    /**
-     * one url -> one main_url and nothing inserted as alias urls
-     *
-     * @group Plugins
-     */
-    public function testAddSiteOneUrl()
-    {
-        $url = "http://piwik.net/";
-        $urlOK = "http://piwik.net";
-        $idsite = API::getInstance()->addSite("name", $url);
-        $this->assertInternalType(PHPUnit_Framework_Constraint_IsType::TYPE_INT, $idsite);
-
-        $siteInfo = API::getInstance()->getSiteFromId($idsite);
-        $this->assertEquals($urlOK, $siteInfo['main_url']);
-        $this->assertEquals(date('Y-m-d'), date('Y-m-d', strtotime($siteInfo['ts_created'])));
-
-        $siteUrls = API::getInstance()->getSiteUrlsFromId($idsite);
-        $this->assertEquals(1, count($siteUrls));
-    }
-
-    /**
-     * several urls -> one main_url and others as alias urls
-     *
-     * @group Plugins
-     */
-    public function testAddSiteSeveralUrls()
-    {
-        $urls = array("http://piwik.net/", "http://piwik.com", "https://piwik.net/test/");
-        $urlsOK = array("http://piwik.net", "http://piwik.com", "https://piwik.net/test");
-        $idsite = API::getInstance()->addSite("super website", $urls);
-        $this->assertInternalType(PHPUnit_Framework_Constraint_IsType::TYPE_INT, $idsite);
-
-        $siteInfo = API::getInstance()->getSiteFromId($idsite);
-        $this->assertEquals($urlsOK[0], $siteInfo['main_url']);
-
-        $siteUrls = API::getInstance()->getSiteUrlsFromId($idsite);
-        $this->assertEquals($urlsOK, $siteUrls);
-    }
-
-    /**
-     * strange name
-     *
-     * @group Plugins
-     */
-    public function testAddSiteStrangeName()
-    {
-        $name = "supertest(); ~@@()''!£\$'%%^'!£ போ";
-        $idsite = API::getInstance()->addSite($name, "http://piwik.net");
-        $this->assertInternalType(PHPUnit_Framework_Constraint_IsType::TYPE_INT, $idsite);
-
-        $siteInfo = API::getInstance()->getSiteFromId($idsite);
-        $this->assertEquals($name, $siteInfo['name']);
-
-    }
-
-    /**
-     * adds a site
-     * use by several other unit tests
-     */
-    protected function _addSite()
-    {
-        $name = "website ";
-        $idsite = API::getInstance()->addSite($name, array("http://piwik.net", "http://piwik.com/test/"));
-        $this->assertInternalType(PHPUnit_Framework_Constraint_IsType::TYPE_INT, $idsite);
-
-        $siteInfo = API::getInstance()->getSiteFromId($idsite);
-        $this->assertEquals($name, $siteInfo['name']);
-        $this->assertEquals("http://piwik.net", $siteInfo['main_url']);
-
-        $siteUrls = API::getInstance()->getSiteUrlsFromId($idsite);
-        $this->assertEquals(array("http://piwik.net", "http://piwik.com/test"), $siteUrls);
-
-        return $idsite;
-    }
-
-    /**
-     * no duplicate -> all the urls are saved
-     *
-     * @group Plugins
-     */
-    public function testAddSiteUrlsnoDuplicate()
-    {
-        $idsite = $this->_addSite();
-
-        $siteUrlsBefore = API::getInstance()->getSiteUrlsFromId($idsite);
-
-        $toAdd = array("http://piwik1.net",
-                       "http://piwik2.net",
-                       "http://piwik3.net/test/",
-                       "http://localhost/test",
-                       "http://localho5.st/test",
-                       "http://l42578gqege.f4",
-                       "http://super.com/test/test/atqata675675/te"
-        );
-        $toAddValid = array("http://piwik1.net",
-                            "http://piwik2.net",
-                            "http://piwik3.net/test",
-                            "http://localhost/test",
-                            "http://localho5.st/test",
-                            "http://l42578gqege.f4",
-                            "http://super.com/test/test/atqata675675/te");
-
-        $insertedUrls = API::getInstance()->addSiteAliasUrls($idsite, $toAdd);
-        $this->assertEquals(count($toAdd), $insertedUrls);
-
-        $siteUrlsAfter = API::getInstance()->getSiteUrlsFromId($idsite);
-
-        $shouldHave = array_merge($siteUrlsBefore, $toAddValid);
-        sort($shouldHave);
-
-        sort($siteUrlsAfter);
-
-        $this->assertEquals($shouldHave, $siteUrlsAfter);
-    }
-
-    /**
-     * duplicate -> don't save the already existing URLs
-     *
-     * @group Plugins
-     */
-    public function testAddSiteUrlsDuplicate()
-    {
-        $idsite = $this->_addSite();
-
-        $siteUrlsBefore = API::getInstance()->getSiteUrlsFromId($idsite);
-
-        $toAdd = array_merge($siteUrlsBefore, array("http://piwik1.net", "http://piwik2.net"));
-
-        $insertedUrls = API::getInstance()->addSiteAliasUrls($idsite, $toAdd);
-        $this->assertEquals(count($toAdd) - count($siteUrlsBefore), $insertedUrls);
-
-        $siteUrlsAfter = API::getInstance()->getSiteUrlsFromId($idsite);
-
-        $shouldHave = $toAdd;
-        sort($shouldHave);
-
-        sort($siteUrlsAfter);
-
-        $this->assertEquals($shouldHave, $siteUrlsAfter);
-    }
-
-    /**
-     * case empty array => nothing happens
-     *
-     * @group Plugins
-     */
-    public function testAddSiteUrlsNoUrlsToAdd1()
-    {
-        $idsite = $this->_addSite();
-
-        $siteUrlsBefore = API::getInstance()->getSiteUrlsFromId($idsite);
-
-        $toAdd = array();
-
-        $insertedUrls = API::getInstance()->addSiteAliasUrls($idsite, $toAdd);
-        $this->assertEquals(count($toAdd), $insertedUrls);
-
-        $siteUrlsAfter = API::getInstance()->getSiteUrlsFromId($idsite);
-
-        $shouldHave = $siteUrlsBefore;
-        sort($shouldHave);
-
-        sort($siteUrlsAfter);
-
-        $this->assertEquals($shouldHave, $siteUrlsAfter);
-    }
-
-    /**
-     * case array only duplicate => nothing happens
-     *
-     * @group Plugins
-     */
-    public function testAddSiteUrlsNoUrlsToAdd2()
-    {
-        $idsite = $this->_addSite();
-
-        $siteUrlsBefore = API::getInstance()->getSiteUrlsFromId($idsite);
-
-        $toAdd = $siteUrlsBefore;
-
-        $insertedUrls = API::getInstance()->addSiteAliasUrls($idsite, $toAdd);
-        $this->assertEquals(0, $insertedUrls);
-
-        $siteUrlsAfter = API::getInstance()->getSiteUrlsFromId($idsite);
-
-        $shouldHave = $siteUrlsBefore;
-        sort($shouldHave);
-
-        sort($siteUrlsAfter);
-
-        $this->assertEquals($shouldHave, $siteUrlsAfter);
-    }
-
-    /**
-     * wrong format urls => exception
-     *
-     * @group Plugins
-     */
-    public function testAddSiteUrlsWrongUrlsFormat3()
-    {
-        try {
-            $idsite = $this->_addSite();
-            $toAdd = array("http:mpigeq");
-            API::getInstance()->addSiteAliasUrls($idsite, $toAdd);
-        } catch (Exception $e) {
-            return;
-        }
-        $this->fail('Expected exception not raised');
-    }
-
-    /**
-     * wrong idsite => no exception because simply no access to this resource
-     *
-     * @group Plugins
-     */
-    public function testAddSiteUrlsWrongIdSite1()
-    {
-        try {
-            $toAdd = array("http://pigeq.com/test");
-            API::getInstance()->addSiteAliasUrls(-1, $toAdd);
-        } catch (Exception $e) {
-            return;
-        }
-        $this->fail('Expected exception not raised');
-    }
-
-    /**
-     * wrong idsite => exception
-     *
-     * @group Plugins
-     */
-    public function testAddSiteUrlsWrongIdSite2()
-    {
-        try {
-            $toAdd = array("http://pigeq.com/test");
-            API::getInstance()->addSiteAliasUrls(155, $toAdd);
-        } catch (Exception $e) {
-            return;
-        }
-        $this->fail('Expected exception not raised');
-    }
-
-    /**
-     * no Id -> empty array
-     *
-     * @group Plugins
-     */
-    public function testGetAllSitesIdNoId()
-    {
-        $ids = API::getInstance()->getAllSitesId();
-        $this->assertEquals(array(), $ids);
-    }
-
-    /**
-     * several Id -> normal array
-     *
-     * @group Plugins
-     */
-    public function testGetAllSitesIdSeveralId()
-    {
-        $name = "tetq";
-        $idsites = array(
-            API::getInstance()->addSite($name, array("http://piwik.net", "http://piwik.com/test/")),
-            API::getInstance()->addSite($name, array("http://piwik.net", "http://piwik.com/test/")),
-            API::getInstance()->addSite($name, array("http://piwik.net", "http://piwik.com/test/")),
-            API::getInstance()->addSite($name, array("http://piwik.net", "http://piwik.com/test/")),
-            API::getInstance()->addSite($name, array("http://piwik.net", "http://piwik.com/test/")),
-        );
-
-        $ids = API::getInstance()->getAllSitesId();
-        $this->assertEquals($idsites, $ids);
-    }
-
-    /**
-     * wrong id => exception
-     *
-     * @group Plugins
-     */
-    public function testGetSiteFromIdWrongId1()
-    {
-        try {
-            API::getInstance()->getSiteFromId(0);
-        } catch (Exception $e) {
-            return;
-        }
-        $this->fail('Expected exception not raised');
-    }
-
-    /**
-     * wrong id => exception
-     *
-     * @group Plugins
-     */
-    public function testGetSiteFromIdWrongId2()
-    {
-        try {
-            API::getInstance()->getSiteFromId("x1");
-        } catch (Exception $e) {
-            return;
-        }
-        $this->fail('Expected exception not raised');
-    }
-
-    /**
-     * wrong id : no access => exception
-     *
-     * @group Plugins
-     */
-    public function testGetSiteFromIdWrongId3()
-    {
-        $idsite = API::getInstance()->addSite("site", array("http://piwik.net", "http://piwik.com/test/"));
-        $this->assertEquals(1, $idsite);
-
-        // set noaccess to site 1
-        FakeAccess::setIdSitesView(array(2));
-        FakeAccess::setIdSitesAdmin(array());
-
-        try {
-            API::getInstance()->getSiteFromId(1);
-        } catch (Exception $e) {
-            return;
-        }
-        $this->fail('Expected exception not raised');
-    }
-
-    /**
-     * normal case
-     *
-     * @group Plugins
-     */
-    public function testGetSiteFromIdNormalId()
-    {
-        $name = "website ''";
-        $idsite = API::getInstance()->addSite($name, array("http://piwik.net", "http://piwik.com/test/"));
-        $this->assertInternalType(PHPUnit_Framework_Constraint_IsType::TYPE_INT, $idsite);
-
-        $siteInfo = API::getInstance()->getSiteFromId($idsite);
-        $this->assertEquals($name, $siteInfo['name']);
-        $this->assertEquals("http://piwik.net", $siteInfo['main_url']);
-    }
-
-    /**
-     * there is no admin site available -> array()
-     *
-     * @group Plugins
-     */
-    public function testGetSitesWithAdminAccessNoResult()
-    {
-        FakeAccess::setIdSitesAdmin(array());
-
-        $sites = API::getInstance()->getSitesWithAdminAccess();
-        $this->assertEquals(array(), $sites);
-    }
-
-    /**
-     * normal case, admin and view and noaccess website => return only admin
-     *
-     * @group Plugins
-     */
-    public function testGetSitesWithAdminAccess()
-    {
-        API::getInstance()->addSite("site1", array("http://piwik.net", "http://piwik.com/test/"));
-        API::getInstance()->addSite("site2", array("http://piwik.com/test/"));
-        API::getInstance()->addSite("site3", array("http://piwik.org"));
-
-        $resultWanted = array(
-            0 => array("idsite" => 1, "name" => "site1", "main_url" => "http://piwik.net", "ecommerce" => 0, "excluded_ips" => "", 'sitesearch' => 1, 'sitesearch_keyword_parameters' => '', 'sitesearch_category_parameters' => '', 'excluded_parameters' => '', 'excluded_user_agents' => '', 'timezone' => 'UTC', 'currency' => 'USD', 'group' => '', 'keep_url_fragment' => 0, 'type' => 'website'),
-            1 => array("idsite" => 3, "name" => "site3", "main_url" => "http://piwik.org", "ecommerce" => 0, "excluded_ips" => "", 'sitesearch' => 1, 'sitesearch_keyword_parameters' => '', 'sitesearch_category_parameters' => '', 'excluded_parameters' => '', 'excluded_user_agents' => '', 'timezone' => 'UTC', 'currency' => 'USD', 'group' => '', 'keep_url_fragment' => 0, 'type' => 'website'),
-        );
-
-        FakeAccess::setIdSitesAdmin(array(1, 3));
-
-        $sites = API::getInstance()->getSitesWithAdminAccess();
-
-        // we dont test the ts_created
-        unset($sites[0]['ts_created']);
-        unset($sites[1]['ts_created']);
-        $this->assertEquals($resultWanted, $sites);
-    }
-
-    /**
-     * there is no admin site available -> array()
-     *
-     * @group Plugins
-     */
-    public function testGetSitesWithViewAccessNoResult()
-    {
-        FakeAccess::setIdSitesView(array());
-        FakeAccess::setIdSitesAdmin(array());
-
-        $sites = API::getInstance()->getSitesWithViewAccess();
-        $this->assertEquals(array(), $sites);
-    }
-
-    /**
-     * normal case, admin and view and noaccess website => return only admin
-     *
-     * @group Plugins
-     */
-    public function testGetSitesWithViewAccess()
-    {
-        API::getInstance()->addSite("site1", array("http://piwik.net", "http://piwik.com/test/"));
-        API::getInstance()->addSite("site2", array("http://piwik.com/test/"));
-        API::getInstance()->addSite("site3", array("http://piwik.org"));
-
-        $resultWanted = array(
-            0 => array("idsite" => 1, "name" => "site1", "main_url" => "http://piwik.net", "ecommerce" => 0, 'sitesearch' => 1, 'sitesearch_keyword_parameters' => '', 'sitesearch_category_parameters' => '', "excluded_ips" => "", 'excluded_parameters' => '', 'excluded_user_agents' => '', 'timezone' => 'UTC', 'currency' => 'USD', 'group' => '', 'keep_url_fragment' => 0, 'type' => 'website'),
-            1 => array("idsite" => 3, "name" => "site3", "main_url" => "http://piwik.org", "ecommerce" => 0, 'sitesearch' => 1, 'sitesearch_keyword_parameters' => '', 'sitesearch_category_parameters' => '', "excluded_ips" => "", 'excluded_parameters' => '', 'excluded_user_agents' => '', 'timezone' => 'UTC', 'currency' => 'USD', 'group' => '', 'keep_url_fragment' => 0, 'type' => 'website'),
-        );
-
-        FakeAccess::setIdSitesView(array(1, 3));
-        FakeAccess::setIdSitesAdmin(array());
-
-        $sites = API::getInstance()->getSitesWithViewAccess();
-        // we dont test the ts_created
-        unset($sites[0]['ts_created']);
-        unset($sites[1]['ts_created']);
-        $this->assertEquals($resultWanted, $sites);
-    }
-
-    /**
-     * there is no admin site available -> array()
-     *
-     * @group Plugins
-     */
-    public function testGetSitesWithAtLeastViewAccessNoResult()
-    {
-        FakeAccess::setIdSitesView(array());
-        FakeAccess::setIdSitesAdmin(array());
-
-        $sites = API::getInstance()->getSitesWithAtLeastViewAccess();
-        $this->assertEquals(array(), $sites);
-    }
-
-    /**
-     * normal case, admin and view and noaccess website => return only admin
-     *
-     * @group Plugins
-     */
-    public function testGetSitesWithAtLeastViewAccess()
-    {
-        API::getInstance()->addSite("site1", array("http://piwik.net", "http://piwik.com/test/"), $ecommerce = 1);
-        API::getInstance()->addSite("site2", array("http://piwik.com/test/"));
-        API::getInstance()->addSite("site3", array("http://piwik.org"));
-
-        $resultWanted = array(
-            0 => array("idsite" => 1, "name" => "site1", "main_url" => "http://piwik.net", "ecommerce" => 1, "excluded_ips" => "", 'sitesearch' => 1, 'sitesearch_keyword_parameters' => '', 'sitesearch_category_parameters' => '', 'excluded_parameters' => '', 'excluded_user_agents' => '', 'timezone' => 'UTC', 'currency' => 'USD', 'group' => '', 'keep_url_fragment' => 0, 'type' => 'website'),
-            1 => array("idsite" => 3, "name" => "site3", "main_url" => "http://piwik.org", "ecommerce" => 0, "excluded_ips" => "", 'sitesearch' => 1, 'sitesearch_keyword_parameters' => '', 'sitesearch_category_parameters' => '', 'excluded_parameters' => '', 'excluded_user_agents' => '', 'timezone' => 'UTC', 'currency' => 'USD', 'group' => '', 'keep_url_fragment' => 0, 'type' => 'website'),
-        );
-
-        FakeAccess::setIdSitesView(array(1, 3));
-        FakeAccess::setIdSitesAdmin(array());
-
-        $sites = API::getInstance()->getSitesWithAtLeastViewAccess();
-        // we dont test the ts_created
-        unset($sites[0]['ts_created']);
-        unset($sites[1]['ts_created']);
-        $this->assertEquals($resultWanted, $sites);
-    }
-
-    /**
-     * no urls for this site => array()
-     *
-     * @group Plugins
-     */
-    public function testGetSiteUrlsFromIdNoUrls()
-    {
-        $idsite = API::getInstance()->addSite("site1", array("http://piwik.net"));
-
-        $urls = API::getInstance()->getSiteUrlsFromId($idsite);
-        $this->assertEquals(array("http://piwik.net"), $urls);
-    }
-
-    /**
-     * normal case
-     *
-     * @group Plugins
-     */
-    public function testGetSiteUrlsFromIdManyUrls()
-    {
-        $site = array("http://piwik.net",
-                      "http://piwik.org",
-                      "http://piwik.org",
-                      "http://piwik.com");
-        sort($site);
-
-        $idsite = API::getInstance()->addSite("site1", $site);
-
-        $siteWanted = array("http://piwik.net",
-                            "http://piwik.org",
-                            "http://piwik.com");
-        sort($siteWanted);
-        $urls = API::getInstance()->getSiteUrlsFromId($idsite);
-
-        $this->assertEquals($siteWanted, $urls);
-    }
-
-    /**
-     * wrongId => exception
-     *
-     * @group Plugins
-     */
-    public function testGetSiteUrlsFromIdWrongId()
-    {
-        try {
-            FakeAccess::setIdSitesView(array(3));
-            FakeAccess::setIdSitesAdmin(array());
-            API::getInstance()->getSiteUrlsFromId(1);
-        } catch (Exception $e) {
-            return;
-        }
-        $this->fail('Expected exception not raised');
-    }
-
-    /**
-     * one url => no change to alias urls
-     *
-     * @group Plugins
-     */
-    public function testUpdateSiteOneUrl()
-    {
-        $urls = array("http://piwiknew.com",
-                      "http://piwiknew.net",
-                      "http://piwiknew.org",
-                      "http://piwiknew.fr");
-        $idsite = API::getInstance()->addSite("site1", $urls);
-
-        $newMainUrl = "http://main.url";
-
-        // Also test that the group was set to empty, and is searchable
-        $websites = API::getInstance()->getSitesFromGroup('');
-        $this->assertEquals(1, count($websites));
-
-        // the Update doesn't change the group field
-        API::getInstance()->updateSite($idsite, "test toto@{}", $newMainUrl);
-        $websites = API::getInstance()->getSitesFromGroup('');
-        $this->assertEquals(1, count($websites));
-
-        // Updating the group to something
-        $group = 'something';
-        API::getInstance()->updateSite($idsite, "test toto@{}", $newMainUrl, $ecommerce = 0, $ss = true, $ss_kwd = null, $ss_cat = '', $ips = null, $parametersExclude = null, $timezone = null, $currency = null, $group);
-        $websites = API::getInstance()->getSitesFromGroup($group);
-        $this->assertEquals(1, count($websites));
-        $this->assertEquals(date('Y-m-d'), date('Y-m-d', strtotime($websites[0]['ts_created'])));
-
-        // Updating the group to nothing
-        $group = '';
-        $type = 'mobileAppTest';
-        API::getInstance()->updateSite($idsite, "test toto@{}", $newMainUrl, $ecommerce = 0, $ss = false, $ss_kwd = '', $ss_cat = null, $ips = null, $parametersExclude = null, $timezone = null, $currency = null, $group, $startDate = '2010-01-01', $excludedUserAgent = null, $keepUrlFragment = 1, $type);
-        $websites = API::getInstance()->getSitesFromGroup($group);
-        $this->assertEquals(1, count($websites));
-        $this->assertEquals('2010-01-01', date('Y-m-d', strtotime($websites[0]['ts_created'])));
-
-        // Test setting the website type
-        $this->assertEquals($type, Site::getTypeFor($idsite));
-
-        // Check Alias URLs contain only main url
-        $allUrls = API::getInstance()->getSiteUrlsFromId($idsite);
-        $this->assertEquals($newMainUrl, $allUrls[0]);
-        $aliasUrls = array_slice($allUrls, 1);
-        $this->assertEquals(array(), $aliasUrls);
-
-    }
-
-    /**
-     * strange name and NO URL => name ok, main_url not updated
-     *
-     * @group Plugins
-     */
-    public function testUpdateSiteStrangeNameNoUrl()
-    {
-        $idsite = API::getInstance()->addSite("site1", "http://main.url");
-        $newName = "test toto@{'786'}";
-
-        API::getInstance()->updateSite($idsite, $newName);
-
-        $site = API::getInstance()->getSiteFromId($idsite);
-
-        $this->assertEquals($newName, $site['name']);
-        // url didn't change because parameter url NULL in updateSite
-        $this->assertEquals("http://main.url", $site['main_url']);
-    }
-
-    /**
-     * several urls => both main and alias are updated
-     * also test the update of group field
-     *
-     * @group Plugins
-     */
-    public function testUpdateSiteSeveralUrlsAndGroup()
-    {
-        $urls = array("http://piwiknew.com",
-                      "http://piwiknew.net",
-                      "http://piwiknew.org",
-                      "http://piwiknew.fr");
-
-        $group = 'GROUP Before';
-        $idsite = API::getInstance()->addSite("site1", $urls, $ecommerce = 1,
-            $siteSearch = 1, $searchKeywordParameters = null, $searchCategoryParameters = null,
-            $excludedIps = null, $excludedQueryParameters = null, $timezone = null, $currency = null, $group, $startDate = '2011-01-01');
-
-        $websites = API::getInstance()->getSitesFromGroup($group);
-        $this->assertEquals(1, count($websites));
-
-        $newurls = array("http://piwiknew2.com",
-                         "http://piwiknew2.net",
-                         "http://piwiknew2.org",
-                         "http://piwiknew2.fr");
-
-        $groupAfter = '   GROUP After';
-        API::getInstance()->updateSite($idsite, "test toto@{}", $newurls, $ecommerce = 0,
-            $siteSearch = 1, $searchKeywordParameters = null, $searchCategoryParameters = null,
-            $excludedIps = null, $excludedQueryParameters = null, $timezone = null, $currency = null, $groupAfter);
-
-        // no result for the group before update
-        $websites = API::getInstance()->getSitesFromGroup($group);
-        $this->assertEquals(0, count($websites));
-
-        // Testing that the group was updated properly (and testing that the group value is trimmed before inserted/searched)
-        $websites = API::getInstance()->getSitesFromGroup($groupAfter . ' ');
-        $this->assertEquals(1, count($websites));
-        $this->assertEquals('2011-01-01', date('Y-m-d', strtotime($websites[0]['ts_created'])));
-
-        // Test fetch website groups
-        $expectedGroups = array(trim($groupAfter));
-        $fetched = API::getInstance()->getSitesGroups();
-        $this->assertEquals($expectedGroups, $fetched);
-
-        $allUrls = API::getInstance()->getSiteUrlsFromId($idsite);
-        sort($allUrls);
-        sort($newurls);
-        $this->assertEquals($newurls, $allUrls);
-    }
-
-    /**
-     * @group Plugins
-     */
-    public function testGetSitesGroups()
-    {
-        $groups = array('group1', ' group1 ', '', 'group2');
-        $expectedGroups = array('group1', '', 'group2');
-        foreach ($groups as $group) {
-            API::getInstance()->addSite("test toto@{}", 'http://example.org', $ecommerce = 1, $siteSearch = null, $searchKeywordParameters = null, $searchCategoryParameters = null, $excludedIps = null, $excludedQueryParameters = null, $timezone = null, $currency = null, $group);
-        }
-
-        $this->assertEquals($expectedGroups, API::getInstance()->getSitesGroups());
-    }
-
-    public function getInvalidTimezoneData()
-    {
-        return array(
-            array('UTC+15'),
-            array('Paris'),
-        );
-    }
-
-    /**
-     *
-     * @dataProvider getInvalidTimezoneData
-     * @group Plugins
-     */
-    public function testAddSitesInvalidTimezone($timezone)
-    {
-        try {
-            API::getInstance()->addSite("site1", array('http://example.org'), $ecommerce = 0,
-                $siteSearch = 1, $searchKeywordParameters = null, $searchCategoryParameters = null, $ip = '', $params = '', $timezone);
-        } catch (Exception $e) {
-            return;
-        }
-        $this->fail('Expected exception not raised');
-    }
-
-    /**
-     * @group Plugins
-     */
-    public function testAddSitesInvalidCurrency()
-    {
-        try {
-            $invalidCurrency = '€';
-            API::getInstance()->addSite("site1", array('http://example.org'), $ecommerce = 0,
-                $siteSearch = 1, $searchKeywordParameters = null, $searchCategoryParameters = null, '', 'UTC', $invalidCurrency);
-        } catch (Exception $e) {
-            return;
-        }
-        $this->fail('Expected exception not raised');
-    }
-
-    /**
-     * @group Plugins
-     */
-    public function testSetDefaultTimezoneAndCurrencyAndExcludedQueryParametersAndExcludedIps()
-    {
-        // test that they return default values
-        $defaultTimezone = API::getInstance()->getDefaultTimezone();
-        $this->assertEquals('UTC', $defaultTimezone);
-        $defaultCurrency = API::getInstance()->getDefaultCurrency();
-        $this->assertEquals('USD', $defaultCurrency);
-        $excludedIps = API::getInstance()->getExcludedIpsGlobal();
-        $this->assertEquals('', $excludedIps);
-        $excludedQueryParameters = API::getInstance()->getExcludedQueryParametersGlobal();
-        $this->assertEquals('', $excludedQueryParameters);
-
-        // test that when not specified, defaults are set as expected
-        $idsite = API::getInstance()->addSite("site1", array('http://example.org'));
-        $site = new Site($idsite);
-        $this->assertEquals('UTC', $site->getTimezone());
-        $this->assertEquals('USD', $site->getCurrency());
-        $this->assertEquals('', $site->getExcludedQueryParameters());
-        $this->assertEquals('', $site->getExcludedIps());
-        $this->assertEquals(false, $site->isEcommerceEnabled());
-
-        // set the global timezone and get it
-        $newDefaultTimezone = 'UTC+5.5';
-        API::getInstance()->setDefaultTimezone($newDefaultTimezone);
-        $defaultTimezone = API::getInstance()->getDefaultTimezone();
-        $this->assertEquals($newDefaultTimezone, $defaultTimezone);
-
-        // set the default currency and get it
-        $newDefaultCurrency = 'EUR';
-        API::getInstance()->setDefaultCurrency($newDefaultCurrency);
-        $defaultCurrency = API::getInstance()->getDefaultCurrency();
-        $this->assertEquals($newDefaultCurrency, $defaultCurrency);
-
-        // set the global IPs to exclude and get it
-        $newGlobalExcludedIps = '1.1.1.*,1.1.*.*,150.1.1.1';
-        API::getInstance()->setGlobalExcludedIps($newGlobalExcludedIps);
-        $globalExcludedIps = API::getInstance()->getExcludedIpsGlobal();
-        $this->assertEquals($newGlobalExcludedIps, $globalExcludedIps);
-
-        // set the global URL query params to exclude and get it
-        $newGlobalExcludedQueryParameters = 'PHPSESSID,blabla, TesT';
-        // removed the space
-        $expectedGlobalExcludedQueryParameters = 'PHPSESSID,blabla,TesT';
-        API::getInstance()->setGlobalExcludedQueryParameters($newGlobalExcludedQueryParameters);
-        $globalExcludedQueryParameters = API::getInstance()->getExcludedQueryParametersGlobal();
-        $this->assertEquals($expectedGlobalExcludedQueryParameters, $globalExcludedQueryParameters);
-
-        // create a website and check that default currency and default timezone are set
-        // however, excluded IPs and excluded query Params are not returned
-        $idsite = API::getInstance()->addSite("site1", array('http://example.org'), $ecommerce = 0,
-            $siteSearch = 0, $searchKeywordParameters = 'test1,test2', $searchCategoryParameters = 'test2,test1',
-            '', '', $newDefaultTimezone);
-        $site = new Site($idsite);
-        $this->assertEquals($newDefaultTimezone, $site->getTimezone());
-        $this->assertEquals(date('Y-m-d'), $site->getCreationDate()->toString());
-        $this->assertEquals($newDefaultCurrency, $site->getCurrency());
-        $this->assertEquals('', $site->getExcludedIps());
-        $this->assertEquals('', $site->getExcludedQueryParameters());
-        $this->assertEquals('test1,test2', $site->getSearchKeywordParameters());
-        $this->assertEquals('test2,test1', $site->getSearchCategoryParameters());
-        $this->assertFalse($site->isSiteSearchEnabled());
-        $this->assertFalse(Site::isSiteSearchEnabledFor($idsite));
-        $this->assertFalse($site->isEcommerceEnabled());
-        $this->assertFalse(Site::isEcommerceEnabledFor($idsite));
-    }
-
-    /**
-     * @group Plugins
-     */
-    public function testGetSitesIdFromSiteUrlSuperUser()
-    {
-        API::getInstance()->addSite("site1", array("http://piwik.net", "http://piwik.com"));
-        API::getInstance()->addSite("site2", array("http://piwik.com", "http://piwik.net"));
-        API::getInstance()->addSite("site3", array("http://piwik.com", "http://piwik.org"));
-
-        $idsites = API::getInstance()->getSitesIdFromSiteUrl('http://piwik.org');
-        $this->assertTrue(count($idsites) == 1);
-
-        $idsites = API::getInstance()->getSitesIdFromSiteUrl('http://www.piwik.org');
-        $this->assertTrue(count($idsites) == 1);
-
-        $idsites = API::getInstance()->getSitesIdFromSiteUrl('http://piwik.net');
-        $this->assertTrue(count($idsites) == 2);
-
-        $idsites = API::getInstance()->getSitesIdFromSiteUrl('http://piwik.com');
-        $this->assertTrue(count($idsites) == 3);
-    }
-
-    /**
-     * @group Plugins
-     */
-    public function testGetSitesIdFromSiteUrlUser()
-    {
-        API::getInstance()->addSite("site1", array("http://www.piwik.net", "http://piwik.com"));
-        API::getInstance()->addSite("site2", array("http://piwik.com", "http://piwik.net"));
-        API::getInstance()->addSite("site3", array("http://piwik.com", "http://piwik.org"));
-
-        $saveAccess = Access::getInstance();
-
-        APIUsersManager::getInstance()->addUser("user1", "geqgegagae", "tegst@tesgt.com", "alias");
-        APIUsersManager::getInstance()->setUserAccess("user1", "view", array(1));
-
-        APIUsersManager::getInstance()->addUser("user2", "geqgegagae", "tegst2@tesgt.com", "alias");
-        APIUsersManager::getInstance()->setUserAccess("user2", "view", array(1));
-        APIUsersManager::getInstance()->setUserAccess("user2", "admin", array(3));
-
-        APIUsersManager::getInstance()->addUser("user3", "geqgegagae", "tegst3@tesgt.com", "alias");
-        APIUsersManager::getInstance()->setUserAccess("user3", "view", array(1, 2));
-        APIUsersManager::getInstance()->setUserAccess("user3", "admin", array(3));
-
-        $pseudoMockAccess = new FakeAccess;
-        FakeAccess::$superUser = false;
-        FakeAccess::$identity = 'user1';
-        FakeAccess::setIdSitesView(array(1));
-        FakeAccess::setIdSitesAdmin(array());
-        Access::setSingletonInstance($pseudoMockAccess);
-        $idsites = API::getInstance()->getSitesIdFromSiteUrl('http://piwik.com');
-        $this->assertEquals(1, count($idsites));
-
-        // testing URL normalization
-        $idsites = API::getInstance()->getSitesIdFromSiteUrl('http://www.piwik.com');
-        $this->assertEquals(1, count($idsites));
-        $idsites = API::getInstance()->getSitesIdFromSiteUrl('http://piwik.net');
-        $this->assertEquals(1, count($idsites));
-
-        $pseudoMockAccess = new FakeAccess;
-        FakeAccess::$superUser = false;
-        FakeAccess::$identity = 'user2';
-        FakeAccess::setIdSitesView(array(1));
-        FakeAccess::setIdSitesAdmin(array(3));
-        Access::setSingletonInstance($pseudoMockAccess);
-        $idsites = API::getInstance()->getSitesIdFromSiteUrl('http://piwik.com');
-        $this->assertEquals(2, count($idsites));
-
-        $pseudoMockAccess = new FakeAccess;
-        FakeAccess::$superUser = false;
-        FakeAccess::$identity = 'user3';
-        FakeAccess::setIdSitesView(array(1, 2));
-        FakeAccess::setIdSitesAdmin(array(3));
-        Access::setSingletonInstance($pseudoMockAccess);
-        $idsites = API::getInstance()->getSitesIdFromSiteUrl('http://piwik.com');
-        $this->assertEquals(3, count($idsites));
-
-        Access::setSingletonInstance($saveAccess);
-    }
-
-    /**
-     * @group Plugins
-     */
-    public function testGetSitesFromTimezones()
-    {
-        API::getInstance()->addSite("site3", array("http://piwik.org"), null, $siteSearch = 1, $searchKeywordParameters = null, $searchCategoryParameters = null, null, null, 'UTC');
-        $idsite2 = API::getInstance()->addSite("site3", array("http://piwik.org"), null, $siteSearch = 1, $searchKeywordParameters = null, $searchCategoryParameters = null, null, null, 'Pacific/Auckland');
-        $idsite3 = API::getInstance()->addSite("site3", array("http://piwik.org"), null, $siteSearch = 1, $searchKeywordParameters = null, $searchCategoryParameters = null, null, null, 'Pacific/Auckland');
-        $idsite4 = API::getInstance()->addSite("site3", array("http://piwik.org"), null, $siteSearch = 1, $searchKeywordParameters = null, $searchCategoryParameters = null, null, null, 'UTC+10');
-        $result = API::getInstance()->getSitesIdFromTimezones(array('UTC+10', 'Pacific/Auckland'));
-        $this->assertEquals(array($idsite2, $idsite3, $idsite4), $result);
-    }
-}
diff --git a/tests/PHPUnit/Integration/Plugins/UsersManagerTest.php b/tests/PHPUnit/Integration/Plugins/UsersManagerTest.php
deleted file mode 100644
index 5f039b7efc..0000000000
--- a/tests/PHPUnit/Integration/Plugins/UsersManagerTest.php
+++ /dev/null
@@ -1,910 +0,0 @@
-<?php
-/**
- * Piwik - free/libre analytics platform
- *
- * @link http://piwik.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- */
-use Piwik\Access;
-use Piwik\Plugins\SitesManager\API as APISitesManager;
-use Piwik\Plugins\UsersManager\API;
-use Piwik\Plugins\UsersManager\Model;
-use Piwik\Translate;
-
-/**
- * Piwik - free/libre analytics platform
- *
- * @link http://piwik.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- *
- * @group Plugins
- */
-class Plugins_UsersManagerTest extends IntegrationTestCase
-{
-    /**
-     * @var API
-     */
-    private $api;
-
-    /**
-     * @var Model
-     */
-    private $model;
-
-    public function setUp()
-    {
-        parent::setUp();
-
-        \Piwik\Plugin\Manager::getInstance()->loadPlugin('UsersManager');
-        \Piwik\Plugin\Manager::getInstance()->installLoadedPlugins();
-
-        // setup the access layer
-        $pseudoMockAccess = new FakeAccess;
-        FakeAccess::setIdSitesView(array(1, 2));
-        FakeAccess::setIdSitesAdmin(array(3, 4));
-
-        //finally we set the user as a Super User by default
-        FakeAccess::$superUser = true;
-        FakeAccess::$superUserLogin = 'superusertest';
-        Access::setSingletonInstance($pseudoMockAccess);
-
-        $this->api   = API::getInstance();
-        $this->model = new Model();
-    }
-
-    private function _flatten($sitesAccess)
-    {
-        $result = array();
-
-        foreach ($sitesAccess as $siteAccess) {
-            $result[$siteAccess['site']] = $siteAccess['access'];
-        }
-
-        return $result;
-    }
-
-    private function _checkUserHasNotChanged($user, $newPassword, $newEmail = null, $newAlias = null)
-    {
-        if (is_null($newEmail)) {
-            $newEmail = $user['email'];
-        }
-        if (is_null($newAlias)) {
-            $newAlias = $user['alias'];
-        }
-        $userAfter = $this->api->getUser($user["login"]);
-        unset($userAfter['date_registered']);
-
-        // we now compute what the token auth should be, it should always be a hash of the login and the current password
-        // if the password has changed then the token_auth has changed!
-        $user['token_auth'] = $this->api->getTokenAuth($user["login"], md5($newPassword));
-        $user['password']   = md5($newPassword);
-        $user['email']      = $newEmail;
-        $user['alias']      = $newAlias;
-        $user['superuser_access'] = 0;
-        $this->assertEquals($user, $userAfter);
-    }
-
-    /**
-     * bad password => exception#
-     * @expectedException \Exception
-     * @expectedExceptionMessage UsersManager_ExceptionInvalidPassword
-     */
-    public function testUpdateUserBadpasswd()
-    {
-        $login = "login";
-        $user  = array('login'    => $login,
-                       'password' => "geqgeagae",
-                       'email'    => "test@test.com",
-                       'alias'    => "alias");
-
-        $this->api->addUser($user['login'], $user['password'], $user['email'], $user['alias']);
-
-        try {
-            $this->api->updateUser($login, "pas");
-        } catch (Exception $expected) {
-            $this->_checkUserHasNotChanged($user, $user['password']);
-            throw $expected;
-        }
-    }
-
-    /**
-     * Dataprovider
-     */
-    public function getAddUserInvalidLoginData()
-    {
-        return array(
-            array(12, "password", "email@email.com", "alias"), // wrong login / integer => exception
-            array("gegag'ggea'", "password", "email@email.com", "alias"), // wrong login / too short => exception
-            array("gegag11gge&", "password", "email@email.com", "alias"), // wrong login / too long => exception
-            array("geg'ag11gge@", "password", "email@email.com", "alias"), // wrong login / bad characters => exception
-        );
-    }
-
-    /**
-     * @dataProvider getAddUserInvalidLoginData
-     * @expectedException \Exception
-     * @expectedExceptionMessage UsersManager_ExceptionInvalidLogin
-     */
-    public function testAddUserWrongLogin($userLogin, $password, $email, $alias)
-    {
-        $this->api->addUser($userLogin, $password, $email, $alias);
-    }
-
-    /**
-     * @expectedException \Exception
-     * @expectedExceptionMessage UsersManager_ExceptionLoginExists
-     */
-    public function testAddUserExistingLogin()
-    {
-        $this->api->addUser("test", "password", "email@email.com", "alias");
-        $this->api->addUser("test", "password2", "em2ail@email.com", "al2ias");
-    }
-
-    /**
-     * Dataprovider for wrong password tests
-     */
-    public function getWrongPasswordTestData()
-    {
-        return array(
-            array("geggeqgeqag", "pas", "email@email.com", "alias"), // too short -> exception
-            array("ghqgeggg", "gegageqqqqqqqgeqgqeg84897897897897g122", "email@email.com", "alias"), // too long -> exception
-            array("geggeqgeqag", "", "email@email.com", "alias"), // empty -> exception
-        );
-    }
-
-    /**
-     * @dataProvider getWrongPasswordTestData
-     * @expectedException \Exception
-     * @expectedExceptionMessage UsersManager_ExceptionInvalidPassword
-     */
-    public function testAddUserWrongPassword($userLogin, $password, $email, $alias)
-    {
-        $this->api->addUser($userLogin, $password, $email, $alias);
-    }
-
-    /**
-     * Dataprovider for wrong email tests
-     */
-    public function getWrongEmailTestData()
-    {
-        return array(
-            array("geggeqgeqag", "geqgeagae", "ema'il@email.com", "alias"),
-            array("geggeqgeqag", "geqgeagae", "@email.com", "alias"),
-            array("geggeqgeqag", "geqgeagae", "email@.com", "alias"),
-            array("geggeqgeqag", "geqgeagae", "email@4.", "alias"),
-            array("geggeqgeqag", "geqgeagae", "", "alias"),
-        );
-    }
-
-    /**
-     * @dataProvider getWrongEmailTestData
-     * @expectedException \Exception
-     * @expectedExceptionMessage mail
-     */
-    public function testAddUserWrongEmail($userLogin, $password, $email, $alias)
-    {
-        $this->api->addUser($userLogin, $password, $email, $alias);
-    }
-
-    /**
-     * empty alias => use login
-     */
-    public function testAddUserEmptyAlias()
-    {
-        $login = "geggeqgeqag";
-        $this->api->addUser($login, "geqgeagae", "mgeagi@geq.com", "");
-        $user = $this->api->getUser($login);
-        $this->assertEquals($login, $user['alias']);
-        $this->assertEquals($login, $user['login']);
-    }
-
-    /**
-     * no alias => use login
-     */
-    public function testAddUserNoAliasSpecified()
-    {
-        $login = "geggeqg455eqag";
-        $this->api->addUser($login, "geqgeagae", "mgeagi@geq.com");
-        $user = $this->api->getUser($login);
-        $this->assertEquals($login, $user['alias']);
-        $this->assertEquals($login, $user['login']);
-    }
-
-    /**
-     * normal test case
-     */
-    public function testAddUser()
-    {
-        $login = "geggeq55eqag";
-        $password = "mypassword";
-        $email = "mgeag4544i@geq.com";
-        $alias = "her is my alias )(&|\" '£%*(&%+))";
-
-        $time = time();
-        $this->api->addUser($login, $password, $email, $alias);
-        $user = $this->api->getUser($login);
-
-        // check that the date registered is correct
-        $this->assertTrue($time <= strtotime($user['date_registered']) && strtotime($user['date_registered']) <= time(),
-            "the date_registered " . strtotime($user['date_registered']) . " is different from the time() " . time());
-        $this->assertTrue($user['date_registered'] <= time());
-
-        // check that token is 32 chars
-        $this->assertEquals(32, strlen($user['password']));
-
-        // that the password has been md5
-        $this->assertEquals(md5($login . md5($password)), $user['token_auth']);
-
-        // check that all fields are the same
-        $this->assertEquals($login, $user['login']);
-        $this->assertEquals(md5($password), $user['password']);
-        $this->assertEquals($email, $user['email']);
-        $this->assertEquals($alias, $user['alias']);
-    }
-
-    /**
-     * @expectedException \Exception
-     * @expectedExceptionMessage UsersManager_ExceptionDeleteDoesNotExist
-     */
-    public function testSeleteUserDoesntExist()
-    {
-        $this->api->addUser("geggeqgeqag", "geqgeagae", "test@test.com", "alias");
-        $this->api->deleteUser("geggeqggnew");
-    }
-
-    /**
-     * @expectedException \Exception
-     * @expectedExceptionMessage UsersManager_ExceptionDeleteDoesNotExist
-     */
-    public function testDeleteUserEmptyUser()
-    {
-        $this->api->deleteUser("");
-    }
-
-    /**
-     * @expectedException \Exception
-     * @expectedExceptionMessage UsersManager_ExceptionDeleteDoesNotExist
-     */
-    public function testDeleteUserNullUser()
-    {
-        $this->api->deleteUser(null);
-    }
-
-    /**
-     * @expectedException \Exception
-     * @expectedExceptionMessage UsersManager_ExceptionDeleteOnlyUserWithSuperUserAccess
-     */
-    public function testDeleteUser_ShouldFail_InCaseTheUserIsTheOnlyRemainingSuperUser()
-    {
-        //add user and set some rights
-        $this->api->addUser("regularuser", "geqgeagae1", "test1@test.com", "alias1");
-        $this->api->addUser("superuser", "geqgeagae2", "test2@test.com", "alias2");
-        $this->api->setSuperUserAccess('superuser', true);
-
-        // delete the user
-        $this->api->deleteUser("superuser");
-    }
-
-    /**
-     * normal case, user deleted
-     */
-    public function testDeleteUser()
-    {
-        $this->addSites(3);
-
-        //add user and set some rights
-        $this->api->addUser("geggeqgeqag", "geqgeagae", "test@test.com", "alias");
-        $this->api->setUserAccess("geggeqgeqag", "view", array(1, 2));
-        $this->api->setUserAccess("geggeqgeqag", "admin", array(1, 3));
-
-        // check rights are set
-        $this->assertNotEquals(array(), $this->api->getSitesAccessFromUser("geggeqgeqag"));
-
-        // delete the user
-        $this->api->deleteUser("geggeqgeqag");
-
-        // try to get it, it should raise an exception
-        try {
-            $this->api->getUser("geggeqgeqag");
-            $this->fail("Exception not raised.");
-        } catch (Exception $expected) {
-            $this->assertRegExp("(UsersManager_ExceptionUserDoesNotExist)", $expected->getMessage());
-        }
-
-        // add the same user
-        $this->api->addUser("geggeqgeqag", "geqgeagae", "test@test.com", "alias");
-
-        //checks access have been deleted
-        //to do so we recreate the same user login and check if the rights are still there
-        $this->assertEquals(array(), $this->api->getSitesAccessFromUser("geggeqgeqag"));
-    }
-
-    /**
-     * @expectedException \Exception
-     * @expectedExceptionMessage UsersManager_ExceptionUserDoesNotExist
-     */
-    public function testGetUserNoUser()
-    {
-        // try to get it, it should raise an exception
-        $this->api->getUser("geggeqgeqag");
-    }
-
-    /**
-     * normal case
-     */
-    public function test_GetUser()
-    {
-        $login = "geggeq55eqag";
-        $password = "mypassword";
-        $email = "mgeag4544i@geq.com";
-        $alias = "";
-
-        $this->api->addUser($login, $password, $email, $alias);
-        $user = $this->api->getUser($login);
-
-        // check that all fields are the same
-        $this->assertEquals($login, $user['login']);
-        $this->assertInternalType('string', $user['password']);
-        $this->assertInternalType('string', $user['date_registered']);
-        $this->assertEquals($email, $user['email']);
-
-        //alias shouldnt be empty even if no alias specified
-        $this->assertGreaterThan(0, strlen($user['alias']));
-    }
-
-    /**
-     * no user => empty array
-     */
-    public function testGetUsersNoUser()
-    {
-        $this->assertEquals($this->api->getUsers(), array());
-    }
-
-    /**
-     * normal case
-     * as well as selecting specific user names, comma separated
-     */
-    public function testGetUsers()
-    {
-        $this->api->addUser("gegg4564eqgeqag", "geqgegagae", "tegst@tesgt.com", "alias");
-        $this->api->addUser("geggeqge632ge56a4qag", "geqgegeagae", "tesggt@tesgt.com", "alias");
-        $this->api->addUser("geggeqgeqagqegg", "geqgeaggggae", "tesgggt@tesgt.com");
-
-        $users = $this->api->getUsers();
-        $users = $this->_removeNonTestableFieldsFromUsers($users);
-        $user1 = array('login' => "gegg4564eqgeqag", 'password' => md5("geqgegagae"), 'alias' => "alias", 'email' => "tegst@tesgt.com", 'superuser_access' => 0);
-        $user2 = array('login' => "geggeqge632ge56a4qag", 'password' => md5("geqgegeagae"), 'alias' => "alias", 'email' => "tesggt@tesgt.com", 'superuser_access' => 0);
-        $user3 = array('login' => "geggeqgeqagqegg", 'password' => md5("geqgeaggggae"), 'alias' => 'geggeqgeqagqegg', 'email' => "tesgggt@tesgt.com", 'superuser_access' => 0);
-        $expectedUsers = array($user1, $user2, $user3);
-        $this->assertEquals($expectedUsers, $users);
-        $this->assertEquals(array($user1), $this->_removeNonTestableFieldsFromUsers($this->api->getUsers('gegg4564eqgeqag')));
-        $this->assertEquals(array($user1, $user2), $this->_removeNonTestableFieldsFromUsers($this->api->getUsers('gegg4564eqgeqag,geggeqge632ge56a4qag')));
-    }
-
-    protected function _removeNonTestableFieldsFromUsers($users)
-    {
-        foreach ($users as &$user) {
-            unset($user['token_auth']);
-            unset($user['date_registered']);
-        }
-        return $users;
-    }
-
-    /**
-     * normal case
-     */
-    public function testGetUsersLogin()
-    {
-        $this->api->addUser('gegg4564eqgeqag', 'geqgegagae', 'tegst@tesgt.com', 'alias');
-        $this->api->addUser("geggeqge632ge56a4qag", "geqgegeagae", "tesggt@tesgt.com", "alias");
-        $this->api->addUser("geggeqgeqagqegg", "geqgeaggggae", "tesgggt@tesgt.com");
-
-        $logins = $this->api->getUsersLogin();
-
-        $this->assertEquals(array("gegg4564eqgeqag", "geggeqge632ge56a4qag", "geggeqgeqagqegg"), $logins);
-    }
-
-    /**
-     * @expectedException \Exception
-     * @expectedExceptionMessage UsersManager_ExceptionUserDoesNotExist
-     */
-    public function testSetUserAccessNoLogin()
-    {
-        $this->api->setUserAccess("nologin", "view", 1);
-    }
-
-    /**
-     * @expectedException \Exception
-     * @expectedExceptionMessage UsersManager_ExceptionAccessValues
-     */
-    public function testSetUserAccessWrongAccessSpecified()
-    {
-        $this->api->addUser("gegg4564eqgeqag", "geqgegagae", "tegst@tesgt.com", "alias");
-        $this->api->setUserAccess("gegg4564eqgeqag", "viewnotknown", 1);
-    }
-
-    /**
-     * @expectedException \Exception
-     * @expectedExceptionMessage UsersManager_ExceptionAccessValues
-     */
-    public function testSetUserAccess_ShouldFail_SuperUserAccessIsNotAllowed()
-    {
-        $this->api->addUser("gegg4564eqgeqag", "geqgegagae", "tegst@tesgt.com", "alias");
-        $this->api->setUserAccess("gegg4564eqgeqag", "superuser", 1);
-    }
-
-    /**
-     * @expectedException \Exception
-     * @expectedExceptionMessage UsersManager_ExceptionUserDoesNotExist
-     */
-    public function testSetUserAccess_ShouldFail_IfLoginIsConfigSuperUserLogin()
-    {
-        $this->api->setUserAccess('superusertest', 'view', 1);
-    }
-
-    /**
-     * @expectedException \Exception
-     * @expectedExceptionMessage UsersManager_ExceptionSuperUserAccess
-     */
-    public function testSetUserAccess_ShouldFail_IfLoginIsUserWithSuperUserAccess()
-    {
-        $this->api->addUser("gegg4564eqgeqag", "geqgegagae", "tegst@tesgt.com", "alias");
-        $this->api->setSuperUserAccess('gegg4564eqgeqag', true);
-
-        $this->api->setUserAccess('gegg4564eqgeqag', 'view', 1);
-    }
-
-    /**
-     * idsites = all => apply access to all websites with admin access
-     */
-    public function testSetUserAccessIdsitesIsAll()
-    {
-        $this->api->addUser("gegg4564eqgeqag", "geqgegagae", "tegst@tesgt.com", "alias");
-
-        FakeAccess::$superUser = false;
-
-        $this->api->setUserAccess("gegg4564eqgeqag", "view", "all");
-
-        FakeAccess::$superUser = true;
-        $access = $this->api->getSitesAccessFromUser("gegg4564eqgeqag");
-        $access = $this->_flatten($access);
-
-        FakeAccess::$superUser = false;
-        $this->assertEquals(array_keys($access), FakeAccess::getSitesIdWithAdminAccess());
-
-        // we want to test the case for which we have actually set some rights
-        // if this is not OK then change the setUp method and add some admin rights for some websites
-        $this->assertGreaterThan(0, count(array_keys($access)));
-    }
-
-    /**
-     * idsites = all AND user is superuser=> apply access to all websites
-     */
-    public function testSetUserAccessIdsitesIsAllSuperuser()
-    {
-        FakeAccess::$superUser = true;
-
-        $idSites = $this->addSites(5);
-
-        $this->api->addUser("gegg4564eqgeqag", "geqgegagae", "tegst@tesgt.com", "alias");
-        $this->api->setUserAccess("gegg4564eqgeqag", "view", "all");
-
-        $access = $this->api->getSitesAccessFromUser("gegg4564eqgeqag");
-        $access = $this->_flatten($access);
-        $this->assertEquals($idSites, array_keys($access));
-    }
-
-    /**
-     * @expectedException \Exception
-     */
-    public function testSetUserAccess_ShouldNotBeAbleToSetAnyAccess_IfIdSitesIsEmpty()
-    {
-        $this->api->addUser("gegg4564eqgeqag", "geqgegagae", "tegst@tesgt.com", "alias");
-
-        $this->api->setUserAccess("gegg4564eqgeqag", "view", array());
-    }
-
-    /**
-     * normal case, access set for only one site
-     */
-    public function testSetUserAccessIdsitesOneSite()
-    {
-        $this->api->addUser("gegg4564eqgeqag", "geqgegagae", "tegst@tesgt.com", "alias");
-        $idSites = $this->addSites(1);
-
-        $this->api->setUserAccess("gegg4564eqgeqag", "view", $idSites);
-
-        $access = $this->api->getSitesAccessFromUser("gegg4564eqgeqag");
-        $access = $this->_flatten($access);
-        $this->assertEquals($idSites, array_keys($access));
-    }
-
-    /**
-     * normal case, access set for multiple sites
-     */
-    public function testSetUserAccessIdsitesMultipleSites()
-    {
-        $this->api->addUser("gegg4564eqgeqag", "geqgegagae", "tegst@tesgt.com", "alias");
-        list($id1, $id2, $id3) = $this->addSites(3);
-
-        $this->api->setUserAccess("gegg4564eqgeqag", "view", array($id1, $id3));
-
-        $access = $this->api->getSitesAccessFromUser("gegg4564eqgeqag");
-        $access = $this->_flatten($access);
-        $this->assertEquals(array($id1, $id3), array_keys($access));
-    }
-
-    /**
-     * normal case, string idSites comma separated access set for multiple sites
-     */
-    public function testSetUserAccessWithIdSitesIsStringCommaSeparated()
-    {
-        $this->api->addUser("gegg4564eqgeqag", "geqgegagae", "tegst@tesgt.com", "alias");
-        list($id1, $id2, $id3) = $this->addSites(3);
-
-        $this->api->setUserAccess("gegg4564eqgeqag", "view", "1,3");
-
-        $access = $this->api->getSitesAccessFromUser("gegg4564eqgeqag");
-        $access = $this->_flatten($access);
-        $this->assertEquals(array($id1, $id3), array_keys($access));
-    }
-
-    /**
-     * normal case,  set different acccess to different websites for one user
-     */
-    public function testSetUserAccessMultipleCallDistinctAccessSameUser()
-    {
-        $this->api->addUser("gegg4564eqgeqag", "geqgegagae", "tegst@tesgt.com", "alias");
-
-        list($id1, $id2) = $this->addSites(2);
-
-        $this->api->setUserAccess("gegg4564eqgeqag", "view", array($id1));
-        $this->api->setUserAccess("gegg4564eqgeqag", "admin", array($id2));
-
-        $access = $this->api->getSitesAccessFromUser("gegg4564eqgeqag");
-        $access = $this->_flatten($access);
-        $this->assertEquals(array($id1 => 'view', $id2 => 'admin'), $access);
-    }
-
-    /**
-     * normal case, set different access to different websites for multiple users
-     */
-    public function testSetUserAccessMultipleCallDistinctAccessMultipleUser()
-    {
-        $this->api->addUser("user1", "geqgegagae", "tegst@tesgt.com", "alias");
-        $this->api->addUser("user2", "geqgegagae", "tegst2@tesgt.com", "alias");
-
-        list($id1, $id2, $id3) = $this->addSites(3);
-
-        $this->api->setUserAccess("user1", "view", array($id1, $id2));
-        $this->api->setUserAccess("user2", "admin", array($id1));
-        $this->api->setUserAccess("user2", "view", array($id3, $id2));
-
-        $access1 = $this->api->getSitesAccessFromUser("user1");
-        $access1 = $this->_flatten($access1);
-        $access2 = $this->api->getSitesAccessFromUser("user2");
-        $access2 = $this->_flatten($access2);
-        $wanted1 = array($id1 => 'view', $id2 => 'view',);
-        $wanted2 = array($id1 => 'admin', $id2 => 'view', $id3 => 'view');
-
-        $this->assertEquals($wanted1, $access1);
-        $this->assertEquals($wanted2, $access2);
-
-        $access1 = $this->api->getUsersAccessFromSite($id1);
-        $access2 = $this->api->getUsersAccessFromSite($id2);
-        $access3 = $this->api->getUsersAccessFromSite($id3);
-        $wanted1 = array('user1' => 'view', 'user2' => 'admin',);
-        $wanted2 = array('user1' => 'view', 'user2' => 'view');
-        $wanted3 = array('user2' => 'view');
-
-        $this->assertEquals($wanted1, $access1);
-        $this->assertEquals($wanted2, $access2);
-        $this->assertEquals($wanted3, $access3);
-
-        $access1 = $this->api->getUsersSitesFromAccess('view');
-        $access2 = $this->api->getUsersSitesFromAccess('admin');
-        $wanted1 = array('user1' => array($id1, $id2), 'user2' => array($id2, $id3));
-        $wanted2 = array('user2' => array($id1));
-
-        $this->assertEquals($wanted1, $access1);
-        $this->assertEquals($wanted2, $access2);
-
-        // Test getUsersWithSiteAccess
-        $users = $this->api->getUsersWithSiteAccess($id1, $access = 'view');
-        $this->assertEquals(1, count($users));
-        $this->assertEquals('user1', $users[0]['login']);
-        $users = $this->api->getUsersWithSiteAccess($id2, $access = 'view');
-        $this->assertEquals(2, count($users));
-        $users = $this->api->getUsersWithSiteAccess($id1, $access = 'admin');
-        $this->assertEquals(1, count($users));
-        $this->assertEquals('user2', $users[0]['login']);
-        $users = $this->api->getUsersWithSiteAccess($id3, $access = 'admin');
-        $this->assertEquals(0, count($users));
-    }
-
-    /**
-     * we set access for one user for one site several times and check that it is updated
-     */
-    public function testSetUserAccessMultipleCallOverwriteSingleUserOneSite()
-    {
-        $this->api->addUser("user1", "geqgegagae", "tegst@tesgt.com", "alias");
-
-        list($id1, $id2) = $this->addSites(2);
-
-        $this->api->setUserAccess("user1", "view", array($id1, $id2));
-        $this->api->setUserAccess("user1", "admin", array($id1));
-
-        $access1 = $this->api->getSitesAccessFromUser("user1");
-        $access1 = $this->_flatten($access1);
-        $wanted1 = array($id1 => 'admin', $id2 => 'view',);
-
-        $this->assertEquals($wanted1, $access1);
-    }
-
-    /**
-     * @expectedException \Exception
-     * @expectedExceptionMessage checkUserHasSuperUserAccess Fake exception
-     */
-    public function testSetSuperUserAccess_ShouldFail_IfUserHasNotSuperUserPermission()
-    {
-        FakeAccess::setSuperUserAccess(false);
-        $this->api->setSuperUserAccess('nologin', false);
-    }
-
-    /**
-     * @expectedException \Exception
-     * @expectedExceptionMessage UsersManager_ExceptionUserDoesNotExist
-     */
-    public function testSetSuperUserAccess_ShouldFail_IfUserWithGivenLoginDoesNotExist()
-    {
-        $this->api->setSuperUserAccess('nologin', false);
-    }
-
-    /**
-     * @expectedException \Exception
-     * @expectedExceptionMessage UsersManager_ExceptionEditAnonymous
-     */
-    public function testSetSuperUserAccess_ShouldFail_IfUserIsAnonymous()
-    {
-        $this->api->setSuperUserAccess('anonymous', true);
-    }
-
-    /**
-     * @expectedException \Exception
-     * @expectedExceptionMessage UsersManager_ExceptionRemoveSuperUserAccessOnlySuperUser
-     */
-    public function testSetSuperUserAccess_ShouldFail_IfUserIsOnlyRemainingUserWithSuperUserAccess()
-    {
-        $this->api->addUser('login1', 'password1', 'test@example.com', false);
-        $this->api->setSuperUserAccess('login1', true);
-
-        $this->api->setSuperUserAccess('login1', false);
-    }
-
-    public function testSetSuperUserAccess_ShouldDeleteAllExistingAccessEntries()
-    {
-        list($id1, $id2) = $this->addSites(2);
-        $this->api->addUser('login1', 'password1', 'test@example.com', false);
-        $this->api->setUserAccess('login1', 'view', array($id1));
-        $this->api->setUserAccess('login1', 'admin', array($id2));
-
-        // verify user has access before setting Super User access
-        $access = $this->_flatten($this->api->getSitesAccessFromUser('login1'));
-        $this->assertEquals(array($id1 => 'view', $id2 => 'admin'), $access);
-
-        $this->api->setSuperUserAccess('login1', true);
-
-        // verify no longer any access
-        $this->assertEquals(array(), $this->model->getSitesAccessFromUser('login1'));
-    }
-
-    public function testSetSuperUserAccess_ShouldAddAndRemoveSuperUserAccessOnlyForGivenLogin()
-    {
-        $this->api->addUser('login1', 'password1', 'test1@example.com', false);
-        $this->api->addUser('login2', 'password2', 'test2@example.com', false);
-        $this->api->addUser('login3', 'password3', 'test3@example.com', false);
-
-        $this->api->setSuperUserAccess('login2', true);
-
-        // test add Super User access
-        $users = $this->api->getUsers();
-
-        $this->assertEquals(0, $users[0]['superuser_access']);
-        $this->assertEquals(1, $users[1]['superuser_access']);
-        $this->assertEquals('login2', $users[1]['login']);
-        $this->assertEquals(0, $users[2]['superuser_access']);
-
-        // should also accept string '1' to add Super User access
-        $this->api->setSuperUserAccess('login1', '1');
-        // test remove Super User access
-        $this->api->setSuperUserAccess('login2', false);
-
-        $users = $this->api->getUsers();
-        $this->assertEquals(1, $users[0]['superuser_access']);
-        $this->assertEquals('login1', $users[0]['login']);
-        $this->assertEquals(0, $users[1]['superuser_access']);
-        $this->assertEquals(0, $users[2]['superuser_access']);
-
-        $this->api->setSuperUserAccess('login3', true);
-        // should also accept string '0' to remove Super User access
-        $this->api->setSuperUserAccess('login1', '0');
-
-        $users = $this->api->getUsers();
-        $this->assertEquals(0, $users[0]['superuser_access']);
-        $this->assertEquals(0, $users[1]['superuser_access']);
-        $this->assertEquals('login3', $users[2]['login']);
-        $this->assertEquals(1, $users[2]['superuser_access']);
-    }
-
-    /**
-     * @expectedException \Exception
-     * @expectedExceptionMessage UsersManager_ExceptionUserDoesNotExist
-     */
-    public function testGetSitesAccessFromUserWrongUser()
-    {
-        $this->api->getSitesAccessFromUser("user1");
-    }
-
-    /**
-     * @expectedException \Exception
-     */
-    public function testGetUsersAccessFromSiteWrongIdSite()
-    {
-        $this->api->getUsersAccessFromSite(1);
-    }
-
-    /**
-     * @expectedException \Exception
-     * @expectedExceptionMessage UsersManager_ExceptionAccessValues
-     */
-    public function testGetUsersSitesFromAccessWrongSite()
-    {
-        $this->api->getUsersSitesFromAccess('unknown');
-    }
-
-    /**
-     * @expectedException \Exception
-     * @expectedExceptionMessage UsersManager_ExceptionUserDoesNotExist
-     */
-    public function testUpdateUserNonExistingLogin()
-    {
-        $this->api->updateUser("lolgin", "password");
-    }
-
-    /**
-     * no email no alias => keep old ones
-     */
-    public function testUpdateUserNoEmailNoAlias()
-    {
-        $login = "login";
-        $user  = array('login'    => $login,
-                       'password' => "geqgeagae",
-                       'email'    => "test@test.com",
-                       'alias'    => "alias");
-
-        $this->api->addUser($user['login'], $user['password'], $user['email'], $user['alias']);
-        $this->api->updateUser($login, "passowordOK");
-
-        $this->_checkUserHasNotChanged($user, "passowordOK");
-    }
-
-    /**
-     * no email => keep old ones
-     */
-    public function testUpdateUserNoEmail()
-    {
-        $login = "login";
-        $user  = array('login'    => $login,
-                       'password' => "geqgeagae",
-                       'email'    => "test@test.com",
-                       'alias'    => "alias");
-
-        $this->api->addUser($user['login'], $user['password'], $user['email'], $user['alias']);
-        $this->api->updateUser($login, "passowordOK", null, "newalias");
-
-        $this->_checkUserHasNotChanged($user, "passowordOK", null, "newalias");
-    }
-
-    /**
-     * no alias => keep old ones
-     */
-    public function testUpdateUserNoAlias()
-    {
-        $login = "login";
-        $user  = array('login'    => $login,
-                       'password' => "geqgeagae",
-                       'email'    => "test@test.com",
-                       'alias'    => "alias");
-
-        $this->api->addUser($user['login'], $user['password'], $user['email'], $user['alias']);
-        $this->api->updateUser($login, "passowordOK", "email@geaga.com");
-
-        $this->_checkUserHasNotChanged($user, "passowordOK", "email@geaga.com");
-    }
-
-    /**
-     * check to modify as the user
-     * @expectedException \Exception
-     * @expectedExceptionMessage UsersManager_ExceptionLoginExists
-     */
-    public function testAddUserIAmTheUser()
-    {
-        FakeAccess::$identity = 'login';
-        $this->testUpdateUserNoEmailNoAlias();
-    }
-
-    /**
-     * check to modify as being another user => exception
-     *
-     * @expectedException \Exception
-     */
-    public function testUpdateUserIAmNotTheUser()
-    {
-        FakeAccess::$identity = 'login2';
-        FakeAccess::$superUser = false;
-        $this->testUpdateUserNoEmailNoAlias();
-    }
-
-    /**
-     * normal case, reused in other tests
-     */
-    public function testUpdateUser()
-    {
-        $login = "login";
-        $user  = array('login'    => $login,
-                       'password' => "geqgeagae",
-                       'email'    => "test@test.com",
-                       'alias'    => "alias");
-
-        $this->api->addUser($user['login'], $user['password'], $user['email'], $user['alias']);
-        $this->api->updateUser($login, "passowordOK", "email@geaga.com", "NEW ALIAS");
-
-        $this->_checkUserHasNotChanged($user, "passowordOK", "email@geaga.com", "NEW ALIAS");
-    }
-
-    /**
-     * @expectedException \Exception
-     */
-    public function testGetUserByEmailInvalidMail()
-    {
-        $this->api->getUserByEmail('email@test.com');
-    }
-
-    public function testGetUserByEmail()
-    {
-        $user = array('login'    => "login",
-                      'password' => "geqgeagae",
-                      'email'    => "test@test.com",
-                      'alias'    => "alias");
-
-        $this->api->addUser($user['login'], $user['password'], $user['email'], $user['alias']);
-
-        $userByMail = $this->api->getUserByEmail($user['email']);
-
-        $this->assertEquals($user['login'], $userByMail['login']);
-        $this->assertEquals($user['email'], $userByMail['email']);
-        $this->assertEquals($user['alias'], $userByMail['alias']);
-    }
-
-    public function testGetUserPreferenceDefault()
-    {
-        $this->addSites(1);
-        $defaultReportPref = API::PREFERENCE_DEFAULT_REPORT;
-        $defaultReportDatePref = API::PREFERENCE_DEFAULT_REPORT_DATE;
-
-        $this->assertEquals(1, $this->api->getUserPreference('someUser', $defaultReportPref));
-        $this->assertEquals('yesterday', $this->api->getUserPreference('someUser', $defaultReportDatePref));
-    }
-
-    private function addSites($numberOfSites)
-    {
-        $idSites = array();
-
-        for ($index = 0; $index < $numberOfSites; $index++) {
-            $name      = "test" . ($index + 1);
-            $idSites[] = APISitesManager::getInstance()->addSite($name, array("http://piwik.net", "http://piwik.com/test/"));
-        }
-
-        return $idSites;
-    }
-}
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/Plugins/ActionsTest.php b/tests/PHPUnit/Plugins/ActionsTest.php
deleted file mode 100644
index 662ec20fac..0000000000
--- a/tests/PHPUnit/Plugins/ActionsTest.php
+++ /dev/null
@@ -1,123 +0,0 @@
-<?php
-/**
- * Piwik - free/libre analytics platform
- *
- * @link    http://piwik.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- */
-use Piwik\Plugins\Actions\ArchivingHelper;
-use Piwik\Tracker\Action;
-use Piwik\Translate;
-
-require_once 'Actions/Actions.php';
-
-class ActionsTests extends PHPUnit_Framework_TestCase
-{
-    public function setUp()
-    {
-        Translate::reloadLanguage('en');
-    }
-
-    public function tearDown()
-    {
-        Translate::unloadEnglishTranslation();
-    }
-
-    public function getActionNameTestData()
-    {
-        return array(
-            array(
-                'params'   => array('name' => 'http://example.org/', 'type' => Action::TYPE_PAGE_URL, 'urlPrefix' => null),
-                'expected' => array('/index'),
-            ),
-            array(
-                'params'   => array('name' => 'example.org/', 'type' => Action::TYPE_PAGE_URL, 'urlPrefix' => 1),
-                'expected' => array('/index'),
-            ),
-            array(
-                'params'   => array('name' => 'example.org/', 'type' => Action::TYPE_PAGE_URL, 'urlPrefix' => 2),
-                'expected' => array('/index'),
-            ),
-            array(
-                'params'   => array('name' => 'example.org/', 'type' => Action::TYPE_PAGE_URL, 'urlPrefix' => 3),
-                'expected' => array('/index'),
-            ),
-            array(
-                'params'   => array('name' => 'example.org/', 'type' => Action::TYPE_PAGE_URL, 'urlPrefix' => 4),
-                'expected' => array('/index'),
-            ),
-            array(
-                'params'   => array('name' => 'example.org/path/', 'type' => Action::TYPE_PAGE_URL, 'urlPrefix' => 4),
-                'expected' => array('path', '/index'),
-            ),
-            array(
-                'params'   => array('name' => 'example.org/test/path', 'type' => Action::TYPE_PAGE_URL, 'urlPrefix' => 1),
-                'expected' => array('test', '/path'),
-            ),
-            array(
-                'params'   => array('name' => 'http://example.org/path/', 'type' => Action::TYPE_PAGE_URL),
-                'expected' => array('path', '/index'),
-            ),
-            array(
-                'params'   => array('name' => 'example.org/test/path', 'type' => Action::TYPE_PAGE_URL, 'urlPrefix' => 1),
-                'expected' => array('test', '/path'),
-            ),
-            array(
-                'params'   => array('name' => 'Test / Path', 'type' => Action::TYPE_PAGE_URL),
-                'expected' => array('Test', '/Path'),
-            ),
-            array(
-                'params'   => array('name' => '    Test trim   ', 'type' => Action::TYPE_PAGE_URL),
-                'expected' => array('/Test trim'),
-            ),
-            array(
-                'params'   => array('name' => 'Category / Subcategory', 'type' => Action::TYPE_PAGE_TITLE),
-                'expected' => array('Category', ' Subcategory'),
-            ),
-            array(
-                'params'   => array('name' => '/path/index.php?var=test', 'type' => Action::TYPE_PAGE_TITLE),
-                'expected' => array('path', ' index.php?var=test'),
-            ),
-            array(
-                'params'   => array('name' => 'http://example.org/path/Default.aspx#anchor', 'type' => Action::TYPE_PAGE_TITLE),
-                'expected' => array('path', ' Default.aspx#anchor'),
-            ),
-            array(
-                'params'   => array('name' => '', 'type' => Action::TYPE_PAGE_TITLE),
-                'expected' => array('Page Name not defined'),
-            ),
-            array(
-                'params'   => array('name' => '', 'type' => Action::TYPE_PAGE_URL),
-                'expected' => array('Page URL not defined'),
-            ),
-            array(
-                'params'   => array('name' => 'http://example.org/download.zip', 'type' => Action::TYPE_DOWNLOAD),
-                'expected' => array('example.org', '/download.zip'),
-            ),
-            array(
-                'params'   => array('name' => 'http://example.org/download/1/', 'type' => Action::TYPE_DOWNLOAD),
-                'expected' => array('example.org', '/download/1/'),
-            ),
-            array(
-                'params'   => array('name' => 'http://example.org/link', 'type' => Action::TYPE_OUTLINK),
-                'expected' => array('example.org', '/link'),
-            ),
-            array(
-                'params'   => array('name' => 'http://example.org/some/path/', 'type' => Action::TYPE_OUTLINK),
-                'expected' => array('example.org', '/some/path/'),
-            ),
-        );
-    }
-
-    /**
-     * @dataProvider getActionNameTestData
-     * @group        Plugins
-     */
-    public function testGetActionExplodedNames($params, $expected)
-    {
-        ArchivingHelper::reloadConfig();
-        $processed = ArchivingHelper::getActionExplodedNames($params['name'], $params['type'], (isset($params['urlPrefix']) ? $params['urlPrefix'] : null));
-        $this->assertEquals($expected, $processed);
-    }
-}
-
diff --git a/tests/PHPUnit/Plugins/AnonymizeIPTest.php b/tests/PHPUnit/Plugins/AnonymizeIPTest.php
deleted file mode 100644
index 449d255f1f..0000000000
--- a/tests/PHPUnit/Plugins/AnonymizeIPTest.php
+++ /dev/null
@@ -1,89 +0,0 @@
-<?php
-/**
- * Piwik - free/libre analytics platform
- *
- * @link http://piwik.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- */
-use Piwik\IP;
-use Piwik\Plugins\PrivacyManager\IPAnonymizer;
-
-require_once 'PrivacyManager/IPAnonymizer.php';
-
-class AnonymizeIPTest extends PHPUnit_Framework_TestCase
-{
-    // IPv4 addresses and expected results
-    public function getipv4Addresses()
-    {
-        return array(
-            // ip, array( expected0, expected1, expected2, expected3, expected4 ),
-            array('0.0.0.0', array("\x00\x00\x00\x00", "\x00\x00\x00\x00", "\x00\x00\x00\x00", "\x00\x00\x00\x00", "\x00\x00\x00\x00")),
-            array('0.0.0.1', array("\x00\x00\x00\x01", "\x00\x00\x00\x00", "\x00\x00\x00\x00", "\x00\x00\x00\x00", "\x00\x00\x00\x00")),
-            array('0.0.0.255', array("\x00\x00\x00\xff", "\x00\x00\x00\x00", "\x00\x00\x00\x00", "\x00\x00\x00\x00", "\x00\x00\x00\x00")),
-            array('0.0.1.0', array("\x00\x00\x01\x00", "\x00\x00\x01\x00", "\x00\x00\x00\x00", "\x00\x00\x00\x00", "\x00\x00\x00\x00")),
-            array('0.0.1.1', array("\x00\x00\x01\x01", "\x00\x00\x01\x00", "\x00\x00\x00\x00", "\x00\x00\x00\x00", "\x00\x00\x00\x00")),
-            array('0.0.255.255', array("\x00\x00\xff\xff", "\x00\x00\xff\x00", "\x00\x00\x00\x00", "\x00\x00\x00\x00", "\x00\x00\x00\x00")),
-            array('0.1.0.0', array("\x00\x01\x00\x00", "\x00\x01\x00\x00", "\x00\x01\x00\x00", "\x00\x00\x00\x00", "\x00\x00\x00\x00")),
-            array('0.1.1.1', array("\x00\x01\x01\x01", "\x00\x01\x01\x00", "\x00\x01\x00\x00", "\x00\x00\x00\x00", "\x00\x00\x00\x00")),
-            array('0.255.255.255', array("\x00\xff\xff\xff", "\x00\xff\xff\x00", "\x00\xff\x00\x00", "\x00\x00\x00\x00", "\x00\x00\x00\x00")),
-            array('1.0.0.0', array("\x01\x00\x00\x00", "\x01\x00\x00\x00", "\x01\x00\x00\x00", "\x01\x00\x00\x00", "\x00\x00\x00\x00")),
-            array('127.255.255.255', array("\x7f\xff\xff\xff", "\x7f\xff\xff\x00", "\x7f\xff\x00\x00", "\x7f\x00\x00\x00", "\x00\x00\x00\x00")),
-            array('128.0.0.0', array("\x80\x00\x00\x00", "\x80\x00\x00\x00", "\x80\x00\x00\x00", "\x80\x00\x00\x00", "\x00\x00\x00\x00")),
-            array('255.255.255.255', array("\xff\xff\xff\xff", "\xff\xff\xff\x00", "\xff\xff\x00\x00", "\xff\x00\x00\x00", "\x00\x00\x00\x00")),
-        );
-    }
-
-    public function getipv6Addresses()
-    {
-        return array(
-            array('2001:db8:0:8d3:0:8a2e:70:7344', array(
-                "\x20\x01\x0d\xb8\x00\x00\x08\xd3\x00\x00\x8a\x2e\x00\x70\x73\x44",
-                "\x20\x01\x0d\xb8\x00\x00\x08\xd3\x00\x00\x00\x00\x00\x00\x00\x00", // mask 64 bits
-                "\x20\x01\x0d\xb8\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", // mask 80 bits
-                "\x20\x01\x0d\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00" // mask 104 bits
-            )),
-            array('2001:6f8:900:724::2', array(
-                "\x20\x01\x06\xf8\x09\x00\x07\x24\x00\x00\x00\x00\x00\x00\x00\x02",
-                "\x20\x01\x06\xf8\x09\x00\x07\x24\x00\x00\x00\x00\x00\x00\x00\x00",
-                "\x20\x01\x06\xf8\x09\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00",
-                "\x20\x01\x06\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00",
-            ))
-        );
-    }
-
-    /**
-     * @dataProvider getipv4Addresses
-     * @group Plugins
-     */
-    public function testApplyIPMask($ip, $expected)
-    {
-        // each IP is tested with 0 to 4 octets masked
-        for ($maskLength = 0; $maskLength <= 4; $maskLength++) {
-            $res = IPAnonymizer::applyIPMask(IP::P2N($ip), $maskLength);
-            $this->assertEquals($expected[$maskLength], $res, "Got " . bin2hex($res) . ", Expected " . bin2hex($expected[$maskLength]));
-        }
-
-        // edge case (bounds check)
-        $this->assertEquals("\x00\x00\x00\x00", IPAnonymizer::applyIPMask(IP::P2N($ip), 5));
-
-        // mask IPv4 mapped addresses
-        for ($maskLength = 0; $maskLength <= 4; $maskLength++) {
-            $res = IPAnonymizer::applyIPMask(IP::P2N('::ffff:' . $ip), $maskLength);
-            $this->assertEquals($res, "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xff\xff" . $expected[$maskLength], "Got " . bin2hex($res) . ", Expected " . bin2hex($expected[$maskLength]));
-        }
-        $this->assertEquals("\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xff\x00\x00\x00\x00\x00", IPAnonymizer::applyIPMask(IP::P2N('::ffff:' . $ip), 5));
-    }
-
-    /**
-     * @dataProvider getipv6Addresses
-     * @group Plugins
-     */
-    public function testApplyIPMask6($ip, $expected)
-    {
-        // each IP is tested with 0 to 4 octets masked
-        for ($maskLength = 0; $maskLength < 4; $maskLength++) {
-            $res = IPAnonymizer::applyIPMask(IP::P2N($ip), $maskLength);
-            $this->assertEquals($expected[$maskLength], $res, "Got " . bin2hex($res) . ", Expected " . bin2hex($expected[$maskLength]) . ", Mask Level " . $maskLength);
-        }
-    }
-}
\ No newline at end of file
diff --git a/tests/PHPUnit/Plugins/LanguagesManagerTest.php b/tests/PHPUnit/Plugins/LanguagesManagerTest.php
deleted file mode 100755
index 13cb46c6e6..0000000000
--- a/tests/PHPUnit/Plugins/LanguagesManagerTest.php
+++ /dev/null
@@ -1,177 +0,0 @@
-<?php
-/**
- * Piwik - free/libre analytics platform
- *
- * @link    http://piwik.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- */
-use Piwik\Common;
-use Piwik\Plugins\LanguagesManager\API;
-use Piwik\Translate\Filter\ByParameterCount;
-use Piwik\Translate\Filter\EmptyTranslations;
-use Piwik\Translate\Filter\EncodedEntities;
-use Piwik\Translate\Filter\UnnecassaryWhitespaces;
-use Piwik\Translate\Validate\CoreTranslations;
-use Piwik\Translate\Validate\NoScripts;
-use Piwik\Translate\Writer;
-
-require_once 'LanguagesManager/API.php';
-
-class Test_LanguagesManager extends PHPUnit_Framework_TestCase
-{
-    public function setUp()
-    {
-        parent::setUp();
-        include PIWIK_INCLUDE_PATH . '/core/DataFiles/Languages.php';
-    }
-
-    function getTestDataForLanguageFiles()
-    {
-        // we also test that none of the language php files outputs any character on the screen (eg. space before the <?php)
-        $languages = API::getInstance()->getAvailableLanguages();
-
-        $plugins = \Piwik\Plugin\Manager::getInstance()->readPluginsDirectory();
-
-        $pluginsWithTranslation = array();
-
-        foreach ($plugins as $plugin) {
-
-            if (API::getInstance()->getPluginTranslationsForLanguage($plugin, 'en')) {
-
-                $pluginsWithTranslation[] = $plugin;
-            }
-        }
-
-        $return = array();
-        foreach ($languages as $language) {
-            if ($language != 'en') {
-                $return[] = array($language, null);
-
-                foreach ($pluginsWithTranslation as $plugin) {
-
-                    $return[] = array($language, $plugin);
-                }
-            }
-        }
-        return $return;
-    }
-
-    /**
-     * test all languages
-     *
-     * @group Plugins
-     *
-     * @dataProvider getTestDataForLanguageFiles
-     */
-    function testGetTranslationsForLanguages($language, $plugin)
-    {
-        $translationWriter = new Writer($language, $plugin);
-
-        $baseTranslations = $translationWriter->getTranslations('en');
-
-        $translationWriter->addValidator(new NoScripts());
-        if (empty($plugin)) {
-            $translationWriter->addValidator(new CoreTranslations($baseTranslations));
-        }
-
-        // prevent build from failing when translations string have been deleted
-//        $translationWriter->addFilter(new ByBaseTranslations($baseTranslations));
-        $translationWriter->addFilter(new EmptyTranslations());
-        $translationWriter->addFilter(new ByParameterCount($baseTranslations));
-        $translationWriter->addFilter(new UnnecassaryWhitespaces($baseTranslations));
-        $translationWriter->addFilter(new EncodedEntities());
-
-        $translations = $translationWriter->getTranslations($language);
-
-        if (empty($translations)) {
-            return; // skip language / plugin combinations that aren't present
-        }
-
-        $translationWriter->setTranslations($translations);
-
-        $this->assertTrue($translationWriter->isValid(), $translationWriter->getValidationMessage());
-
-        if ($translationWriter->wasFiltered()) {
-
-            $translationWriter->saveTemporary();
-            $this->fail(implode("\n", $translationWriter->getFilterMessages()) . "\n"
-                . 'Translation file errors detected in ' . $language . "...\n"
-                . "To overwrite you could manually fix the language files, or run the following command may work if you have access to oTrance: \n"
-                . "$ ./console translations:update [--plugin=XYZ] \n");
-        }
-    }
-
-    /**
-     * test language when it's not defined
-     *
-     * @group Plugins
-     *
-     * @expectedException Exception
-     */
-    function testWriterInvalidPlugin()
-    {
-        new Writer('de', 'iNvaLiDPluGin'); // invalid plugin throws exception
-    }
-
-    /**
-     * test language when it's not defined
-     *
-     * @group Plugins
-     */
-    function testGetTranslationsForLanguagesNot()
-    {
-        $this->assertFalse(API::getInstance()->getTranslationsForLanguage("../no-language"));
-    }
-
-    /**
-     * test English short name for language
-     *
-     * @group Plugins
-     */
-    function testGetLanguageNamesInEnglish()
-    {
-        $languages = API::getInstance()->getAvailableLanguages();
-        foreach ($languages as $language) {
-            $data = file_get_contents(PIWIK_INCLUDE_PATH . "/lang/$language.json");
-            $translations = json_decode($data, true);
-            $name = $translations['General']['EnglishLanguageName'];
-
-            if ($language != 'en') {
-                $this->assertFalse($name == 'English', "for $language");
-            }
-
-            $languageCode = substr($language, 0, 2);
-            $this->assertTrue(isset($GLOBALS['Piwik_LanguageList'][$languageCode]));
-            $names = $GLOBALS['Piwik_LanguageList'][$languageCode];
-
-            if (isset($GLOBALS['Piwik_LanguageList'][$language])) {
-                if (is_array($names)) {
-                    $this->assertTrue(in_array($name, $names), "$language: failed because $name not a known language name");
-                } else {
-                    $this->assertTrue($name == $names, "$language: failed because $name == $names");
-                }
-            } else {
-                if (is_array($names)) {
-                    $this->assertTrue(strpos($name, $names[0]) !== false);
-                } else {
-                    $this->fail("$language: expected an array of language names");
-                }
-            }
-        }
-    }
-
-    /**
-     * test format of DataFile/Languages.php
-     *
-     * @group Plugins
-     */
-    function testGetLanguagesList()
-    {
-        $languages = Common::getLanguagesList();
-        $this->assertTrue(count($languages) > 0);
-        foreach ($languages as $langCode => $langs) {
-            $this->assertTrue(strlen($langCode) == 2, "$langCode length = 2");
-            $this->assertTrue(is_array($langs) && count($langs) >= 1, "$langCode array(names) >= 1");
-        }
-    }
-}
diff --git a/tests/PHPUnit/Plugins/ProxyTest.php b/tests/PHPUnit/Plugins/ProxyTest.php
deleted file mode 100644
index ab5a57bcc4..0000000000
--- a/tests/PHPUnit/Plugins/ProxyTest.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-/**
- * Piwik - free/libre analytics platform
- *
- * @link http://piwik.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- */
-use Piwik\Plugins\Proxy\Controller;
-
-class ProxyTest extends PHPUnit_Framework_TestCase
-{
-    public function getAcceptableRemoteUrls()
-    {
-        return array(
-            // piwik white list (and used in homepage)
-            array('http://piwik.org/', true),
-
-            array('http://piwik.org', true),
-            array('http://qa.piwik.org/', true),
-            array('http://forum.piwik.org/', true),
-            array('http://dev.piwik.org/', true),
-            array('http://demo.piwik.org/', true),
-
-            // not in the piwik white list
-            array('http://www.piwik.org/', false),
-            array('https://piwik.org/', false),
-            array('http://example.org/', false),
-        );
-    }
-
-    /**
-     * @dataProvider getAcceptableRemoteUrls
-     * @group Plugins
-     */
-    public function testIsAcceptableRemoteUrl($url, $expected)
-    {
-        $this->assertEquals($expected, Controller::isPiwikUrl($url));
-    }
-}
-
diff --git a/tests/PHPUnit/Plugins/ReferrersTest.php b/tests/PHPUnit/Plugins/ReferrersTest.php
deleted file mode 100644
index c03c9ad61d..0000000000
--- a/tests/PHPUnit/Plugins/ReferrersTest.php
+++ /dev/null
@@ -1,243 +0,0 @@
-<?php
-/**
- * Piwik - free/libre analytics platform
- *
- * @link http://piwik.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- */
-require_once 'Referrers/Referrers.php';
-
-use Piwik\DataTable;
-use Piwik\DataTable\Row;
-use Piwik\Period;
-
-class ReferrersTest extends PHPUnit_Framework_TestCase
-{
-    /**
-     * Dataprovider serving all search engine data
-     */
-    public function getSearchEngines()
-    {
-        include PIWIK_PATH_TEST_TO_ROOT . '/core/DataFiles/SearchEngines.php';
-
-        $searchEngines = array();
-        foreach ($GLOBALS['Piwik_SearchEngines'] as $url => $searchEngine) {
-            $searchEngines[] = array($url, $searchEngine);
-        }
-        return $searchEngines;
-    }
-
-    /**
-     * search engine has at least one keyword
-     *
-     * @group Plugins
-     *
-     * @dataProvider getSearchEngines
-     */
-    public function testMissingSearchEngineKeyword($url, $searchEngine)
-    {
-        // Get list of search engines and first appearing URL
-        static $searchEngines = array();
-
-        $name = parse_url('http://' . $url);
-        if (!array_key_exists($searchEngine[0], $searchEngines)) {
-            $searchEngines[$searchEngine[0]] = $url;
-
-            $this->assertTrue(!empty($searchEngine[1]), $name['host']);
-        }
-    }
-
-    /**
-     * search engine is defined in DataFiles/SearchEngines.php but there's no favicon
-     *
-     * @group Plugins
-     *
-     * @dataProvider getSearchEngines
-     */
-    public function testMissingSearchEngineIcons($url, $searchEngine)
-    {
-        // Get list of existing favicons
-        $favicons = scandir(PIWIK_PATH_TEST_TO_ROOT . '/plugins/Referrers/images/searchEngines/');
-
-        // Get list of search engines and first appearing URL
-        static $searchEngines = array();
-
-        $name = parse_url('http://' . $url);
-        if (!array_key_exists($searchEngine[0], $searchEngines)) {
-            $searchEngines[$searchEngine[0]] = $url;
-
-            $this->assertTrue(in_array($name['host'] . '.png', $favicons), $name['host']);
-        }
-    }
-
-    /**
-     * favicon exists but there's no corresponding search engine defined in DataFiles/SearchEngines.php
-     *
-     * @group Plugins
-     */
-    public function testObsoleteSearchEngineIcons()
-    {
-        include PIWIK_PATH_TEST_TO_ROOT . '/core/DataFiles/SearchEngines.php';
-
-        // Get list of search engines and first appearing URL
-        $searchEngines = array();
-        foreach ($GLOBALS['Piwik_SearchEngines'] as $url => $searchEngine) {
-            $name = parse_url('http://' . $url);
-            if (!array_key_exists($name['host'], $searchEngines)) {
-                $searchEngines[$name['host']] = true;
-            }
-        }
-
-        // Get list of existing favicons
-        $favicons = scandir(PIWIK_PATH_TEST_TO_ROOT . '/plugins/Referrers/images/searchEngines/');
-        foreach ($favicons as $name) {
-            if ($name[0] == '.' || strpos($name, 'xx.') === 0) {
-                continue;
-            }
-
-            $host = substr($name, 0, -4);
-            $this->assertTrue(array_key_exists($host, $searchEngines), $host);
-        }
-    }
-
-    /**
-     * get search engine host from url
-     *
-     * @group Plugins
-     */
-    public function testGetSearchEngineHostFromUrl()
-    {
-        $data = array(
-            'http://www.google.com/cse' => array('www.google.com', 'www.google.com/cse'),
-            'http://www.google.com'     => array('www.google.com', 'www.google.com'),
-        );
-
-        foreach ($data as $url => $expected) {
-            $this->assertEquals($expected[0], \Piwik\Plugins\Referrers\getSearchEngineHostFromUrl($url));
-            $this->assertEquals($expected[1], \Piwik\Plugins\Referrers\getSearchEngineHostPathFromUrl($url));
-        }
-    }
-
-    /**
-     * Dataprovider for testGetSearchEngineUrlFromUrlAndKeyword
-     */
-    public function getSearchEngineUrlFromUrlAndKeywordTestData()
-    {
-        return array(
-            array('http://apollo.lv/portal/search/', 'piwik', 'http://apollo.lv/portal/search/?cof=FORID%3A11&q=piwik&search_where=www'),
-            array('http://bing.com/images/search', 'piwik', 'http://bing.com/images/search/?q=piwik'),
-            array('http://google.com', 'piwik', 'http://google.com/search?q=piwik'),
-        );
-    }
-
-    /**
-     * get search engine url from name and keyword
-     *
-     * @group Plugins
-     *
-     * @dataProvider getSearchEngineUrlFromUrlAndKeywordTestData
-     */
-    public function testGetSearchEngineUrlFromUrlAndKeyword($url, $keyword, $expected)
-    {
-        include PIWIK_PATH_TEST_TO_ROOT . '/core/DataFiles/SearchEngines.php';
-        $this->assertEquals($expected, \Piwik\Plugins\Referrers\getSearchEngineUrlFromUrlAndKeyword($url, $keyword));
-    }
-
-    /**
-     * Dataprovider for getSocialNetworkFromDomainTestData
-     */
-    public function getSocialNetworkFromDomainTestData()
-    {
-        return array(
-            array('http://www.facebook.com', 'Facebook'),
-            array('http://www.facebook.com/piwik', 'Facebook'),
-            array('http://m.facebook.com', 'Facebook'),
-            array('https://m.facebook.com', 'Facebook'),
-            array('m.facebook.com', 'Facebook'),
-            array('http://lastfm.com.tr', 'Last.fm'),
-            array('http://t.co/test', 'Twitter'),
-            array('http://xxt.co/test', \Piwik\Piwik::translate('General_Unknown')),
-            array('asdfasdfadsf.com', \Piwik\Piwik::translate('General_Unknown')),
-            array('http://xwayn.com', \Piwik\Piwik::translate('General_Unknown')),
-            array('http://live.com/test', \Piwik\Piwik::translate('General_Unknown')),
-        );
-    }
-
-    /**
-     * @group Plugins
-     *
-     * @dataProvider getSocialNetworkFromDomainTestData
-     */
-    public function testGetSocialNetworkFromDomain($url, $expected)
-    {
-        include PIWIK_INCLUDE_PATH . '/core/DataFiles/Socials.php';
-        $this->assertEquals($expected, \Piwik\Plugins\Referrers\getSocialNetworkFromDomain($url));
-    }
-
-    public function getSocialsLogoFromUrlTestData()
-    {
-        return array(
-            array('http://www.facebook.com', 'facebook.com.png'),
-            array('www.facebook.com', 'facebook.com.png',),
-            array('http://lastfm.com.tr', 'last.fm.png'),
-            array('http://asdfasdf.org/test', 'xx.png'),
-            array('http://www.google.com', 'xx.png'),
-        );
-    }
-
-    /**
-     * @group Plugins
-     *
-     * @dataProvider getSocialsLogoFromUrlTestData
-     */
-    public function testGetSocialsLogoFromUrl($url, $expected)
-    {
-        include PIWIK_INCLUDE_PATH . '/core/DataFiles/Socials.php';
-        $this->assertContains($expected, \Piwik\Plugins\Referrers\getSocialsLogoFromUrl($url));
-    }
-
-    public function isSocialUrlTestData()
-    {
-        return array(
-            array('http://www.facebook.com', 'Facebook', true),
-            array('http://www.facebook.com', 'Twitter', false),
-            array('http://m.facebook.com', false, true),
-            array('http://lastfm.com.tr', 'Last.fm', true),
-            array('http://asdfasdf.org/test', false, false),
-            array('http://asdfasdf.com/test', 'Facebook', false),
-        );
-    }
-
-    /**
-     * @group Plugins
-     *
-     * @dataProvider isSocialUrlTestData
-     */
-    public function testIsSocialUrl($url, $assumedSocial, $expected)
-    {
-        include PIWIK_INCLUDE_PATH . '/core/DataFiles/Socials.php';
-        $this->assertEquals($expected, \Piwik\Plugins\Referrers\isSocialUrl($url, $assumedSocial));
-    }
-
-    public function removeUrlProtocolTestData()
-    {
-        return array(
-            array('http://www.facebook.com', 'www.facebook.com'),
-            array('https://bla.fr', 'bla.fr'),
-            array('ftp://bla.fr', 'bla.fr'),
-            array('udp://bla.fr', 'bla.fr'),
-            array('bla.fr', 'bla.fr'),
-            array('ASDasdASDDasd', 'ASDasdASDDasd'),
-        );
-    }
-
-    /**
-     * @group Plugins
-     *
-     * @dataProvider removeUrlProtocolTestData
-     */
-    public function testRemoveUrlProtocol($url, $expected)
-    {
-        $this->assertEquals($expected, \Piwik\Plugins\Referrers\removeUrlProtocol($url));
-    }
-}
diff --git a/tests/PHPUnit/Plugins/SEOTest.php b/tests/PHPUnit/Plugins/SEOTest.php
deleted file mode 100644
index 8cb377eeef..0000000000
--- a/tests/PHPUnit/Plugins/SEOTest.php
+++ /dev/null
@@ -1,60 +0,0 @@
-<?php
-/**
- * Piwik - free/libre analytics platform
- *
- * @link http://piwik.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- */
-use Piwik\Access;
-use Piwik\DataTable\Renderer;
-use Piwik\Plugins\SEO\API;
-
-class SEOTest extends PHPUnit_Framework_TestCase
-{
-    public function setUp()
-    {
-        parent::setUp();
-
-        // setup the access layer
-        $pseudoMockAccess = new FakeAccess;
-        FakeAccess::setIdSitesView(array(1, 2));
-        FakeAccess::setIdSitesAdmin(array(3, 4));
-
-        //finally we set the user as a Super User by default
-        FakeAccess::$superUser = true;
-        Access::setSingletonInstance($pseudoMockAccess);
-
-        $user_agents = array(
-            'Mozilla/6.0 (Macintosh; I; Intel Mac OS X 11_7_9; de-LI; rv:1.9b4) Gecko/2012010317 Firefox/10.0a4',
-            'Mozilla/5.0 (compatible; MSIE 10.6; Windows NT 6.1; Trident/5.0; InfoPath.2; SLCC1; .NET CLR 3.0.4506.2152; .NET CLR 3.5.30729; .NET CLR 2.0.50727) 3gpp-gba UNTRUSTED/1.0',
-            'Mozilla/5.0 (Windows NT 6.1) AppleWebKit/535.2 (KHTML, like Gecko) Chrome/18.6.872.0 Safari/535.2 UNTRUSTED/1.0 3gpp-gba UNTRUSTED/1.0',
-            'Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10_6_8; de-at) AppleWebKit/533.21.1 (KHTML, like Gecko) Version/5.0.5 Safari/533.21.1',
-        );
-
-        $_SERVER['HTTP_USER_AGENT'] = $user_agents[mt_rand(0, count($user_agents) - 1)];
-    }
-
-    /**
-     * tell us when the API is broken
-     *
-     * @group Plugins
-     */
-    public function test_API()
-    {
-        try {
-            $dataTable = API::getInstance()->getRank('http://www.microsoft.com/');
-        } catch(Exception $e) {
-            $this->markTestSkipped('A SEO http request failed, Skipping this test for now. Error was: '.$e->getMessage());
-        }
-        $renderer = Renderer::factory('php');
-        $renderer->setSerialize(false);
-        $ranks = $renderer->render($dataTable);
-        foreach ($ranks as $rank) {
-            $message = $rank['id'] . ' expected non-zero rank, got [' . $rank['rank'] . ']';
-            if(empty($rank['rank'])) {
-                $this->markTestSkipped("Skipped to avoid random build failure: " . $message);
-            }
-            $this->assertNotEmpty($rank['rank'], $message);
-        }
-    }
-}
diff --git a/tests/PHPUnit/Plugins/UserCountryTest.php b/tests/PHPUnit/Plugins/UserCountryTest.php
deleted file mode 100644
index 72f9e7bfce..0000000000
--- a/tests/PHPUnit/Plugins/UserCountryTest.php
+++ /dev/null
@@ -1,182 +0,0 @@
-<?php
-/**
- * Piwik - free/libre analytics platform
- *
- * @link http://piwik.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- */
-
-use Piwik\Plugins\UserCountry\GeoIPAutoUpdater;
-use Piwik\Plugins\UserCountry\LocationProvider\GeoIp;
-use Piwik\Plugins\UserCountry;
-use Piwik\Plugins\UserCountry\LocationProvider;
-
-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
-{
-    /**
-     * @group Plugins
-     */
-    public function testGetFlagFromCode()
-    {
-        $flag = \Piwik\Plugins\UserCountry\getFlagFromCode("us");
-        $this->assertEquals(basename($flag), "us.png");
-    }
-
-    /**
-     * @group Plugins
-     */
-    public function testGetFlagFromInvalidCode()
-    {
-        $flag = \Piwik\Plugins\UserCountry\getFlagFromCode("foo");
-        $this->assertEquals(basename($flag), "xx.png");
-    }
-
-    /**
-     * @group Plugins
-     */
-    public function testFlagsAndContinents()
-    {
-        require PIWIK_PATH_TEST_TO_ROOT . '/core/DataFiles/Countries.php';
-
-        $continents = $GLOBALS['Piwik_ContinentList'];
-        $countries = array_merge($GLOBALS['Piwik_CountryList'], $GLOBALS['Piwik_CountryList_Extras']);
-
-        // Get list of existing flag icons
-        $flags = scandir(PIWIK_PATH_TEST_TO_ROOT . '/plugins/UserCountry/images/flags/');
-
-        // Get list of countries
-        foreach ($countries as $country => $continent) {
-            // test continent
-            $this->assertContains($continent, $continents);
-
-            // test flag
-            $this->assertContains($country . '.png', $flags);
-        }
-
-        foreach ($flags as $filename) {
-            if ($filename == '.' || $filename == '..') {
-                continue;
-            }
-
-            $country = substr($filename, 0, strpos($filename, '.png'));
-
-            // test country
-            $this->assertArrayHasKey($country, $countries, $filename);
-        }
-    }
-
-    /**
-     * Test that redundant checks work.
-     *
-     * @group Plugins
-     */
-    public function testGeoIpUpdaterRedundantChecks()
-    {
-        GeoIp::$geoIPDatabaseDir = 'tests/lib/geoip-files';
-        LocationProvider::$providers = null;
-
-        // create empty ISP & Org files
-        $this->createEmptyISPOrgFiles();
-
-        // run redundant checks
-        $updater = new Piwik_UserCountry_GeoIPAutoUpdater_publictest();
-        $updater->performRedundantDbChecks();
-
-        // check that files are renamed correctly
-        $this->checkBrokenGeoIPState();
-
-        // create empty files again & run checks again
-        $this->createEmptyISPOrgFiles();
-        $updater->performRedundantDbChecks();
-
-        // check that w/ broken files already there, redundant checks still work correctly
-        $this->checkBrokenGeoIPState();
-    }
-
-    /**
-     * @group Plugins
-     *
-     * @dataProvider getInvalidGeoIpUrlsToTest
-     */
-    public function testGeoIpDownloadInvalidUrl($url)
-    {
-        $updater = new Piwik_UserCountry_GeoIPAutoUpdater_publictest();
-        try {
-            $updater->downloadFile('loc', $url);
-            $this->fail("Downloading invalid url succeeded!");
-        } catch (Exception $ex) {
-            $this->assertEquals("UserCountry_UnsupportedArchiveType", $ex->getMessage());
-        }
-    }
-
-    public function getInvalidGeoIpUrlsToTest()
-    {
-        return array(array("http://localhost/tests/resources/geoip.tar"),
-                     array("http://localhost/tests/resources/geoip.tar.bz2"),
-                     array("http://localhost/tests/resources/geoip.dat"));
-    }
-
-    public function setUp()
-    {
-        // empty
-    }
-
-    public function tearDown()
-    {
-        $geoIpDirPath = PIWIK_INCLUDE_PATH . '/tests/lib/geoip-files';
-        $filesToRemove = array('GeoIPISP.dat.broken', 'GeoIPOrg.dat.broken', 'GeoIPISP.dat', 'GeoIPOrg.dat');
-
-        foreach ($filesToRemove as $name) {
-            $path = $geoIpDirPath . '/' . $name;
-            if (file_exists($path)) {
-                unlink($path);
-            }
-        }
-    }
-
-    private function createEmptyISPOrgFiles()
-    {
-        $geoIpDir = PIWIK_INCLUDE_PATH . '/tests/lib/geoip-files';
-
-        $fd = fopen($geoIpDir . '/GeoIPISP.dat', 'w');
-        fclose($fd);
-
-        $fd = fopen($geoIpDir . '/GeoIPOrg.dat', 'w');
-        fclose($fd);
-    }
-
-    private function checkBrokenGeoIPState()
-    {
-        $geoIpDir = PIWIK_INCLUDE_PATH . '/tests/lib/geoip-files';
-
-        $this->assertFalse(file_exists($geoIpDir . '/GeoIPCity.dat.broken'));
-
-        $this->assertFalse(file_exists($geoIpDir . '/GeoIPISP.dat'));
-        $this->assertTrue(file_exists($geoIpDir . '/GeoIPISP.dat.broken'));
-
-        $this->assertFalse(file_exists($geoIpDir . '/GeoIPOrg.dat'));
-        $this->assertTrue(file_exists($geoIpDir . '/GeoIPOrg.dat.broken'));
-    }
-}
-
-class Piwik_UserCountry_GeoIPAutoUpdater_publictest extends GeoIPAutoUpdater
-{
-    public function __construct()
-    {
-        // empty
-    }
-
-    public function performRedundantDbChecks()
-    {
-        parent::performRedundantDbChecks();
-    }
-
-    public function downloadFile($type, $url)
-    {
-        parent::downloadFile($type, $url);
-    }
-}
diff --git a/tests/PHPUnit/Plugins/UserSettingsTest.php b/tests/PHPUnit/Plugins/UserSettingsTest.php
deleted file mode 100644
index b18362f1e5..0000000000
--- a/tests/PHPUnit/Plugins/UserSettingsTest.php
+++ /dev/null
@@ -1,1032 +0,0 @@
-<?php
-/**
- * Piwik - free/libre analytics platform
- *
- * @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';
-
-class UserSettingsTest extends PHPUnit_Framework_TestCase
-{
-    // User agent strings and expected parser results
-    public function getUserAgents()
-    {
-        return array(
-            // array('User Agent String', array(
-            //     array( browser_id, name, short_name, version, major_number, minor_number, family ),
-            //     array( os_id, name, short_name ))),
-
-            // Special: URL encoded IE8
-            array('Mozilla/4.0+(compatible;+MSIE+8.0;+Windows+NT+6.1;+WOW64;+Trident/4.0;+GTB7.4;+SLCC2;+.NET+CLR+2.0.50727;+.NET+CLR+3.5.30729;+.NET+CLR+3.0.30729;+Media+Center+PC+6.0;+.NET4.0C;+.NET4.0E;+MS-RTC+LM+8;+InfoPath.2)', array(
-                array('IE', 'Internet Explorer', 'IE', '8.0', '8', '0', 'ie'),
-                array('WI7', 'Windows 7', 'Win 7'))),
-
-            // ABrowse
-            array('Mozilla/5.0 (compatible; U; ABrowse 0.6; Syllable) AppleWebKit/420+ (KHTML, like Gecko)', array(
-                array('AB', 'ABrowse', 'ABrowse', '0.6', '0', '6', 'webkit'),
-                array('SYL', 'Syllable', 'Syllable'))),
-            array('Mozilla/5.0 (compatible; ABrowse 0.4; Syllable)', array(
-                array('AB', 'ABrowse', 'ABrowse', '0.4', '0', '4', 'webkit'),
-                array('SYL', 'Syllable', 'Syllable'))),
-
-            // Acoo Browser (treat as IE)
-            array('Mozilla/4.0 (compatible; MSIE 8.0; Windows NT 5.1; Trident/4.0; GTB6; Acoo Browser; .NET CLR 1.1.4322; .NET CLR 2.0.50727)', array(
-                array('IE', 'Internet Explorer', 'IE', '8.0', '8', '0', 'ie'),
-                array('WXP', 'Windows XP', 'Win XP'))),
-            array('Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 5.1; Acoo Browser; .NET CLR 2.0.50727; .NET CLR 1.1.4322)', array(
-                array('IE', 'Internet Explorer', 'IE', '7.0', '7', '0', 'ie'),
-                array('WXP', 'Windows XP', 'Win XP'))),
-            array('Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; SV1; Acoo Browser; .NET CLR 1.1.4322; .NET CLR 2.0.50727)', array(
-                array('IE', 'Internet Explorer', 'IE', '6.0', '6', '0', 'ie'),
-                array('WXP', 'Windows XP', 'Win XP'))),
-
-            // Amaya
-            array('amaya/9.52 libwww/5.4.0', array(
-                array('AM', 'Amaya', 'Amaya', '9.52', '9', '52', 'unknown'),
-                false)),
-
-            // AmigaVoyager
-            array('AmigaVoyager/3.2 (AmigaOS/MC680x0)', array(
-                array('AV', 'AmigaVoyager', 'AmigaVoyager', '3.2', '3', '2', 'unknown'),
-                array('AMI', 'AmigaOS', 'AmigaOS'))),
-            array('AmigaVoyager/2.95 (compatible; MC680x0; AmigaOS; SV1)', array(
-                array('AV', 'AmigaVoyager', 'AmigaVoyager', '2.95', '2', '95', 'unknown'),
-                array('AMI', 'AmigaOS', 'AmigaOS'))),
-            array('AmigaVoyager/2.95 (compatible; MC680x0; AmigaOS)', array(
-                array('AV', 'AmigaVoyager', 'AmigaVoyager', '2.95', '2', '95', 'unknown'),
-                array('AMI', 'AmigaOS', 'AmigaOS'))),
-
-            // Android
-            array('Mozilla/5.0 (Linux; U; Android 1.1; en-us; dream) AppleWebKit/525.10+ (KHTML, like Gecko) Version/3.0.4 Mobile Safari/523.12.2', array(
-                array('SF', 'Safari', 'Safari', '3.0', '3', '0', 'webkit'),
-                array('AND', 'Android', 'Android'))),
-            array('Mozilla/5.0 (Linux; U; Android 2.2.1; en-us; Nexus One Build/FRG83) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1', array(
-                array('SF', 'Safari', 'Safari', '4.0', '4', '0', 'webkit'),
-                array('AND', 'Android', 'Android'))),
-            array('Mozilla/5.0 (Linux; U; Android 2.2.1; en-us; device Build/FRG83) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Safari/533.1', array(
-                array('SF', 'Safari', 'Safari', '4.0', '4', '0', 'webkit'),
-                array('AND', 'Android', 'Android'))),
-            array('Mozilla/5.0 (Linux; U; Android 4.0.1; en-us; Galaxy Nexus Build/ITL41D) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Mobile Safari/534.30', array(
-                array('SF', 'Safari', 'Safari', '4.0', '4', '0', 'webkit'),
-                array('AND', 'Android', 'Android'))),
-
-            // Android - Mobile Chrome
-            /*
-                    array('rray('Mozilla/5.0 (Linux; U; Android 4.1; en-us) AppleWebKit/534.24 (KHTML, like Gecko) Chrome/11.0.696.16 Safari/534.24', array(
-                        array('CH', 'Chrome', 'Chrome', '11.0', '11', '0', 'webkit'),
-                        array('AND', 'Android', 'Android'))),
-            */
-            array('Mozilla/5.0 (Linux; U; Android 4.0.1; en-us; Galaxy Nexus Build/ITL41F) AppleWebKit/535.7 (KHTML, like Gecko) CrMo/16.0.912.75 Mobile Safari/535.7', array(
-                array('CH', 'Chrome', 'Chrome', '16.0', '16', '0', 'webkit'),
-                array('AND', 'Android', 'Android'))),
-
-            // AOL / America Online Browser (treat as IE)
-            array('Mozilla/4.0 (compatible; MSIE 7.0; AOL 9.5; AOLBuild 4337.43; Windows NT 5.1; .NET CLR 1.1.4322)', array(
-                array('IE', 'Internet Explorer', 'IE', '7.0', '7', '0', 'ie'),
-                array('WXP', 'Windows XP', 'Win XP'))),
-            array('Mozilla/4.0 (compatible; MSIE 7.0; AOL 9.1; AOLBuild 4334.5009; Windows NT 5.1; GTB5; .NET CLR 1.1.4322)', array(
-                array('IE', 'Internet Explorer', 'IE', '7.0', '7', '0', 'ie'),
-                array('WXP', 'Windows XP', 'Win XP'))),
-            array('Mozilla/4.0 (compatible; MSIE 7.0; AOL 9.0; Windows NT 5.1; InfoPath.1)', array(
-                array('IE', 'Internet Explorer', 'IE', '7.0', '7', '0', 'ie'),
-                array('WXP', 'Windows XP', 'Win XP'))),
-            array('Mozilla/4.0 (compatible; MSIE 6.0; AOL 8.0; Windows NT 5.1; SV1)', array(
-                array('IE', 'Internet Explorer', 'IE', '6.0', '6', '0', 'ie'),
-                array('WXP', 'Windows XP', 'Win XP'))),
-            array('Mozilla/4.0 (compatible; MSIE 7.0; AOL 7.0; Windows NT 5.1)', array(
-                array('IE', 'Internet Explorer', 'IE', '7.0', '7', '0', 'ie'),
-                array('WXP', 'Windows XP', 'Win XP'))),
-            array('Mozilla/4.0 (compatible; MSIE 5.5; AOL 6.0; Windows 98; Win 9x 4.90)', array(
-                array('IE', 'Internet Explorer', 'IE', '5.5', '5', '5', 'ie'),
-                array('WME', 'Windows Me', 'Win Me'))),
-            array('Mozilla/4.0 (compatible; MSIE 5.5; AOL 5.0; Windows NT 5.0)', array(
-                array('IE', 'Internet Explorer', 'IE', '5.5', '5', '5', 'ie'),
-                array('W2K', 'Windows 2000', 'Win 2000'))),
-            array('Mozilla/4.0 (compatible; MSIE 4.01; AOL 4.0; Windows 95)', array(
-                array('IE', 'Internet Explorer', 'IE', '4.01', '4', '01', 'ie'),
-                array('W95', 'Windows 95', 'Win 95'))),
-            array('Mozilla/4.0 (compatible; MSIE 7.0; America Online Browser 1.1; Windows NT 5.1; (R1 1.5); .NET CLR 2.0.50727; InfoPath.1)', array(
-                array('IE', 'Internet Explorer', 'IE', '7.0', '7', '0', 'ie'),
-                array('WXP', 'Windows XP', 'Win XP'))),
-            array('Mozilla/4.0 (compatible; MSIE 6.0; America Online Browser 1.1; Windows 98)', array(
-                array('IE', 'Internet Explorer', 'IE', '6.0', '6', '0', 'ie'),
-                array('W98', 'Windows 98', 'Win 98'))),
-
-            // Arora
-            array('Mozilla/5.0 (X11; U; Linux; de-DE) AppleWebKit/527+ (KHTML, like Gecko, Safari/419.3) Arora/0.8.0', array(
-                array('AR', 'Arora', 'Arora', '0.8', '0', '8', 'webkit'),
-                array('LIN', 'Linux', 'Linux'))),
-            array('Mozilla/5.0 (X11; U; Linux; en-US) AppleWebKit/527+ (KHTML, like Gecko, Safari/419.3) Arora/0.6', array(
-                array('AR', 'Arora', 'Arora', '0.6', '0', '6', 'webkit'),
-                array('LIN', 'Linux', 'Linux'))),
-            array('Mozilla/5.0 (Windows; U; Windows NT 5.2; pt-BR) AppleWebKit/527+ (KHTML, like Gecko, Safari/419.3) Arora/0.4 (Change: )', array(
-                array('AR', 'Arora', 'Arora', '0.4', '0', '4', 'webkit'),
-                array('WS3', 'Windows Server 2003 / XP x64', 'Win S2003'))),
-            array('Mozilla/5.0 (Windows; U; Windows NT 5.1; zh-CN) AppleWebKit/523.15 (KHTML, like Gecko, Safari/419.3) Arora/0.3 (Change: 287 c9dfb30)', array(
-                array('AR', 'Arora', 'Arora', '0.3', '0', '3', 'webkit'),
-                array('WXP', 'Windows XP', 'Win XP'))),
-            array('Mozilla/5.0 (X11; U; Linux; en-US) AppleWebKit/523.15 (KHTML, like Gecko, Safari/419.3) Arora/0.2 (Change: 189 35c14e0)', array(
-                array('AR', 'Arora', 'Arora', '0.2', '0', '2', 'webkit'),
-                array('LIN', 'Linux', 'Linux'))),
-
-            // Avant (treat as IE)
-            array('Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 5.1; Avant Browser; .NET CLR 2.0.50727; MAXTHON 2.0)', array(
-                array('IE', 'Internet Explorer', 'IE', '7.0', '7', '0', 'ie'),
-                array('WXP', 'Windows XP', 'Win XP'))),
-            array('Mozilla/4.0 (compatible; MSIE 8.0; Windows NT 6.1; Trident/4.0; Avant Browser; SLCC2; .NET CLR 2.0.50727; .NET CLR 3.5.30729; .NET CLR 3.0.30729; Media Center PC 6.0)', array(
-                array('IE', 'Internet Explorer', 'IE', '8.0', '8', '0', 'ie'),
-                array('WI7', 'Windows 7', 'Win 7'))),
-
-            // AWeb
-            array('Amiga-AWeb/3.5.07 beta', array(
-                array('AW', 'Amiga AWeb', 'AWeb', '3.5', '3', '5', 'unknown'),
-                array('AMI', 'AmigaOS', 'AmigaOS'))),
-            array('Mozilla/6.0; (Spoofed by Amiga-AWeb/3.5.07 beta)', array(
-                array('AW', 'Amiga AWeb', 'AWeb', '3.5', '3', '5', 'unknown'),
-                array('AMI', 'AmigaOS', 'AmigaOS'))),
-            array('MSIE/6.0; (Spoofed by Amiga-AWeb/3.4APL)', array(
-                array('AW', 'Amiga AWeb', 'AWeb', '3.4', '3', '4', 'unknown'),
-                array('AMI', 'AmigaOS', 'AmigaOS'))),
-
-            // Beonex
-            array('Mozilla/5.0 (Windows; U; WinNT; en; rv:1.0.2) Gecko/20030311 Beonex/0.8.2-stable', array(
-                array('BE', 'Beonex', 'Beonex', '0.8', '0', '8', 'unknown'),
-                array('WNT', 'Windows NT', 'Win NT'))),
-            array('Mozilla/5.0 (Windows; U; WinNT; en; Preview) Gecko/20020603 Beonex/0.8-stable', array(
-                array('BE', 'Beonex', 'Beonex', '0.8', '0', '8', 'unknown'),
-                array('WNT', 'Windows NT', 'Win NT'))),
-
-            // BlackBerry
-            array('BlackBerry8700/4.1.0 Profile/MIDP-2.0 Configuration/CLDC-1.1', array(
-                array('BB', 'BlackBerry', 'BlackBerry', '4.1', '4', '1', 'webkit'),
-                array('BLB', 'BlackBerry', 'BlackBerry'))),
-
-            array('Mozilla/5.0 (BlackBerry; U; BlackBerry 9800; en) AppleWebKit/534.1+ (KHTML, Like Gecko) Version/6.0.0.141 Mobile Safari/534.1+', array(
-                array('BB', 'BlackBerry', 'BlackBerry', '6.0', '6', '0', 'webkit'),
-                array('BLB', 'BlackBerry', 'BlackBerry'))),
-
-            array('Mozilla/5.0 (PlayBook; U; RIM Tablet OS 1.0.0; en-US) AppleWebKit/534.11+ (KHTML, like Gecko) Version/0.0.1 Safari/534.11+', array(
-                array('BP', 'PlayBook', 'PlayBook', '0.0', '0', '0', 'webkit'),
-                array('QNX', 'QNX', 'QNX'))),
-
-            // BrowseX
-            array('Mozilla/4.61 [en] (X11; U; ) - BrowseX (2.0.0 Windows)', array(
-                array('BX', 'BrowseX', 'BrowseX', '2.0', '2', '0', 'unknown'),
-                false)),
-
-            // Camino (formerly known as Chimera; not to be confused with another browser also named Chimera)
-            array('Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10.5; en; rv:1.9.0.8pre) Gecko/2009022800 Camino/2.0b3pre', array(
-                array('CA', 'Camino', 'Camino', '2.0', '2', '0', 'gecko'),
-                array('MAC', 'Mac OS', 'Mac OS'))),
-            array('Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10.5; en; rv:1.9.0.10pre) Gecko/2009041800 Camino/2.0b3pre (like Firefox/3.0.10pre)', array(
-                array('CA', 'Camino', 'Camino', '2.0', '2', '0', 'gecko'),
-                array('MAC', 'Mac OS', 'Mac OS'))),
-            array('Mozilla/5.0 (Macintosh; U; PPC Mac OS X Mach-O; en; rv:1.8.1.4pre) Gecko/20070511 Camino/1.6pre', array(
-                array('CA', 'Camino', 'Camino', '1.6', '1', '6', 'gecko'),
-                array('MAC', 'Mac OS', 'Mac OS'))),
-            array('Mozilla/5.0 (Macintosh; U; Intel Mac OS X; en; rv:1.8.1.6) Gecko/20070809 Firefox/2.0.0.6 Camino/1.5.1', array(
-                array('CA', 'Camino', 'Camino', '1.5', '1', '5', 'gecko'),
-                array('MAC', 'Mac OS', 'Mac OS'))),
-            array('Mozilla/5.0 (Macintosh; U; PPC Mac OS X Mach-O; en-US; rv:1.0.1) Gecko/20030306 Camino/0.7', array(
-                array('CA', 'Camino', 'Camino', '0.7', '0', '7', 'gecko'),
-                array('MAC', 'Mac OS', 'Mac OS'))),
-            array('Mozilla/5.0 (Macintosh; U; PPC Mac OS X; pl-PL; rv:1.0.1) Gecko/20021111 Chimera/0.6', array(
-                array('CA', 'Camino', 'Camino', '0.6', '0', '6', 'gecko'),
-                array('MAC', 'Mac OS', 'Mac OS'))),
-
-            // Cheshire
-            array('Mozilla/5.0 (Macintosh; U; PPC Mac OS X; en) AppleWebKit/418.8 (KHTML, like Gecko, Safari) Cheshire/1.0.UNOFFICIAL', array(
-                array('CS', 'Cheshire', 'Cheshire', '1.0', '1', '0', 'webkit'),
-                array('MAC', 'Mac OS', 'Mac OS'))),
-            array('Mozilla/5.0 (Macintosh; U; PPC Mac OS X; en) AppleWebKit/419 (KHTML, like Gecko, Safari/419.3) Cheshire/1.0.ALPHA', array(
-                array('CS', 'Cheshire', 'Cheshire', '1.0', '1', '0', 'webkit'),
-                array('MAC', 'Mac OS', 'Mac OS'))),
-            array('Mozilla/5.0 (Macintosh; U; PPC Mac OS X; en) AppleWebKit/418.9 (KHTML, like Safari) Cheshire/1.0.ALPHA', array(
-                array('CS', 'Cheshire', 'Cheshire', '1.0', '1', '0', 'webkit'),
-                array('MAC', 'Mac OS', 'Mac OS'))),
-
-            // Chrome / Chromium
-            array('Mozilla/5.0 (Windows; U; Windows NT 5.2; en-US) AppleWebKit/532.9 (KHTML, like Gecko) Chrome/5.0.310.0 Safari/532.9', array(
-                array('CH', 'Chrome', 'Chrome', '5.0', '5', '0', 'webkit'),
-                array('WS3', 'Windows Server 2003 / XP x64', 'Win S2003'))),
-            array('Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US) AppleWebKit/525.19 (KHTML, like Gecko) Chrome/1.0.154.48 Safari/525.19', array(
-                array('CH', 'Chrome', 'Chrome', '1.0', '1', '0', 'webkit'),
-                array('WXP', 'Windows XP', 'Win XP'))),
-            array('Mozilla/5.0 (Linux; U; en-US) AppleWebKit/525.13 (KHTML, like Gecko) Chrome/0.2.149.27 Safari/525.13', array(
-                array('CH', 'Chrome', 'Chrome', '0.2', '0', '2', 'webkit'),
-                array('LIN', 'Linux', 'Linux'))),
-            array('Mozilla/5.0 (Windows NT 6.0; WOW64) AppleWebKit/534.24 (KHTML, like Gecko) Chrome/11.0.696.16 Safari/534.24', array(
-                array('CH', 'Chrome', 'Chrome', '11.0', '11', '0', 'webkit'),
-                array('WVI', 'Windows Vista', 'Win Vista'))),
-            array('Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/534.24 (KHTML, like Gecko) Chrome/11.0.696.16 Safari/534.24', array(
-                array('CH', 'Chrome', 'Chrome', '11.0', '11', '0', 'webkit'),
-                array('LIN', 'Linux', 'Linux'))),
-
-            // Chrome Frame
-            array('Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; SV1; chromeframe/11.0.660.0)', array(
-                array('CF', 'Chrome Frame', 'Chrome Frame', '11.0', '11', '0', 'webkit'),
-                array('WXP', 'Windows XP', 'Win XP'))),
-            array('Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; SV1) chromeframe/11.0.660.0', array(
-                array('CF', 'Chrome Frame', 'Chrome Frame', '11.0', '11', '0', 'webkit'),
-                array('WXP', 'Windows XP', 'Win XP'))),
-            array('Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; chromeframe/11.0.660.0) AppleWebKit/534.18 (KHTML, like Gecko) Chrome/11.0.660.0 Safari/534.18', array(
-                array('CF', 'Chrome Frame', 'Chrome Frame', '11.0', '11', '0', 'webkit'),
-                array('WXP', 'Windows XP', 'Win XP'))),
-            array('Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US) AppleWebKit/534.18 (KHTML, like Gecko) Chrome/11.0.660.0 Safari/534.18', array(
-                array('CH', 'Chrome', 'Chrome', '11.0', '11', '0', 'webkit'),
-                array('WXP', 'Windows XP', 'Win XP'))),
-
-            // ChromePlus (treat as Chrome)
-            array('Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US) AppleWebKit/532.2 (KHTML, like Gecko) ChromePlus/4.0.222.3 Chrome/4.0.222.3 Safari/532.2', array(
-                array('CH', 'Chrome', 'Chrome', '4.0', '4', '0', 'webkit'),
-                array('WXP', 'Windows XP', 'Win XP'))),
-            array('Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US) AppleWebKit/525.28.3 (KHTML, like Gecko) Version/3.2.3 ChromePlus/4.0.222.3 Chrome/4.0.222.3 Safari/525.28.3', array(
-                array('CH', 'Chrome', 'Chrome', '3.2', '3', '2', 'webkit'),
-                array('WXP', 'Windows XP', 'Win XP'))),
-
-            // CometBird
-            array('Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.9.0.5) Gecko/2009011615 Firefox/3.0.5 CometBird/3.0.5', array(
-                array('CO', 'CometBird', 'CometBird', '3.0', '3', '0', 'gecko'),
-                array('WXP', 'Windows XP', 'Win XP'))),
-
-            // Crazy Browser (treat as IE)
-            array('Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 5.1; InfoPath.2; .NET CLR 2.0.50727; .NET CLR 1.1.4322; Crazy Browser 3.0.0 Beta2)', array(
-                array('IE', 'Internet Explorer', 'IE', '7.0', '7', '0', 'ie'),
-                array('WXP', 'Windows XP', 'Win XP'))),
-            array('Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 5.1; Avant Browser; .NET CLR 2.0.50727; .NET CLR 3.0.04506.590; .NET CLR 3.5.20706; Crazy Browser 2.0.1)', array(
-                array('IE', 'Internet Explorer', 'IE', '7.0', '7', '0', 'ie'),
-                array('WXP', 'Windows XP', 'Win XP'))),
-
-            // Dillo
-            array('Dillo/2.0', array(
-                array('DI', 'Dillo', 'Dillo', '2.0', '2', '0', 'unknown'),
-                false)),
-            array('Dillo/0.6.4', array(
-                array('DI', 'Dillo', 'Dillo', '0.6', '0', '6', 'unknown'),
-                false)),
-
-            // Dolfin (or Dolphin, depending on which Samsung documentation you read); and yes, it's "bada" (lower-case)
-            array('Mozilla/5.0 (SAMSUNG; SAMSUNG-GT-S5250/S5250AIJI3; U; Bada/1.0; it-it) AppleWebKit/533.1 (KHTML, like Gecko) Dolfin/2.0 Mobile WQVGA SMM-MMS/1.2.0 NexPlayer/3.0 profile/MIDP-2.1 configuration/CLDC-1.1 OPN-B', array(
-                array('DF', 'Dolfin', 'Dolfin', '2.0', '2', '0', 'webkit'),
-                array('SBA', 'bada', 'bada'))),
-            array('Mozilla/5.0 (SAMSUNG; SAMSUNG-GT-S8530/S8530XXJKA; U; Bada/1.2; en-us) AppleWebKit/533.1 (KHTML, like Gecko) Dolfin/2.2 Mobile WVGA SMM-MMS/1.2.0 OPN-B', array(
-                array('DF', 'Dolfin', 'Dolfin', '2.2', '2', '2', 'webkit'),
-                array('SBA', 'bada', 'bada'))),
-
-            // ELinks
-            array('ELinks/0.12~pre2.dfsg0-1ubuntu1-lite (textmode; Debian; Linux 2.6.32-4-jolicloud i686; 143x37-2)', array(
-                array('EL', 'ELinks', 'ELinks', '0.12', '0', '12', 'unknown'),
-                array('LIN', 'Linux', 'Linux'))),
-            array('ELinks/0.12pre5.GIT (textmode; CYGWIN_NT-6.1 1.7.1(0.218/5/3) i686; 80x24-2)', array(
-                array('EL', 'ELinks', 'ELinks', '0.12', '0', '12', 'unknown'),
-                array('WI7', 'Windows 7', 'Win 7'))),
-            array('ELinks (0.4.3; NetBSD 3.0.2_PATCH sparc64; 141x19)', array(
-                array('EL', 'ELinks', 'ELinks', '0.4', '0', '4', 'unknown'),
-                array('NBS', 'NetBSD', 'NetBSD'))),
-
-            // Epiphany
-            array('Mozilla/5.0 (X11; U; Linux i686; en-us) AppleWebKit/531.2+ (KHTML, like Gecko) Safari/531.2+ Epiphany/2.29.5', array(
-                array('EP', 'Epiphany', 'Epiphany', '2.29', '2', '29', 'webkit'),
-                array('LIN', 'Linux', 'Linux'))),
-            array('Mozilla/5.0 (X11; U; Linux i686; en; rv:1.9.0.11) Gecko/20080528 Epiphany/2.22 Firefox/3.0', array(
-                // technically, this should be 'gecko' but UserAgentParser only supports one browserType (family) per browser
-                array('EP', 'Epiphany', 'Epiphany', '2.22', '2', '22', 'webkit'),
-                array('LIN', 'Linux', 'Linux'))),
-
-            // Fennec
-            array('Mozilla/5.0 (Android; Linux armv7l; rv:2.0.1) Gecko/20100101 Firefox/4.0.1 Fennec/2.0.1', array(
-                array('FE', 'Fennec', 'Fennec', '2.0', '2', '0', 'gecko'),
-                array('AND', 'Android', 'Android'))),
-            array('Mozilla/5.0 (Maemo; Linux armv7l; rv2.0.1) Gecko/20100101 Firefox/4.0.1 Fennec/2.0.1', array(
-                array('FE', 'Fennec', 'Fennec', '2.0', '2', '0', 'gecko'),
-                array('MAE', 'Maemo', 'Maemo'))),
-            array('Mozilla/5.0 (X11; Linux i686; rv2.0.1) Gecko/20100101 Firefox/4.0.1 Fennec/2.0.1', array(
-                array('FE', 'Fennec', 'Fennec', '2.0', '2', '0', 'gecko'),
-                array('LIN', 'Linux', 'Linux'))),
-            array('Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10.5; en-US; rv:1.9.2a1pre) Gecko/20090626 Fennec/1.0b2', array(
-                array('FE', 'Fennec', 'Fennec', '1.0', '1', '0', 'gecko'),
-                array('MAC', 'Mac OS', 'Mac OS'))),
-            array('Mozilla/5.0 (X11; U; Linux armv6l; en-US; rv:1.9.1b1pre) Gecko/20081005220218 Gecko/2008052201 Fennec/0.9pre', array(
-                array('FE', 'Fennec', 'Fennec', '0.9', '0', '9', 'gecko'),
-                array('LIN', 'Linux', 'Linux'))),
-            array('Mozilla/5.0 (X11; U; Linux armv6l; en-US; rv:1.9.1a1pre) Gecko/2008071707 Fennec/0.5', array(
-                array('FE', 'Fennec', 'Fennec', '0.5', '0', '5', 'gecko'),
-                array('LIN', 'Linux', 'Linux'))),
-
-            // Firefox (formerly Firebird, formerly Phoenix; and rebranded versions)
-            array('Mozilla/5.0 (X11; Linux i686; rv:5.0a2) Gecko/20110413 Firefox/5.0a2', array(
-                array('FF', 'Firefox', 'Firefox', '5.0', '5', '0', 'gecko'),
-                array('LIN', 'Linux', 'Linux'))),
-            array('Mozilla/5.0 (Windows NT 6.1; rv:2.0.1) Gecko/20100101 Firefox/4.0.1', array(
-                array('FF', 'Firefox', 'Firefox', '4.0', '4', '0', 'gecko'),
-                array('WI7', 'Windows 7', 'Win 7'))),
-            array('Mozilla/5.0 (X11; U; Linux i686; en-US; rv:2.0a1pre) Gecko/2008060602 Minefield/4.0a1pre', array(
-                array('FF', 'Firefox', 'Firefox', '4.0', '4', '0', 'gecko'),
-                array('LIN', 'Linux', 'Linux'))),
-            array('Mozilla/5.0 (X11; U; Linux i686; en-US; rv:2.0a1pre) Gecko/2008060602 Minefield/4.0a1p', array(
-                array('FF', 'Firefox', 'Firefox', '4.0', '4', '0', 'gecko'),
-                array('LIN', 'Linux', 'Linux'))),
-            array('Mozilla/5.0 (Windows; U; Windows NT 6.0; en-US; rv:1.9.2a2pre) Gecko/20090826 Namoroka/3.6a2pre', array(
-                array('FF', 'Firefox', 'Firefox', '3.6', '3', '6', 'gecko'),
-                array('WVI', 'Windows Vista', 'Win Vista'))),
-            array('Mozilla/5.0 (Windows; U; Windows NT 6.1; en-US; rv:1.9.2) Gecko/20100119 Namoroka/3.6', array(
-                array('FF', 'Firefox', 'Firefox', '3.6', '3', '6', 'gecko'),
-                array('WI7', 'Windows 7', 'Win 7'))),
-            array('Mozilla/5.0 (Windows; U; Windows NT 6.1; en-US; rv:1.9.1b4pre) Gecko/20090420 Shiretoko/3.5b4pre (.NET CLR 3.5.30729)', array(
-                array('FF', 'Firefox', 'Firefox', '3.5', '3', '5', 'gecko'),
-                array('WI7', 'Windows 7', 'Win 7'))),
-            array('Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.1.2) Gecko/20090803 Ubuntu/9.04 (jaunty) Shiretoko/3.5.2', array(
-                array('FF', 'Firefox', 'Firefox', '3.5', '3', '5', 'gecko'),
-                array('LIN', 'Linux', 'Linux'))),
-            array('Mozilla/5.0 (Windows; U; Windows NT 5.1; en-GB; rv:1.9.0.6) Gecko/2009011913 Firefox/3.0.6', array(
-                array('FF', 'Firefox', 'Firefox', '3.0', '3', '0', 'gecko'),
-                array('WXP', 'Windows XP', 'Win XP'))),
-            array('Mozilla/5.0 (Windows; U; Windows NT 6.0; en-US; rv:1.9a7) Gecko/2007080210 GranParadiso/3.0a7', array(
-                array('FF', 'Firefox', 'Firefox', '3.0', '3', '0', 'gecko'),
-                array('WVI', 'Windows Vista', 'Win Vista'))),
-            array('Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.0.1) Gecko/2008072716 IceCat/3.0.1-g1', array(
-                array('FF', 'Firefox', 'Firefox', '3.0', '3', '0', 'gecko'),
-                array('LIN', 'Linux', 'Linux'))),
-            array('Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.0.1) Gecko/2008071420 Iceweasel/3.0.1 (Debian-3.0.1-1)', array(
-                array('FF', 'Firefox', 'Firefox', '3.0', '3', '0', 'gecko'),
-                array('LIN', 'Linux', 'Linux'))),
-            array('Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.8.1b2) Gecko/20060821 BonEcho/2.0b2', array(
-                array('FF', 'Firefox', 'Firefox', '2.0', '2', '0', 'gecko'),
-                array('LIN', 'Linux', 'Linux'))),
-            array('Mozilla/5.0 (X11; U; Darwin Power Macintosh; en-US; rv:1.8.0.12) Gecko/20070803 Firefox/1.5.0.12 Fink Community Edition', array(
-                array('FF', 'Firefox', 'Firefox', '1.5', '1', '5', 'gecko'),
-                array('MAC', 'Mac OS', 'Mac OS'))),
-            array('Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.6b) Gecko/20031212 Firebird/0.7+', array(
-                array('FB', 'Firebird', 'Firebird', '0.7', '0', '7', 'gecko'),
-                array('WXP', 'Windows XP', 'Win XP'))),
-            array('Mozilla/5.0 (Windows; U; Win98; de-DE; rv:1.4b) Gecko/20030516 Mozilla Firebird/0.6', array(
-                array('FB', 'Firebird', 'Firebird', '0.6', '0', '6', 'gecko'),
-                array('W98', 'Windows 98', 'Win 98'))),
-            array('Mozilla/5.0 (Windows; U; WinNT4.0; en-US; rv:1.3a) Gecko/20021207 Phoenix/0.5', array(
-                array('PX', 'Phoenix', 'Phoenix', '0.5', '0', '5', 'gecko'),
-                array('WNT', 'Windows NT', 'Win NT'))),
-            array('Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.2b) Gecko/20020923 Phoenix/0.1', array(
-                array('PX', 'Phoenix', 'Phoenix', '0.1', '0', '1', 'gecko'),
-                array('WXP', 'Windows XP', 'Win XP'))),
-            array('Mozilla/5.0 (Nintendo DS v4; U; M3 Adapter CF + PassMe2; en-US; rv:1.8.0.6 ) Gecko/20060728 Firefox/1.5.0.6 (firefox.gba.ds)', array(
-                array('FF', 'Firefox', 'Firefox', '1.5', '1', '5', 'gecko'),
-                array('NDS', 'Nintendo DS', 'DS'))),
-            array('Mozilla/5.0 (Android; Mobile; rv:15.0) Gecko/15.0 Firefox/15.0a1', array(
-                array('FF', 'Firefox', 'Firefox', '15.0', '15', '0', 'gecko'),
-                array('AND', 'Android', 'Android'))),
-
-            // Flock
-            array('Mozilla/5.0 (Windows; U; Windows NT 6.1; en-US) AppleWebKit/532.5 (KHTML, like Gecko) Flock/3.0.0.3737 Chrome/4.1.249.1071 Safari/532.5', array(
-                array('FL', 'Flock', 'Flock', '3.0', '3', '0', 'webkit'),
-                array('WI7', 'Windows 7', 'Win 7'))),
-            // pre-3.0 is actually gecko
-            array('Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.9.1.7) Gecko/20091221 Firefox/3.5.7 Flock/2.5.6 (.NET CLR 3.5.30729)', array(
-                array('FL', 'Flock', 'Flock', '2.5', '2', '5', 'webkit'),
-                array('WXP', 'Windows XP', 'Win XP'))),
-            array('Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.9.1.7) Gecko/20091221 AppleWebKit/531.21.8 KHTML/4.3.5 (like Gecko) Firefox/3.5.7 Flock/2.5.6 (.NET CLR 3.5.30729)', array(
-                array('FL', 'Flock', 'Flock', '2.5', '2', '5', 'webkit'),
-                array('WXP', 'Windows XP', 'Win XP'))),
-            array('Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.9.1.7) Gecko/20091221 AppleWebKit/531.21.8 (KHTML, like Gecko) Firefox/3.5.7 Flock/2.5.6 (.NET CLR 3.5.30729)', array(
-                array('FL', 'Flock', 'Flock', '2.5', '2', '5', 'webkit'),
-                array('WXP', 'Windows XP', 'Win XP'))),
-            array('Mozilla/5.0 (Macintosh; U; Intel Mac OS X; en-US; rv:1.8.1.9) Gecko/20071106 Firefox/2.0.0.9 Flock/1.0.1', array(
-                array('FL', 'Flock', 'Flock', '1.0', '1', '0', 'webkit'),
-                array('MAC', 'Mac OS', 'Mac OS'))),
-            array('Mozilla/5.0 (Macintosh; U; PPC Mac OS X Mach-O; en-US; rv:1.8.1.8) Gecko/20071101 Firefox/2.0.0.8 Flock/1.0', array(
-                array('FL', 'Flock', 'Flock', '1.0', '1', '0', 'webkit'),
-                array('MAC', 'Mac OS', 'Mac OS'))),
-            array('Mozilla/5.0 (Macintosh; U; PPC Mac OS X Mach-O; en-US; rv:1.8b5) Gecko/20051021 Flock/0.4 Firefox/1.0+', array(
-                array('FL', 'Flock', 'Flock', '0.4', '0', '4', 'webkit'),
-                array('MAC', 'Mac OS', 'Mac OS'))),
-
-            // Fluid
-            array('Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10_6_1; nl-nl) AppleWebKit/532.3+ (KHTML, like Gecko) Fluid/0.9.6 Safari/532.3+', array(
-                array('FD', 'Fluid', 'Fluid', '0.9', '0', '9', 'webkit'),
-                array('MAC', 'Mac OS', 'Mac OS'))),
-            array('Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US) AppleWebKit/525.13 (KHTML, like Gecko) Fluid/0.9.4 Safari/525.13', array(
-                array('FD', 'Fluid', 'Fluid', '0.9', '0', '9', 'webkit'),
-                array('WXP', 'Windows XP', 'Win XP'))),
-
-            // Galeon
-            array('Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.0.8) Gecko/20090327 Galeon/2.0.7', array(
-                array('GA', 'Galeon', 'Galeon', '2.0', '2', '0', 'gecko'),
-                array('LIN', 'Linux', 'Linux'))),
-            array('Mozilla/5.0 (X11; U; OpenBSD i386; en-US; rv:1.8.1.19) Gecko/20090701 Galeon/2.0.7', array(
-                array('GA', 'Galeon', 'Galeon', '2.0', '2', '0', 'gecko'),
-                array('OBS', 'OpenBSD', 'OpenBSD'))),
-            array('Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.8.1.19) Gecko/20081216 Galeon/2.0.4 Firefox/2.0.0.19', array(
-                array('GA', 'Galeon', 'Galeon', '2.0', '2', '0', 'gecko'),
-                array('LIN', 'Linux', 'Linux'))),
-            array('Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.8.0.13pre) Gecko/20080207 Galeon/2.0.1 (Ubuntu package 2.0.1-1ubuntu2) Firefox/1.5.0.13pre', array(
-                array('GA', 'Galeon', 'Galeon', '2.0', '2', '0', 'gecko'),
-                array('LIN', 'Linux', 'Linux'))),
-            array('Mozilla/5.0 (X11; U; FreeBSD i386; en-US; rv:1.6) Gecko/20040406 Galeon/1.3.15', array(
-                array('GA', 'Galeon', 'Galeon', '1.3', '1', '3', 'gecko'),
-                array('BSD', 'FreeBSD', 'FreeBSD'))),
-            array('Mozilla/5.0 Galeon/1.2.9 (X11; Linux i686; U;) Gecko/20021213 Debian/1.2.9-0.bunk', array(
-                array('GA', 'Galeon', 'Galeon', '1.2', '1', '2', 'gecko'),
-                array('LIN', 'Linux', 'Linux'))),
-            array('Mozilla/5.0 Galeon/1.0.3 (X11; Linux i686; U;) Gecko/0', array(
-                array('GA', 'Galeon', 'Galeon', '1.0', '1', '0', 'gecko'),
-                array('LIN', 'Linux', 'Linux'))),
-
-            // Google Earth embedded browser
-            array('Mozilla/5.0 (Windows; U; Windows NT 6.1; en-US) AppleWebKit/532.4 (KHTML, like Gecko) Google Earth/5.2.1.1329 Safari/532.4', array(
-                array('GE', 'Google Earth', 'Google Earth', '5.2', '5', '2', 'webkit'),
-                array('WI7', 'Windows 7', 'Win 7'))),
-
-            // GreenBrowser (treat as IE)
-            array('Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; SV1) ; SLCC1; .NET CLR 2.0.50727; .NET CLR 3.0.04506; Media Center PC 5.0; .NET CLR 3.5.21022; GreenBrowser)', array(
-                array('IE', 'Internet Explorer', 'IE', '6.0', '6', '0', 'ie'),
-                array('WXP', 'Windows XP', 'Win XP'))),
-            array('Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 6.0; Trident/4.0; SLCC1; .NET CLR 2.0.50727; .NET CLR 3.5.30729; InfoPath.2; .NET CLR 3.0.30729; GreenBrowser)', array(
-                array('IE', 'Internet Explorer', 'IE', '8.0', '8', '0', 'ie'),
-                array('WVI', 'Windows Vista', 'Win Vista'))),
-
-            // Hana
-            array('Mozilla/5.0 (Macintosh; U; PPC Mac OS X; en) AppleWebKit/418.9 (KHTML, like Gecko) Hana/1.1', array(
-                array('HA', 'Hana', 'Hana', '1.1', '1', '1', 'webkit'),
-                array('MAC', 'Mac OS', 'Mac OS'))),
-            array('Mozilla/5.0 (Macintosh; U; PPC Mac OS X; en) AppleWebKit/417.9 (KHTML, like Gecko) Hana/1.0', array(
-                array('HA', 'Hana', 'Hana', '1.0', '1', '0', 'webkit'),
-                array('MAC', 'Mac OS', 'Mac OS'))),
-
-            // HotJava
-            array('HotJava/1.1.2 FCS', array(
-                array('HJ', 'HotJava', 'HotJava', '1.1', '1', '1', 'unknown'),
-                false)),
-            array('HotJava/1.0.1/JRE1.1.x', array(
-                array('HJ', 'HotJava', 'HotJava', '1.0', '1', '0', 'unknown'),
-                false)),
-
-            // iBrowse
-            array('Mozilla/5.0 (compatible; IBrowse 3.0; AmigaOS4.0)', array(
-                array('IB', 'IBrowse', 'IBrowse', '3.0', '3', '0', 'unknown'),
-                array('AMI', 'AmigaOS', 'AmigaOS'))),
-            array('Mozilla/4.0 (compatible; IBrowse 2.3; AmigaOS4.0)', array(
-                array('IB', 'IBrowse', 'IBrowse', '2.3', '2', '3', 'unknown'),
-                array('AMI', 'AmigaOS', 'AmigaOS'))),
-            array('IBrowse/2.4 (AmigaOS 3.9; 68K)', array(
-                array('IB', 'IBrowse', 'IBrowse', '2.4', '2', '4', 'unknown'),
-                array('AMI', 'AmigaOS', 'AmigaOS'))),
-            array('IBrowse/2.3 (AmigaOS V51)', array(
-                array('IB', 'IBrowse', 'IBrowse', '2.3', '2', '3', 'unknown'),
-                array('AMI', 'AmigaOS', 'AmigaOS'))),
-            array('IBrowse/2.3 (AmigaOS 4.0)', array(
-                array('IB', 'IBrowse', 'IBrowse', '2.3', '2', '3', 'unknown'),
-                array('AMI', 'AmigaOS', 'AmigaOS'))),
-
-            // iCab
-            array('iCab/4.5 (Macintosh; U; PPC Mac OS X)', array(
-                array('IC', 'iCab', 'iCab', '4.5', '4', '5', 'unknown'),
-                array('MAC', 'Mac OS', 'Mac OS'))),
-            array('iCab/4.5 (Macintosh; U; Mac OS X Leopard 10.5.7)', array(
-                array('IC', 'iCab', 'iCab', '4.5', '4', '5', 'unknown'),
-                array('MAC', 'Mac OS', 'Mac OS'))),
-            array('Mozilla/5.0 (compatible; iCab 3.0.5; Macintosh; U; PPC Mac OS)', array(
-                array('IC', 'iCab', 'iCab', '3.0', '3', '0', 'unknown'),
-                array('MAC', 'Mac OS', 'Mac OS'))),
-            array('Mozilla/5.0 (compatible; iCab 3.0.5; Macintosh; U; PPC Mac OS X)', array(
-                array('IC', 'iCab', 'iCab', '3.0', '3', '0', 'unknown'),
-                array('MAC', 'Mac OS', 'Mac OS'))),
-            array('Mozilla/5.0 (Macintosh; U; PPC Mac OS; en) iCab 3', array(
-                array('IC', 'iCab', 'iCab', '3.0', '3', '0', 'unknown'),
-                array('MAC', 'Mac OS', 'Mac OS'))),
-            array('Mozilla/4.5 (compatible; iCab 2.7.1; Macintosh; I; PPC)', array(
-                array('IC', 'iCab', 'iCab', '2.7', '2', '7', 'unknown'),
-                array('MAC', 'Mac OS', 'Mac OS'))),
-            array('iCab/2.9.8 (Macintosh; U; 68K)', array(
-                array('IC', 'iCab', 'iCab', '2.9', '2', '9', 'unknown'),
-                array('MAC', 'Mac OS', 'Mac OS'))),
-            array('Lynx/2.8 (compatible; iCab 2.9.8; Macintosh; U; 68K)', array(
-                array('IC', 'iCab', 'iCab', '2.9', '2', '9', 'unknown'),
-                array('MAC', 'Mac OS', 'Mac OS'))),
-            array('Mozilla/4/5 (compatible; iCab 2.9.8; Macintosh; U; 68K)', array(
-                array('IC', 'iCab', 'iCab', '2.9', '2', '9', 'unknown'),
-                array('MAC', 'Mac OS', 'Mac OS'))),
-            array('Mozilla/4.0 (compatible; MSIE 5.0; Mac_PowerPC)', array(
-                array('IE', 'Internet Explorer', 'IE', '5.0', '5', '0', 'ie'),
-                array('MAC', 'Mac OS', 'Mac OS'))),
-            array('Mozilla/4.76 (Macintosh; I; PPC)', array(
-                array('NS', 'Netscape', 'Netscape', '4.76', '4', '76', 'gecko'),
-                array('MAC', 'Mac OS', 'Mac OS'))),
-
-            // Internet Explorer
-            array('Mozilla/5.0 (compatible; MSIE 9.0; Windows NT 6.1; Trident/5.0; Xbox)', array(
-                array('IE', 'Internet Explorer', 'IE', '9.0', '9', '0', 'ie'),
-                array('XBX', 'Xbox', 'Xbox'))),
-            array('Mozilla/5.0 (compatible; MSIE 9.0; Windows Phone OS 7.5; Trident/5.0; IEMobile/9.0; Xbox)', array(
-                array('IE', 'Internet Explorer', 'IE', '9.0', '9', '0', 'ie'),
-                array('XBX', 'Xbox', 'Xbox'))),
-            array('Mozilla/5.0 (compatible; MSIE 10.0; Windows NT 6.2; Win64; x64; Trident/6.0)', array(
-                array('IE', 'Internet Explorer', 'IE', '10.0', '10', '0', 'ie'),
-                array('WI8', 'Windows 8', 'Win 8'))),
-            array('Mozilla/5.0 (compatible; MSIE 10.0; Windows NT 6.1; Trident/6.0)', array(
-                array('IE', 'Internet Explorer', 'IE', '10.0', '10', '0', 'ie'),
-                array('WI7', 'Windows 7', 'Win 7'))),
-            array('Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 6.1; Trident/6.0)', array(
-                array('IE', 'Internet Explorer', 'IE', '10.0', '10', '0', 'ie'),
-                array('WI7', 'Windows 7', 'Win 7'))),
-            array('Mozilla/5.0 (compatible; MSIE 9.0; Windows NT 6.1; Trident/5.0)', array(
-                array('IE', 'Internet Explorer', 'IE', '9.0', '9', '0', 'ie'),
-                array('WI7', 'Windows 7', 'Win 7'))),
-            array('Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 6.0; Trident/5.0)', array(
-                array('IE', 'Internet Explorer', 'IE', '9.0', '9', '0', 'ie'),
-                array('WVI', 'Windows Vista', 'Win Vista'))),
-            array('Mozilla/4.0 (compatible; MSIE 8.0; Windows NT 6.1; Trident/4.0; SLCC2; .NET CLR 2.0.50727; .NET CLR 3.5.30729; .NET CLR 3.0.30729; Media Center PC 6.0; .NET CLR 3.0.04506; .NET CLR 3.5.21022; InfoPath.2; SLCC1; Zune 3.0)', array(
-                array('IE', 'Internet Explorer', 'IE', '8.0', '8', '0', 'ie'),
-                array('WI7', 'Windows 7', 'Win 7'))),
-            array('Mozilla/4.0 (compatible; MSIE 8.0; Windows NT 6.0; Trident/4.0)', array(
-                array('IE', 'Internet Explorer', 'IE', '8.0', '8', '0', 'ie'),
-                array('WVI', 'Windows Vista', 'Win Vista'))),
-            array('Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 6.0; Trident/4.0)', array(
-                array('IE', 'Internet Explorer', 'IE', '8.0', '8', '0', 'ie'),
-                array('WVI', 'Windows Vista', 'Win Vista'))),
-            array('Mozilla/4.0 (compatible; MSIE 8.0; Windows NT 5.1; Trident/4.0)', array(
-                array('IE', 'Internet Explorer', 'IE', '8.0', '8', '0', 'ie'),
-                array('WXP', 'Windows XP', 'Win XP'))),
-            array('Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; SV1; .NET CLR 1.1.4322; .NET CLR 2.0.50727; .NET CLR 3.0.04506.30; .NET CLR 3.0.04506.648)', array(
-                array('IE', 'Internet Explorer', 'IE', '6.0', '6', '0', 'ie'),
-                array('WXP', 'Windows XP', 'Win XP'))),
-            array('Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.2; SV1; .NET CLR 1.1.4322; .NET CLR 2.0.50727)', array(
-                array('IE', 'Internet Explorer', 'IE', '6.0', '6', '0', 'ie'),
-                array('WS3', 'Windows Server 2003 / XP x64', 'Win S2003'))),
-            array('Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.2; WOW64; SV1; .NET CLR 2.0.50727)', array(
-                array('IE', 'Internet Explorer', 'IE', '6.0', '6', '0', 'ie'),
-                array('WS3', 'Windows Server 2003 / XP x64', 'Win S2003'))),
-            array('Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.2; Win64; x64; SV1; .NET CLR 2.0.50727)', array(
-                array('IE', 'Internet Explorer', 'IE', '6.0', '6', '0', 'ie'),
-                array('WS3', 'Windows Server 2003 / XP x64', 'Win S2003'))),
-
-            // IE Mobile
-            array('Mozilla/5.0 (compatible; MSIE 9.0; Windows Phone OS 7.5; Trident/5.0; IEMobile/9.0; SAMSUNG; SGH-i917)', array(
-                array('IE', 'Internet Explorer', 'IE', '9.0', '9', '0', 'ie'),
-                array('WPH', 'Windows Phone OS', 'WinPhone'))),
-            array('Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 6.1; XBLWP7; ZuneWP7)', array(
-                array('IE', 'Internet Explorer', 'IE', '7.0', '7', '0', 'ie'),
-                array('WPH', 'Windows Phone OS', 'WinPhone'))),
-            array('Mozilla/4.0 (compatible; MSIE 7.0; Windows Phone OS 7.0; Trident/3.1; IEMobile/7.0; DeviceManufacturer; DeviceModel)', array(
-                array('IE', 'Internet Explorer', 'IE', '7.0', '7', '0', 'ie'),
-                array('WPH', 'Windows Phone OS', 'WinPhone'))),
-            array('Mozilla/4.0 (compatible; MSIE 6.0; Windows CE; IEMobile 7.11)', array(
-                array('IE', 'Internet Explorer', 'IE', '6.0', '6', '0', 'ie'),
-                array('WMO', 'Windows Mobile', 'WinMo'))),
-            array('Mozilla/4.0 (compatible; MSIE 4.01; Windows CE; PPC; 240x320)', array(
-                array('IE', 'Internet Explorer', 'IE', '4.01', '4', '01', 'ie'),
-                array('WCE', 'Windows CE', 'Win CE'))),
-
-            // Internet Explorer with misbehaving Google Tool Bar
-            array('Mozilla/4.0 (compatible; MSIE 8.0; Windows NT 5.1; Trident/4.0; GTB6.5; Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; SV1) ; .NET CLR 1.1.4322; .NET CLR 2.0.50727; .NET CLR 3.0.4506.2152; .NET CLR 3.5.30729)', array(
-                array('IE', 'Internet Explorer', 'IE', '8.0', '8', '0', 'ie'),
-                array('WXP', 'Windows XP', 'Win XP'))),
-            array('Mozilla/4.0 (compatible; MSIE 8.0; Windows NT 5.1; Trident/4.0; GTB0.0; Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; SV1) ; .NET CLR 2.0.50727; .NET CLR 3.0.4506.2152; .NET CLR 3.5.30729)', array(
-                array('IE', 'Internet Explorer', 'IE', '8.0', '8', '0', 'ie'),
-                array('WXP', 'Windows XP', 'Win XP'))),
-
-            // Iron
-            array('Mozilla/5.0 (Windows; U; Windows NT 6.1; en-US) AppleWebKit/531.0 (KHTML, like Gecko) Iron/3.0.189.0 Safari/531.0', array(
-                array('IR', 'Iron', 'Iron', '3.0', '3', '0', 'webkit'),
-                array('WI7', 'Windows 7', 'Win 7'))),
-
-            // K-Meleon
-            array('Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.8.1.21) Gecko/20090331 K-Meleon/1.5.3', array(
-                array('KM', 'K-Meleon', 'K-Meleon', '1.5', '1', '5', 'gecko'),
-                array('LIN', 'Linux', 'Linux'))),
-            array('Mozilla/5.0 (Darwin; FreeBSD 5.6; en-GB; rv:1.8.1.17pre) Gecko/20080716 K-Meleon/1.5.0', array(
-                array('KM', 'K-Meleon', 'K-Meleon', '1.5', '1', '5', 'gecko'),
-                array('MAC', 'Mac OS', 'Mac OS'))),
-            array('Mozilla/5.0 (Windows; U; WinNT4.0; en-US; rv:1.2b) Gecko/20021016 K-Meleon 0.7', array(
-                array('KM', 'K-Meleon', 'K-Meleon', '0.7', '0', '7', 'gecko'),
-                array('WNT', 'Windows NT', 'Win NT'))),
-
-            // Kapiko
-            array('Mozilla/5.0 (Windows; U; Windows NT 5.1; zh-CN; rv:1.9.0.1) Gecko/20080722 Firefox/3.0.1 Kapiko/3.0', array(
-                array('KP', 'Kapiko', 'Kapiko', '3.0', '3', '0', 'gecko'),
-                array('WXP', 'Windows XP', 'Win XP'))),
-
-            // Kazehakase
-            array('Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.0.11) Gecko Kazehakase/0.5.4 Debian/0.5.4-2.1ubuntu3', array(
-                array('KZ', 'Kazehakase', 'Kazehakase', '0.5', '0', '5', 'gecko'),
-                array('LIN', 'Linux', 'Linux'))),
-            array('Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.8.1.13) Gecko/20080311 (Debian-1.8.1.13+nobinonly-0ubuntu1) Kazehakase/0.5.2', array(
-                array('KZ', 'Kazehakase', 'Kazehakase', '0.5', '0', '5', 'gecko'),
-                array('LIN', 'Linux', 'Linux'))),
-            array('Mozilla/5.0 (X11; Linux x86_64; U;) Gecko/20060207 Kazehakase/0.3.5 Debian/0.3.5-1', array(
-                array('KZ', 'Kazehakase', 'Kazehakase', '0.3', '0', '3', 'gecko'),
-                array('LIN', 'Linux', 'Linux'))),
-
-            // KKMAN (treat as IE)
-            array('Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 5.1; KKMAN3.2)', array(
-                array('IE', 'Internet Explorer', 'IE', '7.0', '7', '0', 'ie'),
-                array('WXP', 'Windows XP', 'Win XP'))),
-
-            // Konqueror
-            array('Mozilla/5.0 (compatible; Konqueror/4.0; Linux) KHTML/4.0.5 (like Gecko)', array(
-                array('KO', 'Konqueror', 'Konqueror', '4.0', '4', '0', 'khtml'),
-                array('LIN', 'Linux', 'Linux'))),
-            array('Mozilla/5.0 (compatible; Konqueror/4.0; Microsoft Windows) KHTML/4.0.80 (like Gecko)', array(
-                array('KO', 'Konqueror', 'Konqueror', '4.0', '4', '0', 'khtml'),
-                false)),
-            array('Mozilla/5.0 (compatible; Konqueror/3.5; GNU/kFreeBSD) KHTML/3.5.9 (like Gecko) (Debian)', array(
-                array('KO', 'Konqueror', 'Konqueror', '3.5', '3', '5', 'khtml'),
-                array('BSD', 'FreeBSD', 'FreeBSD'))),
-            array('Mozilla/5.0 (compatible; Konqueror/2.1.1; X11)', array(
-                array('KO', 'Konqueror', 'Konqueror', '2.1', '2', '1', 'khtml'),
-                false)),
-
-            // Links
-            array('Links', array(
-                false,
-                false)),
-            array('Links (2.1pre31; Linux 2.6.21-omap1 armv6l; x)', array(
-                array('LI', 'Links', 'Links', '2.1', '2', '1', 'unknown'),
-                array('LIN', 'Linux', 'Linux'))),
-            array('Links (0.99; OS/2 1 i386; 80x33)', array(
-                array('LI', 'Links', 'Links', '0.99', '0', '99', 'unknown'),
-                array('OS2', 'OS/2', 'OS/2'))),
-
-            // Lunascape (identity crisis)
-            array('Mozilla/5.0 (Windows; U; Windows NT 6.0; en-US; rv:1.9.1) Gecko/20090701 Firefox/3.5 Lunascape/5.1.2.3', array(
-                array('FF', 'Firefox', 'Firefox', '3.5', '3', '5', 'gecko'),
-                array('WVI', 'Windows Vista', 'Win Vista'))),
-            array('Mozilla/5.0 (Windows; U; ; cs-CZ) AppleWebKit/532+ (KHTML, like Gecko, Safari/532.0) Lunascape/5.1.2.3', array(
-                array('SF', 'Safari', 'Safari', '4.0', '4', '0', 'webkit'),
-                false)),
-            array('Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; SV1) ; InfoPath.1; .NET CLR 3.5.30729; .NET CLR 3.0.30729; Lunascape 5.1.2.3)', array(
-                array('IE', 'Internet Explorer', 'IE', '6.0', '6', '0', 'ie'),
-                array('WXP', 'Windows XP', 'Win XP'))),
-
-            // Lynx
-            array('Lynx (textmode)', array(
-                false,
-                false)),
-            array('Lynx/2.8.7dev.9 libwww-FM/2.14', array(
-                array('LX', 'Lynx', 'Lynx', '2.8', '2', '8', 'unknown'),
-                false)),
-
-            // Maxathon (treat as IE)
-            array('Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 5.1; SV1; Maxthon; .NET CLR 1.1.4322)', array(
-                array('IE', 'Internet Explorer', 'IE', '7.0', '7', '0', 'ie'),
-                array('WXP', 'Windows XP', 'Win XP'))),
-
-            // Midori
-            array('Midori/0.1.9 (X11; Linux i686; U; fr-fr) WebKit/532+', array(
-                array('MI', 'Midori', 'Midori', '0.1', '0', '1', 'webkit'),
-                array('LIN', 'Linux', 'Linux'))),
-            array('Mozilla/5.0 (X11; U; Linux; pt-br) AppleWebKit/531+ (KHTML, like Gecko) Safari/531.2+ Midori/0.3', array(
-                array('MI', 'Midori', 'Midori', '0.3', '0', '3', 'webkit'),
-                array('LIN', 'Linux', 'Linux'))),
-
-            // Mozilla Suite
-            array('Mozilla/5.0 (X11; U; SunOS sun4u; en-US; rv:1.7) Gecko/20070606', array(
-                array('MO', 'Mozilla', 'Mozilla', '1.7', '1', '7', 'gecko'),
-                array('SOS', 'SunOS', 'SunOS'))),
-            array('Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.7.8) Gecko/20050927 Debian/1.7.8-1sarge3', array(
-                array('MO', 'Mozilla', 'Mozilla', '1.7', '1', '7', 'gecko'),
-                array('LIN', 'Linux', 'Linux'))),
-
-            // NCSA Mosaic
-            array('PATHWORKS Mosaic/1.0 libwww/2.15_Spyglass', array(
-                array('MC', 'NCSA Mosaic', 'Mosaic', '1.0', '1', '0', 'unknown'),
-                false)),
-            array('WinMosaic/Version 2.0 (ALPHA 2)', array(
-                array('MC', 'NCSA Mosaic', 'Mosaic', '2.0', '2', '0', 'unknown'),
-                false)),
-            array('VMS_Mosaic/3.8-1 (Motif;OpenVMS V7.3-2 DEC 3000 - M700) libwww/2.12_Mosaic', array(
-                array('MC', 'NCSA Mosaic', 'Mosaic', '3.8', '3', '8', 'unknown'),
-                array('VMS', 'OpenVMS', 'OpenVMS'))),
-            array('Mosaic from Digital/1.02_Win32', array(
-                array('MC', 'NCSA Mosaic', 'Mosaic', '1.02', '1', '02', 'unknown'),
-                array('W95', 'Windows 95', 'Win 95'))),
-            array('NCSA Mosaic/2.0.0b4 (Windows AXP)', array(
-                array('MC', 'NCSA Mosaic', 'Mosaic', '2.0', '2', '0', 'unknown'),
-                false)),
-            array('NCSA_Mosaic/2.7b5 (X11;Linux 2.6.7 i686) libwww/2.12 modified', array(
-                array('MC', 'NCSA Mosaic', 'Mosaic', '2.7', '2', '7', 'unknown'),
-                array('LIN', 'Linux', 'Linux'))),
-            array('mMosaic/3.6.6 (X11;SunOS 5.8 sun4m)', array(
-                array('MC', 'NCSA Mosaic', 'Mosaic', '3.6', '3', '6', 'unknown'),
-                array('SOS', 'SunOS', 'SunOS'))),
-
-            // Netscape Navigator (9.x)
-            array('Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.8.1.8pre) Gecko/20071015 Firefox/2.0.0.7 Navigator/9.0', array(
-                array('NS', 'Netscape', 'Netscape', '9.0', '9', '0', 'gecko'),
-                array('LIN', 'Linux', 'Linux'))),
-            array('Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.7.5) Gecko/20070321 Netscape/9.0', array(
-                array('NS', 'Netscape', 'Netscape', '9.0', '9', '0', 'gecko'),
-                array('LIN', 'Linux', 'Linux'))),
-
-            // Netscape (6.x - 8.x)
-            array('Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.7.5) Gecko/20070321 Netscape/8.1.3', array(
-                array('NS', 'Netscape', 'Netscape', '8.1', '8', '1', 'gecko'),
-                array('LIN', 'Linux', 'Linux'))),
-            array('Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.7.2) Gecko/20040804 Netscape/7.2 (ax)', array(
-                array('NS', 'Netscape', 'Netscape', '7.2', '7', '2', 'gecko'),
-                array('WXP', 'Windows XP', 'Win XP'))),
-            array('Mozilla/5.0 (X11; U; OSF1 alpha; en-US; rv:0.9.4.1) Gecko/20020517 Netscape6/6.2.3', array(
-                array('NS', 'Netscape', 'Netscape', '6.2', '6', '2', 'gecko'),
-                array('T64', 'Tru64', 'Tru64'))),
-            array('Mozilla/5.0 (X11; U; Linux i686; en-US; rv:0.9.2) Gecko/20010726 Netscape6/6.1', array(
-                array('NS', 'Netscape', 'Netscape', '6.1', '6', '1', 'gecko'),
-                array('LIN', 'Linux', 'Linux'))),
-
-            // Netscape Communicator (4.x)
-            array('Mozilla/4.76C-SGI [en] (X11; I; IRIX64 6.5 IP30)', array(
-                array('NS', 'Netscape', 'Netscape', '4.76', '4', '76', 'gecko'),
-                array('IRI', 'IRIX', 'IRIX'))),
-            array('Mozilla/4.72 [en] (X11; I; HP-UX B.11.00 9000/800)', array(
-                array('NS', 'Netscape', 'Netscape', '4.72', '4', '72', 'gecko'),
-                array('HPX', 'HP-UX', 'HP-UX'))),
-            array('Mozilla/4.41 (BEOS; U ;Nav)', array(
-                array('NS', 'Netscape', 'Netscape', '4.41', '4', '41', 'gecko'),
-                array('BEO', 'BeOS', 'BeOS'))),
-            array('Mozilla/4.0 (compatible; Windows NT 5.1; U; en)', array(
-                array('NS', 'Netscape', 'Netscape', '4.0', '4', '0', 'gecko'),
-                array('WXP', 'Windows XP', 'Win XP'))),
-
-            // Netscape Navigator (up to 3.x)
-            array('Mozilla/3.0 (X11; I; AIX 2)', array(
-                array('NS', 'Netscape', 'Netscape', '3.0', '3', '0', 'gecko'),
-                array('AIX', 'AIX', 'AIX'))),
-            array('Mozilla/2.02 [fr] (WinNT; I)', array(
-                array('NS', 'Netscape', 'Netscape', '2.02', '2', '02', 'gecko'),
-                array('WNT', 'Windows NT', 'Win NT'))),
-
-            // NetFront NX
-            array('Mozilla/5.0 (Nintendo WiiU) AppleWebKit/534.52 (KHTML, like Gecko) NX/2.1.0.8.21 NintendoBrowser/1.0.0.7494.US', array(
-                array('NF', 'NetFront', 'NetFront', '2.1', '2', '1', 'webkit'),
-                array('WIU', 'Nintendo Wii U', 'Wii U'))),
-            array('Mozilla/5.0 (Nintendo 3DS; U; ; en) Version/1.7498.US', array(
-                array('NF', 'NetFront', 'NetFront', '1.7498', '1', '7498', 'webkit'),
-                array('3DS', 'Nintendo 3DS', '3DS'))),
-            array('Mozilla/5.0 (Playstation Vita 1.61) AppleWebKit/531.22.8 (KHTML, like Gecko) Silk/3.2', array(
-                array('NF', 'NetFront', 'NetFront', '3.2', '3', '2', 'webkit'),
-                array('PSV', 'PlayStation Vita', 'PS Vita'))),
-
-            // Kindle
-            array('Mozilla/4.0 (compatible; Linux 2.6.10) NetFront/3.3 Kindle/1.0 (screen 600x800)', array(
-                array('NF', 'NetFront', 'NetFront', '3.3', '3', '3', 'webkit'),
-                array('LIN', 'Linux', 'Linux'))),
-            array('Mozilla/5.0 (Linux; U; Android 2.3.4; en-us; Kindle Fire Build/GINGERBREAD) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1', array(
-                array('SF', 'Safari', 'Safari', '4.0', '4', '0', 'webkit'),
-                array('AND', 'Android', 'Android'))),
-            array('Mozilla/5.0 (Linux; U; en-US) AppleWebKit/528.5+ (KHTML, like Gecko, Safari/528.5+) Version/4.0 Kindle/3.0 (screen 600×800; rotate)', array(
-                array('SF', 'Safari', 'Safari', '4.0', '4', '0', 'webkit'),
-                array('LIN', 'Linux', 'Linux'))),
-            array('Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10_6_3; en-us; Silk/1.1.0-80) AppleWebKit/533.16 (KHTML, like Gecko) Version/5.0 Safari/533.16 Silk-Accelerated=true', array(
-                array('SF', 'Safari', 'Safari', '5.0', '5', '0', 'webkit'),
-                array('MAC', 'Mac OS', 'Mac OS'))),
-
-            // Omniweb
-            array('Mozilla/5.0 (Macintosh; U; Intel Mac OS X; en-US) AppleWebKit/525.18 (KHTML, like Gecko, Safari/525.20) OmniWeb/v622.3.0.105198', array(
-                array('OW', 'OmniWeb', 'OmniWeb', '5.8', '5', '8', 'webkit'),
-                array('MAC', 'Mac OS', 'Mac OS'))),
-            array('Mozilla/5.0 (Macintosh; U; PPC Mac OS X; en-US) AppleWebKit/522+ (KHTML, like Gecko, Safari/522) OmniWeb/v613', array(
-                array('OW', 'OmniWeb', 'OmniWeb', '5.6', '5', '6', 'webkit'),
-                array('MAC', 'Mac OS', 'Mac OS'))),
-            array('Mozilla/5.0 (Macintosh; U; PPC Mac OS X; en-US) AppleWebKit/420+ (KHTML, like Gecko, Safari/420) OmniWeb/v607', array(
-                array('OW', 'OmniWeb', 'OmniWeb', '5.5', '5', '5', 'webkit'),
-                array('MAC', 'Mac OS', 'Mac OS'))),
-            array('Mozilla/5.0 (Macintosh; U; PPC Mac OS X; en-US) AppleWebKit/125.4 (KHTML, like Gecko, Safari) OmniWeb/v563.34', array(
-                array('OW', 'OmniWeb', 'OmniWeb', '5.1', '5', '1', 'webkit'),
-                array('MAC', 'Mac OS', 'Mac OS'))),
-            array('Mozilla/5.0 (Macintosh; U; PPC Mac OS X; en-US) AppleWebKit/85 (KHTML, like Gecko) OmniWeb/v558.36', array(
-                array('OW', 'OmniWeb', 'OmniWeb', '5.0', '5', '0', 'webkit'),
-                array('MAC', 'Mac OS', 'Mac OS'))),
-            array('Mozilla/5.0 (Macintosh; U; PPC Mac OS X; en-US) AppleWebKit/85 (KHTML, like Gecko) OmniWeb/v496', array(
-                array('OW', 'OmniWeb', 'OmniWeb', '4.5', '4', '5', 'webkit'),
-                array('MAC', 'Mac OS', 'Mac OS'))),
-
-            // Opera
-            array('Opera/9.63 (Windows NT 5.1; U; en) Presto/2.1.1', array(
-                array('OP', 'Opera', 'Opera', '9.63', '9', '63', 'opera'),
-                array('WXP', 'Windows XP', 'Win XP'))),
-            array('Opera/9.30 (Nintendo Wii; U; ; 2047-7; en)', array(
-                array('OP', 'Opera', 'Opera', '9.30', '9', '30', 'opera'),
-                array('WII', 'Nintendo Wii', 'Wii'))),
-            array('Opera/9.64 (Windows ME; U; en) Presto/2.1.1', array(
-                array('OP', 'Opera', 'Opera', '9.64', '9', '64', 'opera'),
-                array('WME', 'Windows Me', 'Win Me'))),
-            array('Opera/9.80 (Windows NT 5.1; U; en) Presto/2.2.15 Version/10.00', array(
-                array('OP', 'Opera', 'Opera', '10.00', '10', '0', 'opera'),
-                array('WXP', 'Windows XP', 'Win XP'))),
-            array('Mozilla/4.0 (compatible; MSIE 6.0; Nitro) Opera 8.50 [en Mozilla/4.0 (compatible; MSIE 6.0; Nitro) Opera 8.50 [ja]', array(
-                array('OP', 'Opera', 'Opera', '8.50', '8', '50', 'opera'),
-                array('NDS', 'Nintendo DS', 'DS'))),
-            array('Opera/9.00 (Nintendo DS U; ; 1309-9; de)', array(
-                array('OP', 'Opera', 'Opera', '9.00', '9', '00', 'opera'),
-                array('NDS', 'Nintendo DS', 'DS'))),
-            array('Opera/9.50 (Nintendo DSi; Opera/507; U; en-US) ', array(
-                array('OP', 'Opera', 'Opera', '9.50', '9', '50', 'opera'),
-                array('DSI', 'Nintendo DSi', 'DSi'))),
-
-            // PlayStation
-            array('Mozilla/5.0 (PLAYSTATION 3; 1.00)', array(
-                false,
-                array('PS3', 'PlayStation 3', 'PS3'))),
-
-            // PSP
-            array('PSP (PlayStation Portable); 2.00', array(
-                false,
-                array('PSP', 'PlayStation Portable', 'PSP'))),
-            array('Mozilla/4.0 (PSP (PlayStation Portable); 2.00)', array(
-                false,
-                array('PSP', 'PlayStation Portable', 'PSP'))),
-
-            // Rekonq 1.0+
-            array('Mozilla/5.0 (X11; Linux i686) AppleWebKit/534.34 (KHTML, like Gecko) rekonq/1.0 Safari/534.34', array(
-                array('RK', 'Rekonq', 'Rekonq', '1.0', '1', '0', 'webkit'),
-                array('LIN', 'Linux', 'Linux'))),
-
-            // Safari
-            array('Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US) AppleWebKit/525.19 (KHTML, like Gecko) Version/3.1.2 Safari/525.21', array(
-                array('SF', 'Safari', 'Safari', '3.1', '3', '1', 'webkit'),
-                array('WXP', 'Windows XP', 'Win XP'))),
-            array('Mozilla/5.0 (iPhone; U; CPU iPhone OS 2_2 like Mac OS X; en-us) AppleWebKit/525.18.1 (KHTML, like Gecko) Version/3.1.1 Mobile/5G77 Safari/525.20', array(
-                array('SF', 'Safari', 'Safari', '3.1', '3', '1', 'webkit'),
-                array('IPH', 'iPhone', 'iPhone'))),
-            array('Mozilla/5.0 (iPod; U; CPU like Mac OS X; en) AppleWebKit/420.1 (KHTML, like Gecko) Version/3.0 Mobile/3A100a Safari/419.3', array(
-                array('SF', 'Safari', 'Safari', '3.0', '3', '0', 'webkit'),
-                array('IPD', 'iPod', 'iPod'))),
-            array('Mozilla/5.0 (iPod; U; CPU iPhone OS 2_2_1 like Mac OS X; en-us) AppleWebKit/525.18.1 (KHTML, like Gecko) Version/3.1.1 Mobile/5H11a Safari/525.20', array(
-                array('SF', 'Safari', 'Safari', '3.1', '3', '1', 'webkit'),
-                array('IPD', 'iPod', 'iPod'))),
-            array('Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10_5_5; en-us) AppleWebKit/527.3+ (KHTML, like Gecko) Version/3.1.2 Safari/525.20.1', array(
-                array('SF', 'Safari', 'Safari', '3.1', '3', '1', 'webkit'),
-                array('MAC', 'Mac OS', 'Mac OS'))),
-            array('Mozilla/5.0 (iPad; U; CPU iPhone OS 3_2 like Mac OS X; en-us) AppleWebKit/531.21.10 (KHTML, like Gecko) Version/4.0.4 Mobile/7B314 Safari/531.21.10', array(
-                array('SF', 'Safari', 'Safari', '4.0', '4', '0', 'webkit'),
-                array('IPA', 'iPad', 'iPad'))),
-            array('Mozilla/5.0 (iPad; U; CPU OS 3_2 like Mac OS X; en-us) AppleWebKit/531.21.10 (KHTML, like Gecko) Version/4.0.4 Mobile/7B367 Safari/531.21.10', array(
-                array('SF', 'Safari', 'Safari', '4.0', '4', '0', 'webkit'),
-                array('IPA', 'iPad', 'iPad'))),
-            array('Mozilla/5.0 (iPod; U; CPU iPhone OS 4_0 like Mac OS X; en-us) AppleWebKit/532.9 (KHTML, like Gecko) Version/4.0.5 Mobile/8A293 Safari/6531.22.7', array(
-                array('SF', 'Safari', 'Safari', '4.0', '4', '0', 'webkit'),
-                array('IPD', 'iPod', 'iPod'))),
-            array('Mozilla/5.0 (iPhone; U; CPU iPhone OS 4_0 like Mac OS X; en-us) AppleWebKit/532.9 (KHTML, like Gecko) Version/4.0.5 Mobile/8A293 Safari/6531.22.7', array(
-                array('SF', 'Safari', 'Safari', '4.0', '4', '0', 'webkit'),
-                array('IPH', 'iPhone', 'iPhone'))),
-            array('Mozilla/5.0 (Windows; U; Windows NT 6.0; en-US) AppleWebKit/533.19.4 (KHTML, like Gecko) ', array(
-                array('SF', 'Safari', 'Safari', '5.0', '5', '0', 'webkit'),
-                array('WVI', 'Windows Vista', 'Win Vista'))),
-            array('Mozilla/5.0 (Macintosh; Intel Mac OS X 10_6_8) AppleWebKit/534.50 (KHTML, like Gecko) Version/5.1 Safari/534.50', array(
-                array('SF', 'Safari', 'Safari', '5.1', '5', '1', 'webkit'),
-                array('MAC', 'Mac OS', 'Mac OS'))),
-            array('Mozilla/5.0 (iPhone; CPU iPhone OS 6_1 like Mac OS X) AppleWebKit/536.26 (KHTML, like Gecko) Mobile/10B141', array(
-                array('SF', 'Safari', 'Safari', '6.0', '6', '0', 'webkit'),
-                array('IPH', 'iPhone', 'iPhone'))),
-            array('Mozilla/5.0 (iPhone; CPU iPhone OS 6_1 like Mac OS X) AppleWebKit/536.26 (KHTML, like Gecko) Version/6.0 Mobile/10B141 Safari/8536.25', array(
-                array('SF', 'Safari', 'Safari', '6.0', '6', '0', 'webkit'),
-                array('IPH', 'iPhone', 'iPhone'))),
-
-            // SeaMonkey (formerly Mozilla Suite and rebranded versions)
-            array('Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.8.1.8) Gecko/20071008 Iceape/1.1.5 (Ubuntu-1.1.5-1ubuntu0.7.10)', array(
-                array('SM', 'SeaMonkey', 'SeaMonkey', '1.1', '1', '1', 'gecko'),
-                array('LIN', 'Linux', 'Linux'))),
-            array('Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.1b4pre) Gecko/20090405 SeaMonkey/2.0b1pre', array(
-                array('SM', 'SeaMonkey', 'SeaMonkey', '2.0', '2', '0', 'gecko'),
-                array('LIN', 'Linux', 'Linux'))),
-            array('Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.9) Gecko', array(
-                // this pre-2.0 UA is missing the SeaMonkey/X.Y
-                array('SM', 'SeaMonkey', 'SeaMonkey', '1.9', '1', '9', 'gecko'),
-                array('WXP', 'Windows XP', 'Win XP'))),
-            array('Mozilla/5.0 (Windows; U; Windows NT 5.1; cs; rv:1.9) Gecko/2008052906', array(
-                // this pre-2.0 UA is missing the SeaMonkey/X.Y
-                array('SM', 'SeaMonkey', 'SeaMonkey', '1.9', '1', '9', 'gecko'),
-                array('WXP', 'Windows XP', 'Win XP'))),
-
-            // Palm webOS
-            array('Mozilla/5.0 (webOS/1.0; U; en-us) AppleWebKit/525.27.1 (KHTML, like Gecko) Version/1.0 Safari/525.27.1 Pre/1.0', array(
-                array('WO', 'Palm webOS', 'webOS', '1.0', '1', '0', 'webkit'),
-                array('WOS', 'Palm webOS', 'webOS'))),
-            array('Mozilla/5.0 (webOS/Palm webOS 1.2.9; U; en-US) AppleWebKit/525.27.1 (KHTML, like Gecko) Version/1.0 Safari/525.27.1 Pixi/1.0', array(
-                array('WO', 'Palm webOS', 'webOS', '1.0', '1', '0', 'webkit'),
-                array('WOS', 'Palm webOS', 'webOS'))),
-            array('Mozilla/5.0 [en] (PalmOS; U; WebPro/3.5; Palm-Zi72)', array(
-                array('WP', 'WebPro', 'WebPro', '3.5', '3', '5', 'unknown'),
-                array('POS', 'Palm OS', 'Palm OS'))),
-
-            // Palm WebPro
-            array('Mozilla/4.76 [en] (PalmOS; U; WebPro/3.0.1a; Palm-Cct1)', array(
-                array('WP', 'WebPro', 'WebPro', '3.0', '3', '0', 'unknown'),
-                array('POS', 'Palm OS', 'Palm OS'))),
-            array('Mozilla/4.76 [en] (PalmOS; U; WebPro/3.0; Palm-Arz1)', array(
-                array('WP', 'WebPro', 'WebPro', '3.0', '3', '0', 'unknown'),
-                array('POS', 'Palm OS', 'Palm OS'))),
-
-            // Shiira 1.x - treat as Safari since it uses the installed version of Safari's WebKit
-            array('Mozilla/5.0 (Macintosh; U; PPC Mac OS X; en) AppleWebKit/417.9 (KHTML, like Gecko, Safari) Shiira/1.1', array(
-                array('SF', 'Safari', 'Safari', '2.0', '2', '0', 'webkit'),
-                array('MAC', 'Mac OS', 'Mac OS'))),
-            array('Mozilla/5.0 (Macintosh; U; PPC Mac OS X; pl-pl) AppleWebKit/312.8 (KHTML, like Gecko) Shiira/1.2.1 Safari/125', array(
-                array('SF', 'Safari', 'Safari', '1.3', '1', '3', 'webkit'),
-                array('MAC', 'Mac OS', 'Mac OS'))),
-
-            // Shiira 2.x - ditto
-            array('Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10_5_7; en-us) AppleWebKit/525.28.3 (KHTML, like Gecko) Shiira Safari/125', array(
-                array('SF', 'Safari', 'Safari', '3.2', '3', '2', 'webkit'),
-                array('MAC', 'Mac OS', 'Mac OS'))),
-
-            // SymbianOS
-            array('Nokia3650/1.0 SymbianOS/6.1 Series60/1.2 Profile/MIDP-1.0 Configuration/CLDC-1.0', array(
-                false,
-                array('SYM', 'SymbianOS', 'SymbianOS'))),
-            array('Mozilla/5.0 (SymbianOS/9.4; U; Series60/5.0 Nokia5800d-1b/20.2.014; Profile/MIDP-2.1 Configuration/CLDC-1.1 ) AppleWebKit/413 (KHTML, like Gecko) Safari/413', array(
-                array('SF', 'Safari', 'Safari', '2.0', '2', '0', 'webkit'),
-                array('SYM', 'SymbianOS', 'SymbianOS'))),
-            array('Opera/9.80 (S60; SymbOS; Opera Mobi/499; U; en-GB) Presto/2.4.18 Version/10.00', array(
-                array('OP', 'Opera', 'Opera', '10.00', '10', '00', 'opera'),
-                array('SYM', 'SymbianOS', 'SymbianOS'))),
-            array('SonyEricssonG700/R100 Mozilla/4.0 (compatible; MSIE 6.0; Symbian OS; 958) Opera 8.65 [ru]', array(
-                array('OP', 'Opera', 'Opera', '8.65', '8', '65', 'opera'),
-                array('SYM', 'SymbianOS', 'SymbianOS'))),
-
-            // Appcelerator Titanium
-            array('Appcelerator Titanium/1.8.0 (iPhone Simulator/4.3; iPhone OS; en_US;)', array(
-                array('TI', 'Titanium', 'Titanium', '1.8', '1', '8', 'webkit'),
-                array('IPH', 'iPhone', 'iPhone'))),
-
-            array('Appcelerator Titanium/1.8.0 (iPod touch/4.3.1; iPhone OS; de_DE;)', array(
-                array('TI', 'Titanium', 'Titanium', '1.8', '1', '8', 'webkit'),
-                array('IPD', 'iPod', 'iPod'))),
-
-            array('Appcelerator Titanium/1.8.0 (iPad/4.3.3; iPhone OS; de_DE;)', array(
-                array('TI', 'Titanium', 'Titanium', '1.8', '1', '8', 'webkit'),
-                array('IPA', 'iPad', 'iPad'))),
-
-            array('Dalvik/1.1.0 (Linux; U; Android 2.1; google_sdk Build/ERD79) Titanium/1.8.0', array(
-                array('TI', 'Titanium', 'Titanium', '1.8', '1', '8', 'webkit'),
-                array('AND', 'Android', 'Android'))),
-
-            array('Dalvik/1.4.0 (Linux; U; Android 2.3.3; GT-I9100 Build/GINGERBREAD) Titanium/1.8.0', array(
-                array('TI', 'Titanium', 'Titanium', '1.8', '1', '8', 'webkit'),
-                array('AND', 'Android', 'Android'))),
-
-            array('Mozilla/5.0 (X11; U; CrOS i686 9.10.0; en-US) AppleWebKit/532.5 (KHTML, like Gecko) Chrome/4.0.253.0 Safari/532.5', array(
-                array('CH', 'Chrome', 'Chrome', '4.0', '4', '0', 'webkit'),
-                array('LIN', 'Linux', 'Linux'))),
-
-            // Email Clients
-
-            // Thunderbird
-            array('Mozilla/5.0 (Windows NT 5.1; rv:14.0) Gecko/20120713 Thunderbird/14.0 Lightning/1.6', array(
-                array('TB', 'Thunderbird', 'Thunderbird', '14.0', '14', '0', 'gecko'),
-                array('WXP', 'Windows XP', 'Win XP'))),
-
-            array('Mozilla/5.0 (X11; Linux i686; rv:16.0) Gecko/20121011 Thunderbird/16.0.1', array(
-                array('TB', 'Thunderbird', 'Thunderbird', '16.0', '16', '0', 'gecko'),
-                array('LIN', 'Linux', 'Linux'))),
-
-            array('Mozilla/5.0 (Windows NT 6.1; WOW64; rv:17.0) Gecko/20130107 Thunderbird/17.0.2 Lightning/1.9', array(
-                array('TB', 'Thunderbird', 'Thunderbird', '17.0', '17', '0', 'gecko'),
-                array('WI7', 'Windows 7', 'Win 7'))),
-
-            array('Mozilla/5.0 (X11; Linux i686 on x86_64; rv:15.0) Gecko/20120907 Thunderbird/15.0.1', array(
-                array('TB', 'Thunderbird', 'Thunderbird', '15.0', '15', '0', 'gecko'),
-                array('LIN', 'Linux', 'Linux')))
-
-        );
-    }
-
-    /**
-     * Test getBrowser()
-     *
-     * @dataProvider getUserAgents
-     * @group Plugins
-     */
-    public function testGetBrowser($userAgent, $expected)
-    {
-        $res = UserAgentParser::getBrowser($userAgent);
-        $family = false;
-
-        if ($res === false)
-            $this->assertFalse($expected[0]);
-        else {
-            $family = \Piwik\Plugins\UserSettings\getBrowserFamily($res['id']);
-            $this->assertEquals($expected[0][0], $res['id']);
-            $this->assertEquals($expected[0][1], $res['name']);
-            $this->assertEquals($expected[0][2], $res['short_name']);
-            $this->assertEquals($expected[0][3], $res['version']);
-            $this->assertEquals($expected[0][4], $res['major_number']);
-            $this->assertEquals($expected[0][5], $res['minor_number']);
-            $this->assertEquals($expected[0][6], $family);
-        }
-    }
-
-    /**
-     * Test getOperatingSystem()
-     *
-     * @dataProvider getUserAgents
-     * @group Plugins
-     */
-    public function testGetOperatingSystem($userAgent, $expected)
-    {
-        $res = UserAgentParser::getOperatingSystem($userAgent);
-
-        $this->assertEquals($expected[1][0], $res['id']);
-        $this->assertEquals($expected[1][1], $res['name']);
-        $this->assertEquals($expected[1][2], $res['short_name']);
-    }
-}
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";