From 532ec64534e993316296f1cc193a9247b5247eb7 Mon Sep 17 00:00:00 2001
From: Ben <ben.burgess@innocraft.com>
Date: Wed, 9 Mar 2022 17:34:34 +1300
Subject: Rework to use a single goals visualisation and show goal metrics
 directly on the action page reports

---
 ...Goals_pages__Actions.getEntryPageTitles_day.xml |  40 ++++
 ...ckGoals_pages__Actions.getEntryPageUrls_day.xml |  41 +++++
 ...trackGoals_pages__Actions.getPageTitles_day.xml | 117 ++++++++++++
 ...t_trackGoals_pages__Actions.getPageUrls_day.xml | 121 ++++++++++++
 ...kGoals_pages__Goals.getPagesEntryTitles_day.xml | 204 ---------------------
 ...t_trackGoals_pages__Goals.getPagesEntry_day.xml | 204 ---------------------
 ..._trackGoals_pages__Goals.getPagesTitles_day.xml | 199 --------------------
 ...est_trackGoals_pages__Goals.getPagesUrl_day.xml | 199 --------------------
 8 files changed, 319 insertions(+), 806 deletions(-)
 create mode 100644 plugins/Goals/tests/System/expected/test_trackGoals_pages__Actions.getEntryPageTitles_day.xml
 create mode 100644 plugins/Goals/tests/System/expected/test_trackGoals_pages__Actions.getEntryPageUrls_day.xml
 create mode 100644 plugins/Goals/tests/System/expected/test_trackGoals_pages__Actions.getPageTitles_day.xml
 create mode 100644 plugins/Goals/tests/System/expected/test_trackGoals_pages__Actions.getPageUrls_day.xml
 delete mode 100644 plugins/Goals/tests/System/expected/test_trackGoals_pages__Goals.getPagesEntryTitles_day.xml
 delete mode 100644 plugins/Goals/tests/System/expected/test_trackGoals_pages__Goals.getPagesEntry_day.xml
 delete mode 100644 plugins/Goals/tests/System/expected/test_trackGoals_pages__Goals.getPagesTitles_day.xml
 delete mode 100644 plugins/Goals/tests/System/expected/test_trackGoals_pages__Goals.getPagesUrl_day.xml

(limited to 'plugins/Goals/tests/System/expected')

