Add ability for Archivers to initiate archiving for other plugins & use in Goals (#13105)

* Add required segments for Goals.get to known segments to archive list.

* Add test to ArchiveCronTest.

* Allow archiving dependent archives in Goals Archiver.

* Clean up last commit & use Segment::combine in more places.

* skip dependent processing if same plugin/segment

* Move ArchiveCronTest to CoreConsole plugin since it is rather long running.

* Fixing tests.

* Remove use statements.

* Fix tests dependent on archive tables.

* check w/ urlencoded/decoded segment/condition in Segment::combine().

* Another test fix

* final test fix

41 files changed, 90 insertions, 3461 deletions

diff --git a/tests/PHPUnit/Integration/SegmentTest.php b/tests/PHPUnit/Integration/SegmentTest.php
index f1f2fd2f2e..d1bea412f2 100644
--- a/tests/PHPUnit/Integration/SegmentTest.php
+++ b/tests/PHPUnit/Integration/SegmentTest.php
@@ -1742,6 +1742,35 @@ log_visit.visit_total_actions
         $this->assertWillBeArchived(false);
     }
 
+    /**
+     * @dataProvider getTestDataForCombine
+     */
+    public function test_combine_shouldCombineSegmentConditionsProperly($segment, $operator, $toCombine, $expected)
+    {
+        $newSegment = Segment::combine($segment, $operator, $toCombine);
+        $this->assertEquals($expected, $newSegment);
+    }
+
+    public function getTestDataForCombine()
+    {
+        return [
+            ['', ';', '', ''],
+            ['browserCode==ff;visitCount>1', ';', '', 'browserCode==ff;visitCount>1'],
+            ['', ';', 'visitCount>1', 'visitCount>1'],
+            ['browserCode==ff;visitCount>1', ';', 'visitCount>1', 'browserCode==ff;visitCount>1'],
+            ['visitCount>1;browserCode==ff', ';', 'visitCount>1', 'visitCount>1;browserCode==ff'],
+            ['visitCount>1,browserCode==ff', ';', 'visitCount>1', 'visitCount>1,browserCode==ff;visitCount>1'],
+            ['browserCode==ff', ';', 'visitCount>1', 'browserCode==ff;visitCount>1'],
+            ['browserCode==ff;visitCount>1', ',', 'visitCount>2', 'browserCode==ff;visitCount>1,visitCount>2'],
+            ['visitorType==new', ';', 'visitorType==new', 'visitorType==new'],
+
+            // urlencoding test
+            [urlencode('browserCode==ff;visitCount>1'), ';', 'visitCount>1', urlencode('browserCode==ff;visitCount>1')],
+            ['browserCode==ff;visitCount>1', ';', urlencode('visitCount>1'), 'browserCode==ff;visitCount>1'],
+            ['browserCode==ff;'.urlencode('visitCount>1'), ';', 'visitCount>1', 'browserCode==ff;'.urlencode('visitCount>1')],
+        ];
+    }
+
     private function assertWillBeArchived($segmentString)
     {
         $this->assertTrue($this->willSegmentByArchived($segmentString));
diff --git a/tests/PHPUnit/System/ArchiveCronTest.php b/tests/PHPUnit/System/ArchiveCronTest.php
deleted file mode 100644
index dcdf8ca5e1..0000000000
--- a/tests/PHPUnit/System/ArchiveCronTest.php
+++ /dev/null
@@ -1,190 +0,0 @@
-<?php
-/**
- * Piwik - free/libre analytics platform
- *
- * @link    http://piwik.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- */
-namespace Piwik\Tests\System;
-
-use Interop\Container\ContainerInterface;
-use Piwik\Date;
-use Piwik\Plugins\SitesManager\API;
-use Piwik\Tests\Framework\TestCase\SystemTestCase;
-use Piwik\Tests\Fixtures\ManySitesImportedLogs;
-use Piwik\Tests\Framework\Fixture;
-use Exception;
-
-/**
- * Tests to call the cron core:archive command script and check there is no error,
- * Then call the API testing for "Browser archiving is disabled" (see disableArchiving)
- * This tests that, when archiving is disabled,
- *  then Piwik API will return data that was pre-processed during archive.php run
- *
- * @group Core
- * @group ArchiveCronTest
- */
-class ArchiveCronTest extends SystemTestCase
-{
-    /**
-     * @var ManySitesImportedLogs
-     */
-    public static $fixture = null; // initialized below class definition
-
-    public function getApiForTesting()
-    {
-        $results = array();
-
-        foreach (self::$fixture->getDefaultSegments() as $segmentName => $info) {
-            $results[] = array('VisitsSummary.get', array('idSite'     => 'all',
-                                                          'date'       => '2012-08-09',
-                                                          'periods'    => array('day', 'week', 'month', 'year'),
-                                                          'segment'    => $info['definition'],
-                                                          'testSuffix' => '_' . $segmentName));
-
-
-        }
-
-        // API Call Without segments
-        $results[] = array('VisitsSummary.get', array('idSite'  => 'all',
-                                                      'date'    => '2012-08-09',
-                                                      'periods' => array('day', 'month', 'year',  'week')));
-
-        $results[] = array('VisitsSummary.get', array('idSite'     => 'all',
-                                                      'date'       => '2012-08-09',
-                                                      'periods'    => array('day', 'week', 'month', 'year'),
-                                                      'segment'    => 'browserCode==EP',
-                                                      'testSuffix' => '_nonPreArchivedSegment'));
-
-        $segments = array(ManySitesImportedLogs::SEGMENT_PRE_ARCHIVED,
-                          ManySitesImportedLogs::SEGMENT_PRE_ARCHIVED_CONTAINS_ENCODED
-        );
-        foreach($segments as $segment) {
-            // Test with a pre-processed segment
-            $results[] = array(array('VisitsSummary.get', 'Live.getLastVisitsDetails', 'VisitFrequency.get'),
-                               array('idSite'     => '1',
-                                     'date'       => '2012-08-09',
-                                     'periods'    => array('day', 'year'),
-                                     'segment'    => $segment,
-                                     'testSuffix' => '_preArchivedSegment',
-                                     'otherRequestParameters' => array(
-                                        'hideColumns' => 'latitude,longitude'
-                                     ))
-            );
-        }
-
-        return $results;
-    }
-
-    public function testArchivePhpCron()
-    {
-        $this->setLastRunArchiveOptions();
-        $output = $this->runArchivePhpCron();
-
-        $this->compareArchivePhpOutputAgainstExpected($output);
-
-        foreach ($this->getApiForTesting() as $testInfo) {
-
-            list($api, $params) = $testInfo;
-
-            if (!isset($params['testSuffix'])) {
-                $params['testSuffix'] = '';
-            }
-            $params['testSuffix'] .= '_noOptions';
-            $params['disableArchiving'] = true;
-
-            $success = $this->runApiTests($api, $params);
-
-            if (!$success) {
-                var_dump($output);
-            }
-        }
-    }
-
-    public function test_archivePhpScript_DoesNotFail_WhenCommandHelpRequested()
-    {
-        $output = $this->runArchivePhpCron(array('--help' => null), PIWIK_INCLUDE_PATH . '/misc/cron/archive.php');
-        $output = implode("\n", $output);
-
-        $this->assertRegExp('/Usage:\s*core:archive/', $output);
-        $this->assertNotContains("Starting Piwik reports archiving...", $output);
-    }
-
-    private function setLastRunArchiveOptions()
-    {
-        $periodTypes = array('day', 'periods');
-        $idSites = API::getInstance()->getAllSitesId();
-
-        $daysAgoArchiveRanSuccessfully = 1500;
-        $this->assertTrue($daysAgoArchiveRanSuccessfully > (\Piwik\CronArchive::ARCHIVE_SITES_WITH_TRAFFIC_SINCE / 86400));
-        $time = Date::factory(self::$fixture->dateTime)->subDay($daysAgoArchiveRanSuccessfully)->getTimestamp();
-
-        foreach ($periodTypes as $period) {
-            foreach ($idSites as $idSite) {
-                // lastRunKey() function inlined
-                $lastRunArchiveOption = "lastRunArchive" . $period . "_" . $idSite;
-                \Piwik\Option::set($lastRunArchiveOption, $time);
-            }
-        }
-    }
-
-    private function runArchivePhpCron($options = array(), $archivePhpScript = false)
-    {
-        $archivePhpScript = $archivePhpScript ?: PIWIK_INCLUDE_PATH . '/tests/PHPUnit/proxy/archive.php';
-        $urlToProxy = Fixture::getRootUrl() . 'tests/PHPUnit/proxy/index.php';
-
-        // create the command
-        $cmd = "php \"$archivePhpScript\" --url=\"$urlToProxy\"";
-        foreach ($options as $name => $value) {
-            $cmd .= " $name";
-            if ($value !== null) {
-                $cmd .= "=" . escapeshellarg($value);
-            }
-        }
-        $cmd .= " 2>&1";
-
-        // run the command
-        exec($cmd, $output, $result);
-        if ($result !== 0 || stripos($result, "error")) {
-            $this->fail("archive cron failed: " . implode("\n", $output) . "\n\ncommand used: $cmd");
-        }
-
-        return $output;
-    }
-
-    private function compareArchivePhpOutputAgainstExpected($output)
-    {
-        $output = implode("\n", $output);
-
-        $fileName = 'test_ArchiveCronTest_archive_php_cron_output.txt';
-        list($pathProcessed, $pathExpected) = static::getProcessedAndExpectedDirs();
-
-        $expectedOutputFile = $pathExpected . $fileName;
-        $processedFile = $pathProcessed . $fileName;
-
-        file_put_contents($processedFile, $output);
-
-        try {
-            $this->assertTrue(is_readable($expectedOutputFile));
-            $this->assertEquals(file_get_contents($expectedOutputFile), $output);
-        } catch (Exception $ex) {
-            $this->comparisonFailures[] = $ex;
-        }
-    }
-
-    public static function provideContainerConfigBeforeClass()
-    {
-        return array(
-            'Psr\Log\LoggerInterface' => \DI\get('Monolog\Logger'),
-
-            // for some reason, w/o real translations archiving segments in CronArchive fails. the data returned by CliMulti
-            // is a translation token, and nothing else.
-            'Piwik\Translation\Translator' => function (ContainerInterface $c) {
-                return new \Piwik\Translation\Translator($c->get('Piwik\Translation\Loader\LoaderInterface'));
-            }
-        );
-    }
-}
-
-ArchiveCronTest::$fixture = new ManySitesImportedLogs();
-ArchiveCronTest::$fixture->addSegments = true;
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ArchiveCronTest_archive_php_cron_output.txt b/tests/PHPUnit/System/expected/test_ArchiveCronTest_archive_php_cron_output.txt
deleted file mode 100644
index 1ca27704f6..0000000000
--- a/tests/PHPUnit/System/expected/test_ArchiveCronTest_archive_php_cron_output.txt
+++ /dev/null
@@ -1,105 +0,0 @@
-
--------------------------------------------------------
-Using this 'archive.php' script is no longer recommended.
-Please use '/path/to/php /home/travis/build/matomo-org/matomo/tests/PHPUnit/proxy/../../..//console core:archive --url=http://localhost/tests/PHPUnit/proxy/index.php' instead.
-To get help use '/path/to/php /home/travis/build/matomo-org/matomo/tests/PHPUnit/proxy/../../..//console core:archive --help'
-See also: https://matomo.org/docs/setup-auto-archiving/
-
-If you cannot use the console because it requires CLI
-try 'php archive.php --url=http://your.piwik/path'
--------------------------------------------------------
-
-
-INFO [2018-01-11 20:48:41] ---------------------------
-INFO [2018-01-11 20:48:41] INIT
-INFO [2018-01-11 20:48:41] Running Matomo 3.3.0-b2 as Super User
-INFO [2018-01-11 20:48:41] ---------------------------
-INFO [2018-01-11 20:48:41] NOTES
-INFO [2018-01-11 20:48:41] - If you execute this script at least once per hour (or more often) in a crontab, you may disable 'Browser trigger archiving' in Matomo UI > Settings > General Settings.
-INFO [2018-01-11 20:48:41]   See the doc at: https://matomo.org/docs/setup-auto-archiving/
-INFO [2018-01-11 20:48:41] - Reports for today will be processed at most every 150 seconds. You can change this value in Matomo UI > Settings > General Settings.
-INFO [2018-01-11 20:48:41] - Reports for the current week/month/year will be requested at most every 3600 seconds.
-INFO [2018-01-11 20:48:41] - Will invalidate archived reports for 2012-08-09 for following websites ids: 1
-INFO [2018-01-11 20:48:41] - Will invalidate archived reports for 2012-08-10 for following websites ids: 1
-INFO [2018-01-11 20:48:41] - Will invalidate archived reports for 2012-08-11 for following websites ids: 1
-INFO [2018-01-11 20:48:41] - Will invalidate archived reports for 2012-08-15 for following websites ids: 1,2,3
-INFO [2018-01-11 20:48:41] - Will invalidate archived reports for 2012-08-19 for following websites ids: 1
-INFO [2018-01-11 20:48:41] - Will invalidate archived reports for 2012-09-30 for following websites ids: 1
-INFO [2018-01-11 20:48:41] - Will invalidate archived reports for 2014-03-12 for following websites ids: 1,3
-INFO [2018-01-11 20:48:41] - Will invalidate archived reports for 2014-03-13 for following websites ids: 1,3
-INFO [2018-01-11 20:48:41] - Will process 3 other websites because some old data reports have been invalidated (eg. using the Log Import script or the InvalidateReports plugin) , IDs: 1, 2, 3
-INFO [2018-01-11 20:48:41] ---------------------------
-INFO [2018-01-11 20:48:41] START
-INFO [2018-01-11 20:48:41] Starting Matomo reports archiving...
-INFO [2018-01-11 20:48:41] Old report was invalidated for website id 1
-INFO [2018-01-11 20:48:41] Will pre-process for website id = 1, period = day, date = last52
-INFO [2018-01-11 20:48:41] - pre-processing all visits
-INFO [2018-01-11 20:48:43] - pre-processing segment 1/3 browserCode==IE
-INFO [2018-01-11 20:48:43] - pre-processing segment 2/3 visitCount<=5;visitorType!=non-existing-type;daysSinceFirstVisit<=50
-INFO [2018-01-11 20:48:43] - pre-processing segment 3/3 visitCount<=5;visitorType!=re%2C%3Btest%20is%20encoded;daysSinceFirstVisit<=50
-INFO [2018-01-11 20:48:48] Archived website id = 1, period = day, 3 segments, 0 visits in last 52 days, 0 visits today, Time elapsed: 6.766s
-INFO [2018-01-11 20:48:48] Will pre-process for website id = 1, period = week, date = last260
-INFO [2018-01-11 20:48:48] - pre-processing all visits
-INFO [2018-01-11 20:48:48] - pre-processing segment 1/3 browserCode==IE
-INFO [2018-01-11 20:48:48] - pre-processing segment 2/3 visitCount<=5;visitorType!=non-existing-type;daysSinceFirstVisit<=50
-INFO [2018-01-11 20:50:15] - pre-processing segment 3/3 visitCount<=5;visitorType!=re%2C%3Btest%20is%20encoded;daysSinceFirstVisit<=50
-INFO [2018-01-11 20:51:01] Archived website id = 1, period = week, 3 segments, 12 visits in last 260 weeks, 0 visits this week, Time elapsed: 133.508s
-INFO [2018-01-11 20:51:01] Will pre-process for website id = 1, period = month, date = last52
-INFO [2018-01-11 20:51:01] - pre-processing all visits
-INFO [2018-01-11 20:51:01] - pre-processing segment 1/3 browserCode==IE
-INFO [2018-01-11 20:51:02] - pre-processing segment 2/3 visitCount<=5;visitorType!=non-existing-type;daysSinceFirstVisit<=50
-INFO [2018-01-11 20:51:12] - pre-processing segment 3/3 visitCount<=5;visitorType!=re%2C%3Btest%20is%20encoded;daysSinceFirstVisit<=50
-INFO [2018-01-11 20:51:18] Archived website id = 1, period = month, 3 segments, 12 visits in last 52 months, 0 visits this month, Time elapsed: 16.400s
-INFO [2018-01-11 20:51:18] Will pre-process for website id = 1, period = year, date = last7
-INFO [2018-01-11 20:51:18] - pre-processing all visits
-INFO [2018-01-11 20:51:18] - pre-processing segment 1/3 browserCode==IE
-INFO [2018-01-11 20:51:18] - pre-processing segment 2/3 visitCount<=5;visitorType!=non-existing-type;daysSinceFirstVisit<=50
-INFO [2018-01-11 20:51:36] - pre-processing segment 3/3 visitCount<=5;visitorType!=re%2C%3Btest%20is%20encoded;daysSinceFirstVisit<=50
-INFO [2018-01-11 20:51:46] Archived website id = 1, period = year, 3 segments, 46 visits in last 7 years, 0 visits this year, Time elapsed: 28.268s
-INFO [2018-01-11 20:51:46] Archived website id = 1, 16 API requests, Time elapsed: 184.958s [1/3 done]
-INFO [2018-01-11 20:51:46] Old report was invalidated for website id 2
-INFO [2018-01-11 20:51:46] Will pre-process for website id = 2, period = day, date = last52
-INFO [2018-01-11 20:51:46] - pre-processing all visits
-INFO [2018-01-11 20:51:48] Archived website id = 2, period = day, 0 segments, 0 visits in last 52 days, 0 visits today, Time elapsed: 2.040s
-INFO [2018-01-11 20:51:48] Will pre-process for website id = 2, period = week, date = last260
-INFO [2018-01-11 20:51:48] - pre-processing all visits
-INFO [2018-01-11 20:52:23] Archived website id = 2, period = week, 0 segments, 0 visits in last 260 weeks, 0 visits this week, Time elapsed: 35.094s
-INFO [2018-01-11 20:52:23] Will pre-process for website id = 2, period = month, date = last52
-INFO [2018-01-11 20:52:23] - pre-processing all visits
-INFO [2018-01-11 20:52:28] Archived website id = 2, period = month, 0 segments, 0 visits in last 52 months, 0 visits this month, Time elapsed: 4.329s
-INFO [2018-01-11 20:52:28] Will pre-process for website id = 2, period = year, date = last7
-INFO [2018-01-11 20:52:28] - pre-processing all visits
-INFO [2018-01-11 20:52:33] Archived website id = 2, period = year, 0 segments, 1 visits in last 7 years, 0 visits this year, Time elapsed: 5.163s
-INFO [2018-01-11 20:52:33] Archived website id = 2, 4 API requests, Time elapsed: 46.629s [2/3 done]
-INFO [2018-01-11 20:52:33] Old report was invalidated for website id 3
-INFO [2018-01-11 20:52:33] Will pre-process for website id = 3, period = day, date = last52
-INFO [2018-01-11 20:52:33] - pre-processing all visits
-INFO [2018-01-11 20:52:35] Archived website id = 3, period = day, 0 segments, 0 visits in last 52 days, 0 visits today, Time elapsed: 1.912s
-INFO [2018-01-11 20:52:35] Will pre-process for website id = 3, period = week, date = last260
-INFO [2018-01-11 20:52:35] - pre-processing all visits
-INFO [2018-01-11 20:53:10] Archived website id = 3, period = week, 0 segments, 12 visits in last 260 weeks, 0 visits this week, Time elapsed: 35.493s
-INFO [2018-01-11 20:53:10] Will pre-process for website id = 3, period = month, date = last52
-INFO [2018-01-11 20:53:10] - pre-processing all visits
-INFO [2018-01-11 20:53:15] Archived website id = 3, period = month, 0 segments, 12 visits in last 52 months, 0 visits this month, Time elapsed: 4.751s
-INFO [2018-01-11 20:53:15] Will pre-process for website id = 3, period = year, date = last7
-INFO [2018-01-11 20:53:15] - pre-processing all visits
-INFO [2018-01-11 20:53:21] Archived website id = 3, period = year, 0 segments, 15 visits in last 7 years, 0 visits this year, Time elapsed: 6.293s
-INFO [2018-01-11 20:53:21] Archived website id = 3, 4 API requests, Time elapsed: 48.454s [3/3 done]
-INFO [2018-01-11 20:53:21] Done archiving!
-INFO [2018-01-11 20:53:21] ---------------------------
-INFO [2018-01-11 20:53:21] SUMMARY
-INFO [2018-01-11 20:53:21] Total visits for today across archived websites: 0
-INFO [2018-01-11 20:53:21] Archived today's reports for 3 websites
-INFO [2018-01-11 20:53:21] Archived week/month/year for 3 websites
-INFO [2018-01-11 20:53:21] Skipped 0 websites
-INFO [2018-01-11 20:53:21] - 0 skipped because no new visit since the last script execution
-INFO [2018-01-11 20:53:21] - 0 skipped because existing daily reports are less than 150 seconds old
-INFO [2018-01-11 20:53:21] - 0 skipped because existing week/month/year periods reports are less than 3600 seconds old
-INFO [2018-01-11 20:53:21] Total API requests: 24
-INFO [2018-01-11 20:53:21] done: 3/3 100%, 0 vtoday, 3 wtoday, 3 wperiods, 24 req, 280230 ms, no error
-INFO [2018-01-11 20:53:21] Time elapsed: 280.230s
-INFO [2018-01-11 20:53:21] ---------------------------
-INFO [2018-01-11 20:53:21] SCHEDULED TASKS
-INFO [2018-01-11 20:53:21] Starting Scheduled tasks...
-INFO [2018-01-11 20:53:21] done
-INFO [2018-01-11 20:53:21] ---------------------------
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ArchiveCronTest_noOptions__VisitsSummary.get_day.xml b/tests/PHPUnit/System/expected/test_ArchiveCronTest_noOptions__VisitsSummary.get_day.xml
deleted file mode 100644
index 37a8f92b6c..0000000000
--- a/tests/PHPUnit/System/expected/test_ArchiveCronTest_noOptions__VisitsSummary.get_day.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<results>
-	<result idSite="1">
-		<nb_uniq_visitors>11</nb_uniq_visitors>
-		<nb_users>0</nb_users>
-		<nb_visits>11</nb_visits>
-		<nb_actions>11</nb_actions>
-		<nb_visits_converted>11</nb_visits_converted>
-		<bounce_count>11</bounce_count>
-		<sum_visit_length>0</sum_visit_length>
-		<max_actions>1</max_actions>
-		<bounce_rate>100%</bounce_rate>
-		<nb_actions_per_visit>1</nb_actions_per_visit>
-		<avg_time_on_site>0</avg_time_on_site>
-	</result>
-	<result idSite="2" />
-	<result idSite="3" />
-</results>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ArchiveCronTest_noOptions__VisitsSummary.get_month.xml b/tests/PHPUnit/System/expected/test_ArchiveCronTest_noOptions__VisitsSummary.get_month.xml
deleted file mode 100644
index 3526826240..0000000000
--- a/tests/PHPUnit/System/expected/test_ArchiveCronTest_noOptions__VisitsSummary.get_month.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<results>
-	<result idSite="1">
-		<nb_uniq_visitors>33</nb_uniq_visitors>
-		<nb_users>1</nb_users>
-		<nb_visits>33</nb_visits>
-		<nb_actions>36</nb_actions>
-		<nb_visits_converted>31</nb_visits_converted>
-		<bounce_count>31</bounce_count>
-		<sum_visit_length>305</sum_visit_length>
-		<max_actions>3</max_actions>
-		<bounce_rate>94%</bounce_rate>
-		<nb_actions_per_visit>1.1</nb_actions_per_visit>
-		<avg_time_on_site>9</avg_time_on_site>
-	</result>
-	<result idSite="2">
-		<nb_uniq_visitors>1</nb_uniq_visitors>
-		<nb_users>0</nb_users>
-		<nb_visits>1</nb_visits>
-		<nb_actions>1</nb_actions>
-		<nb_visits_converted>0</nb_visits_converted>
-		<bounce_count>1</bounce_count>
-		<sum_visit_length>0</sum_visit_length>
-		<max_actions>1</max_actions>
-		<bounce_rate>100%</bounce_rate>
-		<nb_actions_per_visit>1</nb_actions_per_visit>
-		<avg_time_on_site>0</avg_time_on_site>
-	</result>
-	<result idSite="3">
-		<nb_uniq_visitors>2</nb_uniq_visitors>
-		<nb_users>0</nb_users>
-		<nb_visits>3</nb_visits>
-		<nb_actions>5</nb_actions>
-		<nb_visits_converted>0</nb_visits_converted>
-		<bounce_count>2</bounce_count>
-		<sum_visit_length>1</sum_visit_length>
-		<max_actions>3</max_actions>
-		<bounce_rate>67%</bounce_rate>
-		<nb_actions_per_visit>1.7</nb_actions_per_visit>
-		<avg_time_on_site>0</avg_time_on_site>
-	</result>
-</results>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ArchiveCronTest_noOptions__VisitsSummary.get_week.xml b/tests/PHPUnit/System/expected/test_ArchiveCronTest_noOptions__VisitsSummary.get_week.xml
deleted file mode 100644
index 425d6d909d..0000000000
--- a/tests/PHPUnit/System/expected/test_ArchiveCronTest_noOptions__VisitsSummary.get_week.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<results>
-	<result idSite="1">
-		<nb_uniq_visitors>30</nb_uniq_visitors>
-		<nb_users>1</nb_users>
-		<nb_visits>30</nb_visits>
-		<nb_actions>33</nb_actions>
-		<nb_visits_converted>28</nb_visits_converted>
-		<bounce_count>28</bounce_count>
-		<sum_visit_length>305</sum_visit_length>
-		<max_actions>3</max_actions>
-		<bounce_rate>93%</bounce_rate>
-		<nb_actions_per_visit>1.1</nb_actions_per_visit>
-		<avg_time_on_site>10</avg_time_on_site>
-	</result>
-	<result idSite="2" />
-	<result idSite="3" />
-</results>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ArchiveCronTest_noOptions__VisitsSummary.get_year.xml b/tests/PHPUnit/System/expected/test_ArchiveCronTest_noOptions__VisitsSummary.get_year.xml
deleted file mode 100644
index 79f53c6e57..0000000000
--- a/tests/PHPUnit/System/expected/test_ArchiveCronTest_noOptions__VisitsSummary.get_year.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<results>
-	<result idSite="1">
-		<nb_visits>34</nb_visits>
-		<nb_actions>46</nb_actions>
-		<nb_visits_converted>32</nb_visits_converted>
-		<bounce_count>31</bounce_count>
-		<sum_visit_length>359</sum_visit_length>
-		<max_actions>10</max_actions>
-		<bounce_rate>91%</bounce_rate>
-		<nb_actions_per_visit>1.4</nb_actions_per_visit>
-		<avg_time_on_site>11</avg_time_on_site>
-	</result>
-	<result idSite="2">
-		<nb_visits>1</nb_visits>
-		<nb_actions>1</nb_actions>
-		<nb_visits_converted>0</nb_visits_converted>
-		<bounce_count>1</bounce_count>
-		<sum_visit_length>0</sum_visit_length>
-		<max_actions>1</max_actions>
-		<bounce_rate>100%</bounce_rate>
-		<nb_actions_per_visit>1</nb_actions_per_visit>
-		<avg_time_on_site>0</avg_time_on_site>
-	</result>
-	<result idSite="3">
-		<nb_visits>3</nb_visits>
-		<nb_actions>5</nb_actions>
-		<nb_visits_converted>0</nb_visits_converted>
-		<bounce_count>2</bounce_count>
-		<sum_visit_length>1</sum_visit_length>
-		<max_actions>3</max_actions>
-		<bounce_rate>67%</bounce_rate>
-		<nb_actions_per_visit>1.7</nb_actions_per_visit>
-		<avg_time_on_site>0</avg_time_on_site>
-	</result>
-</results>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ArchiveCronTest_nonPreArchivedSegment_noOptions__VisitsSummary.get_day.xml b/tests/PHPUnit/System/expected/test_ArchiveCronTest_nonPreArchivedSegment_noOptions__VisitsSummary.get_day.xml
deleted file mode 100644
index dd52dc4ff4..0000000000
--- a/tests/PHPUnit/System/expected/test_ArchiveCronTest_nonPreArchivedSegment_noOptions__VisitsSummary.get_day.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<results>
-	<result idSite="1" />
-	<result idSite="2" />
-	<result idSite="3" />
-</results>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ArchiveCronTest_nonPreArchivedSegment_noOptions__VisitsSummary.get_month.xml b/tests/PHPUnit/System/expected/test_ArchiveCronTest_nonPreArchivedSegment_noOptions__VisitsSummary.get_month.xml
deleted file mode 100644
index dd52dc4ff4..0000000000
--- a/tests/PHPUnit/System/expected/test_ArchiveCronTest_nonPreArchivedSegment_noOptions__VisitsSummary.get_month.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<results>
-	<result idSite="1" />
-	<result idSite="2" />
-	<result idSite="3" />
-</results>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ArchiveCronTest_nonPreArchivedSegment_noOptions__VisitsSummary.get_week.xml b/tests/PHPUnit/System/expected/test_ArchiveCronTest_nonPreArchivedSegment_noOptions__VisitsSummary.get_week.xml
deleted file mode 100644
index dd52dc4ff4..0000000000
--- a/tests/PHPUnit/System/expected/test_ArchiveCronTest_nonPreArchivedSegment_noOptions__VisitsSummary.get_week.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<results>
-	<result idSite="1" />
-	<result idSite="2" />
-	<result idSite="3" />
-</results>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ArchiveCronTest_nonPreArchivedSegment_noOptions__VisitsSummary.get_year.xml b/tests/PHPUnit/System/expected/test_ArchiveCronTest_nonPreArchivedSegment_noOptions__VisitsSummary.get_year.xml
deleted file mode 100644
index dd52dc4ff4..0000000000
--- a/tests/PHPUnit/System/expected/test_ArchiveCronTest_nonPreArchivedSegment_noOptions__VisitsSummary.get_year.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<results>
-	<result idSite="1" />
-	<result idSite="2" />
-	<result idSite="3" />
-</results>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__Live.getLastVisitsDetails_day.xml
deleted file mode 100644
index 5393773096..0000000000
--- a/tests/PHPUnit/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__Live.getLastVisitsDetails_day.xml
+++ /dev/null
@@ -1,1183 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<result>
-	<row>
-		<idSite>1</idSite>
-		<idVisit>9</idVisit>
-		<visitIp>0.0.0.0</visitIp>
-		
-		<actionDetails>
-			<row>
-				<type>goal</type>
-				<goalName>all</goalName>
-				<goalId>1</goalId>
-				<revenue>5</revenue>
-				<goalPageId>9</goalPageId>
-				
-				<url>http://piwik.net/docs/manage-users/</url>
-				<icon>plugins/Morpheus/images/goal.png</icon>
-				
-			</row>
-			<row>
-				<type>action</type>
-				<url>http://piwik.net/docs/manage-users/</url>
-				<pageTitle />
-				<pageIdAction>9</pageIdAction>
-				
-				
-				<pageId>9</pageId>
-				<bandwidth>3574</bandwidth>
-				<interactionPosition>1</interactionPosition>
-				<icon />
-				
-				<customVariables>
-					<row>
-						<customVariablePageName1>HTTP-code</customVariablePageName1>
-						<customVariablePageValue1>200</customVariablePageValue1>
-					</row>
-				</customVariables>
-				<bandwidth_pretty>3.5 K</bandwidth_pretty>
-			</row>
-		</actionDetails>
-		<goalConversions>1</goalConversions>
-		<siteCurrency>USD</siteCurrency>
-		<siteCurrencySymbol>$</siteCurrencySymbol>
-		
-		
-		
-		
-		<siteName>Piwik test</siteName>
-		
-		
-		
-		
-		
-		
-		<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>0</visitDuration>
-		<visitDurationPretty>0s</visitDurationPretty>
-		<searches>0</searches>
-		<actions>1</actions>
-		<interactions>1</interactions>
-		<referrerType>direct</referrerType>
-		<referrerTypeName>Direct Entry</referrerTypeName>
-		<referrerName />
-		<referrerKeyword />
-		<referrerKeywordPosition />
-		<referrerUrl />
-		<referrerSearchEngineUrl />
-		<referrerSearchEngineIcon />
-		<languageCode />
-		<language>Unknown</language>
-		<deviceType>Desktop</deviceType>
-		<deviceTypeIcon>plugins/Morpheus/icons/dist/devices/desktop.png</deviceTypeIcon>
-		<deviceBrand>Apple</deviceBrand>
-		<deviceModel>Generic Desktop</deviceModel>
-		<operatingSystem>Mac 10.8</operatingSystem>
-		<operatingSystemName>Mac</operatingSystemName>
-		<operatingSystemIcon>plugins/Morpheus/icons/dist/os/MAC.png</operatingSystemIcon>
-		<operatingSystemCode>MAC</operatingSystemCode>
-		<operatingSystemVersion>10.8</operatingSystemVersion>
-		<browserFamily>WebKit</browserFamily>
-		<browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription>
-		<browser>Chrome 19.0</browser>
-		<browserName>Chrome</browserName>
-		<browserIcon>plugins/Morpheus/icons/dist/browsers/CH.png</browserIcon>
-		<browserCode>CH</browserCode>
-		<browserVersion>19.0</browserVersion>
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
-		<events>0</events>
-		<continent>Unknown</continent>
-		<continentCode>unk</continentCode>
-		<country>Unknown</country>
-		<countryCode>xx</countryCode>
-		<countryFlag>plugins/Morpheus/icons/dist/flags/xx.png</countryFlag>
-		<region />
-		<regionCode />
-		<city />
-		<location>Unknown</location>
-		<visitLocalTime>21:00:42</visitLocalTime>
-		<visitLocalHour>21</visitLocalHour>
-		<daysSinceLastVisit>0</daysSinceLastVisit>
-		<customVariables>
-		</customVariables>
-		<resolution>unknown</resolution>
-		<plugins />
-		<pluginsIcons />
-	</row>
-	<row>
-		<idSite>1</idSite>
-		<idVisit>8</idVisit>
-		<visitIp>0.0.0.0</visitIp>
-		
-		<actionDetails>
-			<row>
-				<type>goal</type>
-				<goalName>all</goalName>
-				<goalId>1</goalId>
-				<revenue>5</revenue>
-				<goalPageId>8</goalPageId>
-				
-				<url>http://piwik.net/docs/</url>
-				<icon>plugins/Morpheus/images/goal.png</icon>
-				
-			</row>
-			<row>
-				<type>action</type>
-				<url>http://piwik.net/docs/</url>
-				<pageTitle />
-				<pageIdAction>8</pageIdAction>
-				
-				
-				<pageId>8</pageId>
-				<bandwidth>3574</bandwidth>
-				<interactionPosition>1</interactionPosition>
-				<icon />
-				
-				<customVariables>
-					<row>
-						<customVariablePageName1>HTTP-code</customVariablePageName1>
-						<customVariablePageValue1>200</customVariablePageValue1>
-					</row>
-				</customVariables>
-				<bandwidth_pretty>3.5 K</bandwidth_pretty>
-			</row>
-		</actionDetails>
-		<goalConversions>1</goalConversions>
-		<siteCurrency>USD</siteCurrency>
-		<siteCurrencySymbol>$</siteCurrencySymbol>
-		
-		
-		
-		
-		<siteName>Piwik test</siteName>
-		
-		
-		
-		
-		
-		
-		<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>0</visitDuration>
-		<visitDurationPretty>0s</visitDurationPretty>
-		<searches>0</searches>
-		<actions>1</actions>
-		<interactions>1</interactions>
-		<referrerType>direct</referrerType>
-		<referrerTypeName>Direct Entry</referrerTypeName>
-		<referrerName />
-		<referrerKeyword />
-		<referrerKeywordPosition />
-		<referrerUrl />
-		<referrerSearchEngineUrl />
-		<referrerSearchEngineIcon />
-		<languageCode />
-		<language>Unknown</language>
-		<deviceType>Desktop</deviceType>
-		<deviceTypeIcon>plugins/Morpheus/icons/dist/devices/desktop.png</deviceTypeIcon>
-		<deviceBrand>Unknown</deviceBrand>
-		<deviceModel>Generic Desktop</deviceModel>
-		<operatingSystem>GNU/Linux</operatingSystem>
-		<operatingSystemName>GNU/Linux</operatingSystemName>
-		<operatingSystemIcon>plugins/Morpheus/icons/dist/os/LIN.png</operatingSystemIcon>
-		<operatingSystemCode>LIN</operatingSystemCode>
-		<operatingSystemVersion />
-		<browserFamily>Gecko</browserFamily>
-		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
-		<browser>Firefox 6.0</browser>
-		<browserName>Firefox</browserName>
-		<browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon>
-		<browserCode>FF</browserCode>
-		<browserVersion>6.0</browserVersion>
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
-		<events>0</events>
-		<continent>Unknown</continent>
-		<continentCode>unk</continentCode>
-		<country>Unknown</country>
-		<countryCode>xx</countryCode>
-		<countryFlag>plugins/Morpheus/icons/dist/flags/xx.png</countryFlag>
-		<region />
-		<regionCode />
-		<city />
-		<location>Unknown</location>
-		<visitLocalTime>20:56:45</visitLocalTime>
-		<visitLocalHour>20</visitLocalHour>
-		<daysSinceLastVisit>0</daysSinceLastVisit>
-		<customVariables>
-		</customVariables>
-		<resolution>unknown</resolution>
-		<plugins />
-		<pluginsIcons />
-	</row>
-	<row>
-		<idSite>1</idSite>
-		<idVisit>7</idVisit>
-		<visitIp>72.44.32.10</visitIp>
-		
-		<actionDetails>
-			<row>
-				<type>goal</type>
-				<goalName>all</goalName>
-				<goalId>1</goalId>
-				<revenue>5</revenue>
-				<goalPageId>7</goalPageId>
-				
-				<url>http://piwik.net/translations/</url>
-				<icon>plugins/Morpheus/images/goal.png</icon>
-				
-			</row>
-			<row>
-				<type>action</type>
-				<url>http://piwik.net/translations/</url>
-				<pageTitle />
-				<pageIdAction>7</pageIdAction>
-				
-				
-				<pageId>7</pageId>
-				<bandwidth>3574</bandwidth>
-				<interactionPosition>1</interactionPosition>
-				<icon />
-				
-				<customVariables>
-					<row>
-						<customVariablePageName1>HTTP-code</customVariablePageName1>
-						<customVariablePageValue1>200</customVariablePageValue1>
-					</row>
-				</customVariables>
-				<bandwidth_pretty>3.5 K</bandwidth_pretty>
-			</row>
-		</actionDetails>
-		<goalConversions>1</goalConversions>
-		<siteCurrency>USD</siteCurrency>
-		<siteCurrencySymbol>$</siteCurrencySymbol>
-		
-		
-		
-		
-		<siteName>Piwik test</siteName>
-		
-		
-		
-		
-		
-		
-		<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>0</visitDuration>
-		<visitDurationPretty>0s</visitDurationPretty>
-		<searches>0</searches>
-		<actions>1</actions>
-		<interactions>1</interactions>
-		<referrerType>direct</referrerType>
-		<referrerTypeName>Direct Entry</referrerTypeName>
-		<referrerName />
-		<referrerKeyword />
-		<referrerKeywordPosition />
-		<referrerUrl />
-		<referrerSearchEngineUrl />
-		<referrerSearchEngineIcon />
-		<languageCode />
-		<language>Unknown</language>
-		<deviceType>Desktop</deviceType>
-		<deviceTypeIcon>plugins/Morpheus/icons/dist/devices/desktop.png</deviceTypeIcon>
-		<deviceBrand>Unknown</deviceBrand>
-		<deviceModel>Generic Desktop</deviceModel>
-		<operatingSystem>GNU/Linux</operatingSystem>
-		<operatingSystemName>GNU/Linux</operatingSystemName>
-		<operatingSystemIcon>plugins/Morpheus/icons/dist/os/LIN.png</operatingSystemIcon>
-		<operatingSystemCode>LIN</operatingSystemCode>
-		<operatingSystemVersion />
-		<browserFamily>WebKit</browserFamily>
-		<browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription>
-		<browser>Chrome 19.0</browser>
-		<browserName>Chrome</browserName>
-		<browserIcon>plugins/Morpheus/icons/dist/browsers/CH.png</browserIcon>
-		<browserCode>CH</browserCode>
-		<browserVersion>19.0</browserVersion>
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
-		<events>0</events>
-		<continent>North America</continent>
-		<continentCode>amn</continentCode>
-		<country>United States</country>
-		<countryCode>us</countryCode>
-		<countryFlag>plugins/Morpheus/icons/dist/flags/us.png</countryFlag>
-		<region>Virginia</region>
-		<regionCode>VA</regionCode>
-		<city>Ashburn</city>
-		<location>Ashburn, Virginia, United States</location>
-		<visitLocalTime>13:49:48</visitLocalTime>
-		<visitLocalHour>13</visitLocalHour>
-		<daysSinceLastVisit>0</daysSinceLastVisit>
-		<customVariables>
-		</customVariables>
-		<resolution>unknown</resolution>
-		<plugins />
-		<pluginsIcons />
-	</row>
-	<row>
-		<idSite>1</idSite>
-		<idVisit>6</idVisit>
-		<visitIp>72.44.32.10</visitIp>
-		
-		<actionDetails>
-			<row>
-				<type>goal</type>
-				<goalName>all</goalName>
-				<goalId>1</goalId>
-				<revenue>5</revenue>
-				<goalPageId>6</goalPageId>
-				
-				<url>http://piwik.net/download/counter/</url>
-				<icon>plugins/Morpheus/images/goal.png</icon>
-				
-			</row>
-			<row>
-				<type>action</type>
-				<url>http://piwik.net/download/counter/</url>
-				<pageTitle />
-				<pageIdAction>6</pageIdAction>
-				
-				
-				<pageId>6</pageId>
-				<bandwidth>3574</bandwidth>
-				<interactionPosition>1</interactionPosition>
-				<icon />
-				
-				<customVariables>
-					<row>
-						<customVariablePageName1>HTTP-code</customVariablePageName1>
-						<customVariablePageValue1>200</customVariablePageValue1>
-					</row>
-				</customVariables>
-				<bandwidth_pretty>3.5 K</bandwidth_pretty>
-			</row>
-		</actionDetails>
-		<goalConversions>1</goalConversions>
-		<siteCurrency>USD</siteCurrency>
-		<siteCurrencySymbol>$</siteCurrencySymbol>
-		
-		
-		
-		
-		<siteName>Piwik test</siteName>
-		
-		
-		
-		
-		
-		
-		<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>0</visitDuration>
-		<visitDurationPretty>0s</visitDurationPretty>
-		<searches>0</searches>
-		<actions>1</actions>
-		<interactions>1</interactions>
-		<referrerType>direct</referrerType>
-		<referrerTypeName>Direct Entry</referrerTypeName>
-		<referrerName />
-		<referrerKeyword />
-		<referrerKeywordPosition />
-		<referrerUrl />
-		<referrerSearchEngineUrl />
-		<referrerSearchEngineIcon />
-		<languageCode />
-		<language>Unknown</language>
-		<deviceType>Desktop</deviceType>
-		<deviceTypeIcon>plugins/Morpheus/icons/dist/devices/desktop.png</deviceTypeIcon>
-		<deviceBrand>Unknown</deviceBrand>
-		<deviceModel>Generic Desktop</deviceModel>
-		<operatingSystem>GNU/Linux</operatingSystem>
-		<operatingSystemName>GNU/Linux</operatingSystemName>
-		<operatingSystemIcon>plugins/Morpheus/icons/dist/os/LIN.png</operatingSystemIcon>
-		<operatingSystemCode>LIN</operatingSystemCode>
-		<operatingSystemVersion />
-		<browserFamily>WebKit</browserFamily>
-		<browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription>
-		<browser>GNOME Web 2.30</browser>
-		<browserName>GNOME Web</browserName>
-		<browserIcon>plugins/Morpheus/icons/dist/browsers/EP.png</browserIcon>
-		<browserCode>EP</browserCode>
-		<browserVersion>2.30</browserVersion>
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
-		<events>0</events>
-		<continent>North America</continent>
-		<continentCode>amn</continentCode>
-		<country>United States</country>
-		<countryCode>us</countryCode>
-		<countryFlag>plugins/Morpheus/icons/dist/flags/us.png</countryFlag>
-		<region>Virginia</region>
-		<regionCode>VA</regionCode>
-		<city>Ashburn</city>
-		<location>Ashburn, Virginia, United States</location>
-		<visitLocalTime>13:48:20</visitLocalTime>
-		<visitLocalHour>13</visitLocalHour>
-		<daysSinceLastVisit>0</daysSinceLastVisit>
-		<customVariables>
-		</customVariables>
-		<resolution>unknown</resolution>
-		<plugins />
-		<pluginsIcons />
-	</row>
-	<row>
-		<idSite>1</idSite>
-		<idVisit>5</idVisit>
-		<visitIp>72.44.32.10</visitIp>
-		
-		<actionDetails>
-			<row>
-				<type>goal</type>
-				<goalName>all</goalName>
-				<goalId>1</goalId>
-				<revenue>5</revenue>
-				<goalPageId>5</goalPageId>
-				
-				<url>http://piwik.net/</url>
-				<icon>plugins/Morpheus/images/goal.png</icon>
-				
-			</row>
-			<row>
-				<type>action</type>
-				<url>http://piwik.net/</url>
-				<pageTitle />
-				<pageIdAction>5</pageIdAction>
-				
-				
-				<pageId>5</pageId>
-				<bandwidth>3574</bandwidth>
-				<interactionPosition>1</interactionPosition>
-				<icon />
-				
-				<customVariables>
-					<row>
-						<customVariablePageName1>HTTP-code</customVariablePageName1>
-						<customVariablePageValue1>200</customVariablePageValue1>
-					</row>
-				</customVariables>
-				<bandwidth_pretty>3.5 K</bandwidth_pretty>
-			</row>
-		</actionDetails>
-		<goalConversions>1</goalConversions>
-		<siteCurrency>USD</siteCurrency>
-		<siteCurrencySymbol>$</siteCurrencySymbol>
-		
-		
-		
-		
-		<siteName>Piwik test</siteName>
-		
-		
-		
-		
-		
-		
-		<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>0</visitDuration>
-		<visitDurationPretty>0s</visitDurationPretty>
-		<searches>0</searches>
-		<actions>1</actions>
-		<interactions>1</interactions>
-		<referrerType>direct</referrerType>
-		<referrerTypeName>Direct Entry</referrerTypeName>
-		<referrerName />
-		<referrerKeyword />
-		<referrerKeywordPosition />
-		<referrerUrl />
-		<referrerSearchEngineUrl />
-		<referrerSearchEngineIcon />
-		<languageCode />
-		<language>Unknown</language>
-		<deviceType>Desktop</deviceType>
-		<deviceTypeIcon>plugins/Morpheus/icons/dist/devices/desktop.png</deviceTypeIcon>
-		<deviceBrand>Unknown</deviceBrand>
-		<deviceModel>Generic Desktop</deviceModel>
-		<operatingSystem>Windows 7</operatingSystem>
-		<operatingSystemName>Windows</operatingSystemName>
-		<operatingSystemIcon>plugins/Morpheus/icons/dist/os/WIN.png</operatingSystemIcon>
-		<operatingSystemCode>WIN</operatingSystemCode>
-		<operatingSystemVersion>7</operatingSystemVersion>
-		<browserFamily>Trident</browserFamily>
-		<browserFamilyDescription>Trident (IE)</browserFamilyDescription>
-		<browser>Internet Explorer 9.0</browser>
-		<browserName>Internet Explorer</browserName>
-		<browserIcon>plugins/Morpheus/icons/dist/browsers/IE.png</browserIcon>
-		<browserCode>IE</browserCode>
-		<browserVersion>9.0</browserVersion>
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
-		<events>0</events>
-		<continent>North America</continent>
-		<continentCode>amn</continentCode>
-		<country>United States</country>
-		<countryCode>us</countryCode>
-		<countryFlag>plugins/Morpheus/icons/dist/flags/us.png</countryFlag>
-		<region>Virginia</region>
-		<regionCode>VA</regionCode>
-		<city>Ashburn</city>
-		<location>Ashburn, Virginia, United States</location>
-		<visitLocalTime>13:48:07</visitLocalTime>
-		<visitLocalHour>13</visitLocalHour>
-		<daysSinceLastVisit>0</daysSinceLastVisit>
-		<customVariables>
-		</customVariables>
-		<resolution>unknown</resolution>
-		<plugins />
-		<pluginsIcons />
-	</row>
-	<row>
-		<idSite>1</idSite>
-		<idVisit>4</idVisit>
-		<visitIp>175.41.192.40</visitIp>
-		
-		<actionDetails>
-			<row>
-				<type>goal</type>
-				<goalName>all</goalName>
-				<goalId>1</goalId>
-				<revenue>5</revenue>
-				<goalPageId>4</goalPageId>
-				
-				<url>http://piwik.net/docs/manage-websites/</url>
-				<icon>plugins/Morpheus/images/goal.png</icon>
-				
-			</row>
-			<row>
-				<type>action</type>
-				<url>http://piwik.net/docs/manage-websites/</url>
-				<pageTitle />
-				<pageIdAction>4</pageIdAction>
-				
-				
-				<pageId>4</pageId>
-				<bandwidth>3574</bandwidth>
-				<interactionPosition>1</interactionPosition>
-				<icon />
-				
-				<customVariables>
-					<row>
-						<customVariablePageName1>HTTP-code</customVariablePageName1>
-						<customVariablePageValue1>200</customVariablePageValue1>
-					</row>
-				</customVariables>
-				<bandwidth_pretty>3.5 K</bandwidth_pretty>
-			</row>
-		</actionDetails>
-		<goalConversions>1</goalConversions>
-		<siteCurrency>USD</siteCurrency>
-		<siteCurrencySymbol>$</siteCurrencySymbol>
-		
-		
-		
-		
-		<siteName>Piwik test</siteName>
-		
-		
-		
-		
-		
-		
-		<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>0</visitDuration>
-		<visitDurationPretty>0s</visitDurationPretty>
-		<searches>0</searches>
-		<actions>1</actions>
-		<interactions>1</interactions>
-		<referrerType>direct</referrerType>
-		<referrerTypeName>Direct Entry</referrerTypeName>
-		<referrerName />
-		<referrerKeyword />
-		<referrerKeywordPosition />
-		<referrerUrl />
-		<referrerSearchEngineUrl />
-		<referrerSearchEngineIcon />
-		<languageCode />
-		<language>Unknown</language>
-		<deviceType>Desktop</deviceType>
-		<deviceTypeIcon>plugins/Morpheus/icons/dist/devices/desktop.png</deviceTypeIcon>
-		<deviceBrand>Unknown</deviceBrand>
-		<deviceModel>Generic Desktop</deviceModel>
-		<operatingSystem>GNU/Linux</operatingSystem>
-		<operatingSystemName>GNU/Linux</operatingSystemName>
-		<operatingSystemIcon>plugins/Morpheus/icons/dist/os/LIN.png</operatingSystemIcon>
-		<operatingSystemCode>LIN</operatingSystemCode>
-		<operatingSystemVersion />
-		<browserFamily>Gecko</browserFamily>
-		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
-		<browser>Firefox 6.0</browser>
-		<browserName>Firefox</browserName>
-		<browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon>
-		<browserCode>FF</browserCode>
-		<browserVersion>6.0</browserVersion>
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
-		<events>0</events>
-		<continent>Asia</continent>
-		<continentCode>asi</continentCode>
-		<country>Japan</country>
-		<countryCode>jp</countryCode>
-		<countryFlag>plugins/Morpheus/icons/dist/flags/jp.png</countryFlag>
-		<region />
-		<regionCode />
-		<city />
-		<location>Japan</location>
-		<visitLocalTime>08:12:03</visitLocalTime>
-		<visitLocalHour>8</visitLocalHour>
-		<daysSinceLastVisit>0</daysSinceLastVisit>
-		<customVariables>
-		</customVariables>
-		<resolution>unknown</resolution>
-		<plugins />
-		<pluginsIcons />
-	</row>
-	<row>
-		<idSite>1</idSite>
-		<idVisit>3</idVisit>
-		<visitIp>175.41.192.40</visitIp>
-		
-		<actionDetails>
-			<row>
-				<type>goal</type>
-				<goalName>all</goalName>
-				<goalId>1</goalId>
-				<revenue>5</revenue>
-				<goalPageId>3</goalPageId>
-				
-				<url>http://piwik.net/blog/category/community/</url>
-				<icon>plugins/Morpheus/images/goal.png</icon>
-				
-			</row>
-			<row>
-				<type>action</type>
-				<url>http://piwik.net/blog/category/community/</url>
-				<pageTitle />
-				<pageIdAction>3</pageIdAction>
-				
-				
-				<pageId>3</pageId>
-				<bandwidth>3574</bandwidth>
-				<interactionPosition>1</interactionPosition>
-				<icon />
-				
-				<customVariables>
-					<row>
-						<customVariablePageName1>HTTP-code</customVariablePageName1>
-						<customVariablePageValue1>200</customVariablePageValue1>
-					</row>
-				</customVariables>
-				<bandwidth_pretty>3.5 K</bandwidth_pretty>
-			</row>
-		</actionDetails>
-		<goalConversions>1</goalConversions>
-		<siteCurrency>USD</siteCurrency>
-		<siteCurrencySymbol>$</siteCurrencySymbol>
-		
-		
-		
-		
-		<siteName>Piwik test</siteName>
-		
-		
-		
-		
-		
-		
-		<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>0</visitDuration>
-		<visitDurationPretty>0s</visitDurationPretty>
-		<searches>0</searches>
-		<actions>1</actions>
-		<interactions>1</interactions>
-		<referrerType>direct</referrerType>
-		<referrerTypeName>Direct Entry</referrerTypeName>
-		<referrerName />
-		<referrerKeyword />
-		<referrerKeywordPosition />
-		<referrerUrl />
-		<referrerSearchEngineUrl />
-		<referrerSearchEngineIcon />
-		<languageCode />
-		<language>Unknown</language>
-		<deviceType>Desktop</deviceType>
-		<deviceTypeIcon>plugins/Morpheus/icons/dist/devices/desktop.png</deviceTypeIcon>
-		<deviceBrand>Unknown</deviceBrand>
-		<deviceModel>Generic Desktop</deviceModel>
-		<operatingSystem>GNU/Linux</operatingSystem>
-		<operatingSystemName>GNU/Linux</operatingSystemName>
-		<operatingSystemIcon>plugins/Morpheus/icons/dist/os/LIN.png</operatingSystemIcon>
-		<operatingSystemCode>LIN</operatingSystemCode>
-		<operatingSystemVersion />
-		<browserFamily>WebKit</browserFamily>
-		<browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription>
-		<browser>GNOME Web 2.30</browser>
-		<browserName>GNOME Web</browserName>
-		<browserIcon>plugins/Morpheus/icons/dist/browsers/EP.png</browserIcon>
-		<browserCode>EP</browserCode>
-		<browserVersion>2.30</browserVersion>
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
-		<events>0</events>
-		<continent>Asia</continent>
-		<continentCode>asi</continentCode>
-		<country>Japan</country>
-		<countryCode>jp</countryCode>
-		<countryFlag>plugins/Morpheus/icons/dist/flags/jp.png</countryFlag>
-		<region />
-		<regionCode />
-		<city />
-		<location>Japan</location>
-		<visitLocalTime>08:11:56</visitLocalTime>
-		<visitLocalHour>8</visitLocalHour>
-		<daysSinceLastVisit>0</daysSinceLastVisit>
-		<customVariables>
-		</customVariables>
-		<resolution>unknown</resolution>
-		<plugins />
-		<pluginsIcons />
-	</row>
-	<row>
-		<idSite>1</idSite>
-		<idVisit>2</idVisit>
-		<visitIp>175.41.192.40</visitIp>
-		
-		<actionDetails>
-			<row>
-				<type>goal</type>
-				<goalName>all</goalName>
-				<goalId>1</goalId>
-				<revenue>5</revenue>
-				<goalPageId>2</goalPageId>
-				
-				<url>http://piwik.net/faq/</url>
-				<icon>plugins/Morpheus/images/goal.png</icon>
-				
-			</row>
-			<row>
-				<type>action</type>
-				<url>http://piwik.net/faq/</url>
-				<pageTitle />
-				<pageIdAction>2</pageIdAction>
-				
-				
-				<pageId>2</pageId>
-				<bandwidth>3574</bandwidth>
-				<interactionPosition>1</interactionPosition>
-				<icon />
-				
-				<customVariables>
-					<row>
-						<customVariablePageName1>HTTP-code</customVariablePageName1>
-						<customVariablePageValue1>200</customVariablePageValue1>
-					</row>
-				</customVariables>
-				<bandwidth_pretty>3.5 K</bandwidth_pretty>
-			</row>
-		</actionDetails>
-		<goalConversions>1</goalConversions>
-		<siteCurrency>USD</siteCurrency>
-		<siteCurrencySymbol>$</siteCurrencySymbol>
-		
-		
-		
-		
-		<siteName>Piwik test</siteName>
-		
-		
-		
-		
-		
-		
-		<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>0</visitDuration>
-		<visitDurationPretty>0s</visitDurationPretty>
-		<searches>0</searches>
-		<actions>1</actions>
-		<interactions>1</interactions>
-		<referrerType>direct</referrerType>
-		<referrerTypeName>Direct Entry</referrerTypeName>
-		<referrerName />
-		<referrerKeyword />
-		<referrerKeywordPosition />
-		<referrerUrl />
-		<referrerSearchEngineUrl />
-		<referrerSearchEngineIcon />
-		<languageCode />
-		<language>Unknown</language>
-		<deviceType>Smartphone</deviceType>
-		<deviceTypeIcon>plugins/Morpheus/icons/dist/devices/smartphone.png</deviceTypeIcon>
-		<deviceBrand>HTC</deviceBrand>
-		<deviceModel>Vision</deviceModel>
-		<operatingSystem>Android 2.3</operatingSystem>
-		<operatingSystemName>Android</operatingSystemName>
-		<operatingSystemIcon>plugins/Morpheus/icons/dist/os/AND.png</operatingSystemIcon>
-		<operatingSystemCode>AND</operatingSystemCode>
-		<operatingSystemVersion>2.3</operatingSystemVersion>
-		<browserFamily>WebKit</browserFamily>
-		<browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription>
-		<browser>Android Browser</browser>
-		<browserName>Android Browser</browserName>
-		<browserIcon>plugins/Morpheus/icons/dist/browsers/AN.png</browserIcon>
-		<browserCode>AN</browserCode>
-		<browserVersion />
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
-		<events>0</events>
-		<continent>Asia</continent>
-		<continentCode>asi</continentCode>
-		<country>Japan</country>
-		<countryCode>jp</countryCode>
-		<countryFlag>plugins/Morpheus/icons/dist/flags/jp.png</countryFlag>
-		<region />
-		<regionCode />
-		<city />
-		<location>Japan</location>
-		<visitLocalTime>08:11:30</visitLocalTime>
-		<visitLocalHour>8</visitLocalHour>
-		<daysSinceLastVisit>0</daysSinceLastVisit>
-		<customVariables>
-		</customVariables>
-		<resolution>unknown</resolution>
-		<plugins />
-		<pluginsIcons />
-	</row>
-	<row>
-		<idSite>1</idSite>
-		<idVisit>59</idVisit>
-		<visitIp>175.41.193.46</visitIp>
-		
-		<actionDetails>
-			<row>
-				<type>goal</type>
-				<goalName>all</goalName>
-				<goalId>1</goalId>
-				<revenue>5</revenue>
-				<goalPageId>81</goalPageId>
-				
-				<url>http://www.included4.com/blog/category/meta/</url>
-				<icon>plugins/Morpheus/images/goal.png</icon>
-				
-			</row>
-			<row>
-				<type>action</type>
-				<url>http://www.included4.com/blog/category/meta/</url>
-				<pageTitle />
-				<pageIdAction>57</pageIdAction>
-				
-				
-				<pageId>81</pageId>
-				<bandwidth>3574</bandwidth>
-				<interactionPosition>1</interactionPosition>
-				<icon />
-				
-				<customVariables>
-					<row>
-						<customVariablePageName1>HTTP-code</customVariablePageName1>
-						<customVariablePageValue1>200</customVariablePageValue1>
-					</row>
-				</customVariables>
-				<bandwidth_pretty>3.5 K</bandwidth_pretty>
-			</row>
-		</actionDetails>
-		<goalConversions>1</goalConversions>
-		<siteCurrency>USD</siteCurrency>
-		<siteCurrencySymbol>$</siteCurrencySymbol>
-		
-		
-		
-		
-		<siteName>Piwik test</siteName>
-		
-		
-		
-		
-		
-		
-		<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>0</visitDuration>
-		<visitDurationPretty>0s</visitDurationPretty>
-		<searches>0</searches>
-		<actions>1</actions>
-		<interactions>1</interactions>
-		<referrerType>direct</referrerType>
-		<referrerTypeName>Direct Entry</referrerTypeName>
-		<referrerName />
-		<referrerKeyword />
-		<referrerKeywordPosition />
-		<referrerUrl />
-		<referrerSearchEngineUrl />
-		<referrerSearchEngineIcon />
-		<languageCode />
-		<language>Unknown</language>
-		<deviceType>Desktop</deviceType>
-		<deviceTypeIcon>plugins/Morpheus/icons/dist/devices/desktop.png</deviceTypeIcon>
-		<deviceBrand>Apple</deviceBrand>
-		<deviceModel>Generic Desktop</deviceModel>
-		<operatingSystem>Mac 10.6</operatingSystem>
-		<operatingSystemName>Mac</operatingSystemName>
-		<operatingSystemIcon>plugins/Morpheus/icons/dist/os/MAC.png</operatingSystemIcon>
-		<operatingSystemCode>MAC</operatingSystemCode>
-		<operatingSystemVersion>10.6</operatingSystemVersion>
-		<browserFamily>WebKit</browserFamily>
-		<browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription>
-		<browser>RockMelt 0.9</browser>
-		<browserName>RockMelt</browserName>
-		<browserIcon>plugins/Morpheus/icons/dist/browsers/RM.png</browserIcon>
-		<browserCode>RM</browserCode>
-		<browserVersion>0.9</browserVersion>
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
-		<events>0</events>
-		<continent>Asia</continent>
-		<continentCode>asi</continentCode>
-		<country>Japan</country>
-		<countryCode>jp</countryCode>
-		<countryFlag>plugins/Morpheus/icons/dist/flags/jp.png</countryFlag>
-		<region />
-		<regionCode />
-		<city />
-		<location>Japan</location>
-		<visitLocalTime>08:10:39</visitLocalTime>
-		<visitLocalHour>8</visitLocalHour>
-		<daysSinceLastVisit>0</daysSinceLastVisit>
-		<customVariables>
-		</customVariables>
-		<resolution>unknown</resolution>
-		<plugins />
-		<pluginsIcons />
-	</row>
-	<row>
-		<idSite>1</idSite>
-		<idVisit>61</idVisit>
-		<visitIp>175.41.191.46</visitIp>
-		
-		<actionDetails>
-			<row>
-				<type>goal</type>
-				<goalName>all</goalName>
-				<goalId>1</goalId>
-				<revenue>5</revenue>
-				<goalPageId>83</goalPageId>
-				
-				<url>http://www.included2.com/blog/category/meta/</url>
-				<icon>plugins/Morpheus/images/goal.png</icon>
-				
-			</row>
-			<row>
-				<type>action</type>
-				<url>http://www.included2.com/blog/category/meta/</url>
-				<pageTitle />
-				<pageIdAction>59</pageIdAction>
-				
-				
-				<pageId>83</pageId>
-				<bandwidth>3574</bandwidth>
-				<interactionPosition>1</interactionPosition>
-				<icon />
-				
-				<customVariables>
-					<row>
-						<customVariablePageName1>HTTP-code</customVariablePageName1>
-						<customVariablePageValue1>200</customVariablePageValue1>
-					</row>
-				</customVariables>
-				<bandwidth_pretty>3.5 K</bandwidth_pretty>
-			</row>
-		</actionDetails>
-		<goalConversions>1</goalConversions>
-		<siteCurrency>USD</siteCurrency>
-		<siteCurrencySymbol>$</siteCurrencySymbol>
-		
-		
-		
-		
-		<siteName>Piwik test</siteName>
-		
-		
-		
-		
-		
-		
-		<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>0</visitDuration>
-		<visitDurationPretty>0s</visitDurationPretty>
-		<searches>0</searches>
-		<actions>1</actions>
-		<interactions>1</interactions>
-		<referrerType>direct</referrerType>
-		<referrerTypeName>Direct Entry</referrerTypeName>
-		<referrerName />
-		<referrerKeyword />
-		<referrerKeywordPosition />
-		<referrerUrl />
-		<referrerSearchEngineUrl />
-		<referrerSearchEngineIcon />
-		<languageCode />
-		<language>Unknown</language>
-		<deviceType>Desktop</deviceType>
-		<deviceTypeIcon>plugins/Morpheus/icons/dist/devices/desktop.png</deviceTypeIcon>
-		<deviceBrand>Apple</deviceBrand>
-		<deviceModel>Generic Desktop</deviceModel>
-		<operatingSystem>Mac 10.6</operatingSystem>
-		<operatingSystemName>Mac</operatingSystemName>
-		<operatingSystemIcon>plugins/Morpheus/icons/dist/os/MAC.png</operatingSystemIcon>
-		<operatingSystemCode>MAC</operatingSystemCode>
-		<operatingSystemVersion>10.6</operatingSystemVersion>
-		<browserFamily>WebKit</browserFamily>
-		<browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription>
-		<browser>RockMelt 0.9</browser>
-		<browserName>RockMelt</browserName>
-		<browserIcon>plugins/Morpheus/icons/dist/browsers/RM.png</browserIcon>
-		<browserCode>RM</browserCode>
-		<browserVersion>0.9</browserVersion>
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
-		<events>0</events>
-		<continent>Asia</continent>
-		<continentCode>asi</continentCode>
-		<country>Singapore</country>
-		<countryCode>sg</countryCode>
-		<countryFlag>plugins/Morpheus/icons/dist/flags/sg.png</countryFlag>
-		<region />
-		<regionCode />
-		<city />
-		<location>Singapore</location>
-		<visitLocalTime>08:10:39</visitLocalTime>
-		<visitLocalHour>8</visitLocalHour>
-		<daysSinceLastVisit>0</daysSinceLastVisit>
-		<customVariables>
-		</customVariables>
-		<resolution>unknown</resolution>
-		<plugins />
-		<pluginsIcons />
-	</row>
-</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__Live.getLastVisitsDetails_year.xml b/tests/PHPUnit/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__Live.getLastVisitsDetails_year.xml
deleted file mode 100644
index fe33e67e8b..0000000000
--- a/tests/PHPUnit/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__Live.getLastVisitsDetails_year.xml
+++ /dev/null
@@ -1,1498 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<result>
-	<row>
-		<idSite>1</idSite>
-		<idVisit>57</idVisit>
-		<visitIp>175.41.192.40</visitIp>
-		
-		<actionDetails>
-			<row>
-				<type>action</type>
-				<url>http://piwik.net/blog/category/meta/</url>
-				<pageTitle />
-				<pageIdAction>1</pageIdAction>
-				
-				
-				<pageId>70</pageId>
-				<bandwidth />
-				<timeSpent>0</timeSpent>
-				<timeSpentPretty>0s</timeSpentPretty>
-				<generationTimeMilliseconds>123</generationTimeMilliseconds>
-				<generationTime>0.12s</generationTime>
-				<interactionPosition>1</interactionPosition>
-				<icon />
-				
-				<customVariables>
-					<row>
-						<customVariablePageName1>HTTP-code</customVariablePageName1>
-						<customVariablePageValue1>200</customVariablePageValue1>
-					</row>
-				</customVariables>
-				<bandwidth_pretty>0 M</bandwidth_pretty>
-			</row>
-			<row>
-				<type>goal</type>
-				<goalName>all</goalName>
-				<goalId>1</goalId>
-				<revenue>5</revenue>
-				<goalPageId>70</goalPageId>
-				
-				<url>http://piwik.net/blog/category/meta/</url>
-				<icon>plugins/Morpheus/images/goal.png</icon>
-				
-			</row>
-			<row>
-				<type>action</type>
-				<url>http://piwik.net/blog/category/meta/</url>
-				<pageTitle />
-				<pageIdAction>1</pageIdAction>
-				
-				
-				<pageId>74</pageId>
-				<bandwidth />
-				<timeSpent>0</timeSpent>
-				<timeSpentPretty>0s</timeSpentPretty>
-				<generationTimeMilliseconds>120</generationTimeMilliseconds>
-				<generationTime>0.12s</generationTime>
-				<interactionPosition>5</interactionPosition>
-				<icon />
-				
-				<customVariables>
-					<row>
-						<customVariablePageName1>HTTP-code</customVariablePageName1>
-						<customVariablePageValue1>200</customVariablePageValue1>
-					</row>
-				</customVariables>
-				<bandwidth_pretty>0 M</bandwidth_pretty>
-			</row>
-			<row>
-				<type>action</type>
-				<url>http://piwik.net/blog/category/meta/</url>
-				<pageTitle />
-				<pageIdAction>1</pageIdAction>
-				
-				
-				<pageId>78</pageId>
-				<bandwidth />
-				<timeSpent>52</timeSpent>
-				<timeSpentPretty>52s</timeSpentPretty>
-				<generationTimeMilliseconds>23</generationTimeMilliseconds>
-				<generationTime>0.02s</generationTime>
-				<interactionPosition>9</interactionPosition>
-				<icon />
-				
-				<customVariables>
-					<row>
-						<customVariablePageName1>HTTP-code</customVariablePageName1>
-						<customVariablePageValue1>200</customVariablePageValue1>
-					</row>
-				</customVariables>
-				<bandwidth_pretty>0 M</bandwidth_pretty>
-			</row>
-			<row>
-				<type>action</type>
-				<url>http://piwik.net/faq/</url>
-				<pageTitle />
-				<pageIdAction>2</pageIdAction>
-				
-				
-				<pageId>71</pageId>
-				<bandwidth />
-				<timeSpent>50</timeSpent>
-				<timeSpentPretty>50s</timeSpentPretty>
-				<generationTimeMilliseconds>234</generationTimeMilliseconds>
-				<generationTime>0.23s</generationTime>
-				<interactionPosition>2</interactionPosition>
-				<icon />
-				
-				<customVariables>
-					<row>
-						<customVariablePageName1>HTTP-code</customVariablePageName1>
-						<customVariablePageValue1>200</customVariablePageValue1>
-					</row>
-				</customVariables>
-				<bandwidth_pretty>0 M</bandwidth_pretty>
-			</row>
-			<row>
-				<type>action</type>
-				<url>http://piwik.net/faq/</url>
-				<pageTitle />
-				<pageIdAction>2</pageIdAction>
-				
-				
-				<pageId>75</pageId>
-				<bandwidth />
-				<timeSpent>49</timeSpent>
-				<timeSpentPretty>49s</timeSpentPretty>
-				<generationTimeMilliseconds>294</generationTimeMilliseconds>
-				<generationTime>0.29s</generationTime>
-				<interactionPosition>6</interactionPosition>
-				<icon />
-				
-				<customVariables>
-					<row>
-						<customVariablePageName1>HTTP-code</customVariablePageName1>
-						<customVariablePageValue1>200</customVariablePageValue1>
-					</row>
-				</customVariables>
-				<bandwidth_pretty>0 M</bandwidth_pretty>
-			</row>
-			<row>
-				<type>action</type>
-				<url>http://piwik.net/faq/</url>
-				<pageTitle />
-				<pageIdAction>2</pageIdAction>
-				
-				
-				<pageId>79</pageId>
-				<bandwidth />
-				<timeSpent>26</timeSpent>
-				<timeSpentPretty>26s</timeSpentPretty>
-				<generationTimeMilliseconds>237</generationTimeMilliseconds>
-				<generationTime>0.24s</generationTime>
-				<interactionPosition>10</interactionPosition>
-				<icon />
-				
-				<customVariables>
-					<row>
-						<customVariablePageName1>HTTP-code</customVariablePageName1>
-						<customVariablePageValue1>200</customVariablePageValue1>
-					</row>
-				</customVariables>
-				<bandwidth_pretty>0 M</bandwidth_pretty>
-			</row>
-			<row>
-				<type>action</type>
-				<url>http://piwik.net/blog/category/community/</url>
-				<pageTitle />
-				<pageIdAction>3</pageIdAction>
-				
-				
-				<pageId>72</pageId>
-				<bandwidth />
-				<timeSpent>26</timeSpent>
-				<timeSpentPretty>26s</timeSpentPretty>
-				<generationTimeMilliseconds>1324</generationTimeMilliseconds>
-				<generationTime>1.32s</generationTime>
-				<interactionPosition>3</interactionPosition>
-				<icon />
-				
-				<customVariables>
-					<row>
-						<customVariablePageName1>HTTP-code</customVariablePageName1>
-						<customVariablePageValue1>200</customVariablePageValue1>
-					</row>
-				</customVariables>
-				<bandwidth_pretty>0 M</bandwidth_pretty>
-			</row>
-			<row>
-				<type>action</type>
-				<url>http://piwik.net/blog/category/community/</url>
-				<pageTitle />
-				<pageIdAction>3</pageIdAction>
-				
-				
-				<pageId>76</pageId>
-				<bandwidth />
-				<timeSpent>7</timeSpent>
-				<timeSpentPretty>7s</timeSpentPretty>
-				<generationTimeMilliseconds>624</generationTimeMilliseconds>
-				<generationTime>0.62s</generationTime>
-				<interactionPosition>7</interactionPosition>
-				<icon />
-				
-				<customVariables>
-					<row>
-						<customVariablePageName1>HTTP-code</customVariablePageName1>
-						<customVariablePageValue1>200</customVariablePageValue1>
-					</row>
-				</customVariables>
-				<bandwidth_pretty>0 M</bandwidth_pretty>
-			</row>
-			<row>
-				<type>action</type>
-				<url>http://piwik.net/docs/manage-websites/</url>
-				<pageTitle />
-				<pageIdAction>4</pageIdAction>
-				
-				
-				<pageId>73</pageId>
-				<bandwidth />
-				<timeSpent>8</timeSpent>
-				<timeSpentPretty>8s</timeSpentPretty>
-				<generationTimeMilliseconds>543</generationTimeMilliseconds>
-				<generationTime>0.54s</generationTime>
-				<interactionPosition>4</interactionPosition>
-				<icon />
-				
-				<customVariables>
-					<row>
-						<customVariablePageName1>HTTP-code</customVariablePageName1>
-						<customVariablePageValue1>200</customVariablePageValue1>
-					</row>
-				</customVariables>
-				<bandwidth_pretty>0 M</bandwidth_pretty>
-			</row>
-			<row>
-				<type>action</type>
-				<url>http://piwik.net/docs/manage-websites/</url>
-				<pageTitle />
-				<pageIdAction>4</pageIdAction>
-				
-				
-				<pageId>77</pageId>
-				<bandwidth />
-				<generationTimeMilliseconds>343</generationTimeMilliseconds>
-				<generationTime>0.34s</generationTime>
-				<interactionPosition>8</interactionPosition>
-				<icon />
-				
-				<customVariables>
-					<row>
-						<customVariablePageName1>HTTP-code</customVariablePageName1>
-						<customVariablePageValue1>200</customVariablePageValue1>
-					</row>
-				</customVariables>
-				<bandwidth_pretty>0 M</bandwidth_pretty>
-			</row>
-		</actionDetails>
-		<goalConversions>1</goalConversions>
-		<siteCurrency>USD</siteCurrency>
-		<siteCurrencySymbol>$</siteCurrencySymbol>
-		
-		
-		
-		
-		<siteName>Piwik test</siteName>
-		
-		
-		
-		
-		
-		
-		<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>54</visitDuration>
-		<visitDurationPretty>54s</visitDurationPretty>
-		<searches>0</searches>
-		<actions>10</actions>
-		<interactions>10</interactions>
-		<referrerType>direct</referrerType>
-		<referrerTypeName>Direct Entry</referrerTypeName>
-		<referrerName />
-		<referrerKeyword />
-		<referrerKeywordPosition />
-		<referrerUrl />
-		<referrerSearchEngineUrl />
-		<referrerSearchEngineIcon />
-		<languageCode />
-		<language>Unknown</language>
-		<deviceType>Unknown</deviceType>
-		<deviceTypeIcon>plugins/Morpheus/icons/dist/devices/unknown.png</deviceTypeIcon>
-		<deviceBrand>Unknown</deviceBrand>
-		<deviceModel>Unknown</deviceModel>
-		<operatingSystem>Unknown</operatingSystem>
-		<operatingSystemName>Unknown</operatingSystemName>
-		<operatingSystemIcon>plugins/Morpheus/icons/dist/os/UNK.png</operatingSystemIcon>
-		<operatingSystemCode>UNK</operatingSystemCode>
-		<operatingSystemVersion>UNK</operatingSystemVersion>
-		<browserFamily />
-		<browserFamilyDescription>Unknown</browserFamilyDescription>
-		<browser>Unknown</browser>
-		<browserName>Unknown</browserName>
-		<browserIcon>plugins/Morpheus/icons/dist/browsers/UNK.png</browserIcon>
-		<browserCode>UNK</browserCode>
-		<browserVersion />
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
-		<events>0</events>
-		<continent>Asia</continent>
-		<continentCode>asi</continentCode>
-		<country>Japan</country>
-		<countryCode>jp</countryCode>
-		<countryFlag>plugins/Morpheus/icons/dist/flags/jp.png</countryFlag>
-		<region />
-		<regionCode />
-		<city />
-		<location>Japan</location>
-		<visitLocalTime>08:10:38</visitLocalTime>
-		<visitLocalHour>8</visitLocalHour>
-		<daysSinceLastVisit>0</daysSinceLastVisit>
-		<customVariables>
-		</customVariables>
-		<resolution>unknown</resolution>
-		<plugins />
-		<pluginsIcons />
-	</row>
-	<row>
-		<idSite>1</idSite>
-		<idVisit>62</idVisit>
-		<visitIp>175.41.191.47</visitIp>
-		
-		<actionDetails>
-			<row>
-				<type>goal</type>
-				<goalName>all</goalName>
-				<goalId>1</goalId>
-				<revenue>5</revenue>
-				<goalPageId>84</goalPageId>
-				
-				<url>http://www.notdatefiltered.com/blog/category/meta/</url>
-				<icon>plugins/Morpheus/images/goal.png</icon>
-				
-			</row>
-			<row>
-				<type>action</type>
-				<url>http://www.notdatefiltered.com/blog/category/meta/</url>
-				<pageTitle />
-				<pageIdAction>60</pageIdAction>
-				
-				
-				<pageId>84</pageId>
-				<bandwidth>3574</bandwidth>
-				<interactionPosition>1</interactionPosition>
-				<icon />
-				
-				<customVariables>
-					<row>
-						<customVariablePageName1>HTTP-code</customVariablePageName1>
-						<customVariablePageValue1>200</customVariablePageValue1>
-					</row>
-				</customVariables>
-				<bandwidth_pretty>3.5 K</bandwidth_pretty>
-			</row>
-		</actionDetails>
-		<goalConversions>1</goalConversions>
-		<siteCurrency>USD</siteCurrency>
-		<siteCurrencySymbol>$</siteCurrencySymbol>
-		
-		
-		
-		
-		<siteName>Piwik test</siteName>
-		
-		
-		
-		
-		
-		
-		<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>0</visitDuration>
-		<visitDurationPretty>0s</visitDurationPretty>
-		<searches>0</searches>
-		<actions>1</actions>
-		<interactions>1</interactions>
-		<referrerType>direct</referrerType>
-		<referrerTypeName>Direct Entry</referrerTypeName>
-		<referrerName />
-		<referrerKeyword />
-		<referrerKeywordPosition />
-		<referrerUrl />
-		<referrerSearchEngineUrl />
-		<referrerSearchEngineIcon />
-		<languageCode />
-		<language>Unknown</language>
-		<deviceType>Desktop</deviceType>
-		<deviceTypeIcon>plugins/Morpheus/icons/dist/devices/desktop.png</deviceTypeIcon>
-		<deviceBrand>Apple</deviceBrand>
-		<deviceModel>Generic Desktop</deviceModel>
-		<operatingSystem>Mac 10.6</operatingSystem>
-		<operatingSystemName>Mac</operatingSystemName>
-		<operatingSystemIcon>plugins/Morpheus/icons/dist/os/MAC.png</operatingSystemIcon>
-		<operatingSystemCode>MAC</operatingSystemCode>
-		<operatingSystemVersion>10.6</operatingSystemVersion>
-		<browserFamily>WebKit</browserFamily>
-		<browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription>
-		<browser>RockMelt 0.9</browser>
-		<browserName>RockMelt</browserName>
-		<browserIcon>plugins/Morpheus/icons/dist/browsers/RM.png</browserIcon>
-		<browserCode>RM</browserCode>
-		<browserVersion>0.9</browserVersion>
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
-		<events>0</events>
-		<continent>Asia</continent>
-		<continentCode>asi</continentCode>
-		<country>Singapore</country>
-		<countryCode>sg</countryCode>
-		<countryFlag>plugins/Morpheus/icons/dist/flags/sg.png</countryFlag>
-		<region />
-		<regionCode />
-		<city />
-		<location>Singapore</location>
-		<visitLocalTime>08:10:38</visitLocalTime>
-		<visitLocalHour>8</visitLocalHour>
-		<daysSinceLastVisit>0</daysSinceLastVisit>
-		<customVariables>
-		</customVariables>
-		<resolution>unknown</resolution>
-		<plugins />
-		<pluginsIcons />
-	</row>
-	<row>
-		<idSite>1</idSite>
-		<idVisit>27</idVisit>
-		<visitIp>0.0.0.0</visitIp>
-		
-		<actionDetails>
-			<row>
-				<type>goal</type>
-				<goalName>all</goalName>
-				<goalId>1</goalId>
-				<revenue>5</revenue>
-				<goalPageId>30</goalPageId>
-				
-				<url>http://example.org/index.htm</url>
-				<icon>plugins/Morpheus/images/goal.png</icon>
-				
-			</row>
-			<row>
-				<type>action</type>
-				<url>http://example.org/index.htm</url>
-				<pageTitle>incredible title!</pageTitle>
-				<pageIdAction>29</pageIdAction>
-				
-				
-				<pageId>30</pageId>
-				<bandwidth>43</bandwidth>
-				<interactionPosition>1</interactionPosition>
-				<icon />
-				
-				<customVariables>
-					<row>
-						<customVariablePageName3>_pks</customVariablePageName3>
-						<customVariablePageValue3>SKU2</customVariablePageValue3>
-					</row>
-					<row>
-						<customVariablePageName4>_pkn</customVariablePageName4>
-						<customVariablePageValue4>PRODUCT name</customVariablePageValue4>
-					</row>
-					<row>
-						<customVariablePageName5>_pkc</customVariablePageName5>
-						<customVariablePageValue5>Electronics &amp; Cameras</customVariablePageValue5>
-					</row>
-				</customVariables>
-				<bandwidth_pretty>43 B</bandwidth_pretty>
-			</row>
-		</actionDetails>
-		<goalConversions>1</goalConversions>
-		<siteCurrency>USD</siteCurrency>
-		<siteCurrencySymbol>$</siteCurrencySymbol>
-		
-		
-		
-		
-		<siteName>Piwik test</siteName>
-		
-		
-		
-		
-		
-		
-		<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>0</visitDuration>
-		<visitDurationPretty>0s</visitDurationPretty>
-		<searches>0</searches>
-		<actions>1</actions>
-		<interactions>1</interactions>
-		<referrerType>website</referrerType>
-		<referrerTypeName>Websites</referrerTypeName>
-		<referrerName>piwik.org</referrerName>
-		<referrerKeyword />
-		<referrerKeywordPosition />
-		<referrerUrl>http://piwik.org/contribute%</referrerUrl>
-		<referrerSearchEngineUrl />
-		<referrerSearchEngineIcon />
-		<languageCode />
-		<language>Unknown</language>
-		<deviceType>Desktop</deviceType>
-		<deviceTypeIcon>plugins/Morpheus/icons/dist/devices/desktop.png</deviceTypeIcon>
-		<deviceBrand>Unknown</deviceBrand>
-		<deviceModel>Generic Desktop</deviceModel>
-		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemName>Windows</operatingSystemName>
-		<operatingSystemIcon>plugins/Morpheus/icons/dist/os/WIN.png</operatingSystemIcon>
-		<operatingSystemCode>WIN</operatingSystemCode>
-		<operatingSystemVersion>XP</operatingSystemVersion>
-		<browserFamily>Trident</browserFamily>
-		<browserFamilyDescription>Trident (IE)</browserFamilyDescription>
-		<browser>Internet Explorer 6.0</browser>
-		<browserName>Internet Explorer</browserName>
-		<browserIcon>plugins/Morpheus/icons/dist/browsers/IE.png</browserIcon>
-		<browserCode>IE</browserCode>
-		<browserVersion>6.0</browserVersion>
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
-		<events>0</events>
-		<continent>Unknown</continent>
-		<continentCode>unk</continentCode>
-		<country>Unknown</country>
-		<countryCode>xx</countryCode>
-		<countryFlag>plugins/Morpheus/icons/dist/flags/xx.png</countryFlag>
-		<region />
-		<regionCode />
-		<city />
-		<location>Unknown</location>
-		<visitLocalTime>12:34:06</visitLocalTime>
-		<visitLocalHour>12</visitLocalHour>
-		<daysSinceLastVisit>0</daysSinceLastVisit>
-		<customVariables>
-			<row>
-				<customVariableName5>VisitorType</customVariableName5>
-				<customVariableValue5>NewLoggedOut</customVariableValue5>
-			</row>
-		</customVariables>
-		<resolution>1024x768</resolution>
-		<plugins>cookie, flash, java</plugins>
-		<pluginsIcons>
-			<row>
-				<pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon>
-				<pluginName>cookie</pluginName>
-			</row>
-			<row>
-				<pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon>
-				<pluginName>flash</pluginName>
-			</row>
-			<row>
-				<pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon>
-				<pluginName>java</pluginName>
-			</row>
-		</pluginsIcons>
-	</row>
-	<row>
-		<idSite>1</idSite>
-		<idVisit>25</idVisit>
-		<visitIp>175.41.192.41</visitIp>
-		
-		<actionDetails>
-			<row>
-				<type>goal</type>
-				<goalName>all</goalName>
-				<goalId>1</goalId>
-				<revenue>5</revenue>
-				<goalPageId>28</goalPageId>
-				
-				<url>http://piwik.net/blog/category/meta/</url>
-				<icon>plugins/Morpheus/images/goal.png</icon>
-				
-			</row>
-			<row>
-				<type>action</type>
-				<url>http://piwik.net/blog/category/meta/</url>
-				<pageTitle />
-				<pageIdAction>1</pageIdAction>
-				
-				
-				<pageId>28</pageId>
-				<bandwidth>3574</bandwidth>
-				<interactionPosition>1</interactionPosition>
-				<icon />
-				
-				<customVariables>
-					<row>
-						<customVariablePageName1>HTTP-code</customVariablePageName1>
-						<customVariablePageValue1>200</customVariablePageValue1>
-					</row>
-				</customVariables>
-				<bandwidth_pretty>3.5 K</bandwidth_pretty>
-			</row>
-		</actionDetails>
-		<goalConversions>1</goalConversions>
-		<siteCurrency>USD</siteCurrency>
-		<siteCurrencySymbol>$</siteCurrencySymbol>
-		
-		
-		
-		
-		<siteName>Piwik test</siteName>
-		
-		
-		
-		
-		
-		
-		<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>0</visitDuration>
-		<visitDurationPretty>0s</visitDurationPretty>
-		<searches>0</searches>
-		<actions>1</actions>
-		<interactions>1</interactions>
-		<referrerType>direct</referrerType>
-		<referrerTypeName>Direct Entry</referrerTypeName>
-		<referrerName />
-		<referrerKeyword />
-		<referrerKeywordPosition />
-		<referrerUrl />
-		<referrerSearchEngineUrl />
-		<referrerSearchEngineIcon />
-		<languageCode />
-		<language>Unknown</language>
-		<deviceType>Desktop</deviceType>
-		<deviceTypeIcon>plugins/Morpheus/icons/dist/devices/desktop.png</deviceTypeIcon>
-		<deviceBrand>Apple</deviceBrand>
-		<deviceModel>Generic Desktop</deviceModel>
-		<operatingSystem>Mac 10.6</operatingSystem>
-		<operatingSystemName>Mac</operatingSystemName>
-		<operatingSystemIcon>plugins/Morpheus/icons/dist/os/MAC.png</operatingSystemIcon>
-		<operatingSystemCode>MAC</operatingSystemCode>
-		<operatingSystemVersion>10.6</operatingSystemVersion>
-		<browserFamily>WebKit</browserFamily>
-		<browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription>
-		<browser>RockMelt 0.9</browser>
-		<browserName>RockMelt</browserName>
-		<browserIcon>plugins/Morpheus/icons/dist/browsers/RM.png</browserIcon>
-		<browserCode>RM</browserCode>
-		<browserVersion>0.9</browserVersion>
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
-		<events>0</events>
-		<continent>Asia</continent>
-		<continentCode>asi</continentCode>
-		<country>Japan</country>
-		<countryCode>jp</countryCode>
-		<countryFlag>plugins/Morpheus/icons/dist/flags/jp.png</countryFlag>
-		<region />
-		<regionCode />
-		<city />
-		<location>Japan</location>
-		<visitLocalTime>20:15:41</visitLocalTime>
-		<visitLocalHour>20</visitLocalHour>
-		<daysSinceLastVisit>0</daysSinceLastVisit>
-		<customVariables>
-			<row>
-				<customVariableName1>Not-Bot</customVariableName1>
-				<customVariableValue1>Mozilla/5.0 (Macintosh; Intel Mac OS X 10_6_7) AppleWebKit/534.24 (KHTML, like Gecko) RockMelt/0.9.58.494 Chrome/11.0.696.71 Safari/534.24</customVariableValue1>
-			</row>
-		</customVariables>
-		<resolution>unknown</resolution>
-		<plugins />
-		<pluginsIcons />
-	</row>
-	<row>
-		<idSite>1</idSite>
-		<idVisit>26</idVisit>
-		<visitIp>::ffff:123.45.67.89</visitIp>
-		
-		<actionDetails>
-			<row>
-				<type>goal</type>
-				<goalName>all</goalName>
-				<goalId>1</goalId>
-				<revenue>5</revenue>
-				<goalPageId>29</goalPageId>
-				
-				<url>http://piwik.net/blog/category/meta/</url>
-				<icon>plugins/Morpheus/images/goal.png</icon>
-				
-			</row>
-			<row>
-				<type>action</type>
-				<url>http://piwik.net/blog/category/meta/</url>
-				<pageTitle />
-				<pageIdAction>1</pageIdAction>
-				
-				
-				<pageId>29</pageId>
-				<bandwidth>3574</bandwidth>
-				<interactionPosition>1</interactionPosition>
-				<icon />
-				
-				<customVariables>
-					<row>
-						<customVariablePageName1>HTTP-code</customVariablePageName1>
-						<customVariablePageValue1>200</customVariablePageValue1>
-					</row>
-				</customVariables>
-				<bandwidth_pretty>3.5 K</bandwidth_pretty>
-			</row>
-		</actionDetails>
-		<goalConversions>1</goalConversions>
-		<siteCurrency>USD</siteCurrency>
-		<siteCurrencySymbol>$</siteCurrencySymbol>
-		
-		
-		
-		
-		<siteName>Piwik test</siteName>
-		
-		
-		
-		
-		
-		
-		<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>0</visitDuration>
-		<visitDurationPretty>0s</visitDurationPretty>
-		<searches>0</searches>
-		<actions>1</actions>
-		<interactions>1</interactions>
-		<referrerType>direct</referrerType>
-		<referrerTypeName>Direct Entry</referrerTypeName>
-		<referrerName />
-		<referrerKeyword />
-		<referrerKeywordPosition />
-		<referrerUrl />
-		<referrerSearchEngineUrl />
-		<referrerSearchEngineIcon />
-		<languageCode />
-		<language>Unknown</language>
-		<deviceType>Desktop</deviceType>
-		<deviceTypeIcon>plugins/Morpheus/icons/dist/devices/desktop.png</deviceTypeIcon>
-		<deviceBrand>Apple</deviceBrand>
-		<deviceModel>Generic Desktop</deviceModel>
-		<operatingSystem>Mac 10.6</operatingSystem>
-		<operatingSystemName>Mac</operatingSystemName>
-		<operatingSystemIcon>plugins/Morpheus/icons/dist/os/MAC.png</operatingSystemIcon>
-		<operatingSystemCode>MAC</operatingSystemCode>
-		<operatingSystemVersion>10.6</operatingSystemVersion>
-		<browserFamily>WebKit</browserFamily>
-		<browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription>
-		<browser>RockMelt 0.9</browser>
-		<browserName>RockMelt</browserName>
-		<browserIcon>plugins/Morpheus/icons/dist/browsers/RM.png</browserIcon>
-		<browserCode>RM</browserCode>
-		<browserVersion>0.9</browserVersion>
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
-		<events>0</events>
-		<continent>Asia</continent>
-		<continentCode>asi</continentCode>
-		<country>South Korea</country>
-		<countryCode>kr</countryCode>
-		<countryFlag>plugins/Morpheus/icons/dist/flags/kr.png</countryFlag>
-		<region>Seoul Teugbyeolsi</region>
-		<regionCode>11</regionCode>
-		<city>Seoul</city>
-		<location>Seoul, Seoul Teugbyeolsi, South Korea</location>
-		<visitLocalTime>20:15:41</visitLocalTime>
-		<visitLocalHour>20</visitLocalHour>
-		<daysSinceLastVisit>0</daysSinceLastVisit>
-		<customVariables>
-			<row>
-				<customVariableName1>Not-Bot</customVariableName1>
-				<customVariableValue1>Mozilla/5.0 (Macintosh; Intel Mac OS X 10_6_7) AppleWebKit/534.24 (KHTML, like Gecko) RockMelt/0.9.58.494 Chrome/11.0.696.71 Safari/534.24</customVariableValue1>
-			</row>
-		</customVariables>
-		<resolution>unknown</resolution>
-		<plugins />
-		<pluginsIcons />
-	</row>
-	<row>
-		<idSite>1</idSite>
-		<idVisit>24</idVisit>
-		<visitIp>175.41.192.43</visitIp>
-		
-		<actionDetails>
-			<row>
-				<type>action</type>
-				<url>http://piwik.net/moved-permanently</url>
-				<pageTitle>301/URL = http%3A%2F%2Fpiwik.net%2Fmoved-permanently</pageTitle>
-				<pageIdAction>25</pageIdAction>
-				
-				
-				<pageId>26</pageId>
-				<bandwidth>3574</bandwidth>
-				<timeSpent>180</timeSpent>
-				<timeSpentPretty>3 min 0s</timeSpentPretty>
-				<interactionPosition>1</interactionPosition>
-				<icon />
-				
-				<customVariables>
-					<row>
-						<customVariablePageName1>HTTP-code</customVariablePageName1>
-						<customVariablePageValue1>301</customVariablePageValue1>
-					</row>
-				</customVariables>
-				<bandwidth_pretty>3.5 K</bandwidth_pretty>
-			</row>
-			<row>
-				<type>goal</type>
-				<goalName>all</goalName>
-				<goalId>1</goalId>
-				<revenue>5</revenue>
-				<goalPageId>26</goalPageId>
-				
-				<url>http://piwik.net/moved-permanently</url>
-				<icon>plugins/Morpheus/images/goal.png</icon>
-				
-			</row>
-			<row>
-				<type>action</type>
-				<url>http://piwik.net/temp-redirect</url>
-				<pageTitle>307/URL = http%3A%2F%2Fpiwik.net%2Ftemp-redirect</pageTitle>
-				<pageIdAction>27</pageIdAction>
-				
-				
-				<pageId>27</pageId>
-				<bandwidth>3574</bandwidth>
-				<interactionPosition>2</interactionPosition>
-				<icon />
-				
-				<customVariables>
-					<row>
-						<customVariablePageName1>HTTP-code</customVariablePageName1>
-						<customVariablePageValue1>307</customVariablePageValue1>
-					</row>
-				</customVariables>
-				<bandwidth_pretty>3.5 K</bandwidth_pretty>
-			</row>
-		</actionDetails>
-		<goalConversions>1</goalConversions>
-		<siteCurrency>USD</siteCurrency>
-		<siteCurrencySymbol>$</siteCurrencySymbol>
-		
-		
-		
-		
-		<siteName>Piwik test</siteName>
-		
-		
-		
-		
-		
-		
-		<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>182</visitDuration>
-		<visitDurationPretty>3 min 2s</visitDurationPretty>
-		<searches>0</searches>
-		<actions>2</actions>
-		<interactions>2</interactions>
-		<referrerType>direct</referrerType>
-		<referrerTypeName>Direct Entry</referrerTypeName>
-		<referrerName />
-		<referrerKeyword />
-		<referrerKeywordPosition />
-		<referrerUrl />
-		<referrerSearchEngineUrl />
-		<referrerSearchEngineIcon />
-		<languageCode />
-		<language>Unknown</language>
-		<deviceType>Desktop</deviceType>
-		<deviceTypeIcon>plugins/Morpheus/icons/dist/devices/desktop.png</deviceTypeIcon>
-		<deviceBrand>Apple</deviceBrand>
-		<deviceModel>Generic Desktop</deviceModel>
-		<operatingSystem>Mac 10.6</operatingSystem>
-		<operatingSystemName>Mac</operatingSystemName>
-		<operatingSystemIcon>plugins/Morpheus/icons/dist/os/MAC.png</operatingSystemIcon>
-		<operatingSystemCode>MAC</operatingSystemCode>
-		<operatingSystemVersion>10.6</operatingSystemVersion>
-		<browserFamily>WebKit</browserFamily>
-		<browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription>
-		<browser>RockMelt 0.9</browser>
-		<browserName>RockMelt</browserName>
-		<browserIcon>plugins/Morpheus/icons/dist/browsers/RM.png</browserIcon>
-		<browserCode>RM</browserCode>
-		<browserVersion>0.9</browserVersion>
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
-		<events>0</events>
-		<continent>Asia</continent>
-		<continentCode>asi</continentCode>
-		<country>Japan</country>
-		<countryCode>jp</countryCode>
-		<countryFlag>plugins/Morpheus/icons/dist/flags/jp.png</countryFlag>
-		<region />
-		<regionCode />
-		<city />
-		<location>Japan</location>
-		<visitLocalTime>19:12:40</visitLocalTime>
-		<visitLocalHour>19</visitLocalHour>
-		<daysSinceLastVisit>0</daysSinceLastVisit>
-		<customVariables>
-			<row>
-				<customVariableName1>Not-Bot</customVariableName1>
-				<customVariableValue1>Mozilla/5.0 (Macintosh; Intel Mac OS X 10_6_7) AppleWebKit/534.24 (KHTML, like Gecko) RockMelt/0.9.58.494 Chrome/11.0.696.71 Safari/534.24</customVariableValue1>
-			</row>
-		</customVariables>
-		<resolution>unknown</resolution>
-		<plugins />
-		<pluginsIcons />
-	</row>
-	<row>
-		<idSite>1</idSite>
-		<idVisit>23</idVisit>
-		<visitIp>175.41.192.42</visitIp>
-		
-		<actionDetails>
-			<row>
-				<type>download</type>
-				<url>http://piwik.net/thing.js</url>
-				<pageTitle />
-				<pageIdAction>21</pageIdAction>
-				
-				
-				<pageId>23</pageId>
-				<bandwidth>3574</bandwidth>
-				<timeSpent>61</timeSpent>
-				<timeSpentPretty>1 min 1s</timeSpentPretty>
-				<interactionPosition />
-				<icon>plugins/Morpheus/images/download.png</icon>
-				
-				<customVariables>
-					<row>
-						<customVariablePageName1>HTTP-code</customVariablePageName1>
-						<customVariablePageValue1>200</customVariablePageValue1>
-					</row>
-				</customVariables>
-				<bandwidth_pretty>3.5 K</bandwidth_pretty>
-			</row>
-			<row>
-				<type>download</type>
-				<url>http://piwik.net/thing.css</url>
-				<pageTitle />
-				<pageIdAction>22</pageIdAction>
-				
-				
-				<pageId>24</pageId>
-				<bandwidth>3574</bandwidth>
-				<timeSpent>61</timeSpent>
-				<timeSpentPretty>1 min 1s</timeSpentPretty>
-				<interactionPosition />
-				<icon>plugins/Morpheus/images/download.png</icon>
-				
-				<customVariables>
-					<row>
-						<customVariablePageName1>HTTP-code</customVariablePageName1>
-						<customVariablePageValue1>200</customVariablePageValue1>
-					</row>
-				</customVariables>
-				<bandwidth_pretty>3.5 K</bandwidth_pretty>
-			</row>
-			<row>
-				<type>download</type>
-				<url>http://piwik.net/other.png</url>
-				<pageTitle />
-				<pageIdAction>23</pageIdAction>
-				
-				
-				<pageId>25</pageId>
-				<bandwidth>3574</bandwidth>
-				<interactionPosition />
-				<icon>plugins/Morpheus/images/download.png</icon>
-				
-				<customVariables>
-					<row>
-						<customVariablePageName1>HTTP-code</customVariablePageName1>
-						<customVariablePageValue1>200</customVariablePageValue1>
-					</row>
-				</customVariables>
-				<bandwidth_pretty>3.5 K</bandwidth_pretty>
-			</row>
-		</actionDetails>
-		<goalConversions>0</goalConversions>
-		<siteCurrency>USD</siteCurrency>
-		<siteCurrencySymbol>$</siteCurrencySymbol>
-		
-		
-		
-		
-		<siteName>Piwik test</siteName>
-		
-		
-		
-		
-		
-		
-		<userId />
-		<visitorType>new</visitorType>
-		<visitorTypeIcon />
-		<visitConverted>0</visitConverted>
-		<visitConvertedIcon />
-		<visitCount>1</visitCount>
-		<visitEcommerceStatus>none</visitEcommerceStatus>
-		<visitEcommerceStatusIcon />
-		<daysSinceFirstVisit>0</daysSinceFirstVisit>
-		<daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
-		<visitDuration>123</visitDuration>
-		<visitDurationPretty>2 min 3s</visitDurationPretty>
-		<searches>0</searches>
-		<actions>3</actions>
-		<interactions>0</interactions>
-		<referrerType>direct</referrerType>
-		<referrerTypeName>Direct Entry</referrerTypeName>
-		<referrerName />
-		<referrerKeyword />
-		<referrerKeywordPosition />
-		<referrerUrl />
-		<referrerSearchEngineUrl />
-		<referrerSearchEngineIcon />
-		<languageCode />
-		<language>Unknown</language>
-		<deviceType>Desktop</deviceType>
-		<deviceTypeIcon>plugins/Morpheus/icons/dist/devices/desktop.png</deviceTypeIcon>
-		<deviceBrand>Apple</deviceBrand>
-		<deviceModel>Generic Desktop</deviceModel>
-		<operatingSystem>Mac 10.6</operatingSystem>
-		<operatingSystemName>Mac</operatingSystemName>
-		<operatingSystemIcon>plugins/Morpheus/icons/dist/os/MAC.png</operatingSystemIcon>
-		<operatingSystemCode>MAC</operatingSystemCode>
-		<operatingSystemVersion>10.6</operatingSystemVersion>
-		<browserFamily>WebKit</browserFamily>
-		<browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription>
-		<browser>RockMelt 0.9</browser>
-		<browserName>RockMelt</browserName>
-		<browserIcon>plugins/Morpheus/icons/dist/browsers/RM.png</browserIcon>
-		<browserCode>RM</browserCode>
-		<browserVersion>0.9</browserVersion>
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
-		<events>0</events>
-		<continent>Asia</continent>
-		<continentCode>asi</continentCode>
-		<country>Japan</country>
-		<countryCode>jp</countryCode>
-		<countryFlag>plugins/Morpheus/icons/dist/flags/jp.png</countryFlag>
-		<region />
-		<regionCode />
-		<city />
-		<location>Japan</location>
-		<visitLocalTime>18:10:38</visitLocalTime>
-		<visitLocalHour>18</visitLocalHour>
-		<daysSinceLastVisit>0</daysSinceLastVisit>
-		<customVariables>
-			<row>
-				<customVariableName1>Not-Bot</customVariableName1>
-				<customVariableValue1>Mozilla/5.0 (Macintosh; Intel Mac OS X 10_6_7) AppleWebKit/534.24 (KHTML, like Gecko) RockMelt/0.9.58.494 Chrome/11.0.696.71 Safari/534.24</customVariableValue1>
-			</row>
-		</customVariables>
-		<resolution>unknown</resolution>
-		<plugins />
-		<pluginsIcons />
-	</row>
-	<row>
-		<idSite>1</idSite>
-		<idVisit>22</idVisit>
-		<visitIp>72.44.32.11</visitIp>
-		
-		<actionDetails>
-			<row>
-				<type>goal</type>
-				<goalName>all</goalName>
-				<goalId>1</goalId>
-				<revenue>5</revenue>
-				<goalPageId>22</goalPageId>
-				
-				<url>http://piwik.net/</url>
-				<icon>plugins/Morpheus/images/goal.png</icon>
-				
-			</row>
-			<row>
-				<type>action</type>
-				<url>http://piwik.net/</url>
-				<pageTitle />
-				<pageIdAction>5</pageIdAction>
-				
-				
-				<pageId>22</pageId>
-				<bandwidth>3574</bandwidth>
-				<interactionPosition>1</interactionPosition>
-				<icon />
-				
-				<customVariables>
-					<row>
-						<customVariablePageName1>HTTP-code</customVariablePageName1>
-						<customVariablePageValue1>200</customVariablePageValue1>
-					</row>
-				</customVariables>
-				<bandwidth_pretty>3.5 K</bandwidth_pretty>
-			</row>
-		</actionDetails>
-		<goalConversions>1</goalConversions>
-		<siteCurrency>USD</siteCurrency>
-		<siteCurrencySymbol>$</siteCurrencySymbol>
-		
-		
-		
-		
-		<siteName>Piwik test</siteName>
-		
-		
-		
-		
-		
-		
-		<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>0</visitDuration>
-		<visitDurationPretty>0s</visitDurationPretty>
-		<searches>0</searches>
-		<actions>1</actions>
-		<interactions>1</interactions>
-		<referrerType>direct</referrerType>
-		<referrerTypeName>Direct Entry</referrerTypeName>
-		<referrerName />
-		<referrerKeyword />
-		<referrerKeywordPosition />
-		<referrerUrl />
-		<referrerSearchEngineUrl />
-		<referrerSearchEngineIcon />
-		<languageCode />
-		<language>Unknown</language>
-		<deviceType>Unknown</deviceType>
-		<deviceTypeIcon>plugins/Morpheus/icons/dist/devices/unknown.png</deviceTypeIcon>
-		<deviceBrand>Unknown</deviceBrand>
-		<deviceModel>Unknown</deviceModel>
-		<operatingSystem>Bot</operatingSystem>
-		<operatingSystemName>Bot</operatingSystemName>
-		<operatingSystemIcon>plugins/Morpheus/icons/dist/os/UNK.png</operatingSystemIcon>
-		<operatingSystemCode>BOT</operatingSystemCode>
-		<operatingSystemVersion>UNK</operatingSystemVersion>
-		<browserFamily />
-		<browserFamilyDescription>Unknown</browserFamilyDescription>
-		<browser>Unknown</browser>
-		<browserName>Unknown</browserName>
-		<browserIcon>plugins/Morpheus/icons/dist/browsers/UNK.png</browserIcon>
-		<browserCode>UNK</browserCode>
-		<browserVersion />
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
-		<events>0</events>
-		<continent>North America</continent>
-		<continentCode>amn</continentCode>
-		<country>United States</country>
-		<countryCode>us</countryCode>
-		<countryFlag>plugins/Morpheus/icons/dist/flags/us.png</countryFlag>
-		<region>Virginia</region>
-		<regionCode>VA</regionCode>
-		<city>Ashburn</city>
-		<location>Ashburn, Virginia, United States</location>
-		<visitLocalTime>17:48:08</visitLocalTime>
-		<visitLocalHour>17</visitLocalHour>
-		<daysSinceLastVisit>0</daysSinceLastVisit>
-		<customVariables>
-			<row>
-				<customVariableName1>Bot</customVariableName1>
-				<customVariableValue1>Googlebot/2.1 (+http://www.googlebot.com/bot.html)</customVariableValue1>
-			</row>
-		</customVariables>
-		<resolution>unknown</resolution>
-		<plugins />
-		<pluginsIcons />
-	</row>
-	<row>
-		<idSite>1</idSite>
-		<idVisit>21</idVisit>
-		<visitIp>72.44.32.11</visitIp>
-		
-		<actionDetails>
-			<row>
-				<type>goal</type>
-				<goalName>all</goalName>
-				<goalId>1</goalId>
-				<revenue>5</revenue>
-				<goalPageId>21</goalPageId>
-				
-				<url>http://piwik.net/to-an-error</url>
-				<icon>plugins/Morpheus/images/goal.png</icon>
-				
-			</row>
-			<row>
-				<type>action</type>
-				<url>http://piwik.net/to-an-error</url>
-				<pageTitle>500/URL = http%3A%2F%2Fpiwik.net%2Fto-an-error</pageTitle>
-				<pageIdAction>20</pageIdAction>
-				
-				
-				<pageId>21</pageId>
-				<bandwidth>3574</bandwidth>
-				<interactionPosition>1</interactionPosition>
-				<icon />
-				
-				<customVariables>
-					<row>
-						<customVariablePageName1>HTTP-code</customVariablePageName1>
-						<customVariablePageValue1>500</customVariablePageValue1>
-					</row>
-				</customVariables>
-				<bandwidth_pretty>3.5 K</bandwidth_pretty>
-			</row>
-		</actionDetails>
-		<goalConversions>1</goalConversions>
-		<siteCurrency>USD</siteCurrency>
-		<siteCurrencySymbol>$</siteCurrencySymbol>
-		
-		
-		
-		
-		<siteName>Piwik test</siteName>
-		
-		
-		
-		
-		
-		
-		<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>0</visitDuration>
-		<visitDurationPretty>0s</visitDurationPretty>
-		<searches>0</searches>
-		<actions>1</actions>
-		<interactions>1</interactions>
-		<referrerType>direct</referrerType>
-		<referrerTypeName>Direct Entry</referrerTypeName>
-		<referrerName />
-		<referrerKeyword />
-		<referrerKeywordPosition />
-		<referrerUrl />
-		<referrerSearchEngineUrl />
-		<referrerSearchEngineIcon />
-		<languageCode />
-		<language>Unknown</language>
-		<deviceType>Desktop</deviceType>
-		<deviceTypeIcon>plugins/Morpheus/icons/dist/devices/desktop.png</deviceTypeIcon>
-		<deviceBrand>Unknown</deviceBrand>
-		<deviceModel>Generic Desktop</deviceModel>
-		<operatingSystem>Windows 7</operatingSystem>
-		<operatingSystemName>Windows</operatingSystemName>
-		<operatingSystemIcon>plugins/Morpheus/icons/dist/os/WIN.png</operatingSystemIcon>
-		<operatingSystemCode>WIN</operatingSystemCode>
-		<operatingSystemVersion>7</operatingSystemVersion>
-		<browserFamily>Trident</browserFamily>
-		<browserFamilyDescription>Trident (IE)</browserFamilyDescription>
-		<browser>Internet Explorer 9.0</browser>
-		<browserName>Internet Explorer</browserName>
-		<browserIcon>plugins/Morpheus/icons/dist/browsers/IE.png</browserIcon>
-		<browserCode>IE</browserCode>
-		<browserVersion>9.0</browserVersion>
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
-		<events>0</events>
-		<continent>North America</continent>
-		<continentCode>amn</continentCode>
-		<country>United States</country>
-		<countryCode>us</countryCode>
-		<countryFlag>plugins/Morpheus/icons/dist/flags/us.png</countryFlag>
-		<region>Virginia</region>
-		<regionCode>VA</regionCode>
-		<city>Ashburn</city>
-		<location>Ashburn, Virginia, United States</location>
-		<visitLocalTime>17:48:07</visitLocalTime>
-		<visitLocalHour>17</visitLocalHour>
-		<daysSinceLastVisit>0</daysSinceLastVisit>
-		<customVariables>
-			<row>
-				<customVariableName1>Not-Bot</customVariableName1>
-				<customVariableValue1>Mozilla/5.0 (compatible; MSIE 10.6; Windows NT 6.1; Trident/5.0; InfoPath.2; SLCC1; .NET CLR 3.0.4506.2152; .NET CLR 3.5.30729; .NET CLR 2.0.50727) 3gpp-gba UNTRUSTED/1.0</customVariableValue1>
-			</row>
-		</customVariables>
-		<resolution>unknown</resolution>
-		<plugins />
-		<pluginsIcons />
-	</row>
-	<row>
-		<idSite>1</idSite>
-		<idVisit>18</idVisit>
-		<visitIp>1.2.3.4</visitIp>
-		
-		<actionDetails>
-			<row>
-				<type>download</type>
-				<url>http://piwik.net/19.pdf</url>
-				<pageTitle />
-				<pageIdAction>16</pageIdAction>
-				
-				
-				<pageId>18</pageId>
-				<bandwidth>4324023</bandwidth>
-				<interactionPosition />
-				<icon>plugins/Morpheus/images/download.png</icon>
-				
-				<customVariables>
-					<row>
-						<customVariablePageName1>HTTP-code</customVariablePageName1>
-						<customVariablePageValue1>200</customVariablePageValue1>
-					</row>
-				</customVariables>
-				<bandwidth_pretty>4.1 M</bandwidth_pretty>
-			</row>
-		</actionDetails>
-		<goalConversions>0</goalConversions>
-		<siteCurrency>USD</siteCurrency>
-		<siteCurrencySymbol>$</siteCurrencySymbol>
-		
-		
-		
-		
-		<siteName>Piwik test</siteName>
-		
-		
-		
-		
-		
-		
-		<userId />
-		<visitorType>new</visitorType>
-		<visitorTypeIcon />
-		<visitConverted>0</visitConverted>
-		<visitConvertedIcon />
-		<visitCount>1</visitCount>
-		<visitEcommerceStatus>none</visitEcommerceStatus>
-		<visitEcommerceStatusIcon />
-		<daysSinceFirstVisit>0</daysSinceFirstVisit>
-		<daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
-		<visitDuration>0</visitDuration>
-		<visitDurationPretty>0s</visitDurationPretty>
-		<searches>0</searches>
-		<actions>1</actions>
-		<interactions>0</interactions>
-		<referrerType>direct</referrerType>
-		<referrerTypeName>Direct Entry</referrerTypeName>
-		<referrerName />
-		<referrerKeyword />
-		<referrerKeywordPosition />
-		<referrerUrl />
-		<referrerSearchEngineUrl />
-		<referrerSearchEngineIcon />
-		<languageCode />
-		<language>Unknown</language>
-		<deviceType>Unknown</deviceType>
-		<deviceTypeIcon>plugins/Morpheus/icons/dist/devices/unknown.png</deviceTypeIcon>
-		<deviceBrand>Unknown</deviceBrand>
-		<deviceModel>Unknown</deviceModel>
-		<operatingSystem>Unknown</operatingSystem>
-		<operatingSystemName>Unknown</operatingSystemName>
-		<operatingSystemIcon>plugins/Morpheus/icons/dist/os/UNK.png</operatingSystemIcon>
-		<operatingSystemCode>UNK</operatingSystemCode>
-		<operatingSystemVersion>UNK</operatingSystemVersion>
-		<browserFamily />
-		<browserFamilyDescription>Unknown</browserFamilyDescription>
-		<browser>Unknown</browser>
-		<browserName>Unknown</browserName>
-		<browserIcon>plugins/Morpheus/icons/dist/browsers/UNK.png</browserIcon>
-		<browserCode>UNK</browserCode>
-		<browserVersion />
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
-		<events>0</events>
-		<continent>Oceania</continent>
-		<continentCode>oce</continentCode>
-		<country>Australia</country>
-		<countryCode>au</countryCode>
-		<countryFlag>plugins/Morpheus/icons/dist/flags/au.png</countryFlag>
-		<region />
-		<regionCode />
-		<city />
-		<location>Australia</location>
-		<visitLocalTime>17:46:03</visitLocalTime>
-		<visitLocalHour>17</visitLocalHour>
-		<daysSinceLastVisit>0</daysSinceLastVisit>
-		<customVariables>
-			<row>
-				<customVariableName1>Not-Bot</customVariableName1>
-				<customVariableValue1>Apache-HttpClient/4.2.1 (java 1.5)</customVariableValue1>
-			</row>
-		</customVariables>
-		<resolution>unknown</resolution>
-		<plugins />
-		<pluginsIcons />
-	</row>
-</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__VisitFrequency.get_day.xml b/tests/PHPUnit/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__VisitFrequency.get_day.xml
deleted file mode 100644
index c415099916..0000000000
--- a/tests/PHPUnit/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__VisitFrequency.get_day.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<result>
-	<nb_uniq_visitors_returning>0</nb_uniq_visitors_returning>
-	<nb_users_returning>0</nb_users_returning>
-	<nb_visits_returning>0</nb_visits_returning>
-	<nb_actions_returning>0</nb_actions_returning>
-	<nb_visits_converted_returning>0</nb_visits_converted_returning>
-	<bounce_count_returning>0</bounce_count_returning>
-	<sum_visit_length_returning>0</sum_visit_length_returning>
-	<max_actions_returning>0</max_actions_returning>
-	<bounce_rate_returning>0%</bounce_rate_returning>
-	<nb_actions_per_visit_returning>0</nb_actions_per_visit_returning>
-	<avg_time_on_site_returning>0</avg_time_on_site_returning>
-</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__VisitFrequency.get_year.xml b/tests/PHPUnit/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__VisitFrequency.get_year.xml
deleted file mode 100644
index dafefc726a..0000000000
--- a/tests/PHPUnit/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__VisitFrequency.get_year.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<result>
-	<nb_visits_returning>0</nb_visits_returning>
-	<nb_actions_returning>0</nb_actions_returning>
-	<nb_visits_converted_returning>0</nb_visits_converted_returning>
-	<bounce_count_returning>0</bounce_count_returning>
-	<sum_visit_length_returning>0</sum_visit_length_returning>
-	<max_actions_returning>0</max_actions_returning>
-	<bounce_rate_returning>0%</bounce_rate_returning>
-	<nb_actions_per_visit_returning>0</nb_actions_per_visit_returning>
-	<avg_time_on_site_returning>0</avg_time_on_site_returning>
-</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__VisitsSummary.get_day.xml b/tests/PHPUnit/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__VisitsSummary.get_day.xml
deleted file mode 100644
index 93a593f72a..0000000000
--- a/tests/PHPUnit/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__VisitsSummary.get_day.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<result>
-	<nb_uniq_visitors>11</nb_uniq_visitors>
-	<nb_users>0</nb_users>
-	<nb_visits>11</nb_visits>
-	<nb_actions>11</nb_actions>
-	<nb_visits_converted>11</nb_visits_converted>
-	<bounce_count>11</bounce_count>
-	<sum_visit_length>0</sum_visit_length>
-	<max_actions>1</max_actions>
-	<bounce_rate>100%</bounce_rate>
-	<nb_actions_per_visit>1</nb_actions_per_visit>
-	<avg_time_on_site>0</avg_time_on_site>
-</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__VisitsSummary.get_year.xml b/tests/PHPUnit/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__VisitsSummary.get_year.xml
deleted file mode 100644
index 157967c9a3..0000000000
--- a/tests/PHPUnit/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__VisitsSummary.get_year.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<result>
-	<nb_visits>33</nb_visits>
-	<nb_actions>45</nb_actions>
-	<nb_visits_converted>31</nb_visits_converted>
-	<bounce_count>30</bounce_count>
-	<sum_visit_length>359</sum_visit_length>
-	<max_actions>10</max_actions>
-	<bounce_rate>91%</bounce_rate>
-	<nb_actions_per_visit>1.4</nb_actions_per_visit>
-	<avg_time_on_site>11</avg_time_on_site>
-</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentNoAutoArchive_noOptions__VisitsSummary.get_day.xml b/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentNoAutoArchive_noOptions__VisitsSummary.get_day.xml
deleted file mode 100644
index dd52dc4ff4..0000000000
--- a/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentNoAutoArchive_noOptions__VisitsSummary.get_day.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<results>
-	<result idSite="1" />
-	<result idSite="2" />
-	<result idSite="3" />
-</results>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentNoAutoArchive_noOptions__VisitsSummary.get_month.xml b/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentNoAutoArchive_noOptions__VisitsSummary.get_month.xml
deleted file mode 100644
index dd52dc4ff4..0000000000
--- a/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentNoAutoArchive_noOptions__VisitsSummary.get_month.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<results>
-	<result idSite="1" />
-	<result idSite="2" />
-	<result idSite="3" />
-</results>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentNoAutoArchive_noOptions__VisitsSummary.get_week.xml b/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentNoAutoArchive_noOptions__VisitsSummary.get_week.xml
deleted file mode 100644
index dd52dc4ff4..0000000000
--- a/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentNoAutoArchive_noOptions__VisitsSummary.get_week.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<results>
-	<result idSite="1" />
-	<result idSite="2" />
-	<result idSite="3" />
-</results>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentNoAutoArchive_noOptions__VisitsSummary.get_year.xml b/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentNoAutoArchive_noOptions__VisitsSummary.get_year.xml
deleted file mode 100644
index dd52dc4ff4..0000000000
--- a/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentNoAutoArchive_noOptions__VisitsSummary.get_year.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<results>
-	<result idSite="1" />
-	<result idSite="2" />
-	<result idSite="3" />
-</results>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentOnlyOneSite_noOptions__VisitsSummary.get_day.xml b/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentOnlyOneSite_noOptions__VisitsSummary.get_day.xml
deleted file mode 100644
index 2f05440fac..0000000000
--- a/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentOnlyOneSite_noOptions__VisitsSummary.get_day.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<results>
-	<result idSite="1">
-		<nb_uniq_visitors>1</nb_uniq_visitors>
-		<nb_users>0</nb_users>
-		<nb_visits>1</nb_visits>
-		<nb_actions>1</nb_actions>
-		<nb_visits_converted>1</nb_visits_converted>
-		<bounce_count>1</bounce_count>
-		<sum_visit_length>0</sum_visit_length>
-		<max_actions>1</max_actions>
-		<bounce_rate>100%</bounce_rate>
-		<nb_actions_per_visit>1</nb_actions_per_visit>
-		<avg_time_on_site>0</avg_time_on_site>
-	</result>
-	<result idSite="2" />
-	<result idSite="3" />
-</results>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentOnlyOneSite_noOptions__VisitsSummary.get_month.xml b/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentOnlyOneSite_noOptions__VisitsSummary.get_month.xml
deleted file mode 100644
index 69cfb8ea52..0000000000
--- a/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentOnlyOneSite_noOptions__VisitsSummary.get_month.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<results>
-	<result idSite="1">
-		<nb_uniq_visitors>6</nb_uniq_visitors>
-		<nb_users>0</nb_users>
-		<nb_visits>6</nb_visits>
-		<nb_actions>6</nb_actions>
-		<nb_visits_converted>6</nb_visits_converted>
-		<bounce_count>6</bounce_count>
-		<sum_visit_length>0</sum_visit_length>
-		<max_actions>1</max_actions>
-		<bounce_rate>100%</bounce_rate>
-		<nb_actions_per_visit>1</nb_actions_per_visit>
-		<avg_time_on_site>0</avg_time_on_site>
-	</result>
-	<result idSite="2" />
-	<result idSite="3" />
-</results>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentOnlyOneSite_noOptions__VisitsSummary.get_week.xml b/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentOnlyOneSite_noOptions__VisitsSummary.get_week.xml
deleted file mode 100644
index 3b8ee5ce75..0000000000
--- a/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentOnlyOneSite_noOptions__VisitsSummary.get_week.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<results>
-	<result idSite="1">
-		<nb_uniq_visitors>5</nb_uniq_visitors>
-		<nb_users>0</nb_users>
-		<nb_visits>5</nb_visits>
-		<nb_actions>5</nb_actions>
-		<nb_visits_converted>5</nb_visits_converted>
-		<bounce_count>5</bounce_count>
-		<sum_visit_length>0</sum_visit_length>
-		<max_actions>1</max_actions>
-		<bounce_rate>100%</bounce_rate>
-		<nb_actions_per_visit>1</nb_actions_per_visit>
-		<avg_time_on_site>0</avg_time_on_site>
-	</result>
-	<result idSite="2" />
-	<result idSite="3" />
-</results>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentOnlyOneSite_noOptions__VisitsSummary.get_year.xml b/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentOnlyOneSite_noOptions__VisitsSummary.get_year.xml
deleted file mode 100644
index 127cfeba90..0000000000
--- a/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentOnlyOneSite_noOptions__VisitsSummary.get_year.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<results>
-	<result idSite="1">
-		<nb_visits>6</nb_visits>
-		<nb_actions>6</nb_actions>
-		<nb_visits_converted>6</nb_visits_converted>
-		<bounce_count>6</bounce_count>
-		<sum_visit_length>0</sum_visit_length>
-		<max_actions>1</max_actions>
-		<bounce_rate>100%</bounce_rate>
-		<nb_actions_per_visit>1</nb_actions_per_visit>
-		<avg_time_on_site>0</avg_time_on_site>
-	</result>
-	<result idSite="2" />
-	<result idSite="3" />
-</results>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentPreArchivedWithUrlEncoding_noOptions__VisitsSummary.get_day.xml b/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentPreArchivedWithUrlEncoding_noOptions__VisitsSummary.get_day.xml
deleted file mode 100644
index 37a8f92b6c..0000000000
--- a/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentPreArchivedWithUrlEncoding_noOptions__VisitsSummary.get_day.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<results>
-	<result idSite="1">
-		<nb_uniq_visitors>11</nb_uniq_visitors>
-		<nb_users>0</nb_users>
-		<nb_visits>11</nb_visits>
-		<nb_actions>11</nb_actions>
-		<nb_visits_converted>11</nb_visits_converted>
-		<bounce_count>11</bounce_count>
-		<sum_visit_length>0</sum_visit_length>
-		<max_actions>1</max_actions>
-		<bounce_rate>100%</bounce_rate>
-		<nb_actions_per_visit>1</nb_actions_per_visit>
-		<avg_time_on_site>0</avg_time_on_site>
-	</result>
-	<result idSite="2" />
-	<result idSite="3" />
-</results>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentPreArchivedWithUrlEncoding_noOptions__VisitsSummary.get_month.xml b/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentPreArchivedWithUrlEncoding_noOptions__VisitsSummary.get_month.xml
deleted file mode 100644
index f52b091919..0000000000
--- a/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentPreArchivedWithUrlEncoding_noOptions__VisitsSummary.get_month.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<results>
-	<result idSite="1">
-		<nb_uniq_visitors>32</nb_uniq_visitors>
-		<nb_users>1</nb_users>
-		<nb_visits>32</nb_visits>
-		<nb_actions>35</nb_actions>
-		<nb_visits_converted>30</nb_visits_converted>
-		<bounce_count>30</bounce_count>
-		<sum_visit_length>305</sum_visit_length>
-		<max_actions>3</max_actions>
-		<bounce_rate>94%</bounce_rate>
-		<nb_actions_per_visit>1.1</nb_actions_per_visit>
-		<avg_time_on_site>10</avg_time_on_site>
-	</result>
-	<result idSite="2" />
-	<result idSite="3" />
-</results>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentPreArchivedWithUrlEncoding_noOptions__VisitsSummary.get_week.xml b/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentPreArchivedWithUrlEncoding_noOptions__VisitsSummary.get_week.xml
deleted file mode 100644
index 425d6d909d..0000000000
--- a/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentPreArchivedWithUrlEncoding_noOptions__VisitsSummary.get_week.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<results>
-	<result idSite="1">
-		<nb_uniq_visitors>30</nb_uniq_visitors>
-		<nb_users>1</nb_users>
-		<nb_visits>30</nb_visits>
-		<nb_actions>33</nb_actions>
-		<nb_visits_converted>28</nb_visits_converted>
-		<bounce_count>28</bounce_count>
-		<sum_visit_length>305</sum_visit_length>
-		<max_actions>3</max_actions>
-		<bounce_rate>93%</bounce_rate>
-		<nb_actions_per_visit>1.1</nb_actions_per_visit>
-		<avg_time_on_site>10</avg_time_on_site>
-	</result>
-	<result idSite="2" />
-	<result idSite="3" />
-</results>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentPreArchivedWithUrlEncoding_noOptions__VisitsSummary.get_year.xml b/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentPreArchivedWithUrlEncoding_noOptions__VisitsSummary.get_year.xml
deleted file mode 100644
index d35a916d0e..0000000000
--- a/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentPreArchivedWithUrlEncoding_noOptions__VisitsSummary.get_year.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<results>
-	<result idSite="1">
-		<nb_visits>33</nb_visits>
-		<nb_actions>45</nb_actions>
-		<nb_visits_converted>31</nb_visits_converted>
-		<bounce_count>30</bounce_count>
-		<sum_visit_length>359</sum_visit_length>
-		<max_actions>10</max_actions>
-		<bounce_rate>91%</bounce_rate>
-		<nb_actions_per_visit>1.4</nb_actions_per_visit>
-		<avg_time_on_site>11</avg_time_on_site>
-	</result>
-	<result idSite="2" />
-	<result idSite="3" />
-</results>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentPreArchived_noOptions__VisitsSummary.get_day.xml b/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentPreArchived_noOptions__VisitsSummary.get_day.xml
deleted file mode 100644
index 37a8f92b6c..0000000000
--- a/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentPreArchived_noOptions__VisitsSummary.get_day.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<results>
-	<result idSite="1">
-		<nb_uniq_visitors>11</nb_uniq_visitors>
-		<nb_users>0</nb_users>
-		<nb_visits>11</nb_visits>
-		<nb_actions>11</nb_actions>
-		<nb_visits_converted>11</nb_visits_converted>
-		<bounce_count>11</bounce_count>
-		<sum_visit_length>0</sum_visit_length>
-		<max_actions>1</max_actions>
-		<bounce_rate>100%</bounce_rate>
-		<nb_actions_per_visit>1</nb_actions_per_visit>
-		<avg_time_on_site>0</avg_time_on_site>
-	</result>
-	<result idSite="2" />
-	<result idSite="3" />
-</results>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentPreArchived_noOptions__VisitsSummary.get_month.xml b/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentPreArchived_noOptions__VisitsSummary.get_month.xml
deleted file mode 100644
index f52b091919..0000000000
--- a/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentPreArchived_noOptions__VisitsSummary.get_month.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<results>
-	<result idSite="1">
-		<nb_uniq_visitors>32</nb_uniq_visitors>
-		<nb_users>1</nb_users>
-		<nb_visits>32</nb_visits>
-		<nb_actions>35</nb_actions>
-		<nb_visits_converted>30</nb_visits_converted>
-		<bounce_count>30</bounce_count>
-		<sum_visit_length>305</sum_visit_length>
-		<max_actions>3</max_actions>
-		<bounce_rate>94%</bounce_rate>
-		<nb_actions_per_visit>1.1</nb_actions_per_visit>
-		<avg_time_on_site>10</avg_time_on_site>
-	</result>
-	<result idSite="2" />
-	<result idSite="3" />
-</results>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentPreArchived_noOptions__VisitsSummary.get_week.xml b/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentPreArchived_noOptions__VisitsSummary.get_week.xml
deleted file mode 100644
index 425d6d909d..0000000000
--- a/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentPreArchived_noOptions__VisitsSummary.get_week.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<results>
-	<result idSite="1">
-		<nb_uniq_visitors>30</nb_uniq_visitors>
-		<nb_users>1</nb_users>
-		<nb_visits>30</nb_visits>
-		<nb_actions>33</nb_actions>
-		<nb_visits_converted>28</nb_visits_converted>
-		<bounce_count>28</bounce_count>
-		<sum_visit_length>305</sum_visit_length>
-		<max_actions>3</max_actions>
-		<bounce_rate>93%</bounce_rate>
-		<nb_actions_per_visit>1.1</nb_actions_per_visit>
-		<avg_time_on_site>10</avg_time_on_site>
-	</result>
-	<result idSite="2" />
-	<result idSite="3" />
-</results>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentPreArchived_noOptions__VisitsSummary.get_year.xml b/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentPreArchived_noOptions__VisitsSummary.get_year.xml
deleted file mode 100644
index d35a916d0e..0000000000
--- a/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentPreArchived_noOptions__VisitsSummary.get_year.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<results>
-	<result idSite="1">
-		<nb_visits>33</nb_visits>
-		<nb_actions>45</nb_actions>
-		<nb_visits_converted>31</nb_visits_converted>
-		<bounce_count>30</bounce_count>
-		<sum_visit_length>359</sum_visit_length>
-		<max_actions>10</max_actions>
-		<bounce_rate>91%</bounce_rate>
-		<nb_actions_per_visit>1.4</nb_actions_per_visit>
-		<avg_time_on_site>11</avg_time_on_site>
-	</result>
-	<result idSite="2" />
-	<result idSite="3" />
-</results>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_CustomEvents_Events.getAction_lastN__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents_Events.getAction_lastN__API.getProcessedReport_day.xml
index caa8eb0452..56d44e03eb 100644
--- a/tests/PHPUnit/System/expected/test_CustomEvents_Events.getAction_lastN__API.getProcessedReport_day.xml
+++ b/tests/PHPUnit/System/expected/test_CustomEvents_Events.getAction_lastN__API.getProcessedReport_day.xml
@@ -282,57 +282,57 @@
 			<row>
 				
 				<segment>eventAction==playTrailer</segment>
-				<idsubdatatable>1576</idsubdatatable>
+				<idsubdatatable>1568</idsubdatatable>
 			</row>
 			<row>
 				
 				<segment>eventAction==Search</segment>
-				<idsubdatatable>1569</idsubdatatable>
+				<idsubdatatable>1561</idsubdatatable>
 			</row>
 			<row>
 				
 				<segment>eventAction==play25%25</segment>
-				<idsubdatatable>1571</idsubdatatable>
+				<idsubdatatable>1563</idsubdatatable>
 			</row>
 			<row>
 				
 				<segment>eventAction==play50%25</segment>
-				<idsubdatatable>1572</idsubdatatable>
+				<idsubdatatable>1564</idsubdatatable>
 			</row>
 			<row>
 				
 				<segment>eventAction==play75%25</segment>
-				<idsubdatatable>1573</idsubdatatable>
+				<idsubdatatable>1565</idsubdatatable>
 			</row>
 			<row>
 				
 				<segment>eventAction==playEnd</segment>
-				<idsubdatatable>1574</idsubdatatable>
+				<idsubdatatable>1566</idsubdatatable>
 			</row>
 			<row>
 				
 				<segment>eventAction==rating</segment>
-				<idsubdatatable>1575</idsubdatatable>
+				<idsubdatatable>1567</idsubdatatable>
 			</row>
 			<row>
 				
 				<segment>eventAction==clickBuyNow</segment>
-				<idsubdatatable>1577</idsubdatatable>
+				<idsubdatatable>1569</idsubdatatable>
 			</row>
 			<row>
 				
 				<segment>eventAction==event+action+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+---%26gt%3B+SHOULD+APPEAR+IN+TEST+OUTPUT+NOT+TRUNCATED+%26lt%3B---</segment>
-				<idsubdatatable>1579</idsubdatatable>
+				<idsubdatatable>1571</idsubdatatable>
 			</row>
 			<row>
 				
 				<segment>eventAction==play</segment>
-				<idsubdatatable>1570</idsubdatatable>
+				<idsubdatatable>1562</idsubdatatable>
 			</row>
 			<row>
 				
 				<segment>eventAction==playStart</segment>
-				<idsubdatatable>1578</idsubdatatable>
+				<idsubdatatable>1570</idsubdatatable>
 			</row>
 			<row>
 				<segment>eventAction==Purchase</segment>
@@ -345,57 +345,57 @@
 			<row>
 				
 				<segment>eventAction==playTrailer</segment>
-				<idsubdatatable>1588</idsubdatatable>
+				<idsubdatatable>1580</idsubdatatable>
 			</row>
 			<row>
 				
 				<segment>eventAction==Search</segment>
-				<idsubdatatable>1581</idsubdatatable>
+				<idsubdatatable>1573</idsubdatatable>
 			</row>
 			<row>
 				
 				<segment>eventAction==play25%25</segment>
-				<idsubdatatable>1583</idsubdatatable>
+				<idsubdatatable>1575</idsubdatatable>
 			</row>
 			<row>
 				
 				<segment>eventAction==play50%25</segment>
-				<idsubdatatable>1584</idsubdatatable>
+				<idsubdatatable>1576</idsubdatatable>
 			</row>
 			<row>
 				
 				<segment>eventAction==play75%25</segment>
-				<idsubdatatable>1585</idsubdatatable>
+				<idsubdatatable>1577</idsubdatatable>
 			</row>
 			<row>
 				
 				<segment>eventAction==playEnd</segment>
-				<idsubdatatable>1586</idsubdatatable>
+				<idsubdatatable>1578</idsubdatatable>
 			</row>
 			<row>
 				
 				<segment>eventAction==rating</segment>
-				<idsubdatatable>1587</idsubdatatable>
+				<idsubdatatable>1579</idsubdatatable>
 			</row>
 			<row>
 				
 				<segment>eventAction==clickBuyNow</segment>
-				<idsubdatatable>1589</idsubdatatable>
+				<idsubdatatable>1581</idsubdatatable>
 			</row>
 			<row>
 				
 				<segment>eventAction==event+action+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+---%26gt%3B+SHOULD+APPEAR+IN+TEST+OUTPUT+NOT+TRUNCATED+%26lt%3B---</segment>
-				<idsubdatatable>1591</idsubdatatable>
+				<idsubdatatable>1583</idsubdatatable>
 			</row>
 			<row>
 				
 				<segment>eventAction==play</segment>
-				<idsubdatatable>1582</idsubdatatable>
+				<idsubdatatable>1574</idsubdatatable>
 			</row>
 			<row>
 				
 				<segment>eventAction==playStart</segment>
-				<idsubdatatable>1590</idsubdatatable>
+				<idsubdatatable>1582</idsubdatatable>
 			</row>
 			<row>
 				<segment>eventAction==Purchase</segment>
diff --git a/tests/PHPUnit/System/expected/test_CustomEvents_Events.getCategory_lastN__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents_Events.getCategory_lastN__API.getProcessedReport_day.xml
index c11280f99e..9d4b29126d 100644
--- a/tests/PHPUnit/System/expected/test_CustomEvents_Events.getCategory_lastN__API.getProcessedReport_day.xml
+++ b/tests/PHPUnit/System/expected/test_CustomEvents_Events.getCategory_lastN__API.getProcessedReport_day.xml
@@ -120,39 +120,39 @@
 			<row>
 				
 				<segment>eventCategory==Movie</segment>
-				<idsubdatatable>1494</idsubdatatable>
+				<idsubdatatable>1486</idsubdatatable>
 			</row>
 			<row>
 				
 				<segment>eventCategory==Music</segment>
-				<idsubdatatable>1495</idsubdatatable>
+				<idsubdatatable>1487</idsubdatatable>
 			</row>
 			<row>
 				
 				<segment>eventCategory==event+category+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+---%26gt%3B+SHOULD+APPEAR+IN+TEST+OUTPUT+NOT+TRUNCATED+%26lt%3B---</segment>
-				<idsubdatatable>1496</idsubdatatable>
+				<idsubdatatable>1488</idsubdatatable>
 			</row>
 			<row>
 				
 				<segment>eventCategory==CategoryTriggersGoal+here</segment>
-				<idsubdatatable>1497</idsubdatatable>
+				<idsubdatatable>1489</idsubdatatable>
 			</row>
 		</result>
 		<result prettyDate="Monday, January 4, 2010">
 			<row>
 				
 				<segment>eventCategory==Movie</segment>
-				<idsubdatatable>1499</idsubdatatable>
+				<idsubdatatable>1491</idsubdatatable>
 			</row>
 			<row>
 				
 				<segment>eventCategory==Music</segment>
-				<idsubdatatable>1500</idsubdatatable>
+				<idsubdatatable>1492</idsubdatatable>
 			</row>
 			<row>
 				
 				<segment>eventCategory==event+category+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+---%26gt%3B+SHOULD+APPEAR+IN+TEST+OUTPUT+NOT+TRUNCATED+%26lt%3B---</segment>
-				<idsubdatatable>1501</idsubdatatable>
+				<idsubdatatable>1493</idsubdatatable>
 			</row>
 		</result>
 		<result prettyDate="Tuesday, January 5, 2010" />
diff --git a/tests/PHPUnit/System/expected/test_CustomEvents_Events.getName_lastN__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents_Events.getName_lastN__API.getProcessedReport_day.xml
index 6f99fa8bd0..08b6aad2fa 100644
--- a/tests/PHPUnit/System/expected/test_CustomEvents_Events.getName_lastN__API.getProcessedReport_day.xml
+++ b/tests/PHPUnit/System/expected/test_CustomEvents_Events.getName_lastN__API.getProcessedReport_day.xml
@@ -183,72 +183,72 @@
 			<row>
 				
 				<segment>eventName==Spirited+Away+%28%E5%8D%83%E3%81%A8%E5%8D%83%E5%B0%8B%E3%81%AE%E7%A5%9E%E9%9A%A0%E3%81%97%29</segment>
-				<idsubdatatable>1676</idsubdatatable>
+				<idsubdatatable>1668</idsubdatatable>
 			</row>
 			<row>
 				
 				<segment>eventName==La+fianc%C3%A9e+de+l%26%23039%3Beau</segment>
-				<idsubdatatable>1675</idsubdatatable>
+				<idsubdatatable>1667</idsubdatatable>
 			</row>
 			<row>
 				
-				<idsubdatatable>1674</idsubdatatable>
+				<idsubdatatable>1666</idsubdatatable>
 			</row>
 			<row>
 				
 				<segment>eventName==event+name+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+---%26gt%3B+SHOULD+APPEAR+IN+TEST+OUTPUT+NOT+TRUNCATED+%26lt%3B---</segment>
-				<idsubdatatable>1680</idsubdatatable>
+				<idsubdatatable>1672</idsubdatatable>
 			</row>
 			<row>
 				
 				<segment>eventName==Ponyo+%28%E5%B4%96%E3%81%AE%E4%B8%8A%E3%81%AE%E3%83%9D%E3%83%8B%E3%83%A7%29</segment>
-				<idsubdatatable>1678</idsubdatatable>
+				<idsubdatatable>1670</idsubdatatable>
 			</row>
 			<row>
 				
 				<segment>eventName==Princess+Mononoke+%28%E3%82%82%E3%81%AE%E3%81%AE%E3%81%91%E5%A7%AB%29</segment>
-				<idsubdatatable>1677</idsubdatatable>
+				<idsubdatatable>1669</idsubdatatable>
 			</row>
 			<row>
 				
 				<segment>eventName==Search+query+here</segment>
-				<idsubdatatable>1679</idsubdatatable>
+				<idsubdatatable>1671</idsubdatatable>
 			</row>
 		</result>
 		<result prettyDate="Monday, January 4, 2010">
 			<row>
 				
 				<segment>eventName==Spirited+Away+%28%E5%8D%83%E3%81%A8%E5%8D%83%E5%B0%8B%E3%81%AE%E7%A5%9E%E9%9A%A0%E3%81%97%29</segment>
-				<idsubdatatable>1684</idsubdatatable>
+				<idsubdatatable>1676</idsubdatatable>
 			</row>
 			<row>
 				
 				<segment>eventName==La+fianc%C3%A9e+de+l%26%23039%3Beau</segment>
-				<idsubdatatable>1683</idsubdatatable>
+				<idsubdatatable>1675</idsubdatatable>
 			</row>
 			<row>
 				
-				<idsubdatatable>1682</idsubdatatable>
+				<idsubdatatable>1674</idsubdatatable>
 			</row>
 			<row>
 				
 				<segment>eventName==event+name+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+---%26gt%3B+SHOULD+APPEAR+IN+TEST+OUTPUT+NOT+TRUNCATED+%26lt%3B---</segment>
-				<idsubdatatable>1688</idsubdatatable>
+				<idsubdatatable>1680</idsubdatatable>
 			</row>
 			<row>
 				
 				<segment>eventName==Ponyo+%28%E5%B4%96%E3%81%AE%E4%B8%8A%E3%81%AE%E3%83%9D%E3%83%8B%E3%83%A7%29</segment>
-				<idsubdatatable>1686</idsubdatatable>
+				<idsubdatatable>1678</idsubdatatable>
 			</row>
 			<row>
 				
 				<segment>eventName==Princess+Mononoke+%28%E3%82%82%E3%81%AE%E3%81%AE%E3%81%91%E5%A7%AB%29</segment>
-				<idsubdatatable>1685</idsubdatatable>
+				<idsubdatatable>1677</idsubdatatable>
 			</row>
 			<row>
 				
 				<segment>eventName==Search+query+here</segment>
-				<idsubdatatable>1687</idsubdatatable>
+				<idsubdatatable>1679</idsubdatatable>
 			</row>
 		</result>
 		<result prettyDate="Tuesday, January 5, 2010" />
diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_sortByProcessedMetric__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_sortByProcessedMetric__API.getProcessedReport_day.xml
index 33eb8d25bf..914a9fc566 100644
--- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_sortByProcessedMetric__API.getProcessedReport_day.xml
+++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_sortByProcessedMetric__API.getProcessedReport_day.xml
@@ -61,11 +61,11 @@
 	<reportMetadata>
 		<row>
 			
-			<idsubdatatable>2778</idsubdatatable>
+			<idsubdatatable>2806</idsubdatatable>
 		</row>
 		<row>
 			
-			<idsubdatatable>2777</idsubdatatable>
+			<idsubdatatable>2805</idsubdatatable>
 		</row>
 	</reportMetadata>
 	<reportTotal>
diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_hideColumns___API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_hideColumns___API.getProcessedReport_day.xml
index af6e4b97c9..4a0b042067 100644
--- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_hideColumns___API.getProcessedReport_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_hideColumns___API.getProcessedReport_day.xml
@@ -58,7 +58,7 @@
 	<reportMetadata>
 		<row>
 			
-			<idsubdatatable>5190</idsubdatatable>
+			<idsubdatatable>5166</idsubdatatable>
 		</row>
 		<row>
 		</row>
diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_showColumns___API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_showColumns___API.getProcessedReport_day.xml
index 28535f758d..a69e6d6fad 100644
--- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_showColumns___API.getProcessedReport_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_showColumns___API.getProcessedReport_day.xml
@@ -67,7 +67,7 @@
 	<reportMetadata>
 		<row>
 			
-			<idsubdatatable>5194</idsubdatatable>
+			<idsubdatatable>5170</idsubdatatable>
 		</row>
 		<row>
 		</row>
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Actions.getPageTitles_firstSite_lastN__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Actions.getPageTitles_firstSite_lastN__API.getProcessedReport_day.xml
index 2a60c771ec..c9d148ac12 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Actions.getPageTitles_firstSite_lastN__API.getProcessedReport_day.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Actions.getPageTitles_firstSite_lastN__API.getProcessedReport_day.xml
@@ -184,51 +184,51 @@
 		<result prettyDate="Tuesday, January 5, 2010">
 			<row>
 				
-				<idsubdatatable>2031</idsubdatatable>
+				<idsubdatatable>2111</idsubdatatable>
 			</row>
 			<row>
 				
-				<idsubdatatable>2030</idsubdatatable>
+				<idsubdatatable>2110</idsubdatatable>
 			</row>
 		</result>
 		<result prettyDate="Wednesday, January 6, 2010">
 			<row>
 				
-				<idsubdatatable>2035</idsubdatatable>
+				<idsubdatatable>2115</idsubdatatable>
 			</row>
 			<row>
 				
-				<idsubdatatable>2034</idsubdatatable>
+				<idsubdatatable>2114</idsubdatatable>
 			</row>
 		</result>
 		<result prettyDate="Thursday, January 7, 2010">
 			<row>
 				
-				<idsubdatatable>2039</idsubdatatable>
+				<idsubdatatable>2119</idsubdatatable>
 			</row>
 			<row>
 				
-				<idsubdatatable>2038</idsubdatatable>
+				<idsubdatatable>2118</idsubdatatable>
 			</row>
 		</result>
 		<result prettyDate="Friday, January 8, 2010">
 			<row>
 				
-				<idsubdatatable>2043</idsubdatatable>
+				<idsubdatatable>2123</idsubdatatable>
 			</row>
 			<row>
 				
-				<idsubdatatable>2042</idsubdatatable>
+				<idsubdatatable>2122</idsubdatatable>
 			</row>
 		</result>
 		<result prettyDate="Saturday, January 9, 2010">
 			<row>
 				
-				<idsubdatatable>2047</idsubdatatable>
+				<idsubdatatable>2127</idsubdatatable>
 			</row>
 			<row>
 				
-				<idsubdatatable>2046</idsubdatatable>
+				<idsubdatatable>2126</idsubdatatable>
 			</row>
 		</result>
 	</reportMetadata>
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Referrers.getWebsites_firstSite_lastN__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Referrers.getWebsites_firstSite_lastN__API.getProcessedReport_day.xml
index 1cb0ad4e73..7cf14505eb 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Referrers.getWebsites_firstSite_lastN__API.getProcessedReport_day.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Referrers.getWebsites_firstSite_lastN__API.getProcessedReport_day.xml
@@ -116,14 +116,14 @@
 			<row>
 				
 				<segment>referrerName==referrer.com</segment>
-				<idsubdatatable>1979</idsubdatatable>
+				<idsubdatatable>2059</idsubdatatable>
 			</row>
 		</result>
 		<result prettyDate="Monday, January 4, 2010">
 			<row>
 				
 				<segment>referrerName==referrer.com</segment>
-				<idsubdatatable>1981</idsubdatatable>
+				<idsubdatatable>2061</idsubdatatable>
 			</row>
 		</result>
 		<result prettyDate="Tuesday, January 5, 2010" />
@@ -133,14 +133,14 @@
 			<row>
 				
 				<segment>referrerName==referrer.com</segment>
-				<idsubdatatable>1986</idsubdatatable>
+				<idsubdatatable>2066</idsubdatatable>
 			</row>
 		</result>
 		<result prettyDate="Saturday, January 9, 2010">
 			<row>
 				
 				<segment>referrerName==referrer.com</segment>
-				<idsubdatatable>1988</idsubdatatable>
+				<idsubdatatable>2068</idsubdatatable>
 			</row>
 		</result>
 	</reportMetadata>