From 0b36adb531084ef59f56c7e0002b43764022af4b Mon Sep 17 00:00:00 2001
From: diosmosis <benaka@piwik.pro>
Date: Mon, 3 Nov 2014 12:31:01 -0800
Subject: [PATCH] Fixing more tests.

---
 plugins/Insights/Model.php                    |   2 +-
 .../Insights/tests/Integration/ModelTest.php  |   6 +-
 ...ouldNotAppear__VisitsSummary.get_month.xml |   2 +-
 ...NotInvalidated__VisitsSummary.get_week.xml |   2 +-
 ...ouldNotAppear__VisitsSummary.get_month.xml |   2 +-
 ...ITest_actions__VisitsSummary.get_range.xml |   2 +-
 ...t_browserCode__VisitsSummary.get_range.xml |   2 +-
 ...browserEngine__VisitsSummary.get_range.xml |   2 +-
 ...rowserVersion__VisitsSummary.get_range.xml |   2 +-
 ...tAPITest_city__VisitsSummary.get_range.xml |   2 +-
 ...continentCode__VisitsSummary.get_range.xml |   2 +-
 ...t_countryCode__VisitsSummary.get_range.xml |   2 +-
 ...VariableName1__VisitsSummary.get_range.xml |   2 +-
 ...VariableName5__VisitsSummary.get_range.xml |   2 +-
 ...ablePageName2__VisitsSummary.get_range.xml |   2 +-
 ...ablePageName4__VisitsSummary.get_range.xml |   2 +-
 ...ablePageName5__VisitsSummary.get_range.xml |   2 +-
 ...blePageValue2__VisitsSummary.get_range.xml |   2 +-
 ...blePageValue4__VisitsSummary.get_range.xml |   2 +-
 ...blePageValue5__VisitsSummary.get_range.xml |   2 +-
 ...ariableValue1__VisitsSummary.get_range.xml |   2 +-
 ...ariableValue5__VisitsSummary.get_range.xml |   2 +-
 ...nceFirstVisit__VisitsSummary.get_range.xml |   2 +-
 ...commerceOrder__VisitsSummary.get_range.xml |   2 +-
 ...inceLastVisit__VisitsSummary.get_range.xml |   2 +-
 ...st_deviceType__VisitsSummary.get_range.xml |   2 +-
 ...ntryPageTitle__VisitsSummary.get_range.xml |   2 +-
 ..._entryPageUrl__VisitsSummary.get_range.xml |   2 +-
 ...t_eventAction__VisitsSummary.get_range.xml |   2 +-
 ...eventCategory__VisitsSummary.get_range.xml |   2 +-
 ...est_eventName__VisitsSummary.get_range.xml |   2 +-
 ...PITest_events__VisitsSummary.get_range.xml |   2 +-
 ...exitPageTitle__VisitsSummary.get_range.xml |   2 +-
 ...t_exitPageUrl__VisitsSummary.get_range.xml |   2 +-
 ...Test_latitude__VisitsSummary.get_range.xml |   2 +-
 ...est_longitude__VisitsSummary.get_range.xml |   2 +-
 ...ingSystemCode__VisitsSummary.get_range.xml |   2 +-
 ...est_pageTitle__VisitsSummary.get_range.xml |   2 +-
 ...ITest_pageUrl__VisitsSummary.get_range.xml |   2 +-
 ...Test_provider__VisitsSummary.get_range.xml |   2 +-
 ...ferrerKeyword__VisitsSummary.get_range.xml |   2 +-
 ..._referrerName__VisitsSummary.get_range.xml |   2 +-
 ..._referrerType__VisitsSummary.get_range.xml |   2 +-
 ...t_referrerUrl__VisitsSummary.get_range.xml |   2 +-
 ...st_regionCode__VisitsSummary.get_range.xml |   2 +-
 ...st_resolution__VisitsSummary.get_range.xml |   2 +-
 ...Test_searches__VisitsSummary.get_range.xml |   2 +-
 ...SearchKeyword__VisitsSummary.get_range.xml |   2 +-
 ...PITest_userId__VisitsSummary.get_range.xml |   2 +-
 ...nvertedGoalId__VisitsSummary.get_range.xml |   2 +-
 ...isitConverted__VisitsSummary.get_range.xml |   2 +-
 ...st_visitCount__VisitsSummary.get_range.xml |   2 +-
 ...visitDuration__VisitsSummary.get_range.xml |   2 +-
 ...ommerceStatus__VisitsSummary.get_range.xml |   2 +-
 ...ITest_visitIp__VisitsSummary.get_range.xml |   2 +-
 ...isitLocalHour__VisitsSummary.get_range.xml |   2 +-
 ...sitServerHour__VisitsSummary.get_range.xml |   2 +-
 ...est_visitorId__VisitsSummary.get_range.xml |   2 +-
 ...t_visitorType__VisitsSummary.get_range.xml |   2 +-
 ...tibility1XTest__VisitFrequency.get_day.xml |   2 +-
 ...bility1XTest__VisitFrequency.get_month.xml |   2 +-
 ...bility1XTest__VisitFrequency.get_range.xml |   2 +-
 ...ibility1XTest__VisitFrequency.get_week.xml |   2 +-
 ...ibility1XTest__VisitFrequency.get_year.xml |   2 +-
 ..._multipleDates__VisitFrequency.get_day.xml |   2 +-
 ...ltipleOldNew__VisitFrequency.get_month.xml |   4 +-
 ...t_ImportLogs__VisitFrequency.get_month.xml |   2 +-
 ...t_ImportLogs__VisitFrequency.get_range.xml |   2 +-
 ...st_ImportLogs__VisitsSummary.get_month.xml |   2 +-
 ...singLogReplay__VisitsSummary.get_month.xml |   2 +-
 ...Test_sitesGroup__VisitsSummary.get_day.xml |   2 +-
 ...st_sitesGroup__VisitsSummary.get_month.xml |   2 +-
 ...isitorTwoVisits__VisitsSummary.get_day.xml |   2 +-
 ...OneVisitorTwoVisits_csv__API.get_month.csv | Bin 2494 -> 2472 bytes
 ...hCookieSupport__VisitFrequency.get_day.xml |   2 +-
 ...thCookieSupport__VisitsSummary.get_day.xml |   2 +-
 ...ampaignTracking__VisitsSummary.get_day.xml |   2 +-
 ...t_dayAfterVisit__VisitsSummary.get_day.xml |   2 +-
 ...sTest_withVisit__VisitsSummary.get_day.xml |   2 +-
 ...d_disabledAfter__VisitsSummary.get_day.xml |   2 +-
 ...disabledAfter__VisitsSummary.get_month.xml |   4 +-
 ..._disabledAfter__VisitsSummary.get_week.xml |   2 +-
 ..._disabledAfter__VisitsSummary.get_year.xml |   4 +-
 ...e_isDateRange__VisitsSummary.get_range.xml |   4 +-
 ...e_isDateRange__VisitsSummary.get_range.xml |   4 +-
 ...isabled_enabled__VisitsSummary.get_day.xml |   2 +-
 ...abled_enabled__VisitsSummary.get_month.xml |   4 +-
 ...sabled_enabled__VisitsSummary.get_week.xml |   2 +-
 ...sabled_enabled__VisitsSummary.get_year.xml |   4 +-
 ...NotLastNPeriods__VisitsSummary.get_day.xml |   2 +-
 ...tLastNPeriods__VisitsSummary.get_month.xml |   4 +-
 ...dReports.generateReport_month.original.csv |  94 ++++++-------
 ...serId_VisitorId__VisitsSummary.get_day.xml |   2 +-
 ...rId_VisitorId__VisitsSummary.get_month.xml |   2 +-
 ...erId_VisitorId__VisitsSummary.get_week.xml |   2 +-
 ...erId_VisitorId__VisitsSummary.get_year.xml |   2 +-
 ...d_segmentUserId__VisitsSummary.get_day.xml |   2 +-
 ...ouldNotAppear__VisitsSummary.get_month.xml |   2 +-
 ...ouldNotAppear__VisitsSummary.get_month.xml |   2 +-
 ...ortMetadata__API.getReportMetadata_day.xml | 124 +++++++++++++-----
 ...test_apiGetReportMetadata__API.get_day.xml |  17 ++-
 ...t_csvExport_xp0__VisitsSummary.get_day.csv | Bin 378 -> 378 bytes
 ...inner0_trans-en__VisitsSummary.get_day.csv | Bin 466 -> 466 bytes
 ...inner1_trans-de__VisitsSummary.get_day.csv | Bin 588 -> 588 bytes
 .../test_noVisit__VisitFrequency.get_day.xml  |   2 +-
 .../test_noVisit__VisitsSummary.get_day.xml   |   2 +-
 ...ys_DateRange__VisitFrequency.get_range.xml |   2 +-
 ...ays_DateRange__VisitsSummary.get_range.xml |   2 +-
 ...aAndNormalAPI__VisitsSummary.get_range.xml |   2 +-
 ...ersionsPerVisit__VisitsSummary.get_day.xml |   2 +-
 ...rangeCharacters__VisitsSummary.get_day.xml |   2 +-
 ...geTitleContains__VisitsSummary.get_day.xml |   2 +-
 ...geTitleExcludes__VisitsSummary.get_day.xml |   2 +-
 ...PageUrlContains__VisitsSummary.get_day.xml |   2 +-
 ...PageUrlExcludes__VisitsSummary.get_day.xml |   2 +-
 ...CustomVariables__VisitsSummary.get_day.xml |   2 +-
 ...ustomVariables__VisitsSummary.get_week.xml |   2 +-
 ...hALL_noGoalData__VisitsSummary.get_day.xml |   2 +-
 ...ALL_noGoalData__VisitsSummary.get_week.xml |   2 +-
 ...atchVisitorType__VisitsSummary.get_day.xml |   2 +-
 ...tchVisitorType__VisitsSummary.get_week.xml |   2 +-
 121 files changed, 274 insertions(+), 209 deletions(-)

