diff --git a/tests/System/Commands/MigrateTest.php b/tests/System/Commands/MigrateTest.php
index 47802b7..1e9e70a 100644
--- a/tests/System/Commands/MigrateTest.php
+++ b/tests/System/Commands/MigrateTest.php
@@ -167,7 +167,7 @@ public function testApi_migrated($api, $params)
 
         FakeAccess::clearAccess($superUser = true);
 
-        if (['Live.getLastVisitsDetails'] === $api && version_compare(Version::VERSION, '5.2.0-alpha', '<')) {
+        if (in_array($api, [['Live.getLastVisitsDetails'], ['Actions.getPageUrls']]) && version_compare(Version::VERSION, '5.2.0-alpha', '<')) {
             $params['testSuffix'] = '5-2a';
         }
         try {
diff --git a/tests/System/expected/test_Old__API.get_day.xml b/tests/System/expected/test_Old__API.get_day.xml
deleted file mode 100644
index 741bb31..0000000
--- a/tests/System/expected/test_Old__API.get_day.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<result>
-	<nb_uniq_visitors>2</nb_uniq_visitors>
-	<nb_visits>2</nb_visits>
-	<nb_users>0</nb_users>
-	<nb_actions>4</nb_actions>
-	<max_actions>2</max_actions>
-	<bounce_count>0</bounce_count>
-	<sum_visit_length>1265</sum_visit_length>
-	<nb_visits_new>2</nb_visits_new>
-	<nb_actions_new>4</nb_actions_new>
-	<nb_uniq_visitors_new>2</nb_uniq_visitors_new>
-	<nb_users_new>0</nb_users_new>
-	<max_actions_new>2</max_actions_new>
-	<bounce_rate_new>0%</bounce_rate_new>
-	<nb_actions_per_visit_new>2</nb_actions_per_visit_new>
-	<avg_time_on_site_new>633</avg_time_on_site_new>
-	<nb_visits_returning>0</nb_visits_returning>
-	<nb_actions_returning>0</nb_actions_returning>
-	<nb_uniq_visitors_returning>0</nb_uniq_visitors_returning>
-	<nb_users_returning>0</nb_users_returning>
-	<max_actions_returning>0</max_actions_returning>
-	<bounce_rate_returning>0%</bounce_rate_returning>
-	<nb_actions_per_visit_returning>0</nb_actions_per_visit_returning>
-	<avg_time_on_site_returning>0</avg_time_on_site_returning>
-	<Referrers_visitorsFromSearchEngines>0</Referrers_visitorsFromSearchEngines>
-	<Referrers_visitorsFromSocialNetworks>0</Referrers_visitorsFromSocialNetworks>
-	<Referrers_visitorsFromDirectEntry>2</Referrers_visitorsFromDirectEntry>
-	<Referrers_visitorsFromWebsites>0</Referrers_visitorsFromWebsites>
-	<Referrers_visitorsFromCampaigns>0</Referrers_visitorsFromCampaigns>
-	<Referrers_distinctSearchEngines>0</Referrers_distinctSearchEngines>
-	<Referrers_distinctSocialNetworks>0</Referrers_distinctSocialNetworks>
-	<Referrers_distinctKeywords>0</Referrers_distinctKeywords>
-	<Referrers_distinctWebsites>0</Referrers_distinctWebsites>
-	<Referrers_distinctWebsitesUrls>0</Referrers_distinctWebsitesUrls>
-	<Referrers_distinctCampaigns>0</Referrers_distinctCampaigns>
-	<Referrers_visitorsFromDirectEntry_percent>100%</Referrers_visitorsFromDirectEntry_percent>
-	<Referrers_visitorsFromSearchEngines_percent>0%</Referrers_visitorsFromSearchEngines_percent>
-	<Referrers_visitorsFromCampaigns_percent>0%</Referrers_visitorsFromCampaigns_percent>
-	<Referrers_visitorsFromSocialNetworks_percent>0%</Referrers_visitorsFromSocialNetworks_percent>
-	<Referrers_visitorsFromWebsites_percent>0%</Referrers_visitorsFromWebsites_percent>
-	<PagePerformance_network_time>0</PagePerformance_network_time>
-	<PagePerformance_network_hits>0</PagePerformance_network_hits>
-	<PagePerformance_servery_time>0</PagePerformance_servery_time>
-	<PagePerformance_server_hits>0</PagePerformance_server_hits>
-	<PagePerformance_transfer_time>0</PagePerformance_transfer_time>
-	<PagePerformance_transfer_hits>0</PagePerformance_transfer_hits>
-	<PagePerformance_domprocessing_time>0</PagePerformance_domprocessing_time>
-	<PagePerformance_domprocessing_hits>0</PagePerformance_domprocessing_hits>
-	<PagePerformance_domcompletion_time>0</PagePerformance_domcompletion_time>
-	<PagePerformance_domcompletion_hits>0</PagePerformance_domcompletion_hits>
-	<PagePerformance_onload_time>0</PagePerformance_onload_time>
-	<PagePerformance_onload_hits>0</PagePerformance_onload_hits>
-	<PagePerformance_pageload_time>0</PagePerformance_pageload_time>
-	<PagePerformance_pageload_hits>0</PagePerformance_pageload_hits>
-	<avg_time_network>0</avg_time_network>
-	<avg_time_server>0</avg_time_server>
-	<avg_time_transfer>0</avg_time_transfer>
-	<avg_time_dom_processing>0</avg_time_dom_processing>
-	<avg_time_dom_completion>0</avg_time_dom_completion>
-	<avg_time_on_load>0</avg_time_on_load>
-	<avg_page_load_time>0</avg_page_load_time>
-	<nb_conversions>2</nb_conversions>
-	<nb_visits_converted>1</nb_visits_converted>
-	<revenue>2546</revenue>
-	<conversion_rate>50%</conversion_rate>
-	<nb_conversions_new_visit>2</nb_conversions_new_visit>
-	<nb_visits_converted_new_visit>1</nb_visits_converted_new_visit>
-	<revenue_new_visit>2546</revenue_new_visit>
-	<conversion_rate_new_visit>50%</conversion_rate_new_visit>
-	<nb_conversions_returning_visit>0</nb_conversions_returning_visit>
-	<nb_visits_converted_returning_visit>0</nb_visits_converted_returning_visit>
-	<revenue_returning_visit>0</revenue_returning_visit>
-	<conversion_rate_returning_visit>0%</conversion_rate_returning_visit>
-	<nb_total_overall_bandwidth>0</nb_total_overall_bandwidth>
-	<nb_total_pageview_bandwidth>0</nb_total_pageview_bandwidth>
-	<nb_total_download_bandwidth>0</nb_total_download_bandwidth>
-	<nb_pageviews>3</nb_pageviews>
-	<nb_uniq_pageviews>3</nb_uniq_pageviews>
-	<nb_downloads>0</nb_downloads>
-	<nb_uniq_downloads>0</nb_uniq_downloads>
-	<nb_outlinks>0</nb_outlinks>
-	<nb_uniq_outlinks>0</nb_uniq_outlinks>
-	<nb_searches>1</nb_searches>
-	<nb_keywords>1</nb_keywords>
-	<bounce_rate>0%</bounce_rate>
-	<nb_actions_per_visit>2</nb_actions_per_visit>
-	<avg_time_on_site>633</avg_time_on_site>
-</result>
\ No newline at end of file
diff --git a/tests/System/expected/test_Old__API.get_year.xml b/tests/System/expected/test_Old__API.get_year.xml
deleted file mode 100644
index c4cfe68..0000000
--- a/tests/System/expected/test_Old__API.get_year.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<result>
-	<nb_visits>2</nb_visits>
-	<nb_actions>4</nb_actions>
-	<max_actions>2</max_actions>
-	<bounce_count>0</bounce_count>
-	<sum_visit_length>1265</sum_visit_length>
-	<nb_visits_new>2</nb_visits_new>
-	<nb_actions_new>4</nb_actions_new>
-	<max_actions_new>2</max_actions_new>
-	<bounce_rate_new>0%</bounce_rate_new>
-	<nb_actions_per_visit_new>2</nb_actions_per_visit_new>
-	<avg_time_on_site_new>633</avg_time_on_site_new>
-	<nb_visits_returning>0</nb_visits_returning>
-	<nb_actions_returning>0</nb_actions_returning>
-	<max_actions_returning>0</max_actions_returning>
-	<bounce_rate_returning>0%</bounce_rate_returning>
-	<nb_actions_per_visit_returning>0</nb_actions_per_visit_returning>
-	<avg_time_on_site_returning>0</avg_time_on_site_returning>
-	<Referrers_visitorsFromSearchEngines>0</Referrers_visitorsFromSearchEngines>
-	<Referrers_visitorsFromSocialNetworks>0</Referrers_visitorsFromSocialNetworks>
-	<Referrers_visitorsFromDirectEntry>2</Referrers_visitorsFromDirectEntry>
-	<Referrers_visitorsFromWebsites>0</Referrers_visitorsFromWebsites>
-	<Referrers_visitorsFromCampaigns>0</Referrers_visitorsFromCampaigns>
-	<Referrers_distinctSearchEngines>0</Referrers_distinctSearchEngines>
-	<Referrers_distinctSocialNetworks>0</Referrers_distinctSocialNetworks>
-	<Referrers_distinctKeywords>0</Referrers_distinctKeywords>
-	<Referrers_distinctWebsites>0</Referrers_distinctWebsites>
-	<Referrers_distinctWebsitesUrls>0</Referrers_distinctWebsitesUrls>
-	<Referrers_distinctCampaigns>0</Referrers_distinctCampaigns>
-	<Referrers_visitorsFromDirectEntry_percent>100%</Referrers_visitorsFromDirectEntry_percent>
-	<Referrers_visitorsFromSearchEngines_percent>0%</Referrers_visitorsFromSearchEngines_percent>
-	<Referrers_visitorsFromCampaigns_percent>0%</Referrers_visitorsFromCampaigns_percent>
-	<Referrers_visitorsFromSocialNetworks_percent>0%</Referrers_visitorsFromSocialNetworks_percent>
-	<Referrers_visitorsFromWebsites_percent>0%</Referrers_visitorsFromWebsites_percent>
-	<PagePerformance_network_time>0</PagePerformance_network_time>
-	<PagePerformance_network_hits>0</PagePerformance_network_hits>
-	<PagePerformance_servery_time>0</PagePerformance_servery_time>
-	<PagePerformance_server_hits>0</PagePerformance_server_hits>
-	<PagePerformance_transfer_time>0</PagePerformance_transfer_time>
-	<PagePerformance_transfer_hits>0</PagePerformance_transfer_hits>
-	<PagePerformance_domprocessing_time>0</PagePerformance_domprocessing_time>
-	<PagePerformance_domprocessing_hits>0</PagePerformance_domprocessing_hits>
-	<PagePerformance_domcompletion_time>0</PagePerformance_domcompletion_time>
-	<PagePerformance_domcompletion_hits>0</PagePerformance_domcompletion_hits>
-	<PagePerformance_onload_time>0</PagePerformance_onload_time>
-	<PagePerformance_onload_hits>0</PagePerformance_onload_hits>
-	<PagePerformance_pageload_time>0</PagePerformance_pageload_time>
-	<PagePerformance_pageload_hits>0</PagePerformance_pageload_hits>
-	<avg_time_network>0</avg_time_network>
-	<avg_time_server>0</avg_time_server>
-	<avg_time_transfer>0</avg_time_transfer>
-	<avg_time_dom_processing>0</avg_time_dom_processing>
-	<avg_time_dom_completion>0</avg_time_dom_completion>
-	<avg_time_on_load>0</avg_time_on_load>
-	<avg_page_load_time>0</avg_page_load_time>
-	<nb_conversions>2</nb_conversions>
-	<nb_visits_converted>1</nb_visits_converted>
-	<revenue>2546</revenue>
-	<conversion_rate>50%</conversion_rate>
-	<nb_conversions_new_visit>2</nb_conversions_new_visit>
-	<nb_visits_converted_new_visit>1</nb_visits_converted_new_visit>
-	<revenue_new_visit>2546</revenue_new_visit>
-	<conversion_rate_new_visit>50%</conversion_rate_new_visit>
-	<nb_conversions_returning_visit>0</nb_conversions_returning_visit>
-	<nb_visits_converted_returning_visit>0</nb_visits_converted_returning_visit>
-	<revenue_returning_visit>0</revenue_returning_visit>
-	<conversion_rate_returning_visit>0%</conversion_rate_returning_visit>
-	<nb_total_overall_bandwidth>0</nb_total_overall_bandwidth>
-	<nb_total_pageview_bandwidth>0</nb_total_pageview_bandwidth>
-	<nb_total_download_bandwidth>0</nb_total_download_bandwidth>
-	<nb_pageviews>3</nb_pageviews>
-	<nb_uniq_pageviews>3</nb_uniq_pageviews>
-	<nb_downloads>0</nb_downloads>
-	<nb_uniq_downloads>0</nb_uniq_downloads>
-	<nb_outlinks>0</nb_outlinks>
-	<nb_uniq_outlinks>0</nb_uniq_outlinks>
-	<nb_searches>1</nb_searches>
-	<nb_keywords>1</nb_keywords>
-	<bounce_rate>0%</bounce_rate>
-	<nb_actions_per_visit>2</nb_actions_per_visit>
-	<avg_time_on_site>633</avg_time_on_site>
-</result>
\ No newline at end of file
diff --git a/tests/System/expected/test_Old__Actions.getPageUrls_day.xml b/tests/System/expected/test_Old__Actions.getPageUrls_day.xml
deleted file mode 100644
index 5d9cf83..0000000
--- a/tests/System/expected/test_Old__Actions.getPageUrls_day.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<result>
-	<row>
-		<label>sub</label>
-		<nb_visits>2</nb_visits>
-		<nb_hits>2</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 />
-		<entry_nb_visits>1</entry_nb_visits>
-		<entry_nb_actions>2</entry_nb_actions>
-		<entry_sum_visit_length>721</entry_sum_visit_length>
-		<entry_bounce_count>0</entry_bounce_count>
-		<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>180</avg_time_on_page>
-		<bounce_rate>0%</bounce_rate>
-		<exit_rate>50%</exit_rate>
-		<segment>pageUrl=^http%253A%252F%252Fpiwik.net%252Fsub</segment>
-		<subtable>
-			<row>
-				<label>/page</label>
-				<nb_visits>2</nb_visits>
-				<nb_uniq_visitors>2</nb_uniq_visitors>
-				<nb_hits>2</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 />
-				<entry_nb_uniq_visitors>1</entry_nb_uniq_visitors>
-				<entry_nb_visits>1</entry_nb_visits>
-				<entry_nb_actions>2</entry_nb_actions>
-				<entry_sum_visit_length>721</entry_sum_visit_length>
-				<entry_bounce_count>0</entry_bounce_count>
-				<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>
-				<bounce_rate>0%</bounce_rate>
-				<exit_rate>50%</exit_rate>
-				<url>http://example.com/sub/page</url>
-				<segment>pageUrl==http%253A%252F%252Fexample.com%252Fsub%252Fpage</segment>
-			</row>
-		</subtable>
-	</row>
-	<row>
-		<label>/index</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 />
-		<entry_nb_uniq_visitors>1</entry_nb_uniq_visitors>
-		<entry_nb_visits>1</entry_nb_visits>
-		<entry_nb_actions>2</entry_nb_actions>
-		<entry_sum_visit_length>544</entry_sum_visit_length>
-		<entry_bounce_count>0</entry_bounce_count>
-		<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.com/</url>
-		<segment>pageUrl==http%253A%252F%252Fexample.com%252F</segment>
-	</row>
-</result>
\ No newline at end of file
diff --git a/tests/System/expected/test_Old__Actions.getPageUrls_year.xml b/tests/System/expected/test_Old__Actions.getPageUrls_year.xml
deleted file mode 100644
index 187d005..0000000
--- a/tests/System/expected/test_Old__Actions.getPageUrls_year.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<result>
-	<row>
-		<label>sub</label>
-		<nb_visits>2</nb_visits>
-		<nb_hits>2</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 />
-		<entry_nb_visits>1</entry_nb_visits>
-		<entry_nb_actions>2</entry_nb_actions>
-		<entry_sum_visit_length>721</entry_sum_visit_length>
-		<entry_bounce_count>0</entry_bounce_count>
-		<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>180</avg_time_on_page>
-		<bounce_rate>0%</bounce_rate>
-		<exit_rate>50%</exit_rate>
-		<segment>pageUrl=^http%253A%252F%252Fpiwik.net%252Fsub</segment>
-		<subtable>
-			<row>
-				<label>/page</label>
-				<nb_visits>2</nb_visits>
-				<nb_hits>2</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 />
-				<entry_nb_visits>1</entry_nb_visits>
-				<entry_nb_actions>2</entry_nb_actions>
-				<entry_sum_visit_length>721</entry_sum_visit_length>
-				<entry_bounce_count>0</entry_bounce_count>
-				<exit_nb_visits>1</exit_nb_visits>
-				<sum_daily_nb_uniq_visitors>2</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>
-				<avg_time_on_page>180</avg_time_on_page>
-				<bounce_rate>0%</bounce_rate>
-				<exit_rate>50%</exit_rate>
-				<url>http://example.com/sub/page</url>
-				<segment>pageUrl==http%253A%252F%252Fexample.com%252Fsub%252Fpage</segment>
-			</row>
-		</subtable>
-	</row>
-	<row>
-		<label>/index</label>
-		<nb_visits>1</nb_visits>
-		<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 />
-		<entry_nb_visits>1</entry_nb_visits>
-		<entry_nb_actions>2</entry_nb_actions>
-		<entry_sum_visit_length>544</entry_sum_visit_length>
-		<entry_bounce_count>0</entry_bounce_count>
-		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-		<sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
-		<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.com/</url>
-		<segment>pageUrl==http%253A%252F%252Fexample.com%252F</segment>
-	</row>
-</result>
\ No newline at end of file
diff --git a/tests/System/expected/test_Old__CustomDimensions.getConfiguredCustomDimensions.xml b/tests/System/expected/test_Old__CustomDimensions.getConfiguredCustomDimensions.xml
deleted file mode 100644
index d4aa297..0000000
--- a/tests/System/expected/test_Old__CustomDimensions.getConfiguredCustomDimensions.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<result>
-	<row>
-		<idcustomdimension>1</idcustomdimension>
-		<idsite>1</idsite>
-		<name>MyName1</name>
-		<index>1</index>
-		<scope>visit</scope>
-		<active>1</active>
-		<extractions>
-		</extractions>
-		<case_sensitive>1</case_sensitive>
-	</row>
-	<row>
-		<idcustomdimension>2</idcustomdimension>
-		<idsite>1</idsite>
-		<name>MyName2</name>
-		<index>1</index>
-		<scope>action</scope>
-		<active>1</active>
-		<extractions>
-		</extractions>
-		<case_sensitive>1</case_sensitive>
-	</row>
-	<row>
-		<idcustomdimension>3</idcustomdimension>
-		<idsite>1</idsite>
-		<name>MyName3</name>
-		<index>2</index>
-		<scope>action</scope>
-		<active>0</active>
-		<extractions>
-		</extractions>
-		<case_sensitive>1</case_sensitive>
-	</row>
-</result>
\ No newline at end of file
diff --git a/tests/System/expected/test_Old__Live.getLastVisitsDetails_day.xml b/tests/System/expected/test_Old__Live.getLastVisitsDetails_day.xml
deleted file mode 100644
index 1f6f55a..0000000
--- a/tests/System/expected/test_Old__Live.getLastVisitsDetails_day.xml
+++ /dev/null
@@ -1,374 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<result>
-	<row>
-		<idSite>1</idSite>
-		<idVisit>2</idVisit>
-		<visitIp>56.11.55.73</visitIp>
-		
-		<fingerprint>3d7de8315a349072</fingerprint>
-		<actionDetails>
-			<row>
-				<type>action</type>
-				<url>http://example.com/sub/page</url>
-				<pageTitle>Viewing homepage</pageTitle>
-				
-				
-				
-				<pageId>3</pageId>
-				<bandwidth />
-				<timeSpent>360</timeSpent>
-				<timeSpentPretty>6 min 0s</timeSpentPretty>
-				<pageviewPosition>1</pageviewPosition>
-				<title>Viewing homepage</title>
-				<subtitle>http://example.com/sub/page</subtitle>
-				<icon />
-				<iconSVG>plugins/Morpheus/images/action.svg</iconSVG>
-				
-				<dimension2 />
-				<bandwidth_pretty>0 M</bandwidth_pretty>
-			</row>
-			<row>
-				<type>search</type>
-				<url />
-				
-				
-				
-				<pageId>4</pageId>
-				<bandwidth />
-				<timeSpent>361</timeSpent>
-				<timeSpentPretty>6 min 1s</timeSpentPretty>
-				<siteSearchKeyword>this is a site search query</siteSearchKeyword>
-				<siteSearchCategory />
-				<siteSearchCount />
-				<pageviewPosition>2</pageviewPosition>
-				<icon>plugins/Morpheus/images/search.png</icon>
-				<iconSVG>plugins/Morpheus/images/search.svg</iconSVG>
-				<title>Site Search</title>
-				<subtitle>this is a site search query</subtitle>
-				
-				<dimension2 />
-				<bandwidth_pretty>0 M</bandwidth_pretty>
-			</row>
-			<row>
-				<type>ecommerceAbandonedCart</type>
-				<revenue>2541</revenue>
-				<items>1</items>
-				
-				
-				<itemDetails>
-					<row>
-						<itemSKU>SKU_ID2</itemSKU>
-						<itemName>A durable item</itemName>
-						<itemCategory>Best seller</itemCategory>
-						<price>321</price>
-						<quantity>1</quantity>
-						<categories>
-						<row>Best seller</row>
-						</categories>
-					</row>
-				</itemDetails>
-				<icon>plugins/Morpheus/images/ecommerceAbandonedCart.png</icon>
-				<iconSVG>plugins/Morpheus/images/ecommerceAbandonedCart.svg</iconSVG>
-				<title>Abandoned Cart</title>
-				<subtitle>$2,541 revenue - 1 items: A durable item)</subtitle>
-				
-				<dimension2 />
-			</row>
-		</actionDetails>
-		<goalConversions>0</goalConversions>
-		<siteCurrency>USD</siteCurrency>
-		<siteCurrencySymbol>$</siteCurrencySymbol>
-		
-		
-		
-		
-		<siteName>MigrationSite</siteName>
-		
-		
-		
-		
-		
-		
-		<userId />
-		<visitorType>new</visitorType>
-		<visitorTypeIcon />
-		<visitConverted>0</visitConverted>
-		<visitConvertedIcon />
-		<visitCount>1</visitCount>
-		<visitEcommerceStatus>abandonedCart</visitEcommerceStatus>
-		<visitEcommerceStatusIcon>plugins/Morpheus/images/ecommerceAbandonedCart.svg</visitEcommerceStatusIcon>
-		<daysSinceFirstVisit>0</daysSinceFirstVisit>
-		<secondsSinceFirstVisit>0</secondsSinceFirstVisit>
-		<daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
-		<secondsSinceLastEcommerceOrder />
-		<visitDuration>721</visitDuration>
-		<visitDurationPretty>12 min 1s</visitDurationPretty>
-		<searches>1</searches>
-		<actions>2</actions>
-		<interactions>2</interactions>
-		<referrerType>direct</referrerType>
-		<referrerTypeName>Direct Entry</referrerTypeName>
-		<referrerName />
-		<referrerKeyword />
-		<referrerKeywordPosition />
-		<referrerUrl />
-		<referrerSearchEngineUrl />
-		<referrerSearchEngineIcon />
-		<referrerSocialNetworkUrl />
-		<referrerSocialNetworkIcon />
-		<languageCode>fr</languageCode>
-		<language>French</language>
-		<deviceType>Desktop</deviceType>
-		<deviceTypeIcon>plugins/Morpheus/icons/dist/devices/desktop.png</deviceTypeIcon>
-		<deviceBrand>Unknown</deviceBrand>
-		<deviceModel>Generic Desktop</deviceModel>
-		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemName>Windows</operatingSystemName>
-		<operatingSystemIcon>plugins/Morpheus/icons/dist/os/WIN.png</operatingSystemIcon>
-		<operatingSystemCode>WIN</operatingSystemCode>
-		<operatingSystemVersion>XP</operatingSystemVersion>
-		<browserFamily>Gecko</browserFamily>
-		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
-		<browser>Firefox 3.6</browser>
-		<browserName>Firefox</browserName>
-		<browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon>
-		<browserCode>FF</browserCode>
-		<browserVersion>3.6</browserVersion>
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>2541</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>1</totalAbandonedCarts>
-		<totalAbandonedCartsItems>1</totalAbandonedCartsItems>
-		<events>0</events>
-		<continent>Europe</continent>
-		<continentCode>eur</continentCode>
-		<country>France</country>
-		<countryCode>fr</countryCode>
-		<countryFlag>plugins/Morpheus/icons/dist/flags/fr.png</countryFlag>
-		<region />
-		<regionCode />
-		<city />
-		<location>France</location>
-		<latitude />
-		<longitude />
-		<visitLocalTime>12:34:06</visitLocalTime>
-		<visitLocalHour>12</visitLocalHour>
-		<daysSinceLastVisit>0</daysSinceLastVisit>
-		<secondsSinceLastVisit>0</secondsSinceLastVisit>
-		<resolution>1024x768</resolution>
-		<plugins>cookie, flash, java</plugins>
-		<pluginsIcons>
-			<row>
-				<pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon>
-				<pluginName>cookie</pluginName>
-			</row>
-			<row>
-				<pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon>
-				<pluginName>flash</pluginName>
-			</row>
-			<row>
-				<pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon>
-				<pluginName>java</pluginName>
-			</row>
-		</pluginsIcons>
-		<dimension1 />
-		<customVariables>
-		</customVariables>
-	</row>
-	<row>
-		<idSite>1</idSite>
-		<idVisit>1</idVisit>
-		<visitIp>156.5.3.2</visitIp>
-		
-		<fingerprint>e16cf2bbaeea2c88</fingerprint>
-		<actionDetails>
-			<row>
-				<type>action</type>
-				<url>http://example.com/</url>
-				<pageTitle>Viewing homepage</pageTitle>
-				
-				
-				
-				<pageId>1</pageId>
-				<bandwidth />
-				<timeSpent>360</timeSpent>
-				<timeSpentPretty>6 min 0s</timeSpentPretty>
-				<pageviewPosition>1</pageviewPosition>
-				<title>Viewing homepage</title>
-				<subtitle>http://example.com/</subtitle>
-				<icon />
-				<iconSVG>plugins/Morpheus/images/action.svg</iconSVG>
-				
-				<dimension2 />
-				<bandwidth_pretty>0 M</bandwidth_pretty>
-			</row>
-			<row>
-				<type>action</type>
-				<url>http://example.com/sub/page</url>
-				<pageTitle>Second page view</pageTitle>
-				
-				
-				
-				<pageId>2</pageId>
-				<bandwidth />
-				<timeSpent>184</timeSpent>
-				<timeSpentPretty>3 min 4s</timeSpentPretty>
-				<pageviewPosition>2</pageviewPosition>
-				<title>Second page view</title>
-				<subtitle>http://example.com/sub/page</subtitle>
-				<icon />
-				<iconSVG>plugins/Morpheus/images/action.svg</iconSVG>
-				
-				<dimension2 />
-				<bandwidth_pretty>0 M</bandwidth_pretty>
-			</row>
-			<row>
-				<type>ecommerceOrder</type>
-				<orderId>TestingOrder</orderId>
-				<revenue>2541</revenue>
-				<revenueSubTotal>0</revenueSubTotal>
-				<revenueTax>0</revenueTax>
-				<revenueShipping>0</revenueShipping>
-				<revenueDiscount>0</revenueDiscount>
-				<items>33</items>
-				
-				
-				<itemDetails>
-					<row>
-						<itemSKU>SKU_ID</itemSKU>
-						<itemName>Test item!</itemName>
-						<itemCategory>Test &amp; Category</itemCategory>
-						<price>777</price>
-						<quantity>33</quantity>
-						<categories>
-						<row>Test &amp; Category</row>
-						</categories>
-					</row>
-				</itemDetails>
-				<icon>plugins/Morpheus/images/ecommerceOrder.png</icon>
-				<iconSVG>plugins/Morpheus/images/ecommerceOrder.svg</iconSVG>
-				<title>Ordered (TestingOrder)</title>
-				<subtitle>$2,541 revenue - 33 items: Test item!)</subtitle>
-				
-				<dimension2 />
-			</row>
-			<row>
-				<type>goal</type>
-				<goalName>Download Software</goalName>
-				<goalId>1</goalId>
-				
-				<revenue>5</revenue>
-				<goalPageId />
-				
-				<url>http://example.com/sub/page</url>
-				<icon>plugins/Morpheus/images/goal.png</icon>
-				<iconSVG>plugins/Morpheus/images/goal.svg</iconSVG>
-				<title>Goal conversion</title>
-				<subtitle>Download Software ($5 revenue)</subtitle>
-				
-				<dimension2 />
-			</row>
-		</actionDetails>
-		<goalConversions>1</goalConversions>
-		<siteCurrency>USD</siteCurrency>
-		<siteCurrencySymbol>$</siteCurrencySymbol>
-		
-		
-		
-		
-		<siteName>MigrationSite</siteName>
-		
-		
-		
-		
-		
-		
-		<userId />
-		<visitorType>new</visitorType>
-		<visitorTypeIcon />
-		<visitConverted>1</visitConverted>
-		<visitConvertedIcon>plugins/Morpheus/images/goal.svg</visitConvertedIcon>
-		<visitCount>1</visitCount>
-		<visitEcommerceStatus>ordered</visitEcommerceStatus>
-		<visitEcommerceStatusIcon>plugins/Morpheus/images/ecommerceOrder.svg</visitEcommerceStatusIcon>
-		<daysSinceFirstVisit>0</daysSinceFirstVisit>
-		<secondsSinceFirstVisit>0</secondsSinceFirstVisit>
-		<daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
-		<secondsSinceLastEcommerceOrder>0</secondsSinceLastEcommerceOrder>
-		<visitDuration>544</visitDuration>
-		<visitDurationPretty>9 min 4s</visitDurationPretty>
-		<searches>0</searches>
-		<actions>2</actions>
-		<interactions>2</interactions>
-		<referrerType>direct</referrerType>
-		<referrerTypeName>Direct Entry</referrerTypeName>
-		<referrerName />
-		<referrerKeyword />
-		<referrerKeywordPosition />
-		<referrerUrl />
-		<referrerSearchEngineUrl />
-		<referrerSearchEngineIcon />
-		<referrerSocialNetworkUrl />
-		<referrerSocialNetworkIcon />
-		<languageCode>fr</languageCode>
-		<language>French</language>
-		<deviceType>Desktop</deviceType>
-		<deviceTypeIcon>plugins/Morpheus/icons/dist/devices/desktop.png</deviceTypeIcon>
-		<deviceBrand>Unknown</deviceBrand>
-		<deviceModel>Generic Desktop</deviceModel>
-		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemName>Windows</operatingSystemName>
-		<operatingSystemIcon>plugins/Morpheus/icons/dist/os/WIN.png</operatingSystemIcon>
-		<operatingSystemCode>WIN</operatingSystemCode>
-		<operatingSystemVersion>XP</operatingSystemVersion>
-		<browserFamily>Gecko</browserFamily>
-		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
-		<browser>Firefox 3.6</browser>
-		<browserName>Firefox</browserName>
-		<browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon>
-		<browserCode>FF</browserCode>
-		<browserVersion>3.6</browserVersion>
-		<totalEcommerceRevenue>2541</totalEcommerceRevenue>
-		<totalEcommerceConversions>1</totalEcommerceConversions>
-		<totalEcommerceItems>33</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
-		<events>0</events>
-		<continent>Europe</continent>
-		<continentCode>eur</continentCode>
-		<country>France</country>
-		<countryCode>fr</countryCode>
-		<countryFlag>plugins/Morpheus/icons/dist/flags/fr.png</countryFlag>
-		<region />
-		<regionCode />
-		<city />
-		<location>France</location>
-		<latitude />
-		<longitude />
-		<visitLocalTime>12:34:06</visitLocalTime>
-		<visitLocalHour>12</visitLocalHour>
-		<daysSinceLastVisit>0</daysSinceLastVisit>
-		<secondsSinceLastVisit>0</secondsSinceLastVisit>
-		<resolution>1024x768</resolution>
-		<plugins>cookie, flash, java</plugins>
-		<pluginsIcons>
-			<row>
-				<pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon>
-				<pluginName>cookie</pluginName>
-			</row>
-			<row>
-				<pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon>
-				<pluginName>flash</pluginName>
-			</row>
-			<row>
-				<pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon>
-				<pluginName>java</pluginName>
-			</row>
-		</pluginsIcons>
-		<dimension1 />
-		<customVariables>
-		</customVariables>
-	</row>
-</result>
\ No newline at end of file
diff --git a/tests/System/expected/test_Old__Live.getLastVisitsDetails_year.xml b/tests/System/expected/test_Old__Live.getLastVisitsDetails_year.xml
deleted file mode 100644
index 1f6f55a..0000000
--- a/tests/System/expected/test_Old__Live.getLastVisitsDetails_year.xml
+++ /dev/null
@@ -1,374 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<result>
-	<row>
-		<idSite>1</idSite>
-		<idVisit>2</idVisit>
-		<visitIp>56.11.55.73</visitIp>
-		
-		<fingerprint>3d7de8315a349072</fingerprint>
-		<actionDetails>
-			<row>
-				<type>action</type>
-				<url>http://example.com/sub/page</url>
-				<pageTitle>Viewing homepage</pageTitle>
-				
-				
-				
-				<pageId>3</pageId>
-				<bandwidth />
-				<timeSpent>360</timeSpent>
-				<timeSpentPretty>6 min 0s</timeSpentPretty>
-				<pageviewPosition>1</pageviewPosition>
-				<title>Viewing homepage</title>
-				<subtitle>http://example.com/sub/page</subtitle>
-				<icon />
-				<iconSVG>plugins/Morpheus/images/action.svg</iconSVG>
-				
-				<dimension2 />
-				<bandwidth_pretty>0 M</bandwidth_pretty>
-			</row>
-			<row>
-				<type>search</type>
-				<url />
-				
-				
-				
-				<pageId>4</pageId>
-				<bandwidth />
-				<timeSpent>361</timeSpent>
-				<timeSpentPretty>6 min 1s</timeSpentPretty>
-				<siteSearchKeyword>this is a site search query</siteSearchKeyword>
-				<siteSearchCategory />
-				<siteSearchCount />
-				<pageviewPosition>2</pageviewPosition>
-				<icon>plugins/Morpheus/images/search.png</icon>
-				<iconSVG>plugins/Morpheus/images/search.svg</iconSVG>
-				<title>Site Search</title>
-				<subtitle>this is a site search query</subtitle>
-				
-				<dimension2 />
-				<bandwidth_pretty>0 M</bandwidth_pretty>
-			</row>
-			<row>
-				<type>ecommerceAbandonedCart</type>
-				<revenue>2541</revenue>
-				<items>1</items>
-				
-				
-				<itemDetails>
-					<row>
-						<itemSKU>SKU_ID2</itemSKU>
-						<itemName>A durable item</itemName>
-						<itemCategory>Best seller</itemCategory>
-						<price>321</price>
-						<quantity>1</quantity>
-						<categories>
-						<row>Best seller</row>
-						</categories>
-					</row>
-				</itemDetails>
-				<icon>plugins/Morpheus/images/ecommerceAbandonedCart.png</icon>
-				<iconSVG>plugins/Morpheus/images/ecommerceAbandonedCart.svg</iconSVG>
-				<title>Abandoned Cart</title>
-				<subtitle>$2,541 revenue - 1 items: A durable item)</subtitle>
-				
-				<dimension2 />
-			</row>
-		</actionDetails>
-		<goalConversions>0</goalConversions>
-		<siteCurrency>USD</siteCurrency>
-		<siteCurrencySymbol>$</siteCurrencySymbol>
-		
-		
-		
-		
-		<siteName>MigrationSite</siteName>
-		
-		
-		
-		
-		
-		
-		<userId />
-		<visitorType>new</visitorType>
-		<visitorTypeIcon />
-		<visitConverted>0</visitConverted>
-		<visitConvertedIcon />
-		<visitCount>1</visitCount>
-		<visitEcommerceStatus>abandonedCart</visitEcommerceStatus>
-		<visitEcommerceStatusIcon>plugins/Morpheus/images/ecommerceAbandonedCart.svg</visitEcommerceStatusIcon>
-		<daysSinceFirstVisit>0</daysSinceFirstVisit>
-		<secondsSinceFirstVisit>0</secondsSinceFirstVisit>
-		<daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
-		<secondsSinceLastEcommerceOrder />
-		<visitDuration>721</visitDuration>
-		<visitDurationPretty>12 min 1s</visitDurationPretty>
-		<searches>1</searches>
-		<actions>2</actions>
-		<interactions>2</interactions>
-		<referrerType>direct</referrerType>
-		<referrerTypeName>Direct Entry</referrerTypeName>
-		<referrerName />
-		<referrerKeyword />
-		<referrerKeywordPosition />
-		<referrerUrl />
-		<referrerSearchEngineUrl />
-		<referrerSearchEngineIcon />
-		<referrerSocialNetworkUrl />
-		<referrerSocialNetworkIcon />
-		<languageCode>fr</languageCode>
-		<language>French</language>
-		<deviceType>Desktop</deviceType>
-		<deviceTypeIcon>plugins/Morpheus/icons/dist/devices/desktop.png</deviceTypeIcon>
-		<deviceBrand>Unknown</deviceBrand>
-		<deviceModel>Generic Desktop</deviceModel>
-		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemName>Windows</operatingSystemName>
-		<operatingSystemIcon>plugins/Morpheus/icons/dist/os/WIN.png</operatingSystemIcon>
-		<operatingSystemCode>WIN</operatingSystemCode>
-		<operatingSystemVersion>XP</operatingSystemVersion>
-		<browserFamily>Gecko</browserFamily>
-		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
-		<browser>Firefox 3.6</browser>
-		<browserName>Firefox</browserName>
-		<browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon>
-		<browserCode>FF</browserCode>
-		<browserVersion>3.6</browserVersion>
-		<totalEcommerceRevenue>0</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>2541</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>1</totalAbandonedCarts>
-		<totalAbandonedCartsItems>1</totalAbandonedCartsItems>
-		<events>0</events>
-		<continent>Europe</continent>
-		<continentCode>eur</continentCode>
-		<country>France</country>
-		<countryCode>fr</countryCode>
-		<countryFlag>plugins/Morpheus/icons/dist/flags/fr.png</countryFlag>
-		<region />
-		<regionCode />
-		<city />
-		<location>France</location>
-		<latitude />
-		<longitude />
-		<visitLocalTime>12:34:06</visitLocalTime>
-		<visitLocalHour>12</visitLocalHour>
-		<daysSinceLastVisit>0</daysSinceLastVisit>
-		<secondsSinceLastVisit>0</secondsSinceLastVisit>
-		<resolution>1024x768</resolution>
-		<plugins>cookie, flash, java</plugins>
-		<pluginsIcons>
-			<row>
-				<pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon>
-				<pluginName>cookie</pluginName>
-			</row>
-			<row>
-				<pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon>
-				<pluginName>flash</pluginName>
-			</row>
-			<row>
-				<pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon>
-				<pluginName>java</pluginName>
-			</row>
-		</pluginsIcons>
-		<dimension1 />
-		<customVariables>
-		</customVariables>
-	</row>
-	<row>
-		<idSite>1</idSite>
-		<idVisit>1</idVisit>
-		<visitIp>156.5.3.2</visitIp>
-		
-		<fingerprint>e16cf2bbaeea2c88</fingerprint>
-		<actionDetails>
-			<row>
-				<type>action</type>
-				<url>http://example.com/</url>
-				<pageTitle>Viewing homepage</pageTitle>
-				
-				
-				
-				<pageId>1</pageId>
-				<bandwidth />
-				<timeSpent>360</timeSpent>
-				<timeSpentPretty>6 min 0s</timeSpentPretty>
-				<pageviewPosition>1</pageviewPosition>
-				<title>Viewing homepage</title>
-				<subtitle>http://example.com/</subtitle>
-				<icon />
-				<iconSVG>plugins/Morpheus/images/action.svg</iconSVG>
-				
-				<dimension2 />
-				<bandwidth_pretty>0 M</bandwidth_pretty>
-			</row>
-			<row>
-				<type>action</type>
-				<url>http://example.com/sub/page</url>
-				<pageTitle>Second page view</pageTitle>
-				
-				
-				
-				<pageId>2</pageId>
-				<bandwidth />
-				<timeSpent>184</timeSpent>
-				<timeSpentPretty>3 min 4s</timeSpentPretty>
-				<pageviewPosition>2</pageviewPosition>
-				<title>Second page view</title>
-				<subtitle>http://example.com/sub/page</subtitle>
-				<icon />
-				<iconSVG>plugins/Morpheus/images/action.svg</iconSVG>
-				
-				<dimension2 />
-				<bandwidth_pretty>0 M</bandwidth_pretty>
-			</row>
-			<row>
-				<type>ecommerceOrder</type>
-				<orderId>TestingOrder</orderId>
-				<revenue>2541</revenue>
-				<revenueSubTotal>0</revenueSubTotal>
-				<revenueTax>0</revenueTax>
-				<revenueShipping>0</revenueShipping>
-				<revenueDiscount>0</revenueDiscount>
-				<items>33</items>
-				
-				
-				<itemDetails>
-					<row>
-						<itemSKU>SKU_ID</itemSKU>
-						<itemName>Test item!</itemName>
-						<itemCategory>Test &amp; Category</itemCategory>
-						<price>777</price>
-						<quantity>33</quantity>
-						<categories>
-						<row>Test &amp; Category</row>
-						</categories>
-					</row>
-				</itemDetails>
-				<icon>plugins/Morpheus/images/ecommerceOrder.png</icon>
-				<iconSVG>plugins/Morpheus/images/ecommerceOrder.svg</iconSVG>
-				<title>Ordered (TestingOrder)</title>
-				<subtitle>$2,541 revenue - 33 items: Test item!)</subtitle>
-				
-				<dimension2 />
-			</row>
-			<row>
-				<type>goal</type>
-				<goalName>Download Software</goalName>
-				<goalId>1</goalId>
-				
-				<revenue>5</revenue>
-				<goalPageId />
-				
-				<url>http://example.com/sub/page</url>
-				<icon>plugins/Morpheus/images/goal.png</icon>
-				<iconSVG>plugins/Morpheus/images/goal.svg</iconSVG>
-				<title>Goal conversion</title>
-				<subtitle>Download Software ($5 revenue)</subtitle>
-				
-				<dimension2 />
-			</row>
-		</actionDetails>
-		<goalConversions>1</goalConversions>
-		<siteCurrency>USD</siteCurrency>
-		<siteCurrencySymbol>$</siteCurrencySymbol>
-		
-		
-		
-		
-		<siteName>MigrationSite</siteName>
-		
-		
-		
-		
-		
-		
-		<userId />
-		<visitorType>new</visitorType>
-		<visitorTypeIcon />
-		<visitConverted>1</visitConverted>
-		<visitConvertedIcon>plugins/Morpheus/images/goal.svg</visitConvertedIcon>
-		<visitCount>1</visitCount>
-		<visitEcommerceStatus>ordered</visitEcommerceStatus>
-		<visitEcommerceStatusIcon>plugins/Morpheus/images/ecommerceOrder.svg</visitEcommerceStatusIcon>
-		<daysSinceFirstVisit>0</daysSinceFirstVisit>
-		<secondsSinceFirstVisit>0</secondsSinceFirstVisit>
-		<daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
-		<secondsSinceLastEcommerceOrder>0</secondsSinceLastEcommerceOrder>
-		<visitDuration>544</visitDuration>
-		<visitDurationPretty>9 min 4s</visitDurationPretty>
-		<searches>0</searches>
-		<actions>2</actions>
-		<interactions>2</interactions>
-		<referrerType>direct</referrerType>
-		<referrerTypeName>Direct Entry</referrerTypeName>
-		<referrerName />
-		<referrerKeyword />
-		<referrerKeywordPosition />
-		<referrerUrl />
-		<referrerSearchEngineUrl />
-		<referrerSearchEngineIcon />
-		<referrerSocialNetworkUrl />
-		<referrerSocialNetworkIcon />
-		<languageCode>fr</languageCode>
-		<language>French</language>
-		<deviceType>Desktop</deviceType>
-		<deviceTypeIcon>plugins/Morpheus/icons/dist/devices/desktop.png</deviceTypeIcon>
-		<deviceBrand>Unknown</deviceBrand>
-		<deviceModel>Generic Desktop</deviceModel>
-		<operatingSystem>Windows XP</operatingSystem>
-		<operatingSystemName>Windows</operatingSystemName>
-		<operatingSystemIcon>plugins/Morpheus/icons/dist/os/WIN.png</operatingSystemIcon>
-		<operatingSystemCode>WIN</operatingSystemCode>
-		<operatingSystemVersion>XP</operatingSystemVersion>
-		<browserFamily>Gecko</browserFamily>
-		<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
-		<browser>Firefox 3.6</browser>
-		<browserName>Firefox</browserName>
-		<browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon>
-		<browserCode>FF</browserCode>
-		<browserVersion>3.6</browserVersion>
-		<totalEcommerceRevenue>2541</totalEcommerceRevenue>
-		<totalEcommerceConversions>1</totalEcommerceConversions>
-		<totalEcommerceItems>33</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
-		<events>0</events>
-		<continent>Europe</continent>
-		<continentCode>eur</continentCode>
-		<country>France</country>
-		<countryCode>fr</countryCode>
-		<countryFlag>plugins/Morpheus/icons/dist/flags/fr.png</countryFlag>
-		<region />
-		<regionCode />
-		<city />
-		<location>France</location>
-		<latitude />
-		<longitude />
-		<visitLocalTime>12:34:06</visitLocalTime>
-		<visitLocalHour>12</visitLocalHour>
-		<daysSinceLastVisit>0</daysSinceLastVisit>
-		<secondsSinceLastVisit>0</secondsSinceLastVisit>
-		<resolution>1024x768</resolution>
-		<plugins>cookie, flash, java</plugins>
-		<pluginsIcons>
-			<row>
-				<pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon>
-				<pluginName>cookie</pluginName>
-			</row>
-			<row>
-				<pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon>
-				<pluginName>flash</pluginName>
-			</row>
-			<row>
-				<pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon>
-				<pluginName>java</pluginName>
-			</row>
-		</pluginsIcons>
-		<dimension1 />
-		<customVariables>
-		</customVariables>
-	</row>
-</result>
\ No newline at end of file
diff --git a/tests/System/expected/test_Old__SitesManager.getSiteFromId.xml b/tests/System/expected/test_Old__SitesManager.getSiteFromId.xml
deleted file mode 100644
index baed96d..0000000
--- a/tests/System/expected/test_Old__SitesManager.getSiteFromId.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<result>
-	<row>
-		<idsite>1</idsite>
-		<name>MigrationSite</name>
-		<main_url>http://piwik.net</main_url>
-		<ts_created>2013-01-22 00:00:00</ts_created>
-		<ecommerce>1</ecommerce>
-		<sitesearch>1</sitesearch>
-		<sitesearch_keyword_parameters />
-		<sitesearch_category_parameters />
-		<timezone>UTC</timezone>
-		<currency>USD</currency>
-		<exclude_unknown_urls>0</exclude_unknown_urls>
-		<excluded_ips />
-		<excluded_parameters />
-		<excluded_user_agents />
-		<group />
-		<type>website</type>
-		<keep_url_fragment>0</keep_url_fragment>
-		<creator_login>superUserLogin</creator_login>
-		<timezone_name>UTC</timezone_name>
-		<currency_name>US Dollar</currency_name>
-	</row>
-</result>
\ No newline at end of file