diff --git a/tests/PHPUnit/System/expected/test_ArchiveCronTest_archive_php_cron_output.txt b/tests/PHPUnit/System/expected/test_ArchiveCronTest_archive_php_cron_output.txt
index 937d7d2f86e36c9740bb3cccf33bdae0977c957a..09d4c5e5eadea04b3f101c99e8de52306d39c4f9 100644
--- a/tests/PHPUnit/System/expected/test_ArchiveCronTest_archive_php_cron_output.txt
+++ b/tests/PHPUnit/System/expected/test_ArchiveCronTest_archive_php_cron_output.txt
@@ -10,79 +10,95 @@ try 'php archive.php --url=http://your.piwik/path'
 -------------------------------------------------------
 
 
-INFO [2015-08-20 13:41:26] ---------------------------
-INFO [2015-08-20 13:41:26] INIT
-INFO [2015-08-20 13:41:26] Running Piwik 3.0.0-b1 as Super User
-INFO [2015-08-20 13:41:26] ---------------------------
-INFO [2015-08-20 13:41:26] NOTES
-INFO [2015-08-20 13:41:26] - If you execute this script at least once per hour (or more often) in a crontab, you may disable 'Browser trigger archiving' in Piwik UI > Settings > General Settings.
-INFO [2015-08-20 13:41:26]   See the doc at: http://piwik.org/docs/setup-auto-archiving/
-INFO [2015-08-20 13:41:26] - Reports for today will be processed at most every 150 seconds. You can change this value in Piwik UI > Settings > General Settings.
-INFO [2015-08-20 13:41:26] - Reports for the current week/month/year will be refreshed at most every 3600 seconds.
-INFO [2015-08-20 13:41:26] Will invalidate archived reports for 2012-08-09 for following siteIds: 1
-INFO [2015-08-20 13:41:27] Will invalidate archived reports for 2012-08-10 for following siteIds: 1
-INFO [2015-08-20 13:41:27] Will invalidate archived reports for 2012-08-11 for following siteIds: 1
-INFO [2015-08-20 13:41:27] Will invalidate archived reports for 2012-08-15 for following siteIds: 1,2
-INFO [2015-08-20 13:41:27] Will invalidate archived reports for 2012-09-30 for following siteIds: 1
-INFO [2015-08-20 13:41:27] Will invalidate archived reports for 2014-03-12 for following siteIds: 1
-INFO [2015-08-20 13:41:27] Will invalidate archived reports for 2014-03-13 for following siteIds: 1
-INFO [2015-08-20 13:41:27] - Will process 0 websites with new visits since 7 days 0 hours
-INFO [2015-08-20 13:41:27] - Will process 2 other websites because some old data reports have been invalidated (eg. using the Log Import script) , IDs: 1, 2
-INFO [2015-08-20 13:41:27] ---------------------------
-INFO [2015-08-20 13:41:27] START
-INFO [2015-08-20 13:41:27] Starting Piwik reports archiving...
-INFO [2015-08-20 13:41:27] Will pre-process for website id = 1, period = day, date = last52
-INFO [2015-08-20 13:41:27] - pre-processing all visits
-INFO [2015-08-20 13:41:29] - pre-processing segment 1/3 browserCode==IE
-INFO [2015-08-20 13:41:29] - pre-processing segment 2/3 visitCount<=5;visitorType!=non-existing-type;daysSinceFirstVisit<=50
-INFO [2015-08-20 13:41:29] - pre-processing segment 3/3 visitCount<=5;visitorType!=re%2C%3Btest%20is%20encoded;daysSinceFirstVisit<=50
-INFO [2015-08-20 13:41:31] Archived website id = 1, period = day, 3 segments, 0 visits in last last52 days, 0 visits today, Time elapsed: 2.207s
-INFO [2015-08-20 13:41:31] Will pre-process for website id = 1, period = week, date = last260
-INFO [2015-08-20 13:41:31] - pre-processing all visits
-INFO [2015-08-20 13:41:31] - pre-processing segment 1/3 browserCode==IE
-INFO [2015-08-20 13:41:31] - pre-processing segment 2/3 visitCount<=5;visitorType!=non-existing-type;daysSinceFirstVisit<=50
-INFO [2015-08-20 13:41:56] - pre-processing segment 3/3 visitCount<=5;visitorType!=re%2C%3Btest%20is%20encoded;daysSinceFirstVisit<=50
-INFO [2015-08-20 13:42:18] Archived website id = 1, period = week, 3 segments, 40 visits in last last260 weeks, 0 visits this week, Time elapsed: 47.002s
-INFO [2015-08-20 13:42:18] Will pre-process for website id = 1, period = month, date = last52
-INFO [2015-08-20 13:42:18] - pre-processing all visits
-INFO [2015-08-20 13:42:18] - pre-processing segment 1/3 browserCode==IE
-INFO [2015-08-20 13:42:18] - pre-processing segment 2/3 visitCount<=5;visitorType!=non-existing-type;daysSinceFirstVisit<=50
-INFO [2015-08-20 13:42:24] - pre-processing segment 3/3 visitCount<=5;visitorType!=re%2C%3Btest%20is%20encoded;daysSinceFirstVisit<=50
-INFO [2015-08-20 13:42:29] Archived website id = 1, period = month, 3 segments, 40 visits in last last52 months, 0 visits this month, Time elapsed: 11.370s
-INFO [2015-08-20 13:42:29] Will pre-process for website id = 1, period = year, date = last7
-INFO [2015-08-20 13:42:29] - pre-processing all visits
-INFO [2015-08-20 13:42:29] - pre-processing segment 1/3 browserCode==IE
-INFO [2015-08-20 13:42:29] - pre-processing segment 2/3 visitCount<=5;visitorType!=non-existing-type;daysSinceFirstVisit<=50
-INFO [2015-08-20 13:42:32] - pre-processing segment 3/3 visitCount<=5;visitorType!=re%2C%3Btest%20is%20encoded;daysSinceFirstVisit<=50
-INFO [2015-08-20 13:42:34] Archived website id = 1, period = year, 3 segments, 40 visits in last last7 years, 0 visits this year, Time elapsed: 4.820s
-INFO [2015-08-20 13:42:34] Archived website id = 1, 16 API requests, Time elapsed: 67.301s [1/2 done]
-INFO [2015-08-20 13:42:34] Will pre-process for website id = 2, period = day, date = last52
-INFO [2015-08-20 13:42:34] - pre-processing all visits
-INFO [2015-08-20 13:42:36] Archived website id = 2, period = day, 0 segments, 0 visits in last last52 days, 0 visits today, Time elapsed: 0.001s
-INFO [2015-08-20 13:42:36] Will pre-process for website id = 2, period = week, date = last260
-INFO [2015-08-20 13:42:36] - pre-processing all visits
-INFO [2015-08-20 13:42:51] Archived website id = 2, period = week, 0 segments, 1 visits in last last260 weeks, 0 visits this week, Time elapsed: 15.229s
-INFO [2015-08-20 13:42:51] Will pre-process for website id = 2, period = month, date = last52
-INFO [2015-08-20 13:42:51] - pre-processing all visits
-INFO [2015-08-20 13:42:55] Archived website id = 2, period = month, 0 segments, 1 visits in last last52 months, 0 visits this month, Time elapsed: 3.790s
-INFO [2015-08-20 13:42:55] Will pre-process for website id = 2, period = year, date = last7
-INFO [2015-08-20 13:42:55] - pre-processing all visits
-INFO [2015-08-20 13:42:56] Archived website id = 2, period = year, 0 segments, 1 visits in last last7 years, 0 visits this year, Time elapsed: 1.380s
-INFO [2015-08-20 13:42:56] Archived website id = 2, 4 API requests, Time elapsed: 22.132s [2/2 done]
-INFO [2015-08-20 13:42:56] Done archiving!
-INFO [2015-08-20 13:42:56] ---------------------------
-INFO [2015-08-20 13:42:56] SUMMARY
-INFO [2015-08-20 13:42:56] Total visits for today across archived websites: 0
-INFO [2015-08-20 13:42:56] Archived today's reports for 2 websites
-INFO [2015-08-20 13:42:56] Archived week/month/year for 2 websites
-INFO [2015-08-20 13:42:56] Skipped 0 websites: no new visit since the last script execution
-INFO [2015-08-20 13:42:56] Skipped 0 websites day archiving: existing daily reports are less than 150 seconds old
-INFO [2015-08-20 13:42:56] Skipped 0 websites week/month/year archiving: existing periods reports are less than 3600 seconds old
-INFO [2015-08-20 13:42:56] Total API requests: 20
-INFO [2015-08-20 13:42:56] done: 2/2 100%, 0 vtoday, 2 wtoday, 2 wperiods, 20 req, 89599 ms, no error
-INFO [2015-08-20 13:42:56] Time elapsed: 89.600s
-INFO [2015-08-20 13:42:56] ---------------------------
-INFO [2015-08-20 13:42:56] SCHEDULED TASKS
-INFO [2015-08-20 13:42:56] Starting Scheduled tasks...
-INFO [2015-08-20 13:42:56] done
-INFO [2015-08-20 13:42:56] ---------------------------
\ No newline at end of file
+INFO [2016-11-15 01:01:32] ---------------------------
+INFO [2016-11-15 01:01:32] INIT
+INFO [2016-11-15 01:01:32] Running Piwik 3.0.0-b2 as Super User
+INFO [2016-11-15 01:01:32] ---------------------------
+INFO [2016-11-15 01:01:32] NOTES
+INFO [2016-11-15 01:01:32] - If you execute this script at least once per hour (or more often) in a crontab, you may disable 'Browser trigger archiving' in Piwik UI > Settings > General Settings.
+INFO [2016-11-15 01:01:32]   See the doc at: http://piwik.org/docs/setup-auto-archiving/
+INFO [2016-11-15 01:01:32] - Reports for today will be processed at most every 150 seconds. You can change this value in Piwik UI > Settings > General Settings.
+INFO [2016-11-15 01:01:32] - Reports for the current week/month/year will be refreshed at most every 3600 seconds.
+INFO [2016-11-15 01:01:32] - Will invalidate archived reports for 2012-08-09 for following websites ids: 1
+INFO [2016-11-15 01:01:32] - Will invalidate archived reports for 2012-08-10 for following websites ids: 1
+INFO [2016-11-15 01:01:32] - Will invalidate archived reports for 2012-08-11 for following websites ids: 1
+INFO [2016-11-15 01:01:32] - Will invalidate archived reports for 2012-08-15 for following websites ids: 1,2,3
+INFO [2016-11-15 01:01:32] - Will invalidate archived reports for 2012-09-30 for following websites ids: 1
+INFO [2016-11-15 01:01:32] - Will invalidate archived reports for 2014-03-12 for following websites ids: 1,3
+INFO [2016-11-15 01:01:32] - Will invalidate archived reports for 2014-03-13 for following websites ids: 1,3
+INFO [2016-11-15 01:01:32] - Will process 3 other websites because some old data reports have been invalidated (eg. using the Log Import script) , IDs: 1, 2, 3
+INFO [2016-11-15 01:01:32] ---------------------------
+INFO [2016-11-15 01:01:32] START
+INFO [2016-11-15 01:01:32] Starting Piwik reports archiving...
+INFO [2016-11-15 01:01:32] Old report was invalidated for website id 1
+INFO [2016-11-15 01:01:32] Will pre-process for website id = 1, period = day, date = last52
+INFO [2016-11-15 01:01:32] - pre-processing all visits
+INFO [2016-11-15 01:01:34] - pre-processing segment 1/3 browserCode==IE
+INFO [2016-11-15 01:01:34] - pre-processing segment 2/3 visitCount<=5;visitorType!=non-existing-type;daysSinceFirstVisit<=50
+INFO [2016-11-15 01:01:34] - pre-processing segment 3/3 visitCount<=5;visitorType!=re%2C%3Btest%20is%20encoded;daysSinceFirstVisit<=50
+INFO [2016-11-15 01:01:37] Archived website id = 1, period = day, 3 segments, 0 visits in last 52 days, 0 visits today, Time elapsed: 5.036s
+INFO [2016-11-15 01:01:37] Will pre-process for website id = 1, period = week, date = last260
+INFO [2016-11-15 01:01:37] - pre-processing all visits
+INFO [2016-11-15 01:01:37] - pre-processing segment 1/3 browserCode==IE
+INFO [2016-11-15 01:01:37] - pre-processing segment 2/3 visitCount<=5;visitorType!=non-existing-type;daysSinceFirstVisit<=50
+INFO [2016-11-15 01:02:33] - pre-processing segment 3/3 visitCount<=5;visitorType!=re%2C%3Btest%20is%20encoded;daysSinceFirstVisit<=50
+INFO [2016-11-15 01:03:02] Archived website id = 1, period = week, 3 segments, 41 visits in last 260 weeks, 0 visits this week, Time elapsed: 84.465s
+INFO [2016-11-15 01:03:02] Will pre-process for website id = 1, period = month, date = last52
+INFO [2016-11-15 01:03:02] - pre-processing all visits
+INFO [2016-11-15 01:03:02] - pre-processing segment 1/3 browserCode==IE
+INFO [2016-11-15 01:03:02] - pre-processing segment 2/3 visitCount<=5;visitorType!=non-existing-type;daysSinceFirstVisit<=50
+INFO [2016-11-15 01:03:13] - pre-processing segment 3/3 visitCount<=5;visitorType!=re%2C%3Btest%20is%20encoded;daysSinceFirstVisit<=50
+INFO [2016-11-15 01:03:19] Archived website id = 1, period = month, 3 segments, 41 visits in last 52 months, 0 visits this month, Time elapsed: 17.197s
+INFO [2016-11-15 01:03:19] Will pre-process for website id = 1, period = year, date = last7
+INFO [2016-11-15 01:03:19] - pre-processing all visits
+INFO [2016-11-15 01:03:19] - pre-processing segment 1/3 browserCode==IE
+INFO [2016-11-15 01:03:19] - pre-processing segment 2/3 visitCount<=5;visitorType!=non-existing-type;daysSinceFirstVisit<=50
+INFO [2016-11-15 01:03:23] - pre-processing segment 3/3 visitCount<=5;visitorType!=re%2C%3Btest%20is%20encoded;daysSinceFirstVisit<=50
+INFO [2016-11-15 01:03:25] Archived website id = 1, period = year, 3 segments, 41 visits in last 7 years, 0 visits this year, Time elapsed: 6.455s
+INFO [2016-11-15 01:03:25] Archived website id = 1, 16 API requests, Time elapsed: 113.161s [1/3 done]
+INFO [2016-11-15 01:03:25] Old report was invalidated for website id 2
+INFO [2016-11-15 01:03:25] Will pre-process for website id = 2, period = day, date = last52
+INFO [2016-11-15 01:03:25] - pre-processing all visits
+INFO [2016-11-15 01:03:27] Archived website id = 2, period = day, 0 segments, 0 visits in last 52 days, 0 visits today, Time elapsed: 1.523s
+INFO [2016-11-15 01:03:27] Will pre-process for website id = 2, period = week, date = last260
+INFO [2016-11-15 01:03:27] - pre-processing all visits
+INFO [2016-11-15 01:03:47] Archived website id = 2, period = week, 0 segments, 1 visits in last 260 weeks, 0 visits this week, Time elapsed: 19.715s
+INFO [2016-11-15 01:03:47] Will pre-process for website id = 2, period = month, date = last52
+INFO [2016-11-15 01:03:47] - pre-processing all visits
+INFO [2016-11-15 01:03:50] Archived website id = 2, period = month, 0 segments, 1 visits in last 52 months, 0 visits this month, Time elapsed: 3.855s
+INFO [2016-11-15 01:03:50] Will pre-process for website id = 2, period = year, date = last7
+INFO [2016-11-15 01:03:50] - pre-processing all visits
+INFO [2016-11-15 01:03:51] Archived website id = 2, period = year, 0 segments, 1 visits in last 7 years, 0 visits this year, Time elapsed: 1.058s
+INFO [2016-11-15 01:03:51] Archived website id = 2, 4 API requests, Time elapsed: 26.156s [2/3 done]
+INFO [2016-11-15 01:03:52] Old report was invalidated for website id 3
+INFO [2016-11-15 01:03:52] Will pre-process for website id = 3, period = day, date = last52
+INFO [2016-11-15 01:03:52] - pre-processing all visits
+INFO [2016-11-15 01:03:53] Archived website id = 3, period = day, 0 segments, 0 visits in last 52 days, 0 visits today, Time elapsed: 1.536s
+INFO [2016-11-15 01:03:53] Will pre-process for website id = 3, period = week, date = last260
+INFO [2016-11-15 01:03:53] - pre-processing all visits
+INFO [2016-11-15 01:04:14] Archived website id = 3, period = week, 0 segments, 15 visits in last 260 weeks, 0 visits this week, Time elapsed: 20.828s
+INFO [2016-11-15 01:04:14] Will pre-process for website id = 3, period = month, date = last52
+INFO [2016-11-15 01:04:14] - pre-processing all visits
+INFO [2016-11-15 01:04:18] Archived website id = 3, period = month, 0 segments, 15 visits in last 52 months, 0 visits this month, Time elapsed: 4.449s
+INFO [2016-11-15 01:04:18] Will pre-process for website id = 3, period = year, date = last7
+INFO [2016-11-15 01:04:18] - pre-processing all visits
+INFO [2016-11-15 01:04:20] Archived website id = 3, period = year, 0 segments, 15 visits in last 7 years, 0 visits this year, Time elapsed: 1.866s
+INFO [2016-11-15 01:04:20] Archived website id = 3, 4 API requests, Time elapsed: 28.684s [3/3 done]
+INFO [2016-11-15 01:04:20] Done archiving!
+INFO [2016-11-15 01:04:20] ---------------------------
+INFO [2016-11-15 01:04:20] SUMMARY
+INFO [2016-11-15 01:04:20] Total visits for today across archived websites: 0
+INFO [2016-11-15 01:04:20] Archived today's reports for 3 websites
+INFO [2016-11-15 01:04:20] Archived week/month/year for 3 websites
+INFO [2016-11-15 01:04:20] Skipped 0 websites
+INFO [2016-11-15 01:04:20] - 0 skipped because no new visit since the last script execution
+INFO [2016-11-15 01:04:20] - 0 skipped because existing daily reports are less than 150 seconds old
+INFO [2016-11-15 01:04:20] - 0 skipped because existing week/month/year periods reports are less than 3600 seconds old
+INFO [2016-11-15 01:04:20] Total API requests: 24
+INFO [2016-11-15 01:04:20] done: 3/3 100%, 0 vtoday, 3 wtoday, 3 wperiods, 24 req, 168167 ms, no error
+INFO [2016-11-15 01:04:20] Time elapsed: 168.167s
+INFO [2016-11-15 01:04:20] ---------------------------
+INFO [2016-11-15 01:04:20] SCHEDULED TASKS
+INFO [2016-11-15 01:04:20] Starting Scheduled tasks...
+INFO [2016-11-15 01:04:20] done
+INFO [2016-11-15 01:04:20] ---------------------------
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getDownloads_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getDownloads_month.xml
index 5eb17eb5321f730f178a137095552cec535f48ee..2de80dd3ff433ac530f26c8f6ec188ce0deba454 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getDownloads_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getDownloads_month.xml
@@ -4,26 +4,14 @@
 		<label>piwik.net</label>
 		<nb_visits>4</nb_visits>
 		<nb_hits>4</nb_hits>