diff --git a/plugins/Insights/Model.php b/plugins/Insights/Model.php
index 9dae23c978..b8c4957e55 100644
--- a/plugins/Insights/Model.php
+++ b/plugins/Insights/Model.php
@@ -85,7 +85,7 @@ class Model
 
     public function getTotalValue($idSite, $period, $date, $metric, $segment)
     {
-        $visits   = VisitsSummaryAPI::getInstance()->get($idSite, $period, $date, $segment, array($metric));
+        $visits   = VisitsSummaryAPI::getInstance()->get($idSite, $period, $date, $segment);
         $firstRow = $visits->getFirstRow();
 
         if (empty($firstRow)) {
diff --git a/plugins/Insights/tests/Integration/ModelTest.php b/plugins/Insights/tests/Integration/ModelTest.php
index dda3605309..8b98658f08 100644
--- a/plugins/Insights/tests/Integration/ModelTest.php
+++ b/plugins/Insights/tests/Integration/ModelTest.php
@@ -144,12 +144,10 @@ class ModelTest extends SystemTestCase
         $this->assertEquals(1, $total);
     }
 
-    /**
-     * @expectedException \Exception
-     */
     public function test_getTotalValue_shouldReturnZero_IfColumnDoesNotExist()
     {
-        $this->model->getTotalValue(self::$fixture->idSite, 'day', self::$fixture->date1, 'unknown_ColUmn', false);
+        $total = $this->model->getTotalValue(self::$fixture->idSite, 'day', self::$fixture->date1, 'unknown_ColUmn', false);
+        $this->assertEquals(0, $total);
     }
 
     public function test_getRelevantTotalValue_shouldReturnTotalValue_IfMetricTotalIsHighEnough()
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..55461e8c2e 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
@@ -9,9 +9,9 @@
 		<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>
 		<avg_time_on_site>1</avg_time_on_site>
+		<bounce_rate>0%</bounce_rate>
 	</result>
 	<result date="2010-04" />
 	<result date="2010-05" />
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..a2821522d2 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
@@ -9,9 +9,9 @@
 		<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>
 		<avg_time_on_site>1</avg_time_on_site>
+		<bounce_rate>0%</bounce_rate>
 	</result>
 	<result date="From 2010-01-11 to 2010-01-17" />
 	<result date="From 2010-01-18 to 2010-01-24" />
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..001a304de2 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
@@ -9,9 +9,9 @@
 		<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>
 		<avg_time_on_site>1</avg_time_on_site>
+		<bounce_rate>0%</bounce_rate>
 	</result>
 	<result date="2010-02" />
 	<result date="2010-03" />
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..05d76e44c0 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
@@ -6,7 +6,7 @@
 	<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>
 	<avg_time_on_site>0</avg_time_on_site>
+	<bounce_rate>100%</bounce_rate>
 </result>
\ No newline at end of file
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..21eac49375 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
@@ -6,7 +6,7 @@
 	<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>
 	<avg_time_on_site>607</avg_time_on_site>
+	<bounce_rate>52%</bounce_rate>
 </result>
\ No newline at end of file
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..d829330513 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
@@ -6,7 +6,7 @@
 	<bounce_count>1</bounce_count>
 	<sum_visit_length>0</sum_visit_length>
 	<max_actions>1</max_actions>
-	<bounce_rate>100%</bounce_rate>
 	<nb_actions_per_visit>1</nb_actions_per_visit>
 	<avg_time_on_site>0</avg_time_on_site>
+	<bounce_rate>100%</bounce_rate>
 </result>
\ No newline at end of file
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..21eac49375 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
@@ -6,7 +6,7 @@
 	<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>
 	<avg_time_on_site>607</avg_time_on_site>
+	<bounce_rate>52%</bounce_rate>
 </result>
\ No newline at end of file
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..2b45ee7be6 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
@@ -6,7 +6,7 @@
 	<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>
 	<avg_time_on_site>631</avg_time_on_site>
+	<bounce_rate>50%</bounce_rate>
 </result>
\ No newline at end of file
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..670e6648a7 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
@@ -6,7 +6,7 @@
 	<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>
 	<avg_time_on_site>631</avg_time_on_site>
+	<bounce_rate>50%</bounce_rate>
 </result>
\ No newline at end of file
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..2b45ee7be6 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
@@ -6,7 +6,7 @@
 	<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>
 	<avg_time_on_site>631</avg_time_on_site>
+	<bounce_rate>50%</bounce_rate>
 </result>
\ No newline at end of file
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..c962c1f57a 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
@@ -6,7 +6,7 @@
 	<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>
 	<avg_time_on_site>546</avg_time_on_site>
+	<bounce_rate>57%</bounce_rate>
 </result>
\ No newline at end of file
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..c962c1f57a 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
@@ -6,7 +6,7 @@
 	<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>
 	<avg_time_on_site>546</avg_time_on_site>
+	<bounce_rate>57%</bounce_rate>
 </result>
\ No newline at end of file
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..b298538359 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
@@ -6,7 +6,7 @@
 	<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>
 	<avg_time_on_site>0</avg_time_on_site>
+	<bounce_rate>100%</bounce_rate>
 </result>
\ No newline at end of file
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..5c910751f2 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
@@ -6,7 +6,7 @@
 	<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>
 	<avg_time_on_site>0</avg_time_on_site>
+	<bounce_rate>0%</bounce_rate>
 </result>
\ No newline at end of file
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..b298538359 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
@@ -6,7 +6,7 @@
 	<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>
 	<avg_time_on_site>0</avg_time_on_site>
+	<bounce_rate>100%</bounce_rate>
 </result>
\ No newline at end of file
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..c63a1557c9 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
@@ -6,7 +6,7 @@
 	<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>
 	<avg_time_on_site>0</avg_time_on_site>
+	<bounce_rate>100%</bounce_rate>
 </result>
\ No newline at end of file
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..73dad8e078 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
@@ -6,7 +6,7 @@
 	<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>
 	<avg_time_on_site>1261</avg_time_on_site>
+	<bounce_rate>0%</bounce_rate>
 </result>
\ No newline at end of file
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..c63a1557c9 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
@@ -6,7 +6,7 @@
 	<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>
 	<avg_time_on_site>0</avg_time_on_site>
+	<bounce_rate>100%</bounce_rate>
 </result>
\ No newline at end of file
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..ef1f29ec1e 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
@@ -6,7 +6,7 @@
 	<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>
 	<avg_time_on_site>540</avg_time_on_site>
+	<bounce_rate>57%</bounce_rate>
 </result>
\ No newline at end of file
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..ef1f29ec1e 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
@@ -6,7 +6,7 @@
 	<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>
 	<avg_time_on_site>540</avg_time_on_site>
+	<bounce_rate>57%</bounce_rate>
 </result>
\ No newline at end of file
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..dd20ff477d 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
@@ -6,7 +6,7 @@
 	<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>
 	<avg_time_on_site>1261</avg_time_on_site>
+	<bounce_rate>0%</bounce_rate>
 </result>
\ No newline at end of file
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..dd20ff477d 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
@@ -6,7 +6,7 @@
 	<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>
 	<avg_time_on_site>1261</avg_time_on_site>
+	<bounce_rate>0%</bounce_rate>
 </result>
\ No newline at end of file
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..dd20ff477d 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
@@ -6,7 +6,7 @@
 	<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>
 	<avg_time_on_site>1261</avg_time_on_site>
+	<bounce_rate>0%</bounce_rate>
 </result>
\ No newline at end of file
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..4fb38583bd 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
@@ -6,7 +6,7 @@
 	<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>
 	<avg_time_on_site>585</avg_time_on_site>
+	<bounce_rate>54%</bounce_rate>
 </result>
\ No newline at end of file
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..b298538359 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
@@ -6,7 +6,7 @@
 	<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>
 	<avg_time_on_site>0</avg_time_on_site>
+	<bounce_rate>100%</bounce_rate>
 </result>
\ No newline at end of file
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..05d76e44c0 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
@@ -6,7 +6,7 @@
 	<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>
 	<avg_time_on_site>0</avg_time_on_site>
+	<bounce_rate>100%</bounce_rate>
 </result>
\ No newline at end of file
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..2dd4346fbb 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
@@ -6,7 +6,7 @@
 	<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>
 	<avg_time_on_site>1261</avg_time_on_site>
+	<bounce_rate>0%</bounce_rate>
 </result>
\ No newline at end of file
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..2dd4346fbb 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
@@ -6,7 +6,7 @@
 	<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>
 	<avg_time_on_site>1261</avg_time_on_site>
+	<bounce_rate>0%</bounce_rate>
 </result>
\ No newline at end of file
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..2dd4346fbb 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
@@ -6,7 +6,7 @@
 	<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>
 	<avg_time_on_site>1261</avg_time_on_site>
+	<bounce_rate>0%</bounce_rate>
 </result>
\ No newline at end of file
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..05d76e44c0 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
@@ -6,7 +6,7 @@
 	<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>
 	<avg_time_on_site>0</avg_time_on_site>
+	<bounce_rate>100%</bounce_rate>
 </result>
\ No newline at end of file
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..b298538359 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
@@ -6,7 +6,7 @@
 	<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>
 	<avg_time_on_site>0</avg_time_on_site>
+	<bounce_rate>100%</bounce_rate>
 </result>
\ No newline at end of file
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..05d76e44c0 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
@@ -6,7 +6,7 @@
 	<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>
 	<avg_time_on_site>0</avg_time_on_site>
+	<bounce_rate>100%</bounce_rate>
 </result>
\ No newline at end of file
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..5f7f45bac7 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
@@ -6,7 +6,7 @@
 	<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>
 	<avg_time_on_site>631</avg_time_on_site>
+	<bounce_rate>50%</bounce_rate>
 </result>
\ No newline at end of file
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..5c910751f2 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
@@ -6,7 +6,7 @@
 	<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>
 	<avg_time_on_site>0</avg_time_on_site>
+	<bounce_rate>0%</bounce_rate>
 </result>
\ No newline at end of file
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..4fb38583bd 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
@@ -6,7 +6,7 @@
 	<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>
 	<avg_time_on_site>585</avg_time_on_site>
+	<bounce_rate>54%</bounce_rate>
 </result>
\ No newline at end of file
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..b298538359 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
@@ -6,7 +6,7 @@
 	<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>
 	<avg_time_on_site>0</avg_time_on_site>
+	<bounce_rate>100%</bounce_rate>
 </result>
\ No newline at end of file
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..dd20ff477d 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
@@ -6,7 +6,7 @@
 	<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>
 	<avg_time_on_site>1261</avg_time_on_site>
+	<bounce_rate>0%</bounce_rate>
 </result>
\ No newline at end of file
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..d2922278ae 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
@@ -6,7 +6,7 @@
 	<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>
 	<avg_time_on_site>631</avg_time_on_site>
+	<bounce_rate>50%</bounce_rate>
 </result>
\ No newline at end of file
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..d829330513 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
@@ -6,7 +6,7 @@
 	<bounce_count>1</bounce_count>
 	<sum_visit_length>0</sum_visit_length>
 	<max_actions>1</max_actions>
-	<bounce_rate>100%</bounce_rate>
 	<nb_actions_per_visit>1</nb_actions_per_visit>
 	<avg_time_on_site>0</avg_time_on_site>
+	<bounce_rate>100%</bounce_rate>
 </result>
\ No newline at end of file
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..d829330513 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
@@ -6,7 +6,7 @@
 	<bounce_count>1</bounce_count>
 	<sum_visit_length>0</sum_visit_length>
 	<max_actions>1</max_actions>
-	<bounce_rate>100%</bounce_rate>
 	<nb_actions_per_visit>1</nb_actions_per_visit>
 	<avg_time_on_site>0</avg_time_on_site>
+	<bounce_rate>100%</bounce_rate>
 </result>
\ No newline at end of file
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..3fdf141636 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
@@ -6,7 +6,7 @@
 	<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>
 	<avg_time_on_site>631</avg_time_on_site>
+	<bounce_rate>50%</bounce_rate>
 </result>
\ No newline at end of file
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..d829330513 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
@@ -6,7 +6,7 @@
 	<bounce_count>1</bounce_count>
 	<sum_visit_length>0</sum_visit_length>
 	<max_actions>1</max_actions>
-	<bounce_rate>100%</bounce_rate>
 	<nb_actions_per_visit>1</nb_actions_per_visit>
 	<avg_time_on_site>0</avg_time_on_site>
+	<bounce_rate>100%</bounce_rate>
 </result>
\ No newline at end of file
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..5f7f45bac7 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
@@ -6,7 +6,7 @@
 	<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>
 	<avg_time_on_site>631</avg_time_on_site>
+	<bounce_rate>50%</bounce_rate>
 </result>
\ No newline at end of file
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..24ae7dc5eb 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
@@ -6,7 +6,7 @@
 	<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>
 	<avg_time_on_site>612</avg_time_on_site>
+	<bounce_rate>51%</bounce_rate>
 </result>
\ No newline at end of file
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..c0affa752a 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
@@ -6,7 +6,7 @@
 	<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>
 	<avg_time_on_site>388</avg_time_on_site>
+	<bounce_rate>69%</bounce_rate>
 </result>
\ No newline at end of file
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..73dad8e078 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
@@ -6,7 +6,7 @@
 	<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>
 	<avg_time_on_site>1261</avg_time_on_site>
+	<bounce_rate>0%</bounce_rate>
 </result>
\ No newline at end of file
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..d829330513 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
@@ -6,7 +6,7 @@
 	<bounce_count>1</bounce_count>
 	<sum_visit_length>0</sum_visit_length>
 	<max_actions>1</max_actions>
-	<bounce_rate>100%</bounce_rate>
 	<nb_actions_per_visit>1</nb_actions_per_visit>
 	<avg_time_on_site>0</avg_time_on_site>
+	<bounce_rate>100%</bounce_rate>
 </result>
\ No newline at end of file
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..24ae7dc5eb 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
@@ -6,7 +6,7 @@
 	<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>
 	<avg_time_on_site>612</avg_time_on_site>
+	<bounce_rate>51%</bounce_rate>
 </result>
\ No newline at end of file
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..24ae7dc5eb 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
@@ -6,7 +6,7 @@
 	<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>
 	<avg_time_on_site>612</avg_time_on_site>
+	<bounce_rate>51%</bounce_rate>
 </result>
\ No newline at end of file
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..a18e44ac4f 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
@@ -6,7 +6,7 @@
 	<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>
 	<avg_time_on_site>715</avg_time_on_site>
+	<bounce_rate>43%</bounce_rate>
 </result>
\ No newline at end of file
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..05d76e44c0 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
@@ -6,7 +6,7 @@
 	<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>
 	<avg_time_on_site>0</avg_time_on_site>
+	<bounce_rate>100%</bounce_rate>
 </result>
\ No newline at end of file
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..24ae7dc5eb 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
@@ -6,7 +6,7 @@
 	<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>
 	<avg_time_on_site>612</avg_time_on_site>
+	<bounce_rate>51%</bounce_rate>
 </result>
\ No newline at end of file
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..7ae89fb823 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
@@ -6,7 +6,7 @@
 	<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>
 	<avg_time_on_site>420</avg_time_on_site>
+	<bounce_rate>67%</bounce_rate>
 </result>
\ No newline at end of file
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..24ae7dc5eb 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
@@ -6,7 +6,7 @@
 	<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>
 	<avg_time_on_site>612</avg_time_on_site>
+	<bounce_rate>51%</bounce_rate>
 </result>
\ No newline at end of file
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..05d76e44c0 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
@@ -6,7 +6,7 @@
 	<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>
 	<avg_time_on_site>0</avg_time_on_site>
+	<bounce_rate>100%</bounce_rate>
 </result>
\ No newline at end of file
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..407428439a 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
@@ -6,7 +6,7 @@
 	<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>
 	<avg_time_on_site>631</avg_time_on_site>
+	<bounce_rate>50%</bounce_rate>
 </result>
\ No newline at end of file
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..a18e44ac4f 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
@@ -6,7 +6,7 @@
 	<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>
 	<avg_time_on_site>715</avg_time_on_site>
+	<bounce_rate>43%</bounce_rate>
 </result>
\ No newline at end of file
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..b876004aa6 100644
--- a/tests/PHPUnit/System/expected/test_BackwardsCompatibility1XTest__VisitFrequency.get_day.xml
+++ b/tests/PHPUnit/System/expected/test_BackwardsCompatibility1XTest__VisitFrequency.get_day.xml
@@ -8,7 +8,7 @@
 	<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>
 	<avg_time_on_site_returning>0</avg_time_on_site_returning>
+	<bounce_rate_returning>100%</bounce_rate_returning>
 </result>
\ No newline at end of file
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..babf4d6c4e 100644
--- a/tests/PHPUnit/System/expected/test_BackwardsCompatibility1XTest__VisitFrequency.get_month.xml
+++ b/tests/PHPUnit/System/expected/test_BackwardsCompatibility1XTest__VisitFrequency.get_month.xml
@@ -8,7 +8,7 @@
 	<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>
 	<avg_time_on_site_returning>0</avg_time_on_site_returning>
+	<bounce_rate_returning>100%</bounce_rate_returning>
 </result>
\ No newline at end of file
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..b85c0368da 100644
--- a/tests/PHPUnit/System/expected/test_BackwardsCompatibility1XTest__VisitFrequency.get_range.xml
+++ b/tests/PHPUnit/System/expected/test_BackwardsCompatibility1XTest__VisitFrequency.get_range.xml
@@ -6,7 +6,7 @@
 	<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>
 	<avg_time_on_site_returning>0</avg_time_on_site_returning>
+	<bounce_rate_returning>100%</bounce_rate_returning>
 </result>
\ No newline at end of file
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..babf4d6c4e 100644
--- a/tests/PHPUnit/System/expected/test_BackwardsCompatibility1XTest__VisitFrequency.get_week.xml
+++ b/tests/PHPUnit/System/expected/test_BackwardsCompatibility1XTest__VisitFrequency.get_week.xml
@@ -8,7 +8,7 @@
 	<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>
 	<avg_time_on_site_returning>0</avg_time_on_site_returning>
+	<bounce_rate_returning>100%</bounce_rate_returning>
 </result>
\ No newline at end of file
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..b85c0368da 100644
--- a/tests/PHPUnit/System/expected/test_BackwardsCompatibility1XTest__VisitFrequency.get_year.xml
+++ b/tests/PHPUnit/System/expected/test_BackwardsCompatibility1XTest__VisitFrequency.get_year.xml
@@ -6,7 +6,7 @@
 	<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>
 	<avg_time_on_site_returning>0</avg_time_on_site_returning>
+	<bounce_rate_returning>100%</bounce_rate_returning>
 </result>
\ No newline at end of file
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..0d21f8e79a 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
@@ -12,9 +12,9 @@
 		<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>
 		<avg_time_on_site_returning>0</avg_time_on_site_returning>
+		<bounce_rate_returning>100%</bounce_rate_returning>
 	</result>
 	<result date="2012-03-07" />
 	<result date="2012-03-08" />
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..6503700469 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
@@ -9,9 +9,9 @@
 		<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>
 		<avg_time_on_site_returning>0</avg_time_on_site_returning>
+		<bounce_rate_returning>100%</bounce_rate_returning>
 	</result>
 	<result date="2012-04" />
 	<result date="2012-05" />
@@ -30,8 +30,8 @@
 		<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>
 		<avg_time_on_site_returning>0</avg_time_on_site_returning>
+		<bounce_rate_returning>100%</bounce_rate_returning>
 	</result>
 </results>
\ No newline at end of file
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..b876004aa6 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitFrequency.get_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitFrequency.get_month.xml
@@ -8,7 +8,7 @@
 	<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>
 	<avg_time_on_site_returning>0</avg_time_on_site_returning>
+	<bounce_rate_returning>100%</bounce_rate_returning>
 </result>
\ No newline at end of file
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..4ae0deec01 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitFrequency.get_range.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitFrequency.get_range.xml
@@ -6,7 +6,7 @@
 	<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>
 	<avg_time_on_site_returning>12</avg_time_on_site_returning>
+	<bounce_rate_returning>80%</bounce_rate_returning>
 </result>
\ No newline at end of file
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..07e3a2a444 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.get_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.get_month.xml
@@ -8,7 +8,7 @@
 	<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>
 	<avg_time_on_site>11</avg_time_on_site>
+	<bounce_rate>93%</bounce_rate>
 </result>
\ No newline at end of file
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..e58092a648 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
@@ -8,7 +8,7 @@
 	<bounce_count>1</bounce_count>
 	<sum_visit_length>0</sum_visit_length>
 	<max_actions>1</max_actions>
-	<bounce_rate>100%</bounce_rate>
 	<nb_actions_per_visit>1</nb_actions_per_visit>
 	<avg_time_on_site>0</avg_time_on_site>
+	<bounce_rate>100%</bounce_rate>
 </result>
\ No newline at end of file
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..fae1924b03 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
@@ -8,7 +8,7 @@
 	<bounce_count>5</bounce_count>
 	<sum_visit_length>0</sum_visit_length>
 	<max_actions>1</max_actions>
-	<bounce_rate>100%</bounce_rate>
 	<nb_actions_per_visit>1</nb_actions_per_visit>
 	<avg_time_on_site>0</avg_time_on_site>
+	<bounce_rate>100%</bounce_rate>
 </result>
\ No newline at end of file
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..fae1924b03 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
@@ -8,7 +8,7 @@
 	<bounce_count>5</bounce_count>
 	<sum_visit_length>0</sum_visit_length>
 	<max_actions>1</max_actions>
-	<bounce_rate>100%</bounce_rate>
 	<nb_actions_per_visit>1</nb_actions_per_visit>
 	<avg_time_on_site>0</avg_time_on_site>
+	<bounce_rate>100%</bounce_rate>
 </result>
\ No newline at end of file
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..b638a7f68c 100644
--- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__VisitsSummary.get_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__VisitsSummary.get_day.xml
@@ -7,7 +7,7 @@
 	<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>
 	<avg_time_on_site>811</avg_time_on_site>
+	<bounce_rate>50%</bounce_rate>
 </result>
\ No newline at end of file
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 f0bfc6620564ba6b6dc79484984202b13cf49964..ac649abb58ed5cda69b1ceb4838debec27d6853c 100644
GIT binary patch
delta 87
zcmdldyh3=x3dYT^7>_Ye{=gzJc^{+J<PEGHlWo|#fLLJiEw(Bk%`rKFy$MQlO#a3W
Z6XTfN!eKG_07uqjHO?L`RR$d>1OS568`A&)

delta 100
zcmZ1>yia(;3dYF=tPYd?7<o2tV%)<#c>`<5<O{4UlM^^NCOfb-A+b3oUt+6*@&zWx
Yup`*d;B1e{OE~f-i*Z8Cn8(Qh0Qa>btN;K2

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..b876004aa6 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
@@ -8,7 +8,7 @@
 	<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>
 	<avg_time_on_site_returning>0</avg_time_on_site_returning>
+	<bounce_rate_returning>100%</bounce_rate_returning>
 </result>
\ No newline at end of file
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..df818717fa 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
@@ -8,7 +8,7 @@
 	<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>
 	<avg_time_on_site>811</avg_time_on_site>
+	<bounce_rate>50%</bounce_rate>
 </result>
\ No newline at end of file
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..e796a48661 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
@@ -8,7 +8,7 @@
 	<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>
 	<avg_time_on_site>136</avg_time_on_site>
+	<bounce_rate>100%</bounce_rate>
 </result>
\ No newline at end of file
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..f8181af56d 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
@@ -8,7 +8,7 @@
 	<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>
 	<avg_time_on_site>0</avg_time_on_site>
+	<bounce_rate>0%</bounce_rate>
 </result>
\ No newline at end of file
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..e58092a648 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
@@ -8,7 +8,7 @@
 	<bounce_count>1</bounce_count>
 	<sum_visit_length>0</sum_visit_length>
 	<max_actions>1</max_actions>
-	<bounce_rate>100%</bounce_rate>
 	<nb_actions_per_visit>1</nb_actions_per_visit>
 	<avg_time_on_site>0</avg_time_on_site>
+	<bounce_rate>100%</bounce_rate>
 </result>
\ No newline at end of file
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..8a211396aa 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
@@ -9,9 +9,9 @@
 		<bounce_count>1</bounce_count>
 		<sum_visit_length>0</sum_visit_length>
 		<max_actions>1</max_actions>
-		<bounce_rate>100%</bounce_rate>
 		<nb_actions_per_visit>1</nb_actions_per_visit>
 		<avg_time_on_site>0</avg_time_on_site>
+		<bounce_rate>100%</bounce_rate>
 	</result>
 	<result idSite="2" />
 </results>
\ No newline at end of file
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..72f3317640 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
@@ -9,9 +9,9 @@
 		<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>
 		<avg_time_on_site>758</avg_time_on_site>
+		<bounce_rate>10%</bounce_rate>
 	</result>
 	<result idSite="2">
 		<nb_uniq_visitors>1</nb_uniq_visitors>
@@ -22,8 +22,8 @@
 		<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>
 		<avg_time_on_site>2</avg_time_on_site>
+		<bounce_rate>0%</bounce_rate>
 	</result>
 </results>
\ No newline at end of file
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..8a211396aa 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
@@ -9,9 +9,9 @@
 		<bounce_count>1</bounce_count>
 		<sum_visit_length>0</sum_visit_length>
 		<max_actions>1</max_actions>
-		<bounce_rate>100%</bounce_rate>
 		<nb_actions_per_visit>1</nb_actions_per_visit>
 		<avg_time_on_site>0</avg_time_on_site>
+		<bounce_rate>100%</bounce_rate>
 	</result>
 	<result idSite="2" />
 </results>
\ No newline at end of file
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..02158803ff 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
@@ -7,9 +7,9 @@
 		<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>
 		<avg_time_on_site>758</avg_time_on_site>
+		<bounce_rate>10%</bounce_rate>
 	</result>
 	<result idSite="2">
 		<nb_visits>1</nb_visits>
@@ -18,8 +18,8 @@
 		<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>
 		<avg_time_on_site>2</avg_time_on_site>
+		<bounce_rate>0%</bounce_rate>
 	</result>
 </results>
\ No newline at end of file
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..02158803ff 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
@@ -7,9 +7,9 @@
 		<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>
 		<avg_time_on_site>758</avg_time_on_site>
+		<bounce_rate>10%</bounce_rate>
 	</result>
 	<result idSite="2">
 		<nb_visits>1</nb_visits>
@@ -18,8 +18,8 @@
 		<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>
 		<avg_time_on_site>2</avg_time_on_site>
+		<bounce_rate>0%</bounce_rate>
 	</result>
 </results>
\ No newline at end of file
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..02158803ff 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
@@ -7,9 +7,9 @@
 		<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>
 		<avg_time_on_site>758</avg_time_on_site>
+		<bounce_rate>10%</bounce_rate>
 	</result>
 	<result idSite="2">
 		<nb_visits>1</nb_visits>
@@ -18,8 +18,8 @@
 		<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>
 		<avg_time_on_site>2</avg_time_on_site>
+		<bounce_rate>0%</bounce_rate>
 	</result>
 </results>
\ No newline at end of file
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..8a211396aa 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
@@ -9,9 +9,9 @@
 		<bounce_count>1</bounce_count>
 		<sum_visit_length>0</sum_visit_length>
 		<max_actions>1</max_actions>
-		<bounce_rate>100%</bounce_rate>
 		<nb_actions_per_visit>1</nb_actions_per_visit>
 		<avg_time_on_site>0</avg_time_on_site>
+		<bounce_rate>100%</bounce_rate>
 	</result>
 	<result idSite="2" />
 </results>
\ No newline at end of file
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..72f3317640 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
@@ -9,9 +9,9 @@
 		<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>
 		<avg_time_on_site>758</avg_time_on_site>
+		<bounce_rate>10%</bounce_rate>
 	</result>
 	<result idSite="2">
 		<nb_uniq_visitors>1</nb_uniq_visitors>
@@ -22,8 +22,8 @@
 		<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>
 		<avg_time_on_site>2</avg_time_on_site>
+		<bounce_rate>0%</bounce_rate>
 	</result>
 </results>
\ No newline at end of file
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..8a211396aa 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
@@ -9,9 +9,9 @@
 		<bounce_count>1</bounce_count>
 		<sum_visit_length>0</sum_visit_length>
 		<max_actions>1</max_actions>
-		<bounce_rate>100%</bounce_rate>
 		<nb_actions_per_visit>1</nb_actions_per_visit>
 		<avg_time_on_site>0</avg_time_on_site>
+		<bounce_rate>100%</bounce_rate>
 	</result>
 	<result idSite="2" />
 </results>
\ No newline at end of file
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..02158803ff 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
@@ -7,9 +7,9 @@
 		<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>
 		<avg_time_on_site>758</avg_time_on_site>
+		<bounce_rate>10%</bounce_rate>
 	</result>
 	<result idSite="2">
 		<nb_visits>1</nb_visits>
@@ -18,8 +18,8 @@
 		<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>
 		<avg_time_on_site>2</avg_time_on_site>
+		<bounce_rate>0%</bounce_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..8a211396aa 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
@@ -9,9 +9,9 @@
 		<bounce_count>1</bounce_count>
 		<sum_visit_length>0</sum_visit_length>
 		<max_actions>1</max_actions>
-		<bounce_rate>100%</bounce_rate>
 		<nb_actions_per_visit>1</nb_actions_per_visit>
 		<avg_time_on_site>0</avg_time_on_site>
+		<bounce_rate>100%</bounce_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__VisitsSummary.get_month.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_NotLastNPeriods__VisitsSummary.get_month.xml
index 50c77f2755..72f3317640 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
@@ -9,9 +9,9 @@
 		<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>
 		<avg_time_on_site>758</avg_time_on_site>
+		<bounce_rate>10%</bounce_rate>
 	</result>
 	<result idSite="2">
 		<nb_uniq_visitors>1</nb_uniq_visitors>
@@ -22,8 +22,8 @@
 		<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>
 		<avg_time_on_site>2</avg_time_on_site>
+		<bounce_rate>0%</bounce_rate>
 	</result>
 </results>
\ No newline at end of file
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 5f75466362..e36f65bcae 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
@@ -4,12 +4,12 @@ Site 1,10,43,43,$ 0,0,100%,100%,100%,0%,0%,0,0,$ 0,0
 Site 2,1,3,3,$ 0,0,100%,100%,100%,0%,0%,0,0,$ 0,0
 
 Visits Summary
-nb_uniq_visitors,nb_users,nb_visits,nb_actions,max_actions,bounce_rate,nb_actions_per_visit,avg_time_on_site
-2,0,10,43,5,10%,4.3,00:12:37
+nb_uniq_visitors,nb_users,nb_visits,nb_actions,max_actions,nb_actions_per_visit,avg_time_on_site,bounce_rate
+2,0,10,43,5,4.3,00:12:37,0.1%
 
 Visits by Server Time
 label,nb_visits,nb_actions,nb_actions_per_visit,avg_time_on_site,bounce_rate,revenue
-0h,1,2,2,00:06:01,0%,$ 0
+0h,1,2,0,00:00:00,0%,$ 0
 1h,0,0,0,00:00:00,0%,$ 0
 2h,0,0,0,00:00:00,0%,$ 0
 3h,0,0,0,00:00:00,0%,$ 0
@@ -20,8 +20,8 @@ label,nb_visits,nb_actions,nb_actions_per_visit,avg_time_on_site,bounce_rate,rev
 8h,0,0,0,00:00:00,0%,$ 0
 9h,0,0,0,00:00:00,0%,$ 0
 10h,0,0,0,00:00:00,0%,$ 0
-11h,8,40,5,00:15:01,0%,$ 0
-12h,1,1,1,00:00:00,100%,$ 0
+11h,8,40,0,00:00:00,0%,$ 0
+12h,1,1,0,00:00:00,0%,$ 0
 13h,0,0,0,00:00:00,0%,$ 0
 14h,0,0,0,00:00:00,0%,$ 0
 15h,0,0,0,00:00:00,0%,$ 0
@@ -35,41 +35,41 @@ label,nb_visits,nb_actions,nb_actions_per_visit,avg_time_on_site,bounce_rate,rev
 23h,0,0,0,00:00:00,0%,$ 0
 
 Visits by Local Time
-label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate
-0h,0,0,0%,0,00:00:00,0%
-1h,0,0,0%,0,00:00:00,0%
-2h,0,0,0%,0,00:00:00,0%
-3h,0,0,0%,0,00:00:00,0%
-4h,0,0,0%,0,00:00:00,0%
-5h,0,0,0%,0,00:00:00,0%
-6h,0,0,0%,0,00:00:00,0%
-7h,0,0,0%,0,00:00:00,0%
-8h,0,0,0%,0,00:00:00,0%
-9h,0,0,0%,0,00:00:00,0%
-10h,0,0,0%,0,00:00:00,0%
-11h,0,0,0%,0,00:00:00,0%
-12h,10,43,0%,4.3,00:12:37,10%
-13h,0,0,0%,0,00:00:00,0%
-14h,0,0,0%,0,00:00:00,0%
-15h,0,0,0%,0,00:00:00,0%
-16h,0,0,0%,0,00:00:00,0%
-17h,0,0,0%,0,00:00:00,0%
-18h,0,0,0%,0,00:00:00,0%
-19h,0,0,0%,0,00:00:00,0%
-20h,0,0,0%,0,00:00:00,0%
-21h,0,0,0%,0,00:00:00,0%
-22h,0,0,0%,0,00:00:00,0%
-23h,0,0,0%,0,00:00:00,0%
+label,nb_visits,nb_actions,nb_actions_per_visit,avg_time_on_site,bounce_rate,conversion_rate
+0h,0,0,0,00:00:00,0%,0%
+1h,0,0,0,00:00:00,0%,0%
+2h,0,0,0,00:00:00,0%,0%
+3h,0,0,0,00:00:00,0%,0%
+4h,0,0,0,00:00:00,0%,0%
+5h,0,0,0,00:00:00,0%,0%
+6h,0,0,0,00:00:00,0%,0%
+7h,0,0,0,00:00:00,0%,0%
+8h,0,0,0,00:00:00,0%,0%
+9h,0,0,0,00:00:00,0%,0%
+10h,0,0,0,00:00:00,0%,0%
+11h,0,0,0,00:00:00,0%,0%
+12h,10,43,0,00:00:00,0%,0%
+13h,0,0,0,00:00:00,0%,0%
+14h,0,0,0,00:00:00,0%,0%
+15h,0,0,0,00:00:00,0%,0%
+16h,0,0,0,00:00:00,0%,0%
+17h,0,0,0,00:00:00,0%,0%
+18h,0,0,0,00:00:00,0%,0%
+19h,0,0,0,00:00:00,0%,0%
+20h,0,0,0,00:00:00,0%,0%
+21h,0,0,0,00:00:00,0%,0%
+22h,0,0,0,00:00:00,0%,0%
+23h,0,0,0,00:00:00,0%,0%
 
 Visits by Day of Week
-label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate
-Monday,2,7,0%,3.5,00:10:31,0%
-Tuesday,2,10,0%,5,00:15:01,0%
-Wednesday,1,5,0%,5,00:15:01,0%
-Thursday,1,5,0%,5,00:15:01,0%
-Friday,1,5,0%,5,00:15:01,0%
-Saturday,1,5,0%,5,00:15:01,0%
-Sunday,2,6,0%,3,00:07:31,50%
+label,nb_visits,nb_actions,nb_actions_per_visit,avg_time_on_site,bounce_rate,conversion_rate
+Monday,2,7,0,00:00:00,0%,0%
+Tuesday,2,10,0,00:00:00,0%,0%
+Wednesday,1,5,0,00:00:00,0%,0%
+Thursday,1,5,0,00:00:00,0%,0%
+Friday,1,5,0,00:00:00,0%,0%
+Saturday,1,5,0,00:00:00,0%,0%
+Sunday,2,6,0,00:00:00,0%,0%
 
 Screen Resolution
 label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate
@@ -123,10 +123,10 @@ Unknown,8,40,0%,5,00:15:01,0%
 Windows,2,3,0%,1.5,00:03:01,50%
 
 Mobile vs Desktop
-label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate
-Unknown,8,40,0%,5,00:15:01,0%
-Desktop,2,3,0%,1.5,00:03:01,50%
-Mobile,0,0,0%,0,00:00:00,0%
+label,nb_visits,nb_actions,nb_actions_per_visit,avg_time_on_site,bounce_rate,conversion_rate
+Unknown,8,40,0,00:00:00,0%,0%
+Desktop,2,3,0,00:00:00,0%,0%
+Mobile,0,0,0,00:00:00,0%,0%
 
 Browser language
 label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate
@@ -214,9 +214,9 @@ No data available
 
 Referrer Type
 label,nb_visits,nb_actions,nb_actions_per_visit,avg_time_on_site,bounce_rate,revenue
-Websites,5,22,4.4,00:13:13,0%,$ 0
-Campaigns,4,20,5,00:15:01,0%,$ 0
-Direct Entry,1,1,1,00:00:00,100%,$ 0
+Websites,5,22,0,00:00:00,0%,$ 0
+Campaigns,4,20,0,00:00:00,0%,$ 0
+Direct Entry,1,1,0,00:00:00,0%,$ 0
 
 All Referrers
 label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate
@@ -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,nb_visits_converted_returning,sum_visit_length_returning,max_actions_returning,nb_actions_per_visit_returning,avg_time_on_site_returning,bounce_rate_returning
+1,0,8,40,0,7208,5,5,00:15:01,0%
 
 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_UserId_VisitorId__VisitsSummary.get_day.xml b/tests/PHPUnit/System/expected/test_UserId_VisitorId__VisitsSummary.get_day.xml
index ca85e8dede..a38438cdf5 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
@@ -8,7 +8,7 @@
 	<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>
 	<avg_time_on_site>331</avg_time_on_site>
+	<bounce_rate>50%</bounce_rate>
 </result>
\ No newline at end of file
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..6e60147856 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
@@ -8,7 +8,7 @@
 	<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>
 	<avg_time_on_site>248</avg_time_on_site>
+	<bounce_rate>63%</bounce_rate>
 </result>
\ No newline at end of file
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..a38438cdf5 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
@@ -8,7 +8,7 @@
 	<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>
 	<avg_time_on_site>331</avg_time_on_site>
+	<bounce_rate>50%</bounce_rate>
 </result>
\ No newline at end of file
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..e282c141e9 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
@@ -6,7 +6,7 @@
 	<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>
 	<avg_time_on_site>248</avg_time_on_site>
+	<bounce_rate>63%</bounce_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..9ce463bc58 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
@@ -8,7 +8,7 @@
 	<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>
 	<avg_time_on_site>541</avg_time_on_site>
+	<bounce_rate>50%</bounce_rate>
 </result>
\ No newline at end of file
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..aade7b46a8 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
@@ -11,9 +11,9 @@
 		<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>
 		<avg_time_on_site>1</avg_time_on_site>
+		<bounce_rate>0%</bounce_rate>
 	</result>
 	<result date="2010-04" />
 	<result date="2010-05" />
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..b8f8397cce 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
@@ -12,9 +12,9 @@
 		<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>
 		<avg_time_on_site>1</avg_time_on_site>
+		<bounce_rate>0%</bounce_rate>
 	</result>
 	<result date="2010-02" />
 	<result date="2010-03" />
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 0a2549a18e..61d4d807f8 100644
--- a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportMetadata_day.xml
+++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportMetadata_day.xml
@@ -1,5 +1,65 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <result>
+	<row>
+		<name>All Metrics</name>
+		<module>API</module>
+		<action>get</action>
+		<metrics>
+			<nb_pageviews>Pageviews</nb_pageviews>
+			<nb_uniq_pageviews>Unique Pageviews</nb_uniq_pageviews>
+			<nb_downloads>Downloads</nb_downloads>
+			<nb_uniq_downloads>Unique Downloads</nb_uniq_downloads>
+			<nb_outlinks>Outlinks</nb_outlinks>
+			<nb_uniq_outlinks>Unique Outlinks</nb_uniq_outlinks>
+			<nb_searches>Searches</nb_searches>
+			<nb_keywords>Unique Keywords</nb_keywords>
+			<avg_time_generation>Avg. generation time</avg_time_generation>
+			<nb_conversions>Conversions</nb_conversions>
+			<nb_visits_converted>Visits with Conversions</nb_visits_converted>
+			<conversion_rate>Conversion Rate</conversion_rate>
+			<revenue>Revenue</revenue>
+			<nb_visits_returning>Returning Visits</nb_visits_returning>
+			<nb_actions_returning>Actions by Returning Visits</nb_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>
+			<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>
+			<nb_users>Users</nb_users>
+			<nb_actions>Actions</nb_actions>
+			<nb_actions_per_visit>Actions per Visit</nb_actions_per_visit>
+			<avg_time_on_site>Avg. Visit Duration (in seconds)</avg_time_on_site>
+			<max_actions>Maximum actions in one visit</max_actions>
+		</metrics>
+		<metricsDocumentation>
+			<nb_pageviews>The number of times this page was visited.</nb_pageviews>
+			<nb_uniq_pageviews>The number of visits that included this page. If a page was viewed multiple times during one visit, it is only counted once.</nb_uniq_pageviews>
+			<nb_downloads>The number of times this link was clicked.</nb_downloads>
+			<nb_uniq_downloads>The number of visits that involved a click on this link. If a link was clicked multiple times during one visit, it is only counted once.</nb_uniq_downloads>
+			<nb_outlinks>The number of times this link was clicked.</nb_outlinks>
+			<nb_uniq_outlinks>The number of visits that involved a click on this link. If a link was clicked multiple times during one visit, it is only counted once.</nb_uniq_outlinks>
+			<nb_searches>The number of visits that searched for this keyword on your website's search engine.</nb_searches>
+			<avg_time_generation>The average time it took to generate the page. This metric includes the time it took the server to generate the web page, plus the time it took for the visitor to download the response from the server. A lower 'Avg. generation time' means a faster website for your visitors!</avg_time_generation>
+			<conversion_rate>The percentage of visits that triggered a goal conversion.</conversion_rate>
+			<nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day.</nb_uniq_visitors>
+			<nb_visits>If a visitor comes to your website for the first time or if he visits a page more than 30 minutes after his last page view, this will be recorded as a new visit.</nb_visits>
+			<nb_users>The number of users logged in your website. It is the number of unique active users that have a User ID set (via the Tracking code function 'setUserId').</nb_users>
+			<nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions>
+			<nb_actions_per_visit>The average number of actions (page views, site searches, downloads or outlinks) that were performed during the visits.</nb_actions_per_visit>
+			<avg_time_on_site>The average duration of a visit.</avg_time_on_site>
+		</metricsDocumentation>
+		<processedMetrics>
+			<bounce_rate_returning>Bounce Rate for Returning Visits</bounce_rate_returning>
+			<bounce_rate>Bounce Rate</bounce_rate>
+		</processedMetrics>
+		<imageGraphUrl>index.php?module=API&amp;method=ImageGraph.get&amp;idSite=1&amp;apiModule=API&amp;apiAction=get&amp;period=day&amp;date=2008-12-06,2009-01-04</imageGraphUrl>
+		<imageGraphEvolutionUrl>index.php?module=API&amp;method=ImageGraph.get&amp;idSite=1&amp;apiModule=API&amp;apiAction=get&amp;period=day&amp;date=2008-12-06,2009-01-04</imageGraphEvolutionUrl>
+		<uniqueId>API_get</uniqueId>
+	</row>
 	<row>
 		<category>All Websites</category>
 		<name>All Websites dashboard</name>
@@ -73,7 +133,6 @@
 			<nb_users>Users</nb_users>
 			<nb_actions>Actions</nb_actions>
 			<nb_actions_per_visit>Actions per Visit</nb_actions_per_visit>
-			<bounce_rate>Bounce Rate</bounce_rate>
 			<avg_time_on_site>Avg. Visit Duration (in seconds)</avg_time_on_site>
 			<max_actions>Maximum actions in one visit</max_actions>
 		</metrics>
@@ -83,9 +142,11 @@
 			<nb_users>The number of users logged in your website. It is the number of unique active users that have a User ID set (via the Tracking code function 'setUserId').</nb_users>
 			<nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions>
 			<nb_actions_per_visit>The average number of actions (page views, site searches, downloads or outlinks) that were performed during the visits.</nb_actions_per_visit>
-			<bounce_rate>The percentage of visits that only had a single pageview. This means, that the visitor left the website directly from the entrance page.</bounce_rate>
 			<avg_time_on_site>The average duration of a visit.</avg_time_on_site>
 		</metricsDocumentation>
+		<processedMetrics>
+			<bounce_rate>Bounce Rate</bounce_rate>
+		</processedMetrics>
 		<imageGraphUrl>index.php?module=API&amp;method=ImageGraph.get&amp;idSite=1&amp;apiModule=VisitsSummary&amp;apiAction=get&amp;period=day&amp;date=2008-12-06,2009-01-04</imageGraphUrl>
 		<imageGraphEvolutionUrl>index.php?module=API&amp;method=ImageGraph.get&amp;idSite=1&amp;apiModule=VisitsSummary&amp;apiAction=get&amp;period=day&amp;date=2008-12-06,2009-01-04</imageGraphEvolutionUrl>
 		<uniqueId>VisitsSummary_get</uniqueId>
@@ -1783,7 +1844,6 @@
 			<nb_visits_returning>Returning Visits</nb_visits_returning>
 			<nb_actions_returning>Actions by Returning Visits</nb_actions_returning>
 			<avg_time_on_site_returning>Avg. Duration of a Returning Visit (in sec)</avg_time_on_site_returning>
-			<bounce_rate_returning>Bounce Rate for Returning Visits</bounce_rate_returning>
 			<nb_actions_per_visit_returning>Avg. Actions per Returning Visit</nb_actions_per_visit_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>
@@ -1791,6 +1851,9 @@
 			<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>
+			<bounce_rate_returning>Bounce Rate for Returning Visits</bounce_rate_returning>
+		</processedMetrics>
 		<imageGraphUrl>index.php?module=API&amp;method=ImageGraph.get&amp;idSite=1&amp;apiModule=VisitFrequency&amp;apiAction=get&amp;period=day&amp;date=2008-12-06,2009-01-04</imageGraphUrl>
 		<imageGraphEvolutionUrl>index.php?module=API&amp;method=ImageGraph.get&amp;idSite=1&amp;apiModule=VisitFrequency&amp;apiAction=get&amp;period=day&amp;date=2008-12-06,2009-01-04</imageGraphEvolutionUrl>
 		<uniqueId>VisitFrequency_get</uniqueId>
@@ -2055,24 +2118,6 @@
 		<module>API</module>
 		<action>get</action>
 		<metrics>
-			<nb_uniq_visitors>Unique visitors</nb_uniq_visitors>
-			<nb_visits>Visits</nb_visits>
-			<nb_users>Users</nb_users>
-			<nb_actions>Actions</nb_actions>
-			<nb_actions_per_visit>Actions per Visit</nb_actions_per_visit>
-			<bounce_rate>Bounce Rate</bounce_rate>
-			<avg_time_on_site>Avg. Visit Duration (in seconds)</avg_time_on_site>
-			<max_actions>Maximum actions in one visit</max_actions>
-			<nb_conversions>Conversions</nb_conversions>
-			<nb_visits_converted>Visits with Conversions</nb_visits_converted>
-			<conversion_rate>Conversion Rate</conversion_rate>
-			<revenue>Revenue</revenue>
-			<revenue_subtotal>Subtotal</revenue_subtotal>
-			<revenue_tax>Tax</revenue_tax>
-			<revenue_shipping>Shipping</revenue_shipping>
-			<revenue_discount>Discount</revenue_discount>
-			<items>Products left in cart</items>
-			<avg_order_revenue>Average Order Value</avg_order_revenue>
 			<nb_pageviews>Pageviews</nb_pageviews>
 			<nb_uniq_pageviews>Unique Pageviews</nb_uniq_pageviews>
 			<nb_downloads>Downloads</nb_downloads>
@@ -2082,26 +2127,38 @@
 			<nb_searches>Searches</nb_searches>
 			<nb_keywords>Unique Keywords</nb_keywords>
 			<avg_time_generation>Avg. generation time</avg_time_generation>
+			<nb_conversions>Conversions</nb_conversions>
+			<nb_visits_converted>Visits with Conversions</nb_visits_converted>
+			<conversion_rate>Conversion Rate</conversion_rate>
+			<revenue>Revenue</revenue>
 			<nb_visits_returning>Returning Visits</nb_visits_returning>
 			<nb_actions_returning>Actions by Returning Visits</nb_actions_returning>
 			<avg_time_on_site_returning>Avg. Duration of a Returning Visit (in sec)</avg_time_on_site_returning>
-			<bounce_rate_returning>Bounce Rate for Returning Visits</bounce_rate_returning>
 			<nb_actions_per_visit_returning>Avg. Actions per Returning Visit</nb_actions_per_visit_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>
+			<nb_users>Users</nb_users>
+			<nb_actions>Actions</nb_actions>
+			<nb_actions_per_visit>Actions per Visit</nb_actions_per_visit>
+			<avg_time_on_site>Avg. Visit Duration (in seconds)</avg_time_on_site>
+			<max_actions>Maximum actions in one visit</max_actions>
+			<revenue_subtotal>Subtotal</revenue_subtotal>
+			<revenue_tax>Tax</revenue_tax>
+			<revenue_shipping>Shipping</revenue_shipping>
+			<revenue_discount>Discount</revenue_discount>
+			<items>Products left in cart</items>
+			<avg_order_revenue>Average Order Value</avg_order_revenue>
 		</metrics>
+		<processedMetrics>
+			<bounce_rate_returning>Bounce Rate for Returning Visits</bounce_rate_returning>
+			<bounce_rate>Bounce Rate</bounce_rate>
+		</processedMetrics>
 		<metricsDocumentation>
-			<nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day.</nb_uniq_visitors>
-			<nb_visits>If a visitor comes to your website for the first time or if he visits a page more than 30 minutes after his last page view, this will be recorded as a new visit.</nb_visits>
-			<nb_users>The number of users logged in your website. It is the number of unique active users that have a User ID set (via the Tracking code function 'setUserId').</nb_users>
-			<nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions>
-			<nb_actions_per_visit>The average number of actions (page views, site searches, downloads or outlinks) that were performed during the visits.</nb_actions_per_visit>
-			<bounce_rate>The percentage of visits that only had a single pageview. This means, that the visitor left the website directly from the entrance page.</bounce_rate>
-			<avg_time_on_site>The average duration of a visit.</avg_time_on_site>
-			<conversion_rate>The percentage of visits that triggered a goal conversion.</conversion_rate>
 			<nb_pageviews>The number of times this page was visited.</nb_pageviews>
 			<nb_uniq_pageviews>The number of visits that included this page. If a page was viewed multiple times during one visit, it is only counted once.</nb_uniq_pageviews>
 			<nb_downloads>The number of times this link was clicked.</nb_downloads>
@@ -2110,6 +2167,13 @@
 			<nb_uniq_outlinks>The number of visits that involved a click on this link. If a link was clicked multiple times during one visit, it is only counted once.</nb_uniq_outlinks>
 			<nb_searches>The number of visits that searched for this keyword on your website's search engine.</nb_searches>
 			<avg_time_generation>The average time it took to generate the page. This metric includes the time it took the server to generate the web page, plus the time it took for the visitor to download the response from the server. A lower 'Avg. generation time' means a faster website for your visitors!</avg_time_generation>
+			<conversion_rate>The percentage of visits that triggered a goal conversion.</conversion_rate>
+			<nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day.</nb_uniq_visitors>
+			<nb_visits>If a visitor comes to your website for the first time or if he visits a page more than 30 minutes after his last page view, this will be recorded as a new visit.</nb_visits>
+			<nb_users>The number of users logged in your website. It is the number of unique active users that have a User ID set (via the Tracking code function 'setUserId').</nb_users>
+			<nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions>
+			<nb_actions_per_visit>The average number of actions (page views, site searches, downloads or outlinks) that were performed during the visits.</nb_actions_per_visit>
+			<avg_time_on_site>The average duration of a visit.</avg_time_on_site>
 		</metricsDocumentation>
 		<uniqueId>API_get</uniqueId>
 	</row>
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 fe0924b8d9..a69bb4a656 100644
--- a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.get_day.xml
+++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.get_day.xml
@@ -1,25 +1,27 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <result>
 	<nb_uniq_visitors>1</nb_uniq_visitors>
-	<nb_visits>1</nb_visits>
 	<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>1086</sum_visit_length>
 	<max_actions>1</max_actions>
-	<bounce_rate>100%</bounce_rate>
 	<nb_actions_per_visit>1</nb_actions_per_visit>
 	<avg_time_on_site>1086</avg_time_on_site>
-	<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_returning>0</nb_visits_returning>
+	<nb_actions_returning>0</nb_actions_returning>
 	<nb_visits_converted_returning>0</nb_visits_converted_returning>
+	<bounce_count_returning>0</bounce_count_returning>
+	<sum_visit_length_returning>0</sum_visit_length_returning>
 	<max_actions_returning>0</max_actions_returning>
-	<bounce_rate_returning>0%</bounce_rate_returning>
 	<nb_actions_per_visit_returning>0</nb_actions_per_visit_returning>
 	<avg_time_on_site_returning>0</avg_time_on_site_returning>
+	<bounce_rate_returning>0%</bounce_rate_returning>
 	<nb_conversions>1</nb_conversions>
-	<nb_visits_converted>1</nb_visits_converted>
 	<conversion_rate>100</conversion_rate>
 	<revenue>42.26</revenue>
 	<nb_pageviews>1</nb_pageviews>
@@ -31,4 +33,5 @@
 	<nb_searches>0</nb_searches>
 	<nb_keywords>0</nb_keywords>
 	<avg_time_generation>0</avg_time_generation>
+	<bounce_rate>100%</bounce_rate>
 </result>
\ No newline at end of file
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..5adb44d2cbc8fb9f8547a9278cb291bf90ffef76 100644
GIT binary patch
delta 59
zcmeyx^owc2orwu-6Mwk~>o6oS<TI2q<S`^Oq%y=a6fq=Dwq(>6Gi1<XFlW$VFk&zP
MVjTuEAWxM601$Z%J^%m!

delta 58
zcmeyx^owc29nmC)e1=knJceY3REBtlB8EhU5{A@?H+?7DF{+7~F_<%`GUzZEGUx$W
LIt)e(CO`}T;Oh+D

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..6dc5de50efccf8953c9ab61ec1ffeb8b317f597f 100644
GIT binary patch
delta 62
zcmcb_e2IC36yszg#uRZK1}BDmhEj$+hGd3R1_g#7hD3%EhSbSZ8P&xM8T1&;8FUzo
P7)*dzhrtZUQ)K`Ewn__W

delta 42
vcmcb_e2IC36yxLuMzP5fjA@gnF{+7~F_<%`GUzZEGUx$WIt)e(CO`}T=cWiS

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..ff048e655dc56ca9be97edea3e2345c31ca5996d 100644
GIT binary patch
delta 46
xcmX@Za)xDt3*+Pj#=6N)j53q&F@{JPGUzdwGw3iFF_-|c4uctxrwXJE7yu&U2~Ge2

delta 46
zcmX@Za)xDt3*+P?j8c=G7#k+vV+@fpV=!k>Wzb<TWY7b$bQp{nOn_L2!GHk(FWU*S

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..937fbcb558 100644
--- a/tests/PHPUnit/System/expected/test_noVisit__VisitFrequency.get_day.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit__VisitFrequency.get_day.xml
@@ -8,7 +8,7 @@
 	<bounce_count_returning>0</bounce_count_returning>
 	<sum_visit_length_returning>0</sum_visit_length_returning>
 	<max_actions_returning>0</max_actions_returning>
-	<bounce_rate_returning>0%</bounce_rate_returning>
 	<nb_actions_per_visit_returning>0</nb_actions_per_visit_returning>
 	<avg_time_on_site_returning>0</avg_time_on_site_returning>
+	<bounce_rate_returning>0%</bounce_rate_returning>
 </result>
\ No newline at end of file
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..f8181af56d 100644
--- a/tests/PHPUnit/System/expected/test_noVisit__VisitsSummary.get_day.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit__VisitsSummary.get_day.xml
@@ -8,7 +8,7 @@
 	<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>
 	<avg_time_on_site>0</avg_time_on_site>
+	<bounce_rate>0%</bounce_rate>
 </result>
\ No newline at end of file
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..26fb301d3b 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
@@ -6,7 +6,7 @@
 	<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>
 	<avg_time_on_site_returning>181</avg_time_on_site_returning>
+	<bounce_rate_returning>50%</bounce_rate_returning>
 </result>
\ No newline at end of file
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..ee6e9c48c8 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
@@ -6,7 +6,7 @@
 	<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>
 	<avg_time_on_site>181</avg_time_on_site>
+	<bounce_rate>50%</bounce_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..3276834e80 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
@@ -6,7 +6,7 @@
 	<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>
 	<avg_time_on_site>242</avg_time_on_site>
+	<bounce_rate>67%</bounce_rate>
 </result>
\ No newline at end of file
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..4c75ff4e34 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
@@ -8,7 +8,7 @@
 	<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>
 	<avg_time_on_site>182</avg_time_on_site>
+	<bounce_rate>0%</bounce_rate>
 </result>
\ No newline at end of file
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..d49a524fb4 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
@@ -8,7 +8,7 @@
 	<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>
 	<avg_time_on_site>364</avg_time_on_site>
+	<bounce_rate>0%</bounce_rate>
 </result>
\ No newline at end of file
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..d49a524fb4 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
@@ -8,7 +8,7 @@
 	<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>
 	<avg_time_on_site>364</avg_time_on_site>
+	<bounce_rate>0%</bounce_rate>
 </result>
\ No newline at end of file
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..0dd3a1e7d8 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
@@ -8,7 +8,7 @@
 	<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>
 	<avg_time_on_site>363</avg_time_on_site>
+	<bounce_rate>50%</bounce_rate>
 </result>
\ No newline at end of file
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..d49a524fb4 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
@@ -8,7 +8,7 @@
 	<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>
 	<avg_time_on_site>364</avg_time_on_site>
+	<bounce_rate>0%</bounce_rate>
 </result>
\ No newline at end of file
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..0dd3a1e7d8 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
@@ -8,7 +8,7 @@
 	<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>
 	<avg_time_on_site>363</avg_time_on_site>
+	<bounce_rate>50%</bounce_rate>
 </result>
\ No newline at end of file
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..c07bc42ab2 100644
--- a/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables__VisitsSummary.get_day.xml
+++ b/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables__VisitsSummary.get_day.xml
@@ -10,9 +10,9 @@
 			<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>
 			<avg_time_on_site>241</avg_time_on_site>
+			<bounce_rate>67%</bounce_rate>
 		</result>
 		<result date="2010-01-04" />
 		<result date="2010-01-05" />
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..326e9a2685 100644
--- a/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables__VisitsSummary.get_week.xml
+++ b/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables__VisitsSummary.get_week.xml
@@ -10,9 +10,9 @@
 			<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>
 			<avg_time_on_site>241</avg_time_on_site>
+			<bounce_rate>67%</bounce_rate>
 		</result>
 		<result date="From 2010-01-04 to 2010-01-10" />
 		<result date="From 2010-01-11 to 2010-01-17" />
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..d6c3ce4082 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
@@ -10,9 +10,9 @@
 			<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>
 			<avg_time_on_site>242</avg_time_on_site>
+			<bounce_rate>67%</bounce_rate>
 		</result>
 		<result date="2010-01-04" />
 		<result date="2010-01-05" />
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..1bf3799ef6 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
@@ -10,9 +10,9 @@
 			<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>
 			<avg_time_on_site>242</avg_time_on_site>
+			<bounce_rate>67%</bounce_rate>
 		</result>
 		<result date="From 2010-01-04 to 2010-01-10" />
 		<result date="From 2010-01-11 to 2010-01-17" />
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..bcca65deb4 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
@@ -10,9 +10,9 @@
 			<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>
 			<avg_time_on_site>364</avg_time_on_site>
+			<bounce_rate>0%</bounce_rate>
 		</result>
 		<result date="2010-01-04" />
 		<result date="2010-01-05" />
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..e529d2b356 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
@@ -10,9 +10,9 @@
 			<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>
 			<avg_time_on_site>364</avg_time_on_site>
+			<bounce_rate>0%</bounce_rate>
 		</result>
 		<result date="From 2010-01-04 to 2010-01-10" />
 		<result date="From 2010-01-11 to 2010-01-17" />
-- 
GitLab