diff --git a/plugins/Goals/tests/System/expected/test_trackGoals_pages__Actions.getEntryPageTitles_day.xml b/plugins/Goals/tests/System/expected/test_trackGoals_pages__Actions.getEntryPageTitles_day.xml
new file mode 100644
index 0000000000..37c54238f6
--- /dev/null
+++ b/plugins/Goals/tests/System/expected/test_trackGoals_pages__Actions.getEntryPageTitles_day.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<result>
+	<row>
+		<label> Page A</label>
+		<nb_visits>3</nb_visits>
+		<nb_uniq_visitors>3</nb_uniq_visitors>
+		<nb_hits>4</nb_hits>
+		<sum_time_spent>1440</sum_time_spent>
+		<sum_bandwidth>0</sum_bandwidth>
+		<nb_hits_with_bandwidth>0</nb_hits_with_bandwidth>
+		<min_bandwidth />
+		<max_bandwidth />
+		<entry_nb_uniq_visitors>3</entry_nb_uniq_visitors>
+		<entry_nb_visits>3</entry_nb_visits>
+		<entry_nb_actions>10</entry_nb_actions>
+		<entry_sum_visit_length>2525</entry_sum_visit_length>
+		<entry_bounce_count>0</entry_bounce_count>
+		<goals>
+			<row idgoal='1'>
+				<nb_conversions>3</nb_conversions>
+				<revenue>30</revenue>
+				<nb_conv_pages_before>6</nb_conv_pages_before>
+				<nb_conversions_attrib>1</nb_conversions_attrib>
+				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_uniq>2</nb_conversions_page_uniq>
+				<revenue_attrib>10</revenue_attrib>
+				<revenue_entry>20</revenue_entry>
+				<nb_conversions_entry_rate>0.667</nb_conversions_entry_rate>
+				<revenue_per_entry>6.667</revenue_per_entry>
+				<nb_conversions_entry>2</nb_conversions_entry>
+			</row>
+		</goals>
+		<avg_bandwidth>0</avg_bandwidth>
+		<avg_page_load_time>0</avg_page_load_time>
+		<avg_time_on_page>360</avg_time_on_page>
+		<bounce_rate>0%</bounce_rate>
+		<exit_rate>0%</exit_rate>
+		<segment>entryPageTitle==Page%2BA</segment>
+	</row>
+</result>
\ No newline at end of file
diff --git a/plugins/Goals/tests/System/expected/test_trackGoals_pages__Actions.getEntryPageUrls_day.xml b/plugins/Goals/tests/System/expected/test_trackGoals_pages__Actions.getEntryPageUrls_day.xml
new file mode 100644
index 0000000000..9114308c5e
--- /dev/null
+++ b/plugins/Goals/tests/System/expected/test_trackGoals_pages__Actions.getEntryPageUrls_day.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<result>
+	<row>
+		<label>/page_A</label>
+		<nb_visits>3</nb_visits>
+		<nb_uniq_visitors>3</nb_uniq_visitors>
+		<nb_hits>4</nb_hits>
+		<sum_time_spent>1440</sum_time_spent>
+		<sum_bandwidth>0</sum_bandwidth>
+		<nb_hits_with_bandwidth>0</nb_hits_with_bandwidth>
+		<min_bandwidth />
+		<max_bandwidth />
+		<entry_nb_uniq_visitors>3</entry_nb_uniq_visitors>
+		<entry_nb_visits>3</entry_nb_visits>
+		<entry_nb_actions>10</entry_nb_actions>
+		<entry_sum_visit_length>2525</entry_sum_visit_length>
+		<entry_bounce_count>0</entry_bounce_count>
+		<goals>
+			<row idgoal='1'>
+				<nb_conversions>3</nb_conversions>
+				<revenue>30</revenue>
+				<nb_conv_pages_before>6</nb_conv_pages_before>
+				<nb_conversions_attrib>1</nb_conversions_attrib>
+				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_uniq>2</nb_conversions_page_uniq>
+				<revenue_attrib>10</revenue_attrib>
+				<revenue_entry>20</revenue_entry>
+				<nb_conversions_entry_rate>0.667</nb_conversions_entry_rate>
+				<revenue_per_entry>6.667</revenue_per_entry>
+				<nb_conversions_entry>2</nb_conversions_entry>
+			</row>
+		</goals>
+		<avg_bandwidth>0</avg_bandwidth>
+		<avg_page_load_time>0</avg_page_load_time>
+		<avg_time_on_page>360</avg_time_on_page>
+		<bounce_rate>0%</bounce_rate>
+		<exit_rate>0%</exit_rate>
+		<url>http://example.org/page_A</url>
+		<segment>entryPageUrl==http%253A%252F%252Fexample.org%252Fpage_A</segment>
+	</row>
+</result>
\ No newline at end of file
diff --git a/plugins/Goals/tests/System/expected/test_trackGoals_pages__Actions.getPageTitles_day.xml b/plugins/Goals/tests/System/expected/test_trackGoals_pages__Actions.getPageTitles_day.xml
new file mode 100644
index 0000000000..96ad1c2c85
--- /dev/null
+++ b/plugins/Goals/tests/System/expected/test_trackGoals_pages__Actions.getPageTitles_day.xml
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<result>
+	<row>
+		<label> Page A</label>
+		<nb_visits>3</nb_visits>
+		<nb_uniq_visitors>3</nb_uniq_visitors>
+		<nb_hits>4</nb_hits>
+		<sum_time_spent>1440</sum_time_spent>
+		<sum_bandwidth>0</sum_bandwidth>
+		<nb_hits_with_bandwidth>0</nb_hits_with_bandwidth>
+		<min_bandwidth />
+		<max_bandwidth />
+		<entry_nb_uniq_visitors>3</entry_nb_uniq_visitors>
+		<entry_nb_visits>3</entry_nb_visits>
+		<entry_nb_actions>10</entry_nb_actions>
+		<entry_sum_visit_length>2525</entry_sum_visit_length>
+		<entry_bounce_count>0</entry_bounce_count>
+		<goals>
+			<row idgoal='1'>
+				<nb_conversions>3</nb_conversions>
+				<revenue>30</revenue>
+				<nb_conv_pages_before>6</nb_conv_pages_before>
+				<nb_conversions_attrib>1</nb_conversions_attrib>
+				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_uniq>2</nb_conversions_page_uniq>
+				<revenue_attrib>10</revenue_attrib>
+				<revenue_entry>20</revenue_entry>
+				<nb_conversions_entry_rate>0.667</nb_conversions_entry_rate>
+				<revenue_per_entry>6.667</revenue_per_entry>
+				<nb_conversions_entry>2</nb_conversions_entry>
+			</row>
+		</goals>
+		<avg_bandwidth>0</avg_bandwidth>
+		<avg_page_load_time>0</avg_page_load_time>
+		<avg_time_on_page>360</avg_time_on_page>
+		<bounce_rate>0%</bounce_rate>
+		<exit_rate>0%</exit_rate>
+		<segment>pageTitle==Page%2BA</segment>
+	</row>
+	<row>
+		<label> Page C</label>
+		<nb_visits>2</nb_visits>
+		<nb_uniq_visitors>2</nb_uniq_visitors>
+		<nb_hits>2</nb_hits>
+		<sum_time_spent>0</sum_time_spent>
+		<sum_bandwidth>0</sum_bandwidth>
+		<nb_hits_with_bandwidth>0</nb_hits_with_bandwidth>
+		<min_bandwidth />
+		<max_bandwidth />
+		<exit_nb_uniq_visitors>2</exit_nb_uniq_visitors>
+		<exit_nb_visits>2</exit_nb_visits>
+		<goals>
+			<row idgoal='1'>
+				<nb_conversions>2</nb_conversions>
+				<revenue>20</revenue>
+				<nb_conv_pages_before>6</nb_conv_pages_before>
+				<nb_conversions_attrib>0.75</nb_conversions_attrib>
+				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_uniq>2</nb_conversions_page_uniq>
+				<revenue_attrib>7.5</revenue_attrib>
+			</row>
+		</goals>
+		<avg_bandwidth>0</avg_bandwidth>
+		<avg_page_load_time>0</avg_page_load_time>
+		<avg_time_on_page>0</avg_time_on_page>
+		<bounce_rate>0%</bounce_rate>
+		<exit_rate>100%</exit_rate>
+		<segment>pageTitle==Page%2BC</segment>
+	</row>
+	<row>
+		<label> Page B</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_bandwidth>0</sum_bandwidth>
+		<nb_hits_with_bandwidth>0</nb_hits_with_bandwidth>
+		<min_bandwidth />
+		<max_bandwidth />
+		<goals>
+			<row idgoal='1'>
+				<nb_conversions>1</nb_conversions>
+				<revenue>10</revenue>
+				<nb_conv_pages_before>4</nb_conv_pages_before>
+				<nb_conversions_attrib>0.25</nb_conversions_attrib>
+				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
+				<revenue_attrib>2.5</revenue_attrib>
+			</row>
+		</goals>
+		<avg_bandwidth>0</avg_bandwidth>
+		<avg_page_load_time>0</avg_page_load_time>
+		<avg_time_on_page>360</avg_time_on_page>
+		<bounce_rate>0%</bounce_rate>
+		<exit_rate>0%</exit_rate>
+		<segment>pageTitle==Page%2BB</segment>
+	</row>
+	<row>
+		<label> Page D</label>
+		<nb_visits>1</nb_visits>
+		<nb_uniq_visitors>1</nb_uniq_visitors>
+		<nb_hits>1</nb_hits>
+		<sum_time_spent>0</sum_time_spent>
+		<sum_bandwidth>0</sum_bandwidth>
+		<nb_hits_with_bandwidth>0</nb_hits_with_bandwidth>
+		<min_bandwidth />
+		<max_bandwidth />
+		<exit_nb_uniq_visitors>1</exit_nb_uniq_visitors>
+		<exit_nb_visits>1</exit_nb_visits>
+		<avg_bandwidth>0</avg_bandwidth>
+		<avg_page_load_time>0</avg_page_load_time>
+		<avg_time_on_page>0</avg_time_on_page>
+		<bounce_rate>0%</bounce_rate>
+		<exit_rate>100%</exit_rate>
+		<segment>pageTitle==Page%2BD</segment>
+	</row>
+</result>
\ No newline at end of file
diff --git a/plugins/Goals/tests/System/expected/test_trackGoals_pages__Actions.getPageUrls_day.xml b/plugins/Goals/tests/System/expected/test_trackGoals_pages__Actions.getPageUrls_day.xml
new file mode 100644
index 0000000000..76810041d6
--- /dev/null
+++ b/plugins/Goals/tests/System/expected/test_trackGoals_pages__Actions.getPageUrls_day.xml
@@ -0,0 +1,121 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<result>
+	<row>
+		<label>/page_A</label>
+		<nb_visits>3</nb_visits>
+		<nb_uniq_visitors>3</nb_uniq_visitors>
+		<nb_hits>4</nb_hits>
+		<sum_time_spent>1440</sum_time_spent>
+		<sum_bandwidth>0</sum_bandwidth>
+		<nb_hits_with_bandwidth>0</nb_hits_with_bandwidth>
+		<min_bandwidth />
+		<max_bandwidth />
+		<entry_nb_uniq_visitors>3</entry_nb_uniq_visitors>
+		<entry_nb_visits>3</entry_nb_visits>
+		<entry_nb_actions>10</entry_nb_actions>
+		<entry_sum_visit_length>2525</entry_sum_visit_length>
+		<entry_bounce_count>0</entry_bounce_count>
+		<goals>
+			<row idgoal='1'>
+				<nb_conversions>3</nb_conversions>
+				<revenue>30</revenue>
+				<nb_conv_pages_before>6</nb_conv_pages_before>
+				<nb_conversions_attrib>1</nb_conversions_attrib>
+				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_uniq>2</nb_conversions_page_uniq>
+				<revenue_attrib>10</revenue_attrib>
+				<revenue_entry>20</revenue_entry>
+				<nb_conversions_entry_rate>0.667</nb_conversions_entry_rate>
+				<revenue_per_entry>6.667</revenue_per_entry>
+				<nb_conversions_entry>2</nb_conversions_entry>
+			</row>
+		</goals>
+		<avg_bandwidth>0</avg_bandwidth>
+		<avg_page_load_time>0</avg_page_load_time>
+		<avg_time_on_page>360</avg_time_on_page>
+		<bounce_rate>0%</bounce_rate>
+		<exit_rate>0%</exit_rate>
+		<url>http://example.org/page_A</url>
+		<segment>pageUrl==http%253A%252F%252Fexample.org%252Fpage_A</segment>
+	</row>
+	<row>
+		<label>/page_C</label>
+		<nb_visits>2</nb_visits>
+		<nb_uniq_visitors>2</nb_uniq_visitors>
+		<nb_hits>2</nb_hits>
+		<sum_time_spent>0</sum_time_spent>
+		<sum_bandwidth>0</sum_bandwidth>
+		<nb_hits_with_bandwidth>0</nb_hits_with_bandwidth>
+		<min_bandwidth />
+		<max_bandwidth />
+		<exit_nb_uniq_visitors>2</exit_nb_uniq_visitors>
+		<exit_nb_visits>2</exit_nb_visits>
+		<goals>
+			<row idgoal='1'>
+				<nb_conversions>2</nb_conversions>
+				<revenue>20</revenue>
+				<nb_conv_pages_before>6</nb_conv_pages_before>
+				<nb_conversions_attrib>0.75</nb_conversions_attrib>
+				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_uniq>2</nb_conversions_page_uniq>
+				<revenue_attrib>7.5</revenue_attrib>
+			</row>
+		</goals>
+		<avg_bandwidth>0</avg_bandwidth>
+		<avg_page_load_time>0</avg_page_load_time>
+		<avg_time_on_page>0</avg_time_on_page>
+		<bounce_rate>0%</bounce_rate>
+		<exit_rate>100%</exit_rate>
+		<url>http://example.org/page_C</url>
+		<segment>pageUrl==http%253A%252F%252Fexample.org%252Fpage_C</segment>
+	</row>
+	<row>
+		<label>/page_B</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_bandwidth>0</sum_bandwidth>
+		<nb_hits_with_bandwidth>0</nb_hits_with_bandwidth>
+		<min_bandwidth />
+		<max_bandwidth />
+		<goals>
+			<row idgoal='1'>
+				<nb_conversions>1</nb_conversions>
+				<revenue>10</revenue>
+				<nb_conv_pages_before>4</nb_conv_pages_before>
+				<nb_conversions_attrib>0.25</nb_conversions_attrib>
+				<nb_conversions_page_rate>0</nb_conversions_page_rate>
+				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
+				<revenue_attrib>2.5</revenue_attrib>
+			</row>
+		</goals>
+		<avg_bandwidth>0</avg_bandwidth>
+		<avg_page_load_time>0</avg_page_load_time>
+		<avg_time_on_page>360</avg_time_on_page>
+		<bounce_rate>0%</bounce_rate>
+		<exit_rate>0%</exit_rate>
+		<url>http://example.org/page_B</url>
+		<segment>pageUrl==http%253A%252F%252Fexample.org%252Fpage_B</segment>
+	</row>
+	<row>
+		<label>/page_D</label>
+		<nb_visits>1</nb_visits>
+		<nb_uniq_visitors>1</nb_uniq_visitors>
+		<nb_hits>1</nb_hits>
+		<sum_time_spent>0</sum_time_spent>
+		<sum_bandwidth>0</sum_bandwidth>
+		<nb_hits_with_bandwidth>0</nb_hits_with_bandwidth>
+		<min_bandwidth />
+		<max_bandwidth />
+		<exit_nb_uniq_visitors>1</exit_nb_uniq_visitors>
+		<exit_nb_visits>1</exit_nb_visits>
+		<avg_bandwidth>0</avg_bandwidth>
+		<avg_page_load_time>0</avg_page_load_time>
+		<avg_time_on_page>0</avg_time_on_page>
+		<bounce_rate>0%</bounce_rate>
+		<exit_rate>100%</exit_rate>
+		<url>http://example.org/page_D</url>
+		<segment>pageUrl==http%253A%252F%252Fexample.org%252Fpage_D</segment>
+	</row>
+</result>
\ No newline at end of file
diff --git a/plugins/Goals/tests/System/expected/test_trackGoals_pages__Goals.getPagesEntryTitles_day.xml b/plugins/Goals/tests/System/expected/test_trackGoals_pages__Goals.getPagesEntryTitles_day.xml
deleted file mode 100644
index 1fcc1b7037..0000000000
--- a/plugins/Goals/tests/System/expected/test_trackGoals_pages__Goals.getPagesEntryTitles_day.xml
+++ /dev/null
@@ -1,204 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<result>
-	<row>
-		<label> Page A</label>
-		<nb_uniq_visitors>3</nb_uniq_visitors>
-		<nb_hits>4</nb_hits>
-		<sum_time_spent>1440</sum_time_spent>
-		<sum_time_generation>0</sum_time_generation>
-		<nb_hits_with_time_generation>0</nb_hits_with_time_generation>
-		<min_time_generation />
-		<max_time_generation />
-		<sum_time_network>0.0000</sum_time_network>
-		<nb_hits_with_time_network>0</nb_hits_with_time_network>
-		<min_time_network />
-		<max_time_network />
-		<sum_time_server>0.0000</sum_time_server>
-		<nb_hits_with_time_server>0</nb_hits_with_time_server>
-		<min_time_server />
-		<max_time_server />
-		<sum_time_transfer>0.0000</sum_time_transfer>
-		<nb_hits_with_time_transfer>0</nb_hits_with_time_transfer>
-		<min_time_transfer />
-		<max_time_transfer />
-		<sum_time_dom_processing>0.0000</sum_time_dom_processing>
-		<nb_hits_with_time_dom_processing>0</nb_hits_with_time_dom_processing>
-		<min_time_dom_processing />
-		<max_time_dom_processing />
-		<sum_time_dom_completion>0.0000</sum_time_dom_completion>
-		<nb_hits_with_time_dom_completion>0</nb_hits_with_time_dom_completion>
-		<min_time_dom_completion />
-		<max_time_dom_completion />
-		<sum_time_on_load>0.0000</sum_time_on_load>
-		<nb_hits_with_time_on_load>0</nb_hits_with_time_on_load>
-		<min_time_on_load />
-		<max_time_on_load />
-		<sum_bandwidth>0</sum_bandwidth>
-		<nb_hits_with_bandwidth>0</nb_hits_with_bandwidth>
-		<min_bandwidth />
-		<max_bandwidth />
-		<entry_nb_visits>3</entry_nb_visits>
-		<entry_nb_actions>10</entry_nb_actions>
-		<entry_sum_visit_length>2525</entry_sum_visit_length>
-		<entry_bounce_count>0</entry_bounce_count>
-		<goals>
-			<row idgoal='1'>
-				<nb_conversions>3</nb_conversions>
-				<revenue>30</revenue>
-				<nb_conv_pages_before>6</nb_conv_pages_before>
-				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
-				<nb_conversions_page_uniq>2</nb_conversions_page_uniq>
-				<revenue_attrib>10</revenue_attrib>
-				<revenue_entry>20</revenue_entry>
-				<nb_conversions_entry_rate>0.667</nb_conversions_entry_rate>
-				<revenue_per_entry>6.667</revenue_per_entry>
-				<nb_conversions_entry>2</nb_conversions_entry>
-			</row>
-		</goals>
-		<page_title_path>Page A</page_title_path>
-	</row>
-	<row>
-		<label> Page C</label>
-		<nb_uniq_visitors>2</nb_uniq_visitors>
-		<nb_hits>2</nb_hits>
-		<sum_time_spent>0</sum_time_spent>
-		<sum_time_generation>0</sum_time_generation>
-		<nb_hits_with_time_generation>0</nb_hits_with_time_generation>
-		<min_time_generation />
-		<max_time_generation />
-		<sum_time_network>0.0000</sum_time_network>
-		<nb_hits_with_time_network>0</nb_hits_with_time_network>
-		<min_time_network />
-		<max_time_network />
-		<sum_time_server>0.0000</sum_time_server>
-		<nb_hits_with_time_server>0</nb_hits_with_time_server>
-		<min_time_server />
-		<max_time_server />
-		<sum_time_transfer>0.0000</sum_time_transfer>
-		<nb_hits_with_time_transfer>0</nb_hits_with_time_transfer>
-		<min_time_transfer />
-		<max_time_transfer />
-		<sum_time_dom_processing>0.0000</sum_time_dom_processing>
-		<nb_hits_with_time_dom_processing>0</nb_hits_with_time_dom_processing>
-		<min_time_dom_processing />
-		<max_time_dom_processing />
-		<sum_time_dom_completion>0.0000</sum_time_dom_completion>
-		<nb_hits_with_time_dom_completion>0</nb_hits_with_time_dom_completion>
-		<min_time_dom_completion />
-		<max_time_dom_completion />
-		<sum_time_on_load>0.0000</sum_time_on_load>
-		<nb_hits_with_time_on_load>0</nb_hits_with_time_on_load>
-		<min_time_on_load />
-		<max_time_on_load />
-		<sum_bandwidth>0</sum_bandwidth>
-		<nb_hits_with_bandwidth>0</nb_hits_with_bandwidth>
-		<min_bandwidth />
-		<max_bandwidth />
-		<exit_nb_uniq_visitors>2</exit_nb_uniq_visitors>
-		<exit_nb_visits>2</exit_nb_visits>
-		<goals>
-			<row idgoal='1'>
-				<nb_conversions>2</nb_conversions>
-				<revenue>20</revenue>
-				<nb_conv_pages_before>6</nb_conv_pages_before>
-				<nb_conversions_attrib>0.75</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
-				<nb_conversions_page_uniq>2</nb_conversions_page_uniq>
-				<revenue_attrib>7.5</revenue_attrib>
-			</row>
-		</goals>
-		<page_title_path>Page C</page_title_path>
-	</row>
-	<row>
-		<label> Page B</label>
-		<nb_uniq_visitors>1</nb_uniq_visitors>
-		<nb_hits>1</nb_hits>
-		<sum_time_spent>360</sum_time_spent>
-		<sum_time_generation>0</sum_time_generation>
-		<nb_hits_with_time_generation>0</nb_hits_with_time_generation>
-		<min_time_generation />
-		<max_time_generation />
-		<sum_time_network>0.0000</sum_time_network>
-		<nb_hits_with_time_network>0</nb_hits_with_time_network>
-		<min_time_network />
-		<max_time_network />
-		<sum_time_server>0.0000</sum_time_server>
-		<nb_hits_with_time_server>0</nb_hits_with_time_server>
-		<min_time_server />
-		<max_time_server />
-		<sum_time_transfer>0.0000</sum_time_transfer>
-		<nb_hits_with_time_transfer>0</nb_hits_with_time_transfer>
-		<min_time_transfer />
-		<max_time_transfer />
-		<sum_time_dom_processing>0.0000</sum_time_dom_processing>
-		<nb_hits_with_time_dom_processing>0</nb_hits_with_time_dom_processing>
-		<min_time_dom_processing />
-		<max_time_dom_processing />
-		<sum_time_dom_completion>0.0000</sum_time_dom_completion>
-		<nb_hits_with_time_dom_completion>0</nb_hits_with_time_dom_completion>
-		<min_time_dom_completion />
-		<max_time_dom_completion />
-		<sum_time_on_load>0.0000</sum_time_on_load>
-		<nb_hits_with_time_on_load>0</nb_hits_with_time_on_load>
-		<min_time_on_load />
-		<max_time_on_load />
-		<sum_bandwidth>0</sum_bandwidth>
-		<nb_hits_with_bandwidth>0</nb_hits_with_bandwidth>
-		<min_bandwidth />
-		<max_bandwidth />
-		<goals>
-			<row idgoal='1'>
-				<nb_conversions>1</nb_conversions>
-				<revenue>10</revenue>
-				<nb_conv_pages_before>4</nb_conv_pages_before>
-				<nb_conversions_attrib>0.25</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
-				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
-				<revenue_attrib>2.5</revenue_attrib>
-			</row>
-		</goals>
-		<page_title_path>Page B</page_title_path>
-	</row>
-	<row>
-		<label> Page D</label>
-		<nb_uniq_visitors>1</nb_uniq_visitors>
-		<nb_hits>1</nb_hits>
-		<sum_time_spent>0</sum_time_spent>
-		<sum_time_generation>0</sum_time_generation>
-		<nb_hits_with_time_generation>0</nb_hits_with_time_generation>
-		<min_time_generation />
-		<max_time_generation />
-		<sum_time_network>0.0000</sum_time_network>
-		<nb_hits_with_time_network>0</nb_hits_with_time_network>
-		<min_time_network />
-		<max_time_network />
-		<sum_time_server>0.0000</sum_time_server>
-		<nb_hits_with_time_server>0</nb_hits_with_time_server>
-		<min_time_server />
-		<max_time_server />
-		<sum_time_transfer>0.0000</sum_time_transfer>
-		<nb_hits_with_time_transfer>0</nb_hits_with_time_transfer>
-		<min_time_transfer />
-		<max_time_transfer />
-		<sum_time_dom_processing>0.0000</sum_time_dom_processing>
-		<nb_hits_with_time_dom_processing>0</nb_hits_with_time_dom_processing>
-		<min_time_dom_processing />
-		<max_time_dom_processing />
-		<sum_time_dom_completion>0.0000</sum_time_dom_completion>
-		<nb_hits_with_time_dom_completion>0</nb_hits_with_time_dom_completion>
-		<min_time_dom_completion />
-		<max_time_dom_completion />
-		<sum_time_on_load>0.0000</sum_time_on_load>
-		<nb_hits_with_time_on_load>0</nb_hits_with_time_on_load>
-		<min_time_on_load />
-		<max_time_on_load />
-		<sum_bandwidth>0</sum_bandwidth>
-		<nb_hits_with_bandwidth>0</nb_hits_with_bandwidth>
-		<min_bandwidth />
-		<max_bandwidth />
-		<exit_nb_uniq_visitors>1</exit_nb_uniq_visitors>
-		<exit_nb_visits>1</exit_nb_visits>
-		<page_title_path>Page D</page_title_path>
-	</row>
-</result>
\ No newline at end of file
diff --git a/plugins/Goals/tests/System/expected/test_trackGoals_pages__Goals.getPagesEntry_day.xml b/plugins/Goals/tests/System/expected/test_trackGoals_pages__Goals.getPagesEntry_day.xml
deleted file mode 100644
index 1af527fadc..0000000000
--- a/plugins/Goals/tests/System/expected/test_trackGoals_pages__Goals.getPagesEntry_day.xml
+++ /dev/null
@@ -1,204 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<result>
-	<row>
-		<label>/page_A</label>
-		<nb_uniq_visitors>3</nb_uniq_visitors>
-		<nb_hits>4</nb_hits>
-		<sum_time_spent>1440</sum_time_spent>
-		<sum_time_generation>0</sum_time_generation>
-		<nb_hits_with_time_generation>0</nb_hits_with_time_generation>
-		<min_time_generation />
-		<max_time_generation />
-		<sum_time_network>0.0000</sum_time_network>
-		<nb_hits_with_time_network>0</nb_hits_with_time_network>
-		<min_time_network />
-		<max_time_network />
-		<sum_time_server>0.0000</sum_time_server>
-		<nb_hits_with_time_server>0</nb_hits_with_time_server>
-		<min_time_server />
-		<max_time_server />
-		<sum_time_transfer>0.0000</sum_time_transfer>
-		<nb_hits_with_time_transfer>0</nb_hits_with_time_transfer>
-		<min_time_transfer />
-		<max_time_transfer />
-		<sum_time_dom_processing>0.0000</sum_time_dom_processing>
-		<nb_hits_with_time_dom_processing>0</nb_hits_with_time_dom_processing>
-		<min_time_dom_processing />
-		<max_time_dom_processing />
-		<sum_time_dom_completion>0.0000</sum_time_dom_completion>
-		<nb_hits_with_time_dom_completion>0</nb_hits_with_time_dom_completion>
-		<min_time_dom_completion />
-		<max_time_dom_completion />
-		<sum_time_on_load>0.0000</sum_time_on_load>
-		<nb_hits_with_time_on_load>0</nb_hits_with_time_on_load>
-		<min_time_on_load />
-		<max_time_on_load />
-		<sum_bandwidth>0</sum_bandwidth>
-		<nb_hits_with_bandwidth>0</nb_hits_with_bandwidth>
-		<min_bandwidth />
-		<max_bandwidth />
-		<entry_nb_visits>3</entry_nb_visits>
-		<entry_nb_actions>10</entry_nb_actions>
-		<entry_sum_visit_length>2525</entry_sum_visit_length>
-		<entry_bounce_count>0</entry_bounce_count>
-		<goals>
-			<row idgoal='1'>
-				<nb_conversions>3</nb_conversions>
-				<revenue>30</revenue>
-				<nb_conv_pages_before>6</nb_conv_pages_before>
-				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
-				<nb_conversions_page_uniq>2</nb_conversions_page_uniq>
-				<revenue_attrib>10</revenue_attrib>
-				<revenue_entry>20</revenue_entry>
-				<nb_conversions_entry_rate>0.667</nb_conversions_entry_rate>
-				<revenue_per_entry>6.667</revenue_per_entry>
-				<nb_conversions_entry>2</nb_conversions_entry>
-			</row>
-		</goals>
-		<url>http://example.org/page_A</url>
-	</row>
-	<row>
-		<label>/page_C</label>
-		<nb_uniq_visitors>2</nb_uniq_visitors>
-		<nb_hits>2</nb_hits>
-		<sum_time_spent>0</sum_time_spent>
-		<sum_time_generation>0</sum_time_generation>
-		<nb_hits_with_time_generation>0</nb_hits_with_time_generation>
-		<min_time_generation />
-		<max_time_generation />
-		<sum_time_network>0.0000</sum_time_network>
-		<nb_hits_with_time_network>0</nb_hits_with_time_network>
-		<min_time_network />
-		<max_time_network />
-		<sum_time_server>0.0000</sum_time_server>
-		<nb_hits_with_time_server>0</nb_hits_with_time_server>
-		<min_time_server />
-		<max_time_server />
-		<sum_time_transfer>0.0000</sum_time_transfer>
-		<nb_hits_with_time_transfer>0</nb_hits_with_time_transfer>
-		<min_time_transfer />
-		<max_time_transfer />
-		<sum_time_dom_processing>0.0000</sum_time_dom_processing>
-		<nb_hits_with_time_dom_processing>0</nb_hits_with_time_dom_processing>
-		<min_time_dom_processing />
-		<max_time_dom_processing />
-		<sum_time_dom_completion>0.0000</sum_time_dom_completion>
-		<nb_hits_with_time_dom_completion>0</nb_hits_with_time_dom_completion>
-		<min_time_dom_completion />
-		<max_time_dom_completion />
-		<sum_time_on_load>0.0000</sum_time_on_load>
-		<nb_hits_with_time_on_load>0</nb_hits_with_time_on_load>
-		<min_time_on_load />
-		<max_time_on_load />
-		<sum_bandwidth>0</sum_bandwidth>
-		<nb_hits_with_bandwidth>0</nb_hits_with_bandwidth>
-		<min_bandwidth />
-		<max_bandwidth />
-		<exit_nb_uniq_visitors>2</exit_nb_uniq_visitors>
-		<exit_nb_visits>2</exit_nb_visits>
-		<goals>
-			<row idgoal='1'>
-				<nb_conversions>2</nb_conversions>
-				<revenue>20</revenue>
-				<nb_conv_pages_before>6</nb_conv_pages_before>
-				<nb_conversions_attrib>0.75</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
-				<nb_conversions_page_uniq>2</nb_conversions_page_uniq>
-				<revenue_attrib>7.5</revenue_attrib>
-			</row>
-		</goals>
-		<url>http://example.org/page_C</url>
-	</row>
-	<row>
-		<label>/page_B</label>
-		<nb_uniq_visitors>1</nb_uniq_visitors>
-		<nb_hits>1</nb_hits>
-		<sum_time_spent>360</sum_time_spent>
-		<sum_time_generation>0</sum_time_generation>
-		<nb_hits_with_time_generation>0</nb_hits_with_time_generation>
-		<min_time_generation />
-		<max_time_generation />
-		<sum_time_network>0.0000</sum_time_network>
-		<nb_hits_with_time_network>0</nb_hits_with_time_network>
-		<min_time_network />
-		<max_time_network />
-		<sum_time_server>0.0000</sum_time_server>
-		<nb_hits_with_time_server>0</nb_hits_with_time_server>
-		<min_time_server />
-		<max_time_server />
-		<sum_time_transfer>0.0000</sum_time_transfer>
-		<nb_hits_with_time_transfer>0</nb_hits_with_time_transfer>
-		<min_time_transfer />
-		<max_time_transfer />
-		<sum_time_dom_processing>0.0000</sum_time_dom_processing>
-		<nb_hits_with_time_dom_processing>0</nb_hits_with_time_dom_processing>
-		<min_time_dom_processing />
-		<max_time_dom_processing />
-		<sum_time_dom_completion>0.0000</sum_time_dom_completion>
-		<nb_hits_with_time_dom_completion>0</nb_hits_with_time_dom_completion>
-		<min_time_dom_completion />
-		<max_time_dom_completion />
-		<sum_time_on_load>0.0000</sum_time_on_load>
-		<nb_hits_with_time_on_load>0</nb_hits_with_time_on_load>
-		<min_time_on_load />
-		<max_time_on_load />
-		<sum_bandwidth>0</sum_bandwidth>
-		<nb_hits_with_bandwidth>0</nb_hits_with_bandwidth>
-		<min_bandwidth />
-		<max_bandwidth />
-		<goals>
-			<row idgoal='1'>
-				<nb_conversions>1</nb_conversions>
-				<revenue>10</revenue>
-				<nb_conv_pages_before>4</nb_conv_pages_before>
-				<nb_conversions_attrib>0.25</nb_conversions_attrib>
-				<nb_conversions_page_rate>0</nb_conversions_page_rate>
-				<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
-				<revenue_attrib>2.5</revenue_attrib>
-			</row>
-		</goals>
-		<url>http://example.org/page_B</url>
-	</row>
-	<row>
-		<label>/page_D</label>
-		<nb_uniq_visitors>1</nb_uniq_visitors>
-		<nb_hits>1</nb_hits>
-		<sum_time_spent>0</sum_time_spent>
-		<sum_time_generation>0</sum_time_generation>
-		<nb_hits_with_time_generation>0</nb_hits_with_time_generation>
-		<min_time_generation />
-		<max_time_generation />
-		<sum_time_network>0.0000</sum_time_network>
-		<nb_hits_with_time_network>0</nb_hits_with_time_network>
-		<min_time_network />
-		<max_time_network />
-		<sum_time_server>0.0000</sum_time_server>
-		<nb_hits_with_time_server>0</nb_hits_with_time_server>
-		<min_time_server />
-		<max_time_server />
-		<sum_time_transfer>0.0000</sum_time_transfer>
-		<nb_hits_with_time_transfer>0</nb_hits_with_time_transfer>
-		<min_time_transfer />
-		<max_time_transfer />
-		<sum_time_dom_processing>0.0000</sum_time_dom_processing>
-		<nb_hits_with_time_dom_processing>0</nb_hits_with_time_dom_processing>
-		<min_time_dom_processing />
-		<max_time_dom_processing />
-		<sum_time_dom_completion>0.0000</sum_time_dom_completion>
-		<nb_hits_with_time_dom_completion>0</nb_hits_with_time_dom_completion>
-		<min_time_dom_completion />
-		<max_time_dom_completion />
-		<sum_time_on_load>0.0000</sum_time_on_load>
-		<nb_hits_with_time_on_load>0</nb_hits_with_time_on_load>
-		<min_time_on_load />
-		<max_time_on_load />
-		<sum_bandwidth>0</sum_bandwidth>
-		<nb_hits_with_bandwidth>0</nb_hits_with_bandwidth>
-		<min_bandwidth />
-		<max_bandwidth />
-		<exit_nb_uniq_visitors>1</exit_nb_uniq_visitors>
-		<exit_nb_visits>1</exit_nb_visits>
-		<url>http://example.org/page_D</url>
-	</row>
-</result>
\ No newline at end of file
diff --git a/plugins/Goals/tests/System/expected/test_trackGoals_pages__Goals.getPagesTitles_day.xml b/plugins/Goals/tests/System/expected/test_trackGoals_pages__Goals.getPagesTitles_day.xml
deleted file mode 100644
index f9358cc8c7..0000000000
--- a/plugins/Goals/tests/System/expected/test_trackGoals_pages__Goals.getPagesTitles_day.xml
+++ /dev/null
@@ -1,199 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<result>
-	<row>
-		<label> Page A</label>
-		<nb_uniq_visitors>3</nb_uniq_visitors>
-		<nb_hits>4</nb_hits>
-		<sum_time_spent>1440</sum_time_spent>
-		<sum_time_generation>0</sum_time_generation>
-		<nb_hits_with_time_generation>0</nb_hits_with_time_generation>
-		<min_time_generation />
-		<max_time_generation />
-		<sum_time_network>0.0000</sum_time_network>
-		<nb_hits_with_time_network>0</nb_hits_with_time_network>
-		<min_time_network />
-		<max_time_network />
-		<sum_time_server>0.0000</sum_time_server>
-		<nb_hits_with_time_server>0</nb_hits_with_time_server>
-		<min_time_server />
-		<max_time_server />
-		<sum_time_transfer>0.0000</sum_time_transfer>
-		<nb_hits_with_time_transfer>0</nb_hits_with_time_transfer>
-		<min_time_transfer />
-		<max_time_transfer />
-		<sum_time_dom_processing>0.0000</sum_time_dom_processing>
-		<nb_hits_with_time_dom_processing>0</nb_hits_with_time_dom_processing>
-		<min_time_dom_processing />
-		<max_time_dom_processing />
-		<sum_time_dom_completion>0.0000</sum_time_dom_completion>
-		<nb_hits_with_time_dom_completion>0</nb_hits_with_time_dom_completion>
-		<min_time_dom_completion />
-		<max_time_dom_completion />
-		<sum_time_on_load>0.0000</sum_time_on_load>
-		<nb_hits_with_time_on_load>0</nb_hits_with_time_on_load>
-		<min_time_on_load />
-		<max_time_on_load />
-		<sum_bandwidth>0</sum_bandwidth>
-		<nb_hits_with_bandwidth>0</nb_hits_with_bandwidth>
-		<min_bandwidth />
-		<max_bandwidth />
-		<entry_nb_uniq_visitors>3</entry_nb_uniq_visitors>
-		<entry_nb_visits>3</entry_nb_visits>
-		<entry_nb_actions>10</entry_nb_actions>
-		<entry_sum_visit_length>2525</entry_sum_visit_length>
-		<entry_bounce_count>0</entry_bounce_count>
-		<goals>
-			<row idgoal='1'>
-				<revenue>30</revenue>
-				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>1</nb_conversions_page_rate>
-				<revenue_attrib>10</revenue_attrib>
-				<revenue_entry>20</revenue_entry>
-				<nb_conversions_entry_rate>0.667</nb_conversions_entry_rate>
-				<revenue_per_entry>6.667</revenue_per_entry>
-				<nb_conversions_entry>2</nb_conversions_entry>
-			</row>
-		</goals>
-		<goal_1_nb_conversions_page_rate>1</goal_1_nb_conversions_page_rate>
-		<page_title_path>Page A</page_title_path>
-	</row>
-	<row>
-		<label> Page C</label>
-		<nb_uniq_visitors>2</nb_uniq_visitors>
-		<nb_hits>2</nb_hits>
-		<sum_time_spent>0</sum_time_spent>
-		<sum_time_generation>0</sum_time_generation>
-		<nb_hits_with_time_generation>0</nb_hits_with_time_generation>
-		<min_time_generation />
-		<max_time_generation />
-		<sum_time_network>0.0000</sum_time_network>
-		<nb_hits_with_time_network>0</nb_hits_with_time_network>
-		<min_time_network />
-		<max_time_network />
-		<sum_time_server>0.0000</sum_time_server>
-		<nb_hits_with_time_server>0</nb_hits_with_time_server>
-		<min_time_server />
-		<max_time_server />
-		<sum_time_transfer>0.0000</sum_time_transfer>
-		<nb_hits_with_time_transfer>0</nb_hits_with_time_transfer>
-		<min_time_transfer />
-		<max_time_transfer />
-		<sum_time_dom_processing>0.0000</sum_time_dom_processing>
-		<nb_hits_with_time_dom_processing>0</nb_hits_with_time_dom_processing>
-		<min_time_dom_processing />
-		<max_time_dom_processing />
-		<sum_time_dom_completion>0.0000</sum_time_dom_completion>
-		<nb_hits_with_time_dom_completion>0</nb_hits_with_time_dom_completion>
-		<min_time_dom_completion />
-		<max_time_dom_completion />
-		<sum_time_on_load>0.0000</sum_time_on_load>
-		<nb_hits_with_time_on_load>0</nb_hits_with_time_on_load>
-		<min_time_on_load />
-		<max_time_on_load />
-		<sum_bandwidth>0</sum_bandwidth>
-		<nb_hits_with_bandwidth>0</nb_hits_with_bandwidth>
-		<min_bandwidth />
-		<max_bandwidth />
-		<exit_nb_uniq_visitors>2</exit_nb_uniq_visitors>
-		<exit_nb_visits>2</exit_nb_visits>
-		<goals>
-			<row idgoal='1'>
-				<revenue>20</revenue>
-				<nb_conversions_attrib>0.75</nb_conversions_attrib>
-				<nb_conversions_page_rate>1</nb_conversions_page_rate>
-				<revenue_attrib>7.5</revenue_attrib>
-			</row>
-		</goals>
-		<goal_1_nb_conversions_page_rate>1</goal_1_nb_conversions_page_rate>
-		<page_title_path>Page C</page_title_path>
-	</row>
-	<row>
-		<label> Page B</label>
-		<nb_uniq_visitors>1</nb_uniq_visitors>
-		<nb_hits>1</nb_hits>
-		<sum_time_spent>360</sum_time_spent>
-		<sum_time_generation>0</sum_time_generation>
-		<nb_hits_with_time_generation>0</nb_hits_with_time_generation>
-		<min_time_generation />
-		<max_time_generation />
-		<sum_time_network>0.0000</sum_time_network>
-		<nb_hits_with_time_network>0</nb_hits_with_time_network>
-		<min_time_network />
-		<max_time_network />
-		<sum_time_server>0.0000</sum_time_server>
-		<nb_hits_with_time_server>0</nb_hits_with_time_server>
-		<min_time_server />
-		<max_time_server />
-		<sum_time_transfer>0.0000</sum_time_transfer>
-		<nb_hits_with_time_transfer>0</nb_hits_with_time_transfer>
-		<min_time_transfer />
-		<max_time_transfer />
-		<sum_time_dom_processing>0.0000</sum_time_dom_processing>
-		<nb_hits_with_time_dom_processing>0</nb_hits_with_time_dom_processing>
-		<min_time_dom_processing />
-		<max_time_dom_processing />
-		<sum_time_dom_completion>0.0000</sum_time_dom_completion>
-		<nb_hits_with_time_dom_completion>0</nb_hits_with_time_dom_completion>
-		<min_time_dom_completion />
-		<max_time_dom_completion />
-		<sum_time_on_load>0.0000</sum_time_on_load>
-		<nb_hits_with_time_on_load>0</nb_hits_with_time_on_load>
-		<min_time_on_load />
-		<max_time_on_load />
-		<sum_bandwidth>0</sum_bandwidth>
-		<nb_hits_with_bandwidth>0</nb_hits_with_bandwidth>
-		<min_bandwidth />
-		<max_bandwidth />
-		<goals>
-			<row idgoal='1'>
-				<revenue>10</revenue>
-				<nb_conversions_attrib>0.25</nb_conversions_attrib>
-				<nb_conversions_page_rate>0.5</nb_conversions_page_rate>
-				<revenue_attrib>2.5</revenue_attrib>
-			</row>
-		</goals>
-		<goal_1_nb_conversions_page_rate>0.5</goal_1_nb_conversions_page_rate>
-		<page_title_path>Page B</page_title_path>
-	</row>
-	<row>
-		<label> Page D</label>
-		<nb_uniq_visitors>1</nb_uniq_visitors>
-		<nb_hits>1</nb_hits>
-		<sum_time_spent>0</sum_time_spent>
-		<sum_time_generation>0</sum_time_generation>
-		<nb_hits_with_time_generation>0</nb_hits_with_time_generation>
-		<min_time_generation />
-		<max_time_generation />
-		<sum_time_network>0.0000</sum_time_network>
-		<nb_hits_with_time_network>0</nb_hits_with_time_network>
-		<min_time_network />
-		<max_time_network />
-		<sum_time_server>0.0000</sum_time_server>
-		<nb_hits_with_time_server>0</nb_hits_with_time_server>
-		<min_time_server />
-		<max_time_server />
-		<sum_time_transfer>0.0000</sum_time_transfer>
-		<nb_hits_with_time_transfer>0</nb_hits_with_time_transfer>
-		<min_time_transfer />
-		<max_time_transfer />
-		<sum_time_dom_processing>0.0000</sum_time_dom_processing>
-		<nb_hits_with_time_dom_processing>0</nb_hits_with_time_dom_processing>
-		<min_time_dom_processing />
-		<max_time_dom_processing />
-		<sum_time_dom_completion>0.0000</sum_time_dom_completion>
-		<nb_hits_with_time_dom_completion>0</nb_hits_with_time_dom_completion>
-		<min_time_dom_completion />
-		<max_time_dom_completion />
-		<sum_time_on_load>0.0000</sum_time_on_load>
-		<nb_hits_with_time_on_load>0</nb_hits_with_time_on_load>
-		<min_time_on_load />
-		<max_time_on_load />
-		<sum_bandwidth>0</sum_bandwidth>
-		<nb_hits_with_bandwidth>0</nb_hits_with_bandwidth>
-		<min_bandwidth />
-		<max_bandwidth />
-		<exit_nb_uniq_visitors>1</exit_nb_uniq_visitors>
-		<exit_nb_visits>1</exit_nb_visits>
-		<page_title_path>Page D</page_title_path>
-	</row>
-</result>
\ No newline at end of file
diff --git a/plugins/Goals/tests/System/expected/test_trackGoals_pages__Goals.getPagesUrl_day.xml b/plugins/Goals/tests/System/expected/test_trackGoals_pages__Goals.getPagesUrl_day.xml
deleted file mode 100644
index be95cd7749..0000000000
--- a/plugins/Goals/tests/System/expected/test_trackGoals_pages__Goals.getPagesUrl_day.xml
+++ /dev/null
@@ -1,199 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<result>
-	<row>
-		<label>/page_A</label>
-		<nb_uniq_visitors>3</nb_uniq_visitors>
-		<nb_hits>4</nb_hits>
-		<sum_time_spent>1440</sum_time_spent>
-		<sum_time_generation>0</sum_time_generation>
-		<nb_hits_with_time_generation>0</nb_hits_with_time_generation>
-		<min_time_generation />
-		<max_time_generation />
-		<sum_time_network>0.0000</sum_time_network>
-		<nb_hits_with_time_network>0</nb_hits_with_time_network>
-		<min_time_network />
-		<max_time_network />
-		<sum_time_server>0.0000</sum_time_server>
-		<nb_hits_with_time_server>0</nb_hits_with_time_server>
-		<min_time_server />
-		<max_time_server />
-		<sum_time_transfer>0.0000</sum_time_transfer>
-		<nb_hits_with_time_transfer>0</nb_hits_with_time_transfer>
-		<min_time_transfer />
-		<max_time_transfer />
-		<sum_time_dom_processing>0.0000</sum_time_dom_processing>
-		<nb_hits_with_time_dom_processing>0</nb_hits_with_time_dom_processing>
-		<min_time_dom_processing />
-		<max_time_dom_processing />
-		<sum_time_dom_completion>0.0000</sum_time_dom_completion>
-		<nb_hits_with_time_dom_completion>0</nb_hits_with_time_dom_completion>
-		<min_time_dom_completion />
-		<max_time_dom_completion />
-		<sum_time_on_load>0.0000</sum_time_on_load>
-		<nb_hits_with_time_on_load>0</nb_hits_with_time_on_load>
-		<min_time_on_load />
-		<max_time_on_load />
-		<sum_bandwidth>0</sum_bandwidth>
-		<nb_hits_with_bandwidth>0</nb_hits_with_bandwidth>
-		<min_bandwidth />
-		<max_bandwidth />
-		<entry_nb_uniq_visitors>3</entry_nb_uniq_visitors>
-		<entry_nb_visits>3</entry_nb_visits>
-		<entry_nb_actions>10</entry_nb_actions>
-		<entry_sum_visit_length>2525</entry_sum_visit_length>
-		<entry_bounce_count>0</entry_bounce_count>
-		<goals>
-			<row idgoal='1'>
-				<revenue>30</revenue>
-				<nb_conversions_attrib>1</nb_conversions_attrib>
-				<nb_conversions_page_rate>1</nb_conversions_page_rate>
-				<revenue_attrib>10</revenue_attrib>
-				<revenue_entry>20</revenue_entry>
-				<nb_conversions_entry_rate>0.667</nb_conversions_entry_rate>
-				<revenue_per_entry>6.667</revenue_per_entry>
-				<nb_conversions_entry>2</nb_conversions_entry>
-			</row>
-		</goals>
-		<goal_1_nb_conversions_page_rate>1</goal_1_nb_conversions_page_rate>
-		<url>http://example.org/page_A</url>
-	</row>
-	<row>
-		<label>/page_C</label>
-		<nb_uniq_visitors>2</nb_uniq_visitors>
-		<nb_hits>2</nb_hits>
-		<sum_time_spent>0</sum_time_spent>
-		<sum_time_generation>0</sum_time_generation>
-		<nb_hits_with_time_generation>0</nb_hits_with_time_generation>
-		<min_time_generation />
-		<max_time_generation />
-		<sum_time_network>0.0000</sum_time_network>
-		<nb_hits_with_time_network>0</nb_hits_with_time_network>
-		<min_time_network />
-		<max_time_network />
-		<sum_time_server>0.0000</sum_time_server>
-		<nb_hits_with_time_server>0</nb_hits_with_time_server>
-		<min_time_server />
-		<max_time_server />
-		<sum_time_transfer>0.0000</sum_time_transfer>
-		<nb_hits_with_time_transfer>0</nb_hits_with_time_transfer>
-		<min_time_transfer />
-		<max_time_transfer />
-		<sum_time_dom_processing>0.0000</sum_time_dom_processing>
-		<nb_hits_with_time_dom_processing>0</nb_hits_with_time_dom_processing>
-		<min_time_dom_processing />
-		<max_time_dom_processing />
-		<sum_time_dom_completion>0.0000</sum_time_dom_completion>
-		<nb_hits_with_time_dom_completion>0</nb_hits_with_time_dom_completion>
-		<min_time_dom_completion />
-		<max_time_dom_completion />
-		<sum_time_on_load>0.0000</sum_time_on_load>
-		<nb_hits_with_time_on_load>0</nb_hits_with_time_on_load>
-		<min_time_on_load />
-		<max_time_on_load />
-		<sum_bandwidth>0</sum_bandwidth>
-		<nb_hits_with_bandwidth>0</nb_hits_with_bandwidth>
-		<min_bandwidth />
-		<max_bandwidth />
-		<exit_nb_uniq_visitors>2</exit_nb_uniq_visitors>
-		<exit_nb_visits>2</exit_nb_visits>
-		<goals>
-			<row idgoal='1'>
-				<revenue>20</revenue>
-				<nb_conversions_attrib>0.75</nb_conversions_attrib>
-				<nb_conversions_page_rate>1</nb_conversions_page_rate>
-				<revenue_attrib>7.5</revenue_attrib>
-			</row>
-		</goals>
-		<goal_1_nb_conversions_page_rate>1</goal_1_nb_conversions_page_rate>
-		<url>http://example.org/page_C</url>
-	</row>
-	<row>
-		<label>/page_B</label>
-		<nb_uniq_visitors>1</nb_uniq_visitors>
-		<nb_hits>1</nb_hits>
-		<sum_time_spent>360</sum_time_spent>
-		<sum_time_generation>0</sum_time_generation>
-		<nb_hits_with_time_generation>0</nb_hits_with_time_generation>
-		<min_time_generation />
-		<max_time_generation />
-		<sum_time_network>0.0000</sum_time_network>
-		<nb_hits_with_time_network>0</nb_hits_with_time_network>
-		<min_time_network />
-		<max_time_network />
-		<sum_time_server>0.0000</sum_time_server>
-		<nb_hits_with_time_server>0</nb_hits_with_time_server>
-		<min_time_server />
-		<max_time_server />
-		<sum_time_transfer>0.0000</sum_time_transfer>
-		<nb_hits_with_time_transfer>0</nb_hits_with_time_transfer>
-		<min_time_transfer />
-		<max_time_transfer />
-		<sum_time_dom_processing>0.0000</sum_time_dom_processing>
-		<nb_hits_with_time_dom_processing>0</nb_hits_with_time_dom_processing>
-		<min_time_dom_processing />
-		<max_time_dom_processing />
-		<sum_time_dom_completion>0.0000</sum_time_dom_completion>
-		<nb_hits_with_time_dom_completion>0</nb_hits_with_time_dom_completion>
-		<min_time_dom_completion />
-		<max_time_dom_completion />
-		<sum_time_on_load>0.0000</sum_time_on_load>
-		<nb_hits_with_time_on_load>0</nb_hits_with_time_on_load>
-		<min_time_on_load />
-		<max_time_on_load />
-		<sum_bandwidth>0</sum_bandwidth>
-		<nb_hits_with_bandwidth>0</nb_hits_with_bandwidth>
-		<min_bandwidth />
-		<max_bandwidth />
-		<goals>
-			<row idgoal='1'>
-				<revenue>10</revenue>
-				<nb_conversions_attrib>0.25</nb_conversions_attrib>
-				<nb_conversions_page_rate>0.5</nb_conversions_page_rate>
-				<revenue_attrib>2.5</revenue_attrib>
-			</row>
-		</goals>
-		<goal_1_nb_conversions_page_rate>0.5</goal_1_nb_conversions_page_rate>
-		<url>http://example.org/page_B</url>
-	</row>
-	<row>
-		<label>/page_D</label>
-		<nb_uniq_visitors>1</nb_uniq_visitors>
-		<nb_hits>1</nb_hits>
-		<sum_time_spent>0</sum_time_spent>
-		<sum_time_generation>0</sum_time_generation>
-		<nb_hits_with_time_generation>0</nb_hits_with_time_generation>
-		<min_time_generation />
-		<max_time_generation />
-		<sum_time_network>0.0000</sum_time_network>
-		<nb_hits_with_time_network>0</nb_hits_with_time_network>
-		<min_time_network />
-		<max_time_network />
-		<sum_time_server>0.0000</sum_time_server>
-		<nb_hits_with_time_server>0</nb_hits_with_time_server>
-		<min_time_server />
-		<max_time_server />
-		<sum_time_transfer>0.0000</sum_time_transfer>
-		<nb_hits_with_time_transfer>0</nb_hits_with_time_transfer>
-		<min_time_transfer />
-		<max_time_transfer />
-		<sum_time_dom_processing>0.0000</sum_time_dom_processing>
-		<nb_hits_with_time_dom_processing>0</nb_hits_with_time_dom_processing>
-		<min_time_dom_processing />
-		<max_time_dom_processing />
-		<sum_time_dom_completion>0.0000</sum_time_dom_completion>
-		<nb_hits_with_time_dom_completion>0</nb_hits_with_time_dom_completion>
-		<min_time_dom_completion />
-		<max_time_dom_completion />
-		<sum_time_on_load>0.0000</sum_time_on_load>
-		<nb_hits_with_time_on_load>0</nb_hits_with_time_on_load>
-		<min_time_on_load />
-		<max_time_on_load />
-		<sum_bandwidth>0</sum_bandwidth>
-		<nb_hits_with_bandwidth>0</nb_hits_with_bandwidth>
-		<min_bandwidth />
-		<max_bandwidth />
-		<exit_nb_uniq_visitors>1</exit_nb_uniq_visitors>
-		<exit_nb_visits>1</exit_nb_visits>
-		<url>http://example.org/page_D</url>
-	</row>
-</result>
\ No newline at end of file
-- 
cgit v1.2.3