From b25624d7c84af13d02cdc5d1137f6016e8062cf7 Mon Sep 17 00:00:00 2001
From: mattab <matthieu.aubry@gmail.com>
Date: Tue, 23 Sep 2014 21:18:56 +1200
Subject: [PATCH] User ID is NULLable now results in expected tests results:
 nb_users = 0 when no user id was set. refs #3490 #6162

---
 ...CustomVariables.getCustomVariables_day.xml |  16 ++++
 ...ionTest__Live.getLastVisitsDetails_day.xml |   2 +-
 ...nTest_noOptions__VisitsSummary.get_day.xml |   2 +-
 ...est_noOptions__VisitsSummary.get_month.xml |   4 +-
 ...ouldNotAppear__VisitsSummary.get_month.xml |   2 +-
 ...NotInvalidated__VisitsSummary.get_week.xml |   2 +-
 ...ouldNotAppear__VisitsSummary.get_month.xml |   2 +-
 ...ltipleOldNew__VisitFrequency.get_month.xml |   2 +-
 ...mEvents__Live.getLastVisitsDetails_day.xml |  20 ++---
 ...vents__Live.getLastVisitsDetails_month.xml |  20 ++---
 ...CustomVariables.getCustomVariables_day.xml |  10 +--
 ...ttenReports__Referrers.getWebsites_day.xml |  12 +--
 ...stomVariables.getCustomVariables_month.xml |  22 ++---
 ...tLogs__DevicesDetection.getBrand_month.xml |   4 +-
 ...icesDetection.getBrowserFamilies_month.xml |  10 +--
 ...icesDetection.getBrowserVersions_month.xml |  20 ++---
 ...tLogs__DevicesDetection.getModel_month.xml |   4 +-
 ...__DevicesDetection.getOsFamilies_month.xml |  12 +--
 ...__DevicesDetection.getOsVersions_month.xml |  16 ++--
 ...rtLogs__DevicesDetection.getType_month.xml |   6 +-
 ...tLogs__Live.getLastVisitsDetails_range.xml |  80 +++++++++---------
 ...ImportLogs__Provider.getProvider_month.xml |   2 +-
 ...est_ImportLogs__Referrers.getAll_month.xml |   4 +-
 ...tLogs__Referrers.getReferrerType_month.xml |   8 +-
 ...mportLogs__Referrers.getWebsites_month.xml |   8 +-
 ..._ImportLogs__UserCountry.getCity_month.xml |   4 +-
 ...rtLogs__UserCountry.getContinent_month.xml |  10 +--
 ...portLogs__UserCountry.getCountry_month.xml |  10 +--
 ...mportLogs__UserCountry.getRegion_month.xml |   4 +-
 ...ogs__UserSettings.getBrowserType_month.xml |   8 +-
 ...__UserSettings.getBrowserVersion_month.xml |  20 ++---
 ...ortLogs__UserSettings.getBrowser_month.xml |  14 +--
 ...s__UserSettings.getConfiguration_month.xml |  24 +++---
 ...rtLogs__UserSettings.getLanguage_month.xml |   2 +-
 ..._UserSettings.getMobileVsDesktop_month.xml |   6 +-
 ...rtLogs__UserSettings.getOSFamily_month.xml |  10 +--
 ...t_ImportLogs__UserSettings.getOS_month.xml |  14 +--
 ...Logs__UserSettings.getResolution_month.xml |   6 +-
 ...Logs__UserSettings.getWideScreen_month.xml |   6 +-
 ...t_ImportLogs__VisitFrequency.get_month.xml |   2 +-
 ...rtLogs__VisitTime.getByDayOfWeek_month.xml |   8 +-
 ....getVisitInformationPerLocalTime_month.xml |  20 ++---
 ...getVisitInformationPerServerTime_month.xml |  22 ++---
 ...portLogs__VisitsSummary.getUsers_month.xml |   2 +-
 ...st_ImportLogs__VisitsSummary.get_month.xml |   2 +-
 ...singLogReplay__VisitsSummary.get_month.xml |   2 +-
 ...s_html__Referrers.getSearchEngines_day.xml |   2 +-
 ...itAsc__Live.getLastVisitsDetails_month.xml |  14 +--
 ...Visit__Live.getLastVisitsDetails_month.xml |  12 +--
 ...Count__Live.getLastVisitsDetails_month.xml |  12 +--
 ...tDesc__Live.getLastVisitsDetails_month.xml |  12 +--
 ...eTest__Live.getLastVisitsDetails_month.xml |  18 ++--
 ...WebsiteTest__UserCountry.getCity_month.xml |  22 ++---
 ...teTest__UserCountry.getContinent_month.xml |   8 +-
 ...siteTest__UserCountry.getCountry_month.xml |  18 ++--
 ...bsiteTest__UserCountry.getRegion_month.xml |  18 ++--
 ...egment_city__UserCountry.getCity_month.xml |   2 +-
 ...t_city__UserCountry.getContinent_month.xml |   2 +-
 ...ent_city__UserCountry.getCountry_month.xml |   2 +-
 ...ment_city__UserCountry.getRegion_month.xml |   2 +-
 ...ontinent__UserCountry.getCountry_month.xml |  10 +--
 ...nt_lat_long__UserCountry.getCity_month.xml |   2 +-
 ...t_long__UserCountry.getContinent_month.xml |   2 +-
 ...lat_long__UserCountry.getCountry_month.xml |   2 +-
 ..._lat_long__UserCountry.getRegion_month.xml |   2 +-
 ...ment_region__UserCountry.getCity_month.xml |   4 +-
 ...region__UserCountry.getContinent_month.xml |   2 +-
 ...t_region__UserCountry.getCountry_month.xml |   2 +-
 ...nt_region__UserCountry.getRegion_month.xml |   2 +-
 ...pEmptyRows__API.getProcessedReport_day.xml |   4 +-
 ...Test_sitesGroup__VisitsSummary.get_day.xml |   2 +-
 ...st_sitesGroup__VisitsSummary.get_month.xml |   2 +-
 ..._NonUnicode__Referrers.getWebsites_day.xml |   6 +-
 ...oVisits_bulk_json__API.getBulkRequest.json |   2 +-
 ...TwoVisits_bulk_xml__API.getBulkRequest.xml |   4 +-
 ...OneVisitorTwoVisits_csv__API.get_month.csv | Bin 1896 -> 1896 bytes
 ...hideAllColumns___VisitsSummary.get_day.xml |   2 +-
 ...ts_hideColumns___VisitsSummary.get_day.xml |   2 +-
 ...Support__Live.getLastVisitsDetails_day.xml |   4 +-
 ...ookieSupport__Provider.getProvider_day.xml |   2 +-
 ...ithCookieSupport__Referrers.getAll_day.xml |   4 +-
 ...okieSupport__Referrers.getKeywords_day.xml |   4 +-
 ...Support__Referrers.getReferrerType_day.xml |   8 +-
 ...upport__Referrers.getSearchEngines_day.xml |   4 +-
 ...okieSupport__Referrers.getWebsites_day.xml |   4 +-
 ...CookieSupport__UserCountry.getCity_day.xml |   2 +-
 ...eSupport__UserCountry.getContinent_day.xml |   2 +-
 ...kieSupport__UserCountry.getCountry_day.xml |   2 +-
 ...okieSupport__UserCountry.getRegion_day.xml |   2 +-
 ...pport__UserSettings.getBrowserType_day.xml |   2 +-
 ...rt__UserSettings.getBrowserVersion_day.xml |   2 +-
 ...ieSupport__UserSettings.getBrowser_day.xml |   2 +-
 ...ort__UserSettings.getConfiguration_day.xml |   2 +-
 ...eSupport__UserSettings.getLanguage_day.xml |   2 +-
 ...t__UserSettings.getMobileVsDesktop_day.xml |   2 +-
 ...eSupport__UserSettings.getOSFamily_day.xml |   2 +-
 ...hCookieSupport__UserSettings.getOS_day.xml |   2 +-
 ...upport__UserSettings.getResolution_day.xml |   2 +-
 ...upport__UserSettings.getWideScreen_day.xml |   2 +-
 ...hCookieSupport__VisitFrequency.get_day.xml |   2 +-
 ...eSupport__VisitTime.getByDayOfWeek_day.xml |   2 +-
 ...me.getVisitInformationPerLocalTime_day.xml |   2 +-
 ...e.getVisitInformationPerServerTime_day.xml |   4 +-
 ...kieSupport__VisitsSummary.getUsers_day.xml |   2 +-
 ...thCookieSupport__VisitsSummary.get_day.xml |   2 +-
 ...lsTruncated__Referrers.getKeywords_day.xml |  16 ++--
 ...rdSpecified__Referrers.getKeywords_day.xml |   8 +-
 ...eDays__Live.getLastVisitsDetails_month.xml |   6 +-
 ...gnTracking__Referrers.getCampaigns_day.xml |  26 +++---
 ...ampaignTracking__VisitsSummary.get_day.xml |   2 +-
 ...ters__Referrers.getSearchEngines_month.xml |   6 +-
 ...ion_referrer1__API.getRowEvolution_day.xml |  14 ++-
 ...ion_referrer2__API.getRowEvolution_day.xml |   8 +-
 ...CustomVariables.getCustomVariables_day.xml |   4 +-
 ...stomVariables.getCustomVariables_month.xml |   4 +-
 ...nesTest__Live.getLastVisitsDetails_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 +-
 ...isabled_enabled__VisitsSummary.get_day.xml |   2 +-
 ...abled_enabled__VisitsSummary.get_month.xml |   4 +-
 ...sabled_enabled__VisitsSummary.get_week.xml |   2 +-
 ...NotLastNPeriods__VisitsSummary.get_day.xml |   2 +-
 ...tLastNPeriods__VisitsSummary.get_month.xml |   4 +-
 ...NotLastNPeriods__VisitsSummary.get_day.xml |   2 +-
 ...tLastNPeriods__VisitsSummary.get_month.xml |   4 +-
 ...Site_lastN__API.getProcessedReport_day.xml |  12 +--
 ...Site_lastN__API.getProcessedReport_day.xml |  14 +--
 ...fferentDays__Referrers.getWebsites_day.xml |  28 +++---
 ...erentDays__Referrers.getWebsites_month.xml |  10 +--
 ...ferentDays__Referrers.getWebsites_week.xml |  14 +--
 ...ferentDays__Referrers.getWebsites_year.xml |  10 +--
 ..._differentDays__VisitFrequency.get_day.xml |  10 +--
 ...ifferentDays__VisitFrequency.get_month.xml |   2 +-
 ...differentDays__VisitFrequency.get_week.xml |   4 +-
 ...s_differentDays__VisitsSummary.get_day.xml |  16 ++--
 ...differentDays__VisitsSummary.get_month.xml |   4 +-
 ..._differentDays__VisitsSummary.get_week.xml |   8 +-
 ..._idSiteOne___Referrers.getWebsites_day.xml |  24 +++---
 ...dSiteOne___Referrers.getWebsites_month.xml |   6 +-
 ...idSiteOne___Referrers.getWebsites_week.xml |  10 +--
 ...idSiteOne___Referrers.getWebsites_year.xml |   6 +-
 ...ays_idSiteOne___VisitFrequency.get_day.xml |  10 +--
 ...s_idSiteOne___VisitFrequency.get_month.xml |   2 +-
 ...ys_idSiteOne___VisitFrequency.get_week.xml |   4 +-
 ...Days_idSiteOne___VisitsSummary.get_day.xml |  14 +--
 ...ys_idSiteOne___VisitsSummary.get_month.xml |   2 +-
 ...ays_idSiteOne___VisitsSummary.get_week.xml |   6 +-
 ...dReports.generateReport_month.original.csv |   2 +-
 ...Reports.generateReport_month.original.html |   2 +-
 ...torId__Live.getLastVisitsDetails_month.xml |   6 +-
 ..._VisitorId__VisitsSummary.getUsers_day.xml |   2 +-
 ...isitorId__VisitsSummary.getUsers_month.xml |   2 +-
 ...VisitorId__VisitsSummary.getUsers_week.xml |   2 +-
 ...serId_VisitorId__VisitsSummary.get_day.xml |   2 +-
 ...rId_VisitorId__VisitsSummary.get_month.xml |   2 +-
 ...erId_VisitorId__VisitsSummary.get_week.xml |   2 +-
 ...ouldNotAppear__VisitsSummary.get_month.xml |   2 +-
 ...ouldNotAppear__VisitsSummary.get_month.xml |   2 +-
 ...test_apiGetReportMetadata__API.get_day.xml |   2 +-
 ...RawMetrics__API.getProcessedReport_day.xml |   2 +-
 ...vExport__Live.getLastVisitsDetails_day.csv | Bin 7924 -> 7930 bytes
 ...CustomVariables.getCustomVariables_day.csv | Bin 1280 -> 1280 bytes
 ...t_csvExport_xp0__VisitsSummary.get_day.csv | Bin 378 -> 378 bytes
 ...CustomVariables.getCustomVariables_day.csv | Bin 2500 -> 2500 bytes
 ...inner0_trans-en__VisitsSummary.get_day.csv | Bin 466 -> 466 bytes
 ...CustomVariables.getCustomVariables_day.csv | Bin 3468 -> 3468 bytes
 ...inner1_trans-de__VisitsSummary.get_day.csv | Bin 588 -> 588 bytes
 ...Ordered__Live.getLastVisitsDetails_day.xml |   4 +-
 ...ServerTime__API.getProcessedReport_day.xml |   6 +-
 ...ntAbandonedCart__VisitsSummary.get_day.xml |   2 +-
 ...onvertedGoalId1__VisitsSummary.get_day.xml |   2 +-
 ...nvertedGoalId1__VisitsSummary.get_week.xml |   2 +-
 ...tConvertGoalId1__VisitsSummary.get_day.xml |   2 +-
 ...entNewVisitors__VisitsSummary.get_week.xml |   2 +-
 ...mentNoEcommerce__VisitsSummary.get_day.xml |   2 +-
 ...rderedSomething__VisitsSummary.get_day.xml |   2 +-
 ...tPageTitleMatch__VisitsSummary.get_day.xml |   2 +-
 ...rningCustomers__VisitsSummary.get_week.xml |   2 +-
 ...urningVisitors__VisitsSummary.get_week.xml |   2 +-
 ...sConvertedGoal__VisitsSummary.get_week.xml |   2 +-
 ...dConvertedGoal__VisitsSummary.get_week.xml |   2 +-
 ...CustomVariables.getCustomVariables_day.xml |  12 +--
 ...thItems__Live.getLastVisitsDetails_day.xml |   6 +-
 ...rderWithItems__UserCountry.getCity_day.xml |   2 +-
 ...ithItems__UserCountry.getContinent_day.xml |   2 +-
 ...rWithItems__UserCountry.getCountry_day.xml |   4 +-
 ...erWithItems__UserCountry.getRegion_day.xml |   2 +-
 ...ithItems__VisitTime.getByDayOfWeek_day.xml |   2 +-
 ...me.getVisitInformationPerLocalTime_day.xml |   2 +-
 ...e.getVisitInformationPerServerTime_day.xml |   6 +-
 ...eOrderWithItems__VisitsSummary.get_day.xml |   2 +-
 ...edReports.generateReport_week.original.csv |   2 +-
 ...dReports.generateReport_week.original.html |   2 +-
 ...ndexedByDate__Referrers.getSocials_day.xml |  10 +--
 ..._DateRange__Referrers.getSocials_range.xml |  16 ++--
 ...ange__Referrers.getUrlsForSocial_range.xml |   6 +-
 ...ateRange__UserCountry.getCountry_range.xml |   2 +-
 ...ange__UserSettings.getResolution_range.xml |   2 +-
 ...getVisitInformationPerServerTime_range.xml |   4 +-
 ...able__Referrers.getUrlsForSocial_range.xml |  26 +++---
 ...stomVariables.getCustomVariables_range.xml |  18 ++--
 ...alAPI__Live.getLastVisitsDetails_range.xml |   6 +-
 ...taAndNormalAPI__Live.getVisitorProfile.xml |   6 +-
 ...NormalAPI__Referrers.getKeywords_range.xml |   4 +-
 ...t_reportLimiting__Referrers.getAll_day.xml |  10 +--
 ...ortLimiting__Referrers.getKeywords_day.xml |  14 +--
 ...imiting__Referrers.getReferrerType_day.xml |  18 ++--
 ...miting__Referrers.getSearchEngines_day.xml |  14 +--
 ...ortLimiting__Referrers.getWebsites_day.xml |  14 +--
 ...eportLimiting__UserCountry.getCity_day.xml |   6 +-
 ...ortLimiting__UserCountry.getRegion_day.xml |   6 +-
 ...ng__UserSettings.getBrowserVersion_day.xml |   6 +-
 ...ing__UserSettings.getConfiguration_day.xml |   6 +-
 ...reportLimiting__UserSettings.getOS_day.xml |   6 +-
 ...miting__UserSettings.getResolution_day.xml |   6 +-
 ...ryDisabled__Provider.getProvider_month.xml |   6 +-
 ...ing_rankingQuery__Referrers.getAll_day.xml |  10 +--
 ...ankingQuery__Referrers.getKeywords_day.xml |  14 +--
 ...ngQuery__Referrers.getReferrerType_day.xml |  18 ++--
 ...gQuery__Referrers.getSearchEngines_day.xml |  14 +--
 ...ankingQuery__Referrers.getWebsites_day.xml |  14 +--
 ..._rankingQuery__UserCountry.getCity_day.xml |   6 +-
 ...ankingQuery__UserCountry.getRegion_day.xml |   6 +-
 ...ry__UserSettings.getBrowserVersion_day.xml |   6 +-
 ...ery__UserSettings.getConfiguration_day.xml |   6 +-
 ...g_rankingQuery__UserSettings.getOS_day.xml |   6 +-
 ...gQuery__UserSettings.getResolution_day.xml |   6 +-
 ...e.getVisitInformationPerServerTime_day.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.getCustomVariables_day.xml |  18 ++--
 ...ustomVariables.getCustomVariables_week.xml |  18 ++--
 ...CustomVariables__VisitsSummary.get_day.xml |   2 +-
 ...ustomVariables__VisitsSummary.get_week.xml |   2 +-
 ...__subtable__API.getProcessedReport_day.xml |   4 +-
 ...CustomVariables.getCustomVariables_day.xml |  18 ++--
 ...ustomVariables.getCustomVariables_week.xml |  18 ++--
 ...hALL_noGoalData__VisitsSummary.get_day.xml |   2 +-
 ...ALL_noGoalData__VisitsSummary.get_week.xml |   2 +-
 ...CustomVariables.getCustomVariables_day.xml |  12 +--
 ...ustomVariables.getCustomVariables_week.xml |  12 +--
 ...VisitorType__Referrers.getKeywords_day.xml |   4 +-
 ...isitorType__Referrers.getKeywords_week.xml |   4 +-
 ...atchVisitorType__VisitsSummary.get_day.xml |   2 +-
 ...tchVisitorType__VisitsSummary.get_week.xml |   2 +-
 251 files changed, 834 insertions(+), 822 deletions(-)

diff --git a/plugins/CustomVariables/tests/processed/test_CustomVariablesIntegrationTest__CustomVariables.getCustomVariables_day.xml b/plugins/CustomVariables/tests/processed/test_CustomVariablesIntegrationTest__CustomVariables.getCustomVariables_day.xml
index f18e49c7cf..1ecaf61b08 100644
--- a/plugins/CustomVariables/tests/processed/test_CustomVariablesIntegrationTest__CustomVariables.getCustomVariables_day.xml
+++ b/plugins/CustomVariables/tests/processed/test_CustomVariablesIntegrationTest__CustomVariables.getCustomVariables_day.xml
@@ -92,6 +92,7 @@
 		<label>Name_VISIT_1</label>
 		<nb_visits>1</nb_visits>
 		<nb_actions>1</nb_actions>
+		<nb_users>0</nb_users>
 		<max_actions>1</max_actions>
 		<sum_visit_length>4</sum_visit_length>
 		<bounce_count>1</bounce_count>
@@ -109,6 +110,7 @@
 				<label>Val_VISIT1</label>
 				<nb_visits>1</nb_visits>
 				<nb_actions>1</nb_actions>
+				<nb_users>0</nb_users>
 				<max_actions>1</max_actions>
 				<sum_visit_length>4</sum_visit_length>
 				<bounce_count>1</bounce_count>
@@ -128,6 +130,7 @@
 		<label>Name_VISIT_2</label>
 		<nb_visits>1</nb_visits>
 		<nb_actions>1</nb_actions>
+		<nb_users>0</nb_users>
 		<max_actions>1</max_actions>
 		<sum_visit_length>4</sum_visit_length>
 		<bounce_count>1</bounce_count>
@@ -145,6 +148,7 @@
 				<label>Val_VISIT2</label>
 				<nb_visits>1</nb_visits>
 				<nb_actions>1</nb_actions>
+				<nb_users>0</nb_users>
 				<max_actions>1</max_actions>
 				<sum_visit_length>4</sum_visit_length>
 				<bounce_count>1</bounce_count>
@@ -164,6 +168,7 @@
 		<label>Name_VISIT_3</label>
 		<nb_visits>1</nb_visits>
 		<nb_actions>1</nb_actions>
+		<nb_users>0</nb_users>
 		<max_actions>1</max_actions>
 		<sum_visit_length>4</sum_visit_length>
 		<bounce_count>1</bounce_count>
@@ -181,6 +186,7 @@
 				<label>Val_VISIT3</label>
 				<nb_visits>1</nb_visits>
 				<nb_actions>1</nb_actions>
+				<nb_users>0</nb_users>
 				<max_actions>1</max_actions>
 				<sum_visit_length>4</sum_visit_length>
 				<bounce_count>1</bounce_count>
@@ -200,6 +206,7 @@
 		<label>Name_VISIT_4</label>
 		<nb_visits>1</nb_visits>
 		<nb_actions>1</nb_actions>
+		<nb_users>0</nb_users>
 		<max_actions>1</max_actions>
 		<sum_visit_length>4</sum_visit_length>
 		<bounce_count>1</bounce_count>
@@ -217,6 +224,7 @@
 				<label>Val_VISIT4</label>
 				<nb_visits>1</nb_visits>
 				<nb_actions>1</nb_actions>
+				<nb_users>0</nb_users>
 				<max_actions>1</max_actions>
 				<sum_visit_length>4</sum_visit_length>
 				<bounce_count>1</bounce_count>
@@ -236,6 +244,7 @@
 		<label>Name_VISIT_5</label>
 		<nb_visits>1</nb_visits>
 		<nb_actions>1</nb_actions>
+		<nb_users>0</nb_users>
 		<max_actions>1</max_actions>
 		<sum_visit_length>4</sum_visit_length>
 		<bounce_count>1</bounce_count>
@@ -253,6 +262,7 @@
 				<label>Val_VISIT5</label>
 				<nb_visits>1</nb_visits>
 				<nb_actions>1</nb_actions>
+				<nb_users>0</nb_users>
 				<max_actions>1</max_actions>
 				<sum_visit_length>4</sum_visit_length>
 				<bounce_count>1</bounce_count>
@@ -272,6 +282,7 @@
 		<label>Name_VISIT_6</label>
 		<nb_visits>1</nb_visits>
 		<nb_actions>1</nb_actions>
+		<nb_users>0</nb_users>
 		<max_actions>1</max_actions>
 		<sum_visit_length>4</sum_visit_length>
 		<bounce_count>1</bounce_count>
@@ -289,6 +300,7 @@
 				<label>Val_VISIT6</label>
 				<nb_visits>1</nb_visits>
 				<nb_actions>1</nb_actions>
+				<nb_users>0</nb_users>
 				<max_actions>1</max_actions>
 				<sum_visit_length>4</sum_visit_length>
 				<bounce_count>1</bounce_count>
@@ -308,6 +320,7 @@
 		<label>Name_VISIT_7</label>
 		<nb_visits>1</nb_visits>
 		<nb_actions>1</nb_actions>
+		<nb_users>0</nb_users>
 		<max_actions>1</max_actions>
 		<sum_visit_length>4</sum_visit_length>
 		<bounce_count>1</bounce_count>
@@ -325,6 +338,7 @@
 				<label>Val_VISIT7</label>
 				<nb_visits>1</nb_visits>
 				<nb_actions>1</nb_actions>
+				<nb_users>0</nb_users>
 				<max_actions>1</max_actions>
 				<sum_visit_length>4</sum_visit_length>
 				<bounce_count>1</bounce_count>
@@ -344,6 +358,7 @@
 		<label>Name_VISIT_8</label>
 		<nb_visits>1</nb_visits>
 		<nb_actions>1</nb_actions>
+		<nb_users>0</nb_users>
 		<max_actions>1</max_actions>
 		<sum_visit_length>4</sum_visit_length>
 		<bounce_count>1</bounce_count>
@@ -361,6 +376,7 @@
 				<label>Val_VISIT8</label>
 				<nb_visits>1</nb_visits>
 				<nb_actions>1</nb_actions>
+				<nb_users>0</nb_users>
 				<max_actions>1</max_actions>
 				<sum_visit_length>4</sum_visit_length>
 				<bounce_count>1</bounce_count>
diff --git a/plugins/CustomVariables/tests/processed/test_CustomVariablesIntegrationTest__Live.getLastVisitsDetails_day.xml b/plugins/CustomVariables/tests/processed/test_CustomVariablesIntegrationTest__Live.getLastVisitsDetails_day.xml
index a61cb11554..76e4a27324 100644
--- a/plugins/CustomVariables/tests/processed/test_CustomVariablesIntegrationTest__Live.getLastVisitsDetails_day.xml
+++ b/plugins/CustomVariables/tests/processed/test_CustomVariablesIntegrationTest__Live.getLastVisitsDetails_day.xml
@@ -69,7 +69,7 @@
 		
 		<searches>0</searches>
 		<actions>1</actions>
-		<userId />
+		<userId>0</userId>
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>1</visitConverted>
diff --git a/tests/PHPUnit/Integration/expected/test_ArchiveCronTest_noOptions__VisitsSummary.get_day.xml b/tests/PHPUnit/Integration/expected/test_ArchiveCronTest_noOptions__VisitsSummary.get_day.xml
index 72b3d94c43..32434a44f6 100644
--- a/tests/PHPUnit/Integration/expected/test_ArchiveCronTest_noOptions__VisitsSummary.get_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_ArchiveCronTest_noOptions__VisitsSummary.get_day.xml
@@ -2,7 +2,7 @@
 <results>
 	<result idSite="1">
 		<nb_uniq_visitors>9</nb_uniq_visitors>
-		<nb_users>1</nb_users>
+		<nb_users>0</nb_users>
 		<nb_visits>9</nb_visits>
 		<nb_actions>9</nb_actions>
 		<nb_visits_converted>9</nb_visits_converted>
diff --git a/tests/PHPUnit/Integration/expected/test_ArchiveCronTest_noOptions__VisitsSummary.get_month.xml b/tests/PHPUnit/Integration/expected/test_ArchiveCronTest_noOptions__VisitsSummary.get_month.xml
index 0482fd7e5b..527a5d7177 100644
--- a/tests/PHPUnit/Integration/expected/test_ArchiveCronTest_noOptions__VisitsSummary.get_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ArchiveCronTest_noOptions__VisitsSummary.get_month.xml
@@ -2,7 +2,7 @@
 <results>
 	<result idSite="1">
 		<nb_uniq_visitors>27</nb_uniq_visitors>
-		<nb_users>1</nb_users>
+		<nb_users>0</nb_users>
 		<nb_visits>27</nb_visits>
 		<nb_actions>30</nb_actions>
 		<nb_visits_converted>25</nb_visits_converted>
@@ -15,7 +15,7 @@
 	</result>
 	<result idSite="2">
 		<nb_uniq_visitors>1</nb_uniq_visitors>
-		<nb_users>1</nb_users>
+		<nb_users>0</nb_users>
 		<nb_visits>1</nb_visits>
 		<nb_actions>1</nb_actions>
 		<nb_visits_converted>0</nb_visits_converted>
diff --git a/tests/PHPUnit/Integration/expected/test_Archive_InvalidationWebsite1_NewDataShouldNotAppear__VisitsSummary.get_month.xml b/tests/PHPUnit/Integration/expected/test_Archive_InvalidationWebsite1_NewDataShouldNotAppear__VisitsSummary.get_month.xml
index b19f6f9e63..5d2578d36f 100644
--- a/tests/PHPUnit/Integration/expected/test_Archive_InvalidationWebsite1_NewDataShouldNotAppear__VisitsSummary.get_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_Archive_InvalidationWebsite1_NewDataShouldNotAppear__VisitsSummary.get_month.xml
@@ -2,7 +2,7 @@
 <results>
 	<result date="2010-03">
 		<nb_uniq_visitors>1</nb_uniq_visitors>
-		<nb_users>1</nb_users>
+		<nb_users>0</nb_users>
 		<nb_visits>1</nb_visits>
 		<nb_actions>6</nb_actions>
 		<nb_visits_converted>0</nb_visits_converted>
diff --git a/tests/PHPUnit/Integration/expected/test_Archive_InvalidationWebsite2_NewDataShouldNotAppear_BecauseWeekWasNotInvalidated__VisitsSummary.get_week.xml b/tests/PHPUnit/Integration/expected/test_Archive_InvalidationWebsite2_NewDataShouldNotAppear_BecauseWeekWasNotInvalidated__VisitsSummary.get_week.xml
index 85a94d8af8..75d267cfc4 100644
--- a/tests/PHPUnit/Integration/expected/test_Archive_InvalidationWebsite2_NewDataShouldNotAppear_BecauseWeekWasNotInvalidated__VisitsSummary.get_week.xml
+++ b/tests/PHPUnit/Integration/expected/test_Archive_InvalidationWebsite2_NewDataShouldNotAppear_BecauseWeekWasNotInvalidated__VisitsSummary.get_week.xml
@@ -2,7 +2,7 @@
 <results>
 	<result date="From 2010-01-04 to 2010-01-10">
 		<nb_uniq_visitors>1</nb_uniq_visitors>
-		<nb_users>1</nb_users>
+		<nb_users>0</nb_users>
 		<nb_visits>1</nb_visits>
 		<nb_actions>6</nb_actions>
 		<nb_visits_converted>0</nb_visits_converted>
diff --git a/tests/PHPUnit/Integration/expected/test_Archive_InvalidationWebsite2_NewDataShouldNotAppear__VisitsSummary.get_month.xml b/tests/PHPUnit/Integration/expected/test_Archive_InvalidationWebsite2_NewDataShouldNotAppear__VisitsSummary.get_month.xml
index cbe0ead9bb..4402121f8a 100644
--- a/tests/PHPUnit/Integration/expected/test_Archive_InvalidationWebsite2_NewDataShouldNotAppear__VisitsSummary.get_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_Archive_InvalidationWebsite2_NewDataShouldNotAppear__VisitsSummary.get_month.xml
@@ -2,7 +2,7 @@
 <results>
 	<result date="2010-01">
 		<nb_uniq_visitors>1</nb_uniq_visitors>
-		<nb_users>1</nb_users>
+		<nb_users>0</nb_users>
 		<nb_visits>1</nb_visits>
 		<nb_actions>6</nb_actions>
 		<nb_visits_converted>0</nb_visits_converted>
diff --git a/tests/PHPUnit/Integration/expected/test_BackwardsCompatibility1XTest_multipleOldNew__VisitFrequency.get_month.xml b/tests/PHPUnit/Integration/expected/test_BackwardsCompatibility1XTest_multipleOldNew__VisitFrequency.get_month.xml
index c7ea96791b..9b5f22a3ea 100644
--- a/tests/PHPUnit/Integration/expected/test_BackwardsCompatibility1XTest_multipleOldNew__VisitFrequency.get_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_BackwardsCompatibility1XTest_multipleOldNew__VisitFrequency.get_month.xml
@@ -23,7 +23,7 @@
 	<result date="2012-11" />
 	<result date="2012-12">
 		<nb_uniq_visitors_returning>1</nb_uniq_visitors_returning>
-		<nb_users_returning>1</nb_users_returning>
+		<nb_users_returning>0</nb_users_returning>
 		<nb_visits_returning>1</nb_visits_returning>
 		<nb_actions_returning>1</nb_actions_returning>
 		<nb_visits_converted_returning>0</nb_visits_converted_returning>
diff --git a/tests/PHPUnit/Integration/expected/test_CustomEvents__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/Integration/expected/test_CustomEvents__Live.getLastVisitsDetails_day.xml
index 61b4626535..11b3df7d80 100644
--- a/tests/PHPUnit/Integration/expected/test_CustomEvents__Live.getLastVisitsDetails_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_CustomEvents__Live.getLastVisitsDetails_day.xml
@@ -26,7 +26,7 @@
 		
 		<searches>0</searches>
 		<actions>1</actions>
-		<userId />
+		<userId>0</userId>
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>0</visitConverted>
@@ -128,7 +128,7 @@
 		
 		<searches>0</searches>
 		<actions>1</actions>
-		<userId />
+		<userId>0</userId>
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>0</visitConverted>
@@ -298,7 +298,7 @@
 		
 		<searches>0</searches>
 		<actions>6</actions>
-		<userId />
+		<userId>0</userId>
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>0</visitConverted>
@@ -400,7 +400,7 @@
 		
 		<searches>0</searches>
 		<actions>1</actions>
-		<userId />
+		<userId>0</userId>
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>0</visitConverted>
@@ -737,7 +737,7 @@
 		
 		<searches>0</searches>
 		<actions>15</actions>
-		<userId />
+		<userId>0</userId>
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>1</visitConverted>
@@ -839,7 +839,7 @@
 		
 		<searches>0</searches>
 		<actions>1</actions>
-		<userId />
+		<userId>0</userId>
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>0</visitConverted>
@@ -937,7 +937,7 @@
 		
 		<searches>0</searches>
 		<actions>1</actions>
-		<userId />
+		<userId>0</userId>
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>0</visitConverted>
@@ -1103,7 +1103,7 @@
 		
 		<searches>0</searches>
 		<actions>6</actions>
-		<userId />
+		<userId>0</userId>
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>0</visitConverted>
@@ -1201,7 +1201,7 @@
 		
 		<searches>0</searches>
 		<actions>1</actions>
-		<userId />
+		<userId>0</userId>
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>0</visitConverted>
@@ -1534,7 +1534,7 @@
 		
 		<searches>0</searches>
 		<actions>15</actions>
-		<userId />
+		<userId>0</userId>
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>1</visitConverted>
diff --git a/tests/PHPUnit/Integration/expected/test_CustomEvents__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/Integration/expected/test_CustomEvents__Live.getLastVisitsDetails_month.xml
index 61b4626535..11b3df7d80 100644
--- a/tests/PHPUnit/Integration/expected/test_CustomEvents__Live.getLastVisitsDetails_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_CustomEvents__Live.getLastVisitsDetails_month.xml
@@ -26,7 +26,7 @@
 		
 		<searches>0</searches>
 		<actions>1</actions>
-		<userId />
+		<userId>0</userId>
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>0</visitConverted>
@@ -128,7 +128,7 @@
 		
 		<searches>0</searches>
 		<actions>1</actions>
-		<userId />
+		<userId>0</userId>
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>0</visitConverted>
@@ -298,7 +298,7 @@
 		
 		<searches>0</searches>
 		<actions>6</actions>
-		<userId />
+		<userId>0</userId>
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>0</visitConverted>
@@ -400,7 +400,7 @@
 		
 		<searches>0</searches>
 		<actions>1</actions>
-		<userId />
+		<userId>0</userId>
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>0</visitConverted>
@@ -737,7 +737,7 @@
 		
 		<searches>0</searches>
 		<actions>15</actions>
-		<userId />
+		<userId>0</userId>
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>1</visitConverted>
@@ -839,7 +839,7 @@
 		
 		<searches>0</searches>
 		<actions>1</actions>
-		<userId />
+		<userId>0</userId>
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>0</visitConverted>
@@ -937,7 +937,7 @@
 		
 		<searches>0</searches>
 		<actions>1</actions>
-		<userId />
+		<userId>0</userId>
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>0</visitConverted>
@@ -1103,7 +1103,7 @@
 		
 		<searches>0</searches>
 		<actions>6</actions>
-		<userId />
+		<userId>0</userId>
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>0</visitConverted>
@@ -1201,7 +1201,7 @@
 		
 		<searches>0</searches>
 		<actions>1</actions>
-		<userId />
+		<userId>0</userId>
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>0</visitConverted>
@@ -1534,7 +1534,7 @@
 		
 		<searches>0</searches>
 		<actions>15</actions>
-		<userId />
+		<userId>0</userId>
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>1</visitConverted>
diff --git a/tests/PHPUnit/Integration/expected/test_FlattenReports__CustomVariables.getCustomVariables_day.xml b/tests/PHPUnit/Integration/expected/test_FlattenReports__CustomVariables.getCustomVariables_day.xml
index 8826b0f72b..8a085297ce 100644
--- a/tests/PHPUnit/Integration/expected/test_FlattenReports__CustomVariables.getCustomVariables_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_FlattenReports__CustomVariables.getCustomVariables_day.xml
@@ -28,7 +28,7 @@
 			<label>CustomVarVisit</label>
 			<nb_visits>6</nb_visits>
 			<nb_actions>18</nb_actions>
-			<nb_users>2</nb_users>
+			<nb_users>0</nb_users>
 			<max_actions>3</max_actions>
 			<sum_visit_length>6</sum_visit_length>
 			<bounce_count>0</bounce_count>
@@ -39,7 +39,7 @@
 			<label>CustomVarVisit - CustomVarValue1</label>
 			<nb_visits>3</nb_visits>
 			<nb_actions>9</nb_actions>
-			<nb_users>1</nb_users>
+			<nb_users>0</nb_users>
 			<max_actions>3</max_actions>
 			<sum_visit_length>3</sum_visit_length>
 			<bounce_count>0</bounce_count>
@@ -50,7 +50,7 @@
 			<label>CustomVarVisit - CustomVarValue2</label>
 			<nb_visits>3</nb_visits>
 			<nb_actions>9</nb_actions>
-			<nb_users>1</nb_users>
+			<nb_users>0</nb_users>
 			<max_actions>3</max_actions>
 			<sum_visit_length>3</sum_visit_length>
 			<bounce_count>0</bounce_count>
@@ -63,7 +63,7 @@
 			<label>CustomVarVisit</label>
 			<nb_visits>1</nb_visits>
 			<nb_actions>2</nb_actions>
-			<nb_users>1</nb_users>
+			<nb_users>0</nb_users>
 			<max_actions>2</max_actions>
 			<sum_visit_length>1</sum_visit_length>
 			<bounce_count>0</bounce_count>
@@ -74,7 +74,7 @@
 			<label>CustomVarVisit - CustomVarValue1</label>
 			<nb_visits>1</nb_visits>
 			<nb_actions>2</nb_actions>
-			<nb_users>1</nb_users>
+			<nb_users>0</nb_users>
 			<max_actions>2</max_actions>
 			<sum_visit_length>1</sum_visit_length>
 			<bounce_count>0</bounce_count>
diff --git a/tests/PHPUnit/Integration/expected/test_FlattenReports__Referrers.getWebsites_day.xml b/tests/PHPUnit/Integration/expected/test_FlattenReports__Referrers.getWebsites_day.xml
index 671c9615bd..8c9042be1c 100644
--- a/tests/PHPUnit/Integration/expected/test_FlattenReports__Referrers.getWebsites_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_FlattenReports__Referrers.getWebsites_day.xml
@@ -5,7 +5,7 @@
 		<nb_uniq_visitors>1</nb_uniq_visitors>
 		<nb_visits>1</nb_visits>
 		<nb_actions>3</nb_actions>
-		<nb_users>1</nb_users>
+		<nb_users>0</nb_users>
 		<max_actions>3</max_actions>
 		<sum_visit_length>1</sum_visit_length>
 		<bounce_count>0</bounce_count>
@@ -17,7 +17,7 @@
 		<nb_uniq_visitors>1</nb_uniq_visitors>
 		<nb_visits>1</nb_visits>
 		<nb_actions>3</nb_actions>
-		<nb_users>1</nb_users>
+		<nb_users>0</nb_users>
 		<max_actions>3</max_actions>
 		<sum_visit_length>1</sum_visit_length>
 		<bounce_count>0</bounce_count>
@@ -29,7 +29,7 @@
 		<nb_uniq_visitors>1</nb_uniq_visitors>
 		<nb_visits>1</nb_visits>
 		<nb_actions>3</nb_actions>
-		<nb_users>1</nb_users>
+		<nb_users>0</nb_users>
 		<max_actions>3</max_actions>
 		<sum_visit_length>1</sum_visit_length>
 		<bounce_count>0</bounce_count>
@@ -41,7 +41,7 @@
 		<nb_uniq_visitors>1</nb_uniq_visitors>
 		<nb_visits>1</nb_visits>
 		<nb_actions>3</nb_actions>
-		<nb_users>1</nb_users>
+		<nb_users>0</nb_users>
 		<max_actions>3</max_actions>
 		<sum_visit_length>1</sum_visit_length>
 		<bounce_count>0</bounce_count>
@@ -53,7 +53,7 @@
 		<nb_uniq_visitors>1</nb_uniq_visitors>
 		<nb_visits>1</nb_visits>
 		<nb_actions>3</nb_actions>
-		<nb_users>1</nb_users>
+		<nb_users>0</nb_users>
 		<max_actions>3</max_actions>
 		<sum_visit_length>1</sum_visit_length>
 		<bounce_count>0</bounce_count>
@@ -65,7 +65,7 @@
 		<nb_uniq_visitors>1</nb_uniq_visitors>
 		<nb_visits>1</nb_visits>
 		<nb_actions>3</nb_actions>
-		<nb_users>1</nb_users>
+		<nb_users>0</nb_users>
 		<max_actions>3</max_actions>
 		<sum_visit_length>1</sum_visit_length>
 		<bounce_count>0</bounce_count>
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__CustomVariables.getCustomVariables_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__CustomVariables.getCustomVariables_month.xml
index d2777a6618..6f8a9a4c98 100644
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__CustomVariables.getCustomVariables_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__CustomVariables.getCustomVariables_month.xml
@@ -53,7 +53,7 @@
 		<nb_conversions>5</nb_conversions>
 		<revenue>25</revenue>
 		<sum_daily_nb_uniq_visitors>7</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>4</sum_daily_nb_users>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<subtable>
 			<row>
 				<label>Mozilla/5.0 (Macintosh; Intel Mac OS X 10_6_7) AppleWebKit/534.24 (KHTML, like Gecko) RockMelt/0.9.58.494 Chrome/11.0.696.71 Safari/534.24</label>
@@ -72,7 +72,7 @@
 				<nb_conversions>3</nb_conversions>
 				<revenue>15</revenue>
 				<sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors>
-				<sum_daily_nb_users>1</sum_daily_nb_users>
+				<sum_daily_nb_users>0</sum_daily_nb_users>
 			</row>
 			<row>
 				<label>Apache-HttpClient/4.2.1 (java 1.5)</label>
@@ -83,7 +83,7 @@
 				<bounce_count>1</bounce_count>
 				<nb_visits_converted>0</nb_visits_converted>
 				<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-				<sum_daily_nb_users>1</sum_daily_nb_users>
+				<sum_daily_nb_users>0</sum_daily_nb_users>
 			</row>
 			<row>
 				<label>Mozilla/5.0 (compatible; MSIE 10.6; Windows NT 6.1; Trident/5.0; InfoPath.2; SLCC1; .NET CLR 3.0.4506.2152; .NET CLR 3.5.30729; .NET CLR 2.0.50727) 3gpp-gba UNTRUSTED/1.0</label>
@@ -102,7 +102,7 @@
 				<nb_conversions>1</nb_conversions>
 				<revenue>5</revenue>
 				<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-				<sum_daily_nb_users>1</sum_daily_nb_users>
+				<sum_daily_nb_users>0</sum_daily_nb_users>
 			</row>
 			<row>
 				<label>Mozilla/5.0 (Linux; U; Android 2.3.5; en-us; HTC Vision Build/GRI40) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1</label>
@@ -121,7 +121,7 @@
 				<nb_conversions>1</nb_conversions>
 				<revenue>5</revenue>
 				<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-				<sum_daily_nb_users>1</sum_daily_nb_users>
+				<sum_daily_nb_users>0</sum_daily_nb_users>
 			</row>
 		</subtable>
 	</row>
@@ -142,7 +142,7 @@
 		<nb_conversions>1</nb_conversions>
 		<revenue>5</revenue>
 		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>1</sum_daily_nb_users>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<subtable>
 			<row>
 				<label>Googlebot/2.1 ( http://www.googlebot.com/bot.html)</label>
@@ -161,7 +161,7 @@
 				<nb_conversions>1</nb_conversions>
 				<revenue>5</revenue>
 				<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-				<sum_daily_nb_users>1</sum_daily_nb_users>
+				<sum_daily_nb_users>0</sum_daily_nb_users>
 			</row>
 		</subtable>
 	</row>
@@ -182,7 +182,7 @@
 		<nb_conversions>1</nb_conversions>
 		<revenue>5</revenue>
 		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>1</sum_daily_nb_users>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<subtable>
 			<row>
 				<label>Anonymous</label>
@@ -201,7 +201,7 @@
 				<nb_conversions>1</nb_conversions>
 				<revenue>5</revenue>
 				<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-				<sum_daily_nb_users>1</sum_daily_nb_users>
+				<sum_daily_nb_users>0</sum_daily_nb_users>
 			</row>
 		</subtable>
 	</row>
@@ -222,7 +222,7 @@
 		<nb_conversions>1</nb_conversions>
 		<revenue>5</revenue>
 		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>1</sum_daily_nb_users>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<subtable>
 			<row>
 				<label>NewLoggedOut</label>
@@ -241,7 +241,7 @@
 				<nb_conversions>1</nb_conversions>
 				<revenue>5</revenue>
 				<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-				<sum_daily_nb_users>1</sum_daily_nb_users>
+				<sum_daily_nb_users>0</sum_daily_nb_users>
 			</row>
 		</subtable>
 	</row>
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getBrand_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getBrand_month.xml
index 4900d9f742..38d80d2b64 100644
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getBrand_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getBrand_month.xml
@@ -9,7 +9,7 @@
 		<bounce_count>23</bounce_count>
 		<nb_visits_converted>23</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>25</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>4</sum_daily_nb_users>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<logo>plugins/DevicesDetection/images/brand/Unknown.ico</logo>
 	</row>
 	<row>
@@ -21,7 +21,7 @@
 		<bounce_count>2</bounce_count>
 		<nb_visits_converted>2</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>2</sum_daily_nb_users>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<logo>plugins/DevicesDetection/images/brand/HTC.ico</logo>
 	</row>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getBrowserFamilies_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getBrowserFamilies_month.xml
index 736a970a10..77308fd9e7 100644
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getBrowserFamilies_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getBrowserFamilies_month.xml
@@ -9,7 +9,7 @@
 		<bounce_count>6</bounce_count>
 		<nb_visits_converted>6</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>4</sum_daily_nb_users>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<logo>plugins/UserSettings/images/browsers/IE.gif</logo>
 	</row>
 	<row>
@@ -21,7 +21,7 @@
 		<bounce_count>8</bounce_count>
 		<nb_visits_converted>9</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>10</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>6</sum_daily_nb_users>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<logo>plugins/UserSettings/images/browsers/CH.gif</logo>
 	</row>
 	<row>
@@ -33,7 +33,7 @@
 		<bounce_count>7</bounce_count>
 		<nb_visits_converted>6</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>7</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>4</sum_daily_nb_users>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<logo>plugins/UserSettings/images/browsers/UNK.gif</logo>
 	</row>
 	<row>
@@ -45,7 +45,7 @@
 		<bounce_count>2</bounce_count>
 		<nb_visits_converted>2</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>2</sum_daily_nb_users>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<logo>plugins/UserSettings/images/browsers/AN.gif</logo>
 	</row>
 	<row>
@@ -57,7 +57,7 @@
 		<bounce_count>2</bounce_count>
 		<nb_visits_converted>2</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>1</sum_daily_nb_users>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<logo>plugins/UserSettings/images/browsers/FF.gif</logo>
 	</row>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getBrowserVersions_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getBrowserVersions_month.xml
index 8283929188..80d06470a3 100644
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getBrowserVersions_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getBrowserVersions_month.xml
@@ -9,7 +9,7 @@
 		<bounce_count>5</bounce_count>
 		<nb_visits_converted>5</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>3</sum_daily_nb_users>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<logo>plugins/UserSettings/images/browsers/EP.gif</logo>
 	</row>
 	<row>
@@ -21,7 +21,7 @@
 		<bounce_count>5</bounce_count>
 		<nb_visits_converted>5</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>3</sum_daily_nb_users>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<logo>plugins/UserSettings/images/browsers/IE.gif</logo>
 	</row>
 	<row>
@@ -33,7 +33,7 @@
 		<bounce_count>3</bounce_count>
 		<nb_visits_converted>4</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>2</sum_daily_nb_users>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<logo>plugins/UserSettings/images/browsers/CH.gif</logo>
 	</row>
 	<row>
@@ -45,7 +45,7 @@
 		<bounce_count>2</bounce_count>
 		<nb_visits_converted>2</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>2</sum_daily_nb_users>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<logo>plugins/UserSettings/images/browsers/AN.gif</logo>
 	</row>
 	<row>
@@ -57,7 +57,7 @@
 		<bounce_count>2</bounce_count>
 		<nb_visits_converted>2</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>1</sum_daily_nb_users>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<logo>plugins/UserSettings/images/browsers/CH.gif</logo>
 	</row>
 	<row>
@@ -69,7 +69,7 @@
 		<bounce_count>2</bounce_count>
 		<nb_visits_converted>2</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>2</sum_daily_nb_users>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<logo>plugins/UserSettings/images/browsers/CH.gif</logo>
 	</row>
 	<row>
@@ -81,7 +81,7 @@
 		<bounce_count>2</bounce_count>
 		<nb_visits_converted>2</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>1</sum_daily_nb_users>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<logo>plugins/UserSettings/images/browsers/FF.gif</logo>
 	</row>
 	<row>
@@ -93,7 +93,7 @@
 		<bounce_count>2</bounce_count>
 		<nb_visits_converted>1</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>1</sum_daily_nb_users>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<logo>plugins/UserSettings/images/browsers/UNK.gif</logo>
 	</row>
 	<row>
@@ -105,7 +105,7 @@
 		<bounce_count>1</bounce_count>
 		<nb_visits_converted>1</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>1</sum_daily_nb_users>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<logo>plugins/UserSettings/images/browsers/CH.gif</logo>
 	</row>
 	<row>
@@ -117,7 +117,7 @@
 		<bounce_count>1</bounce_count>
 		<nb_visits_converted>1</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>1</sum_daily_nb_users>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<logo>plugins/UserSettings/images/browsers/IE.gif</logo>
 	</row>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getModel_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getModel_month.xml
index 4f81f5481b..b9bf650ebc 100644
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getModel_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getModel_month.xml
@@ -9,7 +9,7 @@
 		<bounce_count>23</bounce_count>
 		<nb_visits_converted>23</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>25</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>4</sum_daily_nb_users>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
 	</row>
 	<row>
 		<label>Vision</label>
@@ -20,6 +20,6 @@
 		<bounce_count>2</bounce_count>
 		<nb_visits_converted>2</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>2</sum_daily_nb_users>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
 	</row>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getOsFamilies_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getOsFamilies_month.xml
index e529cdbeb2..62d091d83d 100644
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getOsFamilies_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getOsFamilies_month.xml
@@ -9,7 +9,7 @@
 		<bounce_count>8</bounce_count>
 		<nb_visits_converted>8</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>8</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>3</sum_daily_nb_users>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<logo>plugins/UserSettings/images/os/LIN.gif</logo>
 	</row>
 	<row>
@@ -21,7 +21,7 @@
 		<bounce_count>9</bounce_count>
 		<nb_visits_converted>9</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>9</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>4</sum_daily_nb_users>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<logo>plugins/UserSettings/images/os/WI7.gif</logo>
 	</row>
 	<row>
@@ -33,7 +33,7 @@
 		<bounce_count>4</bounce_count>
 		<nb_visits_converted>5</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>2</sum_daily_nb_users>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<logo>plugins/UserSettings/images/os/MAC.gif</logo>
 	</row>
 	<row>
@@ -45,7 +45,7 @@
 		<bounce_count>2</bounce_count>
 		<nb_visits_converted>2</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>2</sum_daily_nb_users>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<logo>plugins/UserSettings/images/os/AND.gif</logo>
 	</row>
 	<row>
@@ -57,7 +57,7 @@
 		<bounce_count>1</bounce_count>
 		<nb_visits_converted>1</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>1</sum_daily_nb_users>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<logo>plugins/UserSettings/images/os/UNK.gif</logo>
 	</row>
 	<row>
@@ -69,7 +69,7 @@
 		<bounce_count>1</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>1</sum_daily_nb_users>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<logo>plugins/UserSettings/images/os/UNK.gif</logo>
 	</row>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getOsVersions_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getOsVersions_month.xml
index 39cb245795..7cad47e0a1 100644
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getOsVersions_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getOsVersions_month.xml
@@ -9,7 +9,7 @@
 		<bounce_count>8</bounce_count>
 		<nb_visits_converted>8</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>8</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>3</sum_daily_nb_users>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<logo>plugins/UserSettings/images/os/LIN.gif</logo>
 	</row>
 	<row>
@@ -21,7 +21,7 @@
 		<bounce_count>7</bounce_count>
 		<nb_visits_converted>7</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>7</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>3</sum_daily_nb_users>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<logo>plugins/UserSettings/images/os/WI7.gif</logo>
 	</row>
 	<row>
@@ -33,7 +33,7 @@
 		<bounce_count>3</bounce_count>
 		<nb_visits_converted>4</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>2</sum_daily_nb_users>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<logo>plugins/UserSettings/images/os/MAC.gif</logo>
 	</row>
 	<row>
@@ -45,7 +45,7 @@
 		<bounce_count>2</bounce_count>
 		<nb_visits_converted>2</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>2</sum_daily_nb_users>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<logo>plugins/UserSettings/images/os/AND.gif</logo>
 	</row>
 	<row>
@@ -57,7 +57,7 @@
 		<bounce_count>2</bounce_count>
 		<nb_visits_converted>2</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>1</sum_daily_nb_users>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<logo>plugins/UserSettings/images/os/WXP.gif</logo>
 	</row>
 	<row>
@@ -69,7 +69,7 @@
 		<bounce_count>1</bounce_count>
 		<nb_visits_converted>1</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>1</sum_daily_nb_users>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<logo>plugins/UserSettings/images/os/UNK.gif</logo>
 	</row>
 	<row>
@@ -81,7 +81,7 @@
 		<bounce_count>1</bounce_count>
 		<nb_visits_converted>1</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>1</sum_daily_nb_users>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<logo>plugins/UserSettings/images/os/MAC.gif</logo>
 	</row>
 	<row>
@@ -93,7 +93,7 @@
 		<bounce_count>1</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>1</sum_daily_nb_users>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<logo>plugins/UserSettings/images/os/UNK.gif</logo>
 	</row>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getType_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getType_month.xml
index 7540309820..276e820253 100644
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getType_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getType_month.xml
@@ -9,7 +9,7 @@
 		<bounce_count>21</bounce_count>
 		<nb_visits_converted>22</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>23</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>4</sum_daily_nb_users>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<logo>plugins/DevicesDetection/images/screens/normal.gif</logo>
 	</row>
 	<row>
@@ -21,7 +21,7 @@
 		<bounce_count>2</bounce_count>
 		<nb_visits_converted>1</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>1</sum_daily_nb_users>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<logo>plugins/DevicesDetection/images/screens/unknown.gif</logo>
 	</row>
 	<row>
@@ -33,7 +33,7 @@
 		<bounce_count>2</bounce_count>
 		<nb_visits_converted>2</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>2</sum_daily_nb_users>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<logo>plugins/DevicesDetection/images/screens/smartphone.png</logo>
 	</row>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml
index 06291c5c5f..db55cce7c1 100644
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml
+++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml
@@ -42,7 +42,7 @@
 		
 		<searches>0</searches>
 		<actions>1</actions>
-		<userId />
+		<userId>0</userId>
 		<visitorType>returning</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
 		<visitConverted>1</visitConverted>
@@ -180,7 +180,7 @@
 		
 		<searches>0</searches>
 		<actions>2</actions>
-		<userId />
+		<userId>0</userId>
 		<visitorType>returning</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
 		<visitConverted>1</visitConverted>
@@ -289,7 +289,7 @@
 		
 		<searches>0</searches>
 		<actions>1</actions>
-		<userId />
+		<userId>0</userId>
 		<visitorType>returning</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
 		<visitConverted>1</visitConverted>
@@ -439,7 +439,7 @@
 		
 		<searches>0</searches>
 		<actions>2</actions>
-		<userId />
+		<userId>0</userId>
 		<visitorType>returning</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
 		<visitConverted>1</visitConverted>
@@ -554,7 +554,7 @@
 		
 		<searches>0</searches>
 		<actions>1</actions>
-		<userId />
+		<userId>0</userId>
 		<visitorType>returning</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
 		<visitConverted>0</visitConverted>
@@ -680,7 +680,7 @@
 		
 		<searches>0</searches>
 		<actions>1</actions>
-		<userId />
+		<userId>0</userId>
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>1</visitConverted>
@@ -813,7 +813,7 @@
 		
 		<searches>0</searches>
 		<actions>1</actions>
-		<userId />
+		<userId>0</userId>
 		<visitorType>returning</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
 		<visitConverted>1</visitConverted>
@@ -935,7 +935,7 @@
 		
 		<searches>0</searches>
 		<actions>1</actions>
-		<userId />
+		<userId>0</userId>
 		<visitorType>returning</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
 		<visitConverted>1</visitConverted>
@@ -1049,7 +1049,7 @@
 		
 		<searches>0</searches>
 		<actions>1</actions>
-		<userId />
+		<userId>0</userId>
 		<visitorType>returning</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
 		<visitConverted>1</visitConverted>
@@ -1218,7 +1218,7 @@
 		
 		<searches>0</searches>
 		<actions>3</actions>
-		<userId />
+		<userId>0</userId>
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>1</visitConverted>
@@ -1336,7 +1336,7 @@
 		
 		<searches>0</searches>
 		<actions>1</actions>
-		<userId />
+		<userId>0</userId>
 		<visitorType>returning</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
 		<visitConverted>1</visitConverted>
@@ -1462,7 +1462,7 @@
 		
 		<searches>0</searches>
 		<actions>1</actions>
-		<userId />
+		<userId>0</userId>
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>1</visitConverted>
@@ -1750,7 +1750,7 @@
 		
 		<searches>0</searches>
 		<actions>10</actions>
-		<userId />
+		<userId>0</userId>
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>1</visitConverted>
@@ -1862,7 +1862,7 @@
 		
 		<searches>0</searches>
 		<actions>1</actions>
-		<userId />
+		<userId>0</userId>
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>1</visitConverted>
@@ -1979,7 +1979,7 @@
 		
 		<searches>0</searches>
 		<actions>1</actions>
-		<userId />
+		<userId>0</userId>
 		<visitorType>returning</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
 		<visitConverted>1</visitConverted>
@@ -2112,7 +2112,7 @@
 		
 		<searches>0</searches>
 		<actions>1</actions>
-		<userId />
+		<userId>0</userId>
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>1</visitConverted>
@@ -2237,7 +2237,7 @@
 		
 		<searches>0</searches>
 		<actions>2</actions>
-		<userId />
+		<userId>0</userId>
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>1</visitConverted>
@@ -2369,7 +2369,7 @@
 		
 		<searches>0</searches>
 		<actions>3</actions>
-		<userId />
+		<userId>0</userId>
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>0</visitConverted>
@@ -2477,7 +2477,7 @@
 		
 		<searches>0</searches>
 		<actions>1</actions>
-		<userId />
+		<userId>0</userId>
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>1</visitConverted>
@@ -2585,7 +2585,7 @@
 		
 		<searches>0</searches>
 		<actions>1</actions>
-		<userId />
+		<userId>0</userId>
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>1</visitConverted>
@@ -2683,7 +2683,7 @@
 		
 		<searches>0</searches>
 		<actions>1</actions>
-		<userId />
+		<userId>0</userId>
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>0</visitConverted>
@@ -2791,7 +2791,7 @@
 		
 		<searches>0</searches>
 		<actions>1</actions>
-		<userId />
+		<userId>0</userId>
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>1</visitConverted>
@@ -2899,7 +2899,7 @@
 		
 		<searches>0</searches>
 		<actions>1</actions>
-		<userId />
+		<userId>0</userId>
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>1</visitConverted>
@@ -3007,7 +3007,7 @@
 		
 		<searches>0</searches>
 		<actions>1</actions>
-		<userId />
+		<userId>0</userId>
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>1</visitConverted>
@@ -3111,7 +3111,7 @@
 		
 		<searches>0</searches>
 		<actions>1</actions>
-		<userId />
+		<userId>0</userId>
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>1</visitConverted>
@@ -3215,7 +3215,7 @@
 		
 		<searches>0</searches>
 		<actions>1</actions>
-		<userId />
+		<userId>0</userId>
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>1</visitConverted>
@@ -3319,7 +3319,7 @@
 		
 		<searches>0</searches>
 		<actions>1</actions>
-		<userId />
+		<userId>0</userId>
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>1</visitConverted>
@@ -3423,7 +3423,7 @@
 		
 		<searches>0</searches>
 		<actions>1</actions>
-		<userId />
+		<userId>0</userId>
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>1</visitConverted>
@@ -3527,7 +3527,7 @@
 		
 		<searches>0</searches>
 		<actions>1</actions>
-		<userId />
+		<userId>0</userId>
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>1</visitConverted>
@@ -3631,7 +3631,7 @@
 		
 		<searches>0</searches>
 		<actions>1</actions>
-		<userId />
+		<userId>0</userId>
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>1</visitConverted>
@@ -3735,7 +3735,7 @@
 		
 		<searches>0</searches>
 		<actions>1</actions>
-		<userId />
+		<userId>0</userId>
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>1</visitConverted>
@@ -3839,7 +3839,7 @@
 		
 		<searches>0</searches>
 		<actions>1</actions>
-		<userId />
+		<userId>0</userId>
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>1</visitConverted>
@@ -3943,7 +3943,7 @@
 		
 		<searches>0</searches>
 		<actions>1</actions>
-		<userId />
+		<userId>0</userId>
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>1</visitConverted>
@@ -4047,7 +4047,7 @@
 		
 		<searches>0</searches>
 		<actions>1</actions>
-		<userId />
+		<userId>0</userId>
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>1</visitConverted>
@@ -4151,7 +4151,7 @@
 		
 		<searches>0</searches>
 		<actions>1</actions>
-		<userId />
+		<userId>0</userId>
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>1</visitConverted>
@@ -4255,7 +4255,7 @@
 		
 		<searches>0</searches>
 		<actions>1</actions>
-		<userId />
+		<userId>0</userId>
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>1</visitConverted>
@@ -4359,7 +4359,7 @@
 		
 		<searches>0</searches>
 		<actions>1</actions>
-		<userId />
+		<userId>0</userId>
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>1</visitConverted>
@@ -4463,7 +4463,7 @@
 		
 		<searches>0</searches>
 		<actions>1</actions>
-		<userId />
+		<userId>0</userId>
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>1</visitConverted>
@@ -4567,7 +4567,7 @@
 		
 		<searches>0</searches>
 		<actions>1</actions>
-		<userId />
+		<userId>0</userId>
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>1</visitConverted>
@@ -4671,7 +4671,7 @@
 		
 		<searches>0</searches>
 		<actions>1</actions>
-		<userId />
+		<userId>0</userId>
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>1</visitConverted>
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__Provider.getProvider_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__Provider.getProvider_month.xml
index c4cf4f3179..e248df22a8 100644
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__Provider.getProvider_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__Provider.getProvider_month.xml
@@ -9,7 +9,7 @@
 		<bounce_count>25</bounce_count>
 		<nb_visits_converted>25</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>27</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>4</sum_daily_nb_users>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<url>http://piwik.org/faq/general/#faq_52</url>
 	</row>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__Referrers.getAll_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__Referrers.getAll_month.xml
index 1c43453213..808d27a0c7 100644
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__Referrers.getAll_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__Referrers.getAll_month.xml
@@ -17,7 +17,7 @@
 		<nb_conversions>1</nb_conversions>
 		<revenue>5</revenue>
 		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>1</sum_daily_nb_users>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<referer_type>3</referer_type>
 	</row>
 	<row>
@@ -37,7 +37,7 @@
 		<nb_conversions>1</nb_conversions>
 		<revenue>5</revenue>
 		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>1</sum_daily_nb_users>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<referer_type>3</referer_type>
 	</row>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__Referrers.getReferrerType_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__Referrers.getReferrerType_month.xml
index 8579d3283a..80a6349ac1 100644
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__Referrers.getReferrerType_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__Referrers.getReferrerType_month.xml
@@ -17,7 +17,7 @@
 		<nb_conversions>23</nb_conversions>
 		<revenue>115</revenue>
 		<sum_daily_nb_uniq_visitors>25</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>3</sum_daily_nb_users>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
 	</row>
 	<row>
 		<label>Websites</label>
@@ -36,7 +36,7 @@
 		<nb_conversions>2</nb_conversions>
 		<revenue>10</revenue>
 		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>2</sum_daily_nb_users>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<subtable>
 			<row>
 				<label>piwik.org</label>
@@ -55,7 +55,7 @@
 				<nb_conversions>1</nb_conversions>
 				<revenue>5</revenue>
 				<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-				<sum_daily_nb_users>1</sum_daily_nb_users>
+				<sum_daily_nb_users>0</sum_daily_nb_users>
 			</row>
 			<row>
 				<label>sn110w.snt110.mail.live.com</label>
@@ -74,7 +74,7 @@
 				<nb_conversions>1</nb_conversions>
 				<revenue>5</revenue>
 				<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-				<sum_daily_nb_users>1</sum_daily_nb_users>
+				<sum_daily_nb_users>0</sum_daily_nb_users>
 			</row>
 		</subtable>
 	</row>
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__Referrers.getWebsites_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__Referrers.getWebsites_month.xml
index 74a22451ad..bfba8f21af 100644
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__Referrers.getWebsites_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__Referrers.getWebsites_month.xml
@@ -17,7 +17,7 @@
 		<nb_conversions>1</nb_conversions>
 		<revenue>5</revenue>
 		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>1</sum_daily_nb_users>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<subtable>
 			<row>
 				<label>http://piwik.org/contribute%</label>
@@ -28,7 +28,7 @@
 				<bounce_count>1</bounce_count>
 				<nb_visits_converted>1</nb_visits_converted>
 				<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-				<sum_daily_nb_users>1</sum_daily_nb_users>
+				<sum_daily_nb_users>0</sum_daily_nb_users>
 			</row>
 		</subtable>
 	</row>
@@ -49,7 +49,7 @@
 		<nb_conversions>1</nb_conversions>
 		<revenue>5</revenue>
 		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>1</sum_daily_nb_users>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<subtable>
 			<row>
 				<label>http://sn110w.snt110.mail.live.com/mail/InboxLight.aspx?n=184083971</label>
@@ -60,7 +60,7 @@
 				<bounce_count>1</bounce_count>
 				<nb_visits_converted>1</nb_visits_converted>
 				<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-				<sum_daily_nb_users>1</sum_daily_nb_users>
+				<sum_daily_nb_users>0</sum_daily_nb_users>
 			</row>
 		</subtable>
 	</row>
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserCountry.getCity_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserCountry.getCity_month.xml
index 9567fc2f23..a14f0cec91 100644
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserCountry.getCity_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserCountry.getCity_month.xml
@@ -17,7 +17,7 @@
 		<nb_conversions>20</nb_conversions>
 		<revenue>100</revenue>
 		<sum_daily_nb_uniq_visitors>22</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>9</sum_daily_nb_users>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<city_name>Unknown</city_name>
 		<city>xx</city>
 		<region>xx</region>
@@ -43,7 +43,7 @@
 		<nb_conversions>5</nb_conversions>
 		<revenue>25</revenue>
 		<sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>2</sum_daily_nb_users>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<lat>39.044</lat>
 		<long>-77.488</long>
 		<city_name>Ashburn</city_name>
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserCountry.getContinent_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserCountry.getContinent_month.xml
index ff0a9a67d6..23e244b751 100644
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserCountry.getContinent_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserCountry.getContinent_month.xml
@@ -17,7 +17,7 @@
 		<nb_conversions>10</nb_conversions>
 		<revenue>50</revenue>
 		<sum_daily_nb_uniq_visitors>11</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>3</sum_daily_nb_users>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<code>Asia</code>
 	</row>
 	<row>
@@ -37,7 +37,7 @@
 		<nb_conversions>7</nb_conversions>
 		<revenue>35</revenue>
 		<sum_daily_nb_uniq_visitors>7</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>4</sum_daily_nb_users>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<code>Unknown</code>
 	</row>
 	<row>
@@ -57,7 +57,7 @@
 		<nb_conversions>5</nb_conversions>
 		<revenue>25</revenue>
 		<sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>2</sum_daily_nb_users>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<code>North America</code>
 	</row>
 	<row>
@@ -77,7 +77,7 @@
 		<nb_conversions>3</nb_conversions>
 		<revenue>15</revenue>
 		<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>1</sum_daily_nb_users>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<code>South America</code>
 	</row>
 	<row>
@@ -89,7 +89,7 @@
 		<bounce_count>1</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>1</sum_daily_nb_users>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<code>Oceania</code>
 	</row>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserCountry.getCountry_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserCountry.getCountry_month.xml
index 9e0087debc..ce5523efde 100644
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserCountry.getCountry_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserCountry.getCountry_month.xml
@@ -17,7 +17,7 @@
 		<nb_conversions>10</nb_conversions>
 		<revenue>50</revenue>
 		<sum_daily_nb_uniq_visitors>11</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>3</sum_daily_nb_users>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<code>jp</code>
 		<logo>plugins/UserCountry/images/flags/jp.png</logo>
 		<logoWidth>16</logoWidth>
@@ -40,7 +40,7 @@
 		<nb_conversions>7</nb_conversions>
 		<revenue>35</revenue>
 		<sum_daily_nb_uniq_visitors>7</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>4</sum_daily_nb_users>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<code>xx</code>
 		<logo>plugins/UserCountry/images/flags/xx.png</logo>
 		<logoWidth>16</logoWidth>
@@ -63,7 +63,7 @@
 		<nb_conversions>5</nb_conversions>
 		<revenue>25</revenue>
 		<sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>2</sum_daily_nb_users>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<code>us</code>
 		<logo>plugins/UserCountry/images/flags/us.png</logo>
 		<logoWidth>16</logoWidth>
@@ -86,7 +86,7 @@
 		<nb_conversions>3</nb_conversions>
 		<revenue>15</revenue>
 		<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>1</sum_daily_nb_users>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<code>br</code>
 		<logo>plugins/UserCountry/images/flags/br.png</logo>
 		<logoWidth>16</logoWidth>
@@ -101,7 +101,7 @@
 		<bounce_count>1</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>1</sum_daily_nb_users>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<code>au</code>
 		<logo>plugins/UserCountry/images/flags/au.png</logo>
 		<logoWidth>16</logoWidth>
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserCountry.getRegion_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserCountry.getRegion_month.xml
index a6ac17fd67..4067fb2618 100644
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserCountry.getRegion_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserCountry.getRegion_month.xml
@@ -17,7 +17,7 @@
 		<nb_conversions>20</nb_conversions>
 		<revenue>100</revenue>
 		<sum_daily_nb_uniq_visitors>22</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>9</sum_daily_nb_users>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<region>xx</region>
 		<country>xx</country>
 		<country_name>Unknown</country_name>
@@ -41,7 +41,7 @@
 		<nb_conversions>5</nb_conversions>
 		<revenue>25</revenue>
 		<sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>2</sum_daily_nb_users>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<region>VA</region>
 		<country>us</country>
 		<country_name>United States</country_name>
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getBrowserType_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getBrowserType_month.xml
index f3ad253189..0a914aaf35 100644
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getBrowserType_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getBrowserType_month.xml
@@ -9,7 +9,7 @@
 		<bounce_count>10</bounce_count>
 		<nb_visits_converted>10</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>10</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>7</sum_daily_nb_users>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<shortLabel>Webkit</shortLabel>
 	</row>
 	<row>
@@ -21,7 +21,7 @@
 		<bounce_count>7</bounce_count>
 		<nb_visits_converted>7</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>9</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>5</sum_daily_nb_users>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<shortLabel>Unknown</shortLabel>
 	</row>
 	<row>
@@ -33,7 +33,7 @@
 		<bounce_count>6</bounce_count>
 		<nb_visits_converted>6</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>4</sum_daily_nb_users>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<shortLabel>Ie</shortLabel>
 	</row>
 	<row>
@@ -45,7 +45,7 @@
 		<bounce_count>2</bounce_count>
 		<nb_visits_converted>2</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>1</sum_daily_nb_users>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<shortLabel>Gecko</shortLabel>
 	</row>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getBrowserVersion_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getBrowserVersion_month.xml
index 6e00118191..4be2e497a2 100644
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getBrowserVersion_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getBrowserVersion_month.xml
@@ -9,7 +9,7 @@
 		<bounce_count>5</bounce_count>
 		<nb_visits_converted>5</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>3</sum_daily_nb_users>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<logo>plugins/UserSettings/images/browsers/EP.gif</logo>
 		<shortLabel>Epiphany 2.30</shortLabel>
 	</row>
@@ -22,7 +22,7 @@
 		<bounce_count>5</bounce_count>
 		<nb_visits_converted>5</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>3</sum_daily_nb_users>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<logo>plugins/UserSettings/images/browsers/IE.gif</logo>
 		<shortLabel>Internet Explorer 9.0</shortLabel>
 	</row>
@@ -35,7 +35,7 @@
 		<bounce_count>3</bounce_count>
 		<nb_visits_converted>4</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>2</sum_daily_nb_users>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<logo>plugins/UserSettings/images/browsers/UNK.gif</logo>
 		<shortLabel>RockMelt 0.9</shortLabel>
 	</row>
@@ -48,7 +48,7 @@
 		<bounce_count>2</bounce_count>
 		<nb_visits_converted>2</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>2</sum_daily_nb_users>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<logo>plugins/UserSettings/images/browsers/AN.gif</logo>
 		<shortLabel>Android Browser </shortLabel>
 	</row>
@@ -61,7 +61,7 @@
 		<bounce_count>2</bounce_count>
 		<nb_visits_converted>2</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>1</sum_daily_nb_users>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<logo>plugins/UserSettings/images/browsers/CH.gif</logo>
 		<shortLabel>Chrome 19.0</shortLabel>
 	</row>
@@ -74,7 +74,7 @@
 		<bounce_count>2</bounce_count>
 		<nb_visits_converted>2</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>2</sum_daily_nb_users>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<logo>plugins/UserSettings/images/browsers/CH.gif</logo>
 		<shortLabel>Chrome 20.0</shortLabel>
 	</row>
@@ -87,7 +87,7 @@
 		<bounce_count>2</bounce_count>
 		<nb_visits_converted>2</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>1</sum_daily_nb_users>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<logo>plugins/UserSettings/images/browsers/FF.gif</logo>
 		<shortLabel>Firefox 6.0</shortLabel>
 	</row>
@@ -100,7 +100,7 @@
 		<bounce_count>2</bounce_count>
 		<nb_visits_converted>1</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>1</sum_daily_nb_users>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<logo>plugins/UserSettings/images/browsers/UNK.gif</logo>
 		<shortLabel>Unknown</shortLabel>
 	</row>
@@ -113,7 +113,7 @@
 		<bounce_count>1</bounce_count>
 		<nb_visits_converted>1</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>1</sum_daily_nb_users>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<logo>plugins/UserSettings/images/browsers/CH.gif</logo>
 		<shortLabel>Chrome 11.0</shortLabel>
 	</row>
@@ -126,7 +126,7 @@
 		<bounce_count>1</bounce_count>
 		<nb_visits_converted>1</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>1</sum_daily_nb_users>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<logo>plugins/UserSettings/images/browsers/IE.gif</logo>
 		<shortLabel>Internet Explorer 6.0</shortLabel>
 	</row>
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getBrowser_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getBrowser_month.xml
index 81101cc381..99d9c637a2 100644
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getBrowser_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getBrowser_month.xml
@@ -9,7 +9,7 @@
 		<bounce_count>5</bounce_count>
 		<nb_visits_converted>5</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>3</sum_daily_nb_users>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<logo>plugins/UserSettings/images/browsers/EP.gif</logo>
 	</row>
 	<row>
@@ -21,7 +21,7 @@
 		<bounce_count>6</bounce_count>
 		<nb_visits_converted>6</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>4</sum_daily_nb_users>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<logo>plugins/UserSettings/images/browsers/IE.gif</logo>
 	</row>
 	<row>
@@ -33,7 +33,7 @@
 		<bounce_count>3</bounce_count>
 		<nb_visits_converted>4</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>2</sum_daily_nb_users>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<logo>plugins/UserSettings/images/browsers/UNK.gif</logo>
 	</row>
 	<row>
@@ -45,7 +45,7 @@
 		<bounce_count>2</bounce_count>
 		<nb_visits_converted>2</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>2</sum_daily_nb_users>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<logo>plugins/UserSettings/images/browsers/AN.gif</logo>
 	</row>
 	<row>
@@ -57,7 +57,7 @@
 		<bounce_count>5</bounce_count>
 		<nb_visits_converted>5</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>4</sum_daily_nb_users>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<logo>plugins/UserSettings/images/browsers/CH.gif</logo>
 	</row>
 	<row>
@@ -69,7 +69,7 @@
 		<bounce_count>2</bounce_count>
 		<nb_visits_converted>2</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>1</sum_daily_nb_users>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<logo>plugins/UserSettings/images/browsers/FF.gif</logo>
 	</row>
 	<row>
@@ -81,7 +81,7 @@
 		<bounce_count>2</bounce_count>
 		<nb_visits_converted>1</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>1</sum_daily_nb_users>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<logo>plugins/UserSettings/images/browsers/UNK.gif</logo>
 	</row>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getConfiguration_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getConfiguration_month.xml
index f9654c1a34..99f2f8d770 100644
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getConfiguration_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getConfiguration_month.xml
@@ -9,7 +9,7 @@
 		<bounce_count>5</bounce_count>
 		<nb_visits_converted>5</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>3</sum_daily_nb_users>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
 	</row>
 	<row>
 		<label>Mac OS / RockMelt / unknown</label>
@@ -20,7 +20,7 @@
 		<bounce_count>3</bounce_count>
 		<nb_visits_converted>4</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>2</sum_daily_nb_users>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
 	</row>
 	<row>
 		<label>Windows 7 / Internet Explorer / unknown</label>
@@ -31,7 +31,7 @@
 		<bounce_count>5</bounce_count>
 		<nb_visits_converted>5</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>3</sum_daily_nb_users>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
 	</row>
 	<row>
 		<label>Android / Android Browser / unknown</label>
@@ -42,7 +42,7 @@
 		<bounce_count>2</bounce_count>
 		<nb_visits_converted>2</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>2</sum_daily_nb_users>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
 	</row>
 	<row>
 		<label>Linux / Firefox / unknown</label>
@@ -53,7 +53,7 @@
 		<bounce_count>2</bounce_count>
 		<nb_visits_converted>2</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>1</sum_daily_nb_users>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
 	</row>
 	<row>
 		<label>Windows 7 / Chrome / unknown</label>
@@ -64,7 +64,7 @@
 		<bounce_count>2</bounce_count>
 		<nb_visits_converted>2</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>2</sum_daily_nb_users>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
 	</row>
 	<row>
 		<label>Bot / Unknown / unknown</label>
@@ -75,7 +75,7 @@
 		<bounce_count>1</bounce_count>
 		<nb_visits_converted>1</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>1</sum_daily_nb_users>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
 	</row>
 	<row>
 		<label>Linux / Chrome / unknown</label>
@@ -86,7 +86,7 @@
 		<bounce_count>1</bounce_count>
 		<nb_visits_converted>1</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>1</sum_daily_nb_users>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
 	</row>
 	<row>
 		<label>Mac OS / Chrome / unknown</label>
@@ -97,7 +97,7 @@
 		<bounce_count>1</bounce_count>
 		<nb_visits_converted>1</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>1</sum_daily_nb_users>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
 	</row>
 	<row>
 		<label>Unknown / Unknown / unknown</label>
@@ -108,7 +108,7 @@
 		<bounce_count>1</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>1</sum_daily_nb_users>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
 	</row>
 	<row>
 		<label>Windows XP / Chrome / 1280x800</label>
@@ -119,7 +119,7 @@
 		<bounce_count>1</bounce_count>
 		<nb_visits_converted>1</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>1</sum_daily_nb_users>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
 	</row>
 	<row>
 		<label>Windows XP / Internet Explorer / 1024x768</label>
@@ -130,6 +130,6 @@
 		<bounce_count>1</bounce_count>
 		<nb_visits_converted>1</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>1</sum_daily_nb_users>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
 	</row>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getLanguage_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getLanguage_month.xml
index e08122bf12..1f8c578db7 100644
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getLanguage_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getLanguage_month.xml
@@ -9,6 +9,6 @@
 		<bounce_count>25</bounce_count>
 		<nb_visits_converted>25</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>27</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>4</sum_daily_nb_users>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
 	</row>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getMobileVsDesktop_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getMobileVsDesktop_month.xml
index 493d6eb7db..27bfc099ba 100644
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getMobileVsDesktop_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getMobileVsDesktop_month.xml
@@ -9,7 +9,7 @@
 		<bounce_count>21</bounce_count>
 		<nb_visits_converted>22</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>23</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>9</sum_daily_nb_users>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<logo>plugins/UserSettings/images/screens/normal.gif</logo>
 	</row>
 	<row>
@@ -21,7 +21,7 @@
 		<bounce_count>2</bounce_count>
 		<nb_visits_converted>2</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>2</sum_daily_nb_users>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<logo>plugins/UserSettings/images/screens/mobile.gif</logo>
 	</row>
 	<row>
@@ -33,7 +33,7 @@
 		<bounce_count>2</bounce_count>
 		<nb_visits_converted>1</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>2</sum_daily_nb_users>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<logo>plugins/UserSettings/images/os/UNK.gif</logo>
 	</row>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getOSFamily_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getOSFamily_month.xml
index 8f4652178c..cb47530ed2 100644
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getOSFamily_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getOSFamily_month.xml
@@ -9,7 +9,7 @@
 		<bounce_count>8</bounce_count>
 		<nb_visits_converted>8</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>8</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>3</sum_daily_nb_users>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<logo>plugins/UserSettings/images/os/LIN.gif</logo>
 	</row>
 	<row>
@@ -21,7 +21,7 @@
 		<bounce_count>9</bounce_count>
 		<nb_visits_converted>9</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>9</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>4</sum_daily_nb_users>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<logo>plugins/UserSettings/images/os/WXP.gif</logo>
 	</row>
 	<row>
@@ -33,7 +33,7 @@
 		<bounce_count>4</bounce_count>
 		<nb_visits_converted>5</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>2</sum_daily_nb_users>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<logo>plugins/UserSettings/images/os/MAC.gif</logo>
 	</row>
 	<row>
@@ -45,7 +45,7 @@
 		<bounce_count>2</bounce_count>
 		<nb_visits_converted>2</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>2</sum_daily_nb_users>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<logo>plugins/UserSettings/images/os/AND.gif</logo>
 	</row>
 	<row>
@@ -57,7 +57,7 @@
 		<bounce_count>2</bounce_count>
 		<nb_visits_converted>1</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>2</sum_daily_nb_users>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<logo>plugins/UserSettings/images/os/UNK.gif</logo>
 	</row>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getOS_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getOS_month.xml
index d64c5f8f98..1ac05e3dda 100644
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getOS_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getOS_month.xml
@@ -9,7 +9,7 @@
 		<bounce_count>8</bounce_count>
 		<nb_visits_converted>8</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>8</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>3</sum_daily_nb_users>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<logo>plugins/UserSettings/images/os/LIN.gif</logo>
 		<shortLabel>Linux</shortLabel>
 	</row>
@@ -22,7 +22,7 @@
 		<bounce_count>7</bounce_count>
 		<nb_visits_converted>7</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>7</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>3</sum_daily_nb_users>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<logo>plugins/UserSettings/images/os/WI7.gif</logo>
 		<shortLabel>Win 7</shortLabel>
 	</row>
@@ -35,7 +35,7 @@
 		<bounce_count>4</bounce_count>
 		<nb_visits_converted>5</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>2</sum_daily_nb_users>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<logo>plugins/UserSettings/images/os/MAC.gif</logo>
 		<shortLabel>Mac OS</shortLabel>
 	</row>
@@ -48,7 +48,7 @@
 		<bounce_count>2</bounce_count>
 		<nb_visits_converted>2</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>2</sum_daily_nb_users>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<logo>plugins/UserSettings/images/os/AND.gif</logo>
 		<shortLabel>Android</shortLabel>
 	</row>
@@ -61,7 +61,7 @@
 		<bounce_count>2</bounce_count>
 		<nb_visits_converted>2</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>1</sum_daily_nb_users>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<logo>plugins/UserSettings/images/os/WXP.gif</logo>
 		<shortLabel>Win XP</shortLabel>
 	</row>
@@ -74,7 +74,7 @@
 		<bounce_count>1</bounce_count>
 		<nb_visits_converted>1</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>1</sum_daily_nb_users>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<logo>plugins/UserSettings/images/os/UNK.gif</logo>
 		<shortLabel>BOT</shortLabel>
 	</row>
@@ -87,7 +87,7 @@
 		<bounce_count>1</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>1</sum_daily_nb_users>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<logo>plugins/UserSettings/images/os/UNK.gif</logo>
 		<shortLabel>Unknown</shortLabel>
 	</row>
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getResolution_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getResolution_month.xml
index ffd5d0c162..659d5beea1 100644
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getResolution_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getResolution_month.xml
@@ -9,7 +9,7 @@
 		<bounce_count>23</bounce_count>
 		<nb_visits_converted>23</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>25</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>3</sum_daily_nb_users>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
 	</row>
 	<row>
 		<label>1024x768</label>
@@ -20,7 +20,7 @@
 		<bounce_count>1</bounce_count>
 		<nb_visits_converted>1</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>1</sum_daily_nb_users>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
 	</row>
 	<row>
 		<label>1280x800</label>
@@ -31,6 +31,6 @@
 		<bounce_count>1</bounce_count>
 		<nb_visits_converted>1</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>1</sum_daily_nb_users>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
 	</row>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getWideScreen_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getWideScreen_month.xml
index 23755c4486..2048a44e64 100644
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getWideScreen_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getWideScreen_month.xml
@@ -9,7 +9,7 @@
 		<bounce_count>23</bounce_count>
 		<nb_visits_converted>23</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>25</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>3</sum_daily_nb_users>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<logo>plugins/UserSettings/images/screens/unknown.gif</logo>
 	</row>
 	<row>
@@ -21,7 +21,7 @@
 		<bounce_count>1</bounce_count>
 		<nb_visits_converted>1</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>1</sum_daily_nb_users>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<logo>plugins/UserSettings/images/screens/normal.gif</logo>
 	</row>
 	<row>
@@ -33,7 +33,7 @@
 		<bounce_count>1</bounce_count>
 		<nb_visits_converted>1</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>1</sum_daily_nb_users>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<logo>plugins/UserSettings/images/screens/wide.gif</logo>
 	</row>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitFrequency.get_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitFrequency.get_month.xml
index f4ff4bbd78..3633fe5914 100644
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitFrequency.get_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitFrequency.get_month.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <result>
 	<nb_uniq_visitors_returning>1</nb_uniq_visitors_returning>
-	<nb_users_returning>1</nb_users_returning>
+	<nb_users_returning>0</nb_users_returning>
 	<nb_visits_returning>1</nb_visits_returning>
 	<nb_actions_returning>1</nb_actions_returning>
 	<nb_visits_converted_returning>1</nb_visits_converted_returning>
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitTime.getByDayOfWeek_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitTime.getByDayOfWeek_month.xml
index 1c2689d174..1a729a8e26 100644
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitTime.getByDayOfWeek_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitTime.getByDayOfWeek_month.xml
@@ -15,7 +15,7 @@
 		<nb_visits>2</nb_visits>
 		<nb_uniq_visitors>2</nb_uniq_visitors>
 		<nb_actions>2</nb_actions>
-		<nb_users>1</nb_users>
+		<nb_users>0</nb_users>
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>2</bounce_count>
 		<nb_visits_converted>2</nb_visits_converted>
@@ -26,7 +26,7 @@
 		<nb_visits>9</nb_visits>
 		<nb_uniq_visitors>9</nb_uniq_visitors>
 		<nb_actions>9</nb_actions>
-		<nb_users>1</nb_users>
+		<nb_users>0</nb_users>
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>9</bounce_count>
 		<nb_visits_converted>9</nb_visits_converted>
@@ -37,7 +37,7 @@
 		<nb_visits>6</nb_visits>
 		<nb_uniq_visitors>6</nb_uniq_visitors>
 		<nb_actions>6</nb_actions>
-		<nb_users>1</nb_users>
+		<nb_users>0</nb_users>
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>6</bounce_count>
 		<nb_visits_converted>6</nb_visits_converted>
@@ -48,7 +48,7 @@
 		<nb_visits>10</nb_visits>
 		<nb_uniq_visitors>10</nb_uniq_visitors>
 		<nb_actions>13</nb_actions>
-		<nb_users>1</nb_users>
+		<nb_users>0</nb_users>
 		<sum_visit_length>305</sum_visit_length>
 		<bounce_count>8</bounce_count>
 		<nb_visits_converted>8</nb_visits_converted>
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitTime.getVisitInformationPerLocalTime_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitTime.getVisitInformationPerLocalTime_month.xml
index 580a24928f..427319a89f 100644
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitTime.getVisitInformationPerLocalTime_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitTime.getVisitInformationPerLocalTime_month.xml
@@ -97,7 +97,7 @@
 		<bounce_count>5</bounce_count>
 		<nb_visits_converted>5</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>2</sum_daily_nb_users>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
 	</row>
 	<row>
 		<label>9h</label>
@@ -141,7 +141,7 @@
 		<bounce_count>1</bounce_count>
 		<nb_visits_converted>1</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>1</sum_daily_nb_users>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
 	</row>
 	<row>
 		<label>13h</label>
@@ -152,7 +152,7 @@
 		<bounce_count>4</bounce_count>
 		<nb_visits_converted>4</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>2</sum_daily_nb_users>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
 	</row>
 	<row>
 		<label>14h</label>
@@ -174,7 +174,7 @@
 		<bounce_count>1</bounce_count>
 		<nb_visits_converted>1</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>1</sum_daily_nb_users>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
 	</row>
 	<row>
 		<label>16h</label>
@@ -185,7 +185,7 @@
 		<bounce_count>2</bounce_count>
 		<nb_visits_converted>2</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>1</sum_daily_nb_users>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
 	</row>
 	<row>
 		<label>17h</label>
@@ -196,7 +196,7 @@
 		<bounce_count>3</bounce_count>
 		<nb_visits_converted>2</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>1</sum_daily_nb_users>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
 	</row>
 	<row>
 		<label>18h</label>
@@ -207,7 +207,7 @@
 		<bounce_count>1</bounce_count>
 		<nb_visits_converted>1</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>2</sum_daily_nb_users>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
 	</row>
 	<row>
 		<label>19h</label>
@@ -218,7 +218,7 @@
 		<bounce_count>1</bounce_count>
 		<nb_visits_converted>2</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>2</sum_daily_nb_users>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
 	</row>
 	<row>
 		<label>20h</label>
@@ -229,7 +229,7 @@
 		<bounce_count>6</bounce_count>
 		<nb_visits_converted>6</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>3</sum_daily_nb_users>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
 	</row>
 	<row>
 		<label>21h</label>
@@ -240,7 +240,7 @@
 		<bounce_count>1</bounce_count>
 		<nb_visits_converted>1</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>1</sum_daily_nb_users>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
 	</row>
 	<row>
 		<label>22h</label>
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitTime.getVisitInformationPerServerTime_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitTime.getVisitInformationPerServerTime_month.xml
index 5bc568ab81..515e54eb3b 100644
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitTime.getVisitInformationPerServerTime_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitTime.getVisitInformationPerServerTime_month.xml
@@ -53,7 +53,7 @@
 		<bounce_count>1</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>1</sum_daily_nb_users>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<goals>
 			<row idgoal='1'>
 				<nb_conversions>1</nb_conversions>
@@ -95,7 +95,7 @@
 		<bounce_count>1</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>1</sum_daily_nb_users>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<goals>
 			<row idgoal='1'>
 				<nb_conversions>1</nb_conversions>
@@ -123,7 +123,7 @@
 		<nb_conversions>4</nb_conversions>
 		<revenue>20</revenue>
 		<sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>1</sum_daily_nb_users>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<nb_visits_converted>0</nb_visits_converted>
 	</row>
 	<row>
@@ -187,7 +187,7 @@
 		<nb_conversions>4</nb_conversions>
 		<revenue>20</revenue>
 		<sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>2</sum_daily_nb_users>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<nb_visits_converted>0</nb_visits_converted>
 	</row>
 	<row>
@@ -210,7 +210,7 @@
 		<bounce_count>1</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>1</sum_daily_nb_users>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<goals>
 			<row idgoal='1'>
 				<nb_conversions>1</nb_conversions>
@@ -230,7 +230,7 @@
 		<bounce_count>2</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>1</sum_daily_nb_users>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<goals>
 			<row idgoal='1'>
 				<nb_conversions>2</nb_conversions>
@@ -250,7 +250,7 @@
 		<bounce_count>3</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>1</sum_daily_nb_users>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<goals>
 			<row idgoal='1'>
 				<nb_conversions>2</nb_conversions>
@@ -270,7 +270,7 @@
 		<bounce_count>1</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>2</sum_daily_nb_users>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<goals>
 			<row idgoal='1'>
 				<nb_conversions>1</nb_conversions>
@@ -290,7 +290,7 @@
 		<bounce_count>1</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>2</sum_daily_nb_users>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<goals>
 			<row idgoal='1'>
 				<nb_conversions>2</nb_conversions>
@@ -318,7 +318,7 @@
 		<nb_conversions>6</nb_conversions>
 		<revenue>30</revenue>
 		<sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>3</sum_daily_nb_users>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<nb_visits_converted>0</nb_visits_converted>
 	</row>
 	<row>
@@ -338,7 +338,7 @@
 		<nb_conversions>1</nb_conversions>
 		<revenue>5</revenue>
 		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>1</sum_daily_nb_users>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<nb_visits_converted>0</nb_visits_converted>
 	</row>
 	<row>
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitsSummary.getUsers_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitsSummary.getUsers_month.xml
index 606fbb5241..f5722c2b94 100644
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitsSummary.getUsers_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitsSummary.getUsers_month.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8" ?>
-<result>1</result>
\ No newline at end of file
+<result>0</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitsSummary.get_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitsSummary.get_month.xml
index 2e8021bebd..327d564f47 100644
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitsSummary.get_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitsSummary.get_month.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <result>
 	<nb_uniq_visitors>27</nb_uniq_visitors>
-	<nb_users>1</nb_users>
+	<nb_users>0</nb_users>
 	<nb_visits>27</nb_visits>
 	<nb_actions>30</nb_actions>
 	<nb_visits_converted>25</nb_visits_converted>
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs_siteIdTwo_TrackedUsingLogReplay__VisitsSummary.get_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs_siteIdTwo_TrackedUsingLogReplay__VisitsSummary.get_month.xml
index 00ebb388f0..b0e66b9280 100644
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs_siteIdTwo_TrackedUsingLogReplay__VisitsSummary.get_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ImportLogs_siteIdTwo_TrackedUsingLogReplay__VisitsSummary.get_month.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <result>
 	<nb_uniq_visitors>1</nb_uniq_visitors>
-	<nb_users>1</nb_users>
+	<nb_users>0</nb_users>
 	<nb_visits>1</nb_visits>
 	<nb_actions>1</nb_actions>
 	<nb_visits_converted>0</nb_visits_converted>
diff --git a/tests/PHPUnit/Integration/expected/test_LabelFilter_keywords_html__Referrers.getSearchEngines_day.xml b/tests/PHPUnit/Integration/expected/test_LabelFilter_keywords_html__Referrers.getSearchEngines_day.xml
index 28fbf3b98b..411d2a2eb9 100644
--- a/tests/PHPUnit/Integration/expected/test_LabelFilter_keywords_html__Referrers.getSearchEngines_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_LabelFilter_keywords_html__Referrers.getSearchEngines_day.xml
@@ -5,7 +5,7 @@
 		<nb_uniq_visitors>1</nb_uniq_visitors>
 		<nb_visits>1</nb_visits>
 		<nb_actions>9</nb_actions>
-		<nb_users>1</nb_users>
+		<nb_users>0</nb_users>
 		<max_actions>9</max_actions>
 		<sum_visit_length>1441</sum_visit_length>
 		<bounce_count>0</bounce_count>
diff --git a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisitAsc__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisitAsc__Live.getLastVisitsDetails_month.xml
index 53636dbe00..1ab2bce22c 100644
--- a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisitAsc__Live.getLastVisitsDetails_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisitAsc__Live.getLastVisitsDetails_month.xml
@@ -43,7 +43,7 @@
 		
 		
 		
-		<userId />
+		<userId>0</userId>
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>1</visitConverted>
@@ -199,7 +199,7 @@
 		
 		
 		
-		<userId />
+		<userId>0</userId>
 		<visitorType>returningCustomer</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
 		<visitConverted>1</visitConverted>
@@ -324,7 +324,7 @@
 		
 		
 		
-		<userId />
+		<userId>0</userId>
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>1</visitConverted>
@@ -480,7 +480,7 @@
 		
 		
 		
-		<userId />
+		<userId>0</userId>
 		<visitorType>returningCustomer</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
 		<visitConverted>1</visitConverted>
@@ -605,7 +605,7 @@
 		
 		
 		
-		<userId />
+		<userId>0</userId>
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>1</visitConverted>
@@ -761,7 +761,7 @@
 		
 		
 		
-		<userId />
+		<userId>0</userId>
 		<visitorType>returningCustomer</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
 		<visitConverted>1</visitConverted>
@@ -878,7 +878,7 @@
 		
 		
 		
-		<userId />
+		<userId>0</userId>
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>1</visitConverted>
diff --git a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisit__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisit__Live.getLastVisitsDetails_month.xml
index 47c2f38c4e..08efeed493 100644
--- a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisit__Live.getLastVisitsDetails_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisit__Live.getLastVisitsDetails_month.xml
@@ -181,7 +181,7 @@
 		
 		
 		
-		<userId />
+		<userId>0</userId>
 		<visitorType>returningCustomer</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
 		<visitConverted>1</visitConverted>
@@ -306,7 +306,7 @@
 		
 		
 		
-		<userId />
+		<userId>0</userId>
 		<visitorType>returningCustomer</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
 		<visitConverted>1</visitConverted>
@@ -445,7 +445,7 @@
 		
 		
 		
-		<userId />
+		<userId>0</userId>
 		<visitorType>returningCustomer</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
 		<visitConverted>1</visitConverted>
@@ -570,7 +570,7 @@
 		
 		
 		
-		<userId />
+		<userId>0</userId>
 		<visitorType>returningCustomer</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
 		<visitConverted>1</visitConverted>
@@ -726,7 +726,7 @@
 		
 		
 		
-		<userId />
+		<userId>0</userId>
 		<visitorType>returningCustomer</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
 		<visitConverted>1</visitConverted>
@@ -851,7 +851,7 @@
 		
 		
 		
-		<userId />
+		<userId>0</userId>
 		<visitorType>returningCustomer</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
 		<visitConverted>1</visitConverted>
diff --git a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByVisitCount__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByVisitCount__Live.getLastVisitsDetails_month.xml
index 8c0eba69bb..af635609ab 100644
--- a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByVisitCount__Live.getLastVisitsDetails_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByVisitCount__Live.getLastVisitsDetails_month.xml
@@ -74,7 +74,7 @@
 		
 		
 		
-		<userId />
+		<userId>0</userId>
 		<visitorType>returningCustomer</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
 		<visitConverted>1</visitConverted>
@@ -199,7 +199,7 @@
 		
 		
 		
-		<userId />
+		<userId>0</userId>
 		<visitorType>returningCustomer</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
 		<visitConverted>1</visitConverted>
@@ -355,7 +355,7 @@
 		
 		
 		
-		<userId />
+		<userId>0</userId>
 		<visitorType>returningCustomer</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
 		<visitConverted>1</visitConverted>
@@ -494,7 +494,7 @@
 		
 		
 		
-		<userId />
+		<userId>0</userId>
 		<visitorType>returningCustomer</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
 		<visitConverted>1</visitConverted>
@@ -619,7 +619,7 @@
 		
 		
 		
-		<userId />
+		<userId>0</userId>
 		<visitorType>returningCustomer</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
 		<visitConverted>1</visitConverted>
@@ -744,7 +744,7 @@
 		
 		
 		
-		<userId />
+		<userId>0</userId>
 		<visitorType>returningCustomer</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
 		<visitConverted>1</visitConverted>
diff --git a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortDesc__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortDesc__Live.getLastVisitsDetails_month.xml
index 47c2f38c4e..08efeed493 100644
--- a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortDesc__Live.getLastVisitsDetails_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortDesc__Live.getLastVisitsDetails_month.xml
@@ -181,7 +181,7 @@
 		
 		
 		
-		<userId />
+		<userId>0</userId>
 		<visitorType>returningCustomer</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
 		<visitConverted>1</visitConverted>
@@ -306,7 +306,7 @@
 		
 		
 		
-		<userId />
+		<userId>0</userId>
 		<visitorType>returningCustomer</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
 		<visitConverted>1</visitConverted>
@@ -445,7 +445,7 @@
 		
 		
 		
-		<userId />
+		<userId>0</userId>
 		<visitorType>returningCustomer</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
 		<visitConverted>1</visitConverted>
@@ -570,7 +570,7 @@
 		
 		
 		
-		<userId />
+		<userId>0</userId>
 		<visitorType>returningCustomer</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
 		<visitConverted>1</visitConverted>
@@ -726,7 +726,7 @@
 		
 		
 		
-		<userId />
+		<userId>0</userId>
 		<visitorType>returningCustomer</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
 		<visitConverted>1</visitConverted>
@@ -851,7 +851,7 @@
 		
 		
 		
-		<userId />
+		<userId>0</userId>
 		<visitorType>returningCustomer</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
 		<visitConverted>1</visitConverted>
diff --git a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest__Live.getLastVisitsDetails_month.xml
index ce1748a73a..59c6334162 100644
--- a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest__Live.getLastVisitsDetails_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest__Live.getLastVisitsDetails_month.xml
@@ -181,7 +181,7 @@
 		
 		
 		
-		<userId />
+		<userId>0</userId>
 		<visitorType>returningCustomer</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
 		<visitConverted>1</visitConverted>
@@ -306,7 +306,7 @@
 		
 		
 		
-		<userId />
+		<userId>0</userId>
 		<visitorType>returningCustomer</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
 		<visitConverted>1</visitConverted>
@@ -445,7 +445,7 @@
 		
 		
 		
-		<userId />
+		<userId>0</userId>
 		<visitorType>returningCustomer</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
 		<visitConverted>1</visitConverted>
@@ -570,7 +570,7 @@
 		
 		
 		
-		<userId />
+		<userId>0</userId>
 		<visitorType>returningCustomer</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
 		<visitConverted>1</visitConverted>
@@ -726,7 +726,7 @@
 		
 		
 		
-		<userId />
+		<userId>0</userId>
 		<visitorType>returningCustomer</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
 		<visitConverted>1</visitConverted>
@@ -851,7 +851,7 @@
 		
 		
 		
-		<userId />
+		<userId>0</userId>
 		<visitorType>returningCustomer</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
 		<visitConverted>1</visitConverted>
@@ -990,7 +990,7 @@
 		
 		
 		
-		<userId />
+		<userId>0</userId>
 		<visitorType>returningCustomer</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
 		<visitConverted>1</visitConverted>
@@ -1115,7 +1115,7 @@
 		
 		
 		
-		<userId />
+		<userId>0</userId>
 		<visitorType>returningCustomer</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
 		<visitConverted>1</visitConverted>
@@ -1271,7 +1271,7 @@
 		
 		
 		
-		<userId />
+		<userId>0</userId>
 		<visitorType>returningCustomer</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
 		<visitConverted>1</visitConverted>
diff --git a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getCity_month.xml b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getCity_month.xml
index 7a27573cee..15d7f11b70 100644
--- a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getCity_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getCity_month.xml
@@ -22,7 +22,7 @@
 		<nb_conversions>12</nb_conversions>
 		<revenue>60</revenue>
 		<sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>4</sum_daily_nb_users>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<city_name>Unknown</city_name>
 		<city>xx</city>
 		<region>xx</region>
@@ -53,7 +53,7 @@
 		<nb_conversions>9</nb_conversions>
 		<revenue>45</revenue>
 		<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>2</sum_daily_nb_users>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<lat>49.25</lat>
 		<long>-123.133</long>
 		<city_name>Vancouver</city_name>
@@ -85,7 +85,7 @@
 		<nb_conversions>6</nb_conversions>
 		<revenue>30</revenue>
 		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>2</sum_daily_nb_users>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<lat>124.456</lat>
 		<long>22.231</long>
 		<city_name>Stratford-upon-Avon</city_name>
@@ -117,7 +117,7 @@
 		<nb_conversions>3</nb_conversions>
 		<revenue>15</revenue>
 		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>1</sum_daily_nb_users>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<lat>47.249</lat>
 		<long>6.018</long>
 		<city_name>Besançon</city_name>
@@ -149,7 +149,7 @@
 		<nb_conversions>3</nb_conversions>
 		<revenue>15</revenue>
 		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>1</sum_daily_nb_users>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<city_name>Hluboká nad Vltavou</city_name>
 		<region>66</region>
 		<country>ru</country>
@@ -179,7 +179,7 @@
 		<nb_conversions>3</nb_conversions>
 		<revenue>15</revenue>
 		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>1</sum_daily_nb_users>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<lat>29.65</lat>
 		<long>91.1</long>
 		<city_name>Lhasa</city_name>
@@ -211,7 +211,7 @@
 		<nb_conversions>3</nb_conversions>
 		<revenue>15</revenue>
 		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>1</sum_daily_nb_users>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<city_name>London</city_name>
 		<region>H9</region>
 		<country>gb</country>
@@ -241,7 +241,7 @@
 		<nb_conversions>3</nb_conversions>
 		<revenue>15</revenue>
 		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>1</sum_daily_nb_users>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<city_name>Nuneaton and Bedworth</city_name>
 		<region>P3</region>
 		<country>gb</country>
@@ -271,7 +271,7 @@
 		<nb_conversions>3</nb_conversions>
 		<revenue>15</revenue>
 		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>1</sum_daily_nb_users>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<city_name>Stratford-upon-Avon</city_name>
 		<region>66</region>
 		<country>mk</country>
@@ -301,7 +301,7 @@
 		<nb_conversions>3</nb_conversions>
 		<revenue>15</revenue>
 		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>1</sum_daily_nb_users>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<city_name>Stratford-upon-Avon</city_name>
 		<region>66</region>
 		<country>ru</country>
@@ -331,7 +331,7 @@
 		<nb_conversions>3</nb_conversions>
 		<revenue>15</revenue>
 		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>1</sum_daily_nb_users>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<city_name>Stratford-upon-Avon</city_name>
 		<region>G5</region>
 		<country>gb</country>
diff --git a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getContinent_month.xml b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getContinent_month.xml
index ff0c032056..9572d1df13 100644
--- a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getContinent_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getContinent_month.xml
@@ -22,7 +22,7 @@
 		<nb_conversions>30</nb_conversions>
 		<revenue>150</revenue>
 		<sum_daily_nb_uniq_visitors>10</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>10</sum_daily_nb_users>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<code>Europe</code>
 	</row>
 	<row>
@@ -47,7 +47,7 @@
 		<nb_conversions>10</nb_conversions>
 		<revenue>50</revenue>
 		<sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>3</sum_daily_nb_users>
+		<sum_daily_nb_users>1</sum_daily_nb_users>
 		<code>North America</code>
 	</row>
 	<row>
@@ -72,7 +72,7 @@
 		<nb_conversions>6</nb_conversions>
 		<revenue>30</revenue>
 		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>2</sum_daily_nb_users>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<code>Unknown</code>
 	</row>
 	<row>
@@ -97,7 +97,7 @@
 		<nb_conversions>6</nb_conversions>
 		<revenue>30</revenue>
 		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>2</sum_daily_nb_users>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<code>Asia</code>
 	</row>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getCountry_month.xml b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getCountry_month.xml
index 7a4e15a2ce..c37c6d773b 100644
--- a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getCountry_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getCountry_month.xml
@@ -22,7 +22,7 @@
 		<nb_conversions>15</nb_conversions>
 		<revenue>75</revenue>
 		<sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>5</sum_daily_nb_users>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<code>gb</code>
 		<logo>plugins/UserCountry/images/flags/gb.png</logo>
 		<logoWidth>16</logoWidth>
@@ -50,7 +50,7 @@
 		<nb_conversions>9</nb_conversions>
 		<revenue>45</revenue>
 		<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>2</sum_daily_nb_users>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<code>ca</code>
 		<logo>plugins/UserCountry/images/flags/ca.png</logo>
 		<logoWidth>16</logoWidth>
@@ -78,7 +78,7 @@
 		<nb_conversions>6</nb_conversions>
 		<revenue>30</revenue>
 		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>2</sum_daily_nb_users>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<code>ru</code>
 		<logo>plugins/UserCountry/images/flags/ru.png</logo>
 		<logoWidth>16</logoWidth>
@@ -106,7 +106,7 @@
 		<nb_conversions>6</nb_conversions>
 		<revenue>30</revenue>
 		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>2</sum_daily_nb_users>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<code>xx</code>
 		<logo>plugins/UserCountry/images/flags/xx.png</logo>
 		<logoWidth>16</logoWidth>
@@ -134,7 +134,7 @@
 		<nb_conversions>3</nb_conversions>
 		<revenue>15</revenue>
 		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>1</sum_daily_nb_users>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<code>fr</code>
 		<logo>plugins/UserCountry/images/flags/fr.png</logo>
 		<logoWidth>16</logoWidth>
@@ -162,7 +162,7 @@
 		<nb_conversions>3</nb_conversions>
 		<revenue>15</revenue>
 		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>1</sum_daily_nb_users>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<code>id</code>
 		<logo>plugins/UserCountry/images/flags/id.png</logo>
 		<logoWidth>16</logoWidth>
@@ -190,7 +190,7 @@
 		<nb_conversions>3</nb_conversions>
 		<revenue>15</revenue>
 		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>1</sum_daily_nb_users>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<code>it</code>
 		<logo>plugins/UserCountry/images/flags/it.png</logo>
 		<logoWidth>16</logoWidth>
@@ -218,7 +218,7 @@
 		<nb_conversions>3</nb_conversions>
 		<revenue>15</revenue>
 		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>1</sum_daily_nb_users>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<code>mk</code>
 		<logo>plugins/UserCountry/images/flags/mk.png</logo>
 		<logoWidth>16</logoWidth>
@@ -246,7 +246,7 @@
 		<nb_conversions>3</nb_conversions>
 		<revenue>15</revenue>
 		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>1</sum_daily_nb_users>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<code>ti</code>
 		<logo>plugins/UserCountry/images/flags/ti.png</logo>
 		<logoWidth>16</logoWidth>
diff --git a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getRegion_month.xml b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getRegion_month.xml
index b0ff278d85..dc3dfb8724 100644
--- a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getRegion_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getRegion_month.xml
@@ -22,7 +22,7 @@
 		<nb_conversions>12</nb_conversions>
 		<revenue>60</revenue>
 		<sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>4</sum_daily_nb_users>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<region>xx</region>
 		<country>xx</country>
 		<country_name>Unknown</country_name>
@@ -51,7 +51,7 @@
 		<nb_conversions>9</nb_conversions>
 		<revenue>45</revenue>
 		<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>2</sum_daily_nb_users>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<region>BC</region>
 		<country>ca</country>
 		<country_name>Canada</country_name>
@@ -80,7 +80,7 @@
 		<nb_conversions>9</nb_conversions>
 		<revenue>45</revenue>
 		<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>3</sum_daily_nb_users>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<region>P3</region>
 		<country>gb</country>
 		<country_name>United Kingdom</country_name>
@@ -109,7 +109,7 @@
 		<nb_conversions>6</nb_conversions>
 		<revenue>30</revenue>
 		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>2</sum_daily_nb_users>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<region>66</region>
 		<country>ru</country>
 		<country_name>Russian Federation</country_name>
@@ -138,7 +138,7 @@
 		<nb_conversions>3</nb_conversions>
 		<revenue>15</revenue>
 		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>1</sum_daily_nb_users>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<region>1</region>
 		<country>ti</country>
 		<country_name>Tibet</country_name>
@@ -167,7 +167,7 @@
 		<nb_conversions>3</nb_conversions>
 		<revenue>15</revenue>
 		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>1</sum_daily_nb_users>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<region>66</region>
 		<country>mk</country>
 		<country_name>Macedonia, the Former Yugoslav Republic of</country_name>
@@ -196,7 +196,7 @@
 		<nb_conversions>3</nb_conversions>
 		<revenue>15</revenue>
 		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>1</sum_daily_nb_users>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<region>A6</region>
 		<country>fr</country>
 		<country_name>France</country_name>
@@ -225,7 +225,7 @@
 		<nb_conversions>3</nb_conversions>
 		<revenue>15</revenue>
 		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>1</sum_daily_nb_users>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<region>G5</region>
 		<country>gb</country>
 		<country_name>United Kingdom</country_name>
@@ -254,7 +254,7 @@
 		<nb_conversions>3</nb_conversions>
 		<revenue>15</revenue>
 		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>1</sum_daily_nb_users>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<region>H9</region>
 		<country>gb</country>
 		<country_name>United Kingdom</country_name>
diff --git a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_city__UserCountry.getCity_month.xml b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_city__UserCountry.getCity_month.xml
index 0e4bd32e99..9f9d42d029 100644
--- a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_city__UserCountry.getCity_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_city__UserCountry.getCity_month.xml
@@ -22,7 +22,7 @@
 		<nb_conversions>6</nb_conversions>
 		<revenue>30</revenue>
 		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>2</sum_daily_nb_users>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<lat>124.456</lat>
 		<long>22.231</long>
 		<city_name>Stratford-upon-Avon</city_name>
diff --git a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_city__UserCountry.getContinent_month.xml b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_city__UserCountry.getContinent_month.xml
index 8c500c205d..0d795a3fdc 100644
--- a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_city__UserCountry.getContinent_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_city__UserCountry.getContinent_month.xml
@@ -22,7 +22,7 @@
 		<nb_conversions>6</nb_conversions>
 		<revenue>30</revenue>
 		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>2</sum_daily_nb_users>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<code>Europe</code>
 	</row>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_city__UserCountry.getCountry_month.xml b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_city__UserCountry.getCountry_month.xml
index 64a6c81f5a..369a9aa0e0 100644
--- a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_city__UserCountry.getCountry_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_city__UserCountry.getCountry_month.xml
@@ -22,7 +22,7 @@
 		<nb_conversions>6</nb_conversions>
 		<revenue>30</revenue>
 		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>2</sum_daily_nb_users>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<code>gb</code>
 		<logo>plugins/UserCountry/images/flags/gb.png</logo>
 		<logoWidth>16</logoWidth>
diff --git a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_city__UserCountry.getRegion_month.xml b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_city__UserCountry.getRegion_month.xml
index 7a5f4e14d5..1324cdf0bc 100644
--- a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_city__UserCountry.getRegion_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_city__UserCountry.getRegion_month.xml
@@ -22,7 +22,7 @@
 		<nb_conversions>6</nb_conversions>
 		<revenue>30</revenue>
 		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>2</sum_daily_nb_users>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<region>P3</region>
 		<country>gb</country>
 		<country_name>United Kingdom</country_name>
diff --git a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_continent__UserCountry.getCountry_month.xml b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_continent__UserCountry.getCountry_month.xml
index 58c9998d63..18fe81f3a0 100644
--- a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_continent__UserCountry.getCountry_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_continent__UserCountry.getCountry_month.xml
@@ -22,7 +22,7 @@
 		<nb_conversions>15</nb_conversions>
 		<revenue>75</revenue>
 		<sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>5</sum_daily_nb_users>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<code>gb</code>
 		<logo>plugins/UserCountry/images/flags/gb.png</logo>
 		<logoWidth>16</logoWidth>
@@ -50,7 +50,7 @@
 		<nb_conversions>6</nb_conversions>
 		<revenue>30</revenue>
 		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>2</sum_daily_nb_users>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<code>ru</code>
 		<logo>plugins/UserCountry/images/flags/ru.png</logo>
 		<logoWidth>16</logoWidth>
@@ -78,7 +78,7 @@
 		<nb_conversions>3</nb_conversions>
 		<revenue>15</revenue>
 		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>1</sum_daily_nb_users>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<code>fr</code>
 		<logo>plugins/UserCountry/images/flags/fr.png</logo>
 		<logoWidth>16</logoWidth>
@@ -106,7 +106,7 @@
 		<nb_conversions>3</nb_conversions>
 		<revenue>15</revenue>
 		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>1</sum_daily_nb_users>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<code>it</code>
 		<logo>plugins/UserCountry/images/flags/it.png</logo>
 		<logoWidth>16</logoWidth>
@@ -134,7 +134,7 @@
 		<nb_conversions>3</nb_conversions>
 		<revenue>15</revenue>
 		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>1</sum_daily_nb_users>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<code>mk</code>
 		<logo>plugins/UserCountry/images/flags/mk.png</logo>
 		<logoWidth>16</logoWidth>
diff --git a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getCity_month.xml b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getCity_month.xml
index cd90855e1f..77c07df86f 100644
--- a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getCity_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getCity_month.xml
@@ -22,7 +22,7 @@
 		<nb_conversions>9</nb_conversions>
 		<revenue>45</revenue>
 		<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>2</sum_daily_nb_users>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<lat>49.25</lat>
 		<long>-123.133</long>
 		<city_name>Vancouver</city_name>
diff --git a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getContinent_month.xml b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getContinent_month.xml
index d94f907eaf..6f06048a7f 100644
--- a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getContinent_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getContinent_month.xml
@@ -22,7 +22,7 @@
 		<nb_conversions>9</nb_conversions>
 		<revenue>45</revenue>
 		<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>2</sum_daily_nb_users>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<code>North America</code>
 	</row>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getCountry_month.xml b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getCountry_month.xml
index a0f1d322a8..f881b40d77 100644
--- a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getCountry_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getCountry_month.xml
@@ -22,7 +22,7 @@
 		<nb_conversions>9</nb_conversions>
 		<revenue>45</revenue>
 		<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>2</sum_daily_nb_users>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<code>ca</code>
 		<logo>plugins/UserCountry/images/flags/ca.png</logo>
 		<logoWidth>16</logoWidth>
diff --git a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getRegion_month.xml b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getRegion_month.xml
index 629e659397..16373b92ee 100644
--- a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getRegion_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getRegion_month.xml
@@ -22,7 +22,7 @@
 		<nb_conversions>9</nb_conversions>
 		<revenue>45</revenue>
 		<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>2</sum_daily_nb_users>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<region>BC</region>
 		<country>ca</country>
 		<country_name>Canada</country_name>
diff --git a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getCity_month.xml b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getCity_month.xml
index 5f4e93831d..0f87ed59f3 100644
--- a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getCity_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getCity_month.xml
@@ -22,7 +22,7 @@
 		<nb_conversions>6</nb_conversions>
 		<revenue>30</revenue>
 		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>2</sum_daily_nb_users>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<lat>124.456</lat>
 		<long>22.231</long>
 		<city_name>Stratford-upon-Avon</city_name>
@@ -54,7 +54,7 @@
 		<nb_conversions>3</nb_conversions>
 		<revenue>15</revenue>
 		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>1</sum_daily_nb_users>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<city_name>Nuneaton and Bedworth</city_name>
 		<region>P3</region>
 		<country>gb</country>
diff --git a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getContinent_month.xml b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getContinent_month.xml
index 4e05e6e6cb..b5566a46cd 100644
--- a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getContinent_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getContinent_month.xml
@@ -22,7 +22,7 @@
 		<nb_conversions>9</nb_conversions>
 		<revenue>45</revenue>
 		<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>3</sum_daily_nb_users>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<code>Europe</code>
 	</row>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getCountry_month.xml b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getCountry_month.xml
index 02920d53d3..48c3eea1ad 100644
--- a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getCountry_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getCountry_month.xml
@@ -22,7 +22,7 @@
 		<nb_conversions>9</nb_conversions>
 		<revenue>45</revenue>
 		<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>3</sum_daily_nb_users>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<code>gb</code>
 		<logo>plugins/UserCountry/images/flags/gb.png</logo>
 		<logoWidth>16</logoWidth>
diff --git a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getRegion_month.xml b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getRegion_month.xml
index 43b33f1cb5..5b3a0754a3 100644
--- a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getRegion_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getRegion_month.xml
@@ -22,7 +22,7 @@
 		<nb_conversions>9</nb_conversions>
 		<revenue>45</revenue>
 		<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>3</sum_daily_nb_users>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<region>P3</region>
 		<country>gb</country>
 		<country_name>United Kingdom</country_name>
diff --git a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_sortByProcessedMetric_constantRowsCountShouldKeepEmptyRows__API.getProcessedReport_day.xml b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_sortByProcessedMetric_constantRowsCountShouldKeepEmptyRows__API.getProcessedReport_day.xml
index 70a94cb5a5..3861e6c668 100644
--- a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_sortByProcessedMetric_constantRowsCountShouldKeepEmptyRows__API.getProcessedReport_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_sortByProcessedMetric_constantRowsCountShouldKeepEmptyRows__API.getProcessedReport_day.xml
@@ -54,7 +54,7 @@
 			<nb_uniq_visitors>4</nb_uniq_visitors>
 			<nb_visits>4</nb_visits>
 			<nb_actions>12</nb_actions>
-			<nb_users>1</nb_users>
+			<nb_users>0</nb_users>
 			<revenue>$ 40</revenue>
 			<nb_actions_per_visit>3</nb_actions_per_visit>
 			<avg_time_on_site>00:21:01</avg_time_on_site>
@@ -65,7 +65,7 @@
 			<nb_uniq_visitors>4</nb_uniq_visitors>
 			<nb_visits>4</nb_visits>
 			<nb_actions>4</nb_actions>
-			<nb_users>1</nb_users>
+			<nb_users>0</nb_users>
 			<revenue>$ 20</revenue>
 			<nb_actions_per_visit>1</nb_actions_per_visit>
 			<avg_time_on_site>00:00:00</avg_time_on_site>
diff --git a/tests/PHPUnit/Integration/expected/test_MultipleSitesArchivingTest_sitesGroup__VisitsSummary.get_day.xml b/tests/PHPUnit/Integration/expected/test_MultipleSitesArchivingTest_sitesGroup__VisitsSummary.get_day.xml
index 428508cf56..64e9c36af1 100644
--- a/tests/PHPUnit/Integration/expected/test_MultipleSitesArchivingTest_sitesGroup__VisitsSummary.get_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_MultipleSitesArchivingTest_sitesGroup__VisitsSummary.get_day.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <result>
 	<nb_uniq_visitors>3</nb_uniq_visitors>
-	<nb_users>1</nb_users>
+	<nb_users>0</nb_users>
 	<nb_visits>5</nb_visits>
 	<nb_actions>5</nb_actions>
 	<nb_visits_converted>0</nb_visits_converted>
diff --git a/tests/PHPUnit/Integration/expected/test_MultipleSitesArchivingTest_sitesGroup__VisitsSummary.get_month.xml b/tests/PHPUnit/Integration/expected/test_MultipleSitesArchivingTest_sitesGroup__VisitsSummary.get_month.xml
index 428508cf56..64e9c36af1 100644
--- a/tests/PHPUnit/Integration/expected/test_MultipleSitesArchivingTest_sitesGroup__VisitsSummary.get_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_MultipleSitesArchivingTest_sitesGroup__VisitsSummary.get_month.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <result>
 	<nb_uniq_visitors>3</nb_uniq_visitors>
-	<nb_users>1</nb_users>
+	<nb_users>0</nb_users>
 	<nb_visits>5</nb_visits>
 	<nb_actions>5</nb_actions>
 	<nb_visits_converted>0</nb_visits_converted>
diff --git a/tests/PHPUnit/Integration/expected/test_NonUnicode__Referrers.getWebsites_day.xml b/tests/PHPUnit/Integration/expected/test_NonUnicode__Referrers.getWebsites_day.xml
index 4581cf832f..bf07781a28 100644
--- a/tests/PHPUnit/Integration/expected/test_NonUnicode__Referrers.getWebsites_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_NonUnicode__Referrers.getWebsites_day.xml
@@ -5,7 +5,7 @@
 		<nb_uniq_visitors>2</nb_uniq_visitors>
 		<nb_visits>2</nb_visits>
 		<nb_actions>6</nb_actions>
-		<nb_users>2</nb_users>
+		<nb_users>0</nb_users>
 		<max_actions>5</max_actions>
 		<sum_visit_length>721</sum_visit_length>
 		<bounce_count>1</bounce_count>
@@ -16,7 +16,7 @@
 				<nb_uniq_visitors>1</nb_uniq_visitors>
 				<nb_visits>1</nb_visits>
 				<nb_actions>1</nb_actions>
-				<nb_users>1</nb_users>
+				<nb_users>0</nb_users>
 				<max_actions>1</max_actions>
 				<sum_visit_length>0</sum_visit_length>
 				<bounce_count>1</bounce_count>
@@ -27,7 +27,7 @@
 				<nb_uniq_visitors>1</nb_uniq_visitors>
 				<nb_visits>1</nb_visits>
 				<nb_actions>5</nb_actions>
-				<nb_users>1</nb_users>
+				<nb_users>0</nb_users>
 				<max_actions>5</max_actions>
 				<sum_visit_length>721</sum_visit_length>
 				<bounce_count>0</bounce_count>
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_bulk_json__API.getBulkRequest.json b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_bulk_json__API.getBulkRequest.json
index b1bda48352..54eec7681d 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_bulk_json__API.getBulkRequest.json
+++ b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_bulk_json__API.getBulkRequest.json
@@ -1 +1 @@
-[{"2010-03-06":{"nb_uniq_visitors":1,"nb_users":1,"nb_visits":2,"nb_actions":8,"nb_visits_converted":2,"bounce_count":1,"sum_visit_length":1621,"max_actions":7,"bounce_rate":"50%","nb_actions_per_visit":4,"avg_time_on_site":811},"2010-03-07":[]},{"2010-03-06":{"nb_uniq_visitors":1,"nb_users":1,"nb_visits":2,"nb_actions":8,"nb_visits_converted":2,"bounce_count":1,"sum_visit_length":1621,"max_actions":7,"bounce_rate":"50%","nb_actions_per_visit":4,"avg_time_on_site":811},"2010-03-07":[]},[{"label":"0-10s","nb_visits":"1"},{"label":"11-30s","nb_visits":"0"},{"label":"31-60s","nb_visits":"0"},{"label":"1-2 min","nb_visits":"0"},{"label":"2-4 min","nb_visits":"0"},{"label":"4-7 min","nb_visits":"0"},{"label":"7-10 min","nb_visits":"0"},{"label":"10-15 min","nb_visits":"0"},{"label":"15-30 min","nb_visits":"1"},{"label":"30+ min","nb_visits":"0"}]]
\ No newline at end of file
+[{"2010-03-06":{"nb_uniq_visitors":1,"nb_users":0,"nb_visits":2,"nb_actions":8,"nb_visits_converted":2,"bounce_count":1,"sum_visit_length":1621,"max_actions":7,"bounce_rate":"50%","nb_actions_per_visit":4,"avg_time_on_site":811},"2010-03-07":[]},{"2010-03-06":{"nb_uniq_visitors":1,"nb_users":0,"nb_visits":2,"nb_actions":8,"nb_visits_converted":2,"bounce_count":1,"sum_visit_length":1621,"max_actions":7,"bounce_rate":"50%","nb_actions_per_visit":4,"avg_time_on_site":811},"2010-03-07":[]},[{"label":"0-10s","nb_visits":"1"},{"label":"11-30s","nb_visits":"0"},{"label":"31-60s","nb_visits":"0"},{"label":"1-2 min","nb_visits":"0"},{"label":"2-4 min","nb_visits":"0"},{"label":"4-7 min","nb_visits":"0"},{"label":"7-10 min","nb_visits":"0"},{"label":"10-15 min","nb_visits":"0"},{"label":"15-30 min","nb_visits":"1"},{"label":"30+ min","nb_visits":"0"}]]
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_bulk_xml__API.getBulkRequest.xml b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_bulk_xml__API.getBulkRequest.xml
index c4d0257c6a..e3455beeec 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_bulk_xml__API.getBulkRequest.xml
+++ b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_bulk_xml__API.getBulkRequest.xml
@@ -3,7 +3,7 @@
 	<row>
 		<row key="2010-03-06">
 			<nb_uniq_visitors>1</nb_uniq_visitors>
-			<nb_users>1</nb_users>
+			<nb_users>0</nb_users>
 			<nb_visits>2</nb_visits>
 			<nb_actions>8</nb_actions>
 			<nb_visits_converted>2</nb_visits_converted>
@@ -20,7 +20,7 @@
 	<row>
 		<row key="2010-03-06">
 			<nb_uniq_visitors>1</nb_uniq_visitors>
-			<nb_users>1</nb_users>
+			<nb_users>0</nb_users>
 			<nb_visits>2</nb_visits>
 			<nb_actions>8</nb_actions>
 			<nb_visits_converted>2</nb_visits_converted>
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_csv__API.get_month.csv b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_csv__API.get_month.csv
index e9e178c6a132a240689f65537ffde5ef9b4c4cc5..6fed0a71f2ee4122334c1ed2336ff50bc8023324 100644
GIT binary patch
delta 13
UcmaFC_kwRj9vh><<b1ZD0484rLjV8(

delta 13
UcmaFC_kwRj9vh?K<b1ZD048JwL;wH)

diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_hideAllColumns___VisitsSummary.get_day.xml b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_hideAllColumns___VisitsSummary.get_day.xml
index 606fbb5241..f5722c2b94 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_hideAllColumns___VisitsSummary.get_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_hideAllColumns___VisitsSummary.get_day.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8" ?>
-<result>1</result>
\ No newline at end of file
+<result>0</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_hideColumns___VisitsSummary.get_day.xml b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_hideColumns___VisitsSummary.get_day.xml
index 2227e7a996..e84bd27189 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_hideColumns___VisitsSummary.get_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_hideColumns___VisitsSummary.get_day.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <result>
 	<nb_uniq_visitors>1</nb_uniq_visitors>
-	<nb_users>1</nb_users>
+	<nb_users>0</nb_users>
 	<bounce_rate>50%</bounce_rate>
 	<nb_actions_per_visit>4</nb_actions_per_visit>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Live.getLastVisitsDetails_day.xml
index 2ceb5d70bf..b49b3c5e84 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Live.getLastVisitsDetails_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Live.getLastVisitsDetails_day.xml
@@ -36,7 +36,7 @@
 		
 		<searches>0</searches>
 		<actions>1</actions>
-		<userId />
+		<userId>0</userId>
 		<visitorType>returning</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
 		<visitConverted>1</visitConverted>
@@ -224,7 +224,7 @@
 		
 		<searches>1</searches>
 		<actions>8</actions>
-		<userId />
+		<userId>0</userId>
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>1</visitConverted>
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Provider.getProvider_day.xml b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Provider.getProvider_day.xml
index 70de8b9679..7254c4a970 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Provider.getProvider_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Provider.getProvider_day.xml
@@ -5,7 +5,7 @@
 		<nb_uniq_visitors>1</nb_uniq_visitors>
 		<nb_visits>2</nb_visits>
 		<nb_actions>9</nb_actions>
-		<nb_users>1</nb_users>
+		<nb_users>0</nb_users>
 		<max_actions>8</max_actions>
 		<sum_visit_length>1621</sum_visit_length>
 		<bounce_count>1</bounce_count>
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getAll_day.xml b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getAll_day.xml
index b497f3fa20..fd61a97675 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getAll_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getAll_day.xml
@@ -5,7 +5,7 @@
 		<nb_uniq_visitors>1</nb_uniq_visitors>
 		<nb_visits>1</nb_visits>
 		<nb_actions>8</nb_actions>
-		<nb_users>1</nb_users>
+		<nb_users>0</nb_users>
 		<max_actions>8</max_actions>
 		<sum_visit_length>1621</sum_visit_length>
 		<bounce_count>0</bounce_count>
@@ -25,7 +25,7 @@
 		<nb_uniq_visitors>1</nb_uniq_visitors>
 		<nb_visits>1</nb_visits>
 		<nb_actions>1</nb_actions>
-		<nb_users>1</nb_users>
+		<nb_users>0</nb_users>
 		<max_actions>1</max_actions>
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>1</bounce_count>
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getKeywords_day.xml b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getKeywords_day.xml
index 014a276cc4..52501d1f57 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getKeywords_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getKeywords_day.xml
@@ -5,7 +5,7 @@
 		<nb_uniq_visitors>1</nb_uniq_visitors>
 		<nb_visits>1</nb_visits>
 		<nb_actions>1</nb_actions>
-		<nb_users>1</nb_users>
+		<nb_users>0</nb_users>
 		<max_actions>1</max_actions>
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>1</bounce_count>
@@ -24,7 +24,7 @@
 				<nb_uniq_visitors>1</nb_uniq_visitors>
 				<nb_visits>1</nb_visits>
 				<nb_actions>1</nb_actions>
-				<nb_users>1</nb_users>
+				<nb_users>0</nb_users>
 				<max_actions>1</max_actions>
 				<sum_visit_length>0</sum_visit_length>
 				<bounce_count>1</bounce_count>
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getReferrerType_day.xml b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getReferrerType_day.xml
index a18003c1f3..2225e62fa0 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getReferrerType_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getReferrerType_day.xml
@@ -5,7 +5,7 @@
 		<nb_uniq_visitors>1</nb_uniq_visitors>
 		<nb_visits>1</nb_visits>
 		<nb_actions>1</nb_actions>
-		<nb_users>1</nb_users>
+		<nb_users>0</nb_users>
 		<max_actions>1</max_actions>
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>1</bounce_count>
@@ -24,7 +24,7 @@
 				<nb_uniq_visitors>1</nb_uniq_visitors>
 				<nb_visits>1</nb_visits>
 				<nb_actions>1</nb_actions>
-				<nb_users>1</nb_users>
+				<nb_users>0</nb_users>
 				<max_actions>1</max_actions>
 				<sum_visit_length>0</sum_visit_length>
 				<bounce_count>1</bounce_count>
@@ -45,7 +45,7 @@
 		<nb_uniq_visitors>1</nb_uniq_visitors>
 		<nb_visits>1</nb_visits>
 		<nb_actions>8</nb_actions>
-		<nb_users>1</nb_users>
+		<nb_users>0</nb_users>
 		<max_actions>8</max_actions>
 		<sum_visit_length>1621</sum_visit_length>
 		<bounce_count>0</bounce_count>
@@ -64,7 +64,7 @@
 				<nb_uniq_visitors>1</nb_uniq_visitors>
 				<nb_visits>1</nb_visits>
 				<nb_actions>8</nb_actions>
-				<nb_users>1</nb_users>
+				<nb_users>0</nb_users>
 				<max_actions>8</max_actions>
 				<sum_visit_length>1621</sum_visit_length>
 				<bounce_count>0</bounce_count>
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getSearchEngines_day.xml b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getSearchEngines_day.xml
index 7f91b2b37b..325ad6ac4f 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getSearchEngines_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getSearchEngines_day.xml
@@ -5,7 +5,7 @@
 		<nb_uniq_visitors>1</nb_uniq_visitors>
 		<nb_visits>1</nb_visits>
 		<nb_actions>1</nb_actions>
-		<nb_users>1</nb_users>
+		<nb_users>0</nb_users>
 		<max_actions>1</max_actions>
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>1</bounce_count>
@@ -26,7 +26,7 @@
 				<nb_uniq_visitors>1</nb_uniq_visitors>
 				<nb_visits>1</nb_visits>
 				<nb_actions>1</nb_actions>
-				<nb_users>1</nb_users>
+				<nb_users>0</nb_users>
 				<max_actions>1</max_actions>
 				<sum_visit_length>0</sum_visit_length>
 				<bounce_count>1</bounce_count>
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getWebsites_day.xml b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getWebsites_day.xml
index 51a5d05c3f..b3100810b3 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getWebsites_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getWebsites_day.xml
@@ -5,7 +5,7 @@
 		<nb_uniq_visitors>1</nb_uniq_visitors>
 		<nb_visits>1</nb_visits>
 		<nb_actions>8</nb_actions>
-		<nb_users>1</nb_users>
+		<nb_users>0</nb_users>
 		<max_actions>8</max_actions>
 		<sum_visit_length>1621</sum_visit_length>
 		<bounce_count>0</bounce_count>
@@ -24,7 +24,7 @@
 				<nb_uniq_visitors>1</nb_uniq_visitors>
 				<nb_visits>1</nb_visits>
 				<nb_actions>8</nb_actions>
-				<nb_users>1</nb_users>
+				<nb_users>0</nb_users>
 				<max_actions>8</max_actions>
 				<sum_visit_length>1621</sum_visit_length>
 				<bounce_count>0</bounce_count>
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserCountry.getCity_day.xml b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserCountry.getCity_day.xml
index 407bf56506..0c927196d9 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserCountry.getCity_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserCountry.getCity_day.xml
@@ -5,7 +5,7 @@
 		<nb_uniq_visitors>1</nb_uniq_visitors>
 		<nb_visits>2</nb_visits>
 		<nb_actions>9</nb_actions>
-		<nb_users>1</nb_users>
+		<nb_users>0</nb_users>
 		<max_actions>8</max_actions>
 		<sum_visit_length>1621</sum_visit_length>
 		<bounce_count>1</bounce_count>
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserCountry.getContinent_day.xml b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserCountry.getContinent_day.xml
index 19d159d081..dd647ae66e 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserCountry.getContinent_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserCountry.getContinent_day.xml
@@ -5,7 +5,7 @@
 		<nb_uniq_visitors>1</nb_uniq_visitors>
 		<nb_visits>2</nb_visits>
 		<nb_actions>9</nb_actions>
-		<nb_users>1</nb_users>
+		<nb_users>0</nb_users>
 		<max_actions>8</max_actions>
 		<sum_visit_length>1621</sum_visit_length>
 		<bounce_count>1</bounce_count>
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserCountry.getCountry_day.xml b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserCountry.getCountry_day.xml
index f2a83be0db..c7cdb13402 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserCountry.getCountry_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserCountry.getCountry_day.xml
@@ -5,7 +5,7 @@
 		<nb_uniq_visitors>1</nb_uniq_visitors>
 		<nb_visits>2</nb_visits>
 		<nb_actions>9</nb_actions>
-		<nb_users>1</nb_users>
+		<nb_users>0</nb_users>
 		<max_actions>8</max_actions>
 		<sum_visit_length>1621</sum_visit_length>
 		<bounce_count>1</bounce_count>
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserCountry.getRegion_day.xml b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserCountry.getRegion_day.xml
index 028d2a9e2b..2a364cd566 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserCountry.getRegion_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserCountry.getRegion_day.xml
@@ -5,7 +5,7 @@
 		<nb_uniq_visitors>1</nb_uniq_visitors>
 		<nb_visits>2</nb_visits>
 		<nb_actions>9</nb_actions>
-		<nb_users>1</nb_users>
+		<nb_users>0</nb_users>
 		<max_actions>8</max_actions>
 		<sum_visit_length>1621</sum_visit_length>
 		<bounce_count>1</bounce_count>
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getBrowserType_day.xml b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getBrowserType_day.xml
index adb035d3e1..e84a021ee9 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getBrowserType_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getBrowserType_day.xml
@@ -5,7 +5,7 @@
 		<nb_uniq_visitors>1</nb_uniq_visitors>
 		<nb_visits>2</nb_visits>
 		<nb_actions>9</nb_actions>
-		<nb_users>1</nb_users>
+		<nb_users>0</nb_users>
 		<max_actions>8</max_actions>
 		<sum_visit_length>1621</sum_visit_length>
 		<bounce_count>1</bounce_count>
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getBrowserVersion_day.xml b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getBrowserVersion_day.xml
index 2d114c7779..6451b5cbbb 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getBrowserVersion_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getBrowserVersion_day.xml
@@ -5,7 +5,7 @@
 		<nb_uniq_visitors>1</nb_uniq_visitors>
 		<nb_visits>2</nb_visits>
 		<nb_actions>9</nb_actions>
-		<nb_users>1</nb_users>
+		<nb_users>0</nb_users>
 		<max_actions>8</max_actions>
 		<sum_visit_length>1621</sum_visit_length>
 		<bounce_count>1</bounce_count>
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getBrowser_day.xml b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getBrowser_day.xml
index cf862f146b..968ffc7d90 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getBrowser_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getBrowser_day.xml
@@ -5,7 +5,7 @@
 		<nb_uniq_visitors>1</nb_uniq_visitors>
 		<nb_visits>2</nb_visits>
 		<nb_actions>9</nb_actions>
-		<nb_users>1</nb_users>
+		<nb_users>0</nb_users>
 		<max_actions>8</max_actions>
 		<sum_visit_length>1621</sum_visit_length>
 		<bounce_count>1</bounce_count>
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getConfiguration_day.xml b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getConfiguration_day.xml
index b13da65ae2..7ce7628e83 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getConfiguration_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getConfiguration_day.xml
@@ -5,7 +5,7 @@
 		<nb_uniq_visitors>1</nb_uniq_visitors>
 		<nb_visits>2</nb_visits>
 		<nb_actions>9</nb_actions>
-		<nb_users>1</nb_users>
+		<nb_users>0</nb_users>
 		<max_actions>8</max_actions>
 		<sum_visit_length>1621</sum_visit_length>
 		<bounce_count>1</bounce_count>
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getLanguage_day.xml b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getLanguage_day.xml
index 3ffbdbfb40..e03cfdd581 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getLanguage_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getLanguage_day.xml
@@ -5,7 +5,7 @@
 		<nb_uniq_visitors>1</nb_uniq_visitors>
 		<nb_visits>2</nb_visits>
 		<nb_actions>9</nb_actions>
-		<nb_users>1</nb_users>
+		<nb_users>0</nb_users>
 		<max_actions>8</max_actions>
 		<sum_visit_length>1621</sum_visit_length>
 		<bounce_count>1</bounce_count>
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getMobileVsDesktop_day.xml b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getMobileVsDesktop_day.xml
index 38f341f90b..1456e8c033 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getMobileVsDesktop_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getMobileVsDesktop_day.xml
@@ -5,7 +5,7 @@
 		<nb_uniq_visitors>1</nb_uniq_visitors>
 		<nb_visits>2</nb_visits>
 		<nb_actions>9</nb_actions>
-		<nb_users>1</nb_users>
+		<nb_users>0</nb_users>
 		<max_actions>8</max_actions>
 		<sum_visit_length>1621</sum_visit_length>
 		<bounce_count>1</bounce_count>
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getOSFamily_day.xml b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getOSFamily_day.xml
index a57ea4981d..63f67f61ca 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getOSFamily_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getOSFamily_day.xml
@@ -5,7 +5,7 @@
 		<nb_uniq_visitors>1</nb_uniq_visitors>
 		<nb_visits>2</nb_visits>
 		<nb_actions>9</nb_actions>
-		<nb_users>1</nb_users>
+		<nb_users>0</nb_users>
 		<max_actions>8</max_actions>
 		<sum_visit_length>1621</sum_visit_length>
 		<bounce_count>1</bounce_count>
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getOS_day.xml b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getOS_day.xml
index 18f14ab367..e041ea2409 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getOS_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getOS_day.xml
@@ -5,7 +5,7 @@
 		<nb_uniq_visitors>1</nb_uniq_visitors>
 		<nb_visits>2</nb_visits>
 		<nb_actions>9</nb_actions>
-		<nb_users>1</nb_users>
+		<nb_users>0</nb_users>
 		<max_actions>8</max_actions>
 		<sum_visit_length>1621</sum_visit_length>
 		<bounce_count>1</bounce_count>
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getResolution_day.xml b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getResolution_day.xml
index dea4d70860..05f05aaf02 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getResolution_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getResolution_day.xml
@@ -5,7 +5,7 @@
 		<nb_uniq_visitors>1</nb_uniq_visitors>
 		<nb_visits>2</nb_visits>
 		<nb_actions>9</nb_actions>
-		<nb_users>1</nb_users>
+		<nb_users>0</nb_users>
 		<max_actions>8</max_actions>
 		<sum_visit_length>1621</sum_visit_length>
 		<bounce_count>1</bounce_count>
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getWideScreen_day.xml b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getWideScreen_day.xml
index 5e27b0a21f..1aa955af66 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getWideScreen_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getWideScreen_day.xml
@@ -5,7 +5,7 @@
 		<nb_uniq_visitors>1</nb_uniq_visitors>
 		<nb_visits>2</nb_visits>
 		<nb_actions>9</nb_actions>
-		<nb_users>1</nb_users>
+		<nb_users>0</nb_users>
 		<max_actions>8</max_actions>
 		<sum_visit_length>1621</sum_visit_length>
 		<bounce_count>1</bounce_count>
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitFrequency.get_day.xml b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitFrequency.get_day.xml
index f4ff4bbd78..3633fe5914 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitFrequency.get_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitFrequency.get_day.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <result>
 	<nb_uniq_visitors_returning>1</nb_uniq_visitors_returning>
-	<nb_users_returning>1</nb_users_returning>
+	<nb_users_returning>0</nb_users_returning>
 	<nb_visits_returning>1</nb_visits_returning>
 	<nb_actions_returning>1</nb_actions_returning>
 	<nb_visits_converted_returning>1</nb_visits_converted_returning>
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitTime.getByDayOfWeek_day.xml b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitTime.getByDayOfWeek_day.xml
index 9832b1f75e..16a8a552ba 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitTime.getByDayOfWeek_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitTime.getByDayOfWeek_day.xml
@@ -30,7 +30,7 @@
 		<nb_visits>2</nb_visits>
 		<nb_uniq_visitors>1</nb_uniq_visitors>
 		<nb_actions>9</nb_actions>
-		<nb_users>1</nb_users>
+		<nb_users>0</nb_users>
 		<sum_visit_length>1621</sum_visit_length>
 		<bounce_count>1</bounce_count>
 		<nb_visits_converted>2</nb_visits_converted>
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitTime.getVisitInformationPerLocalTime_day.xml b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitTime.getVisitInformationPerLocalTime_day.xml
index fac7a12b01..09556822a9 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitTime.getVisitInformationPerLocalTime_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitTime.getVisitInformationPerLocalTime_day.xml
@@ -137,7 +137,7 @@
 		<nb_uniq_visitors>1</nb_uniq_visitors>
 		<nb_visits>2</nb_visits>
 		<nb_actions>9</nb_actions>
-		<nb_users>1</nb_users>
+		<nb_users>0</nb_users>
 		<max_actions>8</max_actions>
 		<sum_visit_length>1621</sum_visit_length>
 		<bounce_count>1</bounce_count>
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitTime.getVisitInformationPerServerTime_day.xml b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitTime.getVisitInformationPerServerTime_day.xml
index ec3e7fc1d8..9ded5c32c2 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitTime.getVisitInformationPerServerTime_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitTime.getVisitInformationPerServerTime_day.xml
@@ -126,7 +126,7 @@
 		<nb_uniq_visitors>1</nb_uniq_visitors>
 		<nb_visits>1</nb_visits>
 		<nb_actions>8</nb_actions>
-		<nb_users>1</nb_users>
+		<nb_users>0</nb_users>
 		<max_actions>8</max_actions>
 		<sum_visit_length>1621</sum_visit_length>
 		<bounce_count>0</bounce_count>
@@ -145,7 +145,7 @@
 		<nb_uniq_visitors>1</nb_uniq_visitors>
 		<nb_visits>1</nb_visits>
 		<nb_actions>1</nb_actions>
-		<nb_users>1</nb_users>
+		<nb_users>0</nb_users>
 		<max_actions>1</max_actions>
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>1</bounce_count>
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitsSummary.getUsers_day.xml b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitsSummary.getUsers_day.xml
index 606fbb5241..f5722c2b94 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitsSummary.getUsers_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitsSummary.getUsers_day.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8" ?>
-<result>1</result>
\ No newline at end of file
+<result>0</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitsSummary.get_day.xml b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitsSummary.get_day.xml
index b352427be8..9f63db28ef 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitsSummary.get_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitsSummary.get_day.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <result>
 	<nb_uniq_visitors>1</nb_uniq_visitors>
-	<nb_users>1</nb_users>
+	<nb_users>0</nb_users>
 	<nb_visits>2</nb_visits>
 	<nb_actions>9</nb_actions>
 	<nb_visits_converted>2</nb_visits_converted>
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitor_LongUrlsTruncated__Referrers.getKeywords_day.xml b/tests/PHPUnit/Integration/expected/test_OneVisitor_LongUrlsTruncated__Referrers.getKeywords_day.xml
index 8c453baeb1..aa89682153 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitor_LongUrlsTruncated__Referrers.getKeywords_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_OneVisitor_LongUrlsTruncated__Referrers.getKeywords_day.xml
@@ -5,7 +5,7 @@
 		<nb_uniq_visitors>4</nb_uniq_visitors>
 		<nb_visits>5</nb_visits>
 		<nb_actions>5</nb_actions>
-		<nb_users>4</nb_users>
+		<nb_users>0</nb_users>
 		<max_actions>1</max_actions>
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>5</bounce_count>
@@ -16,7 +16,7 @@
 				<nb_uniq_visitors>1</nb_uniq_visitors>
 				<nb_visits>2</nb_visits>
 				<nb_actions>2</nb_actions>
-				<nb_users>1</nb_users>
+				<nb_users>0</nb_users>
 				<max_actions>1</max_actions>
 				<sum_visit_length>0</sum_visit_length>
 				<bounce_count>2</bounce_count>
@@ -27,7 +27,7 @@
 				<nb_uniq_visitors>1</nb_uniq_visitors>
 				<nb_visits>1</nb_visits>
 				<nb_actions>1</nb_actions>
-				<nb_users>1</nb_users>
+				<nb_users>0</nb_users>
 				<max_actions>1</max_actions>
 				<sum_visit_length>0</sum_visit_length>
 				<bounce_count>1</bounce_count>
@@ -38,7 +38,7 @@
 				<nb_uniq_visitors>2</nb_uniq_visitors>
 				<nb_visits>2</nb_visits>
 				<nb_actions>2</nb_actions>
-				<nb_users>2</nb_users>
+				<nb_users>0</nb_users>
 				<max_actions>1</max_actions>
 				<sum_visit_length>0</sum_visit_length>
 				<bounce_count>2</bounce_count>
@@ -51,7 +51,7 @@
 		<nb_uniq_visitors>1</nb_uniq_visitors>
 		<nb_visits>1</nb_visits>
 		<nb_actions>13</nb_actions>
-		<nb_users>1</nb_users>
+		<nb_users>0</nb_users>
 		<max_actions>13</max_actions>
 		<sum_visit_length>1</sum_visit_length>
 		<bounce_count>0</bounce_count>
@@ -62,7 +62,7 @@
 				<nb_uniq_visitors>1</nb_uniq_visitors>
 				<nb_visits>1</nb_visits>
 				<nb_actions>13</nb_actions>
-				<nb_users>1</nb_users>
+				<nb_users>0</nb_users>
 				<max_actions>13</max_actions>
 				<sum_visit_length>1</sum_visit_length>
 				<bounce_count>0</bounce_count>
@@ -75,7 +75,7 @@
 		<nb_uniq_visitors>1</nb_uniq_visitors>
 		<nb_visits>1</nb_visits>
 		<nb_actions>1</nb_actions>
-		<nb_users>1</nb_users>
+		<nb_users>0</nb_users>
 		<max_actions>1</max_actions>
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>1</bounce_count>
@@ -86,7 +86,7 @@
 				<nb_uniq_visitors>1</nb_uniq_visitors>
 				<nb_visits>1</nb_visits>
 				<nb_actions>1</nb_actions>
-				<nb_users>1</nb_users>
+				<nb_users>0</nb_users>
 				<max_actions>1</max_actions>
 				<sum_visit_length>0</sum_visit_length>
 				<bounce_count>1</bounce_count>
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitor_NoKeywordSpecified__Referrers.getKeywords_day.xml b/tests/PHPUnit/Integration/expected/test_OneVisitor_NoKeywordSpecified__Referrers.getKeywords_day.xml
index 2e6fdfc3cd..9b2a6b9b0e 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitor_NoKeywordSpecified__Referrers.getKeywords_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_OneVisitor_NoKeywordSpecified__Referrers.getKeywords_day.xml
@@ -5,7 +5,7 @@
 		<nb_uniq_visitors>1</nb_uniq_visitors>
 		<nb_visits>1</nb_visits>
 		<nb_actions>1</nb_actions>
-		<nb_users>1</nb_users>
+		<nb_users>0</nb_users>
 		<max_actions>1</max_actions>
 		<sum_visit_length>1084</sum_visit_length>
 		<bounce_count>1</bounce_count>
@@ -24,7 +24,7 @@
 				<nb_uniq_visitors>1</nb_uniq_visitors>
 				<nb_visits>1</nb_visits>
 				<nb_actions>1</nb_actions>
-				<nb_users>1</nb_users>
+				<nb_users>0</nb_users>
 				<max_actions>1</max_actions>
 				<sum_visit_length>1084</sum_visit_length>
 				<bounce_count>1</bounce_count>
@@ -37,7 +37,7 @@
 		<nb_uniq_visitors>1</nb_uniq_visitors>
 		<nb_visits>1</nb_visits>
 		<nb_actions>1</nb_actions>
-		<nb_users>1</nb_users>
+		<nb_users>0</nb_users>
 		<max_actions>1</max_actions>
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>1</bounce_count>
@@ -48,7 +48,7 @@
 				<nb_uniq_visitors>1</nb_uniq_visitors>
 				<nb_visits>1</nb_visits>
 				<nb_actions>1</nb_actions>
-				<nb_users>1</nb_users>
+				<nb_users>0</nb_users>
 				<max_actions>1</max_actions>
 				<sum_visit_length>0</sum_visit_length>
 				<bounce_count>1</bounce_count>
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitor_SeveralDays_ImportedInRandomOrderTest_shouldShowOneVisit_InEachOfThreeDays__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/Integration/expected/test_OneVisitor_SeveralDays_ImportedInRandomOrderTest_shouldShowOneVisit_InEachOfThreeDays__Live.getLastVisitsDetails_month.xml
index f77489d7a3..6b02eec11b 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitor_SeveralDays_ImportedInRandomOrderTest_shouldShowOneVisit_InEachOfThreeDays__Live.getLastVisitsDetails_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_OneVisitor_SeveralDays_ImportedInRandomOrderTest_shouldShowOneVisit_InEachOfThreeDays__Live.getLastVisitsDetails_month.xml
@@ -30,7 +30,7 @@
 		<lastActionDateTime>2013-04-07 10:00:00</lastActionDateTime>
 		<searches>0</searches>
 		<actions>1</actions>
-		<userId />
+		<userId>0</userId>
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>0</visitConverted>
@@ -123,7 +123,7 @@
 		<lastActionDateTime>2013-04-06 11:00:00</lastActionDateTime>
 		<searches>0</searches>
 		<actions>1</actions>
-		<userId />
+		<userId>0</userId>
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>0</visitConverted>
@@ -216,7 +216,7 @@
 		<lastActionDateTime>2013-04-05 12:00:00</lastActionDateTime>
 		<searches>0</searches>
 		<actions>1</actions>
-		<userId />
+		<userId>0</userId>
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>0</visitConverted>
diff --git a/tests/PHPUnit/Integration/expected/test_PiwikTracker_trackForceUsingVisitId_insteadOfHeuristics_alsoTestsCampaignTracking__Referrers.getCampaigns_day.xml b/tests/PHPUnit/Integration/expected/test_PiwikTracker_trackForceUsingVisitId_insteadOfHeuristics_alsoTestsCampaignTracking__Referrers.getCampaigns_day.xml
index 299668e942..0ad33169a4 100644
--- a/tests/PHPUnit/Integration/expected/test_PiwikTracker_trackForceUsingVisitId_insteadOfHeuristics_alsoTestsCampaignTracking__Referrers.getCampaigns_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_PiwikTracker_trackForceUsingVisitId_insteadOfHeuristics_alsoTestsCampaignTracking__Referrers.getCampaigns_day.xml
@@ -5,7 +5,7 @@
 		<nb_uniq_visitors>3</nb_uniq_visitors>
 		<nb_visits>3</nb_visits>
 		<nb_actions>3</nb_actions>
-		<nb_users>3</nb_users>
+		<nb_users>0</nb_users>
 		<max_actions>1</max_actions>
 		<sum_visit_length>1084</sum_visit_length>
 		<bounce_count>3</bounce_count>
@@ -24,7 +24,7 @@
 				<nb_uniq_visitors>1</nb_uniq_visitors>
 				<nb_visits>1</nb_visits>
 				<nb_actions>1</nb_actions>
-				<nb_users>1</nb_users>
+				<nb_users>0</nb_users>
 				<max_actions>1</max_actions>
 				<sum_visit_length>1084</sum_visit_length>
 				<bounce_count>1</bounce_count>
@@ -43,7 +43,7 @@
 				<nb_uniq_visitors>1</nb_uniq_visitors>
 				<nb_visits>1</nb_visits>
 				<nb_actions>1</nb_actions>
-				<nb_users>1</nb_users>
+				<nb_users>0</nb_users>
 				<max_actions>1</max_actions>
 				<sum_visit_length>0</sum_visit_length>
 				<bounce_count>1</bounce_count>
@@ -54,7 +54,7 @@
 				<nb_uniq_visitors>1</nb_uniq_visitors>
 				<nb_visits>1</nb_visits>
 				<nb_actions>1</nb_actions>
-				<nb_users>1</nb_users>
+				<nb_users>0</nb_users>
 				<max_actions>1</max_actions>
 				<sum_visit_length>0</sum_visit_length>
 				<bounce_count>1</bounce_count>
@@ -67,7 +67,7 @@
 		<nb_uniq_visitors>2</nb_uniq_visitors>
 		<nb_visits>2</nb_visits>
 		<nb_actions>2</nb_actions>
-		<nb_users>2</nb_users>
+		<nb_users>0</nb_users>
 		<max_actions>1</max_actions>
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>2</bounce_count>
@@ -78,7 +78,7 @@
 				<nb_uniq_visitors>1</nb_uniq_visitors>
 				<nb_visits>1</nb_visits>
 				<nb_actions>1</nb_actions>
-				<nb_users>1</nb_users>
+				<nb_users>0</nb_users>
 				<max_actions>1</max_actions>
 				<sum_visit_length>0</sum_visit_length>
 				<bounce_count>1</bounce_count>
@@ -89,7 +89,7 @@
 				<nb_uniq_visitors>1</nb_uniq_visitors>
 				<nb_visits>1</nb_visits>
 				<nb_actions>1</nb_actions>
-				<nb_users>1</nb_users>
+				<nb_users>0</nb_users>
 				<max_actions>1</max_actions>
 				<sum_visit_length>0</sum_visit_length>
 				<bounce_count>1</bounce_count>
@@ -102,7 +102,7 @@
 		<nb_uniq_visitors>1</nb_uniq_visitors>
 		<nb_visits>1</nb_visits>
 		<nb_actions>1</nb_actions>
-		<nb_users>1</nb_users>
+		<nb_users>0</nb_users>
 		<max_actions>1</max_actions>
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>1</bounce_count>
@@ -113,7 +113,7 @@
 				<nb_uniq_visitors>1</nb_uniq_visitors>
 				<nb_visits>1</nb_visits>
 				<nb_actions>1</nb_actions>
-				<nb_users>1</nb_users>
+				<nb_users>0</nb_users>
 				<max_actions>1</max_actions>
 				<sum_visit_length>0</sum_visit_length>
 				<bounce_count>1</bounce_count>
@@ -126,7 +126,7 @@
 		<nb_uniq_visitors>1</nb_uniq_visitors>
 		<nb_visits>1</nb_visits>
 		<nb_actions>1</nb_actions>
-		<nb_users>1</nb_users>
+		<nb_users>0</nb_users>
 		<max_actions>1</max_actions>
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>1</bounce_count>
@@ -137,7 +137,7 @@
 				<nb_uniq_visitors>1</nb_uniq_visitors>
 				<nb_visits>1</nb_visits>
 				<nb_actions>1</nb_actions>
-				<nb_users>1</nb_users>
+				<nb_users>0</nb_users>
 				<max_actions>1</max_actions>
 				<sum_visit_length>0</sum_visit_length>
 				<bounce_count>1</bounce_count>
@@ -150,7 +150,7 @@
 		<nb_uniq_visitors>1</nb_uniq_visitors>
 		<nb_visits>1</nb_visits>
 		<nb_actions>0</nb_actions>
-		<nb_users>1</nb_users>
+		<nb_users>0</nb_users>
 		<max_actions>0</max_actions>
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>1</bounce_count>
@@ -169,7 +169,7 @@
 				<nb_uniq_visitors>1</nb_uniq_visitors>
 				<nb_visits>1</nb_visits>
 				<nb_actions>0</nb_actions>
-				<nb_users>1</nb_users>
+				<nb_users>0</nb_users>
 				<max_actions>0</max_actions>
 				<sum_visit_length>0</sum_visit_length>
 				<bounce_count>1</bounce_count>
diff --git a/tests/PHPUnit/Integration/expected/test_PiwikTracker_trackForceUsingVisitId_insteadOfHeuristics_alsoTestsCampaignTracking__VisitsSummary.get_day.xml b/tests/PHPUnit/Integration/expected/test_PiwikTracker_trackForceUsingVisitId_insteadOfHeuristics_alsoTestsCampaignTracking__VisitsSummary.get_day.xml
index ef8d988f89..78c6610886 100644
--- a/tests/PHPUnit/Integration/expected/test_PiwikTracker_trackForceUsingVisitId_insteadOfHeuristics_alsoTestsCampaignTracking__VisitsSummary.get_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_PiwikTracker_trackForceUsingVisitId_insteadOfHeuristics_alsoTestsCampaignTracking__VisitsSummary.get_day.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <result>
 	<nb_uniq_visitors>3</nb_uniq_visitors>
-	<nb_users>1</nb_users>
+	<nb_users>0</nb_users>
 	<nb_visits>8</nb_visits>
 	<nb_actions>7</nb_actions>
 	<nb_visits_converted>2</nb_visits_converted>
diff --git a/tests/PHPUnit/Integration/expected/test_RowEvolution_flatFilters__Referrers.getSearchEngines_month.xml b/tests/PHPUnit/Integration/expected/test_RowEvolution_flatFilters__Referrers.getSearchEngines_month.xml
index be6412244a..e1f0382dda 100644
--- a/tests/PHPUnit/Integration/expected/test_RowEvolution_flatFilters__Referrers.getSearchEngines_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_RowEvolution_flatFilters__Referrers.getSearchEngines_month.xml
@@ -9,7 +9,7 @@
 		<bounce_count>9</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>9</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>9</sum_daily_nb_users>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<url>http://google.com/search?q=free+%3E+proprietary</url>
 		<logo>plugins/Referrers/images/searchEngines/google.com.png</logo>
 	</row>
@@ -22,7 +22,7 @@
 		<bounce_count>8</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>8</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>8</sum_daily_nb_users>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<url>http://google.com/search?q=justice+%29%28%26%5E%23%25%24+not+corruption%21</url>
 		<logo>plugins/Referrers/images/searchEngines/google.com.png</logo>
 	</row>
@@ -35,7 +35,7 @@
 		<bounce_count>8</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>8</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>8</sum_daily_nb_users>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<url>http://google.com/search?q=peace+%22%2C%22+not+war</url>
 		<logo>plugins/Referrers/images/searchEngines/google.com.png</logo>
 	</row>
diff --git a/tests/PHPUnit/Integration/expected/test_RowEvolution_referrer1__API.getRowEvolution_day.xml b/tests/PHPUnit/Integration/expected/test_RowEvolution_referrer1__API.getRowEvolution_day.xml
index 0e60dac3c4..f75c05f7f8 100644
--- a/tests/PHPUnit/Integration/expected/test_RowEvolution_referrer1__API.getRowEvolution_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_RowEvolution_referrer1__API.getRowEvolution_day.xml
@@ -8,7 +8,7 @@
 				<nb_uniq_visitors>1</nb_uniq_visitors>
 				<nb_visits>1</nb_visits>
 				<nb_actions>1</nb_actions>
-				<nb_users>1</nb_users>
+				<nb_users>0</nb_users>
 				<nb_actions_per_visit>1</nb_actions_per_visit>
 				<avg_time_on_site>365</avg_time_on_site>
 				<bounce_rate>100%</bounce_rate>
@@ -23,7 +23,7 @@
 				<nb_uniq_visitors>1</nb_uniq_visitors>
 				<nb_visits>1</nb_visits>
 				<nb_actions>1</nb_actions>
-				<nb_users>1</nb_users>
+				<nb_users>0</nb_users>
 				<nb_actions_per_visit>1</nb_actions_per_visit>
 				<avg_time_on_site>365</avg_time_on_site>
 				<bounce_rate>100%</bounce_rate>
@@ -38,7 +38,7 @@
 				<nb_uniq_visitors>1</nb_uniq_visitors>
 				<nb_visits>1</nb_visits>
 				<nb_actions>1</nb_actions>
-				<nb_users>1</nb_users>
+				<nb_users>0</nb_users>
 				<nb_actions_per_visit>1</nb_actions_per_visit>
 				<avg_time_on_site>365</avg_time_on_site>
 				<bounce_rate>100%</bounce_rate>
@@ -53,7 +53,7 @@
 				<nb_uniq_visitors>1</nb_uniq_visitors>
 				<nb_visits>1</nb_visits>
 				<nb_actions>1</nb_actions>
-				<nb_users>1</nb_users>
+				<nb_users>0</nb_users>
 				<nb_actions_per_visit>1</nb_actions_per_visit>
 				<avg_time_on_site>365</avg_time_on_site>
 				<bounce_rate>100%</bounce_rate>
@@ -68,7 +68,7 @@
 				<nb_uniq_visitors>1</nb_uniq_visitors>
 				<nb_visits>1</nb_visits>
 				<nb_actions>1</nb_actions>
-				<nb_users>1</nb_users>
+				<nb_users>0</nb_users>
 				<nb_actions_per_visit>1</nb_actions_per_visit>
 				<avg_time_on_site>365</avg_time_on_site>
 				<bounce_rate>100%</bounce_rate>
@@ -83,7 +83,7 @@
 				<nb_uniq_visitors>1</nb_uniq_visitors>
 				<nb_visits>1</nb_visits>
 				<nb_actions>1</nb_actions>
-				<nb_users>1</nb_users>
+				<nb_users>0</nb_users>
 				<nb_actions_per_visit>1</nb_actions_per_visit>
 				<avg_time_on_site>365</avg_time_on_site>
 				<bounce_rate>100%</bounce_rate>
@@ -111,8 +111,6 @@
 			</nb_actions>
 			<nb_users>
 				<name>Users</name>
-				<min>0</min>
-				<max>1</max>
 			</nb_users>
 			<nb_actions_per_visit>
 				<name>Actions per Visit</name>
diff --git a/tests/PHPUnit/Integration/expected/test_RowEvolution_referrer2__API.getRowEvolution_day.xml b/tests/PHPUnit/Integration/expected/test_RowEvolution_referrer2__API.getRowEvolution_day.xml
index 8251015ac6..c424df6d30 100644
--- a/tests/PHPUnit/Integration/expected/test_RowEvolution_referrer2__API.getRowEvolution_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_RowEvolution_referrer2__API.getRowEvolution_day.xml
@@ -10,7 +10,7 @@
 				<nb_uniq_visitors>1</nb_uniq_visitors>
 				<nb_visits>1</nb_visits>
 				<nb_actions>1</nb_actions>
-				<nb_users>1</nb_users>
+				<nb_users>0</nb_users>
 				<nb_actions_per_visit>1</nb_actions_per_visit>
 				<avg_time_on_site>365</avg_time_on_site>
 				<bounce_rate>100%</bounce_rate>
@@ -30,7 +30,7 @@
 				<nb_uniq_visitors>1</nb_uniq_visitors>
 				<nb_visits>1</nb_visits>
 				<nb_actions>1</nb_actions>
-				<nb_users>1</nb_users>
+				<nb_users>0</nb_users>
 				<nb_actions_per_visit>1</nb_actions_per_visit>
 				<avg_time_on_site>365</avg_time_on_site>
 				<bounce_rate>100%</bounce_rate>
@@ -50,7 +50,7 @@
 				<nb_uniq_visitors>1</nb_uniq_visitors>
 				<nb_visits>1</nb_visits>
 				<nb_actions>1</nb_actions>
-				<nb_users>1</nb_users>
+				<nb_users>0</nb_users>
 				<nb_actions_per_visit>1</nb_actions_per_visit>
 				<avg_time_on_site>365</avg_time_on_site>
 				<bounce_rate>100%</bounce_rate>
@@ -81,8 +81,6 @@
 			</nb_actions>
 			<nb_users>
 				<name>Users</name>
-				<min>0</min>
-				<max>1</max>
 			</nb_users>
 			<nb_actions_per_visit>
 				<name>Actions per Visit</name>
diff --git a/tests/PHPUnit/Integration/expected/test_SiteSearch_AllSites__CustomVariables.getCustomVariables_day.xml b/tests/PHPUnit/Integration/expected/test_SiteSearch_AllSites__CustomVariables.getCustomVariables_day.xml
index 1f6a1ab5ed..55f9028117 100644
--- a/tests/PHPUnit/Integration/expected/test_SiteSearch_AllSites__CustomVariables.getCustomVariables_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_SiteSearch_AllSites__CustomVariables.getCustomVariables_day.xml
@@ -119,7 +119,7 @@
 				<label>test cvar name</label>
 				<nb_visits>1</nb_visits>
 				<nb_actions>3</nb_actions>
-				<nb_users>1</nb_users>
+				<nb_users>0</nb_users>
 				<max_actions>3</max_actions>
 				<sum_visit_length>541</sum_visit_length>
 				<bounce_count>0</bounce_count>
@@ -129,7 +129,7 @@
 						<label>test cvar value</label>
 						<nb_visits>1</nb_visits>
 						<nb_actions>3</nb_actions>
-						<nb_users>1</nb_users>
+						<nb_users>0</nb_users>
 						<max_actions>3</max_actions>
 						<sum_visit_length>541</sum_visit_length>
 						<bounce_count>0</bounce_count>
diff --git a/tests/PHPUnit/Integration/expected/test_SiteSearch_AllSites__CustomVariables.getCustomVariables_month.xml b/tests/PHPUnit/Integration/expected/test_SiteSearch_AllSites__CustomVariables.getCustomVariables_month.xml
index ba5b1f793b..1a0871477a 100644
--- a/tests/PHPUnit/Integration/expected/test_SiteSearch_AllSites__CustomVariables.getCustomVariables_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_SiteSearch_AllSites__CustomVariables.getCustomVariables_month.xml
@@ -111,7 +111,7 @@
 				<bounce_count>0</bounce_count>
 				<nb_visits_converted>0</nb_visits_converted>
 				<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-				<sum_daily_nb_users>1</sum_daily_nb_users>
+				<sum_daily_nb_users>0</sum_daily_nb_users>
 				<subtable>
 					<row>
 						<label>test cvar value</label>
@@ -122,7 +122,7 @@
 						<bounce_count>0</bounce_count>
 						<nb_visits_converted>0</nb_visits_converted>
 						<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-						<sum_daily_nb_users>1</sum_daily_nb_users>
+						<sum_daily_nb_users>0</sum_daily_nb_users>
 					</row>
 				</subtable>
 			</row>
diff --git a/tests/PHPUnit/Integration/expected/test_TimezonesTest__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/Integration/expected/test_TimezonesTest__Live.getLastVisitsDetails_day.xml
index 4d5a3bb878..b4156876a6 100644
--- a/tests/PHPUnit/Integration/expected/test_TimezonesTest__Live.getLastVisitsDetails_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_TimezonesTest__Live.getLastVisitsDetails_day.xml
@@ -25,7 +25,7 @@
 		
 		<searches>0</searches>
 		<actions>1</actions>
-		<userId />
+		<userId>0</userId>
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>0</visitConverted>
diff --git a/tests/PHPUnit/Integration/expected/test_TimezonesTest_withVisit__VisitsSummary.get_day.xml b/tests/PHPUnit/Integration/expected/test_TimezonesTest_withVisit__VisitsSummary.get_day.xml
index 00ebb388f0..b0e66b9280 100644
--- a/tests/PHPUnit/Integration/expected/test_TimezonesTest_withVisit__VisitsSummary.get_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_TimezonesTest_withVisit__VisitsSummary.get_day.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <result>
 	<nb_uniq_visitors>1</nb_uniq_visitors>
-	<nb_users>1</nb_users>
+	<nb_users>0</nb_users>
 	<nb_visits>1</nb_visits>
 	<nb_actions>1</nb_actions>
 	<nb_visits_converted>0</nb_visits_converted>
diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_disabledAfter__VisitsSummary.get_day.xml b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_disabledAfter__VisitsSummary.get_day.xml
index 75e6622c16..89cd627339 100644
--- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_disabledAfter__VisitsSummary.get_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_disabledAfter__VisitsSummary.get_day.xml
@@ -2,7 +2,7 @@
 <results>
 	<result idSite="1">
 		<nb_uniq_visitors>1</nb_uniq_visitors>
-		<nb_users>1</nb_users>
+		<nb_users>0</nb_users>
 		<nb_visits>1</nb_visits>
 		<nb_actions>1</nb_actions>
 		<nb_visits_converted>1</nb_visits_converted>
diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_disabledAfter__VisitsSummary.get_month.xml b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_disabledAfter__VisitsSummary.get_month.xml
index 8c4e4cfbaa..50c77f2755 100644
--- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_disabledAfter__VisitsSummary.get_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_disabledAfter__VisitsSummary.get_month.xml
@@ -2,7 +2,7 @@
 <results>
 	<result idSite="1">
 		<nb_uniq_visitors>2</nb_uniq_visitors>
-		<nb_users>1</nb_users>
+		<nb_users>0</nb_users>
 		<nb_visits>10</nb_visits>
 		<nb_actions>43</nb_actions>
 		<nb_visits_converted>10</nb_visits_converted>
@@ -15,7 +15,7 @@
 	</result>
 	<result idSite="2">
 		<nb_uniq_visitors>1</nb_uniq_visitors>
-		<nb_users>1</nb_users>
+		<nb_users>0</nb_users>
 		<nb_visits>1</nb_visits>
 		<nb_actions>3</nb_actions>
 		<nb_visits_converted>1</nb_visits_converted>
diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_disabledAfter__VisitsSummary.get_week.xml b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_disabledAfter__VisitsSummary.get_week.xml
index 75e6622c16..89cd627339 100644
--- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_disabledAfter__VisitsSummary.get_week.xml
+++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_disabledAfter__VisitsSummary.get_week.xml
@@ -2,7 +2,7 @@
 <results>
 	<result idSite="1">
 		<nb_uniq_visitors>1</nb_uniq_visitors>
-		<nb_users>1</nb_users>
+		<nb_users>0</nb_users>
 		<nb_visits>1</nb_visits>
 		<nb_actions>1</nb_actions>
 		<nb_visits_converted>1</nb_visits_converted>
diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_enabled__VisitsSummary.get_day.xml b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_enabled__VisitsSummary.get_day.xml
index 75e6622c16..89cd627339 100644
--- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_enabled__VisitsSummary.get_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_enabled__VisitsSummary.get_day.xml
@@ -2,7 +2,7 @@
 <results>
 	<result idSite="1">
 		<nb_uniq_visitors>1</nb_uniq_visitors>
-		<nb_users>1</nb_users>
+		<nb_users>0</nb_users>
 		<nb_visits>1</nb_visits>
 		<nb_actions>1</nb_actions>
 		<nb_visits_converted>1</nb_visits_converted>
diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_enabled__VisitsSummary.get_month.xml b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_enabled__VisitsSummary.get_month.xml
index 8c4e4cfbaa..50c77f2755 100644
--- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_enabled__VisitsSummary.get_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_enabled__VisitsSummary.get_month.xml
@@ -2,7 +2,7 @@
 <results>
 	<result idSite="1">
 		<nb_uniq_visitors>2</nb_uniq_visitors>
-		<nb_users>1</nb_users>
+		<nb_users>0</nb_users>
 		<nb_visits>10</nb_visits>
 		<nb_actions>43</nb_actions>
 		<nb_visits_converted>10</nb_visits_converted>
@@ -15,7 +15,7 @@
 	</result>
 	<result idSite="2">
 		<nb_uniq_visitors>1</nb_uniq_visitors>
-		<nb_users>1</nb_users>
+		<nb_users>0</nb_users>
 		<nb_visits>1</nb_visits>
 		<nb_actions>3</nb_actions>
 		<nb_visits_converted>1</nb_visits_converted>
diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_enabled__VisitsSummary.get_week.xml b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_enabled__VisitsSummary.get_week.xml
index 75e6622c16..89cd627339 100644
--- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_enabled__VisitsSummary.get_week.xml
+++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_ArchivingDisabled_enabled__VisitsSummary.get_week.xml
@@ -2,7 +2,7 @@
 <results>
 	<result idSite="1">
 		<nb_uniq_visitors>1</nb_uniq_visitors>
-		<nb_users>1</nb_users>
+		<nb_users>0</nb_users>
 		<nb_visits>1</nb_visits>
 		<nb_actions>1</nb_actions>
 		<nb_visits_converted>1</nb_visits_converted>
diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_NotLastNPeriods__VisitsSummary.get_day.xml b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_NotLastNPeriods__VisitsSummary.get_day.xml
index 75e6622c16..89cd627339 100644
--- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_NotLastNPeriods__VisitsSummary.get_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_NotLastNPeriods__VisitsSummary.get_day.xml
@@ -2,7 +2,7 @@
 <results>
 	<result idSite="1">
 		<nb_uniq_visitors>1</nb_uniq_visitors>
-		<nb_users>1</nb_users>
+		<nb_users>0</nb_users>
 		<nb_visits>1</nb_visits>
 		<nb_actions>1</nb_actions>
 		<nb_visits_converted>1</nb_visits_converted>
diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_NotLastNPeriods__VisitsSummary.get_month.xml b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_NotLastNPeriods__VisitsSummary.get_month.xml
index 8c4e4cfbaa..50c77f2755 100644
--- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_NotLastNPeriods__VisitsSummary.get_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_NotLastNPeriods__VisitsSummary.get_month.xml
@@ -2,7 +2,7 @@
 <results>
 	<result idSite="1">
 		<nb_uniq_visitors>2</nb_uniq_visitors>
-		<nb_users>1</nb_users>
+		<nb_users>0</nb_users>
 		<nb_visits>10</nb_visits>
 		<nb_actions>43</nb_actions>
 		<nb_visits_converted>10</nb_visits_converted>
@@ -15,7 +15,7 @@
 	</result>
 	<result idSite="2">
 		<nb_uniq_visitors>1</nb_uniq_visitors>
-		<nb_users>1</nb_users>
+		<nb_users>0</nb_users>
 		<nb_visits>1</nb_visits>
 		<nb_actions>3</nb_actions>
 		<nb_visits_converted>1</nb_visits_converted>
diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_NotLastNPeriods__VisitsSummary.get_day.xml b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_NotLastNPeriods__VisitsSummary.get_day.xml
index 32471ac4cf..296741c7a0 100644
--- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_NotLastNPeriods__VisitsSummary.get_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_NotLastNPeriods__VisitsSummary.get_day.xml
@@ -2,7 +2,7 @@
 <results>
 	<result idSite="1">
 		<nb_uniq_visitors>1</nb_uniq_visitors>
-		<nb_users>1</nb_users>
+		<nb_users>0</nb_users>
 		<nb_visits>1</nb_visits>
 		<nb_actions>1</nb_actions>
 		<nb_visits_converted>0</nb_visits_converted>
diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_NotLastNPeriods__VisitsSummary.get_month.xml b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_NotLastNPeriods__VisitsSummary.get_month.xml
index 06c309c4fa..9aa711753b 100644
--- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_NotLastNPeriods__VisitsSummary.get_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_NotLastNPeriods__VisitsSummary.get_month.xml
@@ -2,7 +2,7 @@
 <results>
 	<result idSite="1">
 		<nb_uniq_visitors>2</nb_uniq_visitors>
-		<nb_users>1</nb_users>
+		<nb_users>0</nb_users>
 		<nb_visits>10</nb_visits>
 		<nb_actions>43</nb_actions>
 		<nb_visits_converted>0</nb_visits_converted>
@@ -15,7 +15,7 @@
 	</result>
 	<result idSite="2">
 		<nb_uniq_visitors>1</nb_uniq_visitors>
-		<nb_users>1</nb_users>
+		<nb_users>0</nb_users>
 		<nb_visits>1</nb_visits>
 		<nb_actions>3</nb_actions>
 		<nb_visits_converted>0</nb_visits_converted>
diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Referrers.getWebsites_firstSite_lastN__API.getProcessedReport_day.xml b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Referrers.getWebsites_firstSite_lastN__API.getProcessedReport_day.xml
index 7b96eea503..b44b46c790 100644
--- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Referrers.getWebsites_firstSite_lastN__API.getProcessedReport_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Referrers.getWebsites_firstSite_lastN__API.getProcessedReport_day.xml
@@ -57,7 +57,7 @@
 				<nb_uniq_visitors>1</nb_uniq_visitors>
 				<nb_visits>1</nb_visits>
 				<nb_actions>2</nb_actions>
-				<nb_users>1</nb_users>
+				<nb_users>0</nb_users>
 				<nb_actions_per_visit>2</nb_actions_per_visit>
 				<avg_time_on_site>00:06:01</avg_time_on_site>
 				<bounce_rate>0%</bounce_rate>
@@ -70,7 +70,7 @@
 				<nb_uniq_visitors>1</nb_uniq_visitors>
 				<nb_visits>1</nb_visits>
 				<nb_actions>5</nb_actions>
-				<nb_users>1</nb_users>
+				<nb_users>0</nb_users>
 				<nb_actions_per_visit>5</nb_actions_per_visit>
 				<avg_time_on_site>00:15:01</avg_time_on_site>
 				<bounce_rate>0%</bounce_rate>
@@ -83,7 +83,7 @@
 				<nb_uniq_visitors>1</nb_uniq_visitors>
 				<nb_visits>1</nb_visits>
 				<nb_actions>5</nb_actions>
-				<nb_users>1</nb_users>
+				<nb_users>0</nb_users>
 				<nb_actions_per_visit>5</nb_actions_per_visit>
 				<avg_time_on_site>00:15:01</avg_time_on_site>
 				<bounce_rate>0%</bounce_rate>
@@ -96,7 +96,7 @@
 				<nb_uniq_visitors>1</nb_uniq_visitors>
 				<nb_visits>1</nb_visits>
 				<nb_actions>5</nb_actions>
-				<nb_users>1</nb_users>
+				<nb_users>0</nb_users>
 				<nb_actions_per_visit>5</nb_actions_per_visit>
 				<avg_time_on_site>00:15:01</avg_time_on_site>
 				<bounce_rate>0%</bounce_rate>
@@ -109,7 +109,7 @@
 				<nb_uniq_visitors>1</nb_uniq_visitors>
 				<nb_visits>1</nb_visits>
 				<nb_actions>5</nb_actions>
-				<nb_users>1</nb_users>
+				<nb_users>0</nb_users>
 				<nb_actions_per_visit>5</nb_actions_per_visit>
 				<avg_time_on_site>00:15:01</avg_time_on_site>
 				<bounce_rate>0%</bounce_rate>
@@ -122,7 +122,7 @@
 				<nb_uniq_visitors>1</nb_uniq_visitors>
 				<nb_visits>1</nb_visits>
 				<nb_actions>5</nb_actions>
-				<nb_users>1</nb_users>
+				<nb_users>0</nb_users>
 				<nb_actions_per_visit>5</nb_actions_per_visit>
 				<avg_time_on_site>00:15:01</avg_time_on_site>
 				<bounce_rate>0%</bounce_rate>
diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_VisitsSummary.get_firstSite_lastN__API.getProcessedReport_day.xml b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_VisitsSummary.get_firstSite_lastN__API.getProcessedReport_day.xml
index d1ae6ccf41..0e48ca569f 100644
--- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_VisitsSummary.get_firstSite_lastN__API.getProcessedReport_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_VisitsSummary.get_firstSite_lastN__API.getProcessedReport_day.xml
@@ -43,7 +43,7 @@
 	<reportData>
 		<result prettyDate="Sunday 3 January 2010">
 			<nb_uniq_visitors>1</nb_uniq_visitors>
-			<nb_users>1</nb_users>
+			<nb_users>0</nb_users>
 			<nb_visits>1</nb_visits>
 			<nb_actions>1</nb_actions>
 			<max_actions>1</max_actions>
@@ -53,7 +53,7 @@
 		</result>
 		<result prettyDate="Monday 4 January 2010">
 			<nb_uniq_visitors>1</nb_uniq_visitors>
-			<nb_users>1</nb_users>
+			<nb_users>0</nb_users>
 			<nb_visits>1</nb_visits>
 			<nb_actions>2</nb_actions>
 			<max_actions>2</max_actions>
@@ -63,7 +63,7 @@
 		</result>
 		<result prettyDate="Tuesday 5 January 2010">
 			<nb_uniq_visitors>1</nb_uniq_visitors>
-			<nb_users>1</nb_users>
+			<nb_users>0</nb_users>
 			<nb_visits>1</nb_visits>
 			<nb_actions>5</nb_actions>
 			<max_actions>5</max_actions>
@@ -73,7 +73,7 @@
 		</result>
 		<result prettyDate="Wednesday 6 January 2010">
 			<nb_uniq_visitors>1</nb_uniq_visitors>
-			<nb_users>1</nb_users>
+			<nb_users>0</nb_users>
 			<nb_visits>1</nb_visits>
 			<nb_actions>5</nb_actions>
 			<max_actions>5</max_actions>
@@ -83,7 +83,7 @@
 		</result>
 		<result prettyDate="Thursday 7 January 2010">
 			<nb_uniq_visitors>1</nb_uniq_visitors>
-			<nb_users>1</nb_users>
+			<nb_users>0</nb_users>
 			<nb_visits>1</nb_visits>
 			<nb_actions>5</nb_actions>
 			<max_actions>5</max_actions>
@@ -93,7 +93,7 @@
 		</result>
 		<result prettyDate="Friday 8 January 2010">
 			<nb_uniq_visitors>1</nb_uniq_visitors>
-			<nb_users>1</nb_users>
+			<nb_users>0</nb_users>
 			<nb_visits>1</nb_visits>
 			<nb_actions>5</nb_actions>
 			<max_actions>5</max_actions>
@@ -103,7 +103,7 @@
 		</result>
 		<result prettyDate="Saturday 9 January 2010">
 			<nb_uniq_visitors>1</nb_uniq_visitors>
-			<nb_users>1</nb_users>
+			<nb_users>0</nb_users>
 			<nb_visits>1</nb_visits>
 			<nb_actions>5</nb_actions>
 			<max_actions>5</max_actions>
diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__Referrers.getWebsites_day.xml b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__Referrers.getWebsites_day.xml
index 9ea8e32470..03e010ff91 100644
--- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__Referrers.getWebsites_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__Referrers.getWebsites_day.xml
@@ -8,7 +8,7 @@
 				<nb_uniq_visitors>1</nb_uniq_visitors>
 				<nb_visits>1</nb_visits>
 				<nb_actions>2</nb_actions>
-				<nb_users>1</nb_users>
+				<nb_users>0</nb_users>
 				<max_actions>2</max_actions>
 				<sum_visit_length>361</sum_visit_length>
 				<bounce_count>0</bounce_count>
@@ -19,7 +19,7 @@
 						<nb_uniq_visitors>1</nb_uniq_visitors>
 						<nb_visits>1</nb_visits>
 						<nb_actions>2</nb_actions>
-						<nb_users>1</nb_users>
+						<nb_users>0</nb_users>
 						<max_actions>2</max_actions>
 						<sum_visit_length>361</sum_visit_length>
 						<bounce_count>0</bounce_count>
@@ -34,7 +34,7 @@
 				<nb_uniq_visitors>1</nb_uniq_visitors>
 				<nb_visits>1</nb_visits>
 				<nb_actions>5</nb_actions>
-				<nb_users>1</nb_users>
+				<nb_users>0</nb_users>
 				<max_actions>5</max_actions>
 				<sum_visit_length>901</sum_visit_length>
 				<bounce_count>0</bounce_count>
@@ -45,7 +45,7 @@
 						<nb_uniq_visitors>1</nb_uniq_visitors>
 						<nb_visits>1</nb_visits>
 						<nb_actions>5</nb_actions>
-						<nb_users>1</nb_users>
+						<nb_users>0</nb_users>
 						<max_actions>5</max_actions>
 						<sum_visit_length>901</sum_visit_length>
 						<bounce_count>0</bounce_count>
@@ -60,7 +60,7 @@
 				<nb_uniq_visitors>1</nb_uniq_visitors>
 				<nb_visits>1</nb_visits>
 				<nb_actions>5</nb_actions>
-				<nb_users>1</nb_users>
+				<nb_users>0</nb_users>
 				<max_actions>5</max_actions>
 				<sum_visit_length>901</sum_visit_length>
 				<bounce_count>0</bounce_count>
@@ -71,7 +71,7 @@
 						<nb_uniq_visitors>1</nb_uniq_visitors>
 						<nb_visits>1</nb_visits>
 						<nb_actions>5</nb_actions>
-						<nb_users>1</nb_users>
+						<nb_users>0</nb_users>
 						<max_actions>5</max_actions>
 						<sum_visit_length>901</sum_visit_length>
 						<bounce_count>0</bounce_count>
@@ -86,7 +86,7 @@
 				<nb_uniq_visitors>1</nb_uniq_visitors>
 				<nb_visits>1</nb_visits>
 				<nb_actions>5</nb_actions>
-				<nb_users>1</nb_users>
+				<nb_users>0</nb_users>
 				<max_actions>5</max_actions>
 				<sum_visit_length>901</sum_visit_length>
 				<bounce_count>0</bounce_count>
@@ -97,7 +97,7 @@
 						<nb_uniq_visitors>1</nb_uniq_visitors>
 						<nb_visits>1</nb_visits>
 						<nb_actions>5</nb_actions>
-						<nb_users>1</nb_users>
+						<nb_users>0</nb_users>
 						<max_actions>5</max_actions>
 						<sum_visit_length>901</sum_visit_length>
 						<bounce_count>0</bounce_count>
@@ -112,7 +112,7 @@
 				<nb_uniq_visitors>1</nb_uniq_visitors>
 				<nb_visits>1</nb_visits>
 				<nb_actions>5</nb_actions>
-				<nb_users>1</nb_users>
+				<nb_users>0</nb_users>
 				<max_actions>5</max_actions>
 				<sum_visit_length>901</sum_visit_length>
 				<bounce_count>0</bounce_count>
@@ -123,7 +123,7 @@
 						<nb_uniq_visitors>1</nb_uniq_visitors>
 						<nb_visits>1</nb_visits>
 						<nb_actions>5</nb_actions>
-						<nb_users>1</nb_users>
+						<nb_users>0</nb_users>
 						<max_actions>5</max_actions>
 						<sum_visit_length>901</sum_visit_length>
 						<bounce_count>0</bounce_count>
@@ -138,7 +138,7 @@
 				<nb_uniq_visitors>1</nb_uniq_visitors>
 				<nb_visits>1</nb_visits>
 				<nb_actions>5</nb_actions>
-				<nb_users>1</nb_users>
+				<nb_users>0</nb_users>
 				<max_actions>5</max_actions>
 				<sum_visit_length>901</sum_visit_length>
 				<bounce_count>0</bounce_count>
@@ -149,7 +149,7 @@
 						<nb_uniq_visitors>1</nb_uniq_visitors>
 						<nb_visits>1</nb_visits>
 						<nb_actions>5</nb_actions>
-						<nb_users>1</nb_users>
+						<nb_users>0</nb_users>
 						<max_actions>5</max_actions>
 						<sum_visit_length>901</sum_visit_length>
 						<bounce_count>0</bounce_count>
@@ -167,7 +167,7 @@
 				<nb_uniq_visitors>1</nb_uniq_visitors>
 				<nb_visits>1</nb_visits>
 				<nb_actions>3</nb_actions>
-				<nb_users>1</nb_users>
+				<nb_users>0</nb_users>
 				<max_actions>3</max_actions>
 				<sum_visit_length>1</sum_visit_length>
 				<bounce_count>0</bounce_count>
@@ -178,7 +178,7 @@
 						<nb_uniq_visitors>1</nb_uniq_visitors>
 						<nb_visits>1</nb_visits>
 						<nb_actions>3</nb_actions>
-						<nb_users>1</nb_users>
+						<nb_users>0</nb_users>
 						<max_actions>3</max_actions>
 						<sum_visit_length>1</sum_visit_length>
 						<bounce_count>0</bounce_count>
diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__Referrers.getWebsites_month.xml b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__Referrers.getWebsites_month.xml
index 302e91d40a..aae3dbad27 100644
--- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__Referrers.getWebsites_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__Referrers.getWebsites_month.xml
@@ -11,7 +11,7 @@
 				<bounce_count>0</bounce_count>
 				<nb_visits_converted>0</nb_visits_converted>
 				<sum_daily_nb_uniq_visitors>9</sum_daily_nb_uniq_visitors>
-				<sum_daily_nb_users>9</sum_daily_nb_users>
+				<sum_daily_nb_users>0</sum_daily_nb_users>
 				<subtable>
 					<row>
 						<label>http://referrer.com/Other_Page.htm</label>
@@ -22,7 +22,7 @@
 						<bounce_count>0</bounce_count>
 						<nb_visits_converted>0</nb_visits_converted>
 						<sum_daily_nb_uniq_visitors>8</sum_daily_nb_uniq_visitors>
-						<sum_daily_nb_users>8</sum_daily_nb_users>
+						<sum_daily_nb_users>0</sum_daily_nb_users>
 					</row>
 					<row>
 						<label>http://referrer.com/page.htm?param=valuewith some spaces</label>
@@ -33,7 +33,7 @@
 						<bounce_count>0</bounce_count>
 						<nb_visits_converted>0</nb_visits_converted>
 						<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-						<sum_daily_nb_users>1</sum_daily_nb_users>
+						<sum_daily_nb_users>0</sum_daily_nb_users>
 					</row>
 				</subtable>
 			</row>
@@ -56,7 +56,7 @@
 				<bounce_count>0</bounce_count>
 				<nb_visits_converted>0</nb_visits_converted>
 				<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-				<sum_daily_nb_users>1</sum_daily_nb_users>
+				<sum_daily_nb_users>0</sum_daily_nb_users>
 				<subtable>
 					<row>
 						<label>http://only-homepage-referrer.com/</label>
@@ -67,7 +67,7 @@
 						<bounce_count>0</bounce_count>
 						<nb_visits_converted>0</nb_visits_converted>
 						<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-						<sum_daily_nb_users>1</sum_daily_nb_users>
+						<sum_daily_nb_users>0</sum_daily_nb_users>
 					</row>
 				</subtable>
 			</row>
diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__Referrers.getWebsites_week.xml b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__Referrers.getWebsites_week.xml
index 9c516cffbe..1ba3ef39a1 100644
--- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__Referrers.getWebsites_week.xml
+++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__Referrers.getWebsites_week.xml
@@ -12,7 +12,7 @@
 				<bounce_count>0</bounce_count>
 				<nb_visits_converted>0</nb_visits_converted>
 				<sum_daily_nb_uniq_visitors>7</sum_daily_nb_uniq_visitors>
-				<sum_daily_nb_users>7</sum_daily_nb_users>
+				<sum_daily_nb_users>0</sum_daily_nb_users>
 				<subtable>
 					<row>
 						<label>http://referrer.com/Other_Page.htm</label>
@@ -23,7 +23,7 @@
 						<bounce_count>0</bounce_count>
 						<nb_visits_converted>0</nb_visits_converted>
 						<sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors>
-						<sum_daily_nb_users>6</sum_daily_nb_users>
+						<sum_daily_nb_users>0</sum_daily_nb_users>
 					</row>
 					<row>
 						<label>http://referrer.com/page.htm?param=valuewith some spaces</label>
@@ -34,7 +34,7 @@
 						<bounce_count>0</bounce_count>
 						<nb_visits_converted>0</nb_visits_converted>
 						<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-						<sum_daily_nb_users>1</sum_daily_nb_users>
+						<sum_daily_nb_users>0</sum_daily_nb_users>
 					</row>
 				</subtable>
 			</row>
@@ -49,7 +49,7 @@
 				<bounce_count>0</bounce_count>
 				<nb_visits_converted>0</nb_visits_converted>
 				<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
-				<sum_daily_nb_users>2</sum_daily_nb_users>
+				<sum_daily_nb_users>0</sum_daily_nb_users>
 				<subtable>
 					<row>
 						<label>http://referrer.com/Other_Page.htm</label>
@@ -60,7 +60,7 @@
 						<bounce_count>0</bounce_count>
 						<nb_visits_converted>0</nb_visits_converted>
 						<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
-						<sum_daily_nb_users>2</sum_daily_nb_users>
+						<sum_daily_nb_users>0</sum_daily_nb_users>
 					</row>
 				</subtable>
 			</row>
@@ -82,7 +82,7 @@
 				<bounce_count>0</bounce_count>
 				<nb_visits_converted>0</nb_visits_converted>
 				<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-				<sum_daily_nb_users>1</sum_daily_nb_users>
+				<sum_daily_nb_users>0</sum_daily_nb_users>
 				<subtable>
 					<row>
 						<label>http://only-homepage-referrer.com/</label>
@@ -93,7 +93,7 @@
 						<bounce_count>0</bounce_count>
 						<nb_visits_converted>0</nb_visits_converted>
 						<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-						<sum_daily_nb_users>1</sum_daily_nb_users>
+						<sum_daily_nb_users>0</sum_daily_nb_users>
 					</row>
 				</subtable>
 			</row>
diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__Referrers.getWebsites_year.xml b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__Referrers.getWebsites_year.xml
index 9af23aaf76..81caacb06a 100644
--- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__Referrers.getWebsites_year.xml
+++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__Referrers.getWebsites_year.xml
@@ -11,7 +11,7 @@
 				<bounce_count>0</bounce_count>
 				<nb_visits_converted>0</nb_visits_converted>
 				<sum_daily_nb_uniq_visitors>9</sum_daily_nb_uniq_visitors>
-				<sum_daily_nb_users>9</sum_daily_nb_users>
+				<sum_daily_nb_users>0</sum_daily_nb_users>
 				<subtable>
 					<row>
 						<label>http://referrer.com/Other_Page.htm</label>
@@ -22,7 +22,7 @@
 						<bounce_count>0</bounce_count>
 						<nb_visits_converted>0</nb_visits_converted>
 						<sum_daily_nb_uniq_visitors>8</sum_daily_nb_uniq_visitors>
-						<sum_daily_nb_users>8</sum_daily_nb_users>
+						<sum_daily_nb_users>0</sum_daily_nb_users>
 					</row>
 					<row>
 						<label>http://referrer.com/page.htm?param=valuewith some spaces</label>
@@ -33,7 +33,7 @@
 						<bounce_count>0</bounce_count>
 						<nb_visits_converted>0</nb_visits_converted>
 						<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-						<sum_daily_nb_users>1</sum_daily_nb_users>
+						<sum_daily_nb_users>0</sum_daily_nb_users>
 					</row>
 				</subtable>
 			</row>
@@ -56,7 +56,7 @@
 				<bounce_count>0</bounce_count>
 				<nb_visits_converted>0</nb_visits_converted>
 				<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-				<sum_daily_nb_users>1</sum_daily_nb_users>
+				<sum_daily_nb_users>0</sum_daily_nb_users>
 				<subtable>
 					<row>
 						<label>http://only-homepage-referrer.com/</label>
@@ -67,7 +67,7 @@
 						<bounce_count>0</bounce_count>
 						<nb_visits_converted>0</nb_visits_converted>
 						<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-						<sum_daily_nb_users>1</sum_daily_nb_users>
+						<sum_daily_nb_users>0</sum_daily_nb_users>
 					</row>
 				</subtable>
 			</row>
diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__VisitFrequency.get_day.xml b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__VisitFrequency.get_day.xml
index d658a0f2f3..1132f1191d 100644
--- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__VisitFrequency.get_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__VisitFrequency.get_day.xml
@@ -5,7 +5,7 @@
 		<result date="2010-01-04" />
 		<result date="2010-01-05">
 			<nb_uniq_visitors_returning>1</nb_uniq_visitors_returning>
-			<nb_users_returning>1</nb_users_returning>
+			<nb_users_returning>0</nb_users_returning>
 			<nb_visits_returning>1</nb_visits_returning>
 			<nb_actions_returning>5</nb_actions_returning>
 			<nb_visits_converted_returning>0</nb_visits_converted_returning>
@@ -18,7 +18,7 @@
 		</result>
 		<result date="2010-01-06">
 			<nb_uniq_visitors_returning>1</nb_uniq_visitors_returning>
-			<nb_users_returning>1</nb_users_returning>
+			<nb_users_returning>0</nb_users_returning>
 			<nb_visits_returning>1</nb_visits_returning>
 			<nb_actions_returning>5</nb_actions_returning>
 			<nb_visits_converted_returning>0</nb_visits_converted_returning>
@@ -31,7 +31,7 @@
 		</result>
 		<result date="2010-01-07">
 			<nb_uniq_visitors_returning>1</nb_uniq_visitors_returning>
-			<nb_users_returning>1</nb_users_returning>
+			<nb_users_returning>0</nb_users_returning>
 			<nb_visits_returning>1</nb_visits_returning>
 			<nb_actions_returning>5</nb_actions_returning>
 			<nb_visits_converted_returning>0</nb_visits_converted_returning>
@@ -44,7 +44,7 @@
 		</result>
 		<result date="2010-01-08">
 			<nb_uniq_visitors_returning>1</nb_uniq_visitors_returning>
-			<nb_users_returning>1</nb_users_returning>
+			<nb_users_returning>0</nb_users_returning>
 			<nb_visits_returning>1</nb_visits_returning>
 			<nb_actions_returning>5</nb_actions_returning>
 			<nb_visits_converted_returning>0</nb_visits_converted_returning>
@@ -57,7 +57,7 @@
 		</result>
 		<result date="2010-01-09">
 			<nb_uniq_visitors_returning>1</nb_uniq_visitors_returning>
-			<nb_users_returning>1</nb_users_returning>
+			<nb_users_returning>0</nb_users_returning>
 			<nb_visits_returning>1</nb_visits_returning>
 			<nb_actions_returning>5</nb_actions_returning>
 			<nb_visits_converted_returning>0</nb_visits_converted_returning>
diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__VisitFrequency.get_month.xml b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__VisitFrequency.get_month.xml
index b5f57f52bc..f6da2a541d 100644
--- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__VisitFrequency.get_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__VisitFrequency.get_month.xml
@@ -3,7 +3,7 @@
 	<result idSite="1">
 		<result date="2010-01">
 			<nb_uniq_visitors_returning>1</nb_uniq_visitors_returning>
-			<nb_users_returning>1</nb_users_returning>
+			<nb_users_returning>0</nb_users_returning>
 			<nb_visits_returning>8</nb_visits_returning>
 			<nb_actions_returning>40</nb_actions_returning>
 			<nb_visits_converted_returning>0</nb_visits_converted_returning>
diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__VisitFrequency.get_week.xml b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__VisitFrequency.get_week.xml
index b42cd3c399..d64e929e8a 100644
--- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__VisitFrequency.get_week.xml
+++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__VisitFrequency.get_week.xml
@@ -4,7 +4,7 @@
 		<result date="From 2009-12-28 to 2010-01-03" />
 		<result date="From 2010-01-04 to 2010-01-10">
 			<nb_uniq_visitors_returning>1</nb_uniq_visitors_returning>
-			<nb_users_returning>1</nb_users_returning>
+			<nb_users_returning>0</nb_users_returning>
 			<nb_visits_returning>6</nb_visits_returning>
 			<nb_actions_returning>30</nb_actions_returning>
 			<nb_visits_converted_returning>0</nb_visits_converted_returning>
@@ -17,7 +17,7 @@
 		</result>
 		<result date="From 2010-01-11 to 2010-01-17">
 			<nb_uniq_visitors_returning>1</nb_uniq_visitors_returning>
-			<nb_users_returning>1</nb_users_returning>
+			<nb_users_returning>0</nb_users_returning>
 			<nb_visits_returning>2</nb_visits_returning>
 			<nb_actions_returning>10</nb_actions_returning>
 			<nb_visits_converted_returning>0</nb_visits_converted_returning>
diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__VisitsSummary.get_day.xml b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__VisitsSummary.get_day.xml
index 95f3ad4c21..c0f0001ebf 100644
--- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__VisitsSummary.get_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__VisitsSummary.get_day.xml
@@ -3,7 +3,7 @@
 	<result idSite="1">
 		<result date="2010-01-03">
 			<nb_uniq_visitors>1</nb_uniq_visitors>
-			<nb_users>1</nb_users>
+			<nb_users>0</nb_users>
 			<nb_visits>1</nb_visits>
 			<nb_actions>1</nb_actions>
 			<nb_visits_converted>0</nb_visits_converted>
@@ -16,7 +16,7 @@
 		</result>
 		<result date="2010-01-04">
 			<nb_uniq_visitors>1</nb_uniq_visitors>
-			<nb_users>1</nb_users>
+			<nb_users>0</nb_users>
 			<nb_visits>1</nb_visits>
 			<nb_actions>2</nb_actions>
 			<nb_visits_converted>0</nb_visits_converted>
@@ -29,7 +29,7 @@
 		</result>
 		<result date="2010-01-05">
 			<nb_uniq_visitors>1</nb_uniq_visitors>
-			<nb_users>1</nb_users>
+			<nb_users>0</nb_users>
 			<nb_visits>1</nb_visits>
 			<nb_actions>5</nb_actions>
 			<nb_visits_converted>0</nb_visits_converted>
@@ -42,7 +42,7 @@
 		</result>
 		<result date="2010-01-06">
 			<nb_uniq_visitors>1</nb_uniq_visitors>
-			<nb_users>1</nb_users>
+			<nb_users>0</nb_users>
 			<nb_visits>1</nb_visits>
 			<nb_actions>5</nb_actions>
 			<nb_visits_converted>0</nb_visits_converted>
@@ -55,7 +55,7 @@
 		</result>
 		<result date="2010-01-07">
 			<nb_uniq_visitors>1</nb_uniq_visitors>
-			<nb_users>1</nb_users>
+			<nb_users>0</nb_users>
 			<nb_visits>1</nb_visits>
 			<nb_actions>5</nb_actions>
 			<nb_visits_converted>0</nb_visits_converted>
@@ -68,7 +68,7 @@
 		</result>
 		<result date="2010-01-08">
 			<nb_uniq_visitors>1</nb_uniq_visitors>
-			<nb_users>1</nb_users>
+			<nb_users>0</nb_users>
 			<nb_visits>1</nb_visits>
 			<nb_actions>5</nb_actions>
 			<nb_visits_converted>0</nb_visits_converted>
@@ -81,7 +81,7 @@
 		</result>
 		<result date="2010-01-09">
 			<nb_uniq_visitors>1</nb_uniq_visitors>
-			<nb_users>1</nb_users>
+			<nb_users>0</nb_users>
 			<nb_visits>1</nb_visits>
 			<nb_actions>5</nb_actions>
 			<nb_visits_converted>0</nb_visits_converted>
@@ -97,7 +97,7 @@
 		<result date="2010-01-03" />
 		<result date="2010-01-04">
 			<nb_uniq_visitors>1</nb_uniq_visitors>
-			<nb_users>1</nb_users>
+			<nb_users>0</nb_users>
 			<nb_visits>1</nb_visits>
 			<nb_actions>3</nb_actions>
 			<nb_visits_converted>0</nb_visits_converted>
diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__VisitsSummary.get_month.xml b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__VisitsSummary.get_month.xml
index a575efca94..d60436c3c9 100644
--- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__VisitsSummary.get_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__VisitsSummary.get_month.xml
@@ -3,7 +3,7 @@
 	<result idSite="1">
 		<result date="2010-01">
 			<nb_uniq_visitors>2</nb_uniq_visitors>
-			<nb_users>1</nb_users>
+			<nb_users>0</nb_users>
 			<nb_visits>10</nb_visits>
 			<nb_actions>43</nb_actions>
 			<nb_visits_converted>0</nb_visits_converted>
@@ -24,7 +24,7 @@
 	<result idSite="2">
 		<result date="2010-01">
 			<nb_uniq_visitors>1</nb_uniq_visitors>
-			<nb_users>1</nb_users>
+			<nb_users>0</nb_users>
 			<nb_visits>1</nb_visits>
 			<nb_actions>3</nb_actions>
 			<nb_visits_converted>0</nb_visits_converted>
diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__VisitsSummary.get_week.xml b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__VisitsSummary.get_week.xml
index 611a7dc7bb..f754acd177 100644
--- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__VisitsSummary.get_week.xml
+++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__VisitsSummary.get_week.xml
@@ -3,7 +3,7 @@
 	<result idSite="1">
 		<result date="From 2009-12-28 to 2010-01-03">
 			<nb_uniq_visitors>1</nb_uniq_visitors>
-			<nb_users>1</nb_users>
+			<nb_users>0</nb_users>
 			<nb_visits>1</nb_visits>
 			<nb_actions>1</nb_actions>
 			<nb_visits_converted>0</nb_visits_converted>
@@ -16,7 +16,7 @@
 		</result>
 		<result date="From 2010-01-04 to 2010-01-10">
 			<nb_uniq_visitors>2</nb_uniq_visitors>
-			<nb_users>1</nb_users>
+			<nb_users>0</nb_users>
 			<nb_visits>7</nb_visits>
 			<nb_actions>32</nb_actions>
 			<nb_visits_converted>0</nb_visits_converted>
@@ -29,7 +29,7 @@
 		</result>
 		<result date="From 2010-01-11 to 2010-01-17">
 			<nb_uniq_visitors>1</nb_uniq_visitors>
-			<nb_users>1</nb_users>
+			<nb_users>0</nb_users>
 			<nb_visits>2</nb_visits>
 			<nb_actions>10</nb_actions>
 			<nb_visits_converted>0</nb_visits_converted>
@@ -49,7 +49,7 @@
 		<result date="From 2009-12-28 to 2010-01-03" />
 		<result date="From 2010-01-04 to 2010-01-10">
 			<nb_uniq_visitors>1</nb_uniq_visitors>
-			<nb_users>1</nb_users>
+			<nb_users>0</nb_users>
 			<nb_visits>1</nb_visits>
 			<nb_actions>3</nb_actions>
 			<nb_visits_converted>0</nb_visits_converted>
diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Referrers.getWebsites_day.xml b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Referrers.getWebsites_day.xml
index 3de785f3d4..1a10c7ba69 100644
--- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Referrers.getWebsites_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Referrers.getWebsites_day.xml
@@ -7,7 +7,7 @@
 			<nb_uniq_visitors>1</nb_uniq_visitors>
 			<nb_visits>1</nb_visits>
 			<nb_actions>2</nb_actions>
-			<nb_users>1</nb_users>
+			<nb_users>0</nb_users>
 			<max_actions>2</max_actions>
 			<sum_visit_length>361</sum_visit_length>
 			<bounce_count>0</bounce_count>
@@ -18,7 +18,7 @@
 					<nb_uniq_visitors>1</nb_uniq_visitors>
 					<nb_visits>1</nb_visits>
 					<nb_actions>2</nb_actions>
-					<nb_users>1</nb_users>
+					<nb_users>0</nb_users>
 					<max_actions>2</max_actions>
 					<sum_visit_length>361</sum_visit_length>
 					<bounce_count>0</bounce_count>
@@ -33,7 +33,7 @@
 			<nb_uniq_visitors>1</nb_uniq_visitors>
 			<nb_visits>1</nb_visits>
 			<nb_actions>5</nb_actions>
-			<nb_users>1</nb_users>
+			<nb_users>0</nb_users>
 			<max_actions>5</max_actions>
 			<sum_visit_length>901</sum_visit_length>
 			<bounce_count>0</bounce_count>
@@ -44,7 +44,7 @@
 					<nb_uniq_visitors>1</nb_uniq_visitors>
 					<nb_visits>1</nb_visits>
 					<nb_actions>5</nb_actions>
-					<nb_users>1</nb_users>
+					<nb_users>0</nb_users>
 					<max_actions>5</max_actions>
 					<sum_visit_length>901</sum_visit_length>
 					<bounce_count>0</bounce_count>
@@ -59,7 +59,7 @@
 			<nb_uniq_visitors>1</nb_uniq_visitors>
 			<nb_visits>1</nb_visits>
 			<nb_actions>5</nb_actions>
-			<nb_users>1</nb_users>
+			<nb_users>0</nb_users>
 			<max_actions>5</max_actions>
 			<sum_visit_length>901</sum_visit_length>
 			<bounce_count>0</bounce_count>
@@ -70,7 +70,7 @@
 					<nb_uniq_visitors>1</nb_uniq_visitors>
 					<nb_visits>1</nb_visits>
 					<nb_actions>5</nb_actions>
-					<nb_users>1</nb_users>
+					<nb_users>0</nb_users>
 					<max_actions>5</max_actions>
 					<sum_visit_length>901</sum_visit_length>
 					<bounce_count>0</bounce_count>
@@ -85,7 +85,7 @@
 			<nb_uniq_visitors>1</nb_uniq_visitors>
 			<nb_visits>1</nb_visits>
 			<nb_actions>5</nb_actions>
-			<nb_users>1</nb_users>
+			<nb_users>0</nb_users>
 			<max_actions>5</max_actions>
 			<sum_visit_length>901</sum_visit_length>
 			<bounce_count>0</bounce_count>
@@ -96,7 +96,7 @@
 					<nb_uniq_visitors>1</nb_uniq_visitors>
 					<nb_visits>1</nb_visits>
 					<nb_actions>5</nb_actions>
-					<nb_users>1</nb_users>
+					<nb_users>0</nb_users>
 					<max_actions>5</max_actions>
 					<sum_visit_length>901</sum_visit_length>
 					<bounce_count>0</bounce_count>
@@ -111,7 +111,7 @@
 			<nb_uniq_visitors>1</nb_uniq_visitors>
 			<nb_visits>1</nb_visits>
 			<nb_actions>5</nb_actions>
-			<nb_users>1</nb_users>
+			<nb_users>0</nb_users>
 			<max_actions>5</max_actions>
 			<sum_visit_length>901</sum_visit_length>
 			<bounce_count>0</bounce_count>
@@ -122,7 +122,7 @@
 					<nb_uniq_visitors>1</nb_uniq_visitors>
 					<nb_visits>1</nb_visits>
 					<nb_actions>5</nb_actions>
-					<nb_users>1</nb_users>
+					<nb_users>0</nb_users>
 					<max_actions>5</max_actions>
 					<sum_visit_length>901</sum_visit_length>
 					<bounce_count>0</bounce_count>
@@ -137,7 +137,7 @@
 			<nb_uniq_visitors>1</nb_uniq_visitors>
 			<nb_visits>1</nb_visits>
 			<nb_actions>5</nb_actions>
-			<nb_users>1</nb_users>
+			<nb_users>0</nb_users>
 			<max_actions>5</max_actions>
 			<sum_visit_length>901</sum_visit_length>
 			<bounce_count>0</bounce_count>
@@ -148,7 +148,7 @@
 					<nb_uniq_visitors>1</nb_uniq_visitors>
 					<nb_visits>1</nb_visits>
 					<nb_actions>5</nb_actions>
-					<nb_users>1</nb_users>
+					<nb_users>0</nb_users>
 					<max_actions>5</max_actions>
 					<sum_visit_length>901</sum_visit_length>
 					<bounce_count>0</bounce_count>
diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Referrers.getWebsites_month.xml b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Referrers.getWebsites_month.xml
index b52e454e88..2be1501d3c 100644
--- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Referrers.getWebsites_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Referrers.getWebsites_month.xml
@@ -10,7 +10,7 @@
 			<bounce_count>0</bounce_count>
 			<nb_visits_converted>0</nb_visits_converted>
 			<sum_daily_nb_uniq_visitors>9</sum_daily_nb_uniq_visitors>
-			<sum_daily_nb_users>9</sum_daily_nb_users>
+			<sum_daily_nb_users>0</sum_daily_nb_users>
 			<subtable>
 				<row>
 					<label>http://referrer.com/Other_Page.htm</label>
@@ -21,7 +21,7 @@
 					<bounce_count>0</bounce_count>
 					<nb_visits_converted>0</nb_visits_converted>
 					<sum_daily_nb_uniq_visitors>8</sum_daily_nb_uniq_visitors>
-					<sum_daily_nb_users>8</sum_daily_nb_users>
+					<sum_daily_nb_users>0</sum_daily_nb_users>
 				</row>
 				<row>
 					<label>http://referrer.com/page.htm?param=valuewith some spaces</label>
@@ -32,7 +32,7 @@
 					<bounce_count>0</bounce_count>
 					<nb_visits_converted>0</nb_visits_converted>
 					<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-					<sum_daily_nb_users>1</sum_daily_nb_users>
+					<sum_daily_nb_users>0</sum_daily_nb_users>
 				</row>
 			</subtable>
 		</row>
diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Referrers.getWebsites_week.xml b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Referrers.getWebsites_week.xml
index 3d650861ff..c0579730ef 100644
--- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Referrers.getWebsites_week.xml
+++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Referrers.getWebsites_week.xml
@@ -11,7 +11,7 @@
 			<bounce_count>0</bounce_count>
 			<nb_visits_converted>0</nb_visits_converted>
 			<sum_daily_nb_uniq_visitors>7</sum_daily_nb_uniq_visitors>
-			<sum_daily_nb_users>7</sum_daily_nb_users>
+			<sum_daily_nb_users>0</sum_daily_nb_users>
 			<subtable>
 				<row>
 					<label>http://referrer.com/Other_Page.htm</label>
@@ -22,7 +22,7 @@
 					<bounce_count>0</bounce_count>
 					<nb_visits_converted>0</nb_visits_converted>
 					<sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors>
-					<sum_daily_nb_users>6</sum_daily_nb_users>
+					<sum_daily_nb_users>0</sum_daily_nb_users>
 				</row>
 				<row>
 					<label>http://referrer.com/page.htm?param=valuewith some spaces</label>
@@ -33,7 +33,7 @@
 					<bounce_count>0</bounce_count>
 					<nb_visits_converted>0</nb_visits_converted>
 					<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-					<sum_daily_nb_users>1</sum_daily_nb_users>
+					<sum_daily_nb_users>0</sum_daily_nb_users>
 				</row>
 			</subtable>
 		</row>
@@ -48,7 +48,7 @@
 			<bounce_count>0</bounce_count>
 			<nb_visits_converted>0</nb_visits_converted>
 			<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
-			<sum_daily_nb_users>2</sum_daily_nb_users>
+			<sum_daily_nb_users>0</sum_daily_nb_users>
 			<subtable>
 				<row>
 					<label>http://referrer.com/Other_Page.htm</label>
@@ -59,7 +59,7 @@
 					<bounce_count>0</bounce_count>
 					<nb_visits_converted>0</nb_visits_converted>
 					<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
-					<sum_daily_nb_users>2</sum_daily_nb_users>
+					<sum_daily_nb_users>0</sum_daily_nb_users>
 				</row>
 			</subtable>
 		</row>
diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Referrers.getWebsites_year.xml b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Referrers.getWebsites_year.xml
index c5f8e144d3..76f90bbf1d 100644
--- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Referrers.getWebsites_year.xml
+++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Referrers.getWebsites_year.xml
@@ -10,7 +10,7 @@
 			<bounce_count>0</bounce_count>
 			<nb_visits_converted>0</nb_visits_converted>
 			<sum_daily_nb_uniq_visitors>9</sum_daily_nb_uniq_visitors>
-			<sum_daily_nb_users>9</sum_daily_nb_users>
+			<sum_daily_nb_users>0</sum_daily_nb_users>
 			<subtable>
 				<row>
 					<label>http://referrer.com/Other_Page.htm</label>
@@ -21,7 +21,7 @@
 					<bounce_count>0</bounce_count>
 					<nb_visits_converted>0</nb_visits_converted>
 					<sum_daily_nb_uniq_visitors>8</sum_daily_nb_uniq_visitors>
-					<sum_daily_nb_users>8</sum_daily_nb_users>
+					<sum_daily_nb_users>0</sum_daily_nb_users>
 				</row>
 				<row>
 					<label>http://referrer.com/page.htm?param=valuewith some spaces</label>
@@ -32,7 +32,7 @@
 					<bounce_count>0</bounce_count>
 					<nb_visits_converted>0</nb_visits_converted>
 					<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-					<sum_daily_nb_users>1</sum_daily_nb_users>
+					<sum_daily_nb_users>0</sum_daily_nb_users>
 				</row>
 			</subtable>
 		</row>
diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitFrequency.get_day.xml b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitFrequency.get_day.xml
index 35d00c3b2b..f760097ff0 100644
--- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitFrequency.get_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitFrequency.get_day.xml
@@ -4,7 +4,7 @@
 	<result date="2010-01-04" />
 	<result date="2010-01-05">
 		<nb_uniq_visitors_returning>1</nb_uniq_visitors_returning>
-		<nb_users_returning>1</nb_users_returning>
+		<nb_users_returning>0</nb_users_returning>
 		<nb_visits_returning>1</nb_visits_returning>
 		<nb_actions_returning>5</nb_actions_returning>
 		<nb_visits_converted_returning>0</nb_visits_converted_returning>
@@ -17,7 +17,7 @@
 	</result>
 	<result date="2010-01-06">
 		<nb_uniq_visitors_returning>1</nb_uniq_visitors_returning>
-		<nb_users_returning>1</nb_users_returning>
+		<nb_users_returning>0</nb_users_returning>
 		<nb_visits_returning>1</nb_visits_returning>
 		<nb_actions_returning>5</nb_actions_returning>
 		<nb_visits_converted_returning>0</nb_visits_converted_returning>
@@ -30,7 +30,7 @@
 	</result>
 	<result date="2010-01-07">
 		<nb_uniq_visitors_returning>1</nb_uniq_visitors_returning>
-		<nb_users_returning>1</nb_users_returning>
+		<nb_users_returning>0</nb_users_returning>
 		<nb_visits_returning>1</nb_visits_returning>
 		<nb_actions_returning>5</nb_actions_returning>
 		<nb_visits_converted_returning>0</nb_visits_converted_returning>
@@ -43,7 +43,7 @@
 	</result>
 	<result date="2010-01-08">
 		<nb_uniq_visitors_returning>1</nb_uniq_visitors_returning>
-		<nb_users_returning>1</nb_users_returning>
+		<nb_users_returning>0</nb_users_returning>
 		<nb_visits_returning>1</nb_visits_returning>
 		<nb_actions_returning>5</nb_actions_returning>
 		<nb_visits_converted_returning>0</nb_visits_converted_returning>
@@ -56,7 +56,7 @@
 	</result>
 	<result date="2010-01-09">
 		<nb_uniq_visitors_returning>1</nb_uniq_visitors_returning>
-		<nb_users_returning>1</nb_users_returning>
+		<nb_users_returning>0</nb_users_returning>
 		<nb_visits_returning>1</nb_visits_returning>
 		<nb_actions_returning>5</nb_actions_returning>
 		<nb_visits_converted_returning>0</nb_visits_converted_returning>
diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitFrequency.get_month.xml b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitFrequency.get_month.xml
index fddd345d31..ddce4b63c9 100644
--- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitFrequency.get_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitFrequency.get_month.xml
@@ -2,7 +2,7 @@
 <results>
 	<result date="2010-01">
 		<nb_uniq_visitors_returning>1</nb_uniq_visitors_returning>
-		<nb_users_returning>1</nb_users_returning>
+		<nb_users_returning>0</nb_users_returning>
 		<nb_visits_returning>8</nb_visits_returning>
 		<nb_actions_returning>40</nb_actions_returning>
 		<nb_visits_converted_returning>0</nb_visits_converted_returning>
diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitFrequency.get_week.xml b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitFrequency.get_week.xml
index 913ff803a3..d44fe0f184 100644
--- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitFrequency.get_week.xml
+++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitFrequency.get_week.xml
@@ -3,7 +3,7 @@
 	<result date="From 2009-12-28 to 2010-01-03" />
 	<result date="From 2010-01-04 to 2010-01-10">
 		<nb_uniq_visitors_returning>1</nb_uniq_visitors_returning>
-		<nb_users_returning>1</nb_users_returning>
+		<nb_users_returning>0</nb_users_returning>
 		<nb_visits_returning>6</nb_visits_returning>
 		<nb_actions_returning>30</nb_actions_returning>
 		<nb_visits_converted_returning>0</nb_visits_converted_returning>
@@ -16,7 +16,7 @@
 	</result>
 	<result date="From 2010-01-11 to 2010-01-17">
 		<nb_uniq_visitors_returning>1</nb_uniq_visitors_returning>
-		<nb_users_returning>1</nb_users_returning>
+		<nb_users_returning>0</nb_users_returning>
 		<nb_visits_returning>2</nb_visits_returning>
 		<nb_actions_returning>10</nb_actions_returning>
 		<nb_visits_converted_returning>0</nb_visits_converted_returning>
diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitsSummary.get_day.xml b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitsSummary.get_day.xml
index 7f58873370..057ccb1b63 100644
--- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitsSummary.get_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitsSummary.get_day.xml
@@ -2,7 +2,7 @@
 <results>
 	<result date="2010-01-03">
 		<nb_uniq_visitors>1</nb_uniq_visitors>
-		<nb_users>1</nb_users>
+		<nb_users>0</nb_users>
 		<nb_visits>1</nb_visits>
 		<nb_actions>1</nb_actions>
 		<nb_visits_converted>0</nb_visits_converted>
@@ -15,7 +15,7 @@
 	</result>
 	<result date="2010-01-04">
 		<nb_uniq_visitors>1</nb_uniq_visitors>
-		<nb_users>1</nb_users>
+		<nb_users>0</nb_users>
 		<nb_visits>1</nb_visits>
 		<nb_actions>2</nb_actions>
 		<nb_visits_converted>0</nb_visits_converted>
@@ -28,7 +28,7 @@
 	</result>
 	<result date="2010-01-05">
 		<nb_uniq_visitors>1</nb_uniq_visitors>
-		<nb_users>1</nb_users>
+		<nb_users>0</nb_users>
 		<nb_visits>1</nb_visits>
 		<nb_actions>5</nb_actions>
 		<nb_visits_converted>0</nb_visits_converted>
@@ -41,7 +41,7 @@
 	</result>
 	<result date="2010-01-06">
 		<nb_uniq_visitors>1</nb_uniq_visitors>
-		<nb_users>1</nb_users>
+		<nb_users>0</nb_users>
 		<nb_visits>1</nb_visits>
 		<nb_actions>5</nb_actions>
 		<nb_visits_converted>0</nb_visits_converted>
@@ -54,7 +54,7 @@
 	</result>
 	<result date="2010-01-07">
 		<nb_uniq_visitors>1</nb_uniq_visitors>
-		<nb_users>1</nb_users>
+		<nb_users>0</nb_users>
 		<nb_visits>1</nb_visits>
 		<nb_actions>5</nb_actions>
 		<nb_visits_converted>0</nb_visits_converted>
@@ -67,7 +67,7 @@
 	</result>
 	<result date="2010-01-08">
 		<nb_uniq_visitors>1</nb_uniq_visitors>
-		<nb_users>1</nb_users>
+		<nb_users>0</nb_users>
 		<nb_visits>1</nb_visits>
 		<nb_actions>5</nb_actions>
 		<nb_visits_converted>0</nb_visits_converted>
@@ -80,7 +80,7 @@
 	</result>
 	<result date="2010-01-09">
 		<nb_uniq_visitors>1</nb_uniq_visitors>
-		<nb_users>1</nb_users>
+		<nb_users>0</nb_users>
 		<nb_visits>1</nb_visits>
 		<nb_actions>5</nb_actions>
 		<nb_visits_converted>0</nb_visits_converted>
diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitsSummary.get_month.xml b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitsSummary.get_month.xml
index 895ff4390d..30c69614b1 100644
--- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitsSummary.get_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitsSummary.get_month.xml
@@ -2,7 +2,7 @@
 <results>
 	<result date="2010-01">
 		<nb_uniq_visitors>2</nb_uniq_visitors>
-		<nb_users>1</nb_users>
+		<nb_users>0</nb_users>
 		<nb_visits>10</nb_visits>
 		<nb_actions>43</nb_actions>
 		<nb_visits_converted>0</nb_visits_converted>
diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitsSummary.get_week.xml b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitsSummary.get_week.xml
index 65935bcab0..bb7f2a5509 100644
--- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitsSummary.get_week.xml
+++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitsSummary.get_week.xml
@@ -2,7 +2,7 @@
 <results>
 	<result date="From 2009-12-28 to 2010-01-03">
 		<nb_uniq_visitors>1</nb_uniq_visitors>
-		<nb_users>1</nb_users>
+		<nb_users>0</nb_users>
 		<nb_visits>1</nb_visits>
 		<nb_actions>1</nb_actions>
 		<nb_visits_converted>0</nb_visits_converted>
@@ -15,7 +15,7 @@
 	</result>
 	<result date="From 2010-01-04 to 2010-01-10">
 		<nb_uniq_visitors>2</nb_uniq_visitors>
-		<nb_users>1</nb_users>
+		<nb_users>0</nb_users>
 		<nb_visits>7</nb_visits>
 		<nb_actions>32</nb_actions>
 		<nb_visits_converted>0</nb_visits_converted>
@@ -28,7 +28,7 @@
 	</result>
 	<result date="From 2010-01-11 to 2010-01-17">
 		<nb_uniq_visitors>1</nb_uniq_visitors>
-		<nb_users>1</nb_users>
+		<nb_users>0</nb_users>
 		<nb_visits>2</nb_visits>
 		<nb_actions>10</nb_actions>
 		<nb_visits_converted>0</nb_visits_converted>
diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_csv__ScheduledReports.generateReport_month.original.csv b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_csv__ScheduledReports.generateReport_month.original.csv
index 67501241d1..61322a1fb7 100644
--- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_csv__ScheduledReports.generateReport_month.original.csv
+++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_csv__ScheduledReports.generateReport_month.original.csv
@@ -5,7 +5,7 @@ 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,1,10,43,5,10%,4.3,00:12:37
+2,0,10,43,5,10%,4.3,00:12:37
 
 Visits by Server Time
 label,nb_visits,nb_actions,nb_actions_per_visit,avg_time_on_site,bounce_rate,revenue
diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_month.original.html b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_month.original.html
index 581aad7388..4205c86a95 100644
--- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_month.original.html
+++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_month.original.html
@@ -431,7 +431,7 @@
                                                                 <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
                                                                                                                                                                         Users                                                                                                                        </td>
                                             <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                1
+                                                                                                0
                                                                                     </td>
                                     </tr>
                             
diff --git a/tests/PHPUnit/Integration/expected/test_UserId_VisitorId__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/Integration/expected/test_UserId_VisitorId__Live.getLastVisitsDetails_month.xml
index 42a3d68d01..1946cec5ba 100644
--- a/tests/PHPUnit/Integration/expected/test_UserId_VisitorId__Live.getLastVisitsDetails_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_UserId_VisitorId__Live.getLastVisitsDetails_month.xml
@@ -16,7 +16,7 @@
 		</actionDetails>
 		<lastActionDateTime>2010-03-06 11:22:33</lastActionDateTime>
 		<actions>1</actions>
-		<userId />
+		<userId>0</userId>
 	</row>
 	<row>
 		<idVisit>2</idVisit>
@@ -45,7 +45,7 @@
 		</actionDetails>
 		<lastActionDateTime>2010-03-06 11:28:33</lastActionDateTime>
 		<actions>2</actions>
-		<userId />
+		<userId>0</userId>
 	</row>
 	<row>
 		<idVisit>3</idVisit>
@@ -165,7 +165,7 @@
 		</actionDetails>
 		<lastActionDateTime>2010-03-06 16:28:33</lastActionDateTime>
 		<actions>1</actions>
-		<userId />
+		<userId>0</userId>
 	</row>
 	<row>
 		<idVisit>7</idVisit>
diff --git a/tests/PHPUnit/Integration/expected/test_UserId_VisitorId__VisitsSummary.getUsers_day.xml b/tests/PHPUnit/Integration/expected/test_UserId_VisitorId__VisitsSummary.getUsers_day.xml
index 15ef03fb49..13002b2017 100644
--- a/tests/PHPUnit/Integration/expected/test_UserId_VisitorId__VisitsSummary.getUsers_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_UserId_VisitorId__VisitsSummary.getUsers_day.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8" ?>
-<result>3</result>
\ No newline at end of file
+<result>2</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/expected/test_UserId_VisitorId__VisitsSummary.getUsers_month.xml b/tests/PHPUnit/Integration/expected/test_UserId_VisitorId__VisitsSummary.getUsers_month.xml
index 6593897748..15ef03fb49 100644
--- a/tests/PHPUnit/Integration/expected/test_UserId_VisitorId__VisitsSummary.getUsers_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_UserId_VisitorId__VisitsSummary.getUsers_month.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8" ?>
-<result>4</result>
\ No newline at end of file
+<result>3</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/expected/test_UserId_VisitorId__VisitsSummary.getUsers_week.xml b/tests/PHPUnit/Integration/expected/test_UserId_VisitorId__VisitsSummary.getUsers_week.xml
index 15ef03fb49..13002b2017 100644
--- a/tests/PHPUnit/Integration/expected/test_UserId_VisitorId__VisitsSummary.getUsers_week.xml
+++ b/tests/PHPUnit/Integration/expected/test_UserId_VisitorId__VisitsSummary.getUsers_week.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8" ?>
-<result>3</result>
\ No newline at end of file
+<result>2</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/expected/test_UserId_VisitorId__VisitsSummary.get_day.xml b/tests/PHPUnit/Integration/expected/test_UserId_VisitorId__VisitsSummary.get_day.xml
index 07d6eee790..4a8baf7fc3 100644
--- a/tests/PHPUnit/Integration/expected/test_UserId_VisitorId__VisitsSummary.get_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_UserId_VisitorId__VisitsSummary.get_day.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <result>
 	<nb_uniq_visitors>5</nb_uniq_visitors>
-	<nb_users>3</nb_users>
+	<nb_users>2</nb_users>
 	<nb_visits>6</nb_visits>
 	<nb_actions>9</nb_actions>
 	<nb_visits_converted>1</nb_visits_converted>
diff --git a/tests/PHPUnit/Integration/expected/test_UserId_VisitorId__VisitsSummary.get_month.xml b/tests/PHPUnit/Integration/expected/test_UserId_VisitorId__VisitsSummary.get_month.xml
index a93adb4c50..94ed6f59e0 100644
--- a/tests/PHPUnit/Integration/expected/test_UserId_VisitorId__VisitsSummary.get_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_UserId_VisitorId__VisitsSummary.get_month.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <result>
 	<nb_uniq_visitors>6</nb_uniq_visitors>
-	<nb_users>4</nb_users>
+	<nb_users>3</nb_users>
 	<nb_visits>8</nb_visits>
 	<nb_actions>11</nb_actions>
 	<nb_visits_converted>1</nb_visits_converted>
diff --git a/tests/PHPUnit/Integration/expected/test_UserId_VisitorId__VisitsSummary.get_week.xml b/tests/PHPUnit/Integration/expected/test_UserId_VisitorId__VisitsSummary.get_week.xml
index 07d6eee790..4a8baf7fc3 100644
--- a/tests/PHPUnit/Integration/expected/test_UserId_VisitorId__VisitsSummary.get_week.xml
+++ b/tests/PHPUnit/Integration/expected/test_UserId_VisitorId__VisitsSummary.get_week.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <result>
 	<nb_uniq_visitors>5</nb_uniq_visitors>
-	<nb_users>3</nb_users>
+	<nb_users>2</nb_users>
 	<nb_visits>6</nb_visits>
 	<nb_actions>9</nb_actions>
 	<nb_visits_converted>1</nb_visits_converted>
diff --git a/tests/PHPUnit/Integration/expected/test_VisitsInPast_InvalidateOldReportsWebsite1_OldReportsShouldNotAppear__VisitsSummary.get_month.xml b/tests/PHPUnit/Integration/expected/test_VisitsInPast_InvalidateOldReportsWebsite1_OldReportsShouldNotAppear__VisitsSummary.get_month.xml
index 6091a91875..d84e6c4f35 100644
--- a/tests/PHPUnit/Integration/expected/test_VisitsInPast_InvalidateOldReportsWebsite1_OldReportsShouldNotAppear__VisitsSummary.get_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_VisitsInPast_InvalidateOldReportsWebsite1_OldReportsShouldNotAppear__VisitsSummary.get_month.xml
@@ -4,7 +4,7 @@
 	<result date="2010-02" />
 	<result date="2010-03">
 		<nb_uniq_visitors>1</nb_uniq_visitors>
-		<nb_users>1</nb_users>
+		<nb_users>0</nb_users>
 		<nb_visits>1</nb_visits>
 		<nb_actions>6</nb_actions>
 		<nb_visits_converted>0</nb_visits_converted>
diff --git a/tests/PHPUnit/Integration/expected/test_VisitsInPast_InvalidateOldReportsWebsite2_OldReportsShouldNotAppear__VisitsSummary.get_month.xml b/tests/PHPUnit/Integration/expected/test_VisitsInPast_InvalidateOldReportsWebsite2_OldReportsShouldNotAppear__VisitsSummary.get_month.xml
index 49123c527d..d046dca549 100644
--- a/tests/PHPUnit/Integration/expected/test_VisitsInPast_InvalidateOldReportsWebsite2_OldReportsShouldNotAppear__VisitsSummary.get_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_VisitsInPast_InvalidateOldReportsWebsite2_OldReportsShouldNotAppear__VisitsSummary.get_month.xml
@@ -5,7 +5,7 @@
 	<result date="2009-12" />
 	<result date="2010-01">
 		<nb_uniq_visitors>1</nb_uniq_visitors>
-		<nb_users>1</nb_users>
+		<nb_users>0</nb_users>
 		<nb_visits>1</nb_visits>
 		<nb_actions>6</nb_actions>
 		<nb_visits_converted>0</nb_visits_converted>
diff --git a/tests/PHPUnit/Integration/expected/test_apiGetReportMetadata__API.get_day.xml b/tests/PHPUnit/Integration/expected/test_apiGetReportMetadata__API.get_day.xml
index 31a1a76207..8615d546da 100644
--- a/tests/PHPUnit/Integration/expected/test_apiGetReportMetadata__API.get_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_apiGetReportMetadata__API.get_day.xml
@@ -2,7 +2,7 @@
 <result>
 	<nb_uniq_visitors>1</nb_uniq_visitors>
 	<nb_visits>1</nb_visits>
-	<nb_users>1</nb_users>
+	<nb_users>0</nb_users>
 	<nb_actions>1</nb_actions>
 	<max_actions>1</max_actions>
 	<bounce_rate>100%</bounce_rate>
diff --git a/tests/PHPUnit/Integration/expected/test_apiGetReportMetadata_showRawMetrics__API.getProcessedReport_day.xml b/tests/PHPUnit/Integration/expected/test_apiGetReportMetadata_showRawMetrics__API.getProcessedReport_day.xml
index 637cd72d01..4b38b3da7f 100644
--- a/tests/PHPUnit/Integration/expected/test_apiGetReportMetadata_showRawMetrics__API.getProcessedReport_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_apiGetReportMetadata_showRawMetrics__API.getProcessedReport_day.xml
@@ -51,7 +51,7 @@
 			<nb_uniq_visitors>1</nb_uniq_visitors>
 			<nb_visits>1</nb_visits>
 			<nb_actions>1</nb_actions>
-			<nb_users>1</nb_users>
+			<nb_users>0</nb_users>
 			<max_actions>1</max_actions>
 			<sum_visit_length>1086</sum_visit_length>
 			<bounce_count>1</bounce_count>
diff --git a/tests/PHPUnit/Integration/expected/test_csvExport__Live.getLastVisitsDetails_day.csv b/tests/PHPUnit/Integration/expected/test_csvExport__Live.getLastVisitsDetails_day.csv
index c287c4bf018d6dd8074cfb02fc330e94a57a772d..76e143458527a947b8544f273b5116651ad64247 100644
GIT binary patch
delta 32
lcmexj`^$EN7Z;<!W=}4CHXv0lP!FUgmkT6r4ilfp4gj|o3OWD)

delta 22
ecmexm`^9#H7uRMVE<Lu*H3D^PoBxRYV+R0k$q6?A

diff --git a/tests/PHPUnit/Integration/expected/test_csvExport_xp0__CustomVariables.getCustomVariables_day.csv b/tests/PHPUnit/Integration/expected/test_csvExport_xp0__CustomVariables.getCustomVariables_day.csv
index b4ffde1b7527645707fab48921ecf5a530ca7ae3..89e329416e9157f6b133d816fdcbcdcd1aa6dee4 100644
GIT binary patch
delta 35
lcmZqRYT(-7!^CJX*_WvhNbYCa4kmRcFJYbrWLdKu1pvM=3mpIe

delta 35
mcmZqRYT(-7!^CJb*_Wx1(Qxv9rtM%-ck&YEX+V}W%TWNnkP9LJ

diff --git a/tests/PHPUnit/Integration/expected/test_csvExport_xp0__VisitsSummary.get_day.csv b/tests/PHPUnit/Integration/expected/test_csvExport_xp0__VisitsSummary.get_day.csv
index 109087d7da2511c3bcd9536e297baeaceb50db8c..26adb45055000e356178ec02921c8d86e9ab4ae7 100644
GIT binary patch
delta 13
Ucmeyx^owbO3nQb!WLHL003=8REdT%j

delta 13
Ucmeyx^owbO3nQc9WLHL003=NWE&u=k

diff --git a/tests/PHPUnit/Integration/expected/test_csvExport_xp1_inner0_trans-en__CustomVariables.getCustomVariables_day.csv b/tests/PHPUnit/Integration/expected/test_csvExport_xp1_inner0_trans-en__CustomVariables.getCustomVariables_day.csv
index 8d4d20182f01f89431ac548172e0c9423d0cec21..1dde5308a474ada7983fa65657d5912187a5c79e 100644
GIT binary patch
delta 54
zcmX>id_;J|5++82$^7iPlP@t@09oA3JE8m?EHaDvSeO|NHuJO3WCTm8PCm!+4FIpp
B4@v+4

delta 54
zcmX>id_;J|5++8&$^7iPlP@t@09oA3JE8m?EHaDvSeO|NH}kX4WCTm8PCm!+4FIrI
B4^IF9

diff --git a/tests/PHPUnit/Integration/expected/test_csvExport_xp1_inner0_trans-en__VisitsSummary.get_day.csv b/tests/PHPUnit/Integration/expected/test_csvExport_xp1_inner0_trans-en__VisitsSummary.get_day.csv
index 271dfc090353a045cd99719514df54a54370b932..58e88ae47a28cb445839c70d9e9583f828bdf6e8 100644
GIT binary patch
delta 13
Ucmcb_e2IC(97aZi$#WS^0VHMwj{pDw

delta 13
Ucmcb_e2IC(97aaN$#WS^0VHb#kN^Mx

diff --git a/tests/PHPUnit/Integration/expected/test_csvExport_xp1_inner1_trans-de__CustomVariables.getCustomVariables_day.csv b/tests/PHPUnit/Integration/expected/test_csvExport_xp1_inner1_trans-de__CustomVariables.getCustomVariables_day.csv
index 70213a84fba0d2787051341eb892ffb6f820125e..24c786dd4719c1f081413b1eb83b19b3c7950e8d 100644
GIT binary patch
delta 93
zcmeB??vdW`hKbQ&@>`}#ASumiIC%!M1(0=-xfIOTom|4QjL~4TH0xhRh`?qy_ID7b
f;p8;VX<)Uglh1IAY&PR607+bAR^5Dt`v4;VL~<Ot

delta 93
zcmeB??vdW`hKbQ=@>`}#M#IU{tcH_kFk1jw7nw`JeBH?<EXx=TH%qhrWrPT9c4L1B
hVH!?O<D3Rot2+4%x5#EQt^$z6MP}8_XSfeA0suys9K!$r

diff --git a/tests/PHPUnit/Integration/expected/test_csvExport_xp1_inner1_trans-de__VisitsSummary.get_day.csv b/tests/PHPUnit/Integration/expected/test_csvExport_xp1_inner1_trans-de__VisitsSummary.get_day.csv
index 0ce34d6ca864142323e2b903731930bff670240a..7315bde8710ac414bdf8329726bcd79dcb223614 100644
GIT binary patch
delta 13
UcmX@Za)xDt5EG-pWML*t03HhicK`qY

delta 13
UcmX@Za)xDt5EG-}WML*t03HwncmMzZ

diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_LiveEcommerceStatusOrdered__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_LiveEcommerceStatusOrdered__Live.getLastVisitsDetails_day.xml
index 25ac19a415..52c78b5310 100644
--- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_LiveEcommerceStatusOrdered__Live.getLastVisitsDetails_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_LiveEcommerceStatusOrdered__Live.getLastVisitsDetails_day.xml
@@ -51,7 +51,7 @@
 		
 		<searches>0</searches>
 		<actions>0</actions>
-		<userId />
+		<userId>0</userId>
 		<visitorType>returningCustomer</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
 		<visitConverted>1</visitConverted>
@@ -262,7 +262,7 @@
 		
 		<searches>0</searches>
 		<actions>3</actions>
-		<userId />
+		<userId>0</userId>
 		<visitorType>returningCustomer</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
 		<visitConverted>1</visitConverted>
diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_Metadata_VisitTime.getVisitInformationPerServerTime__API.getProcessedReport_day.xml b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_Metadata_VisitTime.getVisitInformationPerServerTime__API.getProcessedReport_day.xml
index fc0c7b8b98..71282d9145 100644
--- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_Metadata_VisitTime.getVisitInformationPerServerTime__API.getProcessedReport_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_Metadata_VisitTime.getVisitInformationPerServerTime__API.getProcessedReport_day.xml
@@ -54,7 +54,7 @@
 			<nb_uniq_visitors>1</nb_uniq_visitors>
 			<nb_visits>1</nb_visits>
 			<nb_actions>4</nb_actions>
-			<nb_users>1</nb_users>
+			<nb_users>0</nb_users>
 			<revenue>$ 10</revenue>
 			<nb_actions_per_visit>4</nb_actions_per_visit>
 			<avg_time_on_site>00:12:01</avg_time_on_site>
@@ -76,7 +76,7 @@
 			<nb_uniq_visitors>1</nb_uniq_visitors>
 			<nb_visits>1</nb_visits>
 			<nb_actions>6</nb_actions>
-			<nb_users>1</nb_users>
+			<nb_users>0</nb_users>
 			<revenue>$ 3111</revenue>
 			<nb_actions_per_visit>6</nb_actions_per_visit>
 			<avg_time_on_site>01:06:01</avg_time_on_site>
@@ -131,7 +131,7 @@
 			<nb_uniq_visitors>1</nb_uniq_visitors>
 			<nb_visits>1</nb_visits>
 			<nb_actions>3</nb_actions>
-			<nb_users>1</nb_users>
+			<nb_users>0</nb_users>
 			<revenue>$ 0</revenue>
 			<nb_actions_per_visit>3</nb_actions_per_visit>
 			<avg_time_on_site>00:12:01</avg_time_on_site>
diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentAbandonedCart__VisitsSummary.get_day.xml b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentAbandonedCart__VisitsSummary.get_day.xml
index 84fe788870..2ecf693474 100644
--- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentAbandonedCart__VisitsSummary.get_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentAbandonedCart__VisitsSummary.get_day.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <result>
 	<nb_uniq_visitors>1</nb_uniq_visitors>
-	<nb_users>1</nb_users>
+	<nb_users>0</nb_users>
 	<nb_visits>2</nb_visits>
 	<nb_actions>9</nb_actions>
 	<nb_visits_converted>1</nb_visits_converted>
diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentConvertedGoalId1__VisitsSummary.get_day.xml b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentConvertedGoalId1__VisitsSummary.get_day.xml
index 3756627436..a9d2095dfb 100644
--- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentConvertedGoalId1__VisitsSummary.get_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentConvertedGoalId1__VisitsSummary.get_day.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <result>
 	<nb_uniq_visitors>1</nb_uniq_visitors>
-	<nb_users>1</nb_users>
+	<nb_users>0</nb_users>
 	<nb_visits>1</nb_visits>
 	<nb_actions>4</nb_actions>
 	<nb_visits_converted>1</nb_visits_converted>
diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentConvertedGoalId1__VisitsSummary.get_week.xml b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentConvertedGoalId1__VisitsSummary.get_week.xml
index 3756627436..a9d2095dfb 100644
--- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentConvertedGoalId1__VisitsSummary.get_week.xml
+++ b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentConvertedGoalId1__VisitsSummary.get_week.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <result>
 	<nb_uniq_visitors>1</nb_uniq_visitors>
-	<nb_users>1</nb_users>
+	<nb_users>0</nb_users>
 	<nb_visits>1</nb_visits>
 	<nb_actions>4</nb_actions>
 	<nb_visits_converted>1</nb_visits_converted>
diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentDidNotConvertGoalId1__VisitsSummary.get_day.xml b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentDidNotConvertGoalId1__VisitsSummary.get_day.xml
index 84fe788870..2ecf693474 100644
--- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentDidNotConvertGoalId1__VisitsSummary.get_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentDidNotConvertGoalId1__VisitsSummary.get_day.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <result>
 	<nb_uniq_visitors>1</nb_uniq_visitors>
-	<nb_users>1</nb_users>
+	<nb_users>0</nb_users>
 	<nb_visits>2</nb_visits>
 	<nb_actions>9</nb_actions>
 	<nb_visits_converted>1</nb_visits_converted>
diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentNewVisitors__VisitsSummary.get_week.xml b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentNewVisitors__VisitsSummary.get_week.xml
index 3756627436..a9d2095dfb 100644
--- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentNewVisitors__VisitsSummary.get_week.xml
+++ b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentNewVisitors__VisitsSummary.get_week.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <result>
 	<nb_uniq_visitors>1</nb_uniq_visitors>
-	<nb_users>1</nb_users>
+	<nb_users>0</nb_users>
 	<nb_visits>1</nb_visits>
 	<nb_actions>4</nb_actions>
 	<nb_visits_converted>1</nb_visits_converted>
diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentNoEcommerce__VisitsSummary.get_day.xml b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentNoEcommerce__VisitsSummary.get_day.xml
index 3756627436..a9d2095dfb 100644
--- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentNoEcommerce__VisitsSummary.get_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentNoEcommerce__VisitsSummary.get_day.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <result>
 	<nb_uniq_visitors>1</nb_uniq_visitors>
-	<nb_users>1</nb_users>
+	<nb_users>0</nb_users>
 	<nb_visits>1</nb_visits>
 	<nb_actions>4</nb_actions>
 	<nb_visits_converted>1</nb_visits_converted>
diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentOrderedSomething__VisitsSummary.get_day.xml b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentOrderedSomething__VisitsSummary.get_day.xml
index 245838d973..44b18e613c 100644
--- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentOrderedSomething__VisitsSummary.get_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentOrderedSomething__VisitsSummary.get_day.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <result>
 	<nb_uniq_visitors>1</nb_uniq_visitors>
-	<nb_users>1</nb_users>
+	<nb_users>0</nb_users>
 	<nb_visits>1</nb_visits>
 	<nb_actions>6</nb_actions>
 	<nb_visits_converted>1</nb_visits_converted>
diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentPageTitleMatch__VisitsSummary.get_day.xml b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentPageTitleMatch__VisitsSummary.get_day.xml
index 3756627436..a9d2095dfb 100644
--- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentPageTitleMatch__VisitsSummary.get_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentPageTitleMatch__VisitsSummary.get_day.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <result>
 	<nb_uniq_visitors>1</nb_uniq_visitors>
-	<nb_users>1</nb_users>
+	<nb_users>0</nb_users>
 	<nb_visits>1</nb_visits>
 	<nb_actions>4</nb_actions>
 	<nb_visits_converted>1</nb_visits_converted>
diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentReturningCustomers__VisitsSummary.get_week.xml b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentReturningCustomers__VisitsSummary.get_week.xml
index a77a67e608..02458f0645 100644
--- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentReturningCustomers__VisitsSummary.get_week.xml
+++ b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentReturningCustomers__VisitsSummary.get_week.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <result>
 	<nb_uniq_visitors>1</nb_uniq_visitors>
-	<nb_users>1</nb_users>
+	<nb_users>0</nb_users>
 	<nb_visits>3</nb_visits>
 	<nb_actions>6</nb_actions>
 	<nb_visits_converted>2</nb_visits_converted>
diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentReturningVisitors__VisitsSummary.get_week.xml b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentReturningVisitors__VisitsSummary.get_week.xml
index 245838d973..44b18e613c 100644
--- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentReturningVisitors__VisitsSummary.get_week.xml
+++ b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentReturningVisitors__VisitsSummary.get_week.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <result>
 	<nb_uniq_visitors>1</nb_uniq_visitors>
-	<nb_users>1</nb_users>
+	<nb_users>0</nb_users>
 	<nb_visits>1</nb_visits>
 	<nb_actions>6</nb_actions>
 	<nb_visits_converted>1</nb_visits_converted>
diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentVisitHasConvertedGoal__VisitsSummary.get_week.xml b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentVisitHasConvertedGoal__VisitsSummary.get_week.xml
index 3756627436..a9d2095dfb 100644
--- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentVisitHasConvertedGoal__VisitsSummary.get_week.xml
+++ b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentVisitHasConvertedGoal__VisitsSummary.get_week.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <result>
 	<nb_uniq_visitors>1</nb_uniq_visitors>
-	<nb_users>1</nb_users>
+	<nb_users>0</nb_users>
 	<nb_visits>1</nb_visits>
 	<nb_actions>4</nb_actions>
 	<nb_visits_converted>1</nb_visits_converted>
diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentVisitHasNotOrderedAndConvertedGoal__VisitsSummary.get_week.xml b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentVisitHasNotOrderedAndConvertedGoal__VisitsSummary.get_week.xml
index 3756627436..a9d2095dfb 100644
--- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentVisitHasNotOrderedAndConvertedGoal__VisitsSummary.get_week.xml
+++ b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentVisitHasNotOrderedAndConvertedGoal__VisitsSummary.get_week.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <result>
 	<nb_uniq_visitors>1</nb_uniq_visitors>
-	<nb_users>1</nb_users>
+	<nb_users>0</nb_users>
 	<nb_visits>1</nb_visits>
 	<nb_actions>4</nb_actions>
 	<nb_visits_converted>1</nb_visits_converted>
diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__CustomVariables.getCustomVariables_day.xml b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__CustomVariables.getCustomVariables_day.xml
index fe1fab1bb1..8056021220 100644
--- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__CustomVariables.getCustomVariables_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__CustomVariables.getCustomVariables_day.xml
@@ -4,7 +4,7 @@
 		<label>ValueIsZero</label>
 		<nb_visits>3</nb_visits>
 		<nb_actions>13</nb_actions>
-		<nb_users>1</nb_users>
+		<nb_users>0</nb_users>
 		<max_actions>6</max_actions>
 		<sum_visit_length>5403</sum_visit_length>
 		<bounce_count>0</bounce_count>
@@ -38,7 +38,7 @@
 				<label>0</label>
 				<nb_visits>3</nb_visits>
 				<nb_actions>13</nb_actions>
-				<nb_users>1</nb_users>
+				<nb_users>0</nb_users>
 				<max_actions>6</max_actions>
 				<sum_visit_length>5403</sum_visit_length>
 				<bounce_count>0</bounce_count>
@@ -74,7 +74,7 @@
 		<label>VisitorType</label>
 		<nb_visits>3</nb_visits>
 		<nb_actions>13</nb_actions>
-		<nb_users>1</nb_users>
+		<nb_users>0</nb_users>
 		<max_actions>6</max_actions>
 		<sum_visit_length>5403</sum_visit_length>
 		<bounce_count>0</bounce_count>
@@ -108,7 +108,7 @@
 				<label>NewLoggedOut</label>
 				<nb_visits>3</nb_visits>
 				<nb_actions>13</nb_actions>
-				<nb_users>1</nb_users>
+				<nb_users>0</nb_users>
 				<max_actions>6</max_actions>
 				<sum_visit_length>5403</sum_visit_length>
 				<bounce_count>0</bounce_count>
@@ -236,7 +236,7 @@
 		<label>VisitorName</label>
 		<nb_visits>2</nb_visits>
 		<nb_actions>9</nb_actions>
-		<nb_users>1</nb_users>
+		<nb_users>0</nb_users>
 		<max_actions>6</max_actions>
 		<sum_visit_length>4682</sum_visit_length>
 		<bounce_count>0</bounce_count>
@@ -265,7 +265,7 @@
 				<label>Great name!</label>
 				<nb_visits>2</nb_visits>
 				<nb_actions>9</nb_actions>
-				<nb_users>1</nb_users>
+				<nb_users>0</nb_users>
 				<max_actions>6</max_actions>
 				<sum_visit_length>4682</sum_visit_length>
 				<bounce_count>0</bounce_count>
diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__Live.getLastVisitsDetails_day.xml
index 30ae50eb8f..0bd82be2b7 100644
--- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__Live.getLastVisitsDetails_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__Live.getLastVisitsDetails_day.xml
@@ -127,7 +127,7 @@
 		
 		<searches>0</searches>
 		<actions>3</actions>
-		<userId />
+		<userId>0</userId>
 		<visitorType>returningCustomer</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
 		<visitConverted>0</visitConverted>
@@ -457,7 +457,7 @@
 		
 		<searches>0</searches>
 		<actions>6</actions>
-		<userId />
+		<userId>0</userId>
 		<visitorType>returning</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
 		<visitConverted>1</visitConverted>
@@ -677,7 +677,7 @@
 		
 		<searches>0</searches>
 		<actions>4</actions>
-		<userId />
+		<userId>0</userId>
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>1</visitConverted>
diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__UserCountry.getCity_day.xml b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__UserCountry.getCity_day.xml
index 280871867e..99fad8ffbf 100644
--- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__UserCountry.getCity_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__UserCountry.getCity_day.xml
@@ -5,7 +5,7 @@
 		<nb_uniq_visitors>2</nb_uniq_visitors>
 		<nb_visits>3</nb_visits>
 		<nb_actions>13</nb_actions>
-		<nb_users>2</nb_users>
+		<nb_users>0</nb_users>
 		<max_actions>6</max_actions>
 		<sum_visit_length>5403</sum_visit_length>
 		<bounce_count>0</bounce_count>
diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__UserCountry.getContinent_day.xml b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__UserCountry.getContinent_day.xml
index 9001fd15fe..152f156767 100644
--- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__UserCountry.getContinent_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__UserCountry.getContinent_day.xml
@@ -5,7 +5,7 @@
 		<nb_uniq_visitors>2</nb_uniq_visitors>
 		<nb_visits>3</nb_visits>
 		<nb_actions>13</nb_actions>
-		<nb_users>2</nb_users>
+		<nb_users>0</nb_users>
 		<max_actions>6</max_actions>
 		<sum_visit_length>5403</sum_visit_length>
 		<bounce_count>0</bounce_count>
diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__UserCountry.getCountry_day.xml b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__UserCountry.getCountry_day.xml
index f2727a5735..a61fe0658f 100644
--- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__UserCountry.getCountry_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__UserCountry.getCountry_day.xml
@@ -5,7 +5,7 @@
 		<nb_uniq_visitors>1</nb_uniq_visitors>
 		<nb_visits>2</nb_visits>
 		<nb_actions>9</nb_actions>
-		<nb_users>1</nb_users>
+		<nb_users>0</nb_users>
 		<max_actions>6</max_actions>
 		<sum_visit_length>4682</sum_visit_length>
 		<bounce_count>0</bounce_count>
@@ -39,7 +39,7 @@
 		<nb_uniq_visitors>1</nb_uniq_visitors>
 		<nb_visits>1</nb_visits>
 		<nb_actions>4</nb_actions>
-		<nb_users>1</nb_users>
+		<nb_users>0</nb_users>
 		<max_actions>4</max_actions>
 		<sum_visit_length>721</sum_visit_length>
 		<bounce_count>0</bounce_count>
diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__UserCountry.getRegion_day.xml b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__UserCountry.getRegion_day.xml
index 7c6f26cbac..7a0583f3a4 100644
--- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__UserCountry.getRegion_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__UserCountry.getRegion_day.xml
@@ -5,7 +5,7 @@
 		<nb_uniq_visitors>2</nb_uniq_visitors>
 		<nb_visits>3</nb_visits>
 		<nb_actions>13</nb_actions>
-		<nb_users>2</nb_users>
+		<nb_users>0</nb_users>
 		<max_actions>6</max_actions>
 		<sum_visit_length>5403</sum_visit_length>
 		<bounce_count>0</bounce_count>
diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__VisitTime.getByDayOfWeek_day.xml b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__VisitTime.getByDayOfWeek_day.xml
index 7728bda23d..a982f9b2c6 100644
--- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__VisitTime.getByDayOfWeek_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__VisitTime.getByDayOfWeek_day.xml
@@ -10,7 +10,7 @@
 		<nb_visits>3</nb_visits>
 		<nb_uniq_visitors>1</nb_uniq_visitors>
 		<nb_actions>13</nb_actions>
-		<nb_users>1</nb_users>
+		<nb_users>0</nb_users>
 		<sum_visit_length>5403</sum_visit_length>
 		<bounce_count>0</bounce_count>
 		<nb_visits_converted>2</nb_visits_converted>
diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__VisitTime.getVisitInformationPerLocalTime_day.xml b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__VisitTime.getVisitInformationPerLocalTime_day.xml
index e8dea88fc3..18762c91ed 100644
--- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__VisitTime.getVisitInformationPerLocalTime_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__VisitTime.getVisitInformationPerLocalTime_day.xml
@@ -137,7 +137,7 @@
 		<nb_uniq_visitors>1</nb_uniq_visitors>
 		<nb_visits>3</nb_visits>
 		<nb_actions>13</nb_actions>
-		<nb_users>1</nb_users>
+		<nb_users>0</nb_users>
 		<max_actions>6</max_actions>
 		<sum_visit_length>5403</sum_visit_length>
 		<bounce_count>0</bounce_count>
diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__VisitTime.getVisitInformationPerServerTime_day.xml b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__VisitTime.getVisitInformationPerServerTime_day.xml
index 5b116367a0..ac8065dbb1 100644
--- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__VisitTime.getVisitInformationPerServerTime_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__VisitTime.getVisitInformationPerServerTime_day.xml
@@ -5,7 +5,7 @@
 		<nb_uniq_visitors>1</nb_uniq_visitors>
 		<nb_visits>1</nb_visits>
 		<nb_actions>4</nb_actions>
-		<nb_users>1</nb_users>
+		<nb_users>0</nb_users>
 		<max_actions>4</max_actions>
 		<sum_visit_length>721</sum_visit_length>
 		<bounce_count>0</bounce_count>
@@ -35,7 +35,7 @@
 		<nb_uniq_visitors>1</nb_uniq_visitors>
 		<nb_visits>1</nb_visits>
 		<nb_actions>6</nb_actions>
-		<nb_users>1</nb_users>
+		<nb_users>0</nb_users>
 		<max_actions>6</max_actions>
 		<sum_visit_length>3961</sum_visit_length>
 		<bounce_count>0</bounce_count>
@@ -109,7 +109,7 @@
 		<nb_uniq_visitors>1</nb_uniq_visitors>
 		<nb_visits>1</nb_visits>
 		<nb_actions>3</nb_actions>
-		<nb_users>1</nb_users>
+		<nb_users>0</nb_users>
 		<max_actions>3</max_actions>
 		<sum_visit_length>721</sum_visit_length>
 		<bounce_count>0</bounce_count>
diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__VisitsSummary.get_day.xml b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__VisitsSummary.get_day.xml
index 2cbee6a96a..115904be39 100644
--- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__VisitsSummary.get_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__VisitsSummary.get_day.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <result>
 	<nb_uniq_visitors>1</nb_uniq_visitors>
-	<nb_users>1</nb_users>
+	<nb_users>0</nb_users>
 	<nb_visits>3</nb_visits>
 	<nb_actions>13</nb_actions>
 	<nb_visits_converted>2</nb_visits_converted>
diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_csv__ScheduledReports.generateReport_week.original.csv b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_csv__ScheduledReports.generateReport_week.original.csv
index 6d260e3306..36bbe78e48 100644
--- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_csv__ScheduledReports.generateReport_week.original.csv
+++ b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_csv__ScheduledReports.generateReport_week.original.csv
@@ -5,7 +5,7 @@ Piwik test,2,1,1,$ 250,1,0,$ 0,100%,100%,100%,100%,100%,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
-1,1,5,16,6,20%,3.2,00:22:49
+1,0,5,16,6,20%,3.2,00:22:49
 
 Visits by Server Time
 label,nb_visits,nb_actions,revenue,nb_actions_per_visit,avg_time_on_site,bounce_rate
diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_week.original.html b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_week.original.html
index 21680e2c98..ce6c8a9995 100644
--- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_week.original.html
+++ b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_week.original.html
@@ -491,7 +491,7 @@
                                                                 <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
                                                                                                                                                                         Users                                                                                                                        </td>
                                             <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-                                                                                                1
+                                                                                                0
                                                                                     </td>
                                     </tr>
                             
diff --git a/tests/PHPUnit/Integration/expected/test_oneVisitor_oneWebsite_severalDays_DateRange_IndexedByDate__Referrers.getSocials_day.xml b/tests/PHPUnit/Integration/expected/test_oneVisitor_oneWebsite_severalDays_DateRange_IndexedByDate__Referrers.getSocials_day.xml
index 6496f1c84e..1ffd258f3c 100644
--- a/tests/PHPUnit/Integration/expected/test_oneVisitor_oneWebsite_severalDays_DateRange_IndexedByDate__Referrers.getSocials_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_oneVisitor_oneWebsite_severalDays_DateRange_IndexedByDate__Referrers.getSocials_day.xml
@@ -11,7 +11,7 @@
 				<nb_uniq_visitors>2</nb_uniq_visitors>
 				<nb_visits>2</nb_visits>
 				<nb_actions>3</nb_actions>
-				<nb_users>2</nb_users>
+				<nb_users>0</nb_users>
 				<max_actions>2</max_actions>
 				<sum_visit_length>361</sum_visit_length>
 				<bounce_count>1</bounce_count>
@@ -26,7 +26,7 @@
 				<nb_uniq_visitors>1</nb_uniq_visitors>
 				<nb_visits>1</nb_visits>
 				<nb_actions>2</nb_actions>
-				<nb_users>1</nb_users>
+				<nb_users>0</nb_users>
 				<max_actions>2</max_actions>
 				<sum_visit_length>361</sum_visit_length>
 				<bounce_count>0</bounce_count>
@@ -39,7 +39,7 @@
 				<nb_uniq_visitors>1</nb_uniq_visitors>
 				<nb_visits>1</nb_visits>
 				<nb_actions>1</nb_actions>
-				<nb_users>1</nb_users>
+				<nb_users>0</nb_users>
 				<max_actions>1</max_actions>
 				<sum_visit_length>0</sum_visit_length>
 				<bounce_count>1</bounce_count>
@@ -61,7 +61,7 @@
 				<nb_uniq_visitors>1</nb_uniq_visitors>
 				<nb_visits>1</nb_visits>
 				<nb_actions>1</nb_actions>
-				<nb_users>1</nb_users>
+				<nb_users>0</nb_users>
 				<max_actions>1</max_actions>
 				<sum_visit_length>0</sum_visit_length>
 				<bounce_count>1</bounce_count>
@@ -76,7 +76,7 @@
 				<nb_uniq_visitors>1</nb_uniq_visitors>
 				<nb_visits>1</nb_visits>
 				<nb_actions>1</nb_actions>
-				<nb_users>1</nb_users>
+				<nb_users>0</nb_users>
 				<max_actions>1</max_actions>
 				<sum_visit_length>0</sum_visit_length>
 				<bounce_count>1</bounce_count>
diff --git a/tests/PHPUnit/Integration/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__Referrers.getSocials_range.xml b/tests/PHPUnit/Integration/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__Referrers.getSocials_range.xml
index 0bbeb47f2d..ec49edb3fd 100644
--- a/tests/PHPUnit/Integration/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__Referrers.getSocials_range.xml
+++ b/tests/PHPUnit/Integration/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__Referrers.getSocials_range.xml
@@ -10,7 +10,7 @@
 			<bounce_count>1</bounce_count>
 			<nb_visits_converted>0</nb_visits_converted>
 			<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
-			<sum_daily_nb_users>3</sum_daily_nb_users>
+			<sum_daily_nb_users>0</sum_daily_nb_users>
 			<url>facebook.com</url>
 			<logo>plugins/Referrers/images/socials/facebook.com.png</logo>
 		</row>
@@ -23,7 +23,7 @@
 			<bounce_count>1</bounce_count>
 			<nb_visits_converted>0</nb_visits_converted>
 			<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-			<sum_daily_nb_users>1</sum_daily_nb_users>
+			<sum_daily_nb_users>0</sum_daily_nb_users>
 			<url>mixi.jp</url>
 			<logo>plugins/Referrers/images/socials/mixi.jp.png</logo>
 		</row>
@@ -36,7 +36,7 @@
 			<bounce_count>0</bounce_count>
 			<nb_visits_converted>0</nb_visits_converted>
 			<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-			<sum_daily_nb_users>1</sum_daily_nb_users>
+			<sum_daily_nb_users>0</sum_daily_nb_users>
 			<url>skyrock.com</url>
 			<logo>plugins/Referrers/images/socials/skyrock.com.png</logo>
 		</row>
@@ -49,7 +49,7 @@
 			<bounce_count>2</bounce_count>
 			<nb_visits_converted>0</nb_visits_converted>
 			<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
-			<sum_daily_nb_users>3</sum_daily_nb_users>
+			<sum_daily_nb_users>0</sum_daily_nb_users>
 			<url>twitter.com</url>
 			<logo>plugins/Referrers/images/socials/twitter.com.png</logo>
 		</row>
@@ -62,7 +62,7 @@
 			<bounce_count>0</bounce_count>
 			<nb_visits_converted>0</nb_visits_converted>
 			<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-			<sum_daily_nb_users>1</sum_daily_nb_users>
+			<sum_daily_nb_users>0</sum_daily_nb_users>
 			<url>flickr.com</url>
 			<logo>plugins/Referrers/images/socials/flickr.com.png</logo>
 		</row>
@@ -75,7 +75,7 @@
 			<bounce_count>1</bounce_count>
 			<nb_visits_converted>0</nb_visits_converted>
 			<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-			<sum_daily_nb_users>1</sum_daily_nb_users>
+			<sum_daily_nb_users>0</sum_daily_nb_users>
 			<url>xanga.com</url>
 			<logo>plugins/Referrers/images/socials/xanga.com.png</logo>
 		</row>
@@ -90,7 +90,7 @@
 			<bounce_count>2</bounce_count>
 			<nb_visits_converted>0</nb_visits_converted>
 			<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
-			<sum_daily_nb_users>2</sum_daily_nb_users>
+			<sum_daily_nb_users>0</sum_daily_nb_users>
 			<url>twitter.com</url>
 			<logo>plugins/Referrers/images/socials/twitter.com.png</logo>
 		</row>
@@ -103,7 +103,7 @@
 			<bounce_count>1</bounce_count>
 			<nb_visits_converted>0</nb_visits_converted>
 			<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-			<sum_daily_nb_users>1</sum_daily_nb_users>
+			<sum_daily_nb_users>0</sum_daily_nb_users>
 			<url>facebook.com</url>
 			<logo>plugins/Referrers/images/socials/facebook.com.png</logo>
 		</row>
diff --git a/tests/PHPUnit/Integration/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__Referrers.getUrlsForSocial_range.xml b/tests/PHPUnit/Integration/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__Referrers.getUrlsForSocial_range.xml
index db9224b872..2b521b00a4 100644
--- a/tests/PHPUnit/Integration/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__Referrers.getUrlsForSocial_range.xml
+++ b/tests/PHPUnit/Integration/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__Referrers.getUrlsForSocial_range.xml
@@ -9,7 +9,7 @@
 		<bounce_count>0</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>1</sum_daily_nb_users>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<url>http://facebook.com/whatever</url>
 	</row>
 	<row>
@@ -21,7 +21,7 @@
 		<bounce_count>0</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>1</sum_daily_nb_users>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<url>http://fb.me/?q=sdlfjs&amp;n=slfjsd</url>
 	</row>
 	<row>
@@ -33,7 +33,7 @@
 		<bounce_count>1</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>1</sum_daily_nb_users>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<url>http://www.facebook.com/another/path</url>
 	</row>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__UserCountry.getCountry_range.xml b/tests/PHPUnit/Integration/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__UserCountry.getCountry_range.xml
index de63f6e83a..7cbd671101 100644
--- a/tests/PHPUnit/Integration/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__UserCountry.getCountry_range.xml
+++ b/tests/PHPUnit/Integration/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__UserCountry.getCountry_range.xml
@@ -9,7 +9,7 @@
 		<bounce_count>4</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>4</sum_daily_nb_users>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<code>fr</code>
 		<logo>plugins/UserCountry/images/flags/fr.png</logo>
 		<logoWidth>16</logoWidth>
diff --git a/tests/PHPUnit/Integration/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__UserSettings.getResolution_range.xml b/tests/PHPUnit/Integration/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__UserSettings.getResolution_range.xml
index 97c6ffce80..bef1e186ef 100644
--- a/tests/PHPUnit/Integration/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__UserSettings.getResolution_range.xml
+++ b/tests/PHPUnit/Integration/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__UserSettings.getResolution_range.xml
@@ -9,6 +9,6 @@
 		<bounce_count>3</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>3</sum_daily_nb_users>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
 	</row>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__VisitTime.getVisitInformationPerServerTime_range.xml b/tests/PHPUnit/Integration/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__VisitTime.getVisitInformationPerServerTime_range.xml
index f29f60a748..b054303185 100644
--- a/tests/PHPUnit/Integration/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__VisitTime.getVisitInformationPerServerTime_range.xml
+++ b/tests/PHPUnit/Integration/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__VisitTime.getVisitInformationPerServerTime_range.xml
@@ -20,7 +20,7 @@
 		<bounce_count>0</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>3</sum_daily_nb_users>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
 	</row>
 	<row>
 		<label>2h</label>
@@ -31,7 +31,7 @@
 		<bounce_count>3</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>3</sum_daily_nb_users>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
 	</row>
 	<row>
 		<label>3h</label>
diff --git a/tests/PHPUnit/Integration/expected/test_oneVisitor_oneWebsite_severalDays_DateRange_noIdSubtable__Referrers.getUrlsForSocial_range.xml b/tests/PHPUnit/Integration/expected/test_oneVisitor_oneWebsite_severalDays_DateRange_noIdSubtable__Referrers.getUrlsForSocial_range.xml
index e36d8673a4..4649b78a18 100644
--- a/tests/PHPUnit/Integration/expected/test_oneVisitor_oneWebsite_severalDays_DateRange_noIdSubtable__Referrers.getUrlsForSocial_range.xml
+++ b/tests/PHPUnit/Integration/expected/test_oneVisitor_oneWebsite_severalDays_DateRange_noIdSubtable__Referrers.getUrlsForSocial_range.xml
@@ -10,7 +10,7 @@
 			<bounce_count>0</bounce_count>
 			<nb_visits_converted>0</nb_visits_converted>
 			<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-			<sum_daily_nb_users>1</sum_daily_nb_users>
+			<sum_daily_nb_users>0</sum_daily_nb_users>
 			<url>http://facebook.com/whatever</url>
 		</row>
 		<row>
@@ -22,7 +22,7 @@
 			<bounce_count>0</bounce_count>
 			<nb_visits_converted>0</nb_visits_converted>
 			<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-			<sum_daily_nb_users>1</sum_daily_nb_users>
+			<sum_daily_nb_users>0</sum_daily_nb_users>
 			<url>http://fb.me/?q=sdlfjs&amp;n=slfjsd</url>
 		</row>
 		<row>
@@ -34,7 +34,7 @@
 			<bounce_count>1</bounce_count>
 			<nb_visits_converted>0</nb_visits_converted>
 			<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-			<sum_daily_nb_users>1</sum_daily_nb_users>
+			<sum_daily_nb_users>0</sum_daily_nb_users>
 			<url>http://mixi.jp</url>
 		</row>
 		<row>
@@ -46,7 +46,7 @@
 			<bounce_count>0</bounce_count>
 			<nb_visits_converted>0</nb_visits_converted>
 			<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-			<sum_daily_nb_users>1</sum_daily_nb_users>
+			<sum_daily_nb_users>0</sum_daily_nb_users>
 			<url>http://skyrock.com</url>
 		</row>
 		<row>
@@ -58,7 +58,7 @@
 			<bounce_count>1</bounce_count>
 			<nb_visits_converted>0</nb_visits_converted>
 			<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-			<sum_daily_nb_users>1</sum_daily_nb_users>
+			<sum_daily_nb_users>0</sum_daily_nb_users>
 			<url>http://t.co/id/?y=dsfs</url>
 		</row>
 		<row>
@@ -70,7 +70,7 @@
 			<bounce_count>1</bounce_count>
 			<nb_visits_converted>0</nb_visits_converted>
 			<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-			<sum_daily_nb_users>1</sum_daily_nb_users>
+			<sum_daily_nb_users>0</sum_daily_nb_users>
 			<url>http://twitter.com/whatever2</url>
 		</row>
 		<row>
@@ -82,7 +82,7 @@
 			<bounce_count>1</bounce_count>
 			<nb_visits_converted>0</nb_visits_converted>
 			<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-			<sum_daily_nb_users>1</sum_daily_nb_users>
+			<sum_daily_nb_users>0</sum_daily_nb_users>
 			<url>http://www.facebook.com/another/path</url>
 		</row>
 		<row>
@@ -94,7 +94,7 @@
 			<bounce_count>0</bounce_count>
 			<nb_visits_converted>0</nb_visits_converted>
 			<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-			<sum_daily_nb_users>1</sum_daily_nb_users>
+			<sum_daily_nb_users>0</sum_daily_nb_users>
 			<url>http://www.flickr.com</url>
 		</row>
 		<row>
@@ -106,7 +106,7 @@
 			<bounce_count>0</bounce_count>
 			<nb_visits_converted>0</nb_visits_converted>
 			<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-			<sum_daily_nb_users>1</sum_daily_nb_users>
+			<sum_daily_nb_users>0</sum_daily_nb_users>
 			<url>http://www.twitter.com/index?a=2334</url>
 		</row>
 		<row>
@@ -118,7 +118,7 @@
 			<bounce_count>1</bounce_count>
 			<nb_visits_converted>0</nb_visits_converted>
 			<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-			<sum_daily_nb_users>1</sum_daily_nb_users>
+			<sum_daily_nb_users>0</sum_daily_nb_users>
 			<url>http://xanga.com</url>
 		</row>
 	</result>
@@ -132,7 +132,7 @@
 			<bounce_count>1</bounce_count>
 			<nb_visits_converted>0</nb_visits_converted>
 			<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-			<sum_daily_nb_users>1</sum_daily_nb_users>
+			<sum_daily_nb_users>0</sum_daily_nb_users>
 			<url>http://t.co/id/?y=dsfs</url>
 		</row>
 		<row>
@@ -144,7 +144,7 @@
 			<bounce_count>1</bounce_count>
 			<nb_visits_converted>0</nb_visits_converted>
 			<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-			<sum_daily_nb_users>1</sum_daily_nb_users>
+			<sum_daily_nb_users>0</sum_daily_nb_users>
 			<url>http://twitter.com/whatever2</url>
 		</row>
 		<row>
@@ -156,7 +156,7 @@
 			<bounce_count>1</bounce_count>
 			<nb_visits_converted>0</nb_visits_converted>
 			<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-			<sum_daily_nb_users>1</sum_daily_nb_users>
+			<sum_daily_nb_users>0</sum_daily_nb_users>
 			<url>http://www.facebook.com/another/path</url>
 		</row>
 	</result>
diff --git a/tests/PHPUnit/Integration/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__CustomVariables.getCustomVariables_range.xml b/tests/PHPUnit/Integration/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__CustomVariables.getCustomVariables_range.xml
index e8bbd9822c..1639c238a3 100644
--- a/tests/PHPUnit/Integration/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__CustomVariables.getCustomVariables_range.xml
+++ b/tests/PHPUnit/Integration/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__CustomVariables.getCustomVariables_range.xml
@@ -22,7 +22,7 @@
 		<nb_conversions>3</nb_conversions>
 		<revenue>1000</revenue>
 		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>2</sum_daily_nb_users>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<subtable>
 			<row>
 				<label>LoggedIn</label>
@@ -41,7 +41,7 @@
 				<nb_conversions>1</nb_conversions>
 				<revenue>0</revenue>
 				<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-				<sum_daily_nb_users>1</sum_daily_nb_users>
+				<sum_daily_nb_users>0</sum_daily_nb_users>
 			</row>
 			<row>
 				<label>LoggedOut</label>
@@ -65,7 +65,7 @@
 				<nb_conversions>2</nb_conversions>
 				<revenue>1000</revenue>
 				<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-				<sum_daily_nb_users>1</sum_daily_nb_users>
+				<sum_daily_nb_users>0</sum_daily_nb_users>
 			</row>
 		</subtable>
 	</row>
@@ -86,7 +86,7 @@
 		<nb_conversions>1</nb_conversions>
 		<revenue>0</revenue>
 		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>1</sum_daily_nb_users>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<subtable>
 			<row>
 				<label>Value not defined</label>
@@ -105,7 +105,7 @@
 				<nb_conversions>1</nb_conversions>
 				<revenue>0</revenue>
 				<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-				<sum_daily_nb_users>1</sum_daily_nb_users>
+				<sum_daily_nb_users>0</sum_daily_nb_users>
 			</row>
 		</subtable>
 	</row>
@@ -144,7 +144,7 @@
 		<nb_conversions>1</nb_conversions>
 		<revenue>0</revenue>
 		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>1</sum_daily_nb_users>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<subtable>
 			<row>
 				<label>abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrst</label>
@@ -163,7 +163,7 @@
 				<nb_conversions>1</nb_conversions>
 				<revenue>0</revenue>
 				<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-				<sum_daily_nb_users>1</sum_daily_nb_users>
+				<sum_daily_nb_users>0</sum_daily_nb_users>
 			</row>
 		</subtable>
 	</row>
@@ -184,7 +184,7 @@
 		<nb_conversions>1</nb_conversions>
 		<revenue>1000</revenue>
 		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>1</sum_daily_nb_users>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<subtable>
 			<row>
 				<label>abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz</label>
@@ -203,7 +203,7 @@
 				<nb_conversions>1</nb_conversions>
 				<revenue>1000</revenue>
 				<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-				<sum_daily_nb_users>1</sum_daily_nb_users>
+				<sum_daily_nb_users>0</sum_daily_nb_users>
 			</row>
 		</subtable>
 	</row>
diff --git a/tests/PHPUnit/Integration/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisitsDetails_range.xml b/tests/PHPUnit/Integration/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisitsDetails_range.xml
index 8112427124..0a241b4081 100644
--- a/tests/PHPUnit/Integration/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisitsDetails_range.xml
+++ b/tests/PHPUnit/Integration/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisitsDetails_range.xml
@@ -25,7 +25,7 @@
 		
 		<searches>0</searches>
 		<actions>1</actions>
-		<userId />
+		<userId>0</userId>
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>0</visitConverted>
@@ -140,7 +140,7 @@
 		
 		<searches>0</searches>
 		<actions>1</actions>
-		<userId />
+		<userId>0</userId>
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>1</visitConverted>
@@ -311,7 +311,7 @@
 		
 		<searches>0</searches>
 		<actions>3</actions>
-		<userId />
+		<userId>0</userId>
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
 		<visitConverted>1</visitConverted>
diff --git a/tests/PHPUnit/Integration/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getVisitorProfile.xml b/tests/PHPUnit/Integration/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getVisitorProfile.xml
index 853144f18a..e75075382d 100644
--- a/tests/PHPUnit/Integration/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getVisitorProfile.xml
+++ b/tests/PHPUnit/Integration/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getVisitorProfile.xml
@@ -68,7 +68,7 @@
 			
 			<searches>0</searches>
 			<actions>1</actions>
-			<userId />
+			<userId>0</userId>
 			<visitorType>new</visitorType>
 			<visitorTypeIcon />
 			<visitConverted>0</visitConverted>
@@ -184,7 +184,7 @@
 			
 			<searches>0</searches>
 			<actions>1</actions>
-			<userId />
+			<userId>0</userId>
 			<visitorType>new</visitorType>
 			<visitorTypeIcon />
 			<visitConverted>1</visitConverted>
@@ -266,7 +266,7 @@
 			
 		</row>
 	</lastVisits>
-	<userId />
+	<userId>0</userId>
 	
 	
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Referrers.getKeywords_range.xml b/tests/PHPUnit/Integration/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Referrers.getKeywords_range.xml
index dd5070e6a6..bd1f763bd0 100644
--- a/tests/PHPUnit/Integration/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Referrers.getKeywords_range.xml
+++ b/tests/PHPUnit/Integration/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Referrers.getKeywords_range.xml
@@ -9,7 +9,7 @@
 		<bounce_count>0</bounce_count>
 		<nb_visits_converted>1</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>1</sum_daily_nb_users>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<subtable>
 			<row>
 				<label>Google</label>
@@ -20,7 +20,7 @@
 				<bounce_count>0</bounce_count>
 				<nb_visits_converted>1</nb_visits_converted>
 				<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-				<sum_daily_nb_users>1</sum_daily_nb_users>
+				<sum_daily_nb_users>0</sum_daily_nb_users>
 			</row>
 		</subtable>
 	</row>
diff --git a/tests/PHPUnit/Integration/expected/test_reportLimiting__Referrers.getAll_day.xml b/tests/PHPUnit/Integration/expected/test_reportLimiting__Referrers.getAll_day.xml
index a3121fadae..8202c35460 100644
--- a/tests/PHPUnit/Integration/expected/test_reportLimiting__Referrers.getAll_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_reportLimiting__Referrers.getAll_day.xml
@@ -5,7 +5,7 @@
 		<nb_uniq_visitors>2</nb_uniq_visitors>
 		<nb_visits>2</nb_visits>
 		<nb_actions>2</nb_actions>
-		<nb_users>2</nb_users>
+		<nb_users>0</nb_users>
 		<max_actions>1</max_actions>
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>2</bounce_count>
@@ -17,7 +17,7 @@
 		<nb_uniq_visitors>3</nb_uniq_visitors>
 		<nb_visits>4</nb_visits>
 		<nb_actions>4</nb_actions>
-		<nb_users>3</nb_users>
+		<nb_users>0</nb_users>
 		<max_actions>1</max_actions>
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>4</bounce_count>
@@ -29,7 +29,7 @@
 		<nb_uniq_visitors>2</nb_uniq_visitors>
 		<nb_visits>2</nb_visits>
 		<nb_actions>2</nb_actions>
-		<nb_users>2</nb_users>
+		<nb_users>0</nb_users>
 		<max_actions>1</max_actions>
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>2</bounce_count>
@@ -41,7 +41,7 @@
 		<nb_uniq_visitors>3</nb_uniq_visitors>
 		<nb_visits>3</nb_visits>
 		<nb_actions>3</nb_actions>
-		<nb_users>3</nb_users>
+		<nb_users>0</nb_users>
 		<max_actions>1</max_actions>
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>3</bounce_count>
@@ -53,7 +53,7 @@
 		<nb_uniq_visitors>9</nb_uniq_visitors>
 		<nb_visits>9</nb_visits>
 		<nb_actions>9</nb_actions>
-		<nb_users>9</nb_users>
+		<nb_users>0</nb_users>
 		<max_actions>2</max_actions>
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>9</bounce_count>
diff --git a/tests/PHPUnit/Integration/expected/test_reportLimiting__Referrers.getKeywords_day.xml b/tests/PHPUnit/Integration/expected/test_reportLimiting__Referrers.getKeywords_day.xml
index 25c6014a6f..dd1f7037e6 100644
--- a/tests/PHPUnit/Integration/expected/test_reportLimiting__Referrers.getKeywords_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_reportLimiting__Referrers.getKeywords_day.xml
@@ -5,7 +5,7 @@
 		<nb_uniq_visitors>3</nb_uniq_visitors>
 		<nb_visits>3</nb_visits>
 		<nb_actions>3</nb_actions>
-		<nb_users>3</nb_users>
+		<nb_users>0</nb_users>
 		<max_actions>1</max_actions>
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>3</bounce_count>
@@ -16,7 +16,7 @@
 				<nb_uniq_visitors>1</nb_uniq_visitors>
 				<nb_visits>1</nb_visits>
 				<nb_actions>1</nb_actions>
-				<nb_users>1</nb_users>
+				<nb_users>0</nb_users>
 				<max_actions>1</max_actions>
 				<sum_visit_length>0</sum_visit_length>
 				<bounce_count>1</bounce_count>
@@ -27,7 +27,7 @@
 				<nb_uniq_visitors>2</nb_uniq_visitors>
 				<nb_visits>2</nb_visits>
 				<nb_actions>2</nb_actions>
-				<nb_users>2</nb_users>
+				<nb_users>0</nb_users>
 				<max_actions>1</max_actions>
 				<sum_visit_length>0</sum_visit_length>
 				<bounce_count>2</bounce_count>
@@ -40,7 +40,7 @@
 		<nb_uniq_visitors>2</nb_uniq_visitors>
 		<nb_visits>2</nb_visits>
 		<nb_actions>2</nb_actions>
-		<nb_users>2</nb_users>
+		<nb_users>0</nb_users>
 		<max_actions>1</max_actions>
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>2</bounce_count>
@@ -51,7 +51,7 @@
 				<nb_uniq_visitors>1</nb_uniq_visitors>
 				<nb_visits>1</nb_visits>
 				<nb_actions>1</nb_actions>
-				<nb_users>1</nb_users>
+				<nb_users>0</nb_users>
 				<max_actions>1</max_actions>
 				<sum_visit_length>0</sum_visit_length>
 				<bounce_count>1</bounce_count>
@@ -62,7 +62,7 @@
 				<nb_uniq_visitors>1</nb_uniq_visitors>
 				<nb_visits>1</nb_visits>
 				<nb_actions>1</nb_actions>
-				<nb_users>1</nb_users>
+				<nb_users>0</nb_users>
 				<max_actions>1</max_actions>
 				<sum_visit_length>0</sum_visit_length>
 				<bounce_count>1</bounce_count>
@@ -75,7 +75,7 @@
 		<nb_uniq_visitors>7</nb_uniq_visitors>
 		<nb_visits>7</nb_visits>
 		<nb_actions>7</nb_actions>
-		<nb_users>7</nb_users>
+		<nb_users>0</nb_users>
 		<max_actions>1</max_actions>
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>7</bounce_count>
diff --git a/tests/PHPUnit/Integration/expected/test_reportLimiting__Referrers.getReferrerType_day.xml b/tests/PHPUnit/Integration/expected/test_reportLimiting__Referrers.getReferrerType_day.xml
index 9f75ee4f21..6b8c754c71 100644
--- a/tests/PHPUnit/Integration/expected/test_reportLimiting__Referrers.getReferrerType_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_reportLimiting__Referrers.getReferrerType_day.xml
@@ -5,7 +5,7 @@
 		<nb_uniq_visitors>15</nb_uniq_visitors>
 		<nb_visits>55</nb_visits>
 		<nb_actions>55</nb_actions>
-		<nb_users>1</nb_users>
+		<nb_users>0</nb_users>
 		<max_actions>1</max_actions>
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>55</bounce_count>
@@ -16,7 +16,7 @@
 		<nb_uniq_visitors>12</nb_uniq_visitors>
 		<nb_visits>12</nb_visits>
 		<nb_actions>12</nb_actions>
-		<nb_users>12</nb_users>
+		<nb_users>0</nb_users>
 		<max_actions>1</max_actions>
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>12</bounce_count>
@@ -27,7 +27,7 @@
 				<nb_uniq_visitors>3</nb_uniq_visitors>
 				<nb_visits>3</nb_visits>
 				<nb_actions>3</nb_actions>
-				<nb_users>3</nb_users>
+				<nb_users>0</nb_users>
 				<max_actions>1</max_actions>
 				<sum_visit_length>0</sum_visit_length>
 				<bounce_count>3</bounce_count>
@@ -38,7 +38,7 @@
 				<nb_uniq_visitors>2</nb_uniq_visitors>
 				<nb_visits>2</nb_visits>
 				<nb_actions>2</nb_actions>
-				<nb_users>2</nb_users>
+				<nb_users>0</nb_users>
 				<max_actions>1</max_actions>
 				<sum_visit_length>0</sum_visit_length>
 				<bounce_count>2</bounce_count>
@@ -49,7 +49,7 @@
 				<nb_uniq_visitors>7</nb_uniq_visitors>
 				<nb_visits>7</nb_visits>
 				<nb_actions>7</nb_actions>
-				<nb_users>7</nb_users>
+				<nb_users>0</nb_users>
 				<max_actions>1</max_actions>
 				<sum_visit_length>0</sum_visit_length>
 				<bounce_count>7</bounce_count>
@@ -62,7 +62,7 @@
 		<nb_uniq_visitors>7</nb_uniq_visitors>
 		<nb_visits>8</nb_visits>
 		<nb_actions>8</nb_actions>
-		<nb_users>7</nb_users>
+		<nb_users>0</nb_users>
 		<max_actions>1</max_actions>
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>8</bounce_count>
@@ -73,7 +73,7 @@
 				<nb_uniq_visitors>3</nb_uniq_visitors>
 				<nb_visits>4</nb_visits>
 				<nb_actions>4</nb_actions>
-				<nb_users>3</nb_users>
+				<nb_users>0</nb_users>
 				<max_actions>1</max_actions>
 				<sum_visit_length>0</sum_visit_length>
 				<bounce_count>4</bounce_count>
@@ -84,7 +84,7 @@
 				<nb_uniq_visitors>2</nb_uniq_visitors>
 				<nb_visits>2</nb_visits>
 				<nb_actions>2</nb_actions>
-				<nb_users>2</nb_users>
+				<nb_users>0</nb_users>
 				<max_actions>1</max_actions>
 				<sum_visit_length>0</sum_visit_length>
 				<bounce_count>2</bounce_count>
@@ -95,7 +95,7 @@
 				<nb_uniq_visitors>2</nb_uniq_visitors>
 				<nb_visits>2</nb_visits>
 				<nb_actions>2</nb_actions>
-				<nb_users>2</nb_users>
+				<nb_users>0</nb_users>
 				<max_actions>1</max_actions>
 				<sum_visit_length>0</sum_visit_length>
 				<bounce_count>2</bounce_count>
diff --git a/tests/PHPUnit/Integration/expected/test_reportLimiting__Referrers.getSearchEngines_day.xml b/tests/PHPUnit/Integration/expected/test_reportLimiting__Referrers.getSearchEngines_day.xml
index 60aa118c67..cfcc0601a9 100644
--- a/tests/PHPUnit/Integration/expected/test_reportLimiting__Referrers.getSearchEngines_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_reportLimiting__Referrers.getSearchEngines_day.xml
@@ -5,7 +5,7 @@
 		<nb_uniq_visitors>3</nb_uniq_visitors>
 		<nb_visits>3</nb_visits>
 		<nb_actions>3</nb_actions>
-		<nb_users>3</nb_users>
+		<nb_users>0</nb_users>
 		<max_actions>1</max_actions>
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>3</bounce_count>
@@ -18,7 +18,7 @@
 				<nb_uniq_visitors>1</nb_uniq_visitors>
 				<nb_visits>1</nb_visits>
 				<nb_actions>1</nb_actions>
-				<nb_users>1</nb_users>
+				<nb_users>0</nb_users>
 				<max_actions>1</max_actions>
 				<sum_visit_length>0</sum_visit_length>
 				<bounce_count>1</bounce_count>
@@ -29,7 +29,7 @@
 				<nb_uniq_visitors>2</nb_uniq_visitors>
 				<nb_visits>2</nb_visits>
 				<nb_actions>2</nb_actions>
-				<nb_users>2</nb_users>
+				<nb_users>0</nb_users>
 				<max_actions>1</max_actions>
 				<sum_visit_length>0</sum_visit_length>
 				<bounce_count>2</bounce_count>
@@ -42,7 +42,7 @@
 		<nb_uniq_visitors>3</nb_uniq_visitors>
 		<nb_visits>3</nb_visits>
 		<nb_actions>3</nb_actions>
-		<nb_users>3</nb_users>
+		<nb_users>0</nb_users>
 		<max_actions>1</max_actions>
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>3</bounce_count>
@@ -55,7 +55,7 @@
 				<nb_uniq_visitors>1</nb_uniq_visitors>
 				<nb_visits>1</nb_visits>
 				<nb_actions>1</nb_actions>
-				<nb_users>1</nb_users>
+				<nb_users>0</nb_users>
 				<max_actions>1</max_actions>
 				<sum_visit_length>0</sum_visit_length>
 				<bounce_count>1</bounce_count>
@@ -66,7 +66,7 @@
 				<nb_uniq_visitors>2</nb_uniq_visitors>
 				<nb_visits>2</nb_visits>
 				<nb_actions>2</nb_actions>
-				<nb_users>2</nb_users>
+				<nb_users>0</nb_users>
 				<max_actions>1</max_actions>
 				<sum_visit_length>0</sum_visit_length>
 				<bounce_count>2</bounce_count>
@@ -79,7 +79,7 @@
 		<nb_uniq_visitors>6</nb_uniq_visitors>
 		<nb_visits>6</nb_visits>
 		<nb_actions>6</nb_actions>
-		<nb_users>6</nb_users>
+		<nb_users>0</nb_users>
 		<max_actions>1</max_actions>
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>6</bounce_count>
diff --git a/tests/PHPUnit/Integration/expected/test_reportLimiting__Referrers.getWebsites_day.xml b/tests/PHPUnit/Integration/expected/test_reportLimiting__Referrers.getWebsites_day.xml
index b57109e0af..6b473345a8 100644
--- a/tests/PHPUnit/Integration/expected/test_reportLimiting__Referrers.getWebsites_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_reportLimiting__Referrers.getWebsites_day.xml
@@ -5,7 +5,7 @@
 		<nb_uniq_visitors>3</nb_uniq_visitors>
 		<nb_visits>4</nb_visits>
 		<nb_actions>4</nb_actions>
-		<nb_users>3</nb_users>
+		<nb_users>0</nb_users>
 		<max_actions>1</max_actions>
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>4</bounce_count>
@@ -16,7 +16,7 @@
 				<nb_uniq_visitors>1</nb_uniq_visitors>
 				<nb_visits>2</nb_visits>
 				<nb_actions>2</nb_actions>
-				<nb_users>1</nb_users>
+				<nb_users>0</nb_users>
 				<max_actions>1</max_actions>
 				<sum_visit_length>0</sum_visit_length>
 				<bounce_count>2</bounce_count>
@@ -27,7 +27,7 @@
 				<nb_uniq_visitors>2</nb_uniq_visitors>
 				<nb_visits>2</nb_visits>
 				<nb_actions>2</nb_actions>
-				<nb_users>2</nb_users>
+				<nb_users>0</nb_users>
 				<max_actions>1</max_actions>
 				<sum_visit_length>0</sum_visit_length>
 				<bounce_count>2</bounce_count>
@@ -40,7 +40,7 @@
 		<nb_uniq_visitors>2</nb_uniq_visitors>
 		<nb_visits>2</nb_visits>
 		<nb_actions>2</nb_actions>
-		<nb_users>2</nb_users>
+		<nb_users>0</nb_users>
 		<max_actions>1</max_actions>
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>2</bounce_count>
@@ -51,7 +51,7 @@
 				<nb_uniq_visitors>1</nb_uniq_visitors>
 				<nb_visits>1</nb_visits>
 				<nb_actions>1</nb_actions>
-				<nb_users>1</nb_users>
+				<nb_users>0</nb_users>
 				<max_actions>1</max_actions>
 				<sum_visit_length>0</sum_visit_length>
 				<bounce_count>1</bounce_count>
@@ -62,7 +62,7 @@
 				<nb_uniq_visitors>1</nb_uniq_visitors>
 				<nb_visits>1</nb_visits>
 				<nb_actions>1</nb_actions>
-				<nb_users>1</nb_users>
+				<nb_users>0</nb_users>
 				<max_actions>1</max_actions>
 				<sum_visit_length>0</sum_visit_length>
 				<bounce_count>1</bounce_count>
@@ -75,7 +75,7 @@
 		<nb_uniq_visitors>2</nb_uniq_visitors>
 		<nb_visits>2</nb_visits>
 		<nb_actions>2</nb_actions>
-		<nb_users>2</nb_users>
+		<nb_users>0</nb_users>
 		<max_actions>1</max_actions>
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>2</bounce_count>
diff --git a/tests/PHPUnit/Integration/expected/test_reportLimiting__UserCountry.getCity_day.xml b/tests/PHPUnit/Integration/expected/test_reportLimiting__UserCountry.getCity_day.xml
index eb4632bf55..c9eb98ffda 100644
--- a/tests/PHPUnit/Integration/expected/test_reportLimiting__UserCountry.getCity_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_reportLimiting__UserCountry.getCity_day.xml
@@ -5,7 +5,7 @@
 		<nb_uniq_visitors>4</nb_uniq_visitors>
 		<nb_visits>20</nb_visits>
 		<nb_actions>20</nb_actions>
-		<nb_users>1</nb_users>
+		<nb_users>0</nb_users>
 		<max_actions>1</max_actions>
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>20</bounce_count>
@@ -22,7 +22,7 @@
 		<nb_uniq_visitors>4</nb_uniq_visitors>
 		<nb_visits>20</nb_visits>
 		<nb_actions>20</nb_actions>
-		<nb_users>1</nb_users>
+		<nb_users>0</nb_users>
 		<max_actions>1</max_actions>
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>20</bounce_count>
@@ -39,7 +39,7 @@
 		<nb_uniq_visitors>7</nb_uniq_visitors>
 		<nb_visits>35</nb_visits>
 		<nb_actions>35</nb_actions>
-		<nb_users>2</nb_users>
+		<nb_users>0</nb_users>
 		<max_actions>1</max_actions>
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>35</bounce_count>
diff --git a/tests/PHPUnit/Integration/expected/test_reportLimiting__UserCountry.getRegion_day.xml b/tests/PHPUnit/Integration/expected/test_reportLimiting__UserCountry.getRegion_day.xml
index 8709d29f8f..50888ce069 100644
--- a/tests/PHPUnit/Integration/expected/test_reportLimiting__UserCountry.getRegion_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_reportLimiting__UserCountry.getRegion_day.xml
@@ -5,7 +5,7 @@
 		<nb_uniq_visitors>4</nb_uniq_visitors>
 		<nb_visits>20</nb_visits>
 		<nb_actions>20</nb_actions>
-		<nb_users>1</nb_users>
+		<nb_users>0</nb_users>
 		<max_actions>1</max_actions>
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>20</bounce_count>
@@ -21,7 +21,7 @@
 		<nb_uniq_visitors>4</nb_uniq_visitors>
 		<nb_visits>20</nb_visits>
 		<nb_actions>20</nb_actions>
-		<nb_users>1</nb_users>
+		<nb_users>0</nb_users>
 		<max_actions>1</max_actions>
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>20</bounce_count>
@@ -37,7 +37,7 @@
 		<nb_uniq_visitors>7</nb_uniq_visitors>
 		<nb_visits>35</nb_visits>
 		<nb_actions>35</nb_actions>
-		<nb_users>2</nb_users>
+		<nb_users>0</nb_users>
 		<max_actions>1</max_actions>
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>35</bounce_count>
diff --git a/tests/PHPUnit/Integration/expected/test_reportLimiting__UserSettings.getBrowserVersion_day.xml b/tests/PHPUnit/Integration/expected/test_reportLimiting__UserSettings.getBrowserVersion_day.xml
index 83261e4e55..72dab998db 100644
--- a/tests/PHPUnit/Integration/expected/test_reportLimiting__UserSettings.getBrowserVersion_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_reportLimiting__UserSettings.getBrowserVersion_day.xml
@@ -5,7 +5,7 @@
 		<nb_uniq_visitors>3</nb_uniq_visitors>
 		<nb_visits>15</nb_visits>
 		<nb_actions>15</nb_actions>
-		<nb_users>1</nb_users>
+		<nb_users>0</nb_users>
 		<max_actions>1</max_actions>
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>15</bounce_count>
@@ -18,7 +18,7 @@
 		<nb_uniq_visitors>3</nb_uniq_visitors>
 		<nb_visits>15</nb_visits>
 		<nb_actions>15</nb_actions>
-		<nb_users>1</nb_users>
+		<nb_users>0</nb_users>
 		<max_actions>1</max_actions>
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>15</bounce_count>
@@ -31,7 +31,7 @@
 		<nb_uniq_visitors>9</nb_uniq_visitors>
 		<nb_visits>45</nb_visits>
 		<nb_actions>45</nb_actions>
-		<nb_users>7</nb_users>
+		<nb_users>0</nb_users>
 		<max_actions>1</max_actions>
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>45</bounce_count>
diff --git a/tests/PHPUnit/Integration/expected/test_reportLimiting__UserSettings.getConfiguration_day.xml b/tests/PHPUnit/Integration/expected/test_reportLimiting__UserSettings.getConfiguration_day.xml
index daeaa29064..9f4d67971d 100644
--- a/tests/PHPUnit/Integration/expected/test_reportLimiting__UserSettings.getConfiguration_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_reportLimiting__UserSettings.getConfiguration_day.xml
@@ -5,7 +5,7 @@
 		<nb_uniq_visitors>2</nb_uniq_visitors>
 		<nb_visits>10</nb_visits>
 		<nb_actions>10</nb_actions>
-		<nb_users>1</nb_users>
+		<nb_users>0</nb_users>
 		<max_actions>1</max_actions>
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>10</bounce_count>
@@ -16,7 +16,7 @@
 		<nb_uniq_visitors>1</nb_uniq_visitors>
 		<nb_visits>5</nb_visits>
 		<nb_actions>5</nb_actions>
-		<nb_users>1</nb_users>
+		<nb_users>0</nb_users>
 		<max_actions>1</max_actions>
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>5</bounce_count>
@@ -27,7 +27,7 @@
 		<nb_uniq_visitors>12</nb_uniq_visitors>
 		<nb_visits>60</nb_visits>
 		<nb_actions>60</nb_actions>
-		<nb_users>12</nb_users>
+		<nb_users>0</nb_users>
 		<max_actions>1</max_actions>
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>60</bounce_count>
diff --git a/tests/PHPUnit/Integration/expected/test_reportLimiting__UserSettings.getOS_day.xml b/tests/PHPUnit/Integration/expected/test_reportLimiting__UserSettings.getOS_day.xml
index 7b9b2dda4d..803dcc4819 100644
--- a/tests/PHPUnit/Integration/expected/test_reportLimiting__UserSettings.getOS_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_reportLimiting__UserSettings.getOS_day.xml
@@ -5,7 +5,7 @@
 		<nb_uniq_visitors>4</nb_uniq_visitors>
 		<nb_visits>20</nb_visits>
 		<nb_actions>20</nb_actions>
-		<nb_users>1</nb_users>
+		<nb_users>0</nb_users>
 		<max_actions>1</max_actions>
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>20</bounce_count>
@@ -18,7 +18,7 @@
 		<nb_uniq_visitors>3</nb_uniq_visitors>
 		<nb_visits>15</nb_visits>
 		<nb_actions>15</nb_actions>
-		<nb_users>1</nb_users>
+		<nb_users>0</nb_users>
 		<max_actions>1</max_actions>
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>15</bounce_count>
@@ -31,7 +31,7 @@
 		<nb_uniq_visitors>8</nb_uniq_visitors>
 		<nb_visits>40</nb_visits>
 		<nb_actions>40</nb_actions>
-		<nb_users>5</nb_users>
+		<nb_users>0</nb_users>
 		<max_actions>1</max_actions>
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>40</bounce_count>
diff --git a/tests/PHPUnit/Integration/expected/test_reportLimiting__UserSettings.getResolution_day.xml b/tests/PHPUnit/Integration/expected/test_reportLimiting__UserSettings.getResolution_day.xml
index 446fcc519a..7b29bb6e65 100644
--- a/tests/PHPUnit/Integration/expected/test_reportLimiting__UserSettings.getResolution_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_reportLimiting__UserSettings.getResolution_day.xml
@@ -5,7 +5,7 @@
 		<nb_uniq_visitors>4</nb_uniq_visitors>
 		<nb_visits>20</nb_visits>
 		<nb_actions>20</nb_actions>
-		<nb_users>1</nb_users>
+		<nb_users>0</nb_users>
 		<max_actions>1</max_actions>
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>20</bounce_count>
@@ -16,7 +16,7 @@
 		<nb_uniq_visitors>3</nb_uniq_visitors>
 		<nb_visits>15</nb_visits>
 		<nb_actions>15</nb_actions>
-		<nb_users>1</nb_users>
+		<nb_users>0</nb_users>
 		<max_actions>1</max_actions>
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>15</bounce_count>
@@ -27,7 +27,7 @@
 		<nb_uniq_visitors>8</nb_uniq_visitors>
 		<nb_visits>40</nb_visits>
 		<nb_actions>40</nb_actions>
-		<nb_users>5</nb_users>
+		<nb_users>0</nb_users>
 		<max_actions>1</max_actions>
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>40</bounce_count>
diff --git a/tests/PHPUnit/Integration/expected/test_reportLimiting_rankingQueryDisabled__Provider.getProvider_month.xml b/tests/PHPUnit/Integration/expected/test_reportLimiting_rankingQueryDisabled__Provider.getProvider_month.xml
index 793827ccbb..eb96e297f5 100644
--- a/tests/PHPUnit/Integration/expected/test_reportLimiting_rankingQueryDisabled__Provider.getProvider_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_reportLimiting_rankingQueryDisabled__Provider.getProvider_month.xml
@@ -9,7 +9,7 @@
 		<bounce_count>52</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>20</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>2</sum_daily_nb_users>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<url>http://www.comcast.net/</url>
 	</row>
 	<row>
@@ -21,7 +21,7 @@
 		<bounce_count>26</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>10</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>2</sum_daily_nb_users>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<url>http://www.awesomeisp.com/</url>
 	</row>
 	<row>
@@ -33,7 +33,7 @@
 		<bounce_count>22</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>10</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>2</sum_daily_nb_users>
+		<sum_daily_nb_users>0</sum_daily_nb_users>
 		<url>http://piwik.org/faq/general/#faq_52</url>
 	</row>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/expected/test_reportLimiting_rankingQuery__Referrers.getAll_day.xml b/tests/PHPUnit/Integration/expected/test_reportLimiting_rankingQuery__Referrers.getAll_day.xml
index a3121fadae..8202c35460 100644
--- a/tests/PHPUnit/Integration/expected/test_reportLimiting_rankingQuery__Referrers.getAll_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_reportLimiting_rankingQuery__Referrers.getAll_day.xml
@@ -5,7 +5,7 @@
 		<nb_uniq_visitors>2</nb_uniq_visitors>
 		<nb_visits>2</nb_visits>
 		<nb_actions>2</nb_actions>
-		<nb_users>2</nb_users>
+		<nb_users>0</nb_users>
 		<max_actions>1</max_actions>
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>2</bounce_count>
@@ -17,7 +17,7 @@
 		<nb_uniq_visitors>3</nb_uniq_visitors>
 		<nb_visits>4</nb_visits>
 		<nb_actions>4</nb_actions>
-		<nb_users>3</nb_users>
+		<nb_users>0</nb_users>
 		<max_actions>1</max_actions>
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>4</bounce_count>
@@ -29,7 +29,7 @@
 		<nb_uniq_visitors>2</nb_uniq_visitors>
 		<nb_visits>2</nb_visits>
 		<nb_actions>2</nb_actions>
-		<nb_users>2</nb_users>
+		<nb_users>0</nb_users>
 		<max_actions>1</max_actions>
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>2</bounce_count>
@@ -41,7 +41,7 @@
 		<nb_uniq_visitors>3</nb_uniq_visitors>
 		<nb_visits>3</nb_visits>
 		<nb_actions>3</nb_actions>
-		<nb_users>3</nb_users>
+		<nb_users>0</nb_users>
 		<max_actions>1</max_actions>
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>3</bounce_count>
@@ -53,7 +53,7 @@
 		<nb_uniq_visitors>9</nb_uniq_visitors>
 		<nb_visits>9</nb_visits>
 		<nb_actions>9</nb_actions>
-		<nb_users>9</nb_users>
+		<nb_users>0</nb_users>
 		<max_actions>2</max_actions>
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>9</bounce_count>
diff --git a/tests/PHPUnit/Integration/expected/test_reportLimiting_rankingQuery__Referrers.getKeywords_day.xml b/tests/PHPUnit/Integration/expected/test_reportLimiting_rankingQuery__Referrers.getKeywords_day.xml
index 25c6014a6f..dd1f7037e6 100644
--- a/tests/PHPUnit/Integration/expected/test_reportLimiting_rankingQuery__Referrers.getKeywords_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_reportLimiting_rankingQuery__Referrers.getKeywords_day.xml
@@ -5,7 +5,7 @@
 		<nb_uniq_visitors>3</nb_uniq_visitors>
 		<nb_visits>3</nb_visits>
 		<nb_actions>3</nb_actions>
-		<nb_users>3</nb_users>
+		<nb_users>0</nb_users>
 		<max_actions>1</max_actions>
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>3</bounce_count>
@@ -16,7 +16,7 @@
 				<nb_uniq_visitors>1</nb_uniq_visitors>
 				<nb_visits>1</nb_visits>
 				<nb_actions>1</nb_actions>
-				<nb_users>1</nb_users>
+				<nb_users>0</nb_users>
 				<max_actions>1</max_actions>
 				<sum_visit_length>0</sum_visit_length>
 				<bounce_count>1</bounce_count>
@@ -27,7 +27,7 @@
 				<nb_uniq_visitors>2</nb_uniq_visitors>
 				<nb_visits>2</nb_visits>
 				<nb_actions>2</nb_actions>
-				<nb_users>2</nb_users>
+				<nb_users>0</nb_users>
 				<max_actions>1</max_actions>
 				<sum_visit_length>0</sum_visit_length>
 				<bounce_count>2</bounce_count>
@@ -40,7 +40,7 @@
 		<nb_uniq_visitors>2</nb_uniq_visitors>
 		<nb_visits>2</nb_visits>
 		<nb_actions>2</nb_actions>
-		<nb_users>2</nb_users>
+		<nb_users>0</nb_users>
 		<max_actions>1</max_actions>
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>2</bounce_count>
@@ -51,7 +51,7 @@
 				<nb_uniq_visitors>1</nb_uniq_visitors>
 				<nb_visits>1</nb_visits>
 				<nb_actions>1</nb_actions>
-				<nb_users>1</nb_users>
+				<nb_users>0</nb_users>
 				<max_actions>1</max_actions>
 				<sum_visit_length>0</sum_visit_length>
 				<bounce_count>1</bounce_count>
@@ -62,7 +62,7 @@
 				<nb_uniq_visitors>1</nb_uniq_visitors>
 				<nb_visits>1</nb_visits>
 				<nb_actions>1</nb_actions>
-				<nb_users>1</nb_users>
+				<nb_users>0</nb_users>
 				<max_actions>1</max_actions>
 				<sum_visit_length>0</sum_visit_length>
 				<bounce_count>1</bounce_count>
@@ -75,7 +75,7 @@
 		<nb_uniq_visitors>7</nb_uniq_visitors>
 		<nb_visits>7</nb_visits>
 		<nb_actions>7</nb_actions>
-		<nb_users>7</nb_users>
+		<nb_users>0</nb_users>
 		<max_actions>1</max_actions>
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>7</bounce_count>
diff --git a/tests/PHPUnit/Integration/expected/test_reportLimiting_rankingQuery__Referrers.getReferrerType_day.xml b/tests/PHPUnit/Integration/expected/test_reportLimiting_rankingQuery__Referrers.getReferrerType_day.xml
index 9f75ee4f21..6b8c754c71 100644
--- a/tests/PHPUnit/Integration/expected/test_reportLimiting_rankingQuery__Referrers.getReferrerType_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_reportLimiting_rankingQuery__Referrers.getReferrerType_day.xml
@@ -5,7 +5,7 @@
 		<nb_uniq_visitors>15</nb_uniq_visitors>
 		<nb_visits>55</nb_visits>
 		<nb_actions>55</nb_actions>
-		<nb_users>1</nb_users>
+		<nb_users>0</nb_users>
 		<max_actions>1</max_actions>
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>55</bounce_count>
@@ -16,7 +16,7 @@
 		<nb_uniq_visitors>12</nb_uniq_visitors>
 		<nb_visits>12</nb_visits>
 		<nb_actions>12</nb_actions>
-		<nb_users>12</nb_users>
+		<nb_users>0</nb_users>
 		<max_actions>1</max_actions>
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>12</bounce_count>
@@ -27,7 +27,7 @@
 				<nb_uniq_visitors>3</nb_uniq_visitors>
 				<nb_visits>3</nb_visits>
 				<nb_actions>3</nb_actions>
-				<nb_users>3</nb_users>
+				<nb_users>0</nb_users>
 				<max_actions>1</max_actions>
 				<sum_visit_length>0</sum_visit_length>
 				<bounce_count>3</bounce_count>
@@ -38,7 +38,7 @@
 				<nb_uniq_visitors>2</nb_uniq_visitors>
 				<nb_visits>2</nb_visits>
 				<nb_actions>2</nb_actions>
-				<nb_users>2</nb_users>
+				<nb_users>0</nb_users>
 				<max_actions>1</max_actions>
 				<sum_visit_length>0</sum_visit_length>
 				<bounce_count>2</bounce_count>
@@ -49,7 +49,7 @@
 				<nb_uniq_visitors>7</nb_uniq_visitors>
 				<nb_visits>7</nb_visits>
 				<nb_actions>7</nb_actions>
-				<nb_users>7</nb_users>
+				<nb_users>0</nb_users>
 				<max_actions>1</max_actions>
 				<sum_visit_length>0</sum_visit_length>
 				<bounce_count>7</bounce_count>
@@ -62,7 +62,7 @@
 		<nb_uniq_visitors>7</nb_uniq_visitors>
 		<nb_visits>8</nb_visits>
 		<nb_actions>8</nb_actions>
-		<nb_users>7</nb_users>
+		<nb_users>0</nb_users>
 		<max_actions>1</max_actions>
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>8</bounce_count>
@@ -73,7 +73,7 @@
 				<nb_uniq_visitors>3</nb_uniq_visitors>
 				<nb_visits>4</nb_visits>
 				<nb_actions>4</nb_actions>
-				<nb_users>3</nb_users>
+				<nb_users>0</nb_users>
 				<max_actions>1</max_actions>
 				<sum_visit_length>0</sum_visit_length>
 				<bounce_count>4</bounce_count>
@@ -84,7 +84,7 @@
 				<nb_uniq_visitors>2</nb_uniq_visitors>
 				<nb_visits>2</nb_visits>
 				<nb_actions>2</nb_actions>
-				<nb_users>2</nb_users>
+				<nb_users>0</nb_users>
 				<max_actions>1</max_actions>
 				<sum_visit_length>0</sum_visit_length>
 				<bounce_count>2</bounce_count>
@@ -95,7 +95,7 @@
 				<nb_uniq_visitors>2</nb_uniq_visitors>
 				<nb_visits>2</nb_visits>
 				<nb_actions>2</nb_actions>
-				<nb_users>2</nb_users>
+				<nb_users>0</nb_users>
 				<max_actions>1</max_actions>
 				<sum_visit_length>0</sum_visit_length>
 				<bounce_count>2</bounce_count>
diff --git a/tests/PHPUnit/Integration/expected/test_reportLimiting_rankingQuery__Referrers.getSearchEngines_day.xml b/tests/PHPUnit/Integration/expected/test_reportLimiting_rankingQuery__Referrers.getSearchEngines_day.xml
index 60aa118c67..cfcc0601a9 100644
--- a/tests/PHPUnit/Integration/expected/test_reportLimiting_rankingQuery__Referrers.getSearchEngines_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_reportLimiting_rankingQuery__Referrers.getSearchEngines_day.xml
@@ -5,7 +5,7 @@
 		<nb_uniq_visitors>3</nb_uniq_visitors>
 		<nb_visits>3</nb_visits>
 		<nb_actions>3</nb_actions>
-		<nb_users>3</nb_users>
+		<nb_users>0</nb_users>
 		<max_actions>1</max_actions>
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>3</bounce_count>
@@ -18,7 +18,7 @@
 				<nb_uniq_visitors>1</nb_uniq_visitors>
 				<nb_visits>1</nb_visits>
 				<nb_actions>1</nb_actions>
-				<nb_users>1</nb_users>
+				<nb_users>0</nb_users>
 				<max_actions>1</max_actions>
 				<sum_visit_length>0</sum_visit_length>
 				<bounce_count>1</bounce_count>
@@ -29,7 +29,7 @@
 				<nb_uniq_visitors>2</nb_uniq_visitors>
 				<nb_visits>2</nb_visits>
 				<nb_actions>2</nb_actions>
-				<nb_users>2</nb_users>
+				<nb_users>0</nb_users>
 				<max_actions>1</max_actions>
 				<sum_visit_length>0</sum_visit_length>
 				<bounce_count>2</bounce_count>
@@ -42,7 +42,7 @@
 		<nb_uniq_visitors>3</nb_uniq_visitors>
 		<nb_visits>3</nb_visits>
 		<nb_actions>3</nb_actions>
-		<nb_users>3</nb_users>
+		<nb_users>0</nb_users>
 		<max_actions>1</max_actions>
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>3</bounce_count>
@@ -55,7 +55,7 @@
 				<nb_uniq_visitors>1</nb_uniq_visitors>
 				<nb_visits>1</nb_visits>
 				<nb_actions>1</nb_actions>
-				<nb_users>1</nb_users>
+				<nb_users>0</nb_users>
 				<max_actions>1</max_actions>
 				<sum_visit_length>0</sum_visit_length>
 				<bounce_count>1</bounce_count>
@@ -66,7 +66,7 @@
 				<nb_uniq_visitors>2</nb_uniq_visitors>
 				<nb_visits>2</nb_visits>
 				<nb_actions>2</nb_actions>
-				<nb_users>2</nb_users>
+				<nb_users>0</nb_users>
 				<max_actions>1</max_actions>
 				<sum_visit_length>0</sum_visit_length>
 				<bounce_count>2</bounce_count>
@@ -79,7 +79,7 @@
 		<nb_uniq_visitors>6</nb_uniq_visitors>
 		<nb_visits>6</nb_visits>
 		<nb_actions>6</nb_actions>
-		<nb_users>6</nb_users>
+		<nb_users>0</nb_users>
 		<max_actions>1</max_actions>
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>6</bounce_count>
diff --git a/tests/PHPUnit/Integration/expected/test_reportLimiting_rankingQuery__Referrers.getWebsites_day.xml b/tests/PHPUnit/Integration/expected/test_reportLimiting_rankingQuery__Referrers.getWebsites_day.xml
index b57109e0af..6b473345a8 100644
--- a/tests/PHPUnit/Integration/expected/test_reportLimiting_rankingQuery__Referrers.getWebsites_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_reportLimiting_rankingQuery__Referrers.getWebsites_day.xml
@@ -5,7 +5,7 @@
 		<nb_uniq_visitors>3</nb_uniq_visitors>
 		<nb_visits>4</nb_visits>
 		<nb_actions>4</nb_actions>
-		<nb_users>3</nb_users>
+		<nb_users>0</nb_users>
 		<max_actions>1</max_actions>
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>4</bounce_count>
@@ -16,7 +16,7 @@
 				<nb_uniq_visitors>1</nb_uniq_visitors>
 				<nb_visits>2</nb_visits>
 				<nb_actions>2</nb_actions>
-				<nb_users>1</nb_users>
+				<nb_users>0</nb_users>
 				<max_actions>1</max_actions>
 				<sum_visit_length>0</sum_visit_length>
 				<bounce_count>2</bounce_count>
@@ -27,7 +27,7 @@
 				<nb_uniq_visitors>2</nb_uniq_visitors>
 				<nb_visits>2</nb_visits>
 				<nb_actions>2</nb_actions>
-				<nb_users>2</nb_users>
+				<nb_users>0</nb_users>
 				<max_actions>1</max_actions>
 				<sum_visit_length>0</sum_visit_length>
 				<bounce_count>2</bounce_count>
@@ -40,7 +40,7 @@
 		<nb_uniq_visitors>2</nb_uniq_visitors>
 		<nb_visits>2</nb_visits>
 		<nb_actions>2</nb_actions>
-		<nb_users>2</nb_users>
+		<nb_users>0</nb_users>
 		<max_actions>1</max_actions>
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>2</bounce_count>
@@ -51,7 +51,7 @@
 				<nb_uniq_visitors>1</nb_uniq_visitors>
 				<nb_visits>1</nb_visits>
 				<nb_actions>1</nb_actions>
-				<nb_users>1</nb_users>
+				<nb_users>0</nb_users>
 				<max_actions>1</max_actions>
 				<sum_visit_length>0</sum_visit_length>
 				<bounce_count>1</bounce_count>
@@ -62,7 +62,7 @@
 				<nb_uniq_visitors>1</nb_uniq_visitors>
 				<nb_visits>1</nb_visits>
 				<nb_actions>1</nb_actions>
-				<nb_users>1</nb_users>
+				<nb_users>0</nb_users>
 				<max_actions>1</max_actions>
 				<sum_visit_length>0</sum_visit_length>
 				<bounce_count>1</bounce_count>
@@ -75,7 +75,7 @@
 		<nb_uniq_visitors>2</nb_uniq_visitors>
 		<nb_visits>2</nb_visits>
 		<nb_actions>2</nb_actions>
-		<nb_users>2</nb_users>
+		<nb_users>0</nb_users>
 		<max_actions>1</max_actions>
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>2</bounce_count>
diff --git a/tests/PHPUnit/Integration/expected/test_reportLimiting_rankingQuery__UserCountry.getCity_day.xml b/tests/PHPUnit/Integration/expected/test_reportLimiting_rankingQuery__UserCountry.getCity_day.xml
index eb4632bf55..c9eb98ffda 100644
--- a/tests/PHPUnit/Integration/expected/test_reportLimiting_rankingQuery__UserCountry.getCity_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_reportLimiting_rankingQuery__UserCountry.getCity_day.xml
@@ -5,7 +5,7 @@
 		<nb_uniq_visitors>4</nb_uniq_visitors>
 		<nb_visits>20</nb_visits>
 		<nb_actions>20</nb_actions>
-		<nb_users>1</nb_users>
+		<nb_users>0</nb_users>
 		<max_actions>1</max_actions>
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>20</bounce_count>
@@ -22,7 +22,7 @@
 		<nb_uniq_visitors>4</nb_uniq_visitors>
 		<nb_visits>20</nb_visits>
 		<nb_actions>20</nb_actions>
-		<nb_users>1</nb_users>
+		<nb_users>0</nb_users>
 		<max_actions>1</max_actions>
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>20</bounce_count>
@@ -39,7 +39,7 @@
 		<nb_uniq_visitors>7</nb_uniq_visitors>
 		<nb_visits>35</nb_visits>
 		<nb_actions>35</nb_actions>
-		<nb_users>2</nb_users>
+		<nb_users>0</nb_users>
 		<max_actions>1</max_actions>
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>35</bounce_count>
diff --git a/tests/PHPUnit/Integration/expected/test_reportLimiting_rankingQuery__UserCountry.getRegion_day.xml b/tests/PHPUnit/Integration/expected/test_reportLimiting_rankingQuery__UserCountry.getRegion_day.xml
index 8709d29f8f..50888ce069 100644
--- a/tests/PHPUnit/Integration/expected/test_reportLimiting_rankingQuery__UserCountry.getRegion_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_reportLimiting_rankingQuery__UserCountry.getRegion_day.xml
@@ -5,7 +5,7 @@
 		<nb_uniq_visitors>4</nb_uniq_visitors>
 		<nb_visits>20</nb_visits>
 		<nb_actions>20</nb_actions>
-		<nb_users>1</nb_users>
+		<nb_users>0</nb_users>
 		<max_actions>1</max_actions>
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>20</bounce_count>
@@ -21,7 +21,7 @@
 		<nb_uniq_visitors>4</nb_uniq_visitors>
 		<nb_visits>20</nb_visits>
 		<nb_actions>20</nb_actions>
-		<nb_users>1</nb_users>
+		<nb_users>0</nb_users>
 		<max_actions>1</max_actions>
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>20</bounce_count>
@@ -37,7 +37,7 @@
 		<nb_uniq_visitors>7</nb_uniq_visitors>
 		<nb_visits>35</nb_visits>
 		<nb_actions>35</nb_actions>
-		<nb_users>2</nb_users>
+		<nb_users>0</nb_users>
 		<max_actions>1</max_actions>
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>35</bounce_count>
diff --git a/tests/PHPUnit/Integration/expected/test_reportLimiting_rankingQuery__UserSettings.getBrowserVersion_day.xml b/tests/PHPUnit/Integration/expected/test_reportLimiting_rankingQuery__UserSettings.getBrowserVersion_day.xml
index 83261e4e55..72dab998db 100644
--- a/tests/PHPUnit/Integration/expected/test_reportLimiting_rankingQuery__UserSettings.getBrowserVersion_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_reportLimiting_rankingQuery__UserSettings.getBrowserVersion_day.xml
@@ -5,7 +5,7 @@
 		<nb_uniq_visitors>3</nb_uniq_visitors>
 		<nb_visits>15</nb_visits>
 		<nb_actions>15</nb_actions>
-		<nb_users>1</nb_users>
+		<nb_users>0</nb_users>
 		<max_actions>1</max_actions>
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>15</bounce_count>
@@ -18,7 +18,7 @@
 		<nb_uniq_visitors>3</nb_uniq_visitors>
 		<nb_visits>15</nb_visits>
 		<nb_actions>15</nb_actions>
-		<nb_users>1</nb_users>
+		<nb_users>0</nb_users>
 		<max_actions>1</max_actions>
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>15</bounce_count>
@@ -31,7 +31,7 @@
 		<nb_uniq_visitors>9</nb_uniq_visitors>
 		<nb_visits>45</nb_visits>
 		<nb_actions>45</nb_actions>
-		<nb_users>7</nb_users>
+		<nb_users>0</nb_users>
 		<max_actions>1</max_actions>
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>45</bounce_count>
diff --git a/tests/PHPUnit/Integration/expected/test_reportLimiting_rankingQuery__UserSettings.getConfiguration_day.xml b/tests/PHPUnit/Integration/expected/test_reportLimiting_rankingQuery__UserSettings.getConfiguration_day.xml
index daeaa29064..9f4d67971d 100644
--- a/tests/PHPUnit/Integration/expected/test_reportLimiting_rankingQuery__UserSettings.getConfiguration_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_reportLimiting_rankingQuery__UserSettings.getConfiguration_day.xml
@@ -5,7 +5,7 @@
 		<nb_uniq_visitors>2</nb_uniq_visitors>
 		<nb_visits>10</nb_visits>
 		<nb_actions>10</nb_actions>
-		<nb_users>1</nb_users>
+		<nb_users>0</nb_users>
 		<max_actions>1</max_actions>
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>10</bounce_count>
@@ -16,7 +16,7 @@
 		<nb_uniq_visitors>1</nb_uniq_visitors>
 		<nb_visits>5</nb_visits>
 		<nb_actions>5</nb_actions>
-		<nb_users>1</nb_users>
+		<nb_users>0</nb_users>
 		<max_actions>1</max_actions>
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>5</bounce_count>
@@ -27,7 +27,7 @@
 		<nb_uniq_visitors>12</nb_uniq_visitors>
 		<nb_visits>60</nb_visits>
 		<nb_actions>60</nb_actions>
-		<nb_users>12</nb_users>
+		<nb_users>0</nb_users>
 		<max_actions>1</max_actions>
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>60</bounce_count>
diff --git a/tests/PHPUnit/Integration/expected/test_reportLimiting_rankingQuery__UserSettings.getOS_day.xml b/tests/PHPUnit/Integration/expected/test_reportLimiting_rankingQuery__UserSettings.getOS_day.xml
index 7b9b2dda4d..803dcc4819 100644
--- a/tests/PHPUnit/Integration/expected/test_reportLimiting_rankingQuery__UserSettings.getOS_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_reportLimiting_rankingQuery__UserSettings.getOS_day.xml
@@ -5,7 +5,7 @@
 		<nb_uniq_visitors>4</nb_uniq_visitors>
 		<nb_visits>20</nb_visits>
 		<nb_actions>20</nb_actions>
-		<nb_users>1</nb_users>
+		<nb_users>0</nb_users>
 		<max_actions>1</max_actions>
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>20</bounce_count>
@@ -18,7 +18,7 @@
 		<nb_uniq_visitors>3</nb_uniq_visitors>
 		<nb_visits>15</nb_visits>
 		<nb_actions>15</nb_actions>
-		<nb_users>1</nb_users>
+		<nb_users>0</nb_users>
 		<max_actions>1</max_actions>
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>15</bounce_count>
@@ -31,7 +31,7 @@
 		<nb_uniq_visitors>8</nb_uniq_visitors>
 		<nb_visits>40</nb_visits>
 		<nb_actions>40</nb_actions>
-		<nb_users>5</nb_users>
+		<nb_users>0</nb_users>
 		<max_actions>1</max_actions>
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>40</bounce_count>
diff --git a/tests/PHPUnit/Integration/expected/test_reportLimiting_rankingQuery__UserSettings.getResolution_day.xml b/tests/PHPUnit/Integration/expected/test_reportLimiting_rankingQuery__UserSettings.getResolution_day.xml
index 446fcc519a..7b29bb6e65 100644
--- a/tests/PHPUnit/Integration/expected/test_reportLimiting_rankingQuery__UserSettings.getResolution_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_reportLimiting_rankingQuery__UserSettings.getResolution_day.xml
@@ -5,7 +5,7 @@
 		<nb_uniq_visitors>4</nb_uniq_visitors>
 		<nb_visits>20</nb_visits>
 		<nb_actions>20</nb_actions>
-		<nb_users>1</nb_users>
+		<nb_users>0</nb_users>
 		<max_actions>1</max_actions>
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>20</bounce_count>
@@ -16,7 +16,7 @@
 		<nb_uniq_visitors>3</nb_uniq_visitors>
 		<nb_visits>15</nb_visits>
 		<nb_actions>15</nb_actions>
-		<nb_users>1</nb_users>
+		<nb_users>0</nb_users>
 		<max_actions>1</max_actions>
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>15</bounce_count>
@@ -27,7 +27,7 @@
 		<nb_uniq_visitors>8</nb_uniq_visitors>
 		<nb_visits>40</nb_visits>
 		<nb_actions>40</nb_actions>
-		<nb_users>5</nb_users>
+		<nb_users>0</nb_users>
 		<max_actions>1</max_actions>
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>40</bounce_count>
diff --git a/tests/PHPUnit/Integration/expected/test_trackGoals_allowMultipleConversionsPerVisit__VisitTime.getVisitInformationPerServerTime_day.xml b/tests/PHPUnit/Integration/expected/test_trackGoals_allowMultipleConversionsPerVisit__VisitTime.getVisitInformationPerServerTime_day.xml
index 9b4d19a4ad..55a4fa3bd0 100644
--- a/tests/PHPUnit/Integration/expected/test_trackGoals_allowMultipleConversionsPerVisit__VisitTime.getVisitInformationPerServerTime_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_trackGoals_allowMultipleConversionsPerVisit__VisitTime.getVisitInformationPerServerTime_day.xml
@@ -5,7 +5,7 @@
 		<nb_uniq_visitors>1</nb_uniq_visitors>
 		<nb_visits>2</nb_visits>
 		<nb_actions>5</nb_actions>
-		<nb_users>1</nb_users>
+		<nb_users>0</nb_users>
 		<max_actions>3</max_actions>
 		<sum_visit_length>363</sum_visit_length>
 		<bounce_count>0</bounce_count>
diff --git a/tests/PHPUnit/Integration/expected/test_trackGoals_allowMultipleConversionsPerVisit__VisitsSummary.get_day.xml b/tests/PHPUnit/Integration/expected/test_trackGoals_allowMultipleConversionsPerVisit__VisitsSummary.get_day.xml
index 9738bb1e1d..7168091d51 100644
--- a/tests/PHPUnit/Integration/expected/test_trackGoals_allowMultipleConversionsPerVisit__VisitsSummary.get_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_trackGoals_allowMultipleConversionsPerVisit__VisitsSummary.get_day.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <result>
 	<nb_uniq_visitors>1</nb_uniq_visitors>
-	<nb_users>1</nb_users>
+	<nb_users>0</nb_users>
 	<nb_visits>2</nb_visits>
 	<nb_actions>5</nb_actions>
 	<nb_visits_converted>2</nb_visits_converted>
diff --git a/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_SegmentPageTitleContainsStrangeCharacters__VisitsSummary.get_day.xml b/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_SegmentPageTitleContainsStrangeCharacters__VisitsSummary.get_day.xml
index 6b4ab50749..9cdfb2d5b7 100644
--- a/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_SegmentPageTitleContainsStrangeCharacters__VisitsSummary.get_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_SegmentPageTitleContainsStrangeCharacters__VisitsSummary.get_day.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <result>
 	<nb_uniq_visitors>1</nb_uniq_visitors>
-	<nb_users>1</nb_users>
+	<nb_users>0</nb_users>
 	<nb_visits>1</nb_visits>
 	<nb_actions>3</nb_actions>
 	<nb_visits_converted>1</nb_visits_converted>
diff --git a/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_SegmentPageTitleContains__VisitsSummary.get_day.xml b/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_SegmentPageTitleContains__VisitsSummary.get_day.xml
index 6b4ab50749..9cdfb2d5b7 100644
--- a/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_SegmentPageTitleContains__VisitsSummary.get_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_SegmentPageTitleContains__VisitsSummary.get_day.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <result>
 	<nb_uniq_visitors>1</nb_uniq_visitors>
-	<nb_users>1</nb_users>
+	<nb_users>0</nb_users>
 	<nb_visits>1</nb_visits>
 	<nb_actions>3</nb_actions>
 	<nb_visits_converted>1</nb_visits_converted>
diff --git a/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_SegmentPageTitleExcludes__VisitsSummary.get_day.xml b/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_SegmentPageTitleExcludes__VisitsSummary.get_day.xml
index 5d9ef3f371..06b9efca77 100644
--- a/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_SegmentPageTitleExcludes__VisitsSummary.get_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_SegmentPageTitleExcludes__VisitsSummary.get_day.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <result>
 	<nb_uniq_visitors>2</nb_uniq_visitors>
-	<nb_users>1</nb_users>
+	<nb_users>0</nb_users>
 	<nb_visits>2</nb_visits>
 	<nb_actions>4</nb_actions>
 	<nb_visits_converted>2</nb_visits_converted>
diff --git a/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_SegmentPageUrlContains__VisitsSummary.get_day.xml b/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_SegmentPageUrlContains__VisitsSummary.get_day.xml
index 6b4ab50749..9cdfb2d5b7 100644
--- a/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_SegmentPageUrlContains__VisitsSummary.get_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_SegmentPageUrlContains__VisitsSummary.get_day.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <result>
 	<nb_uniq_visitors>1</nb_uniq_visitors>
-	<nb_users>1</nb_users>
+	<nb_users>0</nb_users>
 	<nb_visits>1</nb_visits>
 	<nb_actions>3</nb_actions>
 	<nb_visits_converted>1</nb_visits_converted>
diff --git a/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_SegmentPageUrlExcludes__VisitsSummary.get_day.xml b/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_SegmentPageUrlExcludes__VisitsSummary.get_day.xml
index 5d9ef3f371..06b9efca77 100644
--- a/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_SegmentPageUrlExcludes__VisitsSummary.get_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_SegmentPageUrlExcludes__VisitsSummary.get_day.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <result>
 	<nb_uniq_visitors>2</nb_uniq_visitors>
-	<nb_users>1</nb_users>
+	<nb_users>0</nb_users>
 	<nb_visits>2</nb_visits>
 	<nb_actions>4</nb_actions>
 	<nb_visits_converted>2</nb_visits_converted>
diff --git a/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables__CustomVariables.getCustomVariables_day.xml b/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables__CustomVariables.getCustomVariables_day.xml
index 8253ae8ec8..c92fc50036 100644
--- a/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables__CustomVariables.getCustomVariables_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables__CustomVariables.getCustomVariables_day.xml
@@ -6,7 +6,7 @@
 				<label>VisitorType</label>
 				<nb_visits>3</nb_visits>
 				<nb_actions>6</nb_actions>
-				<nb_users>2</nb_users>
+				<nb_users>0</nb_users>
 				<max_actions>4</max_actions>
 				<sum_visit_length>722</sum_visit_length>
 				<bounce_count>2</bounce_count>
@@ -29,7 +29,7 @@
 						<label>LoggedIn</label>
 						<nb_visits>1</nb_visits>
 						<nb_actions>4</nb_actions>
-						<nb_users>1</nb_users>
+						<nb_users>0</nb_users>
 						<max_actions>4</max_actions>
 						<sum_visit_length>361</sum_visit_length>
 						<bounce_count>0</bounce_count>
@@ -47,7 +47,7 @@
 						<label>LoggedOut</label>
 						<nb_visits>2</nb_visits>
 						<nb_actions>2</nb_actions>
-						<nb_users>1</nb_users>
+						<nb_users>0</nb_users>
 						<max_actions>1</max_actions>
 						<sum_visit_length>361</sum_visit_length>
 						<bounce_count>2</bounce_count>
@@ -72,7 +72,7 @@
 				<label>SET WITH EMPTY VALUE</label>
 				<nb_visits>1</nb_visits>
 				<nb_actions>4</nb_actions>
-				<nb_users>1</nb_users>
+				<nb_users>0</nb_users>
 				<max_actions>4</max_actions>
 				<sum_visit_length>361</sum_visit_length>
 				<bounce_count>0</bounce_count>
@@ -90,7 +90,7 @@
 						<label>Value not defined</label>
 						<nb_visits>1</nb_visits>
 						<nb_actions>4</nb_actions>
-						<nb_users>1</nb_users>
+						<nb_users>0</nb_users>
 						<max_actions>4</max_actions>
 						<sum_visit_length>361</sum_visit_length>
 						<bounce_count>0</bounce_count>
@@ -110,7 +110,7 @@
 				<label>Value will be VERY long and truncated</label>
 				<nb_visits>1</nb_visits>
 				<nb_actions>4</nb_actions>
-				<nb_users>1</nb_users>
+				<nb_users>0</nb_users>
 				<max_actions>4</max_actions>
 				<sum_visit_length>361</sum_visit_length>
 				<bounce_count>0</bounce_count>
@@ -128,7 +128,7 @@
 						<label>abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrst</label>
 						<nb_visits>1</nb_visits>
 						<nb_actions>4</nb_actions>
-						<nb_users>1</nb_users>
+						<nb_users>0</nb_users>
 						<max_actions>4</max_actions>
 						<sum_visit_length>361</sum_visit_length>
 						<bounce_count>0</bounce_count>
@@ -164,7 +164,7 @@
 				<label>Othercustom value which should be truncated abcdefghijklmnopqrstuvwxyz</label>
 				<nb_visits>2</nb_visits>
 				<nb_actions>2</nb_actions>
-				<nb_users>1</nb_users>
+				<nb_users>0</nb_users>
 				<max_actions>1</max_actions>
 				<sum_visit_length>361</sum_visit_length>
 				<bounce_count>2</bounce_count>
@@ -182,7 +182,7 @@
 						<label>abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz</label>
 						<nb_visits>2</nb_visits>
 						<nb_actions>2</nb_actions>
-						<nb_users>1</nb_users>
+						<nb_users>0</nb_users>
 						<max_actions>1</max_actions>
 						<sum_visit_length>361</sum_visit_length>
 						<bounce_count>2</bounce_count>
diff --git a/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables__CustomVariables.getCustomVariables_week.xml b/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables__CustomVariables.getCustomVariables_week.xml
index e30a2e382d..60639711b9 100644
--- a/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables__CustomVariables.getCustomVariables_week.xml
+++ b/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables__CustomVariables.getCustomVariables_week.xml
@@ -24,7 +24,7 @@
 				<nb_conversions>3</nb_conversions>
 				<revenue>1000</revenue>
 				<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
-				<sum_daily_nb_users>2</sum_daily_nb_users>
+				<sum_daily_nb_users>0</sum_daily_nb_users>
 				<subtable>
 					<row>
 						<label>LoggedIn</label>
@@ -43,7 +43,7 @@
 						<nb_conversions>1</nb_conversions>
 						<revenue>0</revenue>
 						<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-						<sum_daily_nb_users>1</sum_daily_nb_users>
+						<sum_daily_nb_users>0</sum_daily_nb_users>
 					</row>
 					<row>
 						<label>LoggedOut</label>
@@ -67,7 +67,7 @@
 						<nb_conversions>2</nb_conversions>
 						<revenue>1000</revenue>
 						<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-						<sum_daily_nb_users>1</sum_daily_nb_users>
+						<sum_daily_nb_users>0</sum_daily_nb_users>
 					</row>
 				</subtable>
 			</row>
@@ -88,7 +88,7 @@
 				<nb_conversions>1</nb_conversions>
 				<revenue>0</revenue>
 				<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-				<sum_daily_nb_users>1</sum_daily_nb_users>
+				<sum_daily_nb_users>0</sum_daily_nb_users>
 				<subtable>
 					<row>
 						<label>Value not defined</label>
@@ -107,7 +107,7 @@
 						<nb_conversions>1</nb_conversions>
 						<revenue>0</revenue>
 						<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-						<sum_daily_nb_users>1</sum_daily_nb_users>
+						<sum_daily_nb_users>0</sum_daily_nb_users>
 					</row>
 				</subtable>
 			</row>
@@ -128,7 +128,7 @@
 				<nb_conversions>1</nb_conversions>
 				<revenue>0</revenue>
 				<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-				<sum_daily_nb_users>1</sum_daily_nb_users>
+				<sum_daily_nb_users>0</sum_daily_nb_users>
 				<subtable>
 					<row>
 						<label>abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrst</label>
@@ -147,7 +147,7 @@
 						<nb_conversions>1</nb_conversions>
 						<revenue>0</revenue>
 						<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-						<sum_daily_nb_users>1</sum_daily_nb_users>
+						<sum_daily_nb_users>0</sum_daily_nb_users>
 					</row>
 				</subtable>
 			</row>
@@ -186,7 +186,7 @@
 				<nb_conversions>1</nb_conversions>
 				<revenue>1000</revenue>
 				<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-				<sum_daily_nb_users>1</sum_daily_nb_users>
+				<sum_daily_nb_users>0</sum_daily_nb_users>
 				<subtable>
 					<row>
 						<label>abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz</label>
@@ -205,7 +205,7 @@
 						<nb_conversions>1</nb_conversions>
 						<revenue>1000</revenue>
 						<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-						<sum_daily_nb_users>1</sum_daily_nb_users>
+						<sum_daily_nb_users>0</sum_daily_nb_users>
 					</row>
 				</subtable>
 			</row>
diff --git a/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables__VisitsSummary.get_day.xml b/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables__VisitsSummary.get_day.xml
index d0993ba66f..ab7f9f9a18 100644
--- a/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables__VisitsSummary.get_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables__VisitsSummary.get_day.xml
@@ -3,7 +3,7 @@
 	<result idSite="1">
 		<result date="2010-01-03">
 			<nb_uniq_visitors>2</nb_uniq_visitors>
-			<nb_users>1</nb_users>
+			<nb_users>0</nb_users>
 			<nb_visits>3</nb_visits>
 			<nb_actions>6</nb_actions>
 			<nb_visits_converted>2</nb_visits_converted>
diff --git a/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables__VisitsSummary.get_week.xml b/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables__VisitsSummary.get_week.xml
index d1606c4582..b5e37b20aa 100644
--- a/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables__VisitsSummary.get_week.xml
+++ b/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables__VisitsSummary.get_week.xml
@@ -3,7 +3,7 @@
 	<result idSite="1">
 		<result date="From 2009-12-28 to 2010-01-03">
 			<nb_uniq_visitors>2</nb_uniq_visitors>
-			<nb_users>1</nb_users>
+			<nb_users>0</nb_users>
 			<nb_visits>3</nb_visits>
 			<nb_actions>6</nb_actions>
 			<nb_visits_converted>2</nb_visits_converted>
diff --git a/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables__subtable__API.getProcessedReport_day.xml b/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables__subtable__API.getProcessedReport_day.xml
index 6ec09ca8b4..104b5cfd27 100644
--- a/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables__subtable__API.getProcessedReport_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables__subtable__API.getProcessedReport_day.xml
@@ -48,7 +48,7 @@
 			<label>LoggedIn</label>
 			<nb_visits>1</nb_visits>
 			<nb_actions>4</nb_actions>
-			<nb_users>1</nb_users>
+			<nb_users>0</nb_users>
 			<conversion_rate>0%</conversion_rate>
 			<nb_actions_per_visit>4</nb_actions_per_visit>
 			<avg_time_on_site>00:06:01</avg_time_on_site>
@@ -59,7 +59,7 @@
 			<label>LoggedOut</label>
 			<nb_visits>2</nb_visits>
 			<nb_actions>2</nb_actions>
-			<nb_users>1</nb_users>
+			<nb_users>0</nb_users>
 			<conversion_rate>0%</conversion_rate>
 			<nb_actions_per_visit>1</nb_actions_per_visit>
 			<avg_time_on_site>00:03:01</avg_time_on_site>
diff --git a/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_segmentMatchALL_noGoalData__CustomVariables.getCustomVariables_day.xml b/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_segmentMatchALL_noGoalData__CustomVariables.getCustomVariables_day.xml
index 65d9f89144..5b779b60c6 100644
--- a/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_segmentMatchALL_noGoalData__CustomVariables.getCustomVariables_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_segmentMatchALL_noGoalData__CustomVariables.getCustomVariables_day.xml
@@ -6,7 +6,7 @@
 				<label>VisitorType</label>
 				<nb_visits>3</nb_visits>
 				<nb_actions>5</nb_actions>
-				<nb_users>2</nb_users>
+				<nb_users>0</nb_users>
 				<max_actions>3</max_actions>
 				<sum_visit_length>725</sum_visit_length>
 				<bounce_count>2</bounce_count>
@@ -29,7 +29,7 @@
 						<label>LoggedIn</label>
 						<nb_visits>1</nb_visits>
 						<nb_actions>3</nb_actions>
-						<nb_users>1</nb_users>
+						<nb_users>0</nb_users>
 						<max_actions>3</max_actions>
 						<sum_visit_length>364</sum_visit_length>
 						<bounce_count>0</bounce_count>
@@ -47,7 +47,7 @@
 						<label>LoggedOut</label>
 						<nb_visits>2</nb_visits>
 						<nb_actions>2</nb_actions>
-						<nb_users>1</nb_users>
+						<nb_users>0</nb_users>
 						<max_actions>1</max_actions>
 						<sum_visit_length>361</sum_visit_length>
 						<bounce_count>2</bounce_count>
@@ -72,7 +72,7 @@
 				<label>SET WITH EMPTY VALUE</label>
 				<nb_visits>1</nb_visits>
 				<nb_actions>3</nb_actions>
-				<nb_users>1</nb_users>
+				<nb_users>0</nb_users>
 				<max_actions>3</max_actions>
 				<sum_visit_length>364</sum_visit_length>
 				<bounce_count>0</bounce_count>
@@ -90,7 +90,7 @@
 						<label>Value not defined</label>
 						<nb_visits>1</nb_visits>
 						<nb_actions>3</nb_actions>
-						<nb_users>1</nb_users>
+						<nb_users>0</nb_users>
 						<max_actions>3</max_actions>
 						<sum_visit_length>364</sum_visit_length>
 						<bounce_count>0</bounce_count>
@@ -126,7 +126,7 @@
 				<label>Value will be VERY long and truncated</label>
 				<nb_visits>1</nb_visits>
 				<nb_actions>3</nb_actions>
-				<nb_users>1</nb_users>
+				<nb_users>0</nb_users>
 				<max_actions>3</max_actions>
 				<sum_visit_length>364</sum_visit_length>
 				<bounce_count>0</bounce_count>
@@ -144,7 +144,7 @@
 						<label>abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrst</label>
 						<nb_visits>1</nb_visits>
 						<nb_actions>3</nb_actions>
-						<nb_users>1</nb_users>
+						<nb_users>0</nb_users>
 						<max_actions>3</max_actions>
 						<sum_visit_length>364</sum_visit_length>
 						<bounce_count>0</bounce_count>
@@ -164,7 +164,7 @@
 				<label>Othercustom value which should be truncated abcdefghijklmnopqrstuvwxyz</label>
 				<nb_visits>2</nb_visits>
 				<nb_actions>2</nb_actions>
-				<nb_users>1</nb_users>
+				<nb_users>0</nb_users>
 				<max_actions>1</max_actions>
 				<sum_visit_length>361</sum_visit_length>
 				<bounce_count>2</bounce_count>
@@ -182,7 +182,7 @@
 						<label>abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz</label>
 						<nb_visits>2</nb_visits>
 						<nb_actions>2</nb_actions>
-						<nb_users>1</nb_users>
+						<nb_users>0</nb_users>
 						<max_actions>1</max_actions>
 						<sum_visit_length>361</sum_visit_length>
 						<bounce_count>2</bounce_count>
diff --git a/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_segmentMatchALL_noGoalData__CustomVariables.getCustomVariables_week.xml b/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_segmentMatchALL_noGoalData__CustomVariables.getCustomVariables_week.xml
index b60c08c406..6b156a1379 100644
--- a/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_segmentMatchALL_noGoalData__CustomVariables.getCustomVariables_week.xml
+++ b/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_segmentMatchALL_noGoalData__CustomVariables.getCustomVariables_week.xml
@@ -24,7 +24,7 @@
 				<nb_conversions>3</nb_conversions>
 				<revenue>1000</revenue>
 				<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
-				<sum_daily_nb_users>2</sum_daily_nb_users>
+				<sum_daily_nb_users>0</sum_daily_nb_users>
 				<subtable>
 					<row>
 						<label>LoggedIn</label>
@@ -43,7 +43,7 @@
 						<nb_conversions>1</nb_conversions>
 						<revenue>0</revenue>
 						<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-						<sum_daily_nb_users>1</sum_daily_nb_users>
+						<sum_daily_nb_users>0</sum_daily_nb_users>
 					</row>
 					<row>
 						<label>LoggedOut</label>
@@ -67,7 +67,7 @@
 						<nb_conversions>2</nb_conversions>
 						<revenue>1000</revenue>
 						<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-						<sum_daily_nb_users>1</sum_daily_nb_users>
+						<sum_daily_nb_users>0</sum_daily_nb_users>
 					</row>
 				</subtable>
 			</row>
@@ -88,7 +88,7 @@
 				<nb_conversions>1</nb_conversions>
 				<revenue>0</revenue>
 				<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-				<sum_daily_nb_users>1</sum_daily_nb_users>
+				<sum_daily_nb_users>0</sum_daily_nb_users>
 				<subtable>
 					<row>
 						<label>Value not defined</label>
@@ -107,7 +107,7 @@
 						<nb_conversions>1</nb_conversions>
 						<revenue>0</revenue>
 						<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-						<sum_daily_nb_users>1</sum_daily_nb_users>
+						<sum_daily_nb_users>0</sum_daily_nb_users>
 					</row>
 				</subtable>
 			</row>
@@ -146,7 +146,7 @@
 				<nb_conversions>1</nb_conversions>
 				<revenue>0</revenue>
 				<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-				<sum_daily_nb_users>1</sum_daily_nb_users>
+				<sum_daily_nb_users>0</sum_daily_nb_users>
 				<subtable>
 					<row>
 						<label>abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrst</label>
@@ -165,7 +165,7 @@
 						<nb_conversions>1</nb_conversions>
 						<revenue>0</revenue>
 						<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-						<sum_daily_nb_users>1</sum_daily_nb_users>
+						<sum_daily_nb_users>0</sum_daily_nb_users>
 					</row>
 				</subtable>
 			</row>
@@ -186,7 +186,7 @@
 				<nb_conversions>1</nb_conversions>
 				<revenue>1000</revenue>
 				<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-				<sum_daily_nb_users>1</sum_daily_nb_users>
+				<sum_daily_nb_users>0</sum_daily_nb_users>
 				<subtable>
 					<row>
 						<label>abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz</label>
@@ -205,7 +205,7 @@
 						<nb_conversions>1</nb_conversions>
 						<revenue>1000</revenue>
 						<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-						<sum_daily_nb_users>1</sum_daily_nb_users>
+						<sum_daily_nb_users>0</sum_daily_nb_users>
 					</row>
 				</subtable>
 			</row>
diff --git a/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_segmentMatchALL_noGoalData__VisitsSummary.get_day.xml b/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_segmentMatchALL_noGoalData__VisitsSummary.get_day.xml
index 2c077be5ff..283758c4ec 100644
--- a/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_segmentMatchALL_noGoalData__VisitsSummary.get_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_segmentMatchALL_noGoalData__VisitsSummary.get_day.xml
@@ -3,7 +3,7 @@
 	<result idSite="1">
 		<result date="2010-01-03">
 			<nb_uniq_visitors>2</nb_uniq_visitors>
-			<nb_users>1</nb_users>
+			<nb_users>0</nb_users>
 			<nb_visits>3</nb_visits>
 			<nb_actions>5</nb_actions>
 			<nb_visits_converted>2</nb_visits_converted>
diff --git a/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_segmentMatchALL_noGoalData__VisitsSummary.get_week.xml b/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_segmentMatchALL_noGoalData__VisitsSummary.get_week.xml
index 64436791b9..4dab22a018 100644
--- a/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_segmentMatchALL_noGoalData__VisitsSummary.get_week.xml
+++ b/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_segmentMatchALL_noGoalData__VisitsSummary.get_week.xml
@@ -3,7 +3,7 @@
 	<result idSite="1">
 		<result date="From 2009-12-28 to 2010-01-03">
 			<nb_uniq_visitors>2</nb_uniq_visitors>
-			<nb_users>1</nb_users>
+			<nb_users>0</nb_users>
 			<nb_visits>3</nb_visits>
 			<nb_actions>5</nb_actions>
 			<nb_visits_converted>2</nb_visits_converted>
diff --git a/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_segmentMatchVisitorType__CustomVariables.getCustomVariables_day.xml b/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_segmentMatchVisitorType__CustomVariables.getCustomVariables_day.xml
index 51453f0021..4a549e2004 100644
--- a/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_segmentMatchVisitorType__CustomVariables.getCustomVariables_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_segmentMatchVisitorType__CustomVariables.getCustomVariables_day.xml
@@ -6,7 +6,7 @@
 				<label>SET WITH EMPTY VALUE</label>
 				<nb_visits>1</nb_visits>
 				<nb_actions>3</nb_actions>
-				<nb_users>1</nb_users>
+				<nb_users>0</nb_users>
 				<max_actions>3</max_actions>
 				<sum_visit_length>364</sum_visit_length>
 				<bounce_count>0</bounce_count>
@@ -24,7 +24,7 @@
 						<label>Value not defined</label>
 						<nb_visits>1</nb_visits>
 						<nb_actions>3</nb_actions>
-						<nb_users>1</nb_users>
+						<nb_users>0</nb_users>
 						<max_actions>3</max_actions>
 						<sum_visit_length>364</sum_visit_length>
 						<bounce_count>0</bounce_count>
@@ -60,7 +60,7 @@
 				<label>Value will be VERY long and truncated</label>
 				<nb_visits>1</nb_visits>
 				<nb_actions>3</nb_actions>
-				<nb_users>1</nb_users>
+				<nb_users>0</nb_users>
 				<max_actions>3</max_actions>
 				<sum_visit_length>364</sum_visit_length>
 				<bounce_count>0</bounce_count>
@@ -78,7 +78,7 @@
 						<label>abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrst</label>
 						<nb_visits>1</nb_visits>
 						<nb_actions>3</nb_actions>
-						<nb_users>1</nb_users>
+						<nb_users>0</nb_users>
 						<max_actions>3</max_actions>
 						<sum_visit_length>364</sum_visit_length>
 						<bounce_count>0</bounce_count>
@@ -98,7 +98,7 @@
 				<label>VisitorType</label>
 				<nb_visits>1</nb_visits>
 				<nb_actions>3</nb_actions>
-				<nb_users>1</nb_users>
+				<nb_users>0</nb_users>
 				<max_actions>3</max_actions>
 				<sum_visit_length>364</sum_visit_length>
 				<bounce_count>0</bounce_count>
@@ -121,7 +121,7 @@
 						<label>LoggedIn</label>
 						<nb_visits>1</nb_visits>
 						<nb_actions>3</nb_actions>
-						<nb_users>1</nb_users>
+						<nb_users>0</nb_users>
 						<max_actions>3</max_actions>
 						<sum_visit_length>364</sum_visit_length>
 						<bounce_count>0</bounce_count>
diff --git a/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_segmentMatchVisitorType__CustomVariables.getCustomVariables_week.xml b/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_segmentMatchVisitorType__CustomVariables.getCustomVariables_week.xml
index 02da1ef089..28956c8523 100644
--- a/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_segmentMatchVisitorType__CustomVariables.getCustomVariables_week.xml
+++ b/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_segmentMatchVisitorType__CustomVariables.getCustomVariables_week.xml
@@ -19,7 +19,7 @@
 				<nb_conversions>1</nb_conversions>
 				<revenue>0</revenue>
 				<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-				<sum_daily_nb_users>1</sum_daily_nb_users>
+				<sum_daily_nb_users>0</sum_daily_nb_users>
 				<subtable>
 					<row>
 						<label>Value not defined</label>
@@ -38,7 +38,7 @@
 						<nb_conversions>1</nb_conversions>
 						<revenue>0</revenue>
 						<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-						<sum_daily_nb_users>1</sum_daily_nb_users>
+						<sum_daily_nb_users>0</sum_daily_nb_users>
 					</row>
 				</subtable>
 			</row>
@@ -77,7 +77,7 @@
 				<nb_conversions>1</nb_conversions>
 				<revenue>0</revenue>
 				<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-				<sum_daily_nb_users>1</sum_daily_nb_users>
+				<sum_daily_nb_users>0</sum_daily_nb_users>
 				<subtable>
 					<row>
 						<label>abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrst</label>
@@ -96,7 +96,7 @@
 						<nb_conversions>1</nb_conversions>
 						<revenue>0</revenue>
 						<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-						<sum_daily_nb_users>1</sum_daily_nb_users>
+						<sum_daily_nb_users>0</sum_daily_nb_users>
 					</row>
 				</subtable>
 			</row>
@@ -122,7 +122,7 @@
 				<nb_conversions>2</nb_conversions>
 				<revenue>0</revenue>
 				<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-				<sum_daily_nb_users>1</sum_daily_nb_users>
+				<sum_daily_nb_users>0</sum_daily_nb_users>
 				<subtable>
 					<row>
 						<label>LoggedIn</label>
@@ -141,7 +141,7 @@
 						<nb_conversions>1</nb_conversions>
 						<revenue>0</revenue>
 						<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-						<sum_daily_nb_users>1</sum_daily_nb_users>
+						<sum_daily_nb_users>0</sum_daily_nb_users>
 					</row>
 					<row>
 						<label>LoggedOut</label>
diff --git a/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_segmentMatchVisitorType__Referrers.getKeywords_day.xml b/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_segmentMatchVisitorType__Referrers.getKeywords_day.xml
index c18454dfe3..5f34b6f1bb 100644
--- a/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_segmentMatchVisitorType__Referrers.getKeywords_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_segmentMatchVisitorType__Referrers.getKeywords_day.xml
@@ -7,7 +7,7 @@
 				<nb_uniq_visitors>1</nb_uniq_visitors>
 				<nb_visits>1</nb_visits>
 				<nb_actions>3</nb_actions>
-				<nb_users>1</nb_users>
+				<nb_users>0</nb_users>
 				<max_actions>3</max_actions>
 				<sum_visit_length>364</sum_visit_length>
 				<bounce_count>0</bounce_count>
@@ -18,7 +18,7 @@
 						<nb_uniq_visitors>1</nb_uniq_visitors>
 						<nb_visits>1</nb_visits>
 						<nb_actions>3</nb_actions>
-						<nb_users>1</nb_users>
+						<nb_users>0</nb_users>
 						<max_actions>3</max_actions>
 						<sum_visit_length>364</sum_visit_length>
 						<bounce_count>0</bounce_count>
diff --git a/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_segmentMatchVisitorType__Referrers.getKeywords_week.xml b/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_segmentMatchVisitorType__Referrers.getKeywords_week.xml
index c591eb3deb..94f2fa7c83 100644
--- a/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_segmentMatchVisitorType__Referrers.getKeywords_week.xml
+++ b/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_segmentMatchVisitorType__Referrers.getKeywords_week.xml
@@ -11,7 +11,7 @@
 				<bounce_count>0</bounce_count>
 				<nb_visits_converted>1</nb_visits_converted>
 				<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-				<sum_daily_nb_users>1</sum_daily_nb_users>
+				<sum_daily_nb_users>0</sum_daily_nb_users>
 				<subtable>
 					<row>
 						<label>Google</label>
@@ -22,7 +22,7 @@
 						<bounce_count>0</bounce_count>
 						<nb_visits_converted>1</nb_visits_converted>
 						<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-						<sum_daily_nb_users>1</sum_daily_nb_users>
+						<sum_daily_nb_users>0</sum_daily_nb_users>
 					</row>
 				</subtable>
 			</row>
diff --git a/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_segmentMatchVisitorType__VisitsSummary.get_day.xml b/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_segmentMatchVisitorType__VisitsSummary.get_day.xml
index 94e129088d..de4eac0560 100644
--- a/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_segmentMatchVisitorType__VisitsSummary.get_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_segmentMatchVisitorType__VisitsSummary.get_day.xml
@@ -3,7 +3,7 @@
 	<result idSite="1">
 		<result date="2010-01-03">
 			<nb_uniq_visitors>1</nb_uniq_visitors>
-			<nb_users>1</nb_users>
+			<nb_users>0</nb_users>
 			<nb_visits>1</nb_visits>
 			<nb_actions>3</nb_actions>
 			<nb_visits_converted>1</nb_visits_converted>
diff --git a/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_segmentMatchVisitorType__VisitsSummary.get_week.xml b/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_segmentMatchVisitorType__VisitsSummary.get_week.xml
index 703cbd578e..b23508240f 100644
--- a/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_segmentMatchVisitorType__VisitsSummary.get_week.xml
+++ b/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_segmentMatchVisitorType__VisitsSummary.get_week.xml
@@ -3,7 +3,7 @@
 	<result idSite="1">
 		<result date="From 2009-12-28 to 2010-01-03">
 			<nb_uniq_visitors>1</nb_uniq_visitors>
-			<nb_users>1</nb_users>
+			<nb_users>0</nb_users>
 			<nb_visits>1</nb_visits>
 			<nb_actions>3</nb_actions>
 			<nb_visits_converted>1</nb_visits_converted>
-- 
GitLab