-		<sum_time_spent>122</sum_time_spent>
-		<entry_nb_visits>2</entry_nb_visits>
-		<entry_nb_actions>4</entry_nb_actions>
-		<entry_sum_visit_length>123</entry_sum_visit_length>
-		<entry_bounce_count>1</entry_bounce_count>
-		<exit_nb_visits>2</exit_nb_visits>
+		<sum_time_spent>0</sum_time_spent>
 		<subtable>
 			<row>
 				<label>/19.pdf</label>
 				<nb_visits>1</nb_visits>
 				<nb_hits>1</nb_hits>
 				<sum_time_spent>0</sum_time_spent>
-				<entry_nb_visits>1</entry_nb_visits>
-				<entry_nb_actions>1</entry_nb_actions>
-				<entry_sum_visit_length>0</entry_sum_visit_length>
-				<entry_bounce_count>1</entry_bounce_count>
-				<exit_nb_visits>1</exit_nb_visits>
 				<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-				<sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
-				<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
 				<url>http://piwik.net/19.pdf</url>
 			</row>
 			<row>
@@ -31,16 +19,14 @@
 				<nb_visits>1</nb_visits>
 				<nb_hits>1</nb_hits>
 				<sum_time_spent>0</sum_time_spent>
-				<exit_nb_visits>1</exit_nb_visits>
 				<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-				<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
 				<url>http://piwik.net/other.png</url>
 			</row>
 			<row>
 				<label>/thing.css</label>
 				<nb_visits>1</nb_visits>
 				<nb_hits>1</nb_hits>
-				<sum_time_spent>61</sum_time_spent>
+				<sum_time_spent>0</sum_time_spent>
 				<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
 				<url>http://piwik.net/thing.css</url>
 			</row>
@@ -48,13 +34,8 @@
 				<label>/thing.js</label>
 				<nb_visits>1</nb_visits>
 				<nb_hits>1</nb_hits>
-				<sum_time_spent>61</sum_time_spent>
-				<entry_nb_visits>1</entry_nb_visits>
-				<entry_nb_actions>3</entry_nb_actions>
-				<entry_sum_visit_length>123</entry_sum_visit_length>
-				<entry_bounce_count>0</entry_bounce_count>
+				<sum_time_spent>0</sum_time_spent>
 				<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-				<sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
 				<url>http://piwik.net/thing.js</url>
 			</row>
 		</subtable>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getDownloads_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getDownloads_range.xml
index 9c5b6902684038eb3e373995d4e39726652dde4c..95d74bd84aa37daffdf0d69c2ce71c0700a77487 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getDownloads_range.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getDownloads_range.xml
@@ -4,26 +4,14 @@
 		<label>piwik.net</label>
 		<nb_visits>4</nb_visits>
 		<nb_hits>4</nb_hits>
-		<sum_time_spent>122</sum_time_spent>
-		<entry_nb_visits>2</entry_nb_visits>
-		<entry_nb_actions>4</entry_nb_actions>
-		<entry_sum_visit_length>123</entry_sum_visit_length>
-		<entry_bounce_count>1</entry_bounce_count>
-		<exit_nb_visits>2</exit_nb_visits>
+		<sum_time_spent>0</sum_time_spent>
 		<subtable>
 			<row>
 				<label>/19.pdf</label>
 				<nb_visits>1</nb_visits>
 				<nb_hits>1</nb_hits>
 				<sum_time_spent>0</sum_time_spent>
-				<entry_nb_visits>1</entry_nb_visits>
-				<entry_nb_actions>1</entry_nb_actions>
-				<entry_sum_visit_length>0</entry_sum_visit_length>
-				<entry_bounce_count>1</entry_bounce_count>
-				<exit_nb_visits>1</exit_nb_visits>
 				<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-				<sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
-				<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
 				<url>http://piwik.net/19.pdf</url>
 			</row>
 			<row>
@@ -31,16 +19,14 @@
 				<nb_visits>1</nb_visits>
 				<nb_hits>1</nb_hits>
 				<sum_time_spent>0</sum_time_spent>
-				<exit_nb_visits>1</exit_nb_visits>
 				<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-				<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
 				<url>http://piwik.net/other.png</url>
 			</row>
 			<row>
 				<label>/thing.css</label>
 				<nb_visits>1</nb_visits>
 				<nb_hits>1</nb_hits>
-				<sum_time_spent>61</sum_time_spent>
+				<sum_time_spent>0</sum_time_spent>
 				<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
 				<url>http://piwik.net/thing.css</url>
 			</row>
@@ -48,13 +34,8 @@
 				<label>/thing.js</label>
 				<nb_visits>1</nb_visits>
 				<nb_hits>1</nb_hits>
-				<sum_time_spent>61</sum_time_spent>
-				<entry_nb_visits>1</entry_nb_visits>
-				<entry_nb_actions>3</entry_nb_actions>
-				<entry_sum_visit_length>123</entry_sum_visit_length>
-				<entry_bounce_count>0</entry_bounce_count>
+				<sum_time_spent>0</sum_time_spent>
 				<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-				<sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
 				<url>http://piwik.net/thing.js</url>
 			</row>
 		</subtable>
@@ -64,16 +45,13 @@
 		<nb_visits>1</nb_visits>
 		<nb_hits>1</nb_hits>
 		<sum_time_spent>0</sum_time_spent>
-		<exit_nb_visits>1</exit_nb_visits>
 		<subtable>
 			<row>
 				<label>/latest.zip</label>
 				<nb_visits>1</nb_visits>
 				<nb_hits>1</nb_hits>
 				<sum_time_spent>0</sum_time_spent>
-				<exit_nb_visits>1</exit_nb_visits>
 				<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-				<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
 				<url>http://builds.piwik.org/latest.zip</url>
 			</row>
 		</subtable>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageUrls_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageUrls_range.xml
index ed79501504aa6d0cebb7be65f50346a2d0a24875..60556b22b98f7ae917e871c63fdb280ab0509514 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageUrls_range.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageUrls_range.xml
@@ -887,10 +887,10 @@
 		<entry_nb_actions>1</entry_nb_actions>
 		<entry_sum_visit_length>0</entry_sum_visit_length>
 		<entry_bounce_count>1</entry_bounce_count>
-		<exit_nb_visits>1</exit_nb_visits>
+		<exit_nb_visits>2</exit_nb_visits>
 		<avg_time_on_page>4</avg_time_on_page>
 		<bounce_rate>100%</bounce_rate>
-		<exit_rate>50%</exit_rate>
+		<exit_rate>100%</exit_rate>
 		<avg_time_generation>0.113</avg_time_generation>
 		<subtable>
 			<row>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageUrls_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageUrls_range.xml
index 7973b3e001012a3abe1a7fea60fca9b719c2d69d..c53fa70fe8c82bb73afd2054d1bd16244df4b78f 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageUrls_range.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageUrls_range.xml
@@ -884,17 +884,37 @@
 		<entry_nb_actions>1</entry_nb_actions>
 		<entry_sum_visit_length>0</entry_sum_visit_length>
 		<entry_bounce_count>1</entry_bounce_count>
-		<exit_nb_visits>1</exit_nb_visits>
+		<exit_nb_visits>2</exit_nb_visits>
 		<avg_time_on_page>4</avg_time_on_page>
 		<bounce_rate>100%</bounce_rate>
-		<exit_rate>50%</exit_rate>
+		<exit_rate>100%</exit_rate>
 		<avg_time_generation>0.113</avg_time_generation>
 		<subtable>
+			<row>
+				<label>/index</label>
+				<nb_visits>1</nb_visits>
+				<nb_hits>1</nb_hits>
+				<sum_time_spent>7</sum_time_spent>
+				<nb_hits_with_time_generation>1</nb_hits_with_time_generation>
+				<min_time_generation>0.113</min_time_generation>
+				<max_time_generation>0.113</max_time_generation>
+				<exit_nb_visits>1</exit_nb_visits>
+				<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+				<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
+				<avg_time_on_page>7</avg_time_on_page>
+				<bounce_rate>0%</bounce_rate>
+				<exit_rate>100%</exit_rate>
+				<avg_time_generation>0.113</avg_time_generation>
+				<url>http://piwik.org/download/</url>
+			</row>
 			<row>
 				<label>counter</label>
 				<nb_visits>1</nb_visits>
 				<nb_hits>1</nb_hits>
 				<sum_time_spent>0</sum_time_spent>
+				<nb_hits_with_time_generation>0</nb_hits_with_time_generation>
+				<min_time_generation />
+				<max_time_generation>0</max_time_generation>
 				<entry_nb_visits>1</entry_nb_visits>
 				<entry_nb_actions>1</entry_nb_actions>
 				<entry_sum_visit_length>0</entry_sum_visit_length>
@@ -903,6 +923,7 @@
 				<avg_time_on_page>0</avg_time_on_page>
 				<bounce_rate>100%</bounce_rate>
 				<exit_rate>100%</exit_rate>
+				<avg_time_generation>0</avg_time_generation>
 				<subtable>
 					<row>
 						<label>/index</label>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getOutlinks_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getOutlinks_range.xml
index d03b4e81bb3acc9de1d2d6fc68884275ea851933..772331b5950475914645d61c251e028eb5b7b148 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getOutlinks_range.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getOutlinks_range.xml
@@ -5,25 +5,13 @@
 		<nb_visits>1</nb_visits>
 		<nb_hits>1</nb_hits>
 		<sum_time_spent>0</sum_time_spent>
-		<entry_nb_visits>1</entry_nb_visits>
-		<entry_nb_actions>1</entry_nb_actions>
-		<entry_sum_visit_length>0</entry_sum_visit_length>
-		<entry_bounce_count>1</entry_bounce_count>
-		<exit_nb_visits>1</exit_nb_visits>
 		<subtable>
 			<row>
 				<label>/</label>
 				<nb_visits>1</nb_visits>
 				<nb_hits>1</nb_hits>
 				<sum_time_spent>0</sum_time_spent>
-				<entry_nb_visits>1</entry_nb_visits>
-				<entry_nb_actions>1</entry_nb_actions>
-				<entry_sum_visit_length>0</entry_sum_visit_length>
-				<entry_bounce_count>1</entry_bounce_count>
-				<exit_nb_visits>1</exit_nb_visits>
 				<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-				<sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
-				<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
 				<url>http://demo.piwik.org/</url>
 			</row>
 		</subtable>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrls_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrls_range.xml
index 6ed96aef32694818a87528a898b2b35d5e006683..afdbc75c740a2c2485d3126a1d6629847fb3c0b7 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrls_range.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrls_range.xml
@@ -900,10 +900,10 @@
 		<entry_nb_actions>1</entry_nb_actions>
 		<entry_sum_visit_length>0</entry_sum_visit_length>
 		<entry_bounce_count>1</entry_bounce_count>
-		<exit_nb_visits>1</exit_nb_visits>
+		<exit_nb_visits>2</exit_nb_visits>
 		<avg_time_on_page>4</avg_time_on_page>
 		<bounce_rate>100%</bounce_rate>
-		<exit_rate>50%</exit_rate>
+		<exit_rate>100%</exit_rate>
 		<avg_time_generation>0.113</avg_time_generation>
 		<subtable>
 			<row>
@@ -914,10 +914,12 @@
 				<nb_hits_with_time_generation>1</nb_hits_with_time_generation>
 				<min_time_generation>0.113</min_time_generation>
 				<max_time_generation>0.113</max_time_generation>
+				<exit_nb_visits>1</exit_nb_visits>
 				<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+				<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
 				<avg_time_on_page>7</avg_time_on_page>
 				<bounce_rate>0%</bounce_rate>
-				<exit_rate>0%</exit_rate>
+				<exit_rate>100%</exit_rate>
 				<avg_time_generation>0.113</avg_time_generation>
 				<url>http://piwik.org/download/</url>
 			</row>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getCity_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getCity_month.xml
index 4c6a424157119d8bc745bbd598ab0050aebd5265..4f7962f12b5d7b3dc100b11ad94357ed13378f42 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getCity_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getCity_month.xml
@@ -112,7 +112,7 @@
 		<logo>plugins/UserCountry/images/flags/us.png</logo>
 	</row>
 	<row>
-		<label>Seoul, Seoul-t&amp;#039;ukpyolsi, South Korea</label>
+		<label>Seoul, Seoul-t'ukpyolsi, South Korea</label>
 		<nb_visits>1</nb_visits>
 		<nb_actions>1</nb_actions>
 		<max_actions>1</max_actions>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getRegion_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getRegion_month.xml
index b9f8ff9295c009f0b42598c86c60f0f6c8baf0ae..ca4f6b23bf5cbf5792b8dcd848eded71a5e2afba 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getRegion_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getRegion_month.xml
@@ -101,7 +101,7 @@
 		<logo>plugins/UserCountry/images/flags/ca.png</logo>
 	</row>
 	<row>
