New segment: ActionType

16 files changed, 341 insertions, 150 deletions

diff --git a/tests/PHPUnit/Integration/SegmentTest.php b/tests/PHPUnit/Integration/SegmentTest.php
index 483f047433..80c17ebe63 100644
--- a/tests/PHPUnit/Integration/SegmentTest.php
+++ b/tests/PHPUnit/Integration/SegmentTest.php
@@ -161,7 +161,7 @@ class SegmentTest extends IntegrationTestCase
         $this->assertEquals($this->removeExtraWhiteSpaces($expected), $this->removeExtraWhiteSpaces($query));
     }
 
-    public function test_getSelectQuery_whenJoinVisitOnAction()
+    public function test_getSelectQuery_whenJoinVisitOnLogLinkVisitAction()
     {
         $select = '*';
         $from = 'log_link_visit_action';
@@ -225,7 +225,7 @@ class SegmentTest extends IntegrationTestCase
         $this->assertEquals($this->removeExtraWhiteSpaces($expected), $this->removeExtraWhiteSpaces($query));
     }
 
-    public function test_getSelectQuery_whenJoinConversionOnAction()
+    public function test_getSelectQuery_whenJoinConversionOnLogLinkVisitAction()
     {
         $select = '*';
         $from = 'log_link_visit_action';
@@ -375,7 +375,7 @@ class SegmentTest extends IntegrationTestCase
      * visit is joined on action, then conversion is joined
      * make sure that conversion is joined on action not visit
      */
-    public function test_getSelectQuery_whenJoinVisitAndConversionOnAction()
+    public function test_getSelectQuery_whenJoinVisitAndConversionOnLogLinkVisitAction()
     {
         $select = '*';
         $from = 'log_link_visit_action';
@@ -445,6 +445,171 @@ class SegmentTest extends IntegrationTestCase
         $this->assertEquals($this->removeExtraWhiteSpaces($expected), $this->removeExtraWhiteSpaces($query));
     }
 
+    public function test_getSelectQuery_whenJoinVisitOnAction()
+    {
+        $actionType = 3;
+        $idSite = 1;
+        $select = 'count(distinct log_visit.idvisitor) AS `1`,
+                   count(*) AS `2`,
+                   sum(log_visit.visit_total_actions) AS `3`';
+        $from  = 'log_visit';
+        $where = 'log_visit.visit_last_action_time >= ?
+				AND log_visit.visit_last_action_time <= ?
+				AND log_visit.idsite IN (?)';
+        $bind = array('2015-11-30 11:00:00', '2015-12-01 10:59:59', $idSite);
+
+        $segment = 'actionType==' . $actionType;
+        $segment = new Segment($segment, $idSites = array());
+
+        $query = $segment->getSelectQuery($select, $from, $where, $bind);
+
+        $logVisitTable = Common::prefixTable('log_visit');
+        $logActionTable = Common::prefixTable('log_action');
+        $logLinkVisitActionTable = Common::prefixTable('log_link_visit_action');
+
+        $expected = array(
+            "sql"  => "
+             SELECT count(distinct log_inner.idvisitor) AS `1`, count(*) AS `2`, sum(log_inner.visit_total_actions) AS `3` FROM ( SELECT log_visit.idvisitor, log_visit.visit_total_actions
+             FROM $logVisitTable AS log_visit
+                LEFT JOIN $logLinkVisitActionTable AS log_link_visit_action
+                    ON log_link_visit_action.idvisit = log_visit.idvisit
+                LEFT JOIN $logActionTable AS log_action
+                    ON log_link_visit_action.idaction_url = log_action.idaction
+             WHERE ( log_visit.visit_last_action_time >= ?
+                    AND log_visit.visit_last_action_time <= ?
+                    AND log_visit.idsite IN (?) )
+                    AND ( log_action.type = ? )
+             GROUP BY log_visit.idvisit
+             ORDER BY NULL ) AS log_inner",
+            "bind" => array('2015-11-30 11:00:00', '2015-12-01 10:59:59', $idSite, $actionType));
+
+        $this->assertEquals($this->removeExtraWhiteSpaces($expected), $this->removeExtraWhiteSpaces($query));
+    }
+
+    public function test_getSelectQuery_whenJoinLogLinkVisitActionOnActionOnVisit()
+    {
+        $actionType = 3;
+        $idSite = 1;
+        $select = 'log_link_visit_action.custom_dimension_1,
+                  actionAlias.name as url,
+                  sum(log_link_visit_action.time_spent) as `13`,
+                  sum(case visitAlias.visit_total_actions when 1 then 1 when 0 then 1 else 0 end) as `6`';
+        $from  = array(
+            'log_link_visit_action',
+             array('table' => 'log_visit', 'tableAlias' => 'visitAlias', 'joinOn' => 'visitAlias.idvisit = log_link_visit_action.idvisit'),
+             array('table' => 'log_action', 'tableAlias' => 'actionAlias', 'joinOn' => 'log_link_visit_action.idaction_url = actionAlias.idaction')
+        );
+        $where = 'log_link_visit_action.server_time >= ?
+                  AND log_link_visit_action.server_time <= ?
+                  AND log_link_visit_action.idsite = ?';
+        $bind = array('2015-11-30 11:00:00', '2015-12-01 10:59:59', $idSite);
+
+        $segment = 'actionType==' . $actionType;
+        $segment = new Segment($segment, $idSites = array());
+
+        $query = $segment->getSelectQuery($select, $from, $where, $bind);
+
+        $logVisitTable = Common::prefixTable('log_visit');
+        $logActionTable = Common::prefixTable('log_action');
+        $logLinkVisitActionTable = Common::prefixTable('log_link_visit_action');
+
+        $expected = array(
+            "sql"  => "
+             SELECT log_link_visit_action.custom_dimension_1,
+                    actionAlias.name as url,
+                    sum(log_link_visit_action.time_spent) as `13`,
+                    sum(case visitAlias.visit_total_actions when 1 then 1 when 0 then 1 else 0 end) as `6`
+             FROM $logLinkVisitActionTable AS log_link_visit_action
+                  LEFT JOIN $logVisitTable AS visitAlias
+                       ON visitAlias.idvisit = log_link_visit_action.idvisit
+                  LEFT JOIN $logActionTable AS actionAlias
+                       ON log_link_visit_action.idaction_url = actionAlias.idaction
+                  LEFT JOIN $logActionTable AS log_action
+                       ON log_link_visit_action.idaction_url = log_action.idaction
+             WHERE ( log_link_visit_action.server_time >= ?
+                 AND log_link_visit_action.server_time <= ?
+                 AND log_link_visit_action.idsite = ? )
+                 AND ( log_action.type = ? )",
+            "bind" => array('2015-11-30 11:00:00', '2015-12-01 10:59:59', $idSite, $actionType));
+
+        $this->assertEquals($this->removeExtraWhiteSpaces($expected), $this->removeExtraWhiteSpaces($query));
+    }
+
+    public function test_getSelectQuery_whenJoinLogLinkVisitActionOnAction()
+    {
+        $actionType = 3;
+        $idSite = 1;
+        $select = 'log_link_visit_action.custom_dimension_1,
+                  sum(log_link_visit_action.time_spent) as `13`';
+        $from  = 'log_link_visit_action';
+        $where = 'log_link_visit_action.server_time >= ?
+                  AND log_link_visit_action.server_time <= ?
+                  AND log_link_visit_action.idsite = ?';
+        $bind = array('2015-11-30 11:00:00', '2015-12-01 10:59:59', $idSite);
+
+        $segment = 'actionType==' . $actionType;
+        $segment = new Segment($segment, $idSites = array());
+
+        $query = $segment->getSelectQuery($select, $from, $where, $bind);
+
+        $logActionTable = Common::prefixTable('log_action');
+        $logLinkVisitActionTable = Common::prefixTable('log_link_visit_action');
+
+        $expected = array(
+            "sql"  => "
+             SELECT log_link_visit_action.custom_dimension_1, sum(log_link_visit_action.time_spent) as `13`
+             FROM $logLinkVisitActionTable AS log_link_visit_action
+                  LEFT JOIN $logActionTable AS log_action
+                        ON log_link_visit_action.idaction_url = log_action.idaction
+             WHERE ( log_link_visit_action.server_time >= ?
+                 AND log_link_visit_action.server_time <= ?
+                 AND log_link_visit_action.idsite = ? )
+                 AND ( log_action.type = ? )",
+            "bind" => array('2015-11-30 11:00:00', '2015-12-01 10:59:59', $idSite, $actionType));
+
+        $this->assertEquals($this->removeExtraWhiteSpaces($expected), $this->removeExtraWhiteSpaces($query));
+    }
+
+    public function test_getSelectQuery_whenJoinConversionOnAction()
+    {
+        $actionType = 3;
+        $idSite = 1;
+        $select = 'log_conversion.idgoal AS `idgoal`,
+                   log_conversion.custom_dimension_1 AS `custom_dimension_1`,
+                   count(*) AS `1`,
+                   count(distinct log_conversion.idvisit) AS `3`,';
+        $from  = 'log_conversion';
+        $where = 'log_conversion.server_time >= ?
+				  AND log_conversion.server_time <= ?
+				  AND log_conversion.idsite IN (?)';
+        $bind = array('2015-11-30 11:00:00', '2015-12-01 10:59:59', $idSite);
+
+        $segment = 'actionType==' . $actionType;
+        $segment = new Segment($segment, $idSites = array());
+
+        $query = $segment->getSelectQuery($select, $from, $where, $bind);
+
+        $logConversionsTable = Common::prefixTable('log_conversion');
+        $logActionTable = Common::prefixTable('log_action');
+        $logLinkVisitActionTable = Common::prefixTable('log_link_visit_action');
+
+        $expected = array(
+            "sql"  => "
+             SELECT log_conversion.idgoal AS `idgoal`, log_conversion.custom_dimension_1 AS `custom_dimension_1`, count(*) AS `1`, count(distinct log_conversion.idvisit) AS `3`,
+             FROM $logConversionsTable AS log_conversion
+                  LEFT JOIN $logLinkVisitActionTable AS log_link_visit_action
+                       ON log_conversion.idvisit = log_link_visit_action.idvisit
+                  LEFT JOIN $logActionTable AS log_action
+                       ON log_link_visit_action.idaction_url = log_action.idaction
+             WHERE ( log_conversion.server_time >= ?
+                 AND log_conversion.server_time <= ?
+                 AND log_conversion.idsite IN (?) )
+                 AND ( log_action.type = ? )",
+            "bind" => array('2015-11-30 11:00:00', '2015-12-01 10:59:59', $idSite, $actionType));
+
+        $this->assertEquals($this->removeExtraWhiteSpaces($expected), $this->removeExtraWhiteSpaces($query));
+    }
+
     public function test_getSelectQuery_whenUnionOfSegmentsAreUsed()
     {
         $select = 'log_visit.*';
@@ -455,12 +620,15 @@ class SegmentTest extends IntegrationTestCase
         $segment = 'actionUrl=@myTestUrl';
         $segment = new Segment($segment, $idSites = array());
 
+        $logVisitTable = Common::prefixTable('log_visit');
+        $logLinkVisitActionTable = Common::prefixTable('log_link_visit_action');
+
         $query = $segment->getSelectQuery($select, $from, $where, $bind);
 
         $expected = array(
             "sql"  => " SELECT log_inner.* FROM (
-                          SELECT log_visit.* FROM log_visit AS log_visit
-                          LEFT JOIN log_link_visit_action AS log_link_visit_action
+                          SELECT log_visit.* FROM $logVisitTable AS log_visit
+                          LEFT JOIN $logLinkVisitActionTable AS log_link_visit_action
                             ON log_link_visit_action.idvisit = log_visit.idvisit
                           WHERE (( log_link_visit_action.idaction_url IN (SELECT idaction FROM log_action WHERE ( name LIKE CONCAT('%', ?, '%') AND type = 1 )) )
                                 OR ( log_link_visit_action.idaction_url IN (SELECT idaction FROM log_action WHERE ( name LIKE CONCAT('%', ?, '%') AND type = 3 )) )
@@ -471,7 +639,7 @@ class SegmentTest extends IntegrationTestCase
         $this->assertEquals($this->removeExtraWhiteSpaces($expected), $this->removeExtraWhiteSpaces($query));
     }
 
-    public function test_getSelectQuery_whenJoinConversionOnAction_segmentUsesPageUrl()
+    public function test_getSelectQuery_whenJoinConversionOnLogLinkVisitAction_segmentUsesPageUrl()
     {
         $this->insertPageUrlAsAction('example.com/anypage');
         $this->insertPageUrlAsAction('example.com/anypage_bis');
diff --git a/tests/PHPUnit/System/TwoVisitsWithCustomVariablesSegmentMatchNONETest.php b/tests/PHPUnit/System/TwoVisitsWithCustomVariablesSegmentMatchNONETest.php
index 65ff528dc6..482b0d12d8 100755
--- a/tests/PHPUnit/System/TwoVisitsWithCustomVariablesSegmentMatchNONETest.php
+++ b/tests/PHPUnit/System/TwoVisitsWithCustomVariablesSegmentMatchNONETest.php
@@ -64,6 +64,9 @@ class TwoVisitsWithCustomVariablesSegmentMatchNONETest extends SystemTestCase
             if ($segment == 'visitEcommerceStatus') {
                 $value = 'none';
             }
+            if ($segment == 'actionType') {
+                $value = 'pageviews';
+            }
             $matchNone = $segment . '!=' . $value;
 
             // deviceType != campaign matches ALL visits, but we want to match None
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_actionType__API.getSuggestedValuesForSegment.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_actionType__API.getSuggestedValuesForSegment.xml
new file mode 100644
index 0000000000..cff62022a9
--- /dev/null
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_actionType__API.getSuggestedValuesForSegment.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<result>
+	<row>pageviews</row>
+	<row>contents</row>
+	<row>sitesearches</row>
+	<row>events</row>
+	<row>outlinks</row>
+	<row>downloads</row>
+</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_actionType__VisitsSummary.get_range.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_actionType__VisitsSummary.get_range.xml
new file mode 100644
index 0000000000..f3bee672d6
--- /dev/null
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_actionType__VisitsSummary.get_range.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<result>
+	<nb_visits>35</nb_visits>
+	<nb_actions>95</nb_actions>
+	<nb_visits_converted>35</nb_visits_converted>
+	<bounce_count>18</bounce_count>
+	<sum_visit_length>27557</sum_visit_length>
+	<max_actions>5</max_actions>
+	<bounce_rate>51%</bounce_rate>
+	<nb_actions_per_visit>2.7</nb_actions_per_visit>
+	<avg_time_on_site>787</avg_time_on_site>
+</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_day.xml
index e1668e7608..81d8899dcf 100644
--- a/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_day.xml
+++ b/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_day.xml
@@ -9,7 +9,7 @@
 			<row>
 				<type>event</type>
 				<url>http://example.org/movies</url>
-				<pageIdAction>12</pageIdAction>
+				<pageIdAction>14</pageIdAction>
 				
 				<pageId>21</pageId>
 				<eventCategory>Movie</eventCategory>
@@ -114,7 +114,7 @@
 			<row>
 				<type>event</type>
 				<url>http://example.org/movies</url>
-				<pageIdAction>12</pageIdAction>
+				<pageIdAction>14</pageIdAction>
 				
 				<pageId>20</pageId>
 				<eventCategory>Movie</eventCategory>
@@ -219,7 +219,7 @@
 			<row>
 				<type>event</type>
 				<url>http://example.org/movies</url>
-				<pageIdAction>12</pageIdAction>
+				<pageIdAction>14</pageIdAction>
 				
 				<pageId>16</pageId>
 				<eventCategory>Movie</eventCategory>
@@ -233,7 +233,7 @@
 			<row>
 				<type>event</type>
 				<url>http://example.org/movies</url>
-				<pageIdAction>12</pageIdAction>
+				<pageIdAction>14</pageIdAction>
 				
 				<pageId>17</pageId>
 				<eventCategory>Movie</eventCategory>
@@ -247,7 +247,7 @@
 			<row>
 				<type>event</type>
 				<url>http://example.org/movies</url>
-				<pageIdAction>12</pageIdAction>
+				<pageIdAction>14</pageIdAction>
 				
 				<pageId>19</pageId>
 				<eventCategory>Movie</eventCategory>
@@ -261,7 +261,7 @@
 			<row>
 				<type>event</type>
 				<url>http://example.org/movies</url>
-				<pageIdAction>12</pageIdAction>
+				<pageIdAction>14</pageIdAction>
 				
 				<pageId>22</pageId>
 				<eventCategory>Movie</eventCategory>
@@ -290,7 +290,7 @@
 			<row>
 				<type>event</type>
 				<url>http://example.org/finishedMovie</url>
-				<pageIdAction>23</pageIdAction>
+				<pageIdAction>25</pageIdAction>
 				
 				<pageId>24</pageId>
 				<eventCategory>event category Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---&gt; SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED &lt;---</eventCategory>
@@ -397,7 +397,7 @@
 			<row>
 				<type>event</type>
 				<url>http://example.org/movies</url>
-				<pageIdAction>12</pageIdAction>
+				<pageIdAction>14</pageIdAction>
 				
 				<pageId>18</pageId>
 				<eventCategory>Movie</eventCategory>
@@ -526,7 +526,7 @@
 			<row>
 				<type>event</type>
 				<url>http://example.org/webradio</url>
-				<pageIdAction>2</pageIdAction>
+				<pageIdAction>3</pageIdAction>
 				
 				<pageId>2</pageId>
 				<eventCategory>Music</eventCategory>
@@ -546,7 +546,7 @@
 			<row>
 				<type>event</type>
 				<url>http://example.org/webradio</url>
-				<pageIdAction>2</pageIdAction>
+				<pageIdAction>3</pageIdAction>
 				
 				<pageId>3</pageId>
 				<eventCategory>Music</eventCategory>
@@ -566,7 +566,7 @@
 			<row>
 				<type>event</type>
 				<url>http://example.org/webradio</url>
-				<pageIdAction>2</pageIdAction>
+				<pageIdAction>3</pageIdAction>
 				
 				<pageId>4</pageId>
 				<eventCategory>Music</eventCategory>
@@ -586,7 +586,7 @@
 			<row>
 				<type>event</type>
 				<url>http://example.org/webradio</url>
-				<pageIdAction>2</pageIdAction>
+				<pageIdAction>3</pageIdAction>
 				
 				<pageId>5</pageId>
 				<eventCategory>Music</eventCategory>
@@ -606,7 +606,7 @@
 			<row>
 				<type>event</type>
 				<url>http://example.org/webradio</url>
-				<pageIdAction>2</pageIdAction>
+				<pageIdAction>3</pageIdAction>
 				
 				<pageId>6</pageId>
 				<eventCategory>Music</eventCategory>
@@ -626,7 +626,7 @@
 			<row>
 				<type>event</type>
 				<url>http://example.org/webradio</url>
-				<pageIdAction>2</pageIdAction>
+				<pageIdAction>3</pageIdAction>
 				
 				<pageId>7</pageId>
 				<eventCategory>Music</eventCategory>
@@ -647,7 +647,7 @@
 			<row>
 				<type>event</type>
 				<url>http://example.org/webradio</url>
-				<pageIdAction>2</pageIdAction>
+				<pageIdAction>3</pageIdAction>
 				
 				<pageId>8</pageId>
 				<eventCategory>Music</eventCategory>
@@ -669,7 +669,7 @@
 				<type>action</type>
 				<url>http://example.org/movies</url>
 				<pageTitle>Movie Theater</pageTitle>
-				<pageIdAction>12</pageIdAction>
+				<pageIdAction>13</pageIdAction>
 				
 				<pageId>9</pageId>
 				<generationTime>0.67s</generationTime>
@@ -681,7 +681,7 @@
 			<row>
 				<type>event</type>
 				<url>http://example.org/movies</url>
-				<pageIdAction>12</pageIdAction>
+				<pageIdAction>14</pageIdAction>
 				
 				<pageId>10</pageId>
 				<eventCategory>Movie</eventCategory>
@@ -695,7 +695,7 @@
 			<row>
 				<type>event</type>
 				<url>http://example.org/movies</url>
-				<pageIdAction>12</pageIdAction>
+				<pageIdAction>14</pageIdAction>
 				
 				<pageId>11</pageId>
 				<eventCategory>Movie</eventCategory>
@@ -709,7 +709,7 @@
 			<row>
 				<type>event</type>
 				<url>http://example.org/movies</url>
-				<pageIdAction>12</pageIdAction>
+				<pageIdAction>14</pageIdAction>
 				
 				<pageId>12</pageId>
 				<eventCategory>Movie</eventCategory>
@@ -723,7 +723,7 @@
 			<row>
 				<type>event</type>
 				<url>http://example.org/movies</url>
-				<pageIdAction>12</pageIdAction>
+				<pageIdAction>14</pageIdAction>
 				
 				<pageId>13</pageId>
 				<eventCategory>Movie</eventCategory>
@@ -737,7 +737,7 @@
 			<row>
 				<type>event</type>
 				<url>http://example.org/movies</url>
-				<pageIdAction>12</pageIdAction>
+				<pageIdAction>14</pageIdAction>
 				
 				<pageId>14</pageId>
 				<eventCategory>Movie</eventCategory>
@@ -751,7 +751,7 @@
 			<row>
 				<type>event</type>
 				<url>http://example.org/movies</url>
-				<pageIdAction>12</pageIdAction>
+				<pageIdAction>14</pageIdAction>
 				
 				<pageId>15</pageId>
 				<eventCategory>Movie</eventCategory>
@@ -857,7 +857,7 @@
 			<row>
 				<type>event</type>
 				<url>http://example.org/movies</url>
-				<pageIdAction>12</pageIdAction>
+				<pageIdAction>14</pageIdAction>
 				
 				<pageId>45</pageId>
 				<eventCategory>Movie</eventCategory>
@@ -958,7 +958,7 @@
 			<row>
 				<type>event</type>
 				<url>http://example.org/movies</url>
-				<pageIdAction>12</pageIdAction>
+				<pageIdAction>14</pageIdAction>
 				
 				<pageId>44</pageId>
 				<eventCategory>Movie</eventCategory>
@@ -1059,7 +1059,7 @@
 			<row>
 				<type>event</type>
 				<url>http://example.org/movies</url>
-				<pageIdAction>12</pageIdAction>
+				<pageIdAction>14</pageIdAction>
 				
 				<pageId>40</pageId>
 				<eventCategory>Movie</eventCategory>
@@ -1073,7 +1073,7 @@
 			<row>
 				<type>event</type>
 				<url>http://example.org/movies</url>
-				<pageIdAction>12</pageIdAction>
+				<pageIdAction>14</pageIdAction>
 				
 				<pageId>41</pageId>
 				<eventCategory>Movie</eventCategory>
@@ -1087,7 +1087,7 @@
 			<row>
 				<type>event</type>
 				<url>http://example.org/movies</url>
-				<pageIdAction>12</pageIdAction>
+				<pageIdAction>14</pageIdAction>
 				
 				<pageId>43</pageId>
 				<eventCategory>Movie</eventCategory>
@@ -1101,7 +1101,7 @@
 			<row>
 				<type>event</type>
 				<url>http://example.org/movies</url>
-				<pageIdAction>12</pageIdAction>
+				<pageIdAction>14</pageIdAction>
 				
 				<pageId>46</pageId>
 				<eventCategory>Movie</eventCategory>
@@ -1130,7 +1130,7 @@
 			<row>
 				<type>event</type>
 				<url>http://example.org/finishedMovie</url>
-				<pageIdAction>23</pageIdAction>
+				<pageIdAction>25</pageIdAction>
 				
 				<pageId>48</pageId>
 				<eventCategory>event category Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---&gt; SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED &lt;---</eventCategory>
@@ -1233,7 +1233,7 @@
 			<row>
 				<type>event</type>
 				<url>http://example.org/movies</url>
-				<pageIdAction>12</pageIdAction>
+				<pageIdAction>14</pageIdAction>
 				
 				<pageId>42</pageId>
 				<eventCategory>Movie</eventCategory>
@@ -1358,7 +1358,7 @@
 			<row>
 				<type>event</type>
 				<url>http://example.org/webradio</url>
-				<pageIdAction>2</pageIdAction>
+				<pageIdAction>3</pageIdAction>
 				
 				<pageId>26</pageId>
 				<eventCategory>Music</eventCategory>
@@ -1378,7 +1378,7 @@
 			<row>
 				<type>event</type>
 				<url>http://example.org/webradio</url>
-				<pageIdAction>2</pageIdAction>
+				<pageIdAction>3</pageIdAction>
 				
 				<pageId>27</pageId>
 				<eventCategory>Music</eventCategory>
@@ -1398,7 +1398,7 @@
 			<row>
 				<type>event</type>
 				<url>http://example.org/webradio</url>
-				<pageIdAction>2</pageIdAction>
+				<pageIdAction>3</pageIdAction>
 				
 				<pageId>28</pageId>
 				<eventCategory>Music</eventCategory>
@@ -1418,7 +1418,7 @@
 			<row>
 				<type>event</type>
 				<url>http://example.org/webradio</url>
-				<pageIdAction>2</pageIdAction>
+				<pageIdAction>3</pageIdAction>
 				
 				<pageId>29</pageId>
 				<eventCategory>Music</eventCategory>
@@ -1438,7 +1438,7 @@
 			<row>
 				<type>event</type>
 				<url>http://example.org/webradio</url>
-				<pageIdAction>2</pageIdAction>
+				<pageIdAction>3</pageIdAction>
 				
 				<pageId>30</pageId>
 				<eventCategory>Music</eventCategory>
@@ -1458,7 +1458,7 @@
 			<row>
 				<type>event</type>
 				<url>http://example.org/webradio</url>
-				<pageIdAction>2</pageIdAction>
+				<pageIdAction>3</pageIdAction>
 				
 				<pageId>31</pageId>
 				<eventCategory>Music</eventCategory>
@@ -1479,7 +1479,7 @@
 			<row>
 				<type>event</type>
 				<url>http://example.org/webradio</url>
-				<pageIdAction>2</pageIdAction>
+				<pageIdAction>3</pageIdAction>
 				
 				<pageId>32</pageId>
 				<eventCategory>Music</eventCategory>
@@ -1501,7 +1501,7 @@
 				<type>action</type>
 				<url>http://example.org/movies</url>
 				<pageTitle>Movie Theater</pageTitle>
-				<pageIdAction>12</pageIdAction>
+				<pageIdAction>13</pageIdAction>
 				
 				<pageId>33</pageId>
 				<generationTime>0.67s</generationTime>
@@ -1513,7 +1513,7 @@
 			<row>
 				<type>event</type>
 				<url>http://example.org/movies</url>
-				<pageIdAction>12</pageIdAction>
+				<pageIdAction>14</pageIdAction>
 				
 				<pageId>34</pageId>
 				<eventCategory>Movie</eventCategory>
@@ -1527,7 +1527,7 @@
 			<row>
 				<type>event</type>
 				<url>http://example.org/movies</url>
-				<pageIdAction>12</pageIdAction>
+				<pageIdAction>14</pageIdAction>
 				
 				<pageId>35</pageId>
 				<eventCategory>Movie</eventCategory>
@@ -1541,7 +1541,7 @@
 			<row>
 				<type>event</type>
 				<url>http://example.org/movies</url>
-				<pageIdAction>12</pageIdAction>
+				<pageIdAction>14</pageIdAction>
 				
 				<pageId>36</pageId>
 				<eventCategory>Movie</eventCategory>
@@ -1555,7 +1555,7 @@
 			<row>
 				<type>event</type>
 				<url>http://example.org/movies</url>
-				<pageIdAction>12</pageIdAction>
+				<pageIdAction>14</pageIdAction>
 				
 				<pageId>37</pageId>
 				<eventCategory>Movie</eventCategory>
@@ -1569,7 +1569,7 @@
 			<row>
 				<type>event</type>
 				<url>http://example.org/movies</url>
-				<pageIdAction>12</pageIdAction>
+				<pageIdAction>14</pageIdAction>
 				
 				<pageId>38</pageId>
 				<eventCategory>Movie</eventCategory>
@@ -1583,7 +1583,7 @@
 			<row>
 				<type>event</type>
 				<url>http://example.org/movies</url>
-				<pageIdAction>12</pageIdAction>
+				<pageIdAction>14</pageIdAction>
 				
 				<pageId>39</pageId>
 				<eventCategory>Movie</eventCategory>
diff --git a/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_month.xml
index e1668e7608..81d8899dcf 100644
--- a/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_month.xml
+++ b/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_month.xml
@@ -9,7 +9,7 @@
 			<row>
 				<type>event</type>
 				<url>http://example.org/movies</url>
-				<pageIdAction>12</pageIdAction>
+				<pageIdAction>14</pageIdAction>
 				
 				<pageId>21</pageId>
 				<eventCategory>Movie</eventCategory>
@@ -114,7 +114,7 @@
 			<row>
 				<type>event</type>
 				<url>http://example.org/movies</url>
-				<pageIdAction>12</pageIdAction>
+				<pageIdAction>14</pageIdAction>
 				
 				<pageId>20</pageId>
 				<eventCategory>Movie</eventCategory>
@@ -219,7 +219,7 @@
 			<row>
 				<type>event</type>
 				<url>http://example.org/movies</url>
-				<pageIdAction>12</pageIdAction>
+				<pageIdAction>14</pageIdAction>
 				
 				<pageId>16</pageId>
 				<eventCategory>Movie</eventCategory>
@@ -233,7 +233,7 @@
 			<row>
 				<type>event</type>
 				<url>http://example.org/movies</url>
-				<pageIdAction>12</pageIdAction>
+				<pageIdAction>14</pageIdAction>
 				
 				<pageId>17</pageId>
 				<eventCategory>Movie</eventCategory>
@@ -247,7 +247,7 @@
 			<row>
 				<type>event</type>
 				<url>http://example.org/movies</url>
-				<pageIdAction>12</pageIdAction>
+				<pageIdAction>14</pageIdAction>
 				
 				<pageId>19</pageId>
 				<eventCategory>Movie</eventCategory>
@@ -261,7 +261,7 @@
 			<row>
 				<type>event</type>
 				<url>http://example.org/movies</url>
-				<pageIdAction>12</pageIdAction>
+				<pageIdAction>14</pageIdAction>
 				
 				<pageId>22</pageId>
 				<eventCategory>Movie</eventCategory>
@@ -290,7 +290,7 @@
 			<row>
 				<type>event</type>
 				<url>http://example.org/finishedMovie</url>
-				<pageIdAction>23</pageIdAction>
+				<pageIdAction>25</pageIdAction>
 				
 				<pageId>24</pageId>
 				<eventCategory>event category Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---&gt; SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED &lt;---</eventCategory>
@@ -397,7 +397,7 @@
 			<row>
 				<type>event</type>
 				<url>http://example.org/movies</url>
-				<pageIdAction>12</pageIdAction>
+				<pageIdAction>14</pageIdAction>
 				
 				<pageId>18</pageId>
 				<eventCategory>Movie</eventCategory>
@@ -526,7 +526,7 @@
 			<row>
 				<type>event</type>
 				<url>http://example.org/webradio</url>
-				<pageIdAction>2</pageIdAction>
+				<pageIdAction>3</pageIdAction>
 				
 				<pageId>2</pageId>
 				<eventCategory>Music</eventCategory>
@@ -546,7 +546,7 @@
 			<row>
 				<type>event</type>
 				<url>http://example.org/webradio</url>
-				<pageIdAction>2</pageIdAction>
+				<pageIdAction>3</pageIdAction>
 				
 				<pageId>3</pageId>
 				<eventCategory>Music</eventCategory>
@@ -566,7 +566,7 @@
 			<row>
 				<type>event</type>
 				<url>http://example.org/webradio</url>
-				<pageIdAction>2</pageIdAction>
+				<pageIdAction>3</pageIdAction>
 				
 				<pageId>4</pageId>
 				<eventCategory>Music</eventCategory>
@@ -586,7 +586,7 @@
 			<row>
 				<type>event</type>
 				<url>http://example.org/webradio</url>
-				<pageIdAction>2</pageIdAction>
+				<pageIdAction>3</pageIdAction>
 				
 				<pageId>5</pageId>
 				<eventCategory>Music</eventCategory>
@@ -606,7 +606,7 @@
 			<row>
 				<type>event</type>
 				<url>http://example.org/webradio</url>
-				<pageIdAction>2</pageIdAction>
+				<pageIdAction>3</pageIdAction>
 				
 				<pageId>6</pageId>
 				<eventCategory>Music</eventCategory>
@@ -626,7 +626,7 @@
 			<row>
 				<type>event</type>
 				<url>http://example.org/webradio</url>
-				<pageIdAction>2</pageIdAction>
+				<pageIdAction>3</pageIdAction>
 				
 				<pageId>7</pageId>
 				<eventCategory>Music</eventCategory>
@@ -647,7 +647,7 @@
 			<row>
 				<type>event</type>
 				<url>http://example.org/webradio</url>
-				<pageIdAction>2</pageIdAction>
+				<pageIdAction>3</pageIdAction>
 				
 				<pageId>8</pageId>
 				<eventCategory>Music</eventCategory>
@@ -669,7 +669,7 @@
 				<type>action</type>
 				<url>http://example.org/movies</url>
 				<pageTitle>Movie Theater</pageTitle>
-				<pageIdAction>12</pageIdAction>
+				<pageIdAction>13</pageIdAction>
 				
 				<pageId>9</pageId>
 				<generationTime>0.67s</generationTime>
@@ -681,7 +681,7 @@
 			<row>
 				<type>event</type>
 				<url>http://example.org/movies</url>
-				<pageIdAction>12</pageIdAction>
+				<pageIdAction>14</pageIdAction>
 				
 				<pageId>10</pageId>
 				<eventCategory>Movie</eventCategory>
@@ -695,7 +695,7 @@
 			<row>
 				<type>event</type>
 				<url>http://example.org/movies</url>
-				<pageIdAction>12</pageIdAction>
+				<pageIdAction>14</pageIdAction>
 				
 				<pageId>11</pageId>
 				<eventCategory>Movie</eventCategory>
@@ -709,7 +709,7 @@
 			<row>
 				<type>event</type>
 				<url>http://example.org/movies</url>
-				<pageIdAction>12</pageIdAction>
+				<pageIdAction>14</pageIdAction>
 				
 				<pageId>12</pageId>
 				<eventCategory>Movie</eventCategory>
@@ -723,7 +723,7 @@
 			<row>
 				<type>event</type>
 				<url>http://example.org/movies</url>
-				<pageIdAction>12</pageIdAction>
+				<pageIdAction>14</pageIdAction>
 				
 				<pageId>13</pageId>
 				<eventCategory>Movie</eventCategory>
@@ -737,7 +737,7 @@
 			<row>
 				<type>event</type>
 				<url>http://example.org/movies</url>
-				<pageIdAction>12</pageIdAction>
+				<pageIdAction>14</pageIdAction>
 				
 				<pageId>14</pageId>
 				<eventCategory>Movie</eventCategory>
@@ -751,7 +751,7 @@
 			<row>
 				<type>event</type>
 				<url>http://example.org/movies</url>
-				<pageIdAction>12</pageIdAction>
+				<pageIdAction>14</pageIdAction>
 				
 				<pageId>15</pageId>
 				<eventCategory>Movie</eventCategory>
@@ -857,7 +857,7 @@
 			<row>
 				<type>event</type>
 				<url>http://example.org/movies</url>
-				<pageIdAction>12</pageIdAction>
+				<pageIdAction>14</pageIdAction>
 				
 				<pageId>45</pageId>
 				<eventCategory>Movie</eventCategory>
@@ -958,7 +958,7 @@
 			<row>
 				<type>event</type>
 				<url>http://example.org/movies</url>
-				<pageIdAction>12</pageIdAction>
+				<pageIdAction>14</pageIdAction>
 				
 				<pageId>44</pageId>
 				<eventCategory>Movie</eventCategory>
@@ -1059,7 +1059,7 @@
 			<row>
 				<type>event</type>
 				<url>http://example.org/movies</url>
-				<pageIdAction>12</pageIdAction>
+				<pageIdAction>14</pageIdAction>
 				
 				<pageId>40</pageId>
 				<eventCategory>Movie</eventCategory>
@@ -1073,7 +1073,7 @@
 			<row>
 				<type>event</type>
 				<url>http://example.org/movies</url>
-				<pageIdAction>12</pageIdAction>
+				<pageIdAction>14</pageIdAction>
 				
 				<pageId>41</pageId>
 				<eventCategory>Movie</eventCategory>
@@ -1087,7 +1087,7 @@
 			<row>
 				<type>event</type>
 				<url>http://example.org/movies</url>
-				<pageIdAction>12</pageIdAction>
+				<pageIdAction>14</pageIdAction>
 				
 				<pageId>43</pageId>
 				<eventCategory>Movie</eventCategory>
@@ -1101,7 +1101,7 @@
 			<row>
 				<type>event</type>
 				<url>http://example.org/movies</url>
-				<pageIdAction>12</pageIdAction>
+				<pageIdAction>14</pageIdAction>
 				
 				<pageId>46</pageId>
 				<eventCategory>Movie</eventCategory>
@@ -1130,7 +1130,7 @@
 			<row>
 				<type>event</type>
 				<url>http://example.org/finishedMovie</url>
-				<pageIdAction>23</pageIdAction>
+				<pageIdAction>25</pageIdAction>
 				
 				<pageId>48</pageId>
 				<eventCategory>event category Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---&gt; SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED &lt;---</eventCategory>
@@ -1233,7 +1233,7 @@
 			<row>
 				<type>event</type>
 				<url>http://example.org/movies</url>
-				<pageIdAction>12</pageIdAction>
+				<pageIdAction>14</pageIdAction>
 				
 				<pageId>42</pageId>
 				<eventCategory>Movie</eventCategory>
@@ -1358,7 +1358,7 @@
 			<row>
 				<type>event</type>
 				<url>http://example.org/webradio</url>
-				<pageIdAction>2</pageIdAction>
+				<pageIdAction>3</pageIdAction>
 				
 				<pageId>26</pageId>
 				<eventCategory>Music</eventCategory>
@@ -1378,7 +1378,7 @@
 			<row>
 				<type>event</type>
 				<url>http://example.org/webradio</url>
-				<pageIdAction>2</pageIdAction>
+				<pageIdAction>3</pageIdAction>
 				
 				<pageId>27</pageId>
 				<eventCategory>Music</eventCategory>
@@ -1398,7 +1398,7 @@
 			<row>
 				<type>event</type>
 				<url>http://example.org/webradio</url>
-				<pageIdAction>2</pageIdAction>
+				<pageIdAction>3</pageIdAction>
 				
 				<pageId>28</pageId>
 				<eventCategory>Music</eventCategory>
@@ -1418,7 +1418,7 @@
 			<row>
 				<type>event</type>
 				<url>http://example.org/webradio</url>
-				<pageIdAction>2</pageIdAction>
+				<pageIdAction>3</pageIdAction>
 				
 				<pageId>29</pageId>
 				<eventCategory>Music</eventCategory>
@@ -1438,7 +1438,7 @@
 			<row>
 				<type>event</type>
 				<url>http://example.org/webradio</url>
-				<pageIdAction>2</pageIdAction>
+				<pageIdAction>3</pageIdAction>
 				
 				<pageId>30</pageId>
 				<eventCategory>Music</eventCategory>
@@ -1458,7 +1458,7 @@
 			<row>
 				<type>event</type>
 				<url>http://example.org/webradio</url>
-				<pageIdAction>2</pageIdAction>
+				<pageIdAction>3</pageIdAction>
 				
 				<pageId>31</pageId>
 				<eventCategory>Music</eventCategory>
@@ -1479,7 +1479,7 @@
 			<row>
 				<type>event</type>
 				<url>http://example.org/webradio</url>
-				<pageIdAction>2</pageIdAction>
+				<pageIdAction>3</pageIdAction>
 				
 				<pageId>32</pageId>
 				<eventCategory>Music</eventCategory>
@@ -1501,7 +1501,7 @@
 				<type>action</type>
 				<url>http://example.org/movies</url>
 				<pageTitle>Movie Theater</pageTitle>
-				<pageIdAction>12</pageIdAction>
+				<pageIdAction>13</pageIdAction>
 				
 				<pageId>33</pageId>
 				<generationTime>0.67s</generationTime>
@@ -1513,7 +1513,7 @@
 			<row>
 				<type>event</type>
 				<url>http://example.org/movies</url>
-				<pageIdAction>12</pageIdAction>
+				<pageIdAction>14</pageIdAction>
 				
 				<pageId>34</pageId>
 				<eventCategory>Movie</eventCategory>
@@ -1527,7 +1527,7 @@
 			<row>
 				<type>event</type>
 				<url>http://example.org/movies</url>
-				<pageIdAction>12</pageIdAction>
+				<pageIdAction>14</pageIdAction>
 				
 				<pageId>35</pageId>
 				<eventCategory>Movie</eventCategory>
@@ -1541,7 +1541,7 @@
 			<row>
 				<type>event</type>
 				<url>http://example.org/movies</url>
-				<pageIdAction>12</pageIdAction>
+				<pageIdAction>14</pageIdAction>
 				
 				<pageId>36</pageId>
 				<eventCategory>Movie</eventCategory>
@@ -1555,7 +1555,7 @@
 			<row>
 				<type>event</type>
 				<url>http://example.org/movies</url>
-				<pageIdAction>12</pageIdAction>
+				<pageIdAction>14</pageIdAction>
 				
 				<pageId>37</pageId>
 				<eventCategory>Movie</eventCategory>
@@ -1569,7 +1569,7 @@
 			<row>
 				<type>event</type>
 				<url>http://example.org/movies</url>
-				<pageIdAction>12</pageIdAction>
+				<pageIdAction>14</pageIdAction>
 				
 				<pageId>38</pageId>
 				<eventCategory>Movie</eventCategory>
@@ -1583,7 +1583,7 @@
 			<row>
 				<type>event</type>
 				<url>http://example.org/movies</url>
-				<pageIdAction>12</pageIdAction>
+				<pageIdAction>14</pageIdAction>
 				
 				<pageId>39</pageId>
 				<eventCategory>Movie</eventCategory>
diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_offsetAndLimit_1__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_offsetAndLimit_1__Live.getLastVisitsDetails_month.xml
index 805794b25a..8e249fd8e8 100644
--- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_offsetAndLimit_1__Live.getLastVisitsDetails_month.xml
+++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_offsetAndLimit_1__Live.getLastVisitsDetails_month.xml
@@ -62,7 +62,7 @@
 				<type>download</type>
 				<url>http://example.org/path/file8.zip</url>
 				<pageTitle />
-				<pageIdAction>46</pageIdAction>
+				<pageIdAction>47</pageIdAction>
 				
 				<pageId>48</pageId>
 				<timeSpent>180</timeSpent>
@@ -74,7 +74,7 @@
 				<type>outlink</type>
 				<url>http://example-outlink.org/8.html</url>
 				<pageTitle />
-				<pageIdAction>47</pageIdAction>
+				<pageIdAction>48</pageIdAction>
 				
 				<pageId>49</pageId>
 				<timeSpent>180</timeSpent>
@@ -85,7 +85,7 @@
 			<row>
 				<type>event</type>
 				<url>http://piwik.net/space/quest/iv</url>
-				<pageIdAction>4</pageIdAction>
+				<pageIdAction>8</pageIdAction>
 				
 				<pageId>50</pageId>
 				<eventCategory>Cat8</eventCategory>
@@ -360,7 +360,7 @@
 				<type>download</type>
 				<url>http://example.org/path/file7.zip</url>
 				<pageTitle />
-				<pageIdAction>41</pageIdAction>
+				<pageIdAction>42</pageIdAction>
 				
 				<pageId>42</pageId>
 				<timeSpent>180</timeSpent>
@@ -372,7 +372,7 @@
 				<type>outlink</type>
 				<url>http://example-outlink.org/7.html</url>
 				<pageTitle />
-				<pageIdAction>42</pageIdAction>
+				<pageIdAction>43</pageIdAction>
 				
 				<pageId>43</pageId>
 				<timeSpent>180</timeSpent>
@@ -383,7 +383,7 @@
 			<row>
 				<type>event</type>
 				<url>http://piwik.net/space/quest/iv</url>
-				<pageIdAction>4</pageIdAction>
+				<pageIdAction>8</pageIdAction>
 				
 				<pageId>44</pageId>
 				<eventCategory>Cat7</eventCategory>
diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_offsetAndLimit_2__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_offsetAndLimit_2__Live.getLastVisitsDetails_month.xml
index 0f2d97047a..7f6a3282d9 100644
--- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_offsetAndLimit_2__Live.getLastVisitsDetails_month.xml
+++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_offsetAndLimit_2__Live.getLastVisitsDetails_month.xml
@@ -191,7 +191,7 @@
 				<type>download</type>
 				<url>http://example.org/path/file6.zip</url>
 				<pageTitle />
-				<pageIdAction>36</pageIdAction>
+				<pageIdAction>37</pageIdAction>
 				
 				<pageId>37</pageId>
 				<timeSpent>180</timeSpent>
@@ -203,7 +203,7 @@
 				<type>outlink</type>
 				<url>http://example-outlink.org/6.html</url>
 				<pageTitle />
-				<pageIdAction>37</pageIdAction>
+				<pageIdAction>38</pageIdAction>
 				
 				<pageId>38</pageId>
 				<timeSpent>180</timeSpent>
@@ -214,7 +214,7 @@
 			<row>
 				<type>event</type>
 				<url>http://piwik.net/space/quest/iv</url>
-				<pageIdAction>4</pageIdAction>
+				<pageIdAction>8</pageIdAction>
 				
 				<pageId>39</pageId>
 				<eventCategory>Cat6</eventCategory>
diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisit__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisit__Live.getLastVisitsDetails_month.xml
index 3e3259cb3d..582ef94413 100644
--- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisit__Live.getLastVisitsDetails_month.xml
+++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisit__Live.getLastVisitsDetails_month.xml
@@ -173,7 +173,7 @@
 				<type>download</type>
 				<url>http://example.org/path/file8.zip</url>
 				<pageTitle />
-				<pageIdAction>46</pageIdAction>
+				<pageIdAction>47</pageIdAction>
 				
 				<pageId>48</pageId>
 				<timeSpent>180</timeSpent>
@@ -185,7 +185,7 @@
 				<type>outlink</type>
 				<url>http://example-outlink.org/8.html</url>
 				<pageTitle />
-				<pageIdAction>47</pageIdAction>
+				<pageIdAction>48</pageIdAction>
 				
 				<pageId>49</pageId>
 				<timeSpent>180</timeSpent>
@@ -196,7 +196,7 @@
 			<row>
 				<type>event</type>
 				<url>http://piwik.net/space/quest/iv</url>
-				<pageIdAction>4</pageIdAction>
+				<pageIdAction>8</pageIdAction>
 				
 				<pageId>50</pageId>
 				<eventCategory>Cat8</eventCategory>
@@ -471,7 +471,7 @@
 				<type>download</type>
 				<url>http://example.org/path/file7.zip</url>
 				<pageTitle />
-				<pageIdAction>41</pageIdAction>
+				<pageIdAction>42</pageIdAction>
 				
 				<pageId>42</pageId>
 				<timeSpent>180</timeSpent>
@@ -483,7 +483,7 @@
 				<type>outlink</type>
 				<url>http://example-outlink.org/7.html</url>
 				<pageTitle />
-				<pageIdAction>42</pageIdAction>
+				<pageIdAction>43</pageIdAction>
 				
 				<pageId>43</pageId>
 				<timeSpent>180</timeSpent>
@@ -494,7 +494,7 @@
 			<row>
 				<type>event</type>
 				<url>http://piwik.net/space/quest/iv</url>
-				<pageIdAction>4</pageIdAction>
+				<pageIdAction>8</pageIdAction>
 				
 				<pageId>44</pageId>
 				<eventCategory>Cat7</eventCategory>
@@ -787,7 +787,7 @@
 				<type>download</type>
 				<url>http://example.org/path/file6.zip</url>
 				<pageTitle />
-				<pageIdAction>36</pageIdAction>
+				<pageIdAction>37</pageIdAction>
 				
 				<pageId>37</pageId>
 				<timeSpent>180</timeSpent>
@@ -799,7 +799,7 @@
 				<type>outlink</type>
 				<url>http://example-outlink.org/6.html</url>
 				<pageTitle />
-				<pageIdAction>37</pageIdAction>
+				<pageIdAction>38</pageIdAction>
 				
 				<pageId>38</pageId>
 				<timeSpent>180</timeSpent>
@@ -810,7 +810,7 @@
 			<row>
 				<type>event</type>
 				<url>http://piwik.net/space/quest/iv</url>
-				<pageIdAction>4</pageIdAction>
+				<pageIdAction>8</pageIdAction>
 				
 				<pageId>39</pageId>
 				<eventCategory>Cat6</eventCategory>
diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortDesc__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortDesc__Live.getLastVisitsDetails_month.xml
index 3e3259cb3d..582ef94413 100644
--- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortDesc__Live.getLastVisitsDetails_month.xml
+++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortDesc__Live.getLastVisitsDetails_month.xml
@@ -173,7 +173,7 @@
 				<type>download</type>
 				<url>http://example.org/path/file8.zip</url>
 				<pageTitle />
-				<pageIdAction>46</pageIdAction>
+				<pageIdAction>47</pageIdAction>
 				
 				<pageId>48</pageId>
 				<timeSpent>180</timeSpent>
@@ -185,7 +185,7 @@
 				<type>outlink</type>
 				<url>http://example-outlink.org/8.html</url>
 				<pageTitle />
-				<pageIdAction>47</pageIdAction>
+				<pageIdAction>48</pageIdAction>
 				
 				<pageId>49</pageId>
 				<timeSpent>180</timeSpent>
@@ -196,7 +196,7 @@
 			<row>
 				<type>event</type>
 				<url>http://piwik.net/space/quest/iv</url>
-				<pageIdAction>4</pageIdAction>
+				<pageIdAction>8</pageIdAction>
 				
 				<pageId>50</pageId>
 				<eventCategory>Cat8</eventCategory>
@@ -471,7 +471,7 @@
 				<type>download</type>
 				<url>http://example.org/path/file7.zip</url>
 				<pageTitle />
-				<pageIdAction>41</pageIdAction>
+				<pageIdAction>42</pageIdAction>
 				
 				<pageId>42</pageId>
 				<timeSpent>180</timeSpent>
@@ -483,7 +483,7 @@
 				<type>outlink</type>
 				<url>http://example-outlink.org/7.html</url>
 				<pageTitle />
-				<pageIdAction>42</pageIdAction>
+				<pageIdAction>43</pageIdAction>
 				
 				<pageId>43</pageId>
 				<timeSpent>180</timeSpent>
@@ -494,7 +494,7 @@
 			<row>
 				<type>event</type>
 				<url>http://piwik.net/space/quest/iv</url>
-				<pageIdAction>4</pageIdAction>
+				<pageIdAction>8</pageIdAction>
 				
 				<pageId>44</pageId>
 				<eventCategory>Cat7</eventCategory>
@@ -787,7 +787,7 @@
 				<type>download</type>
 				<url>http://example.org/path/file6.zip</url>
 				<pageTitle />
-				<pageIdAction>36</pageIdAction>
+				<pageIdAction>37</pageIdAction>
 				
 				<pageId>37</pageId>
 				<timeSpent>180</timeSpent>
@@ -799,7 +799,7 @@
 				<type>outlink</type>
 				<url>http://example-outlink.org/6.html</url>
 				<pageTitle />
-				<pageIdAction>37</pageIdAction>
+				<pageIdAction>38</pageIdAction>
 				
 				<pageId>38</pageId>
 				<timeSpent>180</timeSpent>
@@ -810,7 +810,7 @@
 			<row>
 				<type>event</type>
 				<url>http://piwik.net/space/quest/iv</url>
-				<pageIdAction>4</pageIdAction>
+				<pageIdAction>8</pageIdAction>
 				
 				<pageId>39</pageId>
 				<eventCategory>Cat6</eventCategory>
diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__Live.getLastVisitsDetails_month.xml
index 03318743cc..0ca5df1e81 100644
--- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__Live.getLastVisitsDetails_month.xml
+++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__Live.getLastVisitsDetails_month.xml
@@ -173,7 +173,7 @@
 				<type>download</type>
 				<url>http://example.org/path/file8.zip</url>
 				<pageTitle />
-				<pageIdAction>46</pageIdAction>
+				<pageIdAction>47</pageIdAction>
 				
 				<pageId>48</pageId>
 				<timeSpent>180</timeSpent>
@@ -185,7 +185,7 @@
 				<type>outlink</type>
 				<url>http://example-outlink.org/8.html</url>
 				<pageTitle />
-				<pageIdAction>47</pageIdAction>
+				<pageIdAction>48</pageIdAction>
 				
 				<pageId>49</pageId>
 				<timeSpent>180</timeSpent>
@@ -196,7 +196,7 @@
 			<row>
 				<type>event</type>
 				<url>http://piwik.net/space/quest/iv</url>
-				<pageIdAction>4</pageIdAction>
+				<pageIdAction>8</pageIdAction>
 				
 				<pageId>50</pageId>
 				<eventCategory>Cat8</eventCategory>
@@ -471,7 +471,7 @@
 				<type>download</type>
 				<url>http://example.org/path/file7.zip</url>
 				<pageTitle />
-				<pageIdAction>41</pageIdAction>
+				<pageIdAction>42</pageIdAction>
 				
 				<pageId>42</pageId>
 				<timeSpent>180</timeSpent>
@@ -483,7 +483,7 @@
 				<type>outlink</type>
 				<url>http://example-outlink.org/7.html</url>
 				<pageTitle />
-				<pageIdAction>42</pageIdAction>
+				<pageIdAction>43</pageIdAction>
 				
 				<pageId>43</pageId>
 				<timeSpent>180</timeSpent>
@@ -494,7 +494,7 @@
 			<row>
 				<type>event</type>
 				<url>http://piwik.net/space/quest/iv</url>
-				<pageIdAction>4</pageIdAction>
+				<pageIdAction>8</pageIdAction>
 				
 				<pageId>44</pageId>
 				<eventCategory>Cat7</eventCategory>
@@ -787,7 +787,7 @@
 				<type>download</type>
 				<url>http://example.org/path/file6.zip</url>
 				<pageTitle />
-				<pageIdAction>36</pageIdAction>
+				<pageIdAction>37</pageIdAction>
 				
 				<pageId>37</pageId>
 				<timeSpent>180</timeSpent>
@@ -799,7 +799,7 @@
 				<type>outlink</type>
 				<url>http://example-outlink.org/6.html</url>
 				<pageTitle />
-				<pageIdAction>37</pageIdAction>
+				<pageIdAction>38</pageIdAction>
 				
 				<pageId>38</pageId>
 				<timeSpent>180</timeSpent>
@@ -810,7 +810,7 @@
 			<row>
 				<type>event</type>
 				<url>http://piwik.net/space/quest/iv</url>
-				<pageIdAction>4</pageIdAction>
+				<pageIdAction>8</pageIdAction>
 				
 				<pageId>39</pageId>
 				<eventCategory>Cat6</eventCategory>
@@ -1085,7 +1085,7 @@
 				<type>download</type>
 				<url>http://example.org/path/file5.zip</url>
 				<pageTitle />
-				<pageIdAction>31</pageIdAction>
+				<pageIdAction>32</pageIdAction>
 				
 				<pageId>31</pageId>
 				<timeSpent>180</timeSpent>
@@ -1097,7 +1097,7 @@
 				<type>outlink</type>
 				<url>http://example-outlink.org/5.html</url>
 				<pageTitle />
-				<pageIdAction>32</pageIdAction>
+				<pageIdAction>33</pageIdAction>
 				
 				<pageId>32</pageId>
 				<timeSpent>180</timeSpent>
@@ -1108,7 +1108,7 @@
 			<row>
 				<type>event</type>
 				<url>http://piwik.net/space/quest/iv</url>
-				<pageIdAction>4</pageIdAction>
+				<pageIdAction>8</pageIdAction>
 				
 				<pageId>33</pageId>
 				<eventCategory>Cat5</eventCategory>
@@ -1401,7 +1401,7 @@
 				<type>download</type>
 				<url>http://example.org/path/file4.zip</url>
 				<pageTitle />
-				<pageIdAction>26</pageIdAction>
+				<pageIdAction>27</pageIdAction>
 				
 				<pageId>26</pageId>
 				<timeSpent>180</timeSpent>
@@ -1413,7 +1413,7 @@
 				<type>outlink</type>
 				<url>http://example-outlink.org/4.html</url>
 				<pageTitle />
-				<pageIdAction>27</pageIdAction>
+				<pageIdAction>28</pageIdAction>
 				
 				<pageId>27</pageId>
 				<timeSpent>180</timeSpent>
@@ -1424,7 +1424,7 @@
 			<row>
 				<type>event</type>
 				<url>http://piwik.net/space/quest/iv</url>
-				<pageIdAction>4</pageIdAction>
+				<pageIdAction>8</pageIdAction>
 				
 				<pageId>28</pageId>
 				<eventCategory>Cat4</eventCategory>
diff --git a/tests/PHPUnit/System/expected/test_Transitions__Transitions.getTransitionsForPageUrl_day.xml b/tests/PHPUnit/System/expected/test_Transitions__Transitions.getTransitionsForPageUrl_day.xml
index 362ecce292..865d25db4e 100644
--- a/tests/PHPUnit/System/expected/test_Transitions__Transitions.getTransitionsForPageUrl_day.xml
+++ b/tests/PHPUnit/System/expected/test_Transitions__Transitions.getTransitionsForPageUrl_day.xml
@@ -25,7 +25,7 @@
 		<loops>2</loops>
 		<pageviews>18</pageviews>
 		<entries>4</entries>
-		<exits>6</exits>
+		<exits>7</exits>
 	</pageMetrics>
 	<followingPages>
 		<row>
@@ -38,7 +38,7 @@
 		</row>
 		<row>
 			<label>Others</label>
-			<referrals>4</referrals>
+			<referrals>3</referrals>
 		</row>
 	</followingPages>
 	<followingSiteSearches>
diff --git a/tests/PHPUnit/System/expected/test_Transitions__Transitions.getTransitionsForPageUrl_month.xml b/tests/PHPUnit/System/expected/test_Transitions__Transitions.getTransitionsForPageUrl_month.xml
index 639a8ffa93..7e7b381757 100644
--- a/tests/PHPUnit/System/expected/test_Transitions__Transitions.getTransitionsForPageUrl_month.xml
+++ b/tests/PHPUnit/System/expected/test_Transitions__Transitions.getTransitionsForPageUrl_month.xml
@@ -25,7 +25,7 @@
 		<loops>2</loops>
 		<pageviews>21</pageviews>
 		<entries>4</entries>
-		<exits>7</exits>
+		<exits>9</exits>
 	</pageMetrics>
 	<followingPages>
 		<row>
@@ -38,7 +38,7 @@
 		</row>
 		<row>
 			<label>Others</label>
-			<referrals>5</referrals>
+			<referrals>3</referrals>
 		</row>
 	</followingPages>
 	<followingSiteSearches>
diff --git a/tests/PHPUnit/System/expected/test_Transitions_noLimit__Transitions.getTransitionsForPageUrl_day.xml b/tests/PHPUnit/System/expected/test_Transitions_noLimit__Transitions.getTransitionsForPageUrl_day.xml
index c6b559a21c..6233153f1c 100644
--- a/tests/PHPUnit/System/expected/test_Transitions_noLimit__Transitions.getTransitionsForPageUrl_day.xml
+++ b/tests/PHPUnit/System/expected/test_Transitions_noLimit__Transitions.getTransitionsForPageUrl_day.xml
@@ -25,7 +25,7 @@
 		<loops>2</loops>
 		<pageviews>18</pageviews>
 		<entries>4</entries>
-		<exits>6</exits>
+		<exits>7</exits>
 	</pageMetrics>
 	<followingPages>
 		<row>
@@ -44,10 +44,6 @@
 			<label>example.org/page3.html</label>
 			<referrals>1</referrals>
 		</row>
-		<row>
-			<label>example.org/page/search.html</label>
-			<referrals>1</referrals>
-		</row>
 	</followingPages>
 	<followingSiteSearches>
 		<row>
diff --git a/tests/PHPUnit/System/expected/test_Transitions_noLimit__Transitions.getTransitionsForPageUrl_month.xml b/tests/PHPUnit/System/expected/test_Transitions_noLimit__Transitions.getTransitionsForPageUrl_month.xml
index dd4aea11a7..c782fbb761 100644
--- a/tests/PHPUnit/System/expected/test_Transitions_noLimit__Transitions.getTransitionsForPageUrl_month.xml
+++ b/tests/PHPUnit/System/expected/test_Transitions_noLimit__Transitions.getTransitionsForPageUrl_month.xml
@@ -25,7 +25,7 @@
 		<loops>2</loops>
 		<pageviews>21</pageviews>
 		<entries>4</entries>
-		<exits>7</exits>
+		<exits>9</exits>
 	</pageMetrics>
 	<followingPages>
 		<row>
@@ -41,10 +41,6 @@
 			<referrals>2</referrals>
 		</row>
 		<row>
-			<label>example.org/page/search.html</label>
-			<referrals>2</referrals>
-		</row>
-		<row>
 			<label>example.org/page3.html</label>
 			<referrals>1</referrals>
 		</row>
diff --git a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getSegmentsMetadata.xml b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getSegmentsMetadata.xml
index e2c3f30c00..4ad95c35d3 100644
--- a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getSegmentsMetadata.xml
+++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getSegmentsMetadata.xml
@@ -59,6 +59,13 @@
 		<permission>1</permission>
 	</row>
 	<row>
+		<type>metric</type>
+		<category>Actions</category>
+		<name>Action Type</name>
+		<segment>actionType</segment>
+		<acceptedValues>A type of action, such as: pageviews, contents, sitesearches, events, outlinks, downloads</acceptedValues>
+	</row>
+	<row>
 		<type>dimension</type>
 		<category>Visit Location</category>
 		<name>City</name>