diff --git a/.gitignore b/.gitignore
index 8f00ee1d60956ab536eff97215e6ece104bb85c5..fcb76175f656065c7662b354d2ebde543af5bd5d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -36,7 +36,7 @@ php_errors.log
 /tests/javascript/unittest2.dbf
 /tests/lib/geoip-files/*.dat*
 /tests/lib/xhprof*
-/tests/PHPUnit/Integration/processed/
+/tests/PHPUnit/System/processed/
 /tests/PHPUnit/phpunit.xml
 /tests/results/
 /.htaccess
diff --git a/.travis.yml b/.travis.yml
index 67925cbeca080fcf6972fda65f434ff4329b8721..8290476d33a99fefd27e334981bd2cb174ed94ff 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -22,12 +22,12 @@ env:
   matrix:
     # PDO Mysql
     - TEST_SUITE=SystemTests MYSQL_ADAPTER=PDO_MYSQL
-    - TEST_SUITE=PluginTests MYSQL_ADAPTER=PDO_MYSQL
-    - TEST_SUITE=CoreTests MYSQL_ADAPTER=PDO_MYSQL
+    - TEST_SUITE=IntegrationTests MYSQL_ADAPTER=PDO_MYSQL
+    - TEST_SUITE=UnitTests MYSQL_ADAPTER=PDO_MYSQL
     # Mysqli
     - TEST_SUITE=SystemTests MYSQL_ADAPTER=MYSQLI
-    - TEST_SUITE=PluginTests MYSQL_ADAPTER=MYSQLI
-    - TEST_SUITE=CoreTests MYSQL_ADAPTER=MYSQLI
+    - TEST_SUITE=IntegrationTests MYSQL_ADAPTER=MYSQLI
+    - TEST_SUITE=UnitTests MYSQL_ADAPTER=MYSQLI
     # Javascript tests
     - TEST_SUITE=JavascriptTests MYSQL_ADAPTER=PDO_MYSQL
     - TEST_SUITE=AngularJSTests MYSQL_ADAPTER=PDO_MYSQL
@@ -79,27 +79,27 @@ matrix:
     - php: 5.3.3
       env: TEST_SUITE=SystemTests MYSQL_ADAPTER=MYSQLI
     - php: 5.3.3
-      env: TEST_SUITE=PluginTests MYSQL_ADAPTER=MYSQLI
+      env: TEST_SUITE=IntegrationTests MYSQL_ADAPTER=MYSQLI
     - php: 5.3.3
-      env: TEST_SUITE=CoreTests MYSQL_ADAPTER=MYSQLI
+      env: TEST_SUITE=UnitTests MYSQL_ADAPTER=MYSQLI
     - php: 5.5
       env: TEST_SUITE=SystemTests MYSQL_ADAPTER=MYSQLI
     - php: 5.5
-      env: TEST_SUITE=PluginTests MYSQL_ADAPTER=MYSQLI
+      env: TEST_SUITE=IntegrationTests MYSQL_ADAPTER=MYSQLI
     - php: 5.5
-      env: TEST_SUITE=CoreTests MYSQL_ADAPTER=MYSQLI
+      env: TEST_SUITE=UnitTests MYSQL_ADAPTER=MYSQLI
     - php: 5.6
       env: TEST_SUITE=SystemTests MYSQL_ADAPTER=MYSQLI
     - php: 5.6
-      env: TEST_SUITE=PluginTests MYSQL_ADAPTER=MYSQLI
+      env: TEST_SUITE=IntegrationTests MYSQL_ADAPTER=MYSQLI
     - php: 5.6
-      env: TEST_SUITE=CoreTests MYSQL_ADAPTER=MYSQLI
+      env: TEST_SUITE=UnitTests MYSQL_ADAPTER=MYSQLI
     - php: hhvm
       env: TEST_SUITE=SystemTests MYSQL_ADAPTER=MYSQLI
     - php: hhvm
-      env: TEST_SUITE=PluginTests MYSQL_ADAPTER=MYSQLI
+      env: TEST_SUITE=IntegrationTests MYSQL_ADAPTER=MYSQLI
     - php: hhvm
-      env: TEST_SUITE=CoreTests MYSQL_ADAPTER=MYSQLI
+      env: TEST_SUITE=UnitTests MYSQL_ADAPTER=MYSQLI
 
 script: $PIWIK_ROOT_DIR/tests/travis/travis.sh
 
diff --git a/core/Option.php b/core/Option.php
index c4410520eab49e07614cb5fc1d93a284b2c36cb3..d50e5c42358c19e9543a7809f5da26134f7a3214 100644
--- a/core/Option.php
+++ b/core/Option.php
@@ -139,6 +139,7 @@ class Option
         if (self::$instance == null) {
             self::$instance = new self;
         }
+
         return self::$instance;
     }
 
@@ -162,6 +163,7 @@ class Option
         if (isset($this->all[$name])) {
             return $this->all[$name];
         }
+
         $value = Db::fetchOne('SELECT option_value FROM `' . Common::prefixTable('option') . '` ' .
                               'WHERE option_name = ?', $name);
 
@@ -176,10 +178,14 @@ class Option
     protected function setValue($name, $value, $autoLoad = 0)
     {
         $autoLoad = (int)$autoLoad;
-        Db::query('INSERT INTO `' . Common::prefixTable('option') . '` (option_name, option_value, autoload) ' .
-            ' VALUES (?, ?, ?) ' .
-            ' ON DUPLICATE KEY UPDATE option_value = ?',
-            array($name, $value, $autoLoad, $value));
+
+        $sql  = 'INSERT INTO `' . Common::prefixTable('option') . '` (option_name, option_value, autoload) ' .
+                ' VALUES (?, ?, ?) ' .
+                ' ON DUPLICATE KEY UPDATE option_value = ?';
+        $bind = array($name, $value, $autoLoad, $value);
+
+        Db::query($sql, $bind);
+
         $this->all[$name] = $value;
     }
 
@@ -217,11 +223,13 @@ class Option
     {
         $sql  = 'SELECT option_name, option_value FROM `' . Common::prefixTable('option') . '` WHERE option_name LIKE ?';
         $bind = array($name);
+        $rows = Db::fetchAll($sql, $bind);
 
         $result = array();
-        foreach (Db::fetchAll($sql, $bind) as $row) {
+        foreach ($rows as $row) {
             $result[$row['option_name']] = $row['option_value'];
         }
+
         return $result;
     }
 
@@ -236,8 +244,10 @@ class Option
             return;
         }
 
-        $all = Db::fetchAll('SELECT option_value, option_name FROM `' . Common::prefixTable('option') . '`
-                             WHERE autoload = 1');
+        $table = Common::prefixTable('option');
+        $sql   = 'SELECT option_value, option_name FROM `' . $table . '` WHERE autoload = 1';
+        $all   = Db::fetchAll($sql);
+
         foreach ($all as $option) {
             $this->all[$option['option_name']] = $option['option_value'];
         }
diff --git a/plugins/API/tests/RowEvolutionTest.php b/plugins/API/tests/RowEvolutionTest.php
index 55651fa6b4cf2b1f676b9d340c97f8a4d062b4c1..21ea9224bd2133e283bc882ceb6517dbbd025e10 100644
--- a/plugins/API/tests/RowEvolutionTest.php
+++ b/plugins/API/tests/RowEvolutionTest.php
@@ -13,7 +13,7 @@ use Piwik\Tests\Fixture;
 /**
  * @group API
  * @group RowEvolutionTest
- * @group Database
+ * @group Plugins
  */
 class RowEvolutionTest extends \IntegrationTestCase
 {
diff --git a/tests/PHPUnit/Plugins/ActionsTest.php b/plugins/Actions/tests/ArchiverTest.php
similarity index 95%
rename from tests/PHPUnit/Plugins/ActionsTest.php
rename to plugins/Actions/tests/ArchiverTest.php
index 662ec20fac4f6ce5708a41988fb7dfed9652c932..6458f425fa457155db049f5802ecd6e34ce084e0 100644
--- a/tests/PHPUnit/Plugins/ActionsTest.php
+++ b/plugins/Actions/tests/ArchiverTest.php
@@ -5,13 +5,21 @@
  * @link    http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
+
+namespace Piwik\Plugins\PrivacyManager\tests;
+
 use Piwik\Plugins\Actions\ArchivingHelper;
 use Piwik\Tracker\Action;
 use Piwik\Translate;
 
-require_once 'Actions/Actions.php';
+require_once PIWIK_INCLUDE_PATH . '/plugins/Actions/Actions.php';
 
-class ActionsTests extends PHPUnit_Framework_TestCase
+/**
+ * @group Actions
+ * @group ArchiverTest
+ * @group Plugins
+ */
+class ArchiverTests extends \PHPUnit_Framework_TestCase
 {
     public function setUp()
     {
@@ -111,7 +119,6 @@ class ActionsTests extends PHPUnit_Framework_TestCase
 
     /**
      * @dataProvider getActionNameTestData
-     * @group        Plugins
      */
     public function testGetActionExplodedNames($params, $expected)
     {
diff --git a/plugins/Contents/tests/ContentsTest.php b/plugins/Contents/tests/ContentsTest.php
index 477886e90f8fbc6deda4b3ff14026b663c771f07..c07f491546809a9d6c9c17d5ef17a067db7bb084 100644
--- a/plugins/Contents/tests/ContentsTest.php
+++ b/plugins/Contents/tests/ContentsTest.php
@@ -9,6 +9,7 @@ namespace Piwik\Plugins\Contents\tests;
 
 use Piwik\Tests\SystemTestCase;
 use Piwik\Plugins\Contents\tests\Fixtures\TwoVisitsWithContents;
+use Piwik\Translate;
 
 /**
  * Testing Contents
@@ -40,6 +41,12 @@ class ContentsTest extends SystemTestCase
         );
     }
 
+    protected function setup()
+    {
+        parent::setup();
+        Translate::reloadLanguage('en');
+    }
+
     protected function tearDown()
     {
         parent::tearDown();
diff --git a/plugins/CoreConsole/Commands/DevelopmentManageTestFiles.php b/plugins/CoreConsole/Commands/DevelopmentManageTestFiles.php
index 429612ae9cff101049ccd913674f9c2eef0bf8aa..d2d96a8edf3fdcb41f2813d4a0307eb2036e74f0 100644
--- a/plugins/CoreConsole/Commands/DevelopmentManageTestFiles.php
+++ b/plugins/CoreConsole/Commands/DevelopmentManageTestFiles.php
@@ -42,7 +42,7 @@ class DevelopmentManageTestFiles extends ConsoleCommand
     {
         $file = $input->getOption('file');
 
-        $prefix = PIWIK_INCLUDE_PATH . '/tests/PHPUnit/Integration/processed/';
+        $prefix = PIWIK_INCLUDE_PATH . '/tests/PHPUnit/System/processed/';
         $guesses = array(
             '/' . $file,
             $prefix . $file,
@@ -55,6 +55,6 @@ class DevelopmentManageTestFiles extends ConsoleCommand
             }
         }
 
-        copy($file, PIWIK_INCLUDE_PATH . '/tests/PHPUnit/Integration/expected/' . basename($file));
+        copy($file, PIWIK_INCLUDE_PATH . '/tests/PHPUnit/System/expected/' . basename($file));
     }
 }
\ No newline at end of file
diff --git a/plugins/CoreConsole/Commands/GenerateTravisYmlFile.php b/plugins/CoreConsole/Commands/GenerateTravisYmlFile.php
index 1bd68cf0f7d8f889fb9c59671ef4f9c84ce3ba8d..13bcc5ad2fc58ffb48b8eb6c58423e681977c2ef 100644
--- a/plugins/CoreConsole/Commands/GenerateTravisYmlFile.php
+++ b/plugins/CoreConsole/Commands/GenerateTravisYmlFile.php
@@ -44,7 +44,7 @@ class GenerateTravisYmlFile extends ConsoleCommand
 
     protected function execute(InputInterface $input, OutputInterface $output)
     {
-        $targetPlugin = $input->getOption('plugin');
+        $targetPlugin  = $input->getOption('plugin');
         $outputYmlPath = $this->getTravisYmlOutputPath($input, $targetPlugin);
 
         $view = $this->createTravisYmlView($input, $output, $targetPlugin, $outputYmlPath);
diff --git a/plugins/CoreConsole/Commands/TestsRun.php b/plugins/CoreConsole/Commands/TestsRun.php
index f1e6db55e602e1d282508b9bd7f67b43e80fa94e..4178337057684614d87f30f9aec1bf01358d545c 100644
--- a/plugins/CoreConsole/Commands/TestsRun.php
+++ b/plugins/CoreConsole/Commands/TestsRun.php
@@ -29,7 +29,7 @@ class TestsRun extends ConsoleCommand
         $this->addOption('options', 'o', InputOption::VALUE_OPTIONAL, 'All options will be forwarded to phpunit', '');
         $this->addOption('xhprof', null, InputOption::VALUE_NONE, 'Profile using xhprof.');
         $this->addOption('file', null, InputOption::VALUE_REQUIRED, 'Execute tests within this file. Should be a path relative to the tests/PHPUnit directory.');
-        $this->addOption('suite', null, InputOption::VALUE_REQUIRED, 'Execute tests of a specific test suite, for instance CoreTests, IntegrationTests or SystemTests.');
+        $this->addOption('suite', null, InputOption::VALUE_REQUIRED, 'Execute tests of a specific test suite, for instance UnitTests, IntegrationTests or SystemTests.');
     }
 
     protected function execute(InputInterface $input, OutputInterface $output)
diff --git a/plugins/CoreConsole/TravisYmlView.php b/plugins/CoreConsole/TravisYmlView.php
index a89b5f1df52f7c03301c10ae01dccec97e0f5b63..9190f220ad863943179cfa5afa5fafca577a1ac1 100644
--- a/plugins/CoreConsole/TravisYmlView.php
+++ b/plugins/CoreConsole/TravisYmlView.php
@@ -199,16 +199,16 @@ class TravisYmlView extends View
         $testsToExclude = array();
 
         if ($this->isTargetPluginContainsPluginTests()) {
-            $testsToRun[] = array('name' => 'PluginTests',
+            $testsToRun[] = array('name' => 'IntegrationTests',
                                   'vars' => "MYSQL_ADAPTER=PDO_MYSQL");
-            $testsToRun[] = array('name' => 'PluginTests',
+            $testsToRun[] = array('name' => 'IntegrationTests',
                                   'vars' => "MYSQL_ADAPTER=PDO_MYSQL TEST_AGAINST_CORE=latest_stable");
 
             $testsToExclude[] = array('description' => 'execute latest stable tests only w/ PHP 5.5',
                                       'php' => '5.3.3',
-                                      'env' => 'TEST_SUITE=PluginTests MYSQL_ADAPTER=PDO_MYSQL TEST_AGAINST_CORE=latest_stable');
+                                      'env' => 'TEST_SUITE=IntegrationTests MYSQL_ADAPTER=PDO_MYSQL TEST_AGAINST_CORE=latest_stable');
             $testsToExclude[] = array('php' => '5.4',
-                                      'env' => 'TEST_SUITE=PluginTests MYSQL_ADAPTER=PDO_MYSQL TEST_AGAINST_CORE=latest_stable');
+                                      'env' => 'TEST_SUITE=IntegrationTests MYSQL_ADAPTER=PDO_MYSQL TEST_AGAINST_CORE=latest_stable');
         }
 
         if ($this->isTargetPluginContainsUITests()) {
diff --git a/plugins/CoreConsole/tests/Unit/TravisYmlViewTest.php b/plugins/CoreConsole/tests/Unit/TravisYmlViewTest.php
index eba77d25ba5c6c3f03c2ce88cd8820c8af17ff1f..b35819c7f0ffdf8c1dc1359b6a77133fbf0a6439 100644
--- a/plugins/CoreConsole/tests/Unit/TravisYmlViewTest.php
+++ b/plugins/CoreConsole/tests/Unit/TravisYmlViewTest.php
@@ -44,8 +44,8 @@ class TravisYmlViewTest extends PHPUnit_Framework_TestCase
         $this->assertContains(array('secure' => 'githubtoken'), $yaml['env']['global']);
 
         $this->assertNotEmpty($yaml['env']['matrix']);
-        $this->assertContains("TEST_SUITE=PluginTests MYSQL_ADAPTER=PDO_MYSQL", $yaml['env']['matrix']);
-        $this->assertContains("TEST_SUITE=PluginTests MYSQL_ADAPTER=PDO_MYSQL TEST_AGAINST_CORE=latest_stable", $yaml['env']['matrix']);
+        $this->assertContains("TEST_SUITE=IntegrationTests MYSQL_ADAPTER=PDO_MYSQL", $yaml['env']['matrix']);
+        $this->assertContains("TEST_SUITE=IntegrationTests MYSQL_ADAPTER=PDO_MYSQL TEST_AGAINST_CORE=latest_stable", $yaml['env']['matrix']);
         $this->assertNotContains("TEST_SUITE=UITests MYSQL_ADAPTER=PDO_MYSQL", $yaml['env']['matrix']);
 
         $this->assertBuildSectionsNotEmpty($yaml);
diff --git a/plugins/CoreConsole/tests/resources/test.travis.yml b/plugins/CoreConsole/tests/resources/test.travis.yml
index 1cdc845f180ab9614964bf5c6117223d29ae67fc..3d469b75ff114da9b7947e22f6ce17bc1f4edfc3 100644
--- a/plugins/CoreConsole/tests/resources/test.travis.yml
+++ b/plugins/CoreConsole/tests/resources/test.travis.yml
@@ -8,8 +8,8 @@ env:
     - PRESERVED_VAR=123
     - secure: anotherpreservedvar
   matrix:
-    - TEST_SUITE=CoreTests MYSQL_ADAPTER=PDO_MYSQL
-    - TEST_SUITE=PluginTests MYSQL_ADAPTER=PDO_MYSQL
+    - TEST_SUITE=UnitTests MYSQL_ADAPTER=PDO_MYSQL
+    - TEST_SUITE=IntegrationTests MYSQL_ADAPTER=PDO_MYSQL
 
 script: ./travis.sh
 
diff --git a/tests/PHPUnit/Integration/Plugins/CorePluginsAdmin/UpdateCommunicationTest.php b/plugins/CorePluginsAdmin/tests/UpdateCommunicationTest.php
similarity index 98%
rename from tests/PHPUnit/Integration/Plugins/CorePluginsAdmin/UpdateCommunicationTest.php
rename to plugins/CorePluginsAdmin/tests/UpdateCommunicationTest.php
index a54ab52cde4afd8385de540789d47810a6d04a67..8da5e009281cf5eb580eca9e5a3b468b47521228 100644
--- a/tests/PHPUnit/Integration/Plugins/CorePluginsAdmin/UpdateCommunicationTest.php
+++ b/plugins/CorePluginsAdmin/tests/UpdateCommunicationTest.php
@@ -6,6 +6,8 @@
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
 
+namespace Piwik\Plugins\CorePluginsAdmin\tests;
+
 use Piwik\Config;
 use Piwik\Option;
 use Piwik\Plugins\CorePluginsAdmin\UpdateCommunication;
@@ -15,7 +17,7 @@ use Piwik\Plugins\CorePluginsAdmin\UpdateCommunication;
  *
  * @group Plugins
  */
-class Plugins_CorePluginsAdmin_UpdateCommunicationTest extends IntegrationTestCase
+class UpdateCommunicationTest extends \IntegrationTestCase
 {
     /**
      * @var UpdateCommunication
diff --git a/tests/PHPUnit/Integration/Plugins/CoreUpdater/UpdateCommunicationTest.php b/plugins/CoreUpdater/tests/UpdateCommunicationTest.php
similarity index 97%
rename from tests/PHPUnit/Integration/Plugins/CoreUpdater/UpdateCommunicationTest.php
rename to plugins/CoreUpdater/tests/UpdateCommunicationTest.php
index 07fafc560976499b5ba2f39fbc35074b7ca4bd6a..d4ee8932c9aaeb5df945b2c7ef0f5e135173c753 100644
--- a/tests/PHPUnit/Integration/Plugins/CoreUpdater/UpdateCommunicationTest.php
+++ b/plugins/CoreUpdater/tests/UpdateCommunicationTest.php
@@ -6,6 +6,8 @@
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
 
+namespace Piwik\Plugins\CoreUpdater\tests;
+
 use Piwik\Config;
 use Piwik\Option;
 use Piwik\Plugins\CoreUpdater\UpdateCommunication;
@@ -17,7 +19,7 @@ use Piwik\Version;
  *
  * @group Plugins
  */
-class Plugins_CoreUpdater_UpdateCommunicationTest extends IntegrationTestCase
+class UpdateCommunicationTest extends \IntegrationTestCase
 {
     public function setUp()
     {
diff --git a/plugins/CustomVariables/tests/Commands/InfoTest.php b/plugins/CustomVariables/tests/Commands/InfoTest.php
index ddddba7ba8cf72923fb53e9b2890bc60966b1ea1..e207cc914ac5624e4d748315ce385b50f502ce0a 100644
--- a/plugins/CustomVariables/tests/Commands/InfoTest.php
+++ b/plugins/CustomVariables/tests/Commands/InfoTest.php
@@ -17,7 +17,7 @@ use Symfony\Component\Console\Tester\CommandTester;
 /**
  * @group CustomVariables
  * @group CustomVariablesTest
- * @group Database
+ * @group Plugins
  * @group Plugins
  */
 class InfoTest extends \IntegrationTestCase
diff --git a/plugins/CustomVariables/tests/Commands/SetNumberOfCustomVariablesTest.php b/plugins/CustomVariables/tests/Commands/SetNumberOfCustomVariablesTest.php
index f02bed38b022506e7129a557da34fe9a04946fe1..2c0d705994a4f6d827868340d346b4810a6a526e 100644
--- a/plugins/CustomVariables/tests/Commands/SetNumberOfCustomVariablesTest.php
+++ b/plugins/CustomVariables/tests/Commands/SetNumberOfCustomVariablesTest.php
@@ -17,7 +17,7 @@ use Symfony\Component\Console\Tester\CommandTester;
 /**
  * @group CustomVariables
  * @group CustomVariablesTest
- * @group Database
+ * @group Plugins
  * @group Plugins
  */
 class SetNumberOfCustomVariablesTest extends \IntegrationTestCase
diff --git a/plugins/CustomVariables/tests/CustomVariablesTest.php b/plugins/CustomVariables/tests/CustomVariablesTest.php
index 19fca3728707f6f3376bbc6a4fcda93aeb45333e..25a158589eb98b71882ba2620d761c35159a7986 100644
--- a/plugins/CustomVariables/tests/CustomVariablesTest.php
+++ b/plugins/CustomVariables/tests/CustomVariablesTest.php
@@ -13,7 +13,7 @@ use Piwik\Tracker\Cache;
 /**
  * @group CustomVariables
  * @group CustomVariablesTest
- * @group Database
+ * @group Plugins
  */
 class CustomVariablesTest extends \IntegrationTestCase
 {
diff --git a/plugins/CustomVariables/tests/ModelTest.php b/plugins/CustomVariables/tests/ModelTest.php
index 8b51e05d3cd3af8b2df55d7f7d18f92a4ac445dd..db0afbbba994921e11ccec76116a6545566709ad 100644
--- a/plugins/CustomVariables/tests/ModelTest.php
+++ b/plugins/CustomVariables/tests/ModelTest.php
@@ -15,7 +15,7 @@ use Piwik\Plugins\CustomVariables\Model;
 /**
  * @group CustomVariables
  * @group ModelTest
- * @group Database
+ * @group Plugins
  * @group CustomVariables_ModelTest
  */
 class ModelTest extends \IntegrationTestCase
diff --git a/plugins/CustomVariables/tests/processed/test_CustomVariablesSystemTest__CustomVariables.getCustomVariables_day.xml b/plugins/CustomVariables/tests/processed/test_CustomVariablesSystemTest__CustomVariables.getCustomVariables_day.xml
new file mode 100644
index 0000000000000000000000000000000000000000..1ecaf61b0850c5d6eb0fb7f0a922fe984f41789d
--- /dev/null
+++ b/plugins/CustomVariables/tests/processed/test_CustomVariablesSystemTest__CustomVariables.getCustomVariables_day.xml
@@ -0,0 +1,395 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<result>
+	<row>
+		<label>Name_PAGE_1</label>
+		<nb_actions>1</nb_actions>
+		<subtable>
+			<row>
+				<label>Val_PAGE1</label>
+				<nb_visits>1</nb_visits>
+				<nb_actions>1</nb_actions>
+			</row>
+		</subtable>
+	</row>
+	<row>
+		<label>Name_PAGE_2</label>
+		<nb_actions>1</nb_actions>
+		<subtable>
+			<row>
+				<label>Val_PAGE2</label>
+				<nb_visits>1</nb_visits>
+				<nb_actions>1</nb_actions>
+			</row>
+		</subtable>
+	</row>
+	<row>
+		<label>Name_PAGE_3</label>
+		<nb_actions>1</nb_actions>
+		<subtable>
+			<row>
+				<label>Val_PAGE3</label>
+				<nb_visits>1</nb_visits>
+				<nb_actions>1</nb_actions>
+			</row>
+		</subtable>
+	</row>
+	<row>
+		<label>Name_PAGE_4</label>
+		<nb_actions>1</nb_actions>
+		<subtable>
+			<row>
+				<label>Val_PAGE4</label>
+				<nb_visits>1</nb_visits>
+				<nb_actions>1</nb_actions>
+			</row>
+		</subtable>
+	</row>
+	<row>
+		<label>Name_PAGE_5</label>
+		<nb_actions>1</nb_actions>
+		<subtable>
+			<row>
+				<label>Val_PAGE5</label>
+				<nb_visits>1</nb_visits>
+				<nb_actions>1</nb_actions>
+			</row>
+		</subtable>
+	</row>
+	<row>
+		<label>Name_PAGE_6</label>
+		<nb_actions>1</nb_actions>
+		<subtable>
+			<row>
+				<label>Val_PAGE6</label>
+				<nb_visits>1</nb_visits>
+				<nb_actions>1</nb_actions>
+			</row>
+		</subtable>
+	</row>
+	<row>
+		<label>Name_PAGE_7</label>
+		<nb_actions>1</nb_actions>
+		<subtable>
+			<row>
+				<label>Val_PAGE7</label>
+				<nb_visits>1</nb_visits>
+				<nb_actions>1</nb_actions>
+			</row>
+		</subtable>
+	</row>
+	<row>
+		<label>Name_PAGE_8</label>
+		<nb_actions>1</nb_actions>
+		<subtable>
+			<row>
+				<label>Val_PAGE8</label>
+				<nb_visits>1</nb_visits>
+				<nb_actions>1</nb_actions>
+			</row>
+		</subtable>
+	</row>
+	<row>
+		<label>Name_VISIT_1</label>
+		<nb_visits>1</nb_visits>
+		<nb_actions>1</nb_actions>
+		<nb_users>0</nb_users>
+		<max_actions>1</max_actions>
+		<sum_visit_length>4</sum_visit_length>
+		<bounce_count>1</bounce_count>
+		<goals>
+			<row idgoal='1'>
+				<nb_conversions>1</nb_conversions>
+				<nb_visits_converted>1</nb_visits_converted>
+				<revenue>0</revenue>
+			</row>
+		</goals>
+		<nb_conversions>1</nb_conversions>
+		<revenue>0</revenue>
+		<subtable>
+			<row>
+				<label>Val_VISIT1</label>
+				<nb_visits>1</nb_visits>
+				<nb_actions>1</nb_actions>
+				<nb_users>0</nb_users>
+				<max_actions>1</max_actions>
+				<sum_visit_length>4</sum_visit_length>
+				<bounce_count>1</bounce_count>
+				<goals>
+					<row idgoal='1'>
+						<nb_conversions>1</nb_conversions>
+						<nb_visits_converted>1</nb_visits_converted>
+						<revenue>0</revenue>
+					</row>
+				</goals>
+				<nb_conversions>1</nb_conversions>
+				<revenue>0</revenue>
+			</row>
+		</subtable>
+	</row>
+	<row>
+		<label>Name_VISIT_2</label>
+		<nb_visits>1</nb_visits>
+		<nb_actions>1</nb_actions>
+		<nb_users>0</nb_users>
+		<max_actions>1</max_actions>
+		<sum_visit_length>4</sum_visit_length>
+		<bounce_count>1</bounce_count>
+		<goals>
+			<row idgoal='1'>
+				<nb_conversions>1</nb_conversions>
+				<nb_visits_converted>1</nb_visits_converted>
+				<revenue>0</revenue>
+			</row>
+		</goals>
+		<nb_conversions>1</nb_conversions>
+		<revenue>0</revenue>
+		<subtable>
+			<row>
+				<label>Val_VISIT2</label>
+				<nb_visits>1</nb_visits>
+				<nb_actions>1</nb_actions>
+				<nb_users>0</nb_users>
+				<max_actions>1</max_actions>
+				<sum_visit_length>4</sum_visit_length>
+				<bounce_count>1</bounce_count>
+				<goals>
+					<row idgoal='1'>
+						<nb_conversions>1</nb_conversions>
+						<nb_visits_converted>1</nb_visits_converted>
+						<revenue>0</revenue>
+					</row>
+				</goals>
+				<nb_conversions>1</nb_conversions>
+				<revenue>0</revenue>
+			</row>
+		</subtable>
+	</row>
+	<row>
+		<label>Name_VISIT_3</label>
+		<nb_visits>1</nb_visits>
+		<nb_actions>1</nb_actions>
+		<nb_users>0</nb_users>
+		<max_actions>1</max_actions>
+		<sum_visit_length>4</sum_visit_length>
+		<bounce_count>1</bounce_count>
+		<goals>
+			<row idgoal='1'>
+				<nb_conversions>1</nb_conversions>
+				<nb_visits_converted>1</nb_visits_converted>
+				<revenue>0</revenue>
+			</row>
+		</goals>
+		<nb_conversions>1</nb_conversions>
+		<revenue>0</revenue>
+		<subtable>
+			<row>
+				<label>Val_VISIT3</label>
+				<nb_visits>1</nb_visits>
+				<nb_actions>1</nb_actions>
+				<nb_users>0</nb_users>
+				<max_actions>1</max_actions>
+				<sum_visit_length>4</sum_visit_length>
+				<bounce_count>1</bounce_count>
+				<goals>
+					<row idgoal='1'>
+						<nb_conversions>1</nb_conversions>
+						<nb_visits_converted>1</nb_visits_converted>
+						<revenue>0</revenue>
+					</row>
+				</goals>
+				<nb_conversions>1</nb_conversions>
+				<revenue>0</revenue>
+			</row>
+		</subtable>
+	</row>
+	<row>
+		<label>Name_VISIT_4</label>
+		<nb_visits>1</nb_visits>
+		<nb_actions>1</nb_actions>
+		<nb_users>0</nb_users>
+		<max_actions>1</max_actions>
+		<sum_visit_length>4</sum_visit_length>
+		<bounce_count>1</bounce_count>
+		<goals>
+			<row idgoal='1'>
+				<nb_conversions>1</nb_conversions>
+				<nb_visits_converted>1</nb_visits_converted>
+				<revenue>0</revenue>
+			</row>
+		</goals>
+		<nb_conversions>1</nb_conversions>
+		<revenue>0</revenue>
+		<subtable>
+			<row>
+				<label>Val_VISIT4</label>
+				<nb_visits>1</nb_visits>
+				<nb_actions>1</nb_actions>
+				<nb_users>0</nb_users>
+				<max_actions>1</max_actions>
+				<sum_visit_length>4</sum_visit_length>
+				<bounce_count>1</bounce_count>
+				<goals>
+					<row idgoal='1'>
+						<nb_conversions>1</nb_conversions>
+						<nb_visits_converted>1</nb_visits_converted>
+						<revenue>0</revenue>
+					</row>
+				</goals>
+				<nb_conversions>1</nb_conversions>
+				<revenue>0</revenue>
+			</row>
+		</subtable>
+	</row>
+	<row>
+		<label>Name_VISIT_5</label>
+		<nb_visits>1</nb_visits>
+		<nb_actions>1</nb_actions>
+		<nb_users>0</nb_users>
+		<max_actions>1</max_actions>
+		<sum_visit_length>4</sum_visit_length>
+		<bounce_count>1</bounce_count>
+		<goals>
+			<row idgoal='1'>
+				<nb_conversions>1</nb_conversions>
+				<nb_visits_converted>1</nb_visits_converted>
+				<revenue>0</revenue>
+			</row>
+		</goals>
+		<nb_conversions>1</nb_conversions>
+		<revenue>0</revenue>
+		<subtable>
+			<row>
+				<label>Val_VISIT5</label>
+				<nb_visits>1</nb_visits>
+				<nb_actions>1</nb_actions>
+				<nb_users>0</nb_users>
+				<max_actions>1</max_actions>
+				<sum_visit_length>4</sum_visit_length>
+				<bounce_count>1</bounce_count>
+				<goals>
+					<row idgoal='1'>
+						<nb_conversions>1</nb_conversions>
+						<nb_visits_converted>1</nb_visits_converted>
+						<revenue>0</revenue>
+					</row>
+				</goals>
+				<nb_conversions>1</nb_conversions>
+				<revenue>0</revenue>
+			</row>
+		</subtable>
+	</row>
+	<row>
+		<label>Name_VISIT_6</label>
+		<nb_visits>1</nb_visits>
+		<nb_actions>1</nb_actions>
+		<nb_users>0</nb_users>
+		<max_actions>1</max_actions>
+		<sum_visit_length>4</sum_visit_length>
+		<bounce_count>1</bounce_count>
+		<goals>
+			<row idgoal='1'>
+				<nb_conversions>1</nb_conversions>
+				<nb_visits_converted>1</nb_visits_converted>
+				<revenue>0</revenue>
+			</row>
+		</goals>
+		<nb_conversions>1</nb_conversions>
+		<revenue>0</revenue>
+		<subtable>
+			<row>
+				<label>Val_VISIT6</label>
+				<nb_visits>1</nb_visits>
+				<nb_actions>1</nb_actions>
+				<nb_users>0</nb_users>
+				<max_actions>1</max_actions>
+				<sum_visit_length>4</sum_visit_length>
+				<bounce_count>1</bounce_count>
+				<goals>
+					<row idgoal='1'>
+						<nb_conversions>1</nb_conversions>
+						<nb_visits_converted>1</nb_visits_converted>
+						<revenue>0</revenue>
+					</row>
+				</goals>
+				<nb_conversions>1</nb_conversions>
+				<revenue>0</revenue>
+			</row>
+		</subtable>
+	</row>
+	<row>
+		<label>Name_VISIT_7</label>
+		<nb_visits>1</nb_visits>
+		<nb_actions>1</nb_actions>
+		<nb_users>0</nb_users>
+		<max_actions>1</max_actions>
+		<sum_visit_length>4</sum_visit_length>
+		<bounce_count>1</bounce_count>
+		<goals>
+			<row idgoal='1'>
+				<nb_conversions>1</nb_conversions>
+				<nb_visits_converted>1</nb_visits_converted>
+				<revenue>0</revenue>
+			</row>
+		</goals>
+		<nb_conversions>1</nb_conversions>
+		<revenue>0</revenue>
+		<subtable>
+			<row>
+				<label>Val_VISIT7</label>
+				<nb_visits>1</nb_visits>
+				<nb_actions>1</nb_actions>
+				<nb_users>0</nb_users>
+				<max_actions>1</max_actions>
+				<sum_visit_length>4</sum_visit_length>
+				<bounce_count>1</bounce_count>
+				<goals>
+					<row idgoal='1'>
+						<nb_conversions>1</nb_conversions>
+						<nb_visits_converted>1</nb_visits_converted>
+						<revenue>0</revenue>
+					</row>
+				</goals>
+				<nb_conversions>1</nb_conversions>
+				<revenue>0</revenue>
+			</row>
+		</subtable>
+	</row>
+	<row>
+		<label>Name_VISIT_8</label>
+		<nb_visits>1</nb_visits>
+		<nb_actions>1</nb_actions>
+		<nb_users>0</nb_users>
+		<max_actions>1</max_actions>
+		<sum_visit_length>4</sum_visit_length>
+		<bounce_count>1</bounce_count>
+		<goals>
+			<row idgoal='1'>
+				<nb_conversions>1</nb_conversions>
+				<nb_visits_converted>1</nb_visits_converted>
+				<revenue>0</revenue>
+			</row>
+		</goals>
+		<nb_conversions>1</nb_conversions>
+		<revenue>0</revenue>
+		<subtable>
+			<row>
+				<label>Val_VISIT8</label>
+				<nb_visits>1</nb_visits>
+				<nb_actions>1</nb_actions>
+				<nb_users>0</nb_users>
+				<max_actions>1</max_actions>
+				<sum_visit_length>4</sum_visit_length>
+				<bounce_count>1</bounce_count>
+				<goals>
+					<row idgoal='1'>
+						<nb_conversions>1</nb_conversions>
+						<nb_visits_converted>1</nb_visits_converted>
+						<revenue>0</revenue>
+					</row>
+				</goals>
+				<nb_conversions>1</nb_conversions>
+				<revenue>0</revenue>
+			</row>
+		</subtable>
+	</row>
+</result>
\ No newline at end of file
diff --git a/plugins/CustomVariables/tests/processed/test_CustomVariablesSystemTest__Live.getLastVisitsDetails_day.xml b/plugins/CustomVariables/tests/processed/test_CustomVariablesSystemTest__Live.getLastVisitsDetails_day.xml
new file mode 100644
index 0000000000000000000000000000000000000000..a61cb115544bbf3bd588842256ddde595e334c6e
--- /dev/null
+++ b/plugins/CustomVariables/tests/processed/test_CustomVariablesSystemTest__Live.getLastVisitsDetails_day.xml
@@ -0,0 +1,176 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<result>
+	<row>
+		<idSite>1</idSite>
+		<idVisit>1</idVisit>
+		<visitIp>156.5.3.2</visitIp>
+		
+		<actionDetails>
+			<row>
+				<type>goal</type>
+				<goalName>triggered js</goalName>
+				<goalId>1</goalId>
+				<revenue>0</revenue>
+				<goalPageId />
+				
+				<url>http://localhost</url>
+				<icon>plugins/Morpheus/images/goal.png</icon>
+			</row>
+			<row>
+				<type>action</type>
+				<url>http://localhost</url>
+				<pageTitle>Profile page</pageTitle>
+				<pageIdAction>2</pageIdAction>
+				
+				<pageId>1</pageId>
+				<customVariables>
+					<row>
+						<customVariablePageName1>Name_PAGE_1</customVariablePageName1>
+						<customVariablePageValue1>Val_PAGE1</customVariablePageValue1>
+					</row>
+					<row>
+						<customVariablePageName2>Name_PAGE_2</customVariablePageName2>
+						<customVariablePageValue2>Val_PAGE2</customVariablePageValue2>
+					</row>
+					<row>
+						<customVariablePageName3>Name_PAGE_3</customVariablePageName3>
+						<customVariablePageValue3>Val_PAGE3</customVariablePageValue3>
+					</row>
+					<row>
+						<customVariablePageName4>Name_PAGE_4</customVariablePageName4>
+						<customVariablePageValue4>Val_PAGE4</customVariablePageValue4>
+					</row>
+					<row>
+						<customVariablePageName5>Name_PAGE_5</customVariablePageName5>
+						<customVariablePageValue5>Val_PAGE5</customVariablePageValue5>
+					</row>
+					<row>
+						<customVariablePageName6>Name_PAGE_6</customVariablePageName6>
+						<customVariablePageValue6>Val_PAGE6</customVariablePageValue6>
+					</row>
+					<row>
+						<customVariablePageName7>Name_PAGE_7</customVariablePageName7>
+						<customVariablePageValue7>Val_PAGE7</customVariablePageValue7>
+					</row>
+					<row>
+						<customVariablePageName8>Name_PAGE_8</customVariablePageName8>
+						<customVariablePageValue8>Val_PAGE8</customVariablePageValue8>
+					</row>
+				</customVariables>
+				<icon />
+			</row>
+		</actionDetails>
+		<goalConversions>1</goalConversions>
+		<siteCurrency>USD</siteCurrency>
+		<siteCurrencySymbol>$</siteCurrencySymbol>
+		
+		
+		
+		
+		<searches>0</searches>
+		<actions>1</actions>
+		<userId />
+		<visitorType>new</visitorType>
+		<visitorTypeIcon />
+		<visitConverted>1</visitConverted>
+		<visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
+		<visitCount>1</visitCount>
+		
+		<visitEcommerceStatus>none</visitEcommerceStatus>
+		<visitEcommerceStatusIcon />
+		<daysSinceFirstVisit>0</daysSinceFirstVisit>
+		<daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
+		<visitDuration>4</visitDuration>
+		<visitDurationPretty>4s</visitDurationPretty>
+		<customVariables>
+			<row>
+				<customVariableName1>Name_VISIT_1</customVariableName1>
+				<customVariableValue1>Val_VISIT1</customVariableValue1>
+			</row>
+			<row>
+				<customVariableName2>Name_VISIT_2</customVariableName2>
+				<customVariableValue2>Val_VISIT2</customVariableValue2>
+			</row>
+			<row>
+				<customVariableName3>Name_VISIT_3</customVariableName3>
+				<customVariableValue3>Val_VISIT3</customVariableValue3>
+			</row>
+			<row>
+				<customVariableName4>Name_VISIT_4</customVariableName4>
+				<customVariableValue4>Val_VISIT4</customVariableValue4>
+			</row>
+			<row>
+				<customVariableName5>Name_VISIT_5</customVariableName5>
+				<customVariableValue5>Val_VISIT5</customVariableValue5>
+			</row>
+			<row>
+				<customVariableName6>Name_VISIT_6</customVariableName6>
+				<customVariableValue6>Val_VISIT6</customVariableValue6>
+			</row>
+			<row>
+				<customVariableName7>Name_VISIT_7</customVariableName7>
+				<customVariableValue7>Val_VISIT7</customVariableValue7>
+			</row>
+			<row>
+				<customVariableName8>Name_VISIT_8</customVariableName8>
+				<customVariableValue8>Val_VISIT8</customVariableValue8>
+			</row>
+		</customVariables>
+		<deviceType>Desktop</deviceType>
+		<events>0</events>
+		<provider>Unknown</provider>
+		<providerName>Unknown</providerName>
+		<providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl>
+		<referrerType>search</referrerType>
+		<referrerTypeName>Search Engines</referrerTypeName>
+		<referrerName>Google</referrerName>
+		<referrerKeyword>this keyword should be ranked</referrerKeyword>
+		<referrerKeywordPosition>1</referrerKeywordPosition>
+		<referrerUrl>http://www.google.com/search?q=this+keyword+should+be+ranked</referrerUrl>
+		<referrerSearchEngineUrl>http://google.com</referrerSearchEngineUrl>
+		<referrerSearchEngineIcon>plugins/Referrers/images/searchEngines/google.com.png</referrerSearchEngineIcon>
+		<continent>Europe</continent>
+		<continentCode>eur</continentCode>
+		<country>France</country>
+		<countryCode>fr</countryCode>
+		<countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag>
+		<region />
+		<regionCode />
+		<city />
+		<location>France</location>
+		<latitude />
+		<longitude />
+		<operatingSystem>Windows XP</operatingSystem>
+		<operatingSystemCode>WXP</operatingSystemCode>
+		<operatingSystemShortName>Win XP</operatingSystemShortName>
+		<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
+		<browserFamily>gecko</browserFamily>
+		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
+		<browserName>Firefox 3.6</browserName>
+		<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
+		<browserCode>FF</browserCode>
+		<browserVersion>3.6</browserVersion>
+		<screenType>normal</screenType>
+		<resolution>1024x768</resolution>
+		<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
+		<plugins>flash, java</plugins>
+		<pluginsIcons>
+			<row>
+				<pluginIcon>plugins/UserSettings/images/plugins/flash.gif</pluginIcon>
+				<pluginName>flash</pluginName>
+			</row>
+			<row>
+				<pluginIcon>plugins/UserSettings/images/plugins/java.gif</pluginIcon>
+				<pluginName>java</pluginName>
+			</row>
+		</pluginsIcons>
+		<visitLocalTime>12:34:06</visitLocalTime>
+		<visitLocalHour>12</visitLocalHour>
+		<daysSinceLastVisit>0</daysSinceLastVisit>
+		
+		
+		
+		
+		
+	</row>
+</result>
\ No newline at end of file
diff --git a/plugins/ExamplePlugin/.travis.yml b/plugins/ExamplePlugin/.travis.yml
index 7dd870605f63d6e375baab57674e54ba7bb6d853..f20c564fdf0b4d149e2c2e7e5bcef0f980dadb96 100644
--- a/plugins/ExamplePlugin/.travis.yml
+++ b/plugins/ExamplePlugin/.travis.yml
@@ -5,8 +5,8 @@ php:
 
 env:
   matrix:
-    - TEST_SUITE=CoreTests MYSQL_ADAPTER=PDO_MYSQL
-    - TEST_SUITE=PluginTests MYSQL_ADAPTER=PDO_MYSQL
+    - TEST_SUITE=UnitTests MYSQL_ADAPTER=PDO_MYSQL
+    - TEST_SUITE=IntegrationTests MYSQL_ADAPTER=PDO_MYSQL
 
 script: ./travis.sh
 
diff --git a/plugins/Goals/tests/APITest.php b/plugins/Goals/tests/APITest.php
index f3892e8057524ac2a900d677af20e413d50a237f..39672b722de80d9c6031ac1fd9e854a8fd4ca859 100644
--- a/plugins/Goals/tests/APITest.php
+++ b/plugins/Goals/tests/APITest.php
@@ -16,7 +16,7 @@ use Piwik\Tests\Fixture;
  * @group Goals
  * @group Plugins
  * @group APITest
- * @group Database
+ * @group Plugins
  */
 class APITest extends \IntegrationTestCase
 {
diff --git a/plugins/Insights/tests/ApiTest.php b/plugins/Insights/tests/ApiTest.php
index 8a33f82fccb62a29c1284d6d4a1993fdbfd615d3..356bc769de057a83a93f578c3c833ec9aebd8385 100644
--- a/plugins/Insights/tests/ApiTest.php
+++ b/plugins/Insights/tests/ApiTest.php
@@ -13,11 +13,12 @@ use Piwik\DataTable\Row;
 use Piwik\Plugins\Insights\API;
 use Piwik\Plugins\Insights\tests\Fixtures\SomeVisitsDifferentPathsOnTwoDays;
 use Piwik\Tests\SystemTestCase;
+use Piwik\Translate;
 
 /**
  * @group Insights
  * @group ApiTest
- * @group Database
+ * @group Plugins
  * @group Plugins
  */
 class ApiTest extends SystemTestCase
@@ -37,6 +38,7 @@ class ApiTest extends SystemTestCase
     {
         parent::setUp();
 
+        Translate::reloadLanguage('en');
         $this->api = API::getInstance();
     }
 
diff --git a/plugins/Insights/tests/ModelTest.php b/plugins/Insights/tests/ModelTest.php
index 2dc0b9f301b3606b6c9377ed1aa2e98d9dde9f22..94ff52201dff97920d8aff14f2bc67fb9fbcb048 100644
--- a/plugins/Insights/tests/ModelTest.php
+++ b/plugins/Insights/tests/ModelTest.php
@@ -16,7 +16,7 @@ use Piwik\Tests\SystemTestCase;
 /**
  * @group Insights
  * @group ModelTest
- * @group Database
+ * @group Plugins
  * @group Plugins
  */
 class ModelTest extends SystemTestCase
diff --git a/tests/PHPUnit/Plugins/LanguagesManagerTest.php b/plugins/LanguagesManager/tests/LanguagesManagerTest.php
similarity index 96%
rename from tests/PHPUnit/Plugins/LanguagesManagerTest.php
rename to plugins/LanguagesManager/tests/LanguagesManagerTest.php
index 13cb46c6e628f67049ad42537cb8a0ca42a65ab6..3ed219acf4a875604011fa73b19637630fac7d44 100755
--- a/tests/PHPUnit/Plugins/LanguagesManagerTest.php
+++ b/plugins/LanguagesManager/tests/LanguagesManagerTest.php
@@ -5,6 +5,9 @@
  * @link    http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
+
+namespace Piwik\Plugins\LanguagesManager\tests;
+
 use Piwik\Common;
 use Piwik\Plugins\LanguagesManager\API;
 use Piwik\Translate\Filter\ByParameterCount;
@@ -14,10 +17,11 @@ use Piwik\Translate\Filter\UnnecassaryWhitespaces;
 use Piwik\Translate\Validate\CoreTranslations;
 use Piwik\Translate\Validate\NoScripts;
 use Piwik\Translate\Writer;
+use \Exception;
 
-require_once 'LanguagesManager/API.php';
+require_once PIWIK_INCLUDE_PATH . '/plugins/LanguagesManager/API.php';
 
-class Test_LanguagesManager extends PHPUnit_Framework_TestCase
+class LanguagesManagerTest extends \PHPUnit_Framework_TestCase
 {
     public function setUp()
     {
@@ -53,6 +57,7 @@ class Test_LanguagesManager extends PHPUnit_Framework_TestCase
                 }
             }
         }
+
         return $return;
     }
 
diff --git a/plugins/LeftMenu/tests/APITest.php b/plugins/LeftMenu/tests/APITest.php
index cb59bc18181df9e6ea73245031b5a1d2bde2d0d3..1b80cdc0d85915300ea4eaa560a633026b9b970a 100644
--- a/plugins/LeftMenu/tests/APITest.php
+++ b/plugins/LeftMenu/tests/APITest.php
@@ -16,7 +16,7 @@ use \FakeAccess;
 /**
  * @group LeftMenu
  * @group APITest
- * @group Database
+ * @group Plugins
  */
 class APITest extends \IntegrationTestCase
 {
diff --git a/tests/PHPUnit/Integration/Plugins/LoginTest.php b/plugins/Login/tests/LoginTest.php
similarity index 98%
rename from tests/PHPUnit/Integration/Plugins/LoginTest.php
rename to plugins/Login/tests/LoginTest.php
index ded63d53fba54cf1074a2f9047d5328ae9aa729d..8e431c93726cb2438c1bd505a7f3f1be2c567585 100644
--- a/tests/PHPUnit/Integration/Plugins/LoginTest.php
+++ b/plugins/Login/tests/LoginTest.php
@@ -5,13 +5,18 @@
  * @link http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
+
+namespace Piwik\Plugins\Login\tests;
+
 use Piwik\Access;
 use Piwik\AuthResult;
 use Piwik\DbHelper;
 use Piwik\Plugins\Login\Auth;
 use Piwik\Plugins\UsersManager\API;
+use IntegrationTestCase;
+use FakeAccess;
 
-require_once 'Login/Auth.php';
+require_once PIWIK_INCLUDE_PATH . '/plugins/Login/Auth.php';
 
 /**
  * Class Plugins_LoginTest
@@ -19,7 +24,7 @@ require_once 'Login/Auth.php';
  * @group Plugins
  * @group Plugins_LoginTest
  */
-class Plugins_LoginTest extends IntegrationTestCase
+class LoginTest extends IntegrationTestCase
 {
 
     /**
diff --git a/tests/PHPUnit/Integration/Plugins/MobileMessagingTest.php b/plugins/MobileMessaging/tests/MobileMessagingTest.php
similarity index 98%
rename from tests/PHPUnit/Integration/Plugins/MobileMessagingTest.php
rename to plugins/MobileMessaging/tests/MobileMessagingTest.php
index a4ed9aa671e2a70e3239ade151c22e19474750b8..dab19beb8389bc637b9875a9b5701d12d514038b 100644
--- a/tests/PHPUnit/Integration/Plugins/MobileMessagingTest.php
+++ b/plugins/MobileMessaging/tests/MobileMessagingTest.php
@@ -6,19 +6,23 @@
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
 
+namespace Piwik\Plugins\MobileMessaging\tests;
+
 use Piwik\Access;
 use Piwik\Plugins\MobileMessaging\API as APIMobileMessaging;
 use Piwik\Plugins\MobileMessaging\MobileMessaging;
 use Piwik\Plugins\MobileMessaging\SMSProvider;
 use Piwik\Plugins\ScheduledReports\API as APIScheduledReports;
 use Piwik\Plugins\SitesManager\API as APISitesManager;
+use IntegrationTestCase;
+use FakeAccess;
 
 /**
  * Class Plugins_MobileMessagingTest
  *
  * @group Plugins
  */
-class Plugins_MobileMessagingTest extends IntegrationTestCase
+class MobileMessagingTest extends IntegrationTestCase
 {
     protected $idSiteAccess;
 
diff --git a/tests/PHPUnit/Integration/Plugins/MultiSitesTest.php b/plugins/MultiSites/tests/MultiSitesTest.php
similarity index 92%
rename from tests/PHPUnit/Integration/Plugins/MultiSitesTest.php
rename to plugins/MultiSites/tests/MultiSitesTest.php
index c973a7e83934fe88813cfde4dd46c7d80f2b7afe..9f317d5ca758e9a46d2212de4059fdf893f88061 100644
--- a/tests/PHPUnit/Integration/Plugins/MultiSitesTest.php
+++ b/plugins/MultiSites/tests/MultiSitesTest.php
@@ -6,16 +6,19 @@
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
 
+namespace Piwik\Plugins\MultiSites\tests;
+
 use Piwik\Access;
 use Piwik\Plugins\MultiSites\API as APIMultiSites;
 use Piwik\Plugins\SitesManager\API as APISitesManager;
+use IntegrationTestCase;
 
 /**
  * Class Plugins_MultiSitesTest
  *
  * @group Plugins
  */
-class Plugins_MultiSitesTest extends IntegrationTestCase
+class MultiSitesTest extends IntegrationTestCase
 {
     protected $idSiteAccess;
 
diff --git a/tests/PHPUnit/Plugins/AnonymizeIPTest.php b/plugins/PrivacyManager/tests/AnonymizeIPTest.php
similarity index 96%
rename from tests/PHPUnit/Plugins/AnonymizeIPTest.php
rename to plugins/PrivacyManager/tests/AnonymizeIPTest.php
index 449d255f1fcd9344875b2d1a69c3f97841ededfd..0ed4e6e4ca7d9067f7839036709d7ab3a671fd24 100644
--- a/tests/PHPUnit/Plugins/AnonymizeIPTest.php
+++ b/plugins/PrivacyManager/tests/AnonymizeIPTest.php
@@ -5,12 +5,15 @@
  * @link http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
+
+namespace Piwik\Plugins\PrivacyManager\tests;
+
 use Piwik\IP;
 use Piwik\Plugins\PrivacyManager\IPAnonymizer;
 
-require_once 'PrivacyManager/IPAnonymizer.php';
+require_once PIWIK_INCLUDE_PATH . '/plugins/PrivacyManager/IPAnonymizer.php';
 
-class AnonymizeIPTest extends PHPUnit_Framework_TestCase
+class AnonymizeIPTest extends \PHPUnit_Framework_TestCase
 {
     // IPv4 addresses and expected results
     public function getipv4Addresses()
diff --git a/tests/PHPUnit/Integration/Plugins/PrivacyManagerConfigTest.php b/plugins/PrivacyManager/tests/PrivacyManagerConfigTest.php
similarity index 95%
rename from tests/PHPUnit/Integration/Plugins/PrivacyManagerConfigTest.php
rename to plugins/PrivacyManager/tests/PrivacyManagerConfigTest.php
index 06a5b691e710a240417a2e07544b2be829f2d072..88194e78f1def0d22e23583739888036db52b0a8 100644
--- a/tests/PHPUnit/Integration/Plugins/PrivacyManagerConfigTest.php
+++ b/plugins/PrivacyManager/tests/PrivacyManagerConfigTest.php
@@ -6,15 +6,18 @@
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
 
+namespace Piwik\Plugins\PrivacyManager\tests;
+
 use Piwik\Option;
 use Piwik\Plugins\PrivacyManager\Config as PrivacyManagerConfig;
+use IntegrationTestCase;
 
 /**
  * Class Plugins_SitesManagerTest
  *
  * @group Plugins
  */
-class Plugins_PrivacyManagerConfigTest extends IntegrationTestCase
+class PrivacyManagerConfigTest extends IntegrationTestCase
 {
     /**
      * @var PrivacyManagerConfig
diff --git a/tests/PHPUnit/Integration/Plugins/PrivacyManagerTest.php b/plugins/PrivacyManager/tests/PrivacyManagerTest.php
similarity index 95%
rename from tests/PHPUnit/Integration/Plugins/PrivacyManagerTest.php
rename to plugins/PrivacyManager/tests/PrivacyManagerTest.php
index ac95705bd3bcda60b5c313ca44750d587c9a0750..f9e3b43079ee0909a37122956ab70a2f45612020 100644
--- a/tests/PHPUnit/Integration/Plugins/PrivacyManagerTest.php
+++ b/plugins/PrivacyManager/tests/PrivacyManagerTest.php
@@ -6,14 +6,17 @@
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
 
+namespace Piwik\Plugins\PrivacyManager\tests;
+
 use Piwik\Plugins\PrivacyManager\PrivacyManager;
+use IntegrationTestCase;
 
 /**
  * Class Plugins_SitesManagerTest
  *
  * @group Plugins
  */
-class Plugins_PrivacyManagerTest extends IntegrationTestCase
+class PrivacyManagerTest extends IntegrationTestCase
 {
     /**
      * @var PrivacyManager
diff --git a/tests/PHPUnit/Plugins/ProxyTest.php b/plugins/Proxy/tests/ProxyTest.php
similarity index 87%
rename from tests/PHPUnit/Plugins/ProxyTest.php
rename to plugins/Proxy/tests/ProxyTest.php
index ab5a57bcc43171e44f95f1bebba5c62405d21a98..8b460a35ccc16083e8093bfa6608c88c976c6af7 100644
--- a/tests/PHPUnit/Plugins/ProxyTest.php
+++ b/plugins/Proxy/tests/ProxyTest.php
@@ -5,9 +5,17 @@
  * @link http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
+
+namespace Piwik\Plugins\Proxy\tests;
+
 use Piwik\Plugins\Proxy\Controller;
 
-class ProxyTest extends PHPUnit_Framework_TestCase
+/**
+ * @group Proxy
+ * @group ProxyTest
+ * @group Plugins
+ */
+class ProxyTest extends \PHPUnit_Framework_TestCase
 {
     public function getAcceptableRemoteUrls()
     {
diff --git a/tests/PHPUnit/Plugins/ReferrersTest.php b/plugins/Referrers/tests/ReferrersTest.php
similarity index 97%
rename from tests/PHPUnit/Plugins/ReferrersTest.php
rename to plugins/Referrers/tests/ReferrersTest.php
index c03c9ad61d65b65bf0e9c64e02a5e6eb6b104773..909e6bf65e60cc6edb244be1eb4dcfbcbb01368f 100644
--- a/tests/PHPUnit/Plugins/ReferrersTest.php
+++ b/plugins/Referrers/tests/ReferrersTest.php
@@ -5,13 +5,16 @@
  * @link http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
-require_once 'Referrers/Referrers.php';
+
+namespace Piwik\Plugins\Referrers\tests;
 
 use Piwik\DataTable;
 use Piwik\DataTable\Row;
 use Piwik\Period;
 
-class ReferrersTest extends PHPUnit_Framework_TestCase
+require_once PIWIK_INCLUDE_PATH . '/plugins/Referrers/Referrers.php';
+
+class ReferrersTest extends \PHPUnit_Framework_TestCase
 {
     /**
      * Dataprovider serving all search engine data
diff --git a/tests/PHPUnit/Plugins/SEOTest.php b/plugins/SEO/tests/SEOTest.php
similarity index 92%
rename from tests/PHPUnit/Plugins/SEOTest.php
rename to plugins/SEO/tests/SEOTest.php
index 8cb377eeef9c2e3f0912e096a4cebbbde11e33a1..06f627d2b4727c9e03a6be655f52599777208167 100644
--- a/tests/PHPUnit/Plugins/SEOTest.php
+++ b/plugins/SEO/tests/SEOTest.php
@@ -5,11 +5,21 @@
  * @link http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
+
+namespace Piwik\Plugins\SEO\tests;
+
 use Piwik\Access;
 use Piwik\DataTable\Renderer;
 use Piwik\Plugins\SEO\API;
+use FakeAccess;
+use Exception;
 
-class SEOTest extends PHPUnit_Framework_TestCase
+/**
+ * @group SEO
+ * @group SEOTest
+ * @group Plugins
+ */
+class SEOTest extends \PHPUnit_Framework_TestCase
 {
     public function setUp()
     {
@@ -36,8 +46,6 @@ class SEOTest extends PHPUnit_Framework_TestCase
 
     /**
      * tell us when the API is broken
-     *
-     * @group Plugins
      */
     public function test_API()
     {
diff --git a/tests/PHPUnit/Integration/Plugins/ScheduledReportsTest.php b/plugins/ScheduledReports/tests/ApiTest.php
similarity index 98%
rename from tests/PHPUnit/Integration/Plugins/ScheduledReportsTest.php
rename to plugins/ScheduledReports/tests/ApiTest.php
index 89ee99e099710d74827470f90952e14262bc920c..7f5f1649e04b06e236389f9e520b4e2ee0751f72 100644
--- a/tests/PHPUnit/Integration/Plugins/ScheduledReportsTest.php
+++ b/plugins/ScheduledReports/tests/ApiTest.php
@@ -5,27 +5,33 @@
  * @link http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
+
+namespace Piwik\Plugins\ScheduledReports\tests;
+
 use Piwik\Access;
 use Piwik\Plugins\MobileMessaging\API as APIMobileMessaging;
 use Piwik\Plugins\MobileMessaging\MobileMessaging;
 use Piwik\Plugins\ScheduledReports\API as APIScheduledReports;
 use Piwik\Plugins\ScheduledReports\Menu;
 use Piwik\Plugins\ScheduledReports\Tasks;
-use Piwik\Plugins\ScheduledReports\ScheduledReports;
 use Piwik\Plugins\SitesManager\API as APISitesManager;
 use Piwik\ScheduledTask;
 use Piwik\ScheduledTime\Monthly;
 use Piwik\ScheduledTime;
 use Piwik\Site;
+use IntegrationTestCase;
+use FakeAccess;
+use Exception;
+use ReflectionMethod;
 
-require_once 'ScheduledReports/ScheduledReports.php';
+require_once PIWIK_INCLUDE_PATH . '/plugins/ScheduledReports/ScheduledReports.php';
 
 /**
  * Class Plugins_ScheduledReportsTest
  *
  * @group Plugins
  */
-class Plugins_ScheduledReportsTest extends IntegrationTestCase
+class ApiTest extends IntegrationTestCase
 {
     private $idSite = 1;
 
diff --git a/plugins/ScheduledReports/tests/ScheduledReportsTest.php b/plugins/ScheduledReports/tests/ScheduledReportsTest.php
index c7aef6b8bcd7b2606301bcd3d55fc3507796137c..241e063aa0c28cb23bb5f37cbf2732bbfbad0729 100644
--- a/plugins/ScheduledReports/tests/ScheduledReportsTest.php
+++ b/plugins/ScheduledReports/tests/ScheduledReportsTest.php
@@ -17,7 +17,7 @@ use Piwik\Tests\Fixture;
 /**
  * @group ScheduledReports
  * @group ScheduledReportsTest
- * @group Database
+ * @group Plugins
  */
 class ScheduledReportsTest extends \IntegrationTestCase
 {
diff --git a/tests/PHPUnit/Integration/Plugins/SegmentEditorTest.php b/plugins/SegmentEditor/tests/SegmentEditorTest.php
similarity index 97%
rename from tests/PHPUnit/Integration/Plugins/SegmentEditorTest.php
rename to plugins/SegmentEditor/tests/SegmentEditorTest.php
index ca918625640bef1f5a08eec384a1aba368387cbe..16f1b3fe34d319005f8dafbe0834a03f069c104e 100644
--- a/tests/PHPUnit/Integration/Plugins/SegmentEditorTest.php
+++ b/plugins/SegmentEditor/tests/SegmentEditorTest.php
@@ -5,19 +5,25 @@
  * @link http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
+
+namespace Piwik\Plugins\SegmentEditor\tests;
+
 use Piwik\Access;
 use Piwik\Date;
 use Piwik\Piwik;
 use Piwik\Plugins\SegmentEditor\API;
 use Piwik\Plugins\SegmentEditor\Model;
 use Piwik\Plugins\SitesManager\API as APISitesManager;
+use IntegrationTestCase;
+use FakeAccess;
+use Exception;
 
 /**
  * Class Plugins_SegmentEditorTest
  *
  * @group Plugins
  */
-class Plugins_SegmentEditorTest extends IntegrationTestCase
+class SegmentEditorTest extends IntegrationTestCase
 {
     public function setUp()
     {
@@ -116,7 +122,7 @@ class Plugins_SegmentEditorTest extends IntegrationTestCase
 
         // There is no segment to process for a non existing site
         try {
-            $segments = $model->getSegmentsToAutoArchive(33);
+            $model->getSegmentsToAutoArchive(33);
             $this->fail();
         } catch(Exception $e) {
             // expected
diff --git a/plugins/SitesManager/tests/SiteUrlsTest.php b/plugins/SitesManager/tests/SiteUrlsTest.php
index 1b946ac5733ac564ec4af26bfa2118bc00eb4615..588b3c08f2185070b3fe71c222b2505104604a63 100644
--- a/plugins/SitesManager/tests/SiteUrlsTest.php
+++ b/plugins/SitesManager/tests/SiteUrlsTest.php
@@ -14,7 +14,7 @@ use Piwik\Plugins\SitesManager\SiteUrls;
 /**
  * @group SitesManager
  * @group SiteUrlsTest
- * @group Database
+ * @group Plugins
  */
 class SiteUrlsTest extends \IntegrationTestCase
 {
diff --git a/tests/PHPUnit/Integration/Plugins/SitesManagerTest.php b/plugins/SitesManager/tests/SitesManagerTest.php
similarity index 99%
rename from tests/PHPUnit/Integration/Plugins/SitesManagerTest.php
rename to plugins/SitesManager/tests/SitesManagerTest.php
index cf54ee6140a841e65c8a5e9a205d6f66ab593a74..6d08f0de2042efa90879da3151fb4a81767e4771 100644
--- a/tests/PHPUnit/Integration/Plugins/SitesManagerTest.php
+++ b/plugins/SitesManager/tests/SitesManagerTest.php
@@ -5,17 +5,24 @@
  * @link http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
+
+namespace Piwik\Plugins\SitesManager\tests;
+
 use Piwik\Access;
 use Piwik\Plugins\SitesManager\API;
 use Piwik\Plugins\UsersManager\API as APIUsersManager;
 use Piwik\Site;
+use IntegrationTestCase;
+use FakeAccess;
+use Exception;
+use PHPUnit_Framework_Constraint_IsType;
 
 /**
  * Class Plugins_SitesManagerTest
  *
  * @group Plugins
  */
-class Plugins_SitesManagerTest extends IntegrationTestCase
+class SitesManagerTest extends IntegrationTestCase
 {
     public function setUp()
     {
diff --git a/tests/PHPUnit/Plugins/UserCountryTest.php b/plugins/UserCountry/tests/UserCountryTest.php
similarity index 97%
rename from tests/PHPUnit/Plugins/UserCountryTest.php
rename to plugins/UserCountry/tests/UserCountryTest.php
index 72f9e7bfce1d0ac10361981365da5d92266bc6af..4dc6b9b497170d44d1e361810efd5557730a917e 100644
--- a/tests/PHPUnit/Plugins/UserCountryTest.php
+++ b/plugins/UserCountry/tests/UserCountryTest.php
@@ -6,16 +6,19 @@
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
 
+namespace Piwik\Plugins\UserCountry\tests;
+
 use Piwik\Plugins\UserCountry\GeoIPAutoUpdater;
 use Piwik\Plugins\UserCountry\LocationProvider\GeoIp;
 use Piwik\Plugins\UserCountry;
 use Piwik\Plugins\UserCountry\LocationProvider;
+use Exception;
 
 require_once PIWIK_INCLUDE_PATH . '/plugins/UserCountry/UserCountry.php';
 require_once PIWIK_INCLUDE_PATH . '/plugins/UserCountry/functions.php';
 require_once PIWIK_INCLUDE_PATH . '/core/DataFiles/Countries.php';
 
-class Test_Piwik_UserCountry extends PHPUnit_Framework_Testcase
+class UserCountryTest extends \PHPUnit_Framework_Testcase
 {
     /**
      * @group Plugins
diff --git a/tests/PHPUnit/Plugins/UserSettingsTest.php b/plugins/UserSettings/tests/UserSettingsTest.php
similarity index 99%
rename from tests/PHPUnit/Plugins/UserSettingsTest.php
rename to plugins/UserSettings/tests/UserSettingsTest.php
index b18362f1e50c3b1ecffc67b4b4e9ff0792510f32..95188a15e4b0a4d5df5b1eab28339403dc411913 100644
--- a/tests/PHPUnit/Plugins/UserSettingsTest.php
+++ b/plugins/UserSettings/tests/UserSettingsTest.php
@@ -5,10 +5,14 @@
  * @link http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
-require_once 'UserSettings/UserSettings.php';
-require_once 'UserSettings/functions.php';
+namespace Piwik\Plugins\UserSettings\tests;
 
-class UserSettingsTest extends PHPUnit_Framework_TestCase
+use UserAgentParser;
+
+require_once PIWIK_INCLUDE_PATH . '/plugins/UserSettings/UserSettings.php';
+require_once PIWIK_INCLUDE_PATH . '/plugins/UserSettings/functions.php';
+
+class UserSettingsTest extends \PHPUnit_Framework_TestCase
 {
     // User agent strings and expected parser results
     public function getUserAgents()
diff --git a/plugins/UserSettings/tests/processed/test___UserSettings.getLanguageCode_day.xml b/plugins/UserSettings/tests/processed/test___UserSettings.getLanguageCode_day.xml
new file mode 100644
index 0000000000000000000000000000000000000000..689e3d7d375ead76136000144430d7a451cadee2
--- /dev/null
+++ b/plugins/UserSettings/tests/processed/test___UserSettings.getLanguageCode_day.xml
@@ -0,0 +1,157 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<result>
+	<row>
+		<label>Polish (pl)</label>
+		<nb_uniq_visitors>2</nb_uniq_visitors>
+		<nb_visits>3</nb_visits>
+		<nb_actions>3</nb_actions>
+		<nb_users>0</nb_users>
+		<max_actions>1</max_actions>
+		<sum_visit_length>0</sum_visit_length>
+		<bounce_count>3</bounce_count>
+		<nb_visits_converted>0</nb_visits_converted>
+	</row>
+	<row>
+		<label>English - United States (en-us)</label>
+		<nb_uniq_visitors>1</nb_uniq_visitors>
+		<nb_visits>2</nb_visits>
+		<nb_actions>2</nb_actions>
+		<nb_users>0</nb_users>
+		<max_actions>1</max_actions>
+		<sum_visit_length>0</sum_visit_length>
+		<bounce_count>2</bounce_count>
+		<nb_visits_converted>0</nb_visits_converted>
+	</row>
+	<row>
+		<label>French - Belgium (fr-be)</label>
+		<nb_uniq_visitors>1</nb_uniq_visitors>
+		<nb_visits>2</nb_visits>
+		<nb_actions>2</nb_actions>
+		<nb_users>0</nb_users>
+		<max_actions>1</max_actions>
+		<sum_visit_length>0</sum_visit_length>
+		<bounce_count>2</bounce_count>
+		<nb_visits_converted>0</nb_visits_converted>
+	</row>
+	<row>
+		<label>Arabic - Qatar (ar-qa)</label>
+		<nb_uniq_visitors>1</nb_uniq_visitors>
+		<nb_visits>1</nb_visits>
+		<nb_actions>1</nb_actions>
+		<nb_users>0</nb_users>
+		<max_actions>1</max_actions>
+		<sum_visit_length>0</sum_visit_length>
+		<bounce_count>1</bounce_count>
+		<nb_visits_converted>0</nb_visits_converted>
+	</row>
+	<row>
+		<label>Czech - Czech Republic (cs-cz)</label>
+		<nb_uniq_visitors>1</nb_uniq_visitors>
+		<nb_visits>1</nb_visits>
+		<nb_actions>1</nb_actions>
+		<nb_users>0</nb_users>
+		<max_actions>1</max_actions>
+		<sum_visit_length>0</sum_visit_length>
+		<bounce_count>1</bounce_count>
+		<nb_visits_converted>0</nb_visits_converted>
+	</row>
+	<row>
+		<label>German (de)</label>
+		<nb_uniq_visitors>1</nb_uniq_visitors>
+		<nb_visits>1</nb_visits>
+		<nb_actions>1</nb_actions>
+		<nb_users>0</nb_users>
+		<max_actions>1</max_actions>
+		<sum_visit_length>0</sum_visit_length>
+		<bounce_count>1</bounce_count>
+		<nb_visits_converted>0</nb_visits_converted>
+	</row>
+	<row>
+		<label>Greek - Greece (el-gr)</label>
+		<nb_uniq_visitors>1</nb_uniq_visitors>
+		<nb_visits>1</nb_visits>
+		<nb_actions>1</nb_actions>
+		<nb_users>0</nb_users>
+		<max_actions>1</max_actions>
+		<sum_visit_length>0</sum_visit_length>
+		<bounce_count>1</bounce_count>
+		<nb_visits_converted>0</nb_visits_converted>
+	</row>
+	<row>
+		<label>Basque - Spain (eu-es)</label>
+		<nb_uniq_visitors>1</nb_uniq_visitors>
+		<nb_visits>1</nb_visits>
+		<nb_actions>1</nb_actions>
+		<nb_users>0</nb_users>
+		<max_actions>1</max_actions>
+		<sum_visit_length>0</sum_visit_length>
+		<bounce_count>1</bounce_count>
+		<nb_visits_converted>0</nb_visits_converted>
+	</row>
+	<row>
+		<label>French (fr)</label>
+		<nb_uniq_visitors>1</nb_uniq_visitors>
+		<nb_visits>1</nb_visits>
+		<nb_actions>1</nb_actions>
+		<nb_users>0</nb_users>
+		<max_actions>1</max_actions>
+		<sum_visit_length>0</sum_visit_length>
+		<bounce_count>1</bounce_count>
+		<nb_visits_converted>0</nb_visits_converted>
+	</row>
+	<row>
+		<label>French - Switzerland (fr-ch)</label>
+		<nb_uniq_visitors>1</nb_uniq_visitors>
+		<nb_visits>1</nb_visits>
+		<nb_actions>1</nb_actions>
+		<nb_users>0</nb_users>
+		<max_actions>1</max_actions>
+		<sum_visit_length>0</sum_visit_length>
+		<bounce_count>1</bounce_count>
+		<nb_visits_converted>0</nb_visits_converted>
+	</row>
+	<row>
+		<label>Serbian - Serbia Montenegro (sr-cs)</label>
+		<nb_uniq_visitors>1</nb_uniq_visitors>
+		<nb_visits>1</nb_visits>
+		<nb_actions>1</nb_actions>
+		<nb_users>0</nb_users>
+		<max_actions>1</max_actions>
+		<sum_visit_length>0</sum_visit_length>
+		<bounce_count>1</bounce_count>
+		<nb_visits_converted>0</nb_visits_converted>
+	</row>
+	<row>
+		<label>Thai (th)</label>
+		<nb_uniq_visitors>1</nb_uniq_visitors>
+		<nb_visits>1</nb_visits>
+		<nb_actions>1</nb_actions>
+		<nb_users>0</nb_users>
+		<max_actions>1</max_actions>
+		<sum_visit_length>0</sum_visit_length>
+		<bounce_count>1</bounce_count>
+		<nb_visits_converted>0</nb_visits_converted>
+	</row>
+	<row>
+		<label>Unknown - Liberia (xx-lr)</label>
+		<nb_uniq_visitors>1</nb_uniq_visitors>
+		<nb_visits>1</nb_visits>
+		<nb_actions>1</nb_actions>
+		<nb_users>0</nb_users>
+		<max_actions>1</max_actions>
+		<sum_visit_length>0</sum_visit_length>
+		<bounce_count>1</bounce_count>
+		<nb_visits_converted>0</nb_visits_converted>
+	</row>
+	<row>
+		<label>Chinese - Singapore (zh-sg)</label>
+		<nb_uniq_visitors>1</nb_uniq_visitors>
+		<nb_visits>1</nb_visits>
+		<nb_actions>1</nb_actions>
+		<nb_users>0</nb_users>
+		<max_actions>1</max_actions>
+		<sum_visit_length>0</sum_visit_length>
+		<bounce_count>1</bounce_count>
+		<nb_visits_converted>0</nb_visits_converted>
+	</row>
+</result>
\ No newline at end of file
diff --git a/plugins/UserSettings/tests/processed/test___UserSettings.getLanguage_day.xml b/plugins/UserSettings/tests/processed/test___UserSettings.getLanguage_day.xml
new file mode 100644
index 0000000000000000000000000000000000000000..6bb328c660ad1d2cc7c3632634438d97149e32e9
--- /dev/null
+++ b/plugins/UserSettings/tests/processed/test___UserSettings.getLanguage_day.xml
@@ -0,0 +1,135 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<result>
+	<row>
+		<label>Polish</label>
+		<nb_uniq_visitors>2</nb_uniq_visitors>
+		<nb_visits>3</nb_visits>
+		<nb_actions>3</nb_actions>
+		<nb_users>0</nb_users>
+		<max_actions>1</max_actions>
+		<sum_visit_length>0</sum_visit_length>
+		<bounce_count>3</bounce_count>
+		<nb_visits_converted>0</nb_visits_converted>
+	</row>
+	<row>
+		<label>English</label>
+		<nb_uniq_visitors>1</nb_uniq_visitors>
+		<nb_visits>2</nb_visits>
+		<nb_actions>2</nb_actions>
+		<nb_users>0</nb_users>
+		<max_actions>1</max_actions>
+		<sum_visit_length>0</sum_visit_length>
+		<bounce_count>2</bounce_count>
+		<nb_visits_converted>0</nb_visits_converted>
+	</row>
+	<row>
+		<label>French</label>
+		<nb_uniq_visitors>3</nb_uniq_visitors>
+		<nb_visits>4</nb_visits>
+		<nb_actions>4</nb_actions>
+		<nb_users>0</nb_users>
+		<max_actions>1</max_actions>
+		<sum_visit_length>0</sum_visit_length>
+		<bounce_count>4</bounce_count>
+		<nb_visits_converted>0</nb_visits_converted>
+	</row>
+	<row>
+		<label>Arabic</label>
+		<nb_uniq_visitors>1</nb_uniq_visitors>
+		<nb_visits>1</nb_visits>
+		<nb_actions>1</nb_actions>
+		<nb_users>0</nb_users>
+		<max_actions>1</max_actions>
+		<sum_visit_length>0</sum_visit_length>
+		<bounce_count>1</bounce_count>
+		<nb_visits_converted>0</nb_visits_converted>
+	</row>
+	<row>
+		<label>Czech</label>
+		<nb_uniq_visitors>1</nb_uniq_visitors>
+		<nb_visits>1</nb_visits>
+		<nb_actions>1</nb_actions>
+		<nb_users>0</nb_users>
+		<max_actions>1</max_actions>
+		<sum_visit_length>0</sum_visit_length>
+		<bounce_count>1</bounce_count>
+		<nb_visits_converted>0</nb_visits_converted>
+	</row>
+	<row>
+		<label>German</label>
+		<nb_uniq_visitors>1</nb_uniq_visitors>
+		<nb_visits>1</nb_visits>
+		<nb_actions>1</nb_actions>
+		<nb_users>0</nb_users>
+		<max_actions>1</max_actions>
+		<sum_visit_length>0</sum_visit_length>
+		<bounce_count>1</bounce_count>
+		<nb_visits_converted>0</nb_visits_converted>
+	</row>
+	<row>
+		<label>Greek</label>
+		<nb_uniq_visitors>1</nb_uniq_visitors>
+		<nb_visits>1</nb_visits>
+		<nb_actions>1</nb_actions>
+		<nb_users>0</nb_users>
+		<max_actions>1</max_actions>
+		<sum_visit_length>0</sum_visit_length>
+		<bounce_count>1</bounce_count>
+		<nb_visits_converted>0</nb_visits_converted>
+	</row>
+	<row>
+		<label>Basque</label>
+		<nb_uniq_visitors>1</nb_uniq_visitors>
+		<nb_visits>1</nb_visits>
+		<nb_actions>1</nb_actions>
+		<nb_users>0</nb_users>
+		<max_actions>1</max_actions>
+		<sum_visit_length>0</sum_visit_length>
+		<bounce_count>1</bounce_count>
+		<nb_visits_converted>0</nb_visits_converted>
+	</row>
+	<row>
+		<label>Serbian</label>
+		<nb_uniq_visitors>1</nb_uniq_visitors>
+		<nb_visits>1</nb_visits>
+		<nb_actions>1</nb_actions>
+		<nb_users>0</nb_users>
+		<max_actions>1</max_actions>
+		<sum_visit_length>0</sum_visit_length>
+		<bounce_count>1</bounce_count>
+		<nb_visits_converted>0</nb_visits_converted>
+	</row>
+	<row>
+		<label>Thai</label>
+		<nb_uniq_visitors>1</nb_uniq_visitors>
+		<nb_visits>1</nb_visits>
+		<nb_actions>1</nb_actions>
+		<nb_users>0</nb_users>
+		<max_actions>1</max_actions>
+		<sum_visit_length>0</sum_visit_length>
+		<bounce_count>1</bounce_count>
+		<nb_visits_converted>0</nb_visits_converted>
+	</row>
+	<row>
+		<label>Unknown</label>
+		<nb_uniq_visitors>1</nb_uniq_visitors>
+		<nb_visits>1</nb_visits>
+		<nb_actions>1</nb_actions>
+		<nb_users>0</nb_users>
+		<max_actions>1</max_actions>
+		<sum_visit_length>0</sum_visit_length>
+		<bounce_count>1</bounce_count>
+		<nb_visits_converted>0</nb_visits_converted>
+	</row>
+	<row>
+		<label>Chinese</label>
+		<nb_uniq_visitors>1</nb_uniq_visitors>
+		<nb_visits>1</nb_visits>
+		<nb_actions>1</nb_actions>
+		<nb_users>0</nb_users>
+		<max_actions>1</max_actions>
+		<sum_visit_length>0</sum_visit_length>
+		<bounce_count>1</bounce_count>
+		<nb_visits_converted>0</nb_visits_converted>
+	</row>
+</result>
\ No newline at end of file
diff --git a/plugins/UsersManager/tests/APITest.php b/plugins/UsersManager/tests/APITest.php
index 9cc230f59daa7b0b311400fa09f9db63c3d613c2..3d77ee7a83cec020b915247908531ce0facf5845 100644
--- a/plugins/UsersManager/tests/APITest.php
+++ b/plugins/UsersManager/tests/APITest.php
@@ -16,7 +16,7 @@ use Piwik\Tests\Fixture;
 /**
  * @group UsersManager
  * @group APITest
- * @group Database
+ * @group Plugins
  */
 class APITest extends \IntegrationTestCase
 {
diff --git a/plugins/UsersManager/tests/UserPreferencesTest.php b/plugins/UsersManager/tests/UserPreferencesTest.php
index 32d56110f4765ce4ddf8f7713507d0f45151c682..50658e46e232770712517fc35b94a5c7bf45f587 100644
--- a/plugins/UsersManager/tests/UserPreferencesTest.php
+++ b/plugins/UsersManager/tests/UserPreferencesTest.php
@@ -7,6 +7,7 @@
  */
 
 namespace Piwik\Plugins\UsersManager\tests;
+
 use Piwik\Piwik;
 use Piwik\Plugins\UsersManager\UserPreferences;
 use Piwik\Plugins\UsersManager\API as APIUsersManager;
@@ -17,7 +18,7 @@ use Piwik\Tests\Fixture;
 /**
  * @group UsersManager
  * @group UserPreferencesTest
- * @group Database
+ * @group Plugins
  * @group Plugins
  */
 class UserPreferencesTest extends \IntegrationTestCase
diff --git a/tests/PHPUnit/Integration/Plugins/UsersManagerTest.php b/plugins/UsersManager/tests/UsersManagerTest.php
similarity index 99%
rename from tests/PHPUnit/Integration/Plugins/UsersManagerTest.php
rename to plugins/UsersManager/tests/UsersManagerTest.php
index 5f039b7efc62ffa00c138926d30bf7bb04992553..da73e142d31b90f08d071990ef06b67c50ba84aa 100644
--- a/tests/PHPUnit/Integration/Plugins/UsersManagerTest.php
+++ b/plugins/UsersManager/tests/UsersManagerTest.php
@@ -5,11 +5,18 @@
  * @link http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
+
+namespace Piwik\Plugins\UsersManager\tests;
+
 use Piwik\Access;
 use Piwik\Plugins\SitesManager\API as APISitesManager;
 use Piwik\Plugins\UsersManager\API;
 use Piwik\Plugins\UsersManager\Model;
 use Piwik\Translate;
+use IntegrationTestCase;
+use FakeAccess;
+use Exception;
+
 
 /**
  * Piwik - free/libre analytics platform
@@ -19,7 +26,7 @@ use Piwik\Translate;
  *
  * @group Plugins
  */
-class Plugins_UsersManagerTest extends IntegrationTestCase
+class UsersManagerTest extends IntegrationTestCase
 {
     /**
      * @var API
diff --git a/plugins/VisitorGenerator b/plugins/VisitorGenerator
index 5d6355fcb38e7b8964d697da3cf9e2d201bf2245..5385c1cf4f30878ddb9bc7f92fda3d1614e97799 160000
--- a/plugins/VisitorGenerator
+++ b/plugins/VisitorGenerator
@@ -1 +1 @@
-Subproject commit 5d6355fcb38e7b8964d697da3cf9e2d201bf2245
+Subproject commit 5385c1cf4f30878ddb9bc7f92fda3d1614e97799
diff --git a/tests/PHPUnit/FakeAccess.php b/tests/PHPUnit/FakeAccess.php
index be97babff04f2b83d0a04274a17ba1b17c38e767..3a7ab32e69e07bb3b9c4539b6e1e4101de0134d0 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
similarity index 100%
rename from tests/PHPUnit/Integration/Core/AccessTest.php
rename to tests/PHPUnit/Integration/AccessTest.php
diff --git a/tests/PHPUnit/Integration/Core/ArchiveProcessingTest.php b/tests/PHPUnit/Integration/ArchiveProcessingTest.php
similarity index 100%
rename from tests/PHPUnit/Integration/Core/ArchiveProcessingTest.php
rename to tests/PHPUnit/Integration/ArchiveProcessingTest.php
diff --git a/tests/PHPUnit/Integration/Core/CliMultiTest.php b/tests/PHPUnit/Integration/CliMultiTest.php
similarity index 100%
rename from tests/PHPUnit/Integration/Core/CliMultiTest.php
rename to tests/PHPUnit/Integration/CliMultiTest.php
diff --git a/tests/PHPUnit/Integration/Core/CronArchive/FixedSiteIdsTest.php b/tests/PHPUnit/Integration/CronArchive/FixedSiteIdsTest.php
similarity index 100%
rename from tests/PHPUnit/Integration/Core/CronArchive/FixedSiteIdsTest.php
rename to tests/PHPUnit/Integration/CronArchive/FixedSiteIdsTest.php
diff --git a/tests/PHPUnit/Integration/Core/CronArchive/SharedSiteIdsTest.php b/tests/PHPUnit/Integration/CronArchive/SharedSiteIdsTest.php
similarity index 100%
rename from tests/PHPUnit/Integration/Core/CronArchive/SharedSiteIdsTest.php
rename to tests/PHPUnit/Integration/CronArchive/SharedSiteIdsTest.php
diff --git a/tests/PHPUnit/Integration/Core/DbTest.php b/tests/PHPUnit/Integration/DbTest.php
similarity index 100%
rename from tests/PHPUnit/Integration/Core/DbTest.php
rename to tests/PHPUnit/Integration/DbTest.php
diff --git a/tests/PHPUnit/Integration/Core/JsProxyTest.php b/tests/PHPUnit/Integration/JsProxyTest.php
similarity index 100%
rename from tests/PHPUnit/Integration/Core/JsProxyTest.php
rename to tests/PHPUnit/Integration/JsProxyTest.php
diff --git a/tests/PHPUnit/Integration/Core/LogTest.php b/tests/PHPUnit/Integration/LogTest.php
similarity index 100%
rename from tests/PHPUnit/Integration/Core/LogTest.php
rename to tests/PHPUnit/Integration/LogTest.php
diff --git a/tests/PHPUnit/Integration/Core/OptionTest.php b/tests/PHPUnit/Integration/OptionTest.php
similarity index 100%
rename from tests/PHPUnit/Integration/Core/OptionTest.php
rename to tests/PHPUnit/Integration/OptionTest.php
diff --git a/tests/PHPUnit/Integration/Core/PiwikTest.php b/tests/PHPUnit/Integration/PiwikTest.php
similarity index 100%
rename from tests/PHPUnit/Integration/Core/PiwikTest.php
rename to tests/PHPUnit/Integration/PiwikTest.php
diff --git a/tests/PHPUnit/Integration/Core/Plugin/SettingsTest.php b/tests/PHPUnit/Integration/Plugin/SettingsTest.php
similarity index 100%
rename from tests/PHPUnit/Integration/Core/Plugin/SettingsTest.php
rename to tests/PHPUnit/Integration/Plugin/SettingsTest.php
diff --git a/tests/PHPUnit/Integration/Core/ReportTest.php b/tests/PHPUnit/Integration/ReportTest.php
similarity index 100%
rename from tests/PHPUnit/Integration/Core/ReportTest.php
rename to tests/PHPUnit/Integration/ReportTest.php
diff --git a/tests/PHPUnit/Integration/Core/SegmentTest.php b/tests/PHPUnit/Integration/SegmentTest.php
similarity index 100%
rename from tests/PHPUnit/Integration/Core/SegmentTest.php
rename to tests/PHPUnit/Integration/SegmentTest.php
diff --git a/tests/PHPUnit/Integration/Core/SqlTest.php b/tests/PHPUnit/Integration/SqlTest.php
similarity index 100%
rename from tests/PHPUnit/Integration/Core/SqlTest.php
rename to tests/PHPUnit/Integration/SqlTest.php
diff --git a/tests/PHPUnit/Integration/Core/Tracker/ActionTest.php b/tests/PHPUnit/Integration/Tracker/ActionTest.php
similarity index 100%
rename from tests/PHPUnit/Integration/Core/Tracker/ActionTest.php
rename to tests/PHPUnit/Integration/Tracker/ActionTest.php
diff --git a/tests/PHPUnit/Integration/Core/Tracker/DbTest.php b/tests/PHPUnit/Integration/Tracker/DbTest.php
similarity index 100%
rename from tests/PHPUnit/Integration/Core/Tracker/DbTest.php
rename to tests/PHPUnit/Integration/Tracker/DbTest.php
diff --git a/tests/PHPUnit/Integration/Core/Tracker/Visit2Test.php b/tests/PHPUnit/Integration/Tracker/Visit2Test.php
similarity index 100%
rename from tests/PHPUnit/Integration/Core/Tracker/Visit2Test.php
rename to tests/PHPUnit/Integration/Tracker/Visit2Test.php
diff --git a/tests/PHPUnit/Integration/Core/Tracker/VisitTest.php b/tests/PHPUnit/Integration/Tracker/VisitTest.php
similarity index 100%
rename from tests/PHPUnit/Integration/Core/Tracker/VisitTest.php
rename to tests/PHPUnit/Integration/Tracker/VisitTest.php
diff --git a/tests/PHPUnit/Integration/Core/TrackerTest.php b/tests/PHPUnit/Integration/TrackerTest.php
similarity index 100%
rename from tests/PHPUnit/Integration/Core/TrackerTest.php
rename to tests/PHPUnit/Integration/TrackerTest.php
diff --git a/tests/PHPUnit/Integration/Core/TravisEnvironmentTest.php b/tests/PHPUnit/Integration/TravisEnvironmentTest.php
similarity index 100%
rename from tests/PHPUnit/Integration/Core/TravisEnvironmentTest.php
rename to tests/PHPUnit/Integration/TravisEnvironmentTest.php
diff --git a/tests/PHPUnit/Integration/Core/UpdaterTest.php b/tests/PHPUnit/Integration/UpdaterTest.php
similarity index 100%
rename from tests/PHPUnit/Integration/Core/UpdaterTest.php
rename to tests/PHPUnit/Integration/UpdaterTest.php
diff --git a/tests/PHPUnit/Integration/Core/ViewDataTable/ManagerTest.php b/tests/PHPUnit/Integration/ViewDataTable/ManagerTest.php
similarity index 100%
rename from tests/PHPUnit/Integration/Core/ViewDataTable/ManagerTest.php
rename to tests/PHPUnit/Integration/ViewDataTable/ManagerTest.php
diff --git a/tests/PHPUnit/Integration/Core/WidgetsListTest.php b/tests/PHPUnit/Integration/WidgetsListTest.php
similarity index 100%
rename from tests/PHPUnit/Integration/Core/WidgetsListTest.php
rename to tests/PHPUnit/Integration/WidgetsListTest.php
diff --git a/tests/PHPUnit/Integration/processed/.gitkeep b/tests/PHPUnit/Integration/processed/.gitkeep
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/tests/PHPUnit/IntegrationTestCase.php b/tests/PHPUnit/IntegrationTestCase.php
index f08c7cfac6d54759d62edbed53ef053a0edbaff0..6d63779e9c730b6f089d450de0daec305bedac3d 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 9d613ae18f46625210c796dae74dcce2f7086530..45cb0c8c04f493f7ced9ceec164f0b3f8c41eb29 100755
--- a/tests/PHPUnit/MockLocationProvider.php
+++ b/tests/PHPUnit/MockLocationProvider.php
@@ -12,7 +12,7 @@ class MockLocationProvider extends LocationProvider
 {
     public static $locations = array();
     private $currentLocation = 0;
-    private $ipToLocations = array();
+    private $ipToLocations   = array();
 
     public function getLocation($info)
     {
@@ -26,7 +26,9 @@ class MockLocationProvider extends LocationProvider
 
             $this->ipToLocations[$ip] = $result;
         }
+
         $this->completeLocationResult($result);
+
         return $result;
     }
 
diff --git a/tests/PHPUnit/Integration/AnnotationsTest.php b/tests/PHPUnit/System/AnnotationsTest.php
similarity index 99%
rename from tests/PHPUnit/Integration/AnnotationsTest.php
rename to tests/PHPUnit/System/AnnotationsTest.php
index 211a0ca2595b37fd25a3c098f66e364a63f564ca..9acf8c7e27bd13b5ceb3421f3cf22fa189077a4a 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
similarity index 99%
rename from tests/PHPUnit/Integration/ApiGetReportMetadataTest.php
rename to tests/PHPUnit/System/ApiGetReportMetadataTest.php
index 086be417c9f59f425a3bfafdd302c041cae1bff3..be86b7f3ab5a7ce019a24cc0f082f99985cd3b38 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
similarity index 97%
rename from tests/PHPUnit/Integration/ApiGetReportMetadataYearTest.php
rename to tests/PHPUnit/System/ApiGetReportMetadataYearTest.php
index 824362ca9595c466a920319a7141364f0e60840c..d3df009834fbedf8d6c141f08cf99e34c890299e 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
similarity index 99%
rename from tests/PHPUnit/Integration/ArchiveCronTest.php
rename to tests/PHPUnit/System/ArchiveCronTest.php
index eefe9fdca933cddcc17b40e22b5dc02a002d87bd..75b7fcb2af39fb313d85a41522b5ac603c56d9b2 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
similarity index 99%
rename from tests/PHPUnit/Integration/ArchiveInvalidationTest.php
rename to tests/PHPUnit/System/ArchiveInvalidationTest.php
index b600aca35546de353197a9c209c7286e663d46fe..6d8d22a2c365a64b9c1b19c921712cad4d0e2ba0 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
similarity index 98%
rename from tests/PHPUnit/Integration/ArchiveWebTest.php
rename to tests/PHPUnit/System/ArchiveWebTest.php
index 6b245d1dc2ecf83e998429e3cb5fc97fb17d27db..53f262df1a5256b652e7ea12c092cb6a9544e610 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
similarity index 99%
rename from tests/PHPUnit/Integration/AutoSuggestAPITest.php
rename to tests/PHPUnit/System/AutoSuggestAPITest.php
index cdb717ef883518ec515156ecf44f2ca9a24a2b06..535e1d4250e4f224e1b1a4d533096dfffd15640c 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
similarity index 99%
rename from tests/PHPUnit/Integration/BackwardsCompatibility1XTest.php
rename to tests/PHPUnit/System/BackwardsCompatibility1XTest.php
index 9c3bf0c9a3828793b60badb770b3d93dbcccf773..5d20fa81a9c390868267779ca9c55e9a82950b18 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
similarity index 99%
rename from tests/PHPUnit/Integration/BlobReportLimitingTest.php
rename to tests/PHPUnit/System/BlobReportLimitingTest.php
index 806b9c3433f1b83aa6d89898be21d64f80886ef2..431709d3cf4f8c703a5b0599d863d923a05a9e6e 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
similarity index 99%
rename from tests/PHPUnit/Integration/CsvExportTest.php
rename to tests/PHPUnit/System/CsvExportTest.php
index bc77b32723904416f2f79bf654140629b724a347..48c9342f8e7a0c276c567be4555983e2c7467f3a 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
similarity index 99%
rename from tests/PHPUnit/Integration/CustomEventsTest.php
rename to tests/PHPUnit/System/CustomEventsTest.php
index 44d1c70611e8eef474c0715062c64988cd771044..b2e92b30a9f2a41dcb629aff8b1f0c12ab77db5e 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
similarity index 99%
rename from tests/PHPUnit/Integration/EcommerceOrderWithItemsTest.php
rename to tests/PHPUnit/System/EcommerceOrderWithItemsTest.php
index bb642d4f7f05fffa4e863cd13b52b173f22d6257..e2ab0ffd44f364bb732ad57b2ebd838f50c4e373 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
similarity index 99%
rename from tests/PHPUnit/Integration/FlattenReportsTest.php
rename to tests/PHPUnit/System/FlattenReportsTest.php
index d045f2d63443d29e675b7b0291bc74e2f9fafa43..e38e10cf7fd3ef38f6e021dd6ff8cd6860654fa8 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
similarity index 99%
rename from tests/PHPUnit/Integration/ImportLogsTest.php
rename to tests/PHPUnit/System/ImportLogsTest.php
index 21a43b235ccd2a0cff47ac0e11ebb1f83daacc67..abf7d6a42a03fd0d6d5cc3c483e14a1bf8b933d2 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
similarity index 99%
rename from tests/PHPUnit/Integration/LabelFilterTest.php
rename to tests/PHPUnit/System/LabelFilterTest.php
index 710c464e3e29318758fd55b9d7677fccc080f601..487e09c07f0698fc66c778564feaaa981e2bb36d 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
similarity index 99%
rename from tests/PHPUnit/Integration/ManyVisitorsOneWebsiteTest.php
rename to tests/PHPUnit/System/ManyVisitorsOneWebsiteTest.php
index fdc23e38c0d1b39a0d49b4a2c9806f3901524928..ec1a0f4f1675ec6ea699b0644706931fd1b93f36 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
similarity index 97%
rename from tests/PHPUnit/Integration/MultipleSitesArchivingTest.php
rename to tests/PHPUnit/System/MultipleSitesArchivingTest.php
index d347dbf0f46ba21e47dbfda3588e6883f33b977a..6d447abb2f886ec1701a53b305727b53427a131f 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
similarity index 97%
rename from tests/PHPUnit/Integration/NoVisitTest.php
rename to tests/PHPUnit/System/NoVisitTest.php
index 14c5f57a4542e2fe43849b8af7b43ab862d144d6..4a817360733a3b3ffbeda3e97859b3bb511c204e 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
similarity index 97%
rename from tests/PHPUnit/Integration/NonUnicodeTest.php
rename to tests/PHPUnit/System/NonUnicodeTest.php
index e7521e0ef0d3fb67fdd8bb20da2e1412df5184e3..370c4acf16a13eb8f44ca566e7b22ed212c77ac0 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
similarity index 97%
rename from tests/PHPUnit/Integration/OneVisitorLongUrlsTruncatedTest.php
rename to tests/PHPUnit/System/OneVisitorLongUrlsTruncatedTest.php
index ad3a7df82b2450dc5c91b9be7111622eba6d3ba2..83a17e0f1188c47832373ba88ffdcb076ed9189c 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
similarity index 97%
rename from tests/PHPUnit/Integration/OneVisitorNoKeywordSpecifiedTest.php
rename to tests/PHPUnit/System/OneVisitorNoKeywordSpecifiedTest.php
index 404d0b7a4d6df7d5d59804f2ebf94b67d38f2fea..4bd244f6635dda2e83df82162b46306529c57038 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
similarity index 99%
rename from tests/PHPUnit/Integration/OneVisitorOneWebsiteSeveralDaysDateRangeArchivingTestsTest.php
rename to tests/PHPUnit/System/OneVisitorOneWebsiteSeveralDaysDateRangeArchivingTestsTest.php
index 531e5b9c35da17b0f370efef802740c4c6ab1cf2..9441f393180014dd515e4651bc5a1e8430584ccf 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
similarity index 99%
rename from tests/PHPUnit/Integration/OneVisitorOneWebsiteSeveralDaysDateRangeTest.php
rename to tests/PHPUnit/System/OneVisitorOneWebsiteSeveralDaysDateRangeTest.php
index f2b68d88e951562cad49c34fcee3227e7940fabd..e744859b7043934eeef385cbabfb6b9bc6f5b29a 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
similarity index 97%
rename from tests/PHPUnit/Integration/OneVisitorSeveralDaysImportedInRandomOrderTest.php
rename to tests/PHPUnit/System/OneVisitorSeveralDaysImportedInRandomOrderTest.php
index 73fccc5de6d3ec61396e6dac67336eeed5432266..9ad8791c4cd8137c2413b616446a8a1440f0dd6b 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
similarity index 99%
rename from tests/PHPUnit/Integration/OneVisitorTwoVisitsTest.php
rename to tests/PHPUnit/System/OneVisitorTwoVisitsTest.php
index 6e5d1b3c96b0cc58ef25927fb50e91da4d624755..6c1b3d69ca83b6e84875d9d9652e359636238e70 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
similarity index 97%
rename from tests/PHPUnit/Integration/OneVisitorTwoVisitsWithCookieSupportTest.php
rename to tests/PHPUnit/System/OneVisitorTwoVisitsWithCookieSupportTest.php
index 9721a786704b8fe5ad5b32d1a7275c9363ef6988..856e10efad8e2c23cf73a56841a169c0accc3dc1 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
similarity index 98%
rename from tests/PHPUnit/Integration/PeriodIsRangeDateIsLastNMetadataAndNormalAPITest.php
rename to tests/PHPUnit/System/PeriodIsRangeDateIsLastNMetadataAndNormalAPITest.php
index b07013ae9dad9eca7d1189dc6ff9d2109f76c465..52739d310b174fc51aa247c5541e3a44ae4d91b3 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
similarity index 99%
rename from tests/PHPUnit/Integration/PivotByQueryParamTest.php
rename to tests/PHPUnit/System/PivotByQueryParamTest.php
index ec320d270561d71c7bec4764cb86c5eb694dda96..358b9b03c0c8a20582242fba5541a400359cd8c9 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
similarity index 99%
rename from tests/PHPUnit/Integration/PrivacyManagerTest.php
rename to tests/PHPUnit/System/PrivacyManagerTest.php
index 55cc3733a04dd6da1099ae53afdf5dc23c21aa65..7ba93e7cd251e1e0c74aa704821f9de505202b2c 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
similarity index 99%
rename from tests/PHPUnit/Integration/PurgeDataTest.php
rename to tests/PHPUnit/System/PurgeDataTest.php
index 816732a2a775c161b87c0c5d6b47f49b67015b77..30bf2244ff6e6a516f39d01fc8e323e97e73b7dc 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
similarity index 99%
rename from tests/PHPUnit/Integration/RowEvolutionTest.php
rename to tests/PHPUnit/System/RowEvolutionTest.php
index 141aa1154c9a766cade14d344f84187d71afb5ae..9eb55e282b1e51d70060d08ce2e63395baefe60a 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
similarity index 98%
rename from tests/PHPUnit/Integration/SiteSearchTest.php
rename to tests/PHPUnit/System/SiteSearchTest.php
index 4637181cca24c9cfa41e954e35bc430d125b42a5..bb5b5c3bb0998506574e685f740ed1d65419e33c 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
similarity index 98%
rename from tests/PHPUnit/Integration/TimezonesTest.php
rename to tests/PHPUnit/System/TimezonesTest.php
index 1dc4e1b19cf777598264942767241d33d5de629f..d9b11c9ae2305062859d84f04cb28e792529f081 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
similarity index 97%
rename from tests/PHPUnit/Integration/TrackCustomVariablesAndCampaignsForceUsingVisitIdNotHeuristicsTest.php
rename to tests/PHPUnit/System/TrackCustomVariablesAndCampaignsForceUsingVisitIdNotHeuristicsTest.php
index 768be87a1ebaf991004ef52e9f763bf5de2c2c96..efb4cf4554d9cc3d107b4883a6d9451a64d2d039 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
similarity index 98%
rename from tests/PHPUnit/Integration/TrackGoalsAllowMultipleConversionsPerVisitTest.php
rename to tests/PHPUnit/System/TrackGoalsAllowMultipleConversionsPerVisitTest.php
index b13cebde75b7a684400c58c42f4786cdd726da36..af2469670bee5d063599740335a9d4dce3b496c2 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
similarity index 97%
rename from tests/PHPUnit/Integration/TrackerWindowLookBackTest.php
rename to tests/PHPUnit/System/TrackerWindowLookBackTest.php
index 97a4ef9e6de58e97614fca14350667f66bf8ae71..433e6baf433580c38c75ae4de4596fc86a40dcfb 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
similarity index 98%
rename from tests/PHPUnit/Integration/TransitionsTest.php
rename to tests/PHPUnit/System/TransitionsTest.php
index c5ece99ab31c271cd85fa102b673c228a2fe68a3..e3ca1c4863e5fb282ac1bdc7f5f29567b6b0ce5c 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
similarity index 99%
rename from tests/PHPUnit/Integration/TwoVisitorsTwoWebsitesDifferentDaysArchivingDisabledTest.php
rename to tests/PHPUnit/System/TwoVisitorsTwoWebsitesDifferentDaysArchivingDisabledTest.php
index a43562a33786f16b279bf6e6792e550e709c50eb..3eb2d2456c95eb3684dd3a447c30dccee75c3225 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
similarity index 99%
rename from tests/PHPUnit/Integration/TwoVisitorsTwoWebsitesDifferentDaysConversionsTest.php
rename to tests/PHPUnit/System/TwoVisitorsTwoWebsitesDifferentDaysConversionsTest.php
index 7fbc8c03bcb521e2b7ba6b06de3e7ffe16c1511e..243e9761c5e7c4ef621c0820ffc314b7b666a468 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
similarity index 99%
rename from tests/PHPUnit/Integration/TwoVisitorsTwoWebsitesDifferentDaysTest.php
rename to tests/PHPUnit/System/TwoVisitorsTwoWebsitesDifferentDaysTest.php
index 35c1069787a277c5e9f7990195828d98c8870cb0..668924b4d89930c2a651cf1c9b1913157193c581 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
similarity index 98%
rename from tests/PHPUnit/Integration/TwoVisitsWithCustomVariablesSegmentContainsTest.php
rename to tests/PHPUnit/System/TwoVisitsWithCustomVariablesSegmentContainsTest.php
index e8373c48e7e6f47f3adf00a52b3e6239a96a1f04..a8bbdcc0926adb072ab480299b104294f3ee9e18 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
similarity index 98%
rename from tests/PHPUnit/Integration/TwoVisitsWithCustomVariablesSegmentMatchALLNoGoalDataTest.php
rename to tests/PHPUnit/System/TwoVisitsWithCustomVariablesSegmentMatchALLNoGoalDataTest.php
index 3856416d152ba439e19b39c3cc29e3ba328730d9..1a16bc627fc3bcd0439151a09c868081e6fa643e 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
similarity index 98%
rename from tests/PHPUnit/Integration/TwoVisitsWithCustomVariablesSegmentMatchNONETest.php
rename to tests/PHPUnit/System/TwoVisitsWithCustomVariablesSegmentMatchNONETest.php
index dd0ce7cf57965337cf0e687ab5671b2d66c57564..27fdbd8167e8355011ac3fae1933ed45c6e84eb8 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
similarity index 99%
rename from tests/PHPUnit/Integration/TwoVisitsWithCustomVariablesSegmentMatchVisitorTypeTest.php
rename to tests/PHPUnit/System/TwoVisitsWithCustomVariablesSegmentMatchVisitorTypeTest.php
index 8502bb3795bfaee8d74f29108b64d3a73b8d33ba..5f1db6060274b3393ee341c86f6795788c7e3b1d 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
similarity index 98%
rename from tests/PHPUnit/Integration/TwoVisitsWithCustomVariablesTest.php
rename to tests/PHPUnit/System/TwoVisitsWithCustomVariablesTest.php
index c41ac7918a4aed70a35fb511362a0713923aa441..a7b65b18fba2a1726150c4ec6659633455909606 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
similarity index 99%
rename from tests/PHPUnit/Integration/UrlNormalizationTest.php
rename to tests/PHPUnit/System/UrlNormalizationTest.php
index d57ad9c2a51df5b393f226fb80cbea6c14ceda0a..07011200ee23f3b1865d003002e0e21363bb62d3 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
similarity index 99%
rename from tests/PHPUnit/Integration/UserIdAndVisitorIdTest.php
rename to tests/PHPUnit/System/UserIdAndVisitorIdTest.php
index 1bfa1d67dffac0e6d8cd79808cd8fd779c4347e3..ca5b2475a914b23a7f95a9b044aef5d50a5c7262 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
similarity index 99%
rename from tests/PHPUnit/Integration/VisitsInPastInvalidateOldReportsTest.php
rename to tests/PHPUnit/System/VisitsInPastInvalidateOldReportsTest.php
index 73af6c15c53f4c161df5dfeeb656f3a26dea4302..35f9b8ab57c946eb1a683c8413b6f06de98844f9 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/.gitkeep
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ArchiveCronTest_archive_php_cron_output.txt
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ArchiveCronTest_noOptions__VisitsSummary.get_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ArchiveCronTest_noOptions__VisitsSummary.get_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ArchiveCronTest_noOptions__VisitsSummary.get_week.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ArchiveCronTest_noOptions__VisitsSummary.get_year.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ArchiveCronTest_nonPreArchivedSegment_noOptions__VisitsSummary.get_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ArchiveCronTest_nonPreArchivedSegment_noOptions__VisitsSummary.get_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ArchiveCronTest_nonPreArchivedSegment_noOptions__VisitsSummary.get_week.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ArchiveCronTest_nonPreArchivedSegment_noOptions__VisitsSummary.get_year.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__Live.getLastVisitsDetails_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__Live.getLastVisitsDetails_year.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__VisitsSummary.get_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__VisitsSummary.get_year.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ArchiveCronTest_segmentNoAutoArchive_noOptions__VisitsSummary.get_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ArchiveCronTest_segmentNoAutoArchive_noOptions__VisitsSummary.get_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ArchiveCronTest_segmentNoAutoArchive_noOptions__VisitsSummary.get_week.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ArchiveCronTest_segmentNoAutoArchive_noOptions__VisitsSummary.get_year.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ArchiveCronTest_segmentOnlyOneSite_noOptions__VisitsSummary.get_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ArchiveCronTest_segmentOnlyOneSite_noOptions__VisitsSummary.get_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ArchiveCronTest_segmentOnlyOneSite_noOptions__VisitsSummary.get_week.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ArchiveCronTest_segmentOnlyOneSite_noOptions__VisitsSummary.get_year.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_Archive_InvalidationWebsite1_NewDataShouldAppear__Actions.getPageUrls_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_Archive_InvalidationWebsite1_NewDataShouldAppear__VisitsSummary.get_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_Archive_InvalidationWebsite1_NewDataShouldNotAppear__Actions.getPageUrls_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_Archive_InvalidationWebsite1_NewDataShouldNotAppear__VisitsSummary.get_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_Archive_InvalidationWebsite2NewDataShouldNotAppear_BecauseWeekWasNotInvalidated__Actions.getPageUrls_week.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_Archive_InvalidationWebsite2NewDataShouldNotAppear_BecauseWeekWasNotInvalidated__VisitsSummary.get_week.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_Archive_InvalidationWebsite2_NewDataShouldAppear__Actions.getPageUrls_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_Archive_InvalidationWebsite2_NewDataShouldAppear__VisitsSummary.get_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_Archive_InvalidationWebsite2_NewDataShouldNotAppear_BecauseWeekWasNotInvalidated__Actions.getPageUrls_week.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_Archive_InvalidationWebsite2_NewDataShouldNotAppear_BecauseWeekWasNotInvalidated__VisitsSummary.get_week.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_Archive_InvalidationWebsite2_NewDataShouldNotAppear__Actions.getPageUrls_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_Archive_InvalidationWebsite2_NewDataShouldNotAppear__VisitsSummary.get_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_actions__API.getSuggestedValuesForSegment.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_actions__VisitsSummary.get_range.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_browserCode__API.getSuggestedValuesForSegment.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_browserCode__VisitsSummary.get_range.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_browserVersion__API.getSuggestedValuesForSegment.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_browserVersion__VisitsSummary.get_range.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_city__API.getSuggestedValuesForSegment.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_city__VisitsSummary.get_range.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_contentInteraction__API.getSuggestedValuesForSegment.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_contentName__API.getSuggestedValuesForSegment.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_contentPiece__API.getSuggestedValuesForSegment.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_contentTarget__API.getSuggestedValuesForSegment.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_continentCode__API.getSuggestedValuesForSegment.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_continentCode__VisitsSummary.get_range.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_countryCode__API.getSuggestedValuesForSegment.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_countryCode__VisitsSummary.get_range.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_customVariableName1__API.getSuggestedValuesForSegment.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_customVariableName1__VisitsSummary.get_range.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_customVariableName2__API.getSuggestedValuesForSegment.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_customVariableName3__API.getSuggestedValuesForSegment.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_customVariableName4__API.getSuggestedValuesForSegment.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_customVariableName5__API.getSuggestedValuesForSegment.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_customVariableName5__VisitsSummary.get_range.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_customVariablePageName1__API.getSuggestedValuesForSegment.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_customVariablePageName2__API.getSuggestedValuesForSegment.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_customVariablePageName2__VisitsSummary.get_range.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_customVariablePageName3__API.getSuggestedValuesForSegment.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_customVariablePageName4__API.getSuggestedValuesForSegment.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_customVariablePageName4__VisitsSummary.get_range.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_customVariablePageName5__API.getSuggestedValuesForSegment.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_customVariablePageName5__VisitsSummary.get_range.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_customVariablePageValue1__API.getSuggestedValuesForSegment.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_customVariablePageValue2__API.getSuggestedValuesForSegment.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_customVariablePageValue2__VisitsSummary.get_range.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_customVariablePageValue3__API.getSuggestedValuesForSegment.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_customVariablePageValue4__API.getSuggestedValuesForSegment.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_customVariablePageValue4__VisitsSummary.get_range.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_customVariablePageValue5__API.getSuggestedValuesForSegment.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_customVariablePageValue5__VisitsSummary.get_range.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_customVariableValue1__API.getSuggestedValuesForSegment.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_customVariableValue1__VisitsSummary.get_range.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_customVariableValue2__API.getSuggestedValuesForSegment.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_customVariableValue3__API.getSuggestedValuesForSegment.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_customVariableValue4__API.getSuggestedValuesForSegment.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_customVariableValue5__API.getSuggestedValuesForSegment.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_customVariableValue5__VisitsSummary.get_range.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_daysSinceFirstVisit__API.getSuggestedValuesForSegment.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_daysSinceFirstVisit__VisitsSummary.get_range.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_daysSinceLastEcommerceOrder__API.getSuggestedValuesForSegment.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_daysSinceLastEcommerceOrder__VisitsSummary.get_range.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_daysSinceLastVisit__API.getSuggestedValuesForSegment.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_daysSinceLastVisit__VisitsSummary.get_range.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_deviceType__API.getSuggestedValuesForSegment.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_deviceType__VisitsSummary.get_range.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_entryPageTitle__API.getSuggestedValuesForSegment.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_entryPageTitle__VisitsSummary.get_range.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_entryPageUrl__API.getSuggestedValuesForSegment.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_entryPageUrl__VisitsSummary.get_range.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_eventAction__API.getSuggestedValuesForSegment.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_eventAction__VisitsSummary.get_range.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_eventCategory__API.getSuggestedValuesForSegment.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_eventCategory__VisitsSummary.get_range.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_eventName__API.getSuggestedValuesForSegment.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_eventName__VisitsSummary.get_range.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_events__API.getSuggestedValuesForSegment.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_events__VisitsSummary.get_range.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_exitPageTitle__API.getSuggestedValuesForSegment.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_exitPageTitle__VisitsSummary.get_range.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_exitPageUrl__API.getSuggestedValuesForSegment.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_exitPageUrl__VisitsSummary.get_range.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_latitude__API.getSuggestedValuesForSegment.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_latitude__VisitsSummary.get_range.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_longitude__API.getSuggestedValuesForSegment.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_longitude__VisitsSummary.get_range.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_operatingSystemCode__API.getSuggestedValuesForSegment.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_operatingSystemCode__VisitsSummary.get_range.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_pageTitle__API.getSuggestedValuesForSegment.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_pageTitle__VisitsSummary.get_range.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_pageUrl__API.getSuggestedValuesForSegment.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_pageUrl__VisitsSummary.get_range.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_provider__API.getSuggestedValuesForSegment.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_provider__VisitsSummary.get_range.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_referrerKeyword__API.getSuggestedValuesForSegment.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_referrerKeyword__VisitsSummary.get_range.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_referrerName__API.getSuggestedValuesForSegment.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_referrerName__VisitsSummary.get_range.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_referrerType__API.getSuggestedValuesForSegment.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_referrerType__VisitsSummary.get_range.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_referrerUrl__API.getSuggestedValuesForSegment.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_referrerUrl__VisitsSummary.get_range.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_regionCode__API.getSuggestedValuesForSegment.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_regionCode__VisitsSummary.get_range.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_resolution__API.getSuggestedValuesForSegment.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_resolution__VisitsSummary.get_range.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_searches__API.getSuggestedValuesForSegment.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_searches__VisitsSummary.get_range.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_siteSearchKeyword__API.getSuggestedValuesForSegment.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_siteSearchKeyword__VisitsSummary.get_range.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_userId__API.getSuggestedValuesForSegment.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_userId__VisitsSummary.get_range.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_visitConvertedGoalId__API.getSuggestedValuesForSegment.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_visitConvertedGoalId__VisitsSummary.get_range.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_visitConverted__API.getSuggestedValuesForSegment.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_visitConverted__VisitsSummary.get_range.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_visitCount__API.getSuggestedValuesForSegment.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_visitCount__VisitsSummary.get_range.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_visitDuration__API.getSuggestedValuesForSegment.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_visitDuration__VisitsSummary.get_range.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_visitEcommerceStatus__API.getSuggestedValuesForSegment.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_visitEcommerceStatus__VisitsSummary.get_range.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_visitId__API.getSuggestedValuesForSegment.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_visitIp__API.getSuggestedValuesForSegment.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_visitIp__VisitsSummary.get_range.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_visitLocalHour__API.getSuggestedValuesForSegment.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_visitLocalHour__VisitsSummary.get_range.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_visitServerHour__API.getSuggestedValuesForSegment.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_visitServerHour__VisitsSummary.get_range.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_visitorId__API.getSuggestedValuesForSegment.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_visitorId__VisitsSummary.get_range.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_visitorType__API.getSuggestedValuesForSegment.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_visitorType__VisitsSummary.get_range.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_BackwardsCompatibility1XTest__VisitFrequency.get_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_BackwardsCompatibility1XTest__VisitFrequency.get_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_BackwardsCompatibility1XTest__VisitFrequency.get_range.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_BackwardsCompatibility1XTest__VisitFrequency.get_week.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_BackwardsCompatibility1XTest__VisitFrequency.get_year.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_BackwardsCompatibility1XTest_multipleDates__VisitFrequency.get_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_BackwardsCompatibility1XTest_multipleOldNew__VisitFrequency.get_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_CustomEvents_Actions.getPageUrls_lastN__API.getProcessedReport_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_CustomEvents_Events.getAction_lastN__API.getProcessedReport_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_CustomEvents_Events.getCategory_lastN__API.getProcessedReport_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_CustomEvents_Events.getName_lastN__API.getProcessedReport_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_CustomEvents__Actions.getPageUrls_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_CustomEvents__Actions.getPageUrls_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_CustomEvents__Actions.get_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_CustomEvents__Actions.get_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_CustomEvents__Events.getAction_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_CustomEvents__Events.getAction_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_CustomEvents__Events.getCategory_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_CustomEvents__Events.getCategory_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_CustomEvents__Events.getName_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_CustomEvents__Events.getName_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_CustomEvents__Live.getLastVisitsDetails_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_CustomEvents__Live.getLastVisitsDetails_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_CustomEvents_eventCategoryOrNameMatch__Actions.getPageUrls_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_CustomEvents_eventCategoryOrNameMatch__Events.getAction_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_CustomEvents_eventCategoryOrNameMatch__Events.getCategory_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_CustomEvents_eventCategoryOrNameMatch__Events.getName_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_CustomEvents_secondaryDimensionIsEventAction__Events.getAction_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_CustomEvents_secondaryDimensionIsEventAction__Events.getAction_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_CustomEvents_secondaryDimensionIsEventAction__Events.getCategory_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_CustomEvents_secondaryDimensionIsEventAction__Events.getCategory_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_CustomEvents_secondaryDimensionIsEventAction__Events.getName_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_CustomEvents_secondaryDimensionIsEventAction__Events.getName_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_CustomEvents_secondaryDimensionIsEventCategory__Events.getAction_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_CustomEvents_secondaryDimensionIsEventCategory__Events.getAction_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_CustomEvents_secondaryDimensionIsEventCategory__Events.getCategory_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_CustomEvents_secondaryDimensionIsEventCategory__Events.getCategory_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_CustomEvents_secondaryDimensionIsEventCategory__Events.getName_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_CustomEvents_secondaryDimensionIsEventCategory__Events.getName_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_CustomEvents_secondaryDimensionIsEventName__Events.getAction_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_CustomEvents_secondaryDimensionIsEventName__Events.getAction_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_CustomEvents_secondaryDimensionIsEventName__Events.getCategory_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_CustomEvents_secondaryDimensionIsEventName__Events.getCategory_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_CustomEvents_secondaryDimensionIsEventName__Events.getName_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_CustomEvents_secondaryDimensionIsEventName__Events.getName_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_CustomEvents_segmentMatchesEventActionPlay__Actions.getPageUrls_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_CustomEvents_segmentMatchesEventActionPlay__Events.getAction_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_CustomEvents_segmentMatchesEventActionPlay__Events.getCategory_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_CustomEvents_segmentMatchesEventActionPlay__Events.getName_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_FlattenReports__Actions.getPageUrls_week.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_FlattenReports__CustomVariables.getCustomVariables_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_FlattenReports__Referrers.getWebsites_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_FlattenReports_expandedSubtable__Actions.getPageUrls_week.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_FlattenReports_expandedWithDepth__Actions.getPageUrls_week.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_FlattenReports_flatFilterPatternRecursive__Actions.getPageUrls_week.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_FlattenReports_withAggregate__Actions.getPageUrls_week.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getDownload_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getDownload_range.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getDownloads_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getDownloads_range.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getEntryPageTitles_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getEntryPageTitles_range.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getEntryPageUrls_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getEntryPageUrls_range.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getExitPageTitles_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getExitPageTitles_range.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getExitPageUrls_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getExitPageUrls_range.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getOutlink_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getOutlink_range.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getOutlinks_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getOutlinks_range.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getPageTitle_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getPageTitle_range.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getPageTitlesFollowingSiteSearch_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getPageTitlesFollowingSiteSearch_range.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getPageTitles_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getPageTitles_range.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getPageUrl_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getPageUrl_range.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getPageUrlsFollowingSiteSearch_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getPageUrlsFollowingSiteSearch_range.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getPageUrls_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getPageUrls_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getPageUrls_range.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getSiteSearchCategories_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getSiteSearchCategories_range.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getSiteSearchKeywords_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getSiteSearchKeywords_range.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getSiteSearchNoResultKeywords_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getSiteSearchNoResultKeywords_range.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.get_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.get_range.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ImportLogs__Contents.getContentNames_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ImportLogs__Contents.getContentPieces_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ImportLogs__CustomVariables.getCustomVariables_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getBrand_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getBrowserFamilies_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getBrowserVersions_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getModel_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getOsFamilies_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getOsVersions_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getType_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ImportLogs__Events.getAction_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ImportLogs__Events.getCategory_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ImportLogs__Events.getName_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ImportLogs__ExamplePlugin.getAnswerToLife.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ImportLogs__ExamplePlugin.getExampleReport_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ImportLogs__Goals.getDaysToConversion_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ImportLogs__Goals.getGoals.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ImportLogs__Goals.getItemsCategory_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ImportLogs__Goals.getItemsName_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ImportLogs__Goals.getItemsSku_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ImportLogs__Goals.getVisitsUntilConversion_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ImportLogs__Goals.get_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ImportLogs__MultiSites.getAll_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ImportLogs__MultiSites.getOne_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ImportLogs__Provider.getProvider_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ImportLogs__Referrers.getAll_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ImportLogs__Referrers.getCampaigns_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ImportLogs__Referrers.getKeywordsForPageUrl_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ImportLogs__Referrers.getKeywords_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ImportLogs__Referrers.getNumberOfDistinctCampaigns_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ImportLogs__Referrers.getNumberOfDistinctKeywords_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ImportLogs__Referrers.getNumberOfDistinctSearchEngines_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ImportLogs__Referrers.getNumberOfDistinctWebsitesUrls_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ImportLogs__Referrers.getNumberOfDistinctWebsites_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ImportLogs__Referrers.getReferrerType_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ImportLogs__Referrers.getSearchEngines_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ImportLogs__Referrers.getSocials_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ImportLogs__Referrers.getUrlsForSocial_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ImportLogs__Referrers.getWebsites_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ImportLogs__UserCountry.getCity_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ImportLogs__UserCountry.getContinent_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ImportLogs__UserCountry.getCountry_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ImportLogs__UserCountry.getNumberOfDistinctCountries_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ImportLogs__UserCountry.getRegion_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getBrowserType_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getBrowserVersion_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getBrowser_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getConfiguration_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getLanguageCode_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getLanguage_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getMobileVsDesktop_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getOSFamily_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getOS_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getPlugin_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getResolution_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getWideScreen_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ImportLogs__VisitFrequency.get_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ImportLogs__VisitFrequency.get_range.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ImportLogs__VisitTime.getByDayOfWeek_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ImportLogs__VisitTime.getVisitInformationPerLocalTime_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ImportLogs__VisitTime.getVisitInformationPerServerTime_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByDaysSinceLast_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByDaysSinceLast_range.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByVisitCount_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByVisitCount_range.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerPage_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerPage_range.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerVisitDuration_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerVisitDuration_range.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ImportLogs__VisitsSummary.getActions_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ImportLogs__VisitsSummary.getBounceCount_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ImportLogs__VisitsSummary.getMaxActions_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ImportLogs__VisitsSummary.getSumVisitsLengthPretty_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ImportLogs__VisitsSummary.getSumVisitsLength_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ImportLogs__VisitsSummary.getUniqueVisitors_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ImportLogs__VisitsSummary.getUsers_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ImportLogs__VisitsSummary.getVisitsConverted_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ImportLogs__VisitsSummary.getVisits_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ImportLogs__VisitsSummary.get_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ImportLogs_siteIdTwo_TrackedUsingLogReplay__VisitsSummary.get_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ImportLogs_withEnhancedAndLast7__MultiSites.getAll_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_LabelFilter_0__Actions.getPageUrls_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_LabelFilter_dir2sub0filephp__Actions.getPageUrls_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_LabelFilter_dir__Actions.getPageUrls_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_LabelFilter_dir_range__Actions.getPageUrls_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_LabelFilter_dirfilephpfoobarfoo2bar__Actions.getPageUrls_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_LabelFilter_dirnonExistent__Actions.getPageUrls_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_LabelFilter_keywords_html__Referrers.getSearchEngines_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_LabelFilter_shouldBeNoData__Actions.getPageUrls_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_LabelFilter_terminalOperator_selectBranch__Actions.getPageTitles_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_LabelFilter_terminalOperator_selectTerminal__Actions.getPageTitles_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_LabelFilter_terminalOperator_selectTerminal__Actions.getPageUrls_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_LabelFilter_thisiscool__Actions.getPageUrls_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_LabelFilter_titlesRecursive__Actions.getPageTitles_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_LabelFilter_titles__Actions.getPageTitles_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortAsc__Live.getLastVisitsDetails_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisitAsc__Live.getLastVisitsDetails_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisit__Live.getLastVisitsDetails_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByVisitCount__Live.getLastVisitsDetails_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortDesc__Live.getLastVisitsDetails_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest__Live.getLastVisitsDetails_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getCity_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getContinent_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getCountry_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getLocationFromIP.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getNumberOfDistinctCountries_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getRegion_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_city__UserCountry.getCity_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_city__UserCountry.getContinent_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_city__UserCountry.getCountry_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_city__UserCountry.getNumberOfDistinctCountries_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_city__UserCountry.getRegion_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_continent__UserCountry.getCountry_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getCity_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getContinent_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getCountry_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getNumberOfDistinctCountries_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getRegion_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getCity_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getContinent_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getCountry_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getNumberOfDistinctCountries_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getRegion_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_sortByProcessedMetric__API.getProcessedReport_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_sortByProcessedMetric_constantRowsCountShouldKeepEmptyRows__API.getProcessedReport_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_MultipleSitesArchivingTest_sitesGroup__VisitsSummary.get_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_MultipleSitesArchivingTest_sitesGroup__VisitsSummary.get_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_NonUnicode__Actions.getPageTitles_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_NonUnicode__Actions.getPageUrls_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_NonUnicode__Actions.getSiteSearchKeywords_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_NonUnicode__Referrers.getWebsites_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__Actions.getDownload_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__Actions.getDownloads_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__Actions.getEntryPageTitles_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__Actions.getEntryPageUrls_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__Actions.getExitPageTitles_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__Actions.getExitPageUrls_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__Actions.getOutlink_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__Actions.getOutlinks_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__Actions.getPageTitle_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__Actions.getPageTitlesFollowingSiteSearch_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__Actions.getPageTitles_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__Actions.getPageUrl_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__Actions.getPageUrlsFollowingSiteSearch_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__Actions.getPageUrls_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__Actions.getSiteSearchCategories_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__Actions.getSiteSearchKeywords_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__Actions.getSiteSearchNoResultKeywords_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__Actions.get_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__Contents.getContentNames_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__Contents.getContentPieces_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__CoreAdminHome.getKnownSegmentsToArchive.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__CoreAdminHome.getWebsiteIdsToInvalidate.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__CustomVariables.getCustomVariables_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__CustomVariables.getReservedCustomVariableKeys.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrand_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrowserFamilies_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrowserVersions_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__DevicesDetection.getModel_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__DevicesDetection.getOsFamilies_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__DevicesDetection.getOsVersions_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__DevicesDetection.getType_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__Events.getAction_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__Events.getCategory_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__Events.getName_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__ExamplePlugin.getAnswerToLife.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__ExamplePlugin.getExampleReport_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__Goals.getConversionRate_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__Goals.getConversions_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__Goals.getDaysToConversion_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__Goals.getGoals.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__Goals.getItemsCategory_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__Goals.getItemsName_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__Goals.getItemsSku_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__Goals.getNbVisitsConverted_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__Goals.getRevenue_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__Goals.getVisitsUntilConversion_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__Goals.get_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__MultiSites.getAll_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__MultiSites.getOne_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__Provider.getProvider_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__Referrers.getAll_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__Referrers.getCampaigns_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__Referrers.getCleanKeyword.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__Referrers.getKeywordNotDefinedString.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__Referrers.getKeywordsForPageUrl_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__Referrers.getKeywords_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__Referrers.getNumberOfDistinctCampaigns_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__Referrers.getNumberOfDistinctKeywords_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__Referrers.getNumberOfDistinctSearchEngines_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__Referrers.getNumberOfDistinctWebsitesUrls_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__Referrers.getNumberOfDistinctWebsites_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__Referrers.getReferrerType_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__Referrers.getSearchEngines_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__Referrers.getSocials_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__Referrers.getUrlsForSocial_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__Referrers.getWebsites_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__UserCountry.getCity_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__UserCountry.getContinent_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__UserCountry.getCountry_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__UserCountry.getNumberOfDistinctCountries_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__UserCountry.getRegion_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__UserSettings.getBrowserType_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__UserSettings.getBrowserVersion_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__UserSettings.getBrowser_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__UserSettings.getConfiguration_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__UserSettings.getLanguageCode_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__UserSettings.getLanguage_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__UserSettings.getMobileVsDesktop_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__UserSettings.getOSFamily_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__UserSettings.getOS_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__UserSettings.getPlugin_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__UserSettings.getResolution_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__UserSettings.getWideScreen_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__VisitFrequency.get_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__VisitTime.getByDayOfWeek_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__VisitTime.getVisitInformationPerLocalTime_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__VisitTime.getVisitInformationPerServerTime_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__VisitorInterest.getNumberOfVisitsByDaysSinceLast_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__VisitorInterest.getNumberOfVisitsByVisitCount_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__VisitorInterest.getNumberOfVisitsPerPage_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__VisitorInterest.getNumberOfVisitsPerVisitDuration_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__VisitsSummary.getActions_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__VisitsSummary.getBounceCount_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__VisitsSummary.getColumns_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__VisitsSummary.getMaxActions_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__VisitsSummary.getSumVisitsLengthPretty_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__VisitsSummary.getSumVisitsLength_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__VisitsSummary.getUniqueVisitors_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__VisitsSummary.getUsers_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__VisitsSummary.getVisitsConverted_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__VisitsSummary.getVisits_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__VisitsSummary.get_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__subtable__API.getProcessedReport_week.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_bulk_json__API.getBulkRequest.json
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_bulk_xml__API.getBulkRequest.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_csv__API.get_month.csv
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_hideAllColumns___VisitsSummary.get_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_hideColumns___API.getProcessedReport_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_hideColumns___Actions.getPageTitles_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_hideColumns___VisitsSummary.get_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_showColumnsWithProcessedMetrics___API.getProcessedReport_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_showColumns__API.get_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_showColumns___API.getProcessedReport_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_showColumns___VisitsSummary.get_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_showColumns_onlyOne__API.getProcessedReport_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getDownload_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getDownloads_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getEntryPageTitles_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getEntryPageUrls_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getExitPageTitles_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getExitPageUrls_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getOutlink_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getOutlinks_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getPageTitle_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getPageTitlesFollowingSiteSearch_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getPageTitles_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getPageUrl_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getPageUrlsFollowingSiteSearch_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getPageUrls_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getSiteSearchCategories_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getSiteSearchKeywords_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getSiteSearchNoResultKeywords_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.get_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__CustomVariables.getCustomVariables_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Goals.getDaysToConversion_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Goals.getGoals.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Goals.getItemsCategory_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Goals.getItemsName_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Goals.getItemsSku_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Goals.getVisitsUntilConversion_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Goals.get_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Live.getLastVisitsDetails_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Provider.getProvider_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getAll_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getCampaigns_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getKeywordsForPageUrl_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getKeywords_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getNumberOfDistinctCampaigns_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getNumberOfDistinctKeywords_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getNumberOfDistinctSearchEngines_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getNumberOfDistinctWebsitesUrls_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getNumberOfDistinctWebsites_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getReferrerType_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getSearchEngines_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getSocials_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getUrlsForSocial_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getWebsites_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserCountry.getCity_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserCountry.getContinent_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserCountry.getCountry_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserCountry.getNumberOfDistinctCountries_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserCountry.getRegion_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getBrowserType_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getBrowserVersion_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getBrowser_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getConfiguration_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getLanguageCode_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getLanguage_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getMobileVsDesktop_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getOSFamily_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getOS_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getPlugin_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getResolution_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getWideScreen_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitFrequency.get_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitTime.getByDayOfWeek_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitTime.getVisitInformationPerLocalTime_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitTime.getVisitInformationPerServerTime_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitorInterest.getNumberOfVisitsByDaysSinceLast_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitorInterest.getNumberOfVisitsByVisitCount_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitorInterest.getNumberOfVisitsPerPage_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitorInterest.getNumberOfVisitsPerVisitDuration_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitsSummary.getActions_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitsSummary.getBounceCount_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitsSummary.getMaxActions_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitsSummary.getSumVisitsLengthPretty_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitsSummary.getSumVisitsLength_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitsSummary.getUniqueVisitors_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitsSummary.getUsers_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitsSummary.getVisitsConverted_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitsSummary.getVisits_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitsSummary.get_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_OneVisitor_LongUrlsTruncated__Actions.getPageUrls_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_OneVisitor_LongUrlsTruncated__Referrers.getKeywords_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_OneVisitor_LongUrlsTruncated__UserSettings.getPlugin_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_OneVisitor_NoKeywordSpecified__Live.getLastVisitsDetails_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_OneVisitor_NoKeywordSpecified__Referrers.getKeywords_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_OneVisitor_SeveralDays_ImportedInRandomOrderTest_shouldShowOneVisit_InEachOfThreeDays__Live.getLastVisitsDetails_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_PivotByQueryParamTest_test_PivotByParam_PlaysNiceWithDataTableMaps__Referrers.getKeywords_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_PivotByQueryParamTest_test_PivotByParam_PlaysNiceWithOtherQueryParams__Referrers.getKeywords_week.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_PivotByQueryParamTest_test_PivotByParam_WorksWithColumnLimiting__Referrers.getKeywords_week.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_PivotByQueryParamTest_test_PivotByParam_WorksWithCsvOutput__Referrers.getKeywords_week.csv
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_PivotByQueryParamTest_test_PivotByParam_WorksWithJsonOutput__Referrers.getKeywords_week.json
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_PivotByQueryParamTest_test_PivotByParam_WorksWithReportWhoseSubtableIsSelf__Actions.getPageUrls_week.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_PivotByQueryParamTest_test_PivotBySegment_CreatesCorrectPivotTable_WhenSegmentUsedInRequest__Referrers.getKeywords_week.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_PivotByQueryParamTest_test_PivotBySegment_CreatesCorrectPivotTable__Referrers.getKeywords_week.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_PivotByQueryParamTest_test_PivotBySubtableDimension_CreatesCorrectPivotTable__Referrers.getKeywords_week.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_PivotByQueryParamTest_test_PivotBySubtableDimension_WhenEntireHirearchyIsNotLoaded__Referrers.getKeywords_week.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_PiwikTracker_trackForceUsingVisitId_insteadOfHeuristics_alsoTestsCampaignTracking__Referrers.getCampaigns_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_PiwikTracker_trackForceUsingVisitId_insteadOfHeuristics_alsoTestsCampaignTracking__Referrers.getWebsites_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_PiwikTracker_trackForceUsingVisitId_insteadOfHeuristics_alsoTestsCampaignTracking__VisitsSummary.get_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_RowEvolution_LabelReservedCharactersHierarchical__API.getRowEvolution_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_RowEvolution_LabelReservedCharacters__API.getRowEvolution_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_RowEvolution_entryPageTitles__API.getRowEvolution_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_RowEvolution_flatFilters__Referrers.getSearchEngines_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_RowEvolution_goals_visitsUntilConversion_WithoutLabels__API.getRowEvolution_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_RowEvolution_goals_visitsUntilConversion__API.getRowEvolution_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_RowEvolution_mobileDesktop__API.getRowEvolution_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_RowEvolution_multiWithFilterLimit__API.getRowEvolution_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_RowEvolution_multiWithNoData__API.getRowEvolution_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_RowEvolution_multipleDates_lastNoData__API.getRowEvolution_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_RowEvolution_pageTitlesMulti__API.getRowEvolution_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_RowEvolution_pageTitlesMulti__API.getRowEvolution_week.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_RowEvolution_pageTitles__API.getRowEvolution_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_RowEvolution_pageTitles__API.getRowEvolution_week.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_RowEvolution_pageUrls__API.getRowEvolution_range.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_RowEvolution_processedRowLabel__API.getRowEvolution_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_RowEvolution_referrer1__API.getRowEvolution_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_RowEvolution_referrer2__API.getRowEvolution_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_RowEvolution_referrerMulti1__API.getRowEvolution_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_SiteSearch_Actions.getPageTitlesFollowingSiteSearch_firstSite_lastN__API.getProcessedReport_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_SiteSearch_Actions.getPageTitlesFollowingSiteSearch_firstSite_lastN__API.getProcessedReport_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_SiteSearch_Actions.getPageTitles_firstSite_lastN__API.getProcessedReport_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_SiteSearch_Actions.getPageTitles_firstSite_lastN__API.getProcessedReport_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_SiteSearch_Actions.getPageUrlsFollowingSiteSearch_firstSite_lastN__API.getProcessedReport_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_SiteSearch_Actions.getPageUrlsFollowingSiteSearch_firstSite_lastN__API.getProcessedReport_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_SiteSearch_Actions.getPageUrls_firstSite_lastN__API.getProcessedReport_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_SiteSearch_Actions.getPageUrls_firstSite_lastN__API.getProcessedReport_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_SiteSearch_Actions.getSiteSearchCategories_firstSite_lastN__API.getProcessedReport_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_SiteSearch_Actions.getSiteSearchCategories_firstSite_lastN__API.getProcessedReport_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_SiteSearch_Actions.getSiteSearchKeywords_firstSite_lastN__API.getProcessedReport_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_SiteSearch_Actions.getSiteSearchKeywords_firstSite_lastN__API.getProcessedReport_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_SiteSearch_Actions.getSiteSearchNoResultKeywords_firstSite_lastN__API.getProcessedReport_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_SiteSearch_Actions.getSiteSearchNoResultKeywords_firstSite_lastN__API.getProcessedReport_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_SiteSearch_Actions.get_firstSite_lastN__API.getProcessedReport_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_SiteSearch_Actions.get_firstSite_lastN__API.getProcessedReport_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_SiteSearch_AllSites__Actions.getPageTitlesFollowingSiteSearch_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_SiteSearch_AllSites__Actions.getPageTitlesFollowingSiteSearch_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_SiteSearch_AllSites__Actions.getPageTitles_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_SiteSearch_AllSites__Actions.getPageTitles_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_SiteSearch_AllSites__Actions.getPageUrlsFollowingSiteSearch_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_SiteSearch_AllSites__Actions.getPageUrlsFollowingSiteSearch_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_SiteSearch_AllSites__Actions.getPageUrls_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_SiteSearch_AllSites__Actions.getPageUrls_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_SiteSearch_AllSites__Actions.getSiteSearchCategories_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_SiteSearch_AllSites__Actions.getSiteSearchCategories_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_SiteSearch_AllSites__Actions.getSiteSearchKeywords_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_SiteSearch_AllSites__Actions.getSiteSearchKeywords_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_SiteSearch_AllSites__Actions.getSiteSearchNoResultKeywords_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_SiteSearch_AllSites__Actions.getSiteSearchNoResultKeywords_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_SiteSearch_AllSites__Actions.get_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_SiteSearch_AllSites__Actions.get_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_SiteSearch_AllSites__CustomVariables.getCustomVariables_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_SiteSearch_AllSites__CustomVariables.getCustomVariables_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_SiteSearch_CustomVariables.getCustomVariables_firstSite_lastN__API.getProcessedReport_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_SiteSearch_CustomVariables.getCustomVariables_firstSite_lastN__API.getProcessedReport_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageTitlesFollowingSiteSearch_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageTitlesFollowingSiteSearch_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageTitles_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageTitles_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageUrlsFollowingSiteSearch_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageUrlsFollowingSiteSearch_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageUrls_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageUrls_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_SiteSearch_NotLastNPeriods__Actions.getSiteSearchCategories_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_SiteSearch_NotLastNPeriods__Actions.getSiteSearchCategories_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_SiteSearch_NotLastNPeriods__Actions.getSiteSearchKeywords_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_SiteSearch_NotLastNPeriods__Actions.getSiteSearchKeywords_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_SiteSearch_NotLastNPeriods__Actions.getSiteSearchNoResultKeywords_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_SiteSearch_NotLastNPeriods__Actions.getSiteSearchNoResultKeywords_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_SiteSearch_NotLastNPeriods__Actions.get_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_SiteSearch_NotLastNPeriods__Actions.get_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_SiteSearch_NotLastNPeriods__CustomVariables.getCustomVariables_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_SiteSearch_NotLastNPeriods__CustomVariables.getCustomVariables_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_TimezonesTest__Live.getLastVisitsDetails_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_TimezonesTest_dayAfterVisit__VisitsSummary.get_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_TimezonesTest_withVisit__VisitsSummary.get_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_TrackerWindowLookBack__VisitsSummary.getVisits_range.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_Transitions__Transitions.getTransitionsForPageUrl_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_Transitions__Transitions.getTransitionsForPageUrl_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_Transitions_noData__Transitions.getTransitionsForPageTitle_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_Transitions_noData__Transitions.getTransitionsForPageTitle_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_Transitions_noData__Transitions.getTransitionsForPageUrl_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_Transitions_noData__Transitions.getTransitionsForPageUrl_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_Transitions_noLimit__Transitions.getTransitionsForPageTitle_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_Transitions_noLimit__Transitions.getTransitionsForPageTitle_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_Transitions_noLimit__Transitions.getTransitionsForPageUrl_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_Transitions_noLimit__Transitions.getTransitionsForPageUrl_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Actions.getOutlinks_firstSite_lastN__API.getProcessedReport_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Actions.getPageTitles_firstSite_lastN__API.getProcessedReport_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Actions.getPageUrls_firstSite_lastN__API.getProcessedReport_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_disabledAfter__VisitsSummary.get_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_disabledAfter__VisitsSummary.get_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_disabledAfter__VisitsSummary.get_week.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_disabledAfter__VisitsSummary.get_year.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_disabledBefore__VisitsSummary.get_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_disabledBefore__VisitsSummary.get_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_disabledBefore__VisitsSummary.get_week.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_disabledBefore__VisitsSummary.get_year.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_disabledBefore_isDateRange__VisitsSummary.get_range.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_enabledBefore_isDateRange__VisitsSummary.get_range.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_enabled__VisitsSummary.get_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_enabled__VisitsSummary.get_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_enabled__VisitsSummary.get_week.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_enabled__VisitsSummary.get_year.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_Goals.getDaysToConversion_firstSite_lastN__API.getProcessedReport_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_MultiSites.getAll_firstSite_lastN__API.getProcessedReport_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_NotLastNPeriods__Goals.get_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_NotLastNPeriods__Goals.get_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_NotLastNPeriods__VisitsSummary.get_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_NotLastNPeriods__VisitsSummary.get_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__Goals.getDaysToConversion_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__Goals.getDaysToConversion_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__Goals.getDaysToConversion_week.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__Goals.getDaysToConversion_year.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__MultiSites.getAll_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__MultiSites.getAll_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__MultiSites.getAll_week.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__MultiSites.getAll_year.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_getMetricsFromDifferentReports__VisitsSummary.get_range.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_idSiteOne___Goals.getDaysToConversion_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_idSiteOne___Goals.getDaysToConversion_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_idSiteOne___Goals.getDaysToConversion_week.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_idSiteOne___Goals.getDaysToConversion_year.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_idSiteOne___MultiSites.getAll_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_idSiteOne___MultiSites.getAll_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_idSiteOne___MultiSites.getAll_week.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_idSiteOne___MultiSites.getAll_year.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_NotLastNPeriods__Goals.get_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_NotLastNPeriods__Goals.get_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_NotLastNPeriods__VisitsSummary.get_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_NotLastNPeriods__VisitsSummary.get_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Referrers.getWebsites_firstSite_lastN__API.getProcessedReport_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_VisitFrequency.get_firstSite_lastN__API.getProcessedReport_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_VisitorInterest.getNumberOfVisitsByDaysSinceLast_firstSite_lastN__API.getProcessedReport_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_VisitsSummary.get_firstSite_lastN__API.getProcessedReport_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getOutlinks_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getOutlinks_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getOutlinks_week.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getOutlinks_year.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageTitle_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageTitle_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageTitle_week.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageTitle_year.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageTitles_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageTitles_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageTitles_week.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageTitles_year.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrl_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrl_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrl_week.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrl_year.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_week.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_year.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__Referrers.getWebsites_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__Referrers.getWebsites_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__Referrers.getWebsites_week.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__Referrers.getWebsites_year.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__VisitFrequency.get_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__VisitFrequency.get_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__VisitFrequency.get_week.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__VisitFrequency.get_year.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__VisitorInterest.getNumberOfVisitsByDaysSinceLast_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__VisitorInterest.getNumberOfVisitsByDaysSinceLast_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__VisitorInterest.getNumberOfVisitsByDaysSinceLast_week.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__VisitorInterest.getNumberOfVisitsByDaysSinceLast_year.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__VisitsSummary.get_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__VisitsSummary.get_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__VisitsSummary.get_week.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__VisitsSummary.get_year.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getOutlinks_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getOutlinks_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getOutlinks_week.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getOutlinks_year.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageTitle_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageTitle_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageTitle_week.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageTitle_year.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageTitles_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageTitles_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageTitles_week.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageTitles_year.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrl_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrl_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrl_week.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrl_year.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrls_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrls_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrls_week.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrls_year.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Referrers.getWebsites_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Referrers.getWebsites_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Referrers.getWebsites_week.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Referrers.getWebsites_year.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitFrequency.get_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitFrequency.get_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitFrequency.get_week.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitFrequency.get_year.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitorInterest.getNumberOfVisitsByDaysSinceLast_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitorInterest.getNumberOfVisitsByDaysSinceLast_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitorInterest.getNumberOfVisitsByDaysSinceLast_week.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitorInterest.getNumberOfVisitsByDaysSinceLast_year.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitsSummary.get_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitsSummary.get_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitsSummary.get_week.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitsSummary.get_year.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_csv__ScheduledReports.generateReport_month.original.csv
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_row_evolution_graph__ScheduledReports.generateReport_month.original.html
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_month.original.html
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_month.original.html
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_pdf_tables_only__ScheduledReports.generateReport_month.original.pdf
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_via_sms_all_sites__ScheduledReports.generateReport_month.original.sms.txt
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_via_sms_one_site__ScheduledReports.generateReport_month.original.sms.txt
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_UrlNormalization_keywords__Referrers.getKeywordsForPageUrl_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_UrlNormalization_pagesSegmentedRef__Actions.getPageUrls_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_UrlNormalization_pagesSegmented__Actions.getPageUrls_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_UrlNormalization_titles__Actions.getPageTitles_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_UrlNormalization_urls__Actions.getPageUrls_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_UserId_VisitorId__Live.getLastVisitsDetails_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_UserId_VisitorId__VisitsSummary.getUsers_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_UserId_VisitorId__VisitsSummary.getUsers_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_UserId_VisitorId__VisitsSummary.getUsers_week.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_UserId_VisitorId__VisitsSummary.getUsers_year.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_UserId_VisitorId__VisitsSummary.get_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_UserId_VisitorId__VisitsSummary.get_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_UserId_VisitorId__VisitsSummary.get_week.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_UserId_VisitorId__VisitsSummary.get_year.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_UserId_VisitorId_invalidSegmentUserId__VisitsSummary.get_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_UserId_VisitorId_segmentUserIdAndCartAbandoned_getAbandonedCartItems__Goals.getItemsName_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_UserId_VisitorId_segmentUserId__Goals.get_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_UserId_VisitorId_segmentUserId__VisitsSummary.get_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_VisitsInPast_InvalidateOldReportsWebsite1_OldReportsShouldAppear__Actions.getPageUrls_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_VisitsInPast_InvalidateOldReportsWebsite1_OldReportsShouldAppear__VisitsSummary.get_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_VisitsInPast_InvalidateOldReportsWebsite1_OldReportsShouldNotAppear__Actions.getPageUrls_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_VisitsInPast_InvalidateOldReportsWebsite1_OldReportsShouldNotAppear__VisitsSummary.get_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_VisitsInPast_InvalidateOldReportsWebsite2_OldReportsShouldAppear__Actions.getPageUrls_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_VisitsInPast_InvalidateOldReportsWebsite2_OldReportsShouldAppear__VisitsSummary.get_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_VisitsInPast_InvalidateOldReportsWebsite2_OldReportsShouldNotAppear__Actions.getPageUrls_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_VisitsInPast_InvalidateOldReportsWebsite2_OldReportsShouldNotAppear__VisitsSummary.get_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_annotations__Annotations.get.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_annotations__Annotations.getAll_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_annotations__Annotations.getAll_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_annotations__Annotations.getAll_week.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_annotations__Annotations.getAll_year.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_annotations__Annotations.getAnnotationCountForDates_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_annotations__Annotations.getAnnotationCountForDates_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_annotations__Annotations.getAnnotationCountForDates_week.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_annotations__Annotations.getAnnotationCountForDates_year.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_annotations_lastN__Annotations.getAll_week.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_annotations_lastN__Annotations.getAnnotationCountForDates_week.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_annotations_multipleSites__Annotations.getAll_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_annotations_multipleSites__Annotations.getAnnotationCountForDates_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_annotations_range__Annotations.getAll_range.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_annotations_range__Annotations.getAnnotationCountForDates_range.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_apiGetReportMetadata__API.getDefaultMetricTranslations.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_apiGetReportMetadata__API.getIpFromHeader.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_apiGetReportMetadata__API.getLastDate_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_apiGetReportMetadata__API.getMetadata_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_apiGetReportMetadata__API.getProcessedReport_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_apiGetReportMetadata__API.getReportMetadata_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_apiGetReportMetadata__API.getRowEvolution_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_apiGetReportMetadata__API.getSegmentsMetadata.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_apiGetReportMetadata__API.getSettings.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_apiGetReportMetadata__API.getSuggestedValuesForSegment.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_apiGetReportMetadata__API.get_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_apiGetReportMetadata_hideMetricsDoc__API.getMetadata_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_apiGetReportMetadata_hideMetricsDoc__API.getProcessedReport_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_apiGetReportMetadata_pageTitleZeroString__Actions.getPageTitles_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_apiGetReportMetadata_phpRenderer__API.getDefaultMetricTranslations.php
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_apiGetReportMetadata_showRawMetrics__API.getProcessedReport_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_apiGetReportMetadata_year__API.getProcessedReport_year.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_apiGetReportMetadata_year__LanguagesManager.getAvailableLanguageNames.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_apiGetReportMetadata_year__SitesManager.getJavascriptTag.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_csvExport__Live.getLastVisitsDetails_day.csv
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_csvExport_xp0__CustomVariables.getCustomVariables_day.csv
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_csvExport_xp0__VisitsSummary.get_day.csv
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_csvExport_xp1_inner0_trans-en__CustomVariables.getCustomVariables_day.csv
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_csvExport_xp1_inner0_trans-en__VisitsSummary.get_day.csv
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_csvExport_xp1_inner1_trans-de__CustomVariables.getCustomVariables_day.csv
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_csvExport_xp1_inner1_trans-de__VisitsSummary.get_day.csv
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_API_get__API.get_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_API_get__API.get_week.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_AbandonedCarts__Goals.getItemsCategory_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_AbandonedCarts__Goals.getItemsCategory_week.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_AbandonedCarts__Goals.getItemsName_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_AbandonedCarts__Goals.getItemsName_week.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_AbandonedCarts__Goals.getItemsSku_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_AbandonedCarts__Goals.getItemsSku_week.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_GoalAbandonedCart__Goals.get_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_GoalAbandonedCart__Goals.get_week.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_GoalMatchTitle__Goals.get_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_GoalMatchTitle__Goals.get_week.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_GoalOrder__Goals.get_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_GoalOrder__Goals.get_week.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_GoalOverall__Goals.get_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_GoalOverall__Goals.get_week.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_LiveEcommerceStatusOrdered__Live.getLastVisitsDetails_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_Metadata_Goals.Get_AbandonedCart__API.getProcessedReport_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_Metadata_Goals.Get_NormalGoal__API.getProcessedReport_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_Metadata_Goals.Get_NotExistingGoal__API.getProcessedReport_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_Metadata_Goals.Get_Order__API.getProcessedReport_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_Metadata_ItemsCategory__API.getProcessedReport_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_Metadata_ItemsSku__API.getProcessedReport_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_Metadata_VisitTime.getVisitInformationPerServerTime__API.getProcessedReport_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentAbandonedCart__VisitsSummary.get_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentConvertedGoalId1__VisitsSummary.get_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentConvertedGoalId1__VisitsSummary.get_week.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentCountryIsFr__Goals.getItemsCategory_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentCountryIsFr__Goals.getItemsCategory_week.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentCountryIsFr__Goals.getItemsName_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentCountryIsFr__Goals.getItemsName_week.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentCountryIsFr__Goals.getItemsSku_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentCountryIsFr__Goals.getItemsSku_week.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentDidNotConvertGoalId1__VisitsSummary.get_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentNewVisitors__VisitsSummary.get_week.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentNoEcommerce__VisitsSummary.get_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentNoVisit_HaveConvertedNonExistingGoal__Goals.getItemsCategory_week.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentNoVisit_HaveConvertedNonExistingGoal__Goals.getItemsName_week.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentNoVisit_HaveConvertedNonExistingGoal__Goals.getItemsSku_week.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentNoVisit_HaveConvertedNonExistingGoal__Goals.get_week.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentNoVisit_HaveConvertedNonExistingGoal__VisitsSummary.get_week.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentOrderedSomething__VisitsSummary.get_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentPageTitleMatch__VisitsSummary.get_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentPageUrlContains__Goals.getItemsCategory_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentPageUrlContains__Goals.getItemsCategory_week.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentPageUrlContains__Goals.getItemsName_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentPageUrlContains__Goals.getItemsName_week.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentPageUrlContains__Goals.getItemsSku_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentPageUrlContains__Goals.getItemsSku_week.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentReturningCustomers__VisitsSummary.get_week.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentReturningVisitors__VisitsSummary.get_week.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentVisitHasConvertedGoal__Goals.getItemsCategory_week.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentVisitHasConvertedGoal__Goals.getItemsName_week.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentVisitHasConvertedGoal__Goals.getItemsSku_week.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentVisitHasConvertedGoal__Goals.get_week.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentVisitHasConvertedGoal__VisitsSummary.get_week.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentVisitHasNotOrderedAndConvertedGoal__Goals.getItemsCategory_week.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentVisitHasNotOrderedAndConvertedGoal__Goals.getItemsName_week.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentVisitHasNotOrderedAndConvertedGoal__Goals.getItemsSku_week.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentVisitHasNotOrderedAndConvertedGoal__Goals.get_week.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentVisitHasNotOrderedAndConvertedGoal__VisitsSummary.get_week.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_Website2__Goals.getItemsCategory_week.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_Website2__Goals.getItemsName_week.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_Website2__Goals.getItemsSku_week.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_Website2__Goals.get_week.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__API.getProcessedReport_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__CustomVariables.getCustomVariables_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__Goals.getItemsCategory_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__Goals.getItemsCategory_week.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__Goals.getItemsName_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__Goals.getItemsName_week.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__Goals.getItemsSku_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__Goals.getItemsSku_week.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__Goals.get_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__Goals.get_week.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__Live.getLastVisitsDetails_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__UserCountry.getCity_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__UserCountry.getContinent_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__UserCountry.getCountry_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__UserCountry.getNumberOfDistinctCountries_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__UserCountry.getRegion_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__VisitTime.getByDayOfWeek_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__VisitTime.getVisitInformationPerLocalTime_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__VisitTime.getVisitInformationPerServerTime_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__VisitsSummary.get_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_csv__ScheduledReports.generateReport_week.original.csv
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_row_evolution_graph__ScheduledReports.generateReport_week.original.html
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_week.original.html
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_week.original.html
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_pdf_tables_only__ScheduledReports.generateReport_week.original.pdf
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_via_sms_all_sites__ScheduledReports.generateReport_week.original.sms.txt
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_via_sms_one_site__ScheduledReports.generateReport_week.original.sms.txt
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItemsmultipleDates__Goals.getItemsCategory_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItemsmultipleDates__Goals.getItemsName_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItemsmultipleDates__Goals.getItemsSku_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItemsmultipleDates_andMultipleWebsites__Goals.getItemsCategory_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItemsmultipleDates_andMultipleWebsites__Goals.getItemsName_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItemsmultipleDates_andMultipleWebsites__Goals.getItemsSku_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Actions.getDownload_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Actions.getDownload_week.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Actions.getDownloads_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Actions.getDownloads_week.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Actions.getEntryPageTitles_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Actions.getEntryPageTitles_week.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Actions.getEntryPageUrls_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Actions.getEntryPageUrls_week.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Actions.getExitPageTitles_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Actions.getExitPageTitles_week.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Actions.getExitPageUrls_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Actions.getExitPageUrls_week.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Actions.getOutlink_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Actions.getOutlink_week.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Actions.getOutlinks_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Actions.getOutlinks_week.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Actions.getPageTitle_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Actions.getPageTitle_week.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Actions.getPageTitlesFollowingSiteSearch_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Actions.getPageTitlesFollowingSiteSearch_week.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Actions.getPageTitles_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Actions.getPageTitles_week.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Actions.getPageUrl_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Actions.getPageUrl_week.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Actions.getPageUrlsFollowingSiteSearch_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Actions.getPageUrlsFollowingSiteSearch_week.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Actions.getPageUrls_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Actions.getPageUrls_week.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Actions.getSiteSearchCategories_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Actions.getSiteSearchCategories_week.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Actions.getSiteSearchKeywords_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Actions.getSiteSearchKeywords_week.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Actions.getSiteSearchNoResultKeywords_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Actions.getSiteSearchNoResultKeywords_week.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Actions.get_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Actions.get_week.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Contents.getContentNames_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Contents.getContentNames_week.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Contents.getContentPieces_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Contents.getContentPieces_week.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__CustomVariables.getCustomVariables_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__CustomVariables.getCustomVariables_week.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__DevicesDetection.getBrand_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__DevicesDetection.getBrand_week.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__DevicesDetection.getBrowserFamilies_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__DevicesDetection.getBrowserFamilies_week.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__DevicesDetection.getBrowserVersions_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__DevicesDetection.getBrowserVersions_week.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__DevicesDetection.getModel_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__DevicesDetection.getModel_week.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__DevicesDetection.getOsFamilies_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__DevicesDetection.getOsFamilies_week.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__DevicesDetection.getOsVersions_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__DevicesDetection.getOsVersions_week.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__DevicesDetection.getType_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__DevicesDetection.getType_week.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Events.getAction_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Events.getAction_week.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Events.getCategory_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Events.getCategory_week.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Events.getName_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Events.getName_week.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__ExamplePlugin.getAnswerToLife.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__ExamplePlugin.getExampleReport_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__ExamplePlugin.getExampleReport_week.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Goals.getDaysToConversion_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Goals.getDaysToConversion_week.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Goals.getGoals.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Goals.getItemsCategory_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Goals.getItemsCategory_week.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Goals.getItemsName_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Goals.getItemsName_week.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Goals.getItemsSku_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Goals.getItemsSku_week.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Goals.getVisitsUntilConversion_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Goals.getVisitsUntilConversion_week.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Goals.get_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Goals.get_week.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__MultiSites.getAll_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__MultiSites.getAll_week.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__MultiSites.getOne_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__MultiSites.getOne_week.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Provider.getProvider_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Provider.getProvider_week.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Referrers.getAll_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Referrers.getAll_week.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Referrers.getCampaigns_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Referrers.getCampaigns_week.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Referrers.getKeywordsForPageUrl_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Referrers.getKeywordsForPageUrl_week.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Referrers.getKeywords_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Referrers.getKeywords_week.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Referrers.getNumberOfDistinctCampaigns_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Referrers.getNumberOfDistinctCampaigns_week.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Referrers.getNumberOfDistinctKeywords_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Referrers.getNumberOfDistinctKeywords_week.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Referrers.getNumberOfDistinctSearchEngines_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Referrers.getNumberOfDistinctSearchEngines_week.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Referrers.getNumberOfDistinctWebsitesUrls_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Referrers.getNumberOfDistinctWebsitesUrls_week.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Referrers.getNumberOfDistinctWebsites_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Referrers.getNumberOfDistinctWebsites_week.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Referrers.getReferrerType_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Referrers.getReferrerType_week.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Referrers.getSearchEngines_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Referrers.getSearchEngines_week.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Referrers.getSocials_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Referrers.getSocials_week.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Referrers.getUrlsForSocial_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Referrers.getUrlsForSocial_week.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Referrers.getWebsites_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__Referrers.getWebsites_week.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__UserCountry.getCity_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__UserCountry.getCity_week.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__UserCountry.getContinent_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__UserCountry.getContinent_week.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__UserCountry.getCountry_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__UserCountry.getCountry_week.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__UserCountry.getNumberOfDistinctCountries_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__UserCountry.getNumberOfDistinctCountries_week.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__UserCountry.getRegion_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__UserCountry.getRegion_week.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__UserSettings.getBrowserType_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__UserSettings.getBrowserType_week.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__UserSettings.getBrowserVersion_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__UserSettings.getBrowserVersion_week.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__UserSettings.getBrowser_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__UserSettings.getBrowser_week.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__UserSettings.getConfiguration_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__UserSettings.getConfiguration_week.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__UserSettings.getLanguageCode_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__UserSettings.getLanguageCode_week.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__UserSettings.getLanguage_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__UserSettings.getLanguage_week.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__UserSettings.getMobileVsDesktop_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__UserSettings.getMobileVsDesktop_week.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__UserSettings.getOSFamily_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__UserSettings.getOSFamily_week.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__UserSettings.getOS_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__UserSettings.getOS_week.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__UserSettings.getPlugin_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__UserSettings.getPlugin_week.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__UserSettings.getResolution_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__UserSettings.getResolution_week.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__UserSettings.getWideScreen_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__UserSettings.getWideScreen_week.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__VisitFrequency.get_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__VisitFrequency.get_week.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__VisitTime.getByDayOfWeek_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__VisitTime.getByDayOfWeek_week.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__VisitTime.getVisitInformationPerLocalTime_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__VisitTime.getVisitInformationPerLocalTime_week.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__VisitTime.getVisitInformationPerServerTime_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__VisitTime.getVisitInformationPerServerTime_week.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__VisitorInterest.getNumberOfVisitsByDaysSinceLast_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__VisitorInterest.getNumberOfVisitsByDaysSinceLast_week.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__VisitorInterest.getNumberOfVisitsByVisitCount_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__VisitorInterest.getNumberOfVisitsByVisitCount_week.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__VisitorInterest.getNumberOfVisitsPerPage_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__VisitorInterest.getNumberOfVisitsPerPage_week.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__VisitorInterest.getNumberOfVisitsPerVisitDuration_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__VisitorInterest.getNumberOfVisitsPerVisitDuration_week.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__VisitsSummary.getActions_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__VisitsSummary.getActions_week.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__VisitsSummary.getBounceCount_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__VisitsSummary.getBounceCount_week.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__VisitsSummary.getMaxActions_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__VisitsSummary.getMaxActions_week.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__VisitsSummary.getSumVisitsLengthPretty_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__VisitsSummary.getSumVisitsLengthPretty_week.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__VisitsSummary.getSumVisitsLength_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__VisitsSummary.getSumVisitsLength_week.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__VisitsSummary.getUniqueVisitors_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__VisitsSummary.getUniqueVisitors_week.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__VisitsSummary.getUsers_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__VisitsSummary.getUsers_week.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__VisitsSummary.getVisitsConverted_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__VisitsSummary.getVisitsConverted_week.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__VisitsSummary.getVisits_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__VisitsSummary.getVisits_week.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__VisitsSummary.get_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__VisitsSummary.get_week.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit__Actions.getDownload_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit__Actions.getDownloads_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit__Actions.getEntryPageTitles_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit__Actions.getEntryPageUrls_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit__Actions.getExitPageTitles_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit__Actions.getExitPageUrls_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit__Actions.getOutlink_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit__Actions.getOutlinks_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit__Actions.getPageTitle_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit__Actions.getPageTitlesFollowingSiteSearch_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit__Actions.getPageTitles_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit__Actions.getPageUrl_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit__Actions.getPageUrlsFollowingSiteSearch_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit__Actions.getPageUrls_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit__Actions.getSiteSearchCategories_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit__Actions.getSiteSearchKeywords_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit__Actions.getSiteSearchNoResultKeywords_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit__Actions.get_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit__Contents.getContentNames_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit__Contents.getContentPieces_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit__CustomVariables.getCustomVariables_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit__DevicesDetection.getBrand_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit__DevicesDetection.getBrowserFamilies_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit__DevicesDetection.getBrowserVersions_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit__DevicesDetection.getModel_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit__DevicesDetection.getOsFamilies_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit__DevicesDetection.getOsVersions_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit__DevicesDetection.getType_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit__Events.getAction_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit__Events.getCategory_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit__Events.getName_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit__ExamplePlugin.getAnswerToLife.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit__ExamplePlugin.getExampleReport_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit__Goals.getDaysToConversion_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit__Goals.getGoals.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit__Goals.getItemsCategory_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit__Goals.getItemsName_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit__Goals.getItemsSku_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit__Goals.getVisitsUntilConversion_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit__Goals.get_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit__MultiSites.getAll_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit__MultiSites.getOne_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit__Provider.getProvider_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit__Referrers.getAll_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit__Referrers.getCampaigns_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit__Referrers.getKeywordsForPageUrl_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit__Referrers.getKeywords_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit__Referrers.getNumberOfDistinctCampaigns_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit__Referrers.getNumberOfDistinctKeywords_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit__Referrers.getNumberOfDistinctSearchEngines_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit__Referrers.getNumberOfDistinctWebsitesUrls_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit__Referrers.getNumberOfDistinctWebsites_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit__Referrers.getReferrerType_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit__Referrers.getSearchEngines_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit__Referrers.getSocials_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit__Referrers.getUrlsForSocial_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit__Referrers.getWebsites_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit__UserCountry.getCity_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit__UserCountry.getContinent_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit__UserCountry.getCountry_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit__UserCountry.getNumberOfDistinctCountries_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit__UserCountry.getRegion_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit__UserSettings.getBrowserType_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit__UserSettings.getBrowserVersion_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit__UserSettings.getBrowser_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit__UserSettings.getConfiguration_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit__UserSettings.getLanguageCode_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit__UserSettings.getLanguage_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit__UserSettings.getMobileVsDesktop_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit__UserSettings.getOSFamily_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit__UserSettings.getOS_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit__UserSettings.getPlugin_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit__UserSettings.getResolution_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit__UserSettings.getWideScreen_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit__VisitFrequency.get_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit__VisitTime.getByDayOfWeek_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit__VisitTime.getVisitInformationPerLocalTime_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit__VisitTime.getVisitInformationPerServerTime_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit__VisitorInterest.getNumberOfVisitsByDaysSinceLast_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit__VisitorInterest.getNumberOfVisitsByVisitCount_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit__VisitorInterest.getNumberOfVisitsPerPage_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit__VisitorInterest.getNumberOfVisitsPerVisitDuration_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit__VisitsSummary.getActions_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit__VisitsSummary.getBounceCount_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit__VisitsSummary.getMaxActions_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit__VisitsSummary.getSumVisitsLengthPretty_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit__VisitsSummary.getSumVisitsLength_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit__VisitsSummary.getUniqueVisitors_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit__VisitsSummary.getUsers_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit__VisitsSummary.getVisitsConverted_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit__VisitsSummary.getVisits_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit__VisitsSummary.get_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_oneVisitor_oneWebsite_severalDays_DateRange_IndexedByDate__MultiSites.getAll_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_oneVisitor_oneWebsite_severalDays_DateRange_IndexedByDate__Referrers.getSocials_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_oneVisitor_oneWebsite_severalDays_DateRange_MultipleDatesNotSupported__MultiSites.getAll_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__Actions.getPageUrls_range.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__MultiSites.getAll_range.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__MultiSites.getOne_range.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__Referrers.getSocials_range.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__Referrers.getUrlsForSocial_range.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__UserCountry.getCountry_range.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__UserSettings.getResolution_range.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__VisitFrequency.get_range.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__VisitTime.getVisitInformationPerServerTime_range.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__VisitsSummary.get_range.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_oneVisitor_oneWebsite_severalDays_DateRange_noIdSubtable__Referrers.getUrlsForSocial_range.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_oneVisitor_oneWebsite_severalDays_DateRange_periodIsRange_expanded___Actions.getPageUrls_range.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_oneVisitor_oneWebsite_severalDays_DateRange_periodIsRange_flattened___Actions.getPageUrls_range.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__API.getProcessedReport_range.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Actions.getPageUrls_range.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__CustomVariables.getCustomVariables_range.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Goals.get_range.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getCounters.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisitsDetails_range.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getMostRecentVisitorId.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getVisitorProfile.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Referrers.getCampaigns_range.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Referrers.getKeywords_range.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__VisitsSummary.get_range.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_reportLimiting__Actions.getDownloads_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_reportLimiting__Actions.getOutlinks_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_reportLimiting__Actions.getPageTitles_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_reportLimiting__Actions.getPageUrls_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_reportLimiting__CustomVariables.getCustomVariables_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_reportLimiting__Goals.getItemsCategory_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_reportLimiting__Goals.getItemsName_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_reportLimiting__Goals.getItemsSku_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_reportLimiting__Referrers.getAll_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_reportLimiting__Referrers.getKeywords_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_reportLimiting__Referrers.getReferrerType_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_reportLimiting__Referrers.getSearchEngines_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_reportLimiting__Referrers.getWebsites_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_reportLimiting__UserCountry.getCity_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_reportLimiting__UserCountry.getRegion_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_reportLimiting__UserSettings.getBrowserVersion_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_reportLimiting__UserSettings.getConfiguration_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_reportLimiting__UserSettings.getOS_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_reportLimiting__UserSettings.getResolution_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_reportLimiting_rangeFlat_rankingQueryDisabled__Actions.getDownloads_range.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_reportLimiting_rankingQueryDisabled__Actions.getPageUrls_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_reportLimiting_rankingQueryDisabled__Provider.getProvider_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_reportLimiting_rankingQuery__Actions.getDownloads_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_reportLimiting_rankingQuery__Actions.getOutlinks_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_reportLimiting_rankingQuery__Actions.getPageTitles_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_reportLimiting_rankingQuery__Actions.getPageUrls_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_reportLimiting_rankingQuery__CustomVariables.getCustomVariables_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_reportLimiting_rankingQuery__Goals.getItemsCategory_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_reportLimiting_rankingQuery__Goals.getItemsName_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_reportLimiting_rankingQuery__Goals.getItemsSku_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_reportLimiting_rankingQuery__Referrers.getAll_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_reportLimiting_rankingQuery__Referrers.getKeywords_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_reportLimiting_rankingQuery__Referrers.getReferrerType_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_reportLimiting_rankingQuery__Referrers.getSearchEngines_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_reportLimiting_rankingQuery__Referrers.getWebsites_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_reportLimiting_rankingQuery__UserCountry.getCity_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_reportLimiting_rankingQuery__UserCountry.getRegion_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_reportLimiting_rankingQuery__UserSettings.getBrowserVersion_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_reportLimiting_rankingQuery__UserSettings.getConfiguration_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_reportLimiting_rankingQuery__UserSettings.getOS_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_reportLimiting_rankingQuery__UserSettings.getResolution_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_reportLimiting_segment_provider_rankingQueryDisabled__Provider.getProvider_month.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_trackGoals_allowMultipleConversionsPerVisit__VisitTime.getVisitInformationPerServerTime_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_trackGoals_allowMultipleConversionsPerVisit__VisitsSummary.get_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_SegmentPageTitleContainsStrangeCharacters__Actions.getPageTitles_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_SegmentPageTitleContainsStrangeCharacters__VisitsSummary.get_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_SegmentPageTitleContains__Actions.getPageTitles_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_SegmentPageTitleContains__Actions.getPageUrls_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_SegmentPageTitleContains__VisitsSummary.get_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_SegmentPageTitleExcludes__Actions.getPageTitles_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_SegmentPageTitleExcludes__Actions.getPageUrls_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_SegmentPageTitleExcludes__VisitsSummary.get_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_SegmentPageUrlContains__Actions.getPageTitles_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_SegmentPageUrlContains__Actions.getPageUrls_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_SegmentPageUrlContains__VisitsSummary.get_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_SegmentPageUrlExcludes__Actions.getPageTitles_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_SegmentPageUrlExcludes__Actions.getPageUrls_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_SegmentPageUrlExcludes__VisitsSummary.get_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables__CustomVariables.getCustomVariables_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables__CustomVariables.getCustomVariables_week.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables__VisitsSummary.get_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables__VisitsSummary.get_week.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables__subtable__API.getProcessedReport_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_segmentMatchALL_noGoalData__CustomVariables.getCustomVariables_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_segmentMatchALL_noGoalData__CustomVariables.getCustomVariables_week.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_segmentMatchALL_noGoalData__VisitsSummary.get_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_segmentMatchALL_noGoalData__VisitsSummary.get_week.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_segmentMatchNONE__CustomVariables.getCustomVariables_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_segmentMatchNONE__CustomVariables.getCustomVariables_week.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_segmentMatchNONE__VisitsSummary.get_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_segmentMatchNONE__VisitsSummary.get_week.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_segmentMatchVisitorType__CustomVariables.getCustomVariables_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_segmentMatchVisitorType__CustomVariables.getCustomVariables_week.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_segmentMatchVisitorType__Referrers.getKeywords_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_segmentMatchVisitorType__Referrers.getKeywords_week.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_segmentMatchVisitorType__VisitsSummary.get_day.xml
rename to 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
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_segmentMatchVisitorType__VisitsSummary.get_week.xml
rename to tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentMatchVisitorType__VisitsSummary.get_week.xml
diff --git a/tests/PHPUnit/SystemTestCase.php b/tests/PHPUnit/SystemTestCase.php
index c554552f19c4c263dd5a48879e16010c581b25c0..90e7da4725d17af038306d1c4075c88ac8ac9d4f 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 ba15855f61cbaf794d00ed13bd63285633007a72..3e2d0ec4c7270ecd16aa7617081a8a4cc4e1a437 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
similarity index 100%
rename from tests/PHPUnit/Core/API/ApiRendererTest.php
rename to tests/PHPUnit/Unit/API/ApiRendererTest.php
diff --git a/tests/PHPUnit/Core/API/ResponseBuilderTest.php b/tests/PHPUnit/Unit/API/ResponseBuilderTest.php
similarity index 100%
rename from tests/PHPUnit/Core/API/ResponseBuilderTest.php
rename to tests/PHPUnit/Unit/API/ResponseBuilderTest.php
diff --git a/tests/PHPUnit/Core/AssetManager/PluginManagerMock.php b/tests/PHPUnit/Unit/AssetManager/PluginManagerMock.php
similarity index 100%
rename from tests/PHPUnit/Core/AssetManager/PluginManagerMock.php
rename to tests/PHPUnit/Unit/AssetManager/PluginManagerMock.php
diff --git a/tests/PHPUnit/Core/AssetManager/PluginMock.php b/tests/PHPUnit/Unit/AssetManager/PluginMock.php
similarity index 100%
rename from tests/PHPUnit/Core/AssetManager/PluginMock.php
rename to tests/PHPUnit/Unit/AssetManager/PluginMock.php
diff --git a/tests/PHPUnit/Core/AssetManager/ThemeMock.php b/tests/PHPUnit/Unit/AssetManager/ThemeMock.php
similarity index 100%
rename from tests/PHPUnit/Core/AssetManager/ThemeMock.php
rename to tests/PHPUnit/Unit/AssetManager/ThemeMock.php
diff --git a/tests/PHPUnit/Core/AssetManager/UIAssetCacheBusterMock.php b/tests/PHPUnit/Unit/AssetManager/UIAssetCacheBusterMock.php
similarity index 100%
rename from tests/PHPUnit/Core/AssetManager/UIAssetCacheBusterMock.php
rename to tests/PHPUnit/Unit/AssetManager/UIAssetCacheBusterMock.php
diff --git a/tests/PHPUnit/Core/AssetManager/UIAssetCacheBusterTest.php b/tests/PHPUnit/Unit/AssetManager/UIAssetCacheBusterTest.php
similarity index 100%
rename from tests/PHPUnit/Core/AssetManager/UIAssetCacheBusterTest.php
rename to tests/PHPUnit/Unit/AssetManager/UIAssetCacheBusterTest.php
diff --git a/tests/PHPUnit/Core/AssetManager/UIAssetCatalogSorterTest.php b/tests/PHPUnit/Unit/AssetManager/UIAssetCatalogSorterTest.php
similarity index 100%
rename from tests/PHPUnit/Core/AssetManager/UIAssetCatalogSorterTest.php
rename to tests/PHPUnit/Unit/AssetManager/UIAssetCatalogSorterTest.php
diff --git a/tests/PHPUnit/Core/AssetManager/UIAssetMinifierTest.php b/tests/PHPUnit/Unit/AssetManager/UIAssetMinifierTest.php
similarity index 100%
rename from tests/PHPUnit/Core/AssetManager/UIAssetMinifierTest.php
rename to 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
similarity index 100%
rename from tests/PHPUnit/Core/AssetManager/configs/merged-assets-disabled.ini.php
rename to 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
similarity index 100%
rename from tests/PHPUnit/Core/AssetManager/configs/merged-assets-enabled.ini.php
rename to 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
similarity index 100%
rename from tests/PHPUnit/Core/AssetManager/configs/plugins.ini.php
rename to 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
similarity index 100%
rename from tests/PHPUnit/Core/AssetManager/scripts/ExpectedMergeResultCore.js
rename to 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
similarity index 100%
rename from tests/PHPUnit/Core/AssetManager/scripts/ExpectedMergeResultNonCore.js
rename to 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
similarity index 100%
rename from tests/PHPUnit/Core/AssetManager/scripts/SimpleAlert.js
rename to 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
similarity index 100%
rename from tests/PHPUnit/Core/AssetManager/scripts/SimpleArray.js
rename to 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
similarity index 100%
rename from tests/PHPUnit/Core/AssetManager/scripts/SimpleComments.js
rename to 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
similarity index 100%
rename from tests/PHPUnit/Core/AssetManager/scripts/SimpleObject.js
rename to 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
similarity index 79%
rename from tests/PHPUnit/Core/AssetManager/stylesheets/CssWithURLs.css
rename to tests/PHPUnit/Unit/AssetManager/stylesheets/CssWithURLs.css
index 75c919da98f45587d4ff1538a02cee93be113822..f53dbe37b503ebdcb6c893da371bc41725ac1e40 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
similarity index 82%
rename from tests/PHPUnit/Core/AssetManager/stylesheets/ExpectedMergeResult.css
rename to tests/PHPUnit/Unit/AssetManager/stylesheets/ExpectedMergeResult.css
index 3b86a91e5226d1023b6ae31c1f7ad8f00ed1f359..12acb9937c4720fd7742c205874039d04a053a74 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
similarity index 100%
rename from tests/PHPUnit/Core/AssetManager/stylesheets/ImportedLess.less
rename to 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
similarity index 100%
rename from tests/PHPUnit/Core/AssetManager/stylesheets/SimpleBody.css
rename to 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
similarity index 100%
rename from tests/PHPUnit/Core/AssetManager/stylesheets/SimpleLess.less
rename to 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
similarity index 100%
rename from tests/PHPUnit/Core/AssetManager/stylesheets/images/test-image.png
rename to tests/PHPUnit/Unit/AssetManager/stylesheets/images/test-image.png
diff --git a/tests/PHPUnit/Core/AssetManagerTest.php b/tests/PHPUnit/Unit/AssetManagerTest.php
similarity index 95%
rename from tests/PHPUnit/Core/AssetManagerTest.php
rename to tests/PHPUnit/Unit/AssetManagerTest.php
index 85fc6d9764cd2a9a60010ec139e71728372dcc5e..5d3e709004d86570a88b6b0369723fab607193b1 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
similarity index 100%
rename from tests/PHPUnit/Core/CliMulti/OutputTest.php
rename to tests/PHPUnit/Unit/CliMulti/OutputTest.php
diff --git a/tests/PHPUnit/Core/CliMulti/ProcessTest.php b/tests/PHPUnit/Unit/CliMulti/ProcessTest.php
similarity index 100%
rename from tests/PHPUnit/Core/CliMulti/ProcessTest.php
rename to tests/PHPUnit/Unit/CliMulti/ProcessTest.php
diff --git a/tests/PHPUnit/Core/Columns/DimensionTest.php b/tests/PHPUnit/Unit/Columns/DimensionTest.php
similarity index 100%
rename from tests/PHPUnit/Core/Columns/DimensionTest.php
rename to tests/PHPUnit/Unit/Columns/DimensionTest.php
diff --git a/tests/PHPUnit/Core/CommonTest.php b/tests/PHPUnit/Unit/CommonTest.php
similarity index 100%
rename from tests/PHPUnit/Core/CommonTest.php
rename to tests/PHPUnit/Unit/CommonTest.php
diff --git a/tests/PHPUnit/Core/ConfigTest.php b/tests/PHPUnit/Unit/ConfigTest.php
similarity index 100%
rename from tests/PHPUnit/Core/ConfigTest.php
rename to tests/PHPUnit/Unit/ConfigTest.php
diff --git a/tests/PHPUnit/Core/CookieTest.php b/tests/PHPUnit/Unit/CookieTest.php
similarity index 100%
rename from tests/PHPUnit/Core/CookieTest.php
rename to tests/PHPUnit/Unit/CookieTest.php
diff --git a/tests/PHPUnit/Core/DataTable/Filter/AddSummaryRowTest.php b/tests/PHPUnit/Unit/DataTable/Filter/AddSummaryRowTest.php
similarity index 100%
rename from tests/PHPUnit/Core/DataTable/Filter/AddSummaryRowTest.php
rename to 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
similarity index 100%
rename from tests/PHPUnit/Core/DataTable/Filter/ExcludeLowPopulationTest.php
rename to 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
similarity index 100%
rename from tests/PHPUnit/Core/DataTable/Filter/LimitTest.php
rename to 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
similarity index 100%
rename from tests/PHPUnit/Core/DataTable/Filter/PatternRecursiveTest.php
rename to 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
similarity index 100%
rename from tests/PHPUnit/Core/DataTable/Filter/PatternTest.php
rename to 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
similarity index 100%
rename from tests/PHPUnit/Core/DataTable/Filter/PivotByDimensionTest.php
rename to 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
similarity index 100%
rename from tests/PHPUnit/Core/DataTable/Filter/RangeCheckTest.php
rename to 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
similarity index 100%
rename from tests/PHPUnit/Core/DataTable/Filter/SortTest.php
rename to 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
similarity index 100%
rename from tests/PHPUnit/Core/DataTable/Filter/TruncateTest.php
rename to tests/PHPUnit/Unit/DataTable/Filter/TruncateTest.php
diff --git a/tests/PHPUnit/Core/DataTable/MapTest.php b/tests/PHPUnit/Unit/DataTable/MapTest.php
similarity index 100%
rename from tests/PHPUnit/Core/DataTable/MapTest.php
rename to tests/PHPUnit/Unit/DataTable/MapTest.php
diff --git a/tests/PHPUnit/Core/DataTable/Renderer/CSVTest.php b/tests/PHPUnit/Unit/DataTable/Renderer/CSVTest.php
similarity index 100%
rename from tests/PHPUnit/Core/DataTable/Renderer/CSVTest.php
rename to 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
similarity index 100%
rename from tests/PHPUnit/Core/DataTable/Renderer/ConsoleTest.php
rename to 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
similarity index 100%
rename from tests/PHPUnit/Core/DataTable/Renderer/JSONTest.php
rename to 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
similarity index 100%
rename from tests/PHPUnit/Core/DataTable/Renderer/PHPTest.php
rename to 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
similarity index 100%
rename from tests/PHPUnit/Core/DataTable/Renderer/XMLTest.php
rename to tests/PHPUnit/Unit/DataTable/Renderer/XMLTest.php
diff --git a/tests/PHPUnit/Core/DataTable/RowTest.php b/tests/PHPUnit/Unit/DataTable/RowTest.php
similarity index 100%
rename from tests/PHPUnit/Core/DataTable/RowTest.php
rename to tests/PHPUnit/Unit/DataTable/RowTest.php
diff --git a/tests/PHPUnit/Core/DataTableTest.php b/tests/PHPUnit/Unit/DataTableTest.php
similarity index 100%
rename from tests/PHPUnit/Core/DataTableTest.php
rename to tests/PHPUnit/Unit/DataTableTest.php
diff --git a/tests/PHPUnit/Core/DateTest.php b/tests/PHPUnit/Unit/DateTest.php
similarity index 100%
rename from tests/PHPUnit/Core/DateTest.php
rename to tests/PHPUnit/Unit/DateTest.php
diff --git a/tests/PHPUnit/Core/DependencyTest.php b/tests/PHPUnit/Unit/DependencyTest.php
similarity index 100%
rename from tests/PHPUnit/Core/DependencyTest.php
rename to tests/PHPUnit/Unit/DependencyTest.php
diff --git a/tests/PHPUnit/Core/DeprecatedMethodsTest.php b/tests/PHPUnit/Unit/DeprecatedMethodsTest.php
similarity index 100%
rename from tests/PHPUnit/Core/DeprecatedMethodsTest.php
rename to tests/PHPUnit/Unit/DeprecatedMethodsTest.php
diff --git a/tests/PHPUnit/Core/FactoryTest.php b/tests/PHPUnit/Unit/FactoryTest.php
similarity index 100%
rename from tests/PHPUnit/Core/FactoryTest.php
rename to tests/PHPUnit/Unit/FactoryTest.php
diff --git a/tests/PHPUnit/Core/FilesystemTest.php b/tests/PHPUnit/Unit/FilesystemTest.php
similarity index 100%
rename from tests/PHPUnit/Core/FilesystemTest.php
rename to tests/PHPUnit/Unit/FilesystemTest.php
diff --git a/tests/PHPUnit/Core/Http/fixture.zip b/tests/PHPUnit/Unit/Http/fixture.zip
similarity index 100%
rename from tests/PHPUnit/Core/Http/fixture.zip
rename to tests/PHPUnit/Unit/Http/fixture.zip
diff --git a/tests/PHPUnit/Core/HttpTest.php b/tests/PHPUnit/Unit/HttpTest.php
similarity index 96%
rename from tests/PHPUnit/Core/HttpTest.php
rename to tests/PHPUnit/Unit/HttpTest.php
index af2711c530c4d71b79637bd4668412023d42242e..71f03aa52882b79118ffa5a957337eecdd784b9b 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
similarity index 100%
rename from tests/PHPUnit/Core/IPTest.php
rename to tests/PHPUnit/Unit/IPTest.php
diff --git a/tests/PHPUnit/Core/Menu/MenuReportingTest.php b/tests/PHPUnit/Unit/Menu/MenuReportingTest.php
similarity index 100%
rename from tests/PHPUnit/Core/Menu/MenuReportingTest.php
rename to tests/PHPUnit/Unit/Menu/MenuReportingTest.php
diff --git a/tests/PHPUnit/Core/MetricsTest.php b/tests/PHPUnit/Unit/MetricsTest.php
similarity index 100%
rename from tests/PHPUnit/Core/MetricsTest.php
rename to tests/PHPUnit/Unit/MetricsTest.php
diff --git a/tests/PHPUnit/Core/NonceTest.php b/tests/PHPUnit/Unit/NonceTest.php
similarity index 100%
rename from tests/PHPUnit/Core/NonceTest.php
rename to tests/PHPUnit/Unit/NonceTest.php
diff --git a/tests/PHPUnit/Core/Period/DayTest.php b/tests/PHPUnit/Unit/Period/DayTest.php
similarity index 100%
rename from tests/PHPUnit/Core/Period/DayTest.php
rename to tests/PHPUnit/Unit/Period/DayTest.php
diff --git a/tests/PHPUnit/Core/Period/MonthTest.php b/tests/PHPUnit/Unit/Period/MonthTest.php
similarity index 100%
rename from tests/PHPUnit/Core/Period/MonthTest.php
rename to tests/PHPUnit/Unit/Period/MonthTest.php
diff --git a/tests/PHPUnit/Core/Period/RangeTest.php b/tests/PHPUnit/Unit/Period/RangeTest.php
similarity index 100%
rename from tests/PHPUnit/Core/Period/RangeTest.php
rename to tests/PHPUnit/Unit/Period/RangeTest.php
diff --git a/tests/PHPUnit/Core/Period/WeekTest.php b/tests/PHPUnit/Unit/Period/WeekTest.php
similarity index 100%
rename from tests/PHPUnit/Core/Period/WeekTest.php
rename to tests/PHPUnit/Unit/Period/WeekTest.php
diff --git a/tests/PHPUnit/Core/Period/YearTest.php b/tests/PHPUnit/Unit/Period/YearTest.php
similarity index 100%
rename from tests/PHPUnit/Core/Period/YearTest.php
rename to tests/PHPUnit/Unit/Period/YearTest.php
diff --git a/tests/PHPUnit/Core/PeriodTest.php b/tests/PHPUnit/Unit/PeriodTest.php
similarity index 100%
rename from tests/PHPUnit/Core/PeriodTest.php
rename to tests/PHPUnit/Unit/PeriodTest.php
diff --git a/tests/PHPUnit/Core/Plugin/ComponentFactoryTest.php b/tests/PHPUnit/Unit/Plugin/ComponentFactoryTest.php
similarity index 100%
rename from tests/PHPUnit/Core/Plugin/ComponentFactoryTest.php
rename to tests/PHPUnit/Unit/Plugin/ComponentFactoryTest.php
diff --git a/tests/PHPUnit/Core/Plugin/Dimension/ActionDimensionTest.php b/tests/PHPUnit/Unit/Plugin/Dimension/ActionDimensionTest.php
similarity index 100%
rename from tests/PHPUnit/Core/Plugin/Dimension/ActionDimensionTest.php
rename to 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
similarity index 100%
rename from tests/PHPUnit/Core/Plugin/Dimension/ConversionDimensionTest.php
rename to 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
similarity index 100%
rename from tests/PHPUnit/Core/Plugin/Dimension/VisitDimensionTest.php
rename to tests/PHPUnit/Unit/Plugin/Dimension/VisitDimensionTest.php
diff --git a/tests/PHPUnit/Core/RankingQueryTest.php b/tests/PHPUnit/Unit/RankingQueryTest.php
similarity index 100%
rename from tests/PHPUnit/Core/RankingQueryTest.php
rename to tests/PHPUnit/Unit/RankingQueryTest.php
diff --git a/tests/PHPUnit/Core/RegistryTest.php b/tests/PHPUnit/Unit/RegistryTest.php
similarity index 100%
rename from tests/PHPUnit/Core/RegistryTest.php
rename to tests/PHPUnit/Unit/RegistryTest.php
diff --git a/tests/PHPUnit/Core/ReleaseCheckListTest.php b/tests/PHPUnit/Unit/ReleaseCheckListTest.php
similarity index 98%
rename from tests/PHPUnit/Core/ReleaseCheckListTest.php
rename to tests/PHPUnit/Unit/ReleaseCheckListTest.php
index ba70ff9410d9bdf982aa11dba6c21e780fc391dd..255c03fb79544089d1dd1872d8a2f83a402ac716 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
similarity index 100%
rename from tests/PHPUnit/Core/ScheduledTaskTest.php
rename to tests/PHPUnit/Unit/ScheduledTaskTest.php
diff --git a/tests/PHPUnit/Core/ScheduledTime/DailyTest.php b/tests/PHPUnit/Unit/ScheduledTime/DailyTest.php
similarity index 100%
rename from tests/PHPUnit/Core/ScheduledTime/DailyTest.php
rename to tests/PHPUnit/Unit/ScheduledTime/DailyTest.php
diff --git a/tests/PHPUnit/Core/ScheduledTime/HourlyTest.php b/tests/PHPUnit/Unit/ScheduledTime/HourlyTest.php
similarity index 100%
rename from tests/PHPUnit/Core/ScheduledTime/HourlyTest.php
rename to tests/PHPUnit/Unit/ScheduledTime/HourlyTest.php
diff --git a/tests/PHPUnit/Core/ScheduledTime/MonthlyTest.php b/tests/PHPUnit/Unit/ScheduledTime/MonthlyTest.php
similarity index 100%
rename from tests/PHPUnit/Core/ScheduledTime/MonthlyTest.php
rename to tests/PHPUnit/Unit/ScheduledTime/MonthlyTest.php
diff --git a/tests/PHPUnit/Core/ScheduledTime/WeeklyTest.php b/tests/PHPUnit/Unit/ScheduledTime/WeeklyTest.php
similarity index 100%
rename from tests/PHPUnit/Core/ScheduledTime/WeeklyTest.php
rename to tests/PHPUnit/Unit/ScheduledTime/WeeklyTest.php
diff --git a/tests/PHPUnit/Core/SegmentExpressionTest.php b/tests/PHPUnit/Unit/SegmentExpressionTest.php
similarity index 100%
rename from tests/PHPUnit/Core/SegmentExpressionTest.php
rename to tests/PHPUnit/Unit/SegmentExpressionTest.php
diff --git a/tests/PHPUnit/Core/ServeStaticFileTest.php b/tests/PHPUnit/Unit/ServeStaticFileTest.php
similarity index 99%
rename from tests/PHPUnit/Core/ServeStaticFileTest.php
rename to tests/PHPUnit/Unit/ServeStaticFileTest.php
index 588c1b8c25d58ef56de8769376ef4378a2c4727c..a3ec57a7afc390f8bb3b6a271e7a47184bada401 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
similarity index 100%
rename from tests/PHPUnit/Core/TaskSchedulerTest.php
rename to tests/PHPUnit/Unit/TaskSchedulerTest.php
diff --git a/tests/PHPUnit/Core/Translate/Filter/ByBaseTranslationsTest.php b/tests/PHPUnit/Unit/Translate/Filter/ByBaseTranslationsTest.php
similarity index 100%
rename from tests/PHPUnit/Core/Translate/Filter/ByBaseTranslationsTest.php
rename to 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
similarity index 100%
rename from tests/PHPUnit/Core/Translate/Filter/ByParameterCountTest.php
rename to 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
similarity index 100%
rename from tests/PHPUnit/Core/Translate/Filter/EmptyTranslationsTest.php
rename to 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
similarity index 100%
rename from tests/PHPUnit/Core/Translate/Filter/EncodedEntitiesTest.php
rename to 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
similarity index 100%
rename from tests/PHPUnit/Core/Translate/Filter/UnnecassaryWhitespacesTest.php
rename to 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
similarity index 100%
rename from tests/PHPUnit/Core/Translate/Validate/CoreTranslationsTest.php
rename to 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
similarity index 100%
rename from tests/PHPUnit/Core/Translate/Validate/NoScriptsTest.php
rename to tests/PHPUnit/Unit/Translate/Validate/NoScriptsTest.php
diff --git a/tests/PHPUnit/Core/Translate/WriterTest.php b/tests/PHPUnit/Unit/Translate/WriterTest.php
similarity index 100%
rename from tests/PHPUnit/Core/Translate/WriterTest.php
rename to tests/PHPUnit/Unit/Translate/WriterTest.php
diff --git a/tests/PHPUnit/Core/TranslateTest.php b/tests/PHPUnit/Unit/TranslateTest.php
similarity index 100%
rename from tests/PHPUnit/Core/TranslateTest.php
rename to tests/PHPUnit/Unit/TranslateTest.php
diff --git a/tests/PHPUnit/Core/UrlHelperTest.php b/tests/PHPUnit/Unit/UrlHelperTest.php
similarity index 100%
rename from tests/PHPUnit/Core/UrlHelperTest.php
rename to tests/PHPUnit/Unit/UrlHelperTest.php
diff --git a/tests/PHPUnit/Core/UrlTest.php b/tests/PHPUnit/Unit/UrlTest.php
similarity index 100%
rename from tests/PHPUnit/Core/UrlTest.php
rename to tests/PHPUnit/Unit/UrlTest.php
diff --git a/tests/PHPUnit/phpunit.xml.dist b/tests/PHPUnit/phpunit.xml.dist
index 3035150bbd77548519c502562bec7b8e8b01cabf..6aef96407c2685b6e9cf9b6bdfb6120711b82bf5 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 3363d90ba88cf7566b67584c079b4cacb8d09c5e..213df21cf83168c8af487b80f1f16cbed8b79e16 100644
--- a/tests/PHPUnit/proxy/index.php
+++ b/tests/PHPUnit/proxy/index.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * Proxy to index.php, but will use the Test DB
- * Used by tests/PHPUnit/Integration/ImportLogsTest.php and tests/PHPUnit/Integration/UITest.php
+ * Used by tests/PHPUnit/System/ImportLogsTest.php and tests/PHPUnit/System/UITest.php
  */
 
 require realpath(dirname(__FILE__)) . "/includes.php";
diff --git a/tests/README.md b/tests/README.md
index 24b2699b43b4fe51725363843f882c1aedb93c4a..bce6f554ead7be76c6f4cb9953ab3684a02c4472 100644
--- a/tests/README.md
+++ b/tests/README.md
@@ -71,8 +71,8 @@ To execute the tests:
 4. 	Run the tests
 
 	$ cd /path/to/piwik/tests/PHPUnit
-	$ phpunit --testsuite CoreTests
-    $ phpunit --testsuite PluginTests
+	$ phpunit --testsuite UnitTests
+    $ phpunit --testsuite IntegrationTests
     $ phpunit --testsuite SystemTests
 
 	There are also two main groups of tests: Core and Plugins
@@ -84,7 +84,7 @@ To execute the tests:
 
 ## System Tests
 
-System tests files are in `tests/PHPUnit/Integration/*Test.php`
+System tests files are in `tests/PHPUnit/System/*Test.php`
 
 System tests allow to test how major Piwik components interact together.
 A test will typically generate hits to the Tracker (record visits and page views)
@@ -93,8 +93,8 @@ If a test fails, you can compare the processed/ and expected/ directories in a g
 text compare tool, such as WinMerge on Win, or MELD on Linux, to easily view changes between files.
 
 For example using Meld, click on "Start new comparison", "Directory comparison",
-in "Original" select "path/to/piwik/tests/PHPUnit/Integration/expected"
-in "Mine" select "path/to/piwik/tests/PHPUnit/Integration/processed"
+in "Original" select "path/to/piwik/tests/PHPUnit/System/expected"
+in "Mine" select "path/to/piwik/tests/PHPUnit/System/processed"
 
 If changes are expected due to the code changes you make, simply copy the file from processed/ to
 expected/, and test will then pass. Copying files is done easily using Meld (ALT+LEFT).
diff --git a/tests/travis/travis.sh b/tests/travis/travis.sh
index 7647211a1208f2ddc0305f88d8e3cccf932dd7f5..71859ea70e5e3bda99d83d32299d0a456e7c71e8 100755
--- a/tests/travis/travis.sh
+++ b/tests/travis/travis.sh
@@ -73,11 +73,11 @@ else
         phpunit --configuration phpunit.xml --testsuite SystemTests --exclude-group System --colors --coverage-clover $TRAVIS_BUILD_DIR/build/logs/clover-integration.xml || true
     elif [ "$COVERAGE" = "Core" ]
     then
-        echo "Executing tests in test suite CoreTests..."
-        phpunit --configuration phpunit.xml --testsuite CoreTests --colors --coverage-clover $TRAVIS_BUILD_DIR/build/logs/clover-core.xml || true
+        echo "Executing tests in test suite UnitTests..."
+        phpunit --configuration phpunit.xml --testsuite UnitTests --colors --coverage-clover $TRAVIS_BUILD_DIR/build/logs/clover-core.xml || true
     elif [ "$COVERAGE" = "Plugins" ]
     then
-        echo "Executing tests in test suite PluginTests..."
-        phpunit --configuration phpunit.xml --testsuite PluginTests --colors --coverage-clover $TRAVIS_BUILD_DIR/build/logs/clover-plugins.xml || true
+        echo "Executing tests in test suite IntegrationTests..."
+        phpunit --configuration phpunit.xml --testsuite IntegrationTests --colors --coverage-clover $TRAVIS_BUILD_DIR/build/logs/clover-plugins.xml || true
     fi;
 fi
\ No newline at end of file
diff --git a/tests/travis/upload_artifacts.sh b/tests/travis/upload_artifacts.sh
index 822fd795be20a7a9926efc36fb389894f3163bd5..325f0448b5d4d2734722d89f895b802576d469c2 100755
--- a/tests/travis/upload_artifacts.sh
+++ b/tests/travis/upload_artifacts.sh
@@ -6,7 +6,7 @@ then
 
     echo "Uploading artifacts for $TEST_SUITE..."
 
-    cd ./tests/PHPUnit/Integration
+    cd ./tests/PHPUnit/System
 
     # upload processed tarball
     tar -cjf processed.tar.bz2 processed --exclude='.gitkeep'