Fix build (#15143)

* Update expected test files.

* Try to increase timeout.

* update screenshots

* update more screenshots

* fix more tests

* Update screenshots.

* Update submodule.

* Fixing another test.

* Updating submodule.

* update submodule

* update submodule

* update submodule

* fix more tests

* fix fixture

* update screenshots

* update submodule

14 files changed, 154 insertions, 254 deletions

diff --git a/tests/PHPUnit/Framework/Fixture.php b/tests/PHPUnit/Framework/Fixture.php
index 2c7d122183..3656785150 100644
--- a/tests/PHPUnit/Framework/Fixture.php
+++ b/tests/PHPUnit/Framework/Fixture.php
@@ -895,7 +895,7 @@ class Fixture extends \PHPUnit_Framework_Assert
         // on travis ci make sure log importer won't hang forever, otherwise the output will never be printed
         // and no one will know why the build fails.
         if (SystemTestCase::isTravisCI()) {
-            $cmd = "timeout 5m $cmd";
+            $cmd = "timeout 10m $cmd";
         }
 
         exec($cmd, $output, $result);
diff --git a/tests/PHPUnit/System/expected/test_CustomEvents_Events.getAction_lastN__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents_Events.getAction_lastN__API.getProcessedReport_day.xml
index 21e0f6a7d3..e3970b7085 100644
--- a/tests/PHPUnit/System/expected/test_CustomEvents_Events.getAction_lastN__API.getProcessedReport_day.xml
+++ b/tests/PHPUnit/System/expected/test_CustomEvents_Events.getAction_lastN__API.getProcessedReport_day.xml
@@ -287,57 +287,57 @@
 			<row>
 				
 				<segment>eventAction==playTrailer</segment>
-				<idsubdatatable>4</idsubdatatable>
+				
 			</row>
 			<row>
 				
 				<segment>eventAction==Search</segment>
-				<idsubdatatable>2</idsubdatatable>
+				
 			</row>
 			<row>
 				
 				<segment>eventAction==play25%25</segment>
-				<idsubdatatable>9</idsubdatatable>
+				
 			</row>
 			<row>
 				
 				<segment>eventAction==play50%25</segment>
-				<idsubdatatable>11</idsubdatatable>
+				
 			</row>
 			<row>
 				
 				<segment>eventAction==play75%25</segment>
-				<idsubdatatable>5</idsubdatatable>
+				
 			</row>
 			<row>
 				
 				<segment>eventAction==playEnd</segment>
-				<idsubdatatable>7</idsubdatatable>
+				
 			</row>
 			<row>
 				
 				<segment>eventAction==rating</segment>
-				<idsubdatatable>10</idsubdatatable>
+				
 			</row>
 			<row>
 				
 				<segment>eventAction==clickBuyNow</segment>
-				<idsubdatatable>12</idsubdatatable>
+				
 			</row>
 			<row>
 				
 				<segment>eventAction==event+action+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+---%26gt%3B+SHOULD+APPEAR+IN+TEST+OUTPUT+NOT+TRUNCATED+%26lt%3B---</segment>
-				<idsubdatatable>6</idsubdatatable>
+				
 			</row>
 			<row>
 				
 				<segment>eventAction==play</segment>
-				<idsubdatatable>8</idsubdatatable>
+				
 			</row>
 			<row>
 				
 				<segment>eventAction==playStart</segment>
-				<idsubdatatable>3</idsubdatatable>
+				
 			</row>
 			<row>
 				<segment>eventAction==Purchase</segment>
@@ -350,57 +350,57 @@
 			<row>
 				
 				<segment>eventAction==playTrailer</segment>
-				<idsubdatatable>16</idsubdatatable>
+				
 			</row>
 			<row>
 				
 				<segment>eventAction==Search</segment>
-				<idsubdatatable>14</idsubdatatable>
+				
 			</row>
 			<row>
 				
 				<segment>eventAction==play25%25</segment>
-				<idsubdatatable>15</idsubdatatable>
+				
 			</row>
 			<row>
 				
 				<segment>eventAction==play50%25</segment>
-				<idsubdatatable>20</idsubdatatable>
+				
 			</row>
 			<row>
 				
 				<segment>eventAction==play75%25</segment>
-				<idsubdatatable>17</idsubdatatable>
+				
 			</row>
 			<row>
 				
 				<segment>eventAction==playEnd</segment>
-				<idsubdatatable>22</idsubdatatable>
+				
 			</row>
 			<row>
 				
 				<segment>eventAction==rating</segment>
-				<idsubdatatable>18</idsubdatatable>
+				
 			</row>
 			<row>
 				
 				<segment>eventAction==clickBuyNow</segment>
-				<idsubdatatable>21</idsubdatatable>
+				
 			</row>
 			<row>
 				
 				<segment>eventAction==event+action+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+---%26gt%3B+SHOULD+APPEAR+IN+TEST+OUTPUT+NOT+TRUNCATED+%26lt%3B---</segment>
-				<idsubdatatable>24</idsubdatatable>
+				
 			</row>
 			<row>
 				
 				<segment>eventAction==play</segment>
-				<idsubdatatable>19</idsubdatatable>
+				
 			</row>
 			<row>
 				
 				<segment>eventAction==playStart</segment>
-				<idsubdatatable>23</idsubdatatable>
+				
 			</row>
 			<row>
 				<segment>eventAction==Purchase</segment>
diff --git a/tests/PHPUnit/System/expected/test_CustomEvents_Events.getCategory_lastN__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents_Events.getCategory_lastN__API.getProcessedReport_day.xml
index 2c9318f3bd..aa720728fd 100644
--- a/tests/PHPUnit/System/expected/test_CustomEvents_Events.getCategory_lastN__API.getProcessedReport_day.xml
+++ b/tests/PHPUnit/System/expected/test_CustomEvents_Events.getCategory_lastN__API.getProcessedReport_day.xml
@@ -125,39 +125,39 @@
 			<row>
 				
 				<segment>eventCategory==Movie</segment>
-				<idsubdatatable>2</idsubdatatable>
+				
 			</row>
 			<row>
 				
 				<segment>eventCategory==Music</segment>
-				<idsubdatatable>3</idsubdatatable>
+				
 			</row>
 			<row>
 				
 				<segment>eventCategory==event+category+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+---%26gt%3B+SHOULD+APPEAR+IN+TEST+OUTPUT+NOT+TRUNCATED+%26lt%3B---</segment>
-				<idsubdatatable>4</idsubdatatable>
+				
 			</row>
 			<row>
 				
 				<segment>eventCategory==CategoryTriggersGoal+here</segment>
-				<idsubdatatable>5</idsubdatatable>
+				
 			</row>
 		</result>
 		<result prettyDate="Monday, January 4, 2010">
 			<row>
 				
 				<segment>eventCategory==Movie</segment>
-				<idsubdatatable>7</idsubdatatable>
+				
 			</row>
 			<row>
 				
 				<segment>eventCategory==Music</segment>
-				<idsubdatatable>8</idsubdatatable>
+				
 			</row>
 			<row>
 				
 				<segment>eventCategory==event+category+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+---%26gt%3B+SHOULD+APPEAR+IN+TEST+OUTPUT+NOT+TRUNCATED+%26lt%3B---</segment>
-				<idsubdatatable>9</idsubdatatable>
+				
 			</row>
 		</result>
 		<result prettyDate="Tuesday, January 5, 2010" />
diff --git a/tests/PHPUnit/System/expected/test_CustomEvents_Events.getName_lastN__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents_Events.getName_lastN__API.getProcessedReport_day.xml
index 88680087dc..e134d7ef78 100644
--- a/tests/PHPUnit/System/expected/test_CustomEvents_Events.getName_lastN__API.getProcessedReport_day.xml
+++ b/tests/PHPUnit/System/expected/test_CustomEvents_Events.getName_lastN__API.getProcessedReport_day.xml
@@ -188,72 +188,72 @@
 			<row>
 				
 				<segment>eventName==Spirited+Away+%28%E5%8D%83%E3%81%A8%E5%8D%83%E5%B0%8B%E3%81%AE%E7%A5%9E%E9%9A%A0%E3%81%97%29</segment>
-				<idsubdatatable>3</idsubdatatable>
+				
 			</row>
 			<row>
 				
 				<segment>eventName==La+fianc%C3%A9e+de+l%26%23039%3Beau</segment>
-				<idsubdatatable>5</idsubdatatable>
+				
 			</row>
 			<row>
 				
-				<idsubdatatable>2</idsubdatatable>
+				
 			</row>
 			<row>
 				
 				<segment>eventName==event+name+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+---%26gt%3B+SHOULD+APPEAR+IN+TEST+OUTPUT+NOT+TRUNCATED+%26lt%3B---</segment>
-				<idsubdatatable>6</idsubdatatable>
+				
 			</row>
 			<row>
 				
 				<segment>eventName==Ponyo+%28%E5%B4%96%E3%81%AE%E4%B8%8A%E3%81%AE%E3%83%9D%E3%83%8B%E3%83%A7%29</segment>
-				<idsubdatatable>4</idsubdatatable>
+				
 			</row>
 			<row>
 				
 				<segment>eventName==Princess+Mononoke+%28%E3%82%82%E3%81%AE%E3%81%AE%E3%81%91%E5%A7%AB%29</segment>
-				<idsubdatatable>8</idsubdatatable>
+				
 			</row>
 			<row>
 				
 				<segment>eventName==Search+query+here</segment>
-				<idsubdatatable>7</idsubdatatable>
+				
 			</row>
 		</result>
 		<result prettyDate="Monday, January 4, 2010">
 			<row>
 				
 				<segment>eventName==Spirited+Away+%28%E5%8D%83%E3%81%A8%E5%8D%83%E5%B0%8B%E3%81%AE%E7%A5%9E%E9%9A%A0%E3%81%97%29</segment>
-				<idsubdatatable>11</idsubdatatable>
+				
 			</row>
 			<row>
 				
 				<segment>eventName==La+fianc%C3%A9e+de+l%26%23039%3Beau</segment>
-				<idsubdatatable>12</idsubdatatable>
+				
 			</row>
 			<row>
 				
-				<idsubdatatable>10</idsubdatatable>
+				
 			</row>
 			<row>
 				
 				<segment>eventName==event+name+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+---%26gt%3B+SHOULD+APPEAR+IN+TEST+OUTPUT+NOT+TRUNCATED+%26lt%3B---</segment>
-				<idsubdatatable>16</idsubdatatable>
+				
 			</row>
 			<row>
 				
 				<segment>eventName==Ponyo+%28%E5%B4%96%E3%81%AE%E4%B8%8A%E3%81%AE%E3%83%9D%E3%83%8B%E3%83%A7%29</segment>
-				<idsubdatatable>15</idsubdatatable>
+				
 			</row>
 			<row>
 				
 				<segment>eventName==Princess+Mononoke+%28%E3%82%82%E3%81%AE%E3%81%AE%E3%81%91%E5%A7%AB%29</segment>
-				<idsubdatatable>14</idsubdatatable>
+				
 			</row>
 			<row>
 				
 				<segment>eventName==Search+query+here</segment>
-				<idsubdatatable>13</idsubdatatable>
+				
 			</row>
 		</result>
 		<result prettyDate="Tuesday, January 5, 2010" />
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml
index eded5b66a7..30a9e0f4e0 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml
@@ -4102,7 +4102,7 @@
 		<actionDetails>
 			<row>
 				<type>event</type>
-				<url>http://piwik.net/shqshne4jdp4b6.cloudfront.net/cfx/st?__?key=value</url>
+				<url>http://piwik.net/shqshne4jdp4b6.cloudfront.net/cfx/st​?key=value</url>
 				<pageIdAction>66</pageIdAction>
 				
 				
@@ -4219,7 +4219,7 @@
 		<actionDetails>
 			<row>
 				<type>event</type>
-				<url>http://piwik.net/shqshne4jdp4b6.cloudfront.net/cfx/st?__?key=value</url>
+				<url>http://piwik.net/shqshne4jdp4b6.cloudfront.net/cfx/st​?key=value</url>
 				<pageIdAction>66</pageIdAction>
 				
 				
@@ -5580,7 +5580,7 @@
 	<row>
 		<idSite>1</idSite>
 		<idVisit>17</idVisit>
-		<visitIp>50.112.0.11</visitIp>
+		<visitIp>0.0.0.0</visitIp>
 		
 		
 		<actionDetails>
@@ -5687,17 +5687,17 @@
 		<totalAbandonedCarts>0</totalAbandonedCarts>
 		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>0</events>
-		<continent>North America</continent>
-		<continentCode>amn</continentCode>
-		<country>United States</country>
-		<countryCode>us</countryCode>
-		<countryFlag>plugins/Morpheus/icons/dist/flags/us.png</countryFlag>
-		<region>California</region>
-		<regionCode>CA</regionCode>
-		<city>San Jose</city>
-		<location>San Jose, California, United States</location>
-		<latitude>45.870000</latitude>
-		<longitude>-119.688000</longitude>
+		<continent>Unknown</continent>
+		<continentCode>unk</continentCode>
+		<country>Unknown</country>
+		<countryCode>xx</countryCode>
+		<countryFlag>plugins/Morpheus/icons/dist/flags/xx.png</countryFlag>
+		<region />
+		<regionCode />
+		<city />
+		<location>Unknown</location>
+		<latitude />
+		<longitude />
 		<visitLocalTime>15:31:05</visitLocalTime>
 		<visitLocalHour>15</visitLocalHour>
 		<daysSinceLastVisit>0</daysSinceLastVisit>
@@ -5710,7 +5710,7 @@
 	<row>
 		<idSite>1</idSite>
 		<idVisit>16</idVisit>
-		<visitIp>50.112.0.28</visitIp>
+		<visitIp>0.0.0.0</visitIp>
 		
 		
 		<actionDetails>
@@ -5817,17 +5817,17 @@
 		<totalAbandonedCarts>0</totalAbandonedCarts>
 		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>0</events>
-		<continent>North America</continent>
-		<continentCode>amn</continentCode>
-		<country>United States</country>
-		<countryCode>us</countryCode>
-		<countryFlag>plugins/Morpheus/icons/dist/flags/us.png</countryFlag>
-		<region>California</region>
-		<regionCode>CA</regionCode>
-		<city>San Jose</city>
-		<location>San Jose, California, United States</location>
-		<latitude>45.870000</latitude>
-		<longitude>-119.688000</longitude>
+		<continent>Unknown</continent>
+		<continentCode>unk</continentCode>
+		<country>Unknown</country>
+		<countryCode>xx</countryCode>
+		<countryFlag>plugins/Morpheus/icons/dist/flags/xx.png</countryFlag>
+		<region />
+		<regionCode />
+		<city />
+		<location>Unknown</location>
+		<latitude />
+		<longitude />
 		<visitLocalTime>13:49:46</visitLocalTime>
 		<visitLocalHour>13</visitLocalHour>
 		<daysSinceLastVisit>0</daysSinceLastVisit>
@@ -6490,7 +6490,7 @@
 	<row>
 		<idSite>1</idSite>
 		<idVisit>10</idVisit>
-		<visitIp>79.125.0.21</visitIp>
+		<visitIp>0.0.0.0</visitIp>
 		
 		
 		<actionDetails>
@@ -6597,17 +6597,17 @@
 		<totalAbandonedCarts>0</totalAbandonedCarts>
 		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>0</events>
-		<continent>Europe</continent>
-		<continentCode>eur</continentCode>
-		<country>Ireland</country>
-		<countryCode>ie</countryCode>
-		<countryFlag>plugins/Morpheus/icons/dist/flags/ie.png</countryFlag>
+		<continent>Unknown</continent>
+		<continentCode>unk</continentCode>
+		<country>Unknown</country>
+		<countryCode>xx</countryCode>
+		<countryFlag>plugins/Morpheus/icons/dist/flags/xx.png</countryFlag>
 		<region />
 		<regionCode />
 		<city />
-		<location>Ireland</location>
-		<latitude>53</latitude>
-		<longitude>-8</longitude>
+		<location>Unknown</location>
+		<latitude />
+		<longitude />
 		<visitLocalTime>18:03:40</visitLocalTime>
 		<visitLocalHour>18</visitLocalHour>
 		<daysSinceLastVisit>0</daysSinceLastVisit>
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 61f36ed9ad..a954714a2e 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getCity_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getCity_month.xml
@@ -2,23 +2,23 @@
 <result>
 	<row>
 		<label>Unknown</label>
-		<nb_visits>31</nb_visits>
-		<nb_actions>38</nb_actions>
+		<nb_visits>33</nb_visits>
+		<nb_actions>40</nb_actions>
 		<max_actions>3</max_actions>
 		<sum_visit_length>553</sum_visit_length>
-		<bounce_count>25</bounce_count>
-		<nb_visits_converted>27</nb_visits_converted>
+		<bounce_count>27</bounce_count>
+		<nb_visits_converted>29</nb_visits_converted>
 		<goals>
 			<row idgoal='1'>
-				<nb_conversions>27</nb_conversions>
-				<nb_visits_converted>27</nb_visits_converted>
-				<revenue>135</revenue>
+				<nb_conversions>29</nb_conversions>
+				<nb_visits_converted>29</nb_visits_converted>
+				<revenue>145</revenue>
 			</row>
 		</goals>
-		<nb_conversions>27</nb_conversions>
-		<revenue>135</revenue>
-		<sum_daily_nb_uniq_visitors>29</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>2</sum_daily_nb_users>
+		<nb_conversions>29</nb_conversions>
+		<revenue>145</revenue>
+		<sum_daily_nb_uniq_visitors>31</sum_daily_nb_uniq_visitors>
+		<sum_daily_nb_users>3</sum_daily_nb_users>
 		<city_name>Unknown</city_name>
 		<city>xx</city>
 		<region>xx</region>
@@ -86,35 +86,6 @@
 		<logo>plugins/Morpheus/icons/dist/flags/sg.png</logo>
 	</row>
 	<row>
-		<label>San Jose, California, United States</label>
-		<nb_visits>2</nb_visits>
-		<nb_actions>2</nb_actions>
-		<max_actions>1</max_actions>
-		<sum_visit_length>0</sum_visit_length>
-		<bounce_count>2</bounce_count>
-		<nb_visits_converted>2</nb_visits_converted>
-		<goals>
-			<row idgoal='1'>
-				<nb_conversions>2</nb_conversions>
-				<nb_visits_converted>2</nb_visits_converted>
-				<revenue>10</revenue>
-			</row>
-		</goals>
-		<nb_conversions>2</nb_conversions>
-		<revenue>10</revenue>
-		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>1</sum_daily_nb_users>
-		<lat>45.87</lat>
-		<long>-119.688</long>
-		<segment>city==San+Jose;regionCode==CA;countryCode==us</segment>
-		<city_name>San Jose</city_name>
-		<region>CA</region>
-		<country>us</country>
-		<country_name>United States</country_name>
-		<region_name>California</region_name>
-		<logo>plugins/Morpheus/icons/dist/flags/us.png</logo>
-	</row>
-	<row>
 		<label>Igloolik, Nunavut, Canada</label>
 		<nb_visits>1</nb_visits>
 		<nb_actions>1</nb_actions>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getContinent_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getContinent_month.xml
index c929d3638a..d44023513c 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getContinent_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getContinent_month.xml
@@ -23,44 +23,44 @@
 	</row>
 	<row>
 		<label>North America</label>
-		<nb_visits>14</nb_visits>
-		<nb_actions>17</nb_actions>
+		<nb_visits>12</nb_visits>
+		<nb_actions>15</nb_actions>
 		<max_actions>2</max_actions>
 		<sum_visit_length>6</sum_visit_length>
-		<bounce_count>11</bounce_count>
-		<nb_visits_converted>14</nb_visits_converted>
+		<bounce_count>9</bounce_count>
+		<nb_visits_converted>12</nb_visits_converted>
 		<goals>
 			<row idgoal='1'>
-				<nb_conversions>14</nb_conversions>
-				<nb_visits_converted>14</nb_visits_converted>
-				<revenue>70</revenue>
+				<nb_conversions>12</nb_conversions>
+				<nb_visits_converted>12</nb_visits_converted>
+				<revenue>60</revenue>
 			</row>
 		</goals>
-		<nb_conversions>14</nb_conversions>
-		<revenue>70</revenue>
-		<sum_daily_nb_uniq_visitors>12</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>3</sum_daily_nb_users>
+		<nb_conversions>12</nb_conversions>
+		<revenue>60</revenue>
+		<sum_daily_nb_uniq_visitors>10</sum_daily_nb_uniq_visitors>
+		<sum_daily_nb_users>2</sum_daily_nb_users>
 		<code>North America</code>
 	</row>
 	<row>
 		<label>Unknown</label>
-		<nb_visits>6</nb_visits>
-		<nb_actions>7</nb_actions>
+		<nb_visits>9</nb_visits>
+		<nb_actions>10</nb_actions>
 		<max_actions>2</max_actions>
 		<sum_visit_length>242</sum_visit_length>
-		<bounce_count>5</bounce_count>
-		<nb_visits_converted>4</nb_visits_converted>
-		<sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>0</sum_daily_nb_users>
+		<bounce_count>8</bounce_count>
+		<nb_visits_converted>7</nb_visits_converted>
 		<goals>
 			<row idgoal='1'>
-				<nb_conversions>4</nb_conversions>
-				<nb_visits_converted>4</nb_visits_converted>
-				<revenue>20</revenue>
+				<nb_conversions>7</nb_conversions>
+				<nb_visits_converted>7</nb_visits_converted>
+				<revenue>35</revenue>
 			</row>
 		</goals>
-		<nb_conversions>4</nb_conversions>
-		<revenue>20</revenue>
+		<nb_conversions>7</nb_conversions>
+		<revenue>35</revenue>
+		<sum_daily_nb_uniq_visitors>9</sum_daily_nb_uniq_visitors>
+		<sum_daily_nb_users>1</sum_daily_nb_users>
 		<code>Unknown</code>
 	</row>
 	<row>
@@ -85,27 +85,6 @@
 		<code>South America</code>
 	</row>
 	<row>
-		<label>Europe</label>
-		<nb_visits>1</nb_visits>
-		<nb_actions>1</nb_actions>
-		<max_actions>1</max_actions>
-		<sum_visit_length>0</sum_visit_length>
-		<bounce_count>1</bounce_count>
-		<nb_visits_converted>1</nb_visits_converted>
-		<goals>
-			<row idgoal='1'>
-				<nb_conversions>1</nb_conversions>
-				<nb_visits_converted>1</nb_visits_converted>
-				<revenue>5</revenue>
-			</row>
-		</goals>
-		<nb_conversions>1</nb_conversions>
-		<revenue>5</revenue>
-		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>0</sum_daily_nb_users>
-		<code>Europe</code>
-	</row>
-	<row>
 		<label>Oceania</label>
 		<nb_visits>1</nb_visits>
 		<nb_actions>1</nb_actions>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getCountry_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getCountry_month.xml
index ea6c73fac1..b64a579d68 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getCountry_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getCountry_month.xml
@@ -26,23 +26,23 @@
 	</row>
 	<row>
 		<label>United States</label>
-		<nb_visits>13</nb_visits>
-		<nb_actions>16</nb_actions>
+		<nb_visits>11</nb_visits>
+		<nb_actions>14</nb_actions>
 		<max_actions>2</max_actions>
 		<sum_visit_length>6</sum_visit_length>
-		<bounce_count>10</bounce_count>
-		<nb_visits_converted>13</nb_visits_converted>
+		<bounce_count>8</bounce_count>
+		<nb_visits_converted>11</nb_visits_converted>
 		<goals>
 			<row idgoal='1'>
-				<nb_conversions>13</nb_conversions>
-				<nb_visits_converted>13</nb_visits_converted>
-				<revenue>65</revenue>
+				<nb_conversions>11</nb_conversions>
+				<nb_visits_converted>11</nb_visits_converted>
+				<revenue>55</revenue>
 			</row>
 		</goals>
-		<nb_conversions>13</nb_conversions>
-		<revenue>65</revenue>
-		<sum_daily_nb_uniq_visitors>11</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>3</sum_daily_nb_users>
+		<nb_conversions>11</nb_conversions>
+		<revenue>55</revenue>
+		<sum_daily_nb_uniq_visitors>9</sum_daily_nb_uniq_visitors>
+		<sum_daily_nb_users>2</sum_daily_nb_users>
 		<code>us</code>
 		<logo>plugins/Morpheus/icons/dist/flags/us.png</logo>
 		<segment>countryCode==us</segment>
@@ -50,23 +50,23 @@
 	</row>
 	<row>
 		<label>Unknown</label>
-		<nb_visits>6</nb_visits>
-		<nb_actions>7</nb_actions>
+		<nb_visits>9</nb_visits>
+		<nb_actions>10</nb_actions>
 		<max_actions>2</max_actions>
 		<sum_visit_length>242</sum_visit_length>
-		<bounce_count>5</bounce_count>
-		<nb_visits_converted>4</nb_visits_converted>
-		<sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>0</sum_daily_nb_users>
+		<bounce_count>8</bounce_count>
+		<nb_visits_converted>7</nb_visits_converted>
 		<goals>
 			<row idgoal='1'>
-				<nb_conversions>4</nb_conversions>
-				<nb_visits_converted>4</nb_visits_converted>
-				<revenue>20</revenue>
+				<nb_conversions>7</nb_conversions>
+				<nb_visits_converted>7</nb_visits_converted>
+				<revenue>35</revenue>
 			</row>
 		</goals>
-		<nb_conversions>4</nb_conversions>
-		<revenue>20</revenue>
+		<nb_conversions>7</nb_conversions>
+		<revenue>35</revenue>
+		<sum_daily_nb_uniq_visitors>9</sum_daily_nb_uniq_visitors>
+		<sum_daily_nb_users>1</sum_daily_nb_users>
 		<code>xx</code>
 		<logo>plugins/Morpheus/icons/dist/flags/xx.png</logo>
 		<segment>countryCode==xx</segment>
@@ -160,30 +160,6 @@
 		<logoHeight>16</logoHeight>
 	</row>
 	<row>
-		<label>Ireland</label>
-		<nb_visits>1</nb_visits>
-		<nb_actions>1</nb_actions>
-		<max_actions>1</max_actions>
-		<sum_visit_length>0</sum_visit_length>
-		<bounce_count>1</bounce_count>
-		<nb_visits_converted>1</nb_visits_converted>
-		<goals>
-			<row idgoal='1'>
-				<nb_conversions>1</nb_conversions>
-				<nb_visits_converted>1</nb_visits_converted>
-				<revenue>5</revenue>
-			</row>
-		</goals>
-		<nb_conversions>1</nb_conversions>
-		<revenue>5</revenue>
-		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>0</sum_daily_nb_users>
-		<code>ie</code>
-		<logo>plugins/Morpheus/icons/dist/flags/ie.png</logo>
-		<segment>countryCode==ie</segment>
-		<logoHeight>16</logoHeight>
-	</row>
-	<row>
 		<label>South Korea</label>
 		<nb_visits>1</nb_visits>
 		<nb_actions>1</nb_actions>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getNumberOfDistinctCountries_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getNumberOfDistinctCountries_month.xml
index 39535fab28..e52ca0ecb1 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getNumberOfDistinctCountries_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getNumberOfDistinctCountries_month.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8" ?>
-<result>9</result>
\ No newline at end of file
+<result>8</result>
\ No newline at end of file
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 80d3f88924..2091eab09f 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getRegion_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getRegion_month.xml
@@ -2,23 +2,23 @@
 <result>
 	<row>
 		<label>Unknown</label>
-		<nb_visits>34</nb_visits>
-		<nb_actions>41</nb_actions>
+		<nb_visits>36</nb_visits>
+		<nb_actions>43</nb_actions>
 		<max_actions>3</max_actions>
 		<sum_visit_length>553</sum_visit_length>
-		<bounce_count>28</bounce_count>
-		<nb_visits_converted>30</nb_visits_converted>
+		<bounce_count>30</bounce_count>
+		<nb_visits_converted>32</nb_visits_converted>
 		<goals>
 			<row idgoal='1'>
-				<nb_conversions>30</nb_conversions>
-				<nb_visits_converted>30</nb_visits_converted>
-				<revenue>150</revenue>
+				<nb_conversions>32</nb_conversions>
+				<nb_visits_converted>32</nb_visits_converted>
+				<revenue>160</revenue>
 			</row>
 		</goals>
-		<nb_conversions>30</nb_conversions>
-		<revenue>150</revenue>
-		<sum_daily_nb_uniq_visitors>32</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>2</sum_daily_nb_users>
+		<nb_conversions>32</nb_conversions>
+		<revenue>160</revenue>
+		<sum_daily_nb_uniq_visitors>34</sum_daily_nb_uniq_visitors>
+		<sum_daily_nb_users>3</sum_daily_nb_users>
 		<region>xx</region>
 		<country>xx</country>
 		<country_name>Unknown</country_name>
@@ -52,32 +52,6 @@
 		<logo>plugins/Morpheus/icons/dist/flags/us.png</logo>
 	</row>
 	<row>
-		<label>California, United States</label>
-		<nb_visits>2</nb_visits>
-		<nb_actions>2</nb_actions>
-		<max_actions>1</max_actions>
-		<sum_visit_length>0</sum_visit_length>
-		<bounce_count>2</bounce_count>
-		<nb_visits_converted>2</nb_visits_converted>
-		<goals>
-			<row idgoal='1'>
-				<nb_conversions>2</nb_conversions>
-				<nb_visits_converted>2</nb_visits_converted>
-				<revenue>10</revenue>
-			</row>
-		</goals>
-		<nb_conversions>2</nb_conversions>
-		<revenue>10</revenue>
-		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
-		<sum_daily_nb_users>1</sum_daily_nb_users>
-		<segment>regionCode==CA;countryCode==us</segment>
-		<region>CA</region>
-		<country>us</country>
-		<country_name>United States</country_name>
-		<region_name>California</region_name>
-		<logo>plugins/Morpheus/icons/dist/flags/us.png</logo>
-	</row>
-	<row>
 		<label>New Jersey, United States</label>
 		<nb_visits>1</nb_visits>
 		<nb_actions>1</nb_actions>
diff --git a/tests/UI/expected-screenshots/OneClickUpdate_update_fail.png b/tests/UI/expected-screenshots/OneClickUpdate_update_fail.png
index 4e63c1d6ef..352421f960 100644
--- a/tests/UI/expected-screenshots/OneClickUpdate_update_fail.png
+++ b/tests/UI/expected-screenshots/OneClickUpdate_update_fail.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:89561aebe2d231e1b1e3d3c8e65a9b1bbb19e4eebabe7b3152e05b9dde51b0a0
-size 99658
+oid sha256:931e203436d22df5fc12987f5c3e4d42b985ba2c296e57aae7ea3b314f6695f2
+size 100171
diff --git a/tests/UI/expected-screenshots/OneClickUpdate_update_screen.png b/tests/UI/expected-screenshots/OneClickUpdate_update_screen.png
index e47113cddf..64be8bef4f 100644
--- a/tests/UI/expected-screenshots/OneClickUpdate_update_screen.png
+++ b/tests/UI/expected-screenshots/OneClickUpdate_update_screen.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:43c71b33b198eea2687257ee9670a78b6d52c771e87a5b88ebac9726a818b398
-size 61720
+oid sha256:48c850b43a5c9c5e66865be76da2a44a53dc6250332014185ed023f38bab2a1c
+size 44142
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_admin_diagnostics_configfile.png b/tests/UI/expected-screenshots/UIIntegrationTest_admin_diagnostics_configfile.png
index 090c037439..a3c0442c34 100644
--- a/tests/UI/expected-screenshots/UIIntegrationTest_admin_diagnostics_configfile.png
+++ b/tests/UI/expected-screenshots/UIIntegrationTest_admin_diagnostics_configfile.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e75dfc851ff839e46c952ed08d2986a98ba565b82182fdc21e0a567fbebe6c80
-size 4403426
+oid sha256:b127bc9bcdb9edb2b146f54d3df4738f0b5813bb675a4f5c5f872e48ef172bce
+size 4392249
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_admin_settings_general.png b/tests/UI/expected-screenshots/UIIntegrationTest_admin_settings_general.png
index dedb6231aa..3655d223cf 100644
--- a/tests/UI/expected-screenshots/UIIntegrationTest_admin_settings_general.png
+++ b/tests/UI/expected-screenshots/UIIntegrationTest_admin_settings_general.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:de6bff606572b2a370760f99dc176ee26a89b554a6e2885ddefcb4310df86835
-size 1043478
+oid sha256:b4e01c9ef7c6168ec6d1b3c2bd67d7d6031fedc693f8b076cb132945de00d64b
+size 1032268