-		<label>Seoul-t&amp;#039;ukpyolsi, South Korea</label>
+		<label>Seoul-t'ukpyolsi, South Korea</label>
 		<nb_visits>1</nb_visits>
 		<nb_actions>1</nb_actions>
 		<max_actions>1</max_actions>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__UserId.getUsers_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserId.getUsers_month.xml
index 5ae68e26247b6ff081223dab7da3ffb8ab9a663f..255255c504cdd0bbe17355aa1cb930f974090e23 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__UserId.getUsers_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserId.getUsers_month.xml
@@ -10,7 +10,7 @@
 		<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>
-		<idvisitor>c7a1daa770a8e43a</idvisitor>
+		
 	</row>
 	<row>
 		<label>user1</label>
@@ -22,7 +22,7 @@
 		<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>
-		<idvisitor>b3daa77b4c04a955</idvisitor>
+		
 	</row>
 	<row>
 		<label>user2</label>
@@ -34,6 +34,6 @@
 		<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>
-		<idvisitor>c515c2f2350e7b1a</idvisitor>
+		
 	</row>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs_siteIdThree_TrackedUsingLogReplayWithFixedSiteId__Actions.getDownloads_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs_siteIdThree_TrackedUsingLogReplayWithFixedSiteId__Actions.getDownloads_range.xml
index a78a95e97b3bccceadf6ff6f0013313db99c3e10..b3f2de96149cd3d5246ed1d4909c82fd74352785 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs_siteIdThree_TrackedUsingLogReplayWithFixedSiteId__Actions.getDownloads_range.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs_siteIdThree_TrackedUsingLogReplayWithFixedSiteId__Actions.getDownloads_range.xml
@@ -5,16 +5,13 @@
 		<nb_visits>1</nb_visits>
 		<nb_hits>1</nb_hits>
 		<sum_time_spent>0</sum_time_spent>
-		<exit_nb_visits>1</exit_nb_visits>
 		<subtable>
 			<row>
 				<label>/latest.zip</label>
 				<nb_visits>1</nb_visits>
 				<nb_hits>1</nb_hits>
 				<sum_time_spent>0</sum_time_spent>
-				<exit_nb_visits>1</exit_nb_visits>
 				<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-				<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
 				<url>http://builds.piwik.org/latest.zip</url>
 			</row>
 		</subtable>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs_siteIdThree_TrackedUsingLogReplayWithFixedSiteId__Actions.getExitPageUrls_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs_siteIdThree_TrackedUsingLogReplayWithFixedSiteId__Actions.getExitPageUrls_range.xml
index 2b3103a1a23059c06452d925e640c2b7c3f2ab65..2dac302631cf0e8a928fa2369f7e6695fc855ca9 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs_siteIdThree_TrackedUsingLogReplayWithFixedSiteId__Actions.getExitPageUrls_range.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs_siteIdThree_TrackedUsingLogReplayWithFixedSiteId__Actions.getExitPageUrls_range.xml
@@ -409,6 +409,39 @@
 			</row>
 		</subtable>
 	</row>
+	<row>
+		<label>download</label>
+		<nb_visits>1</nb_visits>
+		<nb_hits>1</nb_hits>
+		<sum_time_spent>7</sum_time_spent>
+		<nb_hits_with_time_generation>1</nb_hits_with_time_generation>
+		<min_time_generation>0.113</min_time_generation>
+		<max_time_generation>0.113</max_time_generation>
+		<exit_nb_visits>1</exit_nb_visits>
+		<avg_time_on_page>7</avg_time_on_page>
+		<bounce_rate>0%</bounce_rate>
+		<exit_rate>100%</exit_rate>
+		<avg_time_generation>0.113</avg_time_generation>
+		<subtable>
+			<row>
+				<label>/index</label>
+				<nb_visits>1</nb_visits>
+				<nb_hits>1</nb_hits>
+				<sum_time_spent>7</sum_time_spent>
+				<nb_hits_with_time_generation>1</nb_hits_with_time_generation>
+				<min_time_generation>0.113</min_time_generation>
+				<max_time_generation>0.113</max_time_generation>
+				<exit_nb_visits>1</exit_nb_visits>
+				<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+				<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
+				<avg_time_on_page>7</avg_time_on_page>
+				<bounce_rate>0%</bounce_rate>
+				<exit_rate>100%</exit_rate>
+				<avg_time_generation>0.113</avg_time_generation>
+				<url>http://piwik.org/download/</url>
+			</row>
+		</subtable>
+	</row>
 	<row>
 		<label>what-is-piwisk</label>
 		<nb_visits>1</nb_visits>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs_siteIdThree_TrackedUsingLogReplayWithFixedSiteId__Actions.getOutlinks_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs_siteIdThree_TrackedUsingLogReplayWithFixedSiteId__Actions.getOutlinks_range.xml
index d03b4e81bb3acc9de1d2d6fc68884275ea851933..772331b5950475914645d61c251e028eb5b7b148 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs_siteIdThree_TrackedUsingLogReplayWithFixedSiteId__Actions.getOutlinks_range.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs_siteIdThree_TrackedUsingLogReplayWithFixedSiteId__Actions.getOutlinks_range.xml
@@ -5,25 +5,13 @@
 		<nb_visits>1</nb_visits>
 		<nb_hits>1</nb_hits>
 		<sum_time_spent>0</sum_time_spent>
-		<entry_nb_visits>1</entry_nb_visits>
-		<entry_nb_actions>1</entry_nb_actions>
-		<entry_sum_visit_length>0</entry_sum_visit_length>
-		<entry_bounce_count>1</entry_bounce_count>
-		<exit_nb_visits>1</exit_nb_visits>
 		<subtable>
 			<row>
 				<label>/</label>
 				<nb_visits>1</nb_visits>
 				<nb_hits>1</nb_hits>
 				<sum_time_spent>0</sum_time_spent>
-				<entry_nb_visits>1</entry_nb_visits>
-				<entry_nb_actions>1</entry_nb_actions>
-				<entry_sum_visit_length>0</entry_sum_visit_length>
-				<entry_bounce_count>1</entry_bounce_count>
-				<exit_nb_visits>1</exit_nb_visits>
 				<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-				<sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
-				<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
 				<url>http://demo.piwik.org/</url>
 			</row>
 		</subtable>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs_siteIdThree_TrackedUsingLogReplayWithFixedSiteId__Actions.getPageUrls_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs_siteIdThree_TrackedUsingLogReplayWithFixedSiteId__Actions.getPageUrls_range.xml
index 33738e28ff12ee2e74340680f477c6b6431b11bf..962fe422feb81637d44f1615ec397812bfa357b5 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs_siteIdThree_TrackedUsingLogReplayWithFixedSiteId__Actions.getPageUrls_range.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs_siteIdThree_TrackedUsingLogReplayWithFixedSiteId__Actions.getPageUrls_range.xml
@@ -452,9 +452,10 @@
 		<nb_hits_with_time_generation>1</nb_hits_with_time_generation>
 		<min_time_generation>0.113</min_time_generation>
 		<max_time_generation>0.113</max_time_generation>
+		<exit_nb_visits>1</exit_nb_visits>
 		<avg_time_on_page>7</avg_time_on_page>
 		<bounce_rate>0%</bounce_rate>
-		<exit_rate>0%</exit_rate>
+		<exit_rate>100%</exit_rate>
 		<avg_time_generation>0.113</avg_time_generation>
 		<subtable>
 			<row>
@@ -465,10 +466,12 @@
 				<nb_hits_with_time_generation>1</nb_hits_with_time_generation>
 				<min_time_generation>0.113</min_time_generation>
 				<max_time_generation>0.113</max_time_generation>
+				<exit_nb_visits>1</exit_nb_visits>
 				<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+				<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
 				<avg_time_on_page>7</avg_time_on_page>
 				<bounce_rate>0%</bounce_rate>
-				<exit_rate>0%</exit_rate>
+				<exit_rate>100%</exit_rate>
 				<avg_time_generation>0.113</avg_time_generation>
 				<url>http://piwik.org/download/</url>
 			</row>
diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Actions.getDownload_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Actions.getDownload_day.xml
index 32470e4bcbcbbfa7a9938fdc630fc1ae8665a2f2..ef6e3b3e333d1d28b6fe846bc729ff202bfb8ede 100644
--- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Actions.getDownload_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Actions.getDownload_day.xml
@@ -5,7 +5,7 @@
 		<nb_visits>1</nb_visits>
 		<nb_uniq_visitors>1</nb_uniq_visitors>
 		<nb_hits>1</nb_hits>
-		<sum_time_spent>72</sum_time_spent>
+		<sum_time_spent>0</sum_time_spent>
 		<url>http://piwik.org/path/again/latest.zip</url>
 	</row>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Actions.getDownloads_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Actions.getDownloads_day.xml
index c064136f4346ff3daf2406ccf7e51ea9d6ec4f62..283d6e07c9c32940f2438e7df2365032d28d12a9 100644
--- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Actions.getDownloads_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Actions.getDownloads_day.xml
@@ -4,14 +4,14 @@
 		<label>piwik.org</label>
 		<nb_visits>1</nb_visits>
 		<nb_hits>1</nb_hits>
-		<sum_time_spent>72</sum_time_spent>
+		<sum_time_spent>0</sum_time_spent>
 		<subtable>
 			<row>
 				<label>/path/again/latest.zip</label>
 				<nb_visits>1</nb_visits>
 				<nb_uniq_visitors>1</nb_uniq_visitors>
 				<nb_hits>1</nb_hits>
-				<sum_time_spent>72</sum_time_spent>
+				<sum_time_spent>0</sum_time_spent>
 				<url>http://piwik.org/path/again/latest.zip</url>
 			</row>
 		</subtable>
diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Actions.getOutlink_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Actions.getOutlink_day.xml
index 1565685cb1caf5a7bd83c30273e06a15343f85d3..17089a01222091e2571a13f0afeff5a8828d1fcd 100644
--- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Actions.getOutlink_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Actions.getOutlink_day.xml
@@ -5,7 +5,7 @@
 		<nb_visits>1</nb_visits>
 		<nb_uniq_visitors>1</nb_uniq_visitors>
 		<nb_hits>1</nb_hits>
-		<sum_time_spent>180</sum_time_spent>
+		<sum_time_spent>0</sum_time_spent>
 		<url>http://dev.piwik.org/svn</url>
 	</row>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Actions.getOutlinks_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Actions.getOutlinks_day.xml
index c6795a704e778dc618aa6981a3873de1732372b0..40ef57a97d65ecbd05a334b58e6c44369c0c15fd 100644
--- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Actions.getOutlinks_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Actions.getOutlinks_day.xml
@@ -4,14 +4,14 @@
 		<label>outlinks.org</label>
 		<nb_visits>2</nb_visits>
 		<nb_hits>2</nb_hits>
-		<sum_time_spent>468</sum_time_spent>
+		<sum_time_spent>0</sum_time_spent>
 		<subtable>
 			<row>
 				<label>/#!outlink-with-fragment-&lt;script&gt;</label>
 				<nb_visits>1</nb_visits>
 				<nb_uniq_visitors>1</nb_uniq_visitors>
 				<nb_hits>1</nb_hits>
-				<sum_time_spent>360</sum_time_spent>
+				<sum_time_spent>0</sum_time_spent>
 				<url>https://outlinks.org/#!outlink-with-fragment-&lt;script&gt;</url>
 			</row>
 			<row>
@@ -19,7 +19,7 @@
 				<nb_visits>1</nb_visits>
 				<nb_uniq_visitors>1</nb_uniq_visitors>
 				<nb_hits>1</nb_hits>
-				<sum_time_spent>108</sum_time_spent>
+				<sum_time_spent>0</sum_time_spent>
 				<url>http://outlinks.org/other_outlink#fragment&amp;pk_campaign=Open%20partnership</url>
 			</row>
 		</subtable>
@@ -28,14 +28,14 @@
 		<label>dev.piwik.org</label>
 		<nb_visits>1</nb_visits>
 		<nb_hits>1</nb_hits>
-		<sum_time_spent>180</sum_time_spent>
+		<sum_time_spent>0</sum_time_spent>
 		<subtable>
 			<row>
 				<label>/svn</label>
 				<nb_visits>1</nb_visits>
 				<nb_uniq_visitors>1</nb_uniq_visitors>
 				<nb_hits>1</nb_hits>
-				<sum_time_spent>180</sum_time_spent>
+				<sum_time_spent>0</sum_time_spent>
 				<url>http://dev.piwik.org/svn</url>
 			</row>
 		</subtable>
diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Actions.getPageUrls_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Actions.getPageUrls_day.xml
index 2a46f6f4a1a3e8b19fcf53ad5aee7de0d61fdbcf..4b7136441e9b4eed721afe928a433d19d220c224 100644
--- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Actions.getPageUrls_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Actions.getPageUrls_day.xml
@@ -5,12 +5,12 @@
 		<nb_visits>1</nb_visits>
 		<nb_uniq_visitors>1</nb_uniq_visitors>
 		<nb_hits>1</nb_hits>
-		<sum_time_spent>180</sum_time_spent>
+		<sum_time_spent>900</sum_time_spent>
 		<sum_time_generation>0.224</sum_time_generation>
 		<nb_hits_with_time_generation>1</nb_hits_with_time_generation>
 		<min_time_generation>0.224</min_time_generation>
 		<max_time_generation>0.224</max_time_generation>
-		<avg_time_on_page>180</avg_time_on_page>
+		<avg_time_on_page>900</avg_time_on_page>
 		<bounce_rate>0%</bounce_rate>
 		<exit_rate>0%</exit_rate>
 		<avg_time_generation>0.224</avg_time_generation>
diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getDownload_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getDownload_day.xml
index 32470e4bcbcbbfa7a9938fdc630fc1ae8665a2f2..ef6e3b3e333d1d28b6fe846bc729ff202bfb8ede 100644
--- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getDownload_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getDownload_day.xml
@@ -5,7 +5,7 @@
 		<nb_visits>1</nb_visits>
 		<nb_uniq_visitors>1</nb_uniq_visitors>
 		<nb_hits>1</nb_hits>
-		<sum_time_spent>72</sum_time_spent>
+		<sum_time_spent>0</sum_time_spent>
 		<url>http://piwik.org/path/again/latest.zip</url>
 	</row>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getDownloads_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getDownloads_day.xml
index c064136f4346ff3daf2406ccf7e51ea9d6ec4f62..283d6e07c9c32940f2438e7df2365032d28d12a9 100644
--- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getDownloads_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getDownloads_day.xml
@@ -4,14 +4,14 @@
 		<label>piwik.org</label>
 		<nb_visits>1</nb_visits>
 		<nb_hits>1</nb_hits>
-		<sum_time_spent>72</sum_time_spent>
+		<sum_time_spent>0</sum_time_spent>
 		<subtable>
 			<row>
 				<label>/path/again/latest.zip</label>
 				<nb_visits>1</nb_visits>
 				<nb_uniq_visitors>1</nb_uniq_visitors>
 				<nb_hits>1</nb_hits>
-				<sum_time_spent>72</sum_time_spent>
+				<sum_time_spent>0</sum_time_spent>
 				<url>http://piwik.org/path/again/latest.zip</url>
 			</row>
 		</subtable>
diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getOutlink_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getOutlink_day.xml
index cc4024a67f994702869a056fe77561c12c1b3bae..17089a01222091e2571a13f0afeff5a8828d1fcd 100644
--- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getOutlink_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getOutlink_day.xml
@@ -5,7 +5,7 @@
 		<nb_visits>1</nb_visits>
 		<nb_uniq_visitors>1</nb_uniq_visitors>
 		<nb_hits>1</nb_hits>
-		<sum_time_spent>72</sum_time_spent>
+		<sum_time_spent>0</sum_time_spent>
 		<url>http://dev.piwik.org/svn</url>
 	</row>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getOutlinks_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getOutlinks_day.xml
index 01dadf7a928f360bedb2f192fe668b042444c87f..40ef57a97d65ecbd05a334b58e6c44369c0c15fd 100644
--- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getOutlinks_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getOutlinks_day.xml
@@ -4,14 +4,14 @@
 		<label>outlinks.org</label>
 		<nb_visits>2</nb_visits>
 		<nb_hits>2</nb_hits>
