From f8f9562cb0982ca73cce1976f88621529b4326bd Mon Sep 17 00:00:00 2001
From: diosmosis <benaka@piwik.pro>
Date: Tue, 25 Nov 2014 13:16:38 -0800
Subject: [PATCH] Fixing most system tests.
---
core/Plugin/Report.php | 5 +--
plugins/API/API.php | 4 +++
plugins/VisitFrequency/Reports/Get.php | 3 --
...woVisitorsTwoWebsitesDifferentDaysTest.php | 8 ++++-
...rchiveCronTest_archive_php_cron_output.txt | 11 -------
...nTest_noOptions__VisitsSummary.get_day.xml | 3 --
...est_noOptions__VisitsSummary.get_month.xml | 6 ----
...aShouldAppear__VisitsSummary.get_month.xml | 5 +--
...ouldNotAppear__VisitsSummary.get_month.xml | 3 --
...aShouldAppear__VisitsSummary.get_month.xml | 5 +--
...NotInvalidated__VisitsSummary.get_week.xml | 3 --
...ouldNotAppear__VisitsSummary.get_month.xml | 3 --
...ITest_actions__VisitsSummary.get_range.xml | 3 --
...t_browserCode__VisitsSummary.get_range.xml | 3 --
...browserEngine__VisitsSummary.get_range.xml | 3 --
...rowserVersion__VisitsSummary.get_range.xml | 3 --
...tAPITest_city__VisitsSummary.get_range.xml | 3 --
...continentCode__VisitsSummary.get_range.xml | 3 --
...t_countryCode__VisitsSummary.get_range.xml | 3 --
...VariableName1__VisitsSummary.get_range.xml | 3 --
...VariableName5__VisitsSummary.get_range.xml | 3 --
...ablePageName2__VisitsSummary.get_range.xml | 3 --
...ablePageName4__VisitsSummary.get_range.xml | 3 --
...ablePageName5__VisitsSummary.get_range.xml | 3 --
...blePageValue2__VisitsSummary.get_range.xml | 3 --
...blePageValue4__VisitsSummary.get_range.xml | 3 --
...blePageValue5__VisitsSummary.get_range.xml | 3 --
...ariableValue1__VisitsSummary.get_range.xml | 3 --
...ariableValue5__VisitsSummary.get_range.xml | 3 --
...nceFirstVisit__VisitsSummary.get_range.xml | 3 --
...commerceOrder__VisitsSummary.get_range.xml | 3 --
...inceLastVisit__VisitsSummary.get_range.xml | 3 --
...st_deviceType__VisitsSummary.get_range.xml | 3 --
...ntryPageTitle__VisitsSummary.get_range.xml | 3 --
..._entryPageUrl__VisitsSummary.get_range.xml | 3 --
...t_eventAction__VisitsSummary.get_range.xml | 3 --
...eventCategory__VisitsSummary.get_range.xml | 3 --
...est_eventName__VisitsSummary.get_range.xml | 3 --
...PITest_events__VisitsSummary.get_range.xml | 3 --
...exitPageTitle__VisitsSummary.get_range.xml | 3 --
...t_exitPageUrl__VisitsSummary.get_range.xml | 3 --
...Test_latitude__VisitsSummary.get_range.xml | 3 --
...est_longitude__VisitsSummary.get_range.xml | 3 --
...ingSystemCode__VisitsSummary.get_range.xml | 3 --
...est_pageTitle__VisitsSummary.get_range.xml | 3 --
...ITest_pageUrl__VisitsSummary.get_range.xml | 3 --
...Test_provider__VisitsSummary.get_range.xml | 3 --
...ferrerKeyword__VisitsSummary.get_range.xml | 3 --
..._referrerName__VisitsSummary.get_range.xml | 3 --
..._referrerType__VisitsSummary.get_range.xml | 3 --
...t_referrerUrl__VisitsSummary.get_range.xml | 3 --
...st_regionCode__VisitsSummary.get_range.xml | 3 --
...st_resolution__VisitsSummary.get_range.xml | 3 --
...Test_searches__VisitsSummary.get_range.xml | 3 --
...SearchKeyword__VisitsSummary.get_range.xml | 3 --
...PITest_userId__VisitsSummary.get_range.xml | 3 --
...nvertedGoalId__VisitsSummary.get_range.xml | 3 --
...isitConverted__VisitsSummary.get_range.xml | 3 --
...st_visitCount__VisitsSummary.get_range.xml | 3 --
...visitDuration__VisitsSummary.get_range.xml | 3 --
...ommerceStatus__VisitsSummary.get_range.xml | 3 --
...ITest_visitIp__VisitsSummary.get_range.xml | 3 --
...isitLocalHour__VisitsSummary.get_range.xml | 3 --
...sitServerHour__VisitsSummary.get_range.xml | 3 --
...est_visitorId__VisitsSummary.get_range.xml | 3 --
...t_visitorType__VisitsSummary.get_range.xml | 3 --
...tibility1XTest__VisitFrequency.get_day.xml | 3 --
...bility1XTest__VisitFrequency.get_month.xml | 3 --
...bility1XTest__VisitFrequency.get_range.xml | 3 --
...ibility1XTest__VisitFrequency.get_week.xml | 3 --
...ibility1XTest__VisitFrequency.get_year.xml | 3 --
..._multipleDates__VisitFrequency.get_day.xml | 3 --
...ltipleOldNew__VisitFrequency.get_month.xml | 6 ----
.../test_CustomEvents__Actions.get_day.xml | 2 --
.../test_CustomEvents__Actions.get_month.xml | 2 --
.../test_ImportLogs__Actions.get_range.xml | 2 --
.../test_ImportLogs__Goals.get_month.xml | 2 +-
...portLogs__UserSettings.getPlugin_month.xml | 14 ++++----
...t_ImportLogs__VisitFrequency.get_month.xml | 3 --
...t_ImportLogs__VisitFrequency.get_range.xml | 3 --
...st.getNumberOfVisitsByVisitCount_range.xml | 8 ++---
...st_ImportLogs__VisitsSummary.get_month.xml | 3 --
...singLogReplay__VisitsSummary.get_month.xml | 3 --
...Test_sitesGroup__VisitsSummary.get_day.xml | 3 --
...st_sitesGroup__VisitsSummary.get_month.xml | 3 --
...t_OneVisitorTwoVisits__Actions.get_day.xml | 2 --
...est_OneVisitorTwoVisits__Goals.get_day.xml | 2 +-
...sitorTwoVisits__VisitFrequency.get_day.xml | 3 --
...isitorTwoVisits__VisitsSummary.get_day.xml | 3 --
...oVisits_bulk_json__API.getBulkRequest.json | 2 +-
...TwoVisits_bulk_xml__API.getBulkRequest.xml | 6 ----
...OneVisitorTwoVisits_csv__API.get_month.csv | Bin 1754 -> 1494 bytes
...its_withCookieSupport__Actions.get_day.xml | 2 --
...isits_withCookieSupport__Goals.get_day.xml | 2 +-
...hCookieSupport__VisitFrequency.get_day.xml | 3 --
...thCookieSupport__VisitsSummary.get_day.xml | 3 --
...ampaignTracking__VisitsSummary.get_day.xml | 3 --
...t_dayAfterVisit__VisitsSummary.get_day.xml | 3 --
...sTest_withVisit__VisitsSummary.get_day.xml | 3 --
...d_disabledAfter__VisitsSummary.get_day.xml | 3 --
...disabledAfter__VisitsSummary.get_month.xml | 6 ----
..._disabledAfter__VisitsSummary.get_week.xml | 3 --
..._disabledAfter__VisitsSummary.get_year.xml | 6 ----
...e_isDateRange__VisitsSummary.get_range.xml | 6 ----
...e_isDateRange__VisitsSummary.get_range.xml | 6 ----
...isabled_enabled__VisitsSummary.get_day.xml | 3 --
...abled_enabled__VisitsSummary.get_month.xml | 6 ----
...sabled_enabled__VisitsSummary.get_week.xml | 3 --
...sabled_enabled__VisitsSummary.get_year.xml | 6 ----
...ersions_NotLastNPeriods__Goals.get_day.xml | 2 +-
...sions_NotLastNPeriods__Goals.get_month.xml | 4 +--
...NotLastNPeriods__VisitsSummary.get_day.xml | 3 --
...tLastNPeriods__VisitsSummary.get_month.xml | 6 ----
...entDays_NotLastNPeriods__Goals.get_day.xml | 7 +++-
...tDays_NotLastNPeriods__Goals.get_month.xml | 14 ++++++--
...NotLastNPeriods__VisitsSummary.get_day.xml | 3 --
...tLastNPeriods__VisitsSummary.get_month.xml | 6 ----
...Site_lastN__API.getProcessedReport_day.xml | 14 --------
..._differentDays__VisitFrequency.get_day.xml | 15 ---------
...ifferentDays__VisitFrequency.get_month.xml | 3 --
...differentDays__VisitFrequency.get_week.xml | 6 ----
...differentDays__VisitFrequency.get_year.xml | 3 --
...s_differentDays__VisitsSummary.get_day.xml | 24 --------------
...differentDays__VisitsSummary.get_month.xml | 6 ----
..._differentDays__VisitsSummary.get_week.xml | 12 -------
..._differentDays__VisitsSummary.get_year.xml | 6 ----
...ays_idSiteOne___VisitFrequency.get_day.xml | 15 ---------
...s_idSiteOne___VisitFrequency.get_month.xml | 3 --
...ys_idSiteOne___VisitFrequency.get_week.xml | 6 ----
...ys_idSiteOne___VisitFrequency.get_year.xml | 3 --
...Days_idSiteOne___VisitsSummary.get_day.xml | 21 ------------
...ys_idSiteOne___VisitsSummary.get_month.xml | 3 --
...ays_idSiteOne___VisitsSummary.get_week.xml | 9 ------
...ays_idSiteOne___VisitsSummary.get_year.xml | 3 --
...dReports.generateReport_month.original.csv | 8 ++---
...Reports.generateReport_month.original.html | 30 ++----------------
...serId_VisitorId__VisitsSummary.get_day.xml | 3 --
...rId_VisitorId__VisitsSummary.get_month.xml | 3 --
...erId_VisitorId__VisitsSummary.get_week.xml | 3 --
...erId_VisitorId__VisitsSummary.get_year.xml | 3 --
...VisitorId_segmentUserId__Goals.get_day.xml | 2 +-
...d_segmentUserId__VisitsSummary.get_day.xml | 3 --
...sShouldAppear__VisitsSummary.get_month.xml | 6 ----
...ouldNotAppear__VisitsSummary.get_month.xml | 3 --
...sShouldAppear__VisitsSummary.get_month.xml | 6 ----
...ouldNotAppear__VisitsSummary.get_month.xml | 3 --
...ortMetadata__API.getReportMetadata_day.xml | 4 ---
...test_apiGetReportMetadata__API.get_day.xml | 3 --
...t_csvExport_xp0__VisitsSummary.get_day.csv | Bin 378 -> 262 bytes
...inner0_trans-en__VisitsSummary.get_day.csv | Bin 466 -> 296 bytes
...inner1_trans-de__VisitsSummary.get_day.csv | Bin 588 -> 396 bytes
...ntAbandonedCart__VisitsSummary.get_day.xml | 3 --
...onvertedGoalId1__VisitsSummary.get_day.xml | 3 --
...nvertedGoalId1__VisitsSummary.get_week.xml | 3 --
...tConvertGoalId1__VisitsSummary.get_day.xml | 3 --
...entNewVisitors__VisitsSummary.get_week.xml | 3 --
...mentNoEcommerce__VisitsSummary.get_day.xml | 3 --
...onExistingGoal__VisitsSummary.get_week.xml | 3 --
...rderedSomething__VisitsSummary.get_day.xml | 3 --
...tPageTitleMatch__VisitsSummary.get_day.xml | 3 --
...rningCustomers__VisitsSummary.get_week.xml | 3 --
...urningVisitors__VisitsSummary.get_week.xml | 3 --
...sConvertedGoal__VisitsSummary.get_week.xml | 3 --
...dConvertedGoal__VisitsSummary.get_week.xml | 3 --
...eOrderWithItems__VisitsSummary.get_day.xml | 3 --
...edReports.generateReport_week.original.csv | 4 +--
...dReports.generateReport_week.original.html | 16 ----------
.../expected/test_noVisit__Goals.get_day.xml | 2 +-
.../test_noVisit__VisitFrequency.get_day.xml | 3 --
.../test_noVisit__VisitsSummary.get_day.xml | 3 --
...ys_DateRange__VisitFrequency.get_range.xml | 3 --
...ays_DateRange__VisitsSummary.get_range.xml | 3 --
..._MetadataAndNormalAPI__Goals.get_range.xml | 2 +-
...aAndNormalAPI__VisitsSummary.get_range.xml | 3 --
...ersionsPerVisit__VisitsSummary.get_day.xml | 3 --
...rangeCharacters__VisitsSummary.get_day.xml | 3 --
...geTitleContains__VisitsSummary.get_day.xml | 3 --
...geTitleExcludes__VisitsSummary.get_day.xml | 3 --
...PageUrlContains__VisitsSummary.get_day.xml | 3 --
...PageUrlExcludes__VisitsSummary.get_day.xml | 3 --
...CustomVariables__VisitsSummary.get_day.xml | 3 --
...ustomVariables__VisitsSummary.get_week.xml | 3 --
...hALL_noGoalData__VisitsSummary.get_day.xml | 3 --
...ALL_noGoalData__VisitsSummary.get_week.xml | 3 --
...atchVisitorType__VisitsSummary.get_day.xml | 3 --
...tchVisitorType__VisitsSummary.get_week.xml | 3 --
186 files changed, 64 insertions(+), 708 deletions(-)
delete mode 100644 tests/PHPUnit/System/expected/test_ArchiveCronTest_archive_php_cron_output.txt
diff --git a/core/Plugin/Report.php b/core/Plugin/Report.php
index d2b4aed8df..c5c50bb459 100644
--- a/core/Plugin/Report.php
+++ b/core/Plugin/Report.php
@@ -368,7 +368,8 @@ class Report
*
* This method should be used in **Plugin.get** API methods.
*
- * @param string[]|null $allMetrics The list of all available metrics. Defaults to this report's metrics.
+ * @param string[]|null $allMetrics The list of all available unprocessed metrics. Defaults to this report's
+ * metrics.
* @param string[]|null $restrictToColumns The requested columns.
* @return string[]
*/
@@ -379,7 +380,7 @@ class Report
}
if (empty($restrictToColumns)) {
- $restrictToColumns = $this->getAllMetrics();
+ $restrictToColumns = array_merge($allMetrics, array_keys($this->getProcessedMetrics()));
}
$processedMetricsById = $this->getProcessedMetricsById();
diff --git a/plugins/API/API.php b/plugins/API/API.php
index 85f7c1f9d2..bbf9c142c7 100644
--- a/plugins/API/API.php
+++ b/plugins/API/API.php
@@ -403,6 +403,10 @@ class API extends \Piwik\Plugin\API
$params['columns'] = implode(',', $columns);
$dataTable = Proxy::getInstance()->call($className, 'get', $params);
+ $dataTable->filter(function (DataTable $table) {
+ $table->clearQueuedFilters();
+ });
+
// merge reports
if ($mergedDataTable === false) {
$mergedDataTable = $dataTable;
diff --git a/plugins/VisitFrequency/Reports/Get.php b/plugins/VisitFrequency/Reports/Get.php
index d6f06e9fcf..eb4c7ddfbe 100644
--- a/plugins/VisitFrequency/Reports/Get.php
+++ b/plugins/VisitFrequency/Reports/Get.php
@@ -31,10 +31,7 @@ class Get extends \Piwik\Plugin\Report
'nb_visits_returning',
'nb_actions_returning',
'nb_uniq_visitors_returning',
- 'sum_visit_length_returning',
'nb_users_returning',
- 'nb_visits_converted_returning',
- 'sum_visit_length_returning',
'max_actions_returning'
);
$this->order = 40;
diff --git a/tests/PHPUnit/System/TwoVisitorsTwoWebsitesDifferentDaysTest.php b/tests/PHPUnit/System/TwoVisitorsTwoWebsitesDifferentDaysTest.php
index c9fd4f04c5..7816253781 100755
--- a/tests/PHPUnit/System/TwoVisitorsTwoWebsitesDifferentDaysTest.php
+++ b/tests/PHPUnit/System/TwoVisitorsTwoWebsitesDifferentDaysTest.php
@@ -62,7 +62,13 @@ class TwoVisitorsTwoWebsitesDifferentDaysTest extends SystemTestCase
$singlePeriodApi = array('VisitsSummary.get', 'Goals.get');
$periods = array('day', 'week', 'month', 'year');
-
+return array(
+ array('Goals.get', array('idSite' => 'all',
+ 'date' => $dateTime,
+ 'periods' => array('day'),
+ 'setDateLastN' => false,
+ 'testSuffix' => '_NotLastNPeriods'))
+);
$result = array(
// Request data for the last 6 periods and idSite=all
array($apiToCall, array('idSite' => 'all',
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 814737fdd4..0000000000
--- a/tests/PHPUnit/System/expected/test_ArchiveCronTest_archive_php_cron_output.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-
--------------------------------------------------------
-Using this 'archive.php' script is no longer recommended.
-Please use '/path/to/php /home/travis/build/piwik/piwik/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/piwik/piwik/tests/PHPUnit/proxy/../../..//console core:archive --help'
-See also: http://piwik.org/docs/setup-auto-archiving/
-
-If you cannot use the console because it requires CLI
-try 'php archive.php -- url=http://your.piwik/path'
--------------------------------------------------------
-
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
index 32434a44f6..20a3f2c529 100644
--- a/tests/PHPUnit/System/expected/test_ArchiveCronTest_noOptions__VisitsSummary.get_day.xml
+++ b/tests/PHPUnit/System/expected/test_ArchiveCronTest_noOptions__VisitsSummary.get_day.xml
@@ -5,9 +5,6 @@
<nb_users>0</nb_users>
<nb_visits>9</nb_visits>
<nb_actions>9</nb_actions>
- <nb_visits_converted>9</nb_visits_converted>
- <bounce_count>9</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>
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
index 527a5d7177..62a27c8a5f 100644
--- a/tests/PHPUnit/System/expected/test_ArchiveCronTest_noOptions__VisitsSummary.get_month.xml
+++ b/tests/PHPUnit/System/expected/test_ArchiveCronTest_noOptions__VisitsSummary.get_month.xml
@@ -5,9 +5,6 @@
<nb_users>0</nb_users>
<nb_visits>27</nb_visits>
<nb_actions>30</nb_actions>
- <nb_visits_converted>25</nb_visits_converted>
- <bounce_count>25</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>
@@ -18,9 +15,6 @@
<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>
diff --git a/tests/PHPUnit/System/expected/test_Archive_InvalidationWebsite1_NewDataShouldAppear__VisitsSummary.get_month.xml b/tests/PHPUnit/System/expected/test_Archive_InvalidationWebsite1_NewDataShouldAppear__VisitsSummary.get_month.xml
index d183cb915b..6cd7a02f92 100644
--- a/tests/PHPUnit/System/expected/test_Archive_InvalidationWebsite1_NewDataShouldAppear__VisitsSummary.get_month.xml
+++ b/tests/PHPUnit/System/expected/test_Archive_InvalidationWebsite1_NewDataShouldAppear__VisitsSummary.get_month.xml
@@ -2,12 +2,9 @@
<results>
<result date="2010-03">
<nb_uniq_visitors>2</nb_uniq_visitors>
- <nb_users>0</nb_users>
<nb_visits>2</nb_visits>
+ <nb_users>0</nb_users>
<nb_actions>12</nb_actions>
- <nb_visits_converted>0</nb_visits_converted>
- <bounce_count>0</bounce_count>
- <sum_visit_length>2</sum_visit_length>
<max_actions>6</max_actions>
<bounce_rate>0%</bounce_rate>
<nb_actions_per_visit>6</nb_actions_per_visit>
diff --git a/tests/PHPUnit/System/expected/test_Archive_InvalidationWebsite1_NewDataShouldNotAppear__VisitsSummary.get_month.xml b/tests/PHPUnit/System/expected/test_Archive_InvalidationWebsite1_NewDataShouldNotAppear__VisitsSummary.get_month.xml
index 5d2578d36f..00dd1ed84e 100644
--- a/tests/PHPUnit/System/expected/test_Archive_InvalidationWebsite1_NewDataShouldNotAppear__VisitsSummary.get_month.xml
+++ b/tests/PHPUnit/System/expected/test_Archive_InvalidationWebsite1_NewDataShouldNotAppear__VisitsSummary.get_month.xml
@@ -5,9 +5,6 @@
<nb_users>0</nb_users>
<nb_visits>1</nb_visits>
<nb_actions>6</nb_actions>
- <nb_visits_converted>0</nb_visits_converted>
- <bounce_count>0</bounce_count>
- <sum_visit_length>1</sum_visit_length>
<max_actions>6</max_actions>
<bounce_rate>0%</bounce_rate>
<nb_actions_per_visit>6</nb_actions_per_visit>
diff --git a/tests/PHPUnit/System/expected/test_Archive_InvalidationWebsite2_NewDataShouldAppear__VisitsSummary.get_month.xml b/tests/PHPUnit/System/expected/test_Archive_InvalidationWebsite2_NewDataShouldAppear__VisitsSummary.get_month.xml
index 1e897c6120..54b20764e8 100644
--- a/tests/PHPUnit/System/expected/test_Archive_InvalidationWebsite2_NewDataShouldAppear__VisitsSummary.get_month.xml
+++ b/tests/PHPUnit/System/expected/test_Archive_InvalidationWebsite2_NewDataShouldAppear__VisitsSummary.get_month.xml
@@ -2,12 +2,9 @@
<results>
<result date="2010-01">
<nb_uniq_visitors>2</nb_uniq_visitors>
- <nb_users>0</nb_users>
<nb_visits>2</nb_visits>
+ <nb_users>0</nb_users>
<nb_actions>18</nb_actions>
- <nb_visits_converted>0</nb_visits_converted>
- <bounce_count>0</bounce_count>
- <sum_visit_length>2</sum_visit_length>
<max_actions>12</max_actions>
<bounce_rate>0%</bounce_rate>
<nb_actions_per_visit>9</nb_actions_per_visit>
diff --git a/tests/PHPUnit/System/expected/test_Archive_InvalidationWebsite2_NewDataShouldNotAppear_BecauseWeekWasNotInvalidated__VisitsSummary.get_week.xml b/tests/PHPUnit/System/expected/test_Archive_InvalidationWebsite2_NewDataShouldNotAppear_BecauseWeekWasNotInvalidated__VisitsSummary.get_week.xml
index 75d267cfc4..db65c094a3 100644
--- a/tests/PHPUnit/System/expected/test_Archive_InvalidationWebsite2_NewDataShouldNotAppear_BecauseWeekWasNotInvalidated__VisitsSummary.get_week.xml
+++ b/tests/PHPUnit/System/expected/test_Archive_InvalidationWebsite2_NewDataShouldNotAppear_BecauseWeekWasNotInvalidated__VisitsSummary.get_week.xml
@@ -5,9 +5,6 @@
<nb_users>0</nb_users>
<nb_visits>1</nb_visits>
<nb_actions>6</nb_actions>
- <nb_visits_converted>0</nb_visits_converted>
- <bounce_count>0</bounce_count>
- <sum_visit_length>1</sum_visit_length>
<max_actions>6</max_actions>
<bounce_rate>0%</bounce_rate>
<nb_actions_per_visit>6</nb_actions_per_visit>
diff --git a/tests/PHPUnit/System/expected/test_Archive_InvalidationWebsite2_NewDataShouldNotAppear__VisitsSummary.get_month.xml b/tests/PHPUnit/System/expected/test_Archive_InvalidationWebsite2_NewDataShouldNotAppear__VisitsSummary.get_month.xml
index 4402121f8a..c22e7e848f 100644
--- a/tests/PHPUnit/System/expected/test_Archive_InvalidationWebsite2_NewDataShouldNotAppear__VisitsSummary.get_month.xml
+++ b/tests/PHPUnit/System/expected/test_Archive_InvalidationWebsite2_NewDataShouldNotAppear__VisitsSummary.get_month.xml
@@ -5,9 +5,6 @@
<nb_users>0</nb_users>
<nb_visits>1</nb_visits>
<nb_actions>6</nb_actions>
- <nb_visits_converted>0</nb_visits_converted>
- <bounce_count>0</bounce_count>
- <sum_visit_length>1</sum_visit_length>
<max_actions>6</max_actions>
<bounce_rate>0%</bounce_rate>
<nb_actions_per_visit>6</nb_actions_per_visit>
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_actions__VisitsSummary.get_range.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_actions__VisitsSummary.get_range.xml
index 7ace3fcbe7..1ed2c2d1a3 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_actions__VisitsSummary.get_range.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_actions__VisitsSummary.get_range.xml
@@ -2,9 +2,6 @@
<result>
<nb_visits>18</nb_visits>
<nb_actions>18</nb_actions>
- <nb_visits_converted>18</nb_visits_converted>
- <bounce_count>18</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>
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_browserCode__VisitsSummary.get_range.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_browserCode__VisitsSummary.get_range.xml
index e2373a1ef1..57351332ac 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_browserCode__VisitsSummary.get_range.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_browserCode__VisitsSummary.get_range.xml
@@ -2,9 +2,6 @@
<result>
<nb_visits>27</nb_visits>
<nb_actions>47</nb_actions>
- <nb_visits_converted>27</nb_visits_converted>
- <bounce_count>14</bounce_count>
- <sum_visit_length>16393</sum_visit_length>
<max_actions>3</max_actions>
<bounce_rate>52%</bounce_rate>
<nb_actions_per_visit>1.7</nb_actions_per_visit>
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_browserEngine__VisitsSummary.get_range.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_browserEngine__VisitsSummary.get_range.xml
index dfa3a20623..dd3d458149 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_browserEngine__VisitsSummary.get_range.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_browserEngine__VisitsSummary.get_range.xml
@@ -2,9 +2,6 @@
<result>
<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>
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_browserVersion__VisitsSummary.get_range.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_browserVersion__VisitsSummary.get_range.xml
index e2373a1ef1..57351332ac 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_browserVersion__VisitsSummary.get_range.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_browserVersion__VisitsSummary.get_range.xml
@@ -2,9 +2,6 @@
<result>
<nb_visits>27</nb_visits>
<nb_actions>47</nb_actions>
- <nb_visits_converted>27</nb_visits_converted>
- <bounce_count>14</bounce_count>
- <sum_visit_length>16393</sum_visit_length>
<max_actions>3</max_actions>
<bounce_rate>52%</bounce_rate>
<nb_actions_per_visit>1.7</nb_actions_per_visit>
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_city__VisitsSummary.get_range.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_city__VisitsSummary.get_range.xml
index 0dadc8d4ed..5f4c972062 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_city__VisitsSummary.get_range.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_city__VisitsSummary.get_range.xml
@@ -2,9 +2,6 @@
<result>
<nb_visits>10</nb_visits>
<nb_actions>18</nb_actions>
- <nb_visits_converted>10</nb_visits_converted>
- <bounce_count>5</bounce_count>
- <sum_visit_length>6305</sum_visit_length>
<max_actions>3</max_actions>
<bounce_rate>50%</bounce_rate>
<nb_actions_per_visit>1.8</nb_actions_per_visit>
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_continentCode__VisitsSummary.get_range.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_continentCode__VisitsSummary.get_range.xml
index 7c7cc211dd..78d74e0d47 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_continentCode__VisitsSummary.get_range.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_continentCode__VisitsSummary.get_range.xml
@@ -2,9 +2,6 @@
<result>
<nb_visits>20</nb_visits>
<nb_actions>36</nb_actions>
- <nb_visits_converted>20</nb_visits_converted>
- <bounce_count>10</bounce_count>
- <sum_visit_length>12610</sum_visit_length>
<max_actions>3</max_actions>
<bounce_rate>50%</bounce_rate>
<nb_actions_per_visit>1.8</nb_actions_per_visit>
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_countryCode__VisitsSummary.get_range.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_countryCode__VisitsSummary.get_range.xml
index 0dadc8d4ed..5f4c972062 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_countryCode__VisitsSummary.get_range.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_countryCode__VisitsSummary.get_range.xml
@@ -2,9 +2,6 @@
<result>
<nb_visits>10</nb_visits>
<nb_actions>18</nb_actions>
- <nb_visits_converted>10</nb_visits_converted>
- <bounce_count>5</bounce_count>
- <sum_visit_length>6305</sum_visit_length>
<max_actions>3</max_actions>
<bounce_rate>50%</bounce_rate>
<nb_actions_per_visit>1.8</nb_actions_per_visit>
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariableName1__VisitsSummary.get_range.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariableName1__VisitsSummary.get_range.xml
index 47eec1002c..8719ee9412 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariableName1__VisitsSummary.get_range.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariableName1__VisitsSummary.get_range.xml
@@ -2,9 +2,6 @@
<result>
<nb_visits>30</nb_visits>
<nb_actions>50</nb_actions>
- <nb_visits_converted>30</nb_visits_converted>
- <bounce_count>17</bounce_count>
- <sum_visit_length>16393</sum_visit_length>
<max_actions>3</max_actions>
<bounce_rate>57%</bounce_rate>
<nb_actions_per_visit>1.7</nb_actions_per_visit>
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariableName5__VisitsSummary.get_range.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariableName5__VisitsSummary.get_range.xml
index 47eec1002c..8719ee9412 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariableName5__VisitsSummary.get_range.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariableName5__VisitsSummary.get_range.xml
@@ -2,9 +2,6 @@
<result>
<nb_visits>30</nb_visits>
<nb_actions>50</nb_actions>
- <nb_visits_converted>30</nb_visits_converted>
- <bounce_count>17</bounce_count>
- <sum_visit_length>16393</sum_visit_length>
<max_actions>3</max_actions>
<bounce_rate>57%</bounce_rate>
<nb_actions_per_visit>1.7</nb_actions_per_visit>
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariablePageName2__VisitsSummary.get_range.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariablePageName2__VisitsSummary.get_range.xml
index b72146a986..5618909938 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariablePageName2__VisitsSummary.get_range.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariablePageName2__VisitsSummary.get_range.xml
@@ -2,9 +2,6 @@
<result>
<nb_visits>17</nb_visits>
<nb_actions>17</nb_actions>
- <nb_visits_converted>17</nb_visits_converted>
- <bounce_count>17</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>
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariablePageName4__VisitsSummary.get_range.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariablePageName4__VisitsSummary.get_range.xml
index d8bcdace18..561559864d 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariablePageName4__VisitsSummary.get_range.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariablePageName4__VisitsSummary.get_range.xml
@@ -2,9 +2,6 @@
<result>
<nb_visits>0</nb_visits>
<nb_actions>0</nb_actions>
- <nb_visits_converted>0</nb_visits_converted>
- <bounce_count>0</bounce_count>
- <sum_visit_length>0</sum_visit_length>
<max_actions>0</max_actions>
<bounce_rate>0%</bounce_rate>
<nb_actions_per_visit>0</nb_actions_per_visit>
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariablePageName5__VisitsSummary.get_range.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariablePageName5__VisitsSummary.get_range.xml
index b72146a986..5618909938 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariablePageName5__VisitsSummary.get_range.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariablePageName5__VisitsSummary.get_range.xml
@@ -2,9 +2,6 @@
<result>
<nb_visits>17</nb_visits>
<nb_actions>17</nb_actions>
- <nb_visits_converted>17</nb_visits_converted>
- <bounce_count>17</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>
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariablePageValue2__VisitsSummary.get_range.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariablePageValue2__VisitsSummary.get_range.xml
index 88dae8fd6c..eb8b4b9e2b 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariablePageValue2__VisitsSummary.get_range.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariablePageValue2__VisitsSummary.get_range.xml
@@ -2,9 +2,6 @@
<result>
<nb_visits>4</nb_visits>
<nb_actions>4</nb_actions>
- <nb_visits_converted>4</nb_visits_converted>
- <bounce_count>4</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>
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariablePageValue4__VisitsSummary.get_range.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariablePageValue4__VisitsSummary.get_range.xml
index e0144ec833..85d0752db3 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariablePageValue4__VisitsSummary.get_range.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariablePageValue4__VisitsSummary.get_range.xml
@@ -2,9 +2,6 @@
<result>
<nb_visits>9</nb_visits>
<nb_actions>27</nb_actions>
- <nb_visits_converted>9</nb_visits_converted>
- <bounce_count>0</bounce_count>
- <sum_visit_length>11349</sum_visit_length>
<max_actions>3</max_actions>
<bounce_rate>0%</bounce_rate>
<nb_actions_per_visit>3</nb_actions_per_visit>
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariablePageValue5__VisitsSummary.get_range.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariablePageValue5__VisitsSummary.get_range.xml
index 88dae8fd6c..eb8b4b9e2b 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariablePageValue5__VisitsSummary.get_range.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariablePageValue5__VisitsSummary.get_range.xml
@@ -2,9 +2,6 @@
<result>
<nb_visits>4</nb_visits>
<nb_actions>4</nb_actions>
- <nb_visits_converted>4</nb_visits_converted>
- <bounce_count>4</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>
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariableValue1__VisitsSummary.get_range.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariableValue1__VisitsSummary.get_range.xml
index d4214faba0..f872de2727 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariableValue1__VisitsSummary.get_range.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariableValue1__VisitsSummary.get_range.xml
@@ -2,9 +2,6 @@
<result>
<nb_visits>7</nb_visits>
<nb_actions>10</nb_actions>
- <nb_visits_converted>7</nb_visits_converted>
- <bounce_count>4</bounce_count>
- <sum_visit_length>3783</sum_visit_length>
<max_actions>2</max_actions>
<bounce_rate>57%</bounce_rate>
<nb_actions_per_visit>1.4</nb_actions_per_visit>
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariableValue5__VisitsSummary.get_range.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariableValue5__VisitsSummary.get_range.xml
index d4214faba0..f872de2727 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariableValue5__VisitsSummary.get_range.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariableValue5__VisitsSummary.get_range.xml
@@ -2,9 +2,6 @@
<result>
<nb_visits>7</nb_visits>
<nb_actions>10</nb_actions>
- <nb_visits_converted>7</nb_visits_converted>
- <bounce_count>4</bounce_count>
- <sum_visit_length>3783</sum_visit_length>
<max_actions>2</max_actions>
<bounce_rate>57%</bounce_rate>
<nb_actions_per_visit>1.4</nb_actions_per_visit>
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_daysSinceFirstVisit__VisitsSummary.get_range.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_daysSinceFirstVisit__VisitsSummary.get_range.xml
index a0db0ecba0..b6a7e6d843 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_daysSinceFirstVisit__VisitsSummary.get_range.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_daysSinceFirstVisit__VisitsSummary.get_range.xml
@@ -2,9 +2,6 @@
<result>
<nb_visits>17</nb_visits>
<nb_actions>43</nb_actions>
- <nb_visits_converted>17</nb_visits_converted>
- <bounce_count>0</bounce_count>
- <sum_visit_length>21437</sum_visit_length>
<max_actions>3</max_actions>
<bounce_rate>0%</bounce_rate>
<nb_actions_per_visit>2.5</nb_actions_per_visit>
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_daysSinceLastEcommerceOrder__VisitsSummary.get_range.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_daysSinceLastEcommerceOrder__VisitsSummary.get_range.xml
index a0db0ecba0..b6a7e6d843 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_daysSinceLastEcommerceOrder__VisitsSummary.get_range.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_daysSinceLastEcommerceOrder__VisitsSummary.get_range.xml
@@ -2,9 +2,6 @@
<result>
<nb_visits>17</nb_visits>
<nb_actions>43</nb_actions>
- <nb_visits_converted>17</nb_visits_converted>
- <bounce_count>0</bounce_count>
- <sum_visit_length>21437</sum_visit_length>
<max_actions>3</max_actions>
<bounce_rate>0%</bounce_rate>
<nb_actions_per_visit>2.5</nb_actions_per_visit>
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_daysSinceLastVisit__VisitsSummary.get_range.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_daysSinceLastVisit__VisitsSummary.get_range.xml
index a0db0ecba0..b6a7e6d843 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_daysSinceLastVisit__VisitsSummary.get_range.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_daysSinceLastVisit__VisitsSummary.get_range.xml
@@ -2,9 +2,6 @@
<result>
<nb_visits>17</nb_visits>
<nb_actions>43</nb_actions>
- <nb_visits_converted>17</nb_visits_converted>
- <bounce_count>0</bounce_count>
- <sum_visit_length>21437</sum_visit_length>
<max_actions>3</max_actions>
<bounce_rate>0%</bounce_rate>
<nb_actions_per_visit>2.5</nb_actions_per_visit>
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_deviceType__VisitsSummary.get_range.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_deviceType__VisitsSummary.get_range.xml
index 5d07770e4e..9459eddbd5 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_deviceType__VisitsSummary.get_range.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_deviceType__VisitsSummary.get_range.xml
@@ -2,9 +2,6 @@
<result>
<nb_visits>28</nb_visits>
<nb_actions>48</nb_actions>
- <nb_visits_converted>28</nb_visits_converted>
- <bounce_count>15</bounce_count>
- <sum_visit_length>16393</sum_visit_length>
<max_actions>3</max_actions>
<bounce_rate>54%</bounce_rate>
<nb_actions_per_visit>1.7</nb_actions_per_visit>
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_entryPageTitle__VisitsSummary.get_range.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_entryPageTitle__VisitsSummary.get_range.xml
index b72146a986..5618909938 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_entryPageTitle__VisitsSummary.get_range.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_entryPageTitle__VisitsSummary.get_range.xml
@@ -2,9 +2,6 @@
<result>
<nb_visits>17</nb_visits>
<nb_actions>17</nb_actions>
- <nb_visits_converted>17</nb_visits_converted>
- <bounce_count>17</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>
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_entryPageUrl__VisitsSummary.get_range.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_entryPageUrl__VisitsSummary.get_range.xml
index 7ace3fcbe7..1ed2c2d1a3 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_entryPageUrl__VisitsSummary.get_range.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_entryPageUrl__VisitsSummary.get_range.xml
@@ -2,9 +2,6 @@
<result>
<nb_visits>18</nb_visits>
<nb_actions>18</nb_actions>
- <nb_visits_converted>18</nb_visits_converted>
- <bounce_count>18</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>
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_eventAction__VisitsSummary.get_range.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_eventAction__VisitsSummary.get_range.xml
index 1922b24059..a1a2e83ea3 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_eventAction__VisitsSummary.get_range.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_eventAction__VisitsSummary.get_range.xml
@@ -2,9 +2,6 @@
<result>
<nb_visits>4</nb_visits>
<nb_actions>8</nb_actions>
- <nb_visits_converted>4</nb_visits_converted>
- <bounce_count>0</bounce_count>
- <sum_visit_length>5044</sum_visit_length>
<max_actions>2</max_actions>
<bounce_rate>0%</bounce_rate>
<nb_actions_per_visit>2</nb_actions_per_visit>
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_eventCategory__VisitsSummary.get_range.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_eventCategory__VisitsSummary.get_range.xml
index 1922b24059..a1a2e83ea3 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_eventCategory__VisitsSummary.get_range.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_eventCategory__VisitsSummary.get_range.xml
@@ -2,9 +2,6 @@
<result>
<nb_visits>4</nb_visits>
<nb_actions>8</nb_actions>
- <nb_visits_converted>4</nb_visits_converted>
- <bounce_count>0</bounce_count>
- <sum_visit_length>5044</sum_visit_length>
<max_actions>2</max_actions>
<bounce_rate>0%</bounce_rate>
<nb_actions_per_visit>2</nb_actions_per_visit>
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_eventName__VisitsSummary.get_range.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_eventName__VisitsSummary.get_range.xml
index 1922b24059..a1a2e83ea3 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_eventName__VisitsSummary.get_range.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_eventName__VisitsSummary.get_range.xml
@@ -2,9 +2,6 @@
<result>
<nb_visits>4</nb_visits>
<nb_actions>8</nb_actions>
- <nb_visits_converted>4</nb_visits_converted>
- <bounce_count>0</bounce_count>
- <sum_visit_length>5044</sum_visit_length>
<max_actions>2</max_actions>
<bounce_rate>0%</bounce_rate>
<nb_actions_per_visit>2</nb_actions_per_visit>
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_events__VisitsSummary.get_range.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_events__VisitsSummary.get_range.xml
index 7ace3fcbe7..1ed2c2d1a3 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_events__VisitsSummary.get_range.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_events__VisitsSummary.get_range.xml
@@ -2,9 +2,6 @@
<result>
<nb_visits>18</nb_visits>
<nb_actions>18</nb_actions>
- <nb_visits_converted>18</nb_visits_converted>
- <bounce_count>18</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>
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_exitPageTitle__VisitsSummary.get_range.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_exitPageTitle__VisitsSummary.get_range.xml
index b72146a986..5618909938 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_exitPageTitle__VisitsSummary.get_range.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_exitPageTitle__VisitsSummary.get_range.xml
@@ -2,9 +2,6 @@
<result>
<nb_visits>17</nb_visits>
<nb_actions>17</nb_actions>
- <nb_visits_converted>17</nb_visits_converted>
- <bounce_count>17</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>
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_exitPageUrl__VisitsSummary.get_range.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_exitPageUrl__VisitsSummary.get_range.xml
index 7ace3fcbe7..1ed2c2d1a3 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_exitPageUrl__VisitsSummary.get_range.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_exitPageUrl__VisitsSummary.get_range.xml
@@ -2,9 +2,6 @@
<result>
<nb_visits>18</nb_visits>
<nb_actions>18</nb_actions>
- <nb_visits_converted>18</nb_visits_converted>
- <bounce_count>18</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>
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_latitude__VisitsSummary.get_range.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_latitude__VisitsSummary.get_range.xml
index e023a89081..d7919feefc 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_latitude__VisitsSummary.get_range.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_latitude__VisitsSummary.get_range.xml
@@ -2,9 +2,6 @@
<result>
<nb_visits>6</nb_visits>
<nb_actions>10</nb_actions>
- <nb_visits_converted>6</nb_visits_converted>
- <bounce_count>3</bounce_count>
- <sum_visit_length>3783</sum_visit_length>
<max_actions>3</max_actions>
<bounce_rate>50%</bounce_rate>
<nb_actions_per_visit>1.7</nb_actions_per_visit>
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_longitude__VisitsSummary.get_range.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_longitude__VisitsSummary.get_range.xml
index d8bcdace18..561559864d 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_longitude__VisitsSummary.get_range.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_longitude__VisitsSummary.get_range.xml
@@ -2,9 +2,6 @@
<result>
<nb_visits>0</nb_visits>
<nb_actions>0</nb_actions>
- <nb_visits_converted>0</nb_visits_converted>
- <bounce_count>0</bounce_count>
- <sum_visit_length>0</sum_visit_length>
<max_actions>0</max_actions>
<bounce_rate>0%</bounce_rate>
<nb_actions_per_visit>0</nb_actions_per_visit>
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_operatingSystemCode__VisitsSummary.get_range.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_operatingSystemCode__VisitsSummary.get_range.xml
index 5d07770e4e..9459eddbd5 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_operatingSystemCode__VisitsSummary.get_range.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_operatingSystemCode__VisitsSummary.get_range.xml
@@ -2,9 +2,6 @@
<result>
<nb_visits>28</nb_visits>
<nb_actions>48</nb_actions>
- <nb_visits_converted>28</nb_visits_converted>
- <bounce_count>15</bounce_count>
- <sum_visit_length>16393</sum_visit_length>
<max_actions>3</max_actions>
<bounce_rate>54%</bounce_rate>
<nb_actions_per_visit>1.7</nb_actions_per_visit>
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_pageTitle__VisitsSummary.get_range.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_pageTitle__VisitsSummary.get_range.xml
index b72146a986..5618909938 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_pageTitle__VisitsSummary.get_range.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_pageTitle__VisitsSummary.get_range.xml
@@ -2,9 +2,6 @@
<result>
<nb_visits>17</nb_visits>
<nb_actions>17</nb_actions>
- <nb_visits_converted>17</nb_visits_converted>
- <bounce_count>17</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>
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_pageUrl__VisitsSummary.get_range.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_pageUrl__VisitsSummary.get_range.xml
index a0db0ecba0..b6a7e6d843 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_pageUrl__VisitsSummary.get_range.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_pageUrl__VisitsSummary.get_range.xml
@@ -2,9 +2,6 @@
<result>
<nb_visits>17</nb_visits>
<nb_actions>43</nb_actions>
- <nb_visits_converted>17</nb_visits_converted>
- <bounce_count>0</bounce_count>
- <sum_visit_length>21437</sum_visit_length>
<max_actions>3</max_actions>
<bounce_rate>0%</bounce_rate>
<nb_actions_per_visit>2.5</nb_actions_per_visit>
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_provider__VisitsSummary.get_range.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_provider__VisitsSummary.get_range.xml
index c51a1bc13d..120d74f17a 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_provider__VisitsSummary.get_range.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_provider__VisitsSummary.get_range.xml
@@ -2,9 +2,6 @@
<result>
<nb_visits>2</nb_visits>
<nb_actions>4</nb_actions>
- <nb_visits_converted>2</nb_visits_converted>
- <bounce_count>1</bounce_count>
- <sum_visit_length>1261</sum_visit_length>
<max_actions>3</max_actions>
<bounce_rate>50%</bounce_rate>
<nb_actions_per_visit>2</nb_actions_per_visit>
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_referrerKeyword__VisitsSummary.get_range.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_referrerKeyword__VisitsSummary.get_range.xml
index dfa3a20623..dd3d458149 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_referrerKeyword__VisitsSummary.get_range.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_referrerKeyword__VisitsSummary.get_range.xml
@@ -2,9 +2,6 @@
<result>
<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>
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_referrerName__VisitsSummary.get_range.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_referrerName__VisitsSummary.get_range.xml
index dfa3a20623..dd3d458149 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_referrerName__VisitsSummary.get_range.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_referrerName__VisitsSummary.get_range.xml
@@ -2,9 +2,6 @@
<result>
<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>
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_referrerType__VisitsSummary.get_range.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_referrerType__VisitsSummary.get_range.xml
index ce18f5b1dc..38eefb705e 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_referrerType__VisitsSummary.get_range.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_referrerType__VisitsSummary.get_range.xml
@@ -2,9 +2,6 @@
<result>
<nb_visits>34</nb_visits>
<nb_actions>60</nb_actions>
- <nb_visits_converted>34</nb_visits_converted>
- <bounce_count>17</bounce_count>
- <sum_visit_length>21437</sum_visit_length>
<max_actions>3</max_actions>
<bounce_rate>50%</bounce_rate>
<nb_actions_per_visit>1.8</nb_actions_per_visit>
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_referrerUrl__VisitsSummary.get_range.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_referrerUrl__VisitsSummary.get_range.xml
index dfa3a20623..dd3d458149 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_referrerUrl__VisitsSummary.get_range.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_referrerUrl__VisitsSummary.get_range.xml
@@ -2,9 +2,6 @@
<result>
<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>
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_regionCode__VisitsSummary.get_range.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_regionCode__VisitsSummary.get_range.xml
index e023a89081..d7919feefc 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_regionCode__VisitsSummary.get_range.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_regionCode__VisitsSummary.get_range.xml
@@ -2,9 +2,6 @@
<result>
<nb_visits>6</nb_visits>
<nb_actions>10</nb_actions>
- <nb_visits_converted>6</nb_visits_converted>
- <bounce_count>3</bounce_count>
- <sum_visit_length>3783</sum_visit_length>
<max_actions>3</max_actions>
<bounce_rate>50%</bounce_rate>
<nb_actions_per_visit>1.7</nb_actions_per_visit>
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_resolution__VisitsSummary.get_range.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_resolution__VisitsSummary.get_range.xml
index f52326b337..55b860a688 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_resolution__VisitsSummary.get_range.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_resolution__VisitsSummary.get_range.xml
@@ -2,9 +2,6 @@
<result>
<nb_visits>35</nb_visits>
<nb_actions>61</nb_actions>
- <nb_visits_converted>35</nb_visits_converted>
- <bounce_count>18</bounce_count>
- <sum_visit_length>21437</sum_visit_length>
<max_actions>3</max_actions>
<bounce_rate>51%</bounce_rate>
<nb_actions_per_visit>1.7</nb_actions_per_visit>
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_searches__VisitsSummary.get_range.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_searches__VisitsSummary.get_range.xml
index 410df64fa3..1cde7897c6 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_searches__VisitsSummary.get_range.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_searches__VisitsSummary.get_range.xml
@@ -2,9 +2,6 @@
<result>
<nb_visits>26</nb_visits>
<nb_actions>34</nb_actions>
- <nb_visits_converted>26</nb_visits_converted>
- <bounce_count>18</bounce_count>
- <sum_visit_length>10088</sum_visit_length>
<max_actions>2</max_actions>
<bounce_rate>69%</bounce_rate>
<nb_actions_per_visit>1.3</nb_actions_per_visit>
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_siteSearchKeyword__VisitsSummary.get_range.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_siteSearchKeyword__VisitsSummary.get_range.xml
index e0144ec833..85d0752db3 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_siteSearchKeyword__VisitsSummary.get_range.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_siteSearchKeyword__VisitsSummary.get_range.xml
@@ -2,9 +2,6 @@
<result>
<nb_visits>9</nb_visits>
<nb_actions>27</nb_actions>
- <nb_visits_converted>9</nb_visits_converted>
- <bounce_count>0</bounce_count>
- <sum_visit_length>11349</sum_visit_length>
<max_actions>3</max_actions>
<bounce_rate>0%</bounce_rate>
<nb_actions_per_visit>3</nb_actions_per_visit>
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_userId__VisitsSummary.get_range.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_userId__VisitsSummary.get_range.xml
index dfa3a20623..dd3d458149 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_userId__VisitsSummary.get_range.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_userId__VisitsSummary.get_range.xml
@@ -2,9 +2,6 @@
<result>
<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>
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitConvertedGoalId__VisitsSummary.get_range.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitConvertedGoalId__VisitsSummary.get_range.xml
index f52326b337..55b860a688 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitConvertedGoalId__VisitsSummary.get_range.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitConvertedGoalId__VisitsSummary.get_range.xml
@@ -2,9 +2,6 @@
<result>
<nb_visits>35</nb_visits>
<nb_actions>61</nb_actions>
- <nb_visits_converted>35</nb_visits_converted>
- <bounce_count>18</bounce_count>
- <sum_visit_length>21437</sum_visit_length>
<max_actions>3</max_actions>
<bounce_rate>51%</bounce_rate>
<nb_actions_per_visit>1.7</nb_actions_per_visit>
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitConverted__VisitsSummary.get_range.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitConverted__VisitsSummary.get_range.xml
index f52326b337..55b860a688 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitConverted__VisitsSummary.get_range.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitConverted__VisitsSummary.get_range.xml
@@ -2,9 +2,6 @@
<result>
<nb_visits>35</nb_visits>
<nb_actions>61</nb_actions>
- <nb_visits_converted>35</nb_visits_converted>
- <bounce_count>18</bounce_count>
- <sum_visit_length>21437</sum_visit_length>
<max_actions>3</max_actions>
<bounce_rate>51%</bounce_rate>
<nb_actions_per_visit>1.7</nb_actions_per_visit>
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitCount__VisitsSummary.get_range.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitCount__VisitsSummary.get_range.xml
index ce025f0a46..f1a34008c7 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitCount__VisitsSummary.get_range.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitCount__VisitsSummary.get_range.xml
@@ -2,9 +2,6 @@
<result>
<nb_visits>30</nb_visits>
<nb_actions>56</nb_actions>
- <nb_visits_converted>30</nb_visits_converted>
- <bounce_count>13</bounce_count>
- <sum_visit_length>21437</sum_visit_length>
<max_actions>3</max_actions>
<bounce_rate>43%</bounce_rate>
<nb_actions_per_visit>1.9</nb_actions_per_visit>
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitDuration__VisitsSummary.get_range.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitDuration__VisitsSummary.get_range.xml
index 7ace3fcbe7..1ed2c2d1a3 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitDuration__VisitsSummary.get_range.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitDuration__VisitsSummary.get_range.xml
@@ -2,9 +2,6 @@
<result>
<nb_visits>18</nb_visits>
<nb_actions>18</nb_actions>
- <nb_visits_converted>18</nb_visits_converted>
- <bounce_count>18</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>
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitEcommerceStatus__VisitsSummary.get_range.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitEcommerceStatus__VisitsSummary.get_range.xml
index f52326b337..55b860a688 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitEcommerceStatus__VisitsSummary.get_range.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitEcommerceStatus__VisitsSummary.get_range.xml
@@ -2,9 +2,6 @@
<result>
<nb_visits>35</nb_visits>
<nb_actions>61</nb_actions>
- <nb_visits_converted>35</nb_visits_converted>
- <bounce_count>18</bounce_count>
- <sum_visit_length>21437</sum_visit_length>
<max_actions>3</max_actions>
<bounce_rate>51%</bounce_rate>
<nb_actions_per_visit>1.7</nb_actions_per_visit>
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitIp__VisitsSummary.get_range.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitIp__VisitsSummary.get_range.xml
index 352cc69e4a..5332ba0d38 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitIp__VisitsSummary.get_range.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitIp__VisitsSummary.get_range.xml
@@ -2,9 +2,6 @@
<result>
<nb_visits>3</nb_visits>
<nb_actions>5</nb_actions>
- <nb_visits_converted>3</nb_visits_converted>
- <bounce_count>2</bounce_count>
- <sum_visit_length>1261</sum_visit_length>
<max_actions>3</max_actions>
<bounce_rate>67%</bounce_rate>
<nb_actions_per_visit>1.7</nb_actions_per_visit>
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitLocalHour__VisitsSummary.get_range.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitLocalHour__VisitsSummary.get_range.xml
index f52326b337..55b860a688 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitLocalHour__VisitsSummary.get_range.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitLocalHour__VisitsSummary.get_range.xml
@@ -2,9 +2,6 @@
<result>
<nb_visits>35</nb_visits>
<nb_actions>61</nb_actions>
- <nb_visits_converted>35</nb_visits_converted>
- <bounce_count>18</bounce_count>
- <sum_visit_length>21437</sum_visit_length>
<max_actions>3</max_actions>
<bounce_rate>51%</bounce_rate>
<nb_actions_per_visit>1.7</nb_actions_per_visit>
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitServerHour__VisitsSummary.get_range.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitServerHour__VisitsSummary.get_range.xml
index 7ace3fcbe7..1ed2c2d1a3 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitServerHour__VisitsSummary.get_range.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitServerHour__VisitsSummary.get_range.xml
@@ -2,9 +2,6 @@
<result>
<nb_visits>18</nb_visits>
<nb_actions>18</nb_actions>
- <nb_visits_converted>18</nb_visits_converted>
- <bounce_count>18</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>
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitorId__VisitsSummary.get_range.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitorId__VisitsSummary.get_range.xml
index 64efc881e1..911e227c41 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitorId__VisitsSummary.get_range.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitorId__VisitsSummary.get_range.xml
@@ -2,9 +2,6 @@
<result>
<nb_visits>2</nb_visits>
<nb_actions>3</nb_actions>
- <nb_visits_converted>2</nb_visits_converted>
- <bounce_count>1</bounce_count>
- <sum_visit_length>1261</sum_visit_length>
<max_actions>2</max_actions>
<bounce_rate>50%</bounce_rate>
<nb_actions_per_visit>1.5</nb_actions_per_visit>
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitorType__VisitsSummary.get_range.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitorType__VisitsSummary.get_range.xml
index ce025f0a46..f1a34008c7 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitorType__VisitsSummary.get_range.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_visitorType__VisitsSummary.get_range.xml
@@ -2,9 +2,6 @@
<result>
<nb_visits>30</nb_visits>
<nb_actions>56</nb_actions>
- <nb_visits_converted>30</nb_visits_converted>
- <bounce_count>13</bounce_count>
- <sum_visit_length>21437</sum_visit_length>
<max_actions>3</max_actions>
<bounce_rate>43%</bounce_rate>
<nb_actions_per_visit>1.9</nb_actions_per_visit>
diff --git a/tests/PHPUnit/System/expected/test_BackwardsCompatibility1XTest__VisitFrequency.get_day.xml b/tests/PHPUnit/System/expected/test_BackwardsCompatibility1XTest__VisitFrequency.get_day.xml
index 3633fe5914..4bcc0a36cc 100644
--- a/tests/PHPUnit/System/expected/test_BackwardsCompatibility1XTest__VisitFrequency.get_day.xml
+++ b/tests/PHPUnit/System/expected/test_BackwardsCompatibility1XTest__VisitFrequency.get_day.xml
@@ -4,9 +4,6 @@
<nb_users_returning>0</nb_users_returning>
<nb_visits_returning>1</nb_visits_returning>
<nb_actions_returning>1</nb_actions_returning>
- <nb_visits_converted_returning>1</nb_visits_converted_returning>
- <bounce_count_returning>1</bounce_count_returning>
- <sum_visit_length_returning>0</sum_visit_length_returning>
<max_actions_returning>1</max_actions_returning>
<bounce_rate_returning>100%</bounce_rate_returning>
<nb_actions_per_visit_returning>1</nb_actions_per_visit_returning>
diff --git a/tests/PHPUnit/System/expected/test_BackwardsCompatibility1XTest__VisitFrequency.get_month.xml b/tests/PHPUnit/System/expected/test_BackwardsCompatibility1XTest__VisitFrequency.get_month.xml
index 3c62d79738..c0a3bb1aff 100644
--- a/tests/PHPUnit/System/expected/test_BackwardsCompatibility1XTest__VisitFrequency.get_month.xml
+++ b/tests/PHPUnit/System/expected/test_BackwardsCompatibility1XTest__VisitFrequency.get_month.xml
@@ -4,9 +4,6 @@
<nb_users_returning>0</nb_users_returning>
<nb_visits_returning>1</nb_visits_returning>
<nb_actions_returning>1</nb_actions_returning>
- <nb_visits_converted_returning>1</nb_visits_converted_returning>
- <bounce_count_returning>1</bounce_count_returning>
- <sum_visit_length_returning>0</sum_visit_length_returning>
<max_actions_returning>1</max_actions_returning>
<bounce_rate_returning>100%</bounce_rate_returning>
<nb_actions_per_visit_returning>1</nb_actions_per_visit_returning>
diff --git a/tests/PHPUnit/System/expected/test_BackwardsCompatibility1XTest__VisitFrequency.get_range.xml b/tests/PHPUnit/System/expected/test_BackwardsCompatibility1XTest__VisitFrequency.get_range.xml
index a232e03046..b002777495 100644
--- a/tests/PHPUnit/System/expected/test_BackwardsCompatibility1XTest__VisitFrequency.get_range.xml
+++ b/tests/PHPUnit/System/expected/test_BackwardsCompatibility1XTest__VisitFrequency.get_range.xml
@@ -2,9 +2,6 @@
<result>
<nb_visits_returning>2</nb_visits_returning>
<nb_actions_returning>2</nb_actions_returning>
- <nb_visits_converted_returning>1</nb_visits_converted_returning>
- <bounce_count_returning>2</bounce_count_returning>
- <sum_visit_length_returning>0</sum_visit_length_returning>
<max_actions_returning>1</max_actions_returning>
<bounce_rate_returning>100%</bounce_rate_returning>
<nb_actions_per_visit_returning>1</nb_actions_per_visit_returning>
diff --git a/tests/PHPUnit/System/expected/test_BackwardsCompatibility1XTest__VisitFrequency.get_week.xml b/tests/PHPUnit/System/expected/test_BackwardsCompatibility1XTest__VisitFrequency.get_week.xml
index 3c62d79738..c0a3bb1aff 100644
--- a/tests/PHPUnit/System/expected/test_BackwardsCompatibility1XTest__VisitFrequency.get_week.xml
+++ b/tests/PHPUnit/System/expected/test_BackwardsCompatibility1XTest__VisitFrequency.get_week.xml
@@ -4,9 +4,6 @@
<nb_users_returning>0</nb_users_returning>
<nb_visits_returning>1</nb_visits_returning>
<nb_actions_returning>1</nb_actions_returning>
- <nb_visits_converted_returning>1</nb_visits_converted_returning>
- <bounce_count_returning>1</bounce_count_returning>
- <sum_visit_length_returning>0</sum_visit_length_returning>
<max_actions_returning>1</max_actions_returning>
<bounce_rate_returning>100%</bounce_rate_returning>
<nb_actions_per_visit_returning>1</nb_actions_per_visit_returning>
diff --git a/tests/PHPUnit/System/expected/test_BackwardsCompatibility1XTest__VisitFrequency.get_year.xml b/tests/PHPUnit/System/expected/test_BackwardsCompatibility1XTest__VisitFrequency.get_year.xml
index a232e03046..b002777495 100644
--- a/tests/PHPUnit/System/expected/test_BackwardsCompatibility1XTest__VisitFrequency.get_year.xml
+++ b/tests/PHPUnit/System/expected/test_BackwardsCompatibility1XTest__VisitFrequency.get_year.xml
@@ -2,9 +2,6 @@
<result>
<nb_visits_returning>2</nb_visits_returning>
<nb_actions_returning>2</nb_actions_returning>
- <nb_visits_converted_returning>1</nb_visits_converted_returning>
- <bounce_count_returning>2</bounce_count_returning>
- <sum_visit_length_returning>0</sum_visit_length_returning>
<max_actions_returning>1</max_actions_returning>
<bounce_rate_returning>100%</bounce_rate_returning>
<nb_actions_per_visit_returning>1</nb_actions_per_visit_returning>
diff --git a/tests/PHPUnit/System/expected/test_BackwardsCompatibility1XTest_multipleDates__VisitFrequency.get_day.xml b/tests/PHPUnit/System/expected/test_BackwardsCompatibility1XTest_multipleDates__VisitFrequency.get_day.xml
index b8e30312d7..eccb0af0a0 100644
--- a/tests/PHPUnit/System/expected/test_BackwardsCompatibility1XTest_multipleDates__VisitFrequency.get_day.xml
+++ b/tests/PHPUnit/System/expected/test_BackwardsCompatibility1XTest_multipleDates__VisitFrequency.get_day.xml
@@ -8,9 +8,6 @@
<nb_users_returning>0</nb_users_returning>
<nb_visits_returning>1</nb_visits_returning>
<nb_actions_returning>1</nb_actions_returning>
- <nb_visits_converted_returning>1</nb_visits_converted_returning>
- <bounce_count_returning>1</bounce_count_returning>
- <sum_visit_length_returning>0</sum_visit_length_returning>
<max_actions_returning>1</max_actions_returning>
<bounce_rate_returning>100%</bounce_rate_returning>
<nb_actions_per_visit_returning>1</nb_actions_per_visit_returning>
diff --git a/tests/PHPUnit/System/expected/test_BackwardsCompatibility1XTest_multipleOldNew__VisitFrequency.get_month.xml b/tests/PHPUnit/System/expected/test_BackwardsCompatibility1XTest_multipleOldNew__VisitFrequency.get_month.xml
index 9b5f22a3ea..7b4ff4314c 100644
--- a/tests/PHPUnit/System/expected/test_BackwardsCompatibility1XTest_multipleOldNew__VisitFrequency.get_month.xml
+++ b/tests/PHPUnit/System/expected/test_BackwardsCompatibility1XTest_multipleOldNew__VisitFrequency.get_month.xml
@@ -5,9 +5,6 @@
<nb_users_returning>0</nb_users_returning>
<nb_visits_returning>1</nb_visits_returning>
<nb_actions_returning>1</nb_actions_returning>
- <nb_visits_converted_returning>1</nb_visits_converted_returning>
- <bounce_count_returning>1</bounce_count_returning>
- <sum_visit_length_returning>0</sum_visit_length_returning>
<max_actions_returning>1</max_actions_returning>
<bounce_rate_returning>100%</bounce_rate_returning>
<nb_actions_per_visit_returning>1</nb_actions_per_visit_returning>
@@ -26,9 +23,6 @@
<nb_users_returning>0</nb_users_returning>
<nb_visits_returning>1</nb_visits_returning>
<nb_actions_returning>1</nb_actions_returning>
- <nb_visits_converted_returning>0</nb_visits_converted_returning>
- <bounce_count_returning>1</bounce_count_returning>
- <sum_visit_length_returning>0</sum_visit_length_returning>
<max_actions_returning>1</max_actions_returning>
<bounce_rate_returning>100%</bounce_rate_returning>
<nb_actions_per_visit_returning>1</nb_actions_per_visit_returning>
diff --git a/tests/PHPUnit/System/expected/test_CustomEvents__Actions.get_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents__Actions.get_day.xml
index a98b80de47..65ae232e68 100644
--- a/tests/PHPUnit/System/expected/test_CustomEvents__Actions.get_day.xml
+++ b/tests/PHPUnit/System/expected/test_CustomEvents__Actions.get_day.xml
@@ -8,7 +8,5 @@
<nb_uniq_outlinks>0</nb_uniq_outlinks>
<nb_searches>0</nb_searches>
<nb_keywords>0</nb_keywords>
- <sum_time_generation>2</sum_time_generation>
- <nb_hits_with_time_generation>4</nb_hits_with_time_generation>
<avg_time_generation>0.5</avg_time_generation>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_CustomEvents__Actions.get_month.xml b/tests/PHPUnit/System/expected/test_CustomEvents__Actions.get_month.xml
index a98b80de47..65ae232e68 100644
--- a/tests/PHPUnit/System/expected/test_CustomEvents__Actions.get_month.xml
+++ b/tests/PHPUnit/System/expected/test_CustomEvents__Actions.get_month.xml
@@ -8,7 +8,5 @@
<nb_uniq_outlinks>0</nb_uniq_outlinks>
<nb_searches>0</nb_searches>
<nb_keywords>0</nb_keywords>
- <sum_time_generation>2</sum_time_generation>
- <nb_hits_with_time_generation>4</nb_hits_with_time_generation>
<avg_time_generation>0.5</avg_time_generation>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.get_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.get_range.xml
index 54b28f8871..a87ec05ee3 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.get_range.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.get_range.xml
@@ -8,7 +8,5 @@
<nb_uniq_outlinks>1</nb_uniq_outlinks>
<nb_searches>0</nb_searches>
<nb_keywords>0</nb_keywords>
- <sum_time_generation>5.72</sum_time_generation>
- <nb_hits_with_time_generation>19</nb_hits_with_time_generation>
<avg_time_generation>0.301</avg_time_generation>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Goals.get_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Goals.get_month.xml
index fc80cf81c0..4c6855264a 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__Goals.get_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Goals.get_month.xml
@@ -2,6 +2,6 @@
<result>
<nb_conversions>25</nb_conversions>
<nb_visits_converted>25</nb_visits_converted>
- <conversion_rate>92.59</conversion_rate>
<revenue>125</revenue>
+ <conversion_rate>92.59%</conversion_rate>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getPlugin_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getPlugin_month.xml
index 7079af5413..d1f2bda02f 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getPlugin_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getPlugin_month.xml
@@ -3,43 +3,43 @@
<row>
<label>Cookie</label>
<nb_visits>2</nb_visits>
- <nb_visits_percentage>9.5%</nb_visits_percentage>
+ <nb_visits_percentage>10%</nb_visits_percentage>
<logo>plugins/UserSettings/images/plugins/cookie.gif</logo>
</row>
<row>
<label>Flash</label>
<nb_visits>2</nb_visits>
- <nb_visits_percentage>9.5%</nb_visits_percentage>
+ <nb_visits_percentage>10%</nb_visits_percentage>
<logo>plugins/UserSettings/images/plugins/flash.gif</logo>
</row>
<row>
<label>Java</label>
<nb_visits>2</nb_visits>
- <nb_visits_percentage>9.5%</nb_visits_percentage>
+ <nb_visits_percentage>10%</nb_visits_percentage>
<logo>plugins/UserSettings/images/plugins/java.gif</logo>
</row>
<row>
<label>Director</label>
<nb_visits>1</nb_visits>
- <nb_visits_percentage>4.8%</nb_visits_percentage>
+ <nb_visits_percentage>5%</nb_visits_percentage>
<logo>plugins/UserSettings/images/plugins/director.gif</logo>
</row>
<row>
<label>Gears</label>
<nb_visits>1</nb_visits>
- <nb_visits_percentage>4.8%</nb_visits_percentage>
+ <nb_visits_percentage>5%</nb_visits_percentage>
<logo>plugins/UserSettings/images/plugins/gears.gif</logo>
</row>
<row>
<label>Pdf</label>
<nb_visits>1</nb_visits>
- <nb_visits_percentage>4.8%</nb_visits_percentage>
+ <nb_visits_percentage>5%</nb_visits_percentage>
<logo>plugins/UserSettings/images/plugins/pdf.gif</logo>
</row>
<row>
<label>Windowsmedia</label>
<nb_visits>1</nb_visits>
- <nb_visits_percentage>4.8%</nb_visits_percentage>
+ <nb_visits_percentage>5%</nb_visits_percentage>
<logo>plugins/UserSettings/images/plugins/windowsmedia.gif</logo>
</row>
<row>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitFrequency.get_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitFrequency.get_month.xml
index 3633fe5914..4bcc0a36cc 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitFrequency.get_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitFrequency.get_month.xml
@@ -4,9 +4,6 @@
<nb_users_returning>0</nb_users_returning>
<nb_visits_returning>1</nb_visits_returning>
<nb_actions_returning>1</nb_actions_returning>
- <nb_visits_converted_returning>1</nb_visits_converted_returning>
- <bounce_count_returning>1</bounce_count_returning>
- <sum_visit_length_returning>0</sum_visit_length_returning>
<max_actions_returning>1</max_actions_returning>
<bounce_rate_returning>100%</bounce_rate_returning>
<nb_actions_per_visit_returning>1</nb_actions_per_visit_returning>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitFrequency.get_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitFrequency.get_range.xml
index f301254690..6cb34eba3d 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitFrequency.get_range.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitFrequency.get_range.xml
@@ -2,9 +2,6 @@
<result>
<nb_visits_returning>10</nb_visits_returning>
<nb_actions_returning>12</nb_actions_returning>
- <nb_visits_converted_returning>9</nb_visits_converted_returning>
- <bounce_count_returning>8</bounce_count_returning>
- <sum_visit_length_returning>115</sum_visit_length_returning>
<max_actions_returning>2</max_actions_returning>
<bounce_rate_returning>80%</bounce_rate_returning>
<nb_actions_per_visit_returning>1.2</nb_actions_per_visit_returning>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByVisitCount_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByVisitCount_range.xml
index a1ec37b5bf..d7672ae30c 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByVisitCount_range.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByVisitCount_range.xml
@@ -3,7 +3,7 @@
<row>
<label>1 visit</label>
<nb_visits>33</nb_visits>
- <nb_visits_percentage>82.5%</nb_visits_percentage>
+ <nb_visits_percentage>83%</nb_visits_percentage>
</row>
<row>
<label>2 visits</label>
@@ -18,7 +18,7 @@
<row>
<label>4 visits</label>
<nb_visits>1</nb_visits>
- <nb_visits_percentage>2.5%</nb_visits_percentage>
+ <nb_visits_percentage>3%</nb_visits_percentage>
</row>
<row>
<label>5 visits</label>
@@ -33,7 +33,7 @@
<row>
<label>7 visits</label>
<nb_visits>1</nb_visits>
- <nb_visits_percentage>2.5%</nb_visits_percentage>
+ <nb_visits_percentage>3%</nb_visits_percentage>
</row>
<row>
<label>8 visits</label>
@@ -58,7 +58,7 @@
<row>
<label>51-100 visits</label>
<nb_visits>1</nb_visits>
- <nb_visits_percentage>2.5%</nb_visits_percentage>
+ <nb_visits_percentage>3%</nb_visits_percentage>
</row>
<row>
<label>101-200 visits</label>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.get_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.get_month.xml
index 327d564f47..cda8adef5b 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.get_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.get_month.xml
@@ -4,9 +4,6 @@
<nb_users>0</nb_users>
<nb_visits>27</nb_visits>
<nb_actions>30</nb_actions>
- <nb_visits_converted>25</nb_visits_converted>
- <bounce_count>25</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>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs_siteIdTwo_TrackedUsingLogReplay__VisitsSummary.get_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs_siteIdTwo_TrackedUsingLogReplay__VisitsSummary.get_month.xml
index b0e66b9280..f7fde03a9d 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs_siteIdTwo_TrackedUsingLogReplay__VisitsSummary.get_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs_siteIdTwo_TrackedUsingLogReplay__VisitsSummary.get_month.xml
@@ -4,9 +4,6 @@
<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>
diff --git a/tests/PHPUnit/System/expected/test_MultipleSitesArchivingTest_sitesGroup__VisitsSummary.get_day.xml b/tests/PHPUnit/System/expected/test_MultipleSitesArchivingTest_sitesGroup__VisitsSummary.get_day.xml
index 64e9c36af1..4dee40403d 100644
--- a/tests/PHPUnit/System/expected/test_MultipleSitesArchivingTest_sitesGroup__VisitsSummary.get_day.xml
+++ b/tests/PHPUnit/System/expected/test_MultipleSitesArchivingTest_sitesGroup__VisitsSummary.get_day.xml
@@ -4,9 +4,6 @@
<nb_users>0</nb_users>
<nb_visits>5</nb_visits>
<nb_actions>5</nb_actions>
- <nb_visits_converted>0</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>
diff --git a/tests/PHPUnit/System/expected/test_MultipleSitesArchivingTest_sitesGroup__VisitsSummary.get_month.xml b/tests/PHPUnit/System/expected/test_MultipleSitesArchivingTest_sitesGroup__VisitsSummary.get_month.xml
index 64e9c36af1..4dee40403d 100644
--- a/tests/PHPUnit/System/expected/test_MultipleSitesArchivingTest_sitesGroup__VisitsSummary.get_month.xml
+++ b/tests/PHPUnit/System/expected/test_MultipleSitesArchivingTest_sitesGroup__VisitsSummary.get_month.xml
@@ -4,9 +4,6 @@
<nb_users>0</nb_users>
<nb_visits>5</nb_visits>
<nb_actions>5</nb_actions>
- <nb_visits_converted>0</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>
diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Actions.get_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Actions.get_day.xml
index 84ad08455d..e04ea4296d 100644
--- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Actions.get_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Actions.get_day.xml
@@ -8,7 +8,5 @@
<nb_uniq_outlinks>2</nb_uniq_outlinks>
<nb_searches>0</nb_searches>
<nb_keywords>0</nb_keywords>
- <sum_time_generation>0.62</sum_time_generation>
- <nb_hits_with_time_generation>4</nb_hits_with_time_generation>
<avg_time_generation>0.155</avg_time_generation>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Goals.get_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Goals.get_day.xml
index d0e395f9e8..24662c288c 100644
--- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Goals.get_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Goals.get_day.xml
@@ -2,6 +2,6 @@
<result>
<nb_conversions>2</nb_conversions>
<nb_visits_converted>2</nb_visits_converted>
- <conversion_rate>100</conversion_rate>
<revenue>43</revenue>
+ <conversion_rate>100%</conversion_rate>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__VisitFrequency.get_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__VisitFrequency.get_day.xml
index eb4e37fdf7..1ba25c866f 100644
--- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__VisitFrequency.get_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__VisitFrequency.get_day.xml
@@ -3,9 +3,6 @@
<nb_uniq_visitors_returning>1</nb_uniq_visitors_returning>
<nb_visits_returning>1</nb_visits_returning>
<nb_actions_returning>1</nb_actions_returning>
- <nb_visits_converted_returning>1</nb_visits_converted_returning>
- <bounce_count_returning>1</bounce_count_returning>
- <sum_visit_length_returning>0</sum_visit_length_returning>
<max_actions_returning>1</max_actions_returning>
<bounce_rate_returning>100%</bounce_rate_returning>
<nb_actions_per_visit_returning>1</nb_actions_per_visit_returning>
diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__VisitsSummary.get_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__VisitsSummary.get_day.xml
index 40498bf45d..64fee80803 100644
--- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__VisitsSummary.get_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__VisitsSummary.get_day.xml
@@ -3,9 +3,6 @@
<nb_uniq_visitors>1</nb_uniq_visitors>
<nb_visits>2</nb_visits>
<nb_actions>8</nb_actions>
- <nb_visits_converted>2</nb_visits_converted>
- <bounce_count>1</bounce_count>
- <sum_visit_length>1621</sum_visit_length>
<max_actions>7</max_actions>
<bounce_rate>50%</bounce_rate>
<nb_actions_per_visit>4</nb_actions_per_visit>
diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_bulk_json__API.getBulkRequest.json b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_bulk_json__API.getBulkRequest.json
index 54eec7681d..14ac477f7a 100644
--- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_bulk_json__API.getBulkRequest.json
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_bulk_json__API.getBulkRequest.json
@@ -1 +1 @@
-[{"2010-03-06":{"nb_uniq_visitors":1,"nb_users":0,"nb_visits":2,"nb_actions":8,"nb_visits_converted":2,"bounce_count":1,"sum_visit_length":1621,"max_actions":7,"bounce_rate":"50%","nb_actions_per_visit":4,"avg_time_on_site":811},"2010-03-07":[]},{"2010-03-06":{"nb_uniq_visitors":1,"nb_users":0,"nb_visits":2,"nb_actions":8,"nb_visits_converted":2,"bounce_count":1,"sum_visit_length":1621,"max_actions":7,"bounce_rate":"50%","nb_actions_per_visit":4,"avg_time_on_site":811},"2010-03-07":[]},[{"label":"0-10s","nb_visits":"1"},{"label":"11-30s","nb_visits":"0"},{"label":"31-60s","nb_visits":"0"},{"label":"1-2 min","nb_visits":"0"},{"label":"2-4 min","nb_visits":"0"},{"label":"4-7 min","nb_visits":"0"},{"label":"7-10 min","nb_visits":"0"},{"label":"10-15 min","nb_visits":"0"},{"label":"15-30 min","nb_visits":"1"},{"label":"30+ min","nb_visits":"0"}]]
\ No newline at end of file
+[{"2010-03-06":{"nb_uniq_visitors":1,"nb_users":0,"nb_visits":2,"nb_actions":8,"max_actions":7,"bounce_rate":"50%","nb_actions_per_visit":4,"avg_time_on_site":811},"2010-03-07":[]},{"2010-03-06":{"nb_uniq_visitors":1,"nb_users":0,"nb_visits":2,"nb_actions":8,"max_actions":7,"bounce_rate":"50%","nb_actions_per_visit":4,"avg_time_on_site":811},"2010-03-07":[]},[{"label":"0-10s","nb_visits":"1"},{"label":"11-30s","nb_visits":"0"},{"label":"31-60s","nb_visits":"0"},{"label":"1-2 min","nb_visits":"0"},{"label":"2-4 min","nb_visits":"0"},{"label":"4-7 min","nb_visits":"0"},{"label":"7-10 min","nb_visits":"0"},{"label":"10-15 min","nb_visits":"0"},{"label":"15-30 min","nb_visits":"1"},{"label":"30+ min","nb_visits":"0"}]]
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_bulk_xml__API.getBulkRequest.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_bulk_xml__API.getBulkRequest.xml
index e3455beeec..9b05d38afd 100644
--- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_bulk_xml__API.getBulkRequest.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_bulk_xml__API.getBulkRequest.xml
@@ -6,9 +6,6 @@
<nb_users>0</nb_users>
<nb_visits>2</nb_visits>
<nb_actions>8</nb_actions>
- <nb_visits_converted>2</nb_visits_converted>
- <bounce_count>1</bounce_count>
- <sum_visit_length>1621</sum_visit_length>
<max_actions>7</max_actions>
<bounce_rate>50%</bounce_rate>
<nb_actions_per_visit>4</nb_actions_per_visit>
@@ -23,9 +20,6 @@
<nb_users>0</nb_users>
<nb_visits>2</nb_visits>
<nb_actions>8</nb_actions>
- <nb_visits_converted>2</nb_visits_converted>
- <bounce_count>1</bounce_count>
- <sum_visit_length>1621</sum_visit_length>
<max_actions>7</max_actions>
<bounce_rate>50%</bounce_rate>
<nb_actions_per_visit>4</nb_actions_per_visit>
diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_csv__API.get_month.csv b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_csv__API.get_month.csv
index 9ca1f08519c5d1c20ebcdf7ad4a884963a4c37a1..0e2dafdcac3613d826dd7a163d22095340010d9c 100644
GIT binary patch
delta 100
zcmcb`dyRWT6XV1$B9s3y@=OfVo7}{txA_Z`7~^IwmK?^(hnPhs%dzlGp2m7W+>k+s
l!GJ*(NJ3aT3`Rh<(d1S(XBk7F3`EWpN}B-XEPyHv8342B76SkP
delta 174
zcmcb{eT#QP6XV1M8j~+D%1yjvW*Ev)%#g}Z1SEAB{1{3Zav74qd<BMlhBO8RhGZa}
z$4~|qD*=)zlg~0LP7E>v>eu6U21=F!rAvSc(-`t6`!gvs7H@vbsLnXKfkk1n2y+hO
n<OM7T^bLT98=_zX1_K6Fs0c{b2#O7X;s%q;S)C^zVHE-ZJr*ZW
diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.get_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.get_day.xml
index e0100fe3a7..0eea12ac0b 100644
--- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.get_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.get_day.xml
@@ -8,7 +8,5 @@
<nb_uniq_outlinks>2</nb_uniq_outlinks>
<nb_searches>1</nb_searches>
<nb_keywords>1</nb_keywords>
- <sum_time_generation>0.62</sum_time_generation>
- <nb_hits_with_time_generation>4</nb_hits_with_time_generation>
<avg_time_generation>0.155</avg_time_generation>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Goals.get_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Goals.get_day.xml
index d0e395f9e8..24662c288c 100644
--- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Goals.get_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Goals.get_day.xml
@@ -2,6 +2,6 @@
<result>
<nb_conversions>2</nb_conversions>
<nb_visits_converted>2</nb_visits_converted>
- <conversion_rate>100</conversion_rate>
<revenue>43</revenue>
+ <conversion_rate>100%</conversion_rate>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitFrequency.get_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitFrequency.get_day.xml
index 3633fe5914..4bcc0a36cc 100644
--- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitFrequency.get_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitFrequency.get_day.xml
@@ -4,9 +4,6 @@
<nb_users_returning>0</nb_users_returning>
<nb_visits_returning>1</nb_visits_returning>
<nb_actions_returning>1</nb_actions_returning>
- <nb_visits_converted_returning>1</nb_visits_converted_returning>
- <bounce_count_returning>1</bounce_count_returning>
- <sum_visit_length_returning>0</sum_visit_length_returning>
<max_actions_returning>1</max_actions_returning>
<bounce_rate_returning>100%</bounce_rate_returning>
<nb_actions_per_visit_returning>1</nb_actions_per_visit_returning>
diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitsSummary.get_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitsSummary.get_day.xml
index 9f63db28ef..e25296917d 100644
--- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitsSummary.get_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitsSummary.get_day.xml
@@ -4,9 +4,6 @@
<nb_users>0</nb_users>
<nb_visits>2</nb_visits>
<nb_actions>9</nb_actions>
- <nb_visits_converted>2</nb_visits_converted>
- <bounce_count>1</bounce_count>
- <sum_visit_length>1621</sum_visit_length>
<max_actions>8</max_actions>
<bounce_rate>50%</bounce_rate>
<nb_actions_per_visit>4.5</nb_actions_per_visit>
diff --git a/tests/PHPUnit/System/expected/test_PiwikTracker_trackForceUsingVisitId_insteadOfHeuristics_alsoTestsCampaignTracking__VisitsSummary.get_day.xml b/tests/PHPUnit/System/expected/test_PiwikTracker_trackForceUsingVisitId_insteadOfHeuristics_alsoTestsCampaignTracking__VisitsSummary.get_day.xml
index 78c6610886..35875116eb 100644
--- a/tests/PHPUnit/System/expected/test_PiwikTracker_trackForceUsingVisitId_insteadOfHeuristics_alsoTestsCampaignTracking__VisitsSummary.get_day.xml
+++ b/tests/PHPUnit/System/expected/test_PiwikTracker_trackForceUsingVisitId_insteadOfHeuristics_alsoTestsCampaignTracking__VisitsSummary.get_day.xml
@@ -4,9 +4,6 @@
<nb_users>0</nb_users>
<nb_visits>8</nb_visits>
<nb_actions>7</nb_actions>
- <nb_visits_converted>2</nb_visits_converted>
- <bounce_count>8</bounce_count>
- <sum_visit_length>1084</sum_visit_length>
<max_actions>1</max_actions>
<bounce_rate>100%</bounce_rate>
<nb_actions_per_visit>0.9</nb_actions_per_visit>
diff --git a/tests/PHPUnit/System/expected/test_TimezonesTest_dayAfterVisit__VisitsSummary.get_day.xml b/tests/PHPUnit/System/expected/test_TimezonesTest_dayAfterVisit__VisitsSummary.get_day.xml
index 32b66284be..fb2e69c2f2 100644
--- a/tests/PHPUnit/System/expected/test_TimezonesTest_dayAfterVisit__VisitsSummary.get_day.xml
+++ b/tests/PHPUnit/System/expected/test_TimezonesTest_dayAfterVisit__VisitsSummary.get_day.xml
@@ -4,9 +4,6 @@
<nb_users>0</nb_users>
<nb_visits>0</nb_visits>
<nb_actions>0</nb_actions>
- <nb_visits_converted>0</nb_visits_converted>
- <bounce_count>0</bounce_count>
- <sum_visit_length>0</sum_visit_length>
<max_actions>0</max_actions>
<bounce_rate>0%</bounce_rate>
<nb_actions_per_visit>0</nb_actions_per_visit>
diff --git a/tests/PHPUnit/System/expected/test_TimezonesTest_withVisit__VisitsSummary.get_day.xml b/tests/PHPUnit/System/expected/test_TimezonesTest_withVisit__VisitsSummary.get_day.xml
index b0e66b9280..f7fde03a9d 100644
--- a/tests/PHPUnit/System/expected/test_TimezonesTest_withVisit__VisitsSummary.get_day.xml
+++ b/tests/PHPUnit/System/expected/test_TimezonesTest_withVisit__VisitsSummary.get_day.xml
@@ -4,9 +4,6 @@
<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>
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_disabledAfter__VisitsSummary.get_day.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_disabledAfter__VisitsSummary.get_day.xml
index 89cd627339..7a310d9af8 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_disabledAfter__VisitsSummary.get_day.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_disabledAfter__VisitsSummary.get_day.xml
@@ -5,9 +5,6 @@
<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>
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_disabledAfter__VisitsSummary.get_month.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_disabledAfter__VisitsSummary.get_month.xml
index 50c77f2755..03c203ad85 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_disabledAfter__VisitsSummary.get_month.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_disabledAfter__VisitsSummary.get_month.xml
@@ -5,9 +5,6 @@
<nb_users>0</nb_users>
<nb_visits>10</nb_visits>
<nb_actions>43</nb_actions>
- <nb_visits_converted>10</nb_visits_converted>
- <bounce_count>1</bounce_count>
- <sum_visit_length>7577</sum_visit_length>
<max_actions>5</max_actions>
<bounce_rate>10%</bounce_rate>
<nb_actions_per_visit>4.3</nb_actions_per_visit>
@@ -18,9 +15,6 @@
<nb_users>0</nb_users>
<nb_visits>1</nb_visits>
<nb_actions>3</nb_actions>
- <nb_visits_converted>1</nb_visits_converted>
- <bounce_count>0</bounce_count>
- <sum_visit_length>2</sum_visit_length>
<max_actions>3</max_actions>
<bounce_rate>0%</bounce_rate>
<nb_actions_per_visit>3</nb_actions_per_visit>
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_disabledAfter__VisitsSummary.get_week.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_disabledAfter__VisitsSummary.get_week.xml
index 89cd627339..7a310d9af8 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_disabledAfter__VisitsSummary.get_week.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_disabledAfter__VisitsSummary.get_week.xml
@@ -5,9 +5,6 @@
<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>
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_disabledAfter__VisitsSummary.get_year.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_disabledAfter__VisitsSummary.get_year.xml
index f520263652..0438a70aa1 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_disabledAfter__VisitsSummary.get_year.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_disabledAfter__VisitsSummary.get_year.xml
@@ -3,9 +3,6 @@
<result idSite="1">
<nb_visits>10</nb_visits>
<nb_actions>43</nb_actions>
- <nb_visits_converted>10</nb_visits_converted>
- <bounce_count>1</bounce_count>
- <sum_visit_length>7577</sum_visit_length>
<max_actions>5</max_actions>
<bounce_rate>10%</bounce_rate>
<nb_actions_per_visit>4.3</nb_actions_per_visit>
@@ -14,9 +11,6 @@
<result idSite="2">
<nb_visits>1</nb_visits>
<nb_actions>3</nb_actions>
- <nb_visits_converted>1</nb_visits_converted>
- <bounce_count>0</bounce_count>
- <sum_visit_length>2</sum_visit_length>
<max_actions>3</max_actions>
<bounce_rate>0%</bounce_rate>
<nb_actions_per_visit>3</nb_actions_per_visit>
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_disabledBefore_isDateRange__VisitsSummary.get_range.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_disabledBefore_isDateRange__VisitsSummary.get_range.xml
index f520263652..0438a70aa1 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_disabledBefore_isDateRange__VisitsSummary.get_range.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_disabledBefore_isDateRange__VisitsSummary.get_range.xml
@@ -3,9 +3,6 @@
<result idSite="1">
<nb_visits>10</nb_visits>
<nb_actions>43</nb_actions>
- <nb_visits_converted>10</nb_visits_converted>
- <bounce_count>1</bounce_count>
- <sum_visit_length>7577</sum_visit_length>
<max_actions>5</max_actions>
<bounce_rate>10%</bounce_rate>
<nb_actions_per_visit>4.3</nb_actions_per_visit>
@@ -14,9 +11,6 @@
<result idSite="2">
<nb_visits>1</nb_visits>
<nb_actions>3</nb_actions>
- <nb_visits_converted>1</nb_visits_converted>
- <bounce_count>0</bounce_count>
- <sum_visit_length>2</sum_visit_length>
<max_actions>3</max_actions>
<bounce_rate>0%</bounce_rate>
<nb_actions_per_visit>3</nb_actions_per_visit>
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_enabledBefore_isDateRange__VisitsSummary.get_range.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_enabledBefore_isDateRange__VisitsSummary.get_range.xml
index f520263652..0438a70aa1 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_enabledBefore_isDateRange__VisitsSummary.get_range.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_enabledBefore_isDateRange__VisitsSummary.get_range.xml
@@ -3,9 +3,6 @@
<result idSite="1">
<nb_visits>10</nb_visits>
<nb_actions>43</nb_actions>
- <nb_visits_converted>10</nb_visits_converted>
- <bounce_count>1</bounce_count>
- <sum_visit_length>7577</sum_visit_length>
<max_actions>5</max_actions>
<bounce_rate>10%</bounce_rate>
<nb_actions_per_visit>4.3</nb_actions_per_visit>
@@ -14,9 +11,6 @@
<result idSite="2">
<nb_visits>1</nb_visits>
<nb_actions>3</nb_actions>
- <nb_visits_converted>1</nb_visits_converted>
- <bounce_count>0</bounce_count>
- <sum_visit_length>2</sum_visit_length>
<max_actions>3</max_actions>
<bounce_rate>0%</bounce_rate>
<nb_actions_per_visit>3</nb_actions_per_visit>
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_enabled__VisitsSummary.get_day.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_enabled__VisitsSummary.get_day.xml
index 89cd627339..7a310d9af8 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_enabled__VisitsSummary.get_day.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_enabled__VisitsSummary.get_day.xml
@@ -5,9 +5,6 @@
<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>
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_enabled__VisitsSummary.get_month.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_enabled__VisitsSummary.get_month.xml
index 50c77f2755..03c203ad85 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_enabled__VisitsSummary.get_month.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_enabled__VisitsSummary.get_month.xml
@@ -5,9 +5,6 @@
<nb_users>0</nb_users>
<nb_visits>10</nb_visits>
<nb_actions>43</nb_actions>
- <nb_visits_converted>10</nb_visits_converted>
- <bounce_count>1</bounce_count>
- <sum_visit_length>7577</sum_visit_length>
<max_actions>5</max_actions>
<bounce_rate>10%</bounce_rate>
<nb_actions_per_visit>4.3</nb_actions_per_visit>
@@ -18,9 +15,6 @@
<nb_users>0</nb_users>
<nb_visits>1</nb_visits>
<nb_actions>3</nb_actions>
- <nb_visits_converted>1</nb_visits_converted>
- <bounce_count>0</bounce_count>
- <sum_visit_length>2</sum_visit_length>
<max_actions>3</max_actions>
<bounce_rate>0%</bounce_rate>
<nb_actions_per_visit>3</nb_actions_per_visit>
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_enabled__VisitsSummary.get_week.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_enabled__VisitsSummary.get_week.xml
index 89cd627339..7a310d9af8 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_enabled__VisitsSummary.get_week.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_enabled__VisitsSummary.get_week.xml
@@ -5,9 +5,6 @@
<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>
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_enabled__VisitsSummary.get_year.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_enabled__VisitsSummary.get_year.xml
index f520263652..0438a70aa1 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_enabled__VisitsSummary.get_year.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_enabled__VisitsSummary.get_year.xml
@@ -3,9 +3,6 @@
<result idSite="1">
<nb_visits>10</nb_visits>
<nb_actions>43</nb_actions>
- <nb_visits_converted>10</nb_visits_converted>
- <bounce_count>1</bounce_count>
- <sum_visit_length>7577</sum_visit_length>
<max_actions>5</max_actions>
<bounce_rate>10%</bounce_rate>
<nb_actions_per_visit>4.3</nb_actions_per_visit>
@@ -14,9 +11,6 @@
<result idSite="2">
<nb_visits>1</nb_visits>
<nb_actions>3</nb_actions>
- <nb_visits_converted>1</nb_visits_converted>
- <bounce_count>0</bounce_count>
- <sum_visit_length>2</sum_visit_length>
<max_actions>3</max_actions>
<bounce_rate>0%</bounce_rate>
<nb_actions_per_visit>3</nb_actions_per_visit>
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_NotLastNPeriods__Goals.get_day.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_NotLastNPeriods__Goals.get_day.xml
index 6dc2190ded..13d4b19d4b 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_NotLastNPeriods__Goals.get_day.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_NotLastNPeriods__Goals.get_day.xml
@@ -3,8 +3,8 @@
<result idSite="1">
<nb_conversions>2</nb_conversions>
<nb_visits_converted>1</nb_visits_converted>
- <conversion_rate>100</conversion_rate>
<revenue>10</revenue>
+ <conversion_rate>100%</conversion_rate>
</result>
<result idSite="2" />
</results>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_NotLastNPeriods__Goals.get_month.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_NotLastNPeriods__Goals.get_month.xml
index 5c85081c9f..11701117f1 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_NotLastNPeriods__Goals.get_month.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_NotLastNPeriods__Goals.get_month.xml
@@ -3,13 +3,13 @@
<result idSite="1">
<nb_conversions>14</nb_conversions>
<nb_visits_converted>10</nb_visits_converted>
- <conversion_rate>100</conversion_rate>
<revenue>50</revenue>
+ <conversion_rate>100%</conversion_rate>
</result>
<result idSite="2">
<nb_conversions>1</nb_conversions>
<nb_visits_converted>1</nb_visits_converted>
- <conversion_rate>100</conversion_rate>
<revenue>0</revenue>
+ <conversion_rate>100%</conversion_rate>
</result>
</results>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_NotLastNPeriods__VisitsSummary.get_day.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_NotLastNPeriods__VisitsSummary.get_day.xml
index 89cd627339..7a310d9af8 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_NotLastNPeriods__VisitsSummary.get_day.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_NotLastNPeriods__VisitsSummary.get_day.xml
@@ -5,9 +5,6 @@
<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>
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_NotLastNPeriods__VisitsSummary.get_month.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_NotLastNPeriods__VisitsSummary.get_month.xml
index 50c77f2755..03c203ad85 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_NotLastNPeriods__VisitsSummary.get_month.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_NotLastNPeriods__VisitsSummary.get_month.xml
@@ -5,9 +5,6 @@
<nb_users>0</nb_users>
<nb_visits>10</nb_visits>
<nb_actions>43</nb_actions>
- <nb_visits_converted>10</nb_visits_converted>
- <bounce_count>1</bounce_count>
- <sum_visit_length>7577</sum_visit_length>
<max_actions>5</max_actions>
<bounce_rate>10%</bounce_rate>
<nb_actions_per_visit>4.3</nb_actions_per_visit>
@@ -18,9 +15,6 @@
<nb_users>0</nb_users>
<nb_visits>1</nb_visits>
<nb_actions>3</nb_actions>
- <nb_visits_converted>1</nb_visits_converted>
- <bounce_count>0</bounce_count>
- <sum_visit_length>2</sum_visit_length>
<max_actions>3</max_actions>
<bounce_rate>0%</bounce_rate>
<nb_actions_per_visit>3</nb_actions_per_visit>
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_NotLastNPeriods__Goals.get_day.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_NotLastNPeriods__Goals.get_day.xml
index 1c7f2179e5..12226c72f5 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_NotLastNPeriods__Goals.get_day.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_NotLastNPeriods__Goals.get_day.xml
@@ -1,5 +1,10 @@
<?xml version="1.0" encoding="utf-8" ?>
<results>
- <result idSite="1" />
+ <result idSite="1">
+ <nb_conversions>0</nb_conversions>
+ <nb_visits_converted>0</nb_visits_converted>
+ <revenue>0</revenue>
+ <conversion_rate>0%</conversion_rate>
+ </result>
<result idSite="2" />
</results>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_NotLastNPeriods__Goals.get_month.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_NotLastNPeriods__Goals.get_month.xml
index 1c7f2179e5..6a88282877 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_NotLastNPeriods__Goals.get_month.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_NotLastNPeriods__Goals.get_month.xml
@@ -1,5 +1,15 @@
<?xml version="1.0" encoding="utf-8" ?>
<results>
- <result idSite="1" />
- <result idSite="2" />
+ <result idSite="1">
+ <nb_conversions>0</nb_conversions>
+ <nb_visits_converted>0</nb_visits_converted>
+ <revenue>0</revenue>
+ <conversion_rate>0%</conversion_rate>
+ </result>
+ <result idSite="2">
+ <nb_conversions>0</nb_conversions>
+ <nb_visits_converted>0</nb_visits_converted>
+ <revenue>0</revenue>
+ <conversion_rate>0%</conversion_rate>
+ </result>
</results>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_NotLastNPeriods__VisitsSummary.get_day.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_NotLastNPeriods__VisitsSummary.get_day.xml
index 296741c7a0..7a310d9af8 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_NotLastNPeriods__VisitsSummary.get_day.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_NotLastNPeriods__VisitsSummary.get_day.xml
@@ -5,9 +5,6 @@
<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>
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_NotLastNPeriods__VisitsSummary.get_month.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_NotLastNPeriods__VisitsSummary.get_month.xml
index 9aa711753b..051bf3044e 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_NotLastNPeriods__VisitsSummary.get_month.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_NotLastNPeriods__VisitsSummary.get_month.xml
@@ -5,9 +5,6 @@
<nb_users>0</nb_users>
<nb_visits>10</nb_visits>
<nb_actions>43</nb_actions>
- <nb_visits_converted>0</nb_visits_converted>
- <bounce_count>1</bounce_count>
- <sum_visit_length>7569</sum_visit_length>
<max_actions>5</max_actions>
<bounce_rate>10%</bounce_rate>
<nb_actions_per_visit>4.3</nb_actions_per_visit>
@@ -18,9 +15,6 @@
<nb_users>0</nb_users>
<nb_visits>1</nb_visits>
<nb_actions>3</nb_actions>
- <nb_visits_converted>0</nb_visits_converted>
- <bounce_count>0</bounce_count>
- <sum_visit_length>1</sum_visit_length>
<max_actions>3</max_actions>
<bounce_rate>0%</bounce_rate>
<nb_actions_per_visit>3</nb_actions_per_visit>
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_VisitFrequency.get_firstSite_lastN__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_VisitFrequency.get_firstSite_lastN__API.getProcessedReport_day.xml
index f82986a135..dae913cd1b 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_VisitFrequency.get_firstSite_lastN__API.getProcessedReport_day.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_VisitFrequency.get_firstSite_lastN__API.getProcessedReport_day.xml
@@ -11,9 +11,7 @@
<nb_visits_returning>Returning Visits</nb_visits_returning>
<nb_actions_returning>Actions by Returning Visits</nb_actions_returning>
<nb_uniq_visitors_returning>Unique returning visitors</nb_uniq_visitors_returning>
- <sum_visit_length_returning>Total time spent by returning visitors (in seconds)</sum_visit_length_returning>
<nb_users_returning>Returning Users</nb_users_returning>
- <nb_visits_converted_returning>Number of converted returning visits</nb_visits_converted_returning>
<max_actions_returning>Maximum actions in one returning visit</max_actions_returning>
</metrics>
<processedMetrics>
@@ -29,9 +27,7 @@
<nb_visits_returning>Returning Visits</nb_visits_returning>
<nb_actions_returning>Actions by Returning Visits</nb_actions_returning>
<nb_uniq_visitors_returning>Unique returning visitors</nb_uniq_visitors_returning>
- <sum_visit_length_returning>Total time spent by returning visitors (in seconds)</sum_visit_length_returning>
<nb_users_returning>Returning Users</nb_users_returning>
- <nb_visits_converted_returning>Number of converted returning visits</nb_visits_converted_returning>
<max_actions_returning>Maximum actions in one returning visit</max_actions_returning>
<avg_time_on_site_returning>Avg. Duration of a Returning Visit (in sec)</avg_time_on_site_returning>
<nb_actions_per_visit_returning>Avg. Actions per Returning Visit</nb_actions_per_visit_returning>
@@ -45,8 +41,6 @@
<nb_users_returning>0</nb_users_returning>
<nb_visits_returning>1</nb_visits_returning>
<nb_actions_returning>5</nb_actions_returning>
- <nb_visits_converted_returning>0</nb_visits_converted_returning>
- <sum_visit_length_returning>901</sum_visit_length_returning>
<max_actions_returning>5</max_actions_returning>
<bounce_rate_returning>0%</bounce_rate_returning>
<nb_actions_per_visit_returning>5</nb_actions_per_visit_returning>
@@ -57,8 +51,6 @@
<nb_users_returning>0</nb_users_returning>
<nb_visits_returning>1</nb_visits_returning>
<nb_actions_returning>5</nb_actions_returning>
- <nb_visits_converted_returning>0</nb_visits_converted_returning>
- <sum_visit_length_returning>901</sum_visit_length_returning>
<max_actions_returning>5</max_actions_returning>
<bounce_rate_returning>0%</bounce_rate_returning>
<nb_actions_per_visit_returning>5</nb_actions_per_visit_returning>
@@ -69,8 +61,6 @@
<nb_users_returning>0</nb_users_returning>
<nb_visits_returning>1</nb_visits_returning>
<nb_actions_returning>5</nb_actions_returning>
- <nb_visits_converted_returning>0</nb_visits_converted_returning>
- <sum_visit_length_returning>901</sum_visit_length_returning>
<max_actions_returning>5</max_actions_returning>
<bounce_rate_returning>0%</bounce_rate_returning>
<nb_actions_per_visit_returning>5</nb_actions_per_visit_returning>
@@ -81,8 +71,6 @@
<nb_users_returning>0</nb_users_returning>
<nb_visits_returning>1</nb_visits_returning>
<nb_actions_returning>5</nb_actions_returning>
- <nb_visits_converted_returning>0</nb_visits_converted_returning>
- <sum_visit_length_returning>901</sum_visit_length_returning>
<max_actions_returning>5</max_actions_returning>
<bounce_rate_returning>0%</bounce_rate_returning>
<nb_actions_per_visit_returning>5</nb_actions_per_visit_returning>
@@ -93,8 +81,6 @@
<nb_users_returning>0</nb_users_returning>
<nb_visits_returning>1</nb_visits_returning>
<nb_actions_returning>5</nb_actions_returning>
- <nb_visits_converted_returning>0</nb_visits_converted_returning>
- <sum_visit_length_returning>901</sum_visit_length_returning>
<max_actions_returning>5</max_actions_returning>
<bounce_rate_returning>0%</bounce_rate_returning>
<nb_actions_per_visit_returning>5</nb_actions_per_visit_returning>
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__VisitFrequency.get_day.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__VisitFrequency.get_day.xml
index 1132f1191d..9623a57b5a 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__VisitFrequency.get_day.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__VisitFrequency.get_day.xml
@@ -8,9 +8,6 @@
<nb_users_returning>0</nb_users_returning>
<nb_visits_returning>1</nb_visits_returning>
<nb_actions_returning>5</nb_actions_returning>
- <nb_visits_converted_returning>0</nb_visits_converted_returning>
- <bounce_count_returning>0</bounce_count_returning>
- <sum_visit_length_returning>901</sum_visit_length_returning>
<max_actions_returning>5</max_actions_returning>
<bounce_rate_returning>0%</bounce_rate_returning>
<nb_actions_per_visit_returning>5</nb_actions_per_visit_returning>
@@ -21,9 +18,6 @@
<nb_users_returning>0</nb_users_returning>
<nb_visits_returning>1</nb_visits_returning>
<nb_actions_returning>5</nb_actions_returning>
- <nb_visits_converted_returning>0</nb_visits_converted_returning>
- <bounce_count_returning>0</bounce_count_returning>
- <sum_visit_length_returning>901</sum_visit_length_returning>
<max_actions_returning>5</max_actions_returning>
<bounce_rate_returning>0%</bounce_rate_returning>
<nb_actions_per_visit_returning>5</nb_actions_per_visit_returning>
@@ -34,9 +28,6 @@
<nb_users_returning>0</nb_users_returning>
<nb_visits_returning>1</nb_visits_returning>
<nb_actions_returning>5</nb_actions_returning>
- <nb_visits_converted_returning>0</nb_visits_converted_returning>
- <bounce_count_returning>0</bounce_count_returning>
- <sum_visit_length_returning>901</sum_visit_length_returning>
<max_actions_returning>5</max_actions_returning>
<bounce_rate_returning>0%</bounce_rate_returning>
<nb_actions_per_visit_returning>5</nb_actions_per_visit_returning>
@@ -47,9 +38,6 @@
<nb_users_returning>0</nb_users_returning>
<nb_visits_returning>1</nb_visits_returning>
<nb_actions_returning>5</nb_actions_returning>
- <nb_visits_converted_returning>0</nb_visits_converted_returning>
- <bounce_count_returning>0</bounce_count_returning>
- <sum_visit_length_returning>901</sum_visit_length_returning>
<max_actions_returning>5</max_actions_returning>
<bounce_rate_returning>0%</bounce_rate_returning>
<nb_actions_per_visit_returning>5</nb_actions_per_visit_returning>
@@ -60,9 +48,6 @@
<nb_users_returning>0</nb_users_returning>
<nb_visits_returning>1</nb_visits_returning>
<nb_actions_returning>5</nb_actions_returning>
- <nb_visits_converted_returning>0</nb_visits_converted_returning>
- <bounce_count_returning>0</bounce_count_returning>
- <sum_visit_length_returning>901</sum_visit_length_returning>
<max_actions_returning>5</max_actions_returning>
<bounce_rate_returning>0%</bounce_rate_returning>
<nb_actions_per_visit_returning>5</nb_actions_per_visit_returning>
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__VisitFrequency.get_month.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__VisitFrequency.get_month.xml
index f6da2a541d..419e029106 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__VisitFrequency.get_month.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__VisitFrequency.get_month.xml
@@ -6,9 +6,6 @@
<nb_users_returning>0</nb_users_returning>
<nb_visits_returning>8</nb_visits_returning>
<nb_actions_returning>40</nb_actions_returning>
- <nb_visits_converted_returning>0</nb_visits_converted_returning>
- <bounce_count_returning>0</bounce_count_returning>
- <sum_visit_length_returning>7208</sum_visit_length_returning>
<max_actions_returning>5</max_actions_returning>
<bounce_rate_returning>0%</bounce_rate_returning>
<nb_actions_per_visit_returning>5</nb_actions_per_visit_returning>
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__VisitFrequency.get_week.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__VisitFrequency.get_week.xml
index d64e929e8a..59d27cca56 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__VisitFrequency.get_week.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__VisitFrequency.get_week.xml
@@ -7,9 +7,6 @@
<nb_users_returning>0</nb_users_returning>
<nb_visits_returning>6</nb_visits_returning>
<nb_actions_returning>30</nb_actions_returning>
- <nb_visits_converted_returning>0</nb_visits_converted_returning>
- <bounce_count_returning>0</bounce_count_returning>
- <sum_visit_length_returning>5406</sum_visit_length_returning>
<max_actions_returning>5</max_actions_returning>
<bounce_rate_returning>0%</bounce_rate_returning>
<nb_actions_per_visit_returning>5</nb_actions_per_visit_returning>
@@ -20,9 +17,6 @@
<nb_users_returning>0</nb_users_returning>
<nb_visits_returning>2</nb_visits_returning>
<nb_actions_returning>10</nb_actions_returning>
- <nb_visits_converted_returning>0</nb_visits_converted_returning>
- <bounce_count_returning>0</bounce_count_returning>
- <sum_visit_length_returning>1802</sum_visit_length_returning>
<max_actions_returning>5</max_actions_returning>
<bounce_rate_returning>0%</bounce_rate_returning>
<nb_actions_per_visit_returning>5</nb_actions_per_visit_returning>
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__VisitFrequency.get_year.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__VisitFrequency.get_year.xml
index dd6204a199..3c7d32de96 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__VisitFrequency.get_year.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__VisitFrequency.get_year.xml
@@ -4,9 +4,6 @@
<result date="2010">
<nb_visits_returning>8</nb_visits_returning>
<nb_actions_returning>40</nb_actions_returning>
- <nb_visits_converted_returning>0</nb_visits_converted_returning>
- <bounce_count_returning>0</bounce_count_returning>
- <sum_visit_length_returning>7208</sum_visit_length_returning>
<max_actions_returning>5</max_actions_returning>
<bounce_rate_returning>0%</bounce_rate_returning>
<nb_actions_per_visit_returning>5</nb_actions_per_visit_returning>
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__VisitsSummary.get_day.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__VisitsSummary.get_day.xml
index c0f0001ebf..732e4e2d9d 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__VisitsSummary.get_day.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__VisitsSummary.get_day.xml
@@ -6,9 +6,6 @@
<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>
@@ -19,9 +16,6 @@
<nb_users>0</nb_users>
<nb_visits>1</nb_visits>
<nb_actions>2</nb_actions>
- <nb_visits_converted>0</nb_visits_converted>
- <bounce_count>0</bounce_count>
- <sum_visit_length>361</sum_visit_length>
<max_actions>2</max_actions>
<bounce_rate>0%</bounce_rate>
<nb_actions_per_visit>2</nb_actions_per_visit>
@@ -32,9 +26,6 @@
<nb_users>0</nb_users>
<nb_visits>1</nb_visits>
<nb_actions>5</nb_actions>
- <nb_visits_converted>0</nb_visits_converted>
- <bounce_count>0</bounce_count>
- <sum_visit_length>901</sum_visit_length>
<max_actions>5</max_actions>
<bounce_rate>0%</bounce_rate>
<nb_actions_per_visit>5</nb_actions_per_visit>
@@ -45,9 +36,6 @@
<nb_users>0</nb_users>
<nb_visits>1</nb_visits>
<nb_actions>5</nb_actions>
- <nb_visits_converted>0</nb_visits_converted>
- <bounce_count>0</bounce_count>
- <sum_visit_length>901</sum_visit_length>
<max_actions>5</max_actions>
<bounce_rate>0%</bounce_rate>
<nb_actions_per_visit>5</nb_actions_per_visit>
@@ -58,9 +46,6 @@
<nb_users>0</nb_users>
<nb_visits>1</nb_visits>
<nb_actions>5</nb_actions>
- <nb_visits_converted>0</nb_visits_converted>
- <bounce_count>0</bounce_count>
- <sum_visit_length>901</sum_visit_length>
<max_actions>5</max_actions>
<bounce_rate>0%</bounce_rate>
<nb_actions_per_visit>5</nb_actions_per_visit>
@@ -71,9 +56,6 @@
<nb_users>0</nb_users>
<nb_visits>1</nb_visits>
<nb_actions>5</nb_actions>
- <nb_visits_converted>0</nb_visits_converted>
- <bounce_count>0</bounce_count>
- <sum_visit_length>901</sum_visit_length>
<max_actions>5</max_actions>
<bounce_rate>0%</bounce_rate>
<nb_actions_per_visit>5</nb_actions_per_visit>
@@ -84,9 +66,6 @@
<nb_users>0</nb_users>
<nb_visits>1</nb_visits>
<nb_actions>5</nb_actions>
- <nb_visits_converted>0</nb_visits_converted>
- <bounce_count>0</bounce_count>
- <sum_visit_length>901</sum_visit_length>
<max_actions>5</max_actions>
<bounce_rate>0%</bounce_rate>
<nb_actions_per_visit>5</nb_actions_per_visit>
@@ -100,9 +79,6 @@
<nb_users>0</nb_users>
<nb_visits>1</nb_visits>
<nb_actions>3</nb_actions>
- <nb_visits_converted>0</nb_visits_converted>
- <bounce_count>0</bounce_count>
- <sum_visit_length>1</sum_visit_length>
<max_actions>3</max_actions>
<bounce_rate>0%</bounce_rate>
<nb_actions_per_visit>3</nb_actions_per_visit>
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__VisitsSummary.get_month.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__VisitsSummary.get_month.xml
index d60436c3c9..be3285d9ce 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__VisitsSummary.get_month.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__VisitsSummary.get_month.xml
@@ -6,9 +6,6 @@
<nb_users>0</nb_users>
<nb_visits>10</nb_visits>
<nb_actions>43</nb_actions>
- <nb_visits_converted>0</nb_visits_converted>
- <bounce_count>1</bounce_count>
- <sum_visit_length>7569</sum_visit_length>
<max_actions>5</max_actions>
<bounce_rate>10%</bounce_rate>
<nb_actions_per_visit>4.3</nb_actions_per_visit>
@@ -27,9 +24,6 @@
<nb_users>0</nb_users>
<nb_visits>1</nb_visits>
<nb_actions>3</nb_actions>
- <nb_visits_converted>0</nb_visits_converted>
- <bounce_count>0</bounce_count>
- <sum_visit_length>1</sum_visit_length>
<max_actions>3</max_actions>
<bounce_rate>0%</bounce_rate>
<nb_actions_per_visit>3</nb_actions_per_visit>
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__VisitsSummary.get_week.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__VisitsSummary.get_week.xml
index f754acd177..5db0ca624f 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__VisitsSummary.get_week.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__VisitsSummary.get_week.xml
@@ -6,9 +6,6 @@
<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>
@@ -19,9 +16,6 @@
<nb_users>0</nb_users>
<nb_visits>7</nb_visits>
<nb_actions>32</nb_actions>
- <nb_visits_converted>0</nb_visits_converted>
- <bounce_count>0</bounce_count>
- <sum_visit_length>5767</sum_visit_length>
<max_actions>5</max_actions>
<bounce_rate>0%</bounce_rate>
<nb_actions_per_visit>4.6</nb_actions_per_visit>
@@ -32,9 +26,6 @@
<nb_users>0</nb_users>
<nb_visits>2</nb_visits>
<nb_actions>10</nb_actions>
- <nb_visits_converted>0</nb_visits_converted>
- <bounce_count>0</bounce_count>
- <sum_visit_length>1802</sum_visit_length>
<max_actions>5</max_actions>
<bounce_rate>0%</bounce_rate>
<nb_actions_per_visit>5</nb_actions_per_visit>
@@ -52,9 +43,6 @@
<nb_users>0</nb_users>
<nb_visits>1</nb_visits>
<nb_actions>3</nb_actions>
- <nb_visits_converted>0</nb_visits_converted>
- <bounce_count>0</bounce_count>
- <sum_visit_length>1</sum_visit_length>
<max_actions>3</max_actions>
<bounce_rate>0%</bounce_rate>
<nb_actions_per_visit>3</nb_actions_per_visit>
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__VisitsSummary.get_year.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__VisitsSummary.get_year.xml
index 301adee7ee..5e3a2626e1 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__VisitsSummary.get_year.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__VisitsSummary.get_year.xml
@@ -4,9 +4,6 @@
<result date="2010">
<nb_visits>10</nb_visits>
<nb_actions>43</nb_actions>
- <nb_visits_converted>0</nb_visits_converted>
- <bounce_count>1</bounce_count>
- <sum_visit_length>7569</sum_visit_length>
<max_actions>5</max_actions>
<bounce_rate>10%</bounce_rate>
<nb_actions_per_visit>4.3</nb_actions_per_visit>
@@ -23,9 +20,6 @@
<result date="2010">
<nb_visits>1</nb_visits>
<nb_actions>3</nb_actions>
- <nb_visits_converted>0</nb_visits_converted>
- <bounce_count>0</bounce_count>
- <sum_visit_length>1</sum_visit_length>
<max_actions>3</max_actions>
<bounce_rate>0%</bounce_rate>
<nb_actions_per_visit>3</nb_actions_per_visit>
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitFrequency.get_day.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitFrequency.get_day.xml
index f760097ff0..ba889f997d 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitFrequency.get_day.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitFrequency.get_day.xml
@@ -7,9 +7,6 @@
<nb_users_returning>0</nb_users_returning>
<nb_visits_returning>1</nb_visits_returning>
<nb_actions_returning>5</nb_actions_returning>
- <nb_visits_converted_returning>0</nb_visits_converted_returning>
- <bounce_count_returning>0</bounce_count_returning>
- <sum_visit_length_returning>901</sum_visit_length_returning>
<max_actions_returning>5</max_actions_returning>
<bounce_rate_returning>0%</bounce_rate_returning>
<nb_actions_per_visit_returning>5</nb_actions_per_visit_returning>
@@ -20,9 +17,6 @@
<nb_users_returning>0</nb_users_returning>
<nb_visits_returning>1</nb_visits_returning>
<nb_actions_returning>5</nb_actions_returning>
- <nb_visits_converted_returning>0</nb_visits_converted_returning>
- <bounce_count_returning>0</bounce_count_returning>
- <sum_visit_length_returning>901</sum_visit_length_returning>
<max_actions_returning>5</max_actions_returning>
<bounce_rate_returning>0%</bounce_rate_returning>
<nb_actions_per_visit_returning>5</nb_actions_per_visit_returning>
@@ -33,9 +27,6 @@
<nb_users_returning>0</nb_users_returning>
<nb_visits_returning>1</nb_visits_returning>
<nb_actions_returning>5</nb_actions_returning>
- <nb_visits_converted_returning>0</nb_visits_converted_returning>
- <bounce_count_returning>0</bounce_count_returning>
- <sum_visit_length_returning>901</sum_visit_length_returning>
<max_actions_returning>5</max_actions_returning>
<bounce_rate_returning>0%</bounce_rate_returning>
<nb_actions_per_visit_returning>5</nb_actions_per_visit_returning>
@@ -46,9 +37,6 @@
<nb_users_returning>0</nb_users_returning>
<nb_visits_returning>1</nb_visits_returning>
<nb_actions_returning>5</nb_actions_returning>
- <nb_visits_converted_returning>0</nb_visits_converted_returning>
- <bounce_count_returning>0</bounce_count_returning>
- <sum_visit_length_returning>901</sum_visit_length_returning>
<max_actions_returning>5</max_actions_returning>
<bounce_rate_returning>0%</bounce_rate_returning>
<nb_actions_per_visit_returning>5</nb_actions_per_visit_returning>
@@ -59,9 +47,6 @@
<nb_users_returning>0</nb_users_returning>
<nb_visits_returning>1</nb_visits_returning>
<nb_actions_returning>5</nb_actions_returning>
- <nb_visits_converted_returning>0</nb_visits_converted_returning>
- <bounce_count_returning>0</bounce_count_returning>
- <sum_visit_length_returning>901</sum_visit_length_returning>
<max_actions_returning>5</max_actions_returning>
<bounce_rate_returning>0%</bounce_rate_returning>
<nb_actions_per_visit_returning>5</nb_actions_per_visit_returning>
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitFrequency.get_month.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitFrequency.get_month.xml
index ddce4b63c9..069850fb66 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitFrequency.get_month.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitFrequency.get_month.xml
@@ -5,9 +5,6 @@
<nb_users_returning>0</nb_users_returning>
<nb_visits_returning>8</nb_visits_returning>
<nb_actions_returning>40</nb_actions_returning>
- <nb_visits_converted_returning>0</nb_visits_converted_returning>
- <bounce_count_returning>0</bounce_count_returning>
- <sum_visit_length_returning>7208</sum_visit_length_returning>
<max_actions_returning>5</max_actions_returning>
<bounce_rate_returning>0%</bounce_rate_returning>
<nb_actions_per_visit_returning>5</nb_actions_per_visit_returning>
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitFrequency.get_week.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitFrequency.get_week.xml
index d44fe0f184..a3a5ca70bd 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitFrequency.get_week.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitFrequency.get_week.xml
@@ -6,9 +6,6 @@
<nb_users_returning>0</nb_users_returning>
<nb_visits_returning>6</nb_visits_returning>
<nb_actions_returning>30</nb_actions_returning>
- <nb_visits_converted_returning>0</nb_visits_converted_returning>
- <bounce_count_returning>0</bounce_count_returning>
- <sum_visit_length_returning>5406</sum_visit_length_returning>
<max_actions_returning>5</max_actions_returning>
<bounce_rate_returning>0%</bounce_rate_returning>
<nb_actions_per_visit_returning>5</nb_actions_per_visit_returning>
@@ -19,9 +16,6 @@
<nb_users_returning>0</nb_users_returning>
<nb_visits_returning>2</nb_visits_returning>
<nb_actions_returning>10</nb_actions_returning>
- <nb_visits_converted_returning>0</nb_visits_converted_returning>
- <bounce_count_returning>0</bounce_count_returning>
- <sum_visit_length_returning>1802</sum_visit_length_returning>
<max_actions_returning>5</max_actions_returning>
<bounce_rate_returning>0%</bounce_rate_returning>
<nb_actions_per_visit_returning>5</nb_actions_per_visit_returning>
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitFrequency.get_year.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitFrequency.get_year.xml
index a7e7659d80..0996bf12f5 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitFrequency.get_year.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitFrequency.get_year.xml
@@ -3,9 +3,6 @@
<result date="2010">
<nb_visits_returning>8</nb_visits_returning>
<nb_actions_returning>40</nb_actions_returning>
- <nb_visits_converted_returning>0</nb_visits_converted_returning>
- <bounce_count_returning>0</bounce_count_returning>
- <sum_visit_length_returning>7208</sum_visit_length_returning>
<max_actions_returning>5</max_actions_returning>
<bounce_rate_returning>0%</bounce_rate_returning>
<nb_actions_per_visit_returning>5</nb_actions_per_visit_returning>
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitsSummary.get_day.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitsSummary.get_day.xml
index 057ccb1b63..9c045ac7ff 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitsSummary.get_day.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitsSummary.get_day.xml
@@ -5,9 +5,6 @@
<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>
@@ -18,9 +15,6 @@
<nb_users>0</nb_users>
<nb_visits>1</nb_visits>
<nb_actions>2</nb_actions>
- <nb_visits_converted>0</nb_visits_converted>
- <bounce_count>0</bounce_count>
- <sum_visit_length>361</sum_visit_length>
<max_actions>2</max_actions>
<bounce_rate>0%</bounce_rate>
<nb_actions_per_visit>2</nb_actions_per_visit>
@@ -31,9 +25,6 @@
<nb_users>0</nb_users>
<nb_visits>1</nb_visits>
<nb_actions>5</nb_actions>
- <nb_visits_converted>0</nb_visits_converted>
- <bounce_count>0</bounce_count>
- <sum_visit_length>901</sum_visit_length>
<max_actions>5</max_actions>
<bounce_rate>0%</bounce_rate>
<nb_actions_per_visit>5</nb_actions_per_visit>
@@ -44,9 +35,6 @@
<nb_users>0</nb_users>
<nb_visits>1</nb_visits>
<nb_actions>5</nb_actions>
- <nb_visits_converted>0</nb_visits_converted>
- <bounce_count>0</bounce_count>
- <sum_visit_length>901</sum_visit_length>
<max_actions>5</max_actions>
<bounce_rate>0%</bounce_rate>
<nb_actions_per_visit>5</nb_actions_per_visit>
@@ -57,9 +45,6 @@
<nb_users>0</nb_users>
<nb_visits>1</nb_visits>
<nb_actions>5</nb_actions>
- <nb_visits_converted>0</nb_visits_converted>
- <bounce_count>0</bounce_count>
- <sum_visit_length>901</sum_visit_length>
<max_actions>5</max_actions>
<bounce_rate>0%</bounce_rate>
<nb_actions_per_visit>5</nb_actions_per_visit>
@@ -70,9 +55,6 @@
<nb_users>0</nb_users>
<nb_visits>1</nb_visits>
<nb_actions>5</nb_actions>
- <nb_visits_converted>0</nb_visits_converted>
- <bounce_count>0</bounce_count>
- <sum_visit_length>901</sum_visit_length>
<max_actions>5</max_actions>
<bounce_rate>0%</bounce_rate>
<nb_actions_per_visit>5</nb_actions_per_visit>
@@ -83,9 +65,6 @@
<nb_users>0</nb_users>
<nb_visits>1</nb_visits>
<nb_actions>5</nb_actions>
- <nb_visits_converted>0</nb_visits_converted>
- <bounce_count>0</bounce_count>
- <sum_visit_length>901</sum_visit_length>
<max_actions>5</max_actions>
<bounce_rate>0%</bounce_rate>
<nb_actions_per_visit>5</nb_actions_per_visit>
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitsSummary.get_month.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitsSummary.get_month.xml
index 30c69614b1..d43d13e9f7 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitsSummary.get_month.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitsSummary.get_month.xml
@@ -5,9 +5,6 @@
<nb_users>0</nb_users>
<nb_visits>10</nb_visits>
<nb_actions>43</nb_actions>
- <nb_visits_converted>0</nb_visits_converted>
- <bounce_count>1</bounce_count>
- <sum_visit_length>7569</sum_visit_length>
<max_actions>5</max_actions>
<bounce_rate>10%</bounce_rate>
<nb_actions_per_visit>4.3</nb_actions_per_visit>
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitsSummary.get_week.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitsSummary.get_week.xml
index bb7f2a5509..a163de9f75 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitsSummary.get_week.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitsSummary.get_week.xml
@@ -5,9 +5,6 @@
<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>
@@ -18,9 +15,6 @@
<nb_users>0</nb_users>
<nb_visits>7</nb_visits>
<nb_actions>32</nb_actions>
- <nb_visits_converted>0</nb_visits_converted>
- <bounce_count>0</bounce_count>
- <sum_visit_length>5767</sum_visit_length>
<max_actions>5</max_actions>
<bounce_rate>0%</bounce_rate>
<nb_actions_per_visit>4.6</nb_actions_per_visit>
@@ -31,9 +25,6 @@
<nb_users>0</nb_users>
<nb_visits>2</nb_visits>
<nb_actions>10</nb_actions>
- <nb_visits_converted>0</nb_visits_converted>
- <bounce_count>0</bounce_count>
- <sum_visit_length>1802</sum_visit_length>
<max_actions>5</max_actions>
<bounce_rate>0%</bounce_rate>
<nb_actions_per_visit>5</nb_actions_per_visit>
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitsSummary.get_year.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitsSummary.get_year.xml
index 10e5329cb6..b4289e642f 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitsSummary.get_year.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitsSummary.get_year.xml
@@ -3,9 +3,6 @@
<result date="2010">
<nb_visits>10</nb_visits>
<nb_actions>43</nb_actions>
- <nb_visits_converted>0</nb_visits_converted>
- <bounce_count>1</bounce_count>
- <sum_visit_length>7569</sum_visit_length>
<max_actions>5</max_actions>
<bounce_rate>10%</bounce_rate>
<nb_actions_per_visit>4.3</nb_actions_per_visit>
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_csv__ScheduledReports.generateReport_month.original.csv b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_csv__ScheduledReports.generateReport_month.original.csv
index a3e7fe499b..97677526fc 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_csv__ScheduledReports.generateReport_month.original.csv
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_csv__ScheduledReports.generateReport_month.original.csv
@@ -241,8 +241,8 @@ Social Networks
No data available
Goals
-nb_conversions,nb_visits_converted,conversion_rate,revenue,avg_order_revenue
-0,0,0%,$ 0,$ 0
+nb_conversions,nb_visits_converted,revenue,conversion_rate
+0,0,$ 0,0%
Visits to Conversion
No data available
@@ -333,8 +333,8 @@ New visits,2
365+ days,0
Returning Visits
-nb_uniq_visitors_returning,nb_users_returning,nb_visits_returning,nb_actions_returning,nb_visits_converted_returning,sum_visit_length_returning,max_actions_returning,bounce_rate_returning,nb_actions_per_visit_returning,avg_time_on_site_returning
-1,0,8,40,0,7208,5,0%,5,00:15:01
+nb_uniq_visitors_returning,nb_users_returning,nb_visits_returning,nb_actions_returning,max_actions_returning,bounce_rate_returning,nb_actions_per_visit_returning,avg_time_on_site_returning
+1,0,8,40,5,0%,5,00:15:01
Provider
label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_month.original.html b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_month.original.html
index 9304d6a626..f81da6d67a 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_month.original.html
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_month.original.html
@@ -4047,14 +4047,6 @@
</tr>
<tr style="">
- <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
- Conversion Rate </td>
- <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
- 0%
- </td>
- </tr>
-
- <tr style="background-color: rgb(249,250,250)">
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
Revenue </td>
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
@@ -4062,11 +4054,11 @@
</td>
</tr>
- <tr style="">
+ <tr style="background-color: rgb(249,250,250)">
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
- Average Order Value </td>
+ Conversion Rate </td>
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
- $ 0
+ 0%
</td>
</tr>
</tbody>
@@ -4958,22 +4950,6 @@
</td>
</tr>
- <tr style="">
- <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
- Number of converted returning visits </td>
- <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
- 0
- </td>
- </tr>
-
- <tr style="background-color: rgb(249,250,250)">
- <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
- Total time spent by returning visitors (in seconds) </td>
- <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
- 7208
- </td>
- </tr>
-
<tr style="">
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
Maximum actions in one returning visit </td>
diff --git a/tests/PHPUnit/System/expected/test_UserId_VisitorId__VisitsSummary.get_day.xml b/tests/PHPUnit/System/expected/test_UserId_VisitorId__VisitsSummary.get_day.xml
index ca85e8dede..4aa7be5bbf 100644
--- a/tests/PHPUnit/System/expected/test_UserId_VisitorId__VisitsSummary.get_day.xml
+++ b/tests/PHPUnit/System/expected/test_UserId_VisitorId__VisitsSummary.get_day.xml
@@ -4,9 +4,6 @@
<nb_users>2</nb_users>
<nb_visits>6</nb_visits>
<nb_actions>10</nb_actions>
- <nb_visits_converted>1</nb_visits_converted>
- <bounce_count>3</bounce_count>
- <sum_visit_length>1983</sum_visit_length>
<max_actions>3</max_actions>
<bounce_rate>50%</bounce_rate>
<nb_actions_per_visit>1.7</nb_actions_per_visit>
diff --git a/tests/PHPUnit/System/expected/test_UserId_VisitorId__VisitsSummary.get_month.xml b/tests/PHPUnit/System/expected/test_UserId_VisitorId__VisitsSummary.get_month.xml
index 7731535795..384d2679e6 100644
--- a/tests/PHPUnit/System/expected/test_UserId_VisitorId__VisitsSummary.get_month.xml
+++ b/tests/PHPUnit/System/expected/test_UserId_VisitorId__VisitsSummary.get_month.xml
@@ -4,9 +4,6 @@
<nb_users>3</nb_users>
<nb_visits>8</nb_visits>
<nb_actions>12</nb_actions>
- <nb_visits_converted>1</nb_visits_converted>
- <bounce_count>5</bounce_count>
- <sum_visit_length>1983</sum_visit_length>
<max_actions>3</max_actions>
<bounce_rate>63%</bounce_rate>
<nb_actions_per_visit>1.5</nb_actions_per_visit>
diff --git a/tests/PHPUnit/System/expected/test_UserId_VisitorId__VisitsSummary.get_week.xml b/tests/PHPUnit/System/expected/test_UserId_VisitorId__VisitsSummary.get_week.xml
index ca85e8dede..4aa7be5bbf 100644
--- a/tests/PHPUnit/System/expected/test_UserId_VisitorId__VisitsSummary.get_week.xml
+++ b/tests/PHPUnit/System/expected/test_UserId_VisitorId__VisitsSummary.get_week.xml
@@ -4,9 +4,6 @@
<nb_users>2</nb_users>
<nb_visits>6</nb_visits>
<nb_actions>10</nb_actions>
- <nb_visits_converted>1</nb_visits_converted>
- <bounce_count>3</bounce_count>
- <sum_visit_length>1983</sum_visit_length>
<max_actions>3</max_actions>
<bounce_rate>50%</bounce_rate>
<nb_actions_per_visit>1.7</nb_actions_per_visit>
diff --git a/tests/PHPUnit/System/expected/test_UserId_VisitorId__VisitsSummary.get_year.xml b/tests/PHPUnit/System/expected/test_UserId_VisitorId__VisitsSummary.get_year.xml
index 84850ee827..2bb6b1d301 100644
--- a/tests/PHPUnit/System/expected/test_UserId_VisitorId__VisitsSummary.get_year.xml
+++ b/tests/PHPUnit/System/expected/test_UserId_VisitorId__VisitsSummary.get_year.xml
@@ -2,9 +2,6 @@
<result>
<nb_visits>8</nb_visits>
<nb_actions>12</nb_actions>
- <nb_visits_converted>1</nb_visits_converted>
- <bounce_count>5</bounce_count>
- <sum_visit_length>1983</sum_visit_length>
<max_actions>3</max_actions>
<bounce_rate>63%</bounce_rate>
<nb_actions_per_visit>1.5</nb_actions_per_visit>
diff --git a/tests/PHPUnit/System/expected/test_UserId_VisitorId_segmentUserId__Goals.get_day.xml b/tests/PHPUnit/System/expected/test_UserId_VisitorId_segmentUserId__Goals.get_day.xml
index a43cbc433e..b7555aa8c6 100644
--- a/tests/PHPUnit/System/expected/test_UserId_VisitorId_segmentUserId__Goals.get_day.xml
+++ b/tests/PHPUnit/System/expected/test_UserId_VisitorId_segmentUserId__Goals.get_day.xml
@@ -2,6 +2,6 @@
<result>
<nb_conversions>1</nb_conversions>
<nb_visits_converted>1</nb_visits_converted>
- <conversion_rate>50</conversion_rate>
<revenue>0</revenue>
+ <conversion_rate>50%</conversion_rate>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_UserId_VisitorId_segmentUserId__VisitsSummary.get_day.xml b/tests/PHPUnit/System/expected/test_UserId_VisitorId_segmentUserId__VisitsSummary.get_day.xml
index 969fd130e8..038ad7f337 100644
--- a/tests/PHPUnit/System/expected/test_UserId_VisitorId_segmentUserId__VisitsSummary.get_day.xml
+++ b/tests/PHPUnit/System/expected/test_UserId_VisitorId_segmentUserId__VisitsSummary.get_day.xml
@@ -4,9 +4,6 @@
<nb_users>1</nb_users>
<nb_visits>2</nb_visits>
<nb_actions>3</nb_actions>
- <nb_visits_converted>1</nb_visits_converted>
- <bounce_count>1</bounce_count>
- <sum_visit_length>1081</sum_visit_length>
<max_actions>2</max_actions>
<bounce_rate>50%</bounce_rate>
<nb_actions_per_visit>1.5</nb_actions_per_visit>
diff --git a/tests/PHPUnit/System/expected/test_VisitsInPast_InvalidateOldReportsWebsite1_OldReportsShouldAppear__VisitsSummary.get_month.xml b/tests/PHPUnit/System/expected/test_VisitsInPast_InvalidateOldReportsWebsite1_OldReportsShouldAppear__VisitsSummary.get_month.xml
index 2f7ce19aa5..fee45c6b81 100644
--- a/tests/PHPUnit/System/expected/test_VisitsInPast_InvalidateOldReportsWebsite1_OldReportsShouldAppear__VisitsSummary.get_month.xml
+++ b/tests/PHPUnit/System/expected/test_VisitsInPast_InvalidateOldReportsWebsite1_OldReportsShouldAppear__VisitsSummary.get_month.xml
@@ -5,9 +5,6 @@
<nb_users>0</nb_users>
<nb_visits>1</nb_visits>
<nb_actions>4</nb_actions>
- <nb_visits_converted>0</nb_visits_converted>
- <bounce_count>0</bounce_count>
- <sum_visit_length>1</sum_visit_length>
<max_actions>4</max_actions>
<bounce_rate>0%</bounce_rate>
<nb_actions_per_visit>4</nb_actions_per_visit>
@@ -19,9 +16,6 @@
<nb_users>0</nb_users>
<nb_visits>1</nb_visits>
<nb_actions>6</nb_actions>
- <nb_visits_converted>0</nb_visits_converted>
- <bounce_count>0</bounce_count>
- <sum_visit_length>1</sum_visit_length>
<max_actions>6</max_actions>
<bounce_rate>0%</bounce_rate>
<nb_actions_per_visit>6</nb_actions_per_visit>
diff --git a/tests/PHPUnit/System/expected/test_VisitsInPast_InvalidateOldReportsWebsite1_OldReportsShouldNotAppear__VisitsSummary.get_month.xml b/tests/PHPUnit/System/expected/test_VisitsInPast_InvalidateOldReportsWebsite1_OldReportsShouldNotAppear__VisitsSummary.get_month.xml
index d84e6c4f35..eb29de0ae3 100644
--- a/tests/PHPUnit/System/expected/test_VisitsInPast_InvalidateOldReportsWebsite1_OldReportsShouldNotAppear__VisitsSummary.get_month.xml
+++ b/tests/PHPUnit/System/expected/test_VisitsInPast_InvalidateOldReportsWebsite1_OldReportsShouldNotAppear__VisitsSummary.get_month.xml
@@ -7,9 +7,6 @@
<nb_users>0</nb_users>
<nb_visits>1</nb_visits>
<nb_actions>6</nb_actions>
- <nb_visits_converted>0</nb_visits_converted>
- <bounce_count>0</bounce_count>
- <sum_visit_length>1</sum_visit_length>
<max_actions>6</max_actions>
<bounce_rate>0%</bounce_rate>
<nb_actions_per_visit>6</nb_actions_per_visit>
diff --git a/tests/PHPUnit/System/expected/test_VisitsInPast_InvalidateOldReportsWebsite2_OldReportsShouldAppear__VisitsSummary.get_month.xml b/tests/PHPUnit/System/expected/test_VisitsInPast_InvalidateOldReportsWebsite2_OldReportsShouldAppear__VisitsSummary.get_month.xml
index ed3e2b6ade..aa82f70f97 100644
--- a/tests/PHPUnit/System/expected/test_VisitsInPast_InvalidateOldReportsWebsite2_OldReportsShouldAppear__VisitsSummary.get_month.xml
+++ b/tests/PHPUnit/System/expected/test_VisitsInPast_InvalidateOldReportsWebsite2_OldReportsShouldAppear__VisitsSummary.get_month.xml
@@ -5,9 +5,6 @@
<nb_users>0</nb_users>
<nb_visits>1</nb_visits>
<nb_actions>5</nb_actions>
- <nb_visits_converted>0</nb_visits_converted>
- <bounce_count>0</bounce_count>
- <sum_visit_length>361</sum_visit_length>
<max_actions>5</max_actions>
<bounce_rate>0%</bounce_rate>
<nb_actions_per_visit>5</nb_actions_per_visit>
@@ -20,9 +17,6 @@
<nb_users>0</nb_users>
<nb_visits>1</nb_visits>
<nb_actions>6</nb_actions>
- <nb_visits_converted>0</nb_visits_converted>
- <bounce_count>0</bounce_count>
- <sum_visit_length>1</sum_visit_length>
<max_actions>6</max_actions>
<bounce_rate>0%</bounce_rate>
<nb_actions_per_visit>6</nb_actions_per_visit>
diff --git a/tests/PHPUnit/System/expected/test_VisitsInPast_InvalidateOldReportsWebsite2_OldReportsShouldNotAppear__VisitsSummary.get_month.xml b/tests/PHPUnit/System/expected/test_VisitsInPast_InvalidateOldReportsWebsite2_OldReportsShouldNotAppear__VisitsSummary.get_month.xml
index d046dca549..04e74fccbc 100644
--- a/tests/PHPUnit/System/expected/test_VisitsInPast_InvalidateOldReportsWebsite2_OldReportsShouldNotAppear__VisitsSummary.get_month.xml
+++ b/tests/PHPUnit/System/expected/test_VisitsInPast_InvalidateOldReportsWebsite2_OldReportsShouldNotAppear__VisitsSummary.get_month.xml
@@ -8,9 +8,6 @@
<nb_users>0</nb_users>
<nb_visits>1</nb_visits>
<nb_actions>6</nb_actions>
- <nb_visits_converted>0</nb_visits_converted>
- <bounce_count>0</bounce_count>
- <sum_visit_length>1</sum_visit_length>
<max_actions>6</max_actions>
<bounce_rate>0%</bounce_rate>
<nb_actions_per_visit>6</nb_actions_per_visit>
diff --git a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportMetadata_day.xml b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportMetadata_day.xml
index 9bd7d342a9..e31cb79059 100644
--- a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportMetadata_day.xml
+++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportMetadata_day.xml
@@ -507,9 +507,7 @@
<nb_visits_returning>Returning Visits</nb_visits_returning>
<nb_actions_returning>Actions by Returning Visits</nb_actions_returning>
<nb_uniq_visitors_returning>Unique returning visitors</nb_uniq_visitors_returning>
- <sum_visit_length_returning>Total time spent by returning visitors (in seconds)</sum_visit_length_returning>
<nb_users_returning>Returning Users</nb_users_returning>
- <nb_visits_converted_returning>Number of converted returning visits</nb_visits_converted_returning>
<max_actions_returning>Maximum actions in one returning visit</max_actions_returning>
<nb_uniq_visitors>Unique visitors</nb_uniq_visitors>
<nb_visits>Visits</nb_visits>
@@ -1924,9 +1922,7 @@
<nb_visits_returning>Returning Visits</nb_visits_returning>
<nb_actions_returning>Actions by Returning Visits</nb_actions_returning>
<nb_uniq_visitors_returning>Unique returning visitors</nb_uniq_visitors_returning>
- <sum_visit_length_returning>Total time spent by returning visitors (in seconds)</sum_visit_length_returning>
<nb_users_returning>Returning Users</nb_users_returning>
- <nb_visits_converted_returning>Number of converted returning visits</nb_visits_converted_returning>
<max_actions_returning>Maximum actions in one returning visit</max_actions_returning>
</metrics>
<processedMetrics>
diff --git a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.get_day.xml b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.get_day.xml
index a76fff247d..57438262e4 100644
--- a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.get_day.xml
+++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.get_day.xml
@@ -10,11 +10,8 @@
<nb_visits_returning>0</nb_visits_returning>
<nb_actions_returning>0</nb_actions_returning>
<nb_uniq_visitors_returning>0</nb_uniq_visitors_returning>
- <sum_visit_length_returning>0</sum_visit_length_returning>
<nb_users_returning>0</nb_users_returning>
- <nb_visits_converted_returning>0</nb_visits_converted_returning>
<max_actions_returning>0</max_actions_returning>
- <bounce_count_returning>0</bounce_count_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>
diff --git a/tests/PHPUnit/System/expected/test_csvExport_xp0__VisitsSummary.get_day.csv b/tests/PHPUnit/System/expected/test_csvExport_xp0__VisitsSummary.get_day.csv
index 26adb45055000e356178ec02921c8d86e9ab4ae7..779689ac0c64b7afe3f09f4f66a11a0ff2eb4a29 100644
GIT binary patch
delta 13
Ucmeyx)W$R+Vd9aV$q9^704b0KWB>pF
delta 107
zcmZo;`o%OMVWOFke>_7nLq0<uLm5LVLlHv>kW69FVMqdsl>$YRfqaMx5U&I%Qw$W(
o1&Wn1WCGclK(Tm+9H6Q^hIAl1V`6MSw-Hbo2%9q)O?)m707rNjDgXcg
diff --git a/tests/PHPUnit/System/expected/test_csvExport_xp1_inner0_trans-en__VisitsSummary.get_day.csv b/tests/PHPUnit/System/expected/test_csvExport_xp1_inner0_trans-en__VisitsSummary.get_day.csv
index 58e88ae47a28cb445839c70d9e9583f828bdf6e8..31027739ab83719e50195bb5186e66673697305c 100644
GIT binary patch
delta 30
hcmcb_yn<<h&%_5OM2s197z`LxfutdW9)mfU2LOs4273Si
delta 199
zcmZ3%bcuO_Pkk6eCPOh0mjFoxhH@|~1ITh_$Y;o7C}T)vC<4oac*P7l3{F7tQXo4S
zC<Ee$0Qn^hi3~YFJtaWhxj=CRpiBXf&I5`lFeEWl0?9JCJ^5f06&N&tB6&h!#i>B!
qKo+C`HEK@uJgsE}G#P}=fut#rHU?rdAWs!Y8#3qtSs-~6AO--%LL><Q
diff --git a/tests/PHPUnit/System/expected/test_csvExport_xp1_inner1_trans-de__VisitsSummary.get_day.csv b/tests/PHPUnit/System/expected/test_csvExport_xp1_inner1_trans-de__VisitsSummary.get_day.csv
index 7315bde8710ac414bdf8329726bcd79dcb223614..56267781f42198fc1ad38595ed93f0ce65ffa4a4 100644
GIT binary patch
delta 36
kcmX@Z(!)F<ZZij?7^8$SgARiMgDQ|TWYA+U2lGH80ED##X8-^I
delta 194
zcmeBSKEpC0uHK0um7$oSlp&cR1ISWf$Ysc6C;`&m4EYRs3}ryEBA|RGn3oC^(P408
zNCJu!0LA|R`RPCvIt*c8c?AYk(~5xd3Q#kWfa(*$wv>SFaR-vc42dj23ri;RGHPy2
l5Mk6a0vZLv=0MUENE-vO8IY$6qzxJLfGm)_30RE*0{|6=BGCW<
diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_SegmentAbandonedCart__VisitsSummary.get_day.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_SegmentAbandonedCart__VisitsSummary.get_day.xml
index 2ecf693474..a7e343ba22 100644
--- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_SegmentAbandonedCart__VisitsSummary.get_day.xml
+++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_SegmentAbandonedCart__VisitsSummary.get_day.xml
@@ -4,9 +4,6 @@
<nb_users>0</nb_users>
<nb_visits>2</nb_visits>
<nb_actions>9</nb_actions>
- <nb_visits_converted>1</nb_visits_converted>
- <bounce_count>0</bounce_count>
- <sum_visit_length>4682</sum_visit_length>
<max_actions>6</max_actions>
<bounce_rate>0%</bounce_rate>
<nb_actions_per_visit>4.5</nb_actions_per_visit>
diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_SegmentConvertedGoalId1__VisitsSummary.get_day.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_SegmentConvertedGoalId1__VisitsSummary.get_day.xml
index a9d2095dfb..9316fae5a5 100644
--- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_SegmentConvertedGoalId1__VisitsSummary.get_day.xml
+++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_SegmentConvertedGoalId1__VisitsSummary.get_day.xml
@@ -4,9 +4,6 @@
<nb_users>0</nb_users>
<nb_visits>1</nb_visits>
<nb_actions>4</nb_actions>
- <nb_visits_converted>1</nb_visits_converted>
- <bounce_count>0</bounce_count>
- <sum_visit_length>721</sum_visit_length>
<max_actions>4</max_actions>
<bounce_rate>0%</bounce_rate>
<nb_actions_per_visit>4</nb_actions_per_visit>
diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_SegmentConvertedGoalId1__VisitsSummary.get_week.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_SegmentConvertedGoalId1__VisitsSummary.get_week.xml
index a9d2095dfb..9316fae5a5 100644
--- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_SegmentConvertedGoalId1__VisitsSummary.get_week.xml
+++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_SegmentConvertedGoalId1__VisitsSummary.get_week.xml
@@ -4,9 +4,6 @@
<nb_users>0</nb_users>
<nb_visits>1</nb_visits>
<nb_actions>4</nb_actions>
- <nb_visits_converted>1</nb_visits_converted>
- <bounce_count>0</bounce_count>
- <sum_visit_length>721</sum_visit_length>
<max_actions>4</max_actions>
<bounce_rate>0%</bounce_rate>
<nb_actions_per_visit>4</nb_actions_per_visit>
diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_SegmentDidNotConvertGoalId1__VisitsSummary.get_day.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_SegmentDidNotConvertGoalId1__VisitsSummary.get_day.xml
index 2ecf693474..a7e343ba22 100644
--- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_SegmentDidNotConvertGoalId1__VisitsSummary.get_day.xml
+++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_SegmentDidNotConvertGoalId1__VisitsSummary.get_day.xml
@@ -4,9 +4,6 @@
<nb_users>0</nb_users>
<nb_visits>2</nb_visits>
<nb_actions>9</nb_actions>
- <nb_visits_converted>1</nb_visits_converted>
- <bounce_count>0</bounce_count>
- <sum_visit_length>4682</sum_visit_length>
<max_actions>6</max_actions>
<bounce_rate>0%</bounce_rate>
<nb_actions_per_visit>4.5</nb_actions_per_visit>
diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_SegmentNewVisitors__VisitsSummary.get_week.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_SegmentNewVisitors__VisitsSummary.get_week.xml
index a9d2095dfb..9316fae5a5 100644
--- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_SegmentNewVisitors__VisitsSummary.get_week.xml
+++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_SegmentNewVisitors__VisitsSummary.get_week.xml
@@ -4,9 +4,6 @@
<nb_users>0</nb_users>
<nb_visits>1</nb_visits>
<nb_actions>4</nb_actions>
- <nb_visits_converted>1</nb_visits_converted>
- <bounce_count>0</bounce_count>
- <sum_visit_length>721</sum_visit_length>
<max_actions>4</max_actions>
<bounce_rate>0%</bounce_rate>
<nb_actions_per_visit>4</nb_actions_per_visit>
diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_SegmentNoEcommerce__VisitsSummary.get_day.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_SegmentNoEcommerce__VisitsSummary.get_day.xml
index a9d2095dfb..9316fae5a5 100644
--- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_SegmentNoEcommerce__VisitsSummary.get_day.xml
+++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_SegmentNoEcommerce__VisitsSummary.get_day.xml
@@ -4,9 +4,6 @@
<nb_users>0</nb_users>
<nb_visits>1</nb_visits>
<nb_actions>4</nb_actions>
- <nb_visits_converted>1</nb_visits_converted>
- <bounce_count>0</bounce_count>
- <sum_visit_length>721</sum_visit_length>
<max_actions>4</max_actions>
<bounce_rate>0%</bounce_rate>
<nb_actions_per_visit>4</nb_actions_per_visit>
diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_SegmentNoVisit_HaveConvertedNonExistingGoal__VisitsSummary.get_week.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_SegmentNoVisit_HaveConvertedNonExistingGoal__VisitsSummary.get_week.xml
index 32b66284be..fb2e69c2f2 100644
--- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_SegmentNoVisit_HaveConvertedNonExistingGoal__VisitsSummary.get_week.xml
+++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_SegmentNoVisit_HaveConvertedNonExistingGoal__VisitsSummary.get_week.xml
@@ -4,9 +4,6 @@
<nb_users>0</nb_users>
<nb_visits>0</nb_visits>
<nb_actions>0</nb_actions>
- <nb_visits_converted>0</nb_visits_converted>
- <bounce_count>0</bounce_count>
- <sum_visit_length>0</sum_visit_length>
<max_actions>0</max_actions>
<bounce_rate>0%</bounce_rate>
<nb_actions_per_visit>0</nb_actions_per_visit>
diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_SegmentOrderedSomething__VisitsSummary.get_day.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_SegmentOrderedSomething__VisitsSummary.get_day.xml
index 44b18e613c..426bed12e0 100644
--- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_SegmentOrderedSomething__VisitsSummary.get_day.xml
+++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_SegmentOrderedSomething__VisitsSummary.get_day.xml
@@ -4,9 +4,6 @@
<nb_users>0</nb_users>
<nb_visits>1</nb_visits>
<nb_actions>6</nb_actions>
- <nb_visits_converted>1</nb_visits_converted>
- <bounce_count>0</bounce_count>
- <sum_visit_length>3961</sum_visit_length>
<max_actions>6</max_actions>
<bounce_rate>0%</bounce_rate>
<nb_actions_per_visit>6</nb_actions_per_visit>
diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_SegmentPageTitleMatch__VisitsSummary.get_day.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_SegmentPageTitleMatch__VisitsSummary.get_day.xml
index a9d2095dfb..9316fae5a5 100644
--- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_SegmentPageTitleMatch__VisitsSummary.get_day.xml
+++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_SegmentPageTitleMatch__VisitsSummary.get_day.xml
@@ -4,9 +4,6 @@
<nb_users>0</nb_users>
<nb_visits>1</nb_visits>
<nb_actions>4</nb_actions>
- <nb_visits_converted>1</nb_visits_converted>
- <bounce_count>0</bounce_count>
- <sum_visit_length>721</sum_visit_length>
<max_actions>4</max_actions>
<bounce_rate>0%</bounce_rate>
<nb_actions_per_visit>4</nb_actions_per_visit>
diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_SegmentReturningCustomers__VisitsSummary.get_week.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_SegmentReturningCustomers__VisitsSummary.get_week.xml
index 02458f0645..345cf57c2f 100644
--- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_SegmentReturningCustomers__VisitsSummary.get_week.xml
+++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_SegmentReturningCustomers__VisitsSummary.get_week.xml
@@ -4,9 +4,6 @@
<nb_users>0</nb_users>
<nb_visits>3</nb_visits>
<nb_actions>6</nb_actions>
- <nb_visits_converted>2</nb_visits_converted>
- <bounce_count>1</bounce_count>
- <sum_visit_length>2165</sum_visit_length>
<max_actions>3</max_actions>
<bounce_rate>33%</bounce_rate>
<nb_actions_per_visit>2</nb_actions_per_visit>
diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_SegmentReturningVisitors__VisitsSummary.get_week.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_SegmentReturningVisitors__VisitsSummary.get_week.xml
index 44b18e613c..426bed12e0 100644
--- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_SegmentReturningVisitors__VisitsSummary.get_week.xml
+++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_SegmentReturningVisitors__VisitsSummary.get_week.xml
@@ -4,9 +4,6 @@
<nb_users>0</nb_users>
<nb_visits>1</nb_visits>
<nb_actions>6</nb_actions>
- <nb_visits_converted>1</nb_visits_converted>
- <bounce_count>0</bounce_count>
- <sum_visit_length>3961</sum_visit_length>
<max_actions>6</max_actions>
<bounce_rate>0%</bounce_rate>
<nb_actions_per_visit>6</nb_actions_per_visit>
diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_SegmentVisitHasConvertedGoal__VisitsSummary.get_week.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_SegmentVisitHasConvertedGoal__VisitsSummary.get_week.xml
index a9d2095dfb..9316fae5a5 100644
--- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_SegmentVisitHasConvertedGoal__VisitsSummary.get_week.xml
+++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_SegmentVisitHasConvertedGoal__VisitsSummary.get_week.xml
@@ -4,9 +4,6 @@
<nb_users>0</nb_users>
<nb_visits>1</nb_visits>
<nb_actions>4</nb_actions>
- <nb_visits_converted>1</nb_visits_converted>
- <bounce_count>0</bounce_count>
- <sum_visit_length>721</sum_visit_length>
<max_actions>4</max_actions>
<bounce_rate>0%</bounce_rate>
<nb_actions_per_visit>4</nb_actions_per_visit>
diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_SegmentVisitHasNotOrderedAndConvertedGoal__VisitsSummary.get_week.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_SegmentVisitHasNotOrderedAndConvertedGoal__VisitsSummary.get_week.xml
index a9d2095dfb..9316fae5a5 100644
--- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_SegmentVisitHasNotOrderedAndConvertedGoal__VisitsSummary.get_week.xml
+++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_SegmentVisitHasNotOrderedAndConvertedGoal__VisitsSummary.get_week.xml
@@ -4,9 +4,6 @@
<nb_users>0</nb_users>
<nb_visits>1</nb_visits>
<nb_actions>4</nb_actions>
- <nb_visits_converted>1</nb_visits_converted>
- <bounce_count>0</bounce_count>
- <sum_visit_length>721</sum_visit_length>
<max_actions>4</max_actions>
<bounce_rate>0%</bounce_rate>
<nb_actions_per_visit>4</nb_actions_per_visit>
diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__VisitsSummary.get_day.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__VisitsSummary.get_day.xml
index 115904be39..f095668462 100644
--- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__VisitsSummary.get_day.xml
+++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__VisitsSummary.get_day.xml
@@ -4,9 +4,6 @@
<nb_users>0</nb_users>
<nb_visits>3</nb_visits>
<nb_actions>13</nb_actions>
- <nb_visits_converted>2</nb_visits_converted>
- <bounce_count>0</bounce_count>
- <sum_visit_length>5403</sum_visit_length>
<max_actions>6</max_actions>
<bounce_rate>0%</bounce_rate>
<nb_actions_per_visit>4.3</nb_actions_per_visit>
diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_csv__ScheduledReports.generateReport_week.original.csv b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_csv__ScheduledReports.generateReport_week.original.csv
index 5fff1f5e2c..ff003cfbf1 100644
--- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_csv__ScheduledReports.generateReport_week.original.csv
+++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_csv__ScheduledReports.generateReport_week.original.csv
@@ -484,8 +484,8 @@ New visits,1
365+ days,0
Returning Visits
-nb_uniq_visitors_returning,nb_users_returning,nb_visits_returning,nb_actions_returning,nb_visits_converted_returning,sum_visit_length_returning,max_actions_returning,bounce_rate_returning,nb_actions_per_visit_returning,avg_time_on_site_returning
-1,0,4,12,3,6126,6,25%,3,00:25:32
+nb_uniq_visitors_returning,nb_users_returning,nb_visits_returning,nb_actions_returning,max_actions_returning,bounce_rate_returning,nb_actions_per_visit_returning,avg_time_on_site_returning
+1,0,4,12,6,25%,3,00:25:32
Provider
label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate
diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_week.original.html b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_week.original.html
index e278b621de..1b012a722e 100644
--- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_week.original.html
+++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_week.original.html
@@ -6456,22 +6456,6 @@
</td>
</tr>
- <tr style="">
- <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
- Number of converted returning visits </td>
- <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
- 3
- </td>
- </tr>
-
- <tr style="background-color: rgb(249,250,250)">
- <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
- Total time spent by returning visitors (in seconds) </td>
- <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
- 6126
- </td>
- </tr>
-
<tr style="">
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
Maximum actions in one returning visit </td>
diff --git a/tests/PHPUnit/System/expected/test_noVisit__Goals.get_day.xml b/tests/PHPUnit/System/expected/test_noVisit__Goals.get_day.xml
index 257dd359a5..2cb7df5a9e 100644
--- a/tests/PHPUnit/System/expected/test_noVisit__Goals.get_day.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit__Goals.get_day.xml
@@ -2,6 +2,6 @@
<result>
<nb_conversions>0</nb_conversions>
<nb_visits_converted>0</nb_visits_converted>
- <conversion_rate>0</conversion_rate>
<revenue>0</revenue>
+ <conversion_rate>0%</conversion_rate>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_noVisit__VisitFrequency.get_day.xml b/tests/PHPUnit/System/expected/test_noVisit__VisitFrequency.get_day.xml
index c415099916..b6c1430561 100644
--- a/tests/PHPUnit/System/expected/test_noVisit__VisitFrequency.get_day.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit__VisitFrequency.get_day.xml
@@ -4,9 +4,6 @@
<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>
diff --git a/tests/PHPUnit/System/expected/test_noVisit__VisitsSummary.get_day.xml b/tests/PHPUnit/System/expected/test_noVisit__VisitsSummary.get_day.xml
index 32b66284be..fb2e69c2f2 100644
--- a/tests/PHPUnit/System/expected/test_noVisit__VisitsSummary.get_day.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit__VisitsSummary.get_day.xml
@@ -4,9 +4,6 @@
<nb_users>0</nb_users>
<nb_visits>0</nb_visits>
<nb_actions>0</nb_actions>
- <nb_visits_converted>0</nb_visits_converted>
- <bounce_count>0</bounce_count>
- <sum_visit_length>0</sum_visit_length>
<max_actions>0</max_actions>
<bounce_rate>0%</bounce_rate>
<nb_actions_per_visit>0</nb_actions_per_visit>
diff --git a/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__VisitFrequency.get_range.xml b/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__VisitFrequency.get_range.xml
index d7c74b8645..998570088c 100644
--- a/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__VisitFrequency.get_range.xml
+++ b/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__VisitFrequency.get_range.xml
@@ -2,9 +2,6 @@
<result>
<nb_visits_returning>6</nb_visits_returning>
<nb_actions_returning>9</nb_actions_returning>
- <nb_visits_converted_returning>0</nb_visits_converted_returning>
- <bounce_count_returning>3</bounce_count_returning>
- <sum_visit_length_returning>1083</sum_visit_length_returning>
<max_actions_returning>2</max_actions_returning>
<bounce_rate_returning>50%</bounce_rate_returning>
<nb_actions_per_visit_returning>1.5</nb_actions_per_visit_returning>
diff --git a/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__VisitsSummary.get_range.xml b/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__VisitsSummary.get_range.xml
index 29d972ff8a..02e6f04c57 100644
--- a/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__VisitsSummary.get_range.xml
+++ b/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__VisitsSummary.get_range.xml
@@ -2,9 +2,6 @@
<result>
<nb_visits>6</nb_visits>
<nb_actions>9</nb_actions>
- <nb_visits_converted>0</nb_visits_converted>
- <bounce_count>3</bounce_count>
- <sum_visit_length>1083</sum_visit_length>
<max_actions>2</max_actions>
<bounce_rate>50%</bounce_rate>
<nb_actions_per_visit>1.5</nb_actions_per_visit>
diff --git a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Goals.get_range.xml b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Goals.get_range.xml
index cf9900ec47..26bf6746c5 100644
--- a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Goals.get_range.xml
+++ b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Goals.get_range.xml
@@ -2,6 +2,6 @@
<result>
<nb_conversions>3</nb_conversions>
<nb_visits_converted>2</nb_visits_converted>
- <conversion_rate>66.67</conversion_rate>
<revenue>1000</revenue>
+ <conversion_rate>66.67%</conversion_rate>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__VisitsSummary.get_range.xml b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__VisitsSummary.get_range.xml
index 4a5151e912..7ed769dfb3 100644
--- a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__VisitsSummary.get_range.xml
+++ b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__VisitsSummary.get_range.xml
@@ -2,9 +2,6 @@
<result>
<nb_visits>3</nb_visits>
<nb_actions>5</nb_actions>
- <nb_visits_converted>2</nb_visits_converted>
- <bounce_count>2</bounce_count>
- <sum_visit_length>725</sum_visit_length>
<max_actions>3</max_actions>
<bounce_rate>67%</bounce_rate>
<nb_actions_per_visit>1.7</nb_actions_per_visit>
diff --git a/tests/PHPUnit/System/expected/test_trackGoals_allowMultipleConversionsPerVisit__VisitsSummary.get_day.xml b/tests/PHPUnit/System/expected/test_trackGoals_allowMultipleConversionsPerVisit__VisitsSummary.get_day.xml
index 7168091d51..7ff0123b17 100644
--- a/tests/PHPUnit/System/expected/test_trackGoals_allowMultipleConversionsPerVisit__VisitsSummary.get_day.xml
+++ b/tests/PHPUnit/System/expected/test_trackGoals_allowMultipleConversionsPerVisit__VisitsSummary.get_day.xml
@@ -4,9 +4,6 @@
<nb_users>0</nb_users>
<nb_visits>2</nb_visits>
<nb_actions>5</nb_actions>
- <nb_visits_converted>2</nb_visits_converted>
- <bounce_count>0</bounce_count>
- <sum_visit_length>363</sum_visit_length>
<max_actions>3</max_actions>
<bounce_rate>0%</bounce_rate>
<nb_actions_per_visit>2.5</nb_actions_per_visit>
diff --git a/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_SegmentPageTitleContainsStrangeCharacters__VisitsSummary.get_day.xml b/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_SegmentPageTitleContainsStrangeCharacters__VisitsSummary.get_day.xml
index 9cdfb2d5b7..f916b85048 100644
--- a/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_SegmentPageTitleContainsStrangeCharacters__VisitsSummary.get_day.xml
+++ b/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_SegmentPageTitleContainsStrangeCharacters__VisitsSummary.get_day.xml
@@ -4,9 +4,6 @@
<nb_users>0</nb_users>
<nb_visits>1</nb_visits>
<nb_actions>3</nb_actions>
- <nb_visits_converted>1</nb_visits_converted>
- <bounce_count>0</bounce_count>
- <sum_visit_length>364</sum_visit_length>
<max_actions>3</max_actions>
<bounce_rate>0%</bounce_rate>
<nb_actions_per_visit>3</nb_actions_per_visit>
diff --git a/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_SegmentPageTitleContains__VisitsSummary.get_day.xml b/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_SegmentPageTitleContains__VisitsSummary.get_day.xml
index 9cdfb2d5b7..f916b85048 100644
--- a/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_SegmentPageTitleContains__VisitsSummary.get_day.xml
+++ b/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_SegmentPageTitleContains__VisitsSummary.get_day.xml
@@ -4,9 +4,6 @@
<nb_users>0</nb_users>
<nb_visits>1</nb_visits>
<nb_actions>3</nb_actions>
- <nb_visits_converted>1</nb_visits_converted>
- <bounce_count>0</bounce_count>
- <sum_visit_length>364</sum_visit_length>
<max_actions>3</max_actions>
<bounce_rate>0%</bounce_rate>
<nb_actions_per_visit>3</nb_actions_per_visit>
diff --git a/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_SegmentPageTitleExcludes__VisitsSummary.get_day.xml b/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_SegmentPageTitleExcludes__VisitsSummary.get_day.xml
index 06b9efca77..9ed9610ff2 100644
--- a/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_SegmentPageTitleExcludes__VisitsSummary.get_day.xml
+++ b/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_SegmentPageTitleExcludes__VisitsSummary.get_day.xml
@@ -4,9 +4,6 @@
<nb_users>0</nb_users>
<nb_visits>2</nb_visits>
<nb_actions>4</nb_actions>
- <nb_visits_converted>2</nb_visits_converted>
- <bounce_count>1</bounce_count>
- <sum_visit_length>725</sum_visit_length>
<max_actions>3</max_actions>
<bounce_rate>50%</bounce_rate>
<nb_actions_per_visit>2</nb_actions_per_visit>
diff --git a/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_SegmentPageUrlContains__VisitsSummary.get_day.xml b/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_SegmentPageUrlContains__VisitsSummary.get_day.xml
index 9cdfb2d5b7..f916b85048 100644
--- a/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_SegmentPageUrlContains__VisitsSummary.get_day.xml
+++ b/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_SegmentPageUrlContains__VisitsSummary.get_day.xml
@@ -4,9 +4,6 @@
<nb_users>0</nb_users>
<nb_visits>1</nb_visits>
<nb_actions>3</nb_actions>
- <nb_visits_converted>1</nb_visits_converted>
- <bounce_count>0</bounce_count>
- <sum_visit_length>364</sum_visit_length>
<max_actions>3</max_actions>
<bounce_rate>0%</bounce_rate>
<nb_actions_per_visit>3</nb_actions_per_visit>
diff --git a/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_SegmentPageUrlExcludes__VisitsSummary.get_day.xml b/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_SegmentPageUrlExcludes__VisitsSummary.get_day.xml
index 06b9efca77..9ed9610ff2 100644
--- a/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_SegmentPageUrlExcludes__VisitsSummary.get_day.xml
+++ b/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_SegmentPageUrlExcludes__VisitsSummary.get_day.xml
@@ -4,9 +4,6 @@
<nb_users>0</nb_users>
<nb_visits>2</nb_visits>
<nb_actions>4</nb_actions>
- <nb_visits_converted>2</nb_visits_converted>
- <bounce_count>1</bounce_count>
- <sum_visit_length>725</sum_visit_length>
<max_actions>3</max_actions>
<bounce_rate>50%</bounce_rate>
<nb_actions_per_visit>2</nb_actions_per_visit>
diff --git a/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables__VisitsSummary.get_day.xml b/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables__VisitsSummary.get_day.xml
index ab7f9f9a18..c14daef152 100644
--- a/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables__VisitsSummary.get_day.xml
+++ b/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables__VisitsSummary.get_day.xml
@@ -6,9 +6,6 @@
<nb_users>0</nb_users>
<nb_visits>3</nb_visits>
<nb_actions>6</nb_actions>
- <nb_visits_converted>2</nb_visits_converted>
- <bounce_count>2</bounce_count>
- <sum_visit_length>722</sum_visit_length>
<max_actions>4</max_actions>
<bounce_rate>67%</bounce_rate>
<nb_actions_per_visit>2</nb_actions_per_visit>
diff --git a/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables__VisitsSummary.get_week.xml b/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables__VisitsSummary.get_week.xml
index b5e37b20aa..7eb27f4237 100644
--- a/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables__VisitsSummary.get_week.xml
+++ b/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables__VisitsSummary.get_week.xml
@@ -6,9 +6,6 @@
<nb_users>0</nb_users>
<nb_visits>3</nb_visits>
<nb_actions>6</nb_actions>
- <nb_visits_converted>2</nb_visits_converted>
- <bounce_count>2</bounce_count>
- <sum_visit_length>722</sum_visit_length>
<max_actions>4</max_actions>
<bounce_rate>67%</bounce_rate>
<nb_actions_per_visit>2</nb_actions_per_visit>
diff --git a/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentMatchALL_noGoalData__VisitsSummary.get_day.xml b/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentMatchALL_noGoalData__VisitsSummary.get_day.xml
index 283758c4ec..3d7e3d62c4 100644
--- a/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentMatchALL_noGoalData__VisitsSummary.get_day.xml
+++ b/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentMatchALL_noGoalData__VisitsSummary.get_day.xml
@@ -6,9 +6,6 @@
<nb_users>0</nb_users>
<nb_visits>3</nb_visits>
<nb_actions>5</nb_actions>
- <nb_visits_converted>2</nb_visits_converted>
- <bounce_count>2</bounce_count>
- <sum_visit_length>725</sum_visit_length>
<max_actions>3</max_actions>
<bounce_rate>67%</bounce_rate>
<nb_actions_per_visit>1.7</nb_actions_per_visit>
diff --git a/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentMatchALL_noGoalData__VisitsSummary.get_week.xml b/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentMatchALL_noGoalData__VisitsSummary.get_week.xml
index 4dab22a018..f6cf29fc70 100644
--- a/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentMatchALL_noGoalData__VisitsSummary.get_week.xml
+++ b/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentMatchALL_noGoalData__VisitsSummary.get_week.xml
@@ -6,9 +6,6 @@
<nb_users>0</nb_users>
<nb_visits>3</nb_visits>
<nb_actions>5</nb_actions>
- <nb_visits_converted>2</nb_visits_converted>
- <bounce_count>2</bounce_count>
- <sum_visit_length>725</sum_visit_length>
<max_actions>3</max_actions>
<bounce_rate>67%</bounce_rate>
<nb_actions_per_visit>1.7</nb_actions_per_visit>
diff --git a/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentMatchVisitorType__VisitsSummary.get_day.xml b/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentMatchVisitorType__VisitsSummary.get_day.xml
index de4eac0560..38cfd3d23f 100644
--- a/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentMatchVisitorType__VisitsSummary.get_day.xml
+++ b/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentMatchVisitorType__VisitsSummary.get_day.xml
@@ -6,9 +6,6 @@
<nb_users>0</nb_users>
<nb_visits>1</nb_visits>
<nb_actions>3</nb_actions>
- <nb_visits_converted>1</nb_visits_converted>
- <bounce_count>0</bounce_count>
- <sum_visit_length>364</sum_visit_length>
<max_actions>3</max_actions>
<bounce_rate>0%</bounce_rate>
<nb_actions_per_visit>3</nb_actions_per_visit>
diff --git a/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentMatchVisitorType__VisitsSummary.get_week.xml b/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentMatchVisitorType__VisitsSummary.get_week.xml
index b23508240f..de45b35f0a 100644
--- a/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentMatchVisitorType__VisitsSummary.get_week.xml
+++ b/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentMatchVisitorType__VisitsSummary.get_week.xml
@@ -6,9 +6,6 @@
<nb_users>0</nb_users>
<nb_visits>1</nb_visits>
<nb_actions>3</nb_actions>
- <nb_visits_converted>1</nb_visits_converted>
- <bounce_count>0</bounce_count>
- <sum_visit_length>364</sum_visit_length>
<max_actions>3</max_actions>
<bounce_rate>0%</bounce_rate>
<nb_actions_per_visit>3</nb_actions_per_visit>
--
GitLab