-		<sum_time_spent>468</sum_time_spent>
+		<sum_time_spent>0</sum_time_spent>
 		<subtable>
 			<row>
 				<label>/#!outlink-with-fragment-&lt;script&gt;</label>
 				<nb_visits>1</nb_visits>
 				<nb_uniq_visitors>1</nb_uniq_visitors>
 				<nb_hits>1</nb_hits>
-				<sum_time_spent>360</sum_time_spent>
+				<sum_time_spent>0</sum_time_spent>
 				<url>https://outlinks.org/#!outlink-with-fragment-&lt;script&gt;</url>
 			</row>
 			<row>
@@ -19,7 +19,7 @@
 				<nb_visits>1</nb_visits>
 				<nb_uniq_visitors>1</nb_uniq_visitors>
 				<nb_hits>1</nb_hits>
-				<sum_time_spent>108</sum_time_spent>
+				<sum_time_spent>0</sum_time_spent>
 				<url>http://outlinks.org/other_outlink#fragment&amp;pk_campaign=Open%20partnership</url>
 			</row>
 		</subtable>
@@ -28,14 +28,14 @@
 		<label>dev.piwik.org</label>
 		<nb_visits>1</nb_visits>
 		<nb_hits>1</nb_hits>
-		<sum_time_spent>72</sum_time_spent>
+		<sum_time_spent>0</sum_time_spent>
 		<subtable>
 			<row>
 				<label>/svn</label>
 				<nb_visits>1</nb_visits>
 				<nb_uniq_visitors>1</nb_uniq_visitors>
 				<nb_hits>1</nb_hits>
-				<sum_time_spent>72</sum_time_spent>
+				<sum_time_spent>0</sum_time_spent>
 				<url>http://dev.piwik.org/svn</url>
 			</row>
 		</subtable>
diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getPageUrls_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getPageUrls_day.xml
index c86cc78b132c80666d9bce58420d3ada3c542537..ce256e7c76d74c5eec472dd7f997d2ac12d02cdb 100644
--- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getPageUrls_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getPageUrls_day.xml
@@ -5,11 +5,11 @@
 		<nb_visits>1</nb_visits>
 		<nb_uniq_visitors>1</nb_uniq_visitors>
 		<nb_hits>1</nb_hits>
-		<sum_time_spent>180</sum_time_spent>
+		<sum_time_spent>792</sum_time_spent>
 		<nb_hits_with_time_generation>1</nb_hits_with_time_generation>
 		<min_time_generation>0.224</min_time_generation>
 		<max_time_generation>0.224</max_time_generation>
-		<avg_time_on_page>180</avg_time_on_page>
+		<avg_time_on_page>792</avg_time_on_page>
 		<bounce_rate>0%</bounce_rate>
 		<exit_rate>0%</exit_rate>
 		<avg_time_generation>0.224</avg_time_generation>
diff --git a/tests/PHPUnit/System/expected/test_RowEvolution_LabelReservedCharactersHierarchical__API.getRowEvolution_day.xml b/tests/PHPUnit/System/expected/test_RowEvolution_LabelReservedCharactersHierarchical__API.getRowEvolution_day.xml
index 34447b169add6dbc11842f8e5b1ffaa00e7b2fc1..3354c1df29cb2fd444be835b0659037d9a0780af 100644
--- a/tests/PHPUnit/System/expected/test_RowEvolution_LabelReservedCharactersHierarchical__API.getRowEvolution_day.xml
+++ b/tests/PHPUnit/System/expected/test_RowEvolution_LabelReservedCharactersHierarchical__API.getRowEvolution_day.xml
@@ -249,7 +249,7 @@
 				<change>-100%</change>
 			</nb_visits_1>
 			<nb_visits_2>
-				<name>Google - justice )(&amp;^#%$ not &amp;#039;&quot; corruption! (Visits)</name>
+				<name>Google - justice )(&amp;^#%$ not '&quot; corruption! (Visits)</name>
 				<min>0</min>
 				<max>1</max>
 			</nb_visits_2>
diff --git a/tests/PHPUnit/System/expected/test_RowEvolution_flatFilters__Referrers.getSearchEngines_month.xml b/tests/PHPUnit/System/expected/test_RowEvolution_flatFilters__Referrers.getSearchEngines_month.xml
index a0555e1b4ac45dbe4b33c6577f9da9e760cb6f21..8a1dc9d8333c6e217c30fa71e8738aaaad53cb4a 100644
--- a/tests/PHPUnit/System/expected/test_RowEvolution_flatFilters__Referrers.getSearchEngines_month.xml
+++ b/tests/PHPUnit/System/expected/test_RowEvolution_flatFilters__Referrers.getSearchEngines_month.xml
@@ -14,7 +14,7 @@
 		<logo>plugins/Referrers/images/searchEngines/google.com.png</logo>
 	</row>
 	<row>
-		<label>Google - justice )(&amp;^#%$ not &amp;#039;&quot; corruption!</label>
+		<label>Google - justice )(&amp;^#%$ not '&quot; corruption!</label>
 		<nb_visits>8</nb_visits>
 		<nb_actions>8</nb_actions>
 		<max_actions>1</max_actions>
diff --git a/tests/PHPUnit/System/expected/test_RowEvolution_multipleDates_lastNoData__API.getRowEvolution_month.xml b/tests/PHPUnit/System/expected/test_RowEvolution_multipleDates_lastNoData__API.getRowEvolution_month.xml
index 10f622eddabae0db3740f467c266e6cb8a1ecede..0f7c1f401bdf27b70a0673b47c53a3ead37445c5 100644
--- a/tests/PHPUnit/System/expected/test_RowEvolution_multipleDates_lastNoData__API.getRowEvolution_month.xml
+++ b/tests/PHPUnit/System/expected/test_RowEvolution_multipleDates_lastNoData__API.getRowEvolution_month.xml
@@ -33,7 +33,7 @@
 				<change>-100%</change>
 			</nb_visits_0>
 			<nb_visits_1>
-				<name>justice )(&amp;^#%$ not &amp;#039;&quot; corruption! (Visits)</name>
+				<name>justice )(&amp;^#%$ not '&quot; corruption! (Visits)</name>
 				<min>0</min>
 				<max>8</max>
 				<change>-100%</change>
diff --git a/tests/PHPUnit/System/expected/test_Transitions__Transitions.getTransitionsForPageUrl_day.xml b/tests/PHPUnit/System/expected/test_Transitions__Transitions.getTransitionsForPageUrl_day.xml
index 865d25db4e8a57c729071b0a1d9a89c4d327046c..27a3ba1abe53ec4047086761111fe024caee1cec 100644
--- a/tests/PHPUnit/System/expected/test_Transitions__Transitions.getTransitionsForPageUrl_day.xml
+++ b/tests/PHPUnit/System/expected/test_Transitions__Transitions.getTransitionsForPageUrl_day.xml
@@ -22,10 +22,10 @@
 		</row>
 	</previousSiteSearches>
 	<pageMetrics>
-		<loops>2</loops>
+		<loops>5</loops>
 		<pageviews>18</pageviews>
 		<entries>4</entries>
-		<exits>7</exits>
+		<exits>4</exits>
 	</pageMetrics>
 	<followingPages>
 		<row>
diff --git a/tests/PHPUnit/System/expected/test_Transitions__Transitions.getTransitionsForPageUrl_month.xml b/tests/PHPUnit/System/expected/test_Transitions__Transitions.getTransitionsForPageUrl_month.xml
index 7e7b38175731e0ce0a4257a6617b9d9eb4c84ec9..a73d7d39dd0c9b0f367acb5fdec6c1536ccc21cd 100644
--- a/tests/PHPUnit/System/expected/test_Transitions__Transitions.getTransitionsForPageUrl_month.xml
+++ b/tests/PHPUnit/System/expected/test_Transitions__Transitions.getTransitionsForPageUrl_month.xml
@@ -22,10 +22,10 @@
 		</row>
 	</previousSiteSearches>
 	<pageMetrics>
-		<loops>2</loops>
+		<loops>7</loops>
 		<pageviews>21</pageviews>
 		<entries>4</entries>
-		<exits>9</exits>
+		<exits>4</exits>
 	</pageMetrics>
 	<followingPages>
 		<row>
diff --git a/tests/PHPUnit/System/expected/test_Transitions_noLimit__Transitions.getTransitionsForPageUrl_day.xml b/tests/PHPUnit/System/expected/test_Transitions_noLimit__Transitions.getTransitionsForPageUrl_day.xml
index 6233153f1cae531f2367408fb7615004722074e9..9e13a4a0baa8275d8fb418381196c4acd6f13763 100644
--- a/tests/PHPUnit/System/expected/test_Transitions_noLimit__Transitions.getTransitionsForPageUrl_day.xml
+++ b/tests/PHPUnit/System/expected/test_Transitions_noLimit__Transitions.getTransitionsForPageUrl_day.xml
@@ -22,10 +22,10 @@
 		</row>
 	</previousSiteSearches>
 	<pageMetrics>
-		<loops>2</loops>
+		<loops>5</loops>
 		<pageviews>18</pageviews>
 		<entries>4</entries>
-		<exits>7</exits>
+		<exits>4</exits>
 	</pageMetrics>
 	<followingPages>
 		<row>
diff --git a/tests/PHPUnit/System/expected/test_Transitions_noLimit__Transitions.getTransitionsForPageUrl_month.xml b/tests/PHPUnit/System/expected/test_Transitions_noLimit__Transitions.getTransitionsForPageUrl_month.xml
index c782fbb7613e96876d81feb2ce260ec123d968f8..ea8dfddac4a9c870031ee2eaf06d816d95923d8d 100644
--- a/tests/PHPUnit/System/expected/test_Transitions_noLimit__Transitions.getTransitionsForPageUrl_month.xml
+++ b/tests/PHPUnit/System/expected/test_Transitions_noLimit__Transitions.getTransitionsForPageUrl_month.xml
@@ -22,10 +22,10 @@
 		</row>
 	</previousSiteSearches>
 	<pageMetrics>
-		<loops>2</loops>
+		<loops>7</loops>
 		<pageviews>21</pageviews>
 		<entries>4</entries>
-		<exits>9</exits>
+		<exits>4</exits>
 	</pageMetrics>
 	<followingPages>
 		<row>
diff --git a/tests/PHPUnit/System/expected/test_Transitions_withSegment__Transitions.getTransitionsForPageUrl_day.xml b/tests/PHPUnit/System/expected/test_Transitions_withSegment__Transitions.getTransitionsForPageUrl_day.xml
index 865d25db4e8a57c729071b0a1d9a89c4d327046c..27a3ba1abe53ec4047086761111fe024caee1cec 100644
--- a/tests/PHPUnit/System/expected/test_Transitions_withSegment__Transitions.getTransitionsForPageUrl_day.xml
+++ b/tests/PHPUnit/System/expected/test_Transitions_withSegment__Transitions.getTransitionsForPageUrl_day.xml
@@ -22,10 +22,10 @@
 		</row>
 	</previousSiteSearches>
 	<pageMetrics>
-		<loops>2</loops>
+		<loops>5</loops>
 		<pageviews>18</pageviews>
 		<entries>4</entries>
-		<exits>7</exits>
+		<exits>4</exits>
 	</pageMetrics>
 	<followingPages>
 		<row>
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Actions.getPageUrls_firstSite_lastN__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Actions.getPageUrls_firstSite_lastN__API.getProcessedReport_day.xml
index 207e2159fcf85ea7006e939526f8e3162cc2bf52..58ddaf23b72063061d023e759dae7d76182b2ac0 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Actions.getPageUrls_firstSite_lastN__API.getProcessedReport_day.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Actions.getPageUrls_firstSite_lastN__API.getProcessedReport_day.xml
@@ -89,7 +89,7 @@
 				<nb_visits>1</nb_visits>
 				<nb_hits>2</nb_hits>
 				<bounce_rate>0%</bounce_rate>
-				<avg_time_on_page>00:03:00</avg_time_on_page>
+				<avg_time_on_page>00:04:30</avg_time_on_page>
 				<exit_rate>100%</exit_rate>
 				<avg_time_generation>0.31s</avg_time_generation>
 			</row>
@@ -118,7 +118,7 @@
 				<nb_visits>1</nb_visits>
 				<nb_hits>2</nb_hits>
 				<bounce_rate>0%</bounce_rate>
-				<avg_time_on_page>00:03:00</avg_time_on_page>
+				<avg_time_on_page>00:04:30</avg_time_on_page>
 				<exit_rate>100%</exit_rate>
 				<avg_time_generation>0.31s</avg_time_generation>
 			</row>
@@ -147,7 +147,7 @@
 				<nb_visits>1</nb_visits>
 				<nb_hits>2</nb_hits>
 				<bounce_rate>0%</bounce_rate>
-				<avg_time_on_page>00:03:00</avg_time_on_page>
+				<avg_time_on_page>00:04:30</avg_time_on_page>
 				<exit_rate>100%</exit_rate>
 				<avg_time_generation>0.31s</avg_time_generation>
 			</row>
@@ -176,7 +176,7 @@
 				<nb_visits>1</nb_visits>
 				<nb_hits>2</nb_hits>
 				<bounce_rate>0%</bounce_rate>
-				<avg_time_on_page>00:03:00</avg_time_on_page>
+				<avg_time_on_page>00:04:30</avg_time_on_page>
 				<exit_rate>100%</exit_rate>
 				<avg_time_generation>0.31s</avg_time_generation>
 			</row>
@@ -205,7 +205,7 @@
 				<nb_visits>1</nb_visits>
 				<nb_hits>2</nb_hits>
 				<bounce_rate>0%</bounce_rate>
-				<avg_time_on_page>00:03:00</avg_time_on_page>
+				<avg_time_on_page>00:04:30</avg_time_on_page>
 				<exit_rate>100%</exit_rate>
 				<avg_time_generation>0.31s</avg_time_generation>
 			</row>
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_day.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_day.xml
index 57f0b1452f0bb9fa6fc8fa10d565bbfb48f02efc..afa770ee0e5efa5eb85086bb674c9f3aa3204454 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_day.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_day.xml
@@ -93,13 +93,13 @@
 				<nb_visits>1</nb_visits>
 				<nb_uniq_visitors>1</nb_uniq_visitors>
 				<nb_hits>2</nb_hits>
-				<sum_time_spent>360</sum_time_spent>
+				<sum_time_spent>540</sum_time_spent>
 				<nb_hits_with_time_generation>2</nb_hits_with_time_generation>
 				<min_time_generation>0.173</min_time_generation>
 				<max_time_generation>0.452</max_time_generation>
 				<exit_nb_uniq_visitors>1</exit_nb_uniq_visitors>
 				<exit_nb_visits>1</exit_nb_visits>
-				<avg_time_on_page>180</avg_time_on_page>
+				<avg_time_on_page>270</avg_time_on_page>
 				<bounce_rate>0%</bounce_rate>
 				<exit_rate>100%</exit_rate>
 				<avg_time_generation>0.313</avg_time_generation>
@@ -149,13 +149,13 @@
 				<nb_visits>1</nb_visits>
 				<nb_uniq_visitors>1</nb_uniq_visitors>
 				<nb_hits>2</nb_hits>
-				<sum_time_spent>360</sum_time_spent>
+				<sum_time_spent>540</sum_time_spent>
 				<nb_hits_with_time_generation>2</nb_hits_with_time_generation>
 				<min_time_generation>0.173</min_time_generation>
 				<max_time_generation>0.452</max_time_generation>
 				<exit_nb_uniq_visitors>1</exit_nb_uniq_visitors>
 				<exit_nb_visits>1</exit_nb_visits>
-				<avg_time_on_page>180</avg_time_on_page>
+				<avg_time_on_page>270</avg_time_on_page>
 				<bounce_rate>0%</bounce_rate>
 				<exit_rate>100%</exit_rate>
 				<avg_time_generation>0.313</avg_time_generation>
@@ -205,13 +205,13 @@
 				<nb_visits>1</nb_visits>
 				<nb_uniq_visitors>1</nb_uniq_visitors>
 				<nb_hits>2</nb_hits>
-				<sum_time_spent>360</sum_time_spent>
+				<sum_time_spent>540</sum_time_spent>
 				<nb_hits_with_time_generation>2</nb_hits_with_time_generation>
 				<min_time_generation>0.173</min_time_generation>
 				<max_time_generation>0.452</max_time_generation>
 				<exit_nb_uniq_visitors>1</exit_nb_uniq_visitors>
 				<exit_nb_visits>1</exit_nb_visits>
-				<avg_time_on_page>180</avg_time_on_page>
+				<avg_time_on_page>270</avg_time_on_page>
 				<bounce_rate>0%</bounce_rate>
 				<exit_rate>100%</exit_rate>
 				<avg_time_generation>0.313</avg_time_generation>
@@ -261,13 +261,13 @@
 				<nb_visits>1</nb_visits>
 				<nb_uniq_visitors>1</nb_uniq_visitors>
 				<nb_hits>2</nb_hits>
-				<sum_time_spent>360</sum_time_spent>
+				<sum_time_spent>540</sum_time_spent>
 				<nb_hits_with_time_generation>2</nb_hits_with_time_generation>
 				<min_time_generation>0.173</min_time_generation>
 				<max_time_generation>0.452</max_time_generation>
 				<exit_nb_uniq_visitors>1</exit_nb_uniq_visitors>
 				<exit_nb_visits>1</exit_nb_visits>
-				<avg_time_on_page>180</avg_time_on_page>
+				<avg_time_on_page>270</avg_time_on_page>
 				<bounce_rate>0%</bounce_rate>
 				<exit_rate>100%</exit_rate>
 				<avg_time_generation>0.313</avg_time_generation>
@@ -317,13 +317,13 @@
 				<nb_visits>1</nb_visits>
 				<nb_uniq_visitors>1</nb_uniq_visitors>
 				<nb_hits>2</nb_hits>
-				<sum_time_spent>360</sum_time_spent>
+				<sum_time_spent>540</sum_time_spent>
 				<nb_hits_with_time_generation>2</nb_hits_with_time_generation>
 				<min_time_generation>0.173</min_time_generation>
 				<max_time_generation>0.452</max_time_generation>
 				<exit_nb_uniq_visitors>1</exit_nb_uniq_visitors>
 				<exit_nb_visits>1</exit_nb_visits>
-				<avg_time_on_page>180</avg_time_on_page>
+				<avg_time_on_page>270</avg_time_on_page>
 				<bounce_rate>0%</bounce_rate>
 				<exit_rate>100%</exit_rate>
 				<avg_time_generation>0.313</avg_time_generation>
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_month.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_month.xml
index de92713eae586dfc6db9467e73c643aeb6c7d4a8..385b9c0ae7dc68f82580290c38eb0866f4815082 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_month.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_month.xml
@@ -44,14 +44,14 @@
 				<label>/thankyou</label>
 				<nb_visits>8</nb_visits>
 				<nb_hits>16</nb_hits>
-				<sum_time_spent>2880</sum_time_spent>
+				<sum_time_spent>4320</sum_time_spent>
 				<nb_hits_with_time_generation>16</nb_hits_with_time_generation>
 				<min_time_generation>0.173</min_time_generation>
 				<max_time_generation>0.452</max_time_generation>
 				<exit_nb_visits>8</exit_nb_visits>
 				<sum_daily_nb_uniq_visitors>8</sum_daily_nb_uniq_visitors>
 				<sum_daily_exit_nb_uniq_visitors>8</sum_daily_exit_nb_uniq_visitors>
-				<avg_time_on_page>180</avg_time_on_page>
+				<avg_time_on_page>270</avg_time_on_page>
 				<bounce_rate>0%</bounce_rate>
 				<exit_rate>100%</exit_rate>
 				<avg_time_generation>0.313</avg_time_generation>
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_week.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_week.xml
index e61f0aa200c92bd38d9b9c81a0b88927e5844663..cf977fd0b1290570f862db646c544f034d7e101b 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_week.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_week.xml
@@ -90,14 +90,14 @@
 				<label>/thankyou</label>
 				<nb_visits>6</nb_visits>
 				<nb_hits>12</nb_hits>
-				<sum_time_spent>2160</sum_time_spent>
+				<sum_time_spent>3240</sum_time_spent>
 				<nb_hits_with_time_generation>12</nb_hits_with_time_generation>
 				<min_time_generation>0.173</min_time_generation>
 				<max_time_generation>0.452</max_time_generation>
 				<exit_nb_visits>6</exit_nb_visits>
 				<sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors>
 				<sum_daily_exit_nb_uniq_visitors>6</sum_daily_exit_nb_uniq_visitors>
-				<avg_time_on_page>180</avg_time_on_page>
+				<avg_time_on_page>270</avg_time_on_page>
 				<bounce_rate>0%</bounce_rate>
 				<exit_rate>100%</exit_rate>
 				<avg_time_generation>0.313</avg_time_generation>
@@ -131,14 +131,14 @@
 				<label>/thankyou</label>
 				<nb_visits>2</nb_visits>
 				<nb_hits>4</nb_hits>
-				<sum_time_spent>720</sum_time_spent>
+				<sum_time_spent>1080</sum_time_spent>
 				<nb_hits_with_time_generation>4</nb_hits_with_time_generation>
 				<min_time_generation>0.173</min_time_generation>
 				<max_time_generation>0.452</max_time_generation>
 				<exit_nb_visits>2</exit_nb_visits>
 				<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
 				<sum_daily_exit_nb_uniq_visitors>2</sum_daily_exit_nb_uniq_visitors>
-				<avg_time_on_page>180</avg_time_on_page>
+				<avg_time_on_page>270</avg_time_on_page>
 				<bounce_rate>0%</bounce_rate>
 				<exit_rate>100%</exit_rate>
 				<avg_time_generation>0.313</avg_time_generation>
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_year.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_year.xml
index 9cb3a82c02d0909811519dfdd2a82f61893dcccf..bcf37b77178f5c7685264541f55e2ee74bbd11c4 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_year.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_year.xml
@@ -44,14 +44,14 @@
 				<label>/thankyou</label>
 				<nb_visits>8</nb_visits>
 				<nb_hits>16</nb_hits>
-				<sum_time_spent>2880</sum_time_spent>
+				<sum_time_spent>4320</sum_time_spent>
 				<nb_hits_with_time_generation>16</nb_hits_with_time_generation>
 				<min_time_generation>0.173</min_time_generation>
 				<max_time_generation>0.452</max_time_generation>
 				<exit_nb_visits>8</exit_nb_visits>
 				<sum_daily_nb_uniq_visitors>8</sum_daily_nb_uniq_visitors>
 				<sum_daily_exit_nb_uniq_visitors>8</sum_daily_exit_nb_uniq_visitors>
-				<avg_time_on_page>180</avg_time_on_page>
+				<avg_time_on_page>270</avg_time_on_page>
 				<bounce_rate>0%</bounce_rate>
 				<exit_rate>100%</exit_rate>
 				<avg_time_generation>0.313</avg_time_generation>
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrls_day.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrls_day.xml
index f7e7161700997315d8ba5db108f38138d0b2789f..2e19a93bfc559c3864e1f1a61e442f47fcd77d3f 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrls_day.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrls_day.xml
@@ -92,13 +92,13 @@
 			<nb_visits>1</nb_visits>
 			<nb_uniq_visitors>1</nb_uniq_visitors>
 			<nb_hits>2</nb_hits>
-			<sum_time_spent>360</sum_time_spent>
+			<sum_time_spent>540</sum_time_spent>
 			<nb_hits_with_time_generation>2</nb_hits_with_time_generation>
 			<min_time_generation>0.173</min_time_generation>
 			<max_time_generation>0.452</max_time_generation>
 			<exit_nb_uniq_visitors>1</exit_nb_uniq_visitors>
 			<exit_nb_visits>1</exit_nb_visits>
-			<avg_time_on_page>180</avg_time_on_page>
+			<avg_time_on_page>270</avg_time_on_page>
 			<bounce_rate>0%</bounce_rate>
 			<exit_rate>100%</exit_rate>
 			<avg_time_generation>0.313</avg_time_generation>
@@ -148,13 +148,13 @@
 			<nb_visits>1</nb_visits>
 			<nb_uniq_visitors>1</nb_uniq_visitors>
 			<nb_hits>2</nb_hits>
-			<sum_time_spent>360</sum_time_spent>
+			<sum_time_spent>540</sum_time_spent>
 			<nb_hits_with_time_generation>2</nb_hits_with_time_generation>
 			<min_time_generation>0.173</min_time_generation>
 			<max_time_generation>0.452</max_time_generation>
 			<exit_nb_uniq_visitors>1</exit_nb_uniq_visitors>
 			<exit_nb_visits>1</exit_nb_visits>
-			<avg_time_on_page>180</avg_time_on_page>
+			<avg_time_on_page>270</avg_time_on_page>
 			<bounce_rate>0%</bounce_rate>
 			<exit_rate>100%</exit_rate>
 			<avg_time_generation>0.313</avg_time_generation>
@@ -204,13 +204,13 @@
 			<nb_visits>1</nb_visits>
 			<nb_uniq_visitors>1</nb_uniq_visitors>
 			<nb_hits>2</nb_hits>
-			<sum_time_spent>360</sum_time_spent>
+			<sum_time_spent>540</sum_time_spent>
 			<nb_hits_with_time_generation>2</nb_hits_with_time_generation>
 			<min_time_generation>0.173</min_time_generation>
 			<max_time_generation>0.452</max_time_generation>
 			<exit_nb_uniq_visitors>1</exit_nb_uniq_visitors>
 			<exit_nb_visits>1</exit_nb_visits>
-			<avg_time_on_page>180</avg_time_on_page>
+			<avg_time_on_page>270</avg_time_on_page>
 			<bounce_rate>0%</bounce_rate>
 			<exit_rate>100%</exit_rate>
 			<avg_time_generation>0.313</avg_time_generation>
@@ -260,13 +260,13 @@
 			<nb_visits>1</nb_visits>
 			<nb_uniq_visitors>1</nb_uniq_visitors>
 			<nb_hits>2</nb_hits>
-			<sum_time_spent>360</sum_time_spent>
+			<sum_time_spent>540</sum_time_spent>
 			<nb_hits_with_time_generation>2</nb_hits_with_time_generation>
 			<min_time_generation>0.173</min_time_generation>
 			<max_time_generation>0.452</max_time_generation>
 			<exit_nb_uniq_visitors>1</exit_nb_uniq_visitors>
 			<exit_nb_visits>1</exit_nb_visits>
-			<avg_time_on_page>180</avg_time_on_page>
+			<avg_time_on_page>270</avg_time_on_page>
 			<bounce_rate>0%</bounce_rate>
 			<exit_rate>100%</exit_rate>
 			<avg_time_generation>0.313</avg_time_generation>
@@ -316,13 +316,13 @@
 			<nb_visits>1</nb_visits>
 			<nb_uniq_visitors>1</nb_uniq_visitors>
 			<nb_hits>2</nb_hits>
-			<sum_time_spent>360</sum_time_spent>
+			<sum_time_spent>540</sum_time_spent>
 			<nb_hits_with_time_generation>2</nb_hits_with_time_generation>
 			<min_time_generation>0.173</min_time_generation>
 			<max_time_generation>0.452</max_time_generation>
 			<exit_nb_uniq_visitors>1</exit_nb_uniq_visitors>
 			<exit_nb_visits>1</exit_nb_visits>
-			<avg_time_on_page>180</avg_time_on_page>
+			<avg_time_on_page>270</avg_time_on_page>
 			<bounce_rate>0%</bounce_rate>
 			<exit_rate>100%</exit_rate>
 			<avg_time_generation>0.313</avg_time_generation>
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrls_month.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrls_month.xml
index e68d67ec347379b9f893e9bfac2de76c6bdd9bc1..1d720682774540e6bd2b03fcf61a8b62aa2ba379 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrls_month.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrls_month.xml
@@ -43,14 +43,14 @@
 			<label>/thankyou</label>
 			<nb_visits>8</nb_visits>
 			<nb_hits>16</nb_hits>
-			<sum_time_spent>2880</sum_time_spent>
+			<sum_time_spent>4320</sum_time_spent>
 			<nb_hits_with_time_generation>16</nb_hits_with_time_generation>
 			<min_time_generation>0.173</min_time_generation>
 			<max_time_generation>0.452</max_time_generation>
 			<exit_nb_visits>8</exit_nb_visits>
 			<sum_daily_nb_uniq_visitors>8</sum_daily_nb_uniq_visitors>
 			<sum_daily_exit_nb_uniq_visitors>8</sum_daily_exit_nb_uniq_visitors>
-			<avg_time_on_page>180</avg_time_on_page>
+			<avg_time_on_page>270</avg_time_on_page>
 			<bounce_rate>0%</bounce_rate>
 			<exit_rate>100%</exit_rate>
 			<avg_time_generation>0.313</avg_time_generation>
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrls_week.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrls_week.xml
index 12e84f1f05fc32ec36fed574298bca6b33a53f27..0128e3a8ed2f404435d0fc7a5d87b7e8ee485c04 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrls_week.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrls_week.xml
@@ -89,14 +89,14 @@
 			<label>/thankyou</label>
 			<nb_visits>6</nb_visits>
 			<nb_hits>12</nb_hits>
-			<sum_time_spent>2160</sum_time_spent>
+			<sum_time_spent>3240</sum_time_spent>
 			<nb_hits_with_time_generation>12</nb_hits_with_time_generation>
 			<min_time_generation>0.173</min_time_generation>
 			<max_time_generation>0.452</max_time_generation>
 			<exit_nb_visits>6</exit_nb_visits>
 			<sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors>
 			<sum_daily_exit_nb_uniq_visitors>6</sum_daily_exit_nb_uniq_visitors>
-			<avg_time_on_page>180</avg_time_on_page>
+			<avg_time_on_page>270</avg_time_on_page>
 			<bounce_rate>0%</bounce_rate>
 			<exit_rate>100%</exit_rate>
 			<avg_time_generation>0.313</avg_time_generation>
@@ -130,14 +130,14 @@
 			<label>/thankyou</label>
 			<nb_visits>2</nb_visits>
 			<nb_hits>4</nb_hits>
-			<sum_time_spent>720</sum_time_spent>
+			<sum_time_spent>1080</sum_time_spent>
 			<nb_hits_with_time_generation>4</nb_hits_with_time_generation>
 			<min_time_generation>0.173</min_time_generation>
 			<max_time_generation>0.452</max_time_generation>
 			<exit_nb_visits>2</exit_nb_visits>
 			<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
 			<sum_daily_exit_nb_uniq_visitors>2</sum_daily_exit_nb_uniq_visitors>
-			<avg_time_on_page>180</avg_time_on_page>
+			<avg_time_on_page>270</avg_time_on_page>
 			<bounce_rate>0%</bounce_rate>
 			<exit_rate>100%</exit_rate>
 			<avg_time_generation>0.313</avg_time_generation>
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrls_year.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrls_year.xml
index 266832e5907e14988a205f4bb42bf45bbae5e2d4..52d72a528d0fe08cef711d74733aec13e4782922 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrls_year.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrls_year.xml
@@ -43,14 +43,14 @@
 			<label>/thankyou</label>
 			<nb_visits>8</nb_visits>
 			<nb_hits>16</nb_hits>
-			<sum_time_spent>2880</sum_time_spent>
+			<sum_time_spent>4320</sum_time_spent>
 			<nb_hits_with_time_generation>16</nb_hits_with_time_generation>
 			<min_time_generation>0.173</min_time_generation>
 			<max_time_generation>0.452</max_time_generation>
 			<exit_nb_visits>8</exit_nb_visits>
 			<sum_daily_nb_uniq_visitors>8</sum_daily_nb_uniq_visitors>
 			<sum_daily_exit_nb_uniq_visitors>8</sum_daily_exit_nb_uniq_visitors>
-			<avg_time_on_page>180</avg_time_on_page>
+			<avg_time_on_page>270</avg_time_on_page>
 			<bounce_rate>0%</bounce_rate>
 			<exit_rate>100%</exit_rate>
 			<avg_time_generation>0.313</avg_time_generation>
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_csv__ScheduledReports.generateReport_month.original.csv b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_csv__ScheduledReports.generateReport_month.original.csv
index e29c38ad884998101103cca175a355aca60d72a7..2e268537e35b3372efdd5f2b10b4aedd90fdd5b3 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_csv__ScheduledReports.generateReport_month.original.csv
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_csv__ScheduledReports.generateReport_month.original.csv
@@ -243,7 +243,7 @@ Page URLs
 label,nb_visits,nb_hits,bounce_rate,avg_time_on_page,exit_rate,avg_time_generation
 /index.htm,9,9,11%,00:05:20,11%,0.3s
 Page URL not defined,9,17,0%,00:00:00,0%,0.22s
-/thankyou,8,16,0%,00:03:00,100%,0.31s
+/thankyou,8,16,0%,00:04:30,100%,0.31s
 /products,1,1,100%,00:00:00,100%,0.15s
 
 Entry pages
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_month.original.html b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_month.original.html
index 3d01673888bb711d98b918bff990d59954caacc0..e5386df4f1f2e67f5ab5f47eebb82c673db83284 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_month.original.html
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_month.original.html
@@ -4203,7 +4203,7 @@
                                                                                                 8
                                                                                     </td>
                                             <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
-                                                                                                00:03:00
+                                                                                                00:04:30
                                                                                     </td>
                                             <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217);  padding: 5px 0 5px 5px;">
                                                                                                 0%
diff --git a/tests/PHPUnit/System/expected/test_apiGetReportMetadata_year__SitesManager.getJavascriptTag.xml b/tests/PHPUnit/System/expected/test_apiGetReportMetadata_year__SitesManager.getJavascriptTag.xml
index c8c4cc202217e9357aad0ecdc9c51d46163bd267..3a3e734f39f08bd18d22a1e0ece56a09f3e7dd04 100644
--- a/tests/PHPUnit/System/expected/test_apiGetReportMetadata_year__SitesManager.getJavascriptTag.xml
+++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata_year__SitesManager.getJavascriptTag.xml
@@ -14,4 +14,4 @@
 &lt;/script&gt;
 &lt;noscript&gt;&lt;p&gt;&lt;img src=&quot;//example.org/piwik/piwik.php?idsite=1&quot; style=&quot;border:0;&quot; alt=&quot;&quot; /&gt;&lt;/p&gt;&lt;/noscript&gt;
 &lt;!-- End Piwik Code --&gt;
-</result>
+</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_reportLimiting__Actions.getDownloads_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting__Actions.getDownloads_day.xml
index ee5d1985fc83af214ac238263b2a9003bc53673a..f8607561a625caefc282f39ec9f5299717b0ea8c 100644
--- a/tests/PHPUnit/System/expected/test_reportLimiting__Actions.getDownloads_day.xml
+++ b/tests/PHPUnit/System/expected/test_reportLimiting__Actions.getDownloads_day.xml
@@ -5,11 +5,6 @@
 		<nb_visits>5</nb_visits>
 		<nb_hits>5</nb_hits>
 		<sum_time_spent>0</sum_time_spent>
-		<entry_nb_visits>5</entry_nb_visits>
-		<entry_nb_actions>5</entry_nb_actions>
-		<entry_sum_visit_length>0</entry_sum_visit_length>
-		<entry_bounce_count>5</entry_bounce_count>
-		<exit_nb_visits>5</exit_nb_visits>
 		<subtable>
 			<row>
 				<label>/20/download</label>
@@ -17,13 +12,6 @@
 				<nb_uniq_visitors>1</nb_uniq_visitors>
 				<nb_hits>1</nb_hits>
 				<sum_time_spent>0</sum_time_spent>
-				<entry_nb_uniq_visitors>1</entry_nb_uniq_visitors>
-				<entry_nb_visits>1</entry_nb_visits>
-				<entry_nb_actions>1</entry_nb_actions>
-				<entry_sum_visit_length>0</entry_sum_visit_length>
-				<entry_bounce_count>1</entry_bounce_count>
-				<exit_nb_uniq_visitors>1</exit_nb_uniq_visitors>
-				<exit_nb_visits>1</exit_nb_visits>
 				<url>http://cloudsite5.com/20/download</url>
 			</row>
 			<row>
@@ -31,11 +19,6 @@
 				<nb_visits>4</nb_visits>
 				<nb_hits>4</nb_hits>
 				<sum_time_spent>0</sum_time_spent>
-				<entry_nb_visits>4</entry_nb_visits>
-				<entry_nb_actions>4</entry_nb_actions>
-				<entry_sum_visit_length>0</entry_sum_visit_length>
-				<entry_bounce_count>4</entry_bounce_count>
-				<exit_nb_visits>4</exit_nb_visits>
 			</row>
 		</subtable>
 	</row>
@@ -44,11 +27,6 @@
 		<nb_visits>5</nb_visits>
 		<nb_hits>5</nb_hits>
 		<sum_time_spent>0</sum_time_spent>
-		<entry_nb_visits>5</entry_nb_visits>
-		<entry_nb_actions>5</entry_nb_actions>
-		<entry_sum_visit_length>0</entry_sum_visit_length>
-		<entry_bounce_count>5</entry_bounce_count>
-		<exit_nb_visits>5</exit_nb_visits>
 		<subtable>
 			<row>
 				<label>/24/download</label>
@@ -56,13 +34,6 @@
 				<nb_uniq_visitors>1</nb_uniq_visitors>
 				<nb_hits>1</nb_hits>
 				<sum_time_spent>0</sum_time_spent>
-				<entry_nb_uniq_visitors>1</entry_nb_uniq_visitors>
-				<entry_nb_visits>1</entry_nb_visits>
-				<entry_nb_actions>1</entry_nb_actions>
-				<entry_sum_visit_length>0</entry_sum_visit_length>
-				<entry_bounce_count>1</entry_bounce_count>
-				<exit_nb_uniq_visitors>1</exit_nb_uniq_visitors>
-				<exit_nb_visits>1</exit_nb_visits>
 				<url>http://cloudsite6.com/24/download</url>
 			</row>
 			<row>
@@ -70,11 +41,6 @@
 				<nb_visits>4</nb_visits>
 				<nb_hits>4</nb_hits>
 				<sum_time_spent>0</sum_time_spent>
-				<entry_nb_visits>4</entry_nb_visits>
-				<entry_nb_actions>4</entry_nb_actions>
-				<entry_sum_visit_length>0</entry_sum_visit_length>
-				<entry_bounce_count>4</entry_bounce_count>
-				<exit_nb_visits>4</exit_nb_visits>
 			</row>
 		</subtable>
 	</row>
@@ -83,11 +49,6 @@
 		<nb_visits>5</nb_visits>
 		<nb_hits>5</nb_hits>
 		<sum_time_spent>0</sum_time_spent>
-		<entry_nb_visits>5</entry_nb_visits>
-		<entry_nb_actions>5</entry_nb_actions>
-		<entry_sum_visit_length>0</entry_sum_visit_length>
-		<entry_bounce_count>5</entry_bounce_count>
-		<exit_nb_visits>5</exit_nb_visits>
 		<subtable>
 			<row>
 				<label>/28/download</label>
@@ -95,13 +56,6 @@
 				<nb_uniq_visitors>1</nb_uniq_visitors>
 				<nb_hits>1</nb_hits>
 				<sum_time_spent>0</sum_time_spent>
-				<entry_nb_uniq_visitors>1</entry_nb_uniq_visitors>
-				<entry_nb_visits>1</entry_nb_visits>
-				<entry_nb_actions>1</entry_nb_actions>
-				<entry_sum_visit_length>0</entry_sum_visit_length>
-				<entry_bounce_count>1</entry_bounce_count>
-				<exit_nb_uniq_visitors>1</exit_nb_uniq_visitors>
-				<exit_nb_visits>1</exit_nb_visits>
 				<url>http://cloudsite7.com/28/download</url>
 			</row>
 			<row>
@@ -109,11 +63,6 @@
 				<nb_visits>4</nb_visits>
 				<nb_hits>4</nb_hits>
 				<sum_time_spent>0</sum_time_spent>
-				<entry_nb_visits>4</entry_nb_visits>
-				<entry_nb_actions>4</entry_nb_actions>
-				<entry_sum_visit_length>0</entry_sum_visit_length>
-				<entry_bounce_count>4</entry_bounce_count>
-				<exit_nb_visits>4</exit_nb_visits>
 			</row>
 		</subtable>
 	</row>
@@ -122,10 +71,5 @@
 		<nb_visits>10</nb_visits>
 		<nb_hits>10</nb_hits>
 		<sum_time_spent>0</sum_time_spent>
-		<entry_nb_visits>10</entry_nb_visits>
-		<entry_nb_actions>10</entry_nb_actions>
-		<entry_sum_visit_length>0</entry_sum_visit_length>
-		<entry_bounce_count>10</entry_bounce_count>
-		<exit_nb_visits>10</exit_nb_visits>
 	</row>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_reportLimiting__Actions.getOutlinks_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting__Actions.getOutlinks_day.xml
index 1181f0a0c3b1687900bf09d8b71d6a195f3a45ce..226cf16cbfa403e06276babc91b11e7514740035 100644
--- a/tests/PHPUnit/System/expected/test_reportLimiting__Actions.getOutlinks_day.xml
+++ b/tests/PHPUnit/System/expected/test_reportLimiting__Actions.getOutlinks_day.xml
@@ -5,11 +5,6 @@
 		<nb_visits>5</nb_visits>
 		<nb_hits>5</nb_hits>
 		<sum_time_spent>0</sum_time_spent>
-		<entry_nb_visits>5</entry_nb_visits>
-		<entry_nb_actions>5</entry_nb_actions>
-		<entry_sum_visit_length>0</entry_sum_visit_length>
-		<entry_bounce_count>5</entry_bounce_count>
-		<exit_nb_visits>5</exit_nb_visits>
 		<subtable>
 			<row>
 				<label>/</label>
@@ -17,13 +12,6 @@
 				<nb_uniq_visitors>1</nb_uniq_visitors>
 				<nb_hits>1</nb_hits>
 				<sum_time_spent>0</sum_time_spent>
-				<entry_nb_uniq_visitors>1</entry_nb_uniq_visitors>
-				<entry_nb_visits>1</entry_nb_visits>
-				<entry_nb_actions>1</entry_nb_actions>
-				<entry_sum_visit_length>0</entry_sum_visit_length>
-				<entry_bounce_count>1</entry_bounce_count>
-				<exit_nb_uniq_visitors>1</exit_nb_uniq_visitors>
-				<exit_nb_visits>1</exit_nb_visits>
 				<url>http://othersite10.com/</url>
 			</row>
 			<row>
@@ -31,11 +19,6 @@
 				<nb_visits>4</nb_visits>
 				<nb_hits>4</nb_hits>
 				<sum_time_spent>0</sum_time_spent>
-				<entry_nb_visits>4</entry_nb_visits>
-				<entry_nb_actions>4</entry_nb_actions>
-				<entry_sum_visit_length>0</entry_sum_visit_length>
-				<entry_bounce_count>4</entry_bounce_count>
-				<exit_nb_visits>4</exit_nb_visits>
 			</row>
 		</subtable>
 	</row>
@@ -44,11 +27,6 @@
 		<nb_visits>5</nb_visits>
 		<nb_hits>5</nb_hits>
 		<sum_time_spent>0</sum_time_spent>
-		<entry_nb_visits>5</entry_nb_visits>
-		<entry_nb_actions>5</entry_nb_actions>
-		<entry_sum_visit_length>0</entry_sum_visit_length>
-		<entry_bounce_count>5</entry_bounce_count>
-		<exit_nb_visits>5</exit_nb_visits>
 		<subtable>
 			<row>
 				<label>/</label>
@@ -56,13 +34,6 @@
 				<nb_uniq_visitors>1</nb_uniq_visitors>
 				<nb_hits>1</nb_hits>
 				<sum_time_spent>0</sum_time_spent>
-				<entry_nb_uniq_visitors>1</entry_nb_uniq_visitors>
-				<entry_nb_visits>1</entry_nb_visits>
-				<entry_nb_actions>1</entry_nb_actions>
-				<entry_sum_visit_length>0</entry_sum_visit_length>
-				<entry_bounce_count>1</entry_bounce_count>
-				<exit_nb_uniq_visitors>1</exit_nb_uniq_visitors>
-				<exit_nb_visits>1</exit_nb_visits>
 				<url>http://othersite11.com/</url>
 			</row>
 			<row>
@@ -70,11 +41,6 @@
 				<nb_visits>4</nb_visits>
 				<nb_hits>4</nb_hits>
 				<sum_time_spent>0</sum_time_spent>
-				<entry_nb_visits>4</entry_nb_visits>
-				<entry_nb_actions>4</entry_nb_actions>
-				<entry_sum_visit_length>0</entry_sum_visit_length>
-				<entry_bounce_count>4</entry_bounce_count>
-				<exit_nb_visits>4</exit_nb_visits>
 			</row>
 		</subtable>
 	</row>
@@ -83,11 +49,6 @@
 		<nb_visits>5</nb_visits>
 		<nb_hits>5</nb_hits>
 		<sum_time_spent>0</sum_time_spent>
-		<entry_nb_visits>5</entry_nb_visits>
-		<entry_nb_actions>5</entry_nb_actions>
-		<entry_sum_visit_length>0</entry_sum_visit_length>
-		<entry_bounce_count>5</entry_bounce_count>
-		<exit_nb_visits>5</exit_nb_visits>
 		<subtable>
 			<row>
 				<label>/</label>
@@ -95,13 +56,6 @@
 				<nb_uniq_visitors>1</nb_uniq_visitors>
 				<nb_hits>1</nb_hits>
 				<sum_time_spent>0</sum_time_spent>
-				<entry_nb_uniq_visitors>1</entry_nb_uniq_visitors>
-				<entry_nb_visits>1</entry_nb_visits>
-				<entry_nb_actions>1</entry_nb_actions>
-				<entry_sum_visit_length>0</entry_sum_visit_length>
-				<entry_bounce_count>1</entry_bounce_count>
-				<exit_nb_uniq_visitors>1</exit_nb_uniq_visitors>
-				<exit_nb_visits>1</exit_nb_visits>
 				<url>http://othersite12.com/</url>
 			</row>
 			<row>
@@ -109,11 +63,6 @@
 				<nb_visits>4</nb_visits>
 				<nb_hits>4</nb_hits>
 				<sum_time_spent>0</sum_time_spent>
-				<entry_nb_visits>4</entry_nb_visits>
-				<entry_nb_actions>4</entry_nb_actions>
-				<entry_sum_visit_length>0</entry_sum_visit_length>
-				<entry_bounce_count>4</entry_bounce_count>
-				<exit_nb_visits>4</exit_nb_visits>
 			</row>
 		</subtable>
 	</row>
@@ -122,10 +71,5 @@
 		<nb_visits>10</nb_visits>
 		<nb_hits>10</nb_hits>
 		<sum_time_spent>0</sum_time_spent>
-		<entry_nb_visits>10</entry_nb_visits>
-		<entry_nb_actions>10</entry_nb_actions>
-		<entry_sum_visit_length>0</entry_sum_visit_length>
-		<entry_bounce_count>10</entry_bounce_count>
-		<exit_nb_visits>10</exit_nb_visits>
 	</row>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Actions.getDownloads_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Actions.getDownloads_day.xml
index ace4b75be7c030a7752154f0cdfdf4f0865ce910..0cdfb7e595f64737a6edde1d2ffb1e0fbe6be113 100644
--- a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Actions.getDownloads_day.xml
+++ b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Actions.getDownloads_day.xml
@@ -5,44 +5,24 @@
 		<nb_visits>10</nb_visits>
 		<nb_hits>10</nb_hits>
 		<sum_time_spent>0</sum_time_spent>
-		<entry_nb_visits>10</entry_nb_visits>
-		<entry_nb_actions>10</entry_nb_actions>
-		<entry_sum_visit_length>0</entry_sum_visit_length>
-		<entry_bounce_count>10</entry_bounce_count>
-		<exit_nb_visits>10</exit_nb_visits>
 	</row>
 	<row>
 		<label>cloudsite5.com/ - Others</label>
 		<nb_visits>4</nb_visits>
 		<nb_hits>4</nb_hits>
 		<sum_time_spent>0</sum_time_spent>
-		<entry_nb_visits>4</entry_nb_visits>
-		<entry_nb_actions>4</entry_nb_actions>
-		<entry_sum_visit_length>0</entry_sum_visit_length>
-		<entry_bounce_count>4</entry_bounce_count>
-		<exit_nb_visits>4</exit_nb_visits>
 	</row>
 	<row>
 		<label>cloudsite6.com/ - Others</label>
 		<nb_visits>4</nb_visits>
 		<nb_hits>4</nb_hits>
 		<sum_time_spent>0</sum_time_spent>
-		<entry_nb_visits>4</entry_nb_visits>
-		<entry_nb_actions>4</entry_nb_actions>
-		<entry_sum_visit_length>0</entry_sum_visit_length>
-		<entry_bounce_count>4</entry_bounce_count>
-		<exit_nb_visits>4</exit_nb_visits>
 	</row>
 	<row>
 		<label>cloudsite7.com/ - Others</label>
 		<nb_visits>4</nb_visits>
 		<nb_hits>4</nb_hits>
 		<sum_time_spent>0</sum_time_spent>
-		<entry_nb_visits>4</entry_nb_visits>
-		<entry_nb_actions>4</entry_nb_actions>
-		<entry_sum_visit_length>0</entry_sum_visit_length>
-		<entry_bounce_count>4</entry_bounce_count>
-		<exit_nb_visits>4</exit_nb_visits>
 	</row>
 	<row>
 		<label>cloudsite5.com/20/download</label>
@@ -50,13 +30,6 @@
 		<nb_uniq_visitors>1</nb_uniq_visitors>
 		<nb_hits>1</nb_hits>
 		<sum_time_spent>0</sum_time_spent>
-		<entry_nb_uniq_visitors>1</entry_nb_uniq_visitors>
-		<entry_nb_visits>1</entry_nb_visits>
-		<entry_nb_actions>1</entry_nb_actions>
-		<entry_sum_visit_length>0</entry_sum_visit_length>
-		<entry_bounce_count>1</entry_bounce_count>
-		<exit_nb_uniq_visitors>1</exit_nb_uniq_visitors>
-		<exit_nb_visits>1</exit_nb_visits>
 		<url>http://cloudsite5.com/20/download</url>
 		<segment>downloadUrl==http%3A%2F%2Fcloudsite5.com%2F20%2Fdownload</segment>
 	</row>
@@ -66,13 +39,6 @@
 		<nb_uniq_visitors>1</nb_uniq_visitors>
 		<nb_hits>1</nb_hits>
 		<sum_time_spent>0</sum_time_spent>
-		<entry_nb_uniq_visitors>1</entry_nb_uniq_visitors>
-		<entry_nb_visits>1</entry_nb_visits>
-		<entry_nb_actions>1</entry_nb_actions>
-		<entry_sum_visit_length>0</entry_sum_visit_length>
-		<entry_bounce_count>1</entry_bounce_count>
-		<exit_nb_uniq_visitors>1</exit_nb_uniq_visitors>
-		<exit_nb_visits>1</exit_nb_visits>
 		<url>http://cloudsite6.com/24/download</url>
 		<segment>downloadUrl==http%3A%2F%2Fcloudsite6.com%2F24%2Fdownload</segment>
 	</row>
@@ -82,13 +48,6 @@
 		<nb_uniq_visitors>1</nb_uniq_visitors>
 		<nb_hits>1</nb_hits>
 		<sum_time_spent>0</sum_time_spent>
-		<entry_nb_uniq_visitors>1</entry_nb_uniq_visitors>
-		<entry_nb_visits>1</entry_nb_visits>
-		<entry_nb_actions>1</entry_nb_actions>
-		<entry_sum_visit_length>0</entry_sum_visit_length>
-		<entry_bounce_count>1</entry_bounce_count>
-		<exit_nb_uniq_visitors>1</exit_nb_uniq_visitors>
-		<exit_nb_visits>1</exit_nb_visits>
 		<url>http://cloudsite7.com/28/download</url>
 		<segment>downloadUrl==http%3A%2F%2Fcloudsite7.com%2F28%2Fdownload</segment>
 	</row>
diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Actions.getOutlinks_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Actions.getOutlinks_day.xml
index 20b7d824003d8bfe9fa1363a841876e5e46523b4..a4f79150a4b3f63aacc0a2541149a8bee16e6133 100644
--- a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Actions.getOutlinks_day.xml
+++ b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Actions.getOutlinks_day.xml
@@ -5,44 +5,24 @@
 		<nb_visits>10</nb_visits>
 		<nb_hits>10</nb_hits>
 		<sum_time_spent>0</sum_time_spent>
-		<entry_nb_visits>10</entry_nb_visits>
-		<entry_nb_actions>10</entry_nb_actions>
-		<entry_sum_visit_length>0</entry_sum_visit_length>
-		<entry_bounce_count>10</entry_bounce_count>
-		<exit_nb_visits>10</exit_nb_visits>
 	</row>
 	<row>
 		<label>othersite10.com/ - Others</label>
 		<nb_visits>4</nb_visits>
 		<nb_hits>4</nb_hits>
 		<sum_time_spent>0</sum_time_spent>
-		<entry_nb_visits>4</entry_nb_visits>
-		<entry_nb_actions>4</entry_nb_actions>
-		<entry_sum_visit_length>0</entry_sum_visit_length>
-		<entry_bounce_count>4</entry_bounce_count>
-		<exit_nb_visits>4</exit_nb_visits>
 	</row>
 	<row>
 		<label>othersite11.com/ - Others</label>
 		<nb_visits>4</nb_visits>
 		<nb_hits>4</nb_hits>
 		<sum_time_spent>0</sum_time_spent>
-		<entry_nb_visits>4</entry_nb_visits>
-		<entry_nb_actions>4</entry_nb_actions>
-		<entry_sum_visit_length>0</entry_sum_visit_length>
-		<entry_bounce_count>4</entry_bounce_count>
-		<exit_nb_visits>4</exit_nb_visits>
 	</row>
 	<row>
 		<label>othersite12.com/ - Others</label>
 		<nb_visits>4</nb_visits>
 		<nb_hits>4</nb_hits>
 		<sum_time_spent>0</sum_time_spent>
-		<entry_nb_visits>4</entry_nb_visits>
-		<entry_nb_actions>4</entry_nb_actions>
-		<entry_sum_visit_length>0</entry_sum_visit_length>
-		<entry_bounce_count>4</entry_bounce_count>
-		<exit_nb_visits>4</exit_nb_visits>
 	</row>
 	<row>
 		<label>othersite10.com/</label>
@@ -50,13 +30,6 @@
 		<nb_uniq_visitors>1</nb_uniq_visitors>
 		<nb_hits>1</nb_hits>
 		<sum_time_spent>0</sum_time_spent>
-		<entry_nb_uniq_visitors>1</entry_nb_uniq_visitors>
-		<entry_nb_visits>1</entry_nb_visits>
-		<entry_nb_actions>1</entry_nb_actions>
-		<entry_sum_visit_length>0</entry_sum_visit_length>
-		<entry_bounce_count>1</entry_bounce_count>
-		<exit_nb_uniq_visitors>1</exit_nb_uniq_visitors>
-		<exit_nb_visits>1</exit_nb_visits>
 		<url>http://othersite10.com/</url>
 		<segment>outlinkUrl==http%3A%2F%2Fothersite10.com%2F</segment>
 	</row>
@@ -66,13 +39,6 @@
 		<nb_uniq_visitors>1</nb_uniq_visitors>
 		<nb_hits>1</nb_hits>
 		<sum_time_spent>0</sum_time_spent>
-		<entry_nb_uniq_visitors>1</entry_nb_uniq_visitors>
-		<entry_nb_visits>1</entry_nb_visits>
-		<entry_nb_actions>1</entry_nb_actions>
-		<entry_sum_visit_length>0</entry_sum_visit_length>
-		<entry_bounce_count>1</entry_bounce_count>
-		<exit_nb_uniq_visitors>1</exit_nb_uniq_visitors>
-		<exit_nb_visits>1</exit_nb_visits>
 		<url>http://othersite11.com/</url>
 		<segment>outlinkUrl==http%3A%2F%2Fothersite11.com%2F</segment>
 	</row>
@@ -82,13 +48,6 @@
 		<nb_uniq_visitors>1</nb_uniq_visitors>
 		<nb_hits>1</nb_hits>
 		<sum_time_spent>0</sum_time_spent>
-		<entry_nb_uniq_visitors>1</entry_nb_uniq_visitors>
-		<entry_nb_visits>1</entry_nb_visits>
-		<entry_nb_actions>1</entry_nb_actions>
-		<entry_sum_visit_length>0</entry_sum_visit_length>
-		<entry_bounce_count>1</entry_bounce_count>
-		<exit_nb_uniq_visitors>1</exit_nb_uniq_visitors>
-		<exit_nb_visits>1</exit_nb_visits>
 		<url>http://othersite12.com/</url>
 		<segment>outlinkUrl==http%3A%2F%2Fothersite12.com%2F</segment>
 	</row>
diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_rangeFlat_rankingQueryDisabled__Actions.getDownloads_range.xml b/tests/PHPUnit/System/expected/test_reportLimiting_rangeFlat_rankingQueryDisabled__Actions.getDownloads_range.xml
index ae8e9590d083fdc74d571b09e2558c24cbe0f3b9..ed197c1b31fcd53a7438c5b44abe32ddca51a410 100644
--- a/tests/PHPUnit/System/expected/test_reportLimiting_rangeFlat_rankingQueryDisabled__Actions.getDownloads_range.xml
+++ b/tests/PHPUnit/System/expected/test_reportLimiting_rangeFlat_rankingQueryDisabled__Actions.getDownloads_range.xml
@@ -5,14 +5,7 @@
 		<nb_visits>1</nb_visits>
 		<nb_hits>1</nb_hits>
 		<sum_time_spent>0</sum_time_spent>
-		<entry_nb_visits>1</entry_nb_visits>
-		<entry_nb_actions>1</entry_nb_actions>
-		<entry_sum_visit_length>0</entry_sum_visit_length>
-		<entry_bounce_count>1</entry_bounce_count>
-		<exit_nb_visits>1</exit_nb_visits>
 		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-		<sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
-		<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
 		<url>http://cloudsite5.com/20/download</url>
 		<segment>downloadUrl==http%3A%2F%2Fcloudsite5.com%2F20%2Fdownload</segment>
 	</row>
@@ -21,14 +14,7 @@
 		<nb_visits>1</nb_visits>
 		<nb_hits>1</nb_hits>
 		<sum_time_spent>0</sum_time_spent>
-		<entry_nb_visits>1</entry_nb_visits>
-		<entry_nb_actions>1</entry_nb_actions>
-		<entry_sum_visit_length>0</entry_sum_visit_length>
-		<entry_bounce_count>1</entry_bounce_count>
-		<exit_nb_visits>1</exit_nb_visits>
 		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-		<sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
-		<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
 		<url>http://cloudsite5.com/21/download</url>
 		<segment>downloadUrl==http%3A%2F%2Fcloudsite5.com%2F21%2Fdownload</segment>
 	</row>
@@ -37,14 +23,7 @@
 		<nb_visits>1</nb_visits>
 		<nb_hits>1</nb_hits>
 		<sum_time_spent>0</sum_time_spent>
-		<entry_nb_visits>1</entry_nb_visits>
-		<entry_nb_actions>1</entry_nb_actions>
-		<entry_sum_visit_length>0</entry_sum_visit_length>
-		<entry_bounce_count>1</entry_bounce_count>
-		<exit_nb_visits>1</exit_nb_visits>
 		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-		<sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
-		<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
 		<url>http://cloudsite5.com/22/download</url>
 		<segment>downloadUrl==http%3A%2F%2Fcloudsite5.com%2F22%2Fdownload</segment>
 	</row>
@@ -53,14 +32,7 @@
 		<nb_visits>1</nb_visits>
 		<nb_hits>1</nb_hits>
 		<sum_time_spent>0</sum_time_spent>
-		<entry_nb_visits>1</entry_nb_visits>
-		<entry_nb_actions>1</entry_nb_actions>
-		<entry_sum_visit_length>0</entry_sum_visit_length>
-		<entry_bounce_count>1</entry_bounce_count>
-		<exit_nb_visits>1</exit_nb_visits>
 		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-		<sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
-		<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
 		<url>http://cloudsite5.com/23/download</url>
 		<segment>downloadUrl==http%3A%2F%2Fcloudsite5.com%2F23%2Fdownload</segment>
 	</row>
@@ -69,14 +41,7 @@
 		<nb_visits>1</nb_visits>
 		<nb_hits>1</nb_hits>
 		<sum_time_spent>0</sum_time_spent>
-		<entry_nb_visits>1</entry_nb_visits>
-		<entry_nb_actions>1</entry_nb_actions>
-		<entry_sum_visit_length>0</entry_sum_visit_length>
-		<entry_bounce_count>1</entry_bounce_count>
-		<exit_nb_visits>1</exit_nb_visits>
 		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-		<sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
-		<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
 		<url>http://cloudsite5.com/download</url>
 		<segment>downloadUrl==http%3A%2F%2Fcloudsite5.com%2Fdownload</segment>
 	</row>
@@ -85,14 +50,7 @@
 		<nb_visits>1</nb_visits>
 		<nb_hits>1</nb_hits>
 		<sum_time_spent>0</sum_time_spent>
-		<entry_nb_visits>1</entry_nb_visits>
-		<entry_nb_actions>1</entry_nb_actions>
-		<entry_sum_visit_length>0</entry_sum_visit_length>
-		<entry_bounce_count>1</entry_bounce_count>
-		<exit_nb_visits>1</exit_nb_visits>
 		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-		<sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
-		<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
 		<url>http://cloudsite6.com/24/download</url>
 		<segment>downloadUrl==http%3A%2F%2Fcloudsite6.com%2F24%2Fdownload</segment>
 	</row>
@@ -101,14 +59,7 @@
 		<nb_visits>1</nb_visits>
 		<nb_hits>1</nb_hits>
 		<sum_time_spent>0</sum_time_spent>
-		<entry_nb_visits>1</entry_nb_visits>
-		<entry_nb_actions>1</entry_nb_actions>
-		<entry_sum_visit_length>0</entry_sum_visit_length>
-		<entry_bounce_count>1</entry_bounce_count>
-		<exit_nb_visits>1</exit_nb_visits>
 		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-		<sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
-		<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
 		<url>http://cloudsite6.com/25/download</url>
 		<segment>downloadUrl==http%3A%2F%2Fcloudsite6.com%2F25%2Fdownload</segment>
 	</row>
@@ -117,14 +68,7 @@
 		<nb_visits>1</nb_visits>
 		<nb_hits>1</nb_hits>
 		<sum_time_spent>0</sum_time_spent>
-		<entry_nb_visits>1</entry_nb_visits>
-		<entry_nb_actions>1</entry_nb_actions>
-		<entry_sum_visit_length>0</entry_sum_visit_length>
-		<entry_bounce_count>1</entry_bounce_count>
-		<exit_nb_visits>1</exit_nb_visits>
 		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-		<sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
-		<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
 		<url>http://cloudsite6.com/26/download</url>
 		<segment>downloadUrl==http%3A%2F%2Fcloudsite6.com%2F26%2Fdownload</segment>
 	</row>
@@ -133,14 +77,7 @@
 		<nb_visits>1</nb_visits>
 		<nb_hits>1</nb_hits>
 		<sum_time_spent>0</sum_time_spent>
-		<entry_nb_visits>1</entry_nb_visits>
-		<entry_nb_actions>1</entry_nb_actions>
-		<entry_sum_visit_length>0</entry_sum_visit_length>
-		<entry_bounce_count>1</entry_bounce_count>
-		<exit_nb_visits>1</exit_nb_visits>
 		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-		<sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
-		<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
 		<url>http://cloudsite6.com/27/download</url>
 		<segment>downloadUrl==http%3A%2F%2Fcloudsite6.com%2F27%2Fdownload</segment>
 	</row>
@@ -149,14 +86,7 @@
 		<nb_visits>1</nb_visits>
 		<nb_hits>1</nb_hits>
 		<sum_time_spent>0</sum_time_spent>
-		<entry_nb_visits>1</entry_nb_visits>
-		<entry_nb_actions>1</entry_nb_actions>
-		<entry_sum_visit_length>0</entry_sum_visit_length>
-		<entry_bounce_count>1</entry_bounce_count>
-		<exit_nb_visits>1</exit_nb_visits>
 		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-		<sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
-		<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
 		<url>http://cloudsite6.com/download</url>
 		<segment>downloadUrl==http%3A%2F%2Fcloudsite6.com%2Fdownload</segment>
 	</row>
@@ -165,14 +95,7 @@
 		<nb_visits>1</nb_visits>
 		<nb_hits>1</nb_hits>
 		<sum_time_spent>0</sum_time_spent>
-		<entry_nb_visits>1</entry_nb_visits>
-		<entry_nb_actions>1</entry_nb_actions>
-		<entry_sum_visit_length>0</entry_sum_visit_length>
-		<entry_bounce_count>1</entry_bounce_count>
-		<exit_nb_visits>1</exit_nb_visits>
 		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-		<sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
-		<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
 		<url>http://cloudsite7.com/28/download</url>
 		<segment>downloadUrl==http%3A%2F%2Fcloudsite7.com%2F28%2Fdownload</segment>
 	</row>
@@ -181,14 +104,7 @@
 		<nb_visits>1</nb_visits>
 		<nb_hits>1</nb_hits>
 		<sum_time_spent>0</sum_time_spent>
-		<entry_nb_visits>1</entry_nb_visits>
-		<entry_nb_actions>1</entry_nb_actions>
-		<entry_sum_visit_length>0</entry_sum_visit_length>
-		<entry_bounce_count>1</entry_bounce_count>
-		<exit_nb_visits>1</exit_nb_visits>
 		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-		<sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
-		<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
 		<url>http://cloudsite7.com/29/download</url>
 		<segment>downloadUrl==http%3A%2F%2Fcloudsite7.com%2F29%2Fdownload</segment>
 	</row>
@@ -197,14 +113,7 @@
 		<nb_visits>1</nb_visits>
 		<nb_hits>1</nb_hits>
 		<sum_time_spent>0</sum_time_spent>
-		<entry_nb_visits>1</entry_nb_visits>
-		<entry_nb_actions>1</entry_nb_actions>
-		<entry_sum_visit_length>0</entry_sum_visit_length>
-		<entry_bounce_count>1</entry_bounce_count>
-		<exit_nb_visits>1</exit_nb_visits>
 		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-		<sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
-		<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
 		<url>http://cloudsite7.com/30/download</url>
 		<segment>downloadUrl==http%3A%2F%2Fcloudsite7.com%2F30%2Fdownload</segment>
 	</row>
@@ -213,14 +122,7 @@
 		<nb_visits>1</nb_visits>
 		<nb_hits>1</nb_hits>
 		<sum_time_spent>0</sum_time_spent>
-		<entry_nb_visits>1</entry_nb_visits>
-		<entry_nb_actions>1</entry_nb_actions>
-		<entry_sum_visit_length>0</entry_sum_visit_length>
-		<entry_bounce_count>1</entry_bounce_count>
-		<exit_nb_visits>1</exit_nb_visits>
 		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-		<sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
-		<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
 		<url>http://cloudsite7.com/31/download</url>
 		<segment>downloadUrl==http%3A%2F%2Fcloudsite7.com%2F31%2Fdownload</segment>
 	</row>
@@ -229,14 +131,7 @@
 		<nb_visits>1</nb_visits>
 		<nb_hits>1</nb_hits>
 		<sum_time_spent>0</sum_time_spent>
-		<entry_nb_visits>1</entry_nb_visits>
-		<entry_nb_actions>1</entry_nb_actions>
-		<entry_sum_visit_length>0</entry_sum_visit_length>
-		<entry_bounce_count>1</entry_bounce_count>
-		<exit_nb_visits>1</exit_nb_visits>
 		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-		<sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
-		<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
 		<url>http://cloudsite7.com/download</url>
 		<segment>downloadUrl==http%3A%2F%2Fcloudsite7.com%2Fdownload</segment>
 	</row>
@@ -245,14 +140,7 @@
 		<nb_visits>1</nb_visits>
 		<nb_hits>1</nb_hits>
 		<sum_time_spent>0</sum_time_spent>
-		<entry_nb_visits>1</entry_nb_visits>
-		<entry_nb_actions>1</entry_nb_actions>
-		<entry_sum_visit_length>0</entry_sum_visit_length>
-		<entry_bounce_count>1</entry_bounce_count>
-		<exit_nb_visits>1</exit_nb_visits>
 		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-		<sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
-		<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
 		<url>http://cloudsite8.com/32/download</url>
 		<segment>downloadUrl==http%3A%2F%2Fcloudsite8.com%2F32%2Fdownload</segment>
 	</row>
@@ -261,14 +149,7 @@
 		<nb_visits>1</nb_visits>
 		<nb_hits>1</nb_hits>
 		<sum_time_spent>0</sum_time_spent>
-		<entry_nb_visits>1</entry_nb_visits>
-		<entry_nb_actions>1</entry_nb_actions>
-		<entry_sum_visit_length>0</entry_sum_visit_length>
-		<entry_bounce_count>1</entry_bounce_count>
-		<exit_nb_visits>1</exit_nb_visits>
 		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-		<sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
-		<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
 		<url>http://cloudsite8.com/33/download</url>
 		<segment>downloadUrl==http%3A%2F%2Fcloudsite8.com%2F33%2Fdownload</segment>
 	</row>
@@ -277,14 +158,7 @@
 		<nb_visits>1</nb_visits>
 		<nb_hits>1</nb_hits>
 		<sum_time_spent>0</sum_time_spent>
-		<entry_nb_visits>1</entry_nb_visits>
-		<entry_nb_actions>1</entry_nb_actions>
-		<entry_sum_visit_length>0</entry_sum_visit_length>
-		<entry_bounce_count>1</entry_bounce_count>
-		<exit_nb_visits>1</exit_nb_visits>
 		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-		<sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
-		<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
 		<url>http://cloudsite8.com/34/download</url>
 		<segment>downloadUrl==http%3A%2F%2Fcloudsite8.com%2F34%2Fdownload</segment>
 	</row>
@@ -293,14 +167,7 @@
 		<nb_visits>1</nb_visits>
 		<nb_hits>1</nb_hits>
 		<sum_time_spent>0</sum_time_spent>
-		<entry_nb_visits>1</entry_nb_visits>
-		<entry_nb_actions>1</entry_nb_actions>
-		<entry_sum_visit_length>0</entry_sum_visit_length>
-		<entry_bounce_count>1</entry_bounce_count>
-		<exit_nb_visits>1</exit_nb_visits>
 		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-		<sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
-		<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
 		<url>http://cloudsite8.com/35/download</url>
 		<segment>downloadUrl==http%3A%2F%2Fcloudsite8.com%2F35%2Fdownload</segment>
 	</row>
@@ -309,14 +176,7 @@
 		<nb_visits>1</nb_visits>
 		<nb_hits>1</nb_hits>
 		<sum_time_spent>0</sum_time_spent>
-		<entry_nb_visits>1</entry_nb_visits>
-		<entry_nb_actions>1</entry_nb_actions>
-		<entry_sum_visit_length>0</entry_sum_visit_length>
-		<entry_bounce_count>1</entry_bounce_count>
-		<exit_nb_visits>1</exit_nb_visits>
 		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-		<sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
-		<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
 		<url>http://cloudsite8.com/download</url>
 		<segment>downloadUrl==http%3A%2F%2Fcloudsite8.com%2Fdownload</segment>
 	</row>
@@ -325,14 +185,7 @@
 		<nb_visits>1</nb_visits>
 		<nb_hits>1</nb_hits>
 		<sum_time_spent>0</sum_time_spent>
-		<entry_nb_visits>1</entry_nb_visits>
-		<entry_nb_actions>1</entry_nb_actions>
-		<entry_sum_visit_length>0</entry_sum_visit_length>
-		<entry_bounce_count>1</entry_bounce_count>
-		<exit_nb_visits>1</exit_nb_visits>
 		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-		<sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
-		<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
 		<url>http://cloudsite9.com/36/download</url>
 		<segment>downloadUrl==http%3A%2F%2Fcloudsite9.com%2F36%2Fdownload</segment>
 	</row>
@@ -341,14 +194,7 @@
 		<nb_visits>1</nb_visits>
 		<nb_hits>1</nb_hits>
 		<sum_time_spent>0</sum_time_spent>
-		<entry_nb_visits>1</entry_nb_visits>
-		<entry_nb_actions>1</entry_nb_actions>
-		<entry_sum_visit_length>0</entry_sum_visit_length>
-		<entry_bounce_count>1</entry_bounce_count>
-		<exit_nb_visits>1</exit_nb_visits>
 		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-		<sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
-		<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
 		<url>http://cloudsite9.com/37/download</url>
 		<segment>downloadUrl==http%3A%2F%2Fcloudsite9.com%2F37%2Fdownload</segment>
 	</row>
@@ -357,14 +203,7 @@
 		<nb_visits>1</nb_visits>
 		<nb_hits>1</nb_hits>
 		<sum_time_spent>0</sum_time_spent>
-		<entry_nb_visits>1</entry_nb_visits>
-		<entry_nb_actions>1</entry_nb_actions>
-		<entry_sum_visit_length>0</entry_sum_visit_length>
-		<entry_bounce_count>1</entry_bounce_count>
-		<exit_nb_visits>1</exit_nb_visits>
 		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-		<sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
-		<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
 		<url>http://cloudsite9.com/38/download</url>
 		<segment>downloadUrl==http%3A%2F%2Fcloudsite9.com%2F38%2Fdownload</segment>
 	</row>
@@ -373,14 +212,7 @@
 		<nb_visits>1</nb_visits>
 		<nb_hits>1</nb_hits>
 		<sum_time_spent>0</sum_time_spent>
-		<entry_nb_visits>1</entry_nb_visits>
-		<entry_nb_actions>1</entry_nb_actions>
-		<entry_sum_visit_length>0</entry_sum_visit_length>
-		<entry_bounce_count>1</entry_bounce_count>
-		<exit_nb_visits>1</exit_nb_visits>
 		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-		<sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
-		<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
 		<url>http://cloudsite9.com/39/download</url>
 		<segment>downloadUrl==http%3A%2F%2Fcloudsite9.com%2F39%2Fdownload</segment>
 	</row>
@@ -389,14 +221,7 @@
 		<nb_visits>1</nb_visits>
 		<nb_hits>1</nb_hits>
 		<sum_time_spent>0</sum_time_spent>
-		<entry_nb_visits>1</entry_nb_visits>
-		<entry_nb_actions>1</entry_nb_actions>
-		<entry_sum_visit_length>0</entry_sum_visit_length>
-		<entry_bounce_count>1</entry_bounce_count>
-		<exit_nb_visits>1</exit_nb_visits>
 		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-		<sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
-		<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
 		<url>http://cloudsite9.com/download</url>
 		<segment>downloadUrl==http%3A%2F%2Fcloudsite9.com%2Fdownload</segment>
 	</row>
diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__Actions.getDownloads_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__Actions.getDownloads_day.xml
index 486f5a4a8086a239c54a03f87a92d71a3b755385..c0aa6cc9a2822fcb32bdb3ffb3c50d648e70f04b 100644
--- a/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__Actions.getDownloads_day.xml
+++ b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__Actions.getDownloads_day.xml
@@ -5,11 +5,6 @@
 		<nb_visits>4</nb_visits>
 		<nb_hits>4</nb_hits>
 		<sum_time_spent>0</sum_time_spent>
-		<entry_nb_visits>4</entry_nb_visits>
-		<entry_nb_actions>4</entry_nb_actions>
-		<entry_sum_visit_length>0</entry_sum_visit_length>
-		<entry_bounce_count>4</entry_bounce_count>
-		<exit_nb_visits>4</exit_nb_visits>
 		<subtable>
 			<row>
 				<label>/20/download</label>
@@ -17,13 +12,6 @@
 				<nb_uniq_visitors>1</nb_uniq_visitors>
 				<nb_hits>1</nb_hits>
 				<sum_time_spent>0</sum_time_spent>
-				<entry_nb_uniq_visitors>1</entry_nb_uniq_visitors>
-				<entry_nb_visits>1</entry_nb_visits>
-				<entry_nb_actions>1</entry_nb_actions>
-				<entry_sum_visit_length>0</entry_sum_visit_length>
-				<entry_bounce_count>1</entry_bounce_count>
-				<exit_nb_uniq_visitors>1</exit_nb_uniq_visitors>
-				<exit_nb_visits>1</exit_nb_visits>
 				<url>http://cloudsite5.com/20/download</url>
 			</row>
 			<row>
@@ -31,11 +19,6 @@
 				<nb_visits>3</nb_visits>
 				<nb_hits>3</nb_hits>
 				<sum_time_spent>0</sum_time_spent>
-				<entry_nb_visits>3</entry_nb_visits>
-				<entry_nb_actions>3</entry_nb_actions>
-				<entry_sum_visit_length>0</entry_sum_visit_length>
-				<entry_bounce_count>3</entry_bounce_count>
-				<exit_nb_visits>3</exit_nb_visits>
 			</row>
 		</subtable>
 	</row>
@@ -44,10 +27,5 @@
 		<nb_visits>21</nb_visits>
 		<nb_hits>21</nb_hits>
 		<sum_time_spent>0</sum_time_spent>
-		<entry_nb_visits>21</entry_nb_visits>
-		<entry_nb_actions>21</entry_nb_actions>
-		<entry_sum_visit_length>0</entry_sum_visit_length>
-		<entry_bounce_count>21</entry_bounce_count>
-		<exit_nb_visits>21</exit_nb_visits>
 	</row>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__Actions.getOutlinks_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__Actions.getOutlinks_day.xml
index d7f085aa42de63dd0b60ea34aa92759a9debe20c..395151dd5163ba9e63b27233031a7bdc3f583ac1 100644
--- a/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__Actions.getOutlinks_day.xml
+++ b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__Actions.getOutlinks_day.xml
@@ -5,11 +5,6 @@
 		<nb_visits>4</nb_visits>
 		<nb_hits>4</nb_hits>
 		<sum_time_spent>0</sum_time_spent>
-		<entry_nb_visits>4</entry_nb_visits>
-		<entry_nb_actions>4</entry_nb_actions>
-		<entry_sum_visit_length>0</entry_sum_visit_length>
-		<entry_bounce_count>4</entry_bounce_count>
-		<exit_nb_visits>4</exit_nb_visits>
 		<subtable>
 			<row>
 				<label>/</label>
@@ -17,13 +12,6 @@
 				<nb_uniq_visitors>1</nb_uniq_visitors>
 				<nb_hits>1</nb_hits>
 				<sum_time_spent>0</sum_time_spent>
-				<entry_nb_uniq_visitors>1</entry_nb_uniq_visitors>
-				<entry_nb_visits>1</entry_nb_visits>
-				<entry_nb_actions>1</entry_nb_actions>
-				<entry_sum_visit_length>0</entry_sum_visit_length>
-				<entry_bounce_count>1</entry_bounce_count>
-				<exit_nb_uniq_visitors>1</exit_nb_uniq_visitors>
-				<exit_nb_visits>1</exit_nb_visits>
 				<url>http://othersite10.com/</url>
 			</row>
 			<row>
@@ -31,11 +19,6 @@
 				<nb_visits>3</nb_visits>
 				<nb_hits>3</nb_hits>
 				<sum_time_spent>0</sum_time_spent>
-				<entry_nb_visits>3</entry_nb_visits>
-				<entry_nb_actions>3</entry_nb_actions>
-				<entry_sum_visit_length>0</entry_sum_visit_length>
-				<entry_bounce_count>3</entry_bounce_count>
-				<exit_nb_visits>3</exit_nb_visits>
 			</row>
 		</subtable>
 	</row>
@@ -44,10 +27,5 @@
 		<nb_visits>21</nb_visits>
 		<nb_hits>21</nb_hits>
 		<sum_time_spent>0</sum_time_spent>
-		<entry_nb_visits>21</entry_nb_visits>
-		<entry_nb_actions>21</entry_nb_actions>
-		<entry_sum_visit_length>0</entry_sum_visit_length>
-		<entry_bounce_count>21</entry_bounce_count>
-		<exit_nb_visits>21</exit_nb_visits>
 	</row>
 </result>
\ No newline